From c43d15e8cf617be30956d02ba013356d8e93121b Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@nanaian.town>
Date: Sun, 24 Mar 2024 06:43:34 +0000
Subject: [PATCH] Clean up map filenames (#1175)

Co-authored-by: Ethan <ethteck@gmail.com>
---
 .vscode/settings.json                         |    2 +
 .../arn_02/{arn_02_3_entity.c => entity.c}    |    0
 .../arn_02/{arn_02_2_main.c => main.c}        |    0
 .../arn_02/{arn_02_1_music.c => music.c}      |    0
 .../area_arn/arn_02/{arn_02_4_npc.c => npc.c} |    0
 .../arn_02/{arn_02_0_header.c => settings.c}  |    0
 .../arn_03/{arn_03_4_entity.c => entity.c}    |    0
 .../arn_03/{arn_03_2_main.c => main.c}        |    0
 .../arn_03/{arn_03_1_music.c => music.c}      |    0
 .../area_arn/arn_03/{arn_03_3_npc.c => npc.c} |    0
 .../arn_03/{arn_03_0_header.c => settings.c}  |    0
 .../arn_04/{arn_04_4_entity.c => entity.c}    |    0
 .../arn_04/{arn_04_2_main.c => main.c}        |    0
 .../arn_04/{arn_04_1_music.c => music.c}      |    0
 .../area_arn/arn_04/{arn_04_3_npc.c => npc.c} |    0
 .../arn_04/{arn_04_0_header.c => settings.c}  |    0
 .../arn_05/{arn_05_4_entity.c => entity.c}    |    0
 .../arn_05/{arn_05_2_main.c => main.c}        |    0
 .../arn_05/{arn_05_1_music.c => music.c}      |    0
 .../area_arn/arn_05/{arn_05_3_npc.c => npc.c} |    0
 .../arn_05/{arn_05_0_header.c => settings.c}  |    0
 .../arn_07/{arn_07_4_entity.c => entity.c}    |    0
 .../arn_07/{arn_07_2_main.c => main.c}        |    0
 .../arn_07/{arn_07_1_music.c => music.c}      |    0
 .../area_arn/arn_07/{arn_07_5_npc.c => npc.c} |    0
 .../arn_07/{arn_07_0_header.c => settings.c}  |    0
 .../{arn_07_3_windmill.c => windmill.c}       |    0
 .../arn_08/{arn_08_5_demo.c => demo.c}        |    0
 .../arn_08/{arn_08_7_entity.c => entity.c}    |    0
 .../arn_08/{arn_08_4_gears.c => gears.c}      |    0
 .../arn_08/{arn_08_2_main.c => main.c}        |    0
 .../arn_08/{arn_08_1_music.c => music.c}      |    0
 .../area_arn/arn_08/{arn_08_6_npc.c => npc.c} |    0
 .../arn_08/{arn_08_0_header.c => settings.c}  |    0
 .../arn_08/{arn_08_3_well.c => well.c}        |    0
 .../arn_09/{arn_09_3_entity.c => entity.c}    |    0
 .../arn_09/{arn_09_4_launch.c => launch.c}    |    0
 .../arn_09/{arn_09_2_main.c => main.c}        |    0
 .../arn_09/{arn_09_1_music.c => music.c}      |    0
 .../area_arn/arn_09/{arn_09_5_npc.c => npc.c} |    0
 .../arn_09/{arn_09_0_header.c => settings.c}  |    0
 .../arn_10/{arn_10_4_entity.c => entity.c}    |    0
 .../arn_10/{arn_10_2_main.c => main.c}        |    0
 .../arn_10/{arn_10_1_music.c => music.c}      |    0
 .../area_arn/arn_10/{arn_10_3_npc.c => npc.c} |    0
 .../arn_10/{arn_10_0_header.c => settings.c}  |    0
 .../arn_11/{arn_11_2_main.c => main.c}        |    0
 .../arn_11/{arn_11_1_music.c => music.c}      |    0
 .../area_arn/arn_11/{arn_11_3_npc.c => npc.c} |    0
 .../arn_11/{arn_11_0_header.c => settings.c}  |    0
 .../arn_12/{arn_12_4_entity.c => entity.c}    |    0
 .../arn_12/{arn_12_2_main.c => main.c}        |    0
 .../arn_12/{arn_12_1_music.c => music.c}      |    0
 .../area_arn/arn_12/{arn_12_3_npc.c => npc.c} |    0
 .../arn_12/{arn_12_0_header.c => settings.c}  |    0
 .../arn_13/{arn_13_4_entity.c => entity.c}    |    0
 .../arn_13/{arn_13_2_main.c => main.c}        |    0
 .../arn_13/{arn_13_1_music.c => music.c}      |    0
 .../area_arn/arn_13/{arn_13_3_npc.c => npc.c} |    0
 .../arn_13/{arn_13_0_header.c => settings.c}  |    0
 .../dgb_00/{dgb_00_4_entity.c => entity.c}    |    0
 .../dgb_00/{dgb_00_2_main.c => main.c}        |    0
 .../dgb_00/{dgb_00_1_music.c => music.c}      |    0
 .../area_dgb/dgb_00/{dgb_00_3_npc.c => npc.c} |    0
 .../dgb_00/{dgb_00_0_header.c => settings.c}  |    0
 .../dgb_01/{dgb_01_3_bridges.c => bridges.c}  |    0
 .../dgb_01/{dgb_01_4_entity.c => entity.c}    |    0
 .../area_dgb/dgb_01/{dgb_01_7.c => gfx.c}     |    0
 .../dgb_01/{dgb_01_6_img0.c => img0.c}        |    0
 .../dgb_01/{dgb_01_6_img1.c => img1.c}        |    0
 .../dgb_01/{dgb_01_6_img2.c => img2.c}        |    0
 .../dgb_01/{dgb_01_6_img3.c => img3.c}        |    0
 .../dgb_01/{dgb_01_6_img4.c => img4.c}        |    0
 .../dgb_01/{dgb_01_6_img5.c => img5.c}        |    0
 .../dgb_01/{dgb_01_6_img6.c => img6.c}        |    0
 .../dgb_01/{dgb_01_6_img7.c => img7.c}        |    0
 .../dgb_01/{dgb_01_2_main.c => main.c}        |    0
 .../dgb_01/{dgb_01_1_music.c => music.c}      |    0
 .../area_dgb/dgb_01/{dgb_01_5_npc.c => npc.c} |    0
 .../dgb_01/{dgb_01_0_header.c => settings.c}  |    0
 .../dgb_02/{dgb_02_2_main.c => main.c}        |    0
 .../dgb_02/{dgb_02_1_music.c => music.c}      |    0
 .../area_dgb/dgb_02/{dgb_02_3_npc.c => npc.c} |    0
 .../dgb_02/{dgb_02_0_header.c => settings.c}  |    0
 .../dgb_03/{dgb_03_3_clock.c => clock.c}      |    0
 .../dgb_03/{dgb_03_4_entity.c => entity.c}    |    0
 .../dgb_03/{dgb_03_2_main.c => main.c}        |    0
 .../dgb_03/{dgb_03_1_music.c => music.c}      |    0
 .../area_dgb/dgb_03/{dgb_03_5_npc.c => npc.c} |    0
 .../dgb_03/{dgb_03_0_header.c => settings.c}  |    0
 .../dgb_04/{dgb_04_4_entity.c => entity.c}    |    0
 .../dgb_04/{dgb_04_2_main.c => main.c}        |    0
 .../dgb_04/{dgb_04_1_music.c => music.c}      |    0
 .../area_dgb/dgb_04/{dgb_04_3_npc.c => npc.c} |    0
 .../dgb_04/{dgb_04_0_header.c => settings.c}  |    0
 .../dgb_05/{dgb_05_4_entity.c => entity.c}    |    0
 .../dgb_05/{dgb_05_3_hole.c => hole.c}        |    0
 .../dgb_05/{dgb_05_2_main.c => main.c}        |    0
 .../dgb_05/{dgb_05_1_music.c => music.c}      |    0
 .../area_dgb/dgb_05/{dgb_05_5_npc.c => npc.c} |    0
 .../dgb_05/{dgb_05_0_header.c => settings.c}  |    0
 .../dgb_06/{dgb_06_3_entity.c => entity.c}    |    0
 .../dgb_06/{dgb_06_2_main.c => main.c}        |    0
 .../dgb_06/{dgb_06_1_music.c => music.c}      |    0
 .../area_dgb/dgb_06/{dgb_06_4_npc.c => npc.c} |    0
 .../dgb_06/{dgb_06_0_header.c => settings.c}  |    0
 .../dgb_07/{dgb_07_3_entity.c => entity.c}    |    0
 .../dgb_07/{dgb_07_2_main.c => main.c}        |    0
 .../dgb_07/{dgb_07_1_music.c => music.c}      |    0
 .../area_dgb/dgb_07/{dgb_07_4_npc.c => npc.c} |    0
 .../dgb_07/{dgb_07_0_header.c => settings.c}  |    0
 .../dgb_08/{dgb_08_4_entity.c => entity.c}    |    0
 .../dgb_08/{dgb_08_2_main.c => main.c}        |    0
 .../dgb_08/{dgb_08_1_music.c => music.c}      |    0
 .../area_dgb/dgb_08/{dgb_08_3_npc.c => npc.c} |    0
 .../dgb_08/{dgb_08_0_header.c => settings.c}  |    0
 .../{dgb_09_3_breakable.c => breakable.c}     |    0
 .../dgb_09/{dgb_09_2_main.c => main.c}        |    0
 .../dgb_09/{dgb_09_1_music.c => music.c}      |    0
 .../area_dgb/dgb_09/{dgb_09_4_npc.c => npc.c} |    0
 .../dgb_09/{dgb_09_0_header.c => settings.c}  |    0
 .../dgb_10/{dgb_10_4_entity.c => entity.c}    |    0
 .../dgb_10/{dgb_10_3_hole.c => hole.c}        |    0
 .../dgb_10/{dgb_10_2_main.c => main.c}        |    0
 .../dgb_10/{dgb_10_1_music.c => music.c}      |    0
 .../dgb_10/{dgb_10_0_header.c => settings.c}  |    0
 .../dgb_11/{dgb_11_3_entity.c => entity.c}    |    0
 .../dgb_11/{dgb_11_2_main.c => main.c}        |    0
 .../dgb_11/{dgb_11_1_music.c => music.c}      |    0
 .../dgb_11/{dgb_11_0_header.c => settings.c}  |    0
 .../dgb_12/{dgb_12_4_entity.c => entity.c}    |    0
 .../dgb_12/{dgb_12_2_main.c => main.c}        |    0
 .../dgb_12/{dgb_12_1_music.c => music.c}      |    0
 .../dgb_12/{dgb_12_0_header.c => settings.c}  |    0
 .../dgb_12/{dgb_12_3_spikes.c => spikes.c}    |    0
 .../dgb_13/{dgb_13_4_drawer.c => drawer.c}    |    0
 .../dgb_13/{dgb_13_3_entity.c => entity.c}    |    0
 .../dgb_13/{dgb_13_2_main.c => main.c}        |    0
 .../dgb_13/{dgb_13_1_music.c => music.c}      |    0
 .../dgb_13/{dgb_13_0_header.c => settings.c}  |    0
 .../dgb_14/{dgb_14_3_entity.c => entity.c}    |    0
 .../dgb_14/{dgb_14_2_main.c => main.c}        |    0
 .../dgb_14/{dgb_14_1_music.c => music.c}      |    0
 .../dgb_14/{dgb_14_0_header.c => settings.c}  |    0
 .../dgb_15/{dgb_15_4_entity.c => entity.c}    |    0
 .../dgb_15/{dgb_15_2_main.c => main.c}        |    0
 .../dgb_15/{dgb_15_1_music.c => music.c}      |    0
 .../area_dgb/dgb_15/{dgb_15_3_npc.c => npc.c} |    0
 .../dgb_15/{dgb_15_0_header.c => settings.c}  |    0
 .../dgb_16/{dgb_16_3_entity.c => entity.c}    |    0
 .../dgb_16/{dgb_16_2_main.c => main.c}        |    0
 .../dgb_16/{dgb_16_1_music.c => music.c}      |    0
 .../area_dgb/dgb_16/{dgb_16_4_npc.c => npc.c} |    0
 .../dgb_16/{dgb_16_0_header.c => settings.c}  |    0
 .../dgb_17/{dgb_17_3_entity.c => entity.c}    |    0
 .../dgb_17/{dgb_17_2_main.c => main.c}        |    0
 .../dgb_17/{dgb_17_1_music.c => music.c}      |    0
 .../dgb_17/{dgb_17_0_header.c => settings.c}  |    0
 .../dgb_18/{dgb_18_4_entity.c => entity.c}    |    0
 .../dgb_18/{dgb_18_2_main.c => main.c}        |    0
 .../dgb_18/{dgb_18_1_music.c => music.c}      |    0
 .../area_dgb/dgb_18/{dgb_18_3_npc.c => npc.c} |    0
 .../dgb_18/{dgb_18_0_header.c => settings.c}  |    0
 ...dgb_01_smash_bridges.c => smash_bridges.c} |    0
 .../dro_01/{dro_01_6_entity.c => entity.c}    |    0
 .../dro_01/{dro_01_7_foliage.c => foliage.c}  |    0
 .../dro_01/{dro_01_2_main.c => main.c}        |    0
 .../dro_01/{dro_01_1_music.c => music.c}      |    0
 .../area_dro/dro_01/{dro_01_3_npc.c => npc.c} |    0
 .../dro_01/{dro_01_5_rooms.c => rooms.c}      |    0
 .../dro_01/{dro_01_0_header.c => settings.c}  |    0
 .../dro_01/{dro_01_4_shop.c => shop.c}        |    0
 .../dro_02/{dro_02_2_entity.c => entity.c}    |    0
 .../dro_02/{dro_02_3_main.c => main.c}        |    0
 .../dro_02/{dro_02_1_music.c => music.c}      |    0
 .../area_dro/dro_02/{dro_02_5_npc.c => npc.c} |    0
 .../dro_02/{dro_02_4_rooms.c => rooms.c}      |    0
 .../dro_02/{dro_02_0_header.c => settings.c}  |    0
 .../end_00/{end_00_4_allies.c => allies.c}    |    0
 .../end_00/{end_00_7_boos.c => boos.c}        |    0
 .../end_00/{end_00_B_bowser.c => bowser.c}    |    0
 .../end_00/{end_00_6_caravan.c => caravan.c}  |    0
 .../end_00/{end_00_2_credits.c => credits.c}  |    0
 ...end_00_A_crystal_king.c => crystal_king.c} |    0
 .../{end_00_9_huff_n_puff.c => huff_n_puff.c} |    0
 .../end_00/{end_00_5_koopas.c => koopas.c}    |    0
 .../end_00/{end_00_1_main.c => main.c}        |    0
 ...end_00_3_parade_setup.c => parade_setup.c} |    0
 .../end_00/{end_00_0_header.c => settings.c}  |    0
 .../end_00/{end_00_8_yoshis.c => yoshis.c}    |    0
 .../end_01/{end_01_2_credits.c => credits.c}  |    0
 ...end_01_5_flower_float.c => flower_float.c} |    0
 .../end_01/{end_01_1_main.c => main.c}        |    0
 .../{end_01_4_opera_float.c => opera_float.c} |    0
 ...end_01_3_parade_setup.c => parade_setup.c} |    0
 .../{end_01_7_peach_float.c => peach_float.c} |    0
 .../end_01/{end_01_0_header.c => settings.c}  |    0
 ...end_01_6_shyguy_float.c => shyguy_float.c} |    0
 .../{flo_00_5_beanstalk.c => beanstalk.c}     |    0
 .../flo_00/{flo_00_6_entity.c => entity.c}    |    0
 .../{flo_00_4_epilogue.c => epilogue.c}       |    0
 .../flo_00/{flo_00_2_main.c => main.c}        |    0
 .../flo_00/{flo_00_1_music.c => music.c}      |    0
 .../area_flo/flo_00/{flo_00_3_npc.c => npc.c} |    0
 .../flo_00/{flo_00_0_header.c => settings.c}  |    0
 .../flo_03/{flo_03_5_entity.c => entity.c}    |    0
 .../flo_03/{flo_03_4_foliage.c => foliage.c}  |    0
 .../flo_03/{flo_03_2_main.c => main.c}        |    0
 .../flo_03/{flo_03_1_music.c => music.c}      |    0
 .../area_flo/flo_03/{flo_03_3_npc.c => npc.c} |    0
 .../flo_03/{flo_03_0_header.c => settings.c}  |    0
 .../flo_07/{flo_07_2_main.c => main.c}        |    0
 .../flo_07/{flo_07_1_music.c => music.c}      |    0
 .../area_flo/flo_07/{flo_07_3_npc.c => npc.c} |    0
 .../flo_07/{flo_07_0_header.c => settings.c}  |    0
 .../flo_08/{flo_08_2_entity.c => entity.c}    |    0
 .../flo_08/{flo_08_5_foliage.c => foliage.c}  |    0
 .../flo_08/{flo_08_3_main.c => main.c}        |    0
 .../flo_08/{flo_08_1_music.c => music.c}      |    0
 .../area_flo/flo_08/{flo_08_4_npc.c => npc.c} |    0
 .../flo_08/{flo_08_0_header.c => settings.c}  |    0
 .../flo_08/{flo_08_6_vines.c => vines.c}      |    0
 .../flo_09/{flo_09_4_foliage.c => foliage.c}  |    0
 .../flo_09/{flo_09_2_main.c => main.c}        |    0
 .../flo_09/{flo_09_1_music.c => music.c}      |    0
 .../area_flo/flo_09/{flo_09_5_npc.c => npc.c} |    0
 .../flo_09/{flo_09_0_header.c => settings.c}  |    0
 .../flo_09/{flo_09_3_vines.c => vines.c}      |    0
 .../flo_10/{flo_10_2_entity.c => entity.c}    |    0
 .../flo_10/{flo_10_7_foliage.c => foliage.c}  |    0
 .../{flo_10_4_fountain.c => fountain.c}       |    0
 .../flo_10/{flo_10_3_main.c => main.c}        |    0
 .../flo_10/{flo_10_1_music.c => music.c}      |    0
 .../area_flo/flo_10/{flo_10_5_npc.c => npc.c} |    0
 .../flo_10/{flo_10_0_header.c => settings.c}  |    0
 .../flo_10/{flo_10_6_waterfx.c => waterfx.c}  |    0
 .../flo_11/{flo_11_4_entity.c => entity.c}    |    0
 .../flo_11/{flo_11_2_main.c => main.c}        |    0
 .../flo_11/{flo_11_1_music.c => music.c}      |    0
 .../area_flo/flo_11/{flo_11_3_npc.c => npc.c} |    0
 .../flo_11/{flo_11_0_header.c => settings.c}  |    0
 .../flo_12/{flo_12_2_main.c => main.c}        |    0
 .../flo_12/{flo_12_1_music.c => music.c}      |    0
 .../area_flo/flo_12/{flo_12_3_npc.c => npc.c} |    0
 .../flo_12/{flo_12_0_header.c => settings.c}  |    0
 .../flo_13/{flo_13_2_entity.c => entity.c}    |    0
 .../flo_13/{flo_13_3_main.c => main.c}        |    0
 .../flo_13/{flo_13_1_music.c => music.c}      |    0
 .../{flo_13_5_new_partner.c => new_partner.c} |    0
 .../area_flo/flo_13/{flo_13_4_npc.c => npc.c} |    0
 .../flo_13/{flo_13_0_header.c => settings.c}  |    0
 .../flo_14/{flo_14_3_bubbles.c => bubbles.c}  |    0
 .../flo_14/{flo_14_5_entity.c => entity.c}    |    0
 .../flo_14/{flo_14_6_logs.c => logs.c}        |    0
 .../flo_14/{flo_14_2_main.c => main.c}        |    0
 .../flo_14/{flo_14_1_music.c => music.c}      |    0
 .../area_flo/flo_14/{flo_14_4_npc.c => npc.c} |    0
 .../flo_14/{flo_14_0_header.c => settings.c}  |    0
 .../flo_15/{flo_15_4_entity.c => entity.c}    |    0
 .../flo_15/{flo_15_2_main.c => main.c}        |    0
 .../flo_15/{flo_15_1_music.c => music.c}      |    0
 .../area_flo/flo_15/{flo_15_3_npc.c => npc.c} |    0
 .../flo_15/{flo_15_0_header.c => settings.c}  |    0
 .../flo_15/{flo_15_5_stairs.c => stairs.c}    |    0
 .../flo_16/{flo_16_4_entity.c => entity.c}    |    0
 .../flo_16/{flo_16_2_main.c => main.c}        |    0
 .../flo_16/{flo_16_1_music.c => music.c}      |    0
 .../area_flo/flo_16/{flo_16_5_npc.c => npc.c} |    0
 .../flo_16/{flo_16_6_puzzle.c => puzzle.c}    |    0
 .../flo_16/{flo_16_0_header.c => settings.c}  |    0
 .../flo_16/{flo_16_3_vines.c => vines.c}      |    0
 .../flo_17/{flo_17_5_entity.c => entity.c}    |    0
 .../flo_17/{flo_17_3_logs.c => logs.c}        |    0
 .../flo_17/{flo_17_2_main.c => main.c}        |    0
 .../flo_17/{flo_17_1_music.c => music.c}      |    0
 .../area_flo/flo_17/{flo_17_4_npc.c => npc.c} |    0
 .../flo_17/{flo_17_0_header.c => settings.c}  |    0
 .../flo_18/{flo_18_5_foliage.c => foliage.c}  |    0
 .../flo_18/{flo_18_3_machine.c => machine.c}  |    0
 .../flo_18/{flo_18_2_main.c => main.c}        |    0
 .../flo_18/{flo_18_1_music.c => music.c}      |    0
 .../area_flo/flo_18/{flo_18_4_npc.c => npc.c} |    0
 .../flo_18/{flo_18_0_header.c => settings.c}  |    0
 .../{flo_19_5_beanstalk.c => beanstalk.c}     |    0
 .../flo_19/{flo_19_4_clouds.c => clouds.c}    |    0
 .../flo_19/{flo_19_2_entity.c => entity.c}    |    0
 .../flo_19/{flo_19_3_main.c => main.c}        |    0
 .../flo_19/{flo_19_1_music.c => music.c}      |    0
 .../flo_19/{flo_19_0_header.c => settings.c}  |    0
 .../flo_21/{flo_21_3_clouds.c => clouds.c}    |    0
 .../flo_21/{flo_21_2_main.c => main.c}        |    0
 .../flo_21/{flo_21_1_music.c => music.c}      |    0
 .../area_flo/flo_21/{flo_21_4_npc.c => npc.c} |    0
 .../flo_21/{flo_21_0_header.c => settings.c}  |    0
 .../flo_22/{flo_22_5_foliage.c => foliage.c}  |    0
 .../flo_22/{flo_22_2_main.c => main.c}        |    0
 .../flo_22/{flo_22_1_music.c => music.c}      |    0
 .../area_flo/flo_22/{flo_22_3_npc.c => npc.c} |    0
 .../flo_22/{flo_22_0_header.c => settings.c}  |    0
 .../flo_22/{flo_22_4_well.c => well.c}        |    0
 .../flo_23/{flo_23_4_entity.c => entity.c}    |    0
 .../flo_23/{flo_23_2_main.c => main.c}        |    0
 .../flo_23/{flo_23_1_music.c => music.c}      |    0
 .../area_flo/flo_23/{flo_23_3_npc.c => npc.c} |    0
 .../flo_23/{flo_23_0_header.c => settings.c}  |    0
 .../flo_24/{flo_24_5_entity.c => entity.c}    |    0
 .../flo_24/{flo_24_3_foliage.c => foliage.c}  |    0
 .../flo_24/{flo_24_2_main.c => main.c}        |    0
 .../flo_24/{flo_24_1_music.c => music.c}      |    0
 .../flo_24/{flo_24_0_header.c => settings.c}  |    0
 .../flo_24/{flo_24_4_water.c => water.c}      |    0
 .../flo_25/{flo_25_4_entity.c => entity.c}    |    0
 .../flo_25/{flo_25_5_foliage.c => foliage.c}  |    0
 .../flo_25/{flo_25_2_main.c => main.c}        |    0
 .../flo_25/{flo_25_1_music.c => music.c}      |    0
 .../area_flo/flo_25/{flo_25_3_npc.c => npc.c} |    0
 .../flo_25/{flo_25_0_header.c => settings.c}  |    0
 .../flo_25/{flo_25_6_vine.c => vine.c}        |    0
 .../area_gv/gv_01/{gv_01_1_main.c => main.c}  |    0
 .../gv_01/{gv_01_0_header.c => settings.c}    |    0
 .../hos_00/{hos_00_5_entity.c => entity.c}    |    0
 .../hos_00/{hos_00_2_main.c => main.c}        |    0
 .../hos_00/{hos_00_1_music.c => music.c}      |    0
 .../area_hos/hos_00/{hos_00_4_npc.c => npc.c} |    0
 .../hos_00/{hos_00_6_scenes.c => scenes.c}    |    0
 .../hos_00/{hos_00_0_header.c => settings.c}  |    0
 .../{hos_00_7_shade_gfx.c => shade_gfx.c}     |    0
 .../hos_00/{hos_00_3_unused.c => unused.c}    |    0
 .../hos_01/{hos_01_5_entity.c => entity.c}    |    0
 .../hos_01/{hos_01_2_main.c => main.c}        |    0
 .../{hos_01_3_model_fx.c => model_fx.c}       |    0
 .../hos_01/{hos_01_1_music.c => music.c}      |    0
 .../area_hos/hos_01/{hos_01_4_npc.c => npc.c} |    0
 .../hos_01/{hos_01_0_header.c => settings.c}  |    0
 .../{hos_01_6_star_way.c => star_way.c}       |    0
 .../hos_02/{hos_02_6_descent.c => descent.c}  |    0
 .../hos_02/{hos_02_2_main.c => main.c}        |    0
 .../{hos_02_3_model_fx.c => model_fx.c}       |    0
 .../hos_02/{hos_02_1_music.c => music.c}      |    0
 .../area_hos/hos_02/{hos_02_5_npc.c => npc.c} |    0
 .../hos_02/{hos_02_0_header.c => settings.c}  |    0
 .../hos_02/{hos_02_4_unused.c => unused.c}    |    0
 .../hos_03/{hos_03_8_entity.c => entity.c}    |    0
 .../hos_03/{hos_03_5_foliage.c => foliage.c}  |    0
 .../hos_03/{hos_03_2_main.c => main.c}        |    0
 .../{hos_03_3_model_fx.c => model_fx.c}       |    0
 .../hos_03/{hos_03_1_music.c => music.c}      |    0
 .../area_hos/hos_03/{hos_03_6_npc.c => npc.c} |    0
 .../hos_03/{hos_03_4_rooms.c => rooms.c}      |    0
 .../hos_03/{hos_03_0_header.c => settings.c}  |    0
 .../hos_03/{hos_03_7_shop.c => shop.c}        |    0
 .../{hos_04_3_fountains.c => fountains.c}     |    0
 .../hos_04/{hos_04_6_intro.c => intro.c}      |    0
 .../hos_04/{hos_04_2_main.c => main.c}        |    0
 .../hos_04/{hos_04_1_music.c => music.c}      |    0
 .../{hos_04_8_narrator.c => narrator.c}       |    0
 .../hos_04/{hos_04_0_header.c => settings.c}  |    0
 .../{hos_04_7_starship.c => starship.c}       |    0
 .../hos_04/{hos_04_4_unused.c => unused.c}    |    0
 .../hos_05/{hos_05_5_intro.c => intro.c}      |    0
 .../hos_05/{hos_05_2_main.c => main.c}        |    0
 .../hos_05/{hos_05_3_misc.c => misc.c}        |    0
 .../{hos_05_7_model_fx.c => model_fx.c}       |    0
 .../hos_05/{hos_05_1_music.c => music.c}      |    0
 .../{hos_05_6_narrator.c => narrator.c}       |    0
 .../area_hos/hos_05/{hos_05_4_npc.c => npc.c} |    0
 .../hos_05/{hos_05_0_header.c => settings.c}  |    0
 .../{hos_05_8_star_ship.c => star_ship.c}     |    0
 .../hos_06/{hos_06_6_chest.c => chest.c}      |    0
 .../hos_06/{hos_06_1_entity.c => entity.c}    |    0
 .../hos_06/{hos_06_2_main.c => main.c}        |    0
 .../hos_06/{hos_06_3_merlow.c => merlow.c}    |    0
 .../{hos_06_5_merluvlee.c => merluvlee.c}     |    0
 .../hos_06/{hos_06_4_rooms.c => rooms.c}      |    0
 .../hos_06/{hos_06_0_header.c => settings.c}  |    0
 .../hos_10/{hos_10_7_ending.c => ending.c}    |    0
 .../hos_10/{hos_10_5_intro.c => intro.c}      |    0
 .../hos_10/{hos_10_4_main.c => main.c}        |    0
 .../hos_10/{hos_10_1_music.c => music.c}      |    0
 .../hos_10/{hos_10_2_npc1.c => npc1.c}        |    0
 .../hos_10/{hos_10_3_npc2.c => npc2.c}        |    0
 .../{hos_10_6_pre_title.c => pre_title.c}     |    0
 .../hos_10/{hos_10_0_header.c => settings.c}  |    0
 .../hos_20/{hos_20_1_main.c => main.c}        |    0
 .../hos_20/{hos_20_0_header.c => settings.c}  |    0
 .../{hos_20_2_starship.c => starship.c}       |    0
 .../isk_01/{isk_01_4_entity.c => entity.c}    |    0
 .../isk_01/{isk_01_3_haze.c => haze.c}        |    0
 .../isk_01/{isk_01_2_main.c => main.c}        |    0
 .../isk_01/{isk_01_1_music.c => music.c}      |    0
 .../isk_01/{isk_01_0_header.c => settings.c}  |    0
 .../isk_02/{isk_02_3_ambush.c => ambush.c}    |    0
 .../isk_02/{isk_02_4_entity.c => entity.c}    |    0
 .../isk_02/{isk_02_2_lock.c => lock.c}        |    0
 .../isk_02/{isk_02_1_main.c => main.c}        |    0
 .../area_isk/isk_02/{isk_02_5_npc.c => npc.c} |    0
 .../isk_02/{isk_02_0_header.c => settings.c}  |    0
 .../isk_03/{isk_03_3_entity.c => entity.c}    |    0
 .../isk_03/{isk_03_1_main.c => main.c}        |    0
 .../isk_03/{isk_03_2_sand.c => sand.c}        |    0
 .../isk_03/{isk_03_0_header.c => settings.c}  |    0
 .../isk_03/{isk_03_4_switch.c => switch.c}    |    0
 .../isk_04/{isk_04_6_demo.c => demo.c}        |    0
 .../isk_04/{isk_04_4_entity.c => entity.c}    |    0
 .../isk_04/{isk_04_2_main.c => main.c}        |    0
 .../isk_04/{isk_04_1_music.c => music.c}      |    0
 .../area_isk/isk_04/{isk_04_5_npc.c => npc.c} |    0
 ...isk_04_3_obstructions.c => obstructions.c} |    0
 .../isk_04/{isk_04_0_header.c => settings.c}  |    0
 .../isk_05/{isk_05_2_entity.c => entity.c}    |    0
 .../isk_05/{isk_05_1_main.c => main.c}        |    0
 .../area_isk/isk_05/{isk_05_3_npc.c => npc.c} |    0
 .../isk_05/{isk_05_0_header.c => settings.c}  |    0
 .../isk_06/{isk_06_2_entity.c => entity.c}    |    0
 .../isk_06/{isk_06_1_main.c => main.c}        |    0
 .../isk_06/{isk_06_3_sand.c => sand.c}        |    0
 .../isk_06/{isk_06_0_header.c => settings.c}  |    0
 .../isk_06/{isk_06_4_switch.c => switch.c}    |    0
 .../isk_07/{isk_07_7_ambush.c => ambush.c}    |    0
 .../isk_07/{isk_07_2_entity.c => entity.c}    |    0
 .../isk_07/{isk_07_5_lock.c => lock.c}        |    0
 .../isk_07/{isk_07_1_main.c => main.c}        |    0
 .../area_isk/isk_07/{isk_07_3_npc.c => npc.c} |    0
 .../isk_07/{isk_07_0_header.c => settings.c}  |    0
 .../isk_07/{isk_07_4_stairs.c => stairs.c}    |    0
 .../isk_07/{isk_07_6_switch.c => switch.c}    |    0
 .../isk_08/{isk_08_3_entity.c => entity.c}    |    0
 .../isk_08/{isk_08_1_main.c => main.c}        |    0
 .../area_isk/isk_08/{isk_08_2_npc.c => npc.c} |    0
 .../isk_08/{isk_08_0_header.c => settings.c}  |    0
 .../isk_09/{isk_09_3_entity.c => entity.c}    |    0
 .../isk_09/{isk_09_2_main.c => main.c}        |    0
 .../isk_09/{isk_09_1_music.c => music.c}      |    0
 .../isk_09/{isk_09_0_header.c => settings.c}  |    0
 .../isk_09/{isk_09_4_stairs.c => stairs.c}    |    0
 .../isk_09/{isk_09_5_switch.c => switch.c}    |    0
 .../{isk_10_3_bombable.c => bombable.c}       |    0
 .../isk_10/{isk_10_2_entity.c => entity.c}    |    0
 .../isk_10/{isk_10_1_main.c => main.c}        |    0
 .../isk_10/{isk_10_0_header.c => settings.c}  |    0
 .../isk_11/{isk_11_3_entity.c => entity.c}    |    0
 .../isk_11/{isk_11_6_lock.c => lock.c}        |    0
 .../isk_11/{isk_11_2_main.c => main.c}        |    0
 .../isk_11/{isk_11_1_music.c => music.c}      |    0
 .../isk_11/{isk_11_5_puzzle.c => puzzle.c}    |    0
 .../isk_11/{isk_11_4_scene.c => scene.c}      |    0
 .../isk_11/{isk_11_0_header.c => settings.c}  |    0
 .../isk_12/{isk_12_2_entity.c => entity.c}    |    0
 .../isk_12/{isk_12_1_main.c => main.c}        |    0
 .../isk_12/{isk_12_3_sand.c => sand.c}        |    0
 .../isk_12/{isk_12_0_header.c => settings.c}  |    0
 .../isk_12/{isk_12_4_switch.c => switch.c}    |    0
 .../isk_13/{isk_13_2_entity.c => entity.c}    |    0
 .../isk_13/{isk_13_1_main.c => main.c}        |    0
 .../area_isk/isk_13/{isk_13_3_npc.c => npc.c} |    0
 .../isk_13/{isk_13_0_header.c => settings.c}  |    0
 .../isk_14/{isk_14_2_entity.c => entity.c}    |    0
 .../isk_14/{isk_14_1_main.c => main.c}        |    0
 .../area_isk/isk_14/{isk_14_3_npc.c => npc.c} |    0
 .../isk_14/{isk_14_0_header.c => settings.c}  |    0
 .../isk_16/{isk_16_3_boss.c => boss.c}        |    0
 .../isk_16/{isk_16_4_entity.c => entity.c}    |    0
 .../isk_16/{isk_16_1_main.c => main.c}        |    0
 .../area_isk/isk_16/{isk_16_2_npc.c => npc.c} |    0
 .../isk_16/{isk_16_0_header.c => settings.c}  |    0
 .../isk_18/{isk_18_3_entity.c => entity.c}    |    0
 .../isk_18/{isk_18_1_main.c => main.c}        |    0
 .../area_isk/isk_18/{isk_18_2_npc.c => npc.c} |    0
 .../isk_18/{isk_18_0_header.c => settings.c}  |    0
 .../isk_19/{isk_19_3_entity.c => entity.c}    |    0
 .../isk_19/{isk_19_2_main.c => main.c}        |    0
 .../isk_19/{isk_19_1_music.c => music.c}      |    0
 .../isk_19/{isk_19_0_header.c => settings.c}  |    0
 .../iwa_00/{iwa_00_2_entity.c => entity.c}    |    0
 .../iwa_00/{iwa_00_1_main.c => main.c}        |    0
 .../area_iwa/iwa_00/{iwa_00_3_npc.c => npc.c} |    0
 .../iwa_00/{iwa_00_0_header.c => settings.c}  |    0
 .../iwa_00/{iwa_00_4_slide.c => slide.c}      |    0
 .../iwa_01/{iwa_01_2_entity.c => entity.c}    |    0
 .../iwa_01/{iwa_01_1_main.c => main.c}        |    0
 .../area_iwa/iwa_01/{iwa_01_4_npc.c => npc.c} |    0
 .../iwa_01/{iwa_01_0_header.c => settings.c}  |    0
 .../iwa_01/{iwa_01_5_slide.c => slide.c}      |    0
 .../iwa_01/{iwa_01_3_splash.c => splash.c}    |    0
 .../iwa_02/{iwa_02_2_entity.c => entity.c}    |    0
 .../iwa_02/{iwa_02_1_main.c => main.c}        |    0
 .../area_iwa/iwa_02/{iwa_02_3_npc.c => npc.c} |    0
 .../iwa_02/{iwa_02_0_header.c => settings.c}  |    0
 .../iwa_03/{iwa_03_2_entity.c => entity.c}    |    0
 .../iwa_03/{iwa_03_1_main.c => main.c}        |    0
 .../area_iwa/iwa_03/{iwa_03_3_npc.c => npc.c} |    0
 .../iwa_03/{iwa_03_0_header.c => settings.c}  |    0
 .../iwa_03/{iwa_03_4_slide.c => slide.c}      |    0
 .../iwa_04/{iwa_04_3_entity.c => entity.c}    |    0
 .../iwa_04/{iwa_04_2_main.c => main.c}        |    0
 .../iwa_04/{iwa_04_1_music.c => music.c}      |    0
 .../area_iwa/iwa_04/{iwa_04_4_npc.c => npc.c} |    0
 .../iwa_04/{iwa_04_0_header.c => settings.c}  |    0
 .../iwa_10/{iwa_10_5_entity.c => entity.c}    |    0
 .../iwa_10/{iwa_10_8_foliage.c => foliage.c}  |    0
 .../iwa_10/{iwa_10_2_main.c => main.c}        |    0
 .../iwa_10/{iwa_10_1_music.c => music.c}      |    0
 .../{iwa_10_7_new_partner.c => new_partner.c} |    0
 .../area_iwa/iwa_10/{iwa_10_3_npc.c => npc.c} |    0
 .../{iwa_10_6_parakarry.c => parakarry.c}     |    0
 .../iwa_10/{iwa_10_0_header.c => settings.c}  |    0
 .../iwa_10/{iwa_10_4_train.c => train.c}      |    0
 .../iwa_11/{iwa_11_2_main.c => main.c}        |    0
 .../iwa_11/{iwa_11_1_music.c => music.c}      |    0
 .../area_iwa/iwa_11/{iwa_11_5_npc.c => npc.c} |    0
 .../iwa_11/{iwa_11_4_scenery.c => scenery.c}  |    0
 .../iwa_11/{iwa_11_0_header.c => settings.c}  |    0
 .../iwa_11/{iwa_11_3_train.c => train.c}      |    0
 .../jan_00/{jan_00_3_entity.c => entity.c}    |    0
 .../jan_00/{jan_00_5_foliage.c => foliage.c}  |    0
 .../jan_00/{jan_00_1_main.c => main.c}        |    0
 .../area_jan/jan_00/{jan_00_2_npc.c => npc.c} |    0
 .../jan_00/{jan_00_0_header.c => settings.c}  |    0
 .../jan_00/{jan_00_4_whale.c => whale.c}      |    0
 .../jan_01/{jan_01_4_entity.c => entity.c}    |    0
 .../jan_01/{jan_01_5_foliage.c => foliage.c}  |    0
 .../jan_01/{jan_01_2_main.c => main.c}        |    0
 .../jan_01/{jan_01_1_music.c => music.c}      |    0
 .../area_jan/jan_01/{jan_01_3_npc.c => npc.c} |    0
 .../jan_01/{jan_01_0_header.c => settings.c}  |    0
 .../jan_02/{jan_02_4_entity.c => entity.c}    |    0
 .../jan_02/{jan_02_5_foliage.c => foliage.c}  |    0
 .../jan_02/{jan_02_2_main.c => main.c}        |    0
 .../jan_02/{jan_02_1_music.c => music.c}      |    0
 .../area_jan/jan_02/{jan_02_3_npc.c => npc.c} |    0
 .../jan_02/{jan_02_0_header.c => settings.c}  |    0
 .../jan_03/{jan_03_5_entity.c => entity.c}    |    0
 .../jan_03/{jan_03_7_foliage.c => foliage.c}  |    0
 .../jan_03/{jan_03_2_main.c => main.c}        |    0
 .../jan_03/{jan_03_1_music.c => music.c}      |    0
 .../area_jan/jan_03/{jan_03_4_npc.c => npc.c} |    0
 .../jan_03/{jan_03_6_rooms.c => rooms.c}      |    0
 .../jan_03/{jan_03_0_header.c => settings.c}  |    0
 .../jan_03/{jan_03_3_shop.c => shop.c}        |    0
 .../jan_04/{jan_04_9_bushes.c => bushes.c}    |    0
 .../jan_04/{jan_04_10_demo.c => demo.c}       |    0
 .../jan_04/{jan_04_3_entity.c => entity.c}    |    0
 .../jan_04/{jan_04_2_main.c => main.c}        |    0
 .../jan_04/{jan_04_1_music.c => music.c}      |    0
 .../area_jan/jan_04/{jan_04_4_npc.c => npc.c} |    0
 .../jan_04/{jan_04_7_scenes.c => scenes.c}    |    0
 .../jan_04/{jan_04_0_header.c => settings.c}  |    0
 .../{jan_04_8_treasure.c => treasure.c}       |    0
 .../jan_04/{jan_04_6_trees.c => trees.c}      |    0
 .../jan_04/{jan_04_5_unused.c => unused.c}    |    0
 .../jan_05/{jan_05_4_bushes.c => bushes.c}    |    0
 .../jan_05/{jan_05_7_entity.c => entity.c}    |    0
 .../area_jan/jan_05/{jan_05_3_log.c => log.c} |    0
 .../jan_05/{jan_05_2_main.c => main.c}        |    0
 .../jan_05/{jan_05_1_music.c => music.c}      |    0
 .../area_jan/jan_05/{jan_05_5_npc.c => npc.c} |    0
 .../jan_05/{jan_05_0_header.c => settings.c}  |    0
 .../jan_05/{jan_05_6_trees.c => trees.c}      |    0
 .../jan_06/{jan_06_7_bushes.c => bushes.c}    |    0
 .../jan_06/{jan_06_5_entity.c => entity.c}    |    0
 .../area_jan/jan_06/{jan_06_3_log.c => log.c} |    0
 .../jan_06/{jan_06_1_main.c => main.c}        |    0
 .../area_jan/jan_06/{jan_06_6_npc.c => npc.c} |    0
 .../jan_06/{jan_06_0_header.c => settings.c}  |    0
 .../jan_06/{jan_06_2_statue.c => statue.c}    |    0
 .../jan_06/{jan_06_4_trees.c => trees.c}      |    0
 .../jan_07/{jan_07_5_bushes.c => bushes.c}    |    0
 .../jan_07/{jan_07_2_main.c => main.c}        |    0
 .../jan_07/{jan_07_1_music.c => music.c}      |    0
 .../area_jan/jan_07/{jan_07_3_npc.c => npc.c} |    0
 .../jan_07/{jan_07_0_header.c => settings.c}  |    0
 .../jan_07/{jan_07_4_trees.c => trees.c}      |    0
 .../jan_08/{jan_08_3_bushes.c => bushes.c}    |    0
 .../jan_08/{jan_08_4_entity.c => entity.c}    |    0
 .../jan_08/{jan_08_2_main.c => main.c}        |    0
 .../jan_08/{jan_08_1_music.c => music.c}      |    0
 .../area_jan/jan_08/{jan_08_5_npc.c => npc.c} |    0
 .../jan_08/{jan_08_0_header.c => settings.c}  |    0
 .../jan_08/{jan_08_6_trees.c => trees.c}      |    0
 .../jan_09/{jan_09_2_bushes.c => bushes.c}    |    0
 .../jan_09/{jan_09_5_entity.c => entity.c}    |    0
 .../jan_09/{jan_09_1_main.c => main.c}        |    0
 .../area_jan/jan_09/{jan_09_3_npc.c => npc.c} |    0
 .../jan_09/{jan_09_0_header.c => settings.c}  |    0
 .../jan_09/{jan_09_4_trees.c => trees.c}      |    0
 .../jan_10/{jan_10_6_bushes.c => bushes.c}    |    0
 .../jan_10/{jan_10_7_entity.c => entity.c}    |    0
 .../area_jan/jan_10/{jan_10_4_log.c => log.c} |    0
 .../jan_10/{jan_10_2_main.c => main.c}        |    0
 .../jan_10/{jan_10_1_music.c => music.c}      |    0
 .../area_jan/jan_10/{jan_10_3_npc.c => npc.c} |    0
 .../jan_10/{jan_10_0_header.c => settings.c}  |    0
 .../jan_10/{jan_10_5_trees.c => trees.c}      |    0
 .../jan_11/{jan_11_2_main.c => main.c}        |    0
 .../jan_11/{jan_11_1_music.c => music.c}      |    0
 .../area_jan/jan_11/{jan_11_3_npc.c => npc.c} |    0
 .../jan_11/{jan_11_0_header.c => settings.c}  |    0
 .../jan_12/{jan_12_4_entity.c => entity.c}    |    0
 .../jan_12/{jan_12_1_main.c => main.c}        |    0
 .../area_jan/jan_12/{jan_12_5_npc.c => npc.c} |    0
 .../jan_12/{jan_12_0_header.c => settings.c}  |    0
 .../jan_12/{jan_12_3_trees.c => trees.c}      |    0
 .../jan_12/{jan_12_2_vines.c => vines.c}      |    0
 .../jan_13/{jan_13_4_entity.c => entity.c}    |    0
 .../jan_13/{jan_13_1_main.c => main.c}        |    0
 .../jan_13/{jan_13_2_puzzle.c => puzzle.c}    |    0
 .../jan_13/{jan_13_0_header.c => settings.c}  |    0
 .../jan_13/{jan_13_3_trees.c => trees.c}      |    0
 .../jan_14/{jan_14_1_main.c => main.c}        |    0
 .../area_jan/jan_14/{jan_14_4_npc.c => npc.c} |    0
 .../jan_14/{jan_14_0_header.c => settings.c}  |    0
 .../jan_14/{jan_14_3_trees.c => trees.c}      |    0
 .../jan_14/{jan_14_2_vines.c => vines.c}      |    0
 .../jan_15/{jan_15_4_entity.c => entity.c}    |    0
 .../jan_15/{jan_15_1_main.c => main.c}        |    0
 .../area_jan/jan_15/{jan_15_2_npc.c => npc.c} |    0
 .../jan_15/{jan_15_0_header.c => settings.c}  |    0
 .../jan_15/{jan_15_3_trees.c => trees.c}      |    0
 .../jan_16/{jan_16_5_bushes.c => bushes.c}    |    0
 .../jan_16/{jan_16_4_entity.c => entity.c}    |    0
 .../jan_16/{jan_16_2_main.c => main.c}        |    0
 .../jan_16/{jan_16_1_music.c => music.c}      |    0
 .../area_jan/jan_16/{jan_16_3_npc.c => npc.c} |    0
 .../jan_16/{jan_16_0_header.c => settings.c}  |    0
 .../jan_17/{jan_17_3_entity.c => entity.c}    |    0
 .../jan_17/{jan_17_2_main.c => main.c}        |    0
 .../jan_17/{jan_17_1_music.c => music.c}      |    0
 .../jan_17/{jan_17_0_header.c => settings.c}  |    0
 .../jan_18/{jan_18_3_entity.c => entity.c}    |    0
 .../jan_18/{jan_18_2_main.c => main.c}        |    0
 .../jan_18/{jan_18_1_music.c => music.c}      |    0
 .../jan_18/{jan_18_0_header.c => settings.c}  |    0
 .../jan_19/{jan_19_3_entity.c => entity.c}    |    0
 .../jan_19/{jan_19_2_main.c => main.c}        |    0
 .../jan_19/{jan_19_1_music.c => music.c}      |    0
 .../jan_19/{jan_19_0_header.c => settings.c}  |    0
 .../jan_22/{jan_22_6_bushes.c => bushes.c}    |    0
 .../jan_22/{jan_22_4_entity.c => entity.c}    |    0
 .../jan_22/{jan_22_2_main.c => main.c}        |    0
 .../jan_22/{jan_22_1_music.c => music.c}      |    0
 .../area_jan/jan_22/{jan_22_3_npc.c => npc.c} |    0
 .../jan_22/{jan_22_0_header.c => settings.c}  |    0
 .../jan_22/{jan_22_7_trees.c => trees.c}      |    0
 .../jan_22/{jan_22_5_zipline.c => zipline.c}  |    0
 .../jan_23/{jan_23_2_main.c => main.c}        |    0
 .../jan_23/{jan_23_1_music.c => music.c}      |    0
 .../area_jan/jan_23/{jan_23_3_npc.c => npc.c} |    0
 .../jan_23/{jan_23_0_header.c => settings.c}  |    0
 .../kgr_01/{kgr_01_3_extra.c => extra.c}      |    0
 .../kgr_01/{kgr_01_1_main.c => main.c}        |    0
 .../kgr_01/{kgr_01_2_wiggle.c => wiggle.c}    |    0
 .../kgr_02/{kgr_02_4_extra.c => extra.c}      |    0
 .../kgr_02/{kgr_02_1_main.c => main.c}        |    0
 .../area_kgr/kgr_02/{kgr_02_3_npc.c => npc.c} |    0
 .../kgr_02/{kgr_02_2_unused.c => unused.c}    |    0
 .../kkj_00/{kkj_00_2_main.c => main.c}        |    0
 .../kkj_00/{kkj_00_1_music.c => music.c}      |    0
 .../{kkj_00_5_npc_ending.c => npc_ending.c}   |    0
 .../{kkj_00_3_npc_intro.c => npc_intro.c}     |    0
 ...kkj_00_6_scene_ending.c => scene_ending.c} |    0
 .../{kkj_00_4_scene_intro.c => scene_intro.c} |    0
 .../kkj_00/{kkj_00_0_header.c => settings.c}  |    0
 .../kkj_01/{kkj_01_2_main.c => main.c}        |    0
 .../kkj_01/{kkj_01_1_music.c => music.c}      |    0
 .../area_kkj/kkj_01/{kkj_01_3_npc.c => npc.c} |    0
 .../kkj_01/{kkj_01_0_header.c => settings.c}  |    0
 .../kkj_02/{kkj_02_2_main.c => main.c}        |    0
 .../kkj_02/{kkj_02_1_music.c => music.c}      |    0
 .../area_kkj/kkj_02/{kkj_02_3_npc.c => npc.c} |    0
 .../kkj_02/{kkj_02_0_header.c => settings.c}  |    0
 .../kkj_03/{kkj_03_2_main.c => main.c}        |    0
 .../kkj_03/{kkj_03_1_music.c => music.c}      |    0
 .../area_kkj/kkj_03/{kkj_03_3_npc.c => npc.c} |    0
 .../kkj_03/{kkj_03_4_scenes.c => scenes.c}    |    0
 .../kkj_03/{kkj_03_0_header.c => settings.c}  |    0
 .../kkj_10/{kkj_10_2_entity.c => entity.c}    |    0
 .../kkj_10/{kkj_10_1_main.c => main.c}        |    0
 .../{kkj_10_3_npcs_early.c => npcs_early.c}   |    0
 .../{kkj_10_4_npcs_later.c => npcs_later.c}   |    0
 .../kkj_10/{kkj_10_0_header.c => settings.c}  |    0
 .../kkj_11/{kkj_11_4_demo.c => demo.c}        |    0
 .../kkj_11/{kkj_11_2_entity.c => entity.c}    |    0
 .../kkj_11/{kkj_11_1_main.c => main.c}        |    0
 .../{kkj_11_5_npcs_early.c => npcs_early.c}   |    0
 .../{kkj_11_6_npcs_later.c => npcs_later.c}   |    0
 .../kkj_11/{kkj_11_3_scene.c => scene.c}      |    0
 .../kkj_11/{kkj_11_0_header.c => settings.c}  |    0
 .../kkj_12/{kkj_12_1_main.c => main.c}        |    0
 .../area_kkj/kkj_12/{kkj_12_2_npc.c => npc.c} |    0
 .../kkj_12/{kkj_12_0_header.c => settings.c}  |    0
 ...kkj_13_5_intro_scenes.c => intro_scenes.c} |    0
 .../kkj_13/{kkj_13_2_main.c => main.c}        |    0
 .../kkj_13/{kkj_13_1_music.c => music.c}      |    0
 .../{kkj_13_3_npcs_finale.c => npcs_finale.c} |    0
 .../{kkj_13_4_npcs_intro.c => npcs_intro.c}   |    0
 .../kkj_13/{kkj_13_0_header.c => settings.c}  |    0
 .../{kkj_14_8_chapter0.c => chapter0.c}       |    0
 .../{kkj_14_9_chapter1.c => chapter1.c}       |    0
 .../{kkj_14_10_chapter2.c => chapter2.c}      |    0
 .../{kkj_14_11_chapter3.c => chapter3.c}      |    0
 .../{kkj_14_12_chapter4.c => chapter4.c}      |    0
 .../{kkj_14_13_chapter5.c => chapter5.c}      |    0
 .../{kkj_14_14_chapter6.c => chapter6.c}      |    0
 .../{kkj_14_15_chapter7.c => chapter7.c}      |    0
 ...j_14_3_interactables.c => interactables.c} |    0
 .../kkj_14/{kkj_14_2_main.c => main.c}        |    0
 .../kkj_14/{kkj_14_1_music.c => music.c}      |    0
 .../kkj_14/{kkj_14_5_npc_ch0.c => npc_ch0.c}  |    0
 .../kkj_14/{kkj_14_6_npc_ch2.c => npc_ch2.c}  |    0
 .../kkj_14/{kkj_14_7_npc_ch7.c => npc_ch7.c}  |    0
 .../{kkj_14_4_npc_guards.c => npc_guards.c}   |    0
 .../kkj_14/{kkj_14_0_header.c => settings.c}  |    0
 .../{kkj_15_4_chapter0.c => chapter0.c}       |    0
 .../{kkj_15_5_chapter1.c => chapter1.c}       |    0
 .../{kkj_15_6_chapter2.c => chapter2.c}       |    0
 .../{kkj_15_7_chapter3.c => chapter3.c}       |    0
 .../kkj_15/{kkj_15_2_main.c => main.c}        |    0
 .../kkj_15/{kkj_15_1_music.c => music.c}      |    0
 ...kkj_15_8_npc_chapter0.c => npc_chapter0.c} |    0
 ...kkj_15_9_npc_chapter1.c => npc_chapter1.c} |    0
 ...kj_15_10_npc_chapter3.c => npc_chapter3.c} |    0
 ...j_15_3_rotating_wall.c => rotating_wall.c} |    0
 .../kkj_15/{kkj_15_0_header.c => settings.c}  |    0
 .../kkj_16/{kkj_16_5_entity.c => entity.c}    |    0
 .../kkj_16/{kkj_16_1_main.c => main.c}        |    0
 .../{kkj_16_2_npcs_early.c => npcs_early.c}   |    0
 .../{kkj_16_3_npcs_later.c => npcs_later.c}   |    0
 .../kkj_16/{kkj_16_0_header.c => settings.c}  |    0
 .../kkj_16/{kkj_16_4_stealth.c => stealth.c}  |    0
 .../kkj_17/{kkj_17_3_chest.c => chest.c}      |    0
 .../kkj_17/{kkj_17_2_entity.c => entity.c}    |    0
 .../kkj_17/{kkj_17_1_main.c => main.c}        |    0
 .../kkj_17/{kkj_17_0_header.c => settings.c}  |    0
 .../kkj_18/{kkj_18_4_gourmet.c => gourmet.c}  |    0
 .../kkj_18/{kkj_18_2_main.c => main.c}        |    0
 .../kkj_18/{kkj_18_1_music.c => music.c}      |    0
 .../area_kkj/kkj_18/{kkj_18_3_npc.c => npc.c} |    0
 .../kkj_18/{kkj_18_0_header.c => settings.c}  |    0
 .../kkj_19/{kkj_19_5_baking.c => baking.c}    |    0
 .../kkj_19/{kkj_19_2_main.c => main.c}        |    0
 .../kkj_19/{kkj_19_1_music.c => music.c}      |    0
 .../{kkj_19_3_npcs_intro.c => npcs_intro.c}   |    0
 .../{kkj_19_4_npcs_peach.c => npcs_peach.c}   |    0
 .../kkj_19/{kkj_19_0_header.c => settings.c}  |    0
 .../kkj_20/{kkj_20_3_entity.c => entity.c}    |    0
 .../kkj_20/{kkj_20_2_main.c => main.c}        |    0
 .../kkj_20/{kkj_20_1_music.c => music.c}      |    0
 .../area_kkj/kkj_20/{kkj_20_4_npc.c => npc.c} |    0
 .../kkj_20/{kkj_20_0_header.c => settings.c}  |    0
 .../kkj_21/{kkj_21_1_main.c => main.c}        |    0
 .../kkj_21/{kkj_21_0_header.c => settings.c}  |    0
 .../kkj_22/{kkj_22_2_main.c => main.c}        |    0
 .../kkj_22/{kkj_22_1_music.c => music.c}      |    0
 .../kkj_22/{kkj_22_0_header.c => settings.c}  |    0
 .../kkj_23/{kkj_23_2_main.c => main.c}        |    0
 .../kkj_23/{kkj_23_1_music.c => music.c}      |    0
 .../{kkj_23_3_npcs_finale.c => npcs_finale.c} |    0
 .../{kkj_23_4_npcs_peach.c => npcs_peach.c}   |    0
 .../kkj_23/{kkj_23_5_scene.c => scene.c}      |    0
 .../kkj_23/{kkj_23_0_header.c => settings.c}  |    0
 .../kkj_24/{kkj_24_3_entity.c => entity.c}    |    0
 .../kkj_24/{kkj_24_2_main.c => main.c}        |    0
 .../kkj_24/{kkj_24_1_music.c => music.c}      |    0
 .../kkj_24/{kkj_24_0_header.c => settings.c}  |    0
 .../kkj_25/{kkj_25_5_arena.c => arena.c}      |    0
 ..._8_bowser_defeated.c => bowser_defeated.c} |    0
 .../kkj_25/{kkj_25_9_entity.c => entity.c}    |    0
 ...25_7_kammy_defeated.c => kammy_defeated.c} |    0
 .../kkj_25/{kkj_25_1_main.c => main.c}        |    0
 .../{kkj_25_4_npc_final.c => npc_final.c}     |    0
 .../{kkj_25_2_npc_initial.c => npc_initial.c} |    0
 ...kkj_25_3_npc_midpoint.c => npc_midpoint.c} |    0
 .../{kkj_25_6_peach_free.c => peach_free.c}   |    0
 .../kkj_25/{kkj_25_0_header.c => settings.c}  |    0
 .../kkj_26/{kkj_26_3_demo.c => demo.c}        |    0
 .../kkj_26/{kkj_26_1_main.c => main.c}        |    0
 .../kkj_26/{kkj_26_2_scenes.c => scenes.c}    |    0
 .../kkj_26/{kkj_26_0_header.c => settings.c}  |    0
 .../kkj_27/{kkj_27_2_main.c => main.c}        |    0
 .../kkj_27/{kkj_27_1_music.c => music.c}      |    0
 ...j_27_3_rotating_wall.c => rotating_wall.c} |    0
 .../kkj_27/{kkj_27_0_header.c => settings.c}  |    0
 .../kkj_28/{kkj_28_1_main.c => main.c}        |    0
 .../kkj_28/{kkj_28_0_header.c => settings.c}  |    0
 .../kkj_29/{kkj_29_1_main.c => main.c}        |    0
 .../area_kkj/kkj_29/{kkj_29_2_npc.c => npc.c} |    0
 .../kkj_29/{kkj_29_3_quiz.c => quiz.c}        |    0
 .../kkj_29/{kkj_29_0_header.c => settings.c}  |    0
 .../kmr_00/{kmr_00_5_entity.c => entity.c}    |    0
 .../kmr_00/{kmr_00_2_main.c => main.c}        |    0
 .../kmr_00/{kmr_00_1_music.c => music.c}      |    0
 .../area_kmr/kmr_00/{kmr_00_4_npc.c => npc.c} |    0
 .../kmr_00/{kmr_00_3_revival.c => revival.c}  |    0
 .../kmr_00/{kmr_00_0_header.c => settings.c}  |    0
 .../kmr_02/{kmr_02_5_entity.c => entity.c}    |    0
 .../kmr_02/{kmr_02_8_foliage.c => foliage.c}  |    0
 .../kmr_02/{kmr_02_9_images.c => images.c}    |    0
 .../kmr_02/{kmr_02_7_kammy.c => kammy.c}      |    0
 .../kmr_02/{kmr_02_2_main.c => main.c}        |    0
 .../kmr_02/{kmr_02_1_music.c => music.c}      |    0
 .../area_kmr/kmr_02/{kmr_02_3_npc.c => npc.c} |    0
 .../kmr_02/{kmr_02_4_rooms_1.c => rooms_1.c}  |    0
 .../kmr_02/{kmr_02_6_rooms_2.c => rooms_2.c}  |    0
 .../kmr_02/{kmr_02_0_header.c => settings.c}  |    0
 .../kmr_03/{kmr_03_4_entity.c => entity.c}    |    0
 .../{kmr_03_6_fall_down.c => fall_down.c}     |    0
 .../kmr_03/{kmr_03_5_foliage.c => foliage.c}  |    0
 .../kmr_03/{kmr_03_2_main.c => main.c}        |    0
 .../kmr_03/{kmr_03_1_music.c => music.c}      |    0
 .../area_kmr/kmr_03/{kmr_03_3_npc.c => npc.c} |    0
 .../kmr_03/{kmr_03_0_header.c => settings.c}  |    0
 .../kmr_04/{kmr_04_4_entity.c => entity.c}    |    0
 .../kmr_04/{kmr_04_5_foliage.c => foliage.c}  |    0
 .../kmr_04/{kmr_04_2_main.c => main.c}        |    0
 .../kmr_04/{kmr_04_1_music.c => music.c}      |    0
 .../area_kmr/kmr_04/{kmr_04_3_npc.c => npc.c} |    0
 .../kmr_04/{kmr_04_0_header.c => settings.c}  |    0
 .../kmr_05/{kmr_05_4_entity.c => entity.c}    |    0
 .../kmr_05/{kmr_05_5_foliage.c => foliage.c}  |    0
 .../kmr_05/{kmr_05_2_main.c => main.c}        |    0
 .../kmr_05/{kmr_05_1_music.c => music.c}      |    0
 .../area_kmr/kmr_05/{kmr_05_3_npc.c => npc.c} |    0
 .../kmr_05/{kmr_05_0_header.c => settings.c}  |    0
 .../kmr_06/{kmr_06_4_entity.c => entity.c}    |    0
 .../kmr_06/{kmr_06_2_main.c => main.c}        |    0
 .../kmr_06/{kmr_06_1_music.c => music.c}      |    0
 .../area_kmr/kmr_06/{kmr_06_3_npc.c => npc.c} |    0
 .../kmr_06/{kmr_06_0_header.c => settings.c}  |    0
 ...kmr_06_5_sticker_sign.c => sticker_sign.c} |    0
 .../kmr_07/{kmr_07_4_entity.c => entity.c}    |    0
 .../kmr_07/{kmr_07_2_main.c => main.c}        |    0
 .../kmr_07/{kmr_07_1_music.c => music.c}      |    0
 .../area_kmr/kmr_07/{kmr_07_3_npc.c => npc.c} |    0
 .../kmr_07/{kmr_07_0_header.c => settings.c}  |    0
 .../kmr_09/{kmr_09_4_entity.c => entity.c}    |    0
 .../kmr_09/{kmr_09_2_main.c => main.c}        |    0
 .../kmr_09/{kmr_09_1_music.c => music.c}      |    0
 .../area_kmr/kmr_09/{kmr_09_3_npc.c => npc.c} |    0
 .../kmr_09/{kmr_09_0_header.c => settings.c}  |    0
 .../kmr_10/{kmr_10_4_entity.c => entity.c}    |    0
 .../kmr_10/{kmr_10_5_foliage.c => foliage.c}  |    0
 .../kmr_10/{kmr_10_2_main.c => main.c}        |    0
 .../kmr_10/{kmr_10_1_music.c => music.c}      |    0
 .../area_kmr/kmr_10/{kmr_10_3_npc.c => npc.c} |    0
 .../kmr_10/{kmr_10_0_header.c => settings.c}  |    0
 ..._bridge_animation.c => bridge_animation.c} |    0
 ...10_bridge_skeleton.c => bridge_skeleton.c} |    0
 .../kmr_11/{kmr_11_5_entity.c => entity.c}    |    0
 .../kmr_11/{kmr_11_7_foliage.c => foliage.c}  |    0
 ...tress_animation.c => fortress_animation.c} |    0
 ...ortress_skeleton.c => fortress_skeleton.c} |    0
 .../kmr_11/{kmr_11_6_kammy.c => kammy.c}      |    0
 .../kmr_11/{kmr_11_2_main.c => main.c}        |    0
 .../kmr_11/{kmr_11_1_music.c => music.c}      |    0
 .../area_kmr/kmr_11/{kmr_11_4_npc.c => npc.c} |    0
 .../kmr_11/{kmr_11_3_scenes.c => scenes.c}    |    0
 .../kmr_11/{kmr_11_0_header.c => settings.c}  |    0
 .../kmr_12/{kmr_12_4_entity.c => entity.c}    |    0
 .../kmr_12/{kmr_12_2_main.c => main.c}        |    0
 .../kmr_12/{kmr_12_1_music.c => music.c}      |    0
 .../area_kmr/kmr_12/{kmr_12_3_npc.c => npc.c} |    0
 .../kmr_12/{kmr_12_0_header.c => settings.c}  |    0
 .../area_kmr/kmr_20/{kmr_20_8_bed.c => bed.c} |    0
 .../kmr_20/{kmr_20_7_bushes.c => bushes.c}    |    0
 .../{kmr_20_4_documents.c => documents.c}     |    0
 .../kmr_20/{kmr_20_5_entity.c => entity.c}    |    0
 .../kmr_20/{kmr_20_2_main.c => main.c}        |    0
 .../kmr_20/{kmr_20_1_music.c => music.c}      |    0
 .../kmr_20/{kmr_20_10_npc.c => npc.c}         |    0
 ...mr_20_12_npc_epilogue.c => npc_epilogue.c} |    0
 .../{kmr_20_11_npc_intro.c => npc_intro.c}    |    0
 .../{kmr_20_9_npc_scenes.c => npc_scenes.c}   |    0
 .../kmr_20/{kmr_20_13_records.c => records.c} |    0
 .../kmr_20/{kmr_20_3_rooms.c => rooms.c}      |    0
 .../kmr_20/{kmr_20_0_header.c => settings.c}  |    0
 .../kmr_20/{kmr_20_6_trees.c => trees.c}      |    0
 .../kmr_21/{kmr_21_1_main.c => main.c}        |    0
 .../kmr_21/{kmr_21_0_header.c => settings.c}  |    0
 .../kmr_22/{kmr_22_1_main.c => main.c}        |    0
 .../area_kmr/kmr_22/{kmr_22_2_npc.c => npc.c} |    0
 .../kmr_22/{kmr_22_0_header.c => settings.c}  |    0
 .../kmr_23/{kmr_23_1_main.c => main.c}        |    0
 .../area_kmr/kmr_23/{kmr_23_2_npc.c => npc.c} |    0
 .../kmr_23/{kmr_23_0_header.c => settings.c}  |    0
 .../kmr_24/{kmr_24_1_main.c => main.c}        |    0
 .../kmr_24/{kmr_24_0_header.c => settings.c}  |    0
 .../kmr_30/{kmr_30_1_main.c => main.c}        |    0
 .../area_kmr/kmr_30/{kmr_30_2_npc.c => npc.c} |    0
 .../kmr_30/{kmr_30_0_header.c => settings.c}  |    0
 .../kmr_30/{kmr_30_3_the_end.c => the_end.c}  |    0
 .../kpa_01/{kpa_01_4_entity.c => entity.c}    |    0
 .../kpa_01/{kpa_01_2_main.c => main.c}        |    0
 .../kpa_01/{kpa_01_1_music.c => music.c}      |    0
 .../area_kpa/kpa_01/{kpa_01_3_npc.c => npc.c} |    0
 .../kpa_01/{kpa_01_0_header.c => settings.c}  |    0
 .../kpa_03/{kpa_03_4_entity.c => entity.c}    |    0
 .../kpa_03/{kpa_03_2_main.c => main.c}        |    0
 .../kpa_03/{kpa_03_1_music.c => music.c}      |    0
 .../area_kpa/kpa_03/{kpa_03_3_npc.c => npc.c} |    0
 .../kpa_03/{kpa_03_0_header.c => settings.c}  |    0
 .../kpa_04/{kpa_04_2_main.c => main.c}        |    0
 .../kpa_04/{kpa_04_1_music.c => music.c}      |    0
 .../kpa_04/{kpa_04_0_header.c => settings.c}  |    0
 .../kpa_04/{kpa_04_3_statues.c => statues.c}  |    0
 .../kpa_08/{kpa_08_3_entity.c => entity.c}    |    0
 .../kpa_08/{kpa_08_2_main.c => main.c}        |    0
 .../kpa_08/{kpa_08_1_music.c => music.c}      |    0
 .../area_kpa/kpa_08/{kpa_08_4_npc.c => npc.c} |    0
 .../kpa_08/{kpa_08_0_header.c => settings.c}  |    0
 .../kpa_09/{kpa_09_3_entity.c => entity.c}    |    0
 .../kpa_09/{kpa_09_2_main.c => main.c}        |    0
 .../kpa_09/{kpa_09_1_music.c => music.c}      |    0
 .../area_kpa/kpa_09/{kpa_09_4_npc.c => npc.c} |    0
 .../kpa_09/{kpa_09_0_header.c => settings.c}  |    0
 .../kpa_10/{kpa_10_4_entity.c => entity.c}    |    0
 .../kpa_10/{kpa_10_2_main.c => main.c}        |    0
 .../kpa_10/{kpa_10_1_music.c => music.c}      |    0
 .../area_kpa/kpa_10/{kpa_10_3_npc.c => npc.c} |    0
 .../kpa_10/{kpa_10_0_header.c => settings.c}  |    0
 .../kpa_100/{kpa_100_3_entity.c => entity.c}  |    0
 .../kpa_100/{kpa_100_2_main.c => main.c}      |    0
 .../kpa_100/{kpa_100_1_music.c => music.c}    |    0
 .../{kpa_100_0_header.c => settings.c}        |    0
 .../kpa_101/{kpa_101_3_entity.c => entity.c}  |    0
 .../kpa_101/{kpa_101_2_main.c => main.c}      |    0
 .../kpa_101/{kpa_101_1_music.c => music.c}    |    0
 .../{kpa_101_0_header.c => settings.c}        |    0
 .../kpa_102/{kpa_102_2_main.c => main.c}      |    0
 .../kpa_102/{kpa_102_1_music.c => music.c}    |    0
 .../kpa_102/{kpa_102_3_npc.c => npc.c}        |    0
 .../{kpa_102_0_header.c => settings.c}        |    0
 .../kpa_11/{kpa_11_3_entity.c => entity.c}    |    0
 .../kpa_11/{kpa_11_2_main.c => main.c}        |    0
 .../kpa_11/{kpa_11_1_music.c => music.c}      |    0
 .../area_kpa/kpa_11/{kpa_11_4_npc.c => npc.c} |    0
 .../kpa_11/{kpa_11_0_header.c => settings.c}  |    0
 .../kpa_111/{kpa_111_5_entity.c => entity.c}  |    0
 .../kpa_111/{kpa_111_2_main.c => main.c}      |    0
 .../kpa_111/{kpa_111_1_music.c => music.c}    |    0
 .../kpa_111/{kpa_111_4_npc.c => npc.c}        |    0
 .../{kpa_111_0_header.c => settings.c}        |    0
 .../{kpa_111_3_statues.c => statues.c}        |    0
 .../kpa_112/{kpa_112_2_main.c => main.c}      |    0
 .../kpa_112/{kpa_112_1_music.c => music.c}    |    0
 .../{kpa_112_0_header.c => settings.c}        |    0
 .../kpa_113/{kpa_113_3_entity.c => entity.c}  |    0
 .../kpa_113/{kpa_113_2_main.c => main.c}      |    0
 .../kpa_113/{kpa_113_1_music.c => music.c}    |    0
 .../kpa_113/{kpa_113_5_npc.c => npc.c}        |    0
 .../{kpa_113_0_header.c => settings.c}        |    0
 .../{kpa_113_4_statues.c => statues.c}        |    0
 .../kpa_114/{kpa_114_3_entity.c => entity.c}  |    0
 .../kpa_114/{kpa_114_2_main.c => main.c}      |    0
 .../kpa_114/{kpa_114_1_music.c => music.c}    |    0
 .../{kpa_114_0_header.c => settings.c}        |    0
 .../kpa_115/{kpa_115_2_main.c => main.c}      |    0
 .../kpa_115/{kpa_115_1_music.c => music.c}    |    0
 .../kpa_115/{kpa_115_4_npc.c => npc.c}        |    0
 .../{kpa_115_0_header.c => settings.c}        |    0
 .../{kpa_115_3_statues.c => statues.c}        |    0
 .../kpa_116/{kpa_116_2_main.c => main.c}      |    0
 .../kpa_116/{kpa_116_1_music.c => music.c}    |    0
 .../{kpa_116_0_header.c => settings.c}        |    0
 .../kpa_117/{kpa_117_2_main.c => main.c}      |    0
 .../kpa_117/{kpa_117_1_music.c => music.c}    |    0
 .../{kpa_117_0_header.c => settings.c}        |    0
 .../kpa_118/{kpa_118_2_main.c => main.c}      |    0
 .../kpa_118/{kpa_118_1_music.c => music.c}    |    0
 .../{kpa_118_0_header.c => settings.c}        |    0
 .../kpa_119/{kpa_119_2_entity.c => entity.c}  |    0
 .../kpa_119/{kpa_119_3_main.c => main.c}      |    0
 .../kpa_119/{kpa_119_1_music.c => music.c}    |    0
 .../{kpa_119_0_header.c => settings.c}        |    0
 .../kpa_12/{kpa_12_2_main.c => main.c}        |    0
 .../kpa_12/{kpa_12_1_music.c => music.c}      |    0
 .../{kpa_12_3_platforms.c => platforms.c}     |    0
 .../kpa_12/{kpa_12_0_header.c => settings.c}  |    0
 .../kpa_121/{kpa_121_2_main.c => main.c}      |    0
 .../kpa_121/{kpa_121_1_music.c => music.c}    |    0
 .../{kpa_121_0_header.c => settings.c}        |    0
 .../kpa_13/{kpa_13_3_entity.c => entity.c}    |    0
 .../kpa_13/{kpa_13_2_main.c => main.c}        |    0
 .../kpa_13/{kpa_13_1_music.c => music.c}      |    0
 .../{kpa_13_4_platforms.c => platforms.c}     |    0
 .../kpa_13/{kpa_13_0_header.c => settings.c}  |    0
 .../kpa_130/{kpa_130_2_main.c => main.c}      |    0
 .../kpa_130/{kpa_130_1_music.c => music.c}    |    0
 .../kpa_130/{kpa_130_3_npc.c => npc.c}        |    0
 .../{kpa_130_0_header.c => settings.c}        |    0
 .../area_kpa/kpa_133/{kpa_133_6.c => ease.c}  |    0
 .../kpa_133/{kpa_133_3_entity.c => entity.c}  |    0
 .../kpa_133/{kpa_133_2_main.c => main.c}      |    0
 .../kpa_133/{kpa_133_1_music.c => music.c}    |    0
 .../kpa_133/{kpa_133_4_npc.c => npc.c}        |    0
 .../{kpa_133_0_header.c => settings.c}        |    0
 .../kpa_133/{kpa_133_5_water.c => water.c}    |    0
 .../kpa_134/{kpa_134_3_chains.c => chains.c}  |    0
 .../kpa_134/{kpa_134_6_entity.c => entity.c}  |    0
 .../kpa_134/{kpa_134_2_main.c => main.c}      |    0
 .../kpa_134/{kpa_134_1_music.c => music.c}    |    0
 .../kpa_134/{kpa_134_4_npc.c => npc.c}        |    0
 .../kpa_134/{kpa_134_5_panels.c => panels.c}  |    0
 .../{kpa_134_0_header.c => settings.c}        |    0
 .../kpa_14/{kpa_14_3_entity.c => entity.c}    |    0
 .../kpa_14/{kpa_14_2_main.c => main.c}        |    0
 .../kpa_14/{kpa_14_1_music.c => music.c}      |    0
 .../{kpa_14_4_platforms.c => platforms.c}     |    0
 .../kpa_14/{kpa_14_0_header.c => settings.c}  |    0
 .../kpa_15/{kpa_15_3_entity.c => entity.c}    |    0
 .../kpa_15/{kpa_15_2_main.c => main.c}        |    0
 .../kpa_15/{kpa_15_1_music.c => music.c}      |    0
 .../kpa_15/{kpa_15_0_header.c => settings.c}  |    0
 .../kpa_16/{kpa_16_3_entity.c => entity.c}    |    0
 .../kpa_16/{kpa_16_2_main.c => main.c}        |    0
 .../kpa_16/{kpa_16_1_music.c => music.c}      |    0
 .../area_kpa/kpa_16/{kpa_16_4_npc.c => npc.c} |    0
 .../kpa_16/{kpa_16_0_header.c => settings.c}  |    0
 .../kpa_17/{kpa_17_2_entity.c => entity.c}    |    0
 .../kpa_17/{kpa_17_3_main.c => main.c}        |    0
 .../kpa_17/{kpa_17_1_music.c => music.c}      |    0
 .../area_kpa/kpa_17/{kpa_17_4_npc.c => npc.c} |    0
 .../kpa_17/{kpa_17_0_header.c => settings.c}  |    0
 .../kpa_32/{kpa_32_2_entity.c => entity.c}    |    0
 .../kpa_32/{kpa_32_3_main.c => main.c}        |    0
 .../kpa_32/{kpa_32_1_music.c => music.c}      |    0
 .../kpa_32/{kpa_32_0_header.c => settings.c}  |    0
 .../kpa_33/{kpa_33_2_entity.c => entity.c}    |    0
 .../kpa_33/{kpa_33_3_main.c => main.c}        |    0
 .../kpa_33/{kpa_33_1_music.c => music.c}      |    0
 .../kpa_33/{kpa_33_0_header.c => settings.c}  |    0
 .../kpa_40/{kpa_40_2_main.c => main.c}        |    0
 .../kpa_40/{kpa_40_1_music.c => music.c}      |    0
 .../kpa_40/{kpa_40_0_header.c => settings.c}  |    0
 .../kpa_41/{kpa_41_2_main.c => main.c}        |    0
 .../kpa_41/{kpa_41_1_music.c => music.c}      |    0
 .../kpa_41/{kpa_41_0_header.c => settings.c}  |    0
 .../kpa_50/{kpa_50_2_main.c => main.c}        |    0
 .../kpa_50/{kpa_50_1_music.c => music.c}      |    0
 .../area_kpa/kpa_50/{kpa_50_3_npc.c => npc.c} |    0
 .../kpa_50/{kpa_50_0_header.c => settings.c}  |    0
 .../kpa_51/{kpa_51_2_main.c => main.c}        |    0
 .../kpa_51/{kpa_51_1_music.c => music.c}      |    0
 .../area_kpa/kpa_51/{kpa_51_3_npc.c => npc.c} |    0
 .../kpa_51/{kpa_51_0_header.c => settings.c}  |    0
 .../kpa_52/{kpa_52_2_entity.c => entity.c}    |    0
 .../kpa_52/{kpa_52_3_main.c => main.c}        |    0
 .../kpa_52/{kpa_52_1_music.c => music.c}      |    0
 .../area_kpa/kpa_52/{kpa_52_4_npc.c => npc.c} |    0
 .../kpa_52/{kpa_52_0_header.c => settings.c}  |    0
 .../kpa_53/{kpa_53_4_entity.c => entity.c}    |    0
 .../kpa_53/{kpa_53_2_main.c => main.c}        |    0
 .../kpa_53/{kpa_53_1_music.c => music.c}      |    0
 .../area_kpa/kpa_53/{kpa_53_3_npc.c => npc.c} |    0
 .../kpa_53/{kpa_53_0_header.c => settings.c}  |    0
 .../kpa_60/{kpa_60_2_entity.c => entity.c}    |    0
 .../kpa_60/{kpa_60_3_main.c => main.c}        |    0
 .../kpa_60/{kpa_60_1_music.c => music.c}      |    0
 .../kpa_60/{kpa_60_4_scenes.c => scenes.c}    |    0
 .../kpa_60/{kpa_60_0_header.c => settings.c}  |    0
 .../kpa_61/{kpa_61_4_entity.c => entity.c}    |    0
 .../kpa_61/{kpa_61_2_main.c => main.c}        |    0
 .../kpa_61/{kpa_61_1_music.c => music.c}      |    0
 .../area_kpa/kpa_61/{kpa_61_3_npc.c => npc.c} |    0
 .../kpa_61/{kpa_61_0_header.c => settings.c}  |    0
 .../kpa_62/{kpa_62_2_entity.c => entity.c}    |    0
 .../kpa_62/{kpa_62_3_main.c => main.c}        |    0
 .../kpa_62/{kpa_62_1_music.c => music.c}      |    0
 .../kpa_62/{kpa_62_0_header.c => settings.c}  |    0
 .../kpa_63/{kpa_63_2_entity.c => entity.c}    |    0
 .../kpa_63/{kpa_63_3_main.c => main.c}        |    0
 .../kpa_63/{kpa_63_1_music.c => music.c}      |    0
 .../kpa_63/{kpa_63_4_scenes.c => scenes.c}    |    0
 .../kpa_63/{kpa_63_0_header.c => settings.c}  |    0
 .../{kpa_70_5_chain_anim.c => chain_anim.c}   |    0
 .../{kpa_70_4_chain_skele.c => chain_skele.c} |    0
 .../kpa_70/{kpa_70_2_main.c => main.c}        |    0
 .../kpa_70/{kpa_70_1_music.c => music.c}      |    0
 .../area_kpa/kpa_70/{kpa_70_3_npc.c => npc.c} |    0
 .../kpa_70/{kpa_70_0_header.c => settings.c}  |    0
 .../kpa_81/{kpa_81_2_main.c => main.c}        |    0
 .../kpa_81/{kpa_81_1_music.c => music.c}      |    0
 .../area_kpa/kpa_81/{kpa_81_3_npc.c => npc.c} |    0
 .../kpa_81/{kpa_81_0_header.c => settings.c}  |    0
 .../kpa_82/{kpa_82_2_main.c => main.c}        |    0
 .../kpa_82/{kpa_82_1_music.c => music.c}      |    0
 .../area_kpa/kpa_82/{kpa_82_3_npc.c => npc.c} |    0
 .../kpa_82/{kpa_82_0_header.c => settings.c}  |    0
 .../kpa_83/{kpa_83_2_main.c => main.c}        |    0
 .../kpa_83/{kpa_83_1_music.c => music.c}      |    0
 .../area_kpa/kpa_83/{kpa_83_3_npc.c => npc.c} |    0
 .../kpa_83/{kpa_83_0_header.c => settings.c}  |    0
 .../kpa_90/{kpa_90_2_main.c => main.c}        |    0
 .../kpa_90/{kpa_90_1_music.c => music.c}      |    0
 .../kpa_90/{kpa_90_0_header.c => settings.c}  |    0
 .../kpa_91/{kpa_91_4_entity.c => entity.c}    |    0
 .../kpa_91/{kpa_91_2_main.c => main.c}        |    0
 .../kpa_91/{kpa_91_1_music.c => music.c}      |    0
 .../area_kpa/kpa_91/{kpa_91_3_npc.c => npc.c} |    0
 .../kpa_91/{kpa_91_0_header.c => settings.c}  |    0
 .../kpa_94/{kpa_94_2_main.c => main.c}        |    0
 .../kpa_94/{kpa_94_1_music.c => music.c}      |    0
 .../kpa_94/{kpa_94_0_header.c => settings.c}  |    0
 .../kpa_95/{kpa_95_2_entity.c => entity.c}    |    0
 .../kpa_95/{kpa_95_3_main.c => main.c}        |    0
 .../kpa_95/{kpa_95_1_music.c => music.c}      |    0
 .../area_kpa/kpa_95/{kpa_95_4_npc.c => npc.c} |    0
 .../kpa_95/{kpa_95_0_header.c => settings.c}  |    0
 .../kpa_96/{kpa_96_2_main.c => main.c}        |    0
 .../kpa_96/{kpa_96_1_music.c => music.c}      |    0
 .../area_kpa/kpa_96/{kpa_96_3_npc.c => npc.c} |    0
 .../kpa_96/{kpa_96_0_header.c => settings.c}  |    0
 .../kzn_01/{kzn_01_1_main.c => main.c}        |    0
 .../area_kzn/kzn_01/{kzn_01_2_npc.c => npc.c} |    0
 .../kzn_01/{kzn_01_0_header.c => settings.c}  |    0
 .../kzn_02/{kzn_02_4_demo.c => demo.c}        |    0
 .../kzn_02/{kzn_02_1_main.c => main.c}        |    0
 .../area_kzn/kzn_02/{kzn_02_3_npc.c => npc.c} |    0
 .../{kzn_02_2_platforms.c => platforms.c}     |    0
 .../kzn_02/{kzn_02_0_header.c => settings.c}  |    0
 .../kzn_03/{kzn_03_3_entity.c => entity.c}    |    0
 .../kzn_03/{kzn_03_1_main.c => main.c}        |    0
 .../area_kzn/kzn_03/{kzn_03_2_npc.c => npc.c} |    0
 .../kzn_03/{kzn_03_0_header.c => settings.c}  |    0
 .../{kzn_03_4_ziplines.c => ziplines.c}       |    0
 .../kzn_04/{kzn_04_2_entity.c => entity.c}    |    0
 .../kzn_04/{kzn_04_1_main.c => main.c}        |    0
 .../area_kzn/kzn_04/{kzn_04_3_npc.c => npc.c} |    0
 .../kzn_04/{kzn_04_0_header.c => settings.c}  |    0
 .../kzn_05/{kzn_05_1_main.c => main.c}        |    0
 .../kzn_05/{kzn_05_0_header.c => settings.c}  |    0
 .../kzn_06/{kzn_06_2_entity.c => entity.c}    |    0
 .../kzn_06/{kzn_06_3_extra.c => extra.c}      |    0
 .../kzn_06/{kzn_06_1_main.c => main.c}        |    0
 .../kzn_06/{kzn_06_0_header.c => settings.c}  |    0
 .../kzn_07/{kzn_07_3_entity.c => entity.c}    |    0
 .../kzn_07/{kzn_07_2_main.c => main.c}        |    0
 .../kzn_07/{kzn_07_1_music.c => music.c}      |    0
 .../area_kzn/kzn_07/{kzn_07_4_npc.c => npc.c} |    0
 .../kzn_07/{kzn_07_0_header.c => settings.c}  |    0
 .../kzn_08/{kzn_08_2_entity.c => entity.c}    |    0
 .../kzn_08/{kzn_08_4_extra.c => extra.c}      |    0
 .../kzn_08/{kzn_08_1_main.c => main.c}        |    0
 .../area_kzn/kzn_08/{kzn_08_3_npc.c => npc.c} |    0
 .../kzn_08/{kzn_08_0_header.c => settings.c}  |    0
 .../kzn_09/{kzn_09_2_entity.c => entity.c}    |    0
 .../kzn_09/{kzn_09_1_main.c => main.c}        |    0
 .../area_kzn/kzn_09/{kzn_09_4_npc.c => npc.c} |    0
 .../kzn_09/{kzn_09_0_header.c => settings.c}  |    0
 .../kzn_09/{kzn_09_3_zipline.c => zipline.c}  |    0
 .../kzn_10/{kzn_10_1_main.c => main.c}        |    0
 .../kzn_10/{kzn_10_0_header.c => settings.c}  |    0
 .../kzn_10/{kzn_10_2_tromp.c => tromp.c}      |    0
 .../kzn_11/{kzn_11_1_main.c => main.c}        |    0
 .../area_kzn/kzn_11/{kzn_11_3_npc.c => npc.c} |    0
 .../{kzn_11_2_platforms.c => platforms.c}     |    0
 .../kzn_11/{kzn_11_0_header.c => settings.c}  |    0
 .../kzn_17/{kzn_17_2_entity.c => entity.c}    |    0
 .../kzn_17/{kzn_17_1_main.c => main.c}        |    0
 .../area_kzn/kzn_17/{kzn_17_3_npc.c => npc.c} |    0
 .../kzn_17/{kzn_17_0_header.c => settings.c}  |    0
 .../kzn_17/{kzn_17_4_tromp.c => tromp.c}      |    0
 .../kzn_18/{kzn_18_3_entity.c => entity.c}    |    0
 .../kzn_18/{kzn_18_1_main.c => main.c}        |    0
 .../area_kzn/kzn_18/{kzn_18_2_npc.c => npc.c} |    0
 .../kzn_18/{kzn_18_0_header.c => settings.c}  |    0
 .../kzn_19/{kzn_19_6_entity.c => entity.c}    |    0
 .../{kzn_19_5_eruption.c => eruption.c}       |    0
 .../kzn_19/{kzn_19_2_main.c => main.c}        |    0
 .../kzn_19/{kzn_19_1_music.c => music.c}      |    0
 .../area_kzn/kzn_19/{kzn_19_4_npc.c => npc.c} |    0
 ...kzn_19_3_npc_settings.c => npc_settings.c} |    0
 .../kzn_19/{kzn_19_0_header.c => settings.c}  |    0
 .../kzn_20/{kzn_20_2_main.c => main.c}        |    0
 .../kzn_20/{kzn_20_1_music.c => music.c}      |    0
 .../area_kzn/kzn_20/{kzn_20_3_npc.c => npc.c} |    0
 .../kzn_20/{kzn_20_0_header.c => settings.c}  |    0
 .../kzn_22/{kzn_22_3_entity.c => entity.c}    |    0
 .../kzn_22/{kzn_22_2_main.c => main.c}        |    0
 .../kzn_22/{kzn_22_1_music.c => music.c}      |    0
 .../area_kzn/kzn_22/{kzn_22_4_npc.c => npc.c} |    0
 .../kzn_22/{kzn_22_0_header.c => settings.c}  |    0
 .../kzn_23/{kzn_23_2_main.c => main.c}        |    0
 .../kzn_23/{kzn_23_1_music.c => music.c}      |    0
 .../area_kzn/kzn_23/{kzn_23_3_npc.c => npc.c} |    0
 .../kzn_23/{kzn_23_0_header.c => settings.c}  |    0
 .../mac_00/{mac_00_8_demo.c => demo.c}        |    0
 .../mac_00/{mac_00_3_entity.c => entity.c}    |    0
 .../{mac_00_14_epilogue.c => epilogue.c}      |    0
 ...ac_00_13_epilogue_npc.c => epilogue_npc.c} |    0
 .../mac_00/{mac_00_12_intro.c => intro.c}     |    0
 .../{mac_00_11_intro_npc.c => intro_npc.c}    |    0
 .../mac_00/{mac_00_2_main.c => main.c}        |    0
 .../mac_00/{mac_00_1_music.c => music.c}      |    0
 .../{mac_00_7_music_mix.c => music_mix.c}     |    0
 .../area_mac/mac_00/{mac_00_5_npc.c => npc.c} |    0
 .../mac_00/{mac_00_4_rooms.c => rooms.c}      |    0
 .../mac_00/{mac_00_0_header.c => settings.c}  |    0
 .../{mac_00_10_shared_npc.c => shared_npc.c}  |    0
 .../mac_00/{mac_00_6_shop.c => shop.c}        |    0
 .../{mac_00_9_water_gfx.c => water_gfx.c}     |    0
 .../{mac_01_7_bulletin.c => bulletin.c}       |    0
 ..._crystal_ball_gfx.c => crystal_ball_gfx.c} |    0
 .../mac_01/{mac_01_3_entity.c => entity.c}    |    0
 ...ac_01_11_epilogue_npc.c => epilogue_npc.c} |    0
 .../mac_01/{mac_01_13_foliage.c => foliage.c} |    0
 .../mac_01/{mac_01_12_intro.c => intro.c}     |    0
 .../{mac_01_10_intro_npc.c => intro_npc.c}    |    0
 .../mac_01/{mac_01_2_main.c => main.c}        |    0
 .../mac_01/{mac_01_1_music.c => music.c}      |    0
 .../{mac_01_8_music_mix.c => music_mix.c}     |    0
 .../area_mac/mac_01/{mac_01_9_npc.c => npc.c} |    0
 .../mac_01/{mac_01_4_rooms.c => rooms.c}      |    0
 .../mac_01/{mac_01_0_header.c => settings.c}  |    0
 .../mac_01/{mac_01_5_shop.c => shop.c}        |    0
 .../mac_02/{mac_02_5_entity.c => entity.c}    |    0
 .../mac_02/{mac_02_4_foliage.c => foliage.c}  |    0
 .../mac_02/{mac_02_2_main.c => main.c}        |    0
 .../mac_02/{mac_02_1_music.c => music.c}      |    0
 .../{mac_02_7_music_mix.c => music_mix.c}     |    0
 .../area_mac/mac_02/{mac_02_6_npc.c => npc.c} |    0
 .../mac_02/{mac_02_3_rooms.c => rooms.c}      |    0
 .../mac_02/{mac_02_0_header.c => settings.c}  |    0
 .../mac_03/{mac_03_8_demo.c => demo.c}        |    0
 .../mac_03/{mac_03_5_entity.c => entity.c}    |    0
 .../mac_03/{mac_03_6_foliage.c => foliage.c}  |    0
 .../mac_03/{mac_03_2_main.c => main.c}        |    0
 .../mac_03/{mac_03_1_music.c => music.c}      |    0
 .../area_mac/mac_03/{mac_03_4_npc.c => npc.c} |    0
 .../mac_03/{mac_03_7_oinks.c => oinks.c}      |    0
 .../mac_03/{mac_03_0_header.c => settings.c}  |    0
 .../mac_03/{mac_03_3_train.c => train.c}      |    0
 .../mac_04/{mac_04_8_entity.c => entity.c}    |    0
 .../mac_04/{mac_04_4_foliage.c => foliage.c}  |    0
 .../mac_04/{mac_04_2_main.c => main.c}        |    0
 .../mac_04/{mac_04_1_music.c => music.c}      |    0
 .../{mac_04_9_music_mix.c => music_mix.c}     |    0
 .../area_mac/mac_04/{mac_04_6_npc.c => npc.c} |    0
 .../mac_04/{mac_04_3_rooms.c => rooms.c}      |    0
 .../mac_04/{mac_04_0_header.c => settings.c}  |    0
 .../mac_04/{mac_04_5_shop.c => shop.c}        |    0
 .../{mac_04_7_wish_scene.c => wish_scene.c}   |    0
 .../{mac_05_7_club64_sign.c => club64_sign.c} |    0
 .../mac_05/{mac_05_2_entity.c => entity.c}    |    0
 .../mac_05/{mac_05_3_main.c => main.c}        |    0
 .../mac_05/{mac_05_1_music.c => music.c}      |    0
 .../area_mac/mac_05/{mac_05_4_npc.c => npc.c} |    0
 .../mac_05/{mac_05_6_rooms.c => rooms.c}      |    0
 .../mac_05/{mac_05_0_header.c => settings.c}  |    0
 .../mac_05/{mac_05_5_whale.c => whale.c}      |    0
 .../mac_06/{mac_06_1_main.c => main.c}        |    0
 .../area_mac/mac_06/{mac_06_3_npc.c => npc.c} |    0
 .../mac_06/{mac_06_0_header.c => settings.c}  |    0
 .../mac_06/{mac_06_2_whale.c => whale.c}      |    0
 .../machi/{machi_3_entity.c => entity.c}      |    0
 .../{machi_4_goomba_king.c => goomba_king.c}  |    0
 .../area_mac/machi/{machi_2_main.c => main.c} |    0
 .../machi/{machi_6_misstar.c => misstar.c}    |    0
 .../area_mac/machi/{machi_5_npc.c => npc.c}   |    0
 .../machi/{machi_7_partner.c => partner.c}    |    0
 .../machi/{machi_0_header.c => settings.c}    |    0
 .../machi/{machi_1_tables.c => tables.c}      |    0
 .../mgm_00/{mgm_00_1_main.c => main.c}        |    0
 .../area_mgm/mgm_00/{mgm_00_2_npc.c => npc.c} |    0
 .../{mgm_00_3_scoreboard.c => scoreboard.c}   |    0
 .../mgm_00/{mgm_00_0_header.c => settings.c}  |    0
 .../mgm_01/{mgm_01_3_entity.c => entity.c}    |    0
 .../mgm_01/{mgm_01_4_images.c => images.c}    |    0
 .../mgm_01/{mgm_01_1_main.c => main.c}        |    0
 .../area_mgm/mgm_01/{mgm_01_2_npc.c => npc.c} |    0
 .../mgm_01/{mgm_01_0_header.c => settings.c}  |    0
 .../mgm_02/{mgm_02_3_images.c => images.c}    |    0
 .../mgm_02/{mgm_02_1_main.c => main.c}        |    0
 .../area_mgm/mgm_02/{mgm_02_2_npc.c => npc.c} |    0
 .../mgm_02/{mgm_02_0_header.c => settings.c}  |    0
 .../mgm_03/{mgm_03_1_main.c => main.c}        |    0
 .../mgm_03/{mgm_03_0_header.c => settings.c}  |    0
 .../mim_01/{mim_01_3_entity.c => entity.c}    |    0
 .../mim_01/{mim_01_5_gate.c => gate.c}        |    0
 .../mim_01/{mim_01_4_hint.c => hint.c}        |    0
 .../mim_01/{mim_01_2_main.c => main.c}        |    0
 .../mim_01/{mim_01_1_music.c => music.c}      |    0
 .../area_mim/mim_01/{mim_01_6_npc.c => npc.c} |    0
 .../mim_01/{mim_01_0_header.c => settings.c}  |    0
 .../mim_02/{mim_02_4_gate.c => gate.c}        |    0
 .../mim_02/{mim_02_5_hint.c => hint.c}        |    0
 .../mim_02/{mim_02_2_main.c => main.c}        |    0
 .../mim_02/{mim_02_1_music.c => music.c}      |    0
 .../area_mim/mim_02/{mim_02_3_npc.c => npc.c} |    0
 .../mim_02/{mim_02_0_header.c => settings.c}  |    0
 .../mim_03/{mim_03_3_entity.c => entity.c}    |    0
 .../mim_03/{mim_03_5_gate.c => gate.c}        |    0
 .../mim_03/{mim_03_4_hint.c => hint.c}        |    0
 .../mim_03/{mim_03_2_main.c => main.c}        |    0
 .../mim_03/{mim_03_1_music.c => music.c}      |    0
 .../area_mim/mim_03/{mim_03_6_npc.c => npc.c} |    0
 .../mim_03/{mim_03_0_header.c => settings.c}  |    0
 .../mim_04/{mim_04_3_entity.c => entity.c}    |    0
 .../mim_04/{mim_04_5_gate.c => gate.c}        |    0
 .../mim_04/{mim_04_4_hint.c => hint.c}        |    0
 .../mim_04/{mim_04_2_main.c => main.c}        |    0
 .../mim_04/{mim_04_1_music.c => music.c}      |    0
 .../area_mim/mim_04/{mim_04_6_npc.c => npc.c} |    0
 .../mim_04/{mim_04_0_header.c => settings.c}  |    0
 .../mim_05/{mim_05_3_entity.c => entity.c}    |    0
 .../mim_05/{mim_05_5_gate.c => gate.c}        |    0
 .../mim_05/{mim_05_4_hint.c => hint.c}        |    0
 .../mim_05/{mim_05_2_main.c => main.c}        |    0
 .../mim_05/{mim_05_1_music.c => music.c}      |    0
 .../area_mim/mim_05/{mim_05_6_npc.c => npc.c} |    0
 .../mim_05/{mim_05_0_header.c => settings.c}  |    0
 .../mim_06/{mim_06_3_entity.c => entity.c}    |    0
 .../mim_06/{mim_06_5_gate.c => gate.c}        |    0
 .../mim_06/{mim_06_4_hint.c => hint.c}        |    0
 .../mim_06/{mim_06_2_main.c => main.c}        |    0
 .../mim_06/{mim_06_1_music.c => music.c}      |    0
 .../area_mim/mim_06/{mim_06_6_npc.c => npc.c} |    0
 .../mim_06/{mim_06_0_header.c => settings.c}  |    0
 .../mim_07/{mim_07_3_entity.c => entity.c}    |    0
 .../mim_07/{mim_07_5_gate.c => gate.c}        |    0
 .../mim_07/{mim_07_4_hint.c => hint.c}        |    0
 .../mim_07/{mim_07_2_main.c => main.c}        |    0
 .../mim_07/{mim_07_1_music.c => music.c}      |    0
 .../area_mim/mim_07/{mim_07_6_npc.c => npc.c} |    0
 .../mim_07/{mim_07_0_header.c => settings.c}  |    0
 .../mim_08/{mim_08_3_entity.c => entity.c}    |    0
 .../mim_08/{mim_08_4_gate.c => gate.c}        |    0
 .../mim_08/{mim_08_2_main.c => main.c}        |    0
 .../mim_08/{mim_08_1_music.c => music.c}      |    0
 .../area_mim/mim_08/{mim_08_5_npc.c => npc.c} |    0
 .../mim_08/{mim_08_0_header.c => settings.c}  |    0
 .../mim_09/{mim_09_3_entity.c => entity.c}    |    0
 .../mim_09/{mim_09_5_gate.c => gate.c}        |    0
 .../mim_09/{mim_09_4_hint.c => hint.c}        |    0
 .../mim_09/{mim_09_2_main.c => main.c}        |    0
 .../mim_09/{mim_09_1_music.c => music.c}      |    0
 .../area_mim/mim_09/{mim_09_6_npc.c => npc.c} |    0
 .../mim_09/{mim_09_0_header.c => settings.c}  |    0
 .../mim_10/{mim_10_2_entity.c => entity.c}    |    0
 .../mim_10/{mim_10_3_main.c => main.c}        |    0
 .../mim_10/{mim_10_1_music.c => music.c}      |    0
 .../area_mim/mim_10/{mim_10_4_npc.c => npc.c} |    0
 .../mim_10/{mim_10_0_header.c => settings.c}  |    0
 .../mim_11/{mim_11_4_entity.c => entity.c}    |    0
 .../mim_11/{mim_11_6_foliage.c => foliage.c}  |    0
 .../mim_11/{mim_11_3_gate.c => gate.c}        |    0
 .../mim_11/{mim_11_2_main.c => main.c}        |    0
 .../mim_11/{mim_11_1_music.c => music.c}      |    0
 .../area_mim/mim_11/{mim_11_5_npc.c => npc.c} |    0
 .../mim_11/{mim_11_0_header.c => settings.c}  |    0
 .../mim_12/{mim_12_2_entity.c => entity.c}    |    0
 .../mim_12/{mim_12_5_gate.c => gate.c}        |    0
 .../mim_12/{mim_12_3_main.c => main.c}        |    0
 .../mim_12/{mim_12_1_music.c => music.c}      |    0
 .../area_mim/mim_12/{mim_12_4_npc.c => npc.c} |    0
 .../mim_12/{mim_12_0_header.c => settings.c}  |    0
 .../nok_01/{nok_01_3_entity.c => entity.c}    |    0
 .../nok_01/{nok_01_8_foliage.c => foliage.c}  |    0
 .../nok_01/{nok_01_2_main.c => main.c}        |    0
 .../nok_01/{nok_01_1_music.c => music.c}      |    0
 .../area_nok/nok_01/{nok_01_4_npc.c => npc.c} |    0
 .../nok_01/{nok_01_7_radio.c => radio.c}      |    0
 .../nok_01/{nok_01_6_rooms.c => rooms.c}      |    0
 .../nok_01/{nok_01_0_header.c => settings.c}  |    0
 .../nok_01/{nok_01_5_shop.c => shop.c}        |    0
 .../{nok_02_5_bookshelf.c => bookshelf.c}     |    0
 .../nok_02/{nok_02_7_demo.c => demo.c}        |    0
 .../nok_02/{nok_02_3_entity.c => entity.c}    |    0
 .../{nok_02_10_epilogue.c => epilogue.c}      |    0
 .../nok_02/{nok_02_9_foliage.c => foliage.c}  |    0
 .../{nok_02_8_koot_favors.c => koot_favors.c} |    0
 .../nok_02/{nok_02_2_main.c => main.c}        |    0
 .../nok_02/{nok_02_1_music.c => music.c}      |    0
 .../area_nok/nok_02/{nok_02_6_npc.c => npc.c} |    0
 .../nok_02/{nok_02_4_rooms.c => rooms.c}      |    0
 .../nok_02/{nok_02_0_header.c => settings.c}  |    0
 .../nok_03/{nok_03_3_entity.c => entity.c}    |    0
 .../nok_03/{nok_03_2_main.c => main.c}        |    0
 .../nok_03/{nok_03_1_music.c => music.c}      |    0
 .../area_nok/nok_03/{nok_03_4_npc.c => npc.c} |    0
 .../nok_03/{nok_03_0_header.c => settings.c}  |    0
 .../nok_04/{nok_04_3_entity.c => entity.c}    |    0
 .../nok_04/{nok_04_2_main.c => main.c}        |    0
 .../nok_04/{nok_04_1_music.c => music.c}      |    0
 .../{nok_04_5_new_partner.c => new_partner.c} |    0
 .../area_nok/nok_04/{nok_04_4_npc.c => npc.c} |    0
 .../nok_04/{nok_04_0_header.c => settings.c}  |    0
 .../nok_11/{nok_11_3_entity.c => entity.c}    |    0
 .../nok_11/{nok_11_2_main.c => main.c}        |    0
 .../nok_11/{nok_11_1_music.c => music.c}      |    0
 .../area_nok/nok_11/{nok_11_4_npc.c => npc.c} |    0
 .../nok_11/{nok_11_0_header.c => settings.c}  |    0
 .../nok_12/{nok_12_4_bridge.c => bridge.c}    |    0
 .../nok_12/{nok_12_7_demo.c => demo.c}        |    0
 .../nok_12/{nok_12_3_entity.c => entity.c}    |    0
 .../nok_12/{nok_12_5_foliage.c => foliage.c}  |    0
 .../nok_12/{nok_12_2_main.c => main.c}        |    0
 .../nok_12/{nok_12_1_music.c => music.c}      |    0
 .../area_nok/nok_12/{nok_12_6_npc.c => npc.c} |    0
 .../nok_12/{nok_12_0_header.c => settings.c}  |    0
 .../nok_13/{nok_13_3_entity.c => entity.c}    |    0
 .../nok_13/{nok_13_2_main.c => main.c}        |    0
 .../nok_13/{nok_13_1_music.c => music.c}      |    0
 .../nok_13/{nok_13_5.c => musical_hill.c}     |    0
 .../area_nok/nok_13/{nok_13_4_npc.c => npc.c} |    0
 .../nok_13/{nok_13_0_header.c => settings.c}  |    0
 .../nok_14/{nok_14_4_bridge.c => bridge.c}    |    0
 .../nok_14/{nok_14_3_entity.c => entity.c}    |    0
 .../nok_14/{nok_14_2_main.c => main.c}        |    0
 .../nok_14/{nok_14_1_music.c => music.c}      |    0
 .../area_nok/nok_14/{nok_14_5_npc.c => npc.c} |    0
 .../nok_14/{nok_14_0_header.c => settings.c}  |    0
 .../nok_15/{nok_15_3_entity.c => entity.c}    |    0
 .../nok_15/{nok_15_5_foliage.c => foliage.c}  |    0
 .../nok_15/{nok_15_2_main.c => main.c}        |    0
 .../nok_15/{nok_15_1_music.c => music.c}      |    0
 .../area_nok/nok_15/{nok_15_4_npc.c => npc.c} |    0
 .../nok_15/{nok_15_0_header.c => settings.c}  |    0
 .../{obk_01_3_chandelier.c => chandelier.c}   |    0
 .../obk_01/{obk_01_7_entity.c => entity.c}    |    0
 .../{obk_01_5_jump_scare.c => jump_scare.c}   |    0
 .../obk_01/{obk_01_2_main.c => main.c}        |    0
 .../obk_01/{obk_01_1_music.c => music.c}      |    0
 .../area_obk/obk_01/{obk_01_6_npc.c => npc.c} |    0
 .../{obk_01_4_portrait.c => portrait.c}       |    0
 .../obk_01/{obk_01_0_header.c => settings.c}  |    0
 .../{obk_02_4_bombable.c => bombable.c}       |    0
 .../obk_02/{obk_02_5_clock.c => clock.c}      |    0
 .../obk_02/{obk_02_6_entity.c => entity.c}    |    0
 .../obk_02/{obk_02_2_main.c => main.c}        |    0
 .../obk_02/{obk_02_1_music.c => music.c}      |    0
 .../area_obk/obk_02/{obk_02_3_npc.c => npc.c} |    0
 .../obk_02/{obk_02_0_header.c => settings.c}  |    0
 .../obk_03/{obk_03_4_entity.c => entity.c}    |    0
 .../obk_03/{obk_03_2_main.c => main.c}        |    0
 .../obk_03/{obk_03_1_music.c => music.c}      |    0
 .../area_obk/obk_03/{obk_03_6_npc.c => npc.c} |    0
 ...k_03_7_rocking_chair.c => rocking_chair.c} |    0
 .../obk_03/{obk_03_0_header.c => settings.c}  |    0
 .../obk_03/{obk_03_3_shop.c => shop.c}        |    0
 .../obk_03/{obk_03_5_stairs.c => stairs.c}    |    0
 .../obk_04/{obk_04_2_entity.c => entity.c}    |    0
 .../obk_04/{obk_04_6_game.c => game.c}        |    0
 .../obk_04/{obk_04_5_hole.c => hole.c}        |    0
 .../obk_04/{obk_04_4_main.c => main.c}        |    0
 .../obk_04/{obk_04_1_music.c => music.c}      |    0
 .../area_obk/obk_04/{obk_04_3_npc.c => npc.c} |    0
 .../obk_04/{obk_04_0_header.c => settings.c}  |    0
 .../obk_05/{obk_05_6_entity.c => entity.c}    |    0
 .../obk_05/{obk_05_4_hole.c => hole.c}        |    0
 .../obk_05/{obk_05_2_main.c => main.c}        |    0
 .../obk_05/{obk_05_1_music.c => music.c}      |    0
 .../area_obk/obk_05/{obk_05_5_npc.c => npc.c} |    0
 ...k_05_3_rocking_chair.c => rocking_chair.c} |    0
 .../obk_05/{obk_05_0_header.c => settings.c}  |    0
 .../{obk_06_3_bombable.c => bombable.c}       |    0
 .../obk_06/{obk_06_4_entity.c => entity.c}    |    0
 .../obk_06/{obk_06_2_main.c => main.c}        |    0
 .../obk_06/{obk_06_1_music.c => music.c}      |    0
 .../obk_06/{obk_06_0_header.c => settings.c}  |    0
 .../obk_07/{obk_07_3_entity.c => entity.c}    |    0
 .../{obk_07_4_fireplace.c => fireplace.c}     |    0
 .../obk_07/{obk_07_2_main.c => main.c}        |    0
 .../obk_07/{obk_07_1_music.c => music.c}      |    0
 .../area_obk/obk_07/{obk_07_5_npc.c => npc.c} |    0
 .../{obk_07_6_phonograph.c => phonograph.c}   |    0
 .../obk_07/{obk_07_0_header.c => settings.c}  |    0
 .../{obk_08_3_cabinets.c => cabinets.c}       |    0
 .../obk_08/{obk_08_4_entity.c => entity.c}    |    0
 .../obk_08/{obk_08_6_game.c => game.c}        |    0
 .../obk_08/{obk_08_2_main.c => main.c}        |    0
 .../obk_08/{obk_08_1_music.c => music.c}      |    0
 .../area_obk/obk_08/{obk_08_5_npc.c => npc.c} |    0
 .../obk_08/{obk_08_0_header.c => settings.c}  |    0
 .../{obk_09_6_epilogue.c => epilogue.c}       |    0
 .../obk_09/{obk_09_2_main.c => main.c}        |    0
 .../{obk_09_3_meet_bow.c => meet_bow.c}       |    0
 .../obk_09/{obk_09_1_music.c => music.c}      |    0
 .../{obk_09_5_new_partner.c => new_partner.c} |    0
 .../area_obk/obk_09/{obk_09_4_npc.c => npc.c} |    0
 .../obk_09/{obk_09_0_header.c => settings.c}  |    0
 .../omo_01/{omo_01_5_entity.c => entity.c}    |    0
 .../omo_01/{omo_01_3_gizmos.c => gizmos.c}    |    0
 .../omo_01/{omo_01_2_main.c => main.c}        |    0
 .../omo_01/{omo_01_1_music.c => music.c}      |    0
 .../area_omo/omo_01/{omo_01_4_npc.c => npc.c} |    0
 .../omo_01/{omo_01_0_header.c => settings.c}  |    0
 .../{omo_02_5_barricade.c => barricade.c}     |    0
 .../omo_02/{omo_02_3_entity.c => entity.c}    |    0
 .../omo_02/{omo_02_4_gizmos.c => gizmos.c}    |    0
 .../omo_02/{omo_02_2_main.c => main.c}        |    0
 .../omo_02/{omo_02_1_music.c => music.c}      |    0
 .../area_omo/omo_02/{omo_02_6_npc.c => npc.c} |    0
 .../omo_02/{omo_02_0_header.c => settings.c}  |    0
 .../omo_03/{omo_03_4_entity.c => entity.c}    |    0
 .../{omo_03_8_epilogue.c => epilogue.c}       |    0
 .../omo_03/{omo_03_3_gizmos.c => gizmos.c}    |    0
 .../omo_03/{omo_03_2_main.c => main.c}        |    0
 .../omo_03/{omo_03_1_music.c => music.c}      |    0
 .../area_omo/omo_03/{omo_03_5_npc.c => npc.c} |    0
 .../omo_03/{omo_03_0_header.c => settings.c}  |    0
 .../omo_03/{omo_03_6_train.c => train.c}      |    0
 .../{omo_03_7_train_drop.c => train_drop.c}   |    0
 .../omo_04/{omo_04_4_entity.c => entity.c}    |    0
 .../omo_04/{omo_04_3_gizmos.c => gizmos.c}    |    0
 .../omo_04/{omo_04_2_main.c => main.c}        |    0
 .../omo_04/{omo_04_1_music.c => music.c}      |    0
 .../area_omo/omo_04/{omo_04_5_npc.c => npc.c} |    0
 .../omo_04/{omo_04_6_scenes.c => scenes.c}    |    0
 .../omo_04/{omo_04_0_header.c => settings.c}  |    0
 .../omo_05/{omo_05_5_entity.c => entity.c}    |    0
 .../omo_05/{omo_05_3_gizmos.c => gizmos.c}    |    0
 .../omo_05/{omo_05_2_main.c => main.c}        |    0
 .../omo_05/{omo_05_1_music.c => music.c}      |    0
 .../area_omo/omo_05/{omo_05_4_npc.c => npc.c} |    0
 .../omo_05/{omo_05_0_header.c => settings.c}  |    0
 .../omo_06/{omo_06_6_entity.c => entity.c}    |    0
 .../omo_06/{omo_06_3_gizmos.c => gizmos.c}    |    0
 .../omo_06/{omo_06_2_main.c => main.c}        |    0
 .../omo_06/{omo_06_1_music.c => music.c}      |    0
 .../area_omo/omo_06/{omo_06_5_npc.c => npc.c} |    0
 .../omo_06/{omo_06_0_header.c => settings.c}  |    0
 .../omo_06/{omo_06_4_train.c => train.c}      |    0
 .../omo_07/{omo_07_5_entity.c => entity.c}    |    0
 .../omo_07/{omo_07_3_gizmos.c => gizmos.c}    |    0
 .../omo_07/{omo_07_2_main.c => main.c}        |    0
 .../omo_07/{omo_07_1_music.c => music.c}      |    0
 .../area_omo/omo_07/{omo_07_4_npc.c => npc.c} |    0
 .../omo_07/{omo_07_6_scenes.c => scenes.c}    |    0
 .../omo_07/{omo_07_0_header.c => settings.c}  |    0
 .../omo_08/{omo_08_3_boxes.c => boxes.c}      |    0
 .../omo_08/{omo_08_5_entity.c => entity.c}    |    0
 .../omo_08/{omo_08_2_main.c => main.c}        |    0
 .../omo_08/{omo_08_1_music.c => music.c}      |    0
 .../area_omo/omo_08/{omo_08_6_npc.c => npc.c} |    0
 .../omo_08/{omo_08_0_header.c => settings.c}  |    0
 .../omo_08/{omo_08_4_train.c => train.c}      |    0
 .../{omo_09_3_conveyors.c => conveyors.c}     |    0
 .../omo_09/{omo_09_6_entity.c => entity.c}    |    0
 .../omo_09/{omo_09_5_gizmos.c => gizmos.c}    |    0
 .../omo_09/{omo_09_2_main.c => main.c}        |    0
 .../omo_09/{omo_09_1_music.c => music.c}      |    0
 .../area_omo/omo_09/{omo_09_7_npc.c => npc.c} |    0
 .../omo_09/{omo_09_8_scenes.c => scenes.c}    |    0
 .../omo_09/{omo_09_0_header.c => settings.c}  |    0
 ...omo_09_4_slot_machine.c => slot_machine.c} |    0
 .../omo_10/{omo_10_6_entity.c => entity.c}    |    0
 .../omo_10/{omo_10_3_gizmos.c => gizmos.c}    |    0
 .../omo_10/{omo_10_2_main.c => main.c}        |    0
 .../omo_10/{omo_10_1_music.c => music.c}      |    0
 .../area_omo/omo_10/{omo_10_5_npc.c => npc.c} |    0
 .../omo_10/{omo_10_0_header.c => settings.c}  |    0
 .../omo_10/{omo_10_4_train.c => train.c}      |    0
 .../omo_11/{omo_11_4_entity.c => entity.c}    |    0
 .../omo_11/{omo_11_3_gizmos.c => gizmos.c}    |    0
 .../omo_11/{omo_11_2_main.c => main.c}        |    0
 .../omo_11/{omo_11_1_music.c => music.c}      |    0
 .../area_omo/omo_11/{omo_11_5_npc.c => npc.c} |    0
 .../omo_11/{omo_11_0_header.c => settings.c}  |    0
 .../omo_12/{omo_12_2_main.c => main.c}        |    0
 .../omo_12/{omo_12_1_music.c => music.c}      |    0
 .../{omo_12_4_new_partner.c => new_partner.c} |    0
 .../area_omo/omo_12/{omo_12_3_npc.c => npc.c} |    0
 .../omo_12/{omo_12_0_header.c => settings.c}  |    0
 .../omo_13/{omo_13_5_entity.c => entity.c}    |    0
 .../omo_13/{omo_13_3_gizmos.c => gizmos.c}    |    0
 .../omo_13/{omo_13_2_main.c => main.c}        |    0
 .../omo_13/{omo_13_1_music.c => music.c}      |    0
 .../area_omo/omo_13/{omo_13_4_npc.c => npc.c} |    0
 .../omo_13/{omo_13_0_header.c => settings.c}  |    0
 .../omo_14/{omo_14_2_main.c => main.c}        |    0
 .../omo_14/{omo_14_1_music.c => music.c}      |    0
 .../area_omo/omo_14/{omo_14_3_npc.c => npc.c} |    0
 .../omo_14/{omo_14_0_header.c => settings.c}  |    0
 .../omo_15/{omo_15_2_main.c => main.c}        |    0
 .../omo_15/{omo_15_1_music.c => music.c}      |    0
 .../area_omo/omo_15/{omo_15_3_npc.c => npc.c} |    0
 .../omo_15/{omo_15_0_header.c => settings.c}  |    0
 .../omo_16/{omo_16_1_main.c => main.c}        |    0
 .../area_omo/omo_16/{omo_16_3_npc.c => npc.c} |    0
 .../omo_16/{omo_16_0_header.c => settings.c}  |    0
 .../omo_16/{omo_16_2_train.c => train.c}      |    0
 .../omo_17/{omo_17_5_entity.c => entity.c}    |    0
 .../omo_17/{omo_17_2_gizmos.c => gizmos.c}    |    0
 .../omo_17/{omo_17_1_main.c => main.c}        |    0
 .../area_omo/omo_17/{omo_17_4_npc.c => npc.c} |    0
 .../omo_17/{omo_17_0_header.c => settings.c}  |    0
 .../omo_17/{omo_17_3_train.c => train.c}      |    0
 .../osr_00/{osr_00_2_main.c => main.c}        |    0
 .../osr_00/{osr_00_1_music.c => music.c}      |    0
 ...osr_00_4_npc_epilogue.c => npc_epilogue.c} |    0
 .../{osr_00_3_npc_intro.c => npc_intro.c}     |    0
 .../osr_00/{osr_00_5_scenes.c => scenes.c}    |    0
 .../osr_00/{osr_00_0_header.c => settings.c}  |    0
 .../osr_01/{osr_01_2_main.c => main.c}        |    0
 .../osr_01/{osr_01_1_music.c => music.c}      |    0
 .../area_osr/osr_01/{osr_01_3_npc.c => npc.c} |    0
 .../osr_01/{osr_01_0_header.c => settings.c}  |    0
 .../osr_02/{osr_02_2_entity.c => entity.c}    |    0
 .../osr_02/{osr_02_1_main.c => main.c}        |    0
 .../area_osr/osr_02/{osr_02_3_npc.c => npc.c} |    0
 .../{osr_02_4_npc_peach.c => npc_peach.c}     |    0
 .../osr_02/{osr_02_0_header.c => settings.c}  |    0
 .../osr_03/{osr_03_6_ending.c => ending.c}    |    0
 .../{osr_03_5_interlude.c => interlude.c}     |    0
 .../osr_03/{osr_03_3_intro.c => intro.c}      |    0
 .../osr_03/{osr_03_1_main.c => main.c}        |    0
 .../area_osr/osr_03/{osr_03_2_npc.c => npc.c} |    0
 .../osr_03/{osr_03_0_header.c => settings.c}  |    0
 .../{osr_03_4_starship.c => starship.c}       |    0
 .../osr_04/{osr_04_2_assault.c => assault.c}  |    0
 .../osr_04/{osr_04_1_main.c => main.c}        |    0
 .../osr_04/{osr_04_0_header.c => settings.c}  |    0
 .../pra_01/{pra_01_4_entity.c => entity.c}    |    0
 .../pra_01/{pra_01_2_main.c => main.c}        |    0
 .../pra_01/{pra_01_1_music.c => music.c}      |    0
 .../area_pra/pra_01/{pra_01_3_npc.c => npc.c} |    0
 .../pra_01/{pra_01_0_header.c => settings.c}  |    0
 .../pra_02/{pra_02_4_entity.c => entity.c}    |    0
 .../pra_02/{pra_02_2_main.c => main.c}        |    0
 .../pra_02/{pra_02_1_music.c => music.c}      |    0
 .../area_pra/pra_02/{pra_02_3_npc.c => npc.c} |    0
 .../pra_02/{pra_02_0_header.c => settings.c}  |    0
 .../pra_03/{pra_03_3_entity.c => entity.c}    |    0
 .../pra_03/{pra_03_2_main.c => main.c}        |    0
 .../pra_03/{pra_03_1_music.c => music.c}      |    0
 .../pra_03/{pra_03_0_header.c => settings.c}  |    0
 .../pra_04/{pra_04_3_entity.c => entity.c}    |    0
 .../pra_04/{pra_04_2_main.c => main.c}        |    0
 .../pra_04/{pra_04_1_music.c => music.c}      |    0
 .../area_pra/pra_04/{pra_04_4_npc.c => npc.c} |    0
 .../pra_04/{pra_04_0_header.c => settings.c}  |    0
 .../pra_05/{pra_05_3_entity.c => entity.c}    |    0
 .../pra_05/{pra_05_2_main.c => main.c}        |    0
 .../pra_05/{pra_05_1_music.c => music.c}      |    0
 .../pra_05/{pra_05_0_header.c => settings.c}  |    0
 .../pra_06/{pra_06_3_entity.c => entity.c}    |    0
 .../pra_06/{pra_06_2_main.c => main.c}        |    0
 .../pra_06/{pra_06_1_music.c => music.c}      |    0
 .../pra_06/{pra_06_0_header.c => settings.c}  |    0
 .../pra_09/{pra_09_2_main.c => main.c}        |    0
 .../pra_09/{pra_09_1_music.c => music.c}      |    0
 .../area_pra/pra_09/{pra_09_3_npc.c => npc.c} |    0
 .../pra_09/{pra_09_0_header.c => settings.c}  |    0
 .../pra_10/{pra_10_2_main.c => main.c}        |    0
 .../pra_10/{pra_10_1_music.c => music.c}      |    0
 .../area_pra/pra_10/{pra_10_3_npc.c => npc.c} |    0
 .../pra_10/{pra_10_0_header.c => settings.c}  |    0
 .../pra_11/{pra_11_3_entity.c => entity.c}    |    0
 .../pra_11/{pra_11_2_main.c => main.c}        |    0
 .../pra_11/{pra_11_1_music.c => music.c}      |    0
 .../pra_11/{pra_11_0_header.c => settings.c}  |    0
 .../pra_12/{pra_12_3_entity.c => entity.c}    |    0
 .../pra_12/{pra_12_2_main.c => main.c}        |    0
 .../pra_12/{pra_12_1_music.c => music.c}      |    0
 .../pra_12/{pra_12_0_header.c => settings.c}  |    0
 .../pra_13/{pra_13_2_main.c => main.c}        |    0
 .../pra_13/{pra_13_1_music.c => music.c}      |    0
 .../area_pra/pra_13/{pra_13_3_npc.c => npc.c} |    0
 .../pra_13/{pra_13_0_header.c => settings.c}  |    0
 .../pra_14/{pra_14_3_entity.c => entity.c}    |    0
 .../pra_14/{pra_14_2_main.c => main.c}        |    0
 .../pra_14/{pra_14_1_music.c => music.c}      |    0
 .../pra_14/{pra_14_0_header.c => settings.c}  |    0
 .../pra_15/{pra_15_3_entity.c => entity.c}    |    0
 .../pra_15/{pra_15_2_main.c => main.c}        |    0
 .../pra_15/{pra_15_1_music.c => music.c}      |    0
 .../pra_15/{pra_15_0_header.c => settings.c}  |    0
 .../pra_16/{pra_16_2_main.c => main.c}        |    0
 .../pra_16/{pra_16_1_music.c => music.c}      |    0
 .../pra_16/{pra_16_0_header.c => settings.c}  |    0
 .../pra_18/{pra_18_2_main.c => main.c}        |    0
 .../pra_18/{pra_18_1_music.c => music.c}      |    0
 .../area_pra/pra_18/{pra_18_3_npc.c => npc.c} |    0
 .../pra_18/{pra_18_0_header.c => settings.c}  |    0
 .../pra_19/{pra_19_2_main.c => main.c}        |    0
 .../pra_19/{pra_19_1_music.c => music.c}      |    0
 .../area_pra/pra_19/{pra_19_3_npc.c => npc.c} |    0
 .../pra_19/{pra_19_0_header.c => settings.c}  |    0
 .../pra_20/{pra_20_2_main.c => main.c}        |    0
 .../pra_20/{pra_20_1_music.c => music.c}      |    0
 .../pra_20/{pra_20_0_header.c => settings.c}  |    0
 .../pra_21/{pra_21_3_entity.c => entity.c}    |    0
 .../pra_21/{pra_21_2_main.c => main.c}        |    0
 .../pra_21/{pra_21_1_music.c => music.c}      |    0
 .../pra_21/{pra_21_0_header.c => settings.c}  |    0
 .../pra_22/{pra_22_3_entity.c => entity.c}    |    0
 .../pra_22/{pra_22_2_main.c => main.c}        |    0
 .../pra_22/{pra_22_1_music.c => music.c}      |    0
 .../pra_22/{pra_22_0_header.c => settings.c}  |    0
 .../pra_27/{pra_27_3_entity.c => entity.c}    |    0
 .../pra_27/{pra_27_2_main.c => main.c}        |    0
 .../pra_27/{pra_27_1_music.c => music.c}      |    0
 .../pra_27/{pra_27_0_header.c => settings.c}  |    0
 .../pra_28/{pra_28_3_entity.c => entity.c}    |    0
 .../pra_28/{pra_28_2_main.c => main.c}        |    0
 .../pra_28/{pra_28_1_music.c => music.c}      |    0
 .../pra_28/{pra_28_0_header.c => settings.c}  |    0
 .../pra_29/{pra_29_4_bridge.c => bridge.c}    |    0
 .../pra_29/{pra_29_2_entity.c => entity.c}    |    0
 .../pra_29/{pra_29_3_main.c => main.c}        |    0
 .../pra_29/{pra_29_1_music.c => music.c}      |    0
 .../pra_29/{pra_29_0_header.c => settings.c}  |    0
 .../pra_31/{pra_31_3_main.c => main.c}        |    0
 .../pra_31/{pra_31_1_music.c => music.c}      |    0
 .../area_pra/pra_31/{pra_31_2_npc.c => npc.c} |    0
 .../pra_31/{pra_31_4_puzzle.c => puzzle.c}    |    0
 .../pra_31/{pra_31_0_header.c => settings.c}  |    0
 .../{pra_31_9_stairs_anim.c => stairs_anim.c} |    0
 ..._31_10_stairs_lights.c => stairs_lights.c} |    0
 ...pra_31_8_stairs_skele.c => stairs_skele.c} |    0
 .../{pra_31_11_stairs_vtx.c => stairs_vtx.c}  |    0
 .../{pra_31_5_texture_1.c => texture_1.c}     |    0
 .../{pra_31_6_texture_2.c => texture_2.c}     |    0
 .../{pra_31_7_texture_3.c => texture_3.c}     |    0
 .../pra_32/{pra_32_2_main.c => main.c}        |    0
 .../pra_32/{pra_32_1_music.c => music.c}      |    0
 .../area_pra/pra_32/{pra_32_3_npc.c => npc.c} |    0
 .../pra_32/{pra_32_0_header.c => settings.c}  |    0
 .../pra_33/{pra_33_3_entity.c => entity.c}    |    0
 .../pra_33/{pra_33_2_main.c => main.c}        |    0
 .../pra_33/{pra_33_1_music.c => music.c}      |    0
 .../pra_33/{pra_33_0_header.c => settings.c}  |    0
 .../pra_34/{pra_34_3_entity.c => entity.c}    |    0
 .../pra_34/{pra_34_2_main.c => main.c}        |    0
 .../pra_34/{pra_34_1_music.c => music.c}      |    0
 .../pra_34/{pra_34_0_header.c => settings.c}  |    0
 .../pra_35/{pra_35_4_entity.c => entity.c}    |    0
 .../pra_35/{pra_35_2_main.c => main.c}        |    0
 .../pra_35/{pra_35_1_music.c => music.c}      |    0
 .../area_pra/pra_35/{pra_35_3_npc.c => npc.c} |    0
 .../pra_35/{pra_35_0_header.c => settings.c}  |    0
 .../pra_36/{pra_36_2_main.c => main.c}        |    0
 .../pra_36/{pra_36_1_music.c => music.c}      |    0
 .../area_pra/pra_36/{pra_36_3_npc.c => npc.c} |    0
 .../pra_36/{pra_36_0_header.c => settings.c}  |    0
 .../pra_37/{pra_37_2_main.c => main.c}        |    0
 .../pra_37/{pra_37_1_music.c => music.c}      |    0
 .../area_pra/pra_37/{pra_37_3_npc.c => npc.c} |    0
 .../pra_37/{pra_37_0_header.c => settings.c}  |    0
 .../pra_38/{pra_38_2_main.c => main.c}        |    0
 .../pra_38/{pra_38_1_music.c => music.c}      |    0
 .../area_pra/pra_38/{pra_38_3_npc.c => npc.c} |    0
 .../pra_38/{pra_38_0_header.c => settings.c}  |    0
 .../pra_39/{pra_39_2_main.c => main.c}        |    0
 .../pra_39/{pra_39_1_music.c => music.c}      |    0
 .../area_pra/pra_39/{pra_39_3_npc.c => npc.c} |    0
 .../pra_39/{pra_39_0_header.c => settings.c}  |    0
 .../pra_40/{pra_40_3_entity.c => entity.c}    |    0
 .../pra_40/{pra_40_2_main.c => main.c}        |    0
 .../pra_40/{pra_40_1_music.c => music.c}      |    0
 .../pra_40/{pra_40_0_header.c => settings.c}  |    0
 .../sam_01/{sam_01_6_entity.c => entity.c}    |    0
 .../sam_01/{sam_01_2_main.c => main.c}        |    0
 .../sam_01/{sam_01_1_music.c => music.c}      |    0
 .../area_sam/sam_01/{sam_01_4_npc.c => npc.c} |    0
 .../sam_01/{sam_01_3_rooms.c => rooms.c}      |    0
 .../sam_01/{sam_01_5_scenes.c => scenes.c}    |    0
 .../sam_01/{sam_01_0_header.c => settings.c}  |    0
 .../sam_02/{sam_02_5_entity.c => entity.c}    |    0
 .../sam_02/{sam_02_2_main.c => main.c}        |    0
 .../sam_02/{sam_02_1_music.c => music.c}      |    0
 .../area_sam/sam_02/{sam_02_4_npc.c => npc.c} |    0
 .../sam_02/{sam_02_3_rooms.c => rooms.c}      |    0
 .../sam_02/{sam_02_0_header.c => settings.c}  |    0
 .../sam_02/{sam_02_6_shop.c => shop.c}        |    0
 .../sam_03/{sam_03_2_main.c => main.c}        |    0
 .../sam_03/{sam_03_1_music.c => music.c}      |    0
 .../sam_03/{sam_03_3_npc1.c => npc1.c}        |    0
 .../sam_03/{sam_03_4_npc2.c => npc2.c}        |    0
 .../sam_03/{sam_03_0_header.c => settings.c}  |    0
 .../sam_04/{sam_04_5_entity.c => entity.c}    |    0
 .../sam_04/{sam_04_2_main.c => main.c}        |    0
 .../sam_04/{sam_04_1_music.c => music.c}      |    0
 .../area_sam/sam_04/{sam_04_4_npc.c => npc.c} |    0
 .../sam_04/{sam_04_0_header.c => settings.c}  |    0
 .../sam_04/{sam_04_3_snowmen.c => snowmen.c}  |    0
 .../sam_05/{sam_05_3_entity.c => entity.c}    |    0
 .../sam_05/{sam_05_2_main.c => main.c}        |    0
 .../{sam_05_6_monstar_gfx.c => monstar_gfx.c} |    0
 .../{sam_05_7_monstar_vtx.c => monstar_vtx.c} |    0
 .../sam_05/{sam_05_1_music.c => music.c}      |    0
 .../area_sam/sam_05/{sam_05_4_npc.c => npc.c} |    0
 .../sam_05/{sam_05_5_scenes.c => scenes.c}    |    0
 .../sam_05/{sam_05_0_header.c => settings.c}  |    0
 .../sam_06/{sam_06_5_entity.c => entity.c}    |    0
 .../sam_06/{sam_06_2_main.c => main.c}        |    0
 .../sam_06/{sam_06_1_music.c => music.c}      |    0
 .../area_sam/sam_06/{sam_06_4_npc.c => npc.c} |    0
 .../sam_06/{sam_06_3_rooms.c => rooms.c}      |    0
 .../sam_06/{sam_06_0_header.c => settings.c}  |    0
 .../sam_07/{sam_07_3_entity.c => entity.c}    |    0
 .../{sam_07_4_frozen_pit.c => frozen_pit.c}   |    0
 .../sam_07/{sam_07_2_main.c => main.c}        |    0
 .../sam_07/{sam_07_1_music.c => music.c}      |    0
 .../area_sam/sam_07/{sam_07_5_npc.c => npc.c} |    0
 .../sam_07/{sam_07_0_header.c => settings.c}  |    0
 .../sam_08/{sam_08_3_entity.c => entity.c}    |    0
 .../sam_08/{sam_08_2_main.c => main.c}        |    0
 .../sam_08/{sam_08_1_music.c => music.c}      |    0
 .../area_sam/sam_08/{sam_08_4_npc.c => npc.c} |    0
 .../sam_08/{sam_08_5_scenes.c => scenes.c}    |    0
 .../sam_08/{sam_08_0_header.c => settings.c}  |    0
 .../sam_09/{sam_09_3_entity.c => entity.c}    |    0
 .../sam_09/{sam_09_2_main.c => main.c}        |    0
 .../sam_09/{sam_09_1_music.c => music.c}      |    0
 .../sam_09/{sam_09_0_header.c => settings.c}  |    0
 .../sam_09/{sam_09_4_sockets.c => sockets.c}  |    0
 .../sam_10/{sam_10_3_entity.c => entity.c}    |    0
 .../sam_10/{sam_10_2_main.c => main.c}        |    0
 .../sam_10/{sam_10_1_music.c => music.c}      |    0
 .../area_sam/sam_10/{sam_10_5_npc.c => npc.c} |    0
 .../sam_10/{sam_10_0_header.c => settings.c}  |    0
 .../sam_10/{sam_10_4_stairs.c => stairs.c}    |    0
 .../sam_11/{sam_11_4_entity.c => entity.c}    |    0
 .../sam_11/{sam_11_2_main.c => main.c}        |    0
 .../sam_11/{sam_11_1_music.c => music.c}      |    0
 .../area_sam/sam_11/{sam_11_5_npc.c => npc.c} |    0
 .../sam_11/{sam_11_6_pond.c => pond.c}        |    0
 .../{sam_11_8_pond_anim.c => pond_anim.c}     |    0
 .../{sam_11_9_pond_skele.c => pond_skele.c}   |    0
 .../sam_11/{sam_11_3_rooms.c => rooms.c}      |    0
 .../sam_11/{sam_11_0_header.c => settings.c}  |    0
 .../{sam_11_7_staircase.c => staircase.c}     |    0
 .../sam_12/{sam_12_5_entity.c => entity.c}    |    0
 .../sam_12/{sam_12_2_main.c => main.c}        |    0
 .../sam_12/{sam_12_1_music.c => music.c}      |    0
 .../area_sam/sam_12/{sam_12_3_npc.c => npc.c} |    0
 .../sam_12/{sam_12_4_scenes.c => scenes.c}    |    0
 .../sam_12/{sam_12_0_header.c => settings.c}  |    0
 .../sbk_00/{sbk_00_3_entity.c => entity.c}    |    0
 .../sbk_00/{sbk_00_1_main.c => main.c}        |    0
 .../area_sbk/sbk_00/{sbk_00_2_npc.c => npc.c} |    0
 .../sbk_00/{sbk_00_0_header.c => settings.c}  |    0
 .../sbk_01/{sbk_01_1_main.c => main.c}        |    0
 .../area_sbk/sbk_01/{sbk_01_2_npc.c => npc.c} |    0
 .../sbk_02/{sbk_02_5_entity.c => entity.c}    |    0
 .../sbk_02/{sbk_02_2_main.c => main.c}        |    0
 .../sbk_02/{sbk_02_1_music.c => music.c}      |    0
 .../area_sbk/sbk_02/{sbk_02_4_npc.c => npc.c} |    0
 .../sbk_02/{sbk_02_3_ruins.c => ruins.c}      |    0
 .../sbk_02/{sbk_02_0_header.c => settings.c}  |    0
 .../sbk_03/{sbk_03_1_main.c => main.c}        |    0
 .../area_sbk/sbk_03/{sbk_03_2_npc.c => npc.c} |    0
 .../sbk_04/{sbk_04_1_main.c => main.c}        |    0
 .../area_sbk/sbk_04/{sbk_04_2_npc.c => npc.c} |    0
 .../sbk_05/{sbk_05_2_entity.c => entity.c}    |    0
 .../sbk_05/{sbk_05_1_main.c => main.c}        |    0
 .../area_sbk/sbk_05/{sbk_05_3_npc.c => npc.c} |    0
 .../sbk_06/{sbk_06_4_entity.c => entity.c}    |    0
 .../sbk_06/{sbk_06_3_foliage.c => foliage.c}  |    0
 .../sbk_06/{sbk_06_1_main.c => main.c}        |    0
 .../area_sbk/sbk_06/{sbk_06_2_npc.c => npc.c} |    0
 .../sbk_10/{sbk_10_2_entity.c => entity.c}    |    0
 .../sbk_10/{sbk_10_1_main.c => main.c}        |    0
 .../sbk_11/{sbk_11_1_main.c => main.c}        |    0
 .../area_sbk/sbk_11/{sbk_11_2_npc.c => npc.c} |    0
 .../sbk_12/{sbk_12_1_main.c => main.c}        |    0
 .../area_sbk/sbk_12/{sbk_12_2_npc.c => npc.c} |    0
 .../sbk_13/{sbk_13_1_main.c => main.c}        |    0
 .../area_sbk/sbk_13/{sbk_13_2_npc.c => npc.c} |    0
 .../sbk_14/{sbk_14_2_entity.c => entity.c}    |    0
 .../sbk_14/{sbk_14_1_main.c => main.c}        |    0
 .../sbk_15/{sbk_15_1_main.c => main.c}        |    0
 .../area_sbk/sbk_15/{sbk_15_2_npc.c => npc.c} |    0
 .../sbk_16/{sbk_16_2_foliage.c => foliage.c}  |    0
 .../sbk_16/{sbk_16_1_main.c => main.c}        |    0
 .../sbk_20/{sbk_20_2_entity.c => entity.c}    |    0
 .../sbk_20/{sbk_20_1_main.c => main.c}        |    0
 .../area_sbk/sbk_20/{sbk_20_2_npc.c => npc.c} |    0
 .../sbk_21/{sbk_21_1_main.c => main.c}        |    0
 .../sbk_22/{sbk_22_3_entity.c => entity.c}    |    0
 .../sbk_22/{sbk_22_1_main.c => main.c}        |    0
 .../area_sbk/sbk_22/{sbk_22_2_npc.c => npc.c} |    0
 .../sbk_23/{sbk_23_2_entity.c => entity.c}    |    0
 .../sbk_23/{sbk_23_1_main.c => main.c}        |    0
 .../sbk_24/{sbk_24_3_entity.c => entity.c}    |    0
 .../sbk_24/{sbk_24_4_foliage.c => foliage.c}  |    0
 .../sbk_24/{sbk_24_1_main.c => main.c}        |    0
 .../area_sbk/sbk_24/{sbk_24_2_npc.c => npc.c} |    0
 .../sbk_25/{sbk_25_4_entity.c => entity.c}    |    0
 .../sbk_25/{sbk_25_3_foliage.c => foliage.c}  |    0
 .../sbk_25/{sbk_25_1_main.c => main.c}        |    0
 .../area_sbk/sbk_25/{sbk_25_2_npc.c => npc.c} |    0
 .../sbk_26/{sbk_26_3_foliage.c => foliage.c}  |    0
 .../sbk_26/{sbk_26_1_main.c => main.c}        |    0
 .../area_sbk/sbk_26/{sbk_26_2_npc.c => npc.c} |    0
 .../sbk_30/{sbk_30_4_foliage.c => foliage.c}  |    0
 .../sbk_30/{sbk_30_2_main.c => main.c}        |    0
 .../sbk_30/{sbk_30_1_music.c => music.c}      |    0
 .../area_sbk/sbk_30/{sbk_30_3_npc.c => npc.c} |    0
 .../sbk_30/{sbk_30_0_header.c => settings.c}  |    0
 .../sbk_31/{sbk_31_1_main.c => main.c}        |    0
 .../area_sbk/sbk_31/{sbk_31_2_npc.c => npc.c} |    0
 .../sbk_32/{sbk_32_1_main.c => main.c}        |    0
 .../area_sbk/sbk_32/{sbk_32_2_npc.c => npc.c} |    0
 .../sbk_33/{sbk_33_1_entity.c => entity.c}    |    0
 .../sbk_33/{sbk_33_2_main.c => main.c}        |    0
 .../sbk_33/{sbk_33_0_header.c => settings.c}  |    0
 .../sbk_34/{sbk_34_3_foliage.c => foliage.c}  |    0
 .../sbk_34/{sbk_34_1_main.c => main.c}        |    0
 .../area_sbk/sbk_34/{sbk_34_2_npc.c => npc.c} |    0
 .../sbk_35/{sbk_35_3_foliage.c => foliage.c}  |    0
 .../sbk_35/{sbk_35_1_main.c => main.c}        |    0
 .../area_sbk/sbk_35/{sbk_35_2_npc.c => npc.c} |    0
 .../sbk_36/{sbk_36_3_entity.c => entity.c}    |    0
 .../sbk_36/{sbk_36_2_foliage.c => foliage.c}  |    0
 .../sbk_36/{sbk_36_1_main.c => main.c}        |    0
 .../sbk_40/{sbk_40_3_entity.c => entity.c}    |    0
 .../sbk_40/{sbk_40_1_main.c => main.c}        |    0
 .../area_sbk/sbk_40/{sbk_40_2_npc.c => npc.c} |    0
 .../sbk_41/{sbk_41_2_entity.c => entity.c}    |    0
 .../sbk_41/{sbk_41_1_main.c => main.c}        |    0
 .../sbk_42/{sbk_42_1_main.c => main.c}        |    0
 .../area_sbk/sbk_42/{sbk_42_2_npc.c => npc.c} |    0
 .../sbk_43/{sbk_43_2_entity.c => entity.c}    |    0
 .../sbk_43/{sbk_43_1_main.c => main.c}        |    0
 .../sbk_44/{sbk_44_1_main.c => main.c}        |    0
 .../area_sbk/sbk_44/{sbk_44_2_npc.c => npc.c} |    0
 .../sbk_45/{sbk_45_2_entity.c => entity.c}    |    0
 .../sbk_45/{sbk_45_1_main.c => main.c}        |    0
 .../sbk_46/{sbk_46_4_entity.c => entity.c}    |    0
 .../sbk_46/{sbk_46_3_foliage.c => foliage.c}  |    0
 .../sbk_46/{sbk_46_1_main.c => main.c}        |    0
 .../area_sbk/sbk_46/{sbk_46_2_npc.c => npc.c} |    0
 .../sbk_50/{sbk_50_1_main.c => main.c}        |    0
 .../sbk_51/{sbk_51_1_main.c => main.c}        |    0
 .../area_sbk/sbk_51/{sbk_51_2_npc.c => npc.c} |    0
 .../sbk_52/{sbk_52_2_entity.c => entity.c}    |    0
 .../sbk_52/{sbk_52_1_main.c => main.c}        |    0
 .../sbk_53/{sbk_53_1_main.c => main.c}        |    0
 .../area_sbk/sbk_53/{sbk_53_2_npc.c => npc.c} |    0
 .../sbk_54/{sbk_54_2_entity.c => entity.c}    |    0
 .../sbk_54/{sbk_54_1_main.c => main.c}        |    0
 .../sbk_55/{sbk_55_4_entity.c => entity.c}    |    0
 .../sbk_55/{sbk_55_3_foliage.c => foliage.c}  |    0
 .../sbk_55/{sbk_55_1_main.c => main.c}        |    0
 .../area_sbk/sbk_55/{sbk_55_2_npc.c => npc.c} |    0
 .../sbk_56/{sbk_56_2_entity.c => entity.c}    |    0
 .../sbk_56/{sbk_56_3_foliage.c => foliage.c}  |    0
 .../sbk_56/{sbk_56_1_main.c => main.c}        |    0
 .../sbk_60/{sbk_60_1_main.c => main.c}        |    0
 .../area_sbk/sbk_60/{sbk_60_2_npc.c => npc.c} |    0
 .../sbk_61/{sbk_61_2_entity.c => entity.c}    |    0
 .../sbk_61/{sbk_61_1_main.c => main.c}        |    0
 .../sbk_62/{sbk_62_1_main.c => main.c}        |    0
 .../area_sbk/sbk_62/{sbk_62_2_npc.c => npc.c} |    0
 .../sbk_63/{sbk_63_1_main.c => main.c}        |    0
 .../area_sbk/sbk_63/{sbk_63_2_npc.c => npc.c} |    0
 .../sbk_64/{sbk_64_2_entity.c => entity.c}    |    0
 .../sbk_64/{sbk_64_1_main.c => main.c}        |    0
 .../sbk_65/{sbk_65_1_main.c => main.c}        |    0
 .../sbk_66/{sbk_66_4_entity.c => entity.c}    |    0
 .../sbk_66/{sbk_66_3_foliage.c => foliage.c}  |    0
 .../sbk_66/{sbk_66_1_main.c => main.c}        |    0
 .../area_sbk/sbk_66/{sbk_66_2_npc.c => npc.c} |    0
 .../sbk_99/{sbk_99_2_entity.c => entity.c}    |    0
 .../sbk_99/{sbk_99_1_main.c => main.c}        |    0
 .../tik_01/{tik_01_3_drips.c => drips.c}      |    0
 .../tik_01/{tik_01_4_entity.c => entity.c}    |    0
 .../tik_01/{tik_01_2_main.c => main.c}        |    0
 .../tik_01/{tik_01_1_music.c => music.c}      |    0
 .../area_tik/tik_01/{tik_01_5_npc.c => npc.c} |    0
 .../tik_01/{tik_01_0_header.c => settings.c}  |    0
 .../tik_02/{tik_02_4_drips.c => drips.c}      |    0
 .../tik_02/{tik_02_3_entity.c => entity.c}    |    0
 .../tik_02/{tik_02_2_main.c => main.c}        |    0
 .../tik_02/{tik_02_1_music.c => music.c}      |    0
 .../area_tik/tik_02/{tik_02_5_npc.c => npc.c} |    0
 .../tik_02/{tik_02_0_header.c => settings.c}  |    0
 .../tik_03/{tik_03_6_demo.c => demo.c}        |    0
 .../tik_03/{tik_03_3_drips.c => drips.c}      |    0
 .../tik_03/{tik_03_5_entity.c => entity.c}    |    0
 .../tik_03/{tik_03_2_main.c => main.c}        |    0
 .../tik_03/{tik_03_1_music.c => music.c}      |    0
 .../{tik_03_4_platforms.c => platforms.c}     |    0
 .../tik_03/{tik_03_0_header.c => settings.c}  |    0
 .../tik_04/{tik_04_3_drips.c => drips.c}      |    0
 .../tik_04/{tik_04_2_main.c => main.c}        |    0
 .../tik_04/{tik_04_1_music.c => music.c}      |    0
 .../area_tik/tik_04/{tik_04_5_npc.c => npc.c} |    0
 .../{tik_04_4_platforms.c => platforms.c}     |    0
 .../tik_04/{tik_04_0_header.c => settings.c}  |    0
 .../tik_05/{tik_05_3_drips.c => drips.c}      |    0
 .../tik_05/{tik_05_4_entity.c => entity.c}    |    0
 .../tik_05/{tik_05_2_main.c => main.c}        |    0
 .../tik_05/{tik_05_1_music.c => music.c}      |    0
 .../area_tik/tik_05/{tik_05_5_npc.c => npc.c} |    0
 .../tik_05/{tik_05_0_header.c => settings.c}  |    0
 .../tik_06/{tik_06_3_drips.c => drips.c}      |    0
 .../tik_06/{tik_06_4_entity.c => entity.c}    |    0
 .../tik_06/{tik_06_2_main.c => main.c}        |    0
 .../tik_06/{tik_06_1_music.c => music.c}      |    0
 .../tik_06/{tik_06_0_header.c => settings.c}  |    0
 .../tik_07/{tik_07_4_drips.c => drips.c}      |    0
 .../tik_07/{tik_07_3_entity.c => entity.c}    |    0
 .../tik_07/{tik_07_2_main.c => main.c}        |    0
 .../tik_07/{tik_07_1_music.c => music.c}      |    0
 .../area_tik/tik_07/{tik_07_6_npc.c => npc.c} |    0
 .../{tik_07_5_platforms.c => platforms.c}     |    0
 .../tik_07/{tik_07_0_header.c => settings.c}  |    0
 .../tik_08/{tik_08_3_drips.c => drips.c}      |    0
 .../tik_08/{tik_08_4_entity.c => entity.c}    |    0
 .../tik_08/{tik_08_2_main.c => main.c}        |    0
 .../tik_08/{tik_08_1_music.c => music.c}      |    0
 .../area_tik/tik_08/{tik_08_5_npc.c => npc.c} |    0
 .../tik_08/{tik_08_0_header.c => settings.c}  |    0
 .../tik_09/{tik_09_3_drips.c => drips.c}      |    0
 .../tik_09/{tik_09_4_entity.c => entity.c}    |    0
 .../tik_09/{tik_09_2_main.c => main.c}        |    0
 .../tik_09/{tik_09_1_music.c => music.c}      |    0
 .../area_tik/tik_09/{tik_09_5_npc.c => npc.c} |    0
 .../tik_09/{tik_09_0_header.c => settings.c}  |    0
 .../tik_10/{tik_10_3_drips.c => drips.c}      |    0
 .../tik_10/{tik_10_4_entity.c => entity.c}    |    0
 .../tik_10/{tik_10_2_main.c => main.c}        |    0
 .../tik_10/{tik_10_1_music.c => music.c}      |    0
 .../tik_10/{tik_10_0_header.c => settings.c}  |    0
 .../tik_12/{tik_12_3_drips.c => drips.c}      |    0
 .../tik_12/{tik_12_4_entity.c => entity.c}    |    0
 .../tik_12/{tik_12_2_main.c => main.c}        |    0
 .../tik_12/{tik_12_1_music.c => music.c}      |    0
 .../area_tik/tik_12/{tik_12_5_npc.c => npc.c} |    0
 .../tik_12/{tik_12_0_header.c => settings.c}  |    0
 .../tik_14/{tik_14_3_drips.c => drips.c}      |    0
 .../tik_14/{tik_14_4_entity.c => entity.c}    |    0
 .../tik_14/{tik_14_2_main.c => main.c}        |    0
 .../tik_14/{tik_14_1_music.c => music.c}      |    0
 .../tik_14/{tik_14_0_header.c => settings.c}  |    0
 .../tik_15/{tik_15_4_drips.c => drips.c}      |    0
 .../tik_15/{tik_15_3_entity.c => entity.c}    |    0
 .../tik_15/{tik_15_2_main.c => main.c}        |    0
 .../tik_15/{tik_15_1_music.c => music.c}      |    0
 .../area_tik/tik_15/{tik_15_5_npc.c => npc.c} |    0
 .../tik_15/{tik_15_0_header.c => settings.c}  |    0
 .../tik_17/{tik_17_2_entity.c => entity.c}    |    0
 .../tik_17/{tik_17_3_main.c => main.c}        |    0
 .../tik_17/{tik_17_1_music.c => music.c}      |    0
 .../tik_17/{tik_17_0_header.c => settings.c}  |    0
 .../tik_18/{tik_18_3_drips.c => drips.c}      |    0
 .../tik_18/{tik_18_5_entity.c => entity.c}    |    0
 .../tik_18/{tik_18_2_main.c => main.c}        |    0
 .../tik_18/{tik_18_1_music.c => music.c}      |    0
 .../area_tik/tik_18/{tik_18_4_npc.c => npc.c} |    0
 .../tik_18/{tik_18_0_header.c => settings.c}  |    0
 .../tik_19/{tik_19_3_entity.c => entity.c}    |    0
 .../tik_19/{tik_19_2_main.c => main.c}        |    0
 .../tik_19/{tik_19_1_music.c => music.c}      |    0
 .../tik_19/{tik_19_0_header.c => settings.c}  |    0
 .../tik_20/{tik_20_4_entity.c => entity.c}    |    0
 .../tik_20/{tik_20_2_main.c => main.c}        |    0
 .../tik_20/{tik_20_1_music.c => music.c}      |    0
 .../area_tik/tik_20/{tik_20_3_npc.c => npc.c} |    0
 .../tik_20/{tik_20_0_header.c => settings.c}  |    0
 .../tik_21/{tik_21_3_entity.c => entity.c}    |    0
 .../tik_21/{tik_21_2_main.c => main.c}        |    0
 .../tik_21/{tik_21_1_music.c => music.c}      |    0
 .../tik_21/{tik_21_0_header.c => settings.c}  |    0
 .../tik_22/{tik_22_2_main.c => main.c}        |    0
 .../tik_22/{tik_22_1_music.c => music.c}      |    0
 .../tik_22/{tik_22_0_header.c => settings.c}  |    0
 .../tik_23/{tik_23_3_entity.c => entity.c}    |    0
 .../tik_23/{tik_23_2_main.c => main.c}        |    0
 .../tik_23/{tik_23_1_music.c => music.c}      |    0
 .../area_tik/tik_23/{tik_23_4_npc.c => npc.c} |    0
 .../tik_23/{tik_23_0_header.c => settings.c}  |    0
 .../tik_24/{tik_24_3_drips.c => drips.c}      |    0
 .../tik_24/{tik_24_4_entity.c => entity.c}    |    0
 .../tik_24/{tik_24_2_main.c => main.c}        |    0
 .../tik_24/{tik_24_1_music.c => music.c}      |    0
 .../area_tik/tik_24/{tik_24_5_npc.c => npc.c} |    0
 .../tik_24/{tik_24_0_header.c => settings.c}  |    0
 .../tik_25/{tik_25_3_entity.c => entity.c}    |    0
 .../tik_25/{tik_25_2_main.c => main.c}        |    0
 .../tik_25/{tik_25_1_music.c => music.c}      |    0
 .../tik_25/{tik_25_0_header.c => settings.c}  |    0
 .../trd_00/{trd_00_2_entity.c => entity.c}    |    0
 .../trd_00/{trd_00_1_main.c => main.c}        |    0
 .../area_trd/trd_00/{trd_00_3_npc.c => npc.c} |    0
 .../trd_00/{trd_00_0_header.c => settings.c}  |    0
 .../trd_01/{trd_01_2_entity.c => entity.c}    |    0
 .../trd_01/{trd_01_1_main.c => main.c}        |    0
 .../area_trd/trd_01/{trd_01_3_npc.c => npc.c} |    0
 .../trd_01/{trd_01_0_header.c => settings.c}  |    0
 .../trd_02/{trd_02_2_entity.c => entity.c}    |    0
 .../trd_02/{trd_02_1_main.c => main.c}        |    0
 .../area_trd/trd_02/{trd_02_3_npc.c => npc.c} |    0
 .../trd_02/{trd_02_0_header.c => settings.c}  |    0
 .../trd_03/{trd_03_2_entity.c => entity.c}    |    0
 .../trd_03/{trd_03_1_main.c => main.c}        |    0
 .../area_trd/trd_03/{trd_03_3_npc.c => npc.c} |    0
 .../trd_03/{trd_03_4_puzzle.c => puzzle.c}    |    0
 .../trd_03/{trd_03_0_header.c => settings.c}  |    0
 .../trd_04/{trd_04_2_entity.c => entity.c}    |    0
 .../trd_04/{trd_04_1_main.c => main.c}        |    0
 .../area_trd/trd_04/{trd_04_3_npc.c => npc.c} |    0
 .../trd_04/{trd_04_0_header.c => settings.c}  |    0
 .../trd_05/{trd_05_2_entity.c => entity.c}    |    0
 .../trd_05/{trd_05_1_main.c => main.c}        |    0
 .../area_trd/trd_05/{trd_05_4_npc.c => npc.c} |    0
 .../trd_05/{trd_05_0_header.c => settings.c}  |    0
 .../trd_05/{trd_05_3_trap.c => trap.c}        |    0
 .../trd_06/{trd_06_5_entity.c => entity.c}    |    0
 .../trd_06/{trd_06_2_falling.c => falling.c}  |    0
 .../trd_06/{trd_06_1_main.c => main.c}        |    0
 ...06_4_npc_koopa_bros.c => npc_koopa_bros.c} |    0
 ...d_06_3_npc_prisoners.c => npc_prisoners.c} |    0
 .../trd_06/{trd_06_0_header.c => settings.c}  |    0
 .../{trd_07_3_magic_doors.c => magic_doors.c} |    0
 .../trd_07/{trd_07_1_main.c => main.c}        |    0
 .../area_trd/trd_07/{trd_07_2_npc.c => npc.c} |    0
 .../trd_07/{trd_07_0_header.c => settings.c}  |    0
 .../trd_08/{trd_08_2_entity.c => entity.c}    |    0
 .../trd_08/{trd_08_1_main.c => main.c}        |    0
 .../area_trd/trd_08/{trd_08_3_npc.c => npc.c} |    0
 .../trd_08/{trd_08_0_header.c => settings.c}  |    0
 .../trd_09/{trd_09_4_demo.c => demo.c}        |    0
 .../trd_09/{trd_09_2_entity.c => entity.c}    |    0
 .../trd_09/{trd_09_1_main.c => main.c}        |    0
 .../area_trd/trd_09/{trd_09_3_npc.c => npc.c} |    0
 .../trd_09/{trd_09_0_header.c => settings.c}  |    0
 .../{trd_10_3_fake_bowser.c => fake_bowser.c} |    0
 .../trd_10/{trd_10_1_main.c => main.c}        |    0
 .../area_trd/trd_10/{trd_10_2_npc.c => npc.c} |    0
 .../trd_10/{trd_10_0_header.c => settings.c}  |    0
 .../tst_01/{tst_01_2_entity.c => entity.c}    |    0
 .../tst_01/{tst_01_1_main.c => main.c}        |    0
 .../tst_02/{tst_02_2_entity.c => entity.c}    |    0
 .../tst_02/{tst_02_1_main.c => main.c}        |    0
 .../tst_03/{tst_03_2_entity.c => entity.c}    |    0
 .../tst_03/{tst_03_1_main.c => main.c}        |    0
 .../tst_04/{tst_04_2_entity.c => entity.c}    |    0
 .../tst_04/{tst_04_1_main.c => main.c}        |    0
 .../area_tst/tst_04/{tst_04_4_npc.c => npc.c} |    0
 .../{tst_04_3_reflection.c => reflection.c}   |    0
 .../tst_10/{tst_10_1_main.c => main.c}        |    0
 .../tst_11/{tst_11_2_extra.c => extra.c}      |    0
 .../tst_11/{tst_11_1_main.c => main.c}        |    0
 .../tst_12/{tst_12_1_main.c => main.c}        |    0
 .../tst_13/{tst_13_1_main.c => main.c}        |    0
 .../tst_20/{tst_20_1_main.c => main.c}        |    0
 .../{flo_00_5_beanstalk.c => beanstalk.c}     |    0
 .../flo_00/{flo_00_6_entity.c => entity.c}    |    0
 .../{flo_00_4_epilogue.c => epilogue.c}       |    0
 .../flo_00/{flo_00_2_main.c => main.c}        |    0
 .../flo_00/{flo_00_1_music.c => music.c}      |    0
 .../area_flo/flo_00/{flo_00_3_npc.c => npc.c} |    0
 .../flo_00/{flo_00_0_header.c => settings.c}  |    0
 .../flo_03/{flo_03_5_entity.c => entity.c}    |    0
 .../flo_03/{flo_03_4_foliage.c => foliage.c}  |    0
 .../flo_03/{flo_03_2_main.c => main.c}        |    0
 .../flo_03/{flo_03_1_music.c => music.c}      |    0
 .../area_flo/flo_03/{flo_03_3_npc.c => npc.c} |    0
 .../flo_03/{flo_03_0_header.c => settings.c}  |    0
 .../flo_07/{flo_07_2_main.c => main.c}        |    0
 .../flo_07/{flo_07_1_music.c => music.c}      |    0
 .../area_flo/flo_07/{flo_07_3_npc.c => npc.c} |    0
 .../flo_07/{flo_07_0_header.c => settings.c}  |    0
 .../flo_08/{flo_08_2_entity.c => entity.c}    |    0
 .../flo_08/{flo_08_5_foliage.c => foliage.c}  |    0
 .../flo_08/{flo_08_3_main.c => main.c}        |    0
 .../flo_08/{flo_08_1_music.c => music.c}      |    0
 .../area_flo/flo_08/{flo_08_4_npc.c => npc.c} |    0
 .../flo_08/{flo_08_0_header.c => settings.c}  |    0
 .../flo_08/{flo_08_6_vines.c => vines.c}      |    0
 .../flo_09/{flo_09_4_foliage.c => foliage.c}  |    0
 .../flo_09/{flo_09_2_main.c => main.c}        |    0
 .../flo_09/{flo_09_1_music.c => music.c}      |    0
 .../area_flo/flo_09/{flo_09_5_npc.c => npc.c} |    0
 .../flo_09/{flo_09_0_header.c => settings.c}  |    0
 .../flo_09/{flo_09_3_vines.c => vines.c}      |    0
 .../flo_10/{flo_10_2_entity.c => entity.c}    |    0
 .../flo_10/{flo_10_7_foliage.c => foliage.c}  |    0
 .../{flo_10_4_fountain.c => fountain.c}       |    0
 .../flo_10/{flo_10_3_main.c => main.c}        |    0
 .../flo_10/{flo_10_1_music.c => music.c}      |    0
 .../area_flo/flo_10/{flo_10_5_npc.c => npc.c} |    0
 .../flo_10/{flo_10_0_header.c => settings.c}  |    0
 .../flo_10/{flo_10_6_waterfx.c => waterfx.c}  |    0
 .../flo_11/{flo_11_4_entity.c => entity.c}    |    0
 .../flo_11/{flo_11_2_main.c => main.c}        |    0
 .../flo_11/{flo_11_1_music.c => music.c}      |    0
 .../area_flo/flo_11/{flo_11_3_npc.c => npc.c} |    0
 .../flo_11/{flo_11_0_header.c => settings.c}  |    0
 .../flo_12/{flo_12_2_main.c => main.c}        |    0
 .../flo_12/{flo_12_1_music.c => music.c}      |    0
 .../area_flo/flo_12/{flo_12_3_npc.c => npc.c} |    0
 .../flo_12/{flo_12_0_header.c => settings.c}  |    0
 .../flo_13/{flo_13_2_entity.c => entity.c}    |    0
 .../flo_13/{flo_13_3_main.c => main.c}        |    0
 .../flo_13/{flo_13_1_music.c => music.c}      |    0
 .../{flo_13_5_new_partner.c => new_partner.c} |    0
 .../area_flo/flo_13/{flo_13_4_npc.c => npc.c} |    0
 .../flo_13/{flo_13_0_header.c => settings.c}  |    0
 .../flo_14/{flo_14_3_bubbles.c => bubbles.c}  |    0
 .../flo_14/{flo_14_5_entity.c => entity.c}    |    0
 .../flo_14/{flo_14_6_logs.c => logs.c}        |    0
 .../flo_14/{flo_14_2_main.c => main.c}        |    0
 .../flo_14/{flo_14_1_music.c => music.c}      |    0
 .../area_flo/flo_14/{flo_14_4_npc.c => npc.c} |    0
 .../flo_14/{flo_14_0_header.c => settings.c}  |    0
 .../flo_15/{flo_15_4_entity.c => entity.c}    |    0
 .../flo_15/{flo_15_2_main.c => main.c}        |    0
 .../flo_15/{flo_15_1_music.c => music.c}      |    0
 .../area_flo/flo_15/{flo_15_3_npc.c => npc.c} |    0
 .../flo_15/{flo_15_0_header.c => settings.c}  |    0
 .../flo_15/{flo_15_5_stairs.c => stairs.c}    |    0
 .../flo_16/{flo_16_4_entity.c => entity.c}    |    0
 .../flo_16/{flo_16_2_main.c => main.c}        |    0
 .../flo_16/{flo_16_1_music.c => music.c}      |    0
 .../area_flo/flo_16/{flo_16_5_npc.c => npc.c} |    0
 .../flo_16/{flo_16_6_puzzle.c => puzzle.c}    |    0
 .../flo_16/{flo_16_0_header.c => settings.c}  |    0
 .../flo_16/{flo_16_3_vines.c => vines.c}      |    0
 .../flo_17/{flo_17_5_entity.c => entity.c}    |    0
 .../flo_17/{flo_17_3_logs.c => logs.c}        |    0
 .../flo_17/{flo_17_2_main.c => main.c}        |    0
 .../flo_17/{flo_17_1_music.c => music.c}      |    0
 .../area_flo/flo_17/{flo_17_4_npc.c => npc.c} |    0
 .../flo_17/{flo_17_0_header.c => settings.c}  |    0
 .../flo_18/{flo_18_5_foliage.c => foliage.c}  |    0
 .../flo_18/{flo_18_3_machine.c => machine.c}  |    0
 .../flo_18/{flo_18_2_main.c => main.c}        |    0
 .../flo_18/{flo_18_1_music.c => music.c}      |    0
 .../area_flo/flo_18/{flo_18_4_npc.c => npc.c} |    0
 .../flo_18/{flo_18_0_header.c => settings.c}  |    0
 .../{flo_19_5_beanstalk.c => beanstalk.c}     |    0
 .../flo_19/{flo_19_4_clouds.c => clouds.c}    |    0
 .../flo_19/{flo_19_2_entity.c => entity.c}    |    0
 .../flo_19/{flo_19_3_main.c => main.c}        |    0
 .../flo_19/{flo_19_1_music.c => music.c}      |    0
 .../flo_19/{flo_19_0_header.c => settings.c}  |    0
 .../kzn_11/{kzn_11_1_main.c => main.c}        |    0
 .../area_kzn/kzn_11/{kzn_11_3_npc.c => npc.c} |    0
 .../{kzn_11_2_platforms.c => platforms.c}     |    0
 .../kzn_11/{kzn_11_0_header.c => settings.c}  |    0
 .../kzn_17/{kzn_17_2_entity.c => entity.c}    |    0
 .../kzn_17/{kzn_17_1_main.c => main.c}        |    0
 .../area_kzn/kzn_17/{kzn_17_3_npc.c => npc.c} |    0
 .../kzn_17/{kzn_17_0_header.c => settings.c}  |    0
 .../kzn_17/{kzn_17_4_tromp.c => tromp.c}      |    0
 .../kzn_18/{kzn_18_3_entity.c => entity.c}    |    0
 .../kzn_18/{kzn_18_1_main.c => main.c}        |    0
 .../area_kzn/kzn_18/{kzn_18_2_npc.c => npc.c} |    0
 .../kzn_18/{kzn_18_0_header.c => settings.c}  |    0
 .../kzn_19/{kzn_19_6_entity.c => entity.c}    |    0
 .../{kzn_19_5_eruption.c => eruption.c}       |    0
 .../kzn_19/{kzn_19_2_main.c => main.c}        |    0
 .../kzn_19/{kzn_19_1_music.c => music.c}      |    0
 .../area_kzn/kzn_19/{kzn_19_4_npc.c => npc.c} |    0
 ...kzn_19_3_npc_settings.c => npc_settings.c} |    0
 .../kzn_19/{kzn_19_0_header.c => settings.c}  |    0
 .../kzn_20/{kzn_20_2_main.c => main.c}        |    0
 .../kzn_20/{kzn_20_1_music.c => music.c}      |    0
 .../area_kzn/kzn_20/{kzn_20_3_npc.c => npc.c} |    0
 .../kzn_20/{kzn_20_0_header.c => settings.c}  |    0
 .../kzn_22/{kzn_22_3_entity.c => entity.c}    |    0
 .../kzn_22/{kzn_22_2_main.c => main.c}        |    0
 .../kzn_22/{kzn_22_1_music.c => music.c}      |    0
 .../area_kzn/kzn_22/{kzn_22_4_npc.c => npc.c} |    0
 .../kzn_22/{kzn_22_0_header.c => settings.c}  |    0
 .../kzn_23/{kzn_23_2_main.c => main.c}        |    0
 .../kzn_23/{kzn_23_1_music.c => music.c}      |    0
 .../area_kzn/kzn_23/{kzn_23_3_npc.c => npc.c} |    0
 .../kzn_23/{kzn_23_0_header.c => settings.c}  |    0
 ver/ique/splat.yaml                           | 4338 ++++++++--------
 ver/pal/splat.yaml                            | 4508 ++++++++--------
 ver/us/splat.yaml                             | 4588 ++++++++---------
 2267 files changed, 6719 insertions(+), 6717 deletions(-)
 rename src/world/area_arn/arn_02/{arn_02_3_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_02/{arn_02_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_02/{arn_02_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_02/{arn_02_4_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_02/{arn_02_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_03/{arn_03_4_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_03/{arn_03_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_03/{arn_03_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_03/{arn_03_3_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_03/{arn_03_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_04/{arn_04_4_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_04/{arn_04_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_04/{arn_04_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_04/{arn_04_3_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_04/{arn_04_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_05/{arn_05_4_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_05/{arn_05_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_05/{arn_05_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_05/{arn_05_3_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_05/{arn_05_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_07/{arn_07_4_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_07/{arn_07_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_07/{arn_07_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_07/{arn_07_5_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_07/{arn_07_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_07/{arn_07_3_windmill.c => windmill.c} (100%)
 rename src/world/area_arn/arn_08/{arn_08_5_demo.c => demo.c} (100%)
 rename src/world/area_arn/arn_08/{arn_08_7_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_08/{arn_08_4_gears.c => gears.c} (100%)
 rename src/world/area_arn/arn_08/{arn_08_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_08/{arn_08_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_08/{arn_08_6_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_08/{arn_08_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_08/{arn_08_3_well.c => well.c} (100%)
 rename src/world/area_arn/arn_09/{arn_09_3_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_09/{arn_09_4_launch.c => launch.c} (100%)
 rename src/world/area_arn/arn_09/{arn_09_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_09/{arn_09_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_09/{arn_09_5_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_09/{arn_09_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_10/{arn_10_4_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_10/{arn_10_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_10/{arn_10_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_10/{arn_10_3_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_10/{arn_10_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_11/{arn_11_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_11/{arn_11_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_11/{arn_11_3_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_11/{arn_11_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_12/{arn_12_4_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_12/{arn_12_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_12/{arn_12_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_12/{arn_12_3_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_12/{arn_12_0_header.c => settings.c} (100%)
 rename src/world/area_arn/arn_13/{arn_13_4_entity.c => entity.c} (100%)
 rename src/world/area_arn/arn_13/{arn_13_2_main.c => main.c} (100%)
 rename src/world/area_arn/arn_13/{arn_13_1_music.c => music.c} (100%)
 rename src/world/area_arn/arn_13/{arn_13_3_npc.c => npc.c} (100%)
 rename src/world/area_arn/arn_13/{arn_13_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_00/{dgb_00_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_00/{dgb_00_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_00/{dgb_00_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_00/{dgb_00_3_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_00/{dgb_00_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_3_bridges.c => bridges.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_7.c => gfx.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_6_img0.c => img0.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_6_img1.c => img1.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_6_img2.c => img2.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_6_img3.c => img3.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_6_img4.c => img4.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_6_img5.c => img5.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_6_img6.c => img6.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_6_img7.c => img7.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_5_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_01/{dgb_01_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_02/{dgb_02_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_02/{dgb_02_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_02/{dgb_02_3_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_02/{dgb_02_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_03/{dgb_03_3_clock.c => clock.c} (100%)
 rename src/world/area_dgb/dgb_03/{dgb_03_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_03/{dgb_03_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_03/{dgb_03_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_03/{dgb_03_5_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_03/{dgb_03_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_04/{dgb_04_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_04/{dgb_04_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_04/{dgb_04_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_04/{dgb_04_3_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_04/{dgb_04_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_05/{dgb_05_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_05/{dgb_05_3_hole.c => hole.c} (100%)
 rename src/world/area_dgb/dgb_05/{dgb_05_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_05/{dgb_05_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_05/{dgb_05_5_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_05/{dgb_05_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_06/{dgb_06_3_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_06/{dgb_06_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_06/{dgb_06_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_06/{dgb_06_4_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_06/{dgb_06_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_07/{dgb_07_3_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_07/{dgb_07_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_07/{dgb_07_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_07/{dgb_07_4_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_07/{dgb_07_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_08/{dgb_08_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_08/{dgb_08_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_08/{dgb_08_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_08/{dgb_08_3_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_08/{dgb_08_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_09/{dgb_09_3_breakable.c => breakable.c} (100%)
 rename src/world/area_dgb/dgb_09/{dgb_09_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_09/{dgb_09_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_09/{dgb_09_4_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_09/{dgb_09_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_10/{dgb_10_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_10/{dgb_10_3_hole.c => hole.c} (100%)
 rename src/world/area_dgb/dgb_10/{dgb_10_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_10/{dgb_10_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_10/{dgb_10_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_11/{dgb_11_3_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_11/{dgb_11_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_11/{dgb_11_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_11/{dgb_11_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_12/{dgb_12_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_12/{dgb_12_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_12/{dgb_12_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_12/{dgb_12_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_12/{dgb_12_3_spikes.c => spikes.c} (100%)
 rename src/world/area_dgb/dgb_13/{dgb_13_4_drawer.c => drawer.c} (100%)
 rename src/world/area_dgb/dgb_13/{dgb_13_3_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_13/{dgb_13_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_13/{dgb_13_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_13/{dgb_13_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_14/{dgb_14_3_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_14/{dgb_14_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_14/{dgb_14_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_14/{dgb_14_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_15/{dgb_15_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_15/{dgb_15_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_15/{dgb_15_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_15/{dgb_15_3_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_15/{dgb_15_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_16/{dgb_16_3_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_16/{dgb_16_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_16/{dgb_16_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_16/{dgb_16_4_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_16/{dgb_16_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_17/{dgb_17_3_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_17/{dgb_17_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_17/{dgb_17_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_17/{dgb_17_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/dgb_18/{dgb_18_4_entity.c => entity.c} (100%)
 rename src/world/area_dgb/dgb_18/{dgb_18_2_main.c => main.c} (100%)
 rename src/world/area_dgb/dgb_18/{dgb_18_1_music.c => music.c} (100%)
 rename src/world/area_dgb/dgb_18/{dgb_18_3_npc.c => npc.c} (100%)
 rename src/world/area_dgb/dgb_18/{dgb_18_0_header.c => settings.c} (100%)
 rename src/world/area_dgb/{dgb_01_smash_bridges.c => smash_bridges.c} (100%)
 rename src/world/area_dro/dro_01/{dro_01_6_entity.c => entity.c} (100%)
 rename src/world/area_dro/dro_01/{dro_01_7_foliage.c => foliage.c} (100%)
 rename src/world/area_dro/dro_01/{dro_01_2_main.c => main.c} (100%)
 rename src/world/area_dro/dro_01/{dro_01_1_music.c => music.c} (100%)
 rename src/world/area_dro/dro_01/{dro_01_3_npc.c => npc.c} (100%)
 rename src/world/area_dro/dro_01/{dro_01_5_rooms.c => rooms.c} (100%)
 rename src/world/area_dro/dro_01/{dro_01_0_header.c => settings.c} (100%)
 rename src/world/area_dro/dro_01/{dro_01_4_shop.c => shop.c} (100%)
 rename src/world/area_dro/dro_02/{dro_02_2_entity.c => entity.c} (100%)
 rename src/world/area_dro/dro_02/{dro_02_3_main.c => main.c} (100%)
 rename src/world/area_dro/dro_02/{dro_02_1_music.c => music.c} (100%)
 rename src/world/area_dro/dro_02/{dro_02_5_npc.c => npc.c} (100%)
 rename src/world/area_dro/dro_02/{dro_02_4_rooms.c => rooms.c} (100%)
 rename src/world/area_dro/dro_02/{dro_02_0_header.c => settings.c} (100%)
 rename src/world/area_end/end_00/{end_00_4_allies.c => allies.c} (100%)
 rename src/world/area_end/end_00/{end_00_7_boos.c => boos.c} (100%)
 rename src/world/area_end/end_00/{end_00_B_bowser.c => bowser.c} (100%)
 rename src/world/area_end/end_00/{end_00_6_caravan.c => caravan.c} (100%)
 rename src/world/area_end/end_00/{end_00_2_credits.c => credits.c} (100%)
 rename src/world/area_end/end_00/{end_00_A_crystal_king.c => crystal_king.c} (100%)
 rename src/world/area_end/end_00/{end_00_9_huff_n_puff.c => huff_n_puff.c} (100%)
 rename src/world/area_end/end_00/{end_00_5_koopas.c => koopas.c} (100%)
 rename src/world/area_end/end_00/{end_00_1_main.c => main.c} (100%)
 rename src/world/area_end/end_00/{end_00_3_parade_setup.c => parade_setup.c} (100%)
 rename src/world/area_end/end_00/{end_00_0_header.c => settings.c} (100%)
 rename src/world/area_end/end_00/{end_00_8_yoshis.c => yoshis.c} (100%)
 rename src/world/area_end/end_01/{end_01_2_credits.c => credits.c} (100%)
 rename src/world/area_end/end_01/{end_01_5_flower_float.c => flower_float.c} (100%)
 rename src/world/area_end/end_01/{end_01_1_main.c => main.c} (100%)
 rename src/world/area_end/end_01/{end_01_4_opera_float.c => opera_float.c} (100%)
 rename src/world/area_end/end_01/{end_01_3_parade_setup.c => parade_setup.c} (100%)
 rename src/world/area_end/end_01/{end_01_7_peach_float.c => peach_float.c} (100%)
 rename src/world/area_end/end_01/{end_01_0_header.c => settings.c} (100%)
 rename src/world/area_end/end_01/{end_01_6_shyguy_float.c => shyguy_float.c} (100%)
 rename src/world/area_flo/flo_00/{flo_00_5_beanstalk.c => beanstalk.c} (100%)
 rename src/world/area_flo/flo_00/{flo_00_6_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_00/{flo_00_4_epilogue.c => epilogue.c} (100%)
 rename src/world/area_flo/flo_00/{flo_00_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_00/{flo_00_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_00/{flo_00_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_00/{flo_00_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_03/{flo_03_5_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_03/{flo_03_4_foliage.c => foliage.c} (100%)
 rename src/world/area_flo/flo_03/{flo_03_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_03/{flo_03_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_03/{flo_03_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_03/{flo_03_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_07/{flo_07_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_07/{flo_07_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_07/{flo_07_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_07/{flo_07_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_08/{flo_08_2_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_08/{flo_08_5_foliage.c => foliage.c} (100%)
 rename src/world/area_flo/flo_08/{flo_08_3_main.c => main.c} (100%)
 rename src/world/area_flo/flo_08/{flo_08_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_08/{flo_08_4_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_08/{flo_08_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_08/{flo_08_6_vines.c => vines.c} (100%)
 rename src/world/area_flo/flo_09/{flo_09_4_foliage.c => foliage.c} (100%)
 rename src/world/area_flo/flo_09/{flo_09_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_09/{flo_09_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_09/{flo_09_5_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_09/{flo_09_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_09/{flo_09_3_vines.c => vines.c} (100%)
 rename src/world/area_flo/flo_10/{flo_10_2_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_10/{flo_10_7_foliage.c => foliage.c} (100%)
 rename src/world/area_flo/flo_10/{flo_10_4_fountain.c => fountain.c} (100%)
 rename src/world/area_flo/flo_10/{flo_10_3_main.c => main.c} (100%)
 rename src/world/area_flo/flo_10/{flo_10_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_10/{flo_10_5_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_10/{flo_10_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_10/{flo_10_6_waterfx.c => waterfx.c} (100%)
 rename src/world/area_flo/flo_11/{flo_11_4_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_11/{flo_11_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_11/{flo_11_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_11/{flo_11_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_11/{flo_11_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_12/{flo_12_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_12/{flo_12_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_12/{flo_12_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_12/{flo_12_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_13/{flo_13_2_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_13/{flo_13_3_main.c => main.c} (100%)
 rename src/world/area_flo/flo_13/{flo_13_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_13/{flo_13_5_new_partner.c => new_partner.c} (100%)
 rename src/world/area_flo/flo_13/{flo_13_4_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_13/{flo_13_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_14/{flo_14_3_bubbles.c => bubbles.c} (100%)
 rename src/world/area_flo/flo_14/{flo_14_5_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_14/{flo_14_6_logs.c => logs.c} (100%)
 rename src/world/area_flo/flo_14/{flo_14_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_14/{flo_14_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_14/{flo_14_4_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_14/{flo_14_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_15/{flo_15_4_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_15/{flo_15_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_15/{flo_15_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_15/{flo_15_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_15/{flo_15_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_15/{flo_15_5_stairs.c => stairs.c} (100%)
 rename src/world/area_flo/flo_16/{flo_16_4_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_16/{flo_16_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_16/{flo_16_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_16/{flo_16_5_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_16/{flo_16_6_puzzle.c => puzzle.c} (100%)
 rename src/world/area_flo/flo_16/{flo_16_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_16/{flo_16_3_vines.c => vines.c} (100%)
 rename src/world/area_flo/flo_17/{flo_17_5_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_17/{flo_17_3_logs.c => logs.c} (100%)
 rename src/world/area_flo/flo_17/{flo_17_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_17/{flo_17_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_17/{flo_17_4_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_17/{flo_17_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_18/{flo_18_5_foliage.c => foliage.c} (100%)
 rename src/world/area_flo/flo_18/{flo_18_3_machine.c => machine.c} (100%)
 rename src/world/area_flo/flo_18/{flo_18_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_18/{flo_18_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_18/{flo_18_4_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_18/{flo_18_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_19/{flo_19_5_beanstalk.c => beanstalk.c} (100%)
 rename src/world/area_flo/flo_19/{flo_19_4_clouds.c => clouds.c} (100%)
 rename src/world/area_flo/flo_19/{flo_19_2_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_19/{flo_19_3_main.c => main.c} (100%)
 rename src/world/area_flo/flo_19/{flo_19_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_19/{flo_19_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_21/{flo_21_3_clouds.c => clouds.c} (100%)
 rename src/world/area_flo/flo_21/{flo_21_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_21/{flo_21_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_21/{flo_21_4_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_21/{flo_21_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_22/{flo_22_5_foliage.c => foliage.c} (100%)
 rename src/world/area_flo/flo_22/{flo_22_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_22/{flo_22_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_22/{flo_22_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_22/{flo_22_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_22/{flo_22_4_well.c => well.c} (100%)
 rename src/world/area_flo/flo_23/{flo_23_4_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_23/{flo_23_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_23/{flo_23_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_23/{flo_23_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_23/{flo_23_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_24/{flo_24_5_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_24/{flo_24_3_foliage.c => foliage.c} (100%)
 rename src/world/area_flo/flo_24/{flo_24_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_24/{flo_24_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_24/{flo_24_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_24/{flo_24_4_water.c => water.c} (100%)
 rename src/world/area_flo/flo_25/{flo_25_4_entity.c => entity.c} (100%)
 rename src/world/area_flo/flo_25/{flo_25_5_foliage.c => foliage.c} (100%)
 rename src/world/area_flo/flo_25/{flo_25_2_main.c => main.c} (100%)
 rename src/world/area_flo/flo_25/{flo_25_1_music.c => music.c} (100%)
 rename src/world/area_flo/flo_25/{flo_25_3_npc.c => npc.c} (100%)
 rename src/world/area_flo/flo_25/{flo_25_0_header.c => settings.c} (100%)
 rename src/world/area_flo/flo_25/{flo_25_6_vine.c => vine.c} (100%)
 rename src/world/area_gv/gv_01/{gv_01_1_main.c => main.c} (100%)
 rename src/world/area_gv/gv_01/{gv_01_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_00/{hos_00_5_entity.c => entity.c} (100%)
 rename src/world/area_hos/hos_00/{hos_00_2_main.c => main.c} (100%)
 rename src/world/area_hos/hos_00/{hos_00_1_music.c => music.c} (100%)
 rename src/world/area_hos/hos_00/{hos_00_4_npc.c => npc.c} (100%)
 rename src/world/area_hos/hos_00/{hos_00_6_scenes.c => scenes.c} (100%)
 rename src/world/area_hos/hos_00/{hos_00_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_00/{hos_00_7_shade_gfx.c => shade_gfx.c} (100%)
 rename src/world/area_hos/hos_00/{hos_00_3_unused.c => unused.c} (100%)
 rename src/world/area_hos/hos_01/{hos_01_5_entity.c => entity.c} (100%)
 rename src/world/area_hos/hos_01/{hos_01_2_main.c => main.c} (100%)
 rename src/world/area_hos/hos_01/{hos_01_3_model_fx.c => model_fx.c} (100%)
 rename src/world/area_hos/hos_01/{hos_01_1_music.c => music.c} (100%)
 rename src/world/area_hos/hos_01/{hos_01_4_npc.c => npc.c} (100%)
 rename src/world/area_hos/hos_01/{hos_01_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_01/{hos_01_6_star_way.c => star_way.c} (100%)
 rename src/world/area_hos/hos_02/{hos_02_6_descent.c => descent.c} (100%)
 rename src/world/area_hos/hos_02/{hos_02_2_main.c => main.c} (100%)
 rename src/world/area_hos/hos_02/{hos_02_3_model_fx.c => model_fx.c} (100%)
 rename src/world/area_hos/hos_02/{hos_02_1_music.c => music.c} (100%)
 rename src/world/area_hos/hos_02/{hos_02_5_npc.c => npc.c} (100%)
 rename src/world/area_hos/hos_02/{hos_02_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_02/{hos_02_4_unused.c => unused.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_8_entity.c => entity.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_5_foliage.c => foliage.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_2_main.c => main.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_3_model_fx.c => model_fx.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_1_music.c => music.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_6_npc.c => npc.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_4_rooms.c => rooms.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_03/{hos_03_7_shop.c => shop.c} (100%)
 rename src/world/area_hos/hos_04/{hos_04_3_fountains.c => fountains.c} (100%)
 rename src/world/area_hos/hos_04/{hos_04_6_intro.c => intro.c} (100%)
 rename src/world/area_hos/hos_04/{hos_04_2_main.c => main.c} (100%)
 rename src/world/area_hos/hos_04/{hos_04_1_music.c => music.c} (100%)
 rename src/world/area_hos/hos_04/{hos_04_8_narrator.c => narrator.c} (100%)
 rename src/world/area_hos/hos_04/{hos_04_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_04/{hos_04_7_starship.c => starship.c} (100%)
 rename src/world/area_hos/hos_04/{hos_04_4_unused.c => unused.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_5_intro.c => intro.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_2_main.c => main.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_3_misc.c => misc.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_7_model_fx.c => model_fx.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_1_music.c => music.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_6_narrator.c => narrator.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_4_npc.c => npc.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_05/{hos_05_8_star_ship.c => star_ship.c} (100%)
 rename src/world/area_hos/hos_06/{hos_06_6_chest.c => chest.c} (100%)
 rename src/world/area_hos/hos_06/{hos_06_1_entity.c => entity.c} (100%)
 rename src/world/area_hos/hos_06/{hos_06_2_main.c => main.c} (100%)
 rename src/world/area_hos/hos_06/{hos_06_3_merlow.c => merlow.c} (100%)
 rename src/world/area_hos/hos_06/{hos_06_5_merluvlee.c => merluvlee.c} (100%)
 rename src/world/area_hos/hos_06/{hos_06_4_rooms.c => rooms.c} (100%)
 rename src/world/area_hos/hos_06/{hos_06_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_10/{hos_10_7_ending.c => ending.c} (100%)
 rename src/world/area_hos/hos_10/{hos_10_5_intro.c => intro.c} (100%)
 rename src/world/area_hos/hos_10/{hos_10_4_main.c => main.c} (100%)
 rename src/world/area_hos/hos_10/{hos_10_1_music.c => music.c} (100%)
 rename src/world/area_hos/hos_10/{hos_10_2_npc1.c => npc1.c} (100%)
 rename src/world/area_hos/hos_10/{hos_10_3_npc2.c => npc2.c} (100%)
 rename src/world/area_hos/hos_10/{hos_10_6_pre_title.c => pre_title.c} (100%)
 rename src/world/area_hos/hos_10/{hos_10_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_20/{hos_20_1_main.c => main.c} (100%)
 rename src/world/area_hos/hos_20/{hos_20_0_header.c => settings.c} (100%)
 rename src/world/area_hos/hos_20/{hos_20_2_starship.c => starship.c} (100%)
 rename src/world/area_isk/isk_01/{isk_01_4_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_01/{isk_01_3_haze.c => haze.c} (100%)
 rename src/world/area_isk/isk_01/{isk_01_2_main.c => main.c} (100%)
 rename src/world/area_isk/isk_01/{isk_01_1_music.c => music.c} (100%)
 rename src/world/area_isk/isk_01/{isk_01_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_02/{isk_02_3_ambush.c => ambush.c} (100%)
 rename src/world/area_isk/isk_02/{isk_02_4_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_02/{isk_02_2_lock.c => lock.c} (100%)
 rename src/world/area_isk/isk_02/{isk_02_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_02/{isk_02_5_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_02/{isk_02_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_03/{isk_03_3_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_03/{isk_03_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_03/{isk_03_2_sand.c => sand.c} (100%)
 rename src/world/area_isk/isk_03/{isk_03_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_03/{isk_03_4_switch.c => switch.c} (100%)
 rename src/world/area_isk/isk_04/{isk_04_6_demo.c => demo.c} (100%)
 rename src/world/area_isk/isk_04/{isk_04_4_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_04/{isk_04_2_main.c => main.c} (100%)
 rename src/world/area_isk/isk_04/{isk_04_1_music.c => music.c} (100%)
 rename src/world/area_isk/isk_04/{isk_04_5_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_04/{isk_04_3_obstructions.c => obstructions.c} (100%)
 rename src/world/area_isk/isk_04/{isk_04_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_05/{isk_05_2_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_05/{isk_05_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_05/{isk_05_3_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_05/{isk_05_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_06/{isk_06_2_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_06/{isk_06_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_06/{isk_06_3_sand.c => sand.c} (100%)
 rename src/world/area_isk/isk_06/{isk_06_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_06/{isk_06_4_switch.c => switch.c} (100%)
 rename src/world/area_isk/isk_07/{isk_07_7_ambush.c => ambush.c} (100%)
 rename src/world/area_isk/isk_07/{isk_07_2_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_07/{isk_07_5_lock.c => lock.c} (100%)
 rename src/world/area_isk/isk_07/{isk_07_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_07/{isk_07_3_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_07/{isk_07_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_07/{isk_07_4_stairs.c => stairs.c} (100%)
 rename src/world/area_isk/isk_07/{isk_07_6_switch.c => switch.c} (100%)
 rename src/world/area_isk/isk_08/{isk_08_3_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_08/{isk_08_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_08/{isk_08_2_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_08/{isk_08_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_09/{isk_09_3_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_09/{isk_09_2_main.c => main.c} (100%)
 rename src/world/area_isk/isk_09/{isk_09_1_music.c => music.c} (100%)
 rename src/world/area_isk/isk_09/{isk_09_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_09/{isk_09_4_stairs.c => stairs.c} (100%)
 rename src/world/area_isk/isk_09/{isk_09_5_switch.c => switch.c} (100%)
 rename src/world/area_isk/isk_10/{isk_10_3_bombable.c => bombable.c} (100%)
 rename src/world/area_isk/isk_10/{isk_10_2_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_10/{isk_10_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_10/{isk_10_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_11/{isk_11_3_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_11/{isk_11_6_lock.c => lock.c} (100%)
 rename src/world/area_isk/isk_11/{isk_11_2_main.c => main.c} (100%)
 rename src/world/area_isk/isk_11/{isk_11_1_music.c => music.c} (100%)
 rename src/world/area_isk/isk_11/{isk_11_5_puzzle.c => puzzle.c} (100%)
 rename src/world/area_isk/isk_11/{isk_11_4_scene.c => scene.c} (100%)
 rename src/world/area_isk/isk_11/{isk_11_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_12/{isk_12_2_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_12/{isk_12_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_12/{isk_12_3_sand.c => sand.c} (100%)
 rename src/world/area_isk/isk_12/{isk_12_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_12/{isk_12_4_switch.c => switch.c} (100%)
 rename src/world/area_isk/isk_13/{isk_13_2_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_13/{isk_13_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_13/{isk_13_3_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_13/{isk_13_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_14/{isk_14_2_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_14/{isk_14_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_14/{isk_14_3_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_14/{isk_14_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_16/{isk_16_3_boss.c => boss.c} (100%)
 rename src/world/area_isk/isk_16/{isk_16_4_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_16/{isk_16_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_16/{isk_16_2_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_16/{isk_16_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_18/{isk_18_3_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_18/{isk_18_1_main.c => main.c} (100%)
 rename src/world/area_isk/isk_18/{isk_18_2_npc.c => npc.c} (100%)
 rename src/world/area_isk/isk_18/{isk_18_0_header.c => settings.c} (100%)
 rename src/world/area_isk/isk_19/{isk_19_3_entity.c => entity.c} (100%)
 rename src/world/area_isk/isk_19/{isk_19_2_main.c => main.c} (100%)
 rename src/world/area_isk/isk_19/{isk_19_1_music.c => music.c} (100%)
 rename src/world/area_isk/isk_19/{isk_19_0_header.c => settings.c} (100%)
 rename src/world/area_iwa/iwa_00/{iwa_00_2_entity.c => entity.c} (100%)
 rename src/world/area_iwa/iwa_00/{iwa_00_1_main.c => main.c} (100%)
 rename src/world/area_iwa/iwa_00/{iwa_00_3_npc.c => npc.c} (100%)
 rename src/world/area_iwa/iwa_00/{iwa_00_0_header.c => settings.c} (100%)
 rename src/world/area_iwa/iwa_00/{iwa_00_4_slide.c => slide.c} (100%)
 rename src/world/area_iwa/iwa_01/{iwa_01_2_entity.c => entity.c} (100%)
 rename src/world/area_iwa/iwa_01/{iwa_01_1_main.c => main.c} (100%)
 rename src/world/area_iwa/iwa_01/{iwa_01_4_npc.c => npc.c} (100%)
 rename src/world/area_iwa/iwa_01/{iwa_01_0_header.c => settings.c} (100%)
 rename src/world/area_iwa/iwa_01/{iwa_01_5_slide.c => slide.c} (100%)
 rename src/world/area_iwa/iwa_01/{iwa_01_3_splash.c => splash.c} (100%)
 rename src/world/area_iwa/iwa_02/{iwa_02_2_entity.c => entity.c} (100%)
 rename src/world/area_iwa/iwa_02/{iwa_02_1_main.c => main.c} (100%)
 rename src/world/area_iwa/iwa_02/{iwa_02_3_npc.c => npc.c} (100%)
 rename src/world/area_iwa/iwa_02/{iwa_02_0_header.c => settings.c} (100%)
 rename src/world/area_iwa/iwa_03/{iwa_03_2_entity.c => entity.c} (100%)
 rename src/world/area_iwa/iwa_03/{iwa_03_1_main.c => main.c} (100%)
 rename src/world/area_iwa/iwa_03/{iwa_03_3_npc.c => npc.c} (100%)
 rename src/world/area_iwa/iwa_03/{iwa_03_0_header.c => settings.c} (100%)
 rename src/world/area_iwa/iwa_03/{iwa_03_4_slide.c => slide.c} (100%)
 rename src/world/area_iwa/iwa_04/{iwa_04_3_entity.c => entity.c} (100%)
 rename src/world/area_iwa/iwa_04/{iwa_04_2_main.c => main.c} (100%)
 rename src/world/area_iwa/iwa_04/{iwa_04_1_music.c => music.c} (100%)
 rename src/world/area_iwa/iwa_04/{iwa_04_4_npc.c => npc.c} (100%)
 rename src/world/area_iwa/iwa_04/{iwa_04_0_header.c => settings.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_5_entity.c => entity.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_8_foliage.c => foliage.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_2_main.c => main.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_1_music.c => music.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_7_new_partner.c => new_partner.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_3_npc.c => npc.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_6_parakarry.c => parakarry.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_0_header.c => settings.c} (100%)
 rename src/world/area_iwa/iwa_10/{iwa_10_4_train.c => train.c} (100%)
 rename src/world/area_iwa/iwa_11/{iwa_11_2_main.c => main.c} (100%)
 rename src/world/area_iwa/iwa_11/{iwa_11_1_music.c => music.c} (100%)
 rename src/world/area_iwa/iwa_11/{iwa_11_5_npc.c => npc.c} (100%)
 rename src/world/area_iwa/iwa_11/{iwa_11_4_scenery.c => scenery.c} (100%)
 rename src/world/area_iwa/iwa_11/{iwa_11_0_header.c => settings.c} (100%)
 rename src/world/area_iwa/iwa_11/{iwa_11_3_train.c => train.c} (100%)
 rename src/world/area_jan/jan_00/{jan_00_3_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_00/{jan_00_5_foliage.c => foliage.c} (100%)
 rename src/world/area_jan/jan_00/{jan_00_1_main.c => main.c} (100%)
 rename src/world/area_jan/jan_00/{jan_00_2_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_00/{jan_00_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_00/{jan_00_4_whale.c => whale.c} (100%)
 rename src/world/area_jan/jan_01/{jan_01_4_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_01/{jan_01_5_foliage.c => foliage.c} (100%)
 rename src/world/area_jan/jan_01/{jan_01_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_01/{jan_01_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_01/{jan_01_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_01/{jan_01_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_02/{jan_02_4_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_02/{jan_02_5_foliage.c => foliage.c} (100%)
 rename src/world/area_jan/jan_02/{jan_02_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_02/{jan_02_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_02/{jan_02_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_02/{jan_02_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_03/{jan_03_5_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_03/{jan_03_7_foliage.c => foliage.c} (100%)
 rename src/world/area_jan/jan_03/{jan_03_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_03/{jan_03_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_03/{jan_03_4_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_03/{jan_03_6_rooms.c => rooms.c} (100%)
 rename src/world/area_jan/jan_03/{jan_03_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_03/{jan_03_3_shop.c => shop.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_9_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_10_demo.c => demo.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_3_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_4_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_7_scenes.c => scenes.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_8_treasure.c => treasure.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_6_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_04/{jan_04_5_unused.c => unused.c} (100%)
 rename src/world/area_jan/jan_05/{jan_05_4_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_05/{jan_05_7_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_05/{jan_05_3_log.c => log.c} (100%)
 rename src/world/area_jan/jan_05/{jan_05_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_05/{jan_05_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_05/{jan_05_5_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_05/{jan_05_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_05/{jan_05_6_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_06/{jan_06_7_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_06/{jan_06_5_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_06/{jan_06_3_log.c => log.c} (100%)
 rename src/world/area_jan/jan_06/{jan_06_1_main.c => main.c} (100%)
 rename src/world/area_jan/jan_06/{jan_06_6_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_06/{jan_06_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_06/{jan_06_2_statue.c => statue.c} (100%)
 rename src/world/area_jan/jan_06/{jan_06_4_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_07/{jan_07_5_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_07/{jan_07_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_07/{jan_07_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_07/{jan_07_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_07/{jan_07_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_07/{jan_07_4_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_08/{jan_08_3_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_08/{jan_08_4_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_08/{jan_08_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_08/{jan_08_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_08/{jan_08_5_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_08/{jan_08_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_08/{jan_08_6_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_09/{jan_09_2_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_09/{jan_09_5_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_09/{jan_09_1_main.c => main.c} (100%)
 rename src/world/area_jan/jan_09/{jan_09_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_09/{jan_09_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_09/{jan_09_4_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_10/{jan_10_6_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_10/{jan_10_7_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_10/{jan_10_4_log.c => log.c} (100%)
 rename src/world/area_jan/jan_10/{jan_10_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_10/{jan_10_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_10/{jan_10_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_10/{jan_10_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_10/{jan_10_5_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_11/{jan_11_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_11/{jan_11_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_11/{jan_11_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_11/{jan_11_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_12/{jan_12_4_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_12/{jan_12_1_main.c => main.c} (100%)
 rename src/world/area_jan/jan_12/{jan_12_5_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_12/{jan_12_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_12/{jan_12_3_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_12/{jan_12_2_vines.c => vines.c} (100%)
 rename src/world/area_jan/jan_13/{jan_13_4_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_13/{jan_13_1_main.c => main.c} (100%)
 rename src/world/area_jan/jan_13/{jan_13_2_puzzle.c => puzzle.c} (100%)
 rename src/world/area_jan/jan_13/{jan_13_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_13/{jan_13_3_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_14/{jan_14_1_main.c => main.c} (100%)
 rename src/world/area_jan/jan_14/{jan_14_4_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_14/{jan_14_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_14/{jan_14_3_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_14/{jan_14_2_vines.c => vines.c} (100%)
 rename src/world/area_jan/jan_15/{jan_15_4_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_15/{jan_15_1_main.c => main.c} (100%)
 rename src/world/area_jan/jan_15/{jan_15_2_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_15/{jan_15_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_15/{jan_15_3_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_16/{jan_16_5_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_16/{jan_16_4_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_16/{jan_16_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_16/{jan_16_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_16/{jan_16_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_16/{jan_16_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_17/{jan_17_3_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_17/{jan_17_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_17/{jan_17_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_17/{jan_17_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_18/{jan_18_3_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_18/{jan_18_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_18/{jan_18_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_18/{jan_18_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_19/{jan_19_3_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_19/{jan_19_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_19/{jan_19_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_19/{jan_19_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_22/{jan_22_6_bushes.c => bushes.c} (100%)
 rename src/world/area_jan/jan_22/{jan_22_4_entity.c => entity.c} (100%)
 rename src/world/area_jan/jan_22/{jan_22_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_22/{jan_22_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_22/{jan_22_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_22/{jan_22_0_header.c => settings.c} (100%)
 rename src/world/area_jan/jan_22/{jan_22_7_trees.c => trees.c} (100%)
 rename src/world/area_jan/jan_22/{jan_22_5_zipline.c => zipline.c} (100%)
 rename src/world/area_jan/jan_23/{jan_23_2_main.c => main.c} (100%)
 rename src/world/area_jan/jan_23/{jan_23_1_music.c => music.c} (100%)
 rename src/world/area_jan/jan_23/{jan_23_3_npc.c => npc.c} (100%)
 rename src/world/area_jan/jan_23/{jan_23_0_header.c => settings.c} (100%)
 rename src/world/area_kgr/kgr_01/{kgr_01_3_extra.c => extra.c} (100%)
 rename src/world/area_kgr/kgr_01/{kgr_01_1_main.c => main.c} (100%)
 rename src/world/area_kgr/kgr_01/{kgr_01_2_wiggle.c => wiggle.c} (100%)
 rename src/world/area_kgr/kgr_02/{kgr_02_4_extra.c => extra.c} (100%)
 rename src/world/area_kgr/kgr_02/{kgr_02_1_main.c => main.c} (100%)
 rename src/world/area_kgr/kgr_02/{kgr_02_3_npc.c => npc.c} (100%)
 rename src/world/area_kgr/kgr_02/{kgr_02_2_unused.c => unused.c} (100%)
 rename src/world/area_kkj/kkj_00/{kkj_00_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_00/{kkj_00_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_00/{kkj_00_5_npc_ending.c => npc_ending.c} (100%)
 rename src/world/area_kkj/kkj_00/{kkj_00_3_npc_intro.c => npc_intro.c} (100%)
 rename src/world/area_kkj/kkj_00/{kkj_00_6_scene_ending.c => scene_ending.c} (100%)
 rename src/world/area_kkj/kkj_00/{kkj_00_4_scene_intro.c => scene_intro.c} (100%)
 rename src/world/area_kkj/kkj_00/{kkj_00_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_01/{kkj_01_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_01/{kkj_01_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_01/{kkj_01_3_npc.c => npc.c} (100%)
 rename src/world/area_kkj/kkj_01/{kkj_01_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_02/{kkj_02_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_02/{kkj_02_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_02/{kkj_02_3_npc.c => npc.c} (100%)
 rename src/world/area_kkj/kkj_02/{kkj_02_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_03/{kkj_03_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_03/{kkj_03_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_03/{kkj_03_3_npc.c => npc.c} (100%)
 rename src/world/area_kkj/kkj_03/{kkj_03_4_scenes.c => scenes.c} (100%)
 rename src/world/area_kkj/kkj_03/{kkj_03_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_10/{kkj_10_2_entity.c => entity.c} (100%)
 rename src/world/area_kkj/kkj_10/{kkj_10_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_10/{kkj_10_3_npcs_early.c => npcs_early.c} (100%)
 rename src/world/area_kkj/kkj_10/{kkj_10_4_npcs_later.c => npcs_later.c} (100%)
 rename src/world/area_kkj/kkj_10/{kkj_10_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_11/{kkj_11_4_demo.c => demo.c} (100%)
 rename src/world/area_kkj/kkj_11/{kkj_11_2_entity.c => entity.c} (100%)
 rename src/world/area_kkj/kkj_11/{kkj_11_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_11/{kkj_11_5_npcs_early.c => npcs_early.c} (100%)
 rename src/world/area_kkj/kkj_11/{kkj_11_6_npcs_later.c => npcs_later.c} (100%)
 rename src/world/area_kkj/kkj_11/{kkj_11_3_scene.c => scene.c} (100%)
 rename src/world/area_kkj/kkj_11/{kkj_11_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_12/{kkj_12_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_12/{kkj_12_2_npc.c => npc.c} (100%)
 rename src/world/area_kkj/kkj_12/{kkj_12_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_13/{kkj_13_5_intro_scenes.c => intro_scenes.c} (100%)
 rename src/world/area_kkj/kkj_13/{kkj_13_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_13/{kkj_13_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_13/{kkj_13_3_npcs_finale.c => npcs_finale.c} (100%)
 rename src/world/area_kkj/kkj_13/{kkj_13_4_npcs_intro.c => npcs_intro.c} (100%)
 rename src/world/area_kkj/kkj_13/{kkj_13_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_8_chapter0.c => chapter0.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_9_chapter1.c => chapter1.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_10_chapter2.c => chapter2.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_11_chapter3.c => chapter3.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_12_chapter4.c => chapter4.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_13_chapter5.c => chapter5.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_14_chapter6.c => chapter6.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_15_chapter7.c => chapter7.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_3_interactables.c => interactables.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_5_npc_ch0.c => npc_ch0.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_6_npc_ch2.c => npc_ch2.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_7_npc_ch7.c => npc_ch7.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_4_npc_guards.c => npc_guards.c} (100%)
 rename src/world/area_kkj/kkj_14/{kkj_14_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_4_chapter0.c => chapter0.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_5_chapter1.c => chapter1.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_6_chapter2.c => chapter2.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_7_chapter3.c => chapter3.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_8_npc_chapter0.c => npc_chapter0.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_9_npc_chapter1.c => npc_chapter1.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_10_npc_chapter3.c => npc_chapter3.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_3_rotating_wall.c => rotating_wall.c} (100%)
 rename src/world/area_kkj/kkj_15/{kkj_15_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_16/{kkj_16_5_entity.c => entity.c} (100%)
 rename src/world/area_kkj/kkj_16/{kkj_16_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_16/{kkj_16_2_npcs_early.c => npcs_early.c} (100%)
 rename src/world/area_kkj/kkj_16/{kkj_16_3_npcs_later.c => npcs_later.c} (100%)
 rename src/world/area_kkj/kkj_16/{kkj_16_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_16/{kkj_16_4_stealth.c => stealth.c} (100%)
 rename src/world/area_kkj/kkj_17/{kkj_17_3_chest.c => chest.c} (100%)
 rename src/world/area_kkj/kkj_17/{kkj_17_2_entity.c => entity.c} (100%)
 rename src/world/area_kkj/kkj_17/{kkj_17_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_17/{kkj_17_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_18/{kkj_18_4_gourmet.c => gourmet.c} (100%)
 rename src/world/area_kkj/kkj_18/{kkj_18_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_18/{kkj_18_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_18/{kkj_18_3_npc.c => npc.c} (100%)
 rename src/world/area_kkj/kkj_18/{kkj_18_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_19/{kkj_19_5_baking.c => baking.c} (100%)
 rename src/world/area_kkj/kkj_19/{kkj_19_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_19/{kkj_19_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_19/{kkj_19_3_npcs_intro.c => npcs_intro.c} (100%)
 rename src/world/area_kkj/kkj_19/{kkj_19_4_npcs_peach.c => npcs_peach.c} (100%)
 rename src/world/area_kkj/kkj_19/{kkj_19_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_20/{kkj_20_3_entity.c => entity.c} (100%)
 rename src/world/area_kkj/kkj_20/{kkj_20_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_20/{kkj_20_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_20/{kkj_20_4_npc.c => npc.c} (100%)
 rename src/world/area_kkj/kkj_20/{kkj_20_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_21/{kkj_21_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_21/{kkj_21_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_22/{kkj_22_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_22/{kkj_22_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_22/{kkj_22_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_23/{kkj_23_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_23/{kkj_23_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_23/{kkj_23_3_npcs_finale.c => npcs_finale.c} (100%)
 rename src/world/area_kkj/kkj_23/{kkj_23_4_npcs_peach.c => npcs_peach.c} (100%)
 rename src/world/area_kkj/kkj_23/{kkj_23_5_scene.c => scene.c} (100%)
 rename src/world/area_kkj/kkj_23/{kkj_23_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_24/{kkj_24_3_entity.c => entity.c} (100%)
 rename src/world/area_kkj/kkj_24/{kkj_24_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_24/{kkj_24_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_24/{kkj_24_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_5_arena.c => arena.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_8_bowser_defeated.c => bowser_defeated.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_9_entity.c => entity.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_7_kammy_defeated.c => kammy_defeated.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_4_npc_final.c => npc_final.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_2_npc_initial.c => npc_initial.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_3_npc_midpoint.c => npc_midpoint.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_6_peach_free.c => peach_free.c} (100%)
 rename src/world/area_kkj/kkj_25/{kkj_25_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_26/{kkj_26_3_demo.c => demo.c} (100%)
 rename src/world/area_kkj/kkj_26/{kkj_26_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_26/{kkj_26_2_scenes.c => scenes.c} (100%)
 rename src/world/area_kkj/kkj_26/{kkj_26_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_27/{kkj_27_2_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_27/{kkj_27_1_music.c => music.c} (100%)
 rename src/world/area_kkj/kkj_27/{kkj_27_3_rotating_wall.c => rotating_wall.c} (100%)
 rename src/world/area_kkj/kkj_27/{kkj_27_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_28/{kkj_28_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_28/{kkj_28_0_header.c => settings.c} (100%)
 rename src/world/area_kkj/kkj_29/{kkj_29_1_main.c => main.c} (100%)
 rename src/world/area_kkj/kkj_29/{kkj_29_2_npc.c => npc.c} (100%)
 rename src/world/area_kkj/kkj_29/{kkj_29_3_quiz.c => quiz.c} (100%)
 rename src/world/area_kkj/kkj_29/{kkj_29_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_00/{kmr_00_5_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_00/{kmr_00_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_00/{kmr_00_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_00/{kmr_00_4_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_00/{kmr_00_3_revival.c => revival.c} (100%)
 rename src/world/area_kmr/kmr_00/{kmr_00_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_5_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_8_foliage.c => foliage.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_9_images.c => images.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_7_kammy.c => kammy.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_4_rooms_1.c => rooms_1.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_6_rooms_2.c => rooms_2.c} (100%)
 rename src/world/area_kmr/kmr_02/{kmr_02_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_03/{kmr_03_4_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_03/{kmr_03_6_fall_down.c => fall_down.c} (100%)
 rename src/world/area_kmr/kmr_03/{kmr_03_5_foliage.c => foliage.c} (100%)
 rename src/world/area_kmr/kmr_03/{kmr_03_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_03/{kmr_03_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_03/{kmr_03_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_03/{kmr_03_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_04/{kmr_04_4_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_04/{kmr_04_5_foliage.c => foliage.c} (100%)
 rename src/world/area_kmr/kmr_04/{kmr_04_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_04/{kmr_04_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_04/{kmr_04_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_04/{kmr_04_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_05/{kmr_05_4_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_05/{kmr_05_5_foliage.c => foliage.c} (100%)
 rename src/world/area_kmr/kmr_05/{kmr_05_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_05/{kmr_05_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_05/{kmr_05_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_05/{kmr_05_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_06/{kmr_06_4_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_06/{kmr_06_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_06/{kmr_06_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_06/{kmr_06_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_06/{kmr_06_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_06/{kmr_06_5_sticker_sign.c => sticker_sign.c} (100%)
 rename src/world/area_kmr/kmr_07/{kmr_07_4_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_07/{kmr_07_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_07/{kmr_07_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_07/{kmr_07_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_07/{kmr_07_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_09/{kmr_09_4_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_09/{kmr_09_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_09/{kmr_09_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_09/{kmr_09_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_09/{kmr_09_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_10/{kmr_10_4_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_10/{kmr_10_5_foliage.c => foliage.c} (100%)
 rename src/world/area_kmr/kmr_10/{kmr_10_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_10/{kmr_10_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_10/{kmr_10_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_10/{kmr_10_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_11_bridge_animation.c => bridge_animation.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_10_bridge_skeleton.c => bridge_skeleton.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_5_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_7_foliage.c => foliage.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_9_fortress_animation.c => fortress_animation.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_8_fortress_skeleton.c => fortress_skeleton.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_6_kammy.c => kammy.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_4_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_3_scenes.c => scenes.c} (100%)
 rename src/world/area_kmr/kmr_11/{kmr_11_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_12/{kmr_12_4_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_12/{kmr_12_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_12/{kmr_12_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_12/{kmr_12_3_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_12/{kmr_12_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_8_bed.c => bed.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_7_bushes.c => bushes.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_4_documents.c => documents.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_5_entity.c => entity.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_2_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_1_music.c => music.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_10_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_12_npc_epilogue.c => npc_epilogue.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_11_npc_intro.c => npc_intro.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_9_npc_scenes.c => npc_scenes.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_13_records.c => records.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_3_rooms.c => rooms.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_20/{kmr_20_6_trees.c => trees.c} (100%)
 rename src/world/area_kmr/kmr_21/{kmr_21_1_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_21/{kmr_21_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_22/{kmr_22_1_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_22/{kmr_22_2_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_22/{kmr_22_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_23/{kmr_23_1_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_23/{kmr_23_2_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_23/{kmr_23_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_24/{kmr_24_1_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_24/{kmr_24_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_30/{kmr_30_1_main.c => main.c} (100%)
 rename src/world/area_kmr/kmr_30/{kmr_30_2_npc.c => npc.c} (100%)
 rename src/world/area_kmr/kmr_30/{kmr_30_0_header.c => settings.c} (100%)
 rename src/world/area_kmr/kmr_30/{kmr_30_3_the_end.c => the_end.c} (100%)
 rename src/world/area_kpa/kpa_01/{kpa_01_4_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_01/{kpa_01_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_01/{kpa_01_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_01/{kpa_01_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_01/{kpa_01_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_03/{kpa_03_4_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_03/{kpa_03_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_03/{kpa_03_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_03/{kpa_03_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_03/{kpa_03_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_04/{kpa_04_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_04/{kpa_04_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_04/{kpa_04_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_04/{kpa_04_3_statues.c => statues.c} (100%)
 rename src/world/area_kpa/kpa_08/{kpa_08_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_08/{kpa_08_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_08/{kpa_08_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_08/{kpa_08_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_08/{kpa_08_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_09/{kpa_09_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_09/{kpa_09_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_09/{kpa_09_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_09/{kpa_09_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_09/{kpa_09_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_10/{kpa_10_4_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_10/{kpa_10_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_10/{kpa_10_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_10/{kpa_10_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_10/{kpa_10_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_100/{kpa_100_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_100/{kpa_100_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_100/{kpa_100_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_100/{kpa_100_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_101/{kpa_101_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_101/{kpa_101_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_101/{kpa_101_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_101/{kpa_101_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_102/{kpa_102_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_102/{kpa_102_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_102/{kpa_102_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_102/{kpa_102_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_11/{kpa_11_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_11/{kpa_11_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_11/{kpa_11_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_11/{kpa_11_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_11/{kpa_11_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_111/{kpa_111_5_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_111/{kpa_111_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_111/{kpa_111_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_111/{kpa_111_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_111/{kpa_111_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_111/{kpa_111_3_statues.c => statues.c} (100%)
 rename src/world/area_kpa/kpa_112/{kpa_112_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_112/{kpa_112_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_112/{kpa_112_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_113/{kpa_113_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_113/{kpa_113_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_113/{kpa_113_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_113/{kpa_113_5_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_113/{kpa_113_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_113/{kpa_113_4_statues.c => statues.c} (100%)
 rename src/world/area_kpa/kpa_114/{kpa_114_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_114/{kpa_114_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_114/{kpa_114_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_114/{kpa_114_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_115/{kpa_115_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_115/{kpa_115_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_115/{kpa_115_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_115/{kpa_115_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_115/{kpa_115_3_statues.c => statues.c} (100%)
 rename src/world/area_kpa/kpa_116/{kpa_116_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_116/{kpa_116_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_116/{kpa_116_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_117/{kpa_117_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_117/{kpa_117_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_117/{kpa_117_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_118/{kpa_118_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_118/{kpa_118_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_118/{kpa_118_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_119/{kpa_119_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_119/{kpa_119_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_119/{kpa_119_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_119/{kpa_119_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_12/{kpa_12_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_12/{kpa_12_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_12/{kpa_12_3_platforms.c => platforms.c} (100%)
 rename src/world/area_kpa/kpa_12/{kpa_12_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_121/{kpa_121_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_121/{kpa_121_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_121/{kpa_121_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_13/{kpa_13_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_13/{kpa_13_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_13/{kpa_13_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_13/{kpa_13_4_platforms.c => platforms.c} (100%)
 rename src/world/area_kpa/kpa_13/{kpa_13_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_130/{kpa_130_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_130/{kpa_130_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_130/{kpa_130_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_130/{kpa_130_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_133/{kpa_133_6.c => ease.c} (100%)
 rename src/world/area_kpa/kpa_133/{kpa_133_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_133/{kpa_133_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_133/{kpa_133_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_133/{kpa_133_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_133/{kpa_133_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_133/{kpa_133_5_water.c => water.c} (100%)
 rename src/world/area_kpa/kpa_134/{kpa_134_3_chains.c => chains.c} (100%)
 rename src/world/area_kpa/kpa_134/{kpa_134_6_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_134/{kpa_134_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_134/{kpa_134_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_134/{kpa_134_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_134/{kpa_134_5_panels.c => panels.c} (100%)
 rename src/world/area_kpa/kpa_134/{kpa_134_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_14/{kpa_14_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_14/{kpa_14_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_14/{kpa_14_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_14/{kpa_14_4_platforms.c => platforms.c} (100%)
 rename src/world/area_kpa/kpa_14/{kpa_14_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_15/{kpa_15_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_15/{kpa_15_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_15/{kpa_15_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_15/{kpa_15_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_16/{kpa_16_3_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_16/{kpa_16_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_16/{kpa_16_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_16/{kpa_16_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_16/{kpa_16_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_17/{kpa_17_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_17/{kpa_17_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_17/{kpa_17_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_17/{kpa_17_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_17/{kpa_17_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_32/{kpa_32_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_32/{kpa_32_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_32/{kpa_32_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_32/{kpa_32_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_33/{kpa_33_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_33/{kpa_33_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_33/{kpa_33_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_33/{kpa_33_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_40/{kpa_40_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_40/{kpa_40_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_40/{kpa_40_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_41/{kpa_41_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_41/{kpa_41_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_41/{kpa_41_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_50/{kpa_50_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_50/{kpa_50_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_50/{kpa_50_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_50/{kpa_50_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_51/{kpa_51_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_51/{kpa_51_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_51/{kpa_51_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_51/{kpa_51_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_52/{kpa_52_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_52/{kpa_52_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_52/{kpa_52_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_52/{kpa_52_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_52/{kpa_52_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_53/{kpa_53_4_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_53/{kpa_53_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_53/{kpa_53_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_53/{kpa_53_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_53/{kpa_53_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_60/{kpa_60_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_60/{kpa_60_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_60/{kpa_60_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_60/{kpa_60_4_scenes.c => scenes.c} (100%)
 rename src/world/area_kpa/kpa_60/{kpa_60_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_61/{kpa_61_4_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_61/{kpa_61_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_61/{kpa_61_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_61/{kpa_61_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_61/{kpa_61_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_62/{kpa_62_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_62/{kpa_62_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_62/{kpa_62_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_62/{kpa_62_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_63/{kpa_63_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_63/{kpa_63_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_63/{kpa_63_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_63/{kpa_63_4_scenes.c => scenes.c} (100%)
 rename src/world/area_kpa/kpa_63/{kpa_63_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_70/{kpa_70_5_chain_anim.c => chain_anim.c} (100%)
 rename src/world/area_kpa/kpa_70/{kpa_70_4_chain_skele.c => chain_skele.c} (100%)
 rename src/world/area_kpa/kpa_70/{kpa_70_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_70/{kpa_70_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_70/{kpa_70_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_70/{kpa_70_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_81/{kpa_81_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_81/{kpa_81_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_81/{kpa_81_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_81/{kpa_81_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_82/{kpa_82_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_82/{kpa_82_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_82/{kpa_82_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_82/{kpa_82_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_83/{kpa_83_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_83/{kpa_83_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_83/{kpa_83_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_83/{kpa_83_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_90/{kpa_90_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_90/{kpa_90_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_90/{kpa_90_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_91/{kpa_91_4_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_91/{kpa_91_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_91/{kpa_91_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_91/{kpa_91_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_91/{kpa_91_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_94/{kpa_94_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_94/{kpa_94_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_94/{kpa_94_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_95/{kpa_95_2_entity.c => entity.c} (100%)
 rename src/world/area_kpa/kpa_95/{kpa_95_3_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_95/{kpa_95_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_95/{kpa_95_4_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_95/{kpa_95_0_header.c => settings.c} (100%)
 rename src/world/area_kpa/kpa_96/{kpa_96_2_main.c => main.c} (100%)
 rename src/world/area_kpa/kpa_96/{kpa_96_1_music.c => music.c} (100%)
 rename src/world/area_kpa/kpa_96/{kpa_96_3_npc.c => npc.c} (100%)
 rename src/world/area_kpa/kpa_96/{kpa_96_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_01/{kzn_01_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_01/{kzn_01_2_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_01/{kzn_01_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_02/{kzn_02_4_demo.c => demo.c} (100%)
 rename src/world/area_kzn/kzn_02/{kzn_02_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_02/{kzn_02_3_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_02/{kzn_02_2_platforms.c => platforms.c} (100%)
 rename src/world/area_kzn/kzn_02/{kzn_02_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_03/{kzn_03_3_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_03/{kzn_03_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_03/{kzn_03_2_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_03/{kzn_03_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_03/{kzn_03_4_ziplines.c => ziplines.c} (100%)
 rename src/world/area_kzn/kzn_04/{kzn_04_2_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_04/{kzn_04_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_04/{kzn_04_3_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_04/{kzn_04_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_05/{kzn_05_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_05/{kzn_05_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_06/{kzn_06_2_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_06/{kzn_06_3_extra.c => extra.c} (100%)
 rename src/world/area_kzn/kzn_06/{kzn_06_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_06/{kzn_06_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_07/{kzn_07_3_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_07/{kzn_07_2_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_07/{kzn_07_1_music.c => music.c} (100%)
 rename src/world/area_kzn/kzn_07/{kzn_07_4_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_07/{kzn_07_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_08/{kzn_08_2_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_08/{kzn_08_4_extra.c => extra.c} (100%)
 rename src/world/area_kzn/kzn_08/{kzn_08_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_08/{kzn_08_3_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_08/{kzn_08_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_09/{kzn_09_2_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_09/{kzn_09_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_09/{kzn_09_4_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_09/{kzn_09_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_09/{kzn_09_3_zipline.c => zipline.c} (100%)
 rename src/world/area_kzn/kzn_10/{kzn_10_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_10/{kzn_10_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_10/{kzn_10_2_tromp.c => tromp.c} (100%)
 rename src/world/area_kzn/kzn_11/{kzn_11_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_11/{kzn_11_3_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_11/{kzn_11_2_platforms.c => platforms.c} (100%)
 rename src/world/area_kzn/kzn_11/{kzn_11_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_17/{kzn_17_2_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_17/{kzn_17_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_17/{kzn_17_3_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_17/{kzn_17_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_17/{kzn_17_4_tromp.c => tromp.c} (100%)
 rename src/world/area_kzn/kzn_18/{kzn_18_3_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_18/{kzn_18_1_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_18/{kzn_18_2_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_18/{kzn_18_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_19/{kzn_19_6_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_19/{kzn_19_5_eruption.c => eruption.c} (100%)
 rename src/world/area_kzn/kzn_19/{kzn_19_2_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_19/{kzn_19_1_music.c => music.c} (100%)
 rename src/world/area_kzn/kzn_19/{kzn_19_4_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_19/{kzn_19_3_npc_settings.c => npc_settings.c} (100%)
 rename src/world/area_kzn/kzn_19/{kzn_19_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_20/{kzn_20_2_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_20/{kzn_20_1_music.c => music.c} (100%)
 rename src/world/area_kzn/kzn_20/{kzn_20_3_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_20/{kzn_20_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_22/{kzn_22_3_entity.c => entity.c} (100%)
 rename src/world/area_kzn/kzn_22/{kzn_22_2_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_22/{kzn_22_1_music.c => music.c} (100%)
 rename src/world/area_kzn/kzn_22/{kzn_22_4_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_22/{kzn_22_0_header.c => settings.c} (100%)
 rename src/world/area_kzn/kzn_23/{kzn_23_2_main.c => main.c} (100%)
 rename src/world/area_kzn/kzn_23/{kzn_23_1_music.c => music.c} (100%)
 rename src/world/area_kzn/kzn_23/{kzn_23_3_npc.c => npc.c} (100%)
 rename src/world/area_kzn/kzn_23/{kzn_23_0_header.c => settings.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_8_demo.c => demo.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_3_entity.c => entity.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_14_epilogue.c => epilogue.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_13_epilogue_npc.c => epilogue_npc.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_12_intro.c => intro.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_11_intro_npc.c => intro_npc.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_2_main.c => main.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_1_music.c => music.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_7_music_mix.c => music_mix.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_5_npc.c => npc.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_4_rooms.c => rooms.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_0_header.c => settings.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_10_shared_npc.c => shared_npc.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_6_shop.c => shop.c} (100%)
 rename src/world/area_mac/mac_00/{mac_00_9_water_gfx.c => water_gfx.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_7_bulletin.c => bulletin.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_6_crystal_ball_gfx.c => crystal_ball_gfx.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_3_entity.c => entity.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_11_epilogue_npc.c => epilogue_npc.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_13_foliage.c => foliage.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_12_intro.c => intro.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_10_intro_npc.c => intro_npc.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_2_main.c => main.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_1_music.c => music.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_8_music_mix.c => music_mix.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_9_npc.c => npc.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_4_rooms.c => rooms.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_0_header.c => settings.c} (100%)
 rename src/world/area_mac/mac_01/{mac_01_5_shop.c => shop.c} (100%)
 rename src/world/area_mac/mac_02/{mac_02_5_entity.c => entity.c} (100%)
 rename src/world/area_mac/mac_02/{mac_02_4_foliage.c => foliage.c} (100%)
 rename src/world/area_mac/mac_02/{mac_02_2_main.c => main.c} (100%)
 rename src/world/area_mac/mac_02/{mac_02_1_music.c => music.c} (100%)
 rename src/world/area_mac/mac_02/{mac_02_7_music_mix.c => music_mix.c} (100%)
 rename src/world/area_mac/mac_02/{mac_02_6_npc.c => npc.c} (100%)
 rename src/world/area_mac/mac_02/{mac_02_3_rooms.c => rooms.c} (100%)
 rename src/world/area_mac/mac_02/{mac_02_0_header.c => settings.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_8_demo.c => demo.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_5_entity.c => entity.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_6_foliage.c => foliage.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_2_main.c => main.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_1_music.c => music.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_4_npc.c => npc.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_7_oinks.c => oinks.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_0_header.c => settings.c} (100%)
 rename src/world/area_mac/mac_03/{mac_03_3_train.c => train.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_8_entity.c => entity.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_4_foliage.c => foliage.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_2_main.c => main.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_1_music.c => music.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_9_music_mix.c => music_mix.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_6_npc.c => npc.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_3_rooms.c => rooms.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_0_header.c => settings.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_5_shop.c => shop.c} (100%)
 rename src/world/area_mac/mac_04/{mac_04_7_wish_scene.c => wish_scene.c} (100%)
 rename src/world/area_mac/mac_05/{mac_05_7_club64_sign.c => club64_sign.c} (100%)
 rename src/world/area_mac/mac_05/{mac_05_2_entity.c => entity.c} (100%)
 rename src/world/area_mac/mac_05/{mac_05_3_main.c => main.c} (100%)
 rename src/world/area_mac/mac_05/{mac_05_1_music.c => music.c} (100%)
 rename src/world/area_mac/mac_05/{mac_05_4_npc.c => npc.c} (100%)
 rename src/world/area_mac/mac_05/{mac_05_6_rooms.c => rooms.c} (100%)
 rename src/world/area_mac/mac_05/{mac_05_0_header.c => settings.c} (100%)
 rename src/world/area_mac/mac_05/{mac_05_5_whale.c => whale.c} (100%)
 rename src/world/area_mac/mac_06/{mac_06_1_main.c => main.c} (100%)
 rename src/world/area_mac/mac_06/{mac_06_3_npc.c => npc.c} (100%)
 rename src/world/area_mac/mac_06/{mac_06_0_header.c => settings.c} (100%)
 rename src/world/area_mac/mac_06/{mac_06_2_whale.c => whale.c} (100%)
 rename src/world/area_mac/machi/{machi_3_entity.c => entity.c} (100%)
 rename src/world/area_mac/machi/{machi_4_goomba_king.c => goomba_king.c} (100%)
 rename src/world/area_mac/machi/{machi_2_main.c => main.c} (100%)
 rename src/world/area_mac/machi/{machi_6_misstar.c => misstar.c} (100%)
 rename src/world/area_mac/machi/{machi_5_npc.c => npc.c} (100%)
 rename src/world/area_mac/machi/{machi_7_partner.c => partner.c} (100%)
 rename src/world/area_mac/machi/{machi_0_header.c => settings.c} (100%)
 rename src/world/area_mac/machi/{machi_1_tables.c => tables.c} (100%)
 rename src/world/area_mgm/mgm_00/{mgm_00_1_main.c => main.c} (100%)
 rename src/world/area_mgm/mgm_00/{mgm_00_2_npc.c => npc.c} (100%)
 rename src/world/area_mgm/mgm_00/{mgm_00_3_scoreboard.c => scoreboard.c} (100%)
 rename src/world/area_mgm/mgm_00/{mgm_00_0_header.c => settings.c} (100%)
 rename src/world/area_mgm/mgm_01/{mgm_01_3_entity.c => entity.c} (100%)
 rename src/world/area_mgm/mgm_01/{mgm_01_4_images.c => images.c} (100%)
 rename src/world/area_mgm/mgm_01/{mgm_01_1_main.c => main.c} (100%)
 rename src/world/area_mgm/mgm_01/{mgm_01_2_npc.c => npc.c} (100%)
 rename src/world/area_mgm/mgm_01/{mgm_01_0_header.c => settings.c} (100%)
 rename src/world/area_mgm/mgm_02/{mgm_02_3_images.c => images.c} (100%)
 rename src/world/area_mgm/mgm_02/{mgm_02_1_main.c => main.c} (100%)
 rename src/world/area_mgm/mgm_02/{mgm_02_2_npc.c => npc.c} (100%)
 rename src/world/area_mgm/mgm_02/{mgm_02_0_header.c => settings.c} (100%)
 rename src/world/area_mgm/mgm_03/{mgm_03_1_main.c => main.c} (100%)
 rename src/world/area_mgm/mgm_03/{mgm_03_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_01/{mim_01_3_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_01/{mim_01_5_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_01/{mim_01_4_hint.c => hint.c} (100%)
 rename src/world/area_mim/mim_01/{mim_01_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_01/{mim_01_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_01/{mim_01_6_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_01/{mim_01_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_02/{mim_02_4_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_02/{mim_02_5_hint.c => hint.c} (100%)
 rename src/world/area_mim/mim_02/{mim_02_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_02/{mim_02_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_02/{mim_02_3_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_02/{mim_02_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_03/{mim_03_3_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_03/{mim_03_5_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_03/{mim_03_4_hint.c => hint.c} (100%)
 rename src/world/area_mim/mim_03/{mim_03_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_03/{mim_03_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_03/{mim_03_6_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_03/{mim_03_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_04/{mim_04_3_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_04/{mim_04_5_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_04/{mim_04_4_hint.c => hint.c} (100%)
 rename src/world/area_mim/mim_04/{mim_04_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_04/{mim_04_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_04/{mim_04_6_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_04/{mim_04_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_05/{mim_05_3_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_05/{mim_05_5_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_05/{mim_05_4_hint.c => hint.c} (100%)
 rename src/world/area_mim/mim_05/{mim_05_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_05/{mim_05_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_05/{mim_05_6_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_05/{mim_05_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_06/{mim_06_3_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_06/{mim_06_5_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_06/{mim_06_4_hint.c => hint.c} (100%)
 rename src/world/area_mim/mim_06/{mim_06_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_06/{mim_06_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_06/{mim_06_6_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_06/{mim_06_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_07/{mim_07_3_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_07/{mim_07_5_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_07/{mim_07_4_hint.c => hint.c} (100%)
 rename src/world/area_mim/mim_07/{mim_07_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_07/{mim_07_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_07/{mim_07_6_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_07/{mim_07_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_08/{mim_08_3_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_08/{mim_08_4_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_08/{mim_08_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_08/{mim_08_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_08/{mim_08_5_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_08/{mim_08_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_09/{mim_09_3_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_09/{mim_09_5_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_09/{mim_09_4_hint.c => hint.c} (100%)
 rename src/world/area_mim/mim_09/{mim_09_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_09/{mim_09_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_09/{mim_09_6_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_09/{mim_09_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_10/{mim_10_2_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_10/{mim_10_3_main.c => main.c} (100%)
 rename src/world/area_mim/mim_10/{mim_10_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_10/{mim_10_4_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_10/{mim_10_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_11/{mim_11_4_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_11/{mim_11_6_foliage.c => foliage.c} (100%)
 rename src/world/area_mim/mim_11/{mim_11_3_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_11/{mim_11_2_main.c => main.c} (100%)
 rename src/world/area_mim/mim_11/{mim_11_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_11/{mim_11_5_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_11/{mim_11_0_header.c => settings.c} (100%)
 rename src/world/area_mim/mim_12/{mim_12_2_entity.c => entity.c} (100%)
 rename src/world/area_mim/mim_12/{mim_12_5_gate.c => gate.c} (100%)
 rename src/world/area_mim/mim_12/{mim_12_3_main.c => main.c} (100%)
 rename src/world/area_mim/mim_12/{mim_12_1_music.c => music.c} (100%)
 rename src/world/area_mim/mim_12/{mim_12_4_npc.c => npc.c} (100%)
 rename src/world/area_mim/mim_12/{mim_12_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_8_foliage.c => foliage.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_4_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_7_radio.c => radio.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_6_rooms.c => rooms.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_01/{nok_01_5_shop.c => shop.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_5_bookshelf.c => bookshelf.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_7_demo.c => demo.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_10_epilogue.c => epilogue.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_9_foliage.c => foliage.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_8_koot_favors.c => koot_favors.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_6_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_4_rooms.c => rooms.c} (100%)
 rename src/world/area_nok/nok_02/{nok_02_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_03/{nok_03_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_03/{nok_03_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_03/{nok_03_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_03/{nok_03_4_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_03/{nok_03_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_04/{nok_04_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_04/{nok_04_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_04/{nok_04_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_04/{nok_04_5_new_partner.c => new_partner.c} (100%)
 rename src/world/area_nok/nok_04/{nok_04_4_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_04/{nok_04_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_11/{nok_11_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_11/{nok_11_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_11/{nok_11_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_11/{nok_11_4_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_11/{nok_11_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_12/{nok_12_4_bridge.c => bridge.c} (100%)
 rename src/world/area_nok/nok_12/{nok_12_7_demo.c => demo.c} (100%)
 rename src/world/area_nok/nok_12/{nok_12_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_12/{nok_12_5_foliage.c => foliage.c} (100%)
 rename src/world/area_nok/nok_12/{nok_12_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_12/{nok_12_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_12/{nok_12_6_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_12/{nok_12_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_13/{nok_13_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_13/{nok_13_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_13/{nok_13_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_13/{nok_13_5.c => musical_hill.c} (100%)
 rename src/world/area_nok/nok_13/{nok_13_4_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_13/{nok_13_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_14/{nok_14_4_bridge.c => bridge.c} (100%)
 rename src/world/area_nok/nok_14/{nok_14_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_14/{nok_14_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_14/{nok_14_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_14/{nok_14_5_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_14/{nok_14_0_header.c => settings.c} (100%)
 rename src/world/area_nok/nok_15/{nok_15_3_entity.c => entity.c} (100%)
 rename src/world/area_nok/nok_15/{nok_15_5_foliage.c => foliage.c} (100%)
 rename src/world/area_nok/nok_15/{nok_15_2_main.c => main.c} (100%)
 rename src/world/area_nok/nok_15/{nok_15_1_music.c => music.c} (100%)
 rename src/world/area_nok/nok_15/{nok_15_4_npc.c => npc.c} (100%)
 rename src/world/area_nok/nok_15/{nok_15_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_01/{obk_01_3_chandelier.c => chandelier.c} (100%)
 rename src/world/area_obk/obk_01/{obk_01_7_entity.c => entity.c} (100%)
 rename src/world/area_obk/obk_01/{obk_01_5_jump_scare.c => jump_scare.c} (100%)
 rename src/world/area_obk/obk_01/{obk_01_2_main.c => main.c} (100%)
 rename src/world/area_obk/obk_01/{obk_01_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_01/{obk_01_6_npc.c => npc.c} (100%)
 rename src/world/area_obk/obk_01/{obk_01_4_portrait.c => portrait.c} (100%)
 rename src/world/area_obk/obk_01/{obk_01_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_02/{obk_02_4_bombable.c => bombable.c} (100%)
 rename src/world/area_obk/obk_02/{obk_02_5_clock.c => clock.c} (100%)
 rename src/world/area_obk/obk_02/{obk_02_6_entity.c => entity.c} (100%)
 rename src/world/area_obk/obk_02/{obk_02_2_main.c => main.c} (100%)
 rename src/world/area_obk/obk_02/{obk_02_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_02/{obk_02_3_npc.c => npc.c} (100%)
 rename src/world/area_obk/obk_02/{obk_02_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_03/{obk_03_4_entity.c => entity.c} (100%)
 rename src/world/area_obk/obk_03/{obk_03_2_main.c => main.c} (100%)
 rename src/world/area_obk/obk_03/{obk_03_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_03/{obk_03_6_npc.c => npc.c} (100%)
 rename src/world/area_obk/obk_03/{obk_03_7_rocking_chair.c => rocking_chair.c} (100%)
 rename src/world/area_obk/obk_03/{obk_03_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_03/{obk_03_3_shop.c => shop.c} (100%)
 rename src/world/area_obk/obk_03/{obk_03_5_stairs.c => stairs.c} (100%)
 rename src/world/area_obk/obk_04/{obk_04_2_entity.c => entity.c} (100%)
 rename src/world/area_obk/obk_04/{obk_04_6_game.c => game.c} (100%)
 rename src/world/area_obk/obk_04/{obk_04_5_hole.c => hole.c} (100%)
 rename src/world/area_obk/obk_04/{obk_04_4_main.c => main.c} (100%)
 rename src/world/area_obk/obk_04/{obk_04_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_04/{obk_04_3_npc.c => npc.c} (100%)
 rename src/world/area_obk/obk_04/{obk_04_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_05/{obk_05_6_entity.c => entity.c} (100%)
 rename src/world/area_obk/obk_05/{obk_05_4_hole.c => hole.c} (100%)
 rename src/world/area_obk/obk_05/{obk_05_2_main.c => main.c} (100%)
 rename src/world/area_obk/obk_05/{obk_05_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_05/{obk_05_5_npc.c => npc.c} (100%)
 rename src/world/area_obk/obk_05/{obk_05_3_rocking_chair.c => rocking_chair.c} (100%)
 rename src/world/area_obk/obk_05/{obk_05_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_06/{obk_06_3_bombable.c => bombable.c} (100%)
 rename src/world/area_obk/obk_06/{obk_06_4_entity.c => entity.c} (100%)
 rename src/world/area_obk/obk_06/{obk_06_2_main.c => main.c} (100%)
 rename src/world/area_obk/obk_06/{obk_06_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_06/{obk_06_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_07/{obk_07_3_entity.c => entity.c} (100%)
 rename src/world/area_obk/obk_07/{obk_07_4_fireplace.c => fireplace.c} (100%)
 rename src/world/area_obk/obk_07/{obk_07_2_main.c => main.c} (100%)
 rename src/world/area_obk/obk_07/{obk_07_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_07/{obk_07_5_npc.c => npc.c} (100%)
 rename src/world/area_obk/obk_07/{obk_07_6_phonograph.c => phonograph.c} (100%)
 rename src/world/area_obk/obk_07/{obk_07_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_08/{obk_08_3_cabinets.c => cabinets.c} (100%)
 rename src/world/area_obk/obk_08/{obk_08_4_entity.c => entity.c} (100%)
 rename src/world/area_obk/obk_08/{obk_08_6_game.c => game.c} (100%)
 rename src/world/area_obk/obk_08/{obk_08_2_main.c => main.c} (100%)
 rename src/world/area_obk/obk_08/{obk_08_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_08/{obk_08_5_npc.c => npc.c} (100%)
 rename src/world/area_obk/obk_08/{obk_08_0_header.c => settings.c} (100%)
 rename src/world/area_obk/obk_09/{obk_09_6_epilogue.c => epilogue.c} (100%)
 rename src/world/area_obk/obk_09/{obk_09_2_main.c => main.c} (100%)
 rename src/world/area_obk/obk_09/{obk_09_3_meet_bow.c => meet_bow.c} (100%)
 rename src/world/area_obk/obk_09/{obk_09_1_music.c => music.c} (100%)
 rename src/world/area_obk/obk_09/{obk_09_5_new_partner.c => new_partner.c} (100%)
 rename src/world/area_obk/obk_09/{obk_09_4_npc.c => npc.c} (100%)
 rename src/world/area_obk/obk_09/{obk_09_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_01/{omo_01_5_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_01/{omo_01_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_01/{omo_01_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_01/{omo_01_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_01/{omo_01_4_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_01/{omo_01_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_02/{omo_02_5_barricade.c => barricade.c} (100%)
 rename src/world/area_omo/omo_02/{omo_02_3_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_02/{omo_02_4_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_02/{omo_02_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_02/{omo_02_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_02/{omo_02_6_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_02/{omo_02_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_4_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_8_epilogue.c => epilogue.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_5_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_6_train.c => train.c} (100%)
 rename src/world/area_omo/omo_03/{omo_03_7_train_drop.c => train_drop.c} (100%)
 rename src/world/area_omo/omo_04/{omo_04_4_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_04/{omo_04_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_04/{omo_04_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_04/{omo_04_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_04/{omo_04_5_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_04/{omo_04_6_scenes.c => scenes.c} (100%)
 rename src/world/area_omo/omo_04/{omo_04_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_05/{omo_05_5_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_05/{omo_05_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_05/{omo_05_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_05/{omo_05_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_05/{omo_05_4_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_05/{omo_05_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_06/{omo_06_6_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_06/{omo_06_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_06/{omo_06_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_06/{omo_06_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_06/{omo_06_5_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_06/{omo_06_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_06/{omo_06_4_train.c => train.c} (100%)
 rename src/world/area_omo/omo_07/{omo_07_5_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_07/{omo_07_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_07/{omo_07_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_07/{omo_07_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_07/{omo_07_4_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_07/{omo_07_6_scenes.c => scenes.c} (100%)
 rename src/world/area_omo/omo_07/{omo_07_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_08/{omo_08_3_boxes.c => boxes.c} (100%)
 rename src/world/area_omo/omo_08/{omo_08_5_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_08/{omo_08_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_08/{omo_08_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_08/{omo_08_6_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_08/{omo_08_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_08/{omo_08_4_train.c => train.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_3_conveyors.c => conveyors.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_6_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_5_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_7_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_8_scenes.c => scenes.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_09/{omo_09_4_slot_machine.c => slot_machine.c} (100%)
 rename src/world/area_omo/omo_10/{omo_10_6_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_10/{omo_10_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_10/{omo_10_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_10/{omo_10_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_10/{omo_10_5_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_10/{omo_10_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_10/{omo_10_4_train.c => train.c} (100%)
 rename src/world/area_omo/omo_11/{omo_11_4_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_11/{omo_11_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_11/{omo_11_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_11/{omo_11_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_11/{omo_11_5_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_11/{omo_11_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_12/{omo_12_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_12/{omo_12_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_12/{omo_12_4_new_partner.c => new_partner.c} (100%)
 rename src/world/area_omo/omo_12/{omo_12_3_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_12/{omo_12_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_13/{omo_13_5_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_13/{omo_13_3_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_13/{omo_13_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_13/{omo_13_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_13/{omo_13_4_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_13/{omo_13_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_14/{omo_14_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_14/{omo_14_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_14/{omo_14_3_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_14/{omo_14_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_15/{omo_15_2_main.c => main.c} (100%)
 rename src/world/area_omo/omo_15/{omo_15_1_music.c => music.c} (100%)
 rename src/world/area_omo/omo_15/{omo_15_3_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_15/{omo_15_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_16/{omo_16_1_main.c => main.c} (100%)
 rename src/world/area_omo/omo_16/{omo_16_3_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_16/{omo_16_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_16/{omo_16_2_train.c => train.c} (100%)
 rename src/world/area_omo/omo_17/{omo_17_5_entity.c => entity.c} (100%)
 rename src/world/area_omo/omo_17/{omo_17_2_gizmos.c => gizmos.c} (100%)
 rename src/world/area_omo/omo_17/{omo_17_1_main.c => main.c} (100%)
 rename src/world/area_omo/omo_17/{omo_17_4_npc.c => npc.c} (100%)
 rename src/world/area_omo/omo_17/{omo_17_0_header.c => settings.c} (100%)
 rename src/world/area_omo/omo_17/{omo_17_3_train.c => train.c} (100%)
 rename src/world/area_osr/osr_00/{osr_00_2_main.c => main.c} (100%)
 rename src/world/area_osr/osr_00/{osr_00_1_music.c => music.c} (100%)
 rename src/world/area_osr/osr_00/{osr_00_4_npc_epilogue.c => npc_epilogue.c} (100%)
 rename src/world/area_osr/osr_00/{osr_00_3_npc_intro.c => npc_intro.c} (100%)
 rename src/world/area_osr/osr_00/{osr_00_5_scenes.c => scenes.c} (100%)
 rename src/world/area_osr/osr_00/{osr_00_0_header.c => settings.c} (100%)
 rename src/world/area_osr/osr_01/{osr_01_2_main.c => main.c} (100%)
 rename src/world/area_osr/osr_01/{osr_01_1_music.c => music.c} (100%)
 rename src/world/area_osr/osr_01/{osr_01_3_npc.c => npc.c} (100%)
 rename src/world/area_osr/osr_01/{osr_01_0_header.c => settings.c} (100%)
 rename src/world/area_osr/osr_02/{osr_02_2_entity.c => entity.c} (100%)
 rename src/world/area_osr/osr_02/{osr_02_1_main.c => main.c} (100%)
 rename src/world/area_osr/osr_02/{osr_02_3_npc.c => npc.c} (100%)
 rename src/world/area_osr/osr_02/{osr_02_4_npc_peach.c => npc_peach.c} (100%)
 rename src/world/area_osr/osr_02/{osr_02_0_header.c => settings.c} (100%)
 rename src/world/area_osr/osr_03/{osr_03_6_ending.c => ending.c} (100%)
 rename src/world/area_osr/osr_03/{osr_03_5_interlude.c => interlude.c} (100%)
 rename src/world/area_osr/osr_03/{osr_03_3_intro.c => intro.c} (100%)
 rename src/world/area_osr/osr_03/{osr_03_1_main.c => main.c} (100%)
 rename src/world/area_osr/osr_03/{osr_03_2_npc.c => npc.c} (100%)
 rename src/world/area_osr/osr_03/{osr_03_0_header.c => settings.c} (100%)
 rename src/world/area_osr/osr_03/{osr_03_4_starship.c => starship.c} (100%)
 rename src/world/area_osr/osr_04/{osr_04_2_assault.c => assault.c} (100%)
 rename src/world/area_osr/osr_04/{osr_04_1_main.c => main.c} (100%)
 rename src/world/area_osr/osr_04/{osr_04_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_01/{pra_01_4_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_01/{pra_01_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_01/{pra_01_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_01/{pra_01_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_01/{pra_01_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_02/{pra_02_4_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_02/{pra_02_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_02/{pra_02_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_02/{pra_02_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_02/{pra_02_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_03/{pra_03_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_03/{pra_03_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_03/{pra_03_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_03/{pra_03_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_04/{pra_04_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_04/{pra_04_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_04/{pra_04_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_04/{pra_04_4_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_04/{pra_04_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_05/{pra_05_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_05/{pra_05_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_05/{pra_05_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_05/{pra_05_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_06/{pra_06_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_06/{pra_06_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_06/{pra_06_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_06/{pra_06_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_09/{pra_09_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_09/{pra_09_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_09/{pra_09_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_09/{pra_09_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_10/{pra_10_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_10/{pra_10_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_10/{pra_10_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_10/{pra_10_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_11/{pra_11_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_11/{pra_11_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_11/{pra_11_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_11/{pra_11_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_12/{pra_12_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_12/{pra_12_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_12/{pra_12_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_12/{pra_12_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_13/{pra_13_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_13/{pra_13_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_13/{pra_13_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_13/{pra_13_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_14/{pra_14_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_14/{pra_14_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_14/{pra_14_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_14/{pra_14_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_15/{pra_15_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_15/{pra_15_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_15/{pra_15_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_15/{pra_15_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_16/{pra_16_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_16/{pra_16_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_16/{pra_16_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_18/{pra_18_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_18/{pra_18_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_18/{pra_18_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_18/{pra_18_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_19/{pra_19_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_19/{pra_19_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_19/{pra_19_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_19/{pra_19_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_20/{pra_20_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_20/{pra_20_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_20/{pra_20_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_21/{pra_21_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_21/{pra_21_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_21/{pra_21_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_21/{pra_21_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_22/{pra_22_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_22/{pra_22_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_22/{pra_22_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_22/{pra_22_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_27/{pra_27_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_27/{pra_27_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_27/{pra_27_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_27/{pra_27_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_28/{pra_28_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_28/{pra_28_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_28/{pra_28_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_28/{pra_28_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_29/{pra_29_4_bridge.c => bridge.c} (100%)
 rename src/world/area_pra/pra_29/{pra_29_2_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_29/{pra_29_3_main.c => main.c} (100%)
 rename src/world/area_pra/pra_29/{pra_29_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_29/{pra_29_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_3_main.c => main.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_2_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_4_puzzle.c => puzzle.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_9_stairs_anim.c => stairs_anim.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_10_stairs_lights.c => stairs_lights.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_8_stairs_skele.c => stairs_skele.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_11_stairs_vtx.c => stairs_vtx.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_5_texture_1.c => texture_1.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_6_texture_2.c => texture_2.c} (100%)
 rename src/world/area_pra/pra_31/{pra_31_7_texture_3.c => texture_3.c} (100%)
 rename src/world/area_pra/pra_32/{pra_32_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_32/{pra_32_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_32/{pra_32_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_32/{pra_32_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_33/{pra_33_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_33/{pra_33_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_33/{pra_33_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_33/{pra_33_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_34/{pra_34_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_34/{pra_34_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_34/{pra_34_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_34/{pra_34_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_35/{pra_35_4_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_35/{pra_35_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_35/{pra_35_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_35/{pra_35_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_35/{pra_35_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_36/{pra_36_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_36/{pra_36_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_36/{pra_36_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_36/{pra_36_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_37/{pra_37_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_37/{pra_37_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_37/{pra_37_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_37/{pra_37_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_38/{pra_38_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_38/{pra_38_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_38/{pra_38_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_38/{pra_38_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_39/{pra_39_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_39/{pra_39_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_39/{pra_39_3_npc.c => npc.c} (100%)
 rename src/world/area_pra/pra_39/{pra_39_0_header.c => settings.c} (100%)
 rename src/world/area_pra/pra_40/{pra_40_3_entity.c => entity.c} (100%)
 rename src/world/area_pra/pra_40/{pra_40_2_main.c => main.c} (100%)
 rename src/world/area_pra/pra_40/{pra_40_1_music.c => music.c} (100%)
 rename src/world/area_pra/pra_40/{pra_40_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_01/{sam_01_6_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_01/{sam_01_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_01/{sam_01_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_01/{sam_01_4_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_01/{sam_01_3_rooms.c => rooms.c} (100%)
 rename src/world/area_sam/sam_01/{sam_01_5_scenes.c => scenes.c} (100%)
 rename src/world/area_sam/sam_01/{sam_01_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_02/{sam_02_5_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_02/{sam_02_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_02/{sam_02_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_02/{sam_02_4_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_02/{sam_02_3_rooms.c => rooms.c} (100%)
 rename src/world/area_sam/sam_02/{sam_02_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_02/{sam_02_6_shop.c => shop.c} (100%)
 rename src/world/area_sam/sam_03/{sam_03_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_03/{sam_03_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_03/{sam_03_3_npc1.c => npc1.c} (100%)
 rename src/world/area_sam/sam_03/{sam_03_4_npc2.c => npc2.c} (100%)
 rename src/world/area_sam/sam_03/{sam_03_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_04/{sam_04_5_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_04/{sam_04_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_04/{sam_04_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_04/{sam_04_4_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_04/{sam_04_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_04/{sam_04_3_snowmen.c => snowmen.c} (100%)
 rename src/world/area_sam/sam_05/{sam_05_3_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_05/{sam_05_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_05/{sam_05_6_monstar_gfx.c => monstar_gfx.c} (100%)
 rename src/world/area_sam/sam_05/{sam_05_7_monstar_vtx.c => monstar_vtx.c} (100%)
 rename src/world/area_sam/sam_05/{sam_05_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_05/{sam_05_4_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_05/{sam_05_5_scenes.c => scenes.c} (100%)
 rename src/world/area_sam/sam_05/{sam_05_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_06/{sam_06_5_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_06/{sam_06_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_06/{sam_06_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_06/{sam_06_4_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_06/{sam_06_3_rooms.c => rooms.c} (100%)
 rename src/world/area_sam/sam_06/{sam_06_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_07/{sam_07_3_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_07/{sam_07_4_frozen_pit.c => frozen_pit.c} (100%)
 rename src/world/area_sam/sam_07/{sam_07_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_07/{sam_07_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_07/{sam_07_5_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_07/{sam_07_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_08/{sam_08_3_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_08/{sam_08_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_08/{sam_08_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_08/{sam_08_4_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_08/{sam_08_5_scenes.c => scenes.c} (100%)
 rename src/world/area_sam/sam_08/{sam_08_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_09/{sam_09_3_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_09/{sam_09_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_09/{sam_09_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_09/{sam_09_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_09/{sam_09_4_sockets.c => sockets.c} (100%)
 rename src/world/area_sam/sam_10/{sam_10_3_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_10/{sam_10_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_10/{sam_10_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_10/{sam_10_5_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_10/{sam_10_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_10/{sam_10_4_stairs.c => stairs.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_4_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_5_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_6_pond.c => pond.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_8_pond_anim.c => pond_anim.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_9_pond_skele.c => pond_skele.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_3_rooms.c => rooms.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_0_header.c => settings.c} (100%)
 rename src/world/area_sam/sam_11/{sam_11_7_staircase.c => staircase.c} (100%)
 rename src/world/area_sam/sam_12/{sam_12_5_entity.c => entity.c} (100%)
 rename src/world/area_sam/sam_12/{sam_12_2_main.c => main.c} (100%)
 rename src/world/area_sam/sam_12/{sam_12_1_music.c => music.c} (100%)
 rename src/world/area_sam/sam_12/{sam_12_3_npc.c => npc.c} (100%)
 rename src/world/area_sam/sam_12/{sam_12_4_scenes.c => scenes.c} (100%)
 rename src/world/area_sam/sam_12/{sam_12_0_header.c => settings.c} (100%)
 rename src/world/area_sbk/sbk_00/{sbk_00_3_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_00/{sbk_00_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_00/{sbk_00_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_00/{sbk_00_0_header.c => settings.c} (100%)
 rename src/world/area_sbk/sbk_01/{sbk_01_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_01/{sbk_01_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_02/{sbk_02_5_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_02/{sbk_02_2_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_02/{sbk_02_1_music.c => music.c} (100%)
 rename src/world/area_sbk/sbk_02/{sbk_02_4_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_02/{sbk_02_3_ruins.c => ruins.c} (100%)
 rename src/world/area_sbk/sbk_02/{sbk_02_0_header.c => settings.c} (100%)
 rename src/world/area_sbk/sbk_03/{sbk_03_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_03/{sbk_03_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_04/{sbk_04_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_04/{sbk_04_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_05/{sbk_05_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_05/{sbk_05_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_05/{sbk_05_3_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_06/{sbk_06_4_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_06/{sbk_06_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_06/{sbk_06_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_06/{sbk_06_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_10/{sbk_10_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_10/{sbk_10_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_11/{sbk_11_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_11/{sbk_11_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_12/{sbk_12_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_12/{sbk_12_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_13/{sbk_13_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_13/{sbk_13_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_14/{sbk_14_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_14/{sbk_14_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_15/{sbk_15_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_15/{sbk_15_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_16/{sbk_16_2_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_16/{sbk_16_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_20/{sbk_20_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_20/{sbk_20_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_20/{sbk_20_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_21/{sbk_21_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_22/{sbk_22_3_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_22/{sbk_22_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_22/{sbk_22_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_23/{sbk_23_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_23/{sbk_23_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_24/{sbk_24_3_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_24/{sbk_24_4_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_24/{sbk_24_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_24/{sbk_24_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_25/{sbk_25_4_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_25/{sbk_25_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_25/{sbk_25_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_25/{sbk_25_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_26/{sbk_26_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_26/{sbk_26_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_26/{sbk_26_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_30/{sbk_30_4_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_30/{sbk_30_2_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_30/{sbk_30_1_music.c => music.c} (100%)
 rename src/world/area_sbk/sbk_30/{sbk_30_3_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_30/{sbk_30_0_header.c => settings.c} (100%)
 rename src/world/area_sbk/sbk_31/{sbk_31_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_31/{sbk_31_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_32/{sbk_32_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_32/{sbk_32_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_33/{sbk_33_1_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_33/{sbk_33_2_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_33/{sbk_33_0_header.c => settings.c} (100%)
 rename src/world/area_sbk/sbk_34/{sbk_34_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_34/{sbk_34_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_34/{sbk_34_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_35/{sbk_35_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_35/{sbk_35_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_35/{sbk_35_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_36/{sbk_36_3_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_36/{sbk_36_2_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_36/{sbk_36_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_40/{sbk_40_3_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_40/{sbk_40_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_40/{sbk_40_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_41/{sbk_41_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_41/{sbk_41_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_42/{sbk_42_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_42/{sbk_42_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_43/{sbk_43_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_43/{sbk_43_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_44/{sbk_44_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_44/{sbk_44_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_45/{sbk_45_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_45/{sbk_45_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_46/{sbk_46_4_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_46/{sbk_46_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_46/{sbk_46_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_46/{sbk_46_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_50/{sbk_50_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_51/{sbk_51_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_51/{sbk_51_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_52/{sbk_52_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_52/{sbk_52_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_53/{sbk_53_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_53/{sbk_53_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_54/{sbk_54_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_54/{sbk_54_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_55/{sbk_55_4_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_55/{sbk_55_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_55/{sbk_55_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_55/{sbk_55_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_56/{sbk_56_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_56/{sbk_56_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_56/{sbk_56_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_60/{sbk_60_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_60/{sbk_60_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_61/{sbk_61_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_61/{sbk_61_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_62/{sbk_62_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_62/{sbk_62_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_63/{sbk_63_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_63/{sbk_63_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_64/{sbk_64_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_64/{sbk_64_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_65/{sbk_65_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_66/{sbk_66_4_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_66/{sbk_66_3_foliage.c => foliage.c} (100%)
 rename src/world/area_sbk/sbk_66/{sbk_66_1_main.c => main.c} (100%)
 rename src/world/area_sbk/sbk_66/{sbk_66_2_npc.c => npc.c} (100%)
 rename src/world/area_sbk/sbk_99/{sbk_99_2_entity.c => entity.c} (100%)
 rename src/world/area_sbk/sbk_99/{sbk_99_1_main.c => main.c} (100%)
 rename src/world/area_tik/tik_01/{tik_01_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_01/{tik_01_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_01/{tik_01_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_01/{tik_01_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_01/{tik_01_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_01/{tik_01_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_02/{tik_02_4_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_02/{tik_02_3_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_02/{tik_02_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_02/{tik_02_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_02/{tik_02_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_02/{tik_02_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_03/{tik_03_6_demo.c => demo.c} (100%)
 rename src/world/area_tik/tik_03/{tik_03_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_03/{tik_03_5_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_03/{tik_03_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_03/{tik_03_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_03/{tik_03_4_platforms.c => platforms.c} (100%)
 rename src/world/area_tik/tik_03/{tik_03_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_04/{tik_04_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_04/{tik_04_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_04/{tik_04_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_04/{tik_04_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_04/{tik_04_4_platforms.c => platforms.c} (100%)
 rename src/world/area_tik/tik_04/{tik_04_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_05/{tik_05_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_05/{tik_05_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_05/{tik_05_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_05/{tik_05_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_05/{tik_05_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_05/{tik_05_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_06/{tik_06_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_06/{tik_06_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_06/{tik_06_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_06/{tik_06_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_06/{tik_06_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_07/{tik_07_4_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_07/{tik_07_3_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_07/{tik_07_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_07/{tik_07_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_07/{tik_07_6_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_07/{tik_07_5_platforms.c => platforms.c} (100%)
 rename src/world/area_tik/tik_07/{tik_07_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_08/{tik_08_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_08/{tik_08_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_08/{tik_08_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_08/{tik_08_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_08/{tik_08_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_08/{tik_08_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_09/{tik_09_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_09/{tik_09_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_09/{tik_09_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_09/{tik_09_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_09/{tik_09_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_09/{tik_09_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_10/{tik_10_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_10/{tik_10_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_10/{tik_10_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_10/{tik_10_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_10/{tik_10_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_12/{tik_12_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_12/{tik_12_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_12/{tik_12_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_12/{tik_12_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_12/{tik_12_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_12/{tik_12_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_14/{tik_14_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_14/{tik_14_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_14/{tik_14_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_14/{tik_14_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_14/{tik_14_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_15/{tik_15_4_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_15/{tik_15_3_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_15/{tik_15_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_15/{tik_15_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_15/{tik_15_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_15/{tik_15_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_17/{tik_17_2_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_17/{tik_17_3_main.c => main.c} (100%)
 rename src/world/area_tik/tik_17/{tik_17_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_17/{tik_17_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_18/{tik_18_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_18/{tik_18_5_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_18/{tik_18_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_18/{tik_18_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_18/{tik_18_4_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_18/{tik_18_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_19/{tik_19_3_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_19/{tik_19_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_19/{tik_19_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_19/{tik_19_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_20/{tik_20_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_20/{tik_20_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_20/{tik_20_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_20/{tik_20_3_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_20/{tik_20_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_21/{tik_21_3_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_21/{tik_21_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_21/{tik_21_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_21/{tik_21_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_22/{tik_22_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_22/{tik_22_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_22/{tik_22_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_23/{tik_23_3_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_23/{tik_23_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_23/{tik_23_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_23/{tik_23_4_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_23/{tik_23_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_24/{tik_24_3_drips.c => drips.c} (100%)
 rename src/world/area_tik/tik_24/{tik_24_4_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_24/{tik_24_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_24/{tik_24_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_24/{tik_24_5_npc.c => npc.c} (100%)
 rename src/world/area_tik/tik_24/{tik_24_0_header.c => settings.c} (100%)
 rename src/world/area_tik/tik_25/{tik_25_3_entity.c => entity.c} (100%)
 rename src/world/area_tik/tik_25/{tik_25_2_main.c => main.c} (100%)
 rename src/world/area_tik/tik_25/{tik_25_1_music.c => music.c} (100%)
 rename src/world/area_tik/tik_25/{tik_25_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_00/{trd_00_2_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_00/{trd_00_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_00/{trd_00_3_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_00/{trd_00_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_01/{trd_01_2_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_01/{trd_01_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_01/{trd_01_3_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_01/{trd_01_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_02/{trd_02_2_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_02/{trd_02_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_02/{trd_02_3_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_02/{trd_02_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_03/{trd_03_2_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_03/{trd_03_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_03/{trd_03_3_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_03/{trd_03_4_puzzle.c => puzzle.c} (100%)
 rename src/world/area_trd/trd_03/{trd_03_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_04/{trd_04_2_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_04/{trd_04_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_04/{trd_04_3_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_04/{trd_04_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_05/{trd_05_2_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_05/{trd_05_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_05/{trd_05_4_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_05/{trd_05_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_05/{trd_05_3_trap.c => trap.c} (100%)
 rename src/world/area_trd/trd_06/{trd_06_5_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_06/{trd_06_2_falling.c => falling.c} (100%)
 rename src/world/area_trd/trd_06/{trd_06_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_06/{trd_06_4_npc_koopa_bros.c => npc_koopa_bros.c} (100%)
 rename src/world/area_trd/trd_06/{trd_06_3_npc_prisoners.c => npc_prisoners.c} (100%)
 rename src/world/area_trd/trd_06/{trd_06_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_07/{trd_07_3_magic_doors.c => magic_doors.c} (100%)
 rename src/world/area_trd/trd_07/{trd_07_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_07/{trd_07_2_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_07/{trd_07_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_08/{trd_08_2_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_08/{trd_08_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_08/{trd_08_3_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_08/{trd_08_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_09/{trd_09_4_demo.c => demo.c} (100%)
 rename src/world/area_trd/trd_09/{trd_09_2_entity.c => entity.c} (100%)
 rename src/world/area_trd/trd_09/{trd_09_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_09/{trd_09_3_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_09/{trd_09_0_header.c => settings.c} (100%)
 rename src/world/area_trd/trd_10/{trd_10_3_fake_bowser.c => fake_bowser.c} (100%)
 rename src/world/area_trd/trd_10/{trd_10_1_main.c => main.c} (100%)
 rename src/world/area_trd/trd_10/{trd_10_2_npc.c => npc.c} (100%)
 rename src/world/area_trd/trd_10/{trd_10_0_header.c => settings.c} (100%)
 rename src/world/area_tst/tst_01/{tst_01_2_entity.c => entity.c} (100%)
 rename src/world/area_tst/tst_01/{tst_01_1_main.c => main.c} (100%)
 rename src/world/area_tst/tst_02/{tst_02_2_entity.c => entity.c} (100%)
 rename src/world/area_tst/tst_02/{tst_02_1_main.c => main.c} (100%)
 rename src/world/area_tst/tst_03/{tst_03_2_entity.c => entity.c} (100%)
 rename src/world/area_tst/tst_03/{tst_03_1_main.c => main.c} (100%)
 rename src/world/area_tst/tst_04/{tst_04_2_entity.c => entity.c} (100%)
 rename src/world/area_tst/tst_04/{tst_04_1_main.c => main.c} (100%)
 rename src/world/area_tst/tst_04/{tst_04_4_npc.c => npc.c} (100%)
 rename src/world/area_tst/tst_04/{tst_04_3_reflection.c => reflection.c} (100%)
 rename src/world/area_tst/tst_10/{tst_10_1_main.c => main.c} (100%)
 rename src/world/area_tst/tst_11/{tst_11_2_extra.c => extra.c} (100%)
 rename src/world/area_tst/tst_11/{tst_11_1_main.c => main.c} (100%)
 rename src/world/area_tst/tst_12/{tst_12_1_main.c => main.c} (100%)
 rename src/world/area_tst/tst_13/{tst_13_1_main.c => main.c} (100%)
 rename src/world/area_tst/tst_20/{tst_20_1_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_00/{flo_00_5_beanstalk.c => beanstalk.c} (100%)
 rename src/world/dead/area_flo/flo_00/{flo_00_6_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_00/{flo_00_4_epilogue.c => epilogue.c} (100%)
 rename src/world/dead/area_flo/flo_00/{flo_00_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_00/{flo_00_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_00/{flo_00_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_00/{flo_00_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_03/{flo_03_5_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_03/{flo_03_4_foliage.c => foliage.c} (100%)
 rename src/world/dead/area_flo/flo_03/{flo_03_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_03/{flo_03_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_03/{flo_03_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_03/{flo_03_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_07/{flo_07_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_07/{flo_07_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_07/{flo_07_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_07/{flo_07_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_08/{flo_08_2_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_08/{flo_08_5_foliage.c => foliage.c} (100%)
 rename src/world/dead/area_flo/flo_08/{flo_08_3_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_08/{flo_08_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_08/{flo_08_4_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_08/{flo_08_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_08/{flo_08_6_vines.c => vines.c} (100%)
 rename src/world/dead/area_flo/flo_09/{flo_09_4_foliage.c => foliage.c} (100%)
 rename src/world/dead/area_flo/flo_09/{flo_09_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_09/{flo_09_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_09/{flo_09_5_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_09/{flo_09_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_09/{flo_09_3_vines.c => vines.c} (100%)
 rename src/world/dead/area_flo/flo_10/{flo_10_2_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_10/{flo_10_7_foliage.c => foliage.c} (100%)
 rename src/world/dead/area_flo/flo_10/{flo_10_4_fountain.c => fountain.c} (100%)
 rename src/world/dead/area_flo/flo_10/{flo_10_3_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_10/{flo_10_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_10/{flo_10_5_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_10/{flo_10_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_10/{flo_10_6_waterfx.c => waterfx.c} (100%)
 rename src/world/dead/area_flo/flo_11/{flo_11_4_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_11/{flo_11_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_11/{flo_11_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_11/{flo_11_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_11/{flo_11_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_12/{flo_12_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_12/{flo_12_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_12/{flo_12_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_12/{flo_12_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_13/{flo_13_2_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_13/{flo_13_3_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_13/{flo_13_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_13/{flo_13_5_new_partner.c => new_partner.c} (100%)
 rename src/world/dead/area_flo/flo_13/{flo_13_4_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_13/{flo_13_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_14/{flo_14_3_bubbles.c => bubbles.c} (100%)
 rename src/world/dead/area_flo/flo_14/{flo_14_5_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_14/{flo_14_6_logs.c => logs.c} (100%)
 rename src/world/dead/area_flo/flo_14/{flo_14_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_14/{flo_14_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_14/{flo_14_4_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_14/{flo_14_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_15/{flo_15_4_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_15/{flo_15_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_15/{flo_15_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_15/{flo_15_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_15/{flo_15_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_15/{flo_15_5_stairs.c => stairs.c} (100%)
 rename src/world/dead/area_flo/flo_16/{flo_16_4_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_16/{flo_16_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_16/{flo_16_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_16/{flo_16_5_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_16/{flo_16_6_puzzle.c => puzzle.c} (100%)
 rename src/world/dead/area_flo/flo_16/{flo_16_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_16/{flo_16_3_vines.c => vines.c} (100%)
 rename src/world/dead/area_flo/flo_17/{flo_17_5_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_17/{flo_17_3_logs.c => logs.c} (100%)
 rename src/world/dead/area_flo/flo_17/{flo_17_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_17/{flo_17_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_17/{flo_17_4_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_17/{flo_17_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_18/{flo_18_5_foliage.c => foliage.c} (100%)
 rename src/world/dead/area_flo/flo_18/{flo_18_3_machine.c => machine.c} (100%)
 rename src/world/dead/area_flo/flo_18/{flo_18_2_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_18/{flo_18_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_18/{flo_18_4_npc.c => npc.c} (100%)
 rename src/world/dead/area_flo/flo_18/{flo_18_0_header.c => settings.c} (100%)
 rename src/world/dead/area_flo/flo_19/{flo_19_5_beanstalk.c => beanstalk.c} (100%)
 rename src/world/dead/area_flo/flo_19/{flo_19_4_clouds.c => clouds.c} (100%)
 rename src/world/dead/area_flo/flo_19/{flo_19_2_entity.c => entity.c} (100%)
 rename src/world/dead/area_flo/flo_19/{flo_19_3_main.c => main.c} (100%)
 rename src/world/dead/area_flo/flo_19/{flo_19_1_music.c => music.c} (100%)
 rename src/world/dead/area_flo/flo_19/{flo_19_0_header.c => settings.c} (100%)
 rename src/world/dead/area_kzn/kzn_11/{kzn_11_1_main.c => main.c} (100%)
 rename src/world/dead/area_kzn/kzn_11/{kzn_11_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_kzn/kzn_11/{kzn_11_2_platforms.c => platforms.c} (100%)
 rename src/world/dead/area_kzn/kzn_11/{kzn_11_0_header.c => settings.c} (100%)
 rename src/world/dead/area_kzn/kzn_17/{kzn_17_2_entity.c => entity.c} (100%)
 rename src/world/dead/area_kzn/kzn_17/{kzn_17_1_main.c => main.c} (100%)
 rename src/world/dead/area_kzn/kzn_17/{kzn_17_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_kzn/kzn_17/{kzn_17_0_header.c => settings.c} (100%)
 rename src/world/dead/area_kzn/kzn_17/{kzn_17_4_tromp.c => tromp.c} (100%)
 rename src/world/dead/area_kzn/kzn_18/{kzn_18_3_entity.c => entity.c} (100%)
 rename src/world/dead/area_kzn/kzn_18/{kzn_18_1_main.c => main.c} (100%)
 rename src/world/dead/area_kzn/kzn_18/{kzn_18_2_npc.c => npc.c} (100%)
 rename src/world/dead/area_kzn/kzn_18/{kzn_18_0_header.c => settings.c} (100%)
 rename src/world/dead/area_kzn/kzn_19/{kzn_19_6_entity.c => entity.c} (100%)
 rename src/world/dead/area_kzn/kzn_19/{kzn_19_5_eruption.c => eruption.c} (100%)
 rename src/world/dead/area_kzn/kzn_19/{kzn_19_2_main.c => main.c} (100%)
 rename src/world/dead/area_kzn/kzn_19/{kzn_19_1_music.c => music.c} (100%)
 rename src/world/dead/area_kzn/kzn_19/{kzn_19_4_npc.c => npc.c} (100%)
 rename src/world/dead/area_kzn/kzn_19/{kzn_19_3_npc_settings.c => npc_settings.c} (100%)
 rename src/world/dead/area_kzn/kzn_19/{kzn_19_0_header.c => settings.c} (100%)
 rename src/world/dead/area_kzn/kzn_20/{kzn_20_2_main.c => main.c} (100%)
 rename src/world/dead/area_kzn/kzn_20/{kzn_20_1_music.c => music.c} (100%)
 rename src/world/dead/area_kzn/kzn_20/{kzn_20_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_kzn/kzn_20/{kzn_20_0_header.c => settings.c} (100%)
 rename src/world/dead/area_kzn/kzn_22/{kzn_22_3_entity.c => entity.c} (100%)
 rename src/world/dead/area_kzn/kzn_22/{kzn_22_2_main.c => main.c} (100%)
 rename src/world/dead/area_kzn/kzn_22/{kzn_22_1_music.c => music.c} (100%)
 rename src/world/dead/area_kzn/kzn_22/{kzn_22_4_npc.c => npc.c} (100%)
 rename src/world/dead/area_kzn/kzn_22/{kzn_22_0_header.c => settings.c} (100%)
 rename src/world/dead/area_kzn/kzn_23/{kzn_23_2_main.c => main.c} (100%)
 rename src/world/dead/area_kzn/kzn_23/{kzn_23_1_music.c => music.c} (100%)
 rename src/world/dead/area_kzn/kzn_23/{kzn_23_3_npc.c => npc.c} (100%)
 rename src/world/dead/area_kzn/kzn_23/{kzn_23_0_header.c => settings.c} (100%)

diff --git a/.vscode/settings.json b/.vscode/settings.json
index e61ad8866f..69a343fa2a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -70,4 +70,6 @@
         "-l 120"
     ],
     "search.useIgnoreFiles": false,
+    "nixEnvSelector.nixFile": "${workspaceFolder}/shell.nix",
+    "workbench.editor.labelFormat": "short",
 }
diff --git a/src/world/area_arn/arn_02/arn_02_3_entity.c b/src/world/area_arn/arn_02/entity.c
similarity index 100%
rename from src/world/area_arn/arn_02/arn_02_3_entity.c
rename to src/world/area_arn/arn_02/entity.c
diff --git a/src/world/area_arn/arn_02/arn_02_2_main.c b/src/world/area_arn/arn_02/main.c
similarity index 100%
rename from src/world/area_arn/arn_02/arn_02_2_main.c
rename to src/world/area_arn/arn_02/main.c
diff --git a/src/world/area_arn/arn_02/arn_02_1_music.c b/src/world/area_arn/arn_02/music.c
similarity index 100%
rename from src/world/area_arn/arn_02/arn_02_1_music.c
rename to src/world/area_arn/arn_02/music.c
diff --git a/src/world/area_arn/arn_02/arn_02_4_npc.c b/src/world/area_arn/arn_02/npc.c
similarity index 100%
rename from src/world/area_arn/arn_02/arn_02_4_npc.c
rename to src/world/area_arn/arn_02/npc.c
diff --git a/src/world/area_arn/arn_02/arn_02_0_header.c b/src/world/area_arn/arn_02/settings.c
similarity index 100%
rename from src/world/area_arn/arn_02/arn_02_0_header.c
rename to src/world/area_arn/arn_02/settings.c
diff --git a/src/world/area_arn/arn_03/arn_03_4_entity.c b/src/world/area_arn/arn_03/entity.c
similarity index 100%
rename from src/world/area_arn/arn_03/arn_03_4_entity.c
rename to src/world/area_arn/arn_03/entity.c
diff --git a/src/world/area_arn/arn_03/arn_03_2_main.c b/src/world/area_arn/arn_03/main.c
similarity index 100%
rename from src/world/area_arn/arn_03/arn_03_2_main.c
rename to src/world/area_arn/arn_03/main.c
diff --git a/src/world/area_arn/arn_03/arn_03_1_music.c b/src/world/area_arn/arn_03/music.c
similarity index 100%
rename from src/world/area_arn/arn_03/arn_03_1_music.c
rename to src/world/area_arn/arn_03/music.c
diff --git a/src/world/area_arn/arn_03/arn_03_3_npc.c b/src/world/area_arn/arn_03/npc.c
similarity index 100%
rename from src/world/area_arn/arn_03/arn_03_3_npc.c
rename to src/world/area_arn/arn_03/npc.c
diff --git a/src/world/area_arn/arn_03/arn_03_0_header.c b/src/world/area_arn/arn_03/settings.c
similarity index 100%
rename from src/world/area_arn/arn_03/arn_03_0_header.c
rename to src/world/area_arn/arn_03/settings.c
diff --git a/src/world/area_arn/arn_04/arn_04_4_entity.c b/src/world/area_arn/arn_04/entity.c
similarity index 100%
rename from src/world/area_arn/arn_04/arn_04_4_entity.c
rename to src/world/area_arn/arn_04/entity.c
diff --git a/src/world/area_arn/arn_04/arn_04_2_main.c b/src/world/area_arn/arn_04/main.c
similarity index 100%
rename from src/world/area_arn/arn_04/arn_04_2_main.c
rename to src/world/area_arn/arn_04/main.c
diff --git a/src/world/area_arn/arn_04/arn_04_1_music.c b/src/world/area_arn/arn_04/music.c
similarity index 100%
rename from src/world/area_arn/arn_04/arn_04_1_music.c
rename to src/world/area_arn/arn_04/music.c
diff --git a/src/world/area_arn/arn_04/arn_04_3_npc.c b/src/world/area_arn/arn_04/npc.c
similarity index 100%
rename from src/world/area_arn/arn_04/arn_04_3_npc.c
rename to src/world/area_arn/arn_04/npc.c
diff --git a/src/world/area_arn/arn_04/arn_04_0_header.c b/src/world/area_arn/arn_04/settings.c
similarity index 100%
rename from src/world/area_arn/arn_04/arn_04_0_header.c
rename to src/world/area_arn/arn_04/settings.c
diff --git a/src/world/area_arn/arn_05/arn_05_4_entity.c b/src/world/area_arn/arn_05/entity.c
similarity index 100%
rename from src/world/area_arn/arn_05/arn_05_4_entity.c
rename to src/world/area_arn/arn_05/entity.c
diff --git a/src/world/area_arn/arn_05/arn_05_2_main.c b/src/world/area_arn/arn_05/main.c
similarity index 100%
rename from src/world/area_arn/arn_05/arn_05_2_main.c
rename to src/world/area_arn/arn_05/main.c
diff --git a/src/world/area_arn/arn_05/arn_05_1_music.c b/src/world/area_arn/arn_05/music.c
similarity index 100%
rename from src/world/area_arn/arn_05/arn_05_1_music.c
rename to src/world/area_arn/arn_05/music.c
diff --git a/src/world/area_arn/arn_05/arn_05_3_npc.c b/src/world/area_arn/arn_05/npc.c
similarity index 100%
rename from src/world/area_arn/arn_05/arn_05_3_npc.c
rename to src/world/area_arn/arn_05/npc.c
diff --git a/src/world/area_arn/arn_05/arn_05_0_header.c b/src/world/area_arn/arn_05/settings.c
similarity index 100%
rename from src/world/area_arn/arn_05/arn_05_0_header.c
rename to src/world/area_arn/arn_05/settings.c
diff --git a/src/world/area_arn/arn_07/arn_07_4_entity.c b/src/world/area_arn/arn_07/entity.c
similarity index 100%
rename from src/world/area_arn/arn_07/arn_07_4_entity.c
rename to src/world/area_arn/arn_07/entity.c
diff --git a/src/world/area_arn/arn_07/arn_07_2_main.c b/src/world/area_arn/arn_07/main.c
similarity index 100%
rename from src/world/area_arn/arn_07/arn_07_2_main.c
rename to src/world/area_arn/arn_07/main.c
diff --git a/src/world/area_arn/arn_07/arn_07_1_music.c b/src/world/area_arn/arn_07/music.c
similarity index 100%
rename from src/world/area_arn/arn_07/arn_07_1_music.c
rename to src/world/area_arn/arn_07/music.c
diff --git a/src/world/area_arn/arn_07/arn_07_5_npc.c b/src/world/area_arn/arn_07/npc.c
similarity index 100%
rename from src/world/area_arn/arn_07/arn_07_5_npc.c
rename to src/world/area_arn/arn_07/npc.c
diff --git a/src/world/area_arn/arn_07/arn_07_0_header.c b/src/world/area_arn/arn_07/settings.c
similarity index 100%
rename from src/world/area_arn/arn_07/arn_07_0_header.c
rename to src/world/area_arn/arn_07/settings.c
diff --git a/src/world/area_arn/arn_07/arn_07_3_windmill.c b/src/world/area_arn/arn_07/windmill.c
similarity index 100%
rename from src/world/area_arn/arn_07/arn_07_3_windmill.c
rename to src/world/area_arn/arn_07/windmill.c
diff --git a/src/world/area_arn/arn_08/arn_08_5_demo.c b/src/world/area_arn/arn_08/demo.c
similarity index 100%
rename from src/world/area_arn/arn_08/arn_08_5_demo.c
rename to src/world/area_arn/arn_08/demo.c
diff --git a/src/world/area_arn/arn_08/arn_08_7_entity.c b/src/world/area_arn/arn_08/entity.c
similarity index 100%
rename from src/world/area_arn/arn_08/arn_08_7_entity.c
rename to src/world/area_arn/arn_08/entity.c
diff --git a/src/world/area_arn/arn_08/arn_08_4_gears.c b/src/world/area_arn/arn_08/gears.c
similarity index 100%
rename from src/world/area_arn/arn_08/arn_08_4_gears.c
rename to src/world/area_arn/arn_08/gears.c
diff --git a/src/world/area_arn/arn_08/arn_08_2_main.c b/src/world/area_arn/arn_08/main.c
similarity index 100%
rename from src/world/area_arn/arn_08/arn_08_2_main.c
rename to src/world/area_arn/arn_08/main.c
diff --git a/src/world/area_arn/arn_08/arn_08_1_music.c b/src/world/area_arn/arn_08/music.c
similarity index 100%
rename from src/world/area_arn/arn_08/arn_08_1_music.c
rename to src/world/area_arn/arn_08/music.c
diff --git a/src/world/area_arn/arn_08/arn_08_6_npc.c b/src/world/area_arn/arn_08/npc.c
similarity index 100%
rename from src/world/area_arn/arn_08/arn_08_6_npc.c
rename to src/world/area_arn/arn_08/npc.c
diff --git a/src/world/area_arn/arn_08/arn_08_0_header.c b/src/world/area_arn/arn_08/settings.c
similarity index 100%
rename from src/world/area_arn/arn_08/arn_08_0_header.c
rename to src/world/area_arn/arn_08/settings.c
diff --git a/src/world/area_arn/arn_08/arn_08_3_well.c b/src/world/area_arn/arn_08/well.c
similarity index 100%
rename from src/world/area_arn/arn_08/arn_08_3_well.c
rename to src/world/area_arn/arn_08/well.c
diff --git a/src/world/area_arn/arn_09/arn_09_3_entity.c b/src/world/area_arn/arn_09/entity.c
similarity index 100%
rename from src/world/area_arn/arn_09/arn_09_3_entity.c
rename to src/world/area_arn/arn_09/entity.c
diff --git a/src/world/area_arn/arn_09/arn_09_4_launch.c b/src/world/area_arn/arn_09/launch.c
similarity index 100%
rename from src/world/area_arn/arn_09/arn_09_4_launch.c
rename to src/world/area_arn/arn_09/launch.c
diff --git a/src/world/area_arn/arn_09/arn_09_2_main.c b/src/world/area_arn/arn_09/main.c
similarity index 100%
rename from src/world/area_arn/arn_09/arn_09_2_main.c
rename to src/world/area_arn/arn_09/main.c
diff --git a/src/world/area_arn/arn_09/arn_09_1_music.c b/src/world/area_arn/arn_09/music.c
similarity index 100%
rename from src/world/area_arn/arn_09/arn_09_1_music.c
rename to src/world/area_arn/arn_09/music.c
diff --git a/src/world/area_arn/arn_09/arn_09_5_npc.c b/src/world/area_arn/arn_09/npc.c
similarity index 100%
rename from src/world/area_arn/arn_09/arn_09_5_npc.c
rename to src/world/area_arn/arn_09/npc.c
diff --git a/src/world/area_arn/arn_09/arn_09_0_header.c b/src/world/area_arn/arn_09/settings.c
similarity index 100%
rename from src/world/area_arn/arn_09/arn_09_0_header.c
rename to src/world/area_arn/arn_09/settings.c
diff --git a/src/world/area_arn/arn_10/arn_10_4_entity.c b/src/world/area_arn/arn_10/entity.c
similarity index 100%
rename from src/world/area_arn/arn_10/arn_10_4_entity.c
rename to src/world/area_arn/arn_10/entity.c
diff --git a/src/world/area_arn/arn_10/arn_10_2_main.c b/src/world/area_arn/arn_10/main.c
similarity index 100%
rename from src/world/area_arn/arn_10/arn_10_2_main.c
rename to src/world/area_arn/arn_10/main.c
diff --git a/src/world/area_arn/arn_10/arn_10_1_music.c b/src/world/area_arn/arn_10/music.c
similarity index 100%
rename from src/world/area_arn/arn_10/arn_10_1_music.c
rename to src/world/area_arn/arn_10/music.c
diff --git a/src/world/area_arn/arn_10/arn_10_3_npc.c b/src/world/area_arn/arn_10/npc.c
similarity index 100%
rename from src/world/area_arn/arn_10/arn_10_3_npc.c
rename to src/world/area_arn/arn_10/npc.c
diff --git a/src/world/area_arn/arn_10/arn_10_0_header.c b/src/world/area_arn/arn_10/settings.c
similarity index 100%
rename from src/world/area_arn/arn_10/arn_10_0_header.c
rename to src/world/area_arn/arn_10/settings.c
diff --git a/src/world/area_arn/arn_11/arn_11_2_main.c b/src/world/area_arn/arn_11/main.c
similarity index 100%
rename from src/world/area_arn/arn_11/arn_11_2_main.c
rename to src/world/area_arn/arn_11/main.c
diff --git a/src/world/area_arn/arn_11/arn_11_1_music.c b/src/world/area_arn/arn_11/music.c
similarity index 100%
rename from src/world/area_arn/arn_11/arn_11_1_music.c
rename to src/world/area_arn/arn_11/music.c
diff --git a/src/world/area_arn/arn_11/arn_11_3_npc.c b/src/world/area_arn/arn_11/npc.c
similarity index 100%
rename from src/world/area_arn/arn_11/arn_11_3_npc.c
rename to src/world/area_arn/arn_11/npc.c
diff --git a/src/world/area_arn/arn_11/arn_11_0_header.c b/src/world/area_arn/arn_11/settings.c
similarity index 100%
rename from src/world/area_arn/arn_11/arn_11_0_header.c
rename to src/world/area_arn/arn_11/settings.c
diff --git a/src/world/area_arn/arn_12/arn_12_4_entity.c b/src/world/area_arn/arn_12/entity.c
similarity index 100%
rename from src/world/area_arn/arn_12/arn_12_4_entity.c
rename to src/world/area_arn/arn_12/entity.c
diff --git a/src/world/area_arn/arn_12/arn_12_2_main.c b/src/world/area_arn/arn_12/main.c
similarity index 100%
rename from src/world/area_arn/arn_12/arn_12_2_main.c
rename to src/world/area_arn/arn_12/main.c
diff --git a/src/world/area_arn/arn_12/arn_12_1_music.c b/src/world/area_arn/arn_12/music.c
similarity index 100%
rename from src/world/area_arn/arn_12/arn_12_1_music.c
rename to src/world/area_arn/arn_12/music.c
diff --git a/src/world/area_arn/arn_12/arn_12_3_npc.c b/src/world/area_arn/arn_12/npc.c
similarity index 100%
rename from src/world/area_arn/arn_12/arn_12_3_npc.c
rename to src/world/area_arn/arn_12/npc.c
diff --git a/src/world/area_arn/arn_12/arn_12_0_header.c b/src/world/area_arn/arn_12/settings.c
similarity index 100%
rename from src/world/area_arn/arn_12/arn_12_0_header.c
rename to src/world/area_arn/arn_12/settings.c
diff --git a/src/world/area_arn/arn_13/arn_13_4_entity.c b/src/world/area_arn/arn_13/entity.c
similarity index 100%
rename from src/world/area_arn/arn_13/arn_13_4_entity.c
rename to src/world/area_arn/arn_13/entity.c
diff --git a/src/world/area_arn/arn_13/arn_13_2_main.c b/src/world/area_arn/arn_13/main.c
similarity index 100%
rename from src/world/area_arn/arn_13/arn_13_2_main.c
rename to src/world/area_arn/arn_13/main.c
diff --git a/src/world/area_arn/arn_13/arn_13_1_music.c b/src/world/area_arn/arn_13/music.c
similarity index 100%
rename from src/world/area_arn/arn_13/arn_13_1_music.c
rename to src/world/area_arn/arn_13/music.c
diff --git a/src/world/area_arn/arn_13/arn_13_3_npc.c b/src/world/area_arn/arn_13/npc.c
similarity index 100%
rename from src/world/area_arn/arn_13/arn_13_3_npc.c
rename to src/world/area_arn/arn_13/npc.c
diff --git a/src/world/area_arn/arn_13/arn_13_0_header.c b/src/world/area_arn/arn_13/settings.c
similarity index 100%
rename from src/world/area_arn/arn_13/arn_13_0_header.c
rename to src/world/area_arn/arn_13/settings.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_4_entity.c b/src/world/area_dgb/dgb_00/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_00/dgb_00_4_entity.c
rename to src/world/area_dgb/dgb_00/entity.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_2_main.c b/src/world/area_dgb/dgb_00/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_00/dgb_00_2_main.c
rename to src/world/area_dgb/dgb_00/main.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_1_music.c b/src/world/area_dgb/dgb_00/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_00/dgb_00_1_music.c
rename to src/world/area_dgb/dgb_00/music.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_3_npc.c b/src/world/area_dgb/dgb_00/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_00/dgb_00_3_npc.c
rename to src/world/area_dgb/dgb_00/npc.c
diff --git a/src/world/area_dgb/dgb_00/dgb_00_0_header.c b/src/world/area_dgb/dgb_00/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_00/dgb_00_0_header.c
rename to src/world/area_dgb/dgb_00/settings.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_3_bridges.c b/src/world/area_dgb/dgb_01/bridges.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_3_bridges.c
rename to src/world/area_dgb/dgb_01/bridges.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_4_entity.c b/src/world/area_dgb/dgb_01/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_4_entity.c
rename to src/world/area_dgb/dgb_01/entity.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_7.c b/src/world/area_dgb/dgb_01/gfx.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_7.c
rename to src/world/area_dgb/dgb_01/gfx.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img0.c b/src/world/area_dgb/dgb_01/img0.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_6_img0.c
rename to src/world/area_dgb/dgb_01/img0.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img1.c b/src/world/area_dgb/dgb_01/img1.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_6_img1.c
rename to src/world/area_dgb/dgb_01/img1.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img2.c b/src/world/area_dgb/dgb_01/img2.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_6_img2.c
rename to src/world/area_dgb/dgb_01/img2.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img3.c b/src/world/area_dgb/dgb_01/img3.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_6_img3.c
rename to src/world/area_dgb/dgb_01/img3.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img4.c b/src/world/area_dgb/dgb_01/img4.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_6_img4.c
rename to src/world/area_dgb/dgb_01/img4.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img5.c b/src/world/area_dgb/dgb_01/img5.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_6_img5.c
rename to src/world/area_dgb/dgb_01/img5.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img6.c b/src/world/area_dgb/dgb_01/img6.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_6_img6.c
rename to src/world/area_dgb/dgb_01/img6.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_6_img7.c b/src/world/area_dgb/dgb_01/img7.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_6_img7.c
rename to src/world/area_dgb/dgb_01/img7.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_2_main.c b/src/world/area_dgb/dgb_01/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_2_main.c
rename to src/world/area_dgb/dgb_01/main.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_1_music.c b/src/world/area_dgb/dgb_01/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_1_music.c
rename to src/world/area_dgb/dgb_01/music.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_5_npc.c b/src/world/area_dgb/dgb_01/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_5_npc.c
rename to src/world/area_dgb/dgb_01/npc.c
diff --git a/src/world/area_dgb/dgb_01/dgb_01_0_header.c b/src/world/area_dgb/dgb_01/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_01/dgb_01_0_header.c
rename to src/world/area_dgb/dgb_01/settings.c
diff --git a/src/world/area_dgb/dgb_02/dgb_02_2_main.c b/src/world/area_dgb/dgb_02/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_02/dgb_02_2_main.c
rename to src/world/area_dgb/dgb_02/main.c
diff --git a/src/world/area_dgb/dgb_02/dgb_02_1_music.c b/src/world/area_dgb/dgb_02/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_02/dgb_02_1_music.c
rename to src/world/area_dgb/dgb_02/music.c
diff --git a/src/world/area_dgb/dgb_02/dgb_02_3_npc.c b/src/world/area_dgb/dgb_02/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_02/dgb_02_3_npc.c
rename to src/world/area_dgb/dgb_02/npc.c
diff --git a/src/world/area_dgb/dgb_02/dgb_02_0_header.c b/src/world/area_dgb/dgb_02/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_02/dgb_02_0_header.c
rename to src/world/area_dgb/dgb_02/settings.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_3_clock.c b/src/world/area_dgb/dgb_03/clock.c
similarity index 100%
rename from src/world/area_dgb/dgb_03/dgb_03_3_clock.c
rename to src/world/area_dgb/dgb_03/clock.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_4_entity.c b/src/world/area_dgb/dgb_03/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_03/dgb_03_4_entity.c
rename to src/world/area_dgb/dgb_03/entity.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_2_main.c b/src/world/area_dgb/dgb_03/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_03/dgb_03_2_main.c
rename to src/world/area_dgb/dgb_03/main.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_1_music.c b/src/world/area_dgb/dgb_03/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_03/dgb_03_1_music.c
rename to src/world/area_dgb/dgb_03/music.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_5_npc.c b/src/world/area_dgb/dgb_03/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_03/dgb_03_5_npc.c
rename to src/world/area_dgb/dgb_03/npc.c
diff --git a/src/world/area_dgb/dgb_03/dgb_03_0_header.c b/src/world/area_dgb/dgb_03/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_03/dgb_03_0_header.c
rename to src/world/area_dgb/dgb_03/settings.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_4_entity.c b/src/world/area_dgb/dgb_04/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_04/dgb_04_4_entity.c
rename to src/world/area_dgb/dgb_04/entity.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_2_main.c b/src/world/area_dgb/dgb_04/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_04/dgb_04_2_main.c
rename to src/world/area_dgb/dgb_04/main.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_1_music.c b/src/world/area_dgb/dgb_04/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_04/dgb_04_1_music.c
rename to src/world/area_dgb/dgb_04/music.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_3_npc.c b/src/world/area_dgb/dgb_04/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_04/dgb_04_3_npc.c
rename to src/world/area_dgb/dgb_04/npc.c
diff --git a/src/world/area_dgb/dgb_04/dgb_04_0_header.c b/src/world/area_dgb/dgb_04/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_04/dgb_04_0_header.c
rename to src/world/area_dgb/dgb_04/settings.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_4_entity.c b/src/world/area_dgb/dgb_05/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_05/dgb_05_4_entity.c
rename to src/world/area_dgb/dgb_05/entity.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_3_hole.c b/src/world/area_dgb/dgb_05/hole.c
similarity index 100%
rename from src/world/area_dgb/dgb_05/dgb_05_3_hole.c
rename to src/world/area_dgb/dgb_05/hole.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_2_main.c b/src/world/area_dgb/dgb_05/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_05/dgb_05_2_main.c
rename to src/world/area_dgb/dgb_05/main.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_1_music.c b/src/world/area_dgb/dgb_05/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_05/dgb_05_1_music.c
rename to src/world/area_dgb/dgb_05/music.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_5_npc.c b/src/world/area_dgb/dgb_05/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_05/dgb_05_5_npc.c
rename to src/world/area_dgb/dgb_05/npc.c
diff --git a/src/world/area_dgb/dgb_05/dgb_05_0_header.c b/src/world/area_dgb/dgb_05/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_05/dgb_05_0_header.c
rename to src/world/area_dgb/dgb_05/settings.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_3_entity.c b/src/world/area_dgb/dgb_06/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_06/dgb_06_3_entity.c
rename to src/world/area_dgb/dgb_06/entity.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_2_main.c b/src/world/area_dgb/dgb_06/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_06/dgb_06_2_main.c
rename to src/world/area_dgb/dgb_06/main.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_1_music.c b/src/world/area_dgb/dgb_06/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_06/dgb_06_1_music.c
rename to src/world/area_dgb/dgb_06/music.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_4_npc.c b/src/world/area_dgb/dgb_06/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_06/dgb_06_4_npc.c
rename to src/world/area_dgb/dgb_06/npc.c
diff --git a/src/world/area_dgb/dgb_06/dgb_06_0_header.c b/src/world/area_dgb/dgb_06/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_06/dgb_06_0_header.c
rename to src/world/area_dgb/dgb_06/settings.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_3_entity.c b/src/world/area_dgb/dgb_07/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_07/dgb_07_3_entity.c
rename to src/world/area_dgb/dgb_07/entity.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_2_main.c b/src/world/area_dgb/dgb_07/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_07/dgb_07_2_main.c
rename to src/world/area_dgb/dgb_07/main.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_1_music.c b/src/world/area_dgb/dgb_07/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_07/dgb_07_1_music.c
rename to src/world/area_dgb/dgb_07/music.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_4_npc.c b/src/world/area_dgb/dgb_07/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_07/dgb_07_4_npc.c
rename to src/world/area_dgb/dgb_07/npc.c
diff --git a/src/world/area_dgb/dgb_07/dgb_07_0_header.c b/src/world/area_dgb/dgb_07/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_07/dgb_07_0_header.c
rename to src/world/area_dgb/dgb_07/settings.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_4_entity.c b/src/world/area_dgb/dgb_08/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_08/dgb_08_4_entity.c
rename to src/world/area_dgb/dgb_08/entity.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_2_main.c b/src/world/area_dgb/dgb_08/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_08/dgb_08_2_main.c
rename to src/world/area_dgb/dgb_08/main.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_1_music.c b/src/world/area_dgb/dgb_08/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_08/dgb_08_1_music.c
rename to src/world/area_dgb/dgb_08/music.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_3_npc.c b/src/world/area_dgb/dgb_08/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_08/dgb_08_3_npc.c
rename to src/world/area_dgb/dgb_08/npc.c
diff --git a/src/world/area_dgb/dgb_08/dgb_08_0_header.c b/src/world/area_dgb/dgb_08/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_08/dgb_08_0_header.c
rename to src/world/area_dgb/dgb_08/settings.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_3_breakable.c b/src/world/area_dgb/dgb_09/breakable.c
similarity index 100%
rename from src/world/area_dgb/dgb_09/dgb_09_3_breakable.c
rename to src/world/area_dgb/dgb_09/breakable.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_2_main.c b/src/world/area_dgb/dgb_09/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_09/dgb_09_2_main.c
rename to src/world/area_dgb/dgb_09/main.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_1_music.c b/src/world/area_dgb/dgb_09/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_09/dgb_09_1_music.c
rename to src/world/area_dgb/dgb_09/music.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_4_npc.c b/src/world/area_dgb/dgb_09/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_09/dgb_09_4_npc.c
rename to src/world/area_dgb/dgb_09/npc.c
diff --git a/src/world/area_dgb/dgb_09/dgb_09_0_header.c b/src/world/area_dgb/dgb_09/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_09/dgb_09_0_header.c
rename to src/world/area_dgb/dgb_09/settings.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_4_entity.c b/src/world/area_dgb/dgb_10/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_10/dgb_10_4_entity.c
rename to src/world/area_dgb/dgb_10/entity.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_3_hole.c b/src/world/area_dgb/dgb_10/hole.c
similarity index 100%
rename from src/world/area_dgb/dgb_10/dgb_10_3_hole.c
rename to src/world/area_dgb/dgb_10/hole.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_2_main.c b/src/world/area_dgb/dgb_10/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_10/dgb_10_2_main.c
rename to src/world/area_dgb/dgb_10/main.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_1_music.c b/src/world/area_dgb/dgb_10/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_10/dgb_10_1_music.c
rename to src/world/area_dgb/dgb_10/music.c
diff --git a/src/world/area_dgb/dgb_10/dgb_10_0_header.c b/src/world/area_dgb/dgb_10/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_10/dgb_10_0_header.c
rename to src/world/area_dgb/dgb_10/settings.c
diff --git a/src/world/area_dgb/dgb_11/dgb_11_3_entity.c b/src/world/area_dgb/dgb_11/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_11/dgb_11_3_entity.c
rename to src/world/area_dgb/dgb_11/entity.c
diff --git a/src/world/area_dgb/dgb_11/dgb_11_2_main.c b/src/world/area_dgb/dgb_11/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_11/dgb_11_2_main.c
rename to src/world/area_dgb/dgb_11/main.c
diff --git a/src/world/area_dgb/dgb_11/dgb_11_1_music.c b/src/world/area_dgb/dgb_11/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_11/dgb_11_1_music.c
rename to src/world/area_dgb/dgb_11/music.c
diff --git a/src/world/area_dgb/dgb_11/dgb_11_0_header.c b/src/world/area_dgb/dgb_11/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_11/dgb_11_0_header.c
rename to src/world/area_dgb/dgb_11/settings.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_4_entity.c b/src/world/area_dgb/dgb_12/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_12/dgb_12_4_entity.c
rename to src/world/area_dgb/dgb_12/entity.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_2_main.c b/src/world/area_dgb/dgb_12/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_12/dgb_12_2_main.c
rename to src/world/area_dgb/dgb_12/main.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_1_music.c b/src/world/area_dgb/dgb_12/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_12/dgb_12_1_music.c
rename to src/world/area_dgb/dgb_12/music.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_0_header.c b/src/world/area_dgb/dgb_12/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_12/dgb_12_0_header.c
rename to src/world/area_dgb/dgb_12/settings.c
diff --git a/src/world/area_dgb/dgb_12/dgb_12_3_spikes.c b/src/world/area_dgb/dgb_12/spikes.c
similarity index 100%
rename from src/world/area_dgb/dgb_12/dgb_12_3_spikes.c
rename to src/world/area_dgb/dgb_12/spikes.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_4_drawer.c b/src/world/area_dgb/dgb_13/drawer.c
similarity index 100%
rename from src/world/area_dgb/dgb_13/dgb_13_4_drawer.c
rename to src/world/area_dgb/dgb_13/drawer.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_3_entity.c b/src/world/area_dgb/dgb_13/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_13/dgb_13_3_entity.c
rename to src/world/area_dgb/dgb_13/entity.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_2_main.c b/src/world/area_dgb/dgb_13/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_13/dgb_13_2_main.c
rename to src/world/area_dgb/dgb_13/main.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_1_music.c b/src/world/area_dgb/dgb_13/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_13/dgb_13_1_music.c
rename to src/world/area_dgb/dgb_13/music.c
diff --git a/src/world/area_dgb/dgb_13/dgb_13_0_header.c b/src/world/area_dgb/dgb_13/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_13/dgb_13_0_header.c
rename to src/world/area_dgb/dgb_13/settings.c
diff --git a/src/world/area_dgb/dgb_14/dgb_14_3_entity.c b/src/world/area_dgb/dgb_14/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_14/dgb_14_3_entity.c
rename to src/world/area_dgb/dgb_14/entity.c
diff --git a/src/world/area_dgb/dgb_14/dgb_14_2_main.c b/src/world/area_dgb/dgb_14/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_14/dgb_14_2_main.c
rename to src/world/area_dgb/dgb_14/main.c
diff --git a/src/world/area_dgb/dgb_14/dgb_14_1_music.c b/src/world/area_dgb/dgb_14/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_14/dgb_14_1_music.c
rename to src/world/area_dgb/dgb_14/music.c
diff --git a/src/world/area_dgb/dgb_14/dgb_14_0_header.c b/src/world/area_dgb/dgb_14/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_14/dgb_14_0_header.c
rename to src/world/area_dgb/dgb_14/settings.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_4_entity.c b/src/world/area_dgb/dgb_15/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_15/dgb_15_4_entity.c
rename to src/world/area_dgb/dgb_15/entity.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_2_main.c b/src/world/area_dgb/dgb_15/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_15/dgb_15_2_main.c
rename to src/world/area_dgb/dgb_15/main.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_1_music.c b/src/world/area_dgb/dgb_15/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_15/dgb_15_1_music.c
rename to src/world/area_dgb/dgb_15/music.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_3_npc.c b/src/world/area_dgb/dgb_15/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_15/dgb_15_3_npc.c
rename to src/world/area_dgb/dgb_15/npc.c
diff --git a/src/world/area_dgb/dgb_15/dgb_15_0_header.c b/src/world/area_dgb/dgb_15/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_15/dgb_15_0_header.c
rename to src/world/area_dgb/dgb_15/settings.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_3_entity.c b/src/world/area_dgb/dgb_16/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_16/dgb_16_3_entity.c
rename to src/world/area_dgb/dgb_16/entity.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_2_main.c b/src/world/area_dgb/dgb_16/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_16/dgb_16_2_main.c
rename to src/world/area_dgb/dgb_16/main.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_1_music.c b/src/world/area_dgb/dgb_16/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_16/dgb_16_1_music.c
rename to src/world/area_dgb/dgb_16/music.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_4_npc.c b/src/world/area_dgb/dgb_16/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_16/dgb_16_4_npc.c
rename to src/world/area_dgb/dgb_16/npc.c
diff --git a/src/world/area_dgb/dgb_16/dgb_16_0_header.c b/src/world/area_dgb/dgb_16/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_16/dgb_16_0_header.c
rename to src/world/area_dgb/dgb_16/settings.c
diff --git a/src/world/area_dgb/dgb_17/dgb_17_3_entity.c b/src/world/area_dgb/dgb_17/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_17/dgb_17_3_entity.c
rename to src/world/area_dgb/dgb_17/entity.c
diff --git a/src/world/area_dgb/dgb_17/dgb_17_2_main.c b/src/world/area_dgb/dgb_17/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_17/dgb_17_2_main.c
rename to src/world/area_dgb/dgb_17/main.c
diff --git a/src/world/area_dgb/dgb_17/dgb_17_1_music.c b/src/world/area_dgb/dgb_17/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_17/dgb_17_1_music.c
rename to src/world/area_dgb/dgb_17/music.c
diff --git a/src/world/area_dgb/dgb_17/dgb_17_0_header.c b/src/world/area_dgb/dgb_17/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_17/dgb_17_0_header.c
rename to src/world/area_dgb/dgb_17/settings.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_4_entity.c b/src/world/area_dgb/dgb_18/entity.c
similarity index 100%
rename from src/world/area_dgb/dgb_18/dgb_18_4_entity.c
rename to src/world/area_dgb/dgb_18/entity.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_2_main.c b/src/world/area_dgb/dgb_18/main.c
similarity index 100%
rename from src/world/area_dgb/dgb_18/dgb_18_2_main.c
rename to src/world/area_dgb/dgb_18/main.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_1_music.c b/src/world/area_dgb/dgb_18/music.c
similarity index 100%
rename from src/world/area_dgb/dgb_18/dgb_18_1_music.c
rename to src/world/area_dgb/dgb_18/music.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_3_npc.c b/src/world/area_dgb/dgb_18/npc.c
similarity index 100%
rename from src/world/area_dgb/dgb_18/dgb_18_3_npc.c
rename to src/world/area_dgb/dgb_18/npc.c
diff --git a/src/world/area_dgb/dgb_18/dgb_18_0_header.c b/src/world/area_dgb/dgb_18/settings.c
similarity index 100%
rename from src/world/area_dgb/dgb_18/dgb_18_0_header.c
rename to src/world/area_dgb/dgb_18/settings.c
diff --git a/src/world/area_dgb/dgb_01_smash_bridges.c b/src/world/area_dgb/smash_bridges.c
similarity index 100%
rename from src/world/area_dgb/dgb_01_smash_bridges.c
rename to src/world/area_dgb/smash_bridges.c
diff --git a/src/world/area_dro/dro_01/dro_01_6_entity.c b/src/world/area_dro/dro_01/entity.c
similarity index 100%
rename from src/world/area_dro/dro_01/dro_01_6_entity.c
rename to src/world/area_dro/dro_01/entity.c
diff --git a/src/world/area_dro/dro_01/dro_01_7_foliage.c b/src/world/area_dro/dro_01/foliage.c
similarity index 100%
rename from src/world/area_dro/dro_01/dro_01_7_foliage.c
rename to src/world/area_dro/dro_01/foliage.c
diff --git a/src/world/area_dro/dro_01/dro_01_2_main.c b/src/world/area_dro/dro_01/main.c
similarity index 100%
rename from src/world/area_dro/dro_01/dro_01_2_main.c
rename to src/world/area_dro/dro_01/main.c
diff --git a/src/world/area_dro/dro_01/dro_01_1_music.c b/src/world/area_dro/dro_01/music.c
similarity index 100%
rename from src/world/area_dro/dro_01/dro_01_1_music.c
rename to src/world/area_dro/dro_01/music.c
diff --git a/src/world/area_dro/dro_01/dro_01_3_npc.c b/src/world/area_dro/dro_01/npc.c
similarity index 100%
rename from src/world/area_dro/dro_01/dro_01_3_npc.c
rename to src/world/area_dro/dro_01/npc.c
diff --git a/src/world/area_dro/dro_01/dro_01_5_rooms.c b/src/world/area_dro/dro_01/rooms.c
similarity index 100%
rename from src/world/area_dro/dro_01/dro_01_5_rooms.c
rename to src/world/area_dro/dro_01/rooms.c
diff --git a/src/world/area_dro/dro_01/dro_01_0_header.c b/src/world/area_dro/dro_01/settings.c
similarity index 100%
rename from src/world/area_dro/dro_01/dro_01_0_header.c
rename to src/world/area_dro/dro_01/settings.c
diff --git a/src/world/area_dro/dro_01/dro_01_4_shop.c b/src/world/area_dro/dro_01/shop.c
similarity index 100%
rename from src/world/area_dro/dro_01/dro_01_4_shop.c
rename to src/world/area_dro/dro_01/shop.c
diff --git a/src/world/area_dro/dro_02/dro_02_2_entity.c b/src/world/area_dro/dro_02/entity.c
similarity index 100%
rename from src/world/area_dro/dro_02/dro_02_2_entity.c
rename to src/world/area_dro/dro_02/entity.c
diff --git a/src/world/area_dro/dro_02/dro_02_3_main.c b/src/world/area_dro/dro_02/main.c
similarity index 100%
rename from src/world/area_dro/dro_02/dro_02_3_main.c
rename to src/world/area_dro/dro_02/main.c
diff --git a/src/world/area_dro/dro_02/dro_02_1_music.c b/src/world/area_dro/dro_02/music.c
similarity index 100%
rename from src/world/area_dro/dro_02/dro_02_1_music.c
rename to src/world/area_dro/dro_02/music.c
diff --git a/src/world/area_dro/dro_02/dro_02_5_npc.c b/src/world/area_dro/dro_02/npc.c
similarity index 100%
rename from src/world/area_dro/dro_02/dro_02_5_npc.c
rename to src/world/area_dro/dro_02/npc.c
diff --git a/src/world/area_dro/dro_02/dro_02_4_rooms.c b/src/world/area_dro/dro_02/rooms.c
similarity index 100%
rename from src/world/area_dro/dro_02/dro_02_4_rooms.c
rename to src/world/area_dro/dro_02/rooms.c
diff --git a/src/world/area_dro/dro_02/dro_02_0_header.c b/src/world/area_dro/dro_02/settings.c
similarity index 100%
rename from src/world/area_dro/dro_02/dro_02_0_header.c
rename to src/world/area_dro/dro_02/settings.c
diff --git a/src/world/area_end/end_00/end_00_4_allies.c b/src/world/area_end/end_00/allies.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_4_allies.c
rename to src/world/area_end/end_00/allies.c
diff --git a/src/world/area_end/end_00/end_00_7_boos.c b/src/world/area_end/end_00/boos.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_7_boos.c
rename to src/world/area_end/end_00/boos.c
diff --git a/src/world/area_end/end_00/end_00_B_bowser.c b/src/world/area_end/end_00/bowser.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_B_bowser.c
rename to src/world/area_end/end_00/bowser.c
diff --git a/src/world/area_end/end_00/end_00_6_caravan.c b/src/world/area_end/end_00/caravan.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_6_caravan.c
rename to src/world/area_end/end_00/caravan.c
diff --git a/src/world/area_end/end_00/end_00_2_credits.c b/src/world/area_end/end_00/credits.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_2_credits.c
rename to src/world/area_end/end_00/credits.c
diff --git a/src/world/area_end/end_00/end_00_A_crystal_king.c b/src/world/area_end/end_00/crystal_king.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_A_crystal_king.c
rename to src/world/area_end/end_00/crystal_king.c
diff --git a/src/world/area_end/end_00/end_00_9_huff_n_puff.c b/src/world/area_end/end_00/huff_n_puff.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_9_huff_n_puff.c
rename to src/world/area_end/end_00/huff_n_puff.c
diff --git a/src/world/area_end/end_00/end_00_5_koopas.c b/src/world/area_end/end_00/koopas.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_5_koopas.c
rename to src/world/area_end/end_00/koopas.c
diff --git a/src/world/area_end/end_00/end_00_1_main.c b/src/world/area_end/end_00/main.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_1_main.c
rename to src/world/area_end/end_00/main.c
diff --git a/src/world/area_end/end_00/end_00_3_parade_setup.c b/src/world/area_end/end_00/parade_setup.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_3_parade_setup.c
rename to src/world/area_end/end_00/parade_setup.c
diff --git a/src/world/area_end/end_00/end_00_0_header.c b/src/world/area_end/end_00/settings.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_0_header.c
rename to src/world/area_end/end_00/settings.c
diff --git a/src/world/area_end/end_00/end_00_8_yoshis.c b/src/world/area_end/end_00/yoshis.c
similarity index 100%
rename from src/world/area_end/end_00/end_00_8_yoshis.c
rename to src/world/area_end/end_00/yoshis.c
diff --git a/src/world/area_end/end_01/end_01_2_credits.c b/src/world/area_end/end_01/credits.c
similarity index 100%
rename from src/world/area_end/end_01/end_01_2_credits.c
rename to src/world/area_end/end_01/credits.c
diff --git a/src/world/area_end/end_01/end_01_5_flower_float.c b/src/world/area_end/end_01/flower_float.c
similarity index 100%
rename from src/world/area_end/end_01/end_01_5_flower_float.c
rename to src/world/area_end/end_01/flower_float.c
diff --git a/src/world/area_end/end_01/end_01_1_main.c b/src/world/area_end/end_01/main.c
similarity index 100%
rename from src/world/area_end/end_01/end_01_1_main.c
rename to src/world/area_end/end_01/main.c
diff --git a/src/world/area_end/end_01/end_01_4_opera_float.c b/src/world/area_end/end_01/opera_float.c
similarity index 100%
rename from src/world/area_end/end_01/end_01_4_opera_float.c
rename to src/world/area_end/end_01/opera_float.c
diff --git a/src/world/area_end/end_01/end_01_3_parade_setup.c b/src/world/area_end/end_01/parade_setup.c
similarity index 100%
rename from src/world/area_end/end_01/end_01_3_parade_setup.c
rename to src/world/area_end/end_01/parade_setup.c
diff --git a/src/world/area_end/end_01/end_01_7_peach_float.c b/src/world/area_end/end_01/peach_float.c
similarity index 100%
rename from src/world/area_end/end_01/end_01_7_peach_float.c
rename to src/world/area_end/end_01/peach_float.c
diff --git a/src/world/area_end/end_01/end_01_0_header.c b/src/world/area_end/end_01/settings.c
similarity index 100%
rename from src/world/area_end/end_01/end_01_0_header.c
rename to src/world/area_end/end_01/settings.c
diff --git a/src/world/area_end/end_01/end_01_6_shyguy_float.c b/src/world/area_end/end_01/shyguy_float.c
similarity index 100%
rename from src/world/area_end/end_01/end_01_6_shyguy_float.c
rename to src/world/area_end/end_01/shyguy_float.c
diff --git a/src/world/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/area_flo/flo_00/beanstalk.c
similarity index 100%
rename from src/world/area_flo/flo_00/flo_00_5_beanstalk.c
rename to src/world/area_flo/flo_00/beanstalk.c
diff --git a/src/world/area_flo/flo_00/flo_00_6_entity.c b/src/world/area_flo/flo_00/entity.c
similarity index 100%
rename from src/world/area_flo/flo_00/flo_00_6_entity.c
rename to src/world/area_flo/flo_00/entity.c
diff --git a/src/world/area_flo/flo_00/flo_00_4_epilogue.c b/src/world/area_flo/flo_00/epilogue.c
similarity index 100%
rename from src/world/area_flo/flo_00/flo_00_4_epilogue.c
rename to src/world/area_flo/flo_00/epilogue.c
diff --git a/src/world/area_flo/flo_00/flo_00_2_main.c b/src/world/area_flo/flo_00/main.c
similarity index 100%
rename from src/world/area_flo/flo_00/flo_00_2_main.c
rename to src/world/area_flo/flo_00/main.c
diff --git a/src/world/area_flo/flo_00/flo_00_1_music.c b/src/world/area_flo/flo_00/music.c
similarity index 100%
rename from src/world/area_flo/flo_00/flo_00_1_music.c
rename to src/world/area_flo/flo_00/music.c
diff --git a/src/world/area_flo/flo_00/flo_00_3_npc.c b/src/world/area_flo/flo_00/npc.c
similarity index 100%
rename from src/world/area_flo/flo_00/flo_00_3_npc.c
rename to src/world/area_flo/flo_00/npc.c
diff --git a/src/world/area_flo/flo_00/flo_00_0_header.c b/src/world/area_flo/flo_00/settings.c
similarity index 100%
rename from src/world/area_flo/flo_00/flo_00_0_header.c
rename to src/world/area_flo/flo_00/settings.c
diff --git a/src/world/area_flo/flo_03/flo_03_5_entity.c b/src/world/area_flo/flo_03/entity.c
similarity index 100%
rename from src/world/area_flo/flo_03/flo_03_5_entity.c
rename to src/world/area_flo/flo_03/entity.c
diff --git a/src/world/area_flo/flo_03/flo_03_4_foliage.c b/src/world/area_flo/flo_03/foliage.c
similarity index 100%
rename from src/world/area_flo/flo_03/flo_03_4_foliage.c
rename to src/world/area_flo/flo_03/foliage.c
diff --git a/src/world/area_flo/flo_03/flo_03_2_main.c b/src/world/area_flo/flo_03/main.c
similarity index 100%
rename from src/world/area_flo/flo_03/flo_03_2_main.c
rename to src/world/area_flo/flo_03/main.c
diff --git a/src/world/area_flo/flo_03/flo_03_1_music.c b/src/world/area_flo/flo_03/music.c
similarity index 100%
rename from src/world/area_flo/flo_03/flo_03_1_music.c
rename to src/world/area_flo/flo_03/music.c
diff --git a/src/world/area_flo/flo_03/flo_03_3_npc.c b/src/world/area_flo/flo_03/npc.c
similarity index 100%
rename from src/world/area_flo/flo_03/flo_03_3_npc.c
rename to src/world/area_flo/flo_03/npc.c
diff --git a/src/world/area_flo/flo_03/flo_03_0_header.c b/src/world/area_flo/flo_03/settings.c
similarity index 100%
rename from src/world/area_flo/flo_03/flo_03_0_header.c
rename to src/world/area_flo/flo_03/settings.c
diff --git a/src/world/area_flo/flo_07/flo_07_2_main.c b/src/world/area_flo/flo_07/main.c
similarity index 100%
rename from src/world/area_flo/flo_07/flo_07_2_main.c
rename to src/world/area_flo/flo_07/main.c
diff --git a/src/world/area_flo/flo_07/flo_07_1_music.c b/src/world/area_flo/flo_07/music.c
similarity index 100%
rename from src/world/area_flo/flo_07/flo_07_1_music.c
rename to src/world/area_flo/flo_07/music.c
diff --git a/src/world/area_flo/flo_07/flo_07_3_npc.c b/src/world/area_flo/flo_07/npc.c
similarity index 100%
rename from src/world/area_flo/flo_07/flo_07_3_npc.c
rename to src/world/area_flo/flo_07/npc.c
diff --git a/src/world/area_flo/flo_07/flo_07_0_header.c b/src/world/area_flo/flo_07/settings.c
similarity index 100%
rename from src/world/area_flo/flo_07/flo_07_0_header.c
rename to src/world/area_flo/flo_07/settings.c
diff --git a/src/world/area_flo/flo_08/flo_08_2_entity.c b/src/world/area_flo/flo_08/entity.c
similarity index 100%
rename from src/world/area_flo/flo_08/flo_08_2_entity.c
rename to src/world/area_flo/flo_08/entity.c
diff --git a/src/world/area_flo/flo_08/flo_08_5_foliage.c b/src/world/area_flo/flo_08/foliage.c
similarity index 100%
rename from src/world/area_flo/flo_08/flo_08_5_foliage.c
rename to src/world/area_flo/flo_08/foliage.c
diff --git a/src/world/area_flo/flo_08/flo_08_3_main.c b/src/world/area_flo/flo_08/main.c
similarity index 100%
rename from src/world/area_flo/flo_08/flo_08_3_main.c
rename to src/world/area_flo/flo_08/main.c
diff --git a/src/world/area_flo/flo_08/flo_08_1_music.c b/src/world/area_flo/flo_08/music.c
similarity index 100%
rename from src/world/area_flo/flo_08/flo_08_1_music.c
rename to src/world/area_flo/flo_08/music.c
diff --git a/src/world/area_flo/flo_08/flo_08_4_npc.c b/src/world/area_flo/flo_08/npc.c
similarity index 100%
rename from src/world/area_flo/flo_08/flo_08_4_npc.c
rename to src/world/area_flo/flo_08/npc.c
diff --git a/src/world/area_flo/flo_08/flo_08_0_header.c b/src/world/area_flo/flo_08/settings.c
similarity index 100%
rename from src/world/area_flo/flo_08/flo_08_0_header.c
rename to src/world/area_flo/flo_08/settings.c
diff --git a/src/world/area_flo/flo_08/flo_08_6_vines.c b/src/world/area_flo/flo_08/vines.c
similarity index 100%
rename from src/world/area_flo/flo_08/flo_08_6_vines.c
rename to src/world/area_flo/flo_08/vines.c
diff --git a/src/world/area_flo/flo_09/flo_09_4_foliage.c b/src/world/area_flo/flo_09/foliage.c
similarity index 100%
rename from src/world/area_flo/flo_09/flo_09_4_foliage.c
rename to src/world/area_flo/flo_09/foliage.c
diff --git a/src/world/area_flo/flo_09/flo_09_2_main.c b/src/world/area_flo/flo_09/main.c
similarity index 100%
rename from src/world/area_flo/flo_09/flo_09_2_main.c
rename to src/world/area_flo/flo_09/main.c
diff --git a/src/world/area_flo/flo_09/flo_09_1_music.c b/src/world/area_flo/flo_09/music.c
similarity index 100%
rename from src/world/area_flo/flo_09/flo_09_1_music.c
rename to src/world/area_flo/flo_09/music.c
diff --git a/src/world/area_flo/flo_09/flo_09_5_npc.c b/src/world/area_flo/flo_09/npc.c
similarity index 100%
rename from src/world/area_flo/flo_09/flo_09_5_npc.c
rename to src/world/area_flo/flo_09/npc.c
diff --git a/src/world/area_flo/flo_09/flo_09_0_header.c b/src/world/area_flo/flo_09/settings.c
similarity index 100%
rename from src/world/area_flo/flo_09/flo_09_0_header.c
rename to src/world/area_flo/flo_09/settings.c
diff --git a/src/world/area_flo/flo_09/flo_09_3_vines.c b/src/world/area_flo/flo_09/vines.c
similarity index 100%
rename from src/world/area_flo/flo_09/flo_09_3_vines.c
rename to src/world/area_flo/flo_09/vines.c
diff --git a/src/world/area_flo/flo_10/flo_10_2_entity.c b/src/world/area_flo/flo_10/entity.c
similarity index 100%
rename from src/world/area_flo/flo_10/flo_10_2_entity.c
rename to src/world/area_flo/flo_10/entity.c
diff --git a/src/world/area_flo/flo_10/flo_10_7_foliage.c b/src/world/area_flo/flo_10/foliage.c
similarity index 100%
rename from src/world/area_flo/flo_10/flo_10_7_foliage.c
rename to src/world/area_flo/flo_10/foliage.c
diff --git a/src/world/area_flo/flo_10/flo_10_4_fountain.c b/src/world/area_flo/flo_10/fountain.c
similarity index 100%
rename from src/world/area_flo/flo_10/flo_10_4_fountain.c
rename to src/world/area_flo/flo_10/fountain.c
diff --git a/src/world/area_flo/flo_10/flo_10_3_main.c b/src/world/area_flo/flo_10/main.c
similarity index 100%
rename from src/world/area_flo/flo_10/flo_10_3_main.c
rename to src/world/area_flo/flo_10/main.c
diff --git a/src/world/area_flo/flo_10/flo_10_1_music.c b/src/world/area_flo/flo_10/music.c
similarity index 100%
rename from src/world/area_flo/flo_10/flo_10_1_music.c
rename to src/world/area_flo/flo_10/music.c
diff --git a/src/world/area_flo/flo_10/flo_10_5_npc.c b/src/world/area_flo/flo_10/npc.c
similarity index 100%
rename from src/world/area_flo/flo_10/flo_10_5_npc.c
rename to src/world/area_flo/flo_10/npc.c
diff --git a/src/world/area_flo/flo_10/flo_10_0_header.c b/src/world/area_flo/flo_10/settings.c
similarity index 100%
rename from src/world/area_flo/flo_10/flo_10_0_header.c
rename to src/world/area_flo/flo_10/settings.c
diff --git a/src/world/area_flo/flo_10/flo_10_6_waterfx.c b/src/world/area_flo/flo_10/waterfx.c
similarity index 100%
rename from src/world/area_flo/flo_10/flo_10_6_waterfx.c
rename to src/world/area_flo/flo_10/waterfx.c
diff --git a/src/world/area_flo/flo_11/flo_11_4_entity.c b/src/world/area_flo/flo_11/entity.c
similarity index 100%
rename from src/world/area_flo/flo_11/flo_11_4_entity.c
rename to src/world/area_flo/flo_11/entity.c
diff --git a/src/world/area_flo/flo_11/flo_11_2_main.c b/src/world/area_flo/flo_11/main.c
similarity index 100%
rename from src/world/area_flo/flo_11/flo_11_2_main.c
rename to src/world/area_flo/flo_11/main.c
diff --git a/src/world/area_flo/flo_11/flo_11_1_music.c b/src/world/area_flo/flo_11/music.c
similarity index 100%
rename from src/world/area_flo/flo_11/flo_11_1_music.c
rename to src/world/area_flo/flo_11/music.c
diff --git a/src/world/area_flo/flo_11/flo_11_3_npc.c b/src/world/area_flo/flo_11/npc.c
similarity index 100%
rename from src/world/area_flo/flo_11/flo_11_3_npc.c
rename to src/world/area_flo/flo_11/npc.c
diff --git a/src/world/area_flo/flo_11/flo_11_0_header.c b/src/world/area_flo/flo_11/settings.c
similarity index 100%
rename from src/world/area_flo/flo_11/flo_11_0_header.c
rename to src/world/area_flo/flo_11/settings.c
diff --git a/src/world/area_flo/flo_12/flo_12_2_main.c b/src/world/area_flo/flo_12/main.c
similarity index 100%
rename from src/world/area_flo/flo_12/flo_12_2_main.c
rename to src/world/area_flo/flo_12/main.c
diff --git a/src/world/area_flo/flo_12/flo_12_1_music.c b/src/world/area_flo/flo_12/music.c
similarity index 100%
rename from src/world/area_flo/flo_12/flo_12_1_music.c
rename to src/world/area_flo/flo_12/music.c
diff --git a/src/world/area_flo/flo_12/flo_12_3_npc.c b/src/world/area_flo/flo_12/npc.c
similarity index 100%
rename from src/world/area_flo/flo_12/flo_12_3_npc.c
rename to src/world/area_flo/flo_12/npc.c
diff --git a/src/world/area_flo/flo_12/flo_12_0_header.c b/src/world/area_flo/flo_12/settings.c
similarity index 100%
rename from src/world/area_flo/flo_12/flo_12_0_header.c
rename to src/world/area_flo/flo_12/settings.c
diff --git a/src/world/area_flo/flo_13/flo_13_2_entity.c b/src/world/area_flo/flo_13/entity.c
similarity index 100%
rename from src/world/area_flo/flo_13/flo_13_2_entity.c
rename to src/world/area_flo/flo_13/entity.c
diff --git a/src/world/area_flo/flo_13/flo_13_3_main.c b/src/world/area_flo/flo_13/main.c
similarity index 100%
rename from src/world/area_flo/flo_13/flo_13_3_main.c
rename to src/world/area_flo/flo_13/main.c
diff --git a/src/world/area_flo/flo_13/flo_13_1_music.c b/src/world/area_flo/flo_13/music.c
similarity index 100%
rename from src/world/area_flo/flo_13/flo_13_1_music.c
rename to src/world/area_flo/flo_13/music.c
diff --git a/src/world/area_flo/flo_13/flo_13_5_new_partner.c b/src/world/area_flo/flo_13/new_partner.c
similarity index 100%
rename from src/world/area_flo/flo_13/flo_13_5_new_partner.c
rename to src/world/area_flo/flo_13/new_partner.c
diff --git a/src/world/area_flo/flo_13/flo_13_4_npc.c b/src/world/area_flo/flo_13/npc.c
similarity index 100%
rename from src/world/area_flo/flo_13/flo_13_4_npc.c
rename to src/world/area_flo/flo_13/npc.c
diff --git a/src/world/area_flo/flo_13/flo_13_0_header.c b/src/world/area_flo/flo_13/settings.c
similarity index 100%
rename from src/world/area_flo/flo_13/flo_13_0_header.c
rename to src/world/area_flo/flo_13/settings.c
diff --git a/src/world/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/area_flo/flo_14/bubbles.c
similarity index 100%
rename from src/world/area_flo/flo_14/flo_14_3_bubbles.c
rename to src/world/area_flo/flo_14/bubbles.c
diff --git a/src/world/area_flo/flo_14/flo_14_5_entity.c b/src/world/area_flo/flo_14/entity.c
similarity index 100%
rename from src/world/area_flo/flo_14/flo_14_5_entity.c
rename to src/world/area_flo/flo_14/entity.c
diff --git a/src/world/area_flo/flo_14/flo_14_6_logs.c b/src/world/area_flo/flo_14/logs.c
similarity index 100%
rename from src/world/area_flo/flo_14/flo_14_6_logs.c
rename to src/world/area_flo/flo_14/logs.c
diff --git a/src/world/area_flo/flo_14/flo_14_2_main.c b/src/world/area_flo/flo_14/main.c
similarity index 100%
rename from src/world/area_flo/flo_14/flo_14_2_main.c
rename to src/world/area_flo/flo_14/main.c
diff --git a/src/world/area_flo/flo_14/flo_14_1_music.c b/src/world/area_flo/flo_14/music.c
similarity index 100%
rename from src/world/area_flo/flo_14/flo_14_1_music.c
rename to src/world/area_flo/flo_14/music.c
diff --git a/src/world/area_flo/flo_14/flo_14_4_npc.c b/src/world/area_flo/flo_14/npc.c
similarity index 100%
rename from src/world/area_flo/flo_14/flo_14_4_npc.c
rename to src/world/area_flo/flo_14/npc.c
diff --git a/src/world/area_flo/flo_14/flo_14_0_header.c b/src/world/area_flo/flo_14/settings.c
similarity index 100%
rename from src/world/area_flo/flo_14/flo_14_0_header.c
rename to src/world/area_flo/flo_14/settings.c
diff --git a/src/world/area_flo/flo_15/flo_15_4_entity.c b/src/world/area_flo/flo_15/entity.c
similarity index 100%
rename from src/world/area_flo/flo_15/flo_15_4_entity.c
rename to src/world/area_flo/flo_15/entity.c
diff --git a/src/world/area_flo/flo_15/flo_15_2_main.c b/src/world/area_flo/flo_15/main.c
similarity index 100%
rename from src/world/area_flo/flo_15/flo_15_2_main.c
rename to src/world/area_flo/flo_15/main.c
diff --git a/src/world/area_flo/flo_15/flo_15_1_music.c b/src/world/area_flo/flo_15/music.c
similarity index 100%
rename from src/world/area_flo/flo_15/flo_15_1_music.c
rename to src/world/area_flo/flo_15/music.c
diff --git a/src/world/area_flo/flo_15/flo_15_3_npc.c b/src/world/area_flo/flo_15/npc.c
similarity index 100%
rename from src/world/area_flo/flo_15/flo_15_3_npc.c
rename to src/world/area_flo/flo_15/npc.c
diff --git a/src/world/area_flo/flo_15/flo_15_0_header.c b/src/world/area_flo/flo_15/settings.c
similarity index 100%
rename from src/world/area_flo/flo_15/flo_15_0_header.c
rename to src/world/area_flo/flo_15/settings.c
diff --git a/src/world/area_flo/flo_15/flo_15_5_stairs.c b/src/world/area_flo/flo_15/stairs.c
similarity index 100%
rename from src/world/area_flo/flo_15/flo_15_5_stairs.c
rename to src/world/area_flo/flo_15/stairs.c
diff --git a/src/world/area_flo/flo_16/flo_16_4_entity.c b/src/world/area_flo/flo_16/entity.c
similarity index 100%
rename from src/world/area_flo/flo_16/flo_16_4_entity.c
rename to src/world/area_flo/flo_16/entity.c
diff --git a/src/world/area_flo/flo_16/flo_16_2_main.c b/src/world/area_flo/flo_16/main.c
similarity index 100%
rename from src/world/area_flo/flo_16/flo_16_2_main.c
rename to src/world/area_flo/flo_16/main.c
diff --git a/src/world/area_flo/flo_16/flo_16_1_music.c b/src/world/area_flo/flo_16/music.c
similarity index 100%
rename from src/world/area_flo/flo_16/flo_16_1_music.c
rename to src/world/area_flo/flo_16/music.c
diff --git a/src/world/area_flo/flo_16/flo_16_5_npc.c b/src/world/area_flo/flo_16/npc.c
similarity index 100%
rename from src/world/area_flo/flo_16/flo_16_5_npc.c
rename to src/world/area_flo/flo_16/npc.c
diff --git a/src/world/area_flo/flo_16/flo_16_6_puzzle.c b/src/world/area_flo/flo_16/puzzle.c
similarity index 100%
rename from src/world/area_flo/flo_16/flo_16_6_puzzle.c
rename to src/world/area_flo/flo_16/puzzle.c
diff --git a/src/world/area_flo/flo_16/flo_16_0_header.c b/src/world/area_flo/flo_16/settings.c
similarity index 100%
rename from src/world/area_flo/flo_16/flo_16_0_header.c
rename to src/world/area_flo/flo_16/settings.c
diff --git a/src/world/area_flo/flo_16/flo_16_3_vines.c b/src/world/area_flo/flo_16/vines.c
similarity index 100%
rename from src/world/area_flo/flo_16/flo_16_3_vines.c
rename to src/world/area_flo/flo_16/vines.c
diff --git a/src/world/area_flo/flo_17/flo_17_5_entity.c b/src/world/area_flo/flo_17/entity.c
similarity index 100%
rename from src/world/area_flo/flo_17/flo_17_5_entity.c
rename to src/world/area_flo/flo_17/entity.c
diff --git a/src/world/area_flo/flo_17/flo_17_3_logs.c b/src/world/area_flo/flo_17/logs.c
similarity index 100%
rename from src/world/area_flo/flo_17/flo_17_3_logs.c
rename to src/world/area_flo/flo_17/logs.c
diff --git a/src/world/area_flo/flo_17/flo_17_2_main.c b/src/world/area_flo/flo_17/main.c
similarity index 100%
rename from src/world/area_flo/flo_17/flo_17_2_main.c
rename to src/world/area_flo/flo_17/main.c
diff --git a/src/world/area_flo/flo_17/flo_17_1_music.c b/src/world/area_flo/flo_17/music.c
similarity index 100%
rename from src/world/area_flo/flo_17/flo_17_1_music.c
rename to src/world/area_flo/flo_17/music.c
diff --git a/src/world/area_flo/flo_17/flo_17_4_npc.c b/src/world/area_flo/flo_17/npc.c
similarity index 100%
rename from src/world/area_flo/flo_17/flo_17_4_npc.c
rename to src/world/area_flo/flo_17/npc.c
diff --git a/src/world/area_flo/flo_17/flo_17_0_header.c b/src/world/area_flo/flo_17/settings.c
similarity index 100%
rename from src/world/area_flo/flo_17/flo_17_0_header.c
rename to src/world/area_flo/flo_17/settings.c
diff --git a/src/world/area_flo/flo_18/flo_18_5_foliage.c b/src/world/area_flo/flo_18/foliage.c
similarity index 100%
rename from src/world/area_flo/flo_18/flo_18_5_foliage.c
rename to src/world/area_flo/flo_18/foliage.c
diff --git a/src/world/area_flo/flo_18/flo_18_3_machine.c b/src/world/area_flo/flo_18/machine.c
similarity index 100%
rename from src/world/area_flo/flo_18/flo_18_3_machine.c
rename to src/world/area_flo/flo_18/machine.c
diff --git a/src/world/area_flo/flo_18/flo_18_2_main.c b/src/world/area_flo/flo_18/main.c
similarity index 100%
rename from src/world/area_flo/flo_18/flo_18_2_main.c
rename to src/world/area_flo/flo_18/main.c
diff --git a/src/world/area_flo/flo_18/flo_18_1_music.c b/src/world/area_flo/flo_18/music.c
similarity index 100%
rename from src/world/area_flo/flo_18/flo_18_1_music.c
rename to src/world/area_flo/flo_18/music.c
diff --git a/src/world/area_flo/flo_18/flo_18_4_npc.c b/src/world/area_flo/flo_18/npc.c
similarity index 100%
rename from src/world/area_flo/flo_18/flo_18_4_npc.c
rename to src/world/area_flo/flo_18/npc.c
diff --git a/src/world/area_flo/flo_18/flo_18_0_header.c b/src/world/area_flo/flo_18/settings.c
similarity index 100%
rename from src/world/area_flo/flo_18/flo_18_0_header.c
rename to src/world/area_flo/flo_18/settings.c
diff --git a/src/world/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/area_flo/flo_19/beanstalk.c
similarity index 100%
rename from src/world/area_flo/flo_19/flo_19_5_beanstalk.c
rename to src/world/area_flo/flo_19/beanstalk.c
diff --git a/src/world/area_flo/flo_19/flo_19_4_clouds.c b/src/world/area_flo/flo_19/clouds.c
similarity index 100%
rename from src/world/area_flo/flo_19/flo_19_4_clouds.c
rename to src/world/area_flo/flo_19/clouds.c
diff --git a/src/world/area_flo/flo_19/flo_19_2_entity.c b/src/world/area_flo/flo_19/entity.c
similarity index 100%
rename from src/world/area_flo/flo_19/flo_19_2_entity.c
rename to src/world/area_flo/flo_19/entity.c
diff --git a/src/world/area_flo/flo_19/flo_19_3_main.c b/src/world/area_flo/flo_19/main.c
similarity index 100%
rename from src/world/area_flo/flo_19/flo_19_3_main.c
rename to src/world/area_flo/flo_19/main.c
diff --git a/src/world/area_flo/flo_19/flo_19_1_music.c b/src/world/area_flo/flo_19/music.c
similarity index 100%
rename from src/world/area_flo/flo_19/flo_19_1_music.c
rename to src/world/area_flo/flo_19/music.c
diff --git a/src/world/area_flo/flo_19/flo_19_0_header.c b/src/world/area_flo/flo_19/settings.c
similarity index 100%
rename from src/world/area_flo/flo_19/flo_19_0_header.c
rename to src/world/area_flo/flo_19/settings.c
diff --git a/src/world/area_flo/flo_21/flo_21_3_clouds.c b/src/world/area_flo/flo_21/clouds.c
similarity index 100%
rename from src/world/area_flo/flo_21/flo_21_3_clouds.c
rename to src/world/area_flo/flo_21/clouds.c
diff --git a/src/world/area_flo/flo_21/flo_21_2_main.c b/src/world/area_flo/flo_21/main.c
similarity index 100%
rename from src/world/area_flo/flo_21/flo_21_2_main.c
rename to src/world/area_flo/flo_21/main.c
diff --git a/src/world/area_flo/flo_21/flo_21_1_music.c b/src/world/area_flo/flo_21/music.c
similarity index 100%
rename from src/world/area_flo/flo_21/flo_21_1_music.c
rename to src/world/area_flo/flo_21/music.c
diff --git a/src/world/area_flo/flo_21/flo_21_4_npc.c b/src/world/area_flo/flo_21/npc.c
similarity index 100%
rename from src/world/area_flo/flo_21/flo_21_4_npc.c
rename to src/world/area_flo/flo_21/npc.c
diff --git a/src/world/area_flo/flo_21/flo_21_0_header.c b/src/world/area_flo/flo_21/settings.c
similarity index 100%
rename from src/world/area_flo/flo_21/flo_21_0_header.c
rename to src/world/area_flo/flo_21/settings.c
diff --git a/src/world/area_flo/flo_22/flo_22_5_foliage.c b/src/world/area_flo/flo_22/foliage.c
similarity index 100%
rename from src/world/area_flo/flo_22/flo_22_5_foliage.c
rename to src/world/area_flo/flo_22/foliage.c
diff --git a/src/world/area_flo/flo_22/flo_22_2_main.c b/src/world/area_flo/flo_22/main.c
similarity index 100%
rename from src/world/area_flo/flo_22/flo_22_2_main.c
rename to src/world/area_flo/flo_22/main.c
diff --git a/src/world/area_flo/flo_22/flo_22_1_music.c b/src/world/area_flo/flo_22/music.c
similarity index 100%
rename from src/world/area_flo/flo_22/flo_22_1_music.c
rename to src/world/area_flo/flo_22/music.c
diff --git a/src/world/area_flo/flo_22/flo_22_3_npc.c b/src/world/area_flo/flo_22/npc.c
similarity index 100%
rename from src/world/area_flo/flo_22/flo_22_3_npc.c
rename to src/world/area_flo/flo_22/npc.c
diff --git a/src/world/area_flo/flo_22/flo_22_0_header.c b/src/world/area_flo/flo_22/settings.c
similarity index 100%
rename from src/world/area_flo/flo_22/flo_22_0_header.c
rename to src/world/area_flo/flo_22/settings.c
diff --git a/src/world/area_flo/flo_22/flo_22_4_well.c b/src/world/area_flo/flo_22/well.c
similarity index 100%
rename from src/world/area_flo/flo_22/flo_22_4_well.c
rename to src/world/area_flo/flo_22/well.c
diff --git a/src/world/area_flo/flo_23/flo_23_4_entity.c b/src/world/area_flo/flo_23/entity.c
similarity index 100%
rename from src/world/area_flo/flo_23/flo_23_4_entity.c
rename to src/world/area_flo/flo_23/entity.c
diff --git a/src/world/area_flo/flo_23/flo_23_2_main.c b/src/world/area_flo/flo_23/main.c
similarity index 100%
rename from src/world/area_flo/flo_23/flo_23_2_main.c
rename to src/world/area_flo/flo_23/main.c
diff --git a/src/world/area_flo/flo_23/flo_23_1_music.c b/src/world/area_flo/flo_23/music.c
similarity index 100%
rename from src/world/area_flo/flo_23/flo_23_1_music.c
rename to src/world/area_flo/flo_23/music.c
diff --git a/src/world/area_flo/flo_23/flo_23_3_npc.c b/src/world/area_flo/flo_23/npc.c
similarity index 100%
rename from src/world/area_flo/flo_23/flo_23_3_npc.c
rename to src/world/area_flo/flo_23/npc.c
diff --git a/src/world/area_flo/flo_23/flo_23_0_header.c b/src/world/area_flo/flo_23/settings.c
similarity index 100%
rename from src/world/area_flo/flo_23/flo_23_0_header.c
rename to src/world/area_flo/flo_23/settings.c
diff --git a/src/world/area_flo/flo_24/flo_24_5_entity.c b/src/world/area_flo/flo_24/entity.c
similarity index 100%
rename from src/world/area_flo/flo_24/flo_24_5_entity.c
rename to src/world/area_flo/flo_24/entity.c
diff --git a/src/world/area_flo/flo_24/flo_24_3_foliage.c b/src/world/area_flo/flo_24/foliage.c
similarity index 100%
rename from src/world/area_flo/flo_24/flo_24_3_foliage.c
rename to src/world/area_flo/flo_24/foliage.c
diff --git a/src/world/area_flo/flo_24/flo_24_2_main.c b/src/world/area_flo/flo_24/main.c
similarity index 100%
rename from src/world/area_flo/flo_24/flo_24_2_main.c
rename to src/world/area_flo/flo_24/main.c
diff --git a/src/world/area_flo/flo_24/flo_24_1_music.c b/src/world/area_flo/flo_24/music.c
similarity index 100%
rename from src/world/area_flo/flo_24/flo_24_1_music.c
rename to src/world/area_flo/flo_24/music.c
diff --git a/src/world/area_flo/flo_24/flo_24_0_header.c b/src/world/area_flo/flo_24/settings.c
similarity index 100%
rename from src/world/area_flo/flo_24/flo_24_0_header.c
rename to src/world/area_flo/flo_24/settings.c
diff --git a/src/world/area_flo/flo_24/flo_24_4_water.c b/src/world/area_flo/flo_24/water.c
similarity index 100%
rename from src/world/area_flo/flo_24/flo_24_4_water.c
rename to src/world/area_flo/flo_24/water.c
diff --git a/src/world/area_flo/flo_25/flo_25_4_entity.c b/src/world/area_flo/flo_25/entity.c
similarity index 100%
rename from src/world/area_flo/flo_25/flo_25_4_entity.c
rename to src/world/area_flo/flo_25/entity.c
diff --git a/src/world/area_flo/flo_25/flo_25_5_foliage.c b/src/world/area_flo/flo_25/foliage.c
similarity index 100%
rename from src/world/area_flo/flo_25/flo_25_5_foliage.c
rename to src/world/area_flo/flo_25/foliage.c
diff --git a/src/world/area_flo/flo_25/flo_25_2_main.c b/src/world/area_flo/flo_25/main.c
similarity index 100%
rename from src/world/area_flo/flo_25/flo_25_2_main.c
rename to src/world/area_flo/flo_25/main.c
diff --git a/src/world/area_flo/flo_25/flo_25_1_music.c b/src/world/area_flo/flo_25/music.c
similarity index 100%
rename from src/world/area_flo/flo_25/flo_25_1_music.c
rename to src/world/area_flo/flo_25/music.c
diff --git a/src/world/area_flo/flo_25/flo_25_3_npc.c b/src/world/area_flo/flo_25/npc.c
similarity index 100%
rename from src/world/area_flo/flo_25/flo_25_3_npc.c
rename to src/world/area_flo/flo_25/npc.c
diff --git a/src/world/area_flo/flo_25/flo_25_0_header.c b/src/world/area_flo/flo_25/settings.c
similarity index 100%
rename from src/world/area_flo/flo_25/flo_25_0_header.c
rename to src/world/area_flo/flo_25/settings.c
diff --git a/src/world/area_flo/flo_25/flo_25_6_vine.c b/src/world/area_flo/flo_25/vine.c
similarity index 100%
rename from src/world/area_flo/flo_25/flo_25_6_vine.c
rename to src/world/area_flo/flo_25/vine.c
diff --git a/src/world/area_gv/gv_01/gv_01_1_main.c b/src/world/area_gv/gv_01/main.c
similarity index 100%
rename from src/world/area_gv/gv_01/gv_01_1_main.c
rename to src/world/area_gv/gv_01/main.c
diff --git a/src/world/area_gv/gv_01/gv_01_0_header.c b/src/world/area_gv/gv_01/settings.c
similarity index 100%
rename from src/world/area_gv/gv_01/gv_01_0_header.c
rename to src/world/area_gv/gv_01/settings.c
diff --git a/src/world/area_hos/hos_00/hos_00_5_entity.c b/src/world/area_hos/hos_00/entity.c
similarity index 100%
rename from src/world/area_hos/hos_00/hos_00_5_entity.c
rename to src/world/area_hos/hos_00/entity.c
diff --git a/src/world/area_hos/hos_00/hos_00_2_main.c b/src/world/area_hos/hos_00/main.c
similarity index 100%
rename from src/world/area_hos/hos_00/hos_00_2_main.c
rename to src/world/area_hos/hos_00/main.c
diff --git a/src/world/area_hos/hos_00/hos_00_1_music.c b/src/world/area_hos/hos_00/music.c
similarity index 100%
rename from src/world/area_hos/hos_00/hos_00_1_music.c
rename to src/world/area_hos/hos_00/music.c
diff --git a/src/world/area_hos/hos_00/hos_00_4_npc.c b/src/world/area_hos/hos_00/npc.c
similarity index 100%
rename from src/world/area_hos/hos_00/hos_00_4_npc.c
rename to src/world/area_hos/hos_00/npc.c
diff --git a/src/world/area_hos/hos_00/hos_00_6_scenes.c b/src/world/area_hos/hos_00/scenes.c
similarity index 100%
rename from src/world/area_hos/hos_00/hos_00_6_scenes.c
rename to src/world/area_hos/hos_00/scenes.c
diff --git a/src/world/area_hos/hos_00/hos_00_0_header.c b/src/world/area_hos/hos_00/settings.c
similarity index 100%
rename from src/world/area_hos/hos_00/hos_00_0_header.c
rename to src/world/area_hos/hos_00/settings.c
diff --git a/src/world/area_hos/hos_00/hos_00_7_shade_gfx.c b/src/world/area_hos/hos_00/shade_gfx.c
similarity index 100%
rename from src/world/area_hos/hos_00/hos_00_7_shade_gfx.c
rename to src/world/area_hos/hos_00/shade_gfx.c
diff --git a/src/world/area_hos/hos_00/hos_00_3_unused.c b/src/world/area_hos/hos_00/unused.c
similarity index 100%
rename from src/world/area_hos/hos_00/hos_00_3_unused.c
rename to src/world/area_hos/hos_00/unused.c
diff --git a/src/world/area_hos/hos_01/hos_01_5_entity.c b/src/world/area_hos/hos_01/entity.c
similarity index 100%
rename from src/world/area_hos/hos_01/hos_01_5_entity.c
rename to src/world/area_hos/hos_01/entity.c
diff --git a/src/world/area_hos/hos_01/hos_01_2_main.c b/src/world/area_hos/hos_01/main.c
similarity index 100%
rename from src/world/area_hos/hos_01/hos_01_2_main.c
rename to src/world/area_hos/hos_01/main.c
diff --git a/src/world/area_hos/hos_01/hos_01_3_model_fx.c b/src/world/area_hos/hos_01/model_fx.c
similarity index 100%
rename from src/world/area_hos/hos_01/hos_01_3_model_fx.c
rename to src/world/area_hos/hos_01/model_fx.c
diff --git a/src/world/area_hos/hos_01/hos_01_1_music.c b/src/world/area_hos/hos_01/music.c
similarity index 100%
rename from src/world/area_hos/hos_01/hos_01_1_music.c
rename to src/world/area_hos/hos_01/music.c
diff --git a/src/world/area_hos/hos_01/hos_01_4_npc.c b/src/world/area_hos/hos_01/npc.c
similarity index 100%
rename from src/world/area_hos/hos_01/hos_01_4_npc.c
rename to src/world/area_hos/hos_01/npc.c
diff --git a/src/world/area_hos/hos_01/hos_01_0_header.c b/src/world/area_hos/hos_01/settings.c
similarity index 100%
rename from src/world/area_hos/hos_01/hos_01_0_header.c
rename to src/world/area_hos/hos_01/settings.c
diff --git a/src/world/area_hos/hos_01/hos_01_6_star_way.c b/src/world/area_hos/hos_01/star_way.c
similarity index 100%
rename from src/world/area_hos/hos_01/hos_01_6_star_way.c
rename to src/world/area_hos/hos_01/star_way.c
diff --git a/src/world/area_hos/hos_02/hos_02_6_descent.c b/src/world/area_hos/hos_02/descent.c
similarity index 100%
rename from src/world/area_hos/hos_02/hos_02_6_descent.c
rename to src/world/area_hos/hos_02/descent.c
diff --git a/src/world/area_hos/hos_02/hos_02_2_main.c b/src/world/area_hos/hos_02/main.c
similarity index 100%
rename from src/world/area_hos/hos_02/hos_02_2_main.c
rename to src/world/area_hos/hos_02/main.c
diff --git a/src/world/area_hos/hos_02/hos_02_3_model_fx.c b/src/world/area_hos/hos_02/model_fx.c
similarity index 100%
rename from src/world/area_hos/hos_02/hos_02_3_model_fx.c
rename to src/world/area_hos/hos_02/model_fx.c
diff --git a/src/world/area_hos/hos_02/hos_02_1_music.c b/src/world/area_hos/hos_02/music.c
similarity index 100%
rename from src/world/area_hos/hos_02/hos_02_1_music.c
rename to src/world/area_hos/hos_02/music.c
diff --git a/src/world/area_hos/hos_02/hos_02_5_npc.c b/src/world/area_hos/hos_02/npc.c
similarity index 100%
rename from src/world/area_hos/hos_02/hos_02_5_npc.c
rename to src/world/area_hos/hos_02/npc.c
diff --git a/src/world/area_hos/hos_02/hos_02_0_header.c b/src/world/area_hos/hos_02/settings.c
similarity index 100%
rename from src/world/area_hos/hos_02/hos_02_0_header.c
rename to src/world/area_hos/hos_02/settings.c
diff --git a/src/world/area_hos/hos_02/hos_02_4_unused.c b/src/world/area_hos/hos_02/unused.c
similarity index 100%
rename from src/world/area_hos/hos_02/hos_02_4_unused.c
rename to src/world/area_hos/hos_02/unused.c
diff --git a/src/world/area_hos/hos_03/hos_03_8_entity.c b/src/world/area_hos/hos_03/entity.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_8_entity.c
rename to src/world/area_hos/hos_03/entity.c
diff --git a/src/world/area_hos/hos_03/hos_03_5_foliage.c b/src/world/area_hos/hos_03/foliage.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_5_foliage.c
rename to src/world/area_hos/hos_03/foliage.c
diff --git a/src/world/area_hos/hos_03/hos_03_2_main.c b/src/world/area_hos/hos_03/main.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_2_main.c
rename to src/world/area_hos/hos_03/main.c
diff --git a/src/world/area_hos/hos_03/hos_03_3_model_fx.c b/src/world/area_hos/hos_03/model_fx.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_3_model_fx.c
rename to src/world/area_hos/hos_03/model_fx.c
diff --git a/src/world/area_hos/hos_03/hos_03_1_music.c b/src/world/area_hos/hos_03/music.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_1_music.c
rename to src/world/area_hos/hos_03/music.c
diff --git a/src/world/area_hos/hos_03/hos_03_6_npc.c b/src/world/area_hos/hos_03/npc.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_6_npc.c
rename to src/world/area_hos/hos_03/npc.c
diff --git a/src/world/area_hos/hos_03/hos_03_4_rooms.c b/src/world/area_hos/hos_03/rooms.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_4_rooms.c
rename to src/world/area_hos/hos_03/rooms.c
diff --git a/src/world/area_hos/hos_03/hos_03_0_header.c b/src/world/area_hos/hos_03/settings.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_0_header.c
rename to src/world/area_hos/hos_03/settings.c
diff --git a/src/world/area_hos/hos_03/hos_03_7_shop.c b/src/world/area_hos/hos_03/shop.c
similarity index 100%
rename from src/world/area_hos/hos_03/hos_03_7_shop.c
rename to src/world/area_hos/hos_03/shop.c
diff --git a/src/world/area_hos/hos_04/hos_04_3_fountains.c b/src/world/area_hos/hos_04/fountains.c
similarity index 100%
rename from src/world/area_hos/hos_04/hos_04_3_fountains.c
rename to src/world/area_hos/hos_04/fountains.c
diff --git a/src/world/area_hos/hos_04/hos_04_6_intro.c b/src/world/area_hos/hos_04/intro.c
similarity index 100%
rename from src/world/area_hos/hos_04/hos_04_6_intro.c
rename to src/world/area_hos/hos_04/intro.c
diff --git a/src/world/area_hos/hos_04/hos_04_2_main.c b/src/world/area_hos/hos_04/main.c
similarity index 100%
rename from src/world/area_hos/hos_04/hos_04_2_main.c
rename to src/world/area_hos/hos_04/main.c
diff --git a/src/world/area_hos/hos_04/hos_04_1_music.c b/src/world/area_hos/hos_04/music.c
similarity index 100%
rename from src/world/area_hos/hos_04/hos_04_1_music.c
rename to src/world/area_hos/hos_04/music.c
diff --git a/src/world/area_hos/hos_04/hos_04_8_narrator.c b/src/world/area_hos/hos_04/narrator.c
similarity index 100%
rename from src/world/area_hos/hos_04/hos_04_8_narrator.c
rename to src/world/area_hos/hos_04/narrator.c
diff --git a/src/world/area_hos/hos_04/hos_04_0_header.c b/src/world/area_hos/hos_04/settings.c
similarity index 100%
rename from src/world/area_hos/hos_04/hos_04_0_header.c
rename to src/world/area_hos/hos_04/settings.c
diff --git a/src/world/area_hos/hos_04/hos_04_7_starship.c b/src/world/area_hos/hos_04/starship.c
similarity index 100%
rename from src/world/area_hos/hos_04/hos_04_7_starship.c
rename to src/world/area_hos/hos_04/starship.c
diff --git a/src/world/area_hos/hos_04/hos_04_4_unused.c b/src/world/area_hos/hos_04/unused.c
similarity index 100%
rename from src/world/area_hos/hos_04/hos_04_4_unused.c
rename to src/world/area_hos/hos_04/unused.c
diff --git a/src/world/area_hos/hos_05/hos_05_5_intro.c b/src/world/area_hos/hos_05/intro.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_5_intro.c
rename to src/world/area_hos/hos_05/intro.c
diff --git a/src/world/area_hos/hos_05/hos_05_2_main.c b/src/world/area_hos/hos_05/main.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_2_main.c
rename to src/world/area_hos/hos_05/main.c
diff --git a/src/world/area_hos/hos_05/hos_05_3_misc.c b/src/world/area_hos/hos_05/misc.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_3_misc.c
rename to src/world/area_hos/hos_05/misc.c
diff --git a/src/world/area_hos/hos_05/hos_05_7_model_fx.c b/src/world/area_hos/hos_05/model_fx.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_7_model_fx.c
rename to src/world/area_hos/hos_05/model_fx.c
diff --git a/src/world/area_hos/hos_05/hos_05_1_music.c b/src/world/area_hos/hos_05/music.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_1_music.c
rename to src/world/area_hos/hos_05/music.c
diff --git a/src/world/area_hos/hos_05/hos_05_6_narrator.c b/src/world/area_hos/hos_05/narrator.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_6_narrator.c
rename to src/world/area_hos/hos_05/narrator.c
diff --git a/src/world/area_hos/hos_05/hos_05_4_npc.c b/src/world/area_hos/hos_05/npc.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_4_npc.c
rename to src/world/area_hos/hos_05/npc.c
diff --git a/src/world/area_hos/hos_05/hos_05_0_header.c b/src/world/area_hos/hos_05/settings.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_0_header.c
rename to src/world/area_hos/hos_05/settings.c
diff --git a/src/world/area_hos/hos_05/hos_05_8_star_ship.c b/src/world/area_hos/hos_05/star_ship.c
similarity index 100%
rename from src/world/area_hos/hos_05/hos_05_8_star_ship.c
rename to src/world/area_hos/hos_05/star_ship.c
diff --git a/src/world/area_hos/hos_06/hos_06_6_chest.c b/src/world/area_hos/hos_06/chest.c
similarity index 100%
rename from src/world/area_hos/hos_06/hos_06_6_chest.c
rename to src/world/area_hos/hos_06/chest.c
diff --git a/src/world/area_hos/hos_06/hos_06_1_entity.c b/src/world/area_hos/hos_06/entity.c
similarity index 100%
rename from src/world/area_hos/hos_06/hos_06_1_entity.c
rename to src/world/area_hos/hos_06/entity.c
diff --git a/src/world/area_hos/hos_06/hos_06_2_main.c b/src/world/area_hos/hos_06/main.c
similarity index 100%
rename from src/world/area_hos/hos_06/hos_06_2_main.c
rename to src/world/area_hos/hos_06/main.c
diff --git a/src/world/area_hos/hos_06/hos_06_3_merlow.c b/src/world/area_hos/hos_06/merlow.c
similarity index 100%
rename from src/world/area_hos/hos_06/hos_06_3_merlow.c
rename to src/world/area_hos/hos_06/merlow.c
diff --git a/src/world/area_hos/hos_06/hos_06_5_merluvlee.c b/src/world/area_hos/hos_06/merluvlee.c
similarity index 100%
rename from src/world/area_hos/hos_06/hos_06_5_merluvlee.c
rename to src/world/area_hos/hos_06/merluvlee.c
diff --git a/src/world/area_hos/hos_06/hos_06_4_rooms.c b/src/world/area_hos/hos_06/rooms.c
similarity index 100%
rename from src/world/area_hos/hos_06/hos_06_4_rooms.c
rename to src/world/area_hos/hos_06/rooms.c
diff --git a/src/world/area_hos/hos_06/hos_06_0_header.c b/src/world/area_hos/hos_06/settings.c
similarity index 100%
rename from src/world/area_hos/hos_06/hos_06_0_header.c
rename to src/world/area_hos/hos_06/settings.c
diff --git a/src/world/area_hos/hos_10/hos_10_7_ending.c b/src/world/area_hos/hos_10/ending.c
similarity index 100%
rename from src/world/area_hos/hos_10/hos_10_7_ending.c
rename to src/world/area_hos/hos_10/ending.c
diff --git a/src/world/area_hos/hos_10/hos_10_5_intro.c b/src/world/area_hos/hos_10/intro.c
similarity index 100%
rename from src/world/area_hos/hos_10/hos_10_5_intro.c
rename to src/world/area_hos/hos_10/intro.c
diff --git a/src/world/area_hos/hos_10/hos_10_4_main.c b/src/world/area_hos/hos_10/main.c
similarity index 100%
rename from src/world/area_hos/hos_10/hos_10_4_main.c
rename to src/world/area_hos/hos_10/main.c
diff --git a/src/world/area_hos/hos_10/hos_10_1_music.c b/src/world/area_hos/hos_10/music.c
similarity index 100%
rename from src/world/area_hos/hos_10/hos_10_1_music.c
rename to src/world/area_hos/hos_10/music.c
diff --git a/src/world/area_hos/hos_10/hos_10_2_npc1.c b/src/world/area_hos/hos_10/npc1.c
similarity index 100%
rename from src/world/area_hos/hos_10/hos_10_2_npc1.c
rename to src/world/area_hos/hos_10/npc1.c
diff --git a/src/world/area_hos/hos_10/hos_10_3_npc2.c b/src/world/area_hos/hos_10/npc2.c
similarity index 100%
rename from src/world/area_hos/hos_10/hos_10_3_npc2.c
rename to src/world/area_hos/hos_10/npc2.c
diff --git a/src/world/area_hos/hos_10/hos_10_6_pre_title.c b/src/world/area_hos/hos_10/pre_title.c
similarity index 100%
rename from src/world/area_hos/hos_10/hos_10_6_pre_title.c
rename to src/world/area_hos/hos_10/pre_title.c
diff --git a/src/world/area_hos/hos_10/hos_10_0_header.c b/src/world/area_hos/hos_10/settings.c
similarity index 100%
rename from src/world/area_hos/hos_10/hos_10_0_header.c
rename to src/world/area_hos/hos_10/settings.c
diff --git a/src/world/area_hos/hos_20/hos_20_1_main.c b/src/world/area_hos/hos_20/main.c
similarity index 100%
rename from src/world/area_hos/hos_20/hos_20_1_main.c
rename to src/world/area_hos/hos_20/main.c
diff --git a/src/world/area_hos/hos_20/hos_20_0_header.c b/src/world/area_hos/hos_20/settings.c
similarity index 100%
rename from src/world/area_hos/hos_20/hos_20_0_header.c
rename to src/world/area_hos/hos_20/settings.c
diff --git a/src/world/area_hos/hos_20/hos_20_2_starship.c b/src/world/area_hos/hos_20/starship.c
similarity index 100%
rename from src/world/area_hos/hos_20/hos_20_2_starship.c
rename to src/world/area_hos/hos_20/starship.c
diff --git a/src/world/area_isk/isk_01/isk_01_4_entity.c b/src/world/area_isk/isk_01/entity.c
similarity index 100%
rename from src/world/area_isk/isk_01/isk_01_4_entity.c
rename to src/world/area_isk/isk_01/entity.c
diff --git a/src/world/area_isk/isk_01/isk_01_3_haze.c b/src/world/area_isk/isk_01/haze.c
similarity index 100%
rename from src/world/area_isk/isk_01/isk_01_3_haze.c
rename to src/world/area_isk/isk_01/haze.c
diff --git a/src/world/area_isk/isk_01/isk_01_2_main.c b/src/world/area_isk/isk_01/main.c
similarity index 100%
rename from src/world/area_isk/isk_01/isk_01_2_main.c
rename to src/world/area_isk/isk_01/main.c
diff --git a/src/world/area_isk/isk_01/isk_01_1_music.c b/src/world/area_isk/isk_01/music.c
similarity index 100%
rename from src/world/area_isk/isk_01/isk_01_1_music.c
rename to src/world/area_isk/isk_01/music.c
diff --git a/src/world/area_isk/isk_01/isk_01_0_header.c b/src/world/area_isk/isk_01/settings.c
similarity index 100%
rename from src/world/area_isk/isk_01/isk_01_0_header.c
rename to src/world/area_isk/isk_01/settings.c
diff --git a/src/world/area_isk/isk_02/isk_02_3_ambush.c b/src/world/area_isk/isk_02/ambush.c
similarity index 100%
rename from src/world/area_isk/isk_02/isk_02_3_ambush.c
rename to src/world/area_isk/isk_02/ambush.c
diff --git a/src/world/area_isk/isk_02/isk_02_4_entity.c b/src/world/area_isk/isk_02/entity.c
similarity index 100%
rename from src/world/area_isk/isk_02/isk_02_4_entity.c
rename to src/world/area_isk/isk_02/entity.c
diff --git a/src/world/area_isk/isk_02/isk_02_2_lock.c b/src/world/area_isk/isk_02/lock.c
similarity index 100%
rename from src/world/area_isk/isk_02/isk_02_2_lock.c
rename to src/world/area_isk/isk_02/lock.c
diff --git a/src/world/area_isk/isk_02/isk_02_1_main.c b/src/world/area_isk/isk_02/main.c
similarity index 100%
rename from src/world/area_isk/isk_02/isk_02_1_main.c
rename to src/world/area_isk/isk_02/main.c
diff --git a/src/world/area_isk/isk_02/isk_02_5_npc.c b/src/world/area_isk/isk_02/npc.c
similarity index 100%
rename from src/world/area_isk/isk_02/isk_02_5_npc.c
rename to src/world/area_isk/isk_02/npc.c
diff --git a/src/world/area_isk/isk_02/isk_02_0_header.c b/src/world/area_isk/isk_02/settings.c
similarity index 100%
rename from src/world/area_isk/isk_02/isk_02_0_header.c
rename to src/world/area_isk/isk_02/settings.c
diff --git a/src/world/area_isk/isk_03/isk_03_3_entity.c b/src/world/area_isk/isk_03/entity.c
similarity index 100%
rename from src/world/area_isk/isk_03/isk_03_3_entity.c
rename to src/world/area_isk/isk_03/entity.c
diff --git a/src/world/area_isk/isk_03/isk_03_1_main.c b/src/world/area_isk/isk_03/main.c
similarity index 100%
rename from src/world/area_isk/isk_03/isk_03_1_main.c
rename to src/world/area_isk/isk_03/main.c
diff --git a/src/world/area_isk/isk_03/isk_03_2_sand.c b/src/world/area_isk/isk_03/sand.c
similarity index 100%
rename from src/world/area_isk/isk_03/isk_03_2_sand.c
rename to src/world/area_isk/isk_03/sand.c
diff --git a/src/world/area_isk/isk_03/isk_03_0_header.c b/src/world/area_isk/isk_03/settings.c
similarity index 100%
rename from src/world/area_isk/isk_03/isk_03_0_header.c
rename to src/world/area_isk/isk_03/settings.c
diff --git a/src/world/area_isk/isk_03/isk_03_4_switch.c b/src/world/area_isk/isk_03/switch.c
similarity index 100%
rename from src/world/area_isk/isk_03/isk_03_4_switch.c
rename to src/world/area_isk/isk_03/switch.c
diff --git a/src/world/area_isk/isk_04/isk_04_6_demo.c b/src/world/area_isk/isk_04/demo.c
similarity index 100%
rename from src/world/area_isk/isk_04/isk_04_6_demo.c
rename to src/world/area_isk/isk_04/demo.c
diff --git a/src/world/area_isk/isk_04/isk_04_4_entity.c b/src/world/area_isk/isk_04/entity.c
similarity index 100%
rename from src/world/area_isk/isk_04/isk_04_4_entity.c
rename to src/world/area_isk/isk_04/entity.c
diff --git a/src/world/area_isk/isk_04/isk_04_2_main.c b/src/world/area_isk/isk_04/main.c
similarity index 100%
rename from src/world/area_isk/isk_04/isk_04_2_main.c
rename to src/world/area_isk/isk_04/main.c
diff --git a/src/world/area_isk/isk_04/isk_04_1_music.c b/src/world/area_isk/isk_04/music.c
similarity index 100%
rename from src/world/area_isk/isk_04/isk_04_1_music.c
rename to src/world/area_isk/isk_04/music.c
diff --git a/src/world/area_isk/isk_04/isk_04_5_npc.c b/src/world/area_isk/isk_04/npc.c
similarity index 100%
rename from src/world/area_isk/isk_04/isk_04_5_npc.c
rename to src/world/area_isk/isk_04/npc.c
diff --git a/src/world/area_isk/isk_04/isk_04_3_obstructions.c b/src/world/area_isk/isk_04/obstructions.c
similarity index 100%
rename from src/world/area_isk/isk_04/isk_04_3_obstructions.c
rename to src/world/area_isk/isk_04/obstructions.c
diff --git a/src/world/area_isk/isk_04/isk_04_0_header.c b/src/world/area_isk/isk_04/settings.c
similarity index 100%
rename from src/world/area_isk/isk_04/isk_04_0_header.c
rename to src/world/area_isk/isk_04/settings.c
diff --git a/src/world/area_isk/isk_05/isk_05_2_entity.c b/src/world/area_isk/isk_05/entity.c
similarity index 100%
rename from src/world/area_isk/isk_05/isk_05_2_entity.c
rename to src/world/area_isk/isk_05/entity.c
diff --git a/src/world/area_isk/isk_05/isk_05_1_main.c b/src/world/area_isk/isk_05/main.c
similarity index 100%
rename from src/world/area_isk/isk_05/isk_05_1_main.c
rename to src/world/area_isk/isk_05/main.c
diff --git a/src/world/area_isk/isk_05/isk_05_3_npc.c b/src/world/area_isk/isk_05/npc.c
similarity index 100%
rename from src/world/area_isk/isk_05/isk_05_3_npc.c
rename to src/world/area_isk/isk_05/npc.c
diff --git a/src/world/area_isk/isk_05/isk_05_0_header.c b/src/world/area_isk/isk_05/settings.c
similarity index 100%
rename from src/world/area_isk/isk_05/isk_05_0_header.c
rename to src/world/area_isk/isk_05/settings.c
diff --git a/src/world/area_isk/isk_06/isk_06_2_entity.c b/src/world/area_isk/isk_06/entity.c
similarity index 100%
rename from src/world/area_isk/isk_06/isk_06_2_entity.c
rename to src/world/area_isk/isk_06/entity.c
diff --git a/src/world/area_isk/isk_06/isk_06_1_main.c b/src/world/area_isk/isk_06/main.c
similarity index 100%
rename from src/world/area_isk/isk_06/isk_06_1_main.c
rename to src/world/area_isk/isk_06/main.c
diff --git a/src/world/area_isk/isk_06/isk_06_3_sand.c b/src/world/area_isk/isk_06/sand.c
similarity index 100%
rename from src/world/area_isk/isk_06/isk_06_3_sand.c
rename to src/world/area_isk/isk_06/sand.c
diff --git a/src/world/area_isk/isk_06/isk_06_0_header.c b/src/world/area_isk/isk_06/settings.c
similarity index 100%
rename from src/world/area_isk/isk_06/isk_06_0_header.c
rename to src/world/area_isk/isk_06/settings.c
diff --git a/src/world/area_isk/isk_06/isk_06_4_switch.c b/src/world/area_isk/isk_06/switch.c
similarity index 100%
rename from src/world/area_isk/isk_06/isk_06_4_switch.c
rename to src/world/area_isk/isk_06/switch.c
diff --git a/src/world/area_isk/isk_07/isk_07_7_ambush.c b/src/world/area_isk/isk_07/ambush.c
similarity index 100%
rename from src/world/area_isk/isk_07/isk_07_7_ambush.c
rename to src/world/area_isk/isk_07/ambush.c
diff --git a/src/world/area_isk/isk_07/isk_07_2_entity.c b/src/world/area_isk/isk_07/entity.c
similarity index 100%
rename from src/world/area_isk/isk_07/isk_07_2_entity.c
rename to src/world/area_isk/isk_07/entity.c
diff --git a/src/world/area_isk/isk_07/isk_07_5_lock.c b/src/world/area_isk/isk_07/lock.c
similarity index 100%
rename from src/world/area_isk/isk_07/isk_07_5_lock.c
rename to src/world/area_isk/isk_07/lock.c
diff --git a/src/world/area_isk/isk_07/isk_07_1_main.c b/src/world/area_isk/isk_07/main.c
similarity index 100%
rename from src/world/area_isk/isk_07/isk_07_1_main.c
rename to src/world/area_isk/isk_07/main.c
diff --git a/src/world/area_isk/isk_07/isk_07_3_npc.c b/src/world/area_isk/isk_07/npc.c
similarity index 100%
rename from src/world/area_isk/isk_07/isk_07_3_npc.c
rename to src/world/area_isk/isk_07/npc.c
diff --git a/src/world/area_isk/isk_07/isk_07_0_header.c b/src/world/area_isk/isk_07/settings.c
similarity index 100%
rename from src/world/area_isk/isk_07/isk_07_0_header.c
rename to src/world/area_isk/isk_07/settings.c
diff --git a/src/world/area_isk/isk_07/isk_07_4_stairs.c b/src/world/area_isk/isk_07/stairs.c
similarity index 100%
rename from src/world/area_isk/isk_07/isk_07_4_stairs.c
rename to src/world/area_isk/isk_07/stairs.c
diff --git a/src/world/area_isk/isk_07/isk_07_6_switch.c b/src/world/area_isk/isk_07/switch.c
similarity index 100%
rename from src/world/area_isk/isk_07/isk_07_6_switch.c
rename to src/world/area_isk/isk_07/switch.c
diff --git a/src/world/area_isk/isk_08/isk_08_3_entity.c b/src/world/area_isk/isk_08/entity.c
similarity index 100%
rename from src/world/area_isk/isk_08/isk_08_3_entity.c
rename to src/world/area_isk/isk_08/entity.c
diff --git a/src/world/area_isk/isk_08/isk_08_1_main.c b/src/world/area_isk/isk_08/main.c
similarity index 100%
rename from src/world/area_isk/isk_08/isk_08_1_main.c
rename to src/world/area_isk/isk_08/main.c
diff --git a/src/world/area_isk/isk_08/isk_08_2_npc.c b/src/world/area_isk/isk_08/npc.c
similarity index 100%
rename from src/world/area_isk/isk_08/isk_08_2_npc.c
rename to src/world/area_isk/isk_08/npc.c
diff --git a/src/world/area_isk/isk_08/isk_08_0_header.c b/src/world/area_isk/isk_08/settings.c
similarity index 100%
rename from src/world/area_isk/isk_08/isk_08_0_header.c
rename to src/world/area_isk/isk_08/settings.c
diff --git a/src/world/area_isk/isk_09/isk_09_3_entity.c b/src/world/area_isk/isk_09/entity.c
similarity index 100%
rename from src/world/area_isk/isk_09/isk_09_3_entity.c
rename to src/world/area_isk/isk_09/entity.c
diff --git a/src/world/area_isk/isk_09/isk_09_2_main.c b/src/world/area_isk/isk_09/main.c
similarity index 100%
rename from src/world/area_isk/isk_09/isk_09_2_main.c
rename to src/world/area_isk/isk_09/main.c
diff --git a/src/world/area_isk/isk_09/isk_09_1_music.c b/src/world/area_isk/isk_09/music.c
similarity index 100%
rename from src/world/area_isk/isk_09/isk_09_1_music.c
rename to src/world/area_isk/isk_09/music.c
diff --git a/src/world/area_isk/isk_09/isk_09_0_header.c b/src/world/area_isk/isk_09/settings.c
similarity index 100%
rename from src/world/area_isk/isk_09/isk_09_0_header.c
rename to src/world/area_isk/isk_09/settings.c
diff --git a/src/world/area_isk/isk_09/isk_09_4_stairs.c b/src/world/area_isk/isk_09/stairs.c
similarity index 100%
rename from src/world/area_isk/isk_09/isk_09_4_stairs.c
rename to src/world/area_isk/isk_09/stairs.c
diff --git a/src/world/area_isk/isk_09/isk_09_5_switch.c b/src/world/area_isk/isk_09/switch.c
similarity index 100%
rename from src/world/area_isk/isk_09/isk_09_5_switch.c
rename to src/world/area_isk/isk_09/switch.c
diff --git a/src/world/area_isk/isk_10/isk_10_3_bombable.c b/src/world/area_isk/isk_10/bombable.c
similarity index 100%
rename from src/world/area_isk/isk_10/isk_10_3_bombable.c
rename to src/world/area_isk/isk_10/bombable.c
diff --git a/src/world/area_isk/isk_10/isk_10_2_entity.c b/src/world/area_isk/isk_10/entity.c
similarity index 100%
rename from src/world/area_isk/isk_10/isk_10_2_entity.c
rename to src/world/area_isk/isk_10/entity.c
diff --git a/src/world/area_isk/isk_10/isk_10_1_main.c b/src/world/area_isk/isk_10/main.c
similarity index 100%
rename from src/world/area_isk/isk_10/isk_10_1_main.c
rename to src/world/area_isk/isk_10/main.c
diff --git a/src/world/area_isk/isk_10/isk_10_0_header.c b/src/world/area_isk/isk_10/settings.c
similarity index 100%
rename from src/world/area_isk/isk_10/isk_10_0_header.c
rename to src/world/area_isk/isk_10/settings.c
diff --git a/src/world/area_isk/isk_11/isk_11_3_entity.c b/src/world/area_isk/isk_11/entity.c
similarity index 100%
rename from src/world/area_isk/isk_11/isk_11_3_entity.c
rename to src/world/area_isk/isk_11/entity.c
diff --git a/src/world/area_isk/isk_11/isk_11_6_lock.c b/src/world/area_isk/isk_11/lock.c
similarity index 100%
rename from src/world/area_isk/isk_11/isk_11_6_lock.c
rename to src/world/area_isk/isk_11/lock.c
diff --git a/src/world/area_isk/isk_11/isk_11_2_main.c b/src/world/area_isk/isk_11/main.c
similarity index 100%
rename from src/world/area_isk/isk_11/isk_11_2_main.c
rename to src/world/area_isk/isk_11/main.c
diff --git a/src/world/area_isk/isk_11/isk_11_1_music.c b/src/world/area_isk/isk_11/music.c
similarity index 100%
rename from src/world/area_isk/isk_11/isk_11_1_music.c
rename to src/world/area_isk/isk_11/music.c
diff --git a/src/world/area_isk/isk_11/isk_11_5_puzzle.c b/src/world/area_isk/isk_11/puzzle.c
similarity index 100%
rename from src/world/area_isk/isk_11/isk_11_5_puzzle.c
rename to src/world/area_isk/isk_11/puzzle.c
diff --git a/src/world/area_isk/isk_11/isk_11_4_scene.c b/src/world/area_isk/isk_11/scene.c
similarity index 100%
rename from src/world/area_isk/isk_11/isk_11_4_scene.c
rename to src/world/area_isk/isk_11/scene.c
diff --git a/src/world/area_isk/isk_11/isk_11_0_header.c b/src/world/area_isk/isk_11/settings.c
similarity index 100%
rename from src/world/area_isk/isk_11/isk_11_0_header.c
rename to src/world/area_isk/isk_11/settings.c
diff --git a/src/world/area_isk/isk_12/isk_12_2_entity.c b/src/world/area_isk/isk_12/entity.c
similarity index 100%
rename from src/world/area_isk/isk_12/isk_12_2_entity.c
rename to src/world/area_isk/isk_12/entity.c
diff --git a/src/world/area_isk/isk_12/isk_12_1_main.c b/src/world/area_isk/isk_12/main.c
similarity index 100%
rename from src/world/area_isk/isk_12/isk_12_1_main.c
rename to src/world/area_isk/isk_12/main.c
diff --git a/src/world/area_isk/isk_12/isk_12_3_sand.c b/src/world/area_isk/isk_12/sand.c
similarity index 100%
rename from src/world/area_isk/isk_12/isk_12_3_sand.c
rename to src/world/area_isk/isk_12/sand.c
diff --git a/src/world/area_isk/isk_12/isk_12_0_header.c b/src/world/area_isk/isk_12/settings.c
similarity index 100%
rename from src/world/area_isk/isk_12/isk_12_0_header.c
rename to src/world/area_isk/isk_12/settings.c
diff --git a/src/world/area_isk/isk_12/isk_12_4_switch.c b/src/world/area_isk/isk_12/switch.c
similarity index 100%
rename from src/world/area_isk/isk_12/isk_12_4_switch.c
rename to src/world/area_isk/isk_12/switch.c
diff --git a/src/world/area_isk/isk_13/isk_13_2_entity.c b/src/world/area_isk/isk_13/entity.c
similarity index 100%
rename from src/world/area_isk/isk_13/isk_13_2_entity.c
rename to src/world/area_isk/isk_13/entity.c
diff --git a/src/world/area_isk/isk_13/isk_13_1_main.c b/src/world/area_isk/isk_13/main.c
similarity index 100%
rename from src/world/area_isk/isk_13/isk_13_1_main.c
rename to src/world/area_isk/isk_13/main.c
diff --git a/src/world/area_isk/isk_13/isk_13_3_npc.c b/src/world/area_isk/isk_13/npc.c
similarity index 100%
rename from src/world/area_isk/isk_13/isk_13_3_npc.c
rename to src/world/area_isk/isk_13/npc.c
diff --git a/src/world/area_isk/isk_13/isk_13_0_header.c b/src/world/area_isk/isk_13/settings.c
similarity index 100%
rename from src/world/area_isk/isk_13/isk_13_0_header.c
rename to src/world/area_isk/isk_13/settings.c
diff --git a/src/world/area_isk/isk_14/isk_14_2_entity.c b/src/world/area_isk/isk_14/entity.c
similarity index 100%
rename from src/world/area_isk/isk_14/isk_14_2_entity.c
rename to src/world/area_isk/isk_14/entity.c
diff --git a/src/world/area_isk/isk_14/isk_14_1_main.c b/src/world/area_isk/isk_14/main.c
similarity index 100%
rename from src/world/area_isk/isk_14/isk_14_1_main.c
rename to src/world/area_isk/isk_14/main.c
diff --git a/src/world/area_isk/isk_14/isk_14_3_npc.c b/src/world/area_isk/isk_14/npc.c
similarity index 100%
rename from src/world/area_isk/isk_14/isk_14_3_npc.c
rename to src/world/area_isk/isk_14/npc.c
diff --git a/src/world/area_isk/isk_14/isk_14_0_header.c b/src/world/area_isk/isk_14/settings.c
similarity index 100%
rename from src/world/area_isk/isk_14/isk_14_0_header.c
rename to src/world/area_isk/isk_14/settings.c
diff --git a/src/world/area_isk/isk_16/isk_16_3_boss.c b/src/world/area_isk/isk_16/boss.c
similarity index 100%
rename from src/world/area_isk/isk_16/isk_16_3_boss.c
rename to src/world/area_isk/isk_16/boss.c
diff --git a/src/world/area_isk/isk_16/isk_16_4_entity.c b/src/world/area_isk/isk_16/entity.c
similarity index 100%
rename from src/world/area_isk/isk_16/isk_16_4_entity.c
rename to src/world/area_isk/isk_16/entity.c
diff --git a/src/world/area_isk/isk_16/isk_16_1_main.c b/src/world/area_isk/isk_16/main.c
similarity index 100%
rename from src/world/area_isk/isk_16/isk_16_1_main.c
rename to src/world/area_isk/isk_16/main.c
diff --git a/src/world/area_isk/isk_16/isk_16_2_npc.c b/src/world/area_isk/isk_16/npc.c
similarity index 100%
rename from src/world/area_isk/isk_16/isk_16_2_npc.c
rename to src/world/area_isk/isk_16/npc.c
diff --git a/src/world/area_isk/isk_16/isk_16_0_header.c b/src/world/area_isk/isk_16/settings.c
similarity index 100%
rename from src/world/area_isk/isk_16/isk_16_0_header.c
rename to src/world/area_isk/isk_16/settings.c
diff --git a/src/world/area_isk/isk_18/isk_18_3_entity.c b/src/world/area_isk/isk_18/entity.c
similarity index 100%
rename from src/world/area_isk/isk_18/isk_18_3_entity.c
rename to src/world/area_isk/isk_18/entity.c
diff --git a/src/world/area_isk/isk_18/isk_18_1_main.c b/src/world/area_isk/isk_18/main.c
similarity index 100%
rename from src/world/area_isk/isk_18/isk_18_1_main.c
rename to src/world/area_isk/isk_18/main.c
diff --git a/src/world/area_isk/isk_18/isk_18_2_npc.c b/src/world/area_isk/isk_18/npc.c
similarity index 100%
rename from src/world/area_isk/isk_18/isk_18_2_npc.c
rename to src/world/area_isk/isk_18/npc.c
diff --git a/src/world/area_isk/isk_18/isk_18_0_header.c b/src/world/area_isk/isk_18/settings.c
similarity index 100%
rename from src/world/area_isk/isk_18/isk_18_0_header.c
rename to src/world/area_isk/isk_18/settings.c
diff --git a/src/world/area_isk/isk_19/isk_19_3_entity.c b/src/world/area_isk/isk_19/entity.c
similarity index 100%
rename from src/world/area_isk/isk_19/isk_19_3_entity.c
rename to src/world/area_isk/isk_19/entity.c
diff --git a/src/world/area_isk/isk_19/isk_19_2_main.c b/src/world/area_isk/isk_19/main.c
similarity index 100%
rename from src/world/area_isk/isk_19/isk_19_2_main.c
rename to src/world/area_isk/isk_19/main.c
diff --git a/src/world/area_isk/isk_19/isk_19_1_music.c b/src/world/area_isk/isk_19/music.c
similarity index 100%
rename from src/world/area_isk/isk_19/isk_19_1_music.c
rename to src/world/area_isk/isk_19/music.c
diff --git a/src/world/area_isk/isk_19/isk_19_0_header.c b/src/world/area_isk/isk_19/settings.c
similarity index 100%
rename from src/world/area_isk/isk_19/isk_19_0_header.c
rename to src/world/area_isk/isk_19/settings.c
diff --git a/src/world/area_iwa/iwa_00/iwa_00_2_entity.c b/src/world/area_iwa/iwa_00/entity.c
similarity index 100%
rename from src/world/area_iwa/iwa_00/iwa_00_2_entity.c
rename to src/world/area_iwa/iwa_00/entity.c
diff --git a/src/world/area_iwa/iwa_00/iwa_00_1_main.c b/src/world/area_iwa/iwa_00/main.c
similarity index 100%
rename from src/world/area_iwa/iwa_00/iwa_00_1_main.c
rename to src/world/area_iwa/iwa_00/main.c
diff --git a/src/world/area_iwa/iwa_00/iwa_00_3_npc.c b/src/world/area_iwa/iwa_00/npc.c
similarity index 100%
rename from src/world/area_iwa/iwa_00/iwa_00_3_npc.c
rename to src/world/area_iwa/iwa_00/npc.c
diff --git a/src/world/area_iwa/iwa_00/iwa_00_0_header.c b/src/world/area_iwa/iwa_00/settings.c
similarity index 100%
rename from src/world/area_iwa/iwa_00/iwa_00_0_header.c
rename to src/world/area_iwa/iwa_00/settings.c
diff --git a/src/world/area_iwa/iwa_00/iwa_00_4_slide.c b/src/world/area_iwa/iwa_00/slide.c
similarity index 100%
rename from src/world/area_iwa/iwa_00/iwa_00_4_slide.c
rename to src/world/area_iwa/iwa_00/slide.c
diff --git a/src/world/area_iwa/iwa_01/iwa_01_2_entity.c b/src/world/area_iwa/iwa_01/entity.c
similarity index 100%
rename from src/world/area_iwa/iwa_01/iwa_01_2_entity.c
rename to src/world/area_iwa/iwa_01/entity.c
diff --git a/src/world/area_iwa/iwa_01/iwa_01_1_main.c b/src/world/area_iwa/iwa_01/main.c
similarity index 100%
rename from src/world/area_iwa/iwa_01/iwa_01_1_main.c
rename to src/world/area_iwa/iwa_01/main.c
diff --git a/src/world/area_iwa/iwa_01/iwa_01_4_npc.c b/src/world/area_iwa/iwa_01/npc.c
similarity index 100%
rename from src/world/area_iwa/iwa_01/iwa_01_4_npc.c
rename to src/world/area_iwa/iwa_01/npc.c
diff --git a/src/world/area_iwa/iwa_01/iwa_01_0_header.c b/src/world/area_iwa/iwa_01/settings.c
similarity index 100%
rename from src/world/area_iwa/iwa_01/iwa_01_0_header.c
rename to src/world/area_iwa/iwa_01/settings.c
diff --git a/src/world/area_iwa/iwa_01/iwa_01_5_slide.c b/src/world/area_iwa/iwa_01/slide.c
similarity index 100%
rename from src/world/area_iwa/iwa_01/iwa_01_5_slide.c
rename to src/world/area_iwa/iwa_01/slide.c
diff --git a/src/world/area_iwa/iwa_01/iwa_01_3_splash.c b/src/world/area_iwa/iwa_01/splash.c
similarity index 100%
rename from src/world/area_iwa/iwa_01/iwa_01_3_splash.c
rename to src/world/area_iwa/iwa_01/splash.c
diff --git a/src/world/area_iwa/iwa_02/iwa_02_2_entity.c b/src/world/area_iwa/iwa_02/entity.c
similarity index 100%
rename from src/world/area_iwa/iwa_02/iwa_02_2_entity.c
rename to src/world/area_iwa/iwa_02/entity.c
diff --git a/src/world/area_iwa/iwa_02/iwa_02_1_main.c b/src/world/area_iwa/iwa_02/main.c
similarity index 100%
rename from src/world/area_iwa/iwa_02/iwa_02_1_main.c
rename to src/world/area_iwa/iwa_02/main.c
diff --git a/src/world/area_iwa/iwa_02/iwa_02_3_npc.c b/src/world/area_iwa/iwa_02/npc.c
similarity index 100%
rename from src/world/area_iwa/iwa_02/iwa_02_3_npc.c
rename to src/world/area_iwa/iwa_02/npc.c
diff --git a/src/world/area_iwa/iwa_02/iwa_02_0_header.c b/src/world/area_iwa/iwa_02/settings.c
similarity index 100%
rename from src/world/area_iwa/iwa_02/iwa_02_0_header.c
rename to src/world/area_iwa/iwa_02/settings.c
diff --git a/src/world/area_iwa/iwa_03/iwa_03_2_entity.c b/src/world/area_iwa/iwa_03/entity.c
similarity index 100%
rename from src/world/area_iwa/iwa_03/iwa_03_2_entity.c
rename to src/world/area_iwa/iwa_03/entity.c
diff --git a/src/world/area_iwa/iwa_03/iwa_03_1_main.c b/src/world/area_iwa/iwa_03/main.c
similarity index 100%
rename from src/world/area_iwa/iwa_03/iwa_03_1_main.c
rename to src/world/area_iwa/iwa_03/main.c
diff --git a/src/world/area_iwa/iwa_03/iwa_03_3_npc.c b/src/world/area_iwa/iwa_03/npc.c
similarity index 100%
rename from src/world/area_iwa/iwa_03/iwa_03_3_npc.c
rename to src/world/area_iwa/iwa_03/npc.c
diff --git a/src/world/area_iwa/iwa_03/iwa_03_0_header.c b/src/world/area_iwa/iwa_03/settings.c
similarity index 100%
rename from src/world/area_iwa/iwa_03/iwa_03_0_header.c
rename to src/world/area_iwa/iwa_03/settings.c
diff --git a/src/world/area_iwa/iwa_03/iwa_03_4_slide.c b/src/world/area_iwa/iwa_03/slide.c
similarity index 100%
rename from src/world/area_iwa/iwa_03/iwa_03_4_slide.c
rename to src/world/area_iwa/iwa_03/slide.c
diff --git a/src/world/area_iwa/iwa_04/iwa_04_3_entity.c b/src/world/area_iwa/iwa_04/entity.c
similarity index 100%
rename from src/world/area_iwa/iwa_04/iwa_04_3_entity.c
rename to src/world/area_iwa/iwa_04/entity.c
diff --git a/src/world/area_iwa/iwa_04/iwa_04_2_main.c b/src/world/area_iwa/iwa_04/main.c
similarity index 100%
rename from src/world/area_iwa/iwa_04/iwa_04_2_main.c
rename to src/world/area_iwa/iwa_04/main.c
diff --git a/src/world/area_iwa/iwa_04/iwa_04_1_music.c b/src/world/area_iwa/iwa_04/music.c
similarity index 100%
rename from src/world/area_iwa/iwa_04/iwa_04_1_music.c
rename to src/world/area_iwa/iwa_04/music.c
diff --git a/src/world/area_iwa/iwa_04/iwa_04_4_npc.c b/src/world/area_iwa/iwa_04/npc.c
similarity index 100%
rename from src/world/area_iwa/iwa_04/iwa_04_4_npc.c
rename to src/world/area_iwa/iwa_04/npc.c
diff --git a/src/world/area_iwa/iwa_04/iwa_04_0_header.c b/src/world/area_iwa/iwa_04/settings.c
similarity index 100%
rename from src/world/area_iwa/iwa_04/iwa_04_0_header.c
rename to src/world/area_iwa/iwa_04/settings.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_5_entity.c b/src/world/area_iwa/iwa_10/entity.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_5_entity.c
rename to src/world/area_iwa/iwa_10/entity.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_8_foliage.c b/src/world/area_iwa/iwa_10/foliage.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_8_foliage.c
rename to src/world/area_iwa/iwa_10/foliage.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_2_main.c b/src/world/area_iwa/iwa_10/main.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_2_main.c
rename to src/world/area_iwa/iwa_10/main.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_1_music.c b/src/world/area_iwa/iwa_10/music.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_1_music.c
rename to src/world/area_iwa/iwa_10/music.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_7_new_partner.c b/src/world/area_iwa/iwa_10/new_partner.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_7_new_partner.c
rename to src/world/area_iwa/iwa_10/new_partner.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_3_npc.c b/src/world/area_iwa/iwa_10/npc.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_3_npc.c
rename to src/world/area_iwa/iwa_10/npc.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c b/src/world/area_iwa/iwa_10/parakarry.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_6_parakarry.c
rename to src/world/area_iwa/iwa_10/parakarry.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_0_header.c b/src/world/area_iwa/iwa_10/settings.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_0_header.c
rename to src/world/area_iwa/iwa_10/settings.c
diff --git a/src/world/area_iwa/iwa_10/iwa_10_4_train.c b/src/world/area_iwa/iwa_10/train.c
similarity index 100%
rename from src/world/area_iwa/iwa_10/iwa_10_4_train.c
rename to src/world/area_iwa/iwa_10/train.c
diff --git a/src/world/area_iwa/iwa_11/iwa_11_2_main.c b/src/world/area_iwa/iwa_11/main.c
similarity index 100%
rename from src/world/area_iwa/iwa_11/iwa_11_2_main.c
rename to src/world/area_iwa/iwa_11/main.c
diff --git a/src/world/area_iwa/iwa_11/iwa_11_1_music.c b/src/world/area_iwa/iwa_11/music.c
similarity index 100%
rename from src/world/area_iwa/iwa_11/iwa_11_1_music.c
rename to src/world/area_iwa/iwa_11/music.c
diff --git a/src/world/area_iwa/iwa_11/iwa_11_5_npc.c b/src/world/area_iwa/iwa_11/npc.c
similarity index 100%
rename from src/world/area_iwa/iwa_11/iwa_11_5_npc.c
rename to src/world/area_iwa/iwa_11/npc.c
diff --git a/src/world/area_iwa/iwa_11/iwa_11_4_scenery.c b/src/world/area_iwa/iwa_11/scenery.c
similarity index 100%
rename from src/world/area_iwa/iwa_11/iwa_11_4_scenery.c
rename to src/world/area_iwa/iwa_11/scenery.c
diff --git a/src/world/area_iwa/iwa_11/iwa_11_0_header.c b/src/world/area_iwa/iwa_11/settings.c
similarity index 100%
rename from src/world/area_iwa/iwa_11/iwa_11_0_header.c
rename to src/world/area_iwa/iwa_11/settings.c
diff --git a/src/world/area_iwa/iwa_11/iwa_11_3_train.c b/src/world/area_iwa/iwa_11/train.c
similarity index 100%
rename from src/world/area_iwa/iwa_11/iwa_11_3_train.c
rename to src/world/area_iwa/iwa_11/train.c
diff --git a/src/world/area_jan/jan_00/jan_00_3_entity.c b/src/world/area_jan/jan_00/entity.c
similarity index 100%
rename from src/world/area_jan/jan_00/jan_00_3_entity.c
rename to src/world/area_jan/jan_00/entity.c
diff --git a/src/world/area_jan/jan_00/jan_00_5_foliage.c b/src/world/area_jan/jan_00/foliage.c
similarity index 100%
rename from src/world/area_jan/jan_00/jan_00_5_foliage.c
rename to src/world/area_jan/jan_00/foliage.c
diff --git a/src/world/area_jan/jan_00/jan_00_1_main.c b/src/world/area_jan/jan_00/main.c
similarity index 100%
rename from src/world/area_jan/jan_00/jan_00_1_main.c
rename to src/world/area_jan/jan_00/main.c
diff --git a/src/world/area_jan/jan_00/jan_00_2_npc.c b/src/world/area_jan/jan_00/npc.c
similarity index 100%
rename from src/world/area_jan/jan_00/jan_00_2_npc.c
rename to src/world/area_jan/jan_00/npc.c
diff --git a/src/world/area_jan/jan_00/jan_00_0_header.c b/src/world/area_jan/jan_00/settings.c
similarity index 100%
rename from src/world/area_jan/jan_00/jan_00_0_header.c
rename to src/world/area_jan/jan_00/settings.c
diff --git a/src/world/area_jan/jan_00/jan_00_4_whale.c b/src/world/area_jan/jan_00/whale.c
similarity index 100%
rename from src/world/area_jan/jan_00/jan_00_4_whale.c
rename to src/world/area_jan/jan_00/whale.c
diff --git a/src/world/area_jan/jan_01/jan_01_4_entity.c b/src/world/area_jan/jan_01/entity.c
similarity index 100%
rename from src/world/area_jan/jan_01/jan_01_4_entity.c
rename to src/world/area_jan/jan_01/entity.c
diff --git a/src/world/area_jan/jan_01/jan_01_5_foliage.c b/src/world/area_jan/jan_01/foliage.c
similarity index 100%
rename from src/world/area_jan/jan_01/jan_01_5_foliage.c
rename to src/world/area_jan/jan_01/foliage.c
diff --git a/src/world/area_jan/jan_01/jan_01_2_main.c b/src/world/area_jan/jan_01/main.c
similarity index 100%
rename from src/world/area_jan/jan_01/jan_01_2_main.c
rename to src/world/area_jan/jan_01/main.c
diff --git a/src/world/area_jan/jan_01/jan_01_1_music.c b/src/world/area_jan/jan_01/music.c
similarity index 100%
rename from src/world/area_jan/jan_01/jan_01_1_music.c
rename to src/world/area_jan/jan_01/music.c
diff --git a/src/world/area_jan/jan_01/jan_01_3_npc.c b/src/world/area_jan/jan_01/npc.c
similarity index 100%
rename from src/world/area_jan/jan_01/jan_01_3_npc.c
rename to src/world/area_jan/jan_01/npc.c
diff --git a/src/world/area_jan/jan_01/jan_01_0_header.c b/src/world/area_jan/jan_01/settings.c
similarity index 100%
rename from src/world/area_jan/jan_01/jan_01_0_header.c
rename to src/world/area_jan/jan_01/settings.c
diff --git a/src/world/area_jan/jan_02/jan_02_4_entity.c b/src/world/area_jan/jan_02/entity.c
similarity index 100%
rename from src/world/area_jan/jan_02/jan_02_4_entity.c
rename to src/world/area_jan/jan_02/entity.c
diff --git a/src/world/area_jan/jan_02/jan_02_5_foliage.c b/src/world/area_jan/jan_02/foliage.c
similarity index 100%
rename from src/world/area_jan/jan_02/jan_02_5_foliage.c
rename to src/world/area_jan/jan_02/foliage.c
diff --git a/src/world/area_jan/jan_02/jan_02_2_main.c b/src/world/area_jan/jan_02/main.c
similarity index 100%
rename from src/world/area_jan/jan_02/jan_02_2_main.c
rename to src/world/area_jan/jan_02/main.c
diff --git a/src/world/area_jan/jan_02/jan_02_1_music.c b/src/world/area_jan/jan_02/music.c
similarity index 100%
rename from src/world/area_jan/jan_02/jan_02_1_music.c
rename to src/world/area_jan/jan_02/music.c
diff --git a/src/world/area_jan/jan_02/jan_02_3_npc.c b/src/world/area_jan/jan_02/npc.c
similarity index 100%
rename from src/world/area_jan/jan_02/jan_02_3_npc.c
rename to src/world/area_jan/jan_02/npc.c
diff --git a/src/world/area_jan/jan_02/jan_02_0_header.c b/src/world/area_jan/jan_02/settings.c
similarity index 100%
rename from src/world/area_jan/jan_02/jan_02_0_header.c
rename to src/world/area_jan/jan_02/settings.c
diff --git a/src/world/area_jan/jan_03/jan_03_5_entity.c b/src/world/area_jan/jan_03/entity.c
similarity index 100%
rename from src/world/area_jan/jan_03/jan_03_5_entity.c
rename to src/world/area_jan/jan_03/entity.c
diff --git a/src/world/area_jan/jan_03/jan_03_7_foliage.c b/src/world/area_jan/jan_03/foliage.c
similarity index 100%
rename from src/world/area_jan/jan_03/jan_03_7_foliage.c
rename to src/world/area_jan/jan_03/foliage.c
diff --git a/src/world/area_jan/jan_03/jan_03_2_main.c b/src/world/area_jan/jan_03/main.c
similarity index 100%
rename from src/world/area_jan/jan_03/jan_03_2_main.c
rename to src/world/area_jan/jan_03/main.c
diff --git a/src/world/area_jan/jan_03/jan_03_1_music.c b/src/world/area_jan/jan_03/music.c
similarity index 100%
rename from src/world/area_jan/jan_03/jan_03_1_music.c
rename to src/world/area_jan/jan_03/music.c
diff --git a/src/world/area_jan/jan_03/jan_03_4_npc.c b/src/world/area_jan/jan_03/npc.c
similarity index 100%
rename from src/world/area_jan/jan_03/jan_03_4_npc.c
rename to src/world/area_jan/jan_03/npc.c
diff --git a/src/world/area_jan/jan_03/jan_03_6_rooms.c b/src/world/area_jan/jan_03/rooms.c
similarity index 100%
rename from src/world/area_jan/jan_03/jan_03_6_rooms.c
rename to src/world/area_jan/jan_03/rooms.c
diff --git a/src/world/area_jan/jan_03/jan_03_0_header.c b/src/world/area_jan/jan_03/settings.c
similarity index 100%
rename from src/world/area_jan/jan_03/jan_03_0_header.c
rename to src/world/area_jan/jan_03/settings.c
diff --git a/src/world/area_jan/jan_03/jan_03_3_shop.c b/src/world/area_jan/jan_03/shop.c
similarity index 100%
rename from src/world/area_jan/jan_03/jan_03_3_shop.c
rename to src/world/area_jan/jan_03/shop.c
diff --git a/src/world/area_jan/jan_04/jan_04_9_bushes.c b/src/world/area_jan/jan_04/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_9_bushes.c
rename to src/world/area_jan/jan_04/bushes.c
diff --git a/src/world/area_jan/jan_04/jan_04_10_demo.c b/src/world/area_jan/jan_04/demo.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_10_demo.c
rename to src/world/area_jan/jan_04/demo.c
diff --git a/src/world/area_jan/jan_04/jan_04_3_entity.c b/src/world/area_jan/jan_04/entity.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_3_entity.c
rename to src/world/area_jan/jan_04/entity.c
diff --git a/src/world/area_jan/jan_04/jan_04_2_main.c b/src/world/area_jan/jan_04/main.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_2_main.c
rename to src/world/area_jan/jan_04/main.c
diff --git a/src/world/area_jan/jan_04/jan_04_1_music.c b/src/world/area_jan/jan_04/music.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_1_music.c
rename to src/world/area_jan/jan_04/music.c
diff --git a/src/world/area_jan/jan_04/jan_04_4_npc.c b/src/world/area_jan/jan_04/npc.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_4_npc.c
rename to src/world/area_jan/jan_04/npc.c
diff --git a/src/world/area_jan/jan_04/jan_04_7_scenes.c b/src/world/area_jan/jan_04/scenes.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_7_scenes.c
rename to src/world/area_jan/jan_04/scenes.c
diff --git a/src/world/area_jan/jan_04/jan_04_0_header.c b/src/world/area_jan/jan_04/settings.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_0_header.c
rename to src/world/area_jan/jan_04/settings.c
diff --git a/src/world/area_jan/jan_04/jan_04_8_treasure.c b/src/world/area_jan/jan_04/treasure.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_8_treasure.c
rename to src/world/area_jan/jan_04/treasure.c
diff --git a/src/world/area_jan/jan_04/jan_04_6_trees.c b/src/world/area_jan/jan_04/trees.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_6_trees.c
rename to src/world/area_jan/jan_04/trees.c
diff --git a/src/world/area_jan/jan_04/jan_04_5_unused.c b/src/world/area_jan/jan_04/unused.c
similarity index 100%
rename from src/world/area_jan/jan_04/jan_04_5_unused.c
rename to src/world/area_jan/jan_04/unused.c
diff --git a/src/world/area_jan/jan_05/jan_05_4_bushes.c b/src/world/area_jan/jan_05/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_05/jan_05_4_bushes.c
rename to src/world/area_jan/jan_05/bushes.c
diff --git a/src/world/area_jan/jan_05/jan_05_7_entity.c b/src/world/area_jan/jan_05/entity.c
similarity index 100%
rename from src/world/area_jan/jan_05/jan_05_7_entity.c
rename to src/world/area_jan/jan_05/entity.c
diff --git a/src/world/area_jan/jan_05/jan_05_3_log.c b/src/world/area_jan/jan_05/log.c
similarity index 100%
rename from src/world/area_jan/jan_05/jan_05_3_log.c
rename to src/world/area_jan/jan_05/log.c
diff --git a/src/world/area_jan/jan_05/jan_05_2_main.c b/src/world/area_jan/jan_05/main.c
similarity index 100%
rename from src/world/area_jan/jan_05/jan_05_2_main.c
rename to src/world/area_jan/jan_05/main.c
diff --git a/src/world/area_jan/jan_05/jan_05_1_music.c b/src/world/area_jan/jan_05/music.c
similarity index 100%
rename from src/world/area_jan/jan_05/jan_05_1_music.c
rename to src/world/area_jan/jan_05/music.c
diff --git a/src/world/area_jan/jan_05/jan_05_5_npc.c b/src/world/area_jan/jan_05/npc.c
similarity index 100%
rename from src/world/area_jan/jan_05/jan_05_5_npc.c
rename to src/world/area_jan/jan_05/npc.c
diff --git a/src/world/area_jan/jan_05/jan_05_0_header.c b/src/world/area_jan/jan_05/settings.c
similarity index 100%
rename from src/world/area_jan/jan_05/jan_05_0_header.c
rename to src/world/area_jan/jan_05/settings.c
diff --git a/src/world/area_jan/jan_05/jan_05_6_trees.c b/src/world/area_jan/jan_05/trees.c
similarity index 100%
rename from src/world/area_jan/jan_05/jan_05_6_trees.c
rename to src/world/area_jan/jan_05/trees.c
diff --git a/src/world/area_jan/jan_06/jan_06_7_bushes.c b/src/world/area_jan/jan_06/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_06/jan_06_7_bushes.c
rename to src/world/area_jan/jan_06/bushes.c
diff --git a/src/world/area_jan/jan_06/jan_06_5_entity.c b/src/world/area_jan/jan_06/entity.c
similarity index 100%
rename from src/world/area_jan/jan_06/jan_06_5_entity.c
rename to src/world/area_jan/jan_06/entity.c
diff --git a/src/world/area_jan/jan_06/jan_06_3_log.c b/src/world/area_jan/jan_06/log.c
similarity index 100%
rename from src/world/area_jan/jan_06/jan_06_3_log.c
rename to src/world/area_jan/jan_06/log.c
diff --git a/src/world/area_jan/jan_06/jan_06_1_main.c b/src/world/area_jan/jan_06/main.c
similarity index 100%
rename from src/world/area_jan/jan_06/jan_06_1_main.c
rename to src/world/area_jan/jan_06/main.c
diff --git a/src/world/area_jan/jan_06/jan_06_6_npc.c b/src/world/area_jan/jan_06/npc.c
similarity index 100%
rename from src/world/area_jan/jan_06/jan_06_6_npc.c
rename to src/world/area_jan/jan_06/npc.c
diff --git a/src/world/area_jan/jan_06/jan_06_0_header.c b/src/world/area_jan/jan_06/settings.c
similarity index 100%
rename from src/world/area_jan/jan_06/jan_06_0_header.c
rename to src/world/area_jan/jan_06/settings.c
diff --git a/src/world/area_jan/jan_06/jan_06_2_statue.c b/src/world/area_jan/jan_06/statue.c
similarity index 100%
rename from src/world/area_jan/jan_06/jan_06_2_statue.c
rename to src/world/area_jan/jan_06/statue.c
diff --git a/src/world/area_jan/jan_06/jan_06_4_trees.c b/src/world/area_jan/jan_06/trees.c
similarity index 100%
rename from src/world/area_jan/jan_06/jan_06_4_trees.c
rename to src/world/area_jan/jan_06/trees.c
diff --git a/src/world/area_jan/jan_07/jan_07_5_bushes.c b/src/world/area_jan/jan_07/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_07/jan_07_5_bushes.c
rename to src/world/area_jan/jan_07/bushes.c
diff --git a/src/world/area_jan/jan_07/jan_07_2_main.c b/src/world/area_jan/jan_07/main.c
similarity index 100%
rename from src/world/area_jan/jan_07/jan_07_2_main.c
rename to src/world/area_jan/jan_07/main.c
diff --git a/src/world/area_jan/jan_07/jan_07_1_music.c b/src/world/area_jan/jan_07/music.c
similarity index 100%
rename from src/world/area_jan/jan_07/jan_07_1_music.c
rename to src/world/area_jan/jan_07/music.c
diff --git a/src/world/area_jan/jan_07/jan_07_3_npc.c b/src/world/area_jan/jan_07/npc.c
similarity index 100%
rename from src/world/area_jan/jan_07/jan_07_3_npc.c
rename to src/world/area_jan/jan_07/npc.c
diff --git a/src/world/area_jan/jan_07/jan_07_0_header.c b/src/world/area_jan/jan_07/settings.c
similarity index 100%
rename from src/world/area_jan/jan_07/jan_07_0_header.c
rename to src/world/area_jan/jan_07/settings.c
diff --git a/src/world/area_jan/jan_07/jan_07_4_trees.c b/src/world/area_jan/jan_07/trees.c
similarity index 100%
rename from src/world/area_jan/jan_07/jan_07_4_trees.c
rename to src/world/area_jan/jan_07/trees.c
diff --git a/src/world/area_jan/jan_08/jan_08_3_bushes.c b/src/world/area_jan/jan_08/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_08/jan_08_3_bushes.c
rename to src/world/area_jan/jan_08/bushes.c
diff --git a/src/world/area_jan/jan_08/jan_08_4_entity.c b/src/world/area_jan/jan_08/entity.c
similarity index 100%
rename from src/world/area_jan/jan_08/jan_08_4_entity.c
rename to src/world/area_jan/jan_08/entity.c
diff --git a/src/world/area_jan/jan_08/jan_08_2_main.c b/src/world/area_jan/jan_08/main.c
similarity index 100%
rename from src/world/area_jan/jan_08/jan_08_2_main.c
rename to src/world/area_jan/jan_08/main.c
diff --git a/src/world/area_jan/jan_08/jan_08_1_music.c b/src/world/area_jan/jan_08/music.c
similarity index 100%
rename from src/world/area_jan/jan_08/jan_08_1_music.c
rename to src/world/area_jan/jan_08/music.c
diff --git a/src/world/area_jan/jan_08/jan_08_5_npc.c b/src/world/area_jan/jan_08/npc.c
similarity index 100%
rename from src/world/area_jan/jan_08/jan_08_5_npc.c
rename to src/world/area_jan/jan_08/npc.c
diff --git a/src/world/area_jan/jan_08/jan_08_0_header.c b/src/world/area_jan/jan_08/settings.c
similarity index 100%
rename from src/world/area_jan/jan_08/jan_08_0_header.c
rename to src/world/area_jan/jan_08/settings.c
diff --git a/src/world/area_jan/jan_08/jan_08_6_trees.c b/src/world/area_jan/jan_08/trees.c
similarity index 100%
rename from src/world/area_jan/jan_08/jan_08_6_trees.c
rename to src/world/area_jan/jan_08/trees.c
diff --git a/src/world/area_jan/jan_09/jan_09_2_bushes.c b/src/world/area_jan/jan_09/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_09/jan_09_2_bushes.c
rename to src/world/area_jan/jan_09/bushes.c
diff --git a/src/world/area_jan/jan_09/jan_09_5_entity.c b/src/world/area_jan/jan_09/entity.c
similarity index 100%
rename from src/world/area_jan/jan_09/jan_09_5_entity.c
rename to src/world/area_jan/jan_09/entity.c
diff --git a/src/world/area_jan/jan_09/jan_09_1_main.c b/src/world/area_jan/jan_09/main.c
similarity index 100%
rename from src/world/area_jan/jan_09/jan_09_1_main.c
rename to src/world/area_jan/jan_09/main.c
diff --git a/src/world/area_jan/jan_09/jan_09_3_npc.c b/src/world/area_jan/jan_09/npc.c
similarity index 100%
rename from src/world/area_jan/jan_09/jan_09_3_npc.c
rename to src/world/area_jan/jan_09/npc.c
diff --git a/src/world/area_jan/jan_09/jan_09_0_header.c b/src/world/area_jan/jan_09/settings.c
similarity index 100%
rename from src/world/area_jan/jan_09/jan_09_0_header.c
rename to src/world/area_jan/jan_09/settings.c
diff --git a/src/world/area_jan/jan_09/jan_09_4_trees.c b/src/world/area_jan/jan_09/trees.c
similarity index 100%
rename from src/world/area_jan/jan_09/jan_09_4_trees.c
rename to src/world/area_jan/jan_09/trees.c
diff --git a/src/world/area_jan/jan_10/jan_10_6_bushes.c b/src/world/area_jan/jan_10/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_10/jan_10_6_bushes.c
rename to src/world/area_jan/jan_10/bushes.c
diff --git a/src/world/area_jan/jan_10/jan_10_7_entity.c b/src/world/area_jan/jan_10/entity.c
similarity index 100%
rename from src/world/area_jan/jan_10/jan_10_7_entity.c
rename to src/world/area_jan/jan_10/entity.c
diff --git a/src/world/area_jan/jan_10/jan_10_4_log.c b/src/world/area_jan/jan_10/log.c
similarity index 100%
rename from src/world/area_jan/jan_10/jan_10_4_log.c
rename to src/world/area_jan/jan_10/log.c
diff --git a/src/world/area_jan/jan_10/jan_10_2_main.c b/src/world/area_jan/jan_10/main.c
similarity index 100%
rename from src/world/area_jan/jan_10/jan_10_2_main.c
rename to src/world/area_jan/jan_10/main.c
diff --git a/src/world/area_jan/jan_10/jan_10_1_music.c b/src/world/area_jan/jan_10/music.c
similarity index 100%
rename from src/world/area_jan/jan_10/jan_10_1_music.c
rename to src/world/area_jan/jan_10/music.c
diff --git a/src/world/area_jan/jan_10/jan_10_3_npc.c b/src/world/area_jan/jan_10/npc.c
similarity index 100%
rename from src/world/area_jan/jan_10/jan_10_3_npc.c
rename to src/world/area_jan/jan_10/npc.c
diff --git a/src/world/area_jan/jan_10/jan_10_0_header.c b/src/world/area_jan/jan_10/settings.c
similarity index 100%
rename from src/world/area_jan/jan_10/jan_10_0_header.c
rename to src/world/area_jan/jan_10/settings.c
diff --git a/src/world/area_jan/jan_10/jan_10_5_trees.c b/src/world/area_jan/jan_10/trees.c
similarity index 100%
rename from src/world/area_jan/jan_10/jan_10_5_trees.c
rename to src/world/area_jan/jan_10/trees.c
diff --git a/src/world/area_jan/jan_11/jan_11_2_main.c b/src/world/area_jan/jan_11/main.c
similarity index 100%
rename from src/world/area_jan/jan_11/jan_11_2_main.c
rename to src/world/area_jan/jan_11/main.c
diff --git a/src/world/area_jan/jan_11/jan_11_1_music.c b/src/world/area_jan/jan_11/music.c
similarity index 100%
rename from src/world/area_jan/jan_11/jan_11_1_music.c
rename to src/world/area_jan/jan_11/music.c
diff --git a/src/world/area_jan/jan_11/jan_11_3_npc.c b/src/world/area_jan/jan_11/npc.c
similarity index 100%
rename from src/world/area_jan/jan_11/jan_11_3_npc.c
rename to src/world/area_jan/jan_11/npc.c
diff --git a/src/world/area_jan/jan_11/jan_11_0_header.c b/src/world/area_jan/jan_11/settings.c
similarity index 100%
rename from src/world/area_jan/jan_11/jan_11_0_header.c
rename to src/world/area_jan/jan_11/settings.c
diff --git a/src/world/area_jan/jan_12/jan_12_4_entity.c b/src/world/area_jan/jan_12/entity.c
similarity index 100%
rename from src/world/area_jan/jan_12/jan_12_4_entity.c
rename to src/world/area_jan/jan_12/entity.c
diff --git a/src/world/area_jan/jan_12/jan_12_1_main.c b/src/world/area_jan/jan_12/main.c
similarity index 100%
rename from src/world/area_jan/jan_12/jan_12_1_main.c
rename to src/world/area_jan/jan_12/main.c
diff --git a/src/world/area_jan/jan_12/jan_12_5_npc.c b/src/world/area_jan/jan_12/npc.c
similarity index 100%
rename from src/world/area_jan/jan_12/jan_12_5_npc.c
rename to src/world/area_jan/jan_12/npc.c
diff --git a/src/world/area_jan/jan_12/jan_12_0_header.c b/src/world/area_jan/jan_12/settings.c
similarity index 100%
rename from src/world/area_jan/jan_12/jan_12_0_header.c
rename to src/world/area_jan/jan_12/settings.c
diff --git a/src/world/area_jan/jan_12/jan_12_3_trees.c b/src/world/area_jan/jan_12/trees.c
similarity index 100%
rename from src/world/area_jan/jan_12/jan_12_3_trees.c
rename to src/world/area_jan/jan_12/trees.c
diff --git a/src/world/area_jan/jan_12/jan_12_2_vines.c b/src/world/area_jan/jan_12/vines.c
similarity index 100%
rename from src/world/area_jan/jan_12/jan_12_2_vines.c
rename to src/world/area_jan/jan_12/vines.c
diff --git a/src/world/area_jan/jan_13/jan_13_4_entity.c b/src/world/area_jan/jan_13/entity.c
similarity index 100%
rename from src/world/area_jan/jan_13/jan_13_4_entity.c
rename to src/world/area_jan/jan_13/entity.c
diff --git a/src/world/area_jan/jan_13/jan_13_1_main.c b/src/world/area_jan/jan_13/main.c
similarity index 100%
rename from src/world/area_jan/jan_13/jan_13_1_main.c
rename to src/world/area_jan/jan_13/main.c
diff --git a/src/world/area_jan/jan_13/jan_13_2_puzzle.c b/src/world/area_jan/jan_13/puzzle.c
similarity index 100%
rename from src/world/area_jan/jan_13/jan_13_2_puzzle.c
rename to src/world/area_jan/jan_13/puzzle.c
diff --git a/src/world/area_jan/jan_13/jan_13_0_header.c b/src/world/area_jan/jan_13/settings.c
similarity index 100%
rename from src/world/area_jan/jan_13/jan_13_0_header.c
rename to src/world/area_jan/jan_13/settings.c
diff --git a/src/world/area_jan/jan_13/jan_13_3_trees.c b/src/world/area_jan/jan_13/trees.c
similarity index 100%
rename from src/world/area_jan/jan_13/jan_13_3_trees.c
rename to src/world/area_jan/jan_13/trees.c
diff --git a/src/world/area_jan/jan_14/jan_14_1_main.c b/src/world/area_jan/jan_14/main.c
similarity index 100%
rename from src/world/area_jan/jan_14/jan_14_1_main.c
rename to src/world/area_jan/jan_14/main.c
diff --git a/src/world/area_jan/jan_14/jan_14_4_npc.c b/src/world/area_jan/jan_14/npc.c
similarity index 100%
rename from src/world/area_jan/jan_14/jan_14_4_npc.c
rename to src/world/area_jan/jan_14/npc.c
diff --git a/src/world/area_jan/jan_14/jan_14_0_header.c b/src/world/area_jan/jan_14/settings.c
similarity index 100%
rename from src/world/area_jan/jan_14/jan_14_0_header.c
rename to src/world/area_jan/jan_14/settings.c
diff --git a/src/world/area_jan/jan_14/jan_14_3_trees.c b/src/world/area_jan/jan_14/trees.c
similarity index 100%
rename from src/world/area_jan/jan_14/jan_14_3_trees.c
rename to src/world/area_jan/jan_14/trees.c
diff --git a/src/world/area_jan/jan_14/jan_14_2_vines.c b/src/world/area_jan/jan_14/vines.c
similarity index 100%
rename from src/world/area_jan/jan_14/jan_14_2_vines.c
rename to src/world/area_jan/jan_14/vines.c
diff --git a/src/world/area_jan/jan_15/jan_15_4_entity.c b/src/world/area_jan/jan_15/entity.c
similarity index 100%
rename from src/world/area_jan/jan_15/jan_15_4_entity.c
rename to src/world/area_jan/jan_15/entity.c
diff --git a/src/world/area_jan/jan_15/jan_15_1_main.c b/src/world/area_jan/jan_15/main.c
similarity index 100%
rename from src/world/area_jan/jan_15/jan_15_1_main.c
rename to src/world/area_jan/jan_15/main.c
diff --git a/src/world/area_jan/jan_15/jan_15_2_npc.c b/src/world/area_jan/jan_15/npc.c
similarity index 100%
rename from src/world/area_jan/jan_15/jan_15_2_npc.c
rename to src/world/area_jan/jan_15/npc.c
diff --git a/src/world/area_jan/jan_15/jan_15_0_header.c b/src/world/area_jan/jan_15/settings.c
similarity index 100%
rename from src/world/area_jan/jan_15/jan_15_0_header.c
rename to src/world/area_jan/jan_15/settings.c
diff --git a/src/world/area_jan/jan_15/jan_15_3_trees.c b/src/world/area_jan/jan_15/trees.c
similarity index 100%
rename from src/world/area_jan/jan_15/jan_15_3_trees.c
rename to src/world/area_jan/jan_15/trees.c
diff --git a/src/world/area_jan/jan_16/jan_16_5_bushes.c b/src/world/area_jan/jan_16/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_16/jan_16_5_bushes.c
rename to src/world/area_jan/jan_16/bushes.c
diff --git a/src/world/area_jan/jan_16/jan_16_4_entity.c b/src/world/area_jan/jan_16/entity.c
similarity index 100%
rename from src/world/area_jan/jan_16/jan_16_4_entity.c
rename to src/world/area_jan/jan_16/entity.c
diff --git a/src/world/area_jan/jan_16/jan_16_2_main.c b/src/world/area_jan/jan_16/main.c
similarity index 100%
rename from src/world/area_jan/jan_16/jan_16_2_main.c
rename to src/world/area_jan/jan_16/main.c
diff --git a/src/world/area_jan/jan_16/jan_16_1_music.c b/src/world/area_jan/jan_16/music.c
similarity index 100%
rename from src/world/area_jan/jan_16/jan_16_1_music.c
rename to src/world/area_jan/jan_16/music.c
diff --git a/src/world/area_jan/jan_16/jan_16_3_npc.c b/src/world/area_jan/jan_16/npc.c
similarity index 100%
rename from src/world/area_jan/jan_16/jan_16_3_npc.c
rename to src/world/area_jan/jan_16/npc.c
diff --git a/src/world/area_jan/jan_16/jan_16_0_header.c b/src/world/area_jan/jan_16/settings.c
similarity index 100%
rename from src/world/area_jan/jan_16/jan_16_0_header.c
rename to src/world/area_jan/jan_16/settings.c
diff --git a/src/world/area_jan/jan_17/jan_17_3_entity.c b/src/world/area_jan/jan_17/entity.c
similarity index 100%
rename from src/world/area_jan/jan_17/jan_17_3_entity.c
rename to src/world/area_jan/jan_17/entity.c
diff --git a/src/world/area_jan/jan_17/jan_17_2_main.c b/src/world/area_jan/jan_17/main.c
similarity index 100%
rename from src/world/area_jan/jan_17/jan_17_2_main.c
rename to src/world/area_jan/jan_17/main.c
diff --git a/src/world/area_jan/jan_17/jan_17_1_music.c b/src/world/area_jan/jan_17/music.c
similarity index 100%
rename from src/world/area_jan/jan_17/jan_17_1_music.c
rename to src/world/area_jan/jan_17/music.c
diff --git a/src/world/area_jan/jan_17/jan_17_0_header.c b/src/world/area_jan/jan_17/settings.c
similarity index 100%
rename from src/world/area_jan/jan_17/jan_17_0_header.c
rename to src/world/area_jan/jan_17/settings.c
diff --git a/src/world/area_jan/jan_18/jan_18_3_entity.c b/src/world/area_jan/jan_18/entity.c
similarity index 100%
rename from src/world/area_jan/jan_18/jan_18_3_entity.c
rename to src/world/area_jan/jan_18/entity.c
diff --git a/src/world/area_jan/jan_18/jan_18_2_main.c b/src/world/area_jan/jan_18/main.c
similarity index 100%
rename from src/world/area_jan/jan_18/jan_18_2_main.c
rename to src/world/area_jan/jan_18/main.c
diff --git a/src/world/area_jan/jan_18/jan_18_1_music.c b/src/world/area_jan/jan_18/music.c
similarity index 100%
rename from src/world/area_jan/jan_18/jan_18_1_music.c
rename to src/world/area_jan/jan_18/music.c
diff --git a/src/world/area_jan/jan_18/jan_18_0_header.c b/src/world/area_jan/jan_18/settings.c
similarity index 100%
rename from src/world/area_jan/jan_18/jan_18_0_header.c
rename to src/world/area_jan/jan_18/settings.c
diff --git a/src/world/area_jan/jan_19/jan_19_3_entity.c b/src/world/area_jan/jan_19/entity.c
similarity index 100%
rename from src/world/area_jan/jan_19/jan_19_3_entity.c
rename to src/world/area_jan/jan_19/entity.c
diff --git a/src/world/area_jan/jan_19/jan_19_2_main.c b/src/world/area_jan/jan_19/main.c
similarity index 100%
rename from src/world/area_jan/jan_19/jan_19_2_main.c
rename to src/world/area_jan/jan_19/main.c
diff --git a/src/world/area_jan/jan_19/jan_19_1_music.c b/src/world/area_jan/jan_19/music.c
similarity index 100%
rename from src/world/area_jan/jan_19/jan_19_1_music.c
rename to src/world/area_jan/jan_19/music.c
diff --git a/src/world/area_jan/jan_19/jan_19_0_header.c b/src/world/area_jan/jan_19/settings.c
similarity index 100%
rename from src/world/area_jan/jan_19/jan_19_0_header.c
rename to src/world/area_jan/jan_19/settings.c
diff --git a/src/world/area_jan/jan_22/jan_22_6_bushes.c b/src/world/area_jan/jan_22/bushes.c
similarity index 100%
rename from src/world/area_jan/jan_22/jan_22_6_bushes.c
rename to src/world/area_jan/jan_22/bushes.c
diff --git a/src/world/area_jan/jan_22/jan_22_4_entity.c b/src/world/area_jan/jan_22/entity.c
similarity index 100%
rename from src/world/area_jan/jan_22/jan_22_4_entity.c
rename to src/world/area_jan/jan_22/entity.c
diff --git a/src/world/area_jan/jan_22/jan_22_2_main.c b/src/world/area_jan/jan_22/main.c
similarity index 100%
rename from src/world/area_jan/jan_22/jan_22_2_main.c
rename to src/world/area_jan/jan_22/main.c
diff --git a/src/world/area_jan/jan_22/jan_22_1_music.c b/src/world/area_jan/jan_22/music.c
similarity index 100%
rename from src/world/area_jan/jan_22/jan_22_1_music.c
rename to src/world/area_jan/jan_22/music.c
diff --git a/src/world/area_jan/jan_22/jan_22_3_npc.c b/src/world/area_jan/jan_22/npc.c
similarity index 100%
rename from src/world/area_jan/jan_22/jan_22_3_npc.c
rename to src/world/area_jan/jan_22/npc.c
diff --git a/src/world/area_jan/jan_22/jan_22_0_header.c b/src/world/area_jan/jan_22/settings.c
similarity index 100%
rename from src/world/area_jan/jan_22/jan_22_0_header.c
rename to src/world/area_jan/jan_22/settings.c
diff --git a/src/world/area_jan/jan_22/jan_22_7_trees.c b/src/world/area_jan/jan_22/trees.c
similarity index 100%
rename from src/world/area_jan/jan_22/jan_22_7_trees.c
rename to src/world/area_jan/jan_22/trees.c
diff --git a/src/world/area_jan/jan_22/jan_22_5_zipline.c b/src/world/area_jan/jan_22/zipline.c
similarity index 100%
rename from src/world/area_jan/jan_22/jan_22_5_zipline.c
rename to src/world/area_jan/jan_22/zipline.c
diff --git a/src/world/area_jan/jan_23/jan_23_2_main.c b/src/world/area_jan/jan_23/main.c
similarity index 100%
rename from src/world/area_jan/jan_23/jan_23_2_main.c
rename to src/world/area_jan/jan_23/main.c
diff --git a/src/world/area_jan/jan_23/jan_23_1_music.c b/src/world/area_jan/jan_23/music.c
similarity index 100%
rename from src/world/area_jan/jan_23/jan_23_1_music.c
rename to src/world/area_jan/jan_23/music.c
diff --git a/src/world/area_jan/jan_23/jan_23_3_npc.c b/src/world/area_jan/jan_23/npc.c
similarity index 100%
rename from src/world/area_jan/jan_23/jan_23_3_npc.c
rename to src/world/area_jan/jan_23/npc.c
diff --git a/src/world/area_jan/jan_23/jan_23_0_header.c b/src/world/area_jan/jan_23/settings.c
similarity index 100%
rename from src/world/area_jan/jan_23/jan_23_0_header.c
rename to src/world/area_jan/jan_23/settings.c
diff --git a/src/world/area_kgr/kgr_01/kgr_01_3_extra.c b/src/world/area_kgr/kgr_01/extra.c
similarity index 100%
rename from src/world/area_kgr/kgr_01/kgr_01_3_extra.c
rename to src/world/area_kgr/kgr_01/extra.c
diff --git a/src/world/area_kgr/kgr_01/kgr_01_1_main.c b/src/world/area_kgr/kgr_01/main.c
similarity index 100%
rename from src/world/area_kgr/kgr_01/kgr_01_1_main.c
rename to src/world/area_kgr/kgr_01/main.c
diff --git a/src/world/area_kgr/kgr_01/kgr_01_2_wiggle.c b/src/world/area_kgr/kgr_01/wiggle.c
similarity index 100%
rename from src/world/area_kgr/kgr_01/kgr_01_2_wiggle.c
rename to src/world/area_kgr/kgr_01/wiggle.c
diff --git a/src/world/area_kgr/kgr_02/kgr_02_4_extra.c b/src/world/area_kgr/kgr_02/extra.c
similarity index 100%
rename from src/world/area_kgr/kgr_02/kgr_02_4_extra.c
rename to src/world/area_kgr/kgr_02/extra.c
diff --git a/src/world/area_kgr/kgr_02/kgr_02_1_main.c b/src/world/area_kgr/kgr_02/main.c
similarity index 100%
rename from src/world/area_kgr/kgr_02/kgr_02_1_main.c
rename to src/world/area_kgr/kgr_02/main.c
diff --git a/src/world/area_kgr/kgr_02/kgr_02_3_npc.c b/src/world/area_kgr/kgr_02/npc.c
similarity index 100%
rename from src/world/area_kgr/kgr_02/kgr_02_3_npc.c
rename to src/world/area_kgr/kgr_02/npc.c
diff --git a/src/world/area_kgr/kgr_02/kgr_02_2_unused.c b/src/world/area_kgr/kgr_02/unused.c
similarity index 100%
rename from src/world/area_kgr/kgr_02/kgr_02_2_unused.c
rename to src/world/area_kgr/kgr_02/unused.c
diff --git a/src/world/area_kkj/kkj_00/kkj_00_2_main.c b/src/world/area_kkj/kkj_00/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_00/kkj_00_2_main.c
rename to src/world/area_kkj/kkj_00/main.c
diff --git a/src/world/area_kkj/kkj_00/kkj_00_1_music.c b/src/world/area_kkj/kkj_00/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_00/kkj_00_1_music.c
rename to src/world/area_kkj/kkj_00/music.c
diff --git a/src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c b/src/world/area_kkj/kkj_00/npc_ending.c
similarity index 100%
rename from src/world/area_kkj/kkj_00/kkj_00_5_npc_ending.c
rename to src/world/area_kkj/kkj_00/npc_ending.c
diff --git a/src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c b/src/world/area_kkj/kkj_00/npc_intro.c
similarity index 100%
rename from src/world/area_kkj/kkj_00/kkj_00_3_npc_intro.c
rename to src/world/area_kkj/kkj_00/npc_intro.c
diff --git a/src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c b/src/world/area_kkj/kkj_00/scene_ending.c
similarity index 100%
rename from src/world/area_kkj/kkj_00/kkj_00_6_scene_ending.c
rename to src/world/area_kkj/kkj_00/scene_ending.c
diff --git a/src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c b/src/world/area_kkj/kkj_00/scene_intro.c
similarity index 100%
rename from src/world/area_kkj/kkj_00/kkj_00_4_scene_intro.c
rename to src/world/area_kkj/kkj_00/scene_intro.c
diff --git a/src/world/area_kkj/kkj_00/kkj_00_0_header.c b/src/world/area_kkj/kkj_00/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_00/kkj_00_0_header.c
rename to src/world/area_kkj/kkj_00/settings.c
diff --git a/src/world/area_kkj/kkj_01/kkj_01_2_main.c b/src/world/area_kkj/kkj_01/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_01/kkj_01_2_main.c
rename to src/world/area_kkj/kkj_01/main.c
diff --git a/src/world/area_kkj/kkj_01/kkj_01_1_music.c b/src/world/area_kkj/kkj_01/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_01/kkj_01_1_music.c
rename to src/world/area_kkj/kkj_01/music.c
diff --git a/src/world/area_kkj/kkj_01/kkj_01_3_npc.c b/src/world/area_kkj/kkj_01/npc.c
similarity index 100%
rename from src/world/area_kkj/kkj_01/kkj_01_3_npc.c
rename to src/world/area_kkj/kkj_01/npc.c
diff --git a/src/world/area_kkj/kkj_01/kkj_01_0_header.c b/src/world/area_kkj/kkj_01/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_01/kkj_01_0_header.c
rename to src/world/area_kkj/kkj_01/settings.c
diff --git a/src/world/area_kkj/kkj_02/kkj_02_2_main.c b/src/world/area_kkj/kkj_02/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_02/kkj_02_2_main.c
rename to src/world/area_kkj/kkj_02/main.c
diff --git a/src/world/area_kkj/kkj_02/kkj_02_1_music.c b/src/world/area_kkj/kkj_02/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_02/kkj_02_1_music.c
rename to src/world/area_kkj/kkj_02/music.c
diff --git a/src/world/area_kkj/kkj_02/kkj_02_3_npc.c b/src/world/area_kkj/kkj_02/npc.c
similarity index 100%
rename from src/world/area_kkj/kkj_02/kkj_02_3_npc.c
rename to src/world/area_kkj/kkj_02/npc.c
diff --git a/src/world/area_kkj/kkj_02/kkj_02_0_header.c b/src/world/area_kkj/kkj_02/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_02/kkj_02_0_header.c
rename to src/world/area_kkj/kkj_02/settings.c
diff --git a/src/world/area_kkj/kkj_03/kkj_03_2_main.c b/src/world/area_kkj/kkj_03/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_03/kkj_03_2_main.c
rename to src/world/area_kkj/kkj_03/main.c
diff --git a/src/world/area_kkj/kkj_03/kkj_03_1_music.c b/src/world/area_kkj/kkj_03/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_03/kkj_03_1_music.c
rename to src/world/area_kkj/kkj_03/music.c
diff --git a/src/world/area_kkj/kkj_03/kkj_03_3_npc.c b/src/world/area_kkj/kkj_03/npc.c
similarity index 100%
rename from src/world/area_kkj/kkj_03/kkj_03_3_npc.c
rename to src/world/area_kkj/kkj_03/npc.c
diff --git a/src/world/area_kkj/kkj_03/kkj_03_4_scenes.c b/src/world/area_kkj/kkj_03/scenes.c
similarity index 100%
rename from src/world/area_kkj/kkj_03/kkj_03_4_scenes.c
rename to src/world/area_kkj/kkj_03/scenes.c
diff --git a/src/world/area_kkj/kkj_03/kkj_03_0_header.c b/src/world/area_kkj/kkj_03/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_03/kkj_03_0_header.c
rename to src/world/area_kkj/kkj_03/settings.c
diff --git a/src/world/area_kkj/kkj_10/kkj_10_2_entity.c b/src/world/area_kkj/kkj_10/entity.c
similarity index 100%
rename from src/world/area_kkj/kkj_10/kkj_10_2_entity.c
rename to src/world/area_kkj/kkj_10/entity.c
diff --git a/src/world/area_kkj/kkj_10/kkj_10_1_main.c b/src/world/area_kkj/kkj_10/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_10/kkj_10_1_main.c
rename to src/world/area_kkj/kkj_10/main.c
diff --git a/src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c b/src/world/area_kkj/kkj_10/npcs_early.c
similarity index 100%
rename from src/world/area_kkj/kkj_10/kkj_10_3_npcs_early.c
rename to src/world/area_kkj/kkj_10/npcs_early.c
diff --git a/src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c b/src/world/area_kkj/kkj_10/npcs_later.c
similarity index 100%
rename from src/world/area_kkj/kkj_10/kkj_10_4_npcs_later.c
rename to src/world/area_kkj/kkj_10/npcs_later.c
diff --git a/src/world/area_kkj/kkj_10/kkj_10_0_header.c b/src/world/area_kkj/kkj_10/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_10/kkj_10_0_header.c
rename to src/world/area_kkj/kkj_10/settings.c
diff --git a/src/world/area_kkj/kkj_11/kkj_11_4_demo.c b/src/world/area_kkj/kkj_11/demo.c
similarity index 100%
rename from src/world/area_kkj/kkj_11/kkj_11_4_demo.c
rename to src/world/area_kkj/kkj_11/demo.c
diff --git a/src/world/area_kkj/kkj_11/kkj_11_2_entity.c b/src/world/area_kkj/kkj_11/entity.c
similarity index 100%
rename from src/world/area_kkj/kkj_11/kkj_11_2_entity.c
rename to src/world/area_kkj/kkj_11/entity.c
diff --git a/src/world/area_kkj/kkj_11/kkj_11_1_main.c b/src/world/area_kkj/kkj_11/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_11/kkj_11_1_main.c
rename to src/world/area_kkj/kkj_11/main.c
diff --git a/src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c b/src/world/area_kkj/kkj_11/npcs_early.c
similarity index 100%
rename from src/world/area_kkj/kkj_11/kkj_11_5_npcs_early.c
rename to src/world/area_kkj/kkj_11/npcs_early.c
diff --git a/src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c b/src/world/area_kkj/kkj_11/npcs_later.c
similarity index 100%
rename from src/world/area_kkj/kkj_11/kkj_11_6_npcs_later.c
rename to src/world/area_kkj/kkj_11/npcs_later.c
diff --git a/src/world/area_kkj/kkj_11/kkj_11_3_scene.c b/src/world/area_kkj/kkj_11/scene.c
similarity index 100%
rename from src/world/area_kkj/kkj_11/kkj_11_3_scene.c
rename to src/world/area_kkj/kkj_11/scene.c
diff --git a/src/world/area_kkj/kkj_11/kkj_11_0_header.c b/src/world/area_kkj/kkj_11/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_11/kkj_11_0_header.c
rename to src/world/area_kkj/kkj_11/settings.c
diff --git a/src/world/area_kkj/kkj_12/kkj_12_1_main.c b/src/world/area_kkj/kkj_12/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_12/kkj_12_1_main.c
rename to src/world/area_kkj/kkj_12/main.c
diff --git a/src/world/area_kkj/kkj_12/kkj_12_2_npc.c b/src/world/area_kkj/kkj_12/npc.c
similarity index 100%
rename from src/world/area_kkj/kkj_12/kkj_12_2_npc.c
rename to src/world/area_kkj/kkj_12/npc.c
diff --git a/src/world/area_kkj/kkj_12/kkj_12_0_header.c b/src/world/area_kkj/kkj_12/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_12/kkj_12_0_header.c
rename to src/world/area_kkj/kkj_12/settings.c
diff --git a/src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c b/src/world/area_kkj/kkj_13/intro_scenes.c
similarity index 100%
rename from src/world/area_kkj/kkj_13/kkj_13_5_intro_scenes.c
rename to src/world/area_kkj/kkj_13/intro_scenes.c
diff --git a/src/world/area_kkj/kkj_13/kkj_13_2_main.c b/src/world/area_kkj/kkj_13/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_13/kkj_13_2_main.c
rename to src/world/area_kkj/kkj_13/main.c
diff --git a/src/world/area_kkj/kkj_13/kkj_13_1_music.c b/src/world/area_kkj/kkj_13/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_13/kkj_13_1_music.c
rename to src/world/area_kkj/kkj_13/music.c
diff --git a/src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c b/src/world/area_kkj/kkj_13/npcs_finale.c
similarity index 100%
rename from src/world/area_kkj/kkj_13/kkj_13_3_npcs_finale.c
rename to src/world/area_kkj/kkj_13/npcs_finale.c
diff --git a/src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c b/src/world/area_kkj/kkj_13/npcs_intro.c
similarity index 100%
rename from src/world/area_kkj/kkj_13/kkj_13_4_npcs_intro.c
rename to src/world/area_kkj/kkj_13/npcs_intro.c
diff --git a/src/world/area_kkj/kkj_13/kkj_13_0_header.c b/src/world/area_kkj/kkj_13/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_13/kkj_13_0_header.c
rename to src/world/area_kkj/kkj_13/settings.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c b/src/world/area_kkj/kkj_14/chapter0.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_8_chapter0.c
rename to src/world/area_kkj/kkj_14/chapter0.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c b/src/world/area_kkj/kkj_14/chapter1.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_9_chapter1.c
rename to src/world/area_kkj/kkj_14/chapter1.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c b/src/world/area_kkj/kkj_14/chapter2.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_10_chapter2.c
rename to src/world/area_kkj/kkj_14/chapter2.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c b/src/world/area_kkj/kkj_14/chapter3.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_11_chapter3.c
rename to src/world/area_kkj/kkj_14/chapter3.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c b/src/world/area_kkj/kkj_14/chapter4.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_12_chapter4.c
rename to src/world/area_kkj/kkj_14/chapter4.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c b/src/world/area_kkj/kkj_14/chapter5.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_13_chapter5.c
rename to src/world/area_kkj/kkj_14/chapter5.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c b/src/world/area_kkj/kkj_14/chapter6.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_14_chapter6.c
rename to src/world/area_kkj/kkj_14/chapter6.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c b/src/world/area_kkj/kkj_14/chapter7.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_15_chapter7.c
rename to src/world/area_kkj/kkj_14/chapter7.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_3_interactables.c b/src/world/area_kkj/kkj_14/interactables.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_3_interactables.c
rename to src/world/area_kkj/kkj_14/interactables.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_2_main.c b/src/world/area_kkj/kkj_14/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_2_main.c
rename to src/world/area_kkj/kkj_14/main.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_1_music.c b/src/world/area_kkj/kkj_14/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_1_music.c
rename to src/world/area_kkj/kkj_14/music.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c b/src/world/area_kkj/kkj_14/npc_ch0.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_5_npc_ch0.c
rename to src/world/area_kkj/kkj_14/npc_ch0.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c b/src/world/area_kkj/kkj_14/npc_ch2.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_6_npc_ch2.c
rename to src/world/area_kkj/kkj_14/npc_ch2.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c b/src/world/area_kkj/kkj_14/npc_ch7.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_7_npc_ch7.c
rename to src/world/area_kkj/kkj_14/npc_ch7.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c b/src/world/area_kkj/kkj_14/npc_guards.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_4_npc_guards.c
rename to src/world/area_kkj/kkj_14/npc_guards.c
diff --git a/src/world/area_kkj/kkj_14/kkj_14_0_header.c b/src/world/area_kkj/kkj_14/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_14/kkj_14_0_header.c
rename to src/world/area_kkj/kkj_14/settings.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c b/src/world/area_kkj/kkj_15/chapter0.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_4_chapter0.c
rename to src/world/area_kkj/kkj_15/chapter0.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c b/src/world/area_kkj/kkj_15/chapter1.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_5_chapter1.c
rename to src/world/area_kkj/kkj_15/chapter1.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_6_chapter2.c b/src/world/area_kkj/kkj_15/chapter2.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_6_chapter2.c
rename to src/world/area_kkj/kkj_15/chapter2.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c b/src/world/area_kkj/kkj_15/chapter3.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_7_chapter3.c
rename to src/world/area_kkj/kkj_15/chapter3.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_2_main.c b/src/world/area_kkj/kkj_15/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_2_main.c
rename to src/world/area_kkj/kkj_15/main.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_1_music.c b/src/world/area_kkj/kkj_15/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_1_music.c
rename to src/world/area_kkj/kkj_15/music.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c b/src/world/area_kkj/kkj_15/npc_chapter0.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_8_npc_chapter0.c
rename to src/world/area_kkj/kkj_15/npc_chapter0.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c b/src/world/area_kkj/kkj_15/npc_chapter1.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_9_npc_chapter1.c
rename to src/world/area_kkj/kkj_15/npc_chapter1.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c b/src/world/area_kkj/kkj_15/npc_chapter3.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_10_npc_chapter3.c
rename to src/world/area_kkj/kkj_15/npc_chapter3.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c b/src/world/area_kkj/kkj_15/rotating_wall.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_3_rotating_wall.c
rename to src/world/area_kkj/kkj_15/rotating_wall.c
diff --git a/src/world/area_kkj/kkj_15/kkj_15_0_header.c b/src/world/area_kkj/kkj_15/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_15/kkj_15_0_header.c
rename to src/world/area_kkj/kkj_15/settings.c
diff --git a/src/world/area_kkj/kkj_16/kkj_16_5_entity.c b/src/world/area_kkj/kkj_16/entity.c
similarity index 100%
rename from src/world/area_kkj/kkj_16/kkj_16_5_entity.c
rename to src/world/area_kkj/kkj_16/entity.c
diff --git a/src/world/area_kkj/kkj_16/kkj_16_1_main.c b/src/world/area_kkj/kkj_16/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_16/kkj_16_1_main.c
rename to src/world/area_kkj/kkj_16/main.c
diff --git a/src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c b/src/world/area_kkj/kkj_16/npcs_early.c
similarity index 100%
rename from src/world/area_kkj/kkj_16/kkj_16_2_npcs_early.c
rename to src/world/area_kkj/kkj_16/npcs_early.c
diff --git a/src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c b/src/world/area_kkj/kkj_16/npcs_later.c
similarity index 100%
rename from src/world/area_kkj/kkj_16/kkj_16_3_npcs_later.c
rename to src/world/area_kkj/kkj_16/npcs_later.c
diff --git a/src/world/area_kkj/kkj_16/kkj_16_0_header.c b/src/world/area_kkj/kkj_16/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_16/kkj_16_0_header.c
rename to src/world/area_kkj/kkj_16/settings.c
diff --git a/src/world/area_kkj/kkj_16/kkj_16_4_stealth.c b/src/world/area_kkj/kkj_16/stealth.c
similarity index 100%
rename from src/world/area_kkj/kkj_16/kkj_16_4_stealth.c
rename to src/world/area_kkj/kkj_16/stealth.c
diff --git a/src/world/area_kkj/kkj_17/kkj_17_3_chest.c b/src/world/area_kkj/kkj_17/chest.c
similarity index 100%
rename from src/world/area_kkj/kkj_17/kkj_17_3_chest.c
rename to src/world/area_kkj/kkj_17/chest.c
diff --git a/src/world/area_kkj/kkj_17/kkj_17_2_entity.c b/src/world/area_kkj/kkj_17/entity.c
similarity index 100%
rename from src/world/area_kkj/kkj_17/kkj_17_2_entity.c
rename to src/world/area_kkj/kkj_17/entity.c
diff --git a/src/world/area_kkj/kkj_17/kkj_17_1_main.c b/src/world/area_kkj/kkj_17/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_17/kkj_17_1_main.c
rename to src/world/area_kkj/kkj_17/main.c
diff --git a/src/world/area_kkj/kkj_17/kkj_17_0_header.c b/src/world/area_kkj/kkj_17/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_17/kkj_17_0_header.c
rename to src/world/area_kkj/kkj_17/settings.c
diff --git a/src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c b/src/world/area_kkj/kkj_18/gourmet.c
similarity index 100%
rename from src/world/area_kkj/kkj_18/kkj_18_4_gourmet.c
rename to src/world/area_kkj/kkj_18/gourmet.c
diff --git a/src/world/area_kkj/kkj_18/kkj_18_2_main.c b/src/world/area_kkj/kkj_18/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_18/kkj_18_2_main.c
rename to src/world/area_kkj/kkj_18/main.c
diff --git a/src/world/area_kkj/kkj_18/kkj_18_1_music.c b/src/world/area_kkj/kkj_18/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_18/kkj_18_1_music.c
rename to src/world/area_kkj/kkj_18/music.c
diff --git a/src/world/area_kkj/kkj_18/kkj_18_3_npc.c b/src/world/area_kkj/kkj_18/npc.c
similarity index 100%
rename from src/world/area_kkj/kkj_18/kkj_18_3_npc.c
rename to src/world/area_kkj/kkj_18/npc.c
diff --git a/src/world/area_kkj/kkj_18/kkj_18_0_header.c b/src/world/area_kkj/kkj_18/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_18/kkj_18_0_header.c
rename to src/world/area_kkj/kkj_18/settings.c
diff --git a/src/world/area_kkj/kkj_19/kkj_19_5_baking.c b/src/world/area_kkj/kkj_19/baking.c
similarity index 100%
rename from src/world/area_kkj/kkj_19/kkj_19_5_baking.c
rename to src/world/area_kkj/kkj_19/baking.c
diff --git a/src/world/area_kkj/kkj_19/kkj_19_2_main.c b/src/world/area_kkj/kkj_19/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_19/kkj_19_2_main.c
rename to src/world/area_kkj/kkj_19/main.c
diff --git a/src/world/area_kkj/kkj_19/kkj_19_1_music.c b/src/world/area_kkj/kkj_19/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_19/kkj_19_1_music.c
rename to src/world/area_kkj/kkj_19/music.c
diff --git a/src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c b/src/world/area_kkj/kkj_19/npcs_intro.c
similarity index 100%
rename from src/world/area_kkj/kkj_19/kkj_19_3_npcs_intro.c
rename to src/world/area_kkj/kkj_19/npcs_intro.c
diff --git a/src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c b/src/world/area_kkj/kkj_19/npcs_peach.c
similarity index 100%
rename from src/world/area_kkj/kkj_19/kkj_19_4_npcs_peach.c
rename to src/world/area_kkj/kkj_19/npcs_peach.c
diff --git a/src/world/area_kkj/kkj_19/kkj_19_0_header.c b/src/world/area_kkj/kkj_19/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_19/kkj_19_0_header.c
rename to src/world/area_kkj/kkj_19/settings.c
diff --git a/src/world/area_kkj/kkj_20/kkj_20_3_entity.c b/src/world/area_kkj/kkj_20/entity.c
similarity index 100%
rename from src/world/area_kkj/kkj_20/kkj_20_3_entity.c
rename to src/world/area_kkj/kkj_20/entity.c
diff --git a/src/world/area_kkj/kkj_20/kkj_20_2_main.c b/src/world/area_kkj/kkj_20/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_20/kkj_20_2_main.c
rename to src/world/area_kkj/kkj_20/main.c
diff --git a/src/world/area_kkj/kkj_20/kkj_20_1_music.c b/src/world/area_kkj/kkj_20/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_20/kkj_20_1_music.c
rename to src/world/area_kkj/kkj_20/music.c
diff --git a/src/world/area_kkj/kkj_20/kkj_20_4_npc.c b/src/world/area_kkj/kkj_20/npc.c
similarity index 100%
rename from src/world/area_kkj/kkj_20/kkj_20_4_npc.c
rename to src/world/area_kkj/kkj_20/npc.c
diff --git a/src/world/area_kkj/kkj_20/kkj_20_0_header.c b/src/world/area_kkj/kkj_20/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_20/kkj_20_0_header.c
rename to src/world/area_kkj/kkj_20/settings.c
diff --git a/src/world/area_kkj/kkj_21/kkj_21_1_main.c b/src/world/area_kkj/kkj_21/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_21/kkj_21_1_main.c
rename to src/world/area_kkj/kkj_21/main.c
diff --git a/src/world/area_kkj/kkj_21/kkj_21_0_header.c b/src/world/area_kkj/kkj_21/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_21/kkj_21_0_header.c
rename to src/world/area_kkj/kkj_21/settings.c
diff --git a/src/world/area_kkj/kkj_22/kkj_22_2_main.c b/src/world/area_kkj/kkj_22/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_22/kkj_22_2_main.c
rename to src/world/area_kkj/kkj_22/main.c
diff --git a/src/world/area_kkj/kkj_22/kkj_22_1_music.c b/src/world/area_kkj/kkj_22/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_22/kkj_22_1_music.c
rename to src/world/area_kkj/kkj_22/music.c
diff --git a/src/world/area_kkj/kkj_22/kkj_22_0_header.c b/src/world/area_kkj/kkj_22/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_22/kkj_22_0_header.c
rename to src/world/area_kkj/kkj_22/settings.c
diff --git a/src/world/area_kkj/kkj_23/kkj_23_2_main.c b/src/world/area_kkj/kkj_23/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_23/kkj_23_2_main.c
rename to src/world/area_kkj/kkj_23/main.c
diff --git a/src/world/area_kkj/kkj_23/kkj_23_1_music.c b/src/world/area_kkj/kkj_23/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_23/kkj_23_1_music.c
rename to src/world/area_kkj/kkj_23/music.c
diff --git a/src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c b/src/world/area_kkj/kkj_23/npcs_finale.c
similarity index 100%
rename from src/world/area_kkj/kkj_23/kkj_23_3_npcs_finale.c
rename to src/world/area_kkj/kkj_23/npcs_finale.c
diff --git a/src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c b/src/world/area_kkj/kkj_23/npcs_peach.c
similarity index 100%
rename from src/world/area_kkj/kkj_23/kkj_23_4_npcs_peach.c
rename to src/world/area_kkj/kkj_23/npcs_peach.c
diff --git a/src/world/area_kkj/kkj_23/kkj_23_5_scene.c b/src/world/area_kkj/kkj_23/scene.c
similarity index 100%
rename from src/world/area_kkj/kkj_23/kkj_23_5_scene.c
rename to src/world/area_kkj/kkj_23/scene.c
diff --git a/src/world/area_kkj/kkj_23/kkj_23_0_header.c b/src/world/area_kkj/kkj_23/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_23/kkj_23_0_header.c
rename to src/world/area_kkj/kkj_23/settings.c
diff --git a/src/world/area_kkj/kkj_24/kkj_24_3_entity.c b/src/world/area_kkj/kkj_24/entity.c
similarity index 100%
rename from src/world/area_kkj/kkj_24/kkj_24_3_entity.c
rename to src/world/area_kkj/kkj_24/entity.c
diff --git a/src/world/area_kkj/kkj_24/kkj_24_2_main.c b/src/world/area_kkj/kkj_24/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_24/kkj_24_2_main.c
rename to src/world/area_kkj/kkj_24/main.c
diff --git a/src/world/area_kkj/kkj_24/kkj_24_1_music.c b/src/world/area_kkj/kkj_24/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_24/kkj_24_1_music.c
rename to src/world/area_kkj/kkj_24/music.c
diff --git a/src/world/area_kkj/kkj_24/kkj_24_0_header.c b/src/world/area_kkj/kkj_24/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_24/kkj_24_0_header.c
rename to src/world/area_kkj/kkj_24/settings.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_5_arena.c b/src/world/area_kkj/kkj_25/arena.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_5_arena.c
rename to src/world/area_kkj/kkj_25/arena.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c b/src/world/area_kkj/kkj_25/bowser_defeated.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_8_bowser_defeated.c
rename to src/world/area_kkj/kkj_25/bowser_defeated.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_9_entity.c b/src/world/area_kkj/kkj_25/entity.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_9_entity.c
rename to src/world/area_kkj/kkj_25/entity.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c b/src/world/area_kkj/kkj_25/kammy_defeated.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_7_kammy_defeated.c
rename to src/world/area_kkj/kkj_25/kammy_defeated.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_1_main.c b/src/world/area_kkj/kkj_25/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_1_main.c
rename to src/world/area_kkj/kkj_25/main.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c b/src/world/area_kkj/kkj_25/npc_final.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_4_npc_final.c
rename to src/world/area_kkj/kkj_25/npc_final.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c b/src/world/area_kkj/kkj_25/npc_initial.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_2_npc_initial.c
rename to src/world/area_kkj/kkj_25/npc_initial.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c b/src/world/area_kkj/kkj_25/npc_midpoint.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_3_npc_midpoint.c
rename to src/world/area_kkj/kkj_25/npc_midpoint.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c b/src/world/area_kkj/kkj_25/peach_free.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_6_peach_free.c
rename to src/world/area_kkj/kkj_25/peach_free.c
diff --git a/src/world/area_kkj/kkj_25/kkj_25_0_header.c b/src/world/area_kkj/kkj_25/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_25/kkj_25_0_header.c
rename to src/world/area_kkj/kkj_25/settings.c
diff --git a/src/world/area_kkj/kkj_26/kkj_26_3_demo.c b/src/world/area_kkj/kkj_26/demo.c
similarity index 100%
rename from src/world/area_kkj/kkj_26/kkj_26_3_demo.c
rename to src/world/area_kkj/kkj_26/demo.c
diff --git a/src/world/area_kkj/kkj_26/kkj_26_1_main.c b/src/world/area_kkj/kkj_26/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_26/kkj_26_1_main.c
rename to src/world/area_kkj/kkj_26/main.c
diff --git a/src/world/area_kkj/kkj_26/kkj_26_2_scenes.c b/src/world/area_kkj/kkj_26/scenes.c
similarity index 100%
rename from src/world/area_kkj/kkj_26/kkj_26_2_scenes.c
rename to src/world/area_kkj/kkj_26/scenes.c
diff --git a/src/world/area_kkj/kkj_26/kkj_26_0_header.c b/src/world/area_kkj/kkj_26/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_26/kkj_26_0_header.c
rename to src/world/area_kkj/kkj_26/settings.c
diff --git a/src/world/area_kkj/kkj_27/kkj_27_2_main.c b/src/world/area_kkj/kkj_27/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_27/kkj_27_2_main.c
rename to src/world/area_kkj/kkj_27/main.c
diff --git a/src/world/area_kkj/kkj_27/kkj_27_1_music.c b/src/world/area_kkj/kkj_27/music.c
similarity index 100%
rename from src/world/area_kkj/kkj_27/kkj_27_1_music.c
rename to src/world/area_kkj/kkj_27/music.c
diff --git a/src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c b/src/world/area_kkj/kkj_27/rotating_wall.c
similarity index 100%
rename from src/world/area_kkj/kkj_27/kkj_27_3_rotating_wall.c
rename to src/world/area_kkj/kkj_27/rotating_wall.c
diff --git a/src/world/area_kkj/kkj_27/kkj_27_0_header.c b/src/world/area_kkj/kkj_27/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_27/kkj_27_0_header.c
rename to src/world/area_kkj/kkj_27/settings.c
diff --git a/src/world/area_kkj/kkj_28/kkj_28_1_main.c b/src/world/area_kkj/kkj_28/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_28/kkj_28_1_main.c
rename to src/world/area_kkj/kkj_28/main.c
diff --git a/src/world/area_kkj/kkj_28/kkj_28_0_header.c b/src/world/area_kkj/kkj_28/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_28/kkj_28_0_header.c
rename to src/world/area_kkj/kkj_28/settings.c
diff --git a/src/world/area_kkj/kkj_29/kkj_29_1_main.c b/src/world/area_kkj/kkj_29/main.c
similarity index 100%
rename from src/world/area_kkj/kkj_29/kkj_29_1_main.c
rename to src/world/area_kkj/kkj_29/main.c
diff --git a/src/world/area_kkj/kkj_29/kkj_29_2_npc.c b/src/world/area_kkj/kkj_29/npc.c
similarity index 100%
rename from src/world/area_kkj/kkj_29/kkj_29_2_npc.c
rename to src/world/area_kkj/kkj_29/npc.c
diff --git a/src/world/area_kkj/kkj_29/kkj_29_3_quiz.c b/src/world/area_kkj/kkj_29/quiz.c
similarity index 100%
rename from src/world/area_kkj/kkj_29/kkj_29_3_quiz.c
rename to src/world/area_kkj/kkj_29/quiz.c
diff --git a/src/world/area_kkj/kkj_29/kkj_29_0_header.c b/src/world/area_kkj/kkj_29/settings.c
similarity index 100%
rename from src/world/area_kkj/kkj_29/kkj_29_0_header.c
rename to src/world/area_kkj/kkj_29/settings.c
diff --git a/src/world/area_kmr/kmr_00/kmr_00_5_entity.c b/src/world/area_kmr/kmr_00/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_00/kmr_00_5_entity.c
rename to src/world/area_kmr/kmr_00/entity.c
diff --git a/src/world/area_kmr/kmr_00/kmr_00_2_main.c b/src/world/area_kmr/kmr_00/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_00/kmr_00_2_main.c
rename to src/world/area_kmr/kmr_00/main.c
diff --git a/src/world/area_kmr/kmr_00/kmr_00_1_music.c b/src/world/area_kmr/kmr_00/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_00/kmr_00_1_music.c
rename to src/world/area_kmr/kmr_00/music.c
diff --git a/src/world/area_kmr/kmr_00/kmr_00_4_npc.c b/src/world/area_kmr/kmr_00/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_00/kmr_00_4_npc.c
rename to src/world/area_kmr/kmr_00/npc.c
diff --git a/src/world/area_kmr/kmr_00/kmr_00_3_revival.c b/src/world/area_kmr/kmr_00/revival.c
similarity index 100%
rename from src/world/area_kmr/kmr_00/kmr_00_3_revival.c
rename to src/world/area_kmr/kmr_00/revival.c
diff --git a/src/world/area_kmr/kmr_00/kmr_00_0_header.c b/src/world/area_kmr/kmr_00/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_00/kmr_00_0_header.c
rename to src/world/area_kmr/kmr_00/settings.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_5_entity.c b/src/world/area_kmr/kmr_02/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_5_entity.c
rename to src/world/area_kmr/kmr_02/entity.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_8_foliage.c b/src/world/area_kmr/kmr_02/foliage.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_8_foliage.c
rename to src/world/area_kmr/kmr_02/foliage.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_9_images.c b/src/world/area_kmr/kmr_02/images.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_9_images.c
rename to src/world/area_kmr/kmr_02/images.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_7_kammy.c b/src/world/area_kmr/kmr_02/kammy.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_7_kammy.c
rename to src/world/area_kmr/kmr_02/kammy.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_2_main.c b/src/world/area_kmr/kmr_02/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_2_main.c
rename to src/world/area_kmr/kmr_02/main.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_1_music.c b/src/world/area_kmr/kmr_02/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_1_music.c
rename to src/world/area_kmr/kmr_02/music.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_3_npc.c b/src/world/area_kmr/kmr_02/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_3_npc.c
rename to src/world/area_kmr/kmr_02/npc.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c b/src/world/area_kmr/kmr_02/rooms_1.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_4_rooms_1.c
rename to src/world/area_kmr/kmr_02/rooms_1.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c b/src/world/area_kmr/kmr_02/rooms_2.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_6_rooms_2.c
rename to src/world/area_kmr/kmr_02/rooms_2.c
diff --git a/src/world/area_kmr/kmr_02/kmr_02_0_header.c b/src/world/area_kmr/kmr_02/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_02/kmr_02_0_header.c
rename to src/world/area_kmr/kmr_02/settings.c
diff --git a/src/world/area_kmr/kmr_03/kmr_03_4_entity.c b/src/world/area_kmr/kmr_03/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_03/kmr_03_4_entity.c
rename to src/world/area_kmr/kmr_03/entity.c
diff --git a/src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c b/src/world/area_kmr/kmr_03/fall_down.c
similarity index 100%
rename from src/world/area_kmr/kmr_03/kmr_03_6_fall_down.c
rename to src/world/area_kmr/kmr_03/fall_down.c
diff --git a/src/world/area_kmr/kmr_03/kmr_03_5_foliage.c b/src/world/area_kmr/kmr_03/foliage.c
similarity index 100%
rename from src/world/area_kmr/kmr_03/kmr_03_5_foliage.c
rename to src/world/area_kmr/kmr_03/foliage.c
diff --git a/src/world/area_kmr/kmr_03/kmr_03_2_main.c b/src/world/area_kmr/kmr_03/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_03/kmr_03_2_main.c
rename to src/world/area_kmr/kmr_03/main.c
diff --git a/src/world/area_kmr/kmr_03/kmr_03_1_music.c b/src/world/area_kmr/kmr_03/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_03/kmr_03_1_music.c
rename to src/world/area_kmr/kmr_03/music.c
diff --git a/src/world/area_kmr/kmr_03/kmr_03_3_npc.c b/src/world/area_kmr/kmr_03/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_03/kmr_03_3_npc.c
rename to src/world/area_kmr/kmr_03/npc.c
diff --git a/src/world/area_kmr/kmr_03/kmr_03_0_header.c b/src/world/area_kmr/kmr_03/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_03/kmr_03_0_header.c
rename to src/world/area_kmr/kmr_03/settings.c
diff --git a/src/world/area_kmr/kmr_04/kmr_04_4_entity.c b/src/world/area_kmr/kmr_04/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_04/kmr_04_4_entity.c
rename to src/world/area_kmr/kmr_04/entity.c
diff --git a/src/world/area_kmr/kmr_04/kmr_04_5_foliage.c b/src/world/area_kmr/kmr_04/foliage.c
similarity index 100%
rename from src/world/area_kmr/kmr_04/kmr_04_5_foliage.c
rename to src/world/area_kmr/kmr_04/foliage.c
diff --git a/src/world/area_kmr/kmr_04/kmr_04_2_main.c b/src/world/area_kmr/kmr_04/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_04/kmr_04_2_main.c
rename to src/world/area_kmr/kmr_04/main.c
diff --git a/src/world/area_kmr/kmr_04/kmr_04_1_music.c b/src/world/area_kmr/kmr_04/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_04/kmr_04_1_music.c
rename to src/world/area_kmr/kmr_04/music.c
diff --git a/src/world/area_kmr/kmr_04/kmr_04_3_npc.c b/src/world/area_kmr/kmr_04/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_04/kmr_04_3_npc.c
rename to src/world/area_kmr/kmr_04/npc.c
diff --git a/src/world/area_kmr/kmr_04/kmr_04_0_header.c b/src/world/area_kmr/kmr_04/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_04/kmr_04_0_header.c
rename to src/world/area_kmr/kmr_04/settings.c
diff --git a/src/world/area_kmr/kmr_05/kmr_05_4_entity.c b/src/world/area_kmr/kmr_05/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_05/kmr_05_4_entity.c
rename to src/world/area_kmr/kmr_05/entity.c
diff --git a/src/world/area_kmr/kmr_05/kmr_05_5_foliage.c b/src/world/area_kmr/kmr_05/foliage.c
similarity index 100%
rename from src/world/area_kmr/kmr_05/kmr_05_5_foliage.c
rename to src/world/area_kmr/kmr_05/foliage.c
diff --git a/src/world/area_kmr/kmr_05/kmr_05_2_main.c b/src/world/area_kmr/kmr_05/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_05/kmr_05_2_main.c
rename to src/world/area_kmr/kmr_05/main.c
diff --git a/src/world/area_kmr/kmr_05/kmr_05_1_music.c b/src/world/area_kmr/kmr_05/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_05/kmr_05_1_music.c
rename to src/world/area_kmr/kmr_05/music.c
diff --git a/src/world/area_kmr/kmr_05/kmr_05_3_npc.c b/src/world/area_kmr/kmr_05/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_05/kmr_05_3_npc.c
rename to src/world/area_kmr/kmr_05/npc.c
diff --git a/src/world/area_kmr/kmr_05/kmr_05_0_header.c b/src/world/area_kmr/kmr_05/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_05/kmr_05_0_header.c
rename to src/world/area_kmr/kmr_05/settings.c
diff --git a/src/world/area_kmr/kmr_06/kmr_06_4_entity.c b/src/world/area_kmr/kmr_06/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_06/kmr_06_4_entity.c
rename to src/world/area_kmr/kmr_06/entity.c
diff --git a/src/world/area_kmr/kmr_06/kmr_06_2_main.c b/src/world/area_kmr/kmr_06/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_06/kmr_06_2_main.c
rename to src/world/area_kmr/kmr_06/main.c
diff --git a/src/world/area_kmr/kmr_06/kmr_06_1_music.c b/src/world/area_kmr/kmr_06/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_06/kmr_06_1_music.c
rename to src/world/area_kmr/kmr_06/music.c
diff --git a/src/world/area_kmr/kmr_06/kmr_06_3_npc.c b/src/world/area_kmr/kmr_06/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_06/kmr_06_3_npc.c
rename to src/world/area_kmr/kmr_06/npc.c
diff --git a/src/world/area_kmr/kmr_06/kmr_06_0_header.c b/src/world/area_kmr/kmr_06/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_06/kmr_06_0_header.c
rename to src/world/area_kmr/kmr_06/settings.c
diff --git a/src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c b/src/world/area_kmr/kmr_06/sticker_sign.c
similarity index 100%
rename from src/world/area_kmr/kmr_06/kmr_06_5_sticker_sign.c
rename to src/world/area_kmr/kmr_06/sticker_sign.c
diff --git a/src/world/area_kmr/kmr_07/kmr_07_4_entity.c b/src/world/area_kmr/kmr_07/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_07/kmr_07_4_entity.c
rename to src/world/area_kmr/kmr_07/entity.c
diff --git a/src/world/area_kmr/kmr_07/kmr_07_2_main.c b/src/world/area_kmr/kmr_07/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_07/kmr_07_2_main.c
rename to src/world/area_kmr/kmr_07/main.c
diff --git a/src/world/area_kmr/kmr_07/kmr_07_1_music.c b/src/world/area_kmr/kmr_07/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_07/kmr_07_1_music.c
rename to src/world/area_kmr/kmr_07/music.c
diff --git a/src/world/area_kmr/kmr_07/kmr_07_3_npc.c b/src/world/area_kmr/kmr_07/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_07/kmr_07_3_npc.c
rename to src/world/area_kmr/kmr_07/npc.c
diff --git a/src/world/area_kmr/kmr_07/kmr_07_0_header.c b/src/world/area_kmr/kmr_07/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_07/kmr_07_0_header.c
rename to src/world/area_kmr/kmr_07/settings.c
diff --git a/src/world/area_kmr/kmr_09/kmr_09_4_entity.c b/src/world/area_kmr/kmr_09/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_09/kmr_09_4_entity.c
rename to src/world/area_kmr/kmr_09/entity.c
diff --git a/src/world/area_kmr/kmr_09/kmr_09_2_main.c b/src/world/area_kmr/kmr_09/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_09/kmr_09_2_main.c
rename to src/world/area_kmr/kmr_09/main.c
diff --git a/src/world/area_kmr/kmr_09/kmr_09_1_music.c b/src/world/area_kmr/kmr_09/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_09/kmr_09_1_music.c
rename to src/world/area_kmr/kmr_09/music.c
diff --git a/src/world/area_kmr/kmr_09/kmr_09_3_npc.c b/src/world/area_kmr/kmr_09/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_09/kmr_09_3_npc.c
rename to src/world/area_kmr/kmr_09/npc.c
diff --git a/src/world/area_kmr/kmr_09/kmr_09_0_header.c b/src/world/area_kmr/kmr_09/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_09/kmr_09_0_header.c
rename to src/world/area_kmr/kmr_09/settings.c
diff --git a/src/world/area_kmr/kmr_10/kmr_10_4_entity.c b/src/world/area_kmr/kmr_10/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_10/kmr_10_4_entity.c
rename to src/world/area_kmr/kmr_10/entity.c
diff --git a/src/world/area_kmr/kmr_10/kmr_10_5_foliage.c b/src/world/area_kmr/kmr_10/foliage.c
similarity index 100%
rename from src/world/area_kmr/kmr_10/kmr_10_5_foliage.c
rename to src/world/area_kmr/kmr_10/foliage.c
diff --git a/src/world/area_kmr/kmr_10/kmr_10_2_main.c b/src/world/area_kmr/kmr_10/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_10/kmr_10_2_main.c
rename to src/world/area_kmr/kmr_10/main.c
diff --git a/src/world/area_kmr/kmr_10/kmr_10_1_music.c b/src/world/area_kmr/kmr_10/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_10/kmr_10_1_music.c
rename to src/world/area_kmr/kmr_10/music.c
diff --git a/src/world/area_kmr/kmr_10/kmr_10_3_npc.c b/src/world/area_kmr/kmr_10/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_10/kmr_10_3_npc.c
rename to src/world/area_kmr/kmr_10/npc.c
diff --git a/src/world/area_kmr/kmr_10/kmr_10_0_header.c b/src/world/area_kmr/kmr_10/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_10/kmr_10_0_header.c
rename to src/world/area_kmr/kmr_10/settings.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_11_bridge_animation.c b/src/world/area_kmr/kmr_11/bridge_animation.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_11_bridge_animation.c
rename to src/world/area_kmr/kmr_11/bridge_animation.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_10_bridge_skeleton.c b/src/world/area_kmr/kmr_11/bridge_skeleton.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_10_bridge_skeleton.c
rename to src/world/area_kmr/kmr_11/bridge_skeleton.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_5_entity.c b/src/world/area_kmr/kmr_11/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_5_entity.c
rename to src/world/area_kmr/kmr_11/entity.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_7_foliage.c b/src/world/area_kmr/kmr_11/foliage.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_7_foliage.c
rename to src/world/area_kmr/kmr_11/foliage.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_9_fortress_animation.c b/src/world/area_kmr/kmr_11/fortress_animation.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_9_fortress_animation.c
rename to src/world/area_kmr/kmr_11/fortress_animation.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_8_fortress_skeleton.c b/src/world/area_kmr/kmr_11/fortress_skeleton.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_8_fortress_skeleton.c
rename to src/world/area_kmr/kmr_11/fortress_skeleton.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_6_kammy.c b/src/world/area_kmr/kmr_11/kammy.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_6_kammy.c
rename to src/world/area_kmr/kmr_11/kammy.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_2_main.c b/src/world/area_kmr/kmr_11/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_2_main.c
rename to src/world/area_kmr/kmr_11/main.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_1_music.c b/src/world/area_kmr/kmr_11/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_1_music.c
rename to src/world/area_kmr/kmr_11/music.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_4_npc.c b/src/world/area_kmr/kmr_11/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_4_npc.c
rename to src/world/area_kmr/kmr_11/npc.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_3_scenes.c b/src/world/area_kmr/kmr_11/scenes.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_3_scenes.c
rename to src/world/area_kmr/kmr_11/scenes.c
diff --git a/src/world/area_kmr/kmr_11/kmr_11_0_header.c b/src/world/area_kmr/kmr_11/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_11/kmr_11_0_header.c
rename to src/world/area_kmr/kmr_11/settings.c
diff --git a/src/world/area_kmr/kmr_12/kmr_12_4_entity.c b/src/world/area_kmr/kmr_12/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_12/kmr_12_4_entity.c
rename to src/world/area_kmr/kmr_12/entity.c
diff --git a/src/world/area_kmr/kmr_12/kmr_12_2_main.c b/src/world/area_kmr/kmr_12/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_12/kmr_12_2_main.c
rename to src/world/area_kmr/kmr_12/main.c
diff --git a/src/world/area_kmr/kmr_12/kmr_12_1_music.c b/src/world/area_kmr/kmr_12/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_12/kmr_12_1_music.c
rename to src/world/area_kmr/kmr_12/music.c
diff --git a/src/world/area_kmr/kmr_12/kmr_12_3_npc.c b/src/world/area_kmr/kmr_12/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_12/kmr_12_3_npc.c
rename to src/world/area_kmr/kmr_12/npc.c
diff --git a/src/world/area_kmr/kmr_12/kmr_12_0_header.c b/src/world/area_kmr/kmr_12/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_12/kmr_12_0_header.c
rename to src/world/area_kmr/kmr_12/settings.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_8_bed.c b/src/world/area_kmr/kmr_20/bed.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_8_bed.c
rename to src/world/area_kmr/kmr_20/bed.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_7_bushes.c b/src/world/area_kmr/kmr_20/bushes.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_7_bushes.c
rename to src/world/area_kmr/kmr_20/bushes.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_4_documents.c b/src/world/area_kmr/kmr_20/documents.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_4_documents.c
rename to src/world/area_kmr/kmr_20/documents.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_5_entity.c b/src/world/area_kmr/kmr_20/entity.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_5_entity.c
rename to src/world/area_kmr/kmr_20/entity.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_2_main.c b/src/world/area_kmr/kmr_20/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_2_main.c
rename to src/world/area_kmr/kmr_20/main.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_1_music.c b/src/world/area_kmr/kmr_20/music.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_1_music.c
rename to src/world/area_kmr/kmr_20/music.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_10_npc.c b/src/world/area_kmr/kmr_20/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_10_npc.c
rename to src/world/area_kmr/kmr_20/npc.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c b/src/world/area_kmr/kmr_20/npc_epilogue.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_12_npc_epilogue.c
rename to src/world/area_kmr/kmr_20/npc_epilogue.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c b/src/world/area_kmr/kmr_20/npc_intro.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_11_npc_intro.c
rename to src/world/area_kmr/kmr_20/npc_intro.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c b/src/world/area_kmr/kmr_20/npc_scenes.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_9_npc_scenes.c
rename to src/world/area_kmr/kmr_20/npc_scenes.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_13_records.c b/src/world/area_kmr/kmr_20/records.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_13_records.c
rename to src/world/area_kmr/kmr_20/records.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_3_rooms.c b/src/world/area_kmr/kmr_20/rooms.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_3_rooms.c
rename to src/world/area_kmr/kmr_20/rooms.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_0_header.c b/src/world/area_kmr/kmr_20/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_0_header.c
rename to src/world/area_kmr/kmr_20/settings.c
diff --git a/src/world/area_kmr/kmr_20/kmr_20_6_trees.c b/src/world/area_kmr/kmr_20/trees.c
similarity index 100%
rename from src/world/area_kmr/kmr_20/kmr_20_6_trees.c
rename to src/world/area_kmr/kmr_20/trees.c
diff --git a/src/world/area_kmr/kmr_21/kmr_21_1_main.c b/src/world/area_kmr/kmr_21/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_21/kmr_21_1_main.c
rename to src/world/area_kmr/kmr_21/main.c
diff --git a/src/world/area_kmr/kmr_21/kmr_21_0_header.c b/src/world/area_kmr/kmr_21/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_21/kmr_21_0_header.c
rename to src/world/area_kmr/kmr_21/settings.c
diff --git a/src/world/area_kmr/kmr_22/kmr_22_1_main.c b/src/world/area_kmr/kmr_22/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_22/kmr_22_1_main.c
rename to src/world/area_kmr/kmr_22/main.c
diff --git a/src/world/area_kmr/kmr_22/kmr_22_2_npc.c b/src/world/area_kmr/kmr_22/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_22/kmr_22_2_npc.c
rename to src/world/area_kmr/kmr_22/npc.c
diff --git a/src/world/area_kmr/kmr_22/kmr_22_0_header.c b/src/world/area_kmr/kmr_22/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_22/kmr_22_0_header.c
rename to src/world/area_kmr/kmr_22/settings.c
diff --git a/src/world/area_kmr/kmr_23/kmr_23_1_main.c b/src/world/area_kmr/kmr_23/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_23/kmr_23_1_main.c
rename to src/world/area_kmr/kmr_23/main.c
diff --git a/src/world/area_kmr/kmr_23/kmr_23_2_npc.c b/src/world/area_kmr/kmr_23/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_23/kmr_23_2_npc.c
rename to src/world/area_kmr/kmr_23/npc.c
diff --git a/src/world/area_kmr/kmr_23/kmr_23_0_header.c b/src/world/area_kmr/kmr_23/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_23/kmr_23_0_header.c
rename to src/world/area_kmr/kmr_23/settings.c
diff --git a/src/world/area_kmr/kmr_24/kmr_24_1_main.c b/src/world/area_kmr/kmr_24/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_24/kmr_24_1_main.c
rename to src/world/area_kmr/kmr_24/main.c
diff --git a/src/world/area_kmr/kmr_24/kmr_24_0_header.c b/src/world/area_kmr/kmr_24/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_24/kmr_24_0_header.c
rename to src/world/area_kmr/kmr_24/settings.c
diff --git a/src/world/area_kmr/kmr_30/kmr_30_1_main.c b/src/world/area_kmr/kmr_30/main.c
similarity index 100%
rename from src/world/area_kmr/kmr_30/kmr_30_1_main.c
rename to src/world/area_kmr/kmr_30/main.c
diff --git a/src/world/area_kmr/kmr_30/kmr_30_2_npc.c b/src/world/area_kmr/kmr_30/npc.c
similarity index 100%
rename from src/world/area_kmr/kmr_30/kmr_30_2_npc.c
rename to src/world/area_kmr/kmr_30/npc.c
diff --git a/src/world/area_kmr/kmr_30/kmr_30_0_header.c b/src/world/area_kmr/kmr_30/settings.c
similarity index 100%
rename from src/world/area_kmr/kmr_30/kmr_30_0_header.c
rename to src/world/area_kmr/kmr_30/settings.c
diff --git a/src/world/area_kmr/kmr_30/kmr_30_3_the_end.c b/src/world/area_kmr/kmr_30/the_end.c
similarity index 100%
rename from src/world/area_kmr/kmr_30/kmr_30_3_the_end.c
rename to src/world/area_kmr/kmr_30/the_end.c
diff --git a/src/world/area_kpa/kpa_01/kpa_01_4_entity.c b/src/world/area_kpa/kpa_01/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_01/kpa_01_4_entity.c
rename to src/world/area_kpa/kpa_01/entity.c
diff --git a/src/world/area_kpa/kpa_01/kpa_01_2_main.c b/src/world/area_kpa/kpa_01/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_01/kpa_01_2_main.c
rename to src/world/area_kpa/kpa_01/main.c
diff --git a/src/world/area_kpa/kpa_01/kpa_01_1_music.c b/src/world/area_kpa/kpa_01/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_01/kpa_01_1_music.c
rename to src/world/area_kpa/kpa_01/music.c
diff --git a/src/world/area_kpa/kpa_01/kpa_01_3_npc.c b/src/world/area_kpa/kpa_01/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_01/kpa_01_3_npc.c
rename to src/world/area_kpa/kpa_01/npc.c
diff --git a/src/world/area_kpa/kpa_01/kpa_01_0_header.c b/src/world/area_kpa/kpa_01/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_01/kpa_01_0_header.c
rename to src/world/area_kpa/kpa_01/settings.c
diff --git a/src/world/area_kpa/kpa_03/kpa_03_4_entity.c b/src/world/area_kpa/kpa_03/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_03/kpa_03_4_entity.c
rename to src/world/area_kpa/kpa_03/entity.c
diff --git a/src/world/area_kpa/kpa_03/kpa_03_2_main.c b/src/world/area_kpa/kpa_03/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_03/kpa_03_2_main.c
rename to src/world/area_kpa/kpa_03/main.c
diff --git a/src/world/area_kpa/kpa_03/kpa_03_1_music.c b/src/world/area_kpa/kpa_03/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_03/kpa_03_1_music.c
rename to src/world/area_kpa/kpa_03/music.c
diff --git a/src/world/area_kpa/kpa_03/kpa_03_3_npc.c b/src/world/area_kpa/kpa_03/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_03/kpa_03_3_npc.c
rename to src/world/area_kpa/kpa_03/npc.c
diff --git a/src/world/area_kpa/kpa_03/kpa_03_0_header.c b/src/world/area_kpa/kpa_03/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_03/kpa_03_0_header.c
rename to src/world/area_kpa/kpa_03/settings.c
diff --git a/src/world/area_kpa/kpa_04/kpa_04_2_main.c b/src/world/area_kpa/kpa_04/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_04/kpa_04_2_main.c
rename to src/world/area_kpa/kpa_04/main.c
diff --git a/src/world/area_kpa/kpa_04/kpa_04_1_music.c b/src/world/area_kpa/kpa_04/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_04/kpa_04_1_music.c
rename to src/world/area_kpa/kpa_04/music.c
diff --git a/src/world/area_kpa/kpa_04/kpa_04_0_header.c b/src/world/area_kpa/kpa_04/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_04/kpa_04_0_header.c
rename to src/world/area_kpa/kpa_04/settings.c
diff --git a/src/world/area_kpa/kpa_04/kpa_04_3_statues.c b/src/world/area_kpa/kpa_04/statues.c
similarity index 100%
rename from src/world/area_kpa/kpa_04/kpa_04_3_statues.c
rename to src/world/area_kpa/kpa_04/statues.c
diff --git a/src/world/area_kpa/kpa_08/kpa_08_3_entity.c b/src/world/area_kpa/kpa_08/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_08/kpa_08_3_entity.c
rename to src/world/area_kpa/kpa_08/entity.c
diff --git a/src/world/area_kpa/kpa_08/kpa_08_2_main.c b/src/world/area_kpa/kpa_08/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_08/kpa_08_2_main.c
rename to src/world/area_kpa/kpa_08/main.c
diff --git a/src/world/area_kpa/kpa_08/kpa_08_1_music.c b/src/world/area_kpa/kpa_08/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_08/kpa_08_1_music.c
rename to src/world/area_kpa/kpa_08/music.c
diff --git a/src/world/area_kpa/kpa_08/kpa_08_4_npc.c b/src/world/area_kpa/kpa_08/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_08/kpa_08_4_npc.c
rename to src/world/area_kpa/kpa_08/npc.c
diff --git a/src/world/area_kpa/kpa_08/kpa_08_0_header.c b/src/world/area_kpa/kpa_08/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_08/kpa_08_0_header.c
rename to src/world/area_kpa/kpa_08/settings.c
diff --git a/src/world/area_kpa/kpa_09/kpa_09_3_entity.c b/src/world/area_kpa/kpa_09/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_09/kpa_09_3_entity.c
rename to src/world/area_kpa/kpa_09/entity.c
diff --git a/src/world/area_kpa/kpa_09/kpa_09_2_main.c b/src/world/area_kpa/kpa_09/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_09/kpa_09_2_main.c
rename to src/world/area_kpa/kpa_09/main.c
diff --git a/src/world/area_kpa/kpa_09/kpa_09_1_music.c b/src/world/area_kpa/kpa_09/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_09/kpa_09_1_music.c
rename to src/world/area_kpa/kpa_09/music.c
diff --git a/src/world/area_kpa/kpa_09/kpa_09_4_npc.c b/src/world/area_kpa/kpa_09/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_09/kpa_09_4_npc.c
rename to src/world/area_kpa/kpa_09/npc.c
diff --git a/src/world/area_kpa/kpa_09/kpa_09_0_header.c b/src/world/area_kpa/kpa_09/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_09/kpa_09_0_header.c
rename to src/world/area_kpa/kpa_09/settings.c
diff --git a/src/world/area_kpa/kpa_10/kpa_10_4_entity.c b/src/world/area_kpa/kpa_10/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_10/kpa_10_4_entity.c
rename to src/world/area_kpa/kpa_10/entity.c
diff --git a/src/world/area_kpa/kpa_10/kpa_10_2_main.c b/src/world/area_kpa/kpa_10/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_10/kpa_10_2_main.c
rename to src/world/area_kpa/kpa_10/main.c
diff --git a/src/world/area_kpa/kpa_10/kpa_10_1_music.c b/src/world/area_kpa/kpa_10/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_10/kpa_10_1_music.c
rename to src/world/area_kpa/kpa_10/music.c
diff --git a/src/world/area_kpa/kpa_10/kpa_10_3_npc.c b/src/world/area_kpa/kpa_10/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_10/kpa_10_3_npc.c
rename to src/world/area_kpa/kpa_10/npc.c
diff --git a/src/world/area_kpa/kpa_10/kpa_10_0_header.c b/src/world/area_kpa/kpa_10/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_10/kpa_10_0_header.c
rename to src/world/area_kpa/kpa_10/settings.c
diff --git a/src/world/area_kpa/kpa_100/kpa_100_3_entity.c b/src/world/area_kpa/kpa_100/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_100/kpa_100_3_entity.c
rename to src/world/area_kpa/kpa_100/entity.c
diff --git a/src/world/area_kpa/kpa_100/kpa_100_2_main.c b/src/world/area_kpa/kpa_100/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_100/kpa_100_2_main.c
rename to src/world/area_kpa/kpa_100/main.c
diff --git a/src/world/area_kpa/kpa_100/kpa_100_1_music.c b/src/world/area_kpa/kpa_100/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_100/kpa_100_1_music.c
rename to src/world/area_kpa/kpa_100/music.c
diff --git a/src/world/area_kpa/kpa_100/kpa_100_0_header.c b/src/world/area_kpa/kpa_100/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_100/kpa_100_0_header.c
rename to src/world/area_kpa/kpa_100/settings.c
diff --git a/src/world/area_kpa/kpa_101/kpa_101_3_entity.c b/src/world/area_kpa/kpa_101/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_101/kpa_101_3_entity.c
rename to src/world/area_kpa/kpa_101/entity.c
diff --git a/src/world/area_kpa/kpa_101/kpa_101_2_main.c b/src/world/area_kpa/kpa_101/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_101/kpa_101_2_main.c
rename to src/world/area_kpa/kpa_101/main.c
diff --git a/src/world/area_kpa/kpa_101/kpa_101_1_music.c b/src/world/area_kpa/kpa_101/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_101/kpa_101_1_music.c
rename to src/world/area_kpa/kpa_101/music.c
diff --git a/src/world/area_kpa/kpa_101/kpa_101_0_header.c b/src/world/area_kpa/kpa_101/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_101/kpa_101_0_header.c
rename to src/world/area_kpa/kpa_101/settings.c
diff --git a/src/world/area_kpa/kpa_102/kpa_102_2_main.c b/src/world/area_kpa/kpa_102/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_102/kpa_102_2_main.c
rename to src/world/area_kpa/kpa_102/main.c
diff --git a/src/world/area_kpa/kpa_102/kpa_102_1_music.c b/src/world/area_kpa/kpa_102/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_102/kpa_102_1_music.c
rename to src/world/area_kpa/kpa_102/music.c
diff --git a/src/world/area_kpa/kpa_102/kpa_102_3_npc.c b/src/world/area_kpa/kpa_102/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_102/kpa_102_3_npc.c
rename to src/world/area_kpa/kpa_102/npc.c
diff --git a/src/world/area_kpa/kpa_102/kpa_102_0_header.c b/src/world/area_kpa/kpa_102/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_102/kpa_102_0_header.c
rename to src/world/area_kpa/kpa_102/settings.c
diff --git a/src/world/area_kpa/kpa_11/kpa_11_3_entity.c b/src/world/area_kpa/kpa_11/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_11/kpa_11_3_entity.c
rename to src/world/area_kpa/kpa_11/entity.c
diff --git a/src/world/area_kpa/kpa_11/kpa_11_2_main.c b/src/world/area_kpa/kpa_11/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_11/kpa_11_2_main.c
rename to src/world/area_kpa/kpa_11/main.c
diff --git a/src/world/area_kpa/kpa_11/kpa_11_1_music.c b/src/world/area_kpa/kpa_11/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_11/kpa_11_1_music.c
rename to src/world/area_kpa/kpa_11/music.c
diff --git a/src/world/area_kpa/kpa_11/kpa_11_4_npc.c b/src/world/area_kpa/kpa_11/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_11/kpa_11_4_npc.c
rename to src/world/area_kpa/kpa_11/npc.c
diff --git a/src/world/area_kpa/kpa_11/kpa_11_0_header.c b/src/world/area_kpa/kpa_11/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_11/kpa_11_0_header.c
rename to src/world/area_kpa/kpa_11/settings.c
diff --git a/src/world/area_kpa/kpa_111/kpa_111_5_entity.c b/src/world/area_kpa/kpa_111/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_111/kpa_111_5_entity.c
rename to src/world/area_kpa/kpa_111/entity.c
diff --git a/src/world/area_kpa/kpa_111/kpa_111_2_main.c b/src/world/area_kpa/kpa_111/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_111/kpa_111_2_main.c
rename to src/world/area_kpa/kpa_111/main.c
diff --git a/src/world/area_kpa/kpa_111/kpa_111_1_music.c b/src/world/area_kpa/kpa_111/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_111/kpa_111_1_music.c
rename to src/world/area_kpa/kpa_111/music.c
diff --git a/src/world/area_kpa/kpa_111/kpa_111_4_npc.c b/src/world/area_kpa/kpa_111/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_111/kpa_111_4_npc.c
rename to src/world/area_kpa/kpa_111/npc.c
diff --git a/src/world/area_kpa/kpa_111/kpa_111_0_header.c b/src/world/area_kpa/kpa_111/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_111/kpa_111_0_header.c
rename to src/world/area_kpa/kpa_111/settings.c
diff --git a/src/world/area_kpa/kpa_111/kpa_111_3_statues.c b/src/world/area_kpa/kpa_111/statues.c
similarity index 100%
rename from src/world/area_kpa/kpa_111/kpa_111_3_statues.c
rename to src/world/area_kpa/kpa_111/statues.c
diff --git a/src/world/area_kpa/kpa_112/kpa_112_2_main.c b/src/world/area_kpa/kpa_112/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_112/kpa_112_2_main.c
rename to src/world/area_kpa/kpa_112/main.c
diff --git a/src/world/area_kpa/kpa_112/kpa_112_1_music.c b/src/world/area_kpa/kpa_112/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_112/kpa_112_1_music.c
rename to src/world/area_kpa/kpa_112/music.c
diff --git a/src/world/area_kpa/kpa_112/kpa_112_0_header.c b/src/world/area_kpa/kpa_112/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_112/kpa_112_0_header.c
rename to src/world/area_kpa/kpa_112/settings.c
diff --git a/src/world/area_kpa/kpa_113/kpa_113_3_entity.c b/src/world/area_kpa/kpa_113/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_113/kpa_113_3_entity.c
rename to src/world/area_kpa/kpa_113/entity.c
diff --git a/src/world/area_kpa/kpa_113/kpa_113_2_main.c b/src/world/area_kpa/kpa_113/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_113/kpa_113_2_main.c
rename to src/world/area_kpa/kpa_113/main.c
diff --git a/src/world/area_kpa/kpa_113/kpa_113_1_music.c b/src/world/area_kpa/kpa_113/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_113/kpa_113_1_music.c
rename to src/world/area_kpa/kpa_113/music.c
diff --git a/src/world/area_kpa/kpa_113/kpa_113_5_npc.c b/src/world/area_kpa/kpa_113/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_113/kpa_113_5_npc.c
rename to src/world/area_kpa/kpa_113/npc.c
diff --git a/src/world/area_kpa/kpa_113/kpa_113_0_header.c b/src/world/area_kpa/kpa_113/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_113/kpa_113_0_header.c
rename to src/world/area_kpa/kpa_113/settings.c
diff --git a/src/world/area_kpa/kpa_113/kpa_113_4_statues.c b/src/world/area_kpa/kpa_113/statues.c
similarity index 100%
rename from src/world/area_kpa/kpa_113/kpa_113_4_statues.c
rename to src/world/area_kpa/kpa_113/statues.c
diff --git a/src/world/area_kpa/kpa_114/kpa_114_3_entity.c b/src/world/area_kpa/kpa_114/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_114/kpa_114_3_entity.c
rename to src/world/area_kpa/kpa_114/entity.c
diff --git a/src/world/area_kpa/kpa_114/kpa_114_2_main.c b/src/world/area_kpa/kpa_114/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_114/kpa_114_2_main.c
rename to src/world/area_kpa/kpa_114/main.c
diff --git a/src/world/area_kpa/kpa_114/kpa_114_1_music.c b/src/world/area_kpa/kpa_114/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_114/kpa_114_1_music.c
rename to src/world/area_kpa/kpa_114/music.c
diff --git a/src/world/area_kpa/kpa_114/kpa_114_0_header.c b/src/world/area_kpa/kpa_114/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_114/kpa_114_0_header.c
rename to src/world/area_kpa/kpa_114/settings.c
diff --git a/src/world/area_kpa/kpa_115/kpa_115_2_main.c b/src/world/area_kpa/kpa_115/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_115/kpa_115_2_main.c
rename to src/world/area_kpa/kpa_115/main.c
diff --git a/src/world/area_kpa/kpa_115/kpa_115_1_music.c b/src/world/area_kpa/kpa_115/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_115/kpa_115_1_music.c
rename to src/world/area_kpa/kpa_115/music.c
diff --git a/src/world/area_kpa/kpa_115/kpa_115_4_npc.c b/src/world/area_kpa/kpa_115/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_115/kpa_115_4_npc.c
rename to src/world/area_kpa/kpa_115/npc.c
diff --git a/src/world/area_kpa/kpa_115/kpa_115_0_header.c b/src/world/area_kpa/kpa_115/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_115/kpa_115_0_header.c
rename to src/world/area_kpa/kpa_115/settings.c
diff --git a/src/world/area_kpa/kpa_115/kpa_115_3_statues.c b/src/world/area_kpa/kpa_115/statues.c
similarity index 100%
rename from src/world/area_kpa/kpa_115/kpa_115_3_statues.c
rename to src/world/area_kpa/kpa_115/statues.c
diff --git a/src/world/area_kpa/kpa_116/kpa_116_2_main.c b/src/world/area_kpa/kpa_116/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_116/kpa_116_2_main.c
rename to src/world/area_kpa/kpa_116/main.c
diff --git a/src/world/area_kpa/kpa_116/kpa_116_1_music.c b/src/world/area_kpa/kpa_116/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_116/kpa_116_1_music.c
rename to src/world/area_kpa/kpa_116/music.c
diff --git a/src/world/area_kpa/kpa_116/kpa_116_0_header.c b/src/world/area_kpa/kpa_116/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_116/kpa_116_0_header.c
rename to src/world/area_kpa/kpa_116/settings.c
diff --git a/src/world/area_kpa/kpa_117/kpa_117_2_main.c b/src/world/area_kpa/kpa_117/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_117/kpa_117_2_main.c
rename to src/world/area_kpa/kpa_117/main.c
diff --git a/src/world/area_kpa/kpa_117/kpa_117_1_music.c b/src/world/area_kpa/kpa_117/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_117/kpa_117_1_music.c
rename to src/world/area_kpa/kpa_117/music.c
diff --git a/src/world/area_kpa/kpa_117/kpa_117_0_header.c b/src/world/area_kpa/kpa_117/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_117/kpa_117_0_header.c
rename to src/world/area_kpa/kpa_117/settings.c
diff --git a/src/world/area_kpa/kpa_118/kpa_118_2_main.c b/src/world/area_kpa/kpa_118/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_118/kpa_118_2_main.c
rename to src/world/area_kpa/kpa_118/main.c
diff --git a/src/world/area_kpa/kpa_118/kpa_118_1_music.c b/src/world/area_kpa/kpa_118/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_118/kpa_118_1_music.c
rename to src/world/area_kpa/kpa_118/music.c
diff --git a/src/world/area_kpa/kpa_118/kpa_118_0_header.c b/src/world/area_kpa/kpa_118/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_118/kpa_118_0_header.c
rename to src/world/area_kpa/kpa_118/settings.c
diff --git a/src/world/area_kpa/kpa_119/kpa_119_2_entity.c b/src/world/area_kpa/kpa_119/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_119/kpa_119_2_entity.c
rename to src/world/area_kpa/kpa_119/entity.c
diff --git a/src/world/area_kpa/kpa_119/kpa_119_3_main.c b/src/world/area_kpa/kpa_119/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_119/kpa_119_3_main.c
rename to src/world/area_kpa/kpa_119/main.c
diff --git a/src/world/area_kpa/kpa_119/kpa_119_1_music.c b/src/world/area_kpa/kpa_119/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_119/kpa_119_1_music.c
rename to src/world/area_kpa/kpa_119/music.c
diff --git a/src/world/area_kpa/kpa_119/kpa_119_0_header.c b/src/world/area_kpa/kpa_119/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_119/kpa_119_0_header.c
rename to src/world/area_kpa/kpa_119/settings.c
diff --git a/src/world/area_kpa/kpa_12/kpa_12_2_main.c b/src/world/area_kpa/kpa_12/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_12/kpa_12_2_main.c
rename to src/world/area_kpa/kpa_12/main.c
diff --git a/src/world/area_kpa/kpa_12/kpa_12_1_music.c b/src/world/area_kpa/kpa_12/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_12/kpa_12_1_music.c
rename to src/world/area_kpa/kpa_12/music.c
diff --git a/src/world/area_kpa/kpa_12/kpa_12_3_platforms.c b/src/world/area_kpa/kpa_12/platforms.c
similarity index 100%
rename from src/world/area_kpa/kpa_12/kpa_12_3_platforms.c
rename to src/world/area_kpa/kpa_12/platforms.c
diff --git a/src/world/area_kpa/kpa_12/kpa_12_0_header.c b/src/world/area_kpa/kpa_12/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_12/kpa_12_0_header.c
rename to src/world/area_kpa/kpa_12/settings.c
diff --git a/src/world/area_kpa/kpa_121/kpa_121_2_main.c b/src/world/area_kpa/kpa_121/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_121/kpa_121_2_main.c
rename to src/world/area_kpa/kpa_121/main.c
diff --git a/src/world/area_kpa/kpa_121/kpa_121_1_music.c b/src/world/area_kpa/kpa_121/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_121/kpa_121_1_music.c
rename to src/world/area_kpa/kpa_121/music.c
diff --git a/src/world/area_kpa/kpa_121/kpa_121_0_header.c b/src/world/area_kpa/kpa_121/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_121/kpa_121_0_header.c
rename to src/world/area_kpa/kpa_121/settings.c
diff --git a/src/world/area_kpa/kpa_13/kpa_13_3_entity.c b/src/world/area_kpa/kpa_13/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_13/kpa_13_3_entity.c
rename to src/world/area_kpa/kpa_13/entity.c
diff --git a/src/world/area_kpa/kpa_13/kpa_13_2_main.c b/src/world/area_kpa/kpa_13/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_13/kpa_13_2_main.c
rename to src/world/area_kpa/kpa_13/main.c
diff --git a/src/world/area_kpa/kpa_13/kpa_13_1_music.c b/src/world/area_kpa/kpa_13/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_13/kpa_13_1_music.c
rename to src/world/area_kpa/kpa_13/music.c
diff --git a/src/world/area_kpa/kpa_13/kpa_13_4_platforms.c b/src/world/area_kpa/kpa_13/platforms.c
similarity index 100%
rename from src/world/area_kpa/kpa_13/kpa_13_4_platforms.c
rename to src/world/area_kpa/kpa_13/platforms.c
diff --git a/src/world/area_kpa/kpa_13/kpa_13_0_header.c b/src/world/area_kpa/kpa_13/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_13/kpa_13_0_header.c
rename to src/world/area_kpa/kpa_13/settings.c
diff --git a/src/world/area_kpa/kpa_130/kpa_130_2_main.c b/src/world/area_kpa/kpa_130/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_130/kpa_130_2_main.c
rename to src/world/area_kpa/kpa_130/main.c
diff --git a/src/world/area_kpa/kpa_130/kpa_130_1_music.c b/src/world/area_kpa/kpa_130/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_130/kpa_130_1_music.c
rename to src/world/area_kpa/kpa_130/music.c
diff --git a/src/world/area_kpa/kpa_130/kpa_130_3_npc.c b/src/world/area_kpa/kpa_130/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_130/kpa_130_3_npc.c
rename to src/world/area_kpa/kpa_130/npc.c
diff --git a/src/world/area_kpa/kpa_130/kpa_130_0_header.c b/src/world/area_kpa/kpa_130/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_130/kpa_130_0_header.c
rename to src/world/area_kpa/kpa_130/settings.c
diff --git a/src/world/area_kpa/kpa_133/kpa_133_6.c b/src/world/area_kpa/kpa_133/ease.c
similarity index 100%
rename from src/world/area_kpa/kpa_133/kpa_133_6.c
rename to src/world/area_kpa/kpa_133/ease.c
diff --git a/src/world/area_kpa/kpa_133/kpa_133_3_entity.c b/src/world/area_kpa/kpa_133/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_133/kpa_133_3_entity.c
rename to src/world/area_kpa/kpa_133/entity.c
diff --git a/src/world/area_kpa/kpa_133/kpa_133_2_main.c b/src/world/area_kpa/kpa_133/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_133/kpa_133_2_main.c
rename to src/world/area_kpa/kpa_133/main.c
diff --git a/src/world/area_kpa/kpa_133/kpa_133_1_music.c b/src/world/area_kpa/kpa_133/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_133/kpa_133_1_music.c
rename to src/world/area_kpa/kpa_133/music.c
diff --git a/src/world/area_kpa/kpa_133/kpa_133_4_npc.c b/src/world/area_kpa/kpa_133/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_133/kpa_133_4_npc.c
rename to src/world/area_kpa/kpa_133/npc.c
diff --git a/src/world/area_kpa/kpa_133/kpa_133_0_header.c b/src/world/area_kpa/kpa_133/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_133/kpa_133_0_header.c
rename to src/world/area_kpa/kpa_133/settings.c
diff --git a/src/world/area_kpa/kpa_133/kpa_133_5_water.c b/src/world/area_kpa/kpa_133/water.c
similarity index 100%
rename from src/world/area_kpa/kpa_133/kpa_133_5_water.c
rename to src/world/area_kpa/kpa_133/water.c
diff --git a/src/world/area_kpa/kpa_134/kpa_134_3_chains.c b/src/world/area_kpa/kpa_134/chains.c
similarity index 100%
rename from src/world/area_kpa/kpa_134/kpa_134_3_chains.c
rename to src/world/area_kpa/kpa_134/chains.c
diff --git a/src/world/area_kpa/kpa_134/kpa_134_6_entity.c b/src/world/area_kpa/kpa_134/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_134/kpa_134_6_entity.c
rename to src/world/area_kpa/kpa_134/entity.c
diff --git a/src/world/area_kpa/kpa_134/kpa_134_2_main.c b/src/world/area_kpa/kpa_134/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_134/kpa_134_2_main.c
rename to src/world/area_kpa/kpa_134/main.c
diff --git a/src/world/area_kpa/kpa_134/kpa_134_1_music.c b/src/world/area_kpa/kpa_134/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_134/kpa_134_1_music.c
rename to src/world/area_kpa/kpa_134/music.c
diff --git a/src/world/area_kpa/kpa_134/kpa_134_4_npc.c b/src/world/area_kpa/kpa_134/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_134/kpa_134_4_npc.c
rename to src/world/area_kpa/kpa_134/npc.c
diff --git a/src/world/area_kpa/kpa_134/kpa_134_5_panels.c b/src/world/area_kpa/kpa_134/panels.c
similarity index 100%
rename from src/world/area_kpa/kpa_134/kpa_134_5_panels.c
rename to src/world/area_kpa/kpa_134/panels.c
diff --git a/src/world/area_kpa/kpa_134/kpa_134_0_header.c b/src/world/area_kpa/kpa_134/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_134/kpa_134_0_header.c
rename to src/world/area_kpa/kpa_134/settings.c
diff --git a/src/world/area_kpa/kpa_14/kpa_14_3_entity.c b/src/world/area_kpa/kpa_14/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_14/kpa_14_3_entity.c
rename to src/world/area_kpa/kpa_14/entity.c
diff --git a/src/world/area_kpa/kpa_14/kpa_14_2_main.c b/src/world/area_kpa/kpa_14/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_14/kpa_14_2_main.c
rename to src/world/area_kpa/kpa_14/main.c
diff --git a/src/world/area_kpa/kpa_14/kpa_14_1_music.c b/src/world/area_kpa/kpa_14/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_14/kpa_14_1_music.c
rename to src/world/area_kpa/kpa_14/music.c
diff --git a/src/world/area_kpa/kpa_14/kpa_14_4_platforms.c b/src/world/area_kpa/kpa_14/platforms.c
similarity index 100%
rename from src/world/area_kpa/kpa_14/kpa_14_4_platforms.c
rename to src/world/area_kpa/kpa_14/platforms.c
diff --git a/src/world/area_kpa/kpa_14/kpa_14_0_header.c b/src/world/area_kpa/kpa_14/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_14/kpa_14_0_header.c
rename to src/world/area_kpa/kpa_14/settings.c
diff --git a/src/world/area_kpa/kpa_15/kpa_15_3_entity.c b/src/world/area_kpa/kpa_15/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_15/kpa_15_3_entity.c
rename to src/world/area_kpa/kpa_15/entity.c
diff --git a/src/world/area_kpa/kpa_15/kpa_15_2_main.c b/src/world/area_kpa/kpa_15/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_15/kpa_15_2_main.c
rename to src/world/area_kpa/kpa_15/main.c
diff --git a/src/world/area_kpa/kpa_15/kpa_15_1_music.c b/src/world/area_kpa/kpa_15/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_15/kpa_15_1_music.c
rename to src/world/area_kpa/kpa_15/music.c
diff --git a/src/world/area_kpa/kpa_15/kpa_15_0_header.c b/src/world/area_kpa/kpa_15/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_15/kpa_15_0_header.c
rename to src/world/area_kpa/kpa_15/settings.c
diff --git a/src/world/area_kpa/kpa_16/kpa_16_3_entity.c b/src/world/area_kpa/kpa_16/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_16/kpa_16_3_entity.c
rename to src/world/area_kpa/kpa_16/entity.c
diff --git a/src/world/area_kpa/kpa_16/kpa_16_2_main.c b/src/world/area_kpa/kpa_16/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_16/kpa_16_2_main.c
rename to src/world/area_kpa/kpa_16/main.c
diff --git a/src/world/area_kpa/kpa_16/kpa_16_1_music.c b/src/world/area_kpa/kpa_16/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_16/kpa_16_1_music.c
rename to src/world/area_kpa/kpa_16/music.c
diff --git a/src/world/area_kpa/kpa_16/kpa_16_4_npc.c b/src/world/area_kpa/kpa_16/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_16/kpa_16_4_npc.c
rename to src/world/area_kpa/kpa_16/npc.c
diff --git a/src/world/area_kpa/kpa_16/kpa_16_0_header.c b/src/world/area_kpa/kpa_16/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_16/kpa_16_0_header.c
rename to src/world/area_kpa/kpa_16/settings.c
diff --git a/src/world/area_kpa/kpa_17/kpa_17_2_entity.c b/src/world/area_kpa/kpa_17/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_17/kpa_17_2_entity.c
rename to src/world/area_kpa/kpa_17/entity.c
diff --git a/src/world/area_kpa/kpa_17/kpa_17_3_main.c b/src/world/area_kpa/kpa_17/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_17/kpa_17_3_main.c
rename to src/world/area_kpa/kpa_17/main.c
diff --git a/src/world/area_kpa/kpa_17/kpa_17_1_music.c b/src/world/area_kpa/kpa_17/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_17/kpa_17_1_music.c
rename to src/world/area_kpa/kpa_17/music.c
diff --git a/src/world/area_kpa/kpa_17/kpa_17_4_npc.c b/src/world/area_kpa/kpa_17/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_17/kpa_17_4_npc.c
rename to src/world/area_kpa/kpa_17/npc.c
diff --git a/src/world/area_kpa/kpa_17/kpa_17_0_header.c b/src/world/area_kpa/kpa_17/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_17/kpa_17_0_header.c
rename to src/world/area_kpa/kpa_17/settings.c
diff --git a/src/world/area_kpa/kpa_32/kpa_32_2_entity.c b/src/world/area_kpa/kpa_32/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_32/kpa_32_2_entity.c
rename to src/world/area_kpa/kpa_32/entity.c
diff --git a/src/world/area_kpa/kpa_32/kpa_32_3_main.c b/src/world/area_kpa/kpa_32/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_32/kpa_32_3_main.c
rename to src/world/area_kpa/kpa_32/main.c
diff --git a/src/world/area_kpa/kpa_32/kpa_32_1_music.c b/src/world/area_kpa/kpa_32/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_32/kpa_32_1_music.c
rename to src/world/area_kpa/kpa_32/music.c
diff --git a/src/world/area_kpa/kpa_32/kpa_32_0_header.c b/src/world/area_kpa/kpa_32/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_32/kpa_32_0_header.c
rename to src/world/area_kpa/kpa_32/settings.c
diff --git a/src/world/area_kpa/kpa_33/kpa_33_2_entity.c b/src/world/area_kpa/kpa_33/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_33/kpa_33_2_entity.c
rename to src/world/area_kpa/kpa_33/entity.c
diff --git a/src/world/area_kpa/kpa_33/kpa_33_3_main.c b/src/world/area_kpa/kpa_33/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_33/kpa_33_3_main.c
rename to src/world/area_kpa/kpa_33/main.c
diff --git a/src/world/area_kpa/kpa_33/kpa_33_1_music.c b/src/world/area_kpa/kpa_33/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_33/kpa_33_1_music.c
rename to src/world/area_kpa/kpa_33/music.c
diff --git a/src/world/area_kpa/kpa_33/kpa_33_0_header.c b/src/world/area_kpa/kpa_33/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_33/kpa_33_0_header.c
rename to src/world/area_kpa/kpa_33/settings.c
diff --git a/src/world/area_kpa/kpa_40/kpa_40_2_main.c b/src/world/area_kpa/kpa_40/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_40/kpa_40_2_main.c
rename to src/world/area_kpa/kpa_40/main.c
diff --git a/src/world/area_kpa/kpa_40/kpa_40_1_music.c b/src/world/area_kpa/kpa_40/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_40/kpa_40_1_music.c
rename to src/world/area_kpa/kpa_40/music.c
diff --git a/src/world/area_kpa/kpa_40/kpa_40_0_header.c b/src/world/area_kpa/kpa_40/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_40/kpa_40_0_header.c
rename to src/world/area_kpa/kpa_40/settings.c
diff --git a/src/world/area_kpa/kpa_41/kpa_41_2_main.c b/src/world/area_kpa/kpa_41/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_41/kpa_41_2_main.c
rename to src/world/area_kpa/kpa_41/main.c
diff --git a/src/world/area_kpa/kpa_41/kpa_41_1_music.c b/src/world/area_kpa/kpa_41/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_41/kpa_41_1_music.c
rename to src/world/area_kpa/kpa_41/music.c
diff --git a/src/world/area_kpa/kpa_41/kpa_41_0_header.c b/src/world/area_kpa/kpa_41/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_41/kpa_41_0_header.c
rename to src/world/area_kpa/kpa_41/settings.c
diff --git a/src/world/area_kpa/kpa_50/kpa_50_2_main.c b/src/world/area_kpa/kpa_50/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_50/kpa_50_2_main.c
rename to src/world/area_kpa/kpa_50/main.c
diff --git a/src/world/area_kpa/kpa_50/kpa_50_1_music.c b/src/world/area_kpa/kpa_50/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_50/kpa_50_1_music.c
rename to src/world/area_kpa/kpa_50/music.c
diff --git a/src/world/area_kpa/kpa_50/kpa_50_3_npc.c b/src/world/area_kpa/kpa_50/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_50/kpa_50_3_npc.c
rename to src/world/area_kpa/kpa_50/npc.c
diff --git a/src/world/area_kpa/kpa_50/kpa_50_0_header.c b/src/world/area_kpa/kpa_50/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_50/kpa_50_0_header.c
rename to src/world/area_kpa/kpa_50/settings.c
diff --git a/src/world/area_kpa/kpa_51/kpa_51_2_main.c b/src/world/area_kpa/kpa_51/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_51/kpa_51_2_main.c
rename to src/world/area_kpa/kpa_51/main.c
diff --git a/src/world/area_kpa/kpa_51/kpa_51_1_music.c b/src/world/area_kpa/kpa_51/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_51/kpa_51_1_music.c
rename to src/world/area_kpa/kpa_51/music.c
diff --git a/src/world/area_kpa/kpa_51/kpa_51_3_npc.c b/src/world/area_kpa/kpa_51/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_51/kpa_51_3_npc.c
rename to src/world/area_kpa/kpa_51/npc.c
diff --git a/src/world/area_kpa/kpa_51/kpa_51_0_header.c b/src/world/area_kpa/kpa_51/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_51/kpa_51_0_header.c
rename to src/world/area_kpa/kpa_51/settings.c
diff --git a/src/world/area_kpa/kpa_52/kpa_52_2_entity.c b/src/world/area_kpa/kpa_52/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_52/kpa_52_2_entity.c
rename to src/world/area_kpa/kpa_52/entity.c
diff --git a/src/world/area_kpa/kpa_52/kpa_52_3_main.c b/src/world/area_kpa/kpa_52/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_52/kpa_52_3_main.c
rename to src/world/area_kpa/kpa_52/main.c
diff --git a/src/world/area_kpa/kpa_52/kpa_52_1_music.c b/src/world/area_kpa/kpa_52/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_52/kpa_52_1_music.c
rename to src/world/area_kpa/kpa_52/music.c
diff --git a/src/world/area_kpa/kpa_52/kpa_52_4_npc.c b/src/world/area_kpa/kpa_52/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_52/kpa_52_4_npc.c
rename to src/world/area_kpa/kpa_52/npc.c
diff --git a/src/world/area_kpa/kpa_52/kpa_52_0_header.c b/src/world/area_kpa/kpa_52/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_52/kpa_52_0_header.c
rename to src/world/area_kpa/kpa_52/settings.c
diff --git a/src/world/area_kpa/kpa_53/kpa_53_4_entity.c b/src/world/area_kpa/kpa_53/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_53/kpa_53_4_entity.c
rename to src/world/area_kpa/kpa_53/entity.c
diff --git a/src/world/area_kpa/kpa_53/kpa_53_2_main.c b/src/world/area_kpa/kpa_53/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_53/kpa_53_2_main.c
rename to src/world/area_kpa/kpa_53/main.c
diff --git a/src/world/area_kpa/kpa_53/kpa_53_1_music.c b/src/world/area_kpa/kpa_53/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_53/kpa_53_1_music.c
rename to src/world/area_kpa/kpa_53/music.c
diff --git a/src/world/area_kpa/kpa_53/kpa_53_3_npc.c b/src/world/area_kpa/kpa_53/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_53/kpa_53_3_npc.c
rename to src/world/area_kpa/kpa_53/npc.c
diff --git a/src/world/area_kpa/kpa_53/kpa_53_0_header.c b/src/world/area_kpa/kpa_53/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_53/kpa_53_0_header.c
rename to src/world/area_kpa/kpa_53/settings.c
diff --git a/src/world/area_kpa/kpa_60/kpa_60_2_entity.c b/src/world/area_kpa/kpa_60/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_60/kpa_60_2_entity.c
rename to src/world/area_kpa/kpa_60/entity.c
diff --git a/src/world/area_kpa/kpa_60/kpa_60_3_main.c b/src/world/area_kpa/kpa_60/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_60/kpa_60_3_main.c
rename to src/world/area_kpa/kpa_60/main.c
diff --git a/src/world/area_kpa/kpa_60/kpa_60_1_music.c b/src/world/area_kpa/kpa_60/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_60/kpa_60_1_music.c
rename to src/world/area_kpa/kpa_60/music.c
diff --git a/src/world/area_kpa/kpa_60/kpa_60_4_scenes.c b/src/world/area_kpa/kpa_60/scenes.c
similarity index 100%
rename from src/world/area_kpa/kpa_60/kpa_60_4_scenes.c
rename to src/world/area_kpa/kpa_60/scenes.c
diff --git a/src/world/area_kpa/kpa_60/kpa_60_0_header.c b/src/world/area_kpa/kpa_60/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_60/kpa_60_0_header.c
rename to src/world/area_kpa/kpa_60/settings.c
diff --git a/src/world/area_kpa/kpa_61/kpa_61_4_entity.c b/src/world/area_kpa/kpa_61/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_61/kpa_61_4_entity.c
rename to src/world/area_kpa/kpa_61/entity.c
diff --git a/src/world/area_kpa/kpa_61/kpa_61_2_main.c b/src/world/area_kpa/kpa_61/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_61/kpa_61_2_main.c
rename to src/world/area_kpa/kpa_61/main.c
diff --git a/src/world/area_kpa/kpa_61/kpa_61_1_music.c b/src/world/area_kpa/kpa_61/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_61/kpa_61_1_music.c
rename to src/world/area_kpa/kpa_61/music.c
diff --git a/src/world/area_kpa/kpa_61/kpa_61_3_npc.c b/src/world/area_kpa/kpa_61/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_61/kpa_61_3_npc.c
rename to src/world/area_kpa/kpa_61/npc.c
diff --git a/src/world/area_kpa/kpa_61/kpa_61_0_header.c b/src/world/area_kpa/kpa_61/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_61/kpa_61_0_header.c
rename to src/world/area_kpa/kpa_61/settings.c
diff --git a/src/world/area_kpa/kpa_62/kpa_62_2_entity.c b/src/world/area_kpa/kpa_62/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_62/kpa_62_2_entity.c
rename to src/world/area_kpa/kpa_62/entity.c
diff --git a/src/world/area_kpa/kpa_62/kpa_62_3_main.c b/src/world/area_kpa/kpa_62/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_62/kpa_62_3_main.c
rename to src/world/area_kpa/kpa_62/main.c
diff --git a/src/world/area_kpa/kpa_62/kpa_62_1_music.c b/src/world/area_kpa/kpa_62/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_62/kpa_62_1_music.c
rename to src/world/area_kpa/kpa_62/music.c
diff --git a/src/world/area_kpa/kpa_62/kpa_62_0_header.c b/src/world/area_kpa/kpa_62/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_62/kpa_62_0_header.c
rename to src/world/area_kpa/kpa_62/settings.c
diff --git a/src/world/area_kpa/kpa_63/kpa_63_2_entity.c b/src/world/area_kpa/kpa_63/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_63/kpa_63_2_entity.c
rename to src/world/area_kpa/kpa_63/entity.c
diff --git a/src/world/area_kpa/kpa_63/kpa_63_3_main.c b/src/world/area_kpa/kpa_63/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_63/kpa_63_3_main.c
rename to src/world/area_kpa/kpa_63/main.c
diff --git a/src/world/area_kpa/kpa_63/kpa_63_1_music.c b/src/world/area_kpa/kpa_63/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_63/kpa_63_1_music.c
rename to src/world/area_kpa/kpa_63/music.c
diff --git a/src/world/area_kpa/kpa_63/kpa_63_4_scenes.c b/src/world/area_kpa/kpa_63/scenes.c
similarity index 100%
rename from src/world/area_kpa/kpa_63/kpa_63_4_scenes.c
rename to src/world/area_kpa/kpa_63/scenes.c
diff --git a/src/world/area_kpa/kpa_63/kpa_63_0_header.c b/src/world/area_kpa/kpa_63/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_63/kpa_63_0_header.c
rename to src/world/area_kpa/kpa_63/settings.c
diff --git a/src/world/area_kpa/kpa_70/kpa_70_5_chain_anim.c b/src/world/area_kpa/kpa_70/chain_anim.c
similarity index 100%
rename from src/world/area_kpa/kpa_70/kpa_70_5_chain_anim.c
rename to src/world/area_kpa/kpa_70/chain_anim.c
diff --git a/src/world/area_kpa/kpa_70/kpa_70_4_chain_skele.c b/src/world/area_kpa/kpa_70/chain_skele.c
similarity index 100%
rename from src/world/area_kpa/kpa_70/kpa_70_4_chain_skele.c
rename to src/world/area_kpa/kpa_70/chain_skele.c
diff --git a/src/world/area_kpa/kpa_70/kpa_70_2_main.c b/src/world/area_kpa/kpa_70/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_70/kpa_70_2_main.c
rename to src/world/area_kpa/kpa_70/main.c
diff --git a/src/world/area_kpa/kpa_70/kpa_70_1_music.c b/src/world/area_kpa/kpa_70/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_70/kpa_70_1_music.c
rename to src/world/area_kpa/kpa_70/music.c
diff --git a/src/world/area_kpa/kpa_70/kpa_70_3_npc.c b/src/world/area_kpa/kpa_70/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_70/kpa_70_3_npc.c
rename to src/world/area_kpa/kpa_70/npc.c
diff --git a/src/world/area_kpa/kpa_70/kpa_70_0_header.c b/src/world/area_kpa/kpa_70/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_70/kpa_70_0_header.c
rename to src/world/area_kpa/kpa_70/settings.c
diff --git a/src/world/area_kpa/kpa_81/kpa_81_2_main.c b/src/world/area_kpa/kpa_81/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_81/kpa_81_2_main.c
rename to src/world/area_kpa/kpa_81/main.c
diff --git a/src/world/area_kpa/kpa_81/kpa_81_1_music.c b/src/world/area_kpa/kpa_81/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_81/kpa_81_1_music.c
rename to src/world/area_kpa/kpa_81/music.c
diff --git a/src/world/area_kpa/kpa_81/kpa_81_3_npc.c b/src/world/area_kpa/kpa_81/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_81/kpa_81_3_npc.c
rename to src/world/area_kpa/kpa_81/npc.c
diff --git a/src/world/area_kpa/kpa_81/kpa_81_0_header.c b/src/world/area_kpa/kpa_81/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_81/kpa_81_0_header.c
rename to src/world/area_kpa/kpa_81/settings.c
diff --git a/src/world/area_kpa/kpa_82/kpa_82_2_main.c b/src/world/area_kpa/kpa_82/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_82/kpa_82_2_main.c
rename to src/world/area_kpa/kpa_82/main.c
diff --git a/src/world/area_kpa/kpa_82/kpa_82_1_music.c b/src/world/area_kpa/kpa_82/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_82/kpa_82_1_music.c
rename to src/world/area_kpa/kpa_82/music.c
diff --git a/src/world/area_kpa/kpa_82/kpa_82_3_npc.c b/src/world/area_kpa/kpa_82/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_82/kpa_82_3_npc.c
rename to src/world/area_kpa/kpa_82/npc.c
diff --git a/src/world/area_kpa/kpa_82/kpa_82_0_header.c b/src/world/area_kpa/kpa_82/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_82/kpa_82_0_header.c
rename to src/world/area_kpa/kpa_82/settings.c
diff --git a/src/world/area_kpa/kpa_83/kpa_83_2_main.c b/src/world/area_kpa/kpa_83/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_83/kpa_83_2_main.c
rename to src/world/area_kpa/kpa_83/main.c
diff --git a/src/world/area_kpa/kpa_83/kpa_83_1_music.c b/src/world/area_kpa/kpa_83/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_83/kpa_83_1_music.c
rename to src/world/area_kpa/kpa_83/music.c
diff --git a/src/world/area_kpa/kpa_83/kpa_83_3_npc.c b/src/world/area_kpa/kpa_83/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_83/kpa_83_3_npc.c
rename to src/world/area_kpa/kpa_83/npc.c
diff --git a/src/world/area_kpa/kpa_83/kpa_83_0_header.c b/src/world/area_kpa/kpa_83/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_83/kpa_83_0_header.c
rename to src/world/area_kpa/kpa_83/settings.c
diff --git a/src/world/area_kpa/kpa_90/kpa_90_2_main.c b/src/world/area_kpa/kpa_90/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_90/kpa_90_2_main.c
rename to src/world/area_kpa/kpa_90/main.c
diff --git a/src/world/area_kpa/kpa_90/kpa_90_1_music.c b/src/world/area_kpa/kpa_90/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_90/kpa_90_1_music.c
rename to src/world/area_kpa/kpa_90/music.c
diff --git a/src/world/area_kpa/kpa_90/kpa_90_0_header.c b/src/world/area_kpa/kpa_90/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_90/kpa_90_0_header.c
rename to src/world/area_kpa/kpa_90/settings.c
diff --git a/src/world/area_kpa/kpa_91/kpa_91_4_entity.c b/src/world/area_kpa/kpa_91/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_91/kpa_91_4_entity.c
rename to src/world/area_kpa/kpa_91/entity.c
diff --git a/src/world/area_kpa/kpa_91/kpa_91_2_main.c b/src/world/area_kpa/kpa_91/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_91/kpa_91_2_main.c
rename to src/world/area_kpa/kpa_91/main.c
diff --git a/src/world/area_kpa/kpa_91/kpa_91_1_music.c b/src/world/area_kpa/kpa_91/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_91/kpa_91_1_music.c
rename to src/world/area_kpa/kpa_91/music.c
diff --git a/src/world/area_kpa/kpa_91/kpa_91_3_npc.c b/src/world/area_kpa/kpa_91/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_91/kpa_91_3_npc.c
rename to src/world/area_kpa/kpa_91/npc.c
diff --git a/src/world/area_kpa/kpa_91/kpa_91_0_header.c b/src/world/area_kpa/kpa_91/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_91/kpa_91_0_header.c
rename to src/world/area_kpa/kpa_91/settings.c
diff --git a/src/world/area_kpa/kpa_94/kpa_94_2_main.c b/src/world/area_kpa/kpa_94/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_94/kpa_94_2_main.c
rename to src/world/area_kpa/kpa_94/main.c
diff --git a/src/world/area_kpa/kpa_94/kpa_94_1_music.c b/src/world/area_kpa/kpa_94/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_94/kpa_94_1_music.c
rename to src/world/area_kpa/kpa_94/music.c
diff --git a/src/world/area_kpa/kpa_94/kpa_94_0_header.c b/src/world/area_kpa/kpa_94/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_94/kpa_94_0_header.c
rename to src/world/area_kpa/kpa_94/settings.c
diff --git a/src/world/area_kpa/kpa_95/kpa_95_2_entity.c b/src/world/area_kpa/kpa_95/entity.c
similarity index 100%
rename from src/world/area_kpa/kpa_95/kpa_95_2_entity.c
rename to src/world/area_kpa/kpa_95/entity.c
diff --git a/src/world/area_kpa/kpa_95/kpa_95_3_main.c b/src/world/area_kpa/kpa_95/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_95/kpa_95_3_main.c
rename to src/world/area_kpa/kpa_95/main.c
diff --git a/src/world/area_kpa/kpa_95/kpa_95_1_music.c b/src/world/area_kpa/kpa_95/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_95/kpa_95_1_music.c
rename to src/world/area_kpa/kpa_95/music.c
diff --git a/src/world/area_kpa/kpa_95/kpa_95_4_npc.c b/src/world/area_kpa/kpa_95/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_95/kpa_95_4_npc.c
rename to src/world/area_kpa/kpa_95/npc.c
diff --git a/src/world/area_kpa/kpa_95/kpa_95_0_header.c b/src/world/area_kpa/kpa_95/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_95/kpa_95_0_header.c
rename to src/world/area_kpa/kpa_95/settings.c
diff --git a/src/world/area_kpa/kpa_96/kpa_96_2_main.c b/src/world/area_kpa/kpa_96/main.c
similarity index 100%
rename from src/world/area_kpa/kpa_96/kpa_96_2_main.c
rename to src/world/area_kpa/kpa_96/main.c
diff --git a/src/world/area_kpa/kpa_96/kpa_96_1_music.c b/src/world/area_kpa/kpa_96/music.c
similarity index 100%
rename from src/world/area_kpa/kpa_96/kpa_96_1_music.c
rename to src/world/area_kpa/kpa_96/music.c
diff --git a/src/world/area_kpa/kpa_96/kpa_96_3_npc.c b/src/world/area_kpa/kpa_96/npc.c
similarity index 100%
rename from src/world/area_kpa/kpa_96/kpa_96_3_npc.c
rename to src/world/area_kpa/kpa_96/npc.c
diff --git a/src/world/area_kpa/kpa_96/kpa_96_0_header.c b/src/world/area_kpa/kpa_96/settings.c
similarity index 100%
rename from src/world/area_kpa/kpa_96/kpa_96_0_header.c
rename to src/world/area_kpa/kpa_96/settings.c
diff --git a/src/world/area_kzn/kzn_01/kzn_01_1_main.c b/src/world/area_kzn/kzn_01/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_01/kzn_01_1_main.c
rename to src/world/area_kzn/kzn_01/main.c
diff --git a/src/world/area_kzn/kzn_01/kzn_01_2_npc.c b/src/world/area_kzn/kzn_01/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_01/kzn_01_2_npc.c
rename to src/world/area_kzn/kzn_01/npc.c
diff --git a/src/world/area_kzn/kzn_01/kzn_01_0_header.c b/src/world/area_kzn/kzn_01/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_01/kzn_01_0_header.c
rename to src/world/area_kzn/kzn_01/settings.c
diff --git a/src/world/area_kzn/kzn_02/kzn_02_4_demo.c b/src/world/area_kzn/kzn_02/demo.c
similarity index 100%
rename from src/world/area_kzn/kzn_02/kzn_02_4_demo.c
rename to src/world/area_kzn/kzn_02/demo.c
diff --git a/src/world/area_kzn/kzn_02/kzn_02_1_main.c b/src/world/area_kzn/kzn_02/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_02/kzn_02_1_main.c
rename to src/world/area_kzn/kzn_02/main.c
diff --git a/src/world/area_kzn/kzn_02/kzn_02_3_npc.c b/src/world/area_kzn/kzn_02/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_02/kzn_02_3_npc.c
rename to src/world/area_kzn/kzn_02/npc.c
diff --git a/src/world/area_kzn/kzn_02/kzn_02_2_platforms.c b/src/world/area_kzn/kzn_02/platforms.c
similarity index 100%
rename from src/world/area_kzn/kzn_02/kzn_02_2_platforms.c
rename to src/world/area_kzn/kzn_02/platforms.c
diff --git a/src/world/area_kzn/kzn_02/kzn_02_0_header.c b/src/world/area_kzn/kzn_02/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_02/kzn_02_0_header.c
rename to src/world/area_kzn/kzn_02/settings.c
diff --git a/src/world/area_kzn/kzn_03/kzn_03_3_entity.c b/src/world/area_kzn/kzn_03/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_03/kzn_03_3_entity.c
rename to src/world/area_kzn/kzn_03/entity.c
diff --git a/src/world/area_kzn/kzn_03/kzn_03_1_main.c b/src/world/area_kzn/kzn_03/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_03/kzn_03_1_main.c
rename to src/world/area_kzn/kzn_03/main.c
diff --git a/src/world/area_kzn/kzn_03/kzn_03_2_npc.c b/src/world/area_kzn/kzn_03/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_03/kzn_03_2_npc.c
rename to src/world/area_kzn/kzn_03/npc.c
diff --git a/src/world/area_kzn/kzn_03/kzn_03_0_header.c b/src/world/area_kzn/kzn_03/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_03/kzn_03_0_header.c
rename to src/world/area_kzn/kzn_03/settings.c
diff --git a/src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c b/src/world/area_kzn/kzn_03/ziplines.c
similarity index 100%
rename from src/world/area_kzn/kzn_03/kzn_03_4_ziplines.c
rename to src/world/area_kzn/kzn_03/ziplines.c
diff --git a/src/world/area_kzn/kzn_04/kzn_04_2_entity.c b/src/world/area_kzn/kzn_04/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_04/kzn_04_2_entity.c
rename to src/world/area_kzn/kzn_04/entity.c
diff --git a/src/world/area_kzn/kzn_04/kzn_04_1_main.c b/src/world/area_kzn/kzn_04/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_04/kzn_04_1_main.c
rename to src/world/area_kzn/kzn_04/main.c
diff --git a/src/world/area_kzn/kzn_04/kzn_04_3_npc.c b/src/world/area_kzn/kzn_04/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_04/kzn_04_3_npc.c
rename to src/world/area_kzn/kzn_04/npc.c
diff --git a/src/world/area_kzn/kzn_04/kzn_04_0_header.c b/src/world/area_kzn/kzn_04/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_04/kzn_04_0_header.c
rename to src/world/area_kzn/kzn_04/settings.c
diff --git a/src/world/area_kzn/kzn_05/kzn_05_1_main.c b/src/world/area_kzn/kzn_05/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_05/kzn_05_1_main.c
rename to src/world/area_kzn/kzn_05/main.c
diff --git a/src/world/area_kzn/kzn_05/kzn_05_0_header.c b/src/world/area_kzn/kzn_05/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_05/kzn_05_0_header.c
rename to src/world/area_kzn/kzn_05/settings.c
diff --git a/src/world/area_kzn/kzn_06/kzn_06_2_entity.c b/src/world/area_kzn/kzn_06/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_06/kzn_06_2_entity.c
rename to src/world/area_kzn/kzn_06/entity.c
diff --git a/src/world/area_kzn/kzn_06/kzn_06_3_extra.c b/src/world/area_kzn/kzn_06/extra.c
similarity index 100%
rename from src/world/area_kzn/kzn_06/kzn_06_3_extra.c
rename to src/world/area_kzn/kzn_06/extra.c
diff --git a/src/world/area_kzn/kzn_06/kzn_06_1_main.c b/src/world/area_kzn/kzn_06/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_06/kzn_06_1_main.c
rename to src/world/area_kzn/kzn_06/main.c
diff --git a/src/world/area_kzn/kzn_06/kzn_06_0_header.c b/src/world/area_kzn/kzn_06/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_06/kzn_06_0_header.c
rename to src/world/area_kzn/kzn_06/settings.c
diff --git a/src/world/area_kzn/kzn_07/kzn_07_3_entity.c b/src/world/area_kzn/kzn_07/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_07/kzn_07_3_entity.c
rename to src/world/area_kzn/kzn_07/entity.c
diff --git a/src/world/area_kzn/kzn_07/kzn_07_2_main.c b/src/world/area_kzn/kzn_07/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_07/kzn_07_2_main.c
rename to src/world/area_kzn/kzn_07/main.c
diff --git a/src/world/area_kzn/kzn_07/kzn_07_1_music.c b/src/world/area_kzn/kzn_07/music.c
similarity index 100%
rename from src/world/area_kzn/kzn_07/kzn_07_1_music.c
rename to src/world/area_kzn/kzn_07/music.c
diff --git a/src/world/area_kzn/kzn_07/kzn_07_4_npc.c b/src/world/area_kzn/kzn_07/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_07/kzn_07_4_npc.c
rename to src/world/area_kzn/kzn_07/npc.c
diff --git a/src/world/area_kzn/kzn_07/kzn_07_0_header.c b/src/world/area_kzn/kzn_07/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_07/kzn_07_0_header.c
rename to src/world/area_kzn/kzn_07/settings.c
diff --git a/src/world/area_kzn/kzn_08/kzn_08_2_entity.c b/src/world/area_kzn/kzn_08/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_08/kzn_08_2_entity.c
rename to src/world/area_kzn/kzn_08/entity.c
diff --git a/src/world/area_kzn/kzn_08/kzn_08_4_extra.c b/src/world/area_kzn/kzn_08/extra.c
similarity index 100%
rename from src/world/area_kzn/kzn_08/kzn_08_4_extra.c
rename to src/world/area_kzn/kzn_08/extra.c
diff --git a/src/world/area_kzn/kzn_08/kzn_08_1_main.c b/src/world/area_kzn/kzn_08/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_08/kzn_08_1_main.c
rename to src/world/area_kzn/kzn_08/main.c
diff --git a/src/world/area_kzn/kzn_08/kzn_08_3_npc.c b/src/world/area_kzn/kzn_08/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_08/kzn_08_3_npc.c
rename to src/world/area_kzn/kzn_08/npc.c
diff --git a/src/world/area_kzn/kzn_08/kzn_08_0_header.c b/src/world/area_kzn/kzn_08/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_08/kzn_08_0_header.c
rename to src/world/area_kzn/kzn_08/settings.c
diff --git a/src/world/area_kzn/kzn_09/kzn_09_2_entity.c b/src/world/area_kzn/kzn_09/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_09/kzn_09_2_entity.c
rename to src/world/area_kzn/kzn_09/entity.c
diff --git a/src/world/area_kzn/kzn_09/kzn_09_1_main.c b/src/world/area_kzn/kzn_09/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_09/kzn_09_1_main.c
rename to src/world/area_kzn/kzn_09/main.c
diff --git a/src/world/area_kzn/kzn_09/kzn_09_4_npc.c b/src/world/area_kzn/kzn_09/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_09/kzn_09_4_npc.c
rename to src/world/area_kzn/kzn_09/npc.c
diff --git a/src/world/area_kzn/kzn_09/kzn_09_0_header.c b/src/world/area_kzn/kzn_09/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_09/kzn_09_0_header.c
rename to src/world/area_kzn/kzn_09/settings.c
diff --git a/src/world/area_kzn/kzn_09/kzn_09_3_zipline.c b/src/world/area_kzn/kzn_09/zipline.c
similarity index 100%
rename from src/world/area_kzn/kzn_09/kzn_09_3_zipline.c
rename to src/world/area_kzn/kzn_09/zipline.c
diff --git a/src/world/area_kzn/kzn_10/kzn_10_1_main.c b/src/world/area_kzn/kzn_10/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_10/kzn_10_1_main.c
rename to src/world/area_kzn/kzn_10/main.c
diff --git a/src/world/area_kzn/kzn_10/kzn_10_0_header.c b/src/world/area_kzn/kzn_10/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_10/kzn_10_0_header.c
rename to src/world/area_kzn/kzn_10/settings.c
diff --git a/src/world/area_kzn/kzn_10/kzn_10_2_tromp.c b/src/world/area_kzn/kzn_10/tromp.c
similarity index 100%
rename from src/world/area_kzn/kzn_10/kzn_10_2_tromp.c
rename to src/world/area_kzn/kzn_10/tromp.c
diff --git a/src/world/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/area_kzn/kzn_11/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_11/kzn_11_1_main.c
rename to src/world/area_kzn/kzn_11/main.c
diff --git a/src/world/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/area_kzn/kzn_11/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_11/kzn_11_3_npc.c
rename to src/world/area_kzn/kzn_11/npc.c
diff --git a/src/world/area_kzn/kzn_11/kzn_11_2_platforms.c b/src/world/area_kzn/kzn_11/platforms.c
similarity index 100%
rename from src/world/area_kzn/kzn_11/kzn_11_2_platforms.c
rename to src/world/area_kzn/kzn_11/platforms.c
diff --git a/src/world/area_kzn/kzn_11/kzn_11_0_header.c b/src/world/area_kzn/kzn_11/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_11/kzn_11_0_header.c
rename to src/world/area_kzn/kzn_11/settings.c
diff --git a/src/world/area_kzn/kzn_17/kzn_17_2_entity.c b/src/world/area_kzn/kzn_17/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_17/kzn_17_2_entity.c
rename to src/world/area_kzn/kzn_17/entity.c
diff --git a/src/world/area_kzn/kzn_17/kzn_17_1_main.c b/src/world/area_kzn/kzn_17/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_17/kzn_17_1_main.c
rename to src/world/area_kzn/kzn_17/main.c
diff --git a/src/world/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/area_kzn/kzn_17/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_17/kzn_17_3_npc.c
rename to src/world/area_kzn/kzn_17/npc.c
diff --git a/src/world/area_kzn/kzn_17/kzn_17_0_header.c b/src/world/area_kzn/kzn_17/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_17/kzn_17_0_header.c
rename to src/world/area_kzn/kzn_17/settings.c
diff --git a/src/world/area_kzn/kzn_17/kzn_17_4_tromp.c b/src/world/area_kzn/kzn_17/tromp.c
similarity index 100%
rename from src/world/area_kzn/kzn_17/kzn_17_4_tromp.c
rename to src/world/area_kzn/kzn_17/tromp.c
diff --git a/src/world/area_kzn/kzn_18/kzn_18_3_entity.c b/src/world/area_kzn/kzn_18/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_18/kzn_18_3_entity.c
rename to src/world/area_kzn/kzn_18/entity.c
diff --git a/src/world/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/area_kzn/kzn_18/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_18/kzn_18_1_main.c
rename to src/world/area_kzn/kzn_18/main.c
diff --git a/src/world/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/area_kzn/kzn_18/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_18/kzn_18_2_npc.c
rename to src/world/area_kzn/kzn_18/npc.c
diff --git a/src/world/area_kzn/kzn_18/kzn_18_0_header.c b/src/world/area_kzn/kzn_18/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_18/kzn_18_0_header.c
rename to src/world/area_kzn/kzn_18/settings.c
diff --git a/src/world/area_kzn/kzn_19/kzn_19_6_entity.c b/src/world/area_kzn/kzn_19/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_19/kzn_19_6_entity.c
rename to src/world/area_kzn/kzn_19/entity.c
diff --git a/src/world/area_kzn/kzn_19/kzn_19_5_eruption.c b/src/world/area_kzn/kzn_19/eruption.c
similarity index 100%
rename from src/world/area_kzn/kzn_19/kzn_19_5_eruption.c
rename to src/world/area_kzn/kzn_19/eruption.c
diff --git a/src/world/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/area_kzn/kzn_19/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_19/kzn_19_2_main.c
rename to src/world/area_kzn/kzn_19/main.c
diff --git a/src/world/area_kzn/kzn_19/kzn_19_1_music.c b/src/world/area_kzn/kzn_19/music.c
similarity index 100%
rename from src/world/area_kzn/kzn_19/kzn_19_1_music.c
rename to src/world/area_kzn/kzn_19/music.c
diff --git a/src/world/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/area_kzn/kzn_19/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_19/kzn_19_4_npc.c
rename to src/world/area_kzn/kzn_19/npc.c
diff --git a/src/world/area_kzn/kzn_19/kzn_19_3_npc_settings.c b/src/world/area_kzn/kzn_19/npc_settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_19/kzn_19_3_npc_settings.c
rename to src/world/area_kzn/kzn_19/npc_settings.c
diff --git a/src/world/area_kzn/kzn_19/kzn_19_0_header.c b/src/world/area_kzn/kzn_19/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_19/kzn_19_0_header.c
rename to src/world/area_kzn/kzn_19/settings.c
diff --git a/src/world/area_kzn/kzn_20/kzn_20_2_main.c b/src/world/area_kzn/kzn_20/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_20/kzn_20_2_main.c
rename to src/world/area_kzn/kzn_20/main.c
diff --git a/src/world/area_kzn/kzn_20/kzn_20_1_music.c b/src/world/area_kzn/kzn_20/music.c
similarity index 100%
rename from src/world/area_kzn/kzn_20/kzn_20_1_music.c
rename to src/world/area_kzn/kzn_20/music.c
diff --git a/src/world/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/area_kzn/kzn_20/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_20/kzn_20_3_npc.c
rename to src/world/area_kzn/kzn_20/npc.c
diff --git a/src/world/area_kzn/kzn_20/kzn_20_0_header.c b/src/world/area_kzn/kzn_20/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_20/kzn_20_0_header.c
rename to src/world/area_kzn/kzn_20/settings.c
diff --git a/src/world/area_kzn/kzn_22/kzn_22_3_entity.c b/src/world/area_kzn/kzn_22/entity.c
similarity index 100%
rename from src/world/area_kzn/kzn_22/kzn_22_3_entity.c
rename to src/world/area_kzn/kzn_22/entity.c
diff --git a/src/world/area_kzn/kzn_22/kzn_22_2_main.c b/src/world/area_kzn/kzn_22/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_22/kzn_22_2_main.c
rename to src/world/area_kzn/kzn_22/main.c
diff --git a/src/world/area_kzn/kzn_22/kzn_22_1_music.c b/src/world/area_kzn/kzn_22/music.c
similarity index 100%
rename from src/world/area_kzn/kzn_22/kzn_22_1_music.c
rename to src/world/area_kzn/kzn_22/music.c
diff --git a/src/world/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/area_kzn/kzn_22/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_22/kzn_22_4_npc.c
rename to src/world/area_kzn/kzn_22/npc.c
diff --git a/src/world/area_kzn/kzn_22/kzn_22_0_header.c b/src/world/area_kzn/kzn_22/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_22/kzn_22_0_header.c
rename to src/world/area_kzn/kzn_22/settings.c
diff --git a/src/world/area_kzn/kzn_23/kzn_23_2_main.c b/src/world/area_kzn/kzn_23/main.c
similarity index 100%
rename from src/world/area_kzn/kzn_23/kzn_23_2_main.c
rename to src/world/area_kzn/kzn_23/main.c
diff --git a/src/world/area_kzn/kzn_23/kzn_23_1_music.c b/src/world/area_kzn/kzn_23/music.c
similarity index 100%
rename from src/world/area_kzn/kzn_23/kzn_23_1_music.c
rename to src/world/area_kzn/kzn_23/music.c
diff --git a/src/world/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/area_kzn/kzn_23/npc.c
similarity index 100%
rename from src/world/area_kzn/kzn_23/kzn_23_3_npc.c
rename to src/world/area_kzn/kzn_23/npc.c
diff --git a/src/world/area_kzn/kzn_23/kzn_23_0_header.c b/src/world/area_kzn/kzn_23/settings.c
similarity index 100%
rename from src/world/area_kzn/kzn_23/kzn_23_0_header.c
rename to src/world/area_kzn/kzn_23/settings.c
diff --git a/src/world/area_mac/mac_00/mac_00_8_demo.c b/src/world/area_mac/mac_00/demo.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_8_demo.c
rename to src/world/area_mac/mac_00/demo.c
diff --git a/src/world/area_mac/mac_00/mac_00_3_entity.c b/src/world/area_mac/mac_00/entity.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_3_entity.c
rename to src/world/area_mac/mac_00/entity.c
diff --git a/src/world/area_mac/mac_00/mac_00_14_epilogue.c b/src/world/area_mac/mac_00/epilogue.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_14_epilogue.c
rename to src/world/area_mac/mac_00/epilogue.c
diff --git a/src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c b/src/world/area_mac/mac_00/epilogue_npc.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_13_epilogue_npc.c
rename to src/world/area_mac/mac_00/epilogue_npc.c
diff --git a/src/world/area_mac/mac_00/mac_00_12_intro.c b/src/world/area_mac/mac_00/intro.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_12_intro.c
rename to src/world/area_mac/mac_00/intro.c
diff --git a/src/world/area_mac/mac_00/mac_00_11_intro_npc.c b/src/world/area_mac/mac_00/intro_npc.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_11_intro_npc.c
rename to src/world/area_mac/mac_00/intro_npc.c
diff --git a/src/world/area_mac/mac_00/mac_00_2_main.c b/src/world/area_mac/mac_00/main.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_2_main.c
rename to src/world/area_mac/mac_00/main.c
diff --git a/src/world/area_mac/mac_00/mac_00_1_music.c b/src/world/area_mac/mac_00/music.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_1_music.c
rename to src/world/area_mac/mac_00/music.c
diff --git a/src/world/area_mac/mac_00/mac_00_7_music_mix.c b/src/world/area_mac/mac_00/music_mix.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_7_music_mix.c
rename to src/world/area_mac/mac_00/music_mix.c
diff --git a/src/world/area_mac/mac_00/mac_00_5_npc.c b/src/world/area_mac/mac_00/npc.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_5_npc.c
rename to src/world/area_mac/mac_00/npc.c
diff --git a/src/world/area_mac/mac_00/mac_00_4_rooms.c b/src/world/area_mac/mac_00/rooms.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_4_rooms.c
rename to src/world/area_mac/mac_00/rooms.c
diff --git a/src/world/area_mac/mac_00/mac_00_0_header.c b/src/world/area_mac/mac_00/settings.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_0_header.c
rename to src/world/area_mac/mac_00/settings.c
diff --git a/src/world/area_mac/mac_00/mac_00_10_shared_npc.c b/src/world/area_mac/mac_00/shared_npc.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_10_shared_npc.c
rename to src/world/area_mac/mac_00/shared_npc.c
diff --git a/src/world/area_mac/mac_00/mac_00_6_shop.c b/src/world/area_mac/mac_00/shop.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_6_shop.c
rename to src/world/area_mac/mac_00/shop.c
diff --git a/src/world/area_mac/mac_00/mac_00_9_water_gfx.c b/src/world/area_mac/mac_00/water_gfx.c
similarity index 100%
rename from src/world/area_mac/mac_00/mac_00_9_water_gfx.c
rename to src/world/area_mac/mac_00/water_gfx.c
diff --git a/src/world/area_mac/mac_01/mac_01_7_bulletin.c b/src/world/area_mac/mac_01/bulletin.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_7_bulletin.c
rename to src/world/area_mac/mac_01/bulletin.c
diff --git a/src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c b/src/world/area_mac/mac_01/crystal_ball_gfx.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_6_crystal_ball_gfx.c
rename to src/world/area_mac/mac_01/crystal_ball_gfx.c
diff --git a/src/world/area_mac/mac_01/mac_01_3_entity.c b/src/world/area_mac/mac_01/entity.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_3_entity.c
rename to src/world/area_mac/mac_01/entity.c
diff --git a/src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c b/src/world/area_mac/mac_01/epilogue_npc.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_11_epilogue_npc.c
rename to src/world/area_mac/mac_01/epilogue_npc.c
diff --git a/src/world/area_mac/mac_01/mac_01_13_foliage.c b/src/world/area_mac/mac_01/foliage.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_13_foliage.c
rename to src/world/area_mac/mac_01/foliage.c
diff --git a/src/world/area_mac/mac_01/mac_01_12_intro.c b/src/world/area_mac/mac_01/intro.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_12_intro.c
rename to src/world/area_mac/mac_01/intro.c
diff --git a/src/world/area_mac/mac_01/mac_01_10_intro_npc.c b/src/world/area_mac/mac_01/intro_npc.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_10_intro_npc.c
rename to src/world/area_mac/mac_01/intro_npc.c
diff --git a/src/world/area_mac/mac_01/mac_01_2_main.c b/src/world/area_mac/mac_01/main.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_2_main.c
rename to src/world/area_mac/mac_01/main.c
diff --git a/src/world/area_mac/mac_01/mac_01_1_music.c b/src/world/area_mac/mac_01/music.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_1_music.c
rename to src/world/area_mac/mac_01/music.c
diff --git a/src/world/area_mac/mac_01/mac_01_8_music_mix.c b/src/world/area_mac/mac_01/music_mix.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_8_music_mix.c
rename to src/world/area_mac/mac_01/music_mix.c
diff --git a/src/world/area_mac/mac_01/mac_01_9_npc.c b/src/world/area_mac/mac_01/npc.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_9_npc.c
rename to src/world/area_mac/mac_01/npc.c
diff --git a/src/world/area_mac/mac_01/mac_01_4_rooms.c b/src/world/area_mac/mac_01/rooms.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_4_rooms.c
rename to src/world/area_mac/mac_01/rooms.c
diff --git a/src/world/area_mac/mac_01/mac_01_0_header.c b/src/world/area_mac/mac_01/settings.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_0_header.c
rename to src/world/area_mac/mac_01/settings.c
diff --git a/src/world/area_mac/mac_01/mac_01_5_shop.c b/src/world/area_mac/mac_01/shop.c
similarity index 100%
rename from src/world/area_mac/mac_01/mac_01_5_shop.c
rename to src/world/area_mac/mac_01/shop.c
diff --git a/src/world/area_mac/mac_02/mac_02_5_entity.c b/src/world/area_mac/mac_02/entity.c
similarity index 100%
rename from src/world/area_mac/mac_02/mac_02_5_entity.c
rename to src/world/area_mac/mac_02/entity.c
diff --git a/src/world/area_mac/mac_02/mac_02_4_foliage.c b/src/world/area_mac/mac_02/foliage.c
similarity index 100%
rename from src/world/area_mac/mac_02/mac_02_4_foliage.c
rename to src/world/area_mac/mac_02/foliage.c
diff --git a/src/world/area_mac/mac_02/mac_02_2_main.c b/src/world/area_mac/mac_02/main.c
similarity index 100%
rename from src/world/area_mac/mac_02/mac_02_2_main.c
rename to src/world/area_mac/mac_02/main.c
diff --git a/src/world/area_mac/mac_02/mac_02_1_music.c b/src/world/area_mac/mac_02/music.c
similarity index 100%
rename from src/world/area_mac/mac_02/mac_02_1_music.c
rename to src/world/area_mac/mac_02/music.c
diff --git a/src/world/area_mac/mac_02/mac_02_7_music_mix.c b/src/world/area_mac/mac_02/music_mix.c
similarity index 100%
rename from src/world/area_mac/mac_02/mac_02_7_music_mix.c
rename to src/world/area_mac/mac_02/music_mix.c
diff --git a/src/world/area_mac/mac_02/mac_02_6_npc.c b/src/world/area_mac/mac_02/npc.c
similarity index 100%
rename from src/world/area_mac/mac_02/mac_02_6_npc.c
rename to src/world/area_mac/mac_02/npc.c
diff --git a/src/world/area_mac/mac_02/mac_02_3_rooms.c b/src/world/area_mac/mac_02/rooms.c
similarity index 100%
rename from src/world/area_mac/mac_02/mac_02_3_rooms.c
rename to src/world/area_mac/mac_02/rooms.c
diff --git a/src/world/area_mac/mac_02/mac_02_0_header.c b/src/world/area_mac/mac_02/settings.c
similarity index 100%
rename from src/world/area_mac/mac_02/mac_02_0_header.c
rename to src/world/area_mac/mac_02/settings.c
diff --git a/src/world/area_mac/mac_03/mac_03_8_demo.c b/src/world/area_mac/mac_03/demo.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_8_demo.c
rename to src/world/area_mac/mac_03/demo.c
diff --git a/src/world/area_mac/mac_03/mac_03_5_entity.c b/src/world/area_mac/mac_03/entity.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_5_entity.c
rename to src/world/area_mac/mac_03/entity.c
diff --git a/src/world/area_mac/mac_03/mac_03_6_foliage.c b/src/world/area_mac/mac_03/foliage.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_6_foliage.c
rename to src/world/area_mac/mac_03/foliage.c
diff --git a/src/world/area_mac/mac_03/mac_03_2_main.c b/src/world/area_mac/mac_03/main.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_2_main.c
rename to src/world/area_mac/mac_03/main.c
diff --git a/src/world/area_mac/mac_03/mac_03_1_music.c b/src/world/area_mac/mac_03/music.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_1_music.c
rename to src/world/area_mac/mac_03/music.c
diff --git a/src/world/area_mac/mac_03/mac_03_4_npc.c b/src/world/area_mac/mac_03/npc.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_4_npc.c
rename to src/world/area_mac/mac_03/npc.c
diff --git a/src/world/area_mac/mac_03/mac_03_7_oinks.c b/src/world/area_mac/mac_03/oinks.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_7_oinks.c
rename to src/world/area_mac/mac_03/oinks.c
diff --git a/src/world/area_mac/mac_03/mac_03_0_header.c b/src/world/area_mac/mac_03/settings.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_0_header.c
rename to src/world/area_mac/mac_03/settings.c
diff --git a/src/world/area_mac/mac_03/mac_03_3_train.c b/src/world/area_mac/mac_03/train.c
similarity index 100%
rename from src/world/area_mac/mac_03/mac_03_3_train.c
rename to src/world/area_mac/mac_03/train.c
diff --git a/src/world/area_mac/mac_04/mac_04_8_entity.c b/src/world/area_mac/mac_04/entity.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_8_entity.c
rename to src/world/area_mac/mac_04/entity.c
diff --git a/src/world/area_mac/mac_04/mac_04_4_foliage.c b/src/world/area_mac/mac_04/foliage.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_4_foliage.c
rename to src/world/area_mac/mac_04/foliage.c
diff --git a/src/world/area_mac/mac_04/mac_04_2_main.c b/src/world/area_mac/mac_04/main.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_2_main.c
rename to src/world/area_mac/mac_04/main.c
diff --git a/src/world/area_mac/mac_04/mac_04_1_music.c b/src/world/area_mac/mac_04/music.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_1_music.c
rename to src/world/area_mac/mac_04/music.c
diff --git a/src/world/area_mac/mac_04/mac_04_9_music_mix.c b/src/world/area_mac/mac_04/music_mix.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_9_music_mix.c
rename to src/world/area_mac/mac_04/music_mix.c
diff --git a/src/world/area_mac/mac_04/mac_04_6_npc.c b/src/world/area_mac/mac_04/npc.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_6_npc.c
rename to src/world/area_mac/mac_04/npc.c
diff --git a/src/world/area_mac/mac_04/mac_04_3_rooms.c b/src/world/area_mac/mac_04/rooms.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_3_rooms.c
rename to src/world/area_mac/mac_04/rooms.c
diff --git a/src/world/area_mac/mac_04/mac_04_0_header.c b/src/world/area_mac/mac_04/settings.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_0_header.c
rename to src/world/area_mac/mac_04/settings.c
diff --git a/src/world/area_mac/mac_04/mac_04_5_shop.c b/src/world/area_mac/mac_04/shop.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_5_shop.c
rename to src/world/area_mac/mac_04/shop.c
diff --git a/src/world/area_mac/mac_04/mac_04_7_wish_scene.c b/src/world/area_mac/mac_04/wish_scene.c
similarity index 100%
rename from src/world/area_mac/mac_04/mac_04_7_wish_scene.c
rename to src/world/area_mac/mac_04/wish_scene.c
diff --git a/src/world/area_mac/mac_05/mac_05_7_club64_sign.c b/src/world/area_mac/mac_05/club64_sign.c
similarity index 100%
rename from src/world/area_mac/mac_05/mac_05_7_club64_sign.c
rename to src/world/area_mac/mac_05/club64_sign.c
diff --git a/src/world/area_mac/mac_05/mac_05_2_entity.c b/src/world/area_mac/mac_05/entity.c
similarity index 100%
rename from src/world/area_mac/mac_05/mac_05_2_entity.c
rename to src/world/area_mac/mac_05/entity.c
diff --git a/src/world/area_mac/mac_05/mac_05_3_main.c b/src/world/area_mac/mac_05/main.c
similarity index 100%
rename from src/world/area_mac/mac_05/mac_05_3_main.c
rename to src/world/area_mac/mac_05/main.c
diff --git a/src/world/area_mac/mac_05/mac_05_1_music.c b/src/world/area_mac/mac_05/music.c
similarity index 100%
rename from src/world/area_mac/mac_05/mac_05_1_music.c
rename to src/world/area_mac/mac_05/music.c
diff --git a/src/world/area_mac/mac_05/mac_05_4_npc.c b/src/world/area_mac/mac_05/npc.c
similarity index 100%
rename from src/world/area_mac/mac_05/mac_05_4_npc.c
rename to src/world/area_mac/mac_05/npc.c
diff --git a/src/world/area_mac/mac_05/mac_05_6_rooms.c b/src/world/area_mac/mac_05/rooms.c
similarity index 100%
rename from src/world/area_mac/mac_05/mac_05_6_rooms.c
rename to src/world/area_mac/mac_05/rooms.c
diff --git a/src/world/area_mac/mac_05/mac_05_0_header.c b/src/world/area_mac/mac_05/settings.c
similarity index 100%
rename from src/world/area_mac/mac_05/mac_05_0_header.c
rename to src/world/area_mac/mac_05/settings.c
diff --git a/src/world/area_mac/mac_05/mac_05_5_whale.c b/src/world/area_mac/mac_05/whale.c
similarity index 100%
rename from src/world/area_mac/mac_05/mac_05_5_whale.c
rename to src/world/area_mac/mac_05/whale.c
diff --git a/src/world/area_mac/mac_06/mac_06_1_main.c b/src/world/area_mac/mac_06/main.c
similarity index 100%
rename from src/world/area_mac/mac_06/mac_06_1_main.c
rename to src/world/area_mac/mac_06/main.c
diff --git a/src/world/area_mac/mac_06/mac_06_3_npc.c b/src/world/area_mac/mac_06/npc.c
similarity index 100%
rename from src/world/area_mac/mac_06/mac_06_3_npc.c
rename to src/world/area_mac/mac_06/npc.c
diff --git a/src/world/area_mac/mac_06/mac_06_0_header.c b/src/world/area_mac/mac_06/settings.c
similarity index 100%
rename from src/world/area_mac/mac_06/mac_06_0_header.c
rename to src/world/area_mac/mac_06/settings.c
diff --git a/src/world/area_mac/mac_06/mac_06_2_whale.c b/src/world/area_mac/mac_06/whale.c
similarity index 100%
rename from src/world/area_mac/mac_06/mac_06_2_whale.c
rename to src/world/area_mac/mac_06/whale.c
diff --git a/src/world/area_mac/machi/machi_3_entity.c b/src/world/area_mac/machi/entity.c
similarity index 100%
rename from src/world/area_mac/machi/machi_3_entity.c
rename to src/world/area_mac/machi/entity.c
diff --git a/src/world/area_mac/machi/machi_4_goomba_king.c b/src/world/area_mac/machi/goomba_king.c
similarity index 100%
rename from src/world/area_mac/machi/machi_4_goomba_king.c
rename to src/world/area_mac/machi/goomba_king.c
diff --git a/src/world/area_mac/machi/machi_2_main.c b/src/world/area_mac/machi/main.c
similarity index 100%
rename from src/world/area_mac/machi/machi_2_main.c
rename to src/world/area_mac/machi/main.c
diff --git a/src/world/area_mac/machi/machi_6_misstar.c b/src/world/area_mac/machi/misstar.c
similarity index 100%
rename from src/world/area_mac/machi/machi_6_misstar.c
rename to src/world/area_mac/machi/misstar.c
diff --git a/src/world/area_mac/machi/machi_5_npc.c b/src/world/area_mac/machi/npc.c
similarity index 100%
rename from src/world/area_mac/machi/machi_5_npc.c
rename to src/world/area_mac/machi/npc.c
diff --git a/src/world/area_mac/machi/machi_7_partner.c b/src/world/area_mac/machi/partner.c
similarity index 100%
rename from src/world/area_mac/machi/machi_7_partner.c
rename to src/world/area_mac/machi/partner.c
diff --git a/src/world/area_mac/machi/machi_0_header.c b/src/world/area_mac/machi/settings.c
similarity index 100%
rename from src/world/area_mac/machi/machi_0_header.c
rename to src/world/area_mac/machi/settings.c
diff --git a/src/world/area_mac/machi/machi_1_tables.c b/src/world/area_mac/machi/tables.c
similarity index 100%
rename from src/world/area_mac/machi/machi_1_tables.c
rename to src/world/area_mac/machi/tables.c
diff --git a/src/world/area_mgm/mgm_00/mgm_00_1_main.c b/src/world/area_mgm/mgm_00/main.c
similarity index 100%
rename from src/world/area_mgm/mgm_00/mgm_00_1_main.c
rename to src/world/area_mgm/mgm_00/main.c
diff --git a/src/world/area_mgm/mgm_00/mgm_00_2_npc.c b/src/world/area_mgm/mgm_00/npc.c
similarity index 100%
rename from src/world/area_mgm/mgm_00/mgm_00_2_npc.c
rename to src/world/area_mgm/mgm_00/npc.c
diff --git a/src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c b/src/world/area_mgm/mgm_00/scoreboard.c
similarity index 100%
rename from src/world/area_mgm/mgm_00/mgm_00_3_scoreboard.c
rename to src/world/area_mgm/mgm_00/scoreboard.c
diff --git a/src/world/area_mgm/mgm_00/mgm_00_0_header.c b/src/world/area_mgm/mgm_00/settings.c
similarity index 100%
rename from src/world/area_mgm/mgm_00/mgm_00_0_header.c
rename to src/world/area_mgm/mgm_00/settings.c
diff --git a/src/world/area_mgm/mgm_01/mgm_01_3_entity.c b/src/world/area_mgm/mgm_01/entity.c
similarity index 100%
rename from src/world/area_mgm/mgm_01/mgm_01_3_entity.c
rename to src/world/area_mgm/mgm_01/entity.c
diff --git a/src/world/area_mgm/mgm_01/mgm_01_4_images.c b/src/world/area_mgm/mgm_01/images.c
similarity index 100%
rename from src/world/area_mgm/mgm_01/mgm_01_4_images.c
rename to src/world/area_mgm/mgm_01/images.c
diff --git a/src/world/area_mgm/mgm_01/mgm_01_1_main.c b/src/world/area_mgm/mgm_01/main.c
similarity index 100%
rename from src/world/area_mgm/mgm_01/mgm_01_1_main.c
rename to src/world/area_mgm/mgm_01/main.c
diff --git a/src/world/area_mgm/mgm_01/mgm_01_2_npc.c b/src/world/area_mgm/mgm_01/npc.c
similarity index 100%
rename from src/world/area_mgm/mgm_01/mgm_01_2_npc.c
rename to src/world/area_mgm/mgm_01/npc.c
diff --git a/src/world/area_mgm/mgm_01/mgm_01_0_header.c b/src/world/area_mgm/mgm_01/settings.c
similarity index 100%
rename from src/world/area_mgm/mgm_01/mgm_01_0_header.c
rename to src/world/area_mgm/mgm_01/settings.c
diff --git a/src/world/area_mgm/mgm_02/mgm_02_3_images.c b/src/world/area_mgm/mgm_02/images.c
similarity index 100%
rename from src/world/area_mgm/mgm_02/mgm_02_3_images.c
rename to src/world/area_mgm/mgm_02/images.c
diff --git a/src/world/area_mgm/mgm_02/mgm_02_1_main.c b/src/world/area_mgm/mgm_02/main.c
similarity index 100%
rename from src/world/area_mgm/mgm_02/mgm_02_1_main.c
rename to src/world/area_mgm/mgm_02/main.c
diff --git a/src/world/area_mgm/mgm_02/mgm_02_2_npc.c b/src/world/area_mgm/mgm_02/npc.c
similarity index 100%
rename from src/world/area_mgm/mgm_02/mgm_02_2_npc.c
rename to src/world/area_mgm/mgm_02/npc.c
diff --git a/src/world/area_mgm/mgm_02/mgm_02_0_header.c b/src/world/area_mgm/mgm_02/settings.c
similarity index 100%
rename from src/world/area_mgm/mgm_02/mgm_02_0_header.c
rename to src/world/area_mgm/mgm_02/settings.c
diff --git a/src/world/area_mgm/mgm_03/mgm_03_1_main.c b/src/world/area_mgm/mgm_03/main.c
similarity index 100%
rename from src/world/area_mgm/mgm_03/mgm_03_1_main.c
rename to src/world/area_mgm/mgm_03/main.c
diff --git a/src/world/area_mgm/mgm_03/mgm_03_0_header.c b/src/world/area_mgm/mgm_03/settings.c
similarity index 100%
rename from src/world/area_mgm/mgm_03/mgm_03_0_header.c
rename to src/world/area_mgm/mgm_03/settings.c
diff --git a/src/world/area_mim/mim_01/mim_01_3_entity.c b/src/world/area_mim/mim_01/entity.c
similarity index 100%
rename from src/world/area_mim/mim_01/mim_01_3_entity.c
rename to src/world/area_mim/mim_01/entity.c
diff --git a/src/world/area_mim/mim_01/mim_01_5_gate.c b/src/world/area_mim/mim_01/gate.c
similarity index 100%
rename from src/world/area_mim/mim_01/mim_01_5_gate.c
rename to src/world/area_mim/mim_01/gate.c
diff --git a/src/world/area_mim/mim_01/mim_01_4_hint.c b/src/world/area_mim/mim_01/hint.c
similarity index 100%
rename from src/world/area_mim/mim_01/mim_01_4_hint.c
rename to src/world/area_mim/mim_01/hint.c
diff --git a/src/world/area_mim/mim_01/mim_01_2_main.c b/src/world/area_mim/mim_01/main.c
similarity index 100%
rename from src/world/area_mim/mim_01/mim_01_2_main.c
rename to src/world/area_mim/mim_01/main.c
diff --git a/src/world/area_mim/mim_01/mim_01_1_music.c b/src/world/area_mim/mim_01/music.c
similarity index 100%
rename from src/world/area_mim/mim_01/mim_01_1_music.c
rename to src/world/area_mim/mim_01/music.c
diff --git a/src/world/area_mim/mim_01/mim_01_6_npc.c b/src/world/area_mim/mim_01/npc.c
similarity index 100%
rename from src/world/area_mim/mim_01/mim_01_6_npc.c
rename to src/world/area_mim/mim_01/npc.c
diff --git a/src/world/area_mim/mim_01/mim_01_0_header.c b/src/world/area_mim/mim_01/settings.c
similarity index 100%
rename from src/world/area_mim/mim_01/mim_01_0_header.c
rename to src/world/area_mim/mim_01/settings.c
diff --git a/src/world/area_mim/mim_02/mim_02_4_gate.c b/src/world/area_mim/mim_02/gate.c
similarity index 100%
rename from src/world/area_mim/mim_02/mim_02_4_gate.c
rename to src/world/area_mim/mim_02/gate.c
diff --git a/src/world/area_mim/mim_02/mim_02_5_hint.c b/src/world/area_mim/mim_02/hint.c
similarity index 100%
rename from src/world/area_mim/mim_02/mim_02_5_hint.c
rename to src/world/area_mim/mim_02/hint.c
diff --git a/src/world/area_mim/mim_02/mim_02_2_main.c b/src/world/area_mim/mim_02/main.c
similarity index 100%
rename from src/world/area_mim/mim_02/mim_02_2_main.c
rename to src/world/area_mim/mim_02/main.c
diff --git a/src/world/area_mim/mim_02/mim_02_1_music.c b/src/world/area_mim/mim_02/music.c
similarity index 100%
rename from src/world/area_mim/mim_02/mim_02_1_music.c
rename to src/world/area_mim/mim_02/music.c
diff --git a/src/world/area_mim/mim_02/mim_02_3_npc.c b/src/world/area_mim/mim_02/npc.c
similarity index 100%
rename from src/world/area_mim/mim_02/mim_02_3_npc.c
rename to src/world/area_mim/mim_02/npc.c
diff --git a/src/world/area_mim/mim_02/mim_02_0_header.c b/src/world/area_mim/mim_02/settings.c
similarity index 100%
rename from src/world/area_mim/mim_02/mim_02_0_header.c
rename to src/world/area_mim/mim_02/settings.c
diff --git a/src/world/area_mim/mim_03/mim_03_3_entity.c b/src/world/area_mim/mim_03/entity.c
similarity index 100%
rename from src/world/area_mim/mim_03/mim_03_3_entity.c
rename to src/world/area_mim/mim_03/entity.c
diff --git a/src/world/area_mim/mim_03/mim_03_5_gate.c b/src/world/area_mim/mim_03/gate.c
similarity index 100%
rename from src/world/area_mim/mim_03/mim_03_5_gate.c
rename to src/world/area_mim/mim_03/gate.c
diff --git a/src/world/area_mim/mim_03/mim_03_4_hint.c b/src/world/area_mim/mim_03/hint.c
similarity index 100%
rename from src/world/area_mim/mim_03/mim_03_4_hint.c
rename to src/world/area_mim/mim_03/hint.c
diff --git a/src/world/area_mim/mim_03/mim_03_2_main.c b/src/world/area_mim/mim_03/main.c
similarity index 100%
rename from src/world/area_mim/mim_03/mim_03_2_main.c
rename to src/world/area_mim/mim_03/main.c
diff --git a/src/world/area_mim/mim_03/mim_03_1_music.c b/src/world/area_mim/mim_03/music.c
similarity index 100%
rename from src/world/area_mim/mim_03/mim_03_1_music.c
rename to src/world/area_mim/mim_03/music.c
diff --git a/src/world/area_mim/mim_03/mim_03_6_npc.c b/src/world/area_mim/mim_03/npc.c
similarity index 100%
rename from src/world/area_mim/mim_03/mim_03_6_npc.c
rename to src/world/area_mim/mim_03/npc.c
diff --git a/src/world/area_mim/mim_03/mim_03_0_header.c b/src/world/area_mim/mim_03/settings.c
similarity index 100%
rename from src/world/area_mim/mim_03/mim_03_0_header.c
rename to src/world/area_mim/mim_03/settings.c
diff --git a/src/world/area_mim/mim_04/mim_04_3_entity.c b/src/world/area_mim/mim_04/entity.c
similarity index 100%
rename from src/world/area_mim/mim_04/mim_04_3_entity.c
rename to src/world/area_mim/mim_04/entity.c
diff --git a/src/world/area_mim/mim_04/mim_04_5_gate.c b/src/world/area_mim/mim_04/gate.c
similarity index 100%
rename from src/world/area_mim/mim_04/mim_04_5_gate.c
rename to src/world/area_mim/mim_04/gate.c
diff --git a/src/world/area_mim/mim_04/mim_04_4_hint.c b/src/world/area_mim/mim_04/hint.c
similarity index 100%
rename from src/world/area_mim/mim_04/mim_04_4_hint.c
rename to src/world/area_mim/mim_04/hint.c
diff --git a/src/world/area_mim/mim_04/mim_04_2_main.c b/src/world/area_mim/mim_04/main.c
similarity index 100%
rename from src/world/area_mim/mim_04/mim_04_2_main.c
rename to src/world/area_mim/mim_04/main.c
diff --git a/src/world/area_mim/mim_04/mim_04_1_music.c b/src/world/area_mim/mim_04/music.c
similarity index 100%
rename from src/world/area_mim/mim_04/mim_04_1_music.c
rename to src/world/area_mim/mim_04/music.c
diff --git a/src/world/area_mim/mim_04/mim_04_6_npc.c b/src/world/area_mim/mim_04/npc.c
similarity index 100%
rename from src/world/area_mim/mim_04/mim_04_6_npc.c
rename to src/world/area_mim/mim_04/npc.c
diff --git a/src/world/area_mim/mim_04/mim_04_0_header.c b/src/world/area_mim/mim_04/settings.c
similarity index 100%
rename from src/world/area_mim/mim_04/mim_04_0_header.c
rename to src/world/area_mim/mim_04/settings.c
diff --git a/src/world/area_mim/mim_05/mim_05_3_entity.c b/src/world/area_mim/mim_05/entity.c
similarity index 100%
rename from src/world/area_mim/mim_05/mim_05_3_entity.c
rename to src/world/area_mim/mim_05/entity.c
diff --git a/src/world/area_mim/mim_05/mim_05_5_gate.c b/src/world/area_mim/mim_05/gate.c
similarity index 100%
rename from src/world/area_mim/mim_05/mim_05_5_gate.c
rename to src/world/area_mim/mim_05/gate.c
diff --git a/src/world/area_mim/mim_05/mim_05_4_hint.c b/src/world/area_mim/mim_05/hint.c
similarity index 100%
rename from src/world/area_mim/mim_05/mim_05_4_hint.c
rename to src/world/area_mim/mim_05/hint.c
diff --git a/src/world/area_mim/mim_05/mim_05_2_main.c b/src/world/area_mim/mim_05/main.c
similarity index 100%
rename from src/world/area_mim/mim_05/mim_05_2_main.c
rename to src/world/area_mim/mim_05/main.c
diff --git a/src/world/area_mim/mim_05/mim_05_1_music.c b/src/world/area_mim/mim_05/music.c
similarity index 100%
rename from src/world/area_mim/mim_05/mim_05_1_music.c
rename to src/world/area_mim/mim_05/music.c
diff --git a/src/world/area_mim/mim_05/mim_05_6_npc.c b/src/world/area_mim/mim_05/npc.c
similarity index 100%
rename from src/world/area_mim/mim_05/mim_05_6_npc.c
rename to src/world/area_mim/mim_05/npc.c
diff --git a/src/world/area_mim/mim_05/mim_05_0_header.c b/src/world/area_mim/mim_05/settings.c
similarity index 100%
rename from src/world/area_mim/mim_05/mim_05_0_header.c
rename to src/world/area_mim/mim_05/settings.c
diff --git a/src/world/area_mim/mim_06/mim_06_3_entity.c b/src/world/area_mim/mim_06/entity.c
similarity index 100%
rename from src/world/area_mim/mim_06/mim_06_3_entity.c
rename to src/world/area_mim/mim_06/entity.c
diff --git a/src/world/area_mim/mim_06/mim_06_5_gate.c b/src/world/area_mim/mim_06/gate.c
similarity index 100%
rename from src/world/area_mim/mim_06/mim_06_5_gate.c
rename to src/world/area_mim/mim_06/gate.c
diff --git a/src/world/area_mim/mim_06/mim_06_4_hint.c b/src/world/area_mim/mim_06/hint.c
similarity index 100%
rename from src/world/area_mim/mim_06/mim_06_4_hint.c
rename to src/world/area_mim/mim_06/hint.c
diff --git a/src/world/area_mim/mim_06/mim_06_2_main.c b/src/world/area_mim/mim_06/main.c
similarity index 100%
rename from src/world/area_mim/mim_06/mim_06_2_main.c
rename to src/world/area_mim/mim_06/main.c
diff --git a/src/world/area_mim/mim_06/mim_06_1_music.c b/src/world/area_mim/mim_06/music.c
similarity index 100%
rename from src/world/area_mim/mim_06/mim_06_1_music.c
rename to src/world/area_mim/mim_06/music.c
diff --git a/src/world/area_mim/mim_06/mim_06_6_npc.c b/src/world/area_mim/mim_06/npc.c
similarity index 100%
rename from src/world/area_mim/mim_06/mim_06_6_npc.c
rename to src/world/area_mim/mim_06/npc.c
diff --git a/src/world/area_mim/mim_06/mim_06_0_header.c b/src/world/area_mim/mim_06/settings.c
similarity index 100%
rename from src/world/area_mim/mim_06/mim_06_0_header.c
rename to src/world/area_mim/mim_06/settings.c
diff --git a/src/world/area_mim/mim_07/mim_07_3_entity.c b/src/world/area_mim/mim_07/entity.c
similarity index 100%
rename from src/world/area_mim/mim_07/mim_07_3_entity.c
rename to src/world/area_mim/mim_07/entity.c
diff --git a/src/world/area_mim/mim_07/mim_07_5_gate.c b/src/world/area_mim/mim_07/gate.c
similarity index 100%
rename from src/world/area_mim/mim_07/mim_07_5_gate.c
rename to src/world/area_mim/mim_07/gate.c
diff --git a/src/world/area_mim/mim_07/mim_07_4_hint.c b/src/world/area_mim/mim_07/hint.c
similarity index 100%
rename from src/world/area_mim/mim_07/mim_07_4_hint.c
rename to src/world/area_mim/mim_07/hint.c
diff --git a/src/world/area_mim/mim_07/mim_07_2_main.c b/src/world/area_mim/mim_07/main.c
similarity index 100%
rename from src/world/area_mim/mim_07/mim_07_2_main.c
rename to src/world/area_mim/mim_07/main.c
diff --git a/src/world/area_mim/mim_07/mim_07_1_music.c b/src/world/area_mim/mim_07/music.c
similarity index 100%
rename from src/world/area_mim/mim_07/mim_07_1_music.c
rename to src/world/area_mim/mim_07/music.c
diff --git a/src/world/area_mim/mim_07/mim_07_6_npc.c b/src/world/area_mim/mim_07/npc.c
similarity index 100%
rename from src/world/area_mim/mim_07/mim_07_6_npc.c
rename to src/world/area_mim/mim_07/npc.c
diff --git a/src/world/area_mim/mim_07/mim_07_0_header.c b/src/world/area_mim/mim_07/settings.c
similarity index 100%
rename from src/world/area_mim/mim_07/mim_07_0_header.c
rename to src/world/area_mim/mim_07/settings.c
diff --git a/src/world/area_mim/mim_08/mim_08_3_entity.c b/src/world/area_mim/mim_08/entity.c
similarity index 100%
rename from src/world/area_mim/mim_08/mim_08_3_entity.c
rename to src/world/area_mim/mim_08/entity.c
diff --git a/src/world/area_mim/mim_08/mim_08_4_gate.c b/src/world/area_mim/mim_08/gate.c
similarity index 100%
rename from src/world/area_mim/mim_08/mim_08_4_gate.c
rename to src/world/area_mim/mim_08/gate.c
diff --git a/src/world/area_mim/mim_08/mim_08_2_main.c b/src/world/area_mim/mim_08/main.c
similarity index 100%
rename from src/world/area_mim/mim_08/mim_08_2_main.c
rename to src/world/area_mim/mim_08/main.c
diff --git a/src/world/area_mim/mim_08/mim_08_1_music.c b/src/world/area_mim/mim_08/music.c
similarity index 100%
rename from src/world/area_mim/mim_08/mim_08_1_music.c
rename to src/world/area_mim/mim_08/music.c
diff --git a/src/world/area_mim/mim_08/mim_08_5_npc.c b/src/world/area_mim/mim_08/npc.c
similarity index 100%
rename from src/world/area_mim/mim_08/mim_08_5_npc.c
rename to src/world/area_mim/mim_08/npc.c
diff --git a/src/world/area_mim/mim_08/mim_08_0_header.c b/src/world/area_mim/mim_08/settings.c
similarity index 100%
rename from src/world/area_mim/mim_08/mim_08_0_header.c
rename to src/world/area_mim/mim_08/settings.c
diff --git a/src/world/area_mim/mim_09/mim_09_3_entity.c b/src/world/area_mim/mim_09/entity.c
similarity index 100%
rename from src/world/area_mim/mim_09/mim_09_3_entity.c
rename to src/world/area_mim/mim_09/entity.c
diff --git a/src/world/area_mim/mim_09/mim_09_5_gate.c b/src/world/area_mim/mim_09/gate.c
similarity index 100%
rename from src/world/area_mim/mim_09/mim_09_5_gate.c
rename to src/world/area_mim/mim_09/gate.c
diff --git a/src/world/area_mim/mim_09/mim_09_4_hint.c b/src/world/area_mim/mim_09/hint.c
similarity index 100%
rename from src/world/area_mim/mim_09/mim_09_4_hint.c
rename to src/world/area_mim/mim_09/hint.c
diff --git a/src/world/area_mim/mim_09/mim_09_2_main.c b/src/world/area_mim/mim_09/main.c
similarity index 100%
rename from src/world/area_mim/mim_09/mim_09_2_main.c
rename to src/world/area_mim/mim_09/main.c
diff --git a/src/world/area_mim/mim_09/mim_09_1_music.c b/src/world/area_mim/mim_09/music.c
similarity index 100%
rename from src/world/area_mim/mim_09/mim_09_1_music.c
rename to src/world/area_mim/mim_09/music.c
diff --git a/src/world/area_mim/mim_09/mim_09_6_npc.c b/src/world/area_mim/mim_09/npc.c
similarity index 100%
rename from src/world/area_mim/mim_09/mim_09_6_npc.c
rename to src/world/area_mim/mim_09/npc.c
diff --git a/src/world/area_mim/mim_09/mim_09_0_header.c b/src/world/area_mim/mim_09/settings.c
similarity index 100%
rename from src/world/area_mim/mim_09/mim_09_0_header.c
rename to src/world/area_mim/mim_09/settings.c
diff --git a/src/world/area_mim/mim_10/mim_10_2_entity.c b/src/world/area_mim/mim_10/entity.c
similarity index 100%
rename from src/world/area_mim/mim_10/mim_10_2_entity.c
rename to src/world/area_mim/mim_10/entity.c
diff --git a/src/world/area_mim/mim_10/mim_10_3_main.c b/src/world/area_mim/mim_10/main.c
similarity index 100%
rename from src/world/area_mim/mim_10/mim_10_3_main.c
rename to src/world/area_mim/mim_10/main.c
diff --git a/src/world/area_mim/mim_10/mim_10_1_music.c b/src/world/area_mim/mim_10/music.c
similarity index 100%
rename from src/world/area_mim/mim_10/mim_10_1_music.c
rename to src/world/area_mim/mim_10/music.c
diff --git a/src/world/area_mim/mim_10/mim_10_4_npc.c b/src/world/area_mim/mim_10/npc.c
similarity index 100%
rename from src/world/area_mim/mim_10/mim_10_4_npc.c
rename to src/world/area_mim/mim_10/npc.c
diff --git a/src/world/area_mim/mim_10/mim_10_0_header.c b/src/world/area_mim/mim_10/settings.c
similarity index 100%
rename from src/world/area_mim/mim_10/mim_10_0_header.c
rename to src/world/area_mim/mim_10/settings.c
diff --git a/src/world/area_mim/mim_11/mim_11_4_entity.c b/src/world/area_mim/mim_11/entity.c
similarity index 100%
rename from src/world/area_mim/mim_11/mim_11_4_entity.c
rename to src/world/area_mim/mim_11/entity.c
diff --git a/src/world/area_mim/mim_11/mim_11_6_foliage.c b/src/world/area_mim/mim_11/foliage.c
similarity index 100%
rename from src/world/area_mim/mim_11/mim_11_6_foliage.c
rename to src/world/area_mim/mim_11/foliage.c
diff --git a/src/world/area_mim/mim_11/mim_11_3_gate.c b/src/world/area_mim/mim_11/gate.c
similarity index 100%
rename from src/world/area_mim/mim_11/mim_11_3_gate.c
rename to src/world/area_mim/mim_11/gate.c
diff --git a/src/world/area_mim/mim_11/mim_11_2_main.c b/src/world/area_mim/mim_11/main.c
similarity index 100%
rename from src/world/area_mim/mim_11/mim_11_2_main.c
rename to src/world/area_mim/mim_11/main.c
diff --git a/src/world/area_mim/mim_11/mim_11_1_music.c b/src/world/area_mim/mim_11/music.c
similarity index 100%
rename from src/world/area_mim/mim_11/mim_11_1_music.c
rename to src/world/area_mim/mim_11/music.c
diff --git a/src/world/area_mim/mim_11/mim_11_5_npc.c b/src/world/area_mim/mim_11/npc.c
similarity index 100%
rename from src/world/area_mim/mim_11/mim_11_5_npc.c
rename to src/world/area_mim/mim_11/npc.c
diff --git a/src/world/area_mim/mim_11/mim_11_0_header.c b/src/world/area_mim/mim_11/settings.c
similarity index 100%
rename from src/world/area_mim/mim_11/mim_11_0_header.c
rename to src/world/area_mim/mim_11/settings.c
diff --git a/src/world/area_mim/mim_12/mim_12_2_entity.c b/src/world/area_mim/mim_12/entity.c
similarity index 100%
rename from src/world/area_mim/mim_12/mim_12_2_entity.c
rename to src/world/area_mim/mim_12/entity.c
diff --git a/src/world/area_mim/mim_12/mim_12_5_gate.c b/src/world/area_mim/mim_12/gate.c
similarity index 100%
rename from src/world/area_mim/mim_12/mim_12_5_gate.c
rename to src/world/area_mim/mim_12/gate.c
diff --git a/src/world/area_mim/mim_12/mim_12_3_main.c b/src/world/area_mim/mim_12/main.c
similarity index 100%
rename from src/world/area_mim/mim_12/mim_12_3_main.c
rename to src/world/area_mim/mim_12/main.c
diff --git a/src/world/area_mim/mim_12/mim_12_1_music.c b/src/world/area_mim/mim_12/music.c
similarity index 100%
rename from src/world/area_mim/mim_12/mim_12_1_music.c
rename to src/world/area_mim/mim_12/music.c
diff --git a/src/world/area_mim/mim_12/mim_12_4_npc.c b/src/world/area_mim/mim_12/npc.c
similarity index 100%
rename from src/world/area_mim/mim_12/mim_12_4_npc.c
rename to src/world/area_mim/mim_12/npc.c
diff --git a/src/world/area_mim/mim_12/mim_12_0_header.c b/src/world/area_mim/mim_12/settings.c
similarity index 100%
rename from src/world/area_mim/mim_12/mim_12_0_header.c
rename to src/world/area_mim/mim_12/settings.c
diff --git a/src/world/area_nok/nok_01/nok_01_3_entity.c b/src/world/area_nok/nok_01/entity.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_3_entity.c
rename to src/world/area_nok/nok_01/entity.c
diff --git a/src/world/area_nok/nok_01/nok_01_8_foliage.c b/src/world/area_nok/nok_01/foliage.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_8_foliage.c
rename to src/world/area_nok/nok_01/foliage.c
diff --git a/src/world/area_nok/nok_01/nok_01_2_main.c b/src/world/area_nok/nok_01/main.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_2_main.c
rename to src/world/area_nok/nok_01/main.c
diff --git a/src/world/area_nok/nok_01/nok_01_1_music.c b/src/world/area_nok/nok_01/music.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_1_music.c
rename to src/world/area_nok/nok_01/music.c
diff --git a/src/world/area_nok/nok_01/nok_01_4_npc.c b/src/world/area_nok/nok_01/npc.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_4_npc.c
rename to src/world/area_nok/nok_01/npc.c
diff --git a/src/world/area_nok/nok_01/nok_01_7_radio.c b/src/world/area_nok/nok_01/radio.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_7_radio.c
rename to src/world/area_nok/nok_01/radio.c
diff --git a/src/world/area_nok/nok_01/nok_01_6_rooms.c b/src/world/area_nok/nok_01/rooms.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_6_rooms.c
rename to src/world/area_nok/nok_01/rooms.c
diff --git a/src/world/area_nok/nok_01/nok_01_0_header.c b/src/world/area_nok/nok_01/settings.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_0_header.c
rename to src/world/area_nok/nok_01/settings.c
diff --git a/src/world/area_nok/nok_01/nok_01_5_shop.c b/src/world/area_nok/nok_01/shop.c
similarity index 100%
rename from src/world/area_nok/nok_01/nok_01_5_shop.c
rename to src/world/area_nok/nok_01/shop.c
diff --git a/src/world/area_nok/nok_02/nok_02_5_bookshelf.c b/src/world/area_nok/nok_02/bookshelf.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_5_bookshelf.c
rename to src/world/area_nok/nok_02/bookshelf.c
diff --git a/src/world/area_nok/nok_02/nok_02_7_demo.c b/src/world/area_nok/nok_02/demo.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_7_demo.c
rename to src/world/area_nok/nok_02/demo.c
diff --git a/src/world/area_nok/nok_02/nok_02_3_entity.c b/src/world/area_nok/nok_02/entity.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_3_entity.c
rename to src/world/area_nok/nok_02/entity.c
diff --git a/src/world/area_nok/nok_02/nok_02_10_epilogue.c b/src/world/area_nok/nok_02/epilogue.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_10_epilogue.c
rename to src/world/area_nok/nok_02/epilogue.c
diff --git a/src/world/area_nok/nok_02/nok_02_9_foliage.c b/src/world/area_nok/nok_02/foliage.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_9_foliage.c
rename to src/world/area_nok/nok_02/foliage.c
diff --git a/src/world/area_nok/nok_02/nok_02_8_koot_favors.c b/src/world/area_nok/nok_02/koot_favors.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_8_koot_favors.c
rename to src/world/area_nok/nok_02/koot_favors.c
diff --git a/src/world/area_nok/nok_02/nok_02_2_main.c b/src/world/area_nok/nok_02/main.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_2_main.c
rename to src/world/area_nok/nok_02/main.c
diff --git a/src/world/area_nok/nok_02/nok_02_1_music.c b/src/world/area_nok/nok_02/music.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_1_music.c
rename to src/world/area_nok/nok_02/music.c
diff --git a/src/world/area_nok/nok_02/nok_02_6_npc.c b/src/world/area_nok/nok_02/npc.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_6_npc.c
rename to src/world/area_nok/nok_02/npc.c
diff --git a/src/world/area_nok/nok_02/nok_02_4_rooms.c b/src/world/area_nok/nok_02/rooms.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_4_rooms.c
rename to src/world/area_nok/nok_02/rooms.c
diff --git a/src/world/area_nok/nok_02/nok_02_0_header.c b/src/world/area_nok/nok_02/settings.c
similarity index 100%
rename from src/world/area_nok/nok_02/nok_02_0_header.c
rename to src/world/area_nok/nok_02/settings.c
diff --git a/src/world/area_nok/nok_03/nok_03_3_entity.c b/src/world/area_nok/nok_03/entity.c
similarity index 100%
rename from src/world/area_nok/nok_03/nok_03_3_entity.c
rename to src/world/area_nok/nok_03/entity.c
diff --git a/src/world/area_nok/nok_03/nok_03_2_main.c b/src/world/area_nok/nok_03/main.c
similarity index 100%
rename from src/world/area_nok/nok_03/nok_03_2_main.c
rename to src/world/area_nok/nok_03/main.c
diff --git a/src/world/area_nok/nok_03/nok_03_1_music.c b/src/world/area_nok/nok_03/music.c
similarity index 100%
rename from src/world/area_nok/nok_03/nok_03_1_music.c
rename to src/world/area_nok/nok_03/music.c
diff --git a/src/world/area_nok/nok_03/nok_03_4_npc.c b/src/world/area_nok/nok_03/npc.c
similarity index 100%
rename from src/world/area_nok/nok_03/nok_03_4_npc.c
rename to src/world/area_nok/nok_03/npc.c
diff --git a/src/world/area_nok/nok_03/nok_03_0_header.c b/src/world/area_nok/nok_03/settings.c
similarity index 100%
rename from src/world/area_nok/nok_03/nok_03_0_header.c
rename to src/world/area_nok/nok_03/settings.c
diff --git a/src/world/area_nok/nok_04/nok_04_3_entity.c b/src/world/area_nok/nok_04/entity.c
similarity index 100%
rename from src/world/area_nok/nok_04/nok_04_3_entity.c
rename to src/world/area_nok/nok_04/entity.c
diff --git a/src/world/area_nok/nok_04/nok_04_2_main.c b/src/world/area_nok/nok_04/main.c
similarity index 100%
rename from src/world/area_nok/nok_04/nok_04_2_main.c
rename to src/world/area_nok/nok_04/main.c
diff --git a/src/world/area_nok/nok_04/nok_04_1_music.c b/src/world/area_nok/nok_04/music.c
similarity index 100%
rename from src/world/area_nok/nok_04/nok_04_1_music.c
rename to src/world/area_nok/nok_04/music.c
diff --git a/src/world/area_nok/nok_04/nok_04_5_new_partner.c b/src/world/area_nok/nok_04/new_partner.c
similarity index 100%
rename from src/world/area_nok/nok_04/nok_04_5_new_partner.c
rename to src/world/area_nok/nok_04/new_partner.c
diff --git a/src/world/area_nok/nok_04/nok_04_4_npc.c b/src/world/area_nok/nok_04/npc.c
similarity index 100%
rename from src/world/area_nok/nok_04/nok_04_4_npc.c
rename to src/world/area_nok/nok_04/npc.c
diff --git a/src/world/area_nok/nok_04/nok_04_0_header.c b/src/world/area_nok/nok_04/settings.c
similarity index 100%
rename from src/world/area_nok/nok_04/nok_04_0_header.c
rename to src/world/area_nok/nok_04/settings.c
diff --git a/src/world/area_nok/nok_11/nok_11_3_entity.c b/src/world/area_nok/nok_11/entity.c
similarity index 100%
rename from src/world/area_nok/nok_11/nok_11_3_entity.c
rename to src/world/area_nok/nok_11/entity.c
diff --git a/src/world/area_nok/nok_11/nok_11_2_main.c b/src/world/area_nok/nok_11/main.c
similarity index 100%
rename from src/world/area_nok/nok_11/nok_11_2_main.c
rename to src/world/area_nok/nok_11/main.c
diff --git a/src/world/area_nok/nok_11/nok_11_1_music.c b/src/world/area_nok/nok_11/music.c
similarity index 100%
rename from src/world/area_nok/nok_11/nok_11_1_music.c
rename to src/world/area_nok/nok_11/music.c
diff --git a/src/world/area_nok/nok_11/nok_11_4_npc.c b/src/world/area_nok/nok_11/npc.c
similarity index 100%
rename from src/world/area_nok/nok_11/nok_11_4_npc.c
rename to src/world/area_nok/nok_11/npc.c
diff --git a/src/world/area_nok/nok_11/nok_11_0_header.c b/src/world/area_nok/nok_11/settings.c
similarity index 100%
rename from src/world/area_nok/nok_11/nok_11_0_header.c
rename to src/world/area_nok/nok_11/settings.c
diff --git a/src/world/area_nok/nok_12/nok_12_4_bridge.c b/src/world/area_nok/nok_12/bridge.c
similarity index 100%
rename from src/world/area_nok/nok_12/nok_12_4_bridge.c
rename to src/world/area_nok/nok_12/bridge.c
diff --git a/src/world/area_nok/nok_12/nok_12_7_demo.c b/src/world/area_nok/nok_12/demo.c
similarity index 100%
rename from src/world/area_nok/nok_12/nok_12_7_demo.c
rename to src/world/area_nok/nok_12/demo.c
diff --git a/src/world/area_nok/nok_12/nok_12_3_entity.c b/src/world/area_nok/nok_12/entity.c
similarity index 100%
rename from src/world/area_nok/nok_12/nok_12_3_entity.c
rename to src/world/area_nok/nok_12/entity.c
diff --git a/src/world/area_nok/nok_12/nok_12_5_foliage.c b/src/world/area_nok/nok_12/foliage.c
similarity index 100%
rename from src/world/area_nok/nok_12/nok_12_5_foliage.c
rename to src/world/area_nok/nok_12/foliage.c
diff --git a/src/world/area_nok/nok_12/nok_12_2_main.c b/src/world/area_nok/nok_12/main.c
similarity index 100%
rename from src/world/area_nok/nok_12/nok_12_2_main.c
rename to src/world/area_nok/nok_12/main.c
diff --git a/src/world/area_nok/nok_12/nok_12_1_music.c b/src/world/area_nok/nok_12/music.c
similarity index 100%
rename from src/world/area_nok/nok_12/nok_12_1_music.c
rename to src/world/area_nok/nok_12/music.c
diff --git a/src/world/area_nok/nok_12/nok_12_6_npc.c b/src/world/area_nok/nok_12/npc.c
similarity index 100%
rename from src/world/area_nok/nok_12/nok_12_6_npc.c
rename to src/world/area_nok/nok_12/npc.c
diff --git a/src/world/area_nok/nok_12/nok_12_0_header.c b/src/world/area_nok/nok_12/settings.c
similarity index 100%
rename from src/world/area_nok/nok_12/nok_12_0_header.c
rename to src/world/area_nok/nok_12/settings.c
diff --git a/src/world/area_nok/nok_13/nok_13_3_entity.c b/src/world/area_nok/nok_13/entity.c
similarity index 100%
rename from src/world/area_nok/nok_13/nok_13_3_entity.c
rename to src/world/area_nok/nok_13/entity.c
diff --git a/src/world/area_nok/nok_13/nok_13_2_main.c b/src/world/area_nok/nok_13/main.c
similarity index 100%
rename from src/world/area_nok/nok_13/nok_13_2_main.c
rename to src/world/area_nok/nok_13/main.c
diff --git a/src/world/area_nok/nok_13/nok_13_1_music.c b/src/world/area_nok/nok_13/music.c
similarity index 100%
rename from src/world/area_nok/nok_13/nok_13_1_music.c
rename to src/world/area_nok/nok_13/music.c
diff --git a/src/world/area_nok/nok_13/nok_13_5.c b/src/world/area_nok/nok_13/musical_hill.c
similarity index 100%
rename from src/world/area_nok/nok_13/nok_13_5.c
rename to src/world/area_nok/nok_13/musical_hill.c
diff --git a/src/world/area_nok/nok_13/nok_13_4_npc.c b/src/world/area_nok/nok_13/npc.c
similarity index 100%
rename from src/world/area_nok/nok_13/nok_13_4_npc.c
rename to src/world/area_nok/nok_13/npc.c
diff --git a/src/world/area_nok/nok_13/nok_13_0_header.c b/src/world/area_nok/nok_13/settings.c
similarity index 100%
rename from src/world/area_nok/nok_13/nok_13_0_header.c
rename to src/world/area_nok/nok_13/settings.c
diff --git a/src/world/area_nok/nok_14/nok_14_4_bridge.c b/src/world/area_nok/nok_14/bridge.c
similarity index 100%
rename from src/world/area_nok/nok_14/nok_14_4_bridge.c
rename to src/world/area_nok/nok_14/bridge.c
diff --git a/src/world/area_nok/nok_14/nok_14_3_entity.c b/src/world/area_nok/nok_14/entity.c
similarity index 100%
rename from src/world/area_nok/nok_14/nok_14_3_entity.c
rename to src/world/area_nok/nok_14/entity.c
diff --git a/src/world/area_nok/nok_14/nok_14_2_main.c b/src/world/area_nok/nok_14/main.c
similarity index 100%
rename from src/world/area_nok/nok_14/nok_14_2_main.c
rename to src/world/area_nok/nok_14/main.c
diff --git a/src/world/area_nok/nok_14/nok_14_1_music.c b/src/world/area_nok/nok_14/music.c
similarity index 100%
rename from src/world/area_nok/nok_14/nok_14_1_music.c
rename to src/world/area_nok/nok_14/music.c
diff --git a/src/world/area_nok/nok_14/nok_14_5_npc.c b/src/world/area_nok/nok_14/npc.c
similarity index 100%
rename from src/world/area_nok/nok_14/nok_14_5_npc.c
rename to src/world/area_nok/nok_14/npc.c
diff --git a/src/world/area_nok/nok_14/nok_14_0_header.c b/src/world/area_nok/nok_14/settings.c
similarity index 100%
rename from src/world/area_nok/nok_14/nok_14_0_header.c
rename to src/world/area_nok/nok_14/settings.c
diff --git a/src/world/area_nok/nok_15/nok_15_3_entity.c b/src/world/area_nok/nok_15/entity.c
similarity index 100%
rename from src/world/area_nok/nok_15/nok_15_3_entity.c
rename to src/world/area_nok/nok_15/entity.c
diff --git a/src/world/area_nok/nok_15/nok_15_5_foliage.c b/src/world/area_nok/nok_15/foliage.c
similarity index 100%
rename from src/world/area_nok/nok_15/nok_15_5_foliage.c
rename to src/world/area_nok/nok_15/foliage.c
diff --git a/src/world/area_nok/nok_15/nok_15_2_main.c b/src/world/area_nok/nok_15/main.c
similarity index 100%
rename from src/world/area_nok/nok_15/nok_15_2_main.c
rename to src/world/area_nok/nok_15/main.c
diff --git a/src/world/area_nok/nok_15/nok_15_1_music.c b/src/world/area_nok/nok_15/music.c
similarity index 100%
rename from src/world/area_nok/nok_15/nok_15_1_music.c
rename to src/world/area_nok/nok_15/music.c
diff --git a/src/world/area_nok/nok_15/nok_15_4_npc.c b/src/world/area_nok/nok_15/npc.c
similarity index 100%
rename from src/world/area_nok/nok_15/nok_15_4_npc.c
rename to src/world/area_nok/nok_15/npc.c
diff --git a/src/world/area_nok/nok_15/nok_15_0_header.c b/src/world/area_nok/nok_15/settings.c
similarity index 100%
rename from src/world/area_nok/nok_15/nok_15_0_header.c
rename to src/world/area_nok/nok_15/settings.c
diff --git a/src/world/area_obk/obk_01/obk_01_3_chandelier.c b/src/world/area_obk/obk_01/chandelier.c
similarity index 100%
rename from src/world/area_obk/obk_01/obk_01_3_chandelier.c
rename to src/world/area_obk/obk_01/chandelier.c
diff --git a/src/world/area_obk/obk_01/obk_01_7_entity.c b/src/world/area_obk/obk_01/entity.c
similarity index 100%
rename from src/world/area_obk/obk_01/obk_01_7_entity.c
rename to src/world/area_obk/obk_01/entity.c
diff --git a/src/world/area_obk/obk_01/obk_01_5_jump_scare.c b/src/world/area_obk/obk_01/jump_scare.c
similarity index 100%
rename from src/world/area_obk/obk_01/obk_01_5_jump_scare.c
rename to src/world/area_obk/obk_01/jump_scare.c
diff --git a/src/world/area_obk/obk_01/obk_01_2_main.c b/src/world/area_obk/obk_01/main.c
similarity index 100%
rename from src/world/area_obk/obk_01/obk_01_2_main.c
rename to src/world/area_obk/obk_01/main.c
diff --git a/src/world/area_obk/obk_01/obk_01_1_music.c b/src/world/area_obk/obk_01/music.c
similarity index 100%
rename from src/world/area_obk/obk_01/obk_01_1_music.c
rename to src/world/area_obk/obk_01/music.c
diff --git a/src/world/area_obk/obk_01/obk_01_6_npc.c b/src/world/area_obk/obk_01/npc.c
similarity index 100%
rename from src/world/area_obk/obk_01/obk_01_6_npc.c
rename to src/world/area_obk/obk_01/npc.c
diff --git a/src/world/area_obk/obk_01/obk_01_4_portrait.c b/src/world/area_obk/obk_01/portrait.c
similarity index 100%
rename from src/world/area_obk/obk_01/obk_01_4_portrait.c
rename to src/world/area_obk/obk_01/portrait.c
diff --git a/src/world/area_obk/obk_01/obk_01_0_header.c b/src/world/area_obk/obk_01/settings.c
similarity index 100%
rename from src/world/area_obk/obk_01/obk_01_0_header.c
rename to src/world/area_obk/obk_01/settings.c
diff --git a/src/world/area_obk/obk_02/obk_02_4_bombable.c b/src/world/area_obk/obk_02/bombable.c
similarity index 100%
rename from src/world/area_obk/obk_02/obk_02_4_bombable.c
rename to src/world/area_obk/obk_02/bombable.c
diff --git a/src/world/area_obk/obk_02/obk_02_5_clock.c b/src/world/area_obk/obk_02/clock.c
similarity index 100%
rename from src/world/area_obk/obk_02/obk_02_5_clock.c
rename to src/world/area_obk/obk_02/clock.c
diff --git a/src/world/area_obk/obk_02/obk_02_6_entity.c b/src/world/area_obk/obk_02/entity.c
similarity index 100%
rename from src/world/area_obk/obk_02/obk_02_6_entity.c
rename to src/world/area_obk/obk_02/entity.c
diff --git a/src/world/area_obk/obk_02/obk_02_2_main.c b/src/world/area_obk/obk_02/main.c
similarity index 100%
rename from src/world/area_obk/obk_02/obk_02_2_main.c
rename to src/world/area_obk/obk_02/main.c
diff --git a/src/world/area_obk/obk_02/obk_02_1_music.c b/src/world/area_obk/obk_02/music.c
similarity index 100%
rename from src/world/area_obk/obk_02/obk_02_1_music.c
rename to src/world/area_obk/obk_02/music.c
diff --git a/src/world/area_obk/obk_02/obk_02_3_npc.c b/src/world/area_obk/obk_02/npc.c
similarity index 100%
rename from src/world/area_obk/obk_02/obk_02_3_npc.c
rename to src/world/area_obk/obk_02/npc.c
diff --git a/src/world/area_obk/obk_02/obk_02_0_header.c b/src/world/area_obk/obk_02/settings.c
similarity index 100%
rename from src/world/area_obk/obk_02/obk_02_0_header.c
rename to src/world/area_obk/obk_02/settings.c
diff --git a/src/world/area_obk/obk_03/obk_03_4_entity.c b/src/world/area_obk/obk_03/entity.c
similarity index 100%
rename from src/world/area_obk/obk_03/obk_03_4_entity.c
rename to src/world/area_obk/obk_03/entity.c
diff --git a/src/world/area_obk/obk_03/obk_03_2_main.c b/src/world/area_obk/obk_03/main.c
similarity index 100%
rename from src/world/area_obk/obk_03/obk_03_2_main.c
rename to src/world/area_obk/obk_03/main.c
diff --git a/src/world/area_obk/obk_03/obk_03_1_music.c b/src/world/area_obk/obk_03/music.c
similarity index 100%
rename from src/world/area_obk/obk_03/obk_03_1_music.c
rename to src/world/area_obk/obk_03/music.c
diff --git a/src/world/area_obk/obk_03/obk_03_6_npc.c b/src/world/area_obk/obk_03/npc.c
similarity index 100%
rename from src/world/area_obk/obk_03/obk_03_6_npc.c
rename to src/world/area_obk/obk_03/npc.c
diff --git a/src/world/area_obk/obk_03/obk_03_7_rocking_chair.c b/src/world/area_obk/obk_03/rocking_chair.c
similarity index 100%
rename from src/world/area_obk/obk_03/obk_03_7_rocking_chair.c
rename to src/world/area_obk/obk_03/rocking_chair.c
diff --git a/src/world/area_obk/obk_03/obk_03_0_header.c b/src/world/area_obk/obk_03/settings.c
similarity index 100%
rename from src/world/area_obk/obk_03/obk_03_0_header.c
rename to src/world/area_obk/obk_03/settings.c
diff --git a/src/world/area_obk/obk_03/obk_03_3_shop.c b/src/world/area_obk/obk_03/shop.c
similarity index 100%
rename from src/world/area_obk/obk_03/obk_03_3_shop.c
rename to src/world/area_obk/obk_03/shop.c
diff --git a/src/world/area_obk/obk_03/obk_03_5_stairs.c b/src/world/area_obk/obk_03/stairs.c
similarity index 100%
rename from src/world/area_obk/obk_03/obk_03_5_stairs.c
rename to src/world/area_obk/obk_03/stairs.c
diff --git a/src/world/area_obk/obk_04/obk_04_2_entity.c b/src/world/area_obk/obk_04/entity.c
similarity index 100%
rename from src/world/area_obk/obk_04/obk_04_2_entity.c
rename to src/world/area_obk/obk_04/entity.c
diff --git a/src/world/area_obk/obk_04/obk_04_6_game.c b/src/world/area_obk/obk_04/game.c
similarity index 100%
rename from src/world/area_obk/obk_04/obk_04_6_game.c
rename to src/world/area_obk/obk_04/game.c
diff --git a/src/world/area_obk/obk_04/obk_04_5_hole.c b/src/world/area_obk/obk_04/hole.c
similarity index 100%
rename from src/world/area_obk/obk_04/obk_04_5_hole.c
rename to src/world/area_obk/obk_04/hole.c
diff --git a/src/world/area_obk/obk_04/obk_04_4_main.c b/src/world/area_obk/obk_04/main.c
similarity index 100%
rename from src/world/area_obk/obk_04/obk_04_4_main.c
rename to src/world/area_obk/obk_04/main.c
diff --git a/src/world/area_obk/obk_04/obk_04_1_music.c b/src/world/area_obk/obk_04/music.c
similarity index 100%
rename from src/world/area_obk/obk_04/obk_04_1_music.c
rename to src/world/area_obk/obk_04/music.c
diff --git a/src/world/area_obk/obk_04/obk_04_3_npc.c b/src/world/area_obk/obk_04/npc.c
similarity index 100%
rename from src/world/area_obk/obk_04/obk_04_3_npc.c
rename to src/world/area_obk/obk_04/npc.c
diff --git a/src/world/area_obk/obk_04/obk_04_0_header.c b/src/world/area_obk/obk_04/settings.c
similarity index 100%
rename from src/world/area_obk/obk_04/obk_04_0_header.c
rename to src/world/area_obk/obk_04/settings.c
diff --git a/src/world/area_obk/obk_05/obk_05_6_entity.c b/src/world/area_obk/obk_05/entity.c
similarity index 100%
rename from src/world/area_obk/obk_05/obk_05_6_entity.c
rename to src/world/area_obk/obk_05/entity.c
diff --git a/src/world/area_obk/obk_05/obk_05_4_hole.c b/src/world/area_obk/obk_05/hole.c
similarity index 100%
rename from src/world/area_obk/obk_05/obk_05_4_hole.c
rename to src/world/area_obk/obk_05/hole.c
diff --git a/src/world/area_obk/obk_05/obk_05_2_main.c b/src/world/area_obk/obk_05/main.c
similarity index 100%
rename from src/world/area_obk/obk_05/obk_05_2_main.c
rename to src/world/area_obk/obk_05/main.c
diff --git a/src/world/area_obk/obk_05/obk_05_1_music.c b/src/world/area_obk/obk_05/music.c
similarity index 100%
rename from src/world/area_obk/obk_05/obk_05_1_music.c
rename to src/world/area_obk/obk_05/music.c
diff --git a/src/world/area_obk/obk_05/obk_05_5_npc.c b/src/world/area_obk/obk_05/npc.c
similarity index 100%
rename from src/world/area_obk/obk_05/obk_05_5_npc.c
rename to src/world/area_obk/obk_05/npc.c
diff --git a/src/world/area_obk/obk_05/obk_05_3_rocking_chair.c b/src/world/area_obk/obk_05/rocking_chair.c
similarity index 100%
rename from src/world/area_obk/obk_05/obk_05_3_rocking_chair.c
rename to src/world/area_obk/obk_05/rocking_chair.c
diff --git a/src/world/area_obk/obk_05/obk_05_0_header.c b/src/world/area_obk/obk_05/settings.c
similarity index 100%
rename from src/world/area_obk/obk_05/obk_05_0_header.c
rename to src/world/area_obk/obk_05/settings.c
diff --git a/src/world/area_obk/obk_06/obk_06_3_bombable.c b/src/world/area_obk/obk_06/bombable.c
similarity index 100%
rename from src/world/area_obk/obk_06/obk_06_3_bombable.c
rename to src/world/area_obk/obk_06/bombable.c
diff --git a/src/world/area_obk/obk_06/obk_06_4_entity.c b/src/world/area_obk/obk_06/entity.c
similarity index 100%
rename from src/world/area_obk/obk_06/obk_06_4_entity.c
rename to src/world/area_obk/obk_06/entity.c
diff --git a/src/world/area_obk/obk_06/obk_06_2_main.c b/src/world/area_obk/obk_06/main.c
similarity index 100%
rename from src/world/area_obk/obk_06/obk_06_2_main.c
rename to src/world/area_obk/obk_06/main.c
diff --git a/src/world/area_obk/obk_06/obk_06_1_music.c b/src/world/area_obk/obk_06/music.c
similarity index 100%
rename from src/world/area_obk/obk_06/obk_06_1_music.c
rename to src/world/area_obk/obk_06/music.c
diff --git a/src/world/area_obk/obk_06/obk_06_0_header.c b/src/world/area_obk/obk_06/settings.c
similarity index 100%
rename from src/world/area_obk/obk_06/obk_06_0_header.c
rename to src/world/area_obk/obk_06/settings.c
diff --git a/src/world/area_obk/obk_07/obk_07_3_entity.c b/src/world/area_obk/obk_07/entity.c
similarity index 100%
rename from src/world/area_obk/obk_07/obk_07_3_entity.c
rename to src/world/area_obk/obk_07/entity.c
diff --git a/src/world/area_obk/obk_07/obk_07_4_fireplace.c b/src/world/area_obk/obk_07/fireplace.c
similarity index 100%
rename from src/world/area_obk/obk_07/obk_07_4_fireplace.c
rename to src/world/area_obk/obk_07/fireplace.c
diff --git a/src/world/area_obk/obk_07/obk_07_2_main.c b/src/world/area_obk/obk_07/main.c
similarity index 100%
rename from src/world/area_obk/obk_07/obk_07_2_main.c
rename to src/world/area_obk/obk_07/main.c
diff --git a/src/world/area_obk/obk_07/obk_07_1_music.c b/src/world/area_obk/obk_07/music.c
similarity index 100%
rename from src/world/area_obk/obk_07/obk_07_1_music.c
rename to src/world/area_obk/obk_07/music.c
diff --git a/src/world/area_obk/obk_07/obk_07_5_npc.c b/src/world/area_obk/obk_07/npc.c
similarity index 100%
rename from src/world/area_obk/obk_07/obk_07_5_npc.c
rename to src/world/area_obk/obk_07/npc.c
diff --git a/src/world/area_obk/obk_07/obk_07_6_phonograph.c b/src/world/area_obk/obk_07/phonograph.c
similarity index 100%
rename from src/world/area_obk/obk_07/obk_07_6_phonograph.c
rename to src/world/area_obk/obk_07/phonograph.c
diff --git a/src/world/area_obk/obk_07/obk_07_0_header.c b/src/world/area_obk/obk_07/settings.c
similarity index 100%
rename from src/world/area_obk/obk_07/obk_07_0_header.c
rename to src/world/area_obk/obk_07/settings.c
diff --git a/src/world/area_obk/obk_08/obk_08_3_cabinets.c b/src/world/area_obk/obk_08/cabinets.c
similarity index 100%
rename from src/world/area_obk/obk_08/obk_08_3_cabinets.c
rename to src/world/area_obk/obk_08/cabinets.c
diff --git a/src/world/area_obk/obk_08/obk_08_4_entity.c b/src/world/area_obk/obk_08/entity.c
similarity index 100%
rename from src/world/area_obk/obk_08/obk_08_4_entity.c
rename to src/world/area_obk/obk_08/entity.c
diff --git a/src/world/area_obk/obk_08/obk_08_6_game.c b/src/world/area_obk/obk_08/game.c
similarity index 100%
rename from src/world/area_obk/obk_08/obk_08_6_game.c
rename to src/world/area_obk/obk_08/game.c
diff --git a/src/world/area_obk/obk_08/obk_08_2_main.c b/src/world/area_obk/obk_08/main.c
similarity index 100%
rename from src/world/area_obk/obk_08/obk_08_2_main.c
rename to src/world/area_obk/obk_08/main.c
diff --git a/src/world/area_obk/obk_08/obk_08_1_music.c b/src/world/area_obk/obk_08/music.c
similarity index 100%
rename from src/world/area_obk/obk_08/obk_08_1_music.c
rename to src/world/area_obk/obk_08/music.c
diff --git a/src/world/area_obk/obk_08/obk_08_5_npc.c b/src/world/area_obk/obk_08/npc.c
similarity index 100%
rename from src/world/area_obk/obk_08/obk_08_5_npc.c
rename to src/world/area_obk/obk_08/npc.c
diff --git a/src/world/area_obk/obk_08/obk_08_0_header.c b/src/world/area_obk/obk_08/settings.c
similarity index 100%
rename from src/world/area_obk/obk_08/obk_08_0_header.c
rename to src/world/area_obk/obk_08/settings.c
diff --git a/src/world/area_obk/obk_09/obk_09_6_epilogue.c b/src/world/area_obk/obk_09/epilogue.c
similarity index 100%
rename from src/world/area_obk/obk_09/obk_09_6_epilogue.c
rename to src/world/area_obk/obk_09/epilogue.c
diff --git a/src/world/area_obk/obk_09/obk_09_2_main.c b/src/world/area_obk/obk_09/main.c
similarity index 100%
rename from src/world/area_obk/obk_09/obk_09_2_main.c
rename to src/world/area_obk/obk_09/main.c
diff --git a/src/world/area_obk/obk_09/obk_09_3_meet_bow.c b/src/world/area_obk/obk_09/meet_bow.c
similarity index 100%
rename from src/world/area_obk/obk_09/obk_09_3_meet_bow.c
rename to src/world/area_obk/obk_09/meet_bow.c
diff --git a/src/world/area_obk/obk_09/obk_09_1_music.c b/src/world/area_obk/obk_09/music.c
similarity index 100%
rename from src/world/area_obk/obk_09/obk_09_1_music.c
rename to src/world/area_obk/obk_09/music.c
diff --git a/src/world/area_obk/obk_09/obk_09_5_new_partner.c b/src/world/area_obk/obk_09/new_partner.c
similarity index 100%
rename from src/world/area_obk/obk_09/obk_09_5_new_partner.c
rename to src/world/area_obk/obk_09/new_partner.c
diff --git a/src/world/area_obk/obk_09/obk_09_4_npc.c b/src/world/area_obk/obk_09/npc.c
similarity index 100%
rename from src/world/area_obk/obk_09/obk_09_4_npc.c
rename to src/world/area_obk/obk_09/npc.c
diff --git a/src/world/area_obk/obk_09/obk_09_0_header.c b/src/world/area_obk/obk_09/settings.c
similarity index 100%
rename from src/world/area_obk/obk_09/obk_09_0_header.c
rename to src/world/area_obk/obk_09/settings.c
diff --git a/src/world/area_omo/omo_01/omo_01_5_entity.c b/src/world/area_omo/omo_01/entity.c
similarity index 100%
rename from src/world/area_omo/omo_01/omo_01_5_entity.c
rename to src/world/area_omo/omo_01/entity.c
diff --git a/src/world/area_omo/omo_01/omo_01_3_gizmos.c b/src/world/area_omo/omo_01/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_01/omo_01_3_gizmos.c
rename to src/world/area_omo/omo_01/gizmos.c
diff --git a/src/world/area_omo/omo_01/omo_01_2_main.c b/src/world/area_omo/omo_01/main.c
similarity index 100%
rename from src/world/area_omo/omo_01/omo_01_2_main.c
rename to src/world/area_omo/omo_01/main.c
diff --git a/src/world/area_omo/omo_01/omo_01_1_music.c b/src/world/area_omo/omo_01/music.c
similarity index 100%
rename from src/world/area_omo/omo_01/omo_01_1_music.c
rename to src/world/area_omo/omo_01/music.c
diff --git a/src/world/area_omo/omo_01/omo_01_4_npc.c b/src/world/area_omo/omo_01/npc.c
similarity index 100%
rename from src/world/area_omo/omo_01/omo_01_4_npc.c
rename to src/world/area_omo/omo_01/npc.c
diff --git a/src/world/area_omo/omo_01/omo_01_0_header.c b/src/world/area_omo/omo_01/settings.c
similarity index 100%
rename from src/world/area_omo/omo_01/omo_01_0_header.c
rename to src/world/area_omo/omo_01/settings.c
diff --git a/src/world/area_omo/omo_02/omo_02_5_barricade.c b/src/world/area_omo/omo_02/barricade.c
similarity index 100%
rename from src/world/area_omo/omo_02/omo_02_5_barricade.c
rename to src/world/area_omo/omo_02/barricade.c
diff --git a/src/world/area_omo/omo_02/omo_02_3_entity.c b/src/world/area_omo/omo_02/entity.c
similarity index 100%
rename from src/world/area_omo/omo_02/omo_02_3_entity.c
rename to src/world/area_omo/omo_02/entity.c
diff --git a/src/world/area_omo/omo_02/omo_02_4_gizmos.c b/src/world/area_omo/omo_02/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_02/omo_02_4_gizmos.c
rename to src/world/area_omo/omo_02/gizmos.c
diff --git a/src/world/area_omo/omo_02/omo_02_2_main.c b/src/world/area_omo/omo_02/main.c
similarity index 100%
rename from src/world/area_omo/omo_02/omo_02_2_main.c
rename to src/world/area_omo/omo_02/main.c
diff --git a/src/world/area_omo/omo_02/omo_02_1_music.c b/src/world/area_omo/omo_02/music.c
similarity index 100%
rename from src/world/area_omo/omo_02/omo_02_1_music.c
rename to src/world/area_omo/omo_02/music.c
diff --git a/src/world/area_omo/omo_02/omo_02_6_npc.c b/src/world/area_omo/omo_02/npc.c
similarity index 100%
rename from src/world/area_omo/omo_02/omo_02_6_npc.c
rename to src/world/area_omo/omo_02/npc.c
diff --git a/src/world/area_omo/omo_02/omo_02_0_header.c b/src/world/area_omo/omo_02/settings.c
similarity index 100%
rename from src/world/area_omo/omo_02/omo_02_0_header.c
rename to src/world/area_omo/omo_02/settings.c
diff --git a/src/world/area_omo/omo_03/omo_03_4_entity.c b/src/world/area_omo/omo_03/entity.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_4_entity.c
rename to src/world/area_omo/omo_03/entity.c
diff --git a/src/world/area_omo/omo_03/omo_03_8_epilogue.c b/src/world/area_omo/omo_03/epilogue.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_8_epilogue.c
rename to src/world/area_omo/omo_03/epilogue.c
diff --git a/src/world/area_omo/omo_03/omo_03_3_gizmos.c b/src/world/area_omo/omo_03/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_3_gizmos.c
rename to src/world/area_omo/omo_03/gizmos.c
diff --git a/src/world/area_omo/omo_03/omo_03_2_main.c b/src/world/area_omo/omo_03/main.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_2_main.c
rename to src/world/area_omo/omo_03/main.c
diff --git a/src/world/area_omo/omo_03/omo_03_1_music.c b/src/world/area_omo/omo_03/music.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_1_music.c
rename to src/world/area_omo/omo_03/music.c
diff --git a/src/world/area_omo/omo_03/omo_03_5_npc.c b/src/world/area_omo/omo_03/npc.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_5_npc.c
rename to src/world/area_omo/omo_03/npc.c
diff --git a/src/world/area_omo/omo_03/omo_03_0_header.c b/src/world/area_omo/omo_03/settings.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_0_header.c
rename to src/world/area_omo/omo_03/settings.c
diff --git a/src/world/area_omo/omo_03/omo_03_6_train.c b/src/world/area_omo/omo_03/train.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_6_train.c
rename to src/world/area_omo/omo_03/train.c
diff --git a/src/world/area_omo/omo_03/omo_03_7_train_drop.c b/src/world/area_omo/omo_03/train_drop.c
similarity index 100%
rename from src/world/area_omo/omo_03/omo_03_7_train_drop.c
rename to src/world/area_omo/omo_03/train_drop.c
diff --git a/src/world/area_omo/omo_04/omo_04_4_entity.c b/src/world/area_omo/omo_04/entity.c
similarity index 100%
rename from src/world/area_omo/omo_04/omo_04_4_entity.c
rename to src/world/area_omo/omo_04/entity.c
diff --git a/src/world/area_omo/omo_04/omo_04_3_gizmos.c b/src/world/area_omo/omo_04/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_04/omo_04_3_gizmos.c
rename to src/world/area_omo/omo_04/gizmos.c
diff --git a/src/world/area_omo/omo_04/omo_04_2_main.c b/src/world/area_omo/omo_04/main.c
similarity index 100%
rename from src/world/area_omo/omo_04/omo_04_2_main.c
rename to src/world/area_omo/omo_04/main.c
diff --git a/src/world/area_omo/omo_04/omo_04_1_music.c b/src/world/area_omo/omo_04/music.c
similarity index 100%
rename from src/world/area_omo/omo_04/omo_04_1_music.c
rename to src/world/area_omo/omo_04/music.c
diff --git a/src/world/area_omo/omo_04/omo_04_5_npc.c b/src/world/area_omo/omo_04/npc.c
similarity index 100%
rename from src/world/area_omo/omo_04/omo_04_5_npc.c
rename to src/world/area_omo/omo_04/npc.c
diff --git a/src/world/area_omo/omo_04/omo_04_6_scenes.c b/src/world/area_omo/omo_04/scenes.c
similarity index 100%
rename from src/world/area_omo/omo_04/omo_04_6_scenes.c
rename to src/world/area_omo/omo_04/scenes.c
diff --git a/src/world/area_omo/omo_04/omo_04_0_header.c b/src/world/area_omo/omo_04/settings.c
similarity index 100%
rename from src/world/area_omo/omo_04/omo_04_0_header.c
rename to src/world/area_omo/omo_04/settings.c
diff --git a/src/world/area_omo/omo_05/omo_05_5_entity.c b/src/world/area_omo/omo_05/entity.c
similarity index 100%
rename from src/world/area_omo/omo_05/omo_05_5_entity.c
rename to src/world/area_omo/omo_05/entity.c
diff --git a/src/world/area_omo/omo_05/omo_05_3_gizmos.c b/src/world/area_omo/omo_05/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_05/omo_05_3_gizmos.c
rename to src/world/area_omo/omo_05/gizmos.c
diff --git a/src/world/area_omo/omo_05/omo_05_2_main.c b/src/world/area_omo/omo_05/main.c
similarity index 100%
rename from src/world/area_omo/omo_05/omo_05_2_main.c
rename to src/world/area_omo/omo_05/main.c
diff --git a/src/world/area_omo/omo_05/omo_05_1_music.c b/src/world/area_omo/omo_05/music.c
similarity index 100%
rename from src/world/area_omo/omo_05/omo_05_1_music.c
rename to src/world/area_omo/omo_05/music.c
diff --git a/src/world/area_omo/omo_05/omo_05_4_npc.c b/src/world/area_omo/omo_05/npc.c
similarity index 100%
rename from src/world/area_omo/omo_05/omo_05_4_npc.c
rename to src/world/area_omo/omo_05/npc.c
diff --git a/src/world/area_omo/omo_05/omo_05_0_header.c b/src/world/area_omo/omo_05/settings.c
similarity index 100%
rename from src/world/area_omo/omo_05/omo_05_0_header.c
rename to src/world/area_omo/omo_05/settings.c
diff --git a/src/world/area_omo/omo_06/omo_06_6_entity.c b/src/world/area_omo/omo_06/entity.c
similarity index 100%
rename from src/world/area_omo/omo_06/omo_06_6_entity.c
rename to src/world/area_omo/omo_06/entity.c
diff --git a/src/world/area_omo/omo_06/omo_06_3_gizmos.c b/src/world/area_omo/omo_06/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_06/omo_06_3_gizmos.c
rename to src/world/area_omo/omo_06/gizmos.c
diff --git a/src/world/area_omo/omo_06/omo_06_2_main.c b/src/world/area_omo/omo_06/main.c
similarity index 100%
rename from src/world/area_omo/omo_06/omo_06_2_main.c
rename to src/world/area_omo/omo_06/main.c
diff --git a/src/world/area_omo/omo_06/omo_06_1_music.c b/src/world/area_omo/omo_06/music.c
similarity index 100%
rename from src/world/area_omo/omo_06/omo_06_1_music.c
rename to src/world/area_omo/omo_06/music.c
diff --git a/src/world/area_omo/omo_06/omo_06_5_npc.c b/src/world/area_omo/omo_06/npc.c
similarity index 100%
rename from src/world/area_omo/omo_06/omo_06_5_npc.c
rename to src/world/area_omo/omo_06/npc.c
diff --git a/src/world/area_omo/omo_06/omo_06_0_header.c b/src/world/area_omo/omo_06/settings.c
similarity index 100%
rename from src/world/area_omo/omo_06/omo_06_0_header.c
rename to src/world/area_omo/omo_06/settings.c
diff --git a/src/world/area_omo/omo_06/omo_06_4_train.c b/src/world/area_omo/omo_06/train.c
similarity index 100%
rename from src/world/area_omo/omo_06/omo_06_4_train.c
rename to src/world/area_omo/omo_06/train.c
diff --git a/src/world/area_omo/omo_07/omo_07_5_entity.c b/src/world/area_omo/omo_07/entity.c
similarity index 100%
rename from src/world/area_omo/omo_07/omo_07_5_entity.c
rename to src/world/area_omo/omo_07/entity.c
diff --git a/src/world/area_omo/omo_07/omo_07_3_gizmos.c b/src/world/area_omo/omo_07/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_07/omo_07_3_gizmos.c
rename to src/world/area_omo/omo_07/gizmos.c
diff --git a/src/world/area_omo/omo_07/omo_07_2_main.c b/src/world/area_omo/omo_07/main.c
similarity index 100%
rename from src/world/area_omo/omo_07/omo_07_2_main.c
rename to src/world/area_omo/omo_07/main.c
diff --git a/src/world/area_omo/omo_07/omo_07_1_music.c b/src/world/area_omo/omo_07/music.c
similarity index 100%
rename from src/world/area_omo/omo_07/omo_07_1_music.c
rename to src/world/area_omo/omo_07/music.c
diff --git a/src/world/area_omo/omo_07/omo_07_4_npc.c b/src/world/area_omo/omo_07/npc.c
similarity index 100%
rename from src/world/area_omo/omo_07/omo_07_4_npc.c
rename to src/world/area_omo/omo_07/npc.c
diff --git a/src/world/area_omo/omo_07/omo_07_6_scenes.c b/src/world/area_omo/omo_07/scenes.c
similarity index 100%
rename from src/world/area_omo/omo_07/omo_07_6_scenes.c
rename to src/world/area_omo/omo_07/scenes.c
diff --git a/src/world/area_omo/omo_07/omo_07_0_header.c b/src/world/area_omo/omo_07/settings.c
similarity index 100%
rename from src/world/area_omo/omo_07/omo_07_0_header.c
rename to src/world/area_omo/omo_07/settings.c
diff --git a/src/world/area_omo/omo_08/omo_08_3_boxes.c b/src/world/area_omo/omo_08/boxes.c
similarity index 100%
rename from src/world/area_omo/omo_08/omo_08_3_boxes.c
rename to src/world/area_omo/omo_08/boxes.c
diff --git a/src/world/area_omo/omo_08/omo_08_5_entity.c b/src/world/area_omo/omo_08/entity.c
similarity index 100%
rename from src/world/area_omo/omo_08/omo_08_5_entity.c
rename to src/world/area_omo/omo_08/entity.c
diff --git a/src/world/area_omo/omo_08/omo_08_2_main.c b/src/world/area_omo/omo_08/main.c
similarity index 100%
rename from src/world/area_omo/omo_08/omo_08_2_main.c
rename to src/world/area_omo/omo_08/main.c
diff --git a/src/world/area_omo/omo_08/omo_08_1_music.c b/src/world/area_omo/omo_08/music.c
similarity index 100%
rename from src/world/area_omo/omo_08/omo_08_1_music.c
rename to src/world/area_omo/omo_08/music.c
diff --git a/src/world/area_omo/omo_08/omo_08_6_npc.c b/src/world/area_omo/omo_08/npc.c
similarity index 100%
rename from src/world/area_omo/omo_08/omo_08_6_npc.c
rename to src/world/area_omo/omo_08/npc.c
diff --git a/src/world/area_omo/omo_08/omo_08_0_header.c b/src/world/area_omo/omo_08/settings.c
similarity index 100%
rename from src/world/area_omo/omo_08/omo_08_0_header.c
rename to src/world/area_omo/omo_08/settings.c
diff --git a/src/world/area_omo/omo_08/omo_08_4_train.c b/src/world/area_omo/omo_08/train.c
similarity index 100%
rename from src/world/area_omo/omo_08/omo_08_4_train.c
rename to src/world/area_omo/omo_08/train.c
diff --git a/src/world/area_omo/omo_09/omo_09_3_conveyors.c b/src/world/area_omo/omo_09/conveyors.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_3_conveyors.c
rename to src/world/area_omo/omo_09/conveyors.c
diff --git a/src/world/area_omo/omo_09/omo_09_6_entity.c b/src/world/area_omo/omo_09/entity.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_6_entity.c
rename to src/world/area_omo/omo_09/entity.c
diff --git a/src/world/area_omo/omo_09/omo_09_5_gizmos.c b/src/world/area_omo/omo_09/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_5_gizmos.c
rename to src/world/area_omo/omo_09/gizmos.c
diff --git a/src/world/area_omo/omo_09/omo_09_2_main.c b/src/world/area_omo/omo_09/main.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_2_main.c
rename to src/world/area_omo/omo_09/main.c
diff --git a/src/world/area_omo/omo_09/omo_09_1_music.c b/src/world/area_omo/omo_09/music.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_1_music.c
rename to src/world/area_omo/omo_09/music.c
diff --git a/src/world/area_omo/omo_09/omo_09_7_npc.c b/src/world/area_omo/omo_09/npc.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_7_npc.c
rename to src/world/area_omo/omo_09/npc.c
diff --git a/src/world/area_omo/omo_09/omo_09_8_scenes.c b/src/world/area_omo/omo_09/scenes.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_8_scenes.c
rename to src/world/area_omo/omo_09/scenes.c
diff --git a/src/world/area_omo/omo_09/omo_09_0_header.c b/src/world/area_omo/omo_09/settings.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_0_header.c
rename to src/world/area_omo/omo_09/settings.c
diff --git a/src/world/area_omo/omo_09/omo_09_4_slot_machine.c b/src/world/area_omo/omo_09/slot_machine.c
similarity index 100%
rename from src/world/area_omo/omo_09/omo_09_4_slot_machine.c
rename to src/world/area_omo/omo_09/slot_machine.c
diff --git a/src/world/area_omo/omo_10/omo_10_6_entity.c b/src/world/area_omo/omo_10/entity.c
similarity index 100%
rename from src/world/area_omo/omo_10/omo_10_6_entity.c
rename to src/world/area_omo/omo_10/entity.c
diff --git a/src/world/area_omo/omo_10/omo_10_3_gizmos.c b/src/world/area_omo/omo_10/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_10/omo_10_3_gizmos.c
rename to src/world/area_omo/omo_10/gizmos.c
diff --git a/src/world/area_omo/omo_10/omo_10_2_main.c b/src/world/area_omo/omo_10/main.c
similarity index 100%
rename from src/world/area_omo/omo_10/omo_10_2_main.c
rename to src/world/area_omo/omo_10/main.c
diff --git a/src/world/area_omo/omo_10/omo_10_1_music.c b/src/world/area_omo/omo_10/music.c
similarity index 100%
rename from src/world/area_omo/omo_10/omo_10_1_music.c
rename to src/world/area_omo/omo_10/music.c
diff --git a/src/world/area_omo/omo_10/omo_10_5_npc.c b/src/world/area_omo/omo_10/npc.c
similarity index 100%
rename from src/world/area_omo/omo_10/omo_10_5_npc.c
rename to src/world/area_omo/omo_10/npc.c
diff --git a/src/world/area_omo/omo_10/omo_10_0_header.c b/src/world/area_omo/omo_10/settings.c
similarity index 100%
rename from src/world/area_omo/omo_10/omo_10_0_header.c
rename to src/world/area_omo/omo_10/settings.c
diff --git a/src/world/area_omo/omo_10/omo_10_4_train.c b/src/world/area_omo/omo_10/train.c
similarity index 100%
rename from src/world/area_omo/omo_10/omo_10_4_train.c
rename to src/world/area_omo/omo_10/train.c
diff --git a/src/world/area_omo/omo_11/omo_11_4_entity.c b/src/world/area_omo/omo_11/entity.c
similarity index 100%
rename from src/world/area_omo/omo_11/omo_11_4_entity.c
rename to src/world/area_omo/omo_11/entity.c
diff --git a/src/world/area_omo/omo_11/omo_11_3_gizmos.c b/src/world/area_omo/omo_11/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_11/omo_11_3_gizmos.c
rename to src/world/area_omo/omo_11/gizmos.c
diff --git a/src/world/area_omo/omo_11/omo_11_2_main.c b/src/world/area_omo/omo_11/main.c
similarity index 100%
rename from src/world/area_omo/omo_11/omo_11_2_main.c
rename to src/world/area_omo/omo_11/main.c
diff --git a/src/world/area_omo/omo_11/omo_11_1_music.c b/src/world/area_omo/omo_11/music.c
similarity index 100%
rename from src/world/area_omo/omo_11/omo_11_1_music.c
rename to src/world/area_omo/omo_11/music.c
diff --git a/src/world/area_omo/omo_11/omo_11_5_npc.c b/src/world/area_omo/omo_11/npc.c
similarity index 100%
rename from src/world/area_omo/omo_11/omo_11_5_npc.c
rename to src/world/area_omo/omo_11/npc.c
diff --git a/src/world/area_omo/omo_11/omo_11_0_header.c b/src/world/area_omo/omo_11/settings.c
similarity index 100%
rename from src/world/area_omo/omo_11/omo_11_0_header.c
rename to src/world/area_omo/omo_11/settings.c
diff --git a/src/world/area_omo/omo_12/omo_12_2_main.c b/src/world/area_omo/omo_12/main.c
similarity index 100%
rename from src/world/area_omo/omo_12/omo_12_2_main.c
rename to src/world/area_omo/omo_12/main.c
diff --git a/src/world/area_omo/omo_12/omo_12_1_music.c b/src/world/area_omo/omo_12/music.c
similarity index 100%
rename from src/world/area_omo/omo_12/omo_12_1_music.c
rename to src/world/area_omo/omo_12/music.c
diff --git a/src/world/area_omo/omo_12/omo_12_4_new_partner.c b/src/world/area_omo/omo_12/new_partner.c
similarity index 100%
rename from src/world/area_omo/omo_12/omo_12_4_new_partner.c
rename to src/world/area_omo/omo_12/new_partner.c
diff --git a/src/world/area_omo/omo_12/omo_12_3_npc.c b/src/world/area_omo/omo_12/npc.c
similarity index 100%
rename from src/world/area_omo/omo_12/omo_12_3_npc.c
rename to src/world/area_omo/omo_12/npc.c
diff --git a/src/world/area_omo/omo_12/omo_12_0_header.c b/src/world/area_omo/omo_12/settings.c
similarity index 100%
rename from src/world/area_omo/omo_12/omo_12_0_header.c
rename to src/world/area_omo/omo_12/settings.c
diff --git a/src/world/area_omo/omo_13/omo_13_5_entity.c b/src/world/area_omo/omo_13/entity.c
similarity index 100%
rename from src/world/area_omo/omo_13/omo_13_5_entity.c
rename to src/world/area_omo/omo_13/entity.c
diff --git a/src/world/area_omo/omo_13/omo_13_3_gizmos.c b/src/world/area_omo/omo_13/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_13/omo_13_3_gizmos.c
rename to src/world/area_omo/omo_13/gizmos.c
diff --git a/src/world/area_omo/omo_13/omo_13_2_main.c b/src/world/area_omo/omo_13/main.c
similarity index 100%
rename from src/world/area_omo/omo_13/omo_13_2_main.c
rename to src/world/area_omo/omo_13/main.c
diff --git a/src/world/area_omo/omo_13/omo_13_1_music.c b/src/world/area_omo/omo_13/music.c
similarity index 100%
rename from src/world/area_omo/omo_13/omo_13_1_music.c
rename to src/world/area_omo/omo_13/music.c
diff --git a/src/world/area_omo/omo_13/omo_13_4_npc.c b/src/world/area_omo/omo_13/npc.c
similarity index 100%
rename from src/world/area_omo/omo_13/omo_13_4_npc.c
rename to src/world/area_omo/omo_13/npc.c
diff --git a/src/world/area_omo/omo_13/omo_13_0_header.c b/src/world/area_omo/omo_13/settings.c
similarity index 100%
rename from src/world/area_omo/omo_13/omo_13_0_header.c
rename to src/world/area_omo/omo_13/settings.c
diff --git a/src/world/area_omo/omo_14/omo_14_2_main.c b/src/world/area_omo/omo_14/main.c
similarity index 100%
rename from src/world/area_omo/omo_14/omo_14_2_main.c
rename to src/world/area_omo/omo_14/main.c
diff --git a/src/world/area_omo/omo_14/omo_14_1_music.c b/src/world/area_omo/omo_14/music.c
similarity index 100%
rename from src/world/area_omo/omo_14/omo_14_1_music.c
rename to src/world/area_omo/omo_14/music.c
diff --git a/src/world/area_omo/omo_14/omo_14_3_npc.c b/src/world/area_omo/omo_14/npc.c
similarity index 100%
rename from src/world/area_omo/omo_14/omo_14_3_npc.c
rename to src/world/area_omo/omo_14/npc.c
diff --git a/src/world/area_omo/omo_14/omo_14_0_header.c b/src/world/area_omo/omo_14/settings.c
similarity index 100%
rename from src/world/area_omo/omo_14/omo_14_0_header.c
rename to src/world/area_omo/omo_14/settings.c
diff --git a/src/world/area_omo/omo_15/omo_15_2_main.c b/src/world/area_omo/omo_15/main.c
similarity index 100%
rename from src/world/area_omo/omo_15/omo_15_2_main.c
rename to src/world/area_omo/omo_15/main.c
diff --git a/src/world/area_omo/omo_15/omo_15_1_music.c b/src/world/area_omo/omo_15/music.c
similarity index 100%
rename from src/world/area_omo/omo_15/omo_15_1_music.c
rename to src/world/area_omo/omo_15/music.c
diff --git a/src/world/area_omo/omo_15/omo_15_3_npc.c b/src/world/area_omo/omo_15/npc.c
similarity index 100%
rename from src/world/area_omo/omo_15/omo_15_3_npc.c
rename to src/world/area_omo/omo_15/npc.c
diff --git a/src/world/area_omo/omo_15/omo_15_0_header.c b/src/world/area_omo/omo_15/settings.c
similarity index 100%
rename from src/world/area_omo/omo_15/omo_15_0_header.c
rename to src/world/area_omo/omo_15/settings.c
diff --git a/src/world/area_omo/omo_16/omo_16_1_main.c b/src/world/area_omo/omo_16/main.c
similarity index 100%
rename from src/world/area_omo/omo_16/omo_16_1_main.c
rename to src/world/area_omo/omo_16/main.c
diff --git a/src/world/area_omo/omo_16/omo_16_3_npc.c b/src/world/area_omo/omo_16/npc.c
similarity index 100%
rename from src/world/area_omo/omo_16/omo_16_3_npc.c
rename to src/world/area_omo/omo_16/npc.c
diff --git a/src/world/area_omo/omo_16/omo_16_0_header.c b/src/world/area_omo/omo_16/settings.c
similarity index 100%
rename from src/world/area_omo/omo_16/omo_16_0_header.c
rename to src/world/area_omo/omo_16/settings.c
diff --git a/src/world/area_omo/omo_16/omo_16_2_train.c b/src/world/area_omo/omo_16/train.c
similarity index 100%
rename from src/world/area_omo/omo_16/omo_16_2_train.c
rename to src/world/area_omo/omo_16/train.c
diff --git a/src/world/area_omo/omo_17/omo_17_5_entity.c b/src/world/area_omo/omo_17/entity.c
similarity index 100%
rename from src/world/area_omo/omo_17/omo_17_5_entity.c
rename to src/world/area_omo/omo_17/entity.c
diff --git a/src/world/area_omo/omo_17/omo_17_2_gizmos.c b/src/world/area_omo/omo_17/gizmos.c
similarity index 100%
rename from src/world/area_omo/omo_17/omo_17_2_gizmos.c
rename to src/world/area_omo/omo_17/gizmos.c
diff --git a/src/world/area_omo/omo_17/omo_17_1_main.c b/src/world/area_omo/omo_17/main.c
similarity index 100%
rename from src/world/area_omo/omo_17/omo_17_1_main.c
rename to src/world/area_omo/omo_17/main.c
diff --git a/src/world/area_omo/omo_17/omo_17_4_npc.c b/src/world/area_omo/omo_17/npc.c
similarity index 100%
rename from src/world/area_omo/omo_17/omo_17_4_npc.c
rename to src/world/area_omo/omo_17/npc.c
diff --git a/src/world/area_omo/omo_17/omo_17_0_header.c b/src/world/area_omo/omo_17/settings.c
similarity index 100%
rename from src/world/area_omo/omo_17/omo_17_0_header.c
rename to src/world/area_omo/omo_17/settings.c
diff --git a/src/world/area_omo/omo_17/omo_17_3_train.c b/src/world/area_omo/omo_17/train.c
similarity index 100%
rename from src/world/area_omo/omo_17/omo_17_3_train.c
rename to src/world/area_omo/omo_17/train.c
diff --git a/src/world/area_osr/osr_00/osr_00_2_main.c b/src/world/area_osr/osr_00/main.c
similarity index 100%
rename from src/world/area_osr/osr_00/osr_00_2_main.c
rename to src/world/area_osr/osr_00/main.c
diff --git a/src/world/area_osr/osr_00/osr_00_1_music.c b/src/world/area_osr/osr_00/music.c
similarity index 100%
rename from src/world/area_osr/osr_00/osr_00_1_music.c
rename to src/world/area_osr/osr_00/music.c
diff --git a/src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c b/src/world/area_osr/osr_00/npc_epilogue.c
similarity index 100%
rename from src/world/area_osr/osr_00/osr_00_4_npc_epilogue.c
rename to src/world/area_osr/osr_00/npc_epilogue.c
diff --git a/src/world/area_osr/osr_00/osr_00_3_npc_intro.c b/src/world/area_osr/osr_00/npc_intro.c
similarity index 100%
rename from src/world/area_osr/osr_00/osr_00_3_npc_intro.c
rename to src/world/area_osr/osr_00/npc_intro.c
diff --git a/src/world/area_osr/osr_00/osr_00_5_scenes.c b/src/world/area_osr/osr_00/scenes.c
similarity index 100%
rename from src/world/area_osr/osr_00/osr_00_5_scenes.c
rename to src/world/area_osr/osr_00/scenes.c
diff --git a/src/world/area_osr/osr_00/osr_00_0_header.c b/src/world/area_osr/osr_00/settings.c
similarity index 100%
rename from src/world/area_osr/osr_00/osr_00_0_header.c
rename to src/world/area_osr/osr_00/settings.c
diff --git a/src/world/area_osr/osr_01/osr_01_2_main.c b/src/world/area_osr/osr_01/main.c
similarity index 100%
rename from src/world/area_osr/osr_01/osr_01_2_main.c
rename to src/world/area_osr/osr_01/main.c
diff --git a/src/world/area_osr/osr_01/osr_01_1_music.c b/src/world/area_osr/osr_01/music.c
similarity index 100%
rename from src/world/area_osr/osr_01/osr_01_1_music.c
rename to src/world/area_osr/osr_01/music.c
diff --git a/src/world/area_osr/osr_01/osr_01_3_npc.c b/src/world/area_osr/osr_01/npc.c
similarity index 100%
rename from src/world/area_osr/osr_01/osr_01_3_npc.c
rename to src/world/area_osr/osr_01/npc.c
diff --git a/src/world/area_osr/osr_01/osr_01_0_header.c b/src/world/area_osr/osr_01/settings.c
similarity index 100%
rename from src/world/area_osr/osr_01/osr_01_0_header.c
rename to src/world/area_osr/osr_01/settings.c
diff --git a/src/world/area_osr/osr_02/osr_02_2_entity.c b/src/world/area_osr/osr_02/entity.c
similarity index 100%
rename from src/world/area_osr/osr_02/osr_02_2_entity.c
rename to src/world/area_osr/osr_02/entity.c
diff --git a/src/world/area_osr/osr_02/osr_02_1_main.c b/src/world/area_osr/osr_02/main.c
similarity index 100%
rename from src/world/area_osr/osr_02/osr_02_1_main.c
rename to src/world/area_osr/osr_02/main.c
diff --git a/src/world/area_osr/osr_02/osr_02_3_npc.c b/src/world/area_osr/osr_02/npc.c
similarity index 100%
rename from src/world/area_osr/osr_02/osr_02_3_npc.c
rename to src/world/area_osr/osr_02/npc.c
diff --git a/src/world/area_osr/osr_02/osr_02_4_npc_peach.c b/src/world/area_osr/osr_02/npc_peach.c
similarity index 100%
rename from src/world/area_osr/osr_02/osr_02_4_npc_peach.c
rename to src/world/area_osr/osr_02/npc_peach.c
diff --git a/src/world/area_osr/osr_02/osr_02_0_header.c b/src/world/area_osr/osr_02/settings.c
similarity index 100%
rename from src/world/area_osr/osr_02/osr_02_0_header.c
rename to src/world/area_osr/osr_02/settings.c
diff --git a/src/world/area_osr/osr_03/osr_03_6_ending.c b/src/world/area_osr/osr_03/ending.c
similarity index 100%
rename from src/world/area_osr/osr_03/osr_03_6_ending.c
rename to src/world/area_osr/osr_03/ending.c
diff --git a/src/world/area_osr/osr_03/osr_03_5_interlude.c b/src/world/area_osr/osr_03/interlude.c
similarity index 100%
rename from src/world/area_osr/osr_03/osr_03_5_interlude.c
rename to src/world/area_osr/osr_03/interlude.c
diff --git a/src/world/area_osr/osr_03/osr_03_3_intro.c b/src/world/area_osr/osr_03/intro.c
similarity index 100%
rename from src/world/area_osr/osr_03/osr_03_3_intro.c
rename to src/world/area_osr/osr_03/intro.c
diff --git a/src/world/area_osr/osr_03/osr_03_1_main.c b/src/world/area_osr/osr_03/main.c
similarity index 100%
rename from src/world/area_osr/osr_03/osr_03_1_main.c
rename to src/world/area_osr/osr_03/main.c
diff --git a/src/world/area_osr/osr_03/osr_03_2_npc.c b/src/world/area_osr/osr_03/npc.c
similarity index 100%
rename from src/world/area_osr/osr_03/osr_03_2_npc.c
rename to src/world/area_osr/osr_03/npc.c
diff --git a/src/world/area_osr/osr_03/osr_03_0_header.c b/src/world/area_osr/osr_03/settings.c
similarity index 100%
rename from src/world/area_osr/osr_03/osr_03_0_header.c
rename to src/world/area_osr/osr_03/settings.c
diff --git a/src/world/area_osr/osr_03/osr_03_4_starship.c b/src/world/area_osr/osr_03/starship.c
similarity index 100%
rename from src/world/area_osr/osr_03/osr_03_4_starship.c
rename to src/world/area_osr/osr_03/starship.c
diff --git a/src/world/area_osr/osr_04/osr_04_2_assault.c b/src/world/area_osr/osr_04/assault.c
similarity index 100%
rename from src/world/area_osr/osr_04/osr_04_2_assault.c
rename to src/world/area_osr/osr_04/assault.c
diff --git a/src/world/area_osr/osr_04/osr_04_1_main.c b/src/world/area_osr/osr_04/main.c
similarity index 100%
rename from src/world/area_osr/osr_04/osr_04_1_main.c
rename to src/world/area_osr/osr_04/main.c
diff --git a/src/world/area_osr/osr_04/osr_04_0_header.c b/src/world/area_osr/osr_04/settings.c
similarity index 100%
rename from src/world/area_osr/osr_04/osr_04_0_header.c
rename to src/world/area_osr/osr_04/settings.c
diff --git a/src/world/area_pra/pra_01/pra_01_4_entity.c b/src/world/area_pra/pra_01/entity.c
similarity index 100%
rename from src/world/area_pra/pra_01/pra_01_4_entity.c
rename to src/world/area_pra/pra_01/entity.c
diff --git a/src/world/area_pra/pra_01/pra_01_2_main.c b/src/world/area_pra/pra_01/main.c
similarity index 100%
rename from src/world/area_pra/pra_01/pra_01_2_main.c
rename to src/world/area_pra/pra_01/main.c
diff --git a/src/world/area_pra/pra_01/pra_01_1_music.c b/src/world/area_pra/pra_01/music.c
similarity index 100%
rename from src/world/area_pra/pra_01/pra_01_1_music.c
rename to src/world/area_pra/pra_01/music.c
diff --git a/src/world/area_pra/pra_01/pra_01_3_npc.c b/src/world/area_pra/pra_01/npc.c
similarity index 100%
rename from src/world/area_pra/pra_01/pra_01_3_npc.c
rename to src/world/area_pra/pra_01/npc.c
diff --git a/src/world/area_pra/pra_01/pra_01_0_header.c b/src/world/area_pra/pra_01/settings.c
similarity index 100%
rename from src/world/area_pra/pra_01/pra_01_0_header.c
rename to src/world/area_pra/pra_01/settings.c
diff --git a/src/world/area_pra/pra_02/pra_02_4_entity.c b/src/world/area_pra/pra_02/entity.c
similarity index 100%
rename from src/world/area_pra/pra_02/pra_02_4_entity.c
rename to src/world/area_pra/pra_02/entity.c
diff --git a/src/world/area_pra/pra_02/pra_02_2_main.c b/src/world/area_pra/pra_02/main.c
similarity index 100%
rename from src/world/area_pra/pra_02/pra_02_2_main.c
rename to src/world/area_pra/pra_02/main.c
diff --git a/src/world/area_pra/pra_02/pra_02_1_music.c b/src/world/area_pra/pra_02/music.c
similarity index 100%
rename from src/world/area_pra/pra_02/pra_02_1_music.c
rename to src/world/area_pra/pra_02/music.c
diff --git a/src/world/area_pra/pra_02/pra_02_3_npc.c b/src/world/area_pra/pra_02/npc.c
similarity index 100%
rename from src/world/area_pra/pra_02/pra_02_3_npc.c
rename to src/world/area_pra/pra_02/npc.c
diff --git a/src/world/area_pra/pra_02/pra_02_0_header.c b/src/world/area_pra/pra_02/settings.c
similarity index 100%
rename from src/world/area_pra/pra_02/pra_02_0_header.c
rename to src/world/area_pra/pra_02/settings.c
diff --git a/src/world/area_pra/pra_03/pra_03_3_entity.c b/src/world/area_pra/pra_03/entity.c
similarity index 100%
rename from src/world/area_pra/pra_03/pra_03_3_entity.c
rename to src/world/area_pra/pra_03/entity.c
diff --git a/src/world/area_pra/pra_03/pra_03_2_main.c b/src/world/area_pra/pra_03/main.c
similarity index 100%
rename from src/world/area_pra/pra_03/pra_03_2_main.c
rename to src/world/area_pra/pra_03/main.c
diff --git a/src/world/area_pra/pra_03/pra_03_1_music.c b/src/world/area_pra/pra_03/music.c
similarity index 100%
rename from src/world/area_pra/pra_03/pra_03_1_music.c
rename to src/world/area_pra/pra_03/music.c
diff --git a/src/world/area_pra/pra_03/pra_03_0_header.c b/src/world/area_pra/pra_03/settings.c
similarity index 100%
rename from src/world/area_pra/pra_03/pra_03_0_header.c
rename to src/world/area_pra/pra_03/settings.c
diff --git a/src/world/area_pra/pra_04/pra_04_3_entity.c b/src/world/area_pra/pra_04/entity.c
similarity index 100%
rename from src/world/area_pra/pra_04/pra_04_3_entity.c
rename to src/world/area_pra/pra_04/entity.c
diff --git a/src/world/area_pra/pra_04/pra_04_2_main.c b/src/world/area_pra/pra_04/main.c
similarity index 100%
rename from src/world/area_pra/pra_04/pra_04_2_main.c
rename to src/world/area_pra/pra_04/main.c
diff --git a/src/world/area_pra/pra_04/pra_04_1_music.c b/src/world/area_pra/pra_04/music.c
similarity index 100%
rename from src/world/area_pra/pra_04/pra_04_1_music.c
rename to src/world/area_pra/pra_04/music.c
diff --git a/src/world/area_pra/pra_04/pra_04_4_npc.c b/src/world/area_pra/pra_04/npc.c
similarity index 100%
rename from src/world/area_pra/pra_04/pra_04_4_npc.c
rename to src/world/area_pra/pra_04/npc.c
diff --git a/src/world/area_pra/pra_04/pra_04_0_header.c b/src/world/area_pra/pra_04/settings.c
similarity index 100%
rename from src/world/area_pra/pra_04/pra_04_0_header.c
rename to src/world/area_pra/pra_04/settings.c
diff --git a/src/world/area_pra/pra_05/pra_05_3_entity.c b/src/world/area_pra/pra_05/entity.c
similarity index 100%
rename from src/world/area_pra/pra_05/pra_05_3_entity.c
rename to src/world/area_pra/pra_05/entity.c
diff --git a/src/world/area_pra/pra_05/pra_05_2_main.c b/src/world/area_pra/pra_05/main.c
similarity index 100%
rename from src/world/area_pra/pra_05/pra_05_2_main.c
rename to src/world/area_pra/pra_05/main.c
diff --git a/src/world/area_pra/pra_05/pra_05_1_music.c b/src/world/area_pra/pra_05/music.c
similarity index 100%
rename from src/world/area_pra/pra_05/pra_05_1_music.c
rename to src/world/area_pra/pra_05/music.c
diff --git a/src/world/area_pra/pra_05/pra_05_0_header.c b/src/world/area_pra/pra_05/settings.c
similarity index 100%
rename from src/world/area_pra/pra_05/pra_05_0_header.c
rename to src/world/area_pra/pra_05/settings.c
diff --git a/src/world/area_pra/pra_06/pra_06_3_entity.c b/src/world/area_pra/pra_06/entity.c
similarity index 100%
rename from src/world/area_pra/pra_06/pra_06_3_entity.c
rename to src/world/area_pra/pra_06/entity.c
diff --git a/src/world/area_pra/pra_06/pra_06_2_main.c b/src/world/area_pra/pra_06/main.c
similarity index 100%
rename from src/world/area_pra/pra_06/pra_06_2_main.c
rename to src/world/area_pra/pra_06/main.c
diff --git a/src/world/area_pra/pra_06/pra_06_1_music.c b/src/world/area_pra/pra_06/music.c
similarity index 100%
rename from src/world/area_pra/pra_06/pra_06_1_music.c
rename to src/world/area_pra/pra_06/music.c
diff --git a/src/world/area_pra/pra_06/pra_06_0_header.c b/src/world/area_pra/pra_06/settings.c
similarity index 100%
rename from src/world/area_pra/pra_06/pra_06_0_header.c
rename to src/world/area_pra/pra_06/settings.c
diff --git a/src/world/area_pra/pra_09/pra_09_2_main.c b/src/world/area_pra/pra_09/main.c
similarity index 100%
rename from src/world/area_pra/pra_09/pra_09_2_main.c
rename to src/world/area_pra/pra_09/main.c
diff --git a/src/world/area_pra/pra_09/pra_09_1_music.c b/src/world/area_pra/pra_09/music.c
similarity index 100%
rename from src/world/area_pra/pra_09/pra_09_1_music.c
rename to src/world/area_pra/pra_09/music.c
diff --git a/src/world/area_pra/pra_09/pra_09_3_npc.c b/src/world/area_pra/pra_09/npc.c
similarity index 100%
rename from src/world/area_pra/pra_09/pra_09_3_npc.c
rename to src/world/area_pra/pra_09/npc.c
diff --git a/src/world/area_pra/pra_09/pra_09_0_header.c b/src/world/area_pra/pra_09/settings.c
similarity index 100%
rename from src/world/area_pra/pra_09/pra_09_0_header.c
rename to src/world/area_pra/pra_09/settings.c
diff --git a/src/world/area_pra/pra_10/pra_10_2_main.c b/src/world/area_pra/pra_10/main.c
similarity index 100%
rename from src/world/area_pra/pra_10/pra_10_2_main.c
rename to src/world/area_pra/pra_10/main.c
diff --git a/src/world/area_pra/pra_10/pra_10_1_music.c b/src/world/area_pra/pra_10/music.c
similarity index 100%
rename from src/world/area_pra/pra_10/pra_10_1_music.c
rename to src/world/area_pra/pra_10/music.c
diff --git a/src/world/area_pra/pra_10/pra_10_3_npc.c b/src/world/area_pra/pra_10/npc.c
similarity index 100%
rename from src/world/area_pra/pra_10/pra_10_3_npc.c
rename to src/world/area_pra/pra_10/npc.c
diff --git a/src/world/area_pra/pra_10/pra_10_0_header.c b/src/world/area_pra/pra_10/settings.c
similarity index 100%
rename from src/world/area_pra/pra_10/pra_10_0_header.c
rename to src/world/area_pra/pra_10/settings.c
diff --git a/src/world/area_pra/pra_11/pra_11_3_entity.c b/src/world/area_pra/pra_11/entity.c
similarity index 100%
rename from src/world/area_pra/pra_11/pra_11_3_entity.c
rename to src/world/area_pra/pra_11/entity.c
diff --git a/src/world/area_pra/pra_11/pra_11_2_main.c b/src/world/area_pra/pra_11/main.c
similarity index 100%
rename from src/world/area_pra/pra_11/pra_11_2_main.c
rename to src/world/area_pra/pra_11/main.c
diff --git a/src/world/area_pra/pra_11/pra_11_1_music.c b/src/world/area_pra/pra_11/music.c
similarity index 100%
rename from src/world/area_pra/pra_11/pra_11_1_music.c
rename to src/world/area_pra/pra_11/music.c
diff --git a/src/world/area_pra/pra_11/pra_11_0_header.c b/src/world/area_pra/pra_11/settings.c
similarity index 100%
rename from src/world/area_pra/pra_11/pra_11_0_header.c
rename to src/world/area_pra/pra_11/settings.c
diff --git a/src/world/area_pra/pra_12/pra_12_3_entity.c b/src/world/area_pra/pra_12/entity.c
similarity index 100%
rename from src/world/area_pra/pra_12/pra_12_3_entity.c
rename to src/world/area_pra/pra_12/entity.c
diff --git a/src/world/area_pra/pra_12/pra_12_2_main.c b/src/world/area_pra/pra_12/main.c
similarity index 100%
rename from src/world/area_pra/pra_12/pra_12_2_main.c
rename to src/world/area_pra/pra_12/main.c
diff --git a/src/world/area_pra/pra_12/pra_12_1_music.c b/src/world/area_pra/pra_12/music.c
similarity index 100%
rename from src/world/area_pra/pra_12/pra_12_1_music.c
rename to src/world/area_pra/pra_12/music.c
diff --git a/src/world/area_pra/pra_12/pra_12_0_header.c b/src/world/area_pra/pra_12/settings.c
similarity index 100%
rename from src/world/area_pra/pra_12/pra_12_0_header.c
rename to src/world/area_pra/pra_12/settings.c
diff --git a/src/world/area_pra/pra_13/pra_13_2_main.c b/src/world/area_pra/pra_13/main.c
similarity index 100%
rename from src/world/area_pra/pra_13/pra_13_2_main.c
rename to src/world/area_pra/pra_13/main.c
diff --git a/src/world/area_pra/pra_13/pra_13_1_music.c b/src/world/area_pra/pra_13/music.c
similarity index 100%
rename from src/world/area_pra/pra_13/pra_13_1_music.c
rename to src/world/area_pra/pra_13/music.c
diff --git a/src/world/area_pra/pra_13/pra_13_3_npc.c b/src/world/area_pra/pra_13/npc.c
similarity index 100%
rename from src/world/area_pra/pra_13/pra_13_3_npc.c
rename to src/world/area_pra/pra_13/npc.c
diff --git a/src/world/area_pra/pra_13/pra_13_0_header.c b/src/world/area_pra/pra_13/settings.c
similarity index 100%
rename from src/world/area_pra/pra_13/pra_13_0_header.c
rename to src/world/area_pra/pra_13/settings.c
diff --git a/src/world/area_pra/pra_14/pra_14_3_entity.c b/src/world/area_pra/pra_14/entity.c
similarity index 100%
rename from src/world/area_pra/pra_14/pra_14_3_entity.c
rename to src/world/area_pra/pra_14/entity.c
diff --git a/src/world/area_pra/pra_14/pra_14_2_main.c b/src/world/area_pra/pra_14/main.c
similarity index 100%
rename from src/world/area_pra/pra_14/pra_14_2_main.c
rename to src/world/area_pra/pra_14/main.c
diff --git a/src/world/area_pra/pra_14/pra_14_1_music.c b/src/world/area_pra/pra_14/music.c
similarity index 100%
rename from src/world/area_pra/pra_14/pra_14_1_music.c
rename to src/world/area_pra/pra_14/music.c
diff --git a/src/world/area_pra/pra_14/pra_14_0_header.c b/src/world/area_pra/pra_14/settings.c
similarity index 100%
rename from src/world/area_pra/pra_14/pra_14_0_header.c
rename to src/world/area_pra/pra_14/settings.c
diff --git a/src/world/area_pra/pra_15/pra_15_3_entity.c b/src/world/area_pra/pra_15/entity.c
similarity index 100%
rename from src/world/area_pra/pra_15/pra_15_3_entity.c
rename to src/world/area_pra/pra_15/entity.c
diff --git a/src/world/area_pra/pra_15/pra_15_2_main.c b/src/world/area_pra/pra_15/main.c
similarity index 100%
rename from src/world/area_pra/pra_15/pra_15_2_main.c
rename to src/world/area_pra/pra_15/main.c
diff --git a/src/world/area_pra/pra_15/pra_15_1_music.c b/src/world/area_pra/pra_15/music.c
similarity index 100%
rename from src/world/area_pra/pra_15/pra_15_1_music.c
rename to src/world/area_pra/pra_15/music.c
diff --git a/src/world/area_pra/pra_15/pra_15_0_header.c b/src/world/area_pra/pra_15/settings.c
similarity index 100%
rename from src/world/area_pra/pra_15/pra_15_0_header.c
rename to src/world/area_pra/pra_15/settings.c
diff --git a/src/world/area_pra/pra_16/pra_16_2_main.c b/src/world/area_pra/pra_16/main.c
similarity index 100%
rename from src/world/area_pra/pra_16/pra_16_2_main.c
rename to src/world/area_pra/pra_16/main.c
diff --git a/src/world/area_pra/pra_16/pra_16_1_music.c b/src/world/area_pra/pra_16/music.c
similarity index 100%
rename from src/world/area_pra/pra_16/pra_16_1_music.c
rename to src/world/area_pra/pra_16/music.c
diff --git a/src/world/area_pra/pra_16/pra_16_0_header.c b/src/world/area_pra/pra_16/settings.c
similarity index 100%
rename from src/world/area_pra/pra_16/pra_16_0_header.c
rename to src/world/area_pra/pra_16/settings.c
diff --git a/src/world/area_pra/pra_18/pra_18_2_main.c b/src/world/area_pra/pra_18/main.c
similarity index 100%
rename from src/world/area_pra/pra_18/pra_18_2_main.c
rename to src/world/area_pra/pra_18/main.c
diff --git a/src/world/area_pra/pra_18/pra_18_1_music.c b/src/world/area_pra/pra_18/music.c
similarity index 100%
rename from src/world/area_pra/pra_18/pra_18_1_music.c
rename to src/world/area_pra/pra_18/music.c
diff --git a/src/world/area_pra/pra_18/pra_18_3_npc.c b/src/world/area_pra/pra_18/npc.c
similarity index 100%
rename from src/world/area_pra/pra_18/pra_18_3_npc.c
rename to src/world/area_pra/pra_18/npc.c
diff --git a/src/world/area_pra/pra_18/pra_18_0_header.c b/src/world/area_pra/pra_18/settings.c
similarity index 100%
rename from src/world/area_pra/pra_18/pra_18_0_header.c
rename to src/world/area_pra/pra_18/settings.c
diff --git a/src/world/area_pra/pra_19/pra_19_2_main.c b/src/world/area_pra/pra_19/main.c
similarity index 100%
rename from src/world/area_pra/pra_19/pra_19_2_main.c
rename to src/world/area_pra/pra_19/main.c
diff --git a/src/world/area_pra/pra_19/pra_19_1_music.c b/src/world/area_pra/pra_19/music.c
similarity index 100%
rename from src/world/area_pra/pra_19/pra_19_1_music.c
rename to src/world/area_pra/pra_19/music.c
diff --git a/src/world/area_pra/pra_19/pra_19_3_npc.c b/src/world/area_pra/pra_19/npc.c
similarity index 100%
rename from src/world/area_pra/pra_19/pra_19_3_npc.c
rename to src/world/area_pra/pra_19/npc.c
diff --git a/src/world/area_pra/pra_19/pra_19_0_header.c b/src/world/area_pra/pra_19/settings.c
similarity index 100%
rename from src/world/area_pra/pra_19/pra_19_0_header.c
rename to src/world/area_pra/pra_19/settings.c
diff --git a/src/world/area_pra/pra_20/pra_20_2_main.c b/src/world/area_pra/pra_20/main.c
similarity index 100%
rename from src/world/area_pra/pra_20/pra_20_2_main.c
rename to src/world/area_pra/pra_20/main.c
diff --git a/src/world/area_pra/pra_20/pra_20_1_music.c b/src/world/area_pra/pra_20/music.c
similarity index 100%
rename from src/world/area_pra/pra_20/pra_20_1_music.c
rename to src/world/area_pra/pra_20/music.c
diff --git a/src/world/area_pra/pra_20/pra_20_0_header.c b/src/world/area_pra/pra_20/settings.c
similarity index 100%
rename from src/world/area_pra/pra_20/pra_20_0_header.c
rename to src/world/area_pra/pra_20/settings.c
diff --git a/src/world/area_pra/pra_21/pra_21_3_entity.c b/src/world/area_pra/pra_21/entity.c
similarity index 100%
rename from src/world/area_pra/pra_21/pra_21_3_entity.c
rename to src/world/area_pra/pra_21/entity.c
diff --git a/src/world/area_pra/pra_21/pra_21_2_main.c b/src/world/area_pra/pra_21/main.c
similarity index 100%
rename from src/world/area_pra/pra_21/pra_21_2_main.c
rename to src/world/area_pra/pra_21/main.c
diff --git a/src/world/area_pra/pra_21/pra_21_1_music.c b/src/world/area_pra/pra_21/music.c
similarity index 100%
rename from src/world/area_pra/pra_21/pra_21_1_music.c
rename to src/world/area_pra/pra_21/music.c
diff --git a/src/world/area_pra/pra_21/pra_21_0_header.c b/src/world/area_pra/pra_21/settings.c
similarity index 100%
rename from src/world/area_pra/pra_21/pra_21_0_header.c
rename to src/world/area_pra/pra_21/settings.c
diff --git a/src/world/area_pra/pra_22/pra_22_3_entity.c b/src/world/area_pra/pra_22/entity.c
similarity index 100%
rename from src/world/area_pra/pra_22/pra_22_3_entity.c
rename to src/world/area_pra/pra_22/entity.c
diff --git a/src/world/area_pra/pra_22/pra_22_2_main.c b/src/world/area_pra/pra_22/main.c
similarity index 100%
rename from src/world/area_pra/pra_22/pra_22_2_main.c
rename to src/world/area_pra/pra_22/main.c
diff --git a/src/world/area_pra/pra_22/pra_22_1_music.c b/src/world/area_pra/pra_22/music.c
similarity index 100%
rename from src/world/area_pra/pra_22/pra_22_1_music.c
rename to src/world/area_pra/pra_22/music.c
diff --git a/src/world/area_pra/pra_22/pra_22_0_header.c b/src/world/area_pra/pra_22/settings.c
similarity index 100%
rename from src/world/area_pra/pra_22/pra_22_0_header.c
rename to src/world/area_pra/pra_22/settings.c
diff --git a/src/world/area_pra/pra_27/pra_27_3_entity.c b/src/world/area_pra/pra_27/entity.c
similarity index 100%
rename from src/world/area_pra/pra_27/pra_27_3_entity.c
rename to src/world/area_pra/pra_27/entity.c
diff --git a/src/world/area_pra/pra_27/pra_27_2_main.c b/src/world/area_pra/pra_27/main.c
similarity index 100%
rename from src/world/area_pra/pra_27/pra_27_2_main.c
rename to src/world/area_pra/pra_27/main.c
diff --git a/src/world/area_pra/pra_27/pra_27_1_music.c b/src/world/area_pra/pra_27/music.c
similarity index 100%
rename from src/world/area_pra/pra_27/pra_27_1_music.c
rename to src/world/area_pra/pra_27/music.c
diff --git a/src/world/area_pra/pra_27/pra_27_0_header.c b/src/world/area_pra/pra_27/settings.c
similarity index 100%
rename from src/world/area_pra/pra_27/pra_27_0_header.c
rename to src/world/area_pra/pra_27/settings.c
diff --git a/src/world/area_pra/pra_28/pra_28_3_entity.c b/src/world/area_pra/pra_28/entity.c
similarity index 100%
rename from src/world/area_pra/pra_28/pra_28_3_entity.c
rename to src/world/area_pra/pra_28/entity.c
diff --git a/src/world/area_pra/pra_28/pra_28_2_main.c b/src/world/area_pra/pra_28/main.c
similarity index 100%
rename from src/world/area_pra/pra_28/pra_28_2_main.c
rename to src/world/area_pra/pra_28/main.c
diff --git a/src/world/area_pra/pra_28/pra_28_1_music.c b/src/world/area_pra/pra_28/music.c
similarity index 100%
rename from src/world/area_pra/pra_28/pra_28_1_music.c
rename to src/world/area_pra/pra_28/music.c
diff --git a/src/world/area_pra/pra_28/pra_28_0_header.c b/src/world/area_pra/pra_28/settings.c
similarity index 100%
rename from src/world/area_pra/pra_28/pra_28_0_header.c
rename to src/world/area_pra/pra_28/settings.c
diff --git a/src/world/area_pra/pra_29/pra_29_4_bridge.c b/src/world/area_pra/pra_29/bridge.c
similarity index 100%
rename from src/world/area_pra/pra_29/pra_29_4_bridge.c
rename to src/world/area_pra/pra_29/bridge.c
diff --git a/src/world/area_pra/pra_29/pra_29_2_entity.c b/src/world/area_pra/pra_29/entity.c
similarity index 100%
rename from src/world/area_pra/pra_29/pra_29_2_entity.c
rename to src/world/area_pra/pra_29/entity.c
diff --git a/src/world/area_pra/pra_29/pra_29_3_main.c b/src/world/area_pra/pra_29/main.c
similarity index 100%
rename from src/world/area_pra/pra_29/pra_29_3_main.c
rename to src/world/area_pra/pra_29/main.c
diff --git a/src/world/area_pra/pra_29/pra_29_1_music.c b/src/world/area_pra/pra_29/music.c
similarity index 100%
rename from src/world/area_pra/pra_29/pra_29_1_music.c
rename to src/world/area_pra/pra_29/music.c
diff --git a/src/world/area_pra/pra_29/pra_29_0_header.c b/src/world/area_pra/pra_29/settings.c
similarity index 100%
rename from src/world/area_pra/pra_29/pra_29_0_header.c
rename to src/world/area_pra/pra_29/settings.c
diff --git a/src/world/area_pra/pra_31/pra_31_3_main.c b/src/world/area_pra/pra_31/main.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_3_main.c
rename to src/world/area_pra/pra_31/main.c
diff --git a/src/world/area_pra/pra_31/pra_31_1_music.c b/src/world/area_pra/pra_31/music.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_1_music.c
rename to src/world/area_pra/pra_31/music.c
diff --git a/src/world/area_pra/pra_31/pra_31_2_npc.c b/src/world/area_pra/pra_31/npc.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_2_npc.c
rename to src/world/area_pra/pra_31/npc.c
diff --git a/src/world/area_pra/pra_31/pra_31_4_puzzle.c b/src/world/area_pra/pra_31/puzzle.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_4_puzzle.c
rename to src/world/area_pra/pra_31/puzzle.c
diff --git a/src/world/area_pra/pra_31/pra_31_0_header.c b/src/world/area_pra/pra_31/settings.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_0_header.c
rename to src/world/area_pra/pra_31/settings.c
diff --git a/src/world/area_pra/pra_31/pra_31_9_stairs_anim.c b/src/world/area_pra/pra_31/stairs_anim.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_9_stairs_anim.c
rename to src/world/area_pra/pra_31/stairs_anim.c
diff --git a/src/world/area_pra/pra_31/pra_31_10_stairs_lights.c b/src/world/area_pra/pra_31/stairs_lights.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_10_stairs_lights.c
rename to src/world/area_pra/pra_31/stairs_lights.c
diff --git a/src/world/area_pra/pra_31/pra_31_8_stairs_skele.c b/src/world/area_pra/pra_31/stairs_skele.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_8_stairs_skele.c
rename to src/world/area_pra/pra_31/stairs_skele.c
diff --git a/src/world/area_pra/pra_31/pra_31_11_stairs_vtx.c b/src/world/area_pra/pra_31/stairs_vtx.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_11_stairs_vtx.c
rename to src/world/area_pra/pra_31/stairs_vtx.c
diff --git a/src/world/area_pra/pra_31/pra_31_5_texture_1.c b/src/world/area_pra/pra_31/texture_1.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_5_texture_1.c
rename to src/world/area_pra/pra_31/texture_1.c
diff --git a/src/world/area_pra/pra_31/pra_31_6_texture_2.c b/src/world/area_pra/pra_31/texture_2.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_6_texture_2.c
rename to src/world/area_pra/pra_31/texture_2.c
diff --git a/src/world/area_pra/pra_31/pra_31_7_texture_3.c b/src/world/area_pra/pra_31/texture_3.c
similarity index 100%
rename from src/world/area_pra/pra_31/pra_31_7_texture_3.c
rename to src/world/area_pra/pra_31/texture_3.c
diff --git a/src/world/area_pra/pra_32/pra_32_2_main.c b/src/world/area_pra/pra_32/main.c
similarity index 100%
rename from src/world/area_pra/pra_32/pra_32_2_main.c
rename to src/world/area_pra/pra_32/main.c
diff --git a/src/world/area_pra/pra_32/pra_32_1_music.c b/src/world/area_pra/pra_32/music.c
similarity index 100%
rename from src/world/area_pra/pra_32/pra_32_1_music.c
rename to src/world/area_pra/pra_32/music.c
diff --git a/src/world/area_pra/pra_32/pra_32_3_npc.c b/src/world/area_pra/pra_32/npc.c
similarity index 100%
rename from src/world/area_pra/pra_32/pra_32_3_npc.c
rename to src/world/area_pra/pra_32/npc.c
diff --git a/src/world/area_pra/pra_32/pra_32_0_header.c b/src/world/area_pra/pra_32/settings.c
similarity index 100%
rename from src/world/area_pra/pra_32/pra_32_0_header.c
rename to src/world/area_pra/pra_32/settings.c
diff --git a/src/world/area_pra/pra_33/pra_33_3_entity.c b/src/world/area_pra/pra_33/entity.c
similarity index 100%
rename from src/world/area_pra/pra_33/pra_33_3_entity.c
rename to src/world/area_pra/pra_33/entity.c
diff --git a/src/world/area_pra/pra_33/pra_33_2_main.c b/src/world/area_pra/pra_33/main.c
similarity index 100%
rename from src/world/area_pra/pra_33/pra_33_2_main.c
rename to src/world/area_pra/pra_33/main.c
diff --git a/src/world/area_pra/pra_33/pra_33_1_music.c b/src/world/area_pra/pra_33/music.c
similarity index 100%
rename from src/world/area_pra/pra_33/pra_33_1_music.c
rename to src/world/area_pra/pra_33/music.c
diff --git a/src/world/area_pra/pra_33/pra_33_0_header.c b/src/world/area_pra/pra_33/settings.c
similarity index 100%
rename from src/world/area_pra/pra_33/pra_33_0_header.c
rename to src/world/area_pra/pra_33/settings.c
diff --git a/src/world/area_pra/pra_34/pra_34_3_entity.c b/src/world/area_pra/pra_34/entity.c
similarity index 100%
rename from src/world/area_pra/pra_34/pra_34_3_entity.c
rename to src/world/area_pra/pra_34/entity.c
diff --git a/src/world/area_pra/pra_34/pra_34_2_main.c b/src/world/area_pra/pra_34/main.c
similarity index 100%
rename from src/world/area_pra/pra_34/pra_34_2_main.c
rename to src/world/area_pra/pra_34/main.c
diff --git a/src/world/area_pra/pra_34/pra_34_1_music.c b/src/world/area_pra/pra_34/music.c
similarity index 100%
rename from src/world/area_pra/pra_34/pra_34_1_music.c
rename to src/world/area_pra/pra_34/music.c
diff --git a/src/world/area_pra/pra_34/pra_34_0_header.c b/src/world/area_pra/pra_34/settings.c
similarity index 100%
rename from src/world/area_pra/pra_34/pra_34_0_header.c
rename to src/world/area_pra/pra_34/settings.c
diff --git a/src/world/area_pra/pra_35/pra_35_4_entity.c b/src/world/area_pra/pra_35/entity.c
similarity index 100%
rename from src/world/area_pra/pra_35/pra_35_4_entity.c
rename to src/world/area_pra/pra_35/entity.c
diff --git a/src/world/area_pra/pra_35/pra_35_2_main.c b/src/world/area_pra/pra_35/main.c
similarity index 100%
rename from src/world/area_pra/pra_35/pra_35_2_main.c
rename to src/world/area_pra/pra_35/main.c
diff --git a/src/world/area_pra/pra_35/pra_35_1_music.c b/src/world/area_pra/pra_35/music.c
similarity index 100%
rename from src/world/area_pra/pra_35/pra_35_1_music.c
rename to src/world/area_pra/pra_35/music.c
diff --git a/src/world/area_pra/pra_35/pra_35_3_npc.c b/src/world/area_pra/pra_35/npc.c
similarity index 100%
rename from src/world/area_pra/pra_35/pra_35_3_npc.c
rename to src/world/area_pra/pra_35/npc.c
diff --git a/src/world/area_pra/pra_35/pra_35_0_header.c b/src/world/area_pra/pra_35/settings.c
similarity index 100%
rename from src/world/area_pra/pra_35/pra_35_0_header.c
rename to src/world/area_pra/pra_35/settings.c
diff --git a/src/world/area_pra/pra_36/pra_36_2_main.c b/src/world/area_pra/pra_36/main.c
similarity index 100%
rename from src/world/area_pra/pra_36/pra_36_2_main.c
rename to src/world/area_pra/pra_36/main.c
diff --git a/src/world/area_pra/pra_36/pra_36_1_music.c b/src/world/area_pra/pra_36/music.c
similarity index 100%
rename from src/world/area_pra/pra_36/pra_36_1_music.c
rename to src/world/area_pra/pra_36/music.c
diff --git a/src/world/area_pra/pra_36/pra_36_3_npc.c b/src/world/area_pra/pra_36/npc.c
similarity index 100%
rename from src/world/area_pra/pra_36/pra_36_3_npc.c
rename to src/world/area_pra/pra_36/npc.c
diff --git a/src/world/area_pra/pra_36/pra_36_0_header.c b/src/world/area_pra/pra_36/settings.c
similarity index 100%
rename from src/world/area_pra/pra_36/pra_36_0_header.c
rename to src/world/area_pra/pra_36/settings.c
diff --git a/src/world/area_pra/pra_37/pra_37_2_main.c b/src/world/area_pra/pra_37/main.c
similarity index 100%
rename from src/world/area_pra/pra_37/pra_37_2_main.c
rename to src/world/area_pra/pra_37/main.c
diff --git a/src/world/area_pra/pra_37/pra_37_1_music.c b/src/world/area_pra/pra_37/music.c
similarity index 100%
rename from src/world/area_pra/pra_37/pra_37_1_music.c
rename to src/world/area_pra/pra_37/music.c
diff --git a/src/world/area_pra/pra_37/pra_37_3_npc.c b/src/world/area_pra/pra_37/npc.c
similarity index 100%
rename from src/world/area_pra/pra_37/pra_37_3_npc.c
rename to src/world/area_pra/pra_37/npc.c
diff --git a/src/world/area_pra/pra_37/pra_37_0_header.c b/src/world/area_pra/pra_37/settings.c
similarity index 100%
rename from src/world/area_pra/pra_37/pra_37_0_header.c
rename to src/world/area_pra/pra_37/settings.c
diff --git a/src/world/area_pra/pra_38/pra_38_2_main.c b/src/world/area_pra/pra_38/main.c
similarity index 100%
rename from src/world/area_pra/pra_38/pra_38_2_main.c
rename to src/world/area_pra/pra_38/main.c
diff --git a/src/world/area_pra/pra_38/pra_38_1_music.c b/src/world/area_pra/pra_38/music.c
similarity index 100%
rename from src/world/area_pra/pra_38/pra_38_1_music.c
rename to src/world/area_pra/pra_38/music.c
diff --git a/src/world/area_pra/pra_38/pra_38_3_npc.c b/src/world/area_pra/pra_38/npc.c
similarity index 100%
rename from src/world/area_pra/pra_38/pra_38_3_npc.c
rename to src/world/area_pra/pra_38/npc.c
diff --git a/src/world/area_pra/pra_38/pra_38_0_header.c b/src/world/area_pra/pra_38/settings.c
similarity index 100%
rename from src/world/area_pra/pra_38/pra_38_0_header.c
rename to src/world/area_pra/pra_38/settings.c
diff --git a/src/world/area_pra/pra_39/pra_39_2_main.c b/src/world/area_pra/pra_39/main.c
similarity index 100%
rename from src/world/area_pra/pra_39/pra_39_2_main.c
rename to src/world/area_pra/pra_39/main.c
diff --git a/src/world/area_pra/pra_39/pra_39_1_music.c b/src/world/area_pra/pra_39/music.c
similarity index 100%
rename from src/world/area_pra/pra_39/pra_39_1_music.c
rename to src/world/area_pra/pra_39/music.c
diff --git a/src/world/area_pra/pra_39/pra_39_3_npc.c b/src/world/area_pra/pra_39/npc.c
similarity index 100%
rename from src/world/area_pra/pra_39/pra_39_3_npc.c
rename to src/world/area_pra/pra_39/npc.c
diff --git a/src/world/area_pra/pra_39/pra_39_0_header.c b/src/world/area_pra/pra_39/settings.c
similarity index 100%
rename from src/world/area_pra/pra_39/pra_39_0_header.c
rename to src/world/area_pra/pra_39/settings.c
diff --git a/src/world/area_pra/pra_40/pra_40_3_entity.c b/src/world/area_pra/pra_40/entity.c
similarity index 100%
rename from src/world/area_pra/pra_40/pra_40_3_entity.c
rename to src/world/area_pra/pra_40/entity.c
diff --git a/src/world/area_pra/pra_40/pra_40_2_main.c b/src/world/area_pra/pra_40/main.c
similarity index 100%
rename from src/world/area_pra/pra_40/pra_40_2_main.c
rename to src/world/area_pra/pra_40/main.c
diff --git a/src/world/area_pra/pra_40/pra_40_1_music.c b/src/world/area_pra/pra_40/music.c
similarity index 100%
rename from src/world/area_pra/pra_40/pra_40_1_music.c
rename to src/world/area_pra/pra_40/music.c
diff --git a/src/world/area_pra/pra_40/pra_40_0_header.c b/src/world/area_pra/pra_40/settings.c
similarity index 100%
rename from src/world/area_pra/pra_40/pra_40_0_header.c
rename to src/world/area_pra/pra_40/settings.c
diff --git a/src/world/area_sam/sam_01/sam_01_6_entity.c b/src/world/area_sam/sam_01/entity.c
similarity index 100%
rename from src/world/area_sam/sam_01/sam_01_6_entity.c
rename to src/world/area_sam/sam_01/entity.c
diff --git a/src/world/area_sam/sam_01/sam_01_2_main.c b/src/world/area_sam/sam_01/main.c
similarity index 100%
rename from src/world/area_sam/sam_01/sam_01_2_main.c
rename to src/world/area_sam/sam_01/main.c
diff --git a/src/world/area_sam/sam_01/sam_01_1_music.c b/src/world/area_sam/sam_01/music.c
similarity index 100%
rename from src/world/area_sam/sam_01/sam_01_1_music.c
rename to src/world/area_sam/sam_01/music.c
diff --git a/src/world/area_sam/sam_01/sam_01_4_npc.c b/src/world/area_sam/sam_01/npc.c
similarity index 100%
rename from src/world/area_sam/sam_01/sam_01_4_npc.c
rename to src/world/area_sam/sam_01/npc.c
diff --git a/src/world/area_sam/sam_01/sam_01_3_rooms.c b/src/world/area_sam/sam_01/rooms.c
similarity index 100%
rename from src/world/area_sam/sam_01/sam_01_3_rooms.c
rename to src/world/area_sam/sam_01/rooms.c
diff --git a/src/world/area_sam/sam_01/sam_01_5_scenes.c b/src/world/area_sam/sam_01/scenes.c
similarity index 100%
rename from src/world/area_sam/sam_01/sam_01_5_scenes.c
rename to src/world/area_sam/sam_01/scenes.c
diff --git a/src/world/area_sam/sam_01/sam_01_0_header.c b/src/world/area_sam/sam_01/settings.c
similarity index 100%
rename from src/world/area_sam/sam_01/sam_01_0_header.c
rename to src/world/area_sam/sam_01/settings.c
diff --git a/src/world/area_sam/sam_02/sam_02_5_entity.c b/src/world/area_sam/sam_02/entity.c
similarity index 100%
rename from src/world/area_sam/sam_02/sam_02_5_entity.c
rename to src/world/area_sam/sam_02/entity.c
diff --git a/src/world/area_sam/sam_02/sam_02_2_main.c b/src/world/area_sam/sam_02/main.c
similarity index 100%
rename from src/world/area_sam/sam_02/sam_02_2_main.c
rename to src/world/area_sam/sam_02/main.c
diff --git a/src/world/area_sam/sam_02/sam_02_1_music.c b/src/world/area_sam/sam_02/music.c
similarity index 100%
rename from src/world/area_sam/sam_02/sam_02_1_music.c
rename to src/world/area_sam/sam_02/music.c
diff --git a/src/world/area_sam/sam_02/sam_02_4_npc.c b/src/world/area_sam/sam_02/npc.c
similarity index 100%
rename from src/world/area_sam/sam_02/sam_02_4_npc.c
rename to src/world/area_sam/sam_02/npc.c
diff --git a/src/world/area_sam/sam_02/sam_02_3_rooms.c b/src/world/area_sam/sam_02/rooms.c
similarity index 100%
rename from src/world/area_sam/sam_02/sam_02_3_rooms.c
rename to src/world/area_sam/sam_02/rooms.c
diff --git a/src/world/area_sam/sam_02/sam_02_0_header.c b/src/world/area_sam/sam_02/settings.c
similarity index 100%
rename from src/world/area_sam/sam_02/sam_02_0_header.c
rename to src/world/area_sam/sam_02/settings.c
diff --git a/src/world/area_sam/sam_02/sam_02_6_shop.c b/src/world/area_sam/sam_02/shop.c
similarity index 100%
rename from src/world/area_sam/sam_02/sam_02_6_shop.c
rename to src/world/area_sam/sam_02/shop.c
diff --git a/src/world/area_sam/sam_03/sam_03_2_main.c b/src/world/area_sam/sam_03/main.c
similarity index 100%
rename from src/world/area_sam/sam_03/sam_03_2_main.c
rename to src/world/area_sam/sam_03/main.c
diff --git a/src/world/area_sam/sam_03/sam_03_1_music.c b/src/world/area_sam/sam_03/music.c
similarity index 100%
rename from src/world/area_sam/sam_03/sam_03_1_music.c
rename to src/world/area_sam/sam_03/music.c
diff --git a/src/world/area_sam/sam_03/sam_03_3_npc1.c b/src/world/area_sam/sam_03/npc1.c
similarity index 100%
rename from src/world/area_sam/sam_03/sam_03_3_npc1.c
rename to src/world/area_sam/sam_03/npc1.c
diff --git a/src/world/area_sam/sam_03/sam_03_4_npc2.c b/src/world/area_sam/sam_03/npc2.c
similarity index 100%
rename from src/world/area_sam/sam_03/sam_03_4_npc2.c
rename to src/world/area_sam/sam_03/npc2.c
diff --git a/src/world/area_sam/sam_03/sam_03_0_header.c b/src/world/area_sam/sam_03/settings.c
similarity index 100%
rename from src/world/area_sam/sam_03/sam_03_0_header.c
rename to src/world/area_sam/sam_03/settings.c
diff --git a/src/world/area_sam/sam_04/sam_04_5_entity.c b/src/world/area_sam/sam_04/entity.c
similarity index 100%
rename from src/world/area_sam/sam_04/sam_04_5_entity.c
rename to src/world/area_sam/sam_04/entity.c
diff --git a/src/world/area_sam/sam_04/sam_04_2_main.c b/src/world/area_sam/sam_04/main.c
similarity index 100%
rename from src/world/area_sam/sam_04/sam_04_2_main.c
rename to src/world/area_sam/sam_04/main.c
diff --git a/src/world/area_sam/sam_04/sam_04_1_music.c b/src/world/area_sam/sam_04/music.c
similarity index 100%
rename from src/world/area_sam/sam_04/sam_04_1_music.c
rename to src/world/area_sam/sam_04/music.c
diff --git a/src/world/area_sam/sam_04/sam_04_4_npc.c b/src/world/area_sam/sam_04/npc.c
similarity index 100%
rename from src/world/area_sam/sam_04/sam_04_4_npc.c
rename to src/world/area_sam/sam_04/npc.c
diff --git a/src/world/area_sam/sam_04/sam_04_0_header.c b/src/world/area_sam/sam_04/settings.c
similarity index 100%
rename from src/world/area_sam/sam_04/sam_04_0_header.c
rename to src/world/area_sam/sam_04/settings.c
diff --git a/src/world/area_sam/sam_04/sam_04_3_snowmen.c b/src/world/area_sam/sam_04/snowmen.c
similarity index 100%
rename from src/world/area_sam/sam_04/sam_04_3_snowmen.c
rename to src/world/area_sam/sam_04/snowmen.c
diff --git a/src/world/area_sam/sam_05/sam_05_3_entity.c b/src/world/area_sam/sam_05/entity.c
similarity index 100%
rename from src/world/area_sam/sam_05/sam_05_3_entity.c
rename to src/world/area_sam/sam_05/entity.c
diff --git a/src/world/area_sam/sam_05/sam_05_2_main.c b/src/world/area_sam/sam_05/main.c
similarity index 100%
rename from src/world/area_sam/sam_05/sam_05_2_main.c
rename to src/world/area_sam/sam_05/main.c
diff --git a/src/world/area_sam/sam_05/sam_05_6_monstar_gfx.c b/src/world/area_sam/sam_05/monstar_gfx.c
similarity index 100%
rename from src/world/area_sam/sam_05/sam_05_6_monstar_gfx.c
rename to src/world/area_sam/sam_05/monstar_gfx.c
diff --git a/src/world/area_sam/sam_05/sam_05_7_monstar_vtx.c b/src/world/area_sam/sam_05/monstar_vtx.c
similarity index 100%
rename from src/world/area_sam/sam_05/sam_05_7_monstar_vtx.c
rename to src/world/area_sam/sam_05/monstar_vtx.c
diff --git a/src/world/area_sam/sam_05/sam_05_1_music.c b/src/world/area_sam/sam_05/music.c
similarity index 100%
rename from src/world/area_sam/sam_05/sam_05_1_music.c
rename to src/world/area_sam/sam_05/music.c
diff --git a/src/world/area_sam/sam_05/sam_05_4_npc.c b/src/world/area_sam/sam_05/npc.c
similarity index 100%
rename from src/world/area_sam/sam_05/sam_05_4_npc.c
rename to src/world/area_sam/sam_05/npc.c
diff --git a/src/world/area_sam/sam_05/sam_05_5_scenes.c b/src/world/area_sam/sam_05/scenes.c
similarity index 100%
rename from src/world/area_sam/sam_05/sam_05_5_scenes.c
rename to src/world/area_sam/sam_05/scenes.c
diff --git a/src/world/area_sam/sam_05/sam_05_0_header.c b/src/world/area_sam/sam_05/settings.c
similarity index 100%
rename from src/world/area_sam/sam_05/sam_05_0_header.c
rename to src/world/area_sam/sam_05/settings.c
diff --git a/src/world/area_sam/sam_06/sam_06_5_entity.c b/src/world/area_sam/sam_06/entity.c
similarity index 100%
rename from src/world/area_sam/sam_06/sam_06_5_entity.c
rename to src/world/area_sam/sam_06/entity.c
diff --git a/src/world/area_sam/sam_06/sam_06_2_main.c b/src/world/area_sam/sam_06/main.c
similarity index 100%
rename from src/world/area_sam/sam_06/sam_06_2_main.c
rename to src/world/area_sam/sam_06/main.c
diff --git a/src/world/area_sam/sam_06/sam_06_1_music.c b/src/world/area_sam/sam_06/music.c
similarity index 100%
rename from src/world/area_sam/sam_06/sam_06_1_music.c
rename to src/world/area_sam/sam_06/music.c
diff --git a/src/world/area_sam/sam_06/sam_06_4_npc.c b/src/world/area_sam/sam_06/npc.c
similarity index 100%
rename from src/world/area_sam/sam_06/sam_06_4_npc.c
rename to src/world/area_sam/sam_06/npc.c
diff --git a/src/world/area_sam/sam_06/sam_06_3_rooms.c b/src/world/area_sam/sam_06/rooms.c
similarity index 100%
rename from src/world/area_sam/sam_06/sam_06_3_rooms.c
rename to src/world/area_sam/sam_06/rooms.c
diff --git a/src/world/area_sam/sam_06/sam_06_0_header.c b/src/world/area_sam/sam_06/settings.c
similarity index 100%
rename from src/world/area_sam/sam_06/sam_06_0_header.c
rename to src/world/area_sam/sam_06/settings.c
diff --git a/src/world/area_sam/sam_07/sam_07_3_entity.c b/src/world/area_sam/sam_07/entity.c
similarity index 100%
rename from src/world/area_sam/sam_07/sam_07_3_entity.c
rename to src/world/area_sam/sam_07/entity.c
diff --git a/src/world/area_sam/sam_07/sam_07_4_frozen_pit.c b/src/world/area_sam/sam_07/frozen_pit.c
similarity index 100%
rename from src/world/area_sam/sam_07/sam_07_4_frozen_pit.c
rename to src/world/area_sam/sam_07/frozen_pit.c
diff --git a/src/world/area_sam/sam_07/sam_07_2_main.c b/src/world/area_sam/sam_07/main.c
similarity index 100%
rename from src/world/area_sam/sam_07/sam_07_2_main.c
rename to src/world/area_sam/sam_07/main.c
diff --git a/src/world/area_sam/sam_07/sam_07_1_music.c b/src/world/area_sam/sam_07/music.c
similarity index 100%
rename from src/world/area_sam/sam_07/sam_07_1_music.c
rename to src/world/area_sam/sam_07/music.c
diff --git a/src/world/area_sam/sam_07/sam_07_5_npc.c b/src/world/area_sam/sam_07/npc.c
similarity index 100%
rename from src/world/area_sam/sam_07/sam_07_5_npc.c
rename to src/world/area_sam/sam_07/npc.c
diff --git a/src/world/area_sam/sam_07/sam_07_0_header.c b/src/world/area_sam/sam_07/settings.c
similarity index 100%
rename from src/world/area_sam/sam_07/sam_07_0_header.c
rename to src/world/area_sam/sam_07/settings.c
diff --git a/src/world/area_sam/sam_08/sam_08_3_entity.c b/src/world/area_sam/sam_08/entity.c
similarity index 100%
rename from src/world/area_sam/sam_08/sam_08_3_entity.c
rename to src/world/area_sam/sam_08/entity.c
diff --git a/src/world/area_sam/sam_08/sam_08_2_main.c b/src/world/area_sam/sam_08/main.c
similarity index 100%
rename from src/world/area_sam/sam_08/sam_08_2_main.c
rename to src/world/area_sam/sam_08/main.c
diff --git a/src/world/area_sam/sam_08/sam_08_1_music.c b/src/world/area_sam/sam_08/music.c
similarity index 100%
rename from src/world/area_sam/sam_08/sam_08_1_music.c
rename to src/world/area_sam/sam_08/music.c
diff --git a/src/world/area_sam/sam_08/sam_08_4_npc.c b/src/world/area_sam/sam_08/npc.c
similarity index 100%
rename from src/world/area_sam/sam_08/sam_08_4_npc.c
rename to src/world/area_sam/sam_08/npc.c
diff --git a/src/world/area_sam/sam_08/sam_08_5_scenes.c b/src/world/area_sam/sam_08/scenes.c
similarity index 100%
rename from src/world/area_sam/sam_08/sam_08_5_scenes.c
rename to src/world/area_sam/sam_08/scenes.c
diff --git a/src/world/area_sam/sam_08/sam_08_0_header.c b/src/world/area_sam/sam_08/settings.c
similarity index 100%
rename from src/world/area_sam/sam_08/sam_08_0_header.c
rename to src/world/area_sam/sam_08/settings.c
diff --git a/src/world/area_sam/sam_09/sam_09_3_entity.c b/src/world/area_sam/sam_09/entity.c
similarity index 100%
rename from src/world/area_sam/sam_09/sam_09_3_entity.c
rename to src/world/area_sam/sam_09/entity.c
diff --git a/src/world/area_sam/sam_09/sam_09_2_main.c b/src/world/area_sam/sam_09/main.c
similarity index 100%
rename from src/world/area_sam/sam_09/sam_09_2_main.c
rename to src/world/area_sam/sam_09/main.c
diff --git a/src/world/area_sam/sam_09/sam_09_1_music.c b/src/world/area_sam/sam_09/music.c
similarity index 100%
rename from src/world/area_sam/sam_09/sam_09_1_music.c
rename to src/world/area_sam/sam_09/music.c
diff --git a/src/world/area_sam/sam_09/sam_09_0_header.c b/src/world/area_sam/sam_09/settings.c
similarity index 100%
rename from src/world/area_sam/sam_09/sam_09_0_header.c
rename to src/world/area_sam/sam_09/settings.c
diff --git a/src/world/area_sam/sam_09/sam_09_4_sockets.c b/src/world/area_sam/sam_09/sockets.c
similarity index 100%
rename from src/world/area_sam/sam_09/sam_09_4_sockets.c
rename to src/world/area_sam/sam_09/sockets.c
diff --git a/src/world/area_sam/sam_10/sam_10_3_entity.c b/src/world/area_sam/sam_10/entity.c
similarity index 100%
rename from src/world/area_sam/sam_10/sam_10_3_entity.c
rename to src/world/area_sam/sam_10/entity.c
diff --git a/src/world/area_sam/sam_10/sam_10_2_main.c b/src/world/area_sam/sam_10/main.c
similarity index 100%
rename from src/world/area_sam/sam_10/sam_10_2_main.c
rename to src/world/area_sam/sam_10/main.c
diff --git a/src/world/area_sam/sam_10/sam_10_1_music.c b/src/world/area_sam/sam_10/music.c
similarity index 100%
rename from src/world/area_sam/sam_10/sam_10_1_music.c
rename to src/world/area_sam/sam_10/music.c
diff --git a/src/world/area_sam/sam_10/sam_10_5_npc.c b/src/world/area_sam/sam_10/npc.c
similarity index 100%
rename from src/world/area_sam/sam_10/sam_10_5_npc.c
rename to src/world/area_sam/sam_10/npc.c
diff --git a/src/world/area_sam/sam_10/sam_10_0_header.c b/src/world/area_sam/sam_10/settings.c
similarity index 100%
rename from src/world/area_sam/sam_10/sam_10_0_header.c
rename to src/world/area_sam/sam_10/settings.c
diff --git a/src/world/area_sam/sam_10/sam_10_4_stairs.c b/src/world/area_sam/sam_10/stairs.c
similarity index 100%
rename from src/world/area_sam/sam_10/sam_10_4_stairs.c
rename to src/world/area_sam/sam_10/stairs.c
diff --git a/src/world/area_sam/sam_11/sam_11_4_entity.c b/src/world/area_sam/sam_11/entity.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_4_entity.c
rename to src/world/area_sam/sam_11/entity.c
diff --git a/src/world/area_sam/sam_11/sam_11_2_main.c b/src/world/area_sam/sam_11/main.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_2_main.c
rename to src/world/area_sam/sam_11/main.c
diff --git a/src/world/area_sam/sam_11/sam_11_1_music.c b/src/world/area_sam/sam_11/music.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_1_music.c
rename to src/world/area_sam/sam_11/music.c
diff --git a/src/world/area_sam/sam_11/sam_11_5_npc.c b/src/world/area_sam/sam_11/npc.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_5_npc.c
rename to src/world/area_sam/sam_11/npc.c
diff --git a/src/world/area_sam/sam_11/sam_11_6_pond.c b/src/world/area_sam/sam_11/pond.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_6_pond.c
rename to src/world/area_sam/sam_11/pond.c
diff --git a/src/world/area_sam/sam_11/sam_11_8_pond_anim.c b/src/world/area_sam/sam_11/pond_anim.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_8_pond_anim.c
rename to src/world/area_sam/sam_11/pond_anim.c
diff --git a/src/world/area_sam/sam_11/sam_11_9_pond_skele.c b/src/world/area_sam/sam_11/pond_skele.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_9_pond_skele.c
rename to src/world/area_sam/sam_11/pond_skele.c
diff --git a/src/world/area_sam/sam_11/sam_11_3_rooms.c b/src/world/area_sam/sam_11/rooms.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_3_rooms.c
rename to src/world/area_sam/sam_11/rooms.c
diff --git a/src/world/area_sam/sam_11/sam_11_0_header.c b/src/world/area_sam/sam_11/settings.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_0_header.c
rename to src/world/area_sam/sam_11/settings.c
diff --git a/src/world/area_sam/sam_11/sam_11_7_staircase.c b/src/world/area_sam/sam_11/staircase.c
similarity index 100%
rename from src/world/area_sam/sam_11/sam_11_7_staircase.c
rename to src/world/area_sam/sam_11/staircase.c
diff --git a/src/world/area_sam/sam_12/sam_12_5_entity.c b/src/world/area_sam/sam_12/entity.c
similarity index 100%
rename from src/world/area_sam/sam_12/sam_12_5_entity.c
rename to src/world/area_sam/sam_12/entity.c
diff --git a/src/world/area_sam/sam_12/sam_12_2_main.c b/src/world/area_sam/sam_12/main.c
similarity index 100%
rename from src/world/area_sam/sam_12/sam_12_2_main.c
rename to src/world/area_sam/sam_12/main.c
diff --git a/src/world/area_sam/sam_12/sam_12_1_music.c b/src/world/area_sam/sam_12/music.c
similarity index 100%
rename from src/world/area_sam/sam_12/sam_12_1_music.c
rename to src/world/area_sam/sam_12/music.c
diff --git a/src/world/area_sam/sam_12/sam_12_3_npc.c b/src/world/area_sam/sam_12/npc.c
similarity index 100%
rename from src/world/area_sam/sam_12/sam_12_3_npc.c
rename to src/world/area_sam/sam_12/npc.c
diff --git a/src/world/area_sam/sam_12/sam_12_4_scenes.c b/src/world/area_sam/sam_12/scenes.c
similarity index 100%
rename from src/world/area_sam/sam_12/sam_12_4_scenes.c
rename to src/world/area_sam/sam_12/scenes.c
diff --git a/src/world/area_sam/sam_12/sam_12_0_header.c b/src/world/area_sam/sam_12/settings.c
similarity index 100%
rename from src/world/area_sam/sam_12/sam_12_0_header.c
rename to src/world/area_sam/sam_12/settings.c
diff --git a/src/world/area_sbk/sbk_00/sbk_00_3_entity.c b/src/world/area_sbk/sbk_00/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_00/sbk_00_3_entity.c
rename to src/world/area_sbk/sbk_00/entity.c
diff --git a/src/world/area_sbk/sbk_00/sbk_00_1_main.c b/src/world/area_sbk/sbk_00/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_00/sbk_00_1_main.c
rename to src/world/area_sbk/sbk_00/main.c
diff --git a/src/world/area_sbk/sbk_00/sbk_00_2_npc.c b/src/world/area_sbk/sbk_00/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_00/sbk_00_2_npc.c
rename to src/world/area_sbk/sbk_00/npc.c
diff --git a/src/world/area_sbk/sbk_00/sbk_00_0_header.c b/src/world/area_sbk/sbk_00/settings.c
similarity index 100%
rename from src/world/area_sbk/sbk_00/sbk_00_0_header.c
rename to src/world/area_sbk/sbk_00/settings.c
diff --git a/src/world/area_sbk/sbk_01/sbk_01_1_main.c b/src/world/area_sbk/sbk_01/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_01/sbk_01_1_main.c
rename to src/world/area_sbk/sbk_01/main.c
diff --git a/src/world/area_sbk/sbk_01/sbk_01_2_npc.c b/src/world/area_sbk/sbk_01/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_01/sbk_01_2_npc.c
rename to src/world/area_sbk/sbk_01/npc.c
diff --git a/src/world/area_sbk/sbk_02/sbk_02_5_entity.c b/src/world/area_sbk/sbk_02/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_02/sbk_02_5_entity.c
rename to src/world/area_sbk/sbk_02/entity.c
diff --git a/src/world/area_sbk/sbk_02/sbk_02_2_main.c b/src/world/area_sbk/sbk_02/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_02/sbk_02_2_main.c
rename to src/world/area_sbk/sbk_02/main.c
diff --git a/src/world/area_sbk/sbk_02/sbk_02_1_music.c b/src/world/area_sbk/sbk_02/music.c
similarity index 100%
rename from src/world/area_sbk/sbk_02/sbk_02_1_music.c
rename to src/world/area_sbk/sbk_02/music.c
diff --git a/src/world/area_sbk/sbk_02/sbk_02_4_npc.c b/src/world/area_sbk/sbk_02/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_02/sbk_02_4_npc.c
rename to src/world/area_sbk/sbk_02/npc.c
diff --git a/src/world/area_sbk/sbk_02/sbk_02_3_ruins.c b/src/world/area_sbk/sbk_02/ruins.c
similarity index 100%
rename from src/world/area_sbk/sbk_02/sbk_02_3_ruins.c
rename to src/world/area_sbk/sbk_02/ruins.c
diff --git a/src/world/area_sbk/sbk_02/sbk_02_0_header.c b/src/world/area_sbk/sbk_02/settings.c
similarity index 100%
rename from src/world/area_sbk/sbk_02/sbk_02_0_header.c
rename to src/world/area_sbk/sbk_02/settings.c
diff --git a/src/world/area_sbk/sbk_03/sbk_03_1_main.c b/src/world/area_sbk/sbk_03/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_03/sbk_03_1_main.c
rename to src/world/area_sbk/sbk_03/main.c
diff --git a/src/world/area_sbk/sbk_03/sbk_03_2_npc.c b/src/world/area_sbk/sbk_03/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_03/sbk_03_2_npc.c
rename to src/world/area_sbk/sbk_03/npc.c
diff --git a/src/world/area_sbk/sbk_04/sbk_04_1_main.c b/src/world/area_sbk/sbk_04/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_04/sbk_04_1_main.c
rename to src/world/area_sbk/sbk_04/main.c
diff --git a/src/world/area_sbk/sbk_04/sbk_04_2_npc.c b/src/world/area_sbk/sbk_04/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_04/sbk_04_2_npc.c
rename to src/world/area_sbk/sbk_04/npc.c
diff --git a/src/world/area_sbk/sbk_05/sbk_05_2_entity.c b/src/world/area_sbk/sbk_05/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_05/sbk_05_2_entity.c
rename to src/world/area_sbk/sbk_05/entity.c
diff --git a/src/world/area_sbk/sbk_05/sbk_05_1_main.c b/src/world/area_sbk/sbk_05/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_05/sbk_05_1_main.c
rename to src/world/area_sbk/sbk_05/main.c
diff --git a/src/world/area_sbk/sbk_05/sbk_05_3_npc.c b/src/world/area_sbk/sbk_05/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_05/sbk_05_3_npc.c
rename to src/world/area_sbk/sbk_05/npc.c
diff --git a/src/world/area_sbk/sbk_06/sbk_06_4_entity.c b/src/world/area_sbk/sbk_06/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_06/sbk_06_4_entity.c
rename to src/world/area_sbk/sbk_06/entity.c
diff --git a/src/world/area_sbk/sbk_06/sbk_06_3_foliage.c b/src/world/area_sbk/sbk_06/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_06/sbk_06_3_foliage.c
rename to src/world/area_sbk/sbk_06/foliage.c
diff --git a/src/world/area_sbk/sbk_06/sbk_06_1_main.c b/src/world/area_sbk/sbk_06/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_06/sbk_06_1_main.c
rename to src/world/area_sbk/sbk_06/main.c
diff --git a/src/world/area_sbk/sbk_06/sbk_06_2_npc.c b/src/world/area_sbk/sbk_06/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_06/sbk_06_2_npc.c
rename to src/world/area_sbk/sbk_06/npc.c
diff --git a/src/world/area_sbk/sbk_10/sbk_10_2_entity.c b/src/world/area_sbk/sbk_10/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_10/sbk_10_2_entity.c
rename to src/world/area_sbk/sbk_10/entity.c
diff --git a/src/world/area_sbk/sbk_10/sbk_10_1_main.c b/src/world/area_sbk/sbk_10/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_10/sbk_10_1_main.c
rename to src/world/area_sbk/sbk_10/main.c
diff --git a/src/world/area_sbk/sbk_11/sbk_11_1_main.c b/src/world/area_sbk/sbk_11/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_11/sbk_11_1_main.c
rename to src/world/area_sbk/sbk_11/main.c
diff --git a/src/world/area_sbk/sbk_11/sbk_11_2_npc.c b/src/world/area_sbk/sbk_11/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_11/sbk_11_2_npc.c
rename to src/world/area_sbk/sbk_11/npc.c
diff --git a/src/world/area_sbk/sbk_12/sbk_12_1_main.c b/src/world/area_sbk/sbk_12/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_12/sbk_12_1_main.c
rename to src/world/area_sbk/sbk_12/main.c
diff --git a/src/world/area_sbk/sbk_12/sbk_12_2_npc.c b/src/world/area_sbk/sbk_12/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_12/sbk_12_2_npc.c
rename to src/world/area_sbk/sbk_12/npc.c
diff --git a/src/world/area_sbk/sbk_13/sbk_13_1_main.c b/src/world/area_sbk/sbk_13/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_13/sbk_13_1_main.c
rename to src/world/area_sbk/sbk_13/main.c
diff --git a/src/world/area_sbk/sbk_13/sbk_13_2_npc.c b/src/world/area_sbk/sbk_13/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_13/sbk_13_2_npc.c
rename to src/world/area_sbk/sbk_13/npc.c
diff --git a/src/world/area_sbk/sbk_14/sbk_14_2_entity.c b/src/world/area_sbk/sbk_14/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_14/sbk_14_2_entity.c
rename to src/world/area_sbk/sbk_14/entity.c
diff --git a/src/world/area_sbk/sbk_14/sbk_14_1_main.c b/src/world/area_sbk/sbk_14/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_14/sbk_14_1_main.c
rename to src/world/area_sbk/sbk_14/main.c
diff --git a/src/world/area_sbk/sbk_15/sbk_15_1_main.c b/src/world/area_sbk/sbk_15/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_15/sbk_15_1_main.c
rename to src/world/area_sbk/sbk_15/main.c
diff --git a/src/world/area_sbk/sbk_15/sbk_15_2_npc.c b/src/world/area_sbk/sbk_15/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_15/sbk_15_2_npc.c
rename to src/world/area_sbk/sbk_15/npc.c
diff --git a/src/world/area_sbk/sbk_16/sbk_16_2_foliage.c b/src/world/area_sbk/sbk_16/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_16/sbk_16_2_foliage.c
rename to src/world/area_sbk/sbk_16/foliage.c
diff --git a/src/world/area_sbk/sbk_16/sbk_16_1_main.c b/src/world/area_sbk/sbk_16/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_16/sbk_16_1_main.c
rename to src/world/area_sbk/sbk_16/main.c
diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_entity.c b/src/world/area_sbk/sbk_20/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_20/sbk_20_2_entity.c
rename to src/world/area_sbk/sbk_20/entity.c
diff --git a/src/world/area_sbk/sbk_20/sbk_20_1_main.c b/src/world/area_sbk/sbk_20/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_20/sbk_20_1_main.c
rename to src/world/area_sbk/sbk_20/main.c
diff --git a/src/world/area_sbk/sbk_20/sbk_20_2_npc.c b/src/world/area_sbk/sbk_20/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_20/sbk_20_2_npc.c
rename to src/world/area_sbk/sbk_20/npc.c
diff --git a/src/world/area_sbk/sbk_21/sbk_21_1_main.c b/src/world/area_sbk/sbk_21/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_21/sbk_21_1_main.c
rename to src/world/area_sbk/sbk_21/main.c
diff --git a/src/world/area_sbk/sbk_22/sbk_22_3_entity.c b/src/world/area_sbk/sbk_22/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_22/sbk_22_3_entity.c
rename to src/world/area_sbk/sbk_22/entity.c
diff --git a/src/world/area_sbk/sbk_22/sbk_22_1_main.c b/src/world/area_sbk/sbk_22/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_22/sbk_22_1_main.c
rename to src/world/area_sbk/sbk_22/main.c
diff --git a/src/world/area_sbk/sbk_22/sbk_22_2_npc.c b/src/world/area_sbk/sbk_22/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_22/sbk_22_2_npc.c
rename to src/world/area_sbk/sbk_22/npc.c
diff --git a/src/world/area_sbk/sbk_23/sbk_23_2_entity.c b/src/world/area_sbk/sbk_23/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_23/sbk_23_2_entity.c
rename to src/world/area_sbk/sbk_23/entity.c
diff --git a/src/world/area_sbk/sbk_23/sbk_23_1_main.c b/src/world/area_sbk/sbk_23/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_23/sbk_23_1_main.c
rename to src/world/area_sbk/sbk_23/main.c
diff --git a/src/world/area_sbk/sbk_24/sbk_24_3_entity.c b/src/world/area_sbk/sbk_24/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_24/sbk_24_3_entity.c
rename to src/world/area_sbk/sbk_24/entity.c
diff --git a/src/world/area_sbk/sbk_24/sbk_24_4_foliage.c b/src/world/area_sbk/sbk_24/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_24/sbk_24_4_foliage.c
rename to src/world/area_sbk/sbk_24/foliage.c
diff --git a/src/world/area_sbk/sbk_24/sbk_24_1_main.c b/src/world/area_sbk/sbk_24/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_24/sbk_24_1_main.c
rename to src/world/area_sbk/sbk_24/main.c
diff --git a/src/world/area_sbk/sbk_24/sbk_24_2_npc.c b/src/world/area_sbk/sbk_24/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_24/sbk_24_2_npc.c
rename to src/world/area_sbk/sbk_24/npc.c
diff --git a/src/world/area_sbk/sbk_25/sbk_25_4_entity.c b/src/world/area_sbk/sbk_25/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_25/sbk_25_4_entity.c
rename to src/world/area_sbk/sbk_25/entity.c
diff --git a/src/world/area_sbk/sbk_25/sbk_25_3_foliage.c b/src/world/area_sbk/sbk_25/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_25/sbk_25_3_foliage.c
rename to src/world/area_sbk/sbk_25/foliage.c
diff --git a/src/world/area_sbk/sbk_25/sbk_25_1_main.c b/src/world/area_sbk/sbk_25/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_25/sbk_25_1_main.c
rename to src/world/area_sbk/sbk_25/main.c
diff --git a/src/world/area_sbk/sbk_25/sbk_25_2_npc.c b/src/world/area_sbk/sbk_25/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_25/sbk_25_2_npc.c
rename to src/world/area_sbk/sbk_25/npc.c
diff --git a/src/world/area_sbk/sbk_26/sbk_26_3_foliage.c b/src/world/area_sbk/sbk_26/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_26/sbk_26_3_foliage.c
rename to src/world/area_sbk/sbk_26/foliage.c
diff --git a/src/world/area_sbk/sbk_26/sbk_26_1_main.c b/src/world/area_sbk/sbk_26/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_26/sbk_26_1_main.c
rename to src/world/area_sbk/sbk_26/main.c
diff --git a/src/world/area_sbk/sbk_26/sbk_26_2_npc.c b/src/world/area_sbk/sbk_26/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_26/sbk_26_2_npc.c
rename to src/world/area_sbk/sbk_26/npc.c
diff --git a/src/world/area_sbk/sbk_30/sbk_30_4_foliage.c b/src/world/area_sbk/sbk_30/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_30/sbk_30_4_foliage.c
rename to src/world/area_sbk/sbk_30/foliage.c
diff --git a/src/world/area_sbk/sbk_30/sbk_30_2_main.c b/src/world/area_sbk/sbk_30/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_30/sbk_30_2_main.c
rename to src/world/area_sbk/sbk_30/main.c
diff --git a/src/world/area_sbk/sbk_30/sbk_30_1_music.c b/src/world/area_sbk/sbk_30/music.c
similarity index 100%
rename from src/world/area_sbk/sbk_30/sbk_30_1_music.c
rename to src/world/area_sbk/sbk_30/music.c
diff --git a/src/world/area_sbk/sbk_30/sbk_30_3_npc.c b/src/world/area_sbk/sbk_30/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_30/sbk_30_3_npc.c
rename to src/world/area_sbk/sbk_30/npc.c
diff --git a/src/world/area_sbk/sbk_30/sbk_30_0_header.c b/src/world/area_sbk/sbk_30/settings.c
similarity index 100%
rename from src/world/area_sbk/sbk_30/sbk_30_0_header.c
rename to src/world/area_sbk/sbk_30/settings.c
diff --git a/src/world/area_sbk/sbk_31/sbk_31_1_main.c b/src/world/area_sbk/sbk_31/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_31/sbk_31_1_main.c
rename to src/world/area_sbk/sbk_31/main.c
diff --git a/src/world/area_sbk/sbk_31/sbk_31_2_npc.c b/src/world/area_sbk/sbk_31/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_31/sbk_31_2_npc.c
rename to src/world/area_sbk/sbk_31/npc.c
diff --git a/src/world/area_sbk/sbk_32/sbk_32_1_main.c b/src/world/area_sbk/sbk_32/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_32/sbk_32_1_main.c
rename to src/world/area_sbk/sbk_32/main.c
diff --git a/src/world/area_sbk/sbk_32/sbk_32_2_npc.c b/src/world/area_sbk/sbk_32/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_32/sbk_32_2_npc.c
rename to src/world/area_sbk/sbk_32/npc.c
diff --git a/src/world/area_sbk/sbk_33/sbk_33_1_entity.c b/src/world/area_sbk/sbk_33/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_33/sbk_33_1_entity.c
rename to src/world/area_sbk/sbk_33/entity.c
diff --git a/src/world/area_sbk/sbk_33/sbk_33_2_main.c b/src/world/area_sbk/sbk_33/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_33/sbk_33_2_main.c
rename to src/world/area_sbk/sbk_33/main.c
diff --git a/src/world/area_sbk/sbk_33/sbk_33_0_header.c b/src/world/area_sbk/sbk_33/settings.c
similarity index 100%
rename from src/world/area_sbk/sbk_33/sbk_33_0_header.c
rename to src/world/area_sbk/sbk_33/settings.c
diff --git a/src/world/area_sbk/sbk_34/sbk_34_3_foliage.c b/src/world/area_sbk/sbk_34/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_34/sbk_34_3_foliage.c
rename to src/world/area_sbk/sbk_34/foliage.c
diff --git a/src/world/area_sbk/sbk_34/sbk_34_1_main.c b/src/world/area_sbk/sbk_34/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_34/sbk_34_1_main.c
rename to src/world/area_sbk/sbk_34/main.c
diff --git a/src/world/area_sbk/sbk_34/sbk_34_2_npc.c b/src/world/area_sbk/sbk_34/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_34/sbk_34_2_npc.c
rename to src/world/area_sbk/sbk_34/npc.c
diff --git a/src/world/area_sbk/sbk_35/sbk_35_3_foliage.c b/src/world/area_sbk/sbk_35/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_35/sbk_35_3_foliage.c
rename to src/world/area_sbk/sbk_35/foliage.c
diff --git a/src/world/area_sbk/sbk_35/sbk_35_1_main.c b/src/world/area_sbk/sbk_35/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_35/sbk_35_1_main.c
rename to src/world/area_sbk/sbk_35/main.c
diff --git a/src/world/area_sbk/sbk_35/sbk_35_2_npc.c b/src/world/area_sbk/sbk_35/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_35/sbk_35_2_npc.c
rename to src/world/area_sbk/sbk_35/npc.c
diff --git a/src/world/area_sbk/sbk_36/sbk_36_3_entity.c b/src/world/area_sbk/sbk_36/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_36/sbk_36_3_entity.c
rename to src/world/area_sbk/sbk_36/entity.c
diff --git a/src/world/area_sbk/sbk_36/sbk_36_2_foliage.c b/src/world/area_sbk/sbk_36/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_36/sbk_36_2_foliage.c
rename to src/world/area_sbk/sbk_36/foliage.c
diff --git a/src/world/area_sbk/sbk_36/sbk_36_1_main.c b/src/world/area_sbk/sbk_36/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_36/sbk_36_1_main.c
rename to src/world/area_sbk/sbk_36/main.c
diff --git a/src/world/area_sbk/sbk_40/sbk_40_3_entity.c b/src/world/area_sbk/sbk_40/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_40/sbk_40_3_entity.c
rename to src/world/area_sbk/sbk_40/entity.c
diff --git a/src/world/area_sbk/sbk_40/sbk_40_1_main.c b/src/world/area_sbk/sbk_40/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_40/sbk_40_1_main.c
rename to src/world/area_sbk/sbk_40/main.c
diff --git a/src/world/area_sbk/sbk_40/sbk_40_2_npc.c b/src/world/area_sbk/sbk_40/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_40/sbk_40_2_npc.c
rename to src/world/area_sbk/sbk_40/npc.c
diff --git a/src/world/area_sbk/sbk_41/sbk_41_2_entity.c b/src/world/area_sbk/sbk_41/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_41/sbk_41_2_entity.c
rename to src/world/area_sbk/sbk_41/entity.c
diff --git a/src/world/area_sbk/sbk_41/sbk_41_1_main.c b/src/world/area_sbk/sbk_41/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_41/sbk_41_1_main.c
rename to src/world/area_sbk/sbk_41/main.c
diff --git a/src/world/area_sbk/sbk_42/sbk_42_1_main.c b/src/world/area_sbk/sbk_42/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_42/sbk_42_1_main.c
rename to src/world/area_sbk/sbk_42/main.c
diff --git a/src/world/area_sbk/sbk_42/sbk_42_2_npc.c b/src/world/area_sbk/sbk_42/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_42/sbk_42_2_npc.c
rename to src/world/area_sbk/sbk_42/npc.c
diff --git a/src/world/area_sbk/sbk_43/sbk_43_2_entity.c b/src/world/area_sbk/sbk_43/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_43/sbk_43_2_entity.c
rename to src/world/area_sbk/sbk_43/entity.c
diff --git a/src/world/area_sbk/sbk_43/sbk_43_1_main.c b/src/world/area_sbk/sbk_43/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_43/sbk_43_1_main.c
rename to src/world/area_sbk/sbk_43/main.c
diff --git a/src/world/area_sbk/sbk_44/sbk_44_1_main.c b/src/world/area_sbk/sbk_44/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_44/sbk_44_1_main.c
rename to src/world/area_sbk/sbk_44/main.c
diff --git a/src/world/area_sbk/sbk_44/sbk_44_2_npc.c b/src/world/area_sbk/sbk_44/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_44/sbk_44_2_npc.c
rename to src/world/area_sbk/sbk_44/npc.c
diff --git a/src/world/area_sbk/sbk_45/sbk_45_2_entity.c b/src/world/area_sbk/sbk_45/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_45/sbk_45_2_entity.c
rename to src/world/area_sbk/sbk_45/entity.c
diff --git a/src/world/area_sbk/sbk_45/sbk_45_1_main.c b/src/world/area_sbk/sbk_45/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_45/sbk_45_1_main.c
rename to src/world/area_sbk/sbk_45/main.c
diff --git a/src/world/area_sbk/sbk_46/sbk_46_4_entity.c b/src/world/area_sbk/sbk_46/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_46/sbk_46_4_entity.c
rename to src/world/area_sbk/sbk_46/entity.c
diff --git a/src/world/area_sbk/sbk_46/sbk_46_3_foliage.c b/src/world/area_sbk/sbk_46/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_46/sbk_46_3_foliage.c
rename to src/world/area_sbk/sbk_46/foliage.c
diff --git a/src/world/area_sbk/sbk_46/sbk_46_1_main.c b/src/world/area_sbk/sbk_46/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_46/sbk_46_1_main.c
rename to src/world/area_sbk/sbk_46/main.c
diff --git a/src/world/area_sbk/sbk_46/sbk_46_2_npc.c b/src/world/area_sbk/sbk_46/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_46/sbk_46_2_npc.c
rename to src/world/area_sbk/sbk_46/npc.c
diff --git a/src/world/area_sbk/sbk_50/sbk_50_1_main.c b/src/world/area_sbk/sbk_50/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_50/sbk_50_1_main.c
rename to src/world/area_sbk/sbk_50/main.c
diff --git a/src/world/area_sbk/sbk_51/sbk_51_1_main.c b/src/world/area_sbk/sbk_51/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_51/sbk_51_1_main.c
rename to src/world/area_sbk/sbk_51/main.c
diff --git a/src/world/area_sbk/sbk_51/sbk_51_2_npc.c b/src/world/area_sbk/sbk_51/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_51/sbk_51_2_npc.c
rename to src/world/area_sbk/sbk_51/npc.c
diff --git a/src/world/area_sbk/sbk_52/sbk_52_2_entity.c b/src/world/area_sbk/sbk_52/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_52/sbk_52_2_entity.c
rename to src/world/area_sbk/sbk_52/entity.c
diff --git a/src/world/area_sbk/sbk_52/sbk_52_1_main.c b/src/world/area_sbk/sbk_52/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_52/sbk_52_1_main.c
rename to src/world/area_sbk/sbk_52/main.c
diff --git a/src/world/area_sbk/sbk_53/sbk_53_1_main.c b/src/world/area_sbk/sbk_53/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_53/sbk_53_1_main.c
rename to src/world/area_sbk/sbk_53/main.c
diff --git a/src/world/area_sbk/sbk_53/sbk_53_2_npc.c b/src/world/area_sbk/sbk_53/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_53/sbk_53_2_npc.c
rename to src/world/area_sbk/sbk_53/npc.c
diff --git a/src/world/area_sbk/sbk_54/sbk_54_2_entity.c b/src/world/area_sbk/sbk_54/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_54/sbk_54_2_entity.c
rename to src/world/area_sbk/sbk_54/entity.c
diff --git a/src/world/area_sbk/sbk_54/sbk_54_1_main.c b/src/world/area_sbk/sbk_54/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_54/sbk_54_1_main.c
rename to src/world/area_sbk/sbk_54/main.c
diff --git a/src/world/area_sbk/sbk_55/sbk_55_4_entity.c b/src/world/area_sbk/sbk_55/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_55/sbk_55_4_entity.c
rename to src/world/area_sbk/sbk_55/entity.c
diff --git a/src/world/area_sbk/sbk_55/sbk_55_3_foliage.c b/src/world/area_sbk/sbk_55/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_55/sbk_55_3_foliage.c
rename to src/world/area_sbk/sbk_55/foliage.c
diff --git a/src/world/area_sbk/sbk_55/sbk_55_1_main.c b/src/world/area_sbk/sbk_55/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_55/sbk_55_1_main.c
rename to src/world/area_sbk/sbk_55/main.c
diff --git a/src/world/area_sbk/sbk_55/sbk_55_2_npc.c b/src/world/area_sbk/sbk_55/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_55/sbk_55_2_npc.c
rename to src/world/area_sbk/sbk_55/npc.c
diff --git a/src/world/area_sbk/sbk_56/sbk_56_2_entity.c b/src/world/area_sbk/sbk_56/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_56/sbk_56_2_entity.c
rename to src/world/area_sbk/sbk_56/entity.c
diff --git a/src/world/area_sbk/sbk_56/sbk_56_3_foliage.c b/src/world/area_sbk/sbk_56/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_56/sbk_56_3_foliage.c
rename to src/world/area_sbk/sbk_56/foliage.c
diff --git a/src/world/area_sbk/sbk_56/sbk_56_1_main.c b/src/world/area_sbk/sbk_56/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_56/sbk_56_1_main.c
rename to src/world/area_sbk/sbk_56/main.c
diff --git a/src/world/area_sbk/sbk_60/sbk_60_1_main.c b/src/world/area_sbk/sbk_60/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_60/sbk_60_1_main.c
rename to src/world/area_sbk/sbk_60/main.c
diff --git a/src/world/area_sbk/sbk_60/sbk_60_2_npc.c b/src/world/area_sbk/sbk_60/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_60/sbk_60_2_npc.c
rename to src/world/area_sbk/sbk_60/npc.c
diff --git a/src/world/area_sbk/sbk_61/sbk_61_2_entity.c b/src/world/area_sbk/sbk_61/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_61/sbk_61_2_entity.c
rename to src/world/area_sbk/sbk_61/entity.c
diff --git a/src/world/area_sbk/sbk_61/sbk_61_1_main.c b/src/world/area_sbk/sbk_61/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_61/sbk_61_1_main.c
rename to src/world/area_sbk/sbk_61/main.c
diff --git a/src/world/area_sbk/sbk_62/sbk_62_1_main.c b/src/world/area_sbk/sbk_62/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_62/sbk_62_1_main.c
rename to src/world/area_sbk/sbk_62/main.c
diff --git a/src/world/area_sbk/sbk_62/sbk_62_2_npc.c b/src/world/area_sbk/sbk_62/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_62/sbk_62_2_npc.c
rename to src/world/area_sbk/sbk_62/npc.c
diff --git a/src/world/area_sbk/sbk_63/sbk_63_1_main.c b/src/world/area_sbk/sbk_63/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_63/sbk_63_1_main.c
rename to src/world/area_sbk/sbk_63/main.c
diff --git a/src/world/area_sbk/sbk_63/sbk_63_2_npc.c b/src/world/area_sbk/sbk_63/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_63/sbk_63_2_npc.c
rename to src/world/area_sbk/sbk_63/npc.c
diff --git a/src/world/area_sbk/sbk_64/sbk_64_2_entity.c b/src/world/area_sbk/sbk_64/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_64/sbk_64_2_entity.c
rename to src/world/area_sbk/sbk_64/entity.c
diff --git a/src/world/area_sbk/sbk_64/sbk_64_1_main.c b/src/world/area_sbk/sbk_64/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_64/sbk_64_1_main.c
rename to src/world/area_sbk/sbk_64/main.c
diff --git a/src/world/area_sbk/sbk_65/sbk_65_1_main.c b/src/world/area_sbk/sbk_65/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_65/sbk_65_1_main.c
rename to src/world/area_sbk/sbk_65/main.c
diff --git a/src/world/area_sbk/sbk_66/sbk_66_4_entity.c b/src/world/area_sbk/sbk_66/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_66/sbk_66_4_entity.c
rename to src/world/area_sbk/sbk_66/entity.c
diff --git a/src/world/area_sbk/sbk_66/sbk_66_3_foliage.c b/src/world/area_sbk/sbk_66/foliage.c
similarity index 100%
rename from src/world/area_sbk/sbk_66/sbk_66_3_foliage.c
rename to src/world/area_sbk/sbk_66/foliage.c
diff --git a/src/world/area_sbk/sbk_66/sbk_66_1_main.c b/src/world/area_sbk/sbk_66/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_66/sbk_66_1_main.c
rename to src/world/area_sbk/sbk_66/main.c
diff --git a/src/world/area_sbk/sbk_66/sbk_66_2_npc.c b/src/world/area_sbk/sbk_66/npc.c
similarity index 100%
rename from src/world/area_sbk/sbk_66/sbk_66_2_npc.c
rename to src/world/area_sbk/sbk_66/npc.c
diff --git a/src/world/area_sbk/sbk_99/sbk_99_2_entity.c b/src/world/area_sbk/sbk_99/entity.c
similarity index 100%
rename from src/world/area_sbk/sbk_99/sbk_99_2_entity.c
rename to src/world/area_sbk/sbk_99/entity.c
diff --git a/src/world/area_sbk/sbk_99/sbk_99_1_main.c b/src/world/area_sbk/sbk_99/main.c
similarity index 100%
rename from src/world/area_sbk/sbk_99/sbk_99_1_main.c
rename to src/world/area_sbk/sbk_99/main.c
diff --git a/src/world/area_tik/tik_01/tik_01_3_drips.c b/src/world/area_tik/tik_01/drips.c
similarity index 100%
rename from src/world/area_tik/tik_01/tik_01_3_drips.c
rename to src/world/area_tik/tik_01/drips.c
diff --git a/src/world/area_tik/tik_01/tik_01_4_entity.c b/src/world/area_tik/tik_01/entity.c
similarity index 100%
rename from src/world/area_tik/tik_01/tik_01_4_entity.c
rename to src/world/area_tik/tik_01/entity.c
diff --git a/src/world/area_tik/tik_01/tik_01_2_main.c b/src/world/area_tik/tik_01/main.c
similarity index 100%
rename from src/world/area_tik/tik_01/tik_01_2_main.c
rename to src/world/area_tik/tik_01/main.c
diff --git a/src/world/area_tik/tik_01/tik_01_1_music.c b/src/world/area_tik/tik_01/music.c
similarity index 100%
rename from src/world/area_tik/tik_01/tik_01_1_music.c
rename to src/world/area_tik/tik_01/music.c
diff --git a/src/world/area_tik/tik_01/tik_01_5_npc.c b/src/world/area_tik/tik_01/npc.c
similarity index 100%
rename from src/world/area_tik/tik_01/tik_01_5_npc.c
rename to src/world/area_tik/tik_01/npc.c
diff --git a/src/world/area_tik/tik_01/tik_01_0_header.c b/src/world/area_tik/tik_01/settings.c
similarity index 100%
rename from src/world/area_tik/tik_01/tik_01_0_header.c
rename to src/world/area_tik/tik_01/settings.c
diff --git a/src/world/area_tik/tik_02/tik_02_4_drips.c b/src/world/area_tik/tik_02/drips.c
similarity index 100%
rename from src/world/area_tik/tik_02/tik_02_4_drips.c
rename to src/world/area_tik/tik_02/drips.c
diff --git a/src/world/area_tik/tik_02/tik_02_3_entity.c b/src/world/area_tik/tik_02/entity.c
similarity index 100%
rename from src/world/area_tik/tik_02/tik_02_3_entity.c
rename to src/world/area_tik/tik_02/entity.c
diff --git a/src/world/area_tik/tik_02/tik_02_2_main.c b/src/world/area_tik/tik_02/main.c
similarity index 100%
rename from src/world/area_tik/tik_02/tik_02_2_main.c
rename to src/world/area_tik/tik_02/main.c
diff --git a/src/world/area_tik/tik_02/tik_02_1_music.c b/src/world/area_tik/tik_02/music.c
similarity index 100%
rename from src/world/area_tik/tik_02/tik_02_1_music.c
rename to src/world/area_tik/tik_02/music.c
diff --git a/src/world/area_tik/tik_02/tik_02_5_npc.c b/src/world/area_tik/tik_02/npc.c
similarity index 100%
rename from src/world/area_tik/tik_02/tik_02_5_npc.c
rename to src/world/area_tik/tik_02/npc.c
diff --git a/src/world/area_tik/tik_02/tik_02_0_header.c b/src/world/area_tik/tik_02/settings.c
similarity index 100%
rename from src/world/area_tik/tik_02/tik_02_0_header.c
rename to src/world/area_tik/tik_02/settings.c
diff --git a/src/world/area_tik/tik_03/tik_03_6_demo.c b/src/world/area_tik/tik_03/demo.c
similarity index 100%
rename from src/world/area_tik/tik_03/tik_03_6_demo.c
rename to src/world/area_tik/tik_03/demo.c
diff --git a/src/world/area_tik/tik_03/tik_03_3_drips.c b/src/world/area_tik/tik_03/drips.c
similarity index 100%
rename from src/world/area_tik/tik_03/tik_03_3_drips.c
rename to src/world/area_tik/tik_03/drips.c
diff --git a/src/world/area_tik/tik_03/tik_03_5_entity.c b/src/world/area_tik/tik_03/entity.c
similarity index 100%
rename from src/world/area_tik/tik_03/tik_03_5_entity.c
rename to src/world/area_tik/tik_03/entity.c
diff --git a/src/world/area_tik/tik_03/tik_03_2_main.c b/src/world/area_tik/tik_03/main.c
similarity index 100%
rename from src/world/area_tik/tik_03/tik_03_2_main.c
rename to src/world/area_tik/tik_03/main.c
diff --git a/src/world/area_tik/tik_03/tik_03_1_music.c b/src/world/area_tik/tik_03/music.c
similarity index 100%
rename from src/world/area_tik/tik_03/tik_03_1_music.c
rename to src/world/area_tik/tik_03/music.c
diff --git a/src/world/area_tik/tik_03/tik_03_4_platforms.c b/src/world/area_tik/tik_03/platforms.c
similarity index 100%
rename from src/world/area_tik/tik_03/tik_03_4_platforms.c
rename to src/world/area_tik/tik_03/platforms.c
diff --git a/src/world/area_tik/tik_03/tik_03_0_header.c b/src/world/area_tik/tik_03/settings.c
similarity index 100%
rename from src/world/area_tik/tik_03/tik_03_0_header.c
rename to src/world/area_tik/tik_03/settings.c
diff --git a/src/world/area_tik/tik_04/tik_04_3_drips.c b/src/world/area_tik/tik_04/drips.c
similarity index 100%
rename from src/world/area_tik/tik_04/tik_04_3_drips.c
rename to src/world/area_tik/tik_04/drips.c
diff --git a/src/world/area_tik/tik_04/tik_04_2_main.c b/src/world/area_tik/tik_04/main.c
similarity index 100%
rename from src/world/area_tik/tik_04/tik_04_2_main.c
rename to src/world/area_tik/tik_04/main.c
diff --git a/src/world/area_tik/tik_04/tik_04_1_music.c b/src/world/area_tik/tik_04/music.c
similarity index 100%
rename from src/world/area_tik/tik_04/tik_04_1_music.c
rename to src/world/area_tik/tik_04/music.c
diff --git a/src/world/area_tik/tik_04/tik_04_5_npc.c b/src/world/area_tik/tik_04/npc.c
similarity index 100%
rename from src/world/area_tik/tik_04/tik_04_5_npc.c
rename to src/world/area_tik/tik_04/npc.c
diff --git a/src/world/area_tik/tik_04/tik_04_4_platforms.c b/src/world/area_tik/tik_04/platforms.c
similarity index 100%
rename from src/world/area_tik/tik_04/tik_04_4_platforms.c
rename to src/world/area_tik/tik_04/platforms.c
diff --git a/src/world/area_tik/tik_04/tik_04_0_header.c b/src/world/area_tik/tik_04/settings.c
similarity index 100%
rename from src/world/area_tik/tik_04/tik_04_0_header.c
rename to src/world/area_tik/tik_04/settings.c
diff --git a/src/world/area_tik/tik_05/tik_05_3_drips.c b/src/world/area_tik/tik_05/drips.c
similarity index 100%
rename from src/world/area_tik/tik_05/tik_05_3_drips.c
rename to src/world/area_tik/tik_05/drips.c
diff --git a/src/world/area_tik/tik_05/tik_05_4_entity.c b/src/world/area_tik/tik_05/entity.c
similarity index 100%
rename from src/world/area_tik/tik_05/tik_05_4_entity.c
rename to src/world/area_tik/tik_05/entity.c
diff --git a/src/world/area_tik/tik_05/tik_05_2_main.c b/src/world/area_tik/tik_05/main.c
similarity index 100%
rename from src/world/area_tik/tik_05/tik_05_2_main.c
rename to src/world/area_tik/tik_05/main.c
diff --git a/src/world/area_tik/tik_05/tik_05_1_music.c b/src/world/area_tik/tik_05/music.c
similarity index 100%
rename from src/world/area_tik/tik_05/tik_05_1_music.c
rename to src/world/area_tik/tik_05/music.c
diff --git a/src/world/area_tik/tik_05/tik_05_5_npc.c b/src/world/area_tik/tik_05/npc.c
similarity index 100%
rename from src/world/area_tik/tik_05/tik_05_5_npc.c
rename to src/world/area_tik/tik_05/npc.c
diff --git a/src/world/area_tik/tik_05/tik_05_0_header.c b/src/world/area_tik/tik_05/settings.c
similarity index 100%
rename from src/world/area_tik/tik_05/tik_05_0_header.c
rename to src/world/area_tik/tik_05/settings.c
diff --git a/src/world/area_tik/tik_06/tik_06_3_drips.c b/src/world/area_tik/tik_06/drips.c
similarity index 100%
rename from src/world/area_tik/tik_06/tik_06_3_drips.c
rename to src/world/area_tik/tik_06/drips.c
diff --git a/src/world/area_tik/tik_06/tik_06_4_entity.c b/src/world/area_tik/tik_06/entity.c
similarity index 100%
rename from src/world/area_tik/tik_06/tik_06_4_entity.c
rename to src/world/area_tik/tik_06/entity.c
diff --git a/src/world/area_tik/tik_06/tik_06_2_main.c b/src/world/area_tik/tik_06/main.c
similarity index 100%
rename from src/world/area_tik/tik_06/tik_06_2_main.c
rename to src/world/area_tik/tik_06/main.c
diff --git a/src/world/area_tik/tik_06/tik_06_1_music.c b/src/world/area_tik/tik_06/music.c
similarity index 100%
rename from src/world/area_tik/tik_06/tik_06_1_music.c
rename to src/world/area_tik/tik_06/music.c
diff --git a/src/world/area_tik/tik_06/tik_06_0_header.c b/src/world/area_tik/tik_06/settings.c
similarity index 100%
rename from src/world/area_tik/tik_06/tik_06_0_header.c
rename to src/world/area_tik/tik_06/settings.c
diff --git a/src/world/area_tik/tik_07/tik_07_4_drips.c b/src/world/area_tik/tik_07/drips.c
similarity index 100%
rename from src/world/area_tik/tik_07/tik_07_4_drips.c
rename to src/world/area_tik/tik_07/drips.c
diff --git a/src/world/area_tik/tik_07/tik_07_3_entity.c b/src/world/area_tik/tik_07/entity.c
similarity index 100%
rename from src/world/area_tik/tik_07/tik_07_3_entity.c
rename to src/world/area_tik/tik_07/entity.c
diff --git a/src/world/area_tik/tik_07/tik_07_2_main.c b/src/world/area_tik/tik_07/main.c
similarity index 100%
rename from src/world/area_tik/tik_07/tik_07_2_main.c
rename to src/world/area_tik/tik_07/main.c
diff --git a/src/world/area_tik/tik_07/tik_07_1_music.c b/src/world/area_tik/tik_07/music.c
similarity index 100%
rename from src/world/area_tik/tik_07/tik_07_1_music.c
rename to src/world/area_tik/tik_07/music.c
diff --git a/src/world/area_tik/tik_07/tik_07_6_npc.c b/src/world/area_tik/tik_07/npc.c
similarity index 100%
rename from src/world/area_tik/tik_07/tik_07_6_npc.c
rename to src/world/area_tik/tik_07/npc.c
diff --git a/src/world/area_tik/tik_07/tik_07_5_platforms.c b/src/world/area_tik/tik_07/platforms.c
similarity index 100%
rename from src/world/area_tik/tik_07/tik_07_5_platforms.c
rename to src/world/area_tik/tik_07/platforms.c
diff --git a/src/world/area_tik/tik_07/tik_07_0_header.c b/src/world/area_tik/tik_07/settings.c
similarity index 100%
rename from src/world/area_tik/tik_07/tik_07_0_header.c
rename to src/world/area_tik/tik_07/settings.c
diff --git a/src/world/area_tik/tik_08/tik_08_3_drips.c b/src/world/area_tik/tik_08/drips.c
similarity index 100%
rename from src/world/area_tik/tik_08/tik_08_3_drips.c
rename to src/world/area_tik/tik_08/drips.c
diff --git a/src/world/area_tik/tik_08/tik_08_4_entity.c b/src/world/area_tik/tik_08/entity.c
similarity index 100%
rename from src/world/area_tik/tik_08/tik_08_4_entity.c
rename to src/world/area_tik/tik_08/entity.c
diff --git a/src/world/area_tik/tik_08/tik_08_2_main.c b/src/world/area_tik/tik_08/main.c
similarity index 100%
rename from src/world/area_tik/tik_08/tik_08_2_main.c
rename to src/world/area_tik/tik_08/main.c
diff --git a/src/world/area_tik/tik_08/tik_08_1_music.c b/src/world/area_tik/tik_08/music.c
similarity index 100%
rename from src/world/area_tik/tik_08/tik_08_1_music.c
rename to src/world/area_tik/tik_08/music.c
diff --git a/src/world/area_tik/tik_08/tik_08_5_npc.c b/src/world/area_tik/tik_08/npc.c
similarity index 100%
rename from src/world/area_tik/tik_08/tik_08_5_npc.c
rename to src/world/area_tik/tik_08/npc.c
diff --git a/src/world/area_tik/tik_08/tik_08_0_header.c b/src/world/area_tik/tik_08/settings.c
similarity index 100%
rename from src/world/area_tik/tik_08/tik_08_0_header.c
rename to src/world/area_tik/tik_08/settings.c
diff --git a/src/world/area_tik/tik_09/tik_09_3_drips.c b/src/world/area_tik/tik_09/drips.c
similarity index 100%
rename from src/world/area_tik/tik_09/tik_09_3_drips.c
rename to src/world/area_tik/tik_09/drips.c
diff --git a/src/world/area_tik/tik_09/tik_09_4_entity.c b/src/world/area_tik/tik_09/entity.c
similarity index 100%
rename from src/world/area_tik/tik_09/tik_09_4_entity.c
rename to src/world/area_tik/tik_09/entity.c
diff --git a/src/world/area_tik/tik_09/tik_09_2_main.c b/src/world/area_tik/tik_09/main.c
similarity index 100%
rename from src/world/area_tik/tik_09/tik_09_2_main.c
rename to src/world/area_tik/tik_09/main.c
diff --git a/src/world/area_tik/tik_09/tik_09_1_music.c b/src/world/area_tik/tik_09/music.c
similarity index 100%
rename from src/world/area_tik/tik_09/tik_09_1_music.c
rename to src/world/area_tik/tik_09/music.c
diff --git a/src/world/area_tik/tik_09/tik_09_5_npc.c b/src/world/area_tik/tik_09/npc.c
similarity index 100%
rename from src/world/area_tik/tik_09/tik_09_5_npc.c
rename to src/world/area_tik/tik_09/npc.c
diff --git a/src/world/area_tik/tik_09/tik_09_0_header.c b/src/world/area_tik/tik_09/settings.c
similarity index 100%
rename from src/world/area_tik/tik_09/tik_09_0_header.c
rename to src/world/area_tik/tik_09/settings.c
diff --git a/src/world/area_tik/tik_10/tik_10_3_drips.c b/src/world/area_tik/tik_10/drips.c
similarity index 100%
rename from src/world/area_tik/tik_10/tik_10_3_drips.c
rename to src/world/area_tik/tik_10/drips.c
diff --git a/src/world/area_tik/tik_10/tik_10_4_entity.c b/src/world/area_tik/tik_10/entity.c
similarity index 100%
rename from src/world/area_tik/tik_10/tik_10_4_entity.c
rename to src/world/area_tik/tik_10/entity.c
diff --git a/src/world/area_tik/tik_10/tik_10_2_main.c b/src/world/area_tik/tik_10/main.c
similarity index 100%
rename from src/world/area_tik/tik_10/tik_10_2_main.c
rename to src/world/area_tik/tik_10/main.c
diff --git a/src/world/area_tik/tik_10/tik_10_1_music.c b/src/world/area_tik/tik_10/music.c
similarity index 100%
rename from src/world/area_tik/tik_10/tik_10_1_music.c
rename to src/world/area_tik/tik_10/music.c
diff --git a/src/world/area_tik/tik_10/tik_10_0_header.c b/src/world/area_tik/tik_10/settings.c
similarity index 100%
rename from src/world/area_tik/tik_10/tik_10_0_header.c
rename to src/world/area_tik/tik_10/settings.c
diff --git a/src/world/area_tik/tik_12/tik_12_3_drips.c b/src/world/area_tik/tik_12/drips.c
similarity index 100%
rename from src/world/area_tik/tik_12/tik_12_3_drips.c
rename to src/world/area_tik/tik_12/drips.c
diff --git a/src/world/area_tik/tik_12/tik_12_4_entity.c b/src/world/area_tik/tik_12/entity.c
similarity index 100%
rename from src/world/area_tik/tik_12/tik_12_4_entity.c
rename to src/world/area_tik/tik_12/entity.c
diff --git a/src/world/area_tik/tik_12/tik_12_2_main.c b/src/world/area_tik/tik_12/main.c
similarity index 100%
rename from src/world/area_tik/tik_12/tik_12_2_main.c
rename to src/world/area_tik/tik_12/main.c
diff --git a/src/world/area_tik/tik_12/tik_12_1_music.c b/src/world/area_tik/tik_12/music.c
similarity index 100%
rename from src/world/area_tik/tik_12/tik_12_1_music.c
rename to src/world/area_tik/tik_12/music.c
diff --git a/src/world/area_tik/tik_12/tik_12_5_npc.c b/src/world/area_tik/tik_12/npc.c
similarity index 100%
rename from src/world/area_tik/tik_12/tik_12_5_npc.c
rename to src/world/area_tik/tik_12/npc.c
diff --git a/src/world/area_tik/tik_12/tik_12_0_header.c b/src/world/area_tik/tik_12/settings.c
similarity index 100%
rename from src/world/area_tik/tik_12/tik_12_0_header.c
rename to src/world/area_tik/tik_12/settings.c
diff --git a/src/world/area_tik/tik_14/tik_14_3_drips.c b/src/world/area_tik/tik_14/drips.c
similarity index 100%
rename from src/world/area_tik/tik_14/tik_14_3_drips.c
rename to src/world/area_tik/tik_14/drips.c
diff --git a/src/world/area_tik/tik_14/tik_14_4_entity.c b/src/world/area_tik/tik_14/entity.c
similarity index 100%
rename from src/world/area_tik/tik_14/tik_14_4_entity.c
rename to src/world/area_tik/tik_14/entity.c
diff --git a/src/world/area_tik/tik_14/tik_14_2_main.c b/src/world/area_tik/tik_14/main.c
similarity index 100%
rename from src/world/area_tik/tik_14/tik_14_2_main.c
rename to src/world/area_tik/tik_14/main.c
diff --git a/src/world/area_tik/tik_14/tik_14_1_music.c b/src/world/area_tik/tik_14/music.c
similarity index 100%
rename from src/world/area_tik/tik_14/tik_14_1_music.c
rename to src/world/area_tik/tik_14/music.c
diff --git a/src/world/area_tik/tik_14/tik_14_0_header.c b/src/world/area_tik/tik_14/settings.c
similarity index 100%
rename from src/world/area_tik/tik_14/tik_14_0_header.c
rename to src/world/area_tik/tik_14/settings.c
diff --git a/src/world/area_tik/tik_15/tik_15_4_drips.c b/src/world/area_tik/tik_15/drips.c
similarity index 100%
rename from src/world/area_tik/tik_15/tik_15_4_drips.c
rename to src/world/area_tik/tik_15/drips.c
diff --git a/src/world/area_tik/tik_15/tik_15_3_entity.c b/src/world/area_tik/tik_15/entity.c
similarity index 100%
rename from src/world/area_tik/tik_15/tik_15_3_entity.c
rename to src/world/area_tik/tik_15/entity.c
diff --git a/src/world/area_tik/tik_15/tik_15_2_main.c b/src/world/area_tik/tik_15/main.c
similarity index 100%
rename from src/world/area_tik/tik_15/tik_15_2_main.c
rename to src/world/area_tik/tik_15/main.c
diff --git a/src/world/area_tik/tik_15/tik_15_1_music.c b/src/world/area_tik/tik_15/music.c
similarity index 100%
rename from src/world/area_tik/tik_15/tik_15_1_music.c
rename to src/world/area_tik/tik_15/music.c
diff --git a/src/world/area_tik/tik_15/tik_15_5_npc.c b/src/world/area_tik/tik_15/npc.c
similarity index 100%
rename from src/world/area_tik/tik_15/tik_15_5_npc.c
rename to src/world/area_tik/tik_15/npc.c
diff --git a/src/world/area_tik/tik_15/tik_15_0_header.c b/src/world/area_tik/tik_15/settings.c
similarity index 100%
rename from src/world/area_tik/tik_15/tik_15_0_header.c
rename to src/world/area_tik/tik_15/settings.c
diff --git a/src/world/area_tik/tik_17/tik_17_2_entity.c b/src/world/area_tik/tik_17/entity.c
similarity index 100%
rename from src/world/area_tik/tik_17/tik_17_2_entity.c
rename to src/world/area_tik/tik_17/entity.c
diff --git a/src/world/area_tik/tik_17/tik_17_3_main.c b/src/world/area_tik/tik_17/main.c
similarity index 100%
rename from src/world/area_tik/tik_17/tik_17_3_main.c
rename to src/world/area_tik/tik_17/main.c
diff --git a/src/world/area_tik/tik_17/tik_17_1_music.c b/src/world/area_tik/tik_17/music.c
similarity index 100%
rename from src/world/area_tik/tik_17/tik_17_1_music.c
rename to src/world/area_tik/tik_17/music.c
diff --git a/src/world/area_tik/tik_17/tik_17_0_header.c b/src/world/area_tik/tik_17/settings.c
similarity index 100%
rename from src/world/area_tik/tik_17/tik_17_0_header.c
rename to src/world/area_tik/tik_17/settings.c
diff --git a/src/world/area_tik/tik_18/tik_18_3_drips.c b/src/world/area_tik/tik_18/drips.c
similarity index 100%
rename from src/world/area_tik/tik_18/tik_18_3_drips.c
rename to src/world/area_tik/tik_18/drips.c
diff --git a/src/world/area_tik/tik_18/tik_18_5_entity.c b/src/world/area_tik/tik_18/entity.c
similarity index 100%
rename from src/world/area_tik/tik_18/tik_18_5_entity.c
rename to src/world/area_tik/tik_18/entity.c
diff --git a/src/world/area_tik/tik_18/tik_18_2_main.c b/src/world/area_tik/tik_18/main.c
similarity index 100%
rename from src/world/area_tik/tik_18/tik_18_2_main.c
rename to src/world/area_tik/tik_18/main.c
diff --git a/src/world/area_tik/tik_18/tik_18_1_music.c b/src/world/area_tik/tik_18/music.c
similarity index 100%
rename from src/world/area_tik/tik_18/tik_18_1_music.c
rename to src/world/area_tik/tik_18/music.c
diff --git a/src/world/area_tik/tik_18/tik_18_4_npc.c b/src/world/area_tik/tik_18/npc.c
similarity index 100%
rename from src/world/area_tik/tik_18/tik_18_4_npc.c
rename to src/world/area_tik/tik_18/npc.c
diff --git a/src/world/area_tik/tik_18/tik_18_0_header.c b/src/world/area_tik/tik_18/settings.c
similarity index 100%
rename from src/world/area_tik/tik_18/tik_18_0_header.c
rename to src/world/area_tik/tik_18/settings.c
diff --git a/src/world/area_tik/tik_19/tik_19_3_entity.c b/src/world/area_tik/tik_19/entity.c
similarity index 100%
rename from src/world/area_tik/tik_19/tik_19_3_entity.c
rename to src/world/area_tik/tik_19/entity.c
diff --git a/src/world/area_tik/tik_19/tik_19_2_main.c b/src/world/area_tik/tik_19/main.c
similarity index 100%
rename from src/world/area_tik/tik_19/tik_19_2_main.c
rename to src/world/area_tik/tik_19/main.c
diff --git a/src/world/area_tik/tik_19/tik_19_1_music.c b/src/world/area_tik/tik_19/music.c
similarity index 100%
rename from src/world/area_tik/tik_19/tik_19_1_music.c
rename to src/world/area_tik/tik_19/music.c
diff --git a/src/world/area_tik/tik_19/tik_19_0_header.c b/src/world/area_tik/tik_19/settings.c
similarity index 100%
rename from src/world/area_tik/tik_19/tik_19_0_header.c
rename to src/world/area_tik/tik_19/settings.c
diff --git a/src/world/area_tik/tik_20/tik_20_4_entity.c b/src/world/area_tik/tik_20/entity.c
similarity index 100%
rename from src/world/area_tik/tik_20/tik_20_4_entity.c
rename to src/world/area_tik/tik_20/entity.c
diff --git a/src/world/area_tik/tik_20/tik_20_2_main.c b/src/world/area_tik/tik_20/main.c
similarity index 100%
rename from src/world/area_tik/tik_20/tik_20_2_main.c
rename to src/world/area_tik/tik_20/main.c
diff --git a/src/world/area_tik/tik_20/tik_20_1_music.c b/src/world/area_tik/tik_20/music.c
similarity index 100%
rename from src/world/area_tik/tik_20/tik_20_1_music.c
rename to src/world/area_tik/tik_20/music.c
diff --git a/src/world/area_tik/tik_20/tik_20_3_npc.c b/src/world/area_tik/tik_20/npc.c
similarity index 100%
rename from src/world/area_tik/tik_20/tik_20_3_npc.c
rename to src/world/area_tik/tik_20/npc.c
diff --git a/src/world/area_tik/tik_20/tik_20_0_header.c b/src/world/area_tik/tik_20/settings.c
similarity index 100%
rename from src/world/area_tik/tik_20/tik_20_0_header.c
rename to src/world/area_tik/tik_20/settings.c
diff --git a/src/world/area_tik/tik_21/tik_21_3_entity.c b/src/world/area_tik/tik_21/entity.c
similarity index 100%
rename from src/world/area_tik/tik_21/tik_21_3_entity.c
rename to src/world/area_tik/tik_21/entity.c
diff --git a/src/world/area_tik/tik_21/tik_21_2_main.c b/src/world/area_tik/tik_21/main.c
similarity index 100%
rename from src/world/area_tik/tik_21/tik_21_2_main.c
rename to src/world/area_tik/tik_21/main.c
diff --git a/src/world/area_tik/tik_21/tik_21_1_music.c b/src/world/area_tik/tik_21/music.c
similarity index 100%
rename from src/world/area_tik/tik_21/tik_21_1_music.c
rename to src/world/area_tik/tik_21/music.c
diff --git a/src/world/area_tik/tik_21/tik_21_0_header.c b/src/world/area_tik/tik_21/settings.c
similarity index 100%
rename from src/world/area_tik/tik_21/tik_21_0_header.c
rename to src/world/area_tik/tik_21/settings.c
diff --git a/src/world/area_tik/tik_22/tik_22_2_main.c b/src/world/area_tik/tik_22/main.c
similarity index 100%
rename from src/world/area_tik/tik_22/tik_22_2_main.c
rename to src/world/area_tik/tik_22/main.c
diff --git a/src/world/area_tik/tik_22/tik_22_1_music.c b/src/world/area_tik/tik_22/music.c
similarity index 100%
rename from src/world/area_tik/tik_22/tik_22_1_music.c
rename to src/world/area_tik/tik_22/music.c
diff --git a/src/world/area_tik/tik_22/tik_22_0_header.c b/src/world/area_tik/tik_22/settings.c
similarity index 100%
rename from src/world/area_tik/tik_22/tik_22_0_header.c
rename to src/world/area_tik/tik_22/settings.c
diff --git a/src/world/area_tik/tik_23/tik_23_3_entity.c b/src/world/area_tik/tik_23/entity.c
similarity index 100%
rename from src/world/area_tik/tik_23/tik_23_3_entity.c
rename to src/world/area_tik/tik_23/entity.c
diff --git a/src/world/area_tik/tik_23/tik_23_2_main.c b/src/world/area_tik/tik_23/main.c
similarity index 100%
rename from src/world/area_tik/tik_23/tik_23_2_main.c
rename to src/world/area_tik/tik_23/main.c
diff --git a/src/world/area_tik/tik_23/tik_23_1_music.c b/src/world/area_tik/tik_23/music.c
similarity index 100%
rename from src/world/area_tik/tik_23/tik_23_1_music.c
rename to src/world/area_tik/tik_23/music.c
diff --git a/src/world/area_tik/tik_23/tik_23_4_npc.c b/src/world/area_tik/tik_23/npc.c
similarity index 100%
rename from src/world/area_tik/tik_23/tik_23_4_npc.c
rename to src/world/area_tik/tik_23/npc.c
diff --git a/src/world/area_tik/tik_23/tik_23_0_header.c b/src/world/area_tik/tik_23/settings.c
similarity index 100%
rename from src/world/area_tik/tik_23/tik_23_0_header.c
rename to src/world/area_tik/tik_23/settings.c
diff --git a/src/world/area_tik/tik_24/tik_24_3_drips.c b/src/world/area_tik/tik_24/drips.c
similarity index 100%
rename from src/world/area_tik/tik_24/tik_24_3_drips.c
rename to src/world/area_tik/tik_24/drips.c
diff --git a/src/world/area_tik/tik_24/tik_24_4_entity.c b/src/world/area_tik/tik_24/entity.c
similarity index 100%
rename from src/world/area_tik/tik_24/tik_24_4_entity.c
rename to src/world/area_tik/tik_24/entity.c
diff --git a/src/world/area_tik/tik_24/tik_24_2_main.c b/src/world/area_tik/tik_24/main.c
similarity index 100%
rename from src/world/area_tik/tik_24/tik_24_2_main.c
rename to src/world/area_tik/tik_24/main.c
diff --git a/src/world/area_tik/tik_24/tik_24_1_music.c b/src/world/area_tik/tik_24/music.c
similarity index 100%
rename from src/world/area_tik/tik_24/tik_24_1_music.c
rename to src/world/area_tik/tik_24/music.c
diff --git a/src/world/area_tik/tik_24/tik_24_5_npc.c b/src/world/area_tik/tik_24/npc.c
similarity index 100%
rename from src/world/area_tik/tik_24/tik_24_5_npc.c
rename to src/world/area_tik/tik_24/npc.c
diff --git a/src/world/area_tik/tik_24/tik_24_0_header.c b/src/world/area_tik/tik_24/settings.c
similarity index 100%
rename from src/world/area_tik/tik_24/tik_24_0_header.c
rename to src/world/area_tik/tik_24/settings.c
diff --git a/src/world/area_tik/tik_25/tik_25_3_entity.c b/src/world/area_tik/tik_25/entity.c
similarity index 100%
rename from src/world/area_tik/tik_25/tik_25_3_entity.c
rename to src/world/area_tik/tik_25/entity.c
diff --git a/src/world/area_tik/tik_25/tik_25_2_main.c b/src/world/area_tik/tik_25/main.c
similarity index 100%
rename from src/world/area_tik/tik_25/tik_25_2_main.c
rename to src/world/area_tik/tik_25/main.c
diff --git a/src/world/area_tik/tik_25/tik_25_1_music.c b/src/world/area_tik/tik_25/music.c
similarity index 100%
rename from src/world/area_tik/tik_25/tik_25_1_music.c
rename to src/world/area_tik/tik_25/music.c
diff --git a/src/world/area_tik/tik_25/tik_25_0_header.c b/src/world/area_tik/tik_25/settings.c
similarity index 100%
rename from src/world/area_tik/tik_25/tik_25_0_header.c
rename to src/world/area_tik/tik_25/settings.c
diff --git a/src/world/area_trd/trd_00/trd_00_2_entity.c b/src/world/area_trd/trd_00/entity.c
similarity index 100%
rename from src/world/area_trd/trd_00/trd_00_2_entity.c
rename to src/world/area_trd/trd_00/entity.c
diff --git a/src/world/area_trd/trd_00/trd_00_1_main.c b/src/world/area_trd/trd_00/main.c
similarity index 100%
rename from src/world/area_trd/trd_00/trd_00_1_main.c
rename to src/world/area_trd/trd_00/main.c
diff --git a/src/world/area_trd/trd_00/trd_00_3_npc.c b/src/world/area_trd/trd_00/npc.c
similarity index 100%
rename from src/world/area_trd/trd_00/trd_00_3_npc.c
rename to src/world/area_trd/trd_00/npc.c
diff --git a/src/world/area_trd/trd_00/trd_00_0_header.c b/src/world/area_trd/trd_00/settings.c
similarity index 100%
rename from src/world/area_trd/trd_00/trd_00_0_header.c
rename to src/world/area_trd/trd_00/settings.c
diff --git a/src/world/area_trd/trd_01/trd_01_2_entity.c b/src/world/area_trd/trd_01/entity.c
similarity index 100%
rename from src/world/area_trd/trd_01/trd_01_2_entity.c
rename to src/world/area_trd/trd_01/entity.c
diff --git a/src/world/area_trd/trd_01/trd_01_1_main.c b/src/world/area_trd/trd_01/main.c
similarity index 100%
rename from src/world/area_trd/trd_01/trd_01_1_main.c
rename to src/world/area_trd/trd_01/main.c
diff --git a/src/world/area_trd/trd_01/trd_01_3_npc.c b/src/world/area_trd/trd_01/npc.c
similarity index 100%
rename from src/world/area_trd/trd_01/trd_01_3_npc.c
rename to src/world/area_trd/trd_01/npc.c
diff --git a/src/world/area_trd/trd_01/trd_01_0_header.c b/src/world/area_trd/trd_01/settings.c
similarity index 100%
rename from src/world/area_trd/trd_01/trd_01_0_header.c
rename to src/world/area_trd/trd_01/settings.c
diff --git a/src/world/area_trd/trd_02/trd_02_2_entity.c b/src/world/area_trd/trd_02/entity.c
similarity index 100%
rename from src/world/area_trd/trd_02/trd_02_2_entity.c
rename to src/world/area_trd/trd_02/entity.c
diff --git a/src/world/area_trd/trd_02/trd_02_1_main.c b/src/world/area_trd/trd_02/main.c
similarity index 100%
rename from src/world/area_trd/trd_02/trd_02_1_main.c
rename to src/world/area_trd/trd_02/main.c
diff --git a/src/world/area_trd/trd_02/trd_02_3_npc.c b/src/world/area_trd/trd_02/npc.c
similarity index 100%
rename from src/world/area_trd/trd_02/trd_02_3_npc.c
rename to src/world/area_trd/trd_02/npc.c
diff --git a/src/world/area_trd/trd_02/trd_02_0_header.c b/src/world/area_trd/trd_02/settings.c
similarity index 100%
rename from src/world/area_trd/trd_02/trd_02_0_header.c
rename to src/world/area_trd/trd_02/settings.c
diff --git a/src/world/area_trd/trd_03/trd_03_2_entity.c b/src/world/area_trd/trd_03/entity.c
similarity index 100%
rename from src/world/area_trd/trd_03/trd_03_2_entity.c
rename to src/world/area_trd/trd_03/entity.c
diff --git a/src/world/area_trd/trd_03/trd_03_1_main.c b/src/world/area_trd/trd_03/main.c
similarity index 100%
rename from src/world/area_trd/trd_03/trd_03_1_main.c
rename to src/world/area_trd/trd_03/main.c
diff --git a/src/world/area_trd/trd_03/trd_03_3_npc.c b/src/world/area_trd/trd_03/npc.c
similarity index 100%
rename from src/world/area_trd/trd_03/trd_03_3_npc.c
rename to src/world/area_trd/trd_03/npc.c
diff --git a/src/world/area_trd/trd_03/trd_03_4_puzzle.c b/src/world/area_trd/trd_03/puzzle.c
similarity index 100%
rename from src/world/area_trd/trd_03/trd_03_4_puzzle.c
rename to src/world/area_trd/trd_03/puzzle.c
diff --git a/src/world/area_trd/trd_03/trd_03_0_header.c b/src/world/area_trd/trd_03/settings.c
similarity index 100%
rename from src/world/area_trd/trd_03/trd_03_0_header.c
rename to src/world/area_trd/trd_03/settings.c
diff --git a/src/world/area_trd/trd_04/trd_04_2_entity.c b/src/world/area_trd/trd_04/entity.c
similarity index 100%
rename from src/world/area_trd/trd_04/trd_04_2_entity.c
rename to src/world/area_trd/trd_04/entity.c
diff --git a/src/world/area_trd/trd_04/trd_04_1_main.c b/src/world/area_trd/trd_04/main.c
similarity index 100%
rename from src/world/area_trd/trd_04/trd_04_1_main.c
rename to src/world/area_trd/trd_04/main.c
diff --git a/src/world/area_trd/trd_04/trd_04_3_npc.c b/src/world/area_trd/trd_04/npc.c
similarity index 100%
rename from src/world/area_trd/trd_04/trd_04_3_npc.c
rename to src/world/area_trd/trd_04/npc.c
diff --git a/src/world/area_trd/trd_04/trd_04_0_header.c b/src/world/area_trd/trd_04/settings.c
similarity index 100%
rename from src/world/area_trd/trd_04/trd_04_0_header.c
rename to src/world/area_trd/trd_04/settings.c
diff --git a/src/world/area_trd/trd_05/trd_05_2_entity.c b/src/world/area_trd/trd_05/entity.c
similarity index 100%
rename from src/world/area_trd/trd_05/trd_05_2_entity.c
rename to src/world/area_trd/trd_05/entity.c
diff --git a/src/world/area_trd/trd_05/trd_05_1_main.c b/src/world/area_trd/trd_05/main.c
similarity index 100%
rename from src/world/area_trd/trd_05/trd_05_1_main.c
rename to src/world/area_trd/trd_05/main.c
diff --git a/src/world/area_trd/trd_05/trd_05_4_npc.c b/src/world/area_trd/trd_05/npc.c
similarity index 100%
rename from src/world/area_trd/trd_05/trd_05_4_npc.c
rename to src/world/area_trd/trd_05/npc.c
diff --git a/src/world/area_trd/trd_05/trd_05_0_header.c b/src/world/area_trd/trd_05/settings.c
similarity index 100%
rename from src/world/area_trd/trd_05/trd_05_0_header.c
rename to src/world/area_trd/trd_05/settings.c
diff --git a/src/world/area_trd/trd_05/trd_05_3_trap.c b/src/world/area_trd/trd_05/trap.c
similarity index 100%
rename from src/world/area_trd/trd_05/trd_05_3_trap.c
rename to src/world/area_trd/trd_05/trap.c
diff --git a/src/world/area_trd/trd_06/trd_06_5_entity.c b/src/world/area_trd/trd_06/entity.c
similarity index 100%
rename from src/world/area_trd/trd_06/trd_06_5_entity.c
rename to src/world/area_trd/trd_06/entity.c
diff --git a/src/world/area_trd/trd_06/trd_06_2_falling.c b/src/world/area_trd/trd_06/falling.c
similarity index 100%
rename from src/world/area_trd/trd_06/trd_06_2_falling.c
rename to src/world/area_trd/trd_06/falling.c
diff --git a/src/world/area_trd/trd_06/trd_06_1_main.c b/src/world/area_trd/trd_06/main.c
similarity index 100%
rename from src/world/area_trd/trd_06/trd_06_1_main.c
rename to src/world/area_trd/trd_06/main.c
diff --git a/src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c b/src/world/area_trd/trd_06/npc_koopa_bros.c
similarity index 100%
rename from src/world/area_trd/trd_06/trd_06_4_npc_koopa_bros.c
rename to src/world/area_trd/trd_06/npc_koopa_bros.c
diff --git a/src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c b/src/world/area_trd/trd_06/npc_prisoners.c
similarity index 100%
rename from src/world/area_trd/trd_06/trd_06_3_npc_prisoners.c
rename to src/world/area_trd/trd_06/npc_prisoners.c
diff --git a/src/world/area_trd/trd_06/trd_06_0_header.c b/src/world/area_trd/trd_06/settings.c
similarity index 100%
rename from src/world/area_trd/trd_06/trd_06_0_header.c
rename to src/world/area_trd/trd_06/settings.c
diff --git a/src/world/area_trd/trd_07/trd_07_3_magic_doors.c b/src/world/area_trd/trd_07/magic_doors.c
similarity index 100%
rename from src/world/area_trd/trd_07/trd_07_3_magic_doors.c
rename to src/world/area_trd/trd_07/magic_doors.c
diff --git a/src/world/area_trd/trd_07/trd_07_1_main.c b/src/world/area_trd/trd_07/main.c
similarity index 100%
rename from src/world/area_trd/trd_07/trd_07_1_main.c
rename to src/world/area_trd/trd_07/main.c
diff --git a/src/world/area_trd/trd_07/trd_07_2_npc.c b/src/world/area_trd/trd_07/npc.c
similarity index 100%
rename from src/world/area_trd/trd_07/trd_07_2_npc.c
rename to src/world/area_trd/trd_07/npc.c
diff --git a/src/world/area_trd/trd_07/trd_07_0_header.c b/src/world/area_trd/trd_07/settings.c
similarity index 100%
rename from src/world/area_trd/trd_07/trd_07_0_header.c
rename to src/world/area_trd/trd_07/settings.c
diff --git a/src/world/area_trd/trd_08/trd_08_2_entity.c b/src/world/area_trd/trd_08/entity.c
similarity index 100%
rename from src/world/area_trd/trd_08/trd_08_2_entity.c
rename to src/world/area_trd/trd_08/entity.c
diff --git a/src/world/area_trd/trd_08/trd_08_1_main.c b/src/world/area_trd/trd_08/main.c
similarity index 100%
rename from src/world/area_trd/trd_08/trd_08_1_main.c
rename to src/world/area_trd/trd_08/main.c
diff --git a/src/world/area_trd/trd_08/trd_08_3_npc.c b/src/world/area_trd/trd_08/npc.c
similarity index 100%
rename from src/world/area_trd/trd_08/trd_08_3_npc.c
rename to src/world/area_trd/trd_08/npc.c
diff --git a/src/world/area_trd/trd_08/trd_08_0_header.c b/src/world/area_trd/trd_08/settings.c
similarity index 100%
rename from src/world/area_trd/trd_08/trd_08_0_header.c
rename to src/world/area_trd/trd_08/settings.c
diff --git a/src/world/area_trd/trd_09/trd_09_4_demo.c b/src/world/area_trd/trd_09/demo.c
similarity index 100%
rename from src/world/area_trd/trd_09/trd_09_4_demo.c
rename to src/world/area_trd/trd_09/demo.c
diff --git a/src/world/area_trd/trd_09/trd_09_2_entity.c b/src/world/area_trd/trd_09/entity.c
similarity index 100%
rename from src/world/area_trd/trd_09/trd_09_2_entity.c
rename to src/world/area_trd/trd_09/entity.c
diff --git a/src/world/area_trd/trd_09/trd_09_1_main.c b/src/world/area_trd/trd_09/main.c
similarity index 100%
rename from src/world/area_trd/trd_09/trd_09_1_main.c
rename to src/world/area_trd/trd_09/main.c
diff --git a/src/world/area_trd/trd_09/trd_09_3_npc.c b/src/world/area_trd/trd_09/npc.c
similarity index 100%
rename from src/world/area_trd/trd_09/trd_09_3_npc.c
rename to src/world/area_trd/trd_09/npc.c
diff --git a/src/world/area_trd/trd_09/trd_09_0_header.c b/src/world/area_trd/trd_09/settings.c
similarity index 100%
rename from src/world/area_trd/trd_09/trd_09_0_header.c
rename to src/world/area_trd/trd_09/settings.c
diff --git a/src/world/area_trd/trd_10/trd_10_3_fake_bowser.c b/src/world/area_trd/trd_10/fake_bowser.c
similarity index 100%
rename from src/world/area_trd/trd_10/trd_10_3_fake_bowser.c
rename to src/world/area_trd/trd_10/fake_bowser.c
diff --git a/src/world/area_trd/trd_10/trd_10_1_main.c b/src/world/area_trd/trd_10/main.c
similarity index 100%
rename from src/world/area_trd/trd_10/trd_10_1_main.c
rename to src/world/area_trd/trd_10/main.c
diff --git a/src/world/area_trd/trd_10/trd_10_2_npc.c b/src/world/area_trd/trd_10/npc.c
similarity index 100%
rename from src/world/area_trd/trd_10/trd_10_2_npc.c
rename to src/world/area_trd/trd_10/npc.c
diff --git a/src/world/area_trd/trd_10/trd_10_0_header.c b/src/world/area_trd/trd_10/settings.c
similarity index 100%
rename from src/world/area_trd/trd_10/trd_10_0_header.c
rename to src/world/area_trd/trd_10/settings.c
diff --git a/src/world/area_tst/tst_01/tst_01_2_entity.c b/src/world/area_tst/tst_01/entity.c
similarity index 100%
rename from src/world/area_tst/tst_01/tst_01_2_entity.c
rename to src/world/area_tst/tst_01/entity.c
diff --git a/src/world/area_tst/tst_01/tst_01_1_main.c b/src/world/area_tst/tst_01/main.c
similarity index 100%
rename from src/world/area_tst/tst_01/tst_01_1_main.c
rename to src/world/area_tst/tst_01/main.c
diff --git a/src/world/area_tst/tst_02/tst_02_2_entity.c b/src/world/area_tst/tst_02/entity.c
similarity index 100%
rename from src/world/area_tst/tst_02/tst_02_2_entity.c
rename to src/world/area_tst/tst_02/entity.c
diff --git a/src/world/area_tst/tst_02/tst_02_1_main.c b/src/world/area_tst/tst_02/main.c
similarity index 100%
rename from src/world/area_tst/tst_02/tst_02_1_main.c
rename to src/world/area_tst/tst_02/main.c
diff --git a/src/world/area_tst/tst_03/tst_03_2_entity.c b/src/world/area_tst/tst_03/entity.c
similarity index 100%
rename from src/world/area_tst/tst_03/tst_03_2_entity.c
rename to src/world/area_tst/tst_03/entity.c
diff --git a/src/world/area_tst/tst_03/tst_03_1_main.c b/src/world/area_tst/tst_03/main.c
similarity index 100%
rename from src/world/area_tst/tst_03/tst_03_1_main.c
rename to src/world/area_tst/tst_03/main.c
diff --git a/src/world/area_tst/tst_04/tst_04_2_entity.c b/src/world/area_tst/tst_04/entity.c
similarity index 100%
rename from src/world/area_tst/tst_04/tst_04_2_entity.c
rename to src/world/area_tst/tst_04/entity.c
diff --git a/src/world/area_tst/tst_04/tst_04_1_main.c b/src/world/area_tst/tst_04/main.c
similarity index 100%
rename from src/world/area_tst/tst_04/tst_04_1_main.c
rename to src/world/area_tst/tst_04/main.c
diff --git a/src/world/area_tst/tst_04/tst_04_4_npc.c b/src/world/area_tst/tst_04/npc.c
similarity index 100%
rename from src/world/area_tst/tst_04/tst_04_4_npc.c
rename to src/world/area_tst/tst_04/npc.c
diff --git a/src/world/area_tst/tst_04/tst_04_3_reflection.c b/src/world/area_tst/tst_04/reflection.c
similarity index 100%
rename from src/world/area_tst/tst_04/tst_04_3_reflection.c
rename to src/world/area_tst/tst_04/reflection.c
diff --git a/src/world/area_tst/tst_10/tst_10_1_main.c b/src/world/area_tst/tst_10/main.c
similarity index 100%
rename from src/world/area_tst/tst_10/tst_10_1_main.c
rename to src/world/area_tst/tst_10/main.c
diff --git a/src/world/area_tst/tst_11/tst_11_2_extra.c b/src/world/area_tst/tst_11/extra.c
similarity index 100%
rename from src/world/area_tst/tst_11/tst_11_2_extra.c
rename to src/world/area_tst/tst_11/extra.c
diff --git a/src/world/area_tst/tst_11/tst_11_1_main.c b/src/world/area_tst/tst_11/main.c
similarity index 100%
rename from src/world/area_tst/tst_11/tst_11_1_main.c
rename to src/world/area_tst/tst_11/main.c
diff --git a/src/world/area_tst/tst_12/tst_12_1_main.c b/src/world/area_tst/tst_12/main.c
similarity index 100%
rename from src/world/area_tst/tst_12/tst_12_1_main.c
rename to src/world/area_tst/tst_12/main.c
diff --git a/src/world/area_tst/tst_13/tst_13_1_main.c b/src/world/area_tst/tst_13/main.c
similarity index 100%
rename from src/world/area_tst/tst_13/tst_13_1_main.c
rename to src/world/area_tst/tst_13/main.c
diff --git a/src/world/area_tst/tst_20/tst_20_1_main.c b/src/world/area_tst/tst_20/main.c
similarity index 100%
rename from src/world/area_tst/tst_20/tst_20_1_main.c
rename to src/world/area_tst/tst_20/main.c
diff --git a/src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c b/src/world/dead/area_flo/flo_00/beanstalk.c
similarity index 100%
rename from src/world/dead/area_flo/flo_00/flo_00_5_beanstalk.c
rename to src/world/dead/area_flo/flo_00/beanstalk.c
diff --git a/src/world/dead/area_flo/flo_00/flo_00_6_entity.c b/src/world/dead/area_flo/flo_00/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_00/flo_00_6_entity.c
rename to src/world/dead/area_flo/flo_00/entity.c
diff --git a/src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c b/src/world/dead/area_flo/flo_00/epilogue.c
similarity index 100%
rename from src/world/dead/area_flo/flo_00/flo_00_4_epilogue.c
rename to src/world/dead/area_flo/flo_00/epilogue.c
diff --git a/src/world/dead/area_flo/flo_00/flo_00_2_main.c b/src/world/dead/area_flo/flo_00/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_00/flo_00_2_main.c
rename to src/world/dead/area_flo/flo_00/main.c
diff --git a/src/world/dead/area_flo/flo_00/flo_00_1_music.c b/src/world/dead/area_flo/flo_00/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_00/flo_00_1_music.c
rename to src/world/dead/area_flo/flo_00/music.c
diff --git a/src/world/dead/area_flo/flo_00/flo_00_3_npc.c b/src/world/dead/area_flo/flo_00/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_00/flo_00_3_npc.c
rename to src/world/dead/area_flo/flo_00/npc.c
diff --git a/src/world/dead/area_flo/flo_00/flo_00_0_header.c b/src/world/dead/area_flo/flo_00/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_00/flo_00_0_header.c
rename to src/world/dead/area_flo/flo_00/settings.c
diff --git a/src/world/dead/area_flo/flo_03/flo_03_5_entity.c b/src/world/dead/area_flo/flo_03/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_03/flo_03_5_entity.c
rename to src/world/dead/area_flo/flo_03/entity.c
diff --git a/src/world/dead/area_flo/flo_03/flo_03_4_foliage.c b/src/world/dead/area_flo/flo_03/foliage.c
similarity index 100%
rename from src/world/dead/area_flo/flo_03/flo_03_4_foliage.c
rename to src/world/dead/area_flo/flo_03/foliage.c
diff --git a/src/world/dead/area_flo/flo_03/flo_03_2_main.c b/src/world/dead/area_flo/flo_03/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_03/flo_03_2_main.c
rename to src/world/dead/area_flo/flo_03/main.c
diff --git a/src/world/dead/area_flo/flo_03/flo_03_1_music.c b/src/world/dead/area_flo/flo_03/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_03/flo_03_1_music.c
rename to src/world/dead/area_flo/flo_03/music.c
diff --git a/src/world/dead/area_flo/flo_03/flo_03_3_npc.c b/src/world/dead/area_flo/flo_03/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_03/flo_03_3_npc.c
rename to src/world/dead/area_flo/flo_03/npc.c
diff --git a/src/world/dead/area_flo/flo_03/flo_03_0_header.c b/src/world/dead/area_flo/flo_03/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_03/flo_03_0_header.c
rename to src/world/dead/area_flo/flo_03/settings.c
diff --git a/src/world/dead/area_flo/flo_07/flo_07_2_main.c b/src/world/dead/area_flo/flo_07/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_07/flo_07_2_main.c
rename to src/world/dead/area_flo/flo_07/main.c
diff --git a/src/world/dead/area_flo/flo_07/flo_07_1_music.c b/src/world/dead/area_flo/flo_07/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_07/flo_07_1_music.c
rename to src/world/dead/area_flo/flo_07/music.c
diff --git a/src/world/dead/area_flo/flo_07/flo_07_3_npc.c b/src/world/dead/area_flo/flo_07/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_07/flo_07_3_npc.c
rename to src/world/dead/area_flo/flo_07/npc.c
diff --git a/src/world/dead/area_flo/flo_07/flo_07_0_header.c b/src/world/dead/area_flo/flo_07/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_07/flo_07_0_header.c
rename to src/world/dead/area_flo/flo_07/settings.c
diff --git a/src/world/dead/area_flo/flo_08/flo_08_2_entity.c b/src/world/dead/area_flo/flo_08/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_08/flo_08_2_entity.c
rename to src/world/dead/area_flo/flo_08/entity.c
diff --git a/src/world/dead/area_flo/flo_08/flo_08_5_foliage.c b/src/world/dead/area_flo/flo_08/foliage.c
similarity index 100%
rename from src/world/dead/area_flo/flo_08/flo_08_5_foliage.c
rename to src/world/dead/area_flo/flo_08/foliage.c
diff --git a/src/world/dead/area_flo/flo_08/flo_08_3_main.c b/src/world/dead/area_flo/flo_08/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_08/flo_08_3_main.c
rename to src/world/dead/area_flo/flo_08/main.c
diff --git a/src/world/dead/area_flo/flo_08/flo_08_1_music.c b/src/world/dead/area_flo/flo_08/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_08/flo_08_1_music.c
rename to src/world/dead/area_flo/flo_08/music.c
diff --git a/src/world/dead/area_flo/flo_08/flo_08_4_npc.c b/src/world/dead/area_flo/flo_08/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_08/flo_08_4_npc.c
rename to src/world/dead/area_flo/flo_08/npc.c
diff --git a/src/world/dead/area_flo/flo_08/flo_08_0_header.c b/src/world/dead/area_flo/flo_08/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_08/flo_08_0_header.c
rename to src/world/dead/area_flo/flo_08/settings.c
diff --git a/src/world/dead/area_flo/flo_08/flo_08_6_vines.c b/src/world/dead/area_flo/flo_08/vines.c
similarity index 100%
rename from src/world/dead/area_flo/flo_08/flo_08_6_vines.c
rename to src/world/dead/area_flo/flo_08/vines.c
diff --git a/src/world/dead/area_flo/flo_09/flo_09_4_foliage.c b/src/world/dead/area_flo/flo_09/foliage.c
similarity index 100%
rename from src/world/dead/area_flo/flo_09/flo_09_4_foliage.c
rename to src/world/dead/area_flo/flo_09/foliage.c
diff --git a/src/world/dead/area_flo/flo_09/flo_09_2_main.c b/src/world/dead/area_flo/flo_09/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_09/flo_09_2_main.c
rename to src/world/dead/area_flo/flo_09/main.c
diff --git a/src/world/dead/area_flo/flo_09/flo_09_1_music.c b/src/world/dead/area_flo/flo_09/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_09/flo_09_1_music.c
rename to src/world/dead/area_flo/flo_09/music.c
diff --git a/src/world/dead/area_flo/flo_09/flo_09_5_npc.c b/src/world/dead/area_flo/flo_09/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_09/flo_09_5_npc.c
rename to src/world/dead/area_flo/flo_09/npc.c
diff --git a/src/world/dead/area_flo/flo_09/flo_09_0_header.c b/src/world/dead/area_flo/flo_09/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_09/flo_09_0_header.c
rename to src/world/dead/area_flo/flo_09/settings.c
diff --git a/src/world/dead/area_flo/flo_09/flo_09_3_vines.c b/src/world/dead/area_flo/flo_09/vines.c
similarity index 100%
rename from src/world/dead/area_flo/flo_09/flo_09_3_vines.c
rename to src/world/dead/area_flo/flo_09/vines.c
diff --git a/src/world/dead/area_flo/flo_10/flo_10_2_entity.c b/src/world/dead/area_flo/flo_10/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_10/flo_10_2_entity.c
rename to src/world/dead/area_flo/flo_10/entity.c
diff --git a/src/world/dead/area_flo/flo_10/flo_10_7_foliage.c b/src/world/dead/area_flo/flo_10/foliage.c
similarity index 100%
rename from src/world/dead/area_flo/flo_10/flo_10_7_foliage.c
rename to src/world/dead/area_flo/flo_10/foliage.c
diff --git a/src/world/dead/area_flo/flo_10/flo_10_4_fountain.c b/src/world/dead/area_flo/flo_10/fountain.c
similarity index 100%
rename from src/world/dead/area_flo/flo_10/flo_10_4_fountain.c
rename to src/world/dead/area_flo/flo_10/fountain.c
diff --git a/src/world/dead/area_flo/flo_10/flo_10_3_main.c b/src/world/dead/area_flo/flo_10/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_10/flo_10_3_main.c
rename to src/world/dead/area_flo/flo_10/main.c
diff --git a/src/world/dead/area_flo/flo_10/flo_10_1_music.c b/src/world/dead/area_flo/flo_10/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_10/flo_10_1_music.c
rename to src/world/dead/area_flo/flo_10/music.c
diff --git a/src/world/dead/area_flo/flo_10/flo_10_5_npc.c b/src/world/dead/area_flo/flo_10/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_10/flo_10_5_npc.c
rename to src/world/dead/area_flo/flo_10/npc.c
diff --git a/src/world/dead/area_flo/flo_10/flo_10_0_header.c b/src/world/dead/area_flo/flo_10/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_10/flo_10_0_header.c
rename to src/world/dead/area_flo/flo_10/settings.c
diff --git a/src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c b/src/world/dead/area_flo/flo_10/waterfx.c
similarity index 100%
rename from src/world/dead/area_flo/flo_10/flo_10_6_waterfx.c
rename to src/world/dead/area_flo/flo_10/waterfx.c
diff --git a/src/world/dead/area_flo/flo_11/flo_11_4_entity.c b/src/world/dead/area_flo/flo_11/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_11/flo_11_4_entity.c
rename to src/world/dead/area_flo/flo_11/entity.c
diff --git a/src/world/dead/area_flo/flo_11/flo_11_2_main.c b/src/world/dead/area_flo/flo_11/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_11/flo_11_2_main.c
rename to src/world/dead/area_flo/flo_11/main.c
diff --git a/src/world/dead/area_flo/flo_11/flo_11_1_music.c b/src/world/dead/area_flo/flo_11/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_11/flo_11_1_music.c
rename to src/world/dead/area_flo/flo_11/music.c
diff --git a/src/world/dead/area_flo/flo_11/flo_11_3_npc.c b/src/world/dead/area_flo/flo_11/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_11/flo_11_3_npc.c
rename to src/world/dead/area_flo/flo_11/npc.c
diff --git a/src/world/dead/area_flo/flo_11/flo_11_0_header.c b/src/world/dead/area_flo/flo_11/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_11/flo_11_0_header.c
rename to src/world/dead/area_flo/flo_11/settings.c
diff --git a/src/world/dead/area_flo/flo_12/flo_12_2_main.c b/src/world/dead/area_flo/flo_12/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_12/flo_12_2_main.c
rename to src/world/dead/area_flo/flo_12/main.c
diff --git a/src/world/dead/area_flo/flo_12/flo_12_1_music.c b/src/world/dead/area_flo/flo_12/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_12/flo_12_1_music.c
rename to src/world/dead/area_flo/flo_12/music.c
diff --git a/src/world/dead/area_flo/flo_12/flo_12_3_npc.c b/src/world/dead/area_flo/flo_12/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_12/flo_12_3_npc.c
rename to src/world/dead/area_flo/flo_12/npc.c
diff --git a/src/world/dead/area_flo/flo_12/flo_12_0_header.c b/src/world/dead/area_flo/flo_12/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_12/flo_12_0_header.c
rename to src/world/dead/area_flo/flo_12/settings.c
diff --git a/src/world/dead/area_flo/flo_13/flo_13_2_entity.c b/src/world/dead/area_flo/flo_13/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_13/flo_13_2_entity.c
rename to src/world/dead/area_flo/flo_13/entity.c
diff --git a/src/world/dead/area_flo/flo_13/flo_13_3_main.c b/src/world/dead/area_flo/flo_13/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_13/flo_13_3_main.c
rename to src/world/dead/area_flo/flo_13/main.c
diff --git a/src/world/dead/area_flo/flo_13/flo_13_1_music.c b/src/world/dead/area_flo/flo_13/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_13/flo_13_1_music.c
rename to src/world/dead/area_flo/flo_13/music.c
diff --git a/src/world/dead/area_flo/flo_13/flo_13_5_new_partner.c b/src/world/dead/area_flo/flo_13/new_partner.c
similarity index 100%
rename from src/world/dead/area_flo/flo_13/flo_13_5_new_partner.c
rename to src/world/dead/area_flo/flo_13/new_partner.c
diff --git a/src/world/dead/area_flo/flo_13/flo_13_4_npc.c b/src/world/dead/area_flo/flo_13/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_13/flo_13_4_npc.c
rename to src/world/dead/area_flo/flo_13/npc.c
diff --git a/src/world/dead/area_flo/flo_13/flo_13_0_header.c b/src/world/dead/area_flo/flo_13/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_13/flo_13_0_header.c
rename to src/world/dead/area_flo/flo_13/settings.c
diff --git a/src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c b/src/world/dead/area_flo/flo_14/bubbles.c
similarity index 100%
rename from src/world/dead/area_flo/flo_14/flo_14_3_bubbles.c
rename to src/world/dead/area_flo/flo_14/bubbles.c
diff --git a/src/world/dead/area_flo/flo_14/flo_14_5_entity.c b/src/world/dead/area_flo/flo_14/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_14/flo_14_5_entity.c
rename to src/world/dead/area_flo/flo_14/entity.c
diff --git a/src/world/dead/area_flo/flo_14/flo_14_6_logs.c b/src/world/dead/area_flo/flo_14/logs.c
similarity index 100%
rename from src/world/dead/area_flo/flo_14/flo_14_6_logs.c
rename to src/world/dead/area_flo/flo_14/logs.c
diff --git a/src/world/dead/area_flo/flo_14/flo_14_2_main.c b/src/world/dead/area_flo/flo_14/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_14/flo_14_2_main.c
rename to src/world/dead/area_flo/flo_14/main.c
diff --git a/src/world/dead/area_flo/flo_14/flo_14_1_music.c b/src/world/dead/area_flo/flo_14/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_14/flo_14_1_music.c
rename to src/world/dead/area_flo/flo_14/music.c
diff --git a/src/world/dead/area_flo/flo_14/flo_14_4_npc.c b/src/world/dead/area_flo/flo_14/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_14/flo_14_4_npc.c
rename to src/world/dead/area_flo/flo_14/npc.c
diff --git a/src/world/dead/area_flo/flo_14/flo_14_0_header.c b/src/world/dead/area_flo/flo_14/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_14/flo_14_0_header.c
rename to src/world/dead/area_flo/flo_14/settings.c
diff --git a/src/world/dead/area_flo/flo_15/flo_15_4_entity.c b/src/world/dead/area_flo/flo_15/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_15/flo_15_4_entity.c
rename to src/world/dead/area_flo/flo_15/entity.c
diff --git a/src/world/dead/area_flo/flo_15/flo_15_2_main.c b/src/world/dead/area_flo/flo_15/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_15/flo_15_2_main.c
rename to src/world/dead/area_flo/flo_15/main.c
diff --git a/src/world/dead/area_flo/flo_15/flo_15_1_music.c b/src/world/dead/area_flo/flo_15/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_15/flo_15_1_music.c
rename to src/world/dead/area_flo/flo_15/music.c
diff --git a/src/world/dead/area_flo/flo_15/flo_15_3_npc.c b/src/world/dead/area_flo/flo_15/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_15/flo_15_3_npc.c
rename to src/world/dead/area_flo/flo_15/npc.c
diff --git a/src/world/dead/area_flo/flo_15/flo_15_0_header.c b/src/world/dead/area_flo/flo_15/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_15/flo_15_0_header.c
rename to src/world/dead/area_flo/flo_15/settings.c
diff --git a/src/world/dead/area_flo/flo_15/flo_15_5_stairs.c b/src/world/dead/area_flo/flo_15/stairs.c
similarity index 100%
rename from src/world/dead/area_flo/flo_15/flo_15_5_stairs.c
rename to src/world/dead/area_flo/flo_15/stairs.c
diff --git a/src/world/dead/area_flo/flo_16/flo_16_4_entity.c b/src/world/dead/area_flo/flo_16/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_16/flo_16_4_entity.c
rename to src/world/dead/area_flo/flo_16/entity.c
diff --git a/src/world/dead/area_flo/flo_16/flo_16_2_main.c b/src/world/dead/area_flo/flo_16/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_16/flo_16_2_main.c
rename to src/world/dead/area_flo/flo_16/main.c
diff --git a/src/world/dead/area_flo/flo_16/flo_16_1_music.c b/src/world/dead/area_flo/flo_16/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_16/flo_16_1_music.c
rename to src/world/dead/area_flo/flo_16/music.c
diff --git a/src/world/dead/area_flo/flo_16/flo_16_5_npc.c b/src/world/dead/area_flo/flo_16/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_16/flo_16_5_npc.c
rename to src/world/dead/area_flo/flo_16/npc.c
diff --git a/src/world/dead/area_flo/flo_16/flo_16_6_puzzle.c b/src/world/dead/area_flo/flo_16/puzzle.c
similarity index 100%
rename from src/world/dead/area_flo/flo_16/flo_16_6_puzzle.c
rename to src/world/dead/area_flo/flo_16/puzzle.c
diff --git a/src/world/dead/area_flo/flo_16/flo_16_0_header.c b/src/world/dead/area_flo/flo_16/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_16/flo_16_0_header.c
rename to src/world/dead/area_flo/flo_16/settings.c
diff --git a/src/world/dead/area_flo/flo_16/flo_16_3_vines.c b/src/world/dead/area_flo/flo_16/vines.c
similarity index 100%
rename from src/world/dead/area_flo/flo_16/flo_16_3_vines.c
rename to src/world/dead/area_flo/flo_16/vines.c
diff --git a/src/world/dead/area_flo/flo_17/flo_17_5_entity.c b/src/world/dead/area_flo/flo_17/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_17/flo_17_5_entity.c
rename to src/world/dead/area_flo/flo_17/entity.c
diff --git a/src/world/dead/area_flo/flo_17/flo_17_3_logs.c b/src/world/dead/area_flo/flo_17/logs.c
similarity index 100%
rename from src/world/dead/area_flo/flo_17/flo_17_3_logs.c
rename to src/world/dead/area_flo/flo_17/logs.c
diff --git a/src/world/dead/area_flo/flo_17/flo_17_2_main.c b/src/world/dead/area_flo/flo_17/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_17/flo_17_2_main.c
rename to src/world/dead/area_flo/flo_17/main.c
diff --git a/src/world/dead/area_flo/flo_17/flo_17_1_music.c b/src/world/dead/area_flo/flo_17/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_17/flo_17_1_music.c
rename to src/world/dead/area_flo/flo_17/music.c
diff --git a/src/world/dead/area_flo/flo_17/flo_17_4_npc.c b/src/world/dead/area_flo/flo_17/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_17/flo_17_4_npc.c
rename to src/world/dead/area_flo/flo_17/npc.c
diff --git a/src/world/dead/area_flo/flo_17/flo_17_0_header.c b/src/world/dead/area_flo/flo_17/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_17/flo_17_0_header.c
rename to src/world/dead/area_flo/flo_17/settings.c
diff --git a/src/world/dead/area_flo/flo_18/flo_18_5_foliage.c b/src/world/dead/area_flo/flo_18/foliage.c
similarity index 100%
rename from src/world/dead/area_flo/flo_18/flo_18_5_foliage.c
rename to src/world/dead/area_flo/flo_18/foliage.c
diff --git a/src/world/dead/area_flo/flo_18/flo_18_3_machine.c b/src/world/dead/area_flo/flo_18/machine.c
similarity index 100%
rename from src/world/dead/area_flo/flo_18/flo_18_3_machine.c
rename to src/world/dead/area_flo/flo_18/machine.c
diff --git a/src/world/dead/area_flo/flo_18/flo_18_2_main.c b/src/world/dead/area_flo/flo_18/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_18/flo_18_2_main.c
rename to src/world/dead/area_flo/flo_18/main.c
diff --git a/src/world/dead/area_flo/flo_18/flo_18_1_music.c b/src/world/dead/area_flo/flo_18/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_18/flo_18_1_music.c
rename to src/world/dead/area_flo/flo_18/music.c
diff --git a/src/world/dead/area_flo/flo_18/flo_18_4_npc.c b/src/world/dead/area_flo/flo_18/npc.c
similarity index 100%
rename from src/world/dead/area_flo/flo_18/flo_18_4_npc.c
rename to src/world/dead/area_flo/flo_18/npc.c
diff --git a/src/world/dead/area_flo/flo_18/flo_18_0_header.c b/src/world/dead/area_flo/flo_18/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_18/flo_18_0_header.c
rename to src/world/dead/area_flo/flo_18/settings.c
diff --git a/src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c b/src/world/dead/area_flo/flo_19/beanstalk.c
similarity index 100%
rename from src/world/dead/area_flo/flo_19/flo_19_5_beanstalk.c
rename to src/world/dead/area_flo/flo_19/beanstalk.c
diff --git a/src/world/dead/area_flo/flo_19/flo_19_4_clouds.c b/src/world/dead/area_flo/flo_19/clouds.c
similarity index 100%
rename from src/world/dead/area_flo/flo_19/flo_19_4_clouds.c
rename to src/world/dead/area_flo/flo_19/clouds.c
diff --git a/src/world/dead/area_flo/flo_19/flo_19_2_entity.c b/src/world/dead/area_flo/flo_19/entity.c
similarity index 100%
rename from src/world/dead/area_flo/flo_19/flo_19_2_entity.c
rename to src/world/dead/area_flo/flo_19/entity.c
diff --git a/src/world/dead/area_flo/flo_19/flo_19_3_main.c b/src/world/dead/area_flo/flo_19/main.c
similarity index 100%
rename from src/world/dead/area_flo/flo_19/flo_19_3_main.c
rename to src/world/dead/area_flo/flo_19/main.c
diff --git a/src/world/dead/area_flo/flo_19/flo_19_1_music.c b/src/world/dead/area_flo/flo_19/music.c
similarity index 100%
rename from src/world/dead/area_flo/flo_19/flo_19_1_music.c
rename to src/world/dead/area_flo/flo_19/music.c
diff --git a/src/world/dead/area_flo/flo_19/flo_19_0_header.c b/src/world/dead/area_flo/flo_19/settings.c
similarity index 100%
rename from src/world/dead/area_flo/flo_19/flo_19_0_header.c
rename to src/world/dead/area_flo/flo_19/settings.c
diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c b/src/world/dead/area_kzn/kzn_11/main.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_11/kzn_11_1_main.c
rename to src/world/dead/area_kzn/kzn_11/main.c
diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c b/src/world/dead/area_kzn/kzn_11/npc.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_11/kzn_11_3_npc.c
rename to src/world/dead/area_kzn/kzn_11/npc.c
diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_2_platforms.c b/src/world/dead/area_kzn/kzn_11/platforms.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_11/kzn_11_2_platforms.c
rename to src/world/dead/area_kzn/kzn_11/platforms.c
diff --git a/src/world/dead/area_kzn/kzn_11/kzn_11_0_header.c b/src/world/dead/area_kzn/kzn_11/settings.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_11/kzn_11_0_header.c
rename to src/world/dead/area_kzn/kzn_11/settings.c
diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_2_entity.c b/src/world/dead/area_kzn/kzn_17/entity.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_17/kzn_17_2_entity.c
rename to src/world/dead/area_kzn/kzn_17/entity.c
diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c b/src/world/dead/area_kzn/kzn_17/main.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_17/kzn_17_1_main.c
rename to src/world/dead/area_kzn/kzn_17/main.c
diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c b/src/world/dead/area_kzn/kzn_17/npc.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_17/kzn_17_3_npc.c
rename to src/world/dead/area_kzn/kzn_17/npc.c
diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_0_header.c b/src/world/dead/area_kzn/kzn_17/settings.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_17/kzn_17_0_header.c
rename to src/world/dead/area_kzn/kzn_17/settings.c
diff --git a/src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c b/src/world/dead/area_kzn/kzn_17/tromp.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_17/kzn_17_4_tromp.c
rename to src/world/dead/area_kzn/kzn_17/tromp.c
diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_3_entity.c b/src/world/dead/area_kzn/kzn_18/entity.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_18/kzn_18_3_entity.c
rename to src/world/dead/area_kzn/kzn_18/entity.c
diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c b/src/world/dead/area_kzn/kzn_18/main.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_18/kzn_18_1_main.c
rename to src/world/dead/area_kzn/kzn_18/main.c
diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c b/src/world/dead/area_kzn/kzn_18/npc.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_18/kzn_18_2_npc.c
rename to src/world/dead/area_kzn/kzn_18/npc.c
diff --git a/src/world/dead/area_kzn/kzn_18/kzn_18_0_header.c b/src/world/dead/area_kzn/kzn_18/settings.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_18/kzn_18_0_header.c
rename to src/world/dead/area_kzn/kzn_18/settings.c
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_6_entity.c b/src/world/dead/area_kzn/kzn_19/entity.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_19/kzn_19_6_entity.c
rename to src/world/dead/area_kzn/kzn_19/entity.c
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c b/src/world/dead/area_kzn/kzn_19/eruption.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_19/kzn_19_5_eruption.c
rename to src/world/dead/area_kzn/kzn_19/eruption.c
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c b/src/world/dead/area_kzn/kzn_19/main.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_19/kzn_19_2_main.c
rename to src/world/dead/area_kzn/kzn_19/main.c
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c b/src/world/dead/area_kzn/kzn_19/music.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_19/kzn_19_1_music.c
rename to src/world/dead/area_kzn/kzn_19/music.c
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c b/src/world/dead/area_kzn/kzn_19/npc.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_19/kzn_19_4_npc.c
rename to src/world/dead/area_kzn/kzn_19/npc.c
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_3_npc_settings.c b/src/world/dead/area_kzn/kzn_19/npc_settings.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_19/kzn_19_3_npc_settings.c
rename to src/world/dead/area_kzn/kzn_19/npc_settings.c
diff --git a/src/world/dead/area_kzn/kzn_19/kzn_19_0_header.c b/src/world/dead/area_kzn/kzn_19/settings.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_19/kzn_19_0_header.c
rename to src/world/dead/area_kzn/kzn_19/settings.c
diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_2_main.c b/src/world/dead/area_kzn/kzn_20/main.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_20/kzn_20_2_main.c
rename to src/world/dead/area_kzn/kzn_20/main.c
diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c b/src/world/dead/area_kzn/kzn_20/music.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_20/kzn_20_1_music.c
rename to src/world/dead/area_kzn/kzn_20/music.c
diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c b/src/world/dead/area_kzn/kzn_20/npc.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_20/kzn_20_3_npc.c
rename to src/world/dead/area_kzn/kzn_20/npc.c
diff --git a/src/world/dead/area_kzn/kzn_20/kzn_20_0_header.c b/src/world/dead/area_kzn/kzn_20/settings.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_20/kzn_20_0_header.c
rename to src/world/dead/area_kzn/kzn_20/settings.c
diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_3_entity.c b/src/world/dead/area_kzn/kzn_22/entity.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_22/kzn_22_3_entity.c
rename to src/world/dead/area_kzn/kzn_22/entity.c
diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c b/src/world/dead/area_kzn/kzn_22/main.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_22/kzn_22_2_main.c
rename to src/world/dead/area_kzn/kzn_22/main.c
diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c b/src/world/dead/area_kzn/kzn_22/music.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_22/kzn_22_1_music.c
rename to src/world/dead/area_kzn/kzn_22/music.c
diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c b/src/world/dead/area_kzn/kzn_22/npc.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_22/kzn_22_4_npc.c
rename to src/world/dead/area_kzn/kzn_22/npc.c
diff --git a/src/world/dead/area_kzn/kzn_22/kzn_22_0_header.c b/src/world/dead/area_kzn/kzn_22/settings.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_22/kzn_22_0_header.c
rename to src/world/dead/area_kzn/kzn_22/settings.c
diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c b/src/world/dead/area_kzn/kzn_23/main.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_23/kzn_23_2_main.c
rename to src/world/dead/area_kzn/kzn_23/main.c
diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_1_music.c b/src/world/dead/area_kzn/kzn_23/music.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_23/kzn_23_1_music.c
rename to src/world/dead/area_kzn/kzn_23/music.c
diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c b/src/world/dead/area_kzn/kzn_23/npc.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_23/kzn_23_3_npc.c
rename to src/world/dead/area_kzn/kzn_23/npc.c
diff --git a/src/world/dead/area_kzn/kzn_23/kzn_23_0_header.c b/src/world/dead/area_kzn/kzn_23/settings.c
similarity index 100%
rename from src/world/dead/area_kzn/kzn_23/kzn_23_0_header.c
rename to src/world/dead/area_kzn/kzn_23/settings.c
diff --git a/ver/ique/splat.yaml b/ver/ique/splat.yaml
index a7bd672348..0dbfc2a923 100644
--- a/ver/ique/splat.yaml
+++ b/ver/ique/splat.yaml
@@ -7856,58 +7856,58 @@ segments:
     start: 0x82FDD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, machi_0_header]
-    - [auto, c, machi_1_tables]
-    - [auto, c, machi_2_main]
-    - [auto, c, machi_3_entity]
-    - [auto, c, machi_4_goomba_king]
-    - [auto, c, machi_5_npc]
-    - [auto, c, machi_6_misstar]
-    - [auto, c, machi_7_partner]
+    - [auto, c, settings]
+    - [auto, c, tables]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, goomba_king]
+    - [auto, c, npc]
+    - [auto, c, misstar]
+    - [auto, c, partner]
   - name: mac_00
     dir: world/area_mac/mac_00
     type: code
     start: 0x833740
     vram: 0x80240000
     subsegments:
-    - [auto, c, mac_00_0_header]
-    - [auto, c, mac_00_1_music]
-    - [auto, c, mac_00_2_main]
-    - [auto, c, mac_00_3_entity]
-    - [auto, c, mac_00_4_rooms]
-    - [auto, c, mac_00_5_npc]
-    - [auto, c, mac_00_6_shop]
-    - [auto, c, mac_00_7_music_mix]
-    - [auto, c, mac_00_8_demo]
-    - [auto, c, mac_00_9_water_gfx]
-    - [auto, c, mac_00_10_shared_npc]
-    - [auto, c, mac_00_11_intro_npc]
-    - [auto, c, mac_00_12_intro]
-    - [auto, c, mac_00_13_epilogue_npc]
-    - [auto, c, mac_00_14_epilogue]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, rooms]
+    - [auto, c, npc]
+    - [auto, c, shop]
+    - [auto, c, music_mix]
+    - [auto, c, demo]
+    - [auto, c, water_gfx]
+    - [auto, c, shared_npc]
+    - [auto, c, intro_npc]
+    - [auto, c, intro]
+    - [auto, c, epilogue_npc]
+    - [auto, c, epilogue]
   - name: mac_01
     dir: world/area_mac/mac_01
     type: code
     start: 0x8492B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, mac_01_0_header]
-    - [auto, c, mac_01_1_music]
-    - [auto, c, mac_01_2_main]
-    - [auto, c, mac_01_3_entity]
-    - [auto, c, mac_01_4_rooms]
-    - [auto, c, mac_01_5_shop]
-    - [auto, c, mac_01_6_crystal_ball_gfx]
-    - [auto, c, mac_01_7_bulletin]
-    - [auto, c, mac_01_8_music_mix]
-    - [auto, c, mac_01_9_npc]
-    - [auto, c, mac_01_10_intro_npc]
-    - [auto, c, mac_01_11_epilogue_npc]
-    - [auto, c, mac_01_12_intro]
-    - [auto, c, mac_01_13_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, rooms]
+    - [auto, c, shop]
+    - [auto, c, crystal_ball_gfx]
+    - [auto, c, bulletin]
+    - [auto, c, music_mix]
+    - [auto, c, npc]
+    - [auto, c, intro_npc]
+    - [auto, c, epilogue_npc]
+    - [auto, c, intro]
+    - [auto, c, foliage]
     - start: 0x851C20
       type: .data
-      name: mac_01_9_npc
+      name: npc
       subsegments:
       - [0x9B9670]
       - [0x854840, vtx_common, ../../toad_house/blanket]
@@ -7921,369 +7921,369 @@ segments:
     start: 0x86BCF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, mac_02_0_header]
-    - [auto, c, mac_02_1_music]
-    - [auto, c, mac_02_2_main]
-    - [auto, c, mac_02_3_rooms]
-    - [auto, c, mac_02_4_foliage]
-    - [auto, c, mac_02_5_entity]
-    - [auto, c, mac_02_6_npc]
-    - [auto, c, mac_02_7_music_mix]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, foliage]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, music_mix]
   - name: mac_03
     dir: world/area_mac/mac_03
     type: code
     start: 0x87A230
     vram: 0x80240000
     subsegments:
-    - [auto, c, mac_03_0_header]
-    - [auto, c, mac_03_1_music]
-    - [auto, c, mac_03_2_main]
-    - [auto, c, mac_03_3_train]
-    - [auto, c, mac_03_4_npc]
-    - [auto, c, mac_03_5_entity]
-    - [auto, c, mac_03_6_foliage]
-    - [auto, c, mac_03_7_oinks]
-    - [auto, c, mac_03_8_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, train]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
+    - [auto, c, oinks]
+    - [auto, c, demo]
   - name: mac_04
     dir: world/area_mac/mac_04
     type: code
     start: 0x88B600
     vram: 0x80240000
     subsegments:
-    - [auto, c, mac_04_0_header]
-    - [auto, c, mac_04_1_music]
-    - [auto, c, mac_04_2_main]
-    - [auto, c, mac_04_3_rooms]
-    - [auto, c, mac_04_4_foliage]
-    - [auto, c, mac_04_5_shop]
-    - [auto, c, mac_04_6_npc]
-    - [auto, c, mac_04_7_wish_scene]
-    - [auto, c, mac_04_8_entity]
-    - [auto, c, mac_04_9_music_mix]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, foliage]
+    - [auto, c, shop]
+    - [auto, c, npc]
+    - [auto, c, wish_scene]
+    - [auto, c, entity]
+    - [auto, c, music_mix]
   - name: mac_05
     dir: world/area_mac/mac_05
     type: code
     start: 0x89ABA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, mac_05_0_header]
-    - [auto, c, mac_05_1_music]
-    - [auto, c, mac_05_2_entity]
-    - [auto, c, mac_05_3_main]
-    - [auto, c, mac_05_4_npc]
-    - [auto, c, mac_05_5_whale]
-    - [auto, c, mac_05_6_rooms]
-    - [auto, c, mac_05_7_club64_sign]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, whale]
+    - [auto, c, rooms]
+    - [auto, c, club64_sign]
   - name: mac_06
     dir: world/area_mac/mac_06
     type: code
     start: 0x8AD570
     vram: 0x80240000
     subsegments:
-    - [auto, c, mac_06_0_header]
-    - [auto, c, mac_06_1_main]
-    - [auto, c, mac_06_2_whale]
-    - [auto, c, mac_06_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, whale]
+    - [auto, c, npc]
   - name: tik_01
     dir: world/area_tik/tik_01
     type: code
     start: 0x8B1EE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_01_0_header]
-    - [auto, c, tik_01_1_music]
-    - [auto, c, tik_01_2_main]
-    - [auto, c, tik_01_3_drips]
-    - [auto, c, tik_01_4_entity]
-    - [auto, c, tik_01_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_02
     dir: world/area_tik/tik_02
     type: code
     start: 0x8B5170
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_02_0_header]
-    - [auto, c, tik_02_1_music]
-    - [auto, c, tik_02_2_main]
-    - [auto, c, tik_02_3_entity]
-    - [auto, c, tik_02_4_drips]
-    - [auto, c, tik_02_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, drips]
+    - [auto, c, npc]
   - name: tik_03
     dir: world/area_tik/tik_03
     type: code
     start: 0x8B7530
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_03_0_header]
-    - [auto, c, tik_03_1_music]
-    - [auto, c, tik_03_2_main]
-    - [auto, c, tik_03_3_drips]
-    - [auto, c, tik_03_4_platforms]
-    - [auto, c, tik_03_5_entity]
-    - [auto, c, tik_03_6_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, platforms]
+    - [auto, c, entity]
+    - [auto, c, demo]
   - name: tik_04
     dir: world/area_tik/tik_04
     type: code
     start: 0x8BA460
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_04_0_header]
-    - [auto, c, tik_04_1_music]
-    - [auto, c, tik_04_2_main]
-    - [auto, c, tik_04_3_drips]
-    - [auto, c, tik_04_4_platforms]
-    - [auto, c, tik_04_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, platforms]
+    - [auto, c, npc]
   - name: tik_05
     dir: world/area_tik/tik_05
     type: code
     start: 0x8BD7F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_05_0_header]
-    - [auto, c, tik_05_1_music]
-    - [auto, c, tik_05_2_main]
-    - [auto, c, tik_05_3_drips]
-    - [auto, c, tik_05_4_entity]
-    - [auto, c, tik_05_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_06
     dir: world/area_tik/tik_06
     type: code
     start: 0x8BF910
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_06_0_header]
-    - [auto, c, tik_06_1_music]
-    - [auto, c, tik_06_2_main]
-    - [auto, c, tik_06_3_drips]
-    - [auto, c, tik_06_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
   - name: tik_07
     dir: world/area_tik/tik_07
     type: code
     start: 0x8C2610
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_07_0_header]
-    - [auto, c, tik_07_1_music]
-    - [auto, c, tik_07_2_main]
-    - [auto, c, tik_07_3_entity]
-    - [auto, c, tik_07_4_drips]
-    - [auto, c, tik_07_5_platforms]
-    - [auto, c, tik_07_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, drips]
+    - [auto, c, platforms]
+    - [auto, c, npc]
   - name: tik_08
     dir: world/area_tik/tik_08
     type: code
     start: 0x8C7820
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_08_0_header]
-    - [auto, c, tik_08_1_music]
-    - [auto, c, tik_08_2_main]
-    - [auto, c, tik_08_3_drips]
-    - [auto, c, tik_08_4_entity]
-    - [auto, c, tik_08_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_09
     dir: world/area_tik/tik_09
     type: code
     start: 0x8CABF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_09_0_header]
-    - [auto, c, tik_09_1_music]
-    - [auto, c, tik_09_2_main]
-    - [auto, c, tik_09_3_drips]
-    - [auto, c, tik_09_4_entity]
-    - [auto, c, tik_09_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_10
     dir: world/area_tik/tik_10
     type: code
     start: 0x8CEDF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_10_0_header]
-    - [auto, c, tik_10_1_music]
-    - [auto, c, tik_10_2_main]
-    - [auto, c, tik_10_3_drips]
-    - [auto, c, tik_10_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
   - name: tik_12
     dir: world/area_tik/tik_12
     type: code
     start: 0x8D1600
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_12_0_header]
-    - [auto, c, tik_12_1_music]
-    - [auto, c, tik_12_2_main]
-    - [auto, c, tik_12_3_drips]
-    - [auto, c, tik_12_4_entity]
-    - [auto, c, tik_12_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_14
     dir: world/area_tik/tik_14
     type: code
     start: 0x8D6030
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_14_0_header]
-    - [auto, c, tik_14_1_music]
-    - [auto, c, tik_14_2_main]
-    - [auto, c, tik_14_3_drips]
-    - [auto, c, tik_14_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
   - name: tik_15
     dir: world/area_tik/tik_15
     type: code
     start: 0x8D85D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_15_0_header]
-    - [auto, c, tik_15_1_music]
-    - [auto, c, tik_15_2_main]
-    - [auto, c, tik_15_3_entity]
-    - [auto, c, tik_15_4_drips]
-    - [auto, c, tik_15_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, drips]
+    - [auto, c, npc]
   - name: tik_17
     dir: world/area_tik/tik_17
     type: code
     start: 0x8DB450
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_17_0_header]
-    - [auto, c, tik_17_1_music]
-    - [auto, c, tik_17_2_entity]
-    - [auto, c, tik_17_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: tik_18
     dir: world/area_tik/tik_18
     type: code
     start: 0x8DE110
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_18_0_header]
-    - [auto, c, tik_18_1_music]
-    - [auto, c, tik_18_2_main]
-    - [auto, c, tik_18_3_drips]
-    - [auto, c, tik_18_4_npc]
-    - [auto, c, tik_18_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: tik_19
     dir: world/area_tik/tik_19
     type: code
     start: 0x8E0010
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_19_0_header]
-    - [auto, c, tik_19_1_music]
-    - [auto, c, tik_19_2_main]
-    - [auto, c, tik_19_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tik_20
     dir: world/area_tik/tik_20
     type: code
     start: 0x8E2D80
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_20_0_header]
-    - [auto, c, tik_20_1_music]
-    - [auto, c, tik_20_2_main]
-    - [auto, c, tik_20_3_npc]
-    - [auto, c, tik_20_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: tik_21
     dir: world/area_tik/tik_21
     type: code
     start: 0x8E61D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_21_0_header]
-    - [auto, c, tik_21_1_music]
-    - [auto, c, tik_21_2_main]
-    - [auto, c, tik_21_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tik_22
     dir: world/area_tik/tik_22
     type: code
     start: 0x8E88F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_22_0_header]
-    - [auto, c, tik_22_1_music]
-    - [auto, c, tik_22_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: tik_23
     dir: world/area_tik/tik_23
     type: code
     start: 0x8EAE00
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_23_0_header]
-    - [auto, c, tik_23_1_music]
-    - [auto, c, tik_23_2_main]
-    - [auto, c, tik_23_3_entity]
-    - [auto, c, tik_23_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_24
     dir: world/area_tik/tik_24
     type: code
     start: 0x8EE4B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_24_0_header]
-    - [auto, c, tik_24_1_music]
-    - [auto, c, tik_24_2_main]
-    - [auto, c, tik_24_3_drips]
-    - [auto, c, tik_24_4_entity]
-    - [auto, c, tik_24_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_25
     dir: world/area_tik/tik_25
     type: code
     start: 0x8F09B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tik_25_0_header]
-    - [auto, c, tik_25_1_music]
-    - [auto, c, tik_25_2_main]
-    - [auto, c, tik_25_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kgr_01
     dir: world/area_kgr/kgr_01
     type: code
     start: 0x8F2440
     vram: 0x80240000
     subsegments:
-    - [auto, c, kgr_01_1_main]
-    - [auto, c, kgr_01_2_wiggle]
-    - [auto, c, kgr_01_3_extra]
+    - [auto, c, main]
+    - [auto, c, wiggle]
+    - [auto, c, extra]
   - name: kgr_02
     dir: world/area_kgr/kgr_02
     type: code
     start: 0x8F2E80
     vram: 0x80240000
     subsegments:
-    - [auto, c, kgr_02_1_main]
-    - [auto, c, kgr_02_2_unused]
-    - [auto, c, kgr_02_3_npc]
-    - [auto, c, kgr_02_4_extra]
+    - [auto, c, main]
+    - [auto, c, unused]
+    - [auto, c, npc]
+    - [auto, c, extra]
   - name: kmr_00
     dir: world/area_kmr/kmr_00
     type: code
     start: 0x8F49C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_00_0_header]
-    - [auto, c, kmr_00_1_music]
-    - [auto, c, kmr_00_2_main]
-    - [auto, c, kmr_00_3_revival]
-    - [auto, c, kmr_00_4_npc]
-    - [auto, c, kmr_00_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, revival]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kmr_02
     dir: world/area_kmr/kmr_02
     type: code
     start: 0x8F8AA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_02_0_header]
-    - [auto, c, kmr_02_1_music]
-    - [auto, c, kmr_02_2_main]
-    - [auto, c, kmr_02_3_npc]
-    - [auto, c, kmr_02_4_rooms_1]
-    - [auto, c, kmr_02_5_entity]
-    - [auto, c, kmr_02_6_rooms_2]
-    - [auto, c, kmr_02_7_kammy]
-    - [auto, c, kmr_02_8_foliage]
-    - [auto, c, kmr_02_9_images]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, rooms_1]
+    - [auto, c, entity]
+    - [auto, c, rooms_2]
+    - [auto, c, kammy]
+    - [auto, c, foliage]
+    - [auto, c, images]
     - start: 0x9105A0
       type: .data
-      name: kmr_02_9_images
+      name: images
       subsegments:
       - [0x9105A0, ci4, heart_block, 32, 32]
       - [0x9107A0, palette, heart_block]
@@ -8294,28 +8294,28 @@ segments:
     start: 0x9109C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_03_0_header]
-    - [auto, c, kmr_03_1_music]
-    - [auto, c, kmr_03_2_main]
-    - [auto, c, kmr_03_3_npc]
-    - [auto, c, kmr_03_4_entity]
-    - [auto, c, kmr_03_5_foliage]
-    - [auto, c, kmr_03_6_fall_down]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
+    - [auto, c, fall_down]
   - name: kmr_04
     dir: world/area_kmr/kmr_04
     type: code
     start: 0x913330
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_04_0_header]
-    - [auto, c, kmr_04_1_music]
-    - [auto, c, kmr_04_2_main]
-    - [auto, c, kmr_04_3_npc]
-    - [auto, c, kmr_04_4_entity]
-    - [auto, c, kmr_04_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
     - start: 0x914F20
       type: .data
-      name: kmr_04_5_foliage
+      name: foliage
       subsegments:
       - [0x914F20, ci4, hammer_block_message, 48, 48]
       - [0x9153A0, palette, hammer_block_message]
@@ -8326,110 +8326,110 @@ segments:
     start: 0x916AA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_05_0_header]
-    - [auto, c, kmr_05_1_music]
-    - [auto, c, kmr_05_2_main]
-    - [auto, c, kmr_05_3_npc]
-    - [auto, c, kmr_05_4_entity]
-    - [auto, c, kmr_05_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: kmr_06
     dir: world/area_kmr/kmr_06
     type: code
     start: 0x919F40
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_06_0_header]
-    - [auto, c, kmr_06_1_music]
-    - [auto, c, kmr_06_2_main]
-    - [auto, c, kmr_06_3_npc]
-    - [auto, c, kmr_06_4_entity]
-    - [auto, c, kmr_06_5_sticker_sign]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, sticker_sign]
   - name: kmr_07
     dir: world/area_kmr/kmr_07
     type: code
     start: 0x91C7F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_07_0_header]
-    - [auto, c, kmr_07_1_music]
-    - [auto, c, kmr_07_2_main]
-    - [auto, c, kmr_07_3_npc]
-    - [auto, c, kmr_07_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kmr_09
     dir: world/area_kmr/kmr_09
     type: code
     start: 0x91E830
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_09_0_header]
-    - [auto, c, kmr_09_1_music]
-    - [auto, c, kmr_09_2_main]
-    - [auto, c, kmr_09_3_npc]
-    - [auto, c, kmr_09_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kmr_10
     dir: world/area_kmr/kmr_10
     type: code
     start: 0x920F00
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_10_0_header]
-    - [auto, c, kmr_10_1_music]
-    - [auto, c, kmr_10_2_main]
-    - [auto, c, kmr_10_3_npc]
-    - [auto, c, kmr_10_4_entity]
-    - [auto, c, kmr_10_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: kmr_11
     dir: world/area_kmr/kmr_11
     type: code
     start: 0x922B30
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_11_0_header]
-    - [auto, c, kmr_11_1_music]
-    - [auto, c, kmr_11_2_main]
-    - [auto, c, kmr_11_3_scenes]
-    - [auto, c, kmr_11_4_npc]
-    - [auto, c, kmr_11_5_entity]
-    - [auto, c, kmr_11_6_kammy]
-    - [auto, c, kmr_11_7_foliage]
-    - [auto, c, kmr_11_8_fortress_skeleton]
-    - [auto, c, kmr_11_9_fortress_animation]
-    - [auto, c, kmr_11_10_bridge_skeleton]
-    - [auto, c, kmr_11_11_bridge_animation]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, scenes]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, kammy]
+    - [auto, c, foliage]
+    - [auto, c, fortress_skeleton]
+    - [auto, c, fortress_animation]
+    - [auto, c, bridge_skeleton]
+    - [auto, c, bridge_animation]
   - name: kmr_12
     dir: world/area_kmr/kmr_12
     type: code
     start: 0x933D90
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_12_0_header]
-    - [auto, c, kmr_12_1_music]
-    - [auto, c, kmr_12_2_main]
-    - [auto, c, kmr_12_3_npc]
-    - [auto, c, kmr_12_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kmr_20
     dir: world/area_kmr/kmr_20
     type: code
     start: 0x934850
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_20_0_header]
-    - [auto, c, kmr_20_1_music]
-    - [auto, c, kmr_20_2_main]
-    - [auto, c, kmr_20_3_rooms]
-    - [auto, c, kmr_20_4_documents]
-    - [auto, c, kmr_20_5_entity]
-    - [auto, c, kmr_20_6_trees]
-    - [auto, c, kmr_20_7_bushes]
-    - [auto, c, kmr_20_8_bed]
-    - [auto, c, kmr_20_9_npc_scenes]
-    - [auto, c, kmr_20_10_npc]
-    - [auto, c, kmr_20_11_npc_intro]
-    - [auto, c, kmr_20_12_npc_epilogue]
-    - [auto, c, kmr_20_13_records]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, documents]
+    - [auto, c, entity]
+    - [auto, c, trees]
+    - [auto, c, bushes]
+    - [auto, c, bed]
+    - [auto, c, npc_scenes]
+    - [auto, c, npc]
+    - [auto, c, npc_intro]
+    - [auto, c, npc_epilogue]
+    - [auto, c, records]
     - start: 0x9475A0
       type: .data
-      name: kmr_20_13_records
+      name: records
       subsegments:
       - [0x9475A0, gfx, records_screen]
       - [0x947610]
@@ -8439,20 +8439,20 @@ segments:
     start: 0x9478B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_21_0_header]
-    - [auto, c, kmr_21_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kmr_22
     dir: world/area_kmr/kmr_22
     type: code
     start: 0x9480A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_22_0_header]
-    - [auto, c, kmr_22_1_main]
-    - [auto, c, kmr_22_2_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
     - start: 0x9494B0
       type: .data
-      name: kmr_22_2_npc
+      name: npc
       subsegments:
       - [0x9494B0]
       - [0x9499A0, ci4, lava_piranha_vine, 64, 32]
@@ -8465,12 +8465,12 @@ segments:
     start: 0x950460
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_23_0_header]
-    - [auto, c, kmr_23_1_main]
-    - [auto, c, kmr_23_2_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
     - start: 0x951AC0
       type: .data
-      name: kmr_23_2_npc
+      name: npc
       subsegments:
       - [0x951AC0]
       - [0x951B28, ia8, window_ul, 8, 8]
@@ -8484,44 +8484,44 @@ segments:
     start: 0x953C70
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_24_0_header]
-    - [auto, c, kmr_24_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kmr_30
     dir: world/area_kmr/kmr_30
     type: code
     start: 0x954100
     vram: 0x80240000
     subsegments:
-    - [auto, c, kmr_30_0_header]
-    - [auto, c, kmr_30_1_main]
-    - [auto, c, kmr_30_2_npc]
-    - [auto, c, kmr_30_3_the_end]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, the_end]
   - name: iwa_00
     dir: world/area_iwa/iwa_00
     type: code
     start: 0x955670
     vram: 0x80240000
     subsegments:
-    - [auto, c, iwa_00_0_header]
-    - [auto, c, iwa_00_1_main]
-    - [auto, c, iwa_00_2_entity]
-    - [auto, c, iwa_00_3_npc]
-    - [auto, c, iwa_00_4_slide]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, slide]
   - name: iwa_01
     dir: world/area_iwa/iwa_01
     type: code
     start: 0x9580E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, iwa_01_0_header]
-    - [auto, c, iwa_01_1_main]
-    - [auto, c, iwa_01_2_entity]
-    - [auto, c, iwa_01_3_splash]
-    - [auto, c, iwa_01_4_npc]
-    - [auto, c, iwa_01_5_slide]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, splash]
+    - [auto, c, npc]
+    - [auto, c, slide]
     - start: 0x95BAA0
       type: .data
-      name: iwa_01_3_splash
+      name: splash
       subsegments:
       - [0x95BAA0, i8, splash, 32, 32]
       - [0x95BEA0, vtx, splash]
@@ -8533,516 +8533,516 @@ segments:
     start: 0x95E7A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, iwa_02_0_header]
-    - [auto, c, iwa_02_1_main]
-    - [auto, c, iwa_02_2_entity]
-    - [auto, c, iwa_02_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: iwa_03
     dir: world/area_iwa/iwa_03
     type: code
     start: 0x9615E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, iwa_03_0_header]
-    - [auto, c, iwa_03_1_main]
-    - [auto, c, iwa_03_2_entity]
-    - [auto, c, iwa_03_3_npc]
-    - [auto, c, iwa_03_4_slide]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, slide]
   - name: iwa_04
     dir: world/area_iwa/iwa_04
     type: code
     start: 0x964310
     vram: 0x80240000
     subsegments:
-    - [auto, c, iwa_04_0_header]
-    - [auto, c, iwa_04_1_music]
-    - [auto, c, iwa_04_2_main]
-    - [auto, c, iwa_04_3_entity]
-    - [auto, c, iwa_04_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: iwa_10
     dir: world/area_iwa/iwa_10
     type: code
     start: 0x966FA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, iwa_10_0_header]
-    - [auto, c, iwa_10_1_music]
-    - [auto, c, iwa_10_2_main]
-    - [auto, c, iwa_10_3_npc]
-    - [auto, c, iwa_10_4_train]
-    - [auto, c, iwa_10_5_entity]
-    - [auto, c, iwa_10_6_parakarry]
-    - [auto, c, iwa_10_7_new_partner]
-    - [auto, c, iwa_10_8_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, train]
+    - [auto, c, entity]
+    - [auto, c, parakarry]
+    - [auto, c, new_partner]
+    - [auto, c, foliage]
   - name: iwa_11
     dir: world/area_iwa/iwa_11
     type: code
     start: 0x96F420
     vram: 0x80240000
     subsegments:
-    - [auto, c, iwa_11_0_header]
-    - [auto, c, iwa_11_1_music]
-    - [auto, c, iwa_11_2_main]
-    - [auto, c, iwa_11_3_train]
-    - [auto, c, iwa_11_4_scenery]
-    - [auto, c, iwa_11_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, train]
+    - [auto, c, scenery]
+    - [auto, c, npc]
   - name: sbk_00
     dir: world/area_sbk/sbk_00
     type: code
     start: 0x971CA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_00_0_header]
-    - [auto, c, sbk_00_1_main]
-    - [auto, c, sbk_00_2_npc]
-    - [auto, c, sbk_00_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sbk_01
     dir: world/area_sbk/sbk_01
     type: code
     start: 0x9724C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_01_1_main]
-    - [auto, c, sbk_01_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_02 #TODO
     dir: world/area_sbk/sbk_02
     type: code
     start: 0x972CE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_02_0_header]
-    - [auto, c, sbk_02_1_music]
-    - [auto, c, sbk_02_2_main]
-    - [auto, c, sbk_02_3_ruins]
-    - [auto, c, sbk_02_4_npc]
-    - [auto, c, sbk_02_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, ruins]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sbk_03
     dir: world/area_sbk/sbk_03
     type: code
     start: 0x9782E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_03_1_main]
-    - [auto, c, sbk_03_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_04
     dir: world/area_sbk/sbk_04
     type: code
     start: 0x978F00
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_04_1_main]
-    - [auto, c, sbk_04_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_05
     dir: world/area_sbk/sbk_05
     type: code
     start: 0x979720
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_05_1_main]
-    - [auto, c, sbk_05_2_entity]
-    - [auto, c, sbk_05_3_npc]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: sbk_06
     dir: world/area_sbk/sbk_06
     type: code
     start: 0x97AFF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_06_1_main]
-    - [auto, c, sbk_06_2_npc]
-    - [auto, c, sbk_06_3_foliage]
-    - [auto, c, sbk_06_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_10
     dir: world/area_sbk/sbk_10
     type: code
     start: 0x97C6B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_10_1_main]
-    - [auto, c, sbk_10_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_11
     dir: world/area_sbk/sbk_11
     type: code
     start: 0x97CA70
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_11_1_main]
-    - [auto, c, sbk_11_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_12
     dir: world/area_sbk/sbk_12
     type: code
     start: 0x97D770
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_12_1_main]
-    - [auto, c, sbk_12_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_13
     dir: world/area_sbk/sbk_13
     type: code
     start: 0x97E210
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_13_1_main]
-    - [auto, c, sbk_13_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_14
     dir: world/area_sbk/sbk_14
     type: code
     start: 0x97F110
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_14_1_main]
-    - [auto, c, sbk_14_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_15
     dir: world/area_sbk/sbk_15
     type: code
     start: 0x97F700
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_15_1_main]
-    - [auto, c, sbk_15_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_16
     dir: world/area_sbk/sbk_16
     type: code
     start: 0x97FFA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_16_1_main]
-    - [auto, c, sbk_16_2_foliage]
+    - [auto, c, main]
+    - [auto, c, foliage]
   - name: sbk_20
     dir: world/area_sbk/sbk_20
     type: code
     start: 0x980FC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_20_1_main]
-    - [auto, c, sbk_20_2_entity]
-    - [auto, c, sbk_20_2_npc]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: sbk_21
     dir: world/area_sbk/sbk_21
     type: code
     start: 0x981F90
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_21_1_main]
+    - [auto, c, main]
   - name: sbk_22
     dir: world/area_sbk/sbk_22
     type: code
     start: 0x982360
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_22_1_main]
-    - [auto, c, sbk_22_2_npc]
-    - [auto, c, sbk_22_3_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sbk_23
     dir: world/area_sbk/sbk_23
     type: code
     start: 0x983190
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_23_1_main]
-    - [auto, c, sbk_23_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_24
     dir: world/area_sbk/sbk_24
     type: code
     start: 0x983660
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_24_1_main]
-    - [auto, c, sbk_24_2_npc]
-    - [auto, c, sbk_24_3_entity]
-    - [auto, c, sbk_24_4_foliage]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: sbk_25
     dir: world/area_sbk/sbk_25
     type: code
     start: 0x984CB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_25_1_main]
-    - [auto, c, sbk_25_2_npc]
-    - [auto, c, sbk_25_3_foliage]
-    - [auto, c, sbk_25_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_26
     dir: world/area_sbk/sbk_26
     type: code
     start: 0x986700
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_26_1_main]
-    - [auto, c, sbk_26_2_npc]
-    - [auto, c, sbk_26_3_foliage]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: sbk_30
     dir: world/area_sbk/sbk_30
     type: code
     start: 0x987FE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_30_0_header]
-    - [auto, c, sbk_30_1_music]
-    - [auto, c, sbk_30_2_main]
-    - [auto, c, sbk_30_3_npc]
-    - [auto, c, sbk_30_4_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: sbk_31
     dir: world/area_sbk/sbk_31
     type: code
     start: 0x98CA30
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_31_1_main]
-    - [auto, c, sbk_31_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_32
     dir: world/area_sbk/sbk_32
     type: code
     start: 0x98D490
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_32_1_main]
-    - [auto, c, sbk_32_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_33
     dir: world/area_sbk/sbk_33
     type: code
     start: 0x98E400
     vram: 0x80240000
     subsegments: # unusual organization
-    - [auto, c, sbk_33_0_header]
-    - [auto, c, sbk_33_1_entity]
-    - [auto, c, sbk_33_2_main]
+    - [auto, c, settings]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: sbk_34
     dir: world/area_sbk/sbk_34
     type: code
     start: 0x98E900
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_34_1_main]
-    - [auto, c, sbk_34_2_npc]
-    - [auto, c, sbk_34_3_foliage]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: sbk_35
     dir: world/area_sbk/sbk_35
     type: code
     start: 0x9910E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_35_1_main]
-    - [auto, c, sbk_35_2_npc]
-    - [auto, c, sbk_35_3_foliage]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: sbk_36
     dir: world/area_sbk/sbk_36
     type: code
     start: 0x992890
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_36_1_main]
-    - [auto, c, sbk_36_2_foliage]
-    - [auto, c, sbk_36_3_entity]
+    - [auto, c, main]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_40
     dir: world/area_sbk/sbk_40
     type: code
     start: 0x993DD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_40_1_main]
-    - [auto, c, sbk_40_2_npc]
-    - [auto, c, sbk_40_3_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sbk_41
     dir: world/area_sbk/sbk_41
     type: code
     start: 0x994A70
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_41_1_main]
-    - [auto, c, sbk_41_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_42
     dir: world/area_sbk/sbk_42
     type: code
     start: 0x994F40
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_42_1_main]
-    - [auto, c, sbk_42_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_43
     dir: world/area_sbk/sbk_43
     type: code
     start: 0x995BA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_43_1_main]
-    - [auto, c, sbk_43_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_44
     dir: world/area_sbk/sbk_44
     type: code
     start: 0x995FD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_44_1_main]
-    - [auto, c, sbk_44_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_45
     dir: world/area_sbk/sbk_45
     type: code
     start: 0x996ED0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_45_1_main]
-    - [auto, c, sbk_45_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_46
     dir: world/area_sbk/sbk_46
     type: code
     start: 0x9973D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_46_1_main]
-    - [auto, c, sbk_46_2_npc]
-    - [auto, c, sbk_46_3_foliage]
-    - [auto, c, sbk_46_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_50
     dir: world/area_sbk/sbk_50
     type: code
     start: 0x999040
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_50_1_main]
+    - [auto, c, main]
   - name: sbk_51
     dir: world/area_sbk/sbk_51
     type: code
     start: 0x9993A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_51_1_main]
-    - [auto, c, sbk_51_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_52
     dir: world/area_sbk/sbk_52
     type: code
     start: 0x99A0A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_52_1_main]
-    - [auto, c, sbk_52_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_53
     dir: world/area_sbk/sbk_53
     type: code
     start: 0x99A510
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_53_1_main]
-    - [auto, c, sbk_53_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_54
     dir: world/area_sbk/sbk_54
     type: code
     start: 0x99AFB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_54_1_main]
-    - [auto, c, sbk_54_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_55
     dir: world/area_sbk/sbk_55
     type: code
     start: 0x99B480
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_55_1_main]
-    - [auto, c, sbk_55_2_npc]
-    - [auto, c, sbk_55_3_foliage]
-    - [auto, c, sbk_55_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_56
     dir: world/area_sbk/sbk_56
     type: code
     start: 0x99C9F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_56_1_main]
-    - [auto, c, sbk_56_2_entity]
-    - [auto, c, sbk_56_3_foliage]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: sbk_60
     dir: world/area_sbk/sbk_60
     type: code
     start: 0x99F420
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_60_1_main]
-    - [auto, c, sbk_60_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_61
     dir: world/area_sbk/sbk_61
     type: code
     start: 0x99F9C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_61_1_main]
-    - [auto, c, sbk_61_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_62
     dir: world/area_sbk/sbk_62
     type: code
     start: 0x99FD80
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_62_1_main]
-    - [auto, c, sbk_62_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_63
     dir: world/area_sbk/sbk_63
     type: code
     start: 0x9A07A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_63_1_main]
-    - [auto, c, sbk_63_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_64
     dir: world/area_sbk/sbk_64
     type: code
     start: 0x9A0FC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_64_1_main]
-    - [auto, c, sbk_64_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_65
     dir: world/area_sbk/sbk_65
     type: code
     start: 0x9A1380
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_65_1_main]
+    - [auto, c, main]
   - name: sbk_66
     dir: world/area_sbk/sbk_66
     type: code
     start: 0x9A16E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_66_1_main]
-    - [auto, c, sbk_66_2_npc]
-    - [auto, c, sbk_66_3_foliage]
-    - [auto, c, sbk_66_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_99
     dir: world/area_sbk/sbk_99
     type: code
     start: 0x9A38E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sbk_99_1_main]
-    - [auto, c, sbk_99_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: dro_01
     dir: world/area_dro/dro_01
     type: code
     start: 0x9A3C30
     vram: 0x80240000
     subsegments:
-    - [auto, c, dro_01_0_header]
-    - [auto, c, dro_01_1_music]
-    - [auto, c, dro_01_2_main]
-    - [auto, c, dro_01_3_npc]
-    - [auto, c, dro_01_4_shop]
-    - [auto, c, dro_01_5_rooms]
-    - [auto, c, dro_01_6_entity]
-    - [auto, c, dro_01_7_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, shop]
+    - [auto, c, rooms]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: dro_02
     dir: world/area_dro/dro_02
     type: code
     start: 0x9B1BF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, dro_02_0_header]
-    - [auto, c, dro_02_1_music]
-    - [auto, c, dro_02_2_entity]
-    - [auto, c, dro_02_3_main]
-    - [auto, c, dro_02_4_rooms]
-    - [auto, c, dro_02_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, npc]
     - start: 0x9B69D0
       type: .data
-      name: dro_02_5_npc
+      name: npc
       subsegments:
       - [0x9B69D0]
       - [0x9B91D8, ci4, card, 32, 32]
@@ -9062,1459 +9062,1459 @@ segments:
     start: 0x9C0B70
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_01_0_header]
-    - [auto, c, isk_01_1_music]
-    - [auto, c, isk_01_2_main]
-    - [auto, c, isk_01_3_haze]
-    - [auto, c, isk_01_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, haze]
+    - [auto, c, entity]
   - name: isk_02
     dir: world/area_isk/isk_02
     type: code
     start: 0x9C1140
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_02_0_header]
-    - [auto, c, isk_02_1_main]
-    - [auto, c, isk_02_2_lock]
-    - [auto, c, isk_02_3_ambush]
-    - [auto, c, isk_02_4_entity]
-    - [auto, c, isk_02_5_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, lock]
+    - [auto, c, ambush]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: isk_03
     dir: world/area_isk/isk_03
     type: code
     start: 0x9C2880
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_03_0_header]
-    - [auto, c, isk_03_1_main]
-    - [auto, c, isk_03_2_sand]
-    - [auto, c, isk_03_3_entity]
-    - [auto, c, isk_03_4_switch]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, sand]
+    - [auto, c, entity]
+    - [auto, c, switch]
   - name: isk_04
     dir: world/area_isk/isk_04
     type: code
     start: 0x9C4060
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_04_0_header]
-    - [auto, c, isk_04_1_music]
-    - [auto, c, isk_04_2_main]
-    - [auto, c, isk_04_3_obstructions]
-    - [auto, c, isk_04_4_entity]
-    - [auto, c, isk_04_5_npc]
-    - [auto, c, isk_04_6_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, obstructions]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, demo]
   - name: isk_05
     dir: world/area_isk/isk_05
     type: code
     start: 0x9C6500
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_05_0_header]
-    - [auto, c, isk_05_1_main]
-    - [auto, c, isk_05_2_entity]
-    - [auto, c, isk_05_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: isk_06
     dir: world/area_isk/isk_06
     type: code
     start: 0x9C9450
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_06_0_header]
-    - [auto, c, isk_06_1_main]
-    - [auto, c, isk_06_2_entity]
-    - [auto, c, isk_06_3_sand]
-    - [auto, c, isk_06_4_switch]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, sand]
+    - [auto, c, switch]
   - name: isk_07
     dir: world/area_isk/isk_07
     type: code
     start: 0x9CAE70
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_07_0_header]
-    - [auto, c, isk_07_1_main]
-    - [auto, c, isk_07_2_entity]
-    - [auto, c, isk_07_3_npc]
-    - [auto, c, isk_07_4_stairs]
-    - [auto, c, isk_07_5_lock]
-    - [auto, c, isk_07_6_switch]
-    - [auto, c, isk_07_7_ambush]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, stairs]
+    - [auto, c, lock]
+    - [auto, c, switch]
+    - [auto, c, ambush]
   - name: isk_08
     dir: world/area_isk/isk_08
     type: code
     start: 0x9CD860
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_08_0_header]
-    - [auto, c, isk_08_1_main]
-    - [auto, c, isk_08_2_npc]
-    - [auto, c, isk_08_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: isk_09
     dir: world/area_isk/isk_09
     type: code
     start: 0x9CEF10
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_09_0_header]
-    - [auto, c, isk_09_1_music]
-    - [auto, c, isk_09_2_main]
-    - [auto, c, isk_09_3_entity]
-    - [auto, c, isk_09_4_stairs]
-    - [auto, c, isk_09_5_switch]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, stairs]
+    - [auto, c, switch]
   - name: isk_10
     dir: world/area_isk/isk_10
     type: code
     start: 0x9D1590
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_10_0_header]
-    - [auto, c, isk_10_1_main]
-    - [auto, c, isk_10_2_entity]
-    - [auto, c, isk_10_3_bombable]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, bombable]
   - name: isk_11
     dir: world/area_isk/isk_11
     type: code
     start: 0x9D3440
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_11_0_header]
-    - [auto, c, isk_11_1_music]
-    - [auto, c, isk_11_2_main]
-    - [auto, c, isk_11_3_entity]
-    - [auto, c, isk_11_4_scene]
-    - [auto, c, isk_11_5_puzzle]
-    - [auto, c, isk_11_6_lock]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, scene]
+    - [auto, c, puzzle]
+    - [auto, c, lock]
   - name: isk_12
     dir: world/area_isk/isk_12
     type: code
     start: 0x9D6070
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_12_0_header]
-    - [auto, c, isk_12_1_main]
-    - [auto, c, isk_12_2_entity]
-    - [auto, c, isk_12_3_sand]
-    - [auto, c, isk_12_4_switch]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, sand]
+    - [auto, c, switch]
   - name: isk_13
     dir: world/area_isk/isk_13
     type: code
     start: 0x9D8210
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_13_0_header]
-    - [auto, c, isk_13_1_main]
-    - [auto, c, isk_13_2_entity]
-    - [auto, c, isk_13_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: isk_14
     dir: world/area_isk/isk_14
     type: code
     start: 0x9DB160
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_14_0_header]
-    - [auto, c, isk_14_1_main]
-    - [auto, c, isk_14_2_entity]
-    - [auto, c, isk_14_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: isk_16
     dir: world/area_isk/isk_16
     type: code
     start: 0x9DDC20
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_16_0_header]
-    - [auto, c, isk_16_1_main]
-    - [auto, c, isk_16_2_npc]
-    - [auto, c, isk_16_3_boss]
-    - [auto, c, isk_16_4_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, boss]
+    - [auto, c, entity]
   - name: isk_18
     dir: world/area_isk/isk_18
     type: code
     start: 0x9E09A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_18_0_header]
-    - [auto, c, isk_18_1_main]
-    - [auto, c, isk_18_2_npc]
-    - [auto, c, isk_18_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: isk_19
     dir: world/area_isk/isk_19
     type: code
     start: 0x9E2170
     vram: 0x80240000
     subsegments:
-    - [auto, c, isk_19_0_header]
-    - [auto, c, isk_19_1_music]
-    - [auto, c, isk_19_2_main]
-    - [auto, c, isk_19_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: trd_00
     dir: world/area_trd/trd_00
     type: code
     start: 0x9E26A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_00_0_header]
-    - [auto, c, trd_00_1_main]
-    - [auto, c, trd_00_2_entity]
-    - [auto, c, trd_00_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_01
     dir: world/area_trd/trd_01
     type: code
     start: 0x9E53C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_01_0_header]
-    - [auto, c, trd_01_1_main]
-    - [auto, c, trd_01_2_entity]
-    - [auto, c, trd_01_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_02
     dir: world/area_trd/trd_02
     type: code
     start: 0x9E9A10
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_02_0_header]
-    - [auto, c, trd_02_1_main]
-    - [auto, c, trd_02_2_entity]
-    - [auto, c, trd_02_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_03
     dir: world/area_trd/trd_03
     type: code
     start: 0x9ED080
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_03_0_header]
-    - [auto, c, trd_03_1_main]
-    - [auto, c, trd_03_2_entity]
-    - [auto, c, trd_03_3_npc]
-    - [auto, c, trd_03_4_puzzle]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, puzzle]
   - name: trd_04
     dir: world/area_trd/trd_04
     type: code
     start: 0x9F0E20
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_04_0_header]
-    - [auto, c, trd_04_1_main]
-    - [auto, c, trd_04_2_entity]
-    - [auto, c, trd_04_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_05
     dir: world/area_trd/trd_05
     type: code
     start: 0x9F7130
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_05_0_header]
-    - [auto, c, trd_05_1_main]
-    - [auto, c, trd_05_2_entity]
-    - [auto, c, trd_05_3_trap]
-    - [auto, c, trd_05_4_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, trap]
+    - [auto, c, npc]
   - name: trd_06
     dir: world/area_trd/trd_06
     type: code
     start: 0x9FA1C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_06_0_header]
-    - [auto, c, trd_06_1_main]
-    - [auto, c, trd_06_2_falling]
-    - [auto, c, trd_06_3_npc_prisoners]
-    - [auto, c, trd_06_4_npc_koopa_bros]
-    - [auto, c, trd_06_5_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, falling]
+    - [auto, c, npc_prisoners]
+    - [auto, c, npc_koopa_bros]
+    - [auto, c, entity]
   - name: trd_07
     dir: world/area_trd/trd_07
     type: code
     start: 0x9FF3B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_07_0_header]
-    - [auto, c, trd_07_1_main]
-    - [auto, c, trd_07_2_npc]
-    - [auto, c, trd_07_3_magic_doors]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, magic_doors]
   - name: trd_08
     dir: world/area_trd/trd_08
     type: code
     start: 0xA03CD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_08_0_header]
-    - [auto, c, trd_08_1_main]
-    - [auto, c, trd_08_2_entity]
-    - [auto, c, trd_08_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_09
     dir: world/area_trd/trd_09
     type: code
     start: 0xA06090
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_09_0_header]
-    - [auto, c, trd_09_1_main]
-    - [auto, c, trd_09_2_entity]
-    - [auto, c, trd_09_3_npc]
-    - [auto, c, trd_09_4_demo]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, demo]
   - name: trd_10
     dir: world/area_trd/trd_10
     type: code
     start: 0xA0B340
     vram: 0x80240000
     subsegments:
-    - [auto, c, trd_10_0_header]
-    - [auto, c, trd_10_1_main]
-    - [auto, c, trd_10_2_npc]
-    - [auto, c, trd_10_3_fake_bowser]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, fake_bowser]
   - name: nok_01
     dir: world/area_nok/nok_01
     type: code
     start: 0xA0DE10
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_01_0_header]
-    - [auto, c, nok_01_1_music]
-    - [auto, c, nok_01_2_main]
-    - [auto, c, nok_01_3_entity]
-    - [auto, c, nok_01_4_npc]
-    - [auto, c, nok_01_5_shop]
-    - [auto, c, nok_01_6_rooms]
-    - [auto, c, nok_01_7_radio]
-    - [auto, c, nok_01_8_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, shop]
+    - [auto, c, rooms]
+    - [auto, c, radio]
+    - [auto, c, foliage]
   - name: nok_02
     dir: world/area_nok/nok_02
     type: code
     start: 0xA1FA50
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_02_0_header]
-    - [auto, c, nok_02_1_music]
-    - [auto, c, nok_02_2_main]
-    - [auto, c, nok_02_3_entity]
-    - [auto, c, nok_02_4_rooms]
-    - [auto, c, nok_02_5_bookshelf]
-    - [auto, c, nok_02_6_npc]
-    - [auto, c, nok_02_7_demo]
-    - [auto, c, nok_02_8_koot_favors]
-    - [auto, c, nok_02_9_foliage]
-    - [auto, c, nok_02_10_epilogue]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, rooms]
+    - [auto, c, bookshelf]
+    - [auto, c, npc]
+    - [auto, c, demo]
+    - [auto, c, koot_favors]
+    - [auto, c, foliage]
+    - [auto, c, epilogue]
   - name: nok_03
     dir: world/area_nok/nok_03
     type: code
     start: 0xA34220
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_03_0_header]
-    - [auto, c, nok_03_1_music]
-    - [auto, c, nok_03_2_main]
-    - [auto, c, nok_03_3_entity]
-    - [auto, c, nok_03_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: nok_04
     dir: world/area_nok/nok_04
     type: code
     start: 0xA36620
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_04_0_header]
-    - [auto, c, nok_04_1_music]
-    - [auto, c, nok_04_2_main]
-    - [auto, c, nok_04_3_entity]
-    - [auto, c, nok_04_4_npc]
-    - [auto, c, nok_04_5_new_partner]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
   - name: nok_11
     dir: world/area_nok/nok_11
     type: code
     start: 0xA3D470
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_11_0_header]
-    - [auto, c, nok_11_1_music]
-    - [auto, c, nok_11_2_main]
-    - [auto, c, nok_11_3_entity]
-    - [auto, c, nok_11_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: nok_12
     dir: world/area_nok/nok_12
     type: code
     start: 0xA43220
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_12_0_header]
-    - [auto, c, nok_12_1_music]
-    - [auto, c, nok_12_2_main]
-    - [auto, c, nok_12_3_entity]
-    - [auto, c, nok_12_4_bridge]
-    - [auto, c, nok_12_5_foliage]
-    - [auto, c, nok_12_6_npc]
-    - [auto, c, nok_12_7_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, bridge]
+    - [auto, c, foliage]
+    - [auto, c, npc]
+    - [auto, c, demo]
   - name: nok_13
     dir: world/area_nok/nok_13
     type: code
     start: 0xA49030
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_13_0_header]
-    - [auto, c, nok_13_1_music]
-    - [auto, c, nok_13_2_main]
-    - [auto, c, nok_13_3_entity]
-    - [auto, c, nok_13_4_npc]
-    - [auto, c, nok_13_5]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, musical_hill]
   - name: nok_14
     dir: world/area_nok/nok_14
     type: code
     start: 0xA4B270
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_14_0_header]
-    - [auto, c, nok_14_1_music]
-    - [auto, c, nok_14_2_main]
-    - [auto, c, nok_14_3_entity]
-    - [auto, c, nok_14_4_bridge]
-    - [auto, c, nok_14_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, bridge]
+    - [auto, c, npc]
   - name: nok_15
     dir: world/area_nok/nok_15
     type: code
     start: 0xA4F930
     vram: 0x80240000
     subsegments:
-    - [auto, c, nok_15_0_header]
-    - [auto, c, nok_15_1_music]
-    - [auto, c, nok_15_2_main]
-    - [auto, c, nok_15_3_entity]
-    - [auto, c, nok_15_4_npc]
-    - [auto, c, nok_15_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: hos_00
     dir: world/area_hos/hos_00
     type: code
     start: 0xA54720
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_00_0_header]
-    - [auto, c, hos_00_1_music]
-    - [auto, c, hos_00_2_main]
-    - [auto, c, hos_00_3_unused]
-    - [auto, c, hos_00_4_npc]
-    - [auto, c, hos_00_5_entity]
-    - [auto, c, hos_00_6_scenes]
-    - [auto, c, hos_00_7_shade_gfx]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, unused]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, scenes]
+    - [auto, c, shade_gfx]
   - name: hos_01
     dir: world/area_hos/hos_01
     type: code
     start: 0xA592B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_01_0_header]
-    - [auto, c, hos_01_1_music]
-    - [auto, c, hos_01_2_main]
-    - [auto, c, hos_01_3_model_fx]
-    - [auto, c, hos_01_4_npc]
-    - [auto, c, hos_01_5_entity]
-    - [auto, c, hos_01_6_star_way]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, model_fx]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, star_way]
   - name: hos_02
     dir: world/area_hos/hos_02
     type: code
     start: 0xA5EC50
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_02_0_header]
-    - [auto, c, hos_02_1_music]
-    - [auto, c, hos_02_2_main]
-    - [auto, c, hos_02_3_model_fx]
-    - [auto, c, hos_02_4_unused]
-    - [auto, c, hos_02_5_npc]
-    - [auto, c, hos_02_6_descent]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, model_fx]
+    - [auto, c, unused]
+    - [auto, c, npc]
+    - [auto, c, descent]
   - name: hos_03
     dir: world/area_hos/hos_03
     type: code
     start: 0xA63B30
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_03_0_header]
-    - [auto, c, hos_03_1_music]
-    - [auto, c, hos_03_2_main]
-    - [auto, c, hos_03_3_model_fx]
-    - [auto, c, hos_03_4_rooms]
-    - [auto, c, hos_03_5_foliage]
-    - [auto, c, hos_03_6_npc]
-    - [auto, c, hos_03_7_shop]
-    - [auto, c, hos_03_8_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, model_fx]
+    - [auto, c, rooms]
+    - [auto, c, foliage]
+    - [auto, c, npc]
+    - [auto, c, shop]
+    - [auto, c, entity]
   - name: hos_04
     dir: world/area_hos/hos_04
     type: code
     start: 0xA6F900
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_04_0_header]
-    - [auto, c, hos_04_1_music]
-    - [auto, c, hos_04_2_main]
-    - [auto, c, hos_04_3_fountains]
-    - [auto, c, hos_04_4_unused]
-    - [auto, c, hos_04_6_intro]
-    - [auto, c, hos_04_7_starship]
-    - [auto, c, hos_04_8_narrator]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, fountains]
+    - [auto, c, unused]
+    - [auto, c, intro]
+    - [auto, c, starship]
+    - [auto, c, narrator]
   - name: hos_05
     dir: world/area_hos/hos_05
     type: code
     start: 0xA72C70
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_05_0_header]
-    - [auto, c, hos_05_1_music]
-    - [auto, c, hos_05_2_main]
-    - [auto, c, hos_05_3_misc]
-    - [auto, c, hos_05_4_npc]
-    - [auto, c, hos_05_5_intro]
-    - [auto, c, hos_05_6_narrator]
-    - [auto, c, hos_05_7_model_fx]
-    - [auto, c, hos_05_8_star_ship]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, misc]
+    - [auto, c, npc]
+    - [auto, c, intro]
+    - [auto, c, narrator]
+    - [auto, c, model_fx]
+    - [auto, c, star_ship]
   - name: hos_06
     dir: world/area_hos/hos_06
     type: code
     start: 0xA81F10
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_06_0_header]
-    - [auto, c, hos_06_1_entity]
-    - [auto, c, hos_06_2_main]
-    - [auto, c, hos_06_3_merlow]
-    - [auto, c, hos_06_4_rooms]
-    - [auto, c, hos_06_5_merluvlee]
-    - [auto, c, hos_06_6_chest]
+    - [auto, c, settings]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, merlow]
+    - [auto, c, rooms]
+    - [auto, c, merluvlee]
+    - [auto, c, chest]
   - name: hos_10
     dir: world/area_hos/hos_10
     type: code
     start: 0xA88170
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_10_0_header]
-    - [auto, c, hos_10_1_music]
-    - [auto, c, hos_10_2_npc1]
-    - [auto, c, hos_10_3_npc2]
-    - [auto, c, hos_10_4_main]
-    - [auto, c, hos_10_5_intro]
-    - [auto, c, hos_10_6_pre_title]
-    - [auto, c, hos_10_7_ending]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, npc1]
+    - [auto, c, npc2]
+    - [auto, c, main]
+    - [auto, c, intro]
+    - [auto, c, pre_title]
+    - [auto, c, ending]
   - name: hos_20
     dir: world/area_hos/hos_20
     type: code
     start: 0xA8E360
     vram: 0x80240000
     subsegments:
-    - [auto, c, hos_20_0_header]
-    - [auto, c, hos_20_1_main]
-    - [auto, c, hos_20_2_starship]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, starship]
   - name: kpa_01
     dir: world/area_kpa/kpa_01
     type: code
     start: 0xA8F990
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_01_0_header]
-    - [auto, c, kpa_01_1_music]
-    - [auto, c, kpa_01_2_main]
-    - [auto, c, kpa_01_3_npc]
-    - [auto, c, kpa_01_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_03
     dir: world/area_kpa/kpa_03
     type: code
     start: 0xA90FF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_03_0_header]
-    - [auto, c, kpa_03_1_music]
-    - [auto, c, kpa_03_2_main]
-    - [auto, c, kpa_03_3_npc]
-    - [auto, c, kpa_03_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_04
     dir: world/area_kpa/kpa_04
     type: code
     start: 0xA94990
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_04_0_header]
-    - [auto, c, kpa_04_1_music]
-    - [auto, c, kpa_04_2_main]
-    - [auto, c, kpa_04_3_statues]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, statues]
   - name: kpa_08
     dir: world/area_kpa/kpa_08
     type: code
     start: 0xA95450
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_08_0_header]
-    - [auto, c, kpa_08_1_music]
-    - [auto, c, kpa_08_2_main]
-    - [auto, c, kpa_08_3_entity]
-    - [auto, c, kpa_08_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kpa_09
     dir: world/area_kpa/kpa_09
     type: code
     start: 0xA97A30
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_09_0_header]
-    - [auto, c, kpa_09_1_music]
-    - [auto, c, kpa_09_2_main]
-    - [auto, c, kpa_09_3_entity]
-    - [auto, c, kpa_09_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kpa_10
     dir: world/area_kpa/kpa_10
     type: code
     start: 0xA9A3B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_10_0_header]
-    - [auto, c, kpa_10_1_music]
-    - [auto, c, kpa_10_2_main]
-    - [auto, c, kpa_10_3_npc]
-    - [auto, c, kpa_10_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_11
     dir: world/area_kpa/kpa_11
     type: code
     start: 0xA9B2F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_11_0_header]
-    - [auto, c, kpa_11_1_music]
-    - [auto, c, kpa_11_2_main]
-    - [auto, c, kpa_11_3_entity]
-    - [auto, c, kpa_11_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kpa_12
     dir: world/area_kpa/kpa_12
     type: code
     start: 0xA9D380
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_12_0_header]
-    - [auto, c, kpa_12_1_music]
-    - [auto, c, kpa_12_2_main]
-    - [auto, c, kpa_12_3_platforms]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, platforms]
   - name: kpa_13
     dir: world/area_kpa/kpa_13
     type: code
     start: 0xA9E950
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_13_0_header]
-    - [auto, c, kpa_13_1_music]
-    - [auto, c, kpa_13_2_main]
-    - [auto, c, kpa_13_3_entity]
-    - [auto, c, kpa_13_4_platforms]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, platforms]
   - name: kpa_14
     dir: world/area_kpa/kpa_14
     type: code
     start: 0xA9FEE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_14_0_header]
-    - [auto, c, kpa_14_1_music]
-    - [auto, c, kpa_14_2_main]
-    - [auto, c, kpa_14_3_entity]
-    - [auto, c, kpa_14_4_platforms]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, platforms]
   - name: kpa_15
     dir: world/area_kpa/kpa_15
     type: code
     start: 0xAA1DC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_15_0_header]
-    - [auto, c, kpa_15_1_music]
-    - [auto, c, kpa_15_2_main]
-    - [auto, c, kpa_15_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kpa_16
     dir: world/area_kpa/kpa_16
     type: code
     start: 0xAA2A60
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_16_0_header]
-    - [auto, c, kpa_16_1_music]
-    - [auto, c, kpa_16_2_main]
-    - [auto, c, kpa_16_3_entity]
-    - [auto, c, kpa_16_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kpa_17
     dir: world/area_kpa/kpa_17
     type: code
     start: 0xAA5450
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_17_0_header]
-    - [auto, c, kpa_17_1_music]
-    - [auto, c, kpa_17_2_entity]
-    - [auto, c, kpa_17_3_main]
-    - [auto, c, kpa_17_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_32
     dir: world/area_kpa/kpa_32
     type: code
     start: 0xAA6AF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_32_0_header]
-    - [auto, c, kpa_32_1_music]
-    - [auto, c, kpa_32_2_entity]
-    - [auto, c, kpa_32_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: kpa_33
     dir: world/area_kpa/kpa_33
     type: code
     start: 0xAA7AB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_33_0_header]
-    - [auto, c, kpa_33_1_music]
-    - [auto, c, kpa_33_2_entity]
-    - [auto, c, kpa_33_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: kpa_40
     dir: world/area_kpa/kpa_40
     type: code
     start: 0xAA8A70
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_40_0_header]
-    - [auto, c, kpa_40_1_music]
-    - [auto, c, kpa_40_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_41
     dir: world/area_kpa/kpa_41
     type: code
     start: 0xAA8EA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_41_0_header]
-    - [auto, c, kpa_41_1_music]
-    - [auto, c, kpa_41_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_50
     dir: world/area_kpa/kpa_50
     type: code
     start: 0xAA9400
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_50_0_header]
-    - [auto, c, kpa_50_1_music]
-    - [auto, c, kpa_50_2_main]
-    - [auto, c, kpa_50_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_51
     dir: world/area_kpa/kpa_51
     type: code
     start: 0xAACAC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_51_0_header]
-    - [auto, c, kpa_51_1_music]
-    - [auto, c, kpa_51_2_main]
-    - [auto, c, kpa_51_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_52
     dir: world/area_kpa/kpa_52
     type: code
     start: 0xAAFB30
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_52_0_header]
-    - [auto, c, kpa_52_1_music]
-    - [auto, c, kpa_52_2_entity]
-    - [auto, c, kpa_52_3_main]
-    - [auto, c, kpa_52_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_53
     dir: world/area_kpa/kpa_53
     type: code
     start: 0xAB36D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_53_0_header]
-    - [auto, c, kpa_53_1_music]
-    - [auto, c, kpa_53_2_main]
-    - [auto, c, kpa_53_3_npc]
-    - [auto, c, kpa_53_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_60
     dir: world/area_kpa/kpa_60
     type: code
     start: 0xAB5530
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_60_0_header]
-    - [auto, c, kpa_60_1_music]
-    - [auto, c, kpa_60_2_entity]
-    - [auto, c, kpa_60_3_main]
-    - [auto, c, kpa_60_4_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, scenes]
   - name: kpa_61
     dir: world/area_kpa/kpa_61
     type: code
     start: 0xAB6E10
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_61_0_header]
-    - [auto, c, kpa_61_1_music]
-    - [auto, c, kpa_61_2_main]
-    - [auto, c, kpa_61_3_npc]
-    - [auto, c, kpa_61_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_62
     dir: world/area_kpa/kpa_62
     type: code
     start: 0xABAC50
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_62_0_header]
-    - [auto, c, kpa_62_1_music]
-    - [auto, c, kpa_62_2_entity]
-    - [auto, c, kpa_62_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: kpa_63
     dir: world/area_kpa/kpa_63
     type: code
     start: 0xABBFE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_63_0_header]
-    - [auto, c, kpa_63_1_music]
-    - [auto, c, kpa_63_2_entity]
-    - [auto, c, kpa_63_3_main]
-    - [auto, c, kpa_63_4_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, scenes]
   - name: kpa_70
     dir: world/area_kpa/kpa_70
     type: code
     start: 0xABD2A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_70_0_header]
-    - [auto, c, kpa_70_1_music]
-    - [auto, c, kpa_70_2_main]
-    - [auto, c, kpa_70_3_npc]
-    - [auto, c, kpa_70_4_chain_skele]
-    - [auto, c, kpa_70_5_chain_anim]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, chain_skele]
+    - [auto, c, chain_anim]
   - name: kpa_81
     dir: world/area_kpa/kpa_81
     type: code
     start: 0xAC0EF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_81_0_header]
-    - [auto, c, kpa_81_1_music]
-    - [auto, c, kpa_81_2_main]
-    - [auto, c, kpa_81_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_82
     dir: world/area_kpa/kpa_82
     type: code
     start: 0xAC2F30
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_82_0_header]
-    - [auto, c, kpa_82_1_music]
-    - [auto, c, kpa_82_2_main]
-    - [auto, c, kpa_82_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_83
     dir: world/area_kpa/kpa_83
     type: code
     start: 0xACBEC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_83_0_header]
-    - [auto, c, kpa_83_1_music]
-    - [auto, c, kpa_83_2_main]
-    - [auto, c, kpa_83_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_90
     dir: world/area_kpa/kpa_90
     type: code
     start: 0xACF1E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_90_0_header]
-    - [auto, c, kpa_90_1_music]
-    - [auto, c, kpa_90_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_91
     dir: world/area_kpa/kpa_91
     type: code
     start: 0xACF480
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_91_0_header]
-    - [auto, c, kpa_91_1_music]
-    - [auto, c, kpa_91_2_main]
-    - [auto, c, kpa_91_3_npc]
-    - [auto, c, kpa_91_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_94
     dir: world/area_kpa/kpa_94
     type: code
     start: 0xAD51F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_94_0_header]
-    - [auto, c, kpa_94_1_music]
-    - [auto, c, kpa_94_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_95
     dir: world/area_kpa/kpa_95
     type: code
     start: 0xAD54B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_95_0_header]
-    - [auto, c, kpa_95_1_music]
-    - [auto, c, kpa_95_2_entity]
-    - [auto, c, kpa_95_3_main]
-    - [auto, c, kpa_95_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_96
     dir: world/area_kpa/kpa_96
     type: code
     start: 0xADB1F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_96_0_header]
-    - [auto, c, kpa_96_1_music]
-    - [auto, c, kpa_96_2_main]
-    - [auto, c, kpa_96_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_100
     dir: world/area_kpa/kpa_100
     type: code
     start: 0xADBB90
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_100_0_header]
-    - [auto, c, kpa_100_1_music]
-    - [auto, c, kpa_100_2_main]
-    - [auto, c, kpa_100_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kpa_101
     dir: world/area_kpa/kpa_101
     type: code
     start: 0xADBE70
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_101_0_header]
-    - [auto, c, kpa_101_1_music]
-    - [auto, c, kpa_101_2_main]
-    - [auto, c, kpa_101_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kpa_102
     dir: world/area_kpa/kpa_102
     type: code
     start: 0xADC170
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_102_0_header]
-    - [auto, c, kpa_102_1_music]
-    - [auto, c, kpa_102_2_main]
-    - [auto, c, kpa_102_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_111
     dir: world/area_kpa/kpa_111
     type: code
     start: 0xAE1FC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_111_0_header]
-    - [auto, c, kpa_111_1_music]
-    - [auto, c, kpa_111_2_main]
-    - [auto, c, kpa_111_3_statues]
-    - [auto, c, kpa_111_4_npc]
-    - [auto, c, kpa_111_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, statues]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_112
     dir: world/area_kpa/kpa_112
     type: code
     start: 0xAE53C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_112_0_header]
-    - [auto, c, kpa_112_1_music]
-    - [auto, c, kpa_112_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_113
     dir: world/area_kpa/kpa_113
     type: code
     start: 0xAE5660
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_113_0_header]
-    - [auto, c, kpa_113_1_music]
-    - [auto, c, kpa_113_2_main]
-    - [auto, c, kpa_113_3_entity]
-    - [auto, c, kpa_113_4_statues]
-    - [auto, c, kpa_113_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, statues]
+    - [auto, c, npc]
   - name: kpa_114
     dir: world/area_kpa/kpa_114
     type: code
     start: 0xAE73B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_114_0_header]
-    - [auto, c, kpa_114_1_music]
-    - [auto, c, kpa_114_2_main]
-    - [auto, c, kpa_114_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kpa_115
     dir: world/area_kpa/kpa_115
     type: code
     start: 0xAE7770
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_115_0_header]
-    - [auto, c, kpa_115_1_music]
-    - [auto, c, kpa_115_2_main]
-    - [auto, c, kpa_115_3_statues]
-    - [auto, c, kpa_115_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, statues]
+    - [auto, c, npc]
   - name: kpa_116
     dir: world/area_kpa/kpa_116
     type: code
     start: 0xAEA910
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_116_0_header]
-    - [auto, c, kpa_116_1_music]
-    - [auto, c, kpa_116_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_117
     dir: world/area_kpa/kpa_117
     type: code
     start: 0xAEABB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_117_0_header]
-    - [auto, c, kpa_117_1_music]
-    - [auto, c, kpa_117_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_118
     dir: world/area_kpa/kpa_118
     type: code
     start: 0xAEADF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_118_0_header]
-    - [auto, c, kpa_118_1_music]
-    - [auto, c, kpa_118_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_119
     dir: world/area_kpa/kpa_119
     type: code
     start: 0xAEB090
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_119_0_header]
-    - [auto, c, kpa_119_1_music]
-    - [auto, c, kpa_119_2_entity]
-    - [auto, c, kpa_119_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: kpa_121
     dir: world/area_kpa/kpa_121
     type: code
     start: 0xAEB320
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_121_0_header]
-    - [auto, c, kpa_121_1_music]
-    - [auto, c, kpa_121_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_130
     dir: world/area_kpa/kpa_130
     type: code
     start: 0xAEB750
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_130_0_header]
-    - [auto, c, kpa_130_1_music]
-    - [auto, c, kpa_130_2_main]
-    - [auto, c, kpa_130_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_133
     dir: world/area_kpa/kpa_133
     type: code
     start: 0xAEFEB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_133_0_header]
-    - [auto, c, kpa_133_1_music]
-    - [auto, c, kpa_133_2_main]
-    - [auto, c, kpa_133_3_entity]
-    - [auto, c, kpa_133_4_npc]
-    - [auto, c, kpa_133_5_water]
-    - [auto, c, kpa_133_6]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, water]
+    - [auto, c, ease]
   - name: kpa_134
     dir: world/area_kpa/kpa_134
     type: code
     start: 0xAF19D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kpa_134_0_header]
-    - [auto, c, kpa_134_1_music]
-    - [auto, c, kpa_134_2_main]
-    - [auto, c, kpa_134_3_chains]
-    - [auto, c, kpa_134_4_npc]
-    - [auto, c, kpa_134_5_panels]
-    - [auto, c, kpa_134_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, chains]
+    - [auto, c, npc]
+    - [auto, c, panels]
+    - [auto, c, entity]
   - name: osr_00
     dir: world/area_osr/osr_00
     type: code
     start: 0xAF5260
     vram: 0x80240000
     subsegments:
-    - [auto, c, osr_00_0_header]
-    - [auto, c, osr_00_1_music]
-    - [auto, c, osr_00_2_main]
-    - [auto, c, osr_00_3_npc_intro]
-    - [auto, c, osr_00_4_npc_epilogue]
-    - [auto, c, osr_00_5_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc_intro]
+    - [auto, c, npc_epilogue]
+    - [auto, c, scenes]
   - name: osr_01
     dir: world/area_osr/osr_01
     type: code
     start: 0xAF8A20
     vram: 0x80240000
     subsegments:
-    - [auto, c, osr_01_0_header]
-    - [auto, c, osr_01_1_music]
-    - [auto, c, osr_01_2_main]
-    - [auto, c, osr_01_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: osr_02
     dir: world/area_osr/osr_02
     type: code
     start: 0xAFABA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, osr_02_0_header]
-    - [auto, c, osr_02_1_main]
-    - [auto, c, osr_02_2_entity]
-    - [auto, c, osr_02_3_npc]
-    - [auto, c, osr_02_4_npc_peach]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, npc_peach]
   - name: osr_03
     dir: world/area_osr/osr_03
     type: code
     start: 0xAFECC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, osr_03_0_header]
-    - [auto, c, osr_03_1_main]
-    - [auto, c, osr_03_2_npc]
-    - [auto, c, osr_03_3_intro]
-    - [auto, c, osr_03_4_starship]
-    - [auto, c, osr_03_5_interlude]
-    - [auto, c, osr_03_6_ending]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, intro]
+    - [auto, c, starship]
+    - [auto, c, interlude]
+    - [auto, c, ending]
   - name: osr_04
     dir: world/area_osr/osr_04
     type: code
     start: 0xB01CE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, osr_04_0_header]
-    - [auto, c, osr_04_1_main]
-    - [auto, c, osr_04_2_assault]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, assault]
   - name: kkj_00
     dir: world/area_kkj/kkj_00
     type: code
     start: 0xB03CC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_00_0_header]
-    - [auto, c, kkj_00_1_music]
-    - [auto, c, kkj_00_2_main]
-    - [auto, c, kkj_00_3_npc_intro]
-    - [auto, c, kkj_00_4_scene_intro]
-    - [auto, c, kkj_00_5_npc_ending]
-    - [auto, c, kkj_00_6_scene_ending]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc_intro]
+    - [auto, c, scene_intro]
+    - [auto, c, npc_ending]
+    - [auto, c, scene_ending]
   - name: kkj_01
     dir: world/area_kkj/kkj_01
     type: code
     start: 0xB0DBA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_01_0_header]
-    - [auto, c, kkj_01_1_music]
-    - [auto, c, kkj_01_2_main]
-    - [auto, c, kkj_01_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kkj_02
     dir: world/area_kkj/kkj_02
     type: code
     start: 0xB11750
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_02_0_header]
-    - [auto, c, kkj_02_1_music]
-    - [auto, c, kkj_02_2_main]
-    - [auto, c, kkj_02_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kkj_03
     dir: world/area_kkj/kkj_03
     type: code
     start: 0xB12140
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_03_0_header]
-    - [auto, c, kkj_03_1_music]
-    - [auto, c, kkj_03_2_main]
-    - [auto, c, kkj_03_3_npc]
-    - [auto, c, kkj_03_4_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, scenes]
   - name: kkj_10
     dir: world/area_kkj/kkj_10
     type: code
     start: 0xB13550
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_10_0_header]
-    - [auto, c, kkj_10_1_main]
-    - [auto, c, kkj_10_2_entity]
-    - [auto, c, kkj_10_3_npcs_early]
-    - [auto, c, kkj_10_4_npcs_later]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npcs_early]
+    - [auto, c, npcs_later]
   - name: kkj_11
     dir: world/area_kkj/kkj_11
     type: code
     start: 0xB16B70
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_11_0_header]
-    - [auto, c, kkj_11_1_main]
-    - [auto, c, kkj_11_2_entity]
-    - [auto, c, kkj_11_3_scene]
-    - [auto, c, kkj_11_4_demo]
-    - [auto, c, kkj_11_5_npcs_early]
-    - [auto, c, kkj_11_6_npcs_later]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, scene]
+    - [auto, c, demo]
+    - [auto, c, npcs_early]
+    - [auto, c, npcs_later]
   - name: kkj_12
     dir: world/area_kkj/kkj_12
     type: code
     start: 0xB1CAC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_12_0_header]
-    - [auto, c, kkj_12_1_main]
-    - [auto, c, kkj_12_2_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kkj_13
     dir: world/area_kkj/kkj_13
     type: code
     start: 0xB1E900
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_13_0_header]
-    - [auto, c, kkj_13_1_music]
-    - [auto, c, kkj_13_2_main]
-    - [auto, c, kkj_13_3_npcs_finale]
-    - [auto, c, kkj_13_4_npcs_intro]
-    - [auto, c, kkj_13_5_intro_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npcs_finale]
+    - [auto, c, npcs_intro]
+    - [auto, c, intro_scenes]
   - name: kkj_14
     dir: world/area_kkj/kkj_14
     type: code
     start: 0xB238D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_14_0_header]
-    - [auto, c, kkj_14_1_music]
-    - [auto, c, kkj_14_2_main]
-    - [auto, c, kkj_14_3_interactables]
-    - [auto, c, kkj_14_4_npc_guards]
-    - [auto, c, kkj_14_5_npc_ch0]
-    - [auto, c, kkj_14_6_npc_ch2]
-    - [auto, c, kkj_14_7_npc_ch7]
-    - [auto, c, kkj_14_8_chapter0]
-    - [auto, c, kkj_14_9_chapter1]
-    - [auto, c, kkj_14_10_chapter2]
-    - [auto, c, kkj_14_11_chapter3]
-    - [auto, c, kkj_14_12_chapter4]
-    - [auto, c, kkj_14_13_chapter5]
-    - [auto, c, kkj_14_14_chapter6]
-    - [auto, c, kkj_14_15_chapter7]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, interactables]
+    - [auto, c, npc_guards]
+    - [auto, c, npc_ch0]
+    - [auto, c, npc_ch2]
+    - [auto, c, npc_ch7]
+    - [auto, c, chapter0]
+    - [auto, c, chapter1]
+    - [auto, c, chapter2]
+    - [auto, c, chapter3]
+    - [auto, c, chapter4]
+    - [auto, c, chapter5]
+    - [auto, c, chapter6]
+    - [auto, c, chapter7]
   - name: kkj_15
     dir: world/area_kkj/kkj_15
     type: code
     start: 0xB2DFC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_15_0_header]
-    - [auto, c, kkj_15_1_music]
-    - [auto, c, kkj_15_2_main]
-    - [auto, c, kkj_15_3_rotating_wall]
-    - [auto, c, kkj_15_4_chapter0]
-    - [auto, c, kkj_15_5_chapter1]
-    - [auto, c, kkj_15_6_chapter2]
-    - [auto, c, kkj_15_7_chapter3]
-    - [auto, c, kkj_15_8_npc_chapter0]
-    - [auto, c, kkj_15_9_npc_chapter1]
-    - [auto, c, kkj_15_10_npc_chapter3]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rotating_wall]
+    - [auto, c, chapter0]
+    - [auto, c, chapter1]
+    - [auto, c, chapter2]
+    - [auto, c, chapter3]
+    - [auto, c, npc_chapter0]
+    - [auto, c, npc_chapter1]
+    - [auto, c, npc_chapter3]
   - name: kkj_16
     dir: world/area_kkj/kkj_16
     type: code
     start: 0xB35E40
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_16_0_header]
-    - [auto, c, kkj_16_1_main]
-    - [auto, c, kkj_16_2_npcs_early]
-    - [auto, c, kkj_16_3_npcs_later]
-    - [auto, c, kkj_16_4_stealth]
-    - [auto, c, kkj_16_5_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npcs_early]
+    - [auto, c, npcs_later]
+    - [auto, c, stealth]
+    - [auto, c, entity]
   - name: kkj_17
     dir: world/area_kkj/kkj_17
     type: code
     start: 0xB3A690
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_17_0_header]
-    - [auto, c, kkj_17_1_main]
-    - [auto, c, kkj_17_2_entity]
-    - [auto, c, kkj_17_3_chest]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, chest]
   - name: kkj_18
     dir: world/area_kkj/kkj_18
     type: code
     start: 0xB3B6D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_18_0_header]
-    - [auto, c, kkj_18_1_music]
-    - [auto, c, kkj_18_2_main]
-    - [auto, c, kkj_18_3_npc]
-    - [auto, c, kkj_18_4_gourmet]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, gourmet]
   - name: kkj_19
     dir: world/area_kkj/kkj_19
     type: code
     start: 0xB40380
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_19_0_header]
-    - [auto, c, kkj_19_1_music]
-    - [auto, c, kkj_19_2_main]
-    - [auto, c, kkj_19_3_npcs_intro]
-    - [auto, c, kkj_19_4_npcs_peach]
-    - [auto, c, kkj_19_5_baking]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npcs_intro]
+    - [auto, c, npcs_peach]
+    - [auto, c, baking]
   - name: kkj_20
     dir: world/area_kkj/kkj_20
     type: code
     start: 0xB46570
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_20_0_header]
-    - [auto, c, kkj_20_1_music]
-    - [auto, c, kkj_20_2_main]
-    - [auto, c, kkj_20_3_entity]
-    - [auto, c, kkj_20_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kkj_21
     dir: world/area_kkj/kkj_21
     type: code
     start: 0xB4ACD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_21_0_header]
-    - [auto, c, kkj_21_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kkj_22
     dir: world/area_kkj/kkj_22
     type: code
     start: 0xB4AF20
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_22_0_header]
-    - [auto, c, kkj_22_1_music]
-    - [auto, c, kkj_22_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kkj_23
     dir: world/area_kkj/kkj_23
     type: code
     start: 0xB4B2B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_23_0_header]
-    - [auto, c, kkj_23_1_music]
-    - [auto, c, kkj_23_2_main]
-    - [auto, c, kkj_23_3_npcs_finale]
-    - [auto, c, kkj_23_4_npcs_peach]
-    - [auto, c, kkj_23_5_scene]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npcs_finale]
+    - [auto, c, npcs_peach]
+    - [auto, c, scene]
   - name: kkj_24
     dir: world/area_kkj/kkj_24
     type: code
     start: 0xB4EFA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_24_0_header]
-    - [auto, c, kkj_24_1_music]
-    - [auto, c, kkj_24_2_main]
-    - [auto, c, kkj_24_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kkj_25
     dir: world/area_kkj/kkj_25
     type: code
     start: 0xB4F430
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_25_0_header]
-    - [auto, c, kkj_25_1_main]
-    - [auto, c, kkj_25_2_npc_initial]
-    - [auto, c, kkj_25_3_npc_midpoint]
-    - [auto, c, kkj_25_4_npc_final]
-    - [auto, c, kkj_25_5_arena]
-    - [auto, c, kkj_25_6_peach_free]
-    - [auto, c, kkj_25_7_kammy_defeated]
-    - [auto, c, kkj_25_8_bowser_defeated]
-    - [auto, c, kkj_25_9_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc_initial]
+    - [auto, c, npc_midpoint]
+    - [auto, c, npc_final]
+    - [auto, c, arena]
+    - [auto, c, peach_free]
+    - [auto, c, kammy_defeated]
+    - [auto, c, bowser_defeated]
+    - [auto, c, entity]
   - name: kkj_26
     dir: world/area_kkj/kkj_26
     type: code
     start: 0xB5BB50
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_26_0_header]
-    - [auto, c, kkj_26_1_main]
-    - [auto, c, kkj_26_2_scenes]
-    - [auto, c, kkj_26_3_demo]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, scenes]
+    - [auto, c, demo]
   - name: kkj_27
     dir: world/area_kkj/kkj_27
     type: code
     start: 0xB5C7A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_27_0_header]
-    - [auto, c, kkj_27_1_music]
-    - [auto, c, kkj_27_2_main]
-    - [auto, c, kkj_27_3_rotating_wall]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rotating_wall]
   - name: kkj_28
     dir: world/area_kkj/kkj_28
     type: code
     start: 0xB5D8D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_28_0_header]
-    - [auto, c, kkj_28_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kkj_29
     dir: world/area_kkj/kkj_29
     type: code
     start: 0xB5DAE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kkj_29_0_header]
-    - [auto, c, kkj_29_1_main]
-    - [auto, c, kkj_29_2_npc]
-    - [auto, c, kkj_29_3_quiz]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, quiz]
   - name: tst_01
     dir: world/area_tst/tst_01
     type: code
     start: 0xB63330
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_01_1_main]
-    - [auto, c, tst_01_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tst_02
     dir: world/area_tst/tst_02
     type: code
     start: 0xB63660
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_02_1_main]
-    - [auto, c, tst_02_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tst_03
     dir: world/area_tst/tst_03
     type: code
     start: 0xB639B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_03_1_main]
-    - [auto, c, tst_03_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tst_04
     dir: world/area_tst/tst_04
     type: code
     start: 0xB63FA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_04_1_main]
-    - [auto, c, tst_04_2_entity]
-    - [auto, c, tst_04_3_reflection]
-    - [auto, c, tst_04_4_npc]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, reflection]
+    - [auto, c, npc]
   - name: tst_10
     dir: world/area_tst/tst_10
     type: code
     start: 0xB64F70
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_10_1_main]
+    - [auto, c, main]
   - name: tst_11
     dir: world/area_tst/tst_11
     type: code
     start: 0xB65480
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_11_1_main]
-    - [auto, c, tst_11_2_extra]
+    - [auto, c, main]
+    - [auto, c, extra]
   - name: tst_12
     dir: world/area_tst/tst_12
     type: code
     start: 0xB65D20
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_12_1_main]
+    - [auto, c, main]
   - name: tst_13
     dir: world/area_tst/tst_13
     type: code
     start: 0xB66190
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_13_1_main]
+    - [auto, c, main]
     - start: 0xB66550
       type: .data
-      name: tst_13_1_main
+      name: main
       subsegments:
       - [0xB66550]
       - [0xB68440, vtx, shockwave]
@@ -10526,748 +10526,748 @@ segments:
     start: 0xB68EA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, tst_20_1_main]
+    - [auto, c, main]
   - name: jan_00
     dir: world/area_jan/jan_00
     type: code
     start: 0xB68F70
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_00_0_header]
-    - [auto, c, jan_00_1_main]
-    - [auto, c, jan_00_2_npc]
-    - [auto, c, jan_00_3_entity]
-    - [auto, c, jan_00_4_whale]
-    - [auto, c, jan_00_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, whale]
+    - [auto, c, foliage]
   - name: jan_01
     dir: world/area_jan/jan_01
     type: code
     start: 0xB70A60
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_01_0_header]
-    - [auto, c, jan_01_1_music]
-    - [auto, c, jan_01_2_main]
-    - [auto, c, jan_01_3_npc]
-    - [auto, c, jan_01_4_entity]
-    - [auto, c, jan_01_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: jan_02
     dir: world/area_jan/jan_02
     type: code
     start: 0xB74EA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_02_0_header]
-    - [auto, c, jan_02_1_music]
-    - [auto, c, jan_02_2_main]
-    - [auto, c, jan_02_3_npc]
-    - [auto, c, jan_02_4_entity]
-    - [auto, c, jan_02_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: jan_03
     dir: world/area_jan/jan_03
     type: code
     start: 0xB7D600
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_03_0_header]
-    - [auto, c, jan_03_1_music]
-    - [auto, c, jan_03_2_main]
-    - [auto, c, jan_03_3_shop]
-    - [auto, c, jan_03_4_npc]
-    - [auto, c, jan_03_5_entity]
-    - [auto, c, jan_03_6_rooms]
-    - [auto, c, jan_03_7_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, shop]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, rooms]
+    - [auto, c, foliage]
   - name: jan_04
     dir: world/area_jan/jan_04
     type: code
     start: 0xB8D1A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_04_0_header]
-    - [auto, c, jan_04_1_music]
-    - [auto, c, jan_04_2_main]
-    - [auto, c, jan_04_3_entity]
-    - [auto, c, jan_04_4_npc]
-    - [auto, c, jan_04_5_unused]
-    - [auto, c, jan_04_6_trees]
-    - [auto, c, jan_04_7_scenes]
-    - [auto, c, jan_04_8_treasure]
-    - [auto, c, jan_04_9_bushes]
-    - [auto, c, jan_04_10_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, unused]
+    - [auto, c, trees]
+    - [auto, c, scenes]
+    - [auto, c, treasure]
+    - [auto, c, bushes]
+    - [auto, c, demo]
   - name: jan_05
     dir: world/area_jan/jan_05
     type: code
     start: 0xB934A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_05_0_header]
-    - [auto, c, jan_05_1_music]
-    - [auto, c, jan_05_2_main]
-    - [auto, c, jan_05_3_log]
-    - [auto, c, jan_05_4_bushes]
-    - [auto, c, jan_05_5_npc]
-    - [auto, c, jan_05_6_trees]
-    - [auto, c, jan_05_7_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, log]
+    - [auto, c, bushes]
+    - [auto, c, npc]
+    - [auto, c, trees]
+    - [auto, c, entity]
   - name: jan_06
     dir: world/area_jan/jan_06
     type: code
     start: 0xB9B260
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_06_0_header]
-    - [auto, c, jan_06_1_main]
-    - [auto, c, jan_06_2_statue]
-    - [auto, c, jan_06_3_log]
-    - [auto, c, jan_06_4_trees]
-    - [auto, c, jan_06_5_entity]
-    - [auto, c, jan_06_6_npc]
-    - [auto, c, jan_06_7_bushes]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, statue]
+    - [auto, c, log]
+    - [auto, c, trees]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, bushes]
   - name: jan_07
     dir: world/area_jan/jan_07
     type: code
     start: 0xBA22A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_07_0_header]
-    - [auto, c, jan_07_1_music]
-    - [auto, c, jan_07_2_main]
-    - [auto, c, jan_07_3_npc]
-    - [auto, c, jan_07_4_trees]
-    - [auto, c, jan_07_5_bushes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, trees]
+    - [auto, c, bushes]
   - name: jan_08
     dir: world/area_jan/jan_08
     type: code
     start: 0xBA6CE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_08_0_header]
-    - [auto, c, jan_08_1_music]
-    - [auto, c, jan_08_2_main]
-    - [auto, c, jan_08_3_bushes]
-    - [auto, c, jan_08_4_entity]
-    - [auto, c, jan_08_5_npc]
-    - [auto, c, jan_08_6_trees]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bushes]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, trees]
   - name: jan_09
     dir: world/area_jan/jan_09
     type: code
     start: 0xBAE4E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_09_0_header]
-    - [auto, c, jan_09_1_main]
-    - [auto, c, jan_09_2_bushes]
-    - [auto, c, jan_09_3_npc]
-    - [auto, c, jan_09_4_trees]
-    - [auto, c, jan_09_5_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, bushes]
+    - [auto, c, npc]
+    - [auto, c, trees]
+    - [auto, c, entity]
   - name: jan_10
     dir: world/area_jan/jan_10
     type: code
     start: 0xBB4DC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_10_0_header]
-    - [auto, c, jan_10_1_music]
-    - [auto, c, jan_10_2_main]
-    - [auto, c, jan_10_3_npc]
-    - [auto, c, jan_10_4_log]
-    - [auto, c, jan_10_5_trees]
-    - [auto, c, jan_10_6_bushes]
-    - [auto, c, jan_10_7_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, log]
+    - [auto, c, trees]
+    - [auto, c, bushes]
+    - [auto, c, entity]
   - name: jan_11
     dir: world/area_jan/jan_11
     type: code
     start: 0xBB9290
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_11_0_header]
-    - [auto, c, jan_11_1_music]
-    - [auto, c, jan_11_2_main]
-    - [auto, c, jan_11_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: jan_12
     dir: world/area_jan/jan_12
     type: code
     start: 0xBBBAE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_12_0_header]
-    - [auto, c, jan_12_1_main]
-    - [auto, c, jan_12_2_vines]
-    - [auto, c, jan_12_3_trees]
-    - [auto, c, jan_12_4_entity]
-    - [auto, c, jan_12_5_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, trees]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: jan_13
     dir: world/area_jan/jan_13
     type: code
     start: 0xBBF1E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_13_0_header]
-    - [auto, c, jan_13_1_main]
-    - [auto, c, jan_13_2_puzzle]
-    - [auto, c, jan_13_3_trees]
-    - [auto, c, jan_13_4_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, puzzle]
+    - [auto, c, trees]
+    - [auto, c, entity]
   - name: jan_14
     dir: world/area_jan/jan_14
     type: code
     start: 0xBC2A80
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_14_0_header]
-    - [auto, c, jan_14_1_main]
-    - [auto, c, jan_14_2_vines]
-    - [auto, c, jan_14_3_trees]
-    - [auto, c, jan_14_4_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, trees]
+    - [auto, c, npc]
   - name: jan_15
     dir: world/area_jan/jan_15
     type: code
     start: 0xBC6350
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_15_0_header]
-    - [auto, c, jan_15_1_main]
-    - [auto, c, jan_15_2_npc]
-    - [auto, c, jan_15_3_trees]
-    - [auto, c, jan_15_4_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, trees]
+    - [auto, c, entity]
   - name: jan_16
     dir: world/area_jan/jan_16
     type: code
     start: 0xBC8A30
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_16_0_header]
-    - [auto, c, jan_16_1_music]
-    - [auto, c, jan_16_2_main]
-    - [auto, c, jan_16_3_npc]
-    - [auto, c, jan_16_4_entity]
-    - [auto, c, jan_16_5_bushes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, bushes]
   - name: jan_17
     dir: world/area_jan/jan_17
     type: code
     start: 0xBCC1F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_17_0_header]
-    - [auto, c, jan_17_1_music]
-    - [auto, c, jan_17_2_main]
-    - [auto, c, jan_17_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: jan_18
     dir: world/area_jan/jan_18
     type: code
     start: 0xBCC5C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_18_0_header]
-    - [auto, c, jan_18_1_music]
-    - [auto, c, jan_18_2_main]
-    - [auto, c, jan_18_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: jan_19
     dir: world/area_jan/jan_19
     type: code
     start: 0xBCC890
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_19_0_header]
-    - [auto, c, jan_19_1_music]
-    - [auto, c, jan_19_2_main]
-    - [auto, c, jan_19_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: jan_22
     dir: world/area_jan/jan_22
     type: code
     start: 0xBCCBB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_22_0_header]
-    - [auto, c, jan_22_1_music]
-    - [auto, c, jan_22_2_main]
-    - [auto, c, jan_22_3_npc]
-    - [auto, c, jan_22_4_entity]
-    - [auto, c, jan_22_5_zipline]
-    - [auto, c, jan_22_6_bushes]
-    - [auto, c, jan_22_7_trees]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, zipline]
+    - [auto, c, bushes]
+    - [auto, c, trees]
   - name: jan_23
     dir: world/area_jan/jan_23
     type: code
     start: 0xBD8700
     vram: 0x80240000
     subsegments:
-    - [auto, c, jan_23_0_header]
-    - [auto, c, jan_23_1_music]
-    - [auto, c, jan_23_2_main]
-    - [auto, c, jan_23_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: mim_01
     dir: world/area_mim/mim_01
     type: code
     start: 0xBDBE70
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_01_0_header]
-    - [auto, c, mim_01_1_music]
-    - [auto, c, mim_01_2_main]
-    - [auto, c, mim_01_3_entity]
-    - [auto, c, mim_01_4_hint]
-    - [auto, c, mim_01_5_gate]
-    - [auto, c, mim_01_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_02
     dir: world/area_mim/mim_02
     type: code
     start: 0xBE0630
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_02_0_header]
-    - [auto, c, mim_02_1_music]
-    - [auto, c, mim_02_2_main]
-    - [auto, c, mim_02_3_npc]
-    - [auto, c, mim_02_4_gate]
-    - [auto, c, mim_02_5_hint]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, gate]
+    - [auto, c, hint]
   - name: mim_03
     dir: world/area_mim/mim_03
     type: code
     start: 0xBE3EB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_03_0_header]
-    - [auto, c, mim_03_1_music]
-    - [auto, c, mim_03_2_main]
-    - [auto, c, mim_03_3_entity]
-    - [auto, c, mim_03_4_hint]
-    - [auto, c, mim_03_5_gate]
-    - [auto, c, mim_03_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_04
     dir: world/area_mim/mim_04
     type: code
     start: 0xBE6390
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_04_0_header]
-    - [auto, c, mim_04_1_music]
-    - [auto, c, mim_04_2_main]
-    - [auto, c, mim_04_3_entity]
-    - [auto, c, mim_04_4_hint]
-    - [auto, c, mim_04_5_gate]
-    - [auto, c, mim_04_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_05
     dir: world/area_mim/mim_05
     type: code
     start: 0xBE9160
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_05_0_header]
-    - [auto, c, mim_05_1_music]
-    - [auto, c, mim_05_2_main]
-    - [auto, c, mim_05_3_entity]
-    - [auto, c, mim_05_4_hint]
-    - [auto, c, mim_05_5_gate]
-    - [auto, c, mim_05_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_06
     dir: world/area_mim/mim_06
     type: code
     start: 0xBED1B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_06_0_header]
-    - [auto, c, mim_06_1_music]
-    - [auto, c, mim_06_2_main]
-    - [auto, c, mim_06_3_entity]
-    - [auto, c, mim_06_4_hint]
-    - [auto, c, mim_06_5_gate]
-    - [auto, c, mim_06_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_07
     dir: world/area_mim/mim_07
     type: code
     start: 0xBF2B70
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_07_0_header]
-    - [auto, c, mim_07_1_music]
-    - [auto, c, mim_07_2_main]
-    - [auto, c, mim_07_3_entity]
-    - [auto, c, mim_07_4_hint]
-    - [auto, c, mim_07_5_gate]
-    - [auto, c, mim_07_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_08
     dir: world/area_mim/mim_08
     type: code
     start: 0xBF6370
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_08_0_header]
-    - [auto, c, mim_08_1_music]
-    - [auto, c, mim_08_2_main]
-    - [auto, c, mim_08_3_entity]
-    - [auto, c, mim_08_4_gate]
-    - [auto, c, mim_08_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_09
     dir: world/area_mim/mim_09
     type: code
     start: 0xBFB830
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_09_0_header]
-    - [auto, c, mim_09_1_music]
-    - [auto, c, mim_09_2_main]
-    - [auto, c, mim_09_3_entity]
-    - [auto, c, mim_09_4_hint]
-    - [auto, c, mim_09_5_gate]
-    - [auto, c, mim_09_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_10
     dir: world/area_mim/mim_10
     type: code
     start: 0xBFE410
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_10_0_header]
-    - [auto, c, mim_10_1_music]
-    - [auto, c, mim_10_2_entity]
-    - [auto, c, mim_10_3_main]
-    - [auto, c, mim_10_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: mim_11
     dir: world/area_mim/mim_11
     type: code
     start: 0xBFFAA0
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_11_0_header]
-    - [auto, c, mim_11_1_music]
-    - [auto, c, mim_11_2_main]
-    - [auto, c, mim_11_3_gate]
-    - [auto, c, mim_11_4_entity]
-    - [auto, c, mim_11_5_npc]
-    - [auto, c, mim_11_6_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gate]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: mim_12
     dir: world/area_mim/mim_12
     type: code
     start: 0xC03DB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, mim_12_0_header]
-    - [auto, c, mim_12_1_music]
-    - [auto, c, mim_12_2_entity]
-    - [auto, c, mim_12_3_main]
-    - [auto, c, mim_12_4_npc]
-    - [auto, c, mim_12_5_gate]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, gate]
   - name: obk_01
     dir: world/area_obk/obk_01
     type: code
     start: 0xC05BD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_01_0_header]
-    - [auto, c, obk_01_1_music]
-    - [auto, c, obk_01_2_main]
-    - [auto, c, obk_01_3_chandelier]
-    - [auto, c, obk_01_4_portrait]
-    - [auto, c, obk_01_5_jump_scare]
-    - [auto, c, obk_01_6_npc]
-    - [auto, c, obk_01_7_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, chandelier]
+    - [auto, c, portrait]
+    - [auto, c, jump_scare]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: obk_02
     dir: world/area_obk/obk_02
     type: code
     start: 0xC0B4C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_02_0_header]
-    - [auto, c, obk_02_1_music]
-    - [auto, c, obk_02_2_main]
-    - [auto, c, obk_02_3_npc]
-    - [auto, c, obk_02_4_bombable]
-    - [auto, c, obk_02_5_clock]
-    - [auto, c, obk_02_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, bombable]
+    - [auto, c, clock]
+    - [auto, c, entity]
   - name: obk_03
     dir: world/area_obk/obk_03
     type: code
     start: 0xC0CCB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_03_0_header]
-    - [auto, c, obk_03_1_music]
-    - [auto, c, obk_03_2_main]
-    - [auto, c, obk_03_3_shop]
-    - [auto, c, obk_03_4_entity]
-    - [auto, c, obk_03_5_stairs]
-    - [auto, c, obk_03_6_npc]
-    - [auto, c, obk_03_7_rocking_chair]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, shop]
+    - [auto, c, entity]
+    - [auto, c, stairs]
+    - [auto, c, npc]
+    - [auto, c, rocking_chair]
   - name: obk_04
     dir: world/area_obk/obk_04
     type: code
     start: 0xC10890
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_04_0_header]
-    - [auto, c, obk_04_1_music]
-    - [auto, c, obk_04_2_entity]
-    - [auto, c, obk_04_3_npc]
-    - [auto, c, obk_04_4_main]
-    - [auto, c, obk_04_5_hole]
-    - [auto, c, obk_04_6_game]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, main]
+    - [auto, c, hole]
+    - [auto, c, game]
   - name: obk_05
     dir: world/area_obk/obk_05
     type: code
     start: 0xC15A90
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_05_0_header]
-    - [auto, c, obk_05_1_music]
-    - [auto, c, obk_05_2_main]
-    - [auto, c, obk_05_3_rocking_chair]
-    - [auto, c, obk_05_4_hole]
-    - [auto, c, obk_05_5_npc]
-    - [auto, c, obk_05_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rocking_chair]
+    - [auto, c, hole]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: obk_06
     dir: world/area_obk/obk_06
     type: code
     start: 0xC170C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_06_0_header]
-    - [auto, c, obk_06_1_music]
-    - [auto, c, obk_06_2_main]
-    - [auto, c, obk_06_3_bombable]
-    - [auto, c, obk_06_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bombable]
+    - [auto, c, entity]
   - name: obk_07
     dir: world/area_obk/obk_07
     type: code
     start: 0xC17620
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_07_0_header]
-    - [auto, c, obk_07_1_music]
-    - [auto, c, obk_07_2_main]
-    - [auto, c, obk_07_3_entity]
-    - [auto, c, obk_07_4_fireplace]
-    - [auto, c, obk_07_5_npc]
-    - [auto, c, obk_07_6_phonograph]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, fireplace]
+    - [auto, c, npc]
+    - [auto, c, phonograph]
   - name: obk_08
     dir: world/area_obk/obk_08
     type: code
     start: 0xC1C2A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_08_0_header]
-    - [auto, c, obk_08_1_music]
-    - [auto, c, obk_08_2_main]
-    - [auto, c, obk_08_3_cabinets]
-    - [auto, c, obk_08_4_entity]
-    - [auto, c, obk_08_5_npc]
-    - [auto, c, obk_08_6_game]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, cabinets]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, game]
   - name: obk_09
     dir: world/area_obk/obk_09
     type: code
     start: 0xC231E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, obk_09_0_header]
-    - [auto, c, obk_09_1_music]
-    - [auto, c, obk_09_2_main]
-    - [auto, c, obk_09_3_meet_bow]
-    - [auto, c, obk_09_4_npc]
-    - [auto, c, obk_09_5_new_partner]
-    - [auto, c, obk_09_6_epilogue]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, meet_bow]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
+    - [auto, c, epilogue]
   - name: arn_02
     dir: world/area_arn/arn_02
     type: code
     start: 0xC25BE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_02_0_header]
-    - [auto, c, arn_02_1_music]
-    - [auto, c, arn_02_2_main]
-    - [auto, c, arn_02_3_entity]
-    - [auto, c, arn_02_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: arn_03
     dir: world/area_arn/arn_03
     type: code
     start: 0xC277C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_03_0_header]
-    - [auto, c, arn_03_1_music]
-    - [auto, c, arn_03_2_main]
-    - [auto, c, arn_03_3_npc]
-    - [auto, c, arn_03_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_04
     dir: world/area_arn/arn_04
     type: code
     start: 0xC2C1E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_04_0_header]
-    - [auto, c, arn_04_1_music]
-    - [auto, c, arn_04_2_main]
-    - [auto, c, arn_04_3_npc]
-    - [auto, c, arn_04_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_05
     dir: world/area_arn/arn_05
     type: code
     start: 0xC30610
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_05_0_header]
-    - [auto, c, arn_05_1_music]
-    - [auto, c, arn_05_2_main]
-    - [auto, c, arn_05_3_npc]
-    - [auto, c, arn_05_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_07
     dir: world/area_arn/arn_07
     type: code
     start: 0xC35820
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_07_0_header]
-    - [auto, c, arn_07_1_music]
-    - [auto, c, arn_07_2_main]
-    - [auto, c, arn_07_3_windmill]
-    - [auto, c, arn_07_4_entity]
-    - [auto, c, arn_07_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, windmill]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: arn_08
     dir: world/area_arn/arn_08
     type: code
     start: 0xC3D1D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_08_0_header]
-    - [auto, c, arn_08_1_music]
-    - [auto, c, arn_08_2_main]
-    - [auto, c, arn_08_3_well]
-    - [auto, c, arn_08_4_gears]
-    - [auto, c, arn_08_5_demo]
-    - [auto, c, arn_08_6_npc]
-    - [auto, c, arn_08_7_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, well]
+    - [auto, c, gears]
+    - [auto, c, demo]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_09
     dir: world/area_arn/arn_09
     type: code
     start: 0xC3EA90
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_09_0_header]
-    - [auto, c, arn_09_1_music]
-    - [auto, c, arn_09_2_main]
-    - [auto, c, arn_09_3_entity]
-    - [auto, c, arn_09_4_launch]
-    - [auto, c, arn_09_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, launch]
+    - [auto, c, npc]
   - name: arn_10
     dir: world/area_arn/arn_10
     type: code
     start: 0xC3F430
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_10_0_header]
-    - [auto, c, arn_10_1_music]
-    - [auto, c, arn_10_2_main]
-    - [auto, c, arn_10_3_npc]
-    - [auto, c, arn_10_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_11
     dir: world/area_arn/arn_11
     type: code
     start: 0xC400B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_11_0_header]
-    - [auto, c, arn_11_1_music]
-    - [auto, c, arn_11_2_main]
-    - [auto, c, arn_11_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: arn_12
     dir: world/area_arn/arn_12
     type: code
     start: 0xC411C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_12_0_header]
-    - [auto, c, arn_12_1_music]
-    - [auto, c, arn_12_2_main]
-    - [auto, c, arn_12_3_npc]
-    - [auto, c, arn_12_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_13
     dir: world/area_arn/arn_13
     type: code
     start: 0xC41E40
     vram: 0x80240000
     subsegments:
-    - [auto, c, arn_13_0_header]
-    - [auto, c, arn_13_1_music]
-    - [auto, c, arn_13_2_main]
-    - [auto, c, arn_13_3_npc]
-    - [auto, c, arn_13_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_00
     dir: world/area_dgb/dgb_00
     type: code
     start: 0xC42AD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_00_0_header]
-    - [auto, c, dgb_00_1_music]
-    - [auto, c, dgb_00_2_main]
-    - [auto, c, dgb_00_3_npc]
-    - [auto, c, dgb_00_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_01
     dir: world/area_dgb/dgb_01
     type: code
     start: 0xC462B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_01_0_header]
-    - [auto, c, dgb_01_1_music]
-    - [auto, c, dgb_01_2_main]
-    - [auto, c, dgb_01_3_bridges]
-    - [auto, c, dgb_01_4_entity]
-    - [auto, c, dgb_01_5_npc]
-    - [auto, c, dgb_01_6_img0]
-    - [auto, c, dgb_01_6_img1]
-    - [auto, c, dgb_01_6_img2]
-    - [auto, c, dgb_01_6_img3]
-    - [auto, c, dgb_01_6_img4]
-    - [auto, c, dgb_01_6_img5]
-    - [auto, c, dgb_01_6_img6]
-    - [auto, c, dgb_01_6_img7]
-    - [auto, c, dgb_01_7]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bridges]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, img0]
+    - [auto, c, img1]
+    - [auto, c, img2]
+    - [auto, c, img3]
+    - [auto, c, img4]
+    - [auto, c, img5]
+    - [auto, c, img6]
+    - [auto, c, img7]
+    - [auto, c, gfx]
     - start: 0xC4D220
       type: .data
-      name: dgb_01_6_img0
+      name: img0
       subsegments:
       - [0xC4D220, rgba16, img0, 64, 32]
       - [0xC4E220, gfx, img0]
     - start: 0xC4E2A0
       type: .data
-      name: dgb_01_6_img1
+      name: img1
       subsegments:
       - [0xC4E2A0, rgba16, img1, 64, 32]
       - [0xC4F2A0, gfx, img1]
     - start: 0xC4F320
       type: .data
-      name: dgb_01_6_img2
+      name: img2
       subsegments:
       - [0xC4F320, rgba16, img2, 32, 32]
       - [0xC4FB20, gfx, img2]
     - start: 0xC4FBA0
       type: .data
-      name: dgb_01_6_img3
+      name: img3
       subsegments:
       - [0xC4FBA0, rgba16, img3, 16, 32]
       - [0xC4FFA0, gfx, img3]
     - start: 0xC50020
       type: .data
-      name: dgb_01_6_img4
+      name: img4
       subsegments:
       - [0xC50020, rgba16, img4, 16, 32]
       - [0xC50420, gfx, img4]
     - start: 0xC504A0
       type: .data
-      name: dgb_01_6_img5
+      name: img5
       subsegments:
       - [0xC504A0, rgba16, img5, 16, 32]
       - [0xC508A0, gfx, img5]
     - start: 0xC50920
       type: .data
-      name: dgb_01_6_img6
+      name: img6
       subsegments:
       - [0xC50920, rgba16, img6, 32, 32]
       - [0xC51120, gfx, img6]
     - start: 0xC511A0
       type: .data
-      name: dgb_01_6_img7
+      name: img7
       subsegments:
       - [0xC511A0, rgba16, img7, 32, 32]
       - [0xC519A0, gfx, img7]
-    - [0xC51A20, .data, dgb_01_7] # TODO needs additioanl cleanup and gfx splitting
+    - [0xC51A20, .data, gfx] # TODO needs additioanl cleanup and gfx splitting
     - [0xC696A0]
   - name: dgb_01_smash_bridges # DMAd at the beginning of tubba blubba's castle (bridge cutscene)
     type: code
@@ -11275,10 +11275,10 @@ segments:
     start: 0xC69970
     vram: 0x80200000
     subsegments:
-    - [auto, c, dgb_01_smash_bridges]
+    - [auto, c, smash_bridges]
     - start: 0xC69970
       type: .data
-      name: dgb_01_smash_bridges
+      name: smash_bridges
       subsegments:
       - [0xC69970, vtx, vtx/C20F40]
       - [0xC69B30, vtx, vtx/C21100]
@@ -11576,333 +11576,333 @@ segments:
     start: 0xC775D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_02_0_header]
-    - [auto, c, dgb_02_1_music]
-    - [auto, c, dgb_02_2_main]
-    - [auto, c, dgb_02_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: dgb_03
     dir: world/area_dgb/dgb_03
     type: code
     start: 0xC79F10
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_03_0_header]
-    - [auto, c, dgb_03_1_music]
-    - [auto, c, dgb_03_2_main]
-    - [auto, c, dgb_03_3_clock]
-    - [auto, c, dgb_03_4_entity]
-    - [auto, c, dgb_03_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, clock]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_04
     dir: world/area_dgb/dgb_04
     type: code
     start: 0xC7EF60
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_04_0_header]
-    - [auto, c, dgb_04_1_music]
-    - [auto, c, dgb_04_2_main]
-    - [auto, c, dgb_04_3_npc]
-    - [auto, c, dgb_04_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_05
     dir: world/area_dgb/dgb_05
     type: code
     start: 0xC83440
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_05_0_header]
-    - [auto, c, dgb_05_1_music]
-    - [auto, c, dgb_05_2_main]
-    - [auto, c, dgb_05_3_hole]
-    - [auto, c, dgb_05_4_entity]
-    - [auto, c, dgb_05_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, hole]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_06
     dir: world/area_dgb/dgb_06
     type: code
     start: 0xC85AB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_06_0_header]
-    - [auto, c, dgb_06_1_music]
-    - [auto, c, dgb_06_2_main]
-    - [auto, c, dgb_06_3_entity]
-    - [auto, c, dgb_06_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_07
     dir: world/area_dgb/dgb_07
     type: code
     start: 0xC86620
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_07_0_header]
-    - [auto, c, dgb_07_1_music]
-    - [auto, c, dgb_07_2_main]
-    - [auto, c, dgb_07_3_entity]
-    - [auto, c, dgb_07_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_08
     dir: world/area_dgb/dgb_08
     type: code
     start: 0xC887E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_08_0_header]
-    - [auto, c, dgb_08_1_music]
-    - [auto, c, dgb_08_2_main]
-    - [auto, c, dgb_08_3_npc]
-    - [auto, c, dgb_08_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_09
     dir: world/area_dgb/dgb_09
     type: code
     start: 0xC8F610
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_09_0_header]
-    - [auto, c, dgb_09_1_music]
-    - [auto, c, dgb_09_2_main]
-    - [auto, c, dgb_09_3_breakable]
-    - [auto, c, dgb_09_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, breakable]
+    - [auto, c, npc]
   - name: dgb_10
     dir: world/area_dgb/dgb_10
     type: code
     start: 0xC94DC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_10_0_header]
-    - [auto, c, dgb_10_1_music]
-    - [auto, c, dgb_10_2_main]
-    - [auto, c, dgb_10_3_hole]
-    - [auto, c, dgb_10_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, hole]
+    - [auto, c, entity]
   - name: dgb_11
     dir: world/area_dgb/dgb_11
     type: code
     start: 0xC95E10
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_11_0_header]
-    - [auto, c, dgb_11_1_music]
-    - [auto, c, dgb_11_2_main]
-    - [auto, c, dgb_11_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: dgb_12
     dir: world/area_dgb/dgb_12
     type: code
     start: 0xC96920
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_12_0_header]
-    - [auto, c, dgb_12_1_music]
-    - [auto, c, dgb_12_2_main]
-    - [auto, c, dgb_12_3_spikes]
-    - [auto, c, dgb_12_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, spikes]
+    - [auto, c, entity]
   - name: dgb_13
     dir: world/area_dgb/dgb_13
     type: code
     start: 0xC97390
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_13_0_header]
-    - [auto, c, dgb_13_1_music]
-    - [auto, c, dgb_13_2_main]
-    - [auto, c, dgb_13_3_entity]
-    - [auto, c, dgb_13_4_drawer]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, drawer]
   - name: dgb_14
     dir: world/area_dgb/dgb_14
     type: code
     start: 0xC97A60
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_14_0_header]
-    - [auto, c, dgb_14_1_music]
-    - [auto, c, dgb_14_2_main]
-    - [auto, c, dgb_14_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: dgb_15
     dir: world/area_dgb/dgb_15
     type: code
     start: 0xC97F40
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_15_0_header]
-    - [auto, c, dgb_15_1_music]
-    - [auto, c, dgb_15_2_main]
-    - [auto, c, dgb_15_3_npc]
-    - [auto, c, dgb_15_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_16
     dir: world/area_dgb/dgb_16
     type: code
     start: 0xC9AF70
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_16_0_header]
-    - [auto, c, dgb_16_1_music]
-    - [auto, c, dgb_16_2_main]
-    - [auto, c, dgb_16_3_entity]
-    - [auto, c, dgb_16_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_17
     dir: world/area_dgb/dgb_17
     type: code
     start: 0xC9E490
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_17_0_header]
-    - [auto, c, dgb_17_1_music]
-    - [auto, c, dgb_17_2_main]
-    - [auto, c, dgb_17_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: dgb_18
     dir: world/area_dgb/dgb_18
     type: code
     start: 0xC9E970
     vram: 0x80240000
     subsegments:
-    - [auto, c, dgb_18_0_header]
-    - [auto, c, dgb_18_1_music]
-    - [auto, c, dgb_18_2_main]
-    - [auto, c, dgb_18_3_npc]
-    - [auto, c, dgb_18_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kzn_01
     dir: world/area_kzn/kzn_01
     type: code
     start: 0xCA2400
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_01_0_header]
-    - [auto, c, kzn_01_1_main]
-    - [auto, c, kzn_01_2_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kzn_02
     dir: world/area_kzn/kzn_02
     type: code
     start: 0xCA3170
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_02_0_header]
-    - [auto, c, kzn_02_1_main]
-    - [auto, c, kzn_02_2_platforms]
-    - [auto, c, kzn_02_3_npc]
-    - [auto, c, kzn_02_4_demo]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, platforms]
+    - [auto, c, npc]
+    - [auto, c, demo]
   - name: kzn_03
     dir: world/area_kzn/kzn_03
     type: code
     start: 0xCA9740
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_03_0_header]
-    - [auto, c, kzn_03_1_main]
-    - [auto, c, kzn_03_2_npc]
-    - [auto, c, kzn_03_3_entity]
-    - [auto, c, kzn_03_4_ziplines]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, ziplines]
   - name: kzn_04
     dir: world/area_kzn/kzn_04
     type: code
     start: 0xCB0B60
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_04_0_header]
-    - [auto, c, kzn_04_1_main]
-    - [auto, c, kzn_04_2_entity]
-    - [auto, c, kzn_04_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kzn_05
     dir: world/area_kzn/kzn_05
     type: code
     start: 0xCB4B00
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_05_0_header]
-    - [auto, c, kzn_05_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kzn_06
     dir: world/area_kzn/kzn_06
     type: code
     start: 0xCB5350
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_06_0_header]
-    - [auto, c, kzn_06_1_main]
-    - [auto, c, kzn_06_2_entity]
-    - [auto, c, kzn_06_3_extra]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, extra]
   - name: kzn_07
     dir: world/area_kzn/kzn_07
     type: code
     start: 0xCB6D60
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_07_0_header]
-    - [auto, c, kzn_07_1_music]
-    - [auto, c, kzn_07_2_main]
-    - [auto, c, kzn_07_3_entity]
-    - [auto, c, kzn_07_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kzn_08
     dir: world/area_kzn/kzn_08
     type: code
     start: 0xCB9EB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_08_0_header]
-    - [auto, c, kzn_08_1_main]
-    - [auto, c, kzn_08_2_entity]
-    - [auto, c, kzn_08_3_npc]
-    - [auto, c, kzn_08_4_extra]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, extra]
   - name: kzn_09
     dir: world/area_kzn/kzn_09
     type: code
     start: 0xCBF710
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_09_0_header]
-    - [auto, c, kzn_09_1_main]
-    - [auto, c, kzn_09_2_entity]
-    - [auto, c, kzn_09_3_zipline]
-    - [auto, c, kzn_09_4_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, zipline]
+    - [auto, c, npc]
   - name: kzn_10
     dir: world/area_kzn/kzn_10
     type: code
     start: 0xCC6BB0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_10_0_header]
-    - [auto, c, kzn_10_1_main]
-    - [auto, c, kzn_10_2_tromp]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, tromp]
   - name: kzn_11
     dir: world/area_kzn/kzn_11
     type: code
     start: 0xCC8BD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_11_0_header]
-    - [auto, c, kzn_11_1_main]
-    - [auto, c, kzn_11_2_platforms]
-    - [auto, c, kzn_11_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, platforms]
+    - [auto, c, npc]
   - name: kzn_17
     dir: world/area_kzn/kzn_17
     type: code
     start: 0xCCE4E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_17_0_header]
-    - [auto, c, kzn_17_1_main]
-    - [auto, c, kzn_17_2_entity]
-    - [auto, c, kzn_17_3_npc]
-    - [auto, c, kzn_17_4_tromp]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, tromp]
   - name: kzn_18
     dir: world/area_kzn/kzn_18
     type: code
     start: 0xCD4AD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_18_0_header]
-    - [auto, c, kzn_18_1_main]
-    - [auto, c, kzn_18_2_npc]
-    - [auto, c, kzn_18_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kzn_19
     dir: world/area_kzn/kzn_19
     type: code
     start: 0xCD65E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_19_0_header]
-    - [auto, c, kzn_19_1_music]
-    - [auto, c, kzn_19_2_main]
-    - [auto, c, kzn_19_3_npc_settings]
-    - [auto, c, kzn_19_4_npc]
-    - [auto, c, kzn_19_5_eruption]
-    - [auto, c, kzn_19_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc_settings]
+    - [auto, c, npc]
+    - [auto, c, eruption]
+    - [auto, c, entity]
     - start: 0xCD9620
       type: .data
-      name: kzn_19_4_npc
+      name: npc
       subsegments:
       - [0xCD9620]
       - [0xCD9AB8, ci4, ../../lava_piranha/vine, 64, 32]
@@ -11915,337 +11915,337 @@ segments:
     start: 0xCDE960
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_20_0_header]
-    - [auto, c, kzn_20_1_music]
-    - [auto, c, kzn_20_2_main]
-    - [auto, c, kzn_20_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kzn_22
     dir: world/area_kzn/kzn_22
     type: code
     start: 0xCE2C30
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_22_0_header]
-    - [auto, c, kzn_22_1_music]
-    - [auto, c, kzn_22_2_main]
-    - [auto, c, kzn_22_3_entity]
-    - [auto, c, kzn_22_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kzn_23
     dir: world/area_kzn/kzn_23
     type: code
     start: 0xCE4D30
     vram: 0x80240000
     subsegments:
-    - [auto, c, kzn_23_0_header]
-    - [auto, c, kzn_23_1_music]
-    - [auto, c, kzn_23_2_main]
-    - [auto, c, kzn_23_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: flo_00
     dir: world/area_flo/flo_00
     type: code
     start: 0xCE6950
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_00_0_header]
-    - [auto, c, flo_00_1_music]
-    - [auto, c, flo_00_2_main]
-    - [auto, c, flo_00_3_npc]
-    - [auto, c, flo_00_4_epilogue]
-    - [auto, c, flo_00_5_beanstalk]
-    - [auto, c, flo_00_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, epilogue]
+    - [auto, c, beanstalk]
+    - [auto, c, entity]
   - name: flo_03
     dir: world/area_flo/flo_03
     type: code
     start: 0xCEFCD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_03_0_header]
-    - [auto, c, flo_03_1_music]
-    - [auto, c, flo_03_2_main]
-    - [auto, c, flo_03_3_npc]
-    - [auto, c, flo_03_4_foliage]
-    - [auto, c, flo_03_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: flo_07
     dir: world/area_flo/flo_07
     type: code
     start: 0xCF4C20
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_07_0_header]
-    - [auto, c, flo_07_1_music]
-    - [auto, c, flo_07_2_main]
-    - [auto, c, flo_07_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: flo_08
     dir: world/area_flo/flo_08
     type: code
     start: 0xCF7770
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_08_0_header]
-    - [auto, c, flo_08_1_music]
-    - [auto, c, flo_08_2_entity]
-    - [auto, c, flo_08_3_main]
-    - [auto, c, flo_08_4_npc]
-    - [auto, c, flo_08_5_foliage]
-    - [auto, c, flo_08_6_vines]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, vines]
   - name: flo_09
     dir: world/area_flo/flo_09
     type: code
     start: 0xCFDA30
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_09_0_header]
-    - [auto, c, flo_09_1_music]
-    - [auto, c, flo_09_2_main]
-    - [auto, c, flo_09_3_vines]
-    - [auto, c, flo_09_4_foliage]
-    - [auto, c, flo_09_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, foliage]
+    - [auto, c, npc]
   - name: flo_10
     dir: world/area_flo/flo_10
     type: code
     start: 0xD01C30
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_10_0_header]
-    - [auto, c, flo_10_1_music]
-    - [auto, c, flo_10_2_entity]
-    - [auto, c, flo_10_3_main]
-    - [auto, c, flo_10_4_fountain]
-    - [auto, c, flo_10_5_npc]
-    - [auto, c, flo_10_6_waterfx]
-    - [auto, c, flo_10_7_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, fountain]
+    - [auto, c, npc]
+    - [auto, c, waterfx]
+    - [auto, c, foliage]
   - name: flo_11
     dir: world/area_flo/flo_11
     type: code
     start: 0xD06700
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_11_0_header]
-    - [auto, c, flo_11_1_music]
-    - [auto, c, flo_11_2_main]
-    - [auto, c, flo_11_3_npc]
-    - [auto, c, flo_11_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: flo_12
     dir: world/area_flo/flo_12
     type: code
     start: 0xD09860
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_12_0_header]
-    - [auto, c, flo_12_1_music]
-    - [auto, c, flo_12_2_main]
-    - [auto, c, flo_12_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: flo_13
     dir: world/area_flo/flo_13
     type: code
     start: 0xD0C240
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_13_0_header]
-    - [auto, c, flo_13_1_music]
-    - [auto, c, flo_13_2_entity]
-    - [auto, c, flo_13_3_main]
-    - [auto, c, flo_13_4_npc]
-    - [auto, c, flo_13_5_new_partner]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
   - name: flo_14
     dir: world/area_flo/flo_14
     type: code
     start: 0xD13D40
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_14_0_header]
-    - [auto, c, flo_14_1_music]
-    - [auto, c, flo_14_2_main]
-    - [auto, c, flo_14_3_bubbles]
-    - [auto, c, flo_14_4_npc]
-    - [auto, c, flo_14_5_entity]
-    - [auto, c, flo_14_6_logs]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bubbles]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, logs]
   - name: flo_15
     dir: world/area_flo/flo_15
     type: code
     start: 0xD190F0
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_15_0_header]
-    - [auto, c, flo_15_1_music]
-    - [auto, c, flo_15_2_main]
-    - [auto, c, flo_15_3_npc]
-    - [auto, c, flo_15_4_entity]
-    - [auto, c, flo_15_5_stairs]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, stairs]
   - name: flo_16
     dir: world/area_flo/flo_16
     type: code
     start: 0xD1A860
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_16_0_header]
-    - [auto, c, flo_16_1_music]
-    - [auto, c, flo_16_2_main]
-    - [auto, c, flo_16_3_vines]
-    - [auto, c, flo_16_4_entity]
-    - [auto, c, flo_16_5_npc]
-    - [auto, c, flo_16_6_puzzle]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, puzzle]
   - name: flo_17
     dir: world/area_flo/flo_17
     type: code
     start: 0xD1FD10
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_17_0_header]
-    - [auto, c, flo_17_1_music]
-    - [auto, c, flo_17_2_main]
-    - [auto, c, flo_17_3_logs]
-    - [auto, c, flo_17_4_npc]
-    - [auto, c, flo_17_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, logs]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: flo_18
     dir: world/area_flo/flo_18
     type: code
     start: 0xD250D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_18_0_header]
-    - [auto, c, flo_18_1_music]
-    - [auto, c, flo_18_2_main]
-    - [auto, c, flo_18_3_machine]
-    - [auto, c, flo_18_4_npc]
-    - [auto, c, flo_18_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, machine]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: flo_19
     dir: world/area_flo/flo_19
     type: code
     start: 0xD2C120
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_19_0_header]
-    - [auto, c, flo_19_1_music]
-    - [auto, c, flo_19_2_entity]
-    - [auto, c, flo_19_3_main]
-    - [auto, c, flo_19_4_clouds]
-    - [auto, c, flo_19_5_beanstalk]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, clouds]
+    - [auto, c, beanstalk]
   - name: flo_21
     dir: world/area_flo/flo_21
     type: code
     start: 0xD2F130
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_21_0_header]
-    - [auto, c, flo_21_1_music]
-    - [auto, c, flo_21_2_main]
-    - [auto, c, flo_21_3_clouds]
-    - [auto, c, flo_21_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, clouds]
+    - [auto, c, npc]
   - name: flo_22
     dir: world/area_flo/flo_22
     type: code
     start: 0xD34C70
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_22_0_header]
-    - [auto, c, flo_22_1_music]
-    - [auto, c, flo_22_2_main]
-    - [auto, c, flo_22_3_npc]
-    - [auto, c, flo_22_4_well]
-    - [auto, c, flo_22_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, well]
+    - [auto, c, foliage]
   - name: flo_23
     dir: world/area_flo/flo_23
     type: code
     start: 0xD36C90
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_23_0_header]
-    - [auto, c, flo_23_1_music]
-    - [auto, c, flo_23_2_main]
-    - [auto, c, flo_23_3_npc]
-    - [auto, c, flo_23_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: flo_24
     dir: world/area_flo/flo_24
     type: code
     start: 0xD39370
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_24_0_header]
-    - [auto, c, flo_24_1_music]
-    - [auto, c, flo_24_2_main]
-    - [auto, c, flo_24_3_foliage]
-    - [auto, c, flo_24_4_water]
-    - [auto, c, flo_24_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, foliage]
+    - [auto, c, water]
+    - [auto, c, entity]
   - name: flo_25
     dir: world/area_flo/flo_25
     type: code
     start: 0xD3B600
     vram: 0x80240000
     subsegments:
-    - [auto, c, flo_25_0_header]
-    - [auto, c, flo_25_1_music]
-    - [auto, c, flo_25_2_main]
-    - [auto, c, flo_25_3_npc]
-    - [auto, c, flo_25_4_entity]
-    - [auto, c, flo_25_5_foliage]
-    - [auto, c, flo_25_6_vine]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
+    - [auto, c, vine]
   - name: sam_01
     dir: world/area_sam/sam_01
     type: code
     start: 0xD405A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_01_0_header]
-    - [auto, c, sam_01_1_music]
-    - [auto, c, sam_01_2_main]
-    - [auto, c, sam_01_3_rooms]
-    - [auto, c, sam_01_4_npc]
-    - [auto, c, sam_01_5_scenes]
-    - [auto, c, sam_01_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, npc]
+    - [auto, c, scenes]
+    - [auto, c, entity]
   - name: sam_02
     dir: world/area_sam/sam_02
     type: code
     start: 0xD4E160
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_02_0_header]
-    - [auto, c, sam_02_1_music]
-    - [auto, c, sam_02_2_main]
-    - [auto, c, sam_02_3_rooms]
-    - [auto, c, sam_02_4_npc]
-    - [auto, c, sam_02_5_entity]
-    - [auto, c, sam_02_6_shop]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, shop]
   - name: sam_03
     dir: world/area_sam/sam_03
     type: code
     start: 0xD59AF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_03_0_header]
-    - [auto, c, sam_03_1_music]
-    - [auto, c, sam_03_2_main]
-    - [auto, c, sam_03_3_npc1]
-    - [auto, c, sam_03_4_npc2]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc1]
+    - [auto, c, npc2]
   - name: sam_04
     dir: world/area_sam/sam_04
     type: code
     start: 0xD5C000
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_04_0_header]
-    - [auto, c, sam_04_1_music]
-    - [auto, c, sam_04_2_main]
-    - [auto, c, sam_04_3_snowmen]
-    - [auto, c, sam_04_4_npc]
-    - [auto, c, sam_04_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, snowmen]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sam_05
     dir: world/area_sam/sam_05
     type: code
     start: 0xD61210
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_05_0_header]
-    - [auto, c, sam_05_1_music]
-    - [auto, c, sam_05_2_main]
-    - [auto, c, sam_05_3_entity]
-    - [auto, c, sam_05_4_npc]
-    - [auto, c, sam_05_5_scenes]
-    - [auto, c, sam_05_6_monstar_gfx]
-    - [auto, c, sam_05_7_monstar_vtx]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, scenes]
+    - [auto, c, monstar_gfx]
+    - [auto, c, monstar_vtx]
     - start: 0xD63330
       type: .data
-      name: sam_05_4_npc
+      name: npc
       subsegments:
       - [0xD63330]
       - [0xD63980, ci4, monstar, 32, 32]
@@ -12256,12 +12256,12 @@ segments:
       - [0xD641A0]
     - start: 0xD681B0
       type: .data
-      name: sam_05_6_monstar_gfx
+      name: monstar_gfx
       subsegments:
       - [0xD681B0, gfx, monstar]
     - start: 0xD682C0
       type: .data
-      name: sam_05_7_monstar_vtx
+      name: monstar_vtx
       subsegments:
       - [0xD682C0, vtx, monstar]
     - [0xD686E0]
@@ -12271,330 +12271,330 @@ segments:
     start: 0xD688C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_06_0_header]
-    - [auto, c, sam_06_1_music]
-    - [auto, c, sam_06_2_main]
-    - [auto, c, sam_06_3_rooms]
-    - [auto, c, sam_06_4_npc]
-    - [auto, c, sam_06_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sam_07
     dir: world/area_sam/sam_07
     type: code
     start: 0xD74760
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_07_0_header]
-    - [auto, c, sam_07_1_music]
-    - [auto, c, sam_07_2_main]
-    - [auto, c, sam_07_3_entity]
-    - [auto, c, sam_07_4_frozen_pit]
-    - [auto, c, sam_07_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, frozen_pit]
+    - [auto, c, npc]
   - name: sam_08
     dir: world/area_sam/sam_08
     type: code
     start: 0xD786B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_08_0_header]
-    - [auto, c, sam_08_1_music]
-    - [auto, c, sam_08_2_main]
-    - [auto, c, sam_08_3_entity]
-    - [auto, c, sam_08_4_npc]
-    - [auto, c, sam_08_5_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, scenes]
   - name: sam_09
     dir: world/area_sam/sam_09
     type: code
     start: 0xD7ED20
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_09_0_header]
-    - [auto, c, sam_09_1_music]
-    - [auto, c, sam_09_2_main]
-    - [auto, c, sam_09_3_entity]
-    - [auto, c, sam_09_4_sockets]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, sockets]
   - name: sam_10
     dir: world/area_sam/sam_10
     type: code
     start: 0xD80230
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_10_0_header]
-    - [auto, c, sam_10_1_music]
-    - [auto, c, sam_10_2_main]
-    - [auto, c, sam_10_3_entity]
-    - [auto, c, sam_10_4_stairs]
-    - [auto, c, sam_10_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, stairs]
+    - [auto, c, npc]
   - name: sam_11
     dir: world/area_sam/sam_11
     type: code
     start: 0xD83000
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_11_0_header]
-    - [auto, c, sam_11_1_music]
-    - [auto, c, sam_11_2_main]
-    - [auto, c, sam_11_3_rooms]
-    - [auto, c, sam_11_4_entity]
-    - [auto, c, sam_11_5_npc]
-    - [auto, c, sam_11_6_pond]
-    - [auto, c, sam_11_7_staircase]
-    - [auto, c, sam_11_8_pond_anim]
-    - [auto, c, sam_11_9_pond_skele]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, pond]
+    - [auto, c, staircase]
+    - [auto, c, pond_anim]
+    - [auto, c, pond_skele]
   - name: sam_12
     dir: world/area_sam/sam_12
     type: code
     start: 0xD94450
     vram: 0x80240000
     subsegments:
-    - [auto, c, sam_12_0_header]
-    - [auto, c, sam_12_1_music]
-    - [auto, c, sam_12_2_main]
-    - [auto, c, sam_12_3_npc]
-    - [auto, c, sam_12_4_scenes]
-    - [auto, c, sam_12_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, scenes]
+    - [auto, c, entity]
   - name: pra_01
     dir: world/area_pra/pra_01
     type: code
     start: 0xD95A70
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_01_0_header]
-    - [auto, c, pra_01_1_music]
-    - [auto, c, pra_01_2_main]
-    - [auto, c, pra_01_3_npc]
-    - [auto, c, pra_01_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: pra_02
     dir: world/area_pra/pra_02
     type: code
     start: 0xD98A20
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_02_0_header]
-    - [auto, c, pra_02_1_music]
-    - [auto, c, pra_02_2_main]
-    - [auto, c, pra_02_3_npc]
-    - [auto, c, pra_02_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: pra_03
     dir: world/area_pra/pra_03
     type: code
     start: 0xD9C6E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_03_0_header]
-    - [auto, c, pra_03_1_music]
-    - [auto, c, pra_03_2_main]
-    - [auto, c, pra_03_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_04
     dir: world/area_pra/pra_04
     type: code
     start: 0xD9D0C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_04_0_header]
-    - [auto, c, pra_04_1_music]
-    - [auto, c, pra_04_2_main]
-    - [auto, c, pra_04_3_entity]
-    - [auto, c, pra_04_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: pra_05
     dir: world/area_pra/pra_05
     type: code
     start: 0xD9E5E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_05_0_header]
-    - [auto, c, pra_05_1_music]
-    - [auto, c, pra_05_2_main]
-    - [auto, c, pra_05_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_06
     dir: world/area_pra/pra_06
     type: code
     start: 0xD9FE60
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_06_0_header]
-    - [auto, c, pra_06_1_music]
-    - [auto, c, pra_06_2_main]
-    - [auto, c, pra_06_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_09
     dir: world/area_pra/pra_09
     type: code
     start: 0xDA12C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_09_0_header]
-    - [auto, c, pra_09_1_music]
-    - [auto, c, pra_09_2_main]
-    - [auto, c, pra_09_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_10
     dir: world/area_pra/pra_10
     type: code
     start: 0xDA7CE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_10_0_header]
-    - [auto, c, pra_10_1_music]
-    - [auto, c, pra_10_2_main]
-    - [auto, c, pra_10_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_11
     dir: world/area_pra/pra_11
     type: code
     start: 0xDA9F30
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_11_0_header]
-    - [auto, c, pra_11_1_music]
-    - [auto, c, pra_11_2_main]
-    - [auto, c, pra_11_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_12
     dir: world/area_pra/pra_12
     type: code
     start: 0xDAB740
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_12_0_header]
-    - [auto, c, pra_12_1_music]
-    - [auto, c, pra_12_2_main]
-    - [auto, c, pra_12_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_13
     dir: world/area_pra/pra_13
     type: code
     start: 0xDAD010
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_13_0_header]
-    - [auto, c, pra_13_1_music]
-    - [auto, c, pra_13_2_main]
-    - [auto, c, pra_13_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_14
     dir: world/area_pra/pra_14
     type: code
     start: 0xDB0730
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_14_0_header]
-    - [auto, c, pra_14_1_music]
-    - [auto, c, pra_14_2_main]
-    - [auto, c, pra_14_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_15
     dir: world/area_pra/pra_15
     type: code
     start: 0xDB2240
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_15_0_header]
-    - [auto, c, pra_15_1_music]
-    - [auto, c, pra_15_2_main]
-    - [auto, c, pra_15_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_16
     dir: world/area_pra/pra_16
     type: code
     start: 0xDB2550
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_16_0_header]
-    - [auto, c, pra_16_1_music]
-    - [auto, c, pra_16_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: pra_18
     dir: world/area_pra/pra_18
     type: code
     start: 0xDB4050
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_18_0_header]
-    - [auto, c, pra_18_1_music]
-    - [auto, c, pra_18_2_main]
-    - [auto, c, pra_18_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_19
     dir: world/area_pra/pra_19
     type: code
     start: 0xDB73E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_19_0_header]
-    - [auto, c, pra_19_1_music]
-    - [auto, c, pra_19_2_main]
-    - [auto, c, pra_19_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_20
     dir: world/area_pra/pra_20
     type: code
     start: 0xDBEDD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_20_0_header]
-    - [auto, c, pra_20_1_music]
-    - [auto, c, pra_20_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: pra_21
     dir: world/area_pra/pra_21
     type: code
     start: 0xDC0950
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_21_0_header]
-    - [auto, c, pra_21_1_music]
-    - [auto, c, pra_21_2_main]
-    - [auto, c, pra_21_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_22
     dir: world/area_pra/pra_22
     type: code
     start: 0xDC12B0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_22_0_header]
-    - [auto, c, pra_22_1_music]
-    - [auto, c, pra_22_2_main]
-    - [auto, c, pra_22_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_27
     dir: world/area_pra/pra_27
     type: code
     start: 0xDC2420
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_27_0_header]
-    - [auto, c, pra_27_1_music]
-    - [auto, c, pra_27_2_main]
-    - [auto, c, pra_27_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_28
     dir: world/area_pra/pra_28
     type: code
     start: 0xDC3CD0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_28_0_header]
-    - [auto, c, pra_28_1_music]
-    - [auto, c, pra_28_2_main]
-    - [auto, c, pra_28_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_29
     dir: world/area_pra/pra_29
     type: code
     start: 0xDC5580
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_29_0_header]
-    - [auto, c, pra_29_1_music]
-    - [auto, c, pra_29_2_entity]
-    - [auto, c, pra_29_3_main]
-    - [auto, c, pra_29_4_bridge]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, bridge]
   - name: pra_31
     dir: world/area_pra/pra_31
     type: code
     start: 0xDC7790
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_31_0_header]
-    - [auto, c, pra_31_1_music]
-    - [auto, c, pra_31_2_npc]
-    - [auto, c, pra_31_3_main]
-    - [auto, c, pra_31_4_puzzle]
-    - [auto, c, pra_31_5_texture_1]
-    - [auto, c, pra_31_6_texture_2]
-    - [auto, c, pra_31_7_texture_3]
-    - [auto, c, pra_31_8_stairs_skele]
-    - [auto, c, pra_31_9_stairs_anim]
-    - [auto, c, pra_31_10_stairs_lights]
-    - [auto, c, pra_31_11_stairs_vtx]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, npc]
+    - [auto, c, main]
+    - [auto, c, puzzle]
+    - [auto, c, texture_1]
+    - [auto, c, texture_2]
+    - [auto, c, texture_3]
+    - [auto, c, stairs_skele]
+    - [auto, c, stairs_anim]
+    - [auto, c, stairs_lights]
+    - [auto, c, stairs_vtx]
     - start: 0xDCACA0
       type: .data
-      name: pra_31_5_texture_1
+      name: texture_1
       subsegments:
       - [0xDCACA0, ci4, texture_1, 64, 64]
       - [0xDCB4A0, palette, texture_1]
@@ -12602,7 +12602,7 @@ segments:
       - [0xDCB578]
     - start: 0xDCB580
       type: .data
-      name: pra_31_6_texture_2
+      name: texture_2
       subsegments:
       - [0xDCB580, ci4, texture_2, 64, 64]
       - [0xDCBD80, palette, texture_2]
@@ -12610,14 +12610,14 @@ segments:
       - [0xDCBE48]
     - start: 0xDCBE50
       type: .data
-      name: pra_31_7_texture_3
+      name: texture_3
       subsegments:
       - [0xDCBE50, rgba16, texture_3, 32, 32]
       - [0xDCC650, gfx, texture_3]
       - [0xDCC6D8]
     - start: 0xDCC6E0
       type: .data
-      name: pra_31_8_stairs_skele
+      name: stairs_skele
       subsegments:
       - [0xDCC6E0, gfx, unk_01]
       - [0xDCC758, gfx, unk_02]
@@ -12656,7 +12656,7 @@ segments:
       - [0xDCD220]
     - start: 0xDCEED0
       type: .data
-      name: pra_31_11_stairs_vtx
+      name: stairs_vtx
       subsegments:
       - [0xDCEED0]
       - [0xDCF250, vtx, stairs]
@@ -12668,356 +12668,356 @@ segments:
     start: 0xDCF430
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_32_0_header]
-    - [auto, c, pra_32_1_music]
-    - [auto, c, pra_32_2_main]
-    - [auto, c, pra_32_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_33
     dir: world/area_pra/pra_33
     type: code
     start: 0xDD2110
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_33_0_header]
-    - [auto, c, pra_33_1_music]
-    - [auto, c, pra_33_2_main]
-    - [auto, c, pra_33_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_34
     dir: world/area_pra/pra_34
     type: code
     start: 0xDD3DE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_34_0_header]
-    - [auto, c, pra_34_1_music]
-    - [auto, c, pra_34_2_main]
-    - [auto, c, pra_34_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_35
     dir: world/area_pra/pra_35
     type: code
     start: 0xDD5C80
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_35_0_header]
-    - [auto, c, pra_35_1_music]
-    - [auto, c, pra_35_2_main]
-    - [auto, c, pra_35_3_npc]
-    - [auto, c, pra_35_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: pra_36
     dir: world/area_pra/pra_36
     type: code
     start: 0xDDA130
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_36_0_header]
-    - [auto, c, pra_36_1_music]
-    - [auto, c, pra_36_2_main]
-    - [auto, c, pra_36_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_37
     dir: world/area_pra/pra_37
     type: code
     start: 0xDDB970
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_37_0_header]
-    - [auto, c, pra_37_1_music]
-    - [auto, c, pra_37_2_main]
-    - [auto, c, pra_37_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_38
     dir: world/area_pra/pra_38
     type: code
     start: 0xDDE020
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_38_0_header]
-    - [auto, c, pra_38_1_music]
-    - [auto, c, pra_38_2_main]
-    - [auto, c, pra_38_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_39
     dir: world/area_pra/pra_39
     type: code
     start: 0xDE02C0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_39_0_header]
-    - [auto, c, pra_39_1_music]
-    - [auto, c, pra_39_2_main]
-    - [auto, c, pra_39_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_40
     dir: world/area_pra/pra_40
     type: code
     start: 0xDE23E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, pra_40_0_header]
-    - [auto, c, pra_40_1_music]
-    - [auto, c, pra_40_2_main]
-    - [auto, c, pra_40_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: omo_01
     dir: world/area_omo/omo_01
     type: code
     start: 0xDE3920
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_01_0_header]
-    - [auto, c, omo_01_1_music]
-    - [auto, c, omo_01_2_main]
-    - [auto, c, omo_01_3_gizmos]
-    - [auto, c, omo_01_4_npc]
-    - [auto, c, omo_01_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_02
     dir: world/area_omo/omo_02
     type: code
     start: 0xDE5F00
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_02_0_header]
-    - [auto, c, omo_02_1_music]
-    - [auto, c, omo_02_2_main]
-    - [auto, c, omo_02_3_entity]
-    - [auto, c, omo_02_4_gizmos]
-    - [auto, c, omo_02_5_barricade]
-    - [auto, c, omo_02_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, gizmos]
+    - [auto, c, barricade]
+    - [auto, c, npc]
   - name: omo_03
     dir: world/area_omo/omo_03
     type: code
     start: 0xDEDC70
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_03_0_header]
-    - [auto, c, omo_03_1_music]
-    - [auto, c, omo_03_2_main]
-    - [auto, c, omo_03_3_gizmos]
-    - [auto, c, omo_03_4_entity]
-    - [auto, c, omo_03_5_npc]
-    - [auto, c, omo_03_6_train]
-    - [auto, c, omo_03_7_train_drop]
-    - [auto, c, omo_03_8_epilogue]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, train]
+    - [auto, c, train_drop]
+    - [auto, c, epilogue]
   - name: omo_04
     dir: world/area_omo/omo_04
     type: code
     start: 0xDF5E30
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_04_0_header]
-    - [auto, c, omo_04_1_music]
-    - [auto, c, omo_04_2_main]
-    - [auto, c, omo_04_3_gizmos]
-    - [auto, c, omo_04_4_entity]
-    - [auto, c, omo_04_5_npc]
-    - [auto, c, omo_04_6_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, scenes]
   - name: omo_05
     dir: world/area_omo/omo_05
     type: code
     start: 0xDFACF0
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_05_0_header]
-    - [auto, c, omo_05_1_music]
-    - [auto, c, omo_05_2_main]
-    - [auto, c, omo_05_3_gizmos]
-    - [auto, c, omo_05_4_npc]
-    - [auto, c, omo_05_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_06
     dir: world/area_omo/omo_06
     type: code
     start: 0xE00340
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_06_0_header]
-    - [auto, c, omo_06_1_music]
-    - [auto, c, omo_06_2_main]
-    - [auto, c, omo_06_3_gizmos]
-    - [auto, c, omo_06_4_train]
-    - [auto, c, omo_06_5_npc]
-    - [auto, c, omo_06_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, train]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_07
     dir: world/area_omo/omo_07
     type: code
     start: 0xE05CE0
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_07_0_header]
-    - [auto, c, omo_07_1_music]
-    - [auto, c, omo_07_2_main]
-    - [auto, c, omo_07_3_gizmos]
-    - [auto, c, omo_07_4_npc]
-    - [auto, c, omo_07_5_entity]
-    - [auto, c, omo_07_6_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, scenes]
   - name: omo_08
     dir: world/area_omo/omo_08
     type: code
     start: 0xE0CE00
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_08_0_header]
-    - [auto, c, omo_08_1_music]
-    - [auto, c, omo_08_2_main]
-    - [auto, c, omo_08_3_boxes]
-    - [auto, c, omo_08_4_train]
-    - [auto, c, omo_08_5_entity]
-    - [auto, c, omo_08_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, boxes]
+    - [auto, c, train]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: omo_09
     dir: world/area_omo/omo_09
     type: code
     start: 0xE15700
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_09_0_header]
-    - [auto, c, omo_09_1_music]
-    - [auto, c, omo_09_2_main]
-    - [auto, c, omo_09_3_conveyors]
-    - [auto, c, omo_09_4_slot_machine]
-    - [auto, c, omo_09_5_gizmos]
-    - [auto, c, omo_09_6_entity]
-    - [auto, c, omo_09_7_npc]
-    - [auto, c, omo_09_8_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, conveyors]
+    - [auto, c, slot_machine]
+    - [auto, c, gizmos]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, scenes]
   - name: omo_10
     dir: world/area_omo/omo_10
     type: code
     start: 0xE203E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_10_0_header]
-    - [auto, c, omo_10_1_music]
-    - [auto, c, omo_10_2_main]
-    - [auto, c, omo_10_3_gizmos]
-    - [auto, c, omo_10_4_train]
-    - [auto, c, omo_10_5_npc]
-    - [auto, c, omo_10_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, train]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_11
     dir: world/area_omo/omo_11
     type: code
     start: 0xE25260
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_11_0_header]
-    - [auto, c, omo_11_1_music]
-    - [auto, c, omo_11_2_main]
-    - [auto, c, omo_11_3_gizmos]
-    - [auto, c, omo_11_4_entity]
-    - [auto, c, omo_11_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: omo_12
     dir: world/area_omo/omo_12
     type: code
     start: 0xE27D40
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_12_0_header]
-    - [auto, c, omo_12_1_music]
-    - [auto, c, omo_12_2_main]
-    - [auto, c, omo_12_3_npc]
-    - [auto, c, omo_12_4_new_partner]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
   - name: omo_13
     dir: world/area_omo/omo_13
     type: code
     start: 0xE2AEC0
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_13_0_header]
-    - [auto, c, omo_13_1_music]
-    - [auto, c, omo_13_2_main]
-    - [auto, c, omo_13_3_gizmos]
-    - [auto, c, omo_13_4_npc]
-    - [auto, c, omo_13_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_14
     dir: world/area_omo/omo_14
     type: code
     start: 0xE2E0E0
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_14_0_header]
-    - [auto, c, omo_14_1_music]
-    - [auto, c, omo_14_2_main]
-    - [auto, c, omo_14_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: omo_15
     dir: world/area_omo/omo_15
     type: code
     start: 0xE311A0
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_15_0_header]
-    - [auto, c, omo_15_1_music]
-    - [auto, c, omo_15_2_main]
-    - [auto, c, omo_15_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: omo_16
     dir: world/area_omo/omo_16
     type: code
     start: 0xE34900
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_16_0_header]
-    - [auto, c, omo_16_1_main]
-    - [auto, c, omo_16_2_train]
-    - [auto, c, omo_16_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, train]
+    - [auto, c, npc]
   - name: omo_17
     dir: world/area_omo/omo_17
     type: code
     start: 0xE378D0
     vram: 0x80240000
     subsegments:
-    - [auto, c, omo_17_0_header]
-    - [auto, c, omo_17_1_main]
-    - [auto, c, omo_17_2_gizmos]
-    - [auto, c, omo_17_3_train]
-    - [auto, c, omo_17_4_npc]
-    - [auto, c, omo_17_5_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, train]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: end_00
     dir: world/area_end/end_00
     type: code
     start: 0xE3F430
     vram: 0x80240000
     subsegments:
-    - [auto, c, end_00_0_header]
-    - [auto, c, end_00_1_main]
-    - [auto, c, end_00_2_credits]
-    - [auto, c, end_00_3_parade_setup]
-    - [auto, c, end_00_4_allies]
-    - [auto, c, end_00_5_koopas]
-    - [auto, c, end_00_6_caravan]
-    - [auto, c, end_00_7_boos]
-    - [auto, c, end_00_8_yoshis]
-    - [auto, c, end_00_9_huff_n_puff]
-    - [auto, c, end_00_A_crystal_king]
-    - [auto, c, end_00_B_bowser]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, credits]
+    - [auto, c, parade_setup]
+    - [auto, c, allies]
+    - [auto, c, koopas]
+    - [auto, c, caravan]
+    - [auto, c, boos]
+    - [auto, c, yoshis]
+    - [auto, c, huff_n_puff]
+    - [auto, c, crystal_king]
+    - [auto, c, bowser]
   - name: end_01
     dir: world/area_end/end_01
     type: code
     start: 0xE4DD90
     vram: 0x80240000
     subsegments:
-    - [auto, c, end_01_0_header]
-    - [auto, c, end_01_1_main]
-    - [auto, c, end_01_2_credits]
-    - [auto, c, end_01_3_parade_setup]
-    - [auto, c, end_01_4_opera_float]
-    - [auto, c, end_01_5_flower_float]
-    - [auto, c, end_01_6_shyguy_float]
-    - [auto, c, end_01_7_peach_float]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, credits]
+    - [auto, c, parade_setup]
+    - [auto, c, opera_float]
+    - [auto, c, flower_float]
+    - [auto, c, shyguy_float]
+    - [auto, c, peach_float]
   - name: mgm_00
     dir: world/area_mgm/mgm_00
     type: code
     start: 0xE57280
     vram: 0x80240000
     subsegments:
-    - [auto, c, mgm_00_0_header]
-    - [auto, c, mgm_00_1_main]
-    - [auto, c, mgm_00_2_npc]
-    - [auto, c, mgm_00_3_scoreboard]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, scoreboard]
   - name: mgm_01
     dir: world/area_mgm/mgm_01
     type: code
     start: 0xE5B240
     vram: 0x80240000
     subsegments:
-    - [auto, c, mgm_01_0_header]
-    - [auto, c, mgm_01_1_main]
-    - [auto, c, mgm_01_2_npc]
-    - [auto, c, mgm_01_3_entity]
-    - [auto, c, mgm_01_4_images]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, images]
     - start: 0xE5DF20
       type: .data
-      name: mgm_01_4_images
+      name: images
       subsegments:
       - [0xE5DF20, ci4, panel_1_coin, 32, 32]
       - [0xE5E120, palette, panel_1_coin]
@@ -13034,13 +13034,13 @@ segments:
     start: 0xE5E860
     vram: 0x80240000
     subsegments:
-    - [auto, c, mgm_02_0_header]
-    - [auto, c, mgm_02_1_main]
-    - [auto, c, mgm_02_2_npc]
-    - [auto, c, mgm_02_3_images]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, images]
     - start: 0xE66B00
       type: .data
-      name: mgm_02_3_images
+      name: images
       subsegments:
       - [0xE66B00, ci4, panel_peach, 32, 32]
       - [0xE66D00, palette, panel_peach]
@@ -13051,16 +13051,16 @@ segments:
     start: 0xE66E60
     vram: 0x80240000
     subsegments:
-    - [auto, c, mgm_03_0_header]
-    - [auto, c, mgm_03_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: gv_01
     dir: world/area_gv/gv_01
     type: code
     start: 0xE66F40
     vram: 0x80240000
     subsegments:
-    - [auto, c, gv_01_0_header]
-    - [auto, c, gv_01_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: heaps2
     type: code
     start: 0xE68B50
diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml
index b7f312edaa..dcc32e7d27 100644
--- a/ver/pal/splat.yaml
+++ b/ver/pal/splat.yaml
@@ -6841,455 +6841,455 @@ segments:
     start: 0x853440
     vram: 0x80240000
     subsegments:
-    - [0x853440, c, machi_0_header]
-    - [0x853440, c, machi_1_tables]
-    - [0x853440, c, machi_2_main]
-    - [0x853470, c, machi_3_entity]
-    - [0x8535F0, c, machi_4_goomba_king]
-    - [0x8535F0, c, machi_5_npc]
-    - [0x8538F0, c, machi_6_misstar]
-    - [0x853AD0, c, machi_7_partner]
+    - [0x853440, c, settings]
+    - [0x853440, c, tables]
+    - [0x853440, c, main]
+    - [0x853470, c, entity]
+    - [0x8535F0, c, goomba_king]
+    - [0x8535F0, c, npc]
+    - [0x8538F0, c, misstar]
+    - [0x853AD0, c, partner]
   - name: mac_00
     dir: world/area_mac/mac_00
     type: code
     start: 0x856DB0
     vram: 0x80240000
     subsegments:
-    - [0x856DB0, c, mac_00_0_header]
-    - [0x856DB0, c, mac_00_1_music]
-    - [0x856DB0, c, mac_00_2_main]
-    - [0x8573E0, c, mac_00_3_entity]
-    - [0x8573E0, c, mac_00_4_rooms]
-    - [0x8573E0, c, mac_00_5_npc]
-    - [0x859070, c, mac_00_6_shop]
-    - [0x859070, c, mac_00_7_music_mix]
-    - [0x8591A0, c, mac_00_8_demo]
-    - [0x8591A0, c, mac_00_9_water_gfx]
-    - [0x859320, c, mac_00_10_shared_npc]
-    - [0x85A910, c, mac_00_11_intro_npc]
-    - [0x85A910, c, mac_00_12_intro]
-    - [0x85A910, c, mac_00_13_epilogue_npc]
-    - [0x85A910, c, mac_00_14_epilogue]
+    - [0x856DB0, c, settings]
+    - [0x856DB0, c, music]
+    - [0x856DB0, c, main]
+    - [0x8573E0, c, entity]
+    - [0x8573E0, c, rooms]
+    - [0x8573E0, c, npc]
+    - [0x859070, c, shop]
+    - [0x859070, c, music_mix]
+    - [0x8591A0, c, demo]
+    - [0x8591A0, c, water_gfx]
+    - [0x859320, c, shared_npc]
+    - [0x85A910, c, intro_npc]
+    - [0x85A910, c, intro]
+    - [0x85A910, c, epilogue_npc]
+    - [0x85A910, c, epilogue]
   - name: mac_01
     dir: world/area_mac/mac_01
     type: code
     start: 0x86C990
     vram: 0x80240000
     subsegments:
-    - [0x86C990, c, mac_01_0_header]
-    - [0x86C990, c, mac_01_1_music]
-    - [0x86C990, c, mac_01_2_main]
-    - [0x86C990, c, mac_01_3_entity]
-    - [0x86C990, c, mac_01_4_rooms]
-    - [0x86C990, c, mac_01_5_shop]
-    - [0x86CD50, c, mac_01_6_crystal_ball_gfx]
-    - [0x86D810, c, mac_01_7_bulletin]
-    - [0x86D8E0, c, mac_01_8_music_mix]
-    - [0x86DA10, c, mac_01_9_npc]
-    - [0x871EE0, c, mac_01_10_intro_npc]
-    - [0x872D70, c, mac_01_11_epilogue_npc]
-    - [0x872D70, c, mac_01_12_intro]
-    - [0x872E20, c, mac_01_13_foliage]
-    - [0x873060, .data, mac_01_0_header]
-    - [0x873100, .data, mac_01_1_music]
-    - [0x8732E0, .data, mac_01_2_main]
-    - [0x873D30, .data, mac_01_3_entity]
-    - [0x873DE0, .data, mac_01_4_rooms]
-    - [0x8747B0, .data, mac_01_5_shop]
-    - [0x874DD0, .data, mac_01_6_crystal_ball_gfx]
-    - [0x874EA0, .data, mac_01_7_bulletin]
-    - [0x875210, .data, mac_01_8_music_mix]
+    - [0x86C990, c, settings]
+    - [0x86C990, c, music]
+    - [0x86C990, c, main]
+    - [0x86C990, c, entity]
+    - [0x86C990, c, rooms]
+    - [0x86C990, c, shop]
+    - [0x86CD50, c, crystal_ball_gfx]
+    - [0x86D810, c, bulletin]
+    - [0x86D8E0, c, music_mix]
+    - [0x86DA10, c, npc]
+    - [0x871EE0, c, intro_npc]
+    - [0x872D70, c, epilogue_npc]
+    - [0x872D70, c, intro]
+    - [0x872E20, c, foliage]
+    - [0x873060, .data, settings]
+    - [0x873100, .data, music]
+    - [0x8732E0, .data, main]
+    - [0x873D30, .data, entity]
+    - [0x873DE0, .data, rooms]
+    - [0x8747B0, .data, shop]
+    - [0x874DD0, .data, crystal_ball_gfx]
+    - [0x874EA0, .data, bulletin]
+    - [0x875210, .data, music_mix]
     - start: 0x875320
       type: .data
-      name: mac_01_9_npc
+      name: npc
       subsegments:
       - [0x875320]
       - [0x877F80, vtx_common, ../../toad_house/blanket]
       - [0x879560, gfx_common, ../../toad_house/blanket]
       - [0x8796C8, rgba16, ../../toad_house/blanket, 16, 32, namespaced]
       - [0x879AC8]
-    - [0x88BB30, .data, mac_01_10_intro_npc]
-    - [0x88C440, .data, mac_01_11_epilogue_npc]
-    - [0x88E270, .data, mac_01_12_intro]
-    - [0x88E5D0, .data, mac_01_13_foliage]
+    - [0x88BB30, .data, intro_npc]
+    - [0x88C440, .data, epilogue_npc]
+    - [0x88E270, .data, intro]
+    - [0x88E5D0, .data, foliage]
   - name: mac_02
     dir: world/area_mac/mac_02
     type: code
     start: 0x88F430
     vram: 0x80240000
     subsegments:
-    - [0x88F430, c, mac_02_0_header]
-    - [0x88F430, c, mac_02_1_music]
-    - [0x88F430, c, mac_02_2_main]
-    - [0x88FA20, c, mac_02_3_rooms]
-    - [0x88FAE0, c, mac_02_4_foliage]
-    - [0x88FD20, c, mac_02_5_entity]
-    - [0x88FD60, c, mac_02_6_npc]
-    - [0x892820, c, mac_02_7_music_mix]
+    - [0x88F430, c, settings]
+    - [0x88F430, c, music]
+    - [0x88F430, c, main]
+    - [0x88FA20, c, rooms]
+    - [0x88FAE0, c, foliage]
+    - [0x88FD20, c, entity]
+    - [0x88FD60, c, npc]
+    - [0x892820, c, music_mix]
   - name: mac_03
     dir: world/area_mac/mac_03
     type: code
     start: 0x89D9B0
     vram: 0x80240000
     subsegments:
-    - [0x89D9B0, c, mac_03_0_header]
-    - [0x89D9B0, c, mac_03_1_music]
-    - [0x89D9B0, c, mac_03_2_main]
-    - [0x89DCD0, c, mac_03_3_train]
-    - [0x89DE60, c, mac_03_4_npc]
-    - [0x89F6B0, c, mac_03_5_entity]
-    - [0x89F6B0, c, mac_03_6_foliage]
-    - [0x89F8F0, c, mac_03_7_oinks]
-    - [0x8A0220, c, mac_03_8_demo]
+    - [0x89D9B0, c, settings]
+    - [0x89D9B0, c, music]
+    - [0x89D9B0, c, main]
+    - [0x89DCD0, c, train]
+    - [0x89DE60, c, npc]
+    - [0x89F6B0, c, entity]
+    - [0x89F6B0, c, foliage]
+    - [0x89F8F0, c, oinks]
+    - [0x8A0220, c, demo]
   - name: mac_04
     dir: world/area_mac/mac_04
     type: code
     start: 0x8AEDE0
     vram: 0x80240000
     subsegments:
-    - [0x8AEDE0, c, mac_04_0_header]
-    - [0x8AEE30, c, mac_04_1_music]
-    - [0x8AEE30, c, mac_04_2_main]
-    - [0x8AEFA0, c, mac_04_3_rooms]
-    - [0x8AF000, c, mac_04_4_foliage]
-    - [0x8AF240, c, mac_04_5_shop]
-    - [0x8AF240, c, mac_04_6_npc]
-    - [0x8B0A70, c, mac_04_7_wish_scene]
-    - [0x8B0A70, c, mac_04_8_entity]
-    - [0x8B0CD0, c, mac_04_9_music_mix]
+    - [0x8AEDE0, c, settings]
+    - [0x8AEE30, c, music]
+    - [0x8AEE30, c, main]
+    - [0x8AEFA0, c, rooms]
+    - [0x8AF000, c, foliage]
+    - [0x8AF240, c, shop]
+    - [0x8AF240, c, npc]
+    - [0x8B0A70, c, wish_scene]
+    - [0x8B0A70, c, entity]
+    - [0x8B0CD0, c, music_mix]
   - name: mac_05
     dir: world/area_mac/mac_05
     type: code
     start: 0x8BE3C0
     vram: 0x80240000
     subsegments:
-    - [0x8BE3C0, c, mac_05_0_header]
-    - [0x8BE3C0, c, mac_05_1_music]
-    - [0x8BE3C0, c, mac_05_2_entity]
-    - [0x8BE3C0, c, mac_05_3_main]
-    - [0x8BE850, c, mac_05_4_npc]
-    - [0x8C17B0, c, mac_05_5_whale]
-    - [0x8C2170, c, mac_05_6_rooms]
-    - [0x8C2170, c, mac_05_7_club64_sign]
+    - [0x8BE3C0, c, settings]
+    - [0x8BE3C0, c, music]
+    - [0x8BE3C0, c, entity]
+    - [0x8BE3C0, c, main]
+    - [0x8BE850, c, npc]
+    - [0x8C17B0, c, whale]
+    - [0x8C2170, c, rooms]
+    - [0x8C2170, c, club64_sign]
   - name: mac_06
     dir: world/area_mac/mac_06
     type: code
     start: 0x8D0DD0
     vram: 0x80240000
     subsegments:
-    - [0x8D0DD0, c, mac_06_0_header]
-    - [0x8D0DD0, c, mac_06_1_main]
-    - [0x8D1290, c, mac_06_2_whale]
-    - [0x8D1C50, c, mac_06_3_npc]
+    - [0x8D0DD0, c, settings]
+    - [0x8D0DD0, c, main]
+    - [0x8D1290, c, whale]
+    - [0x8D1C50, c, npc]
   - name: tik_01
     dir: world/area_tik/tik_01
     type: code
     start: 0x8D5740
     vram: 0x80240000
     subsegments:
-    - [0x8D5740, c, tik_01_0_header]
-    - [0x8D5740, c, tik_01_1_music]
-    - [0x8D5740, c, tik_01_2_main]
-    - [0x8D5D30, c, tik_01_3_drips]
-    - [0x8D60A0, c, tik_01_4_entity]
-    - [0x8D6170, c, tik_01_5_npc]
+    - [0x8D5740, c, settings]
+    - [0x8D5740, c, music]
+    - [0x8D5740, c, main]
+    - [0x8D5D30, c, drips]
+    - [0x8D60A0, c, entity]
+    - [0x8D6170, c, npc]
   - name: tik_02
     dir: world/area_tik/tik_02
     type: code
     start: 0x8D89D0
     vram: 0x80240000
     subsegments:
-    - [0x8D89D0, c, tik_02_0_header]
-    - [0x8D89D0, c, tik_02_1_music]
-    - [0x8D89D0, c, tik_02_2_main]
-    - [0x8D8CE0, c, tik_02_3_entity]
-    - [0x8D8FA0, c, tik_02_4_drips]
-    - [0x8D9310, c, tik_02_5_npc]
+    - [0x8D89D0, c, settings]
+    - [0x8D89D0, c, music]
+    - [0x8D89D0, c, main]
+    - [0x8D8CE0, c, entity]
+    - [0x8D8FA0, c, drips]
+    - [0x8D9310, c, npc]
   - name: tik_03
     dir: world/area_tik/tik_03
     type: code
     start: 0x8DAD90
     vram: 0x80240000
     subsegments:
-    - [0x8DAD90, c, tik_03_0_header]
-    - [0x8DAD90, c, tik_03_1_music]
-    - [0x8DAD90, c, tik_03_2_main]
-    - [0x8DB380, c, tik_03_3_drips]
-    - [0x8DB6F0, c, tik_03_4_platforms]
-    - [0x8DB750, c, tik_03_5_entity]
-    - [0x8DB750, c, tik_03_6_demo]
+    - [0x8DAD90, c, settings]
+    - [0x8DAD90, c, music]
+    - [0x8DAD90, c, main]
+    - [0x8DB380, c, drips]
+    - [0x8DB6F0, c, platforms]
+    - [0x8DB750, c, entity]
+    - [0x8DB750, c, demo]
   - name: tik_04
     dir: world/area_tik/tik_04
     type: code
     start: 0x8DDCC0
     vram: 0x80240000
     subsegments:
-    - [0x8DDCC0, c, tik_04_0_header]
-    - [0x8DDCC0, c, tik_04_1_music]
-    - [0x8DDCC0, c, tik_04_2_main]
-    - [0x8DE2B0, c, tik_04_3_drips]
-    - [0x8DE620, c, tik_04_4_platforms]
-    - [0x8DE930, c, tik_04_5_npc]
+    - [0x8DDCC0, c, settings]
+    - [0x8DDCC0, c, music]
+    - [0x8DDCC0, c, main]
+    - [0x8DE2B0, c, drips]
+    - [0x8DE620, c, platforms]
+    - [0x8DE930, c, npc]
   - name: tik_05
     dir: world/area_tik/tik_05
     type: code
     start: 0x8E1050
     vram: 0x80240000
     subsegments:
-    - [0x8E1050, c, tik_05_0_header]
-    - [0x8E1050, c, tik_05_1_music]
-    - [0x8E1050, c, tik_05_2_main]
-    - [0x8E1360, c, tik_05_3_drips]
-    - [0x8E16D0, c, tik_05_4_entity]
-    - [0x8E1AA0, c, tik_05_5_npc]
+    - [0x8E1050, c, settings]
+    - [0x8E1050, c, music]
+    - [0x8E1050, c, main]
+    - [0x8E1360, c, drips]
+    - [0x8E16D0, c, entity]
+    - [0x8E1AA0, c, npc]
   - name: tik_06
     dir: world/area_tik/tik_06
     type: code
     start: 0x8E3170
     vram: 0x80240000
     subsegments:
-    - [0x8E3170, c, tik_06_0_header]
-    - [0x8E3170, c, tik_06_1_music]
-    - [0x8E3170, c, tik_06_2_main]
-    - [0x8E3760, c, tik_06_3_drips]
-    - [0x8E3AD0, c, tik_06_4_entity]
+    - [0x8E3170, c, settings]
+    - [0x8E3170, c, music]
+    - [0x8E3170, c, main]
+    - [0x8E3760, c, drips]
+    - [0x8E3AD0, c, entity]
   - name: tik_07
     dir: world/area_tik/tik_07
     type: code
     start: 0x8E5E70
     vram: 0x80240000
     subsegments:
-    - [0x8E5E70, c, tik_07_0_header]
-    - [0x8E5E70, c, tik_07_1_music]
-    - [0x8E5E70, c, tik_07_2_main]
-    - [0x8E6150, c, tik_07_3_entity]
-    - [0x8E6E90, c, tik_07_4_drips]
-    - [0x8E7200, c, tik_07_5_platforms]
-    - [0x8E7260, c, tik_07_6_npc]
+    - [0x8E5E70, c, settings]
+    - [0x8E5E70, c, music]
+    - [0x8E5E70, c, main]
+    - [0x8E6150, c, entity]
+    - [0x8E6E90, c, drips]
+    - [0x8E7200, c, platforms]
+    - [0x8E7260, c, npc]
   - name: tik_08
     dir: world/area_tik/tik_08
     type: code
     start: 0x8EB080
     vram: 0x80240000
     subsegments:
-    - [0x8EB080, c, tik_08_0_header]
-    - [0x8EB080, c, tik_08_1_music]
-    - [0x8EB080, c, tik_08_2_main]
-    - [0x8EB670, c, tik_08_3_drips]
-    - [0x8EB9E0, c, tik_08_4_entity]
-    - [0x8EBAB0, c, tik_08_5_npc]
+    - [0x8EB080, c, settings]
+    - [0x8EB080, c, music]
+    - [0x8EB080, c, main]
+    - [0x8EB670, c, drips]
+    - [0x8EB9E0, c, entity]
+    - [0x8EBAB0, c, npc]
   - name: tik_09
     dir: world/area_tik/tik_09
     type: code
     start: 0x8EE450
     vram: 0x80240000
     subsegments:
-    - [0x8EE450, c, tik_09_0_header]
-    - [0x8EE450, c, tik_09_1_music]
-    - [0x8EE450, c, tik_09_2_main]
-    - [0x8EEA40, c, tik_09_3_drips]
-    - [0x8EEDB0, c, tik_09_4_entity]
-    - [0x8EEE80, c, tik_09_5_npc]
+    - [0x8EE450, c, settings]
+    - [0x8EE450, c, music]
+    - [0x8EE450, c, main]
+    - [0x8EEA40, c, drips]
+    - [0x8EEDB0, c, entity]
+    - [0x8EEE80, c, npc]
   - name: tik_10
     dir: world/area_tik/tik_10
     type: code
     start: 0x8F2650
     vram: 0x80240000
     subsegments:
-    - [0x8F2650, c, tik_10_0_header]
-    - [0x8F2650, c, tik_10_1_music]
-    - [0x8F2650, c, tik_10_2_main]
-    - [0x8F2960, c, tik_10_3_drips]
-    - [0x8F2CD0, c, tik_10_4_entity]
+    - [0x8F2650, c, settings]
+    - [0x8F2650, c, music]
+    - [0x8F2650, c, main]
+    - [0x8F2960, c, drips]
+    - [0x8F2CD0, c, entity]
   - name: tik_12
     dir: world/area_tik/tik_12
     type: code
     start: 0x8F4E60
     vram: 0x80240000
     subsegments:
-    - [0x8F4E60, c, tik_12_0_header]
-    - [0x8F4E60, c, tik_12_1_music]
-    - [0x8F4E60, c, tik_12_2_main]
-    - [0x8F5450, c, tik_12_3_drips]
-    - [0x8F57C0, c, tik_12_4_entity]
-    - [0x8F67C0, c, tik_12_5_npc]
+    - [0x8F4E60, c, settings]
+    - [0x8F4E60, c, music]
+    - [0x8F4E60, c, main]
+    - [0x8F5450, c, drips]
+    - [0x8F57C0, c, entity]
+    - [0x8F67C0, c, npc]
   - name: tik_14
     dir: world/area_tik/tik_14
     type: code
     start: 0x8F9890
     vram: 0x80240000
     subsegments:
-    - [0x8F9890, c, tik_14_0_header]
-    - [0x8F9890, c, tik_14_1_music]
-    - [0x8F9890, c, tik_14_2_main]
-    - [0x8F9E80, c, tik_14_3_drips]
-    - [0x8FA1F0, c, tik_14_4_entity]
+    - [0x8F9890, c, settings]
+    - [0x8F9890, c, music]
+    - [0x8F9890, c, main]
+    - [0x8F9E80, c, drips]
+    - [0x8FA1F0, c, entity]
   - name: tik_15
     dir: world/area_tik/tik_15
     type: code
     start: 0x8FBE30
     vram: 0x80240000
     subsegments:
-    - [0x8FBE30, c, tik_15_0_header]
-    - [0x8FBE30, c, tik_15_1_music]
-    - [0x8FBE30, c, tik_15_2_main]
-    - [0x8FC420, c, tik_15_3_entity]
-    - [0x8FC420, c, tik_15_4_drips]
-    - [0x8FC790, c, tik_15_5_npc]
+    - [0x8FBE30, c, settings]
+    - [0x8FBE30, c, music]
+    - [0x8FBE30, c, main]
+    - [0x8FC420, c, entity]
+    - [0x8FC420, c, drips]
+    - [0x8FC790, c, npc]
   - name: tik_17
     dir: world/area_tik/tik_17
     type: code
     start: 0x8FECB0
     vram: 0x80240000
     subsegments:
-    - [0x8FECB0, c, tik_17_0_header]
-    - [0x8FECB0, c, tik_17_1_music]
-    - [0x8FECE0, c, tik_17_2_entity]
-    - [0x8FFA20, c, tik_17_3_main]
+    - [0x8FECB0, c, settings]
+    - [0x8FECB0, c, music]
+    - [0x8FECE0, c, entity]
+    - [0x8FFA20, c, main]
   - name: tik_18
     dir: world/area_tik/tik_18
     type: code
     start: 0x901970
     vram: 0x80240000
     subsegments:
-    - [0x901970, c, tik_18_0_header]
-    - [0x901970, c, tik_18_1_music]
-    - [0x901970, c, tik_18_2_main]
-    - [0x901C80, c, tik_18_3_drips]
-    - [0x901FF0, c, tik_18_4_npc]
-    - [0x901FF0, c, tik_18_5_entity]
+    - [0x901970, c, settings]
+    - [0x901970, c, music]
+    - [0x901970, c, main]
+    - [0x901C80, c, drips]
+    - [0x901FF0, c, npc]
+    - [0x901FF0, c, entity]
   - name: tik_19
     dir: world/area_tik/tik_19
     type: code
     start: 0x903870
     vram: 0x80240000
     subsegments:
-    - [0x903870, c, tik_19_0_header]
-    - [0x903870, c, tik_19_1_music]
-    - [0x903870, c, tik_19_2_main]
-    - [0x903E60, c, tik_19_3_entity]
+    - [0x903870, c, settings]
+    - [0x903870, c, music]
+    - [0x903870, c, main]
+    - [0x903E60, c, entity]
   - name: tik_20
     dir: world/area_tik/tik_20
     type: code
     start: 0x9065E0
     vram: 0x80240000
     subsegments:
-    - [0x9065E0, c, tik_20_0_header]
-    - [0x9065E0, c, tik_20_1_music]
-    - [0x9065E0, c, tik_20_2_main]
-    - [0x906F40, c, tik_20_3_npc]
-    - [0x907720, c, tik_20_4_entity]
+    - [0x9065E0, c, settings]
+    - [0x9065E0, c, music]
+    - [0x9065E0, c, main]
+    - [0x906F40, c, npc]
+    - [0x907720, c, entity]
   - name: tik_21
     dir: world/area_tik/tik_21
     type: code
     start: 0x909A30
     vram: 0x80240000
     subsegments:
-    - [0x909A30, c, tik_21_0_header]
-    - [0x909A30, c, tik_21_1_music]
-    - [0x909A30, c, tik_21_2_main]
-    - [0x90A390, c, tik_21_3_entity]
+    - [0x909A30, c, settings]
+    - [0x909A30, c, music]
+    - [0x909A30, c, main]
+    - [0x90A390, c, entity]
   - name: tik_22
     dir: world/area_tik/tik_22
     type: code
     start: 0x90C150
     vram: 0x80240000
     subsegments:
-    - [0x90C150, c, tik_22_0_header]
-    - [0x90C150, c, tik_22_1_music]
-    - [0x90C180, c, tik_22_2_main]
+    - [0x90C150, c, settings]
+    - [0x90C150, c, music]
+    - [0x90C180, c, main]
   - name: tik_23
     dir: world/area_tik/tik_23
     type: code
     start: 0x90E660
     vram: 0x80240000
     subsegments:
-    - [0x90E660, c, tik_23_0_header]
-    - [0x90E660, c, tik_23_1_music]
-    - [0x90E660, c, tik_23_2_main]
-    - [0x90EFC0, c, tik_23_3_entity]
-    - [0x90EFC0, c, tik_23_4_npc]
+    - [0x90E660, c, settings]
+    - [0x90E660, c, music]
+    - [0x90E660, c, main]
+    - [0x90EFC0, c, entity]
+    - [0x90EFC0, c, npc]
   - name: tik_24
     dir: world/area_tik/tik_24
     type: code
     start: 0x911D10
     vram: 0x80240000
     subsegments:
-    - [0x911D10, c, tik_24_0_header]
-    - [0x911D60, c, tik_24_1_music]
-    - [0x911D60, c, tik_24_2_main]
-    - [0x912070, c, tik_24_3_drips]
-    - [0x9123E0, c, tik_24_4_entity]
-    - [0x9123E0, c, tik_24_5_npc]
+    - [0x911D10, c, settings]
+    - [0x911D60, c, music]
+    - [0x911D60, c, main]
+    - [0x912070, c, drips]
+    - [0x9123E0, c, entity]
+    - [0x9123E0, c, npc]
   - name: tik_25
     dir: world/area_tik/tik_25
     type: code
     start: 0x914210
     vram: 0x80240000
     subsegments:
-    - [0x914210, c, tik_25_0_header]
-    - [0x914210, c, tik_25_1_music]
-    - [0x914210, c, tik_25_2_main]
-    - [0x914890, c, tik_25_3_entity]
+    - [0x914210, c, settings]
+    - [0x914210, c, music]
+    - [0x914210, c, main]
+    - [0x914890, c, entity]
   - name: kgr_01
     dir: world/area_kgr/kgr_01
     type: code
     start: 0x915CA0
     vram: 0x80240000
     subsegments:
-    - [0x915CA0, c, kgr_01_1_main]
-    - [0x915E00, c, kgr_01_2_wiggle]
-    - [0x9161A0, c, kgr_01_3_extra]
+    - [0x915CA0, c, main]
+    - [0x915E00, c, wiggle]
+    - [0x9161A0, c, extra]
   - name: kgr_02
     dir: world/area_kgr/kgr_02
     type: code
     start: 0x9166E0
     vram: 0x80240000
     subsegments:
-    - [0x9166E0, c, kgr_02_1_main]
-    - [0x916840, c, kgr_02_2_unused]
-    - [0x916E10, c, kgr_02_3_npc]
-    - [0x916E40, c, kgr_02_4_extra]
+    - [0x9166E0, c, main]
+    - [0x916840, c, unused]
+    - [0x916E10, c, npc]
+    - [0x916E40, c, extra]
   - name: kmr_00
     dir: world/area_kmr/kmr_00
     type: code
     start: 0x918220
     vram: 0x80240000
     subsegments:
-    - [0x918220, c, kmr_00_0_header]
-    - [0x918220, c, kmr_00_1_music]
-    - [0x918220, c, kmr_00_2_main]
-    - [0x918220, c, kmr_00_3_revival]
-    - [0x918F60, c, kmr_00_4_npc]
-    - [0x919020, c, kmr_00_5_entity]
+    - [0x918220, c, settings]
+    - [0x918220, c, music]
+    - [0x918220, c, main]
+    - [0x918220, c, revival]
+    - [0x918F60, c, npc]
+    - [0x919020, c, entity]
   - name: kmr_02
     dir: world/area_kmr/kmr_02
     type: code
     start: 0x91C3B0
     vram: 0x80240000
     subsegments:
-    - [0x91C3B0, c, kmr_02_0_header]
-    - [0x91C3B0, c, kmr_02_1_music]
-    - [0x91C3B0, c, kmr_02_2_main]
-    - [0x91C740, c, kmr_02_3_npc]
-    - [0x91F420, c, kmr_02_4_rooms_1]
-    - [0x91F720, c, kmr_02_5_entity]
-    - [0x91F9F0, c, kmr_02_6_rooms_2]
-    - [0x91F9F0, c, kmr_02_7_kammy]
-    - [0x91FB10, c, kmr_02_8_foliage]
-    - [0x91FD50, c, kmr_02_9_images]
-    - [0x91FDF0, .data, kmr_02_0_header]
-    - [0x91FEE0, .data, kmr_02_1_music]
-    - [0x920050, .data, kmr_02_2_main]
-    - [0x921980, .data, kmr_02_3_npc]
-    - [0x92D7F0, .data, kmr_02_4_rooms_1]
-    - [0x930DD0, .data, kmr_02_5_entity]
-    - [0x931560, .data, kmr_02_6_rooms_2]
-    - [0x931A30, .data, kmr_02_7_kammy]
-    - [0x9333A0, .data, kmr_02_8_foliage]
+    - [0x91C3B0, c, settings]
+    - [0x91C3B0, c, music]
+    - [0x91C3B0, c, main]
+    - [0x91C740, c, npc]
+    - [0x91F420, c, rooms_1]
+    - [0x91F720, c, entity]
+    - [0x91F9F0, c, rooms_2]
+    - [0x91F9F0, c, kammy]
+    - [0x91FB10, c, foliage]
+    - [0x91FD50, c, images]
+    - [0x91FDF0, .data, settings]
+    - [0x91FEE0, .data, music]
+    - [0x920050, .data, main]
+    - [0x921980, .data, npc]
+    - [0x92D7F0, .data, rooms_1]
+    - [0x930DD0, .data, entity]
+    - [0x931560, .data, rooms_2]
+    - [0x931A30, .data, kammy]
+    - [0x9333A0, .data, foliage]
     - start: 0x933F00
       type: .data
-      name: kmr_02_9_images
+      name: images
       subsegments:
       - [0x933F00, ci4, heart_block, 32, 32]
       - [0x934100, palette, heart_block]
@@ -7300,33 +7300,33 @@ segments:
     start: 0x934320
     vram: 0x80240000
     subsegments:
-    - [0x934320, c, kmr_03_0_header]
-    - [0x934320, c, kmr_03_1_music]
-    - [0x934320, c, kmr_03_2_main]
-    - [0x934320, c, kmr_03_3_npc]
-    - [0x934640, c, kmr_03_4_entity]
-    - [0x934730, c, kmr_03_5_foliage]
-    - [0x934970, c, kmr_03_6_fall_down]
+    - [0x934320, c, settings]
+    - [0x934320, c, music]
+    - [0x934320, c, main]
+    - [0x934320, c, npc]
+    - [0x934640, c, entity]
+    - [0x934730, c, foliage]
+    - [0x934970, c, fall_down]
   - name: kmr_04
     dir: world/area_kmr/kmr_04
     type: code
     start: 0x936C90
     vram: 0x80240000
     subsegments:
-    - [0x936C90, c, kmr_04_0_header]
-    - [0x936C90, c, kmr_04_1_music]
-    - [0x936C90, c, kmr_04_2_main]
-    - [0x936C90, c, kmr_04_3_npc]
-    - [0x936CF0, c, kmr_04_4_entity]
-    - [0x936CF0, c, kmr_04_5_foliage]
-    - [0x937100, .data, kmr_04_0_header]
-    - [0x9371F0, .data, kmr_04_1_music]
-    - [0x937290, .data, kmr_04_2_main]
-    - [0x9374F0, .data, kmr_04_3_npc]
-    - [0x938710, .data, kmr_04_4_entity]
+    - [0x936C90, c, settings]
+    - [0x936C90, c, music]
+    - [0x936C90, c, main]
+    - [0x936C90, c, npc]
+    - [0x936CF0, c, entity]
+    - [0x936CF0, c, foliage]
+    - [0x937100, .data, settings]
+    - [0x9371F0, .data, music]
+    - [0x937290, .data, main]
+    - [0x9374F0, .data, npc]
+    - [0x938710, .data, entity]
     - start: 0x938880
       type: .data
-      name: kmr_04_5_foliage
+      name: foliage
       subsegments:
       - [0x938880, ci4, hammer_block_message, 48, 48]
       - [0x938D00, palette, hammer_block_message]
@@ -7337,123 +7337,123 @@ segments:
     start: 0x93A400
     vram: 0x80240000
     subsegments:
-    - [0x93A400, c, kmr_05_0_header]
-    - [0x93A400, c, kmr_05_1_music]
-    - [0x93A400, c, kmr_05_2_main]
-    - [0x93A400, c, kmr_05_3_npc]
-    - [0x93B900, c, kmr_05_4_entity]
-    - [0x93B900, c, kmr_05_5_foliage]
+    - [0x93A400, c, settings]
+    - [0x93A400, c, music]
+    - [0x93A400, c, main]
+    - [0x93A400, c, npc]
+    - [0x93B900, c, entity]
+    - [0x93B900, c, foliage]
   - name: kmr_06
     dir: world/area_kmr/kmr_06
     type: code
     start: 0x93D8A0
     vram: 0x80240000
     subsegments:
-    - [0x93D8A0, c, kmr_06_0_header]
-    - [0x93D8A0, c, kmr_06_1_music]
-    - [0x93D8A0, c, kmr_06_2_main]
-    - [0x93D8A0, c, kmr_06_3_npc]
-    - [0x93EDA0, c, kmr_06_4_entity]
-    - [0x93EDA0, c, kmr_06_5_sticker_sign]
+    - [0x93D8A0, c, settings]
+    - [0x93D8A0, c, music]
+    - [0x93D8A0, c, main]
+    - [0x93D8A0, c, npc]
+    - [0x93EDA0, c, entity]
+    - [0x93EDA0, c, sticker_sign]
   - name: kmr_07
     dir: world/area_kmr/kmr_07
     type: code
     start: 0x940150
     vram: 0x80240000
     subsegments:
-    - [0x940150, c, kmr_07_0_header]
-    - [0x940150, c, kmr_07_1_music]
-    - [0x940150, c, kmr_07_2_main]
-    - [0x940150, c, kmr_07_3_npc]
-    - [0x940C10, c, kmr_07_4_entity]
+    - [0x940150, c, settings]
+    - [0x940150, c, music]
+    - [0x940150, c, main]
+    - [0x940150, c, npc]
+    - [0x940C10, c, entity]
   - name: kmr_09
     dir: world/area_kmr/kmr_09
     type: code
     start: 0x942190
     vram: 0x80240000
     subsegments:
-    - [0x942190, c, kmr_09_0_header]
-    - [0x942190, c, kmr_09_1_music]
-    - [0x942190, c, kmr_09_2_main]
-    - [0x942190, c, kmr_09_3_npc]
-    - [0x9436C0, c, kmr_09_4_entity]
+    - [0x942190, c, settings]
+    - [0x942190, c, music]
+    - [0x942190, c, main]
+    - [0x942190, c, npc]
+    - [0x9436C0, c, entity]
   - name: kmr_10
     dir: world/area_kmr/kmr_10
     type: code
     start: 0x944860
     vram: 0x80240000
     subsegments:
-    - [0x944860, c, kmr_10_0_header]
-    - [0x944860, c, kmr_10_1_music]
-    - [0x944860, c, kmr_10_2_main]
-    - [0x944860, c, kmr_10_3_npc]
-    - [0x944860, c, kmr_10_4_entity]
-    - [0x944C30, c, kmr_10_5_foliage]
+    - [0x944860, c, settings]
+    - [0x944860, c, music]
+    - [0x944860, c, main]
+    - [0x944860, c, npc]
+    - [0x944860, c, entity]
+    - [0x944C30, c, foliage]
   - name: kmr_11
     dir: world/area_kmr/kmr_11
     type: code
     start: 0x946490
     vram: 0x80240000
     subsegments:
-    - [0x946490, c, kmr_11_0_header]
-    - [0x946490, c, kmr_11_1_music]
-    - [0x946490, c, kmr_11_2_main]
-    - [0x946730, c, kmr_11_3_scenes]
-    - [0x946800, c, kmr_11_4_npc]
-    - [0x947350, c, kmr_11_5_entity]
-    - [0x9473B0, c, kmr_11_6_kammy]
-    - [0x9473B0, c, kmr_11_7_foliage]
-    - [0x9475F0, c, kmr_11_8_fortress_skeleton]
-    - [0x9475F0, c, kmr_11_9_fortress_animation]
-    - [0x9475F0, c, kmr_11_10_bridge_skeleton]
-    - [0x9475F0, c, kmr_11_11_bridge_animation]
+    - [0x946490, c, settings]
+    - [0x946490, c, music]
+    - [0x946490, c, main]
+    - [0x946730, c, scenes]
+    - [0x946800, c, npc]
+    - [0x947350, c, entity]
+    - [0x9473B0, c, kammy]
+    - [0x9473B0, c, foliage]
+    - [0x9475F0, c, fortress_skeleton]
+    - [0x9475F0, c, fortress_animation]
+    - [0x9475F0, c, bridge_skeleton]
+    - [0x9475F0, c, bridge_animation]
   - name: kmr_12
     dir: world/area_kmr/kmr_12
     type: code
     start: 0x9576F0
     vram: 0x80240000
     subsegments:
-    - [0x9576F0, c, kmr_12_0_header]
-    - [0x9576F0, c, kmr_12_1_music]
-    - [0x9576F0, c, kmr_12_2_main]
-    - [0x9576F0, c, kmr_12_3_npc]
-    - [0x957720, c, kmr_12_4_entity]
+    - [0x9576F0, c, settings]
+    - [0x9576F0, c, music]
+    - [0x9576F0, c, main]
+    - [0x9576F0, c, npc]
+    - [0x957720, c, entity]
   - name: kmr_20
     dir: world/area_kmr/kmr_20
     type: code
     start: 0x9581B0
     vram: 0x80240000
     subsegments:
-    - [0x9581B0, c, kmr_20_0_header]
-    - [0x9581B0, c, kmr_20_1_music]
-    - [0x9581E0, c, kmr_20_2_main]
-    - [0x9584E0, c, kmr_20_3_rooms]
-    - [0x958530, c, kmr_20_4_documents]
-    - [0x958F80, c, kmr_20_5_entity]
-    - [0x958FD0, c, kmr_20_6_trees]
-    - [0x959210, c, kmr_20_7_bushes]
-    - [0x959450, c, kmr_20_8_bed]
-    - [0x9597D0, c, kmr_20_9_npc_scenes]
-    - [0x9597D0, c, kmr_20_10_npc]
-    - [0x959930, c, kmr_20_11_npc_intro]
-    - [0x959F00, c, kmr_20_12_npc_epilogue]
-    - [0x95A350, c, kmr_20_13_records]
-    - [0x95AD60, .data, kmr_20_0_header]
-    - [0x95ADF0, .data, kmr_20_1_music]
-    - [0x95AF50, .data, kmr_20_2_main]
-    - [0x95C130, .data, kmr_20_3_rooms]
-    - [0x95C570, .data, kmr_20_4_documents]
-    - [0x95D890, .data, kmr_20_5_entity]
-    - [0x95DF90, .data, kmr_20_6_trees]
-    - [0x95E9A0, .data, kmr_20_7_bushes]
-    - [0x95F4C0, .data, kmr_20_8_bed]
-    - [0x962580, .data, kmr_20_9_npc_scenes]
-    - [0x962A60, .data, kmr_20_10_npc]
-    - [0x9660C0, .data, kmr_20_11_npc_intro]
-    - [0x969170, .data, kmr_20_12_npc_epilogue]
+    - [0x9581B0, c, settings]
+    - [0x9581B0, c, music]
+    - [0x9581E0, c, main]
+    - [0x9584E0, c, rooms]
+    - [0x958530, c, documents]
+    - [0x958F80, c, entity]
+    - [0x958FD0, c, trees]
+    - [0x959210, c, bushes]
+    - [0x959450, c, bed]
+    - [0x9597D0, c, npc_scenes]
+    - [0x9597D0, c, npc]
+    - [0x959930, c, npc_intro]
+    - [0x959F00, c, npc_epilogue]
+    - [0x95A350, c, records]
+    - [0x95AD60, .data, settings]
+    - [0x95ADF0, .data, music]
+    - [0x95AF50, .data, main]
+    - [0x95C130, .data, rooms]
+    - [0x95C570, .data, documents]
+    - [0x95D890, .data, entity]
+    - [0x95DF90, .data, trees]
+    - [0x95E9A0, .data, bushes]
+    - [0x95F4C0, .data, bed]
+    - [0x962580, .data, npc_scenes]
+    - [0x962A60, .data, npc]
+    - [0x9660C0, .data, npc_intro]
+    - [0x969170, .data, npc_epilogue]
     - start: 0x96AF00
       type: .data
-      name: kmr_20_13_records
+      name: records
       subsegments:
       - [0x96AF00, gfx, records_screen]
       - [0x96AF70]
@@ -7463,22 +7463,22 @@ segments:
     start: 0x96B210
     vram: 0x80240000
     subsegments:
-    - [0x96B210, c, kmr_21_0_header]
-    - [0x96B220, c, kmr_21_1_main]
+    - [0x96B210, c, settings]
+    - [0x96B220, c, main]
   - name: kmr_22
     dir: world/area_kmr/kmr_22
     type: code
     start: 0x96B9E0
     vram: 0x80240000
     subsegments:
-    - [0x96B9E0, c, kmr_22_0_header]
-    - [0x96B9F0, c, kmr_22_1_main]
-    - [0x96BC20, c, kmr_22_2_npc]
-    - [0x96C6F0, .data, kmr_22_0_header]
-    - [0x96C7C0, .data, kmr_22_1_main]
+    - [0x96B9E0, c, settings]
+    - [0x96B9F0, c, main]
+    - [0x96BC20, c, npc]
+    - [0x96C6F0, .data, settings]
+    - [0x96C7C0, .data, main]
     - start: 0x96CDF0
       type: .data
-      name: kmr_22_2_npc
+      name: npc
       subsegments:
       - [0x96C7C0]
       - [0x96D2E0, ci4, lava_piranha_vine, 64, 32]
@@ -7491,14 +7491,14 @@ segments:
     start: 0x973DA0
     vram: 0x80240000
     subsegments:
-    - [0x973DA0, c, kmr_23_0_header]
-    - [0x973DB0, c, kmr_23_1_main]
-    - [0x973DE0, c, kmr_23_2_npc]
-    - [0x974E70, .data, kmr_23_0_header]
-    - [0x974F30, .data, kmr_23_1_main]
+    - [0x973DA0, c, settings]
+    - [0x973DB0, c, main]
+    - [0x973DE0, c, npc]
+    - [0x974E70, .data, settings]
+    - [0x974F30, .data, main]
     - start: 0x975400
       type: .data
-      name: kmr_23_2_npc
+      name: npc
       subsegments:
       - [0x975400]
       - [0x975468, ia8, window_ul, 8, 8]
@@ -7512,575 +7512,575 @@ segments:
     start: 0x9775B0
     vram: 0x80240000
     subsegments:
-    - [0x9775B0, c, kmr_24_0_header]
-    - [0x9775C0, c, kmr_24_1_main]
+    - [0x9775B0, c, settings]
+    - [0x9775C0, c, main]
   - name: kmr_30
     dir: world/area_kmr/kmr_30
     type: code
     start: 0x977A40
     vram: 0x80240000
     subsegments:
-    - [0x977A40, c, kmr_30_0_header]
-    - [0x977A40, c, kmr_30_1_main]
-    - [0x977D50, c, kmr_30_2_npc]
-    - [0x977D50, c, kmr_30_3_the_end]
+    - [0x977A40, c, settings]
+    - [0x977A40, c, main]
+    - [0x977D50, c, npc]
+    - [0x977D50, c, the_end]
   - name: iwa_00
     dir: world/area_iwa/iwa_00
     type: code
     start: 0x978FB0
     vram: 0x80240000
     subsegments:
-    - [0x978FB0, c, iwa_00_0_header]
-    - [0x978FB0, c, iwa_00_1_main]
-    - [0x978FB0, c, iwa_00_2_entity]
-    - [0x978FB0, c, iwa_00_3_npc]
-    - [0x979260, c, iwa_00_4_slide]
+    - [0x978FB0, c, settings]
+    - [0x978FB0, c, main]
+    - [0x978FB0, c, entity]
+    - [0x978FB0, c, npc]
+    - [0x979260, c, slide]
   - name: iwa_01
     dir: world/area_iwa/iwa_01
     type: code
     start: 0x97BA20
     vram: 0x80240000
     subsegments:
-    - [0x97BA20, c, iwa_01_0_header]
-    - [0x97BA20, c, iwa_01_1_main]
-    - [0x97BA20, c, iwa_01_2_entity]
-    - [0x97BA20, c, iwa_01_3_splash]
-    - [0x97BF40, c, iwa_01_4_npc]
-    - [0x97ECD0, c, iwa_01_5_slide]
-    - [0x97ED00, .data, iwa_01_0_header]
-    - [0x97ED80, .data, iwa_01_1_main]
-    - [0x97F2D0, .data, iwa_01_2_entity]
+    - [0x97BA20, c, settings]
+    - [0x97BA20, c, main]
+    - [0x97BA20, c, entity]
+    - [0x97BA20, c, splash]
+    - [0x97BF40, c, npc]
+    - [0x97ECD0, c, slide]
+    - [0x97ED00, .data, settings]
+    - [0x97ED80, .data, main]
+    - [0x97F2D0, .data, entity]
     - start: 0x97F3E0
       type: .data
-      name: iwa_01_3_splash
+      name: splash
       subsegments:
       - [0x97F3E0, i8, splash, 32, 32]
       - [0x97F7E0, vtx, splash]
       - [0x97F820, gfx, splash]
       - [0x97F8E8]
-    - [0x97F940, .data, iwa_01_4_npc]
-    - [0x981820, .data, iwa_01_5_slide]
+    - [0x97F940, .data, npc]
+    - [0x981820, .data, slide]
   - name: iwa_02
     dir: world/area_iwa/iwa_02
     type: code
     start: 0x9820E0
     vram: 0x80240000
     subsegments:
-    - [0x9820E0, c, iwa_02_0_header]
-    - [0x9820E0, c, iwa_02_1_main]
-    - [0x9820E0, c, iwa_02_2_entity]
-    - [0x9820E0, c, iwa_02_3_npc]
+    - [0x9820E0, c, settings]
+    - [0x9820E0, c, main]
+    - [0x9820E0, c, entity]
+    - [0x9820E0, c, npc]
   - name: iwa_03
     dir: world/area_iwa/iwa_03
     type: code
     start: 0x984F20
     vram: 0x80240000
     subsegments:
-    - [0x984F20, c, iwa_03_0_header]
-    - [0x984F20, c, iwa_03_1_main]
-    - [0x984F20, c, iwa_03_2_entity]
-    - [0x985260, c, iwa_03_3_npc]
-    - [0x986240, c, iwa_03_4_slide]
+    - [0x984F20, c, settings]
+    - [0x984F20, c, main]
+    - [0x984F20, c, entity]
+    - [0x985260, c, npc]
+    - [0x986240, c, slide]
   - name: iwa_04
     dir: world/area_iwa/iwa_04
     type: code
     start: 0x987C50
     vram: 0x80240000
     subsegments:
-    - [0x987C50, c, iwa_04_0_header]
-    - [0x987C50, c, iwa_04_1_music]
-    - [0x987C50, c, iwa_04_2_main]
-    - [0x987C50, c, iwa_04_3_entity]
-    - [0x987CD0, c, iwa_04_4_npc]
+    - [0x987C50, c, settings]
+    - [0x987C50, c, music]
+    - [0x987C50, c, main]
+    - [0x987C50, c, entity]
+    - [0x987CD0, c, npc]
   - name: iwa_10
     dir: world/area_iwa/iwa_10
     type: code
     start: 0x98A8E0
     vram: 0x80240000
     subsegments:
-    - [0x98A8E0, c, iwa_10_0_header]
-    - [0x98A8E0, c, iwa_10_1_music]
-    - [0x98A8E0, c, iwa_10_2_main]
-    - [0x98A920, c, iwa_10_3_npc]
-    - [0x98AA40, c, iwa_10_4_train]
-    - [0x98ABD0, c, iwa_10_5_entity]
-    - [0x98B910, c, iwa_10_6_parakarry]
-    - [0x98BDF0, c, iwa_10_7_new_partner]
-    - [0x98BE90, c, iwa_10_8_foliage]
+    - [0x98A8E0, c, settings]
+    - [0x98A8E0, c, music]
+    - [0x98A8E0, c, main]
+    - [0x98A920, c, npc]
+    - [0x98AA40, c, train]
+    - [0x98ABD0, c, entity]
+    - [0x98B910, c, parakarry]
+    - [0x98BDF0, c, new_partner]
+    - [0x98BE90, c, foliage]
   - name: iwa_11
     dir: world/area_iwa/iwa_11
     type: code
     start: 0x992D80
     vram: 0x80240000
     subsegments:
-    - [0x992D80, c, iwa_11_0_header]
-    - [0x992D80, c, iwa_11_1_music]
-    - [0x992D80, c, iwa_11_2_main]
-    - [0x992DA0, c, iwa_11_3_train]
-    - [0x993000, c, iwa_11_4_scenery]
-    - [0x993090, c, iwa_11_5_npc]
+    - [0x992D80, c, settings]
+    - [0x992D80, c, music]
+    - [0x992D80, c, main]
+    - [0x992DA0, c, train]
+    - [0x993000, c, scenery]
+    - [0x993090, c, npc]
   - name: sbk_00
     dir: world/area_sbk/sbk_00
     type: code
     start: 0x995600
     vram: 0x80240000
     subsegments:
-    - [0x995600, c, sbk_00_0_header]
-    - [0x995600, c, sbk_00_1_main]
-    - [0x995640, c, sbk_00_2_npc]
-    - [0x995660, c, sbk_00_3_entity]
+    - [0x995600, c, settings]
+    - [0x995600, c, main]
+    - [0x995640, c, npc]
+    - [0x995660, c, entity]
   - name: sbk_01
     dir: world/area_sbk/sbk_01
     type: code
     start: 0x995E20
     vram: 0x80240000
     subsegments:
-    - [0x995E20, c, sbk_01_1_main]
-    - [0x995E60, c, sbk_01_2_npc]
+    - [0x995E20, c, main]
+    - [0x995E60, c, npc]
   - name: sbk_02
     dir: world/area_sbk/sbk_02
     type: code
     start: 0x996640
     vram: 0x80240000
     subsegments:
-    - [0x996640, c, sbk_02_0_header]
-    - [0x996680, c, sbk_02_1_music]
-    - [0x996680, c, sbk_02_2_main]
-    - [0x996680, c, sbk_02_3_ruins]
-    - [0x996D30, c, sbk_02_4_npc]
-    - [0x997240, c, sbk_02_5_entity]
+    - [0x996640, c, settings]
+    - [0x996680, c, music]
+    - [0x996680, c, main]
+    - [0x996680, c, ruins]
+    - [0x996D30, c, npc]
+    - [0x997240, c, entity]
   - name: sbk_03
     dir: world/area_sbk/sbk_03
     type: code
     start: 0x99BC40
     vram: 0x80240000
     subsegments:
-    - [0x99BC40, c, sbk_03_1_main]
-    - [0x99BC80, c, sbk_03_2_npc]
+    - [0x99BC40, c, main]
+    - [0x99BC80, c, npc]
   - name: sbk_04
     dir: world/area_sbk/sbk_04
     type: code
     start: 0x99C860
     vram: 0x80240000
     subsegments:
-    - [0x99C860, c, sbk_04_1_main]
-    - [0x99C8A0, c, sbk_04_2_npc]
+    - [0x99C860, c, main]
+    - [0x99C8A0, c, npc]
   - name: sbk_05
     dir: world/area_sbk/sbk_05
     type: code
     start: 0x99D080
     vram: 0x80240000
     subsegments:
-    - [0x99D080, c, sbk_05_1_main]
-    - [0x99D0C0, c, sbk_05_2_entity]
-    - [0x99D0C0, c, sbk_05_3_npc]
+    - [0x99D080, c, main]
+    - [0x99D0C0, c, entity]
+    - [0x99D0C0, c, npc]
   - name: sbk_06
     dir: world/area_sbk/sbk_06
     type: code
     start: 0x99E950
     vram: 0x80240000
     subsegments:
-    - [0x99E950, c, sbk_06_1_main]
-    - [0x99E990, c, sbk_06_2_npc]
-    - [0x99EA90, c, sbk_06_3_foliage]
-    - [0x99ECD0, c, sbk_06_4_entity]
+    - [0x99E950, c, main]
+    - [0x99E990, c, npc]
+    - [0x99EA90, c, foliage]
+    - [0x99ECD0, c, entity]
   - name: sbk_10
     dir: world/area_sbk/sbk_10
     type: code
     start: 0x9A0010
     vram: 0x80240000
     subsegments:
-    - [0x9A0010, c, sbk_10_1_main]
-    - [0x9A0050, c, sbk_10_2_entity]
+    - [0x9A0010, c, main]
+    - [0x9A0050, c, entity]
   - name: sbk_11
     dir: world/area_sbk/sbk_11
     type: code
     start: 0x9A03D0
     vram: 0x80240000
     subsegments:
-    - [0x9A03D0, c, sbk_11_1_main]
-    - [0x9A0410, c, sbk_11_2_npc]
+    - [0x9A03D0, c, main]
+    - [0x9A0410, c, npc]
   - name: sbk_12
     dir: world/area_sbk/sbk_12
     type: code
     start: 0x9A10D0
     vram: 0x80240000
     subsegments:
-    - [0x9A10D0, c, sbk_12_1_main]
-    - [0x9A1110, c, sbk_12_2_npc]
+    - [0x9A10D0, c, main]
+    - [0x9A1110, c, npc]
   - name: sbk_13
     dir: world/area_sbk/sbk_13
     type: code
     start: 0x9A1B70
     vram: 0x80240000
     subsegments:
-    - [0x9A1B70, c, sbk_13_1_main]
-    - [0x9A1BB0, c, sbk_13_2_npc]
+    - [0x9A1B70, c, main]
+    - [0x9A1BB0, c, npc]
   - name: sbk_14
     dir: world/area_sbk/sbk_14
     type: code
     start: 0x9A2A70
     vram: 0x80240000
     subsegments:
-    - [0x9A2A70, c, sbk_14_1_main]
-    - [0x9A2AB0, c, sbk_14_2_entity]
+    - [0x9A2A70, c, main]
+    - [0x9A2AB0, c, entity]
   - name: sbk_15
     dir: world/area_sbk/sbk_15
     type: code
     start: 0x9A3060
     vram: 0x80240000
     subsegments:
-    - [0x9A3060, c, sbk_15_1_main]
-    - [0x9A30A0, c, sbk_15_2_npc]
+    - [0x9A3060, c, main]
+    - [0x9A30A0, c, npc]
   - name: sbk_16
     dir: world/area_sbk/sbk_16
     type: code
     start: 0x9A3900
     vram: 0x80240000
     subsegments:
-    - [0x9A3900, c, sbk_16_1_main]
-    - [0x9A3940, c, sbk_16_2_foliage]
+    - [0x9A3900, c, main]
+    - [0x9A3940, c, foliage]
   - name: sbk_20
     dir: world/area_sbk/sbk_20
     type: code
     start: 0x9A4920
     vram: 0x80240000
     subsegments:
-    - [0x9A4920, c, sbk_20_1_main]
-    - [0x9A4960, c, sbk_20_2_entity]
-    - [0x9A4960, c, sbk_20_2_npc]
+    - [0x9A4920, c, main]
+    - [0x9A4960, c, entity]
+    - [0x9A4960, c, npc]
   - name: sbk_21
     dir: world/area_sbk/sbk_21
     type: code
     start: 0x9A58F0
     vram: 0x80240000
     subsegments:
-    - [0x9A58F0, c, sbk_21_1_main]
+    - [0x9A58F0, c, main]
   - name: sbk_22
     dir: world/area_sbk/sbk_22
     type: code
     start: 0x9A5CC0
     vram: 0x80240000
     subsegments:
-    - [0x9A5CC0, c, sbk_22_1_main]
-    - [0x9A5D00, c, sbk_22_2_npc]
-    - [0x9A5E20, c, sbk_22_3_entity]
+    - [0x9A5CC0, c, main]
+    - [0x9A5D00, c, npc]
+    - [0x9A5E20, c, entity]
   - name: sbk_23
     dir: world/area_sbk/sbk_23
     type: code
     start: 0x9A6AF0
     vram: 0x80240000
     subsegments:
-    - [0x9A6AF0, c, sbk_23_1_main]
-    - [0x9A6B30, c, sbk_23_2_entity]
+    - [0x9A6AF0, c, main]
+    - [0x9A6B30, c, entity]
   - name: sbk_24
     dir: world/area_sbk/sbk_24
     type: code
     start: 0x9A6FC0
     vram: 0x80240000
     subsegments:
-    - [0x9A6FC0, c, sbk_24_1_main]
-    - [0x9A7000, c, sbk_24_2_npc]
-    - [0x9A7100, c, sbk_24_3_entity]
-    - [0x9A7100, c, sbk_24_4_foliage]
+    - [0x9A6FC0, c, main]
+    - [0x9A7000, c, npc]
+    - [0x9A7100, c, entity]
+    - [0x9A7100, c, foliage]
   - name: sbk_25
     dir: world/area_sbk/sbk_25
     type: code
     start: 0x9A8610
     vram: 0x80240000
     subsegments:
-    - [0x9A8610, c, sbk_25_1_main]
-    - [0x9A8650, c, sbk_25_2_npc]
-    - [0x9A8750, c, sbk_25_3_foliage]
-    - [0x9A8990, c, sbk_25_4_entity]
+    - [0x9A8610, c, main]
+    - [0x9A8650, c, npc]
+    - [0x9A8750, c, foliage]
+    - [0x9A8990, c, entity]
   - name: sbk_26
     dir: world/area_sbk/sbk_26
     type: code
     start: 0x9AA060
     vram: 0x80240000
     subsegments:
-    - [0x9AA060, c, sbk_26_1_main]
-    - [0x9AA0A0, c, sbk_26_2_npc]
-    - [0x9AA1C0, c, sbk_26_3_foliage]
+    - [0x9AA060, c, main]
+    - [0x9AA0A0, c, npc]
+    - [0x9AA1C0, c, foliage]
   - name: sbk_30
     dir: world/area_sbk/sbk_30
     type: code
     start: 0x9AB940
     vram: 0x80240000
     subsegments:
-    - [0x9AB940, c, sbk_30_0_header]
-    - [0x9AB980, c, sbk_30_1_music]
-    - [0x9AB980, c, sbk_30_2_main]
-    - [0x9ABCB0, c, sbk_30_3_npc]
-    - [0x9ACF10, c, sbk_30_4_foliage]
+    - [0x9AB940, c, settings]
+    - [0x9AB980, c, music]
+    - [0x9AB980, c, main]
+    - [0x9ABCB0, c, npc]
+    - [0x9ACF10, c, foliage]
   - name: sbk_31
     dir: world/area_sbk/sbk_31
     type: code
     start: 0x9B0390
     vram: 0x80240000
     subsegments:
-    - [0x9B0390, c, sbk_31_1_main]
-    - [0x9B03D0, c, sbk_31_2_npc]
+    - [0x9B0390, c, main]
+    - [0x9B03D0, c, npc]
   - name: sbk_32
     dir: world/area_sbk/sbk_32
     type: code
     start: 0x9B0DF0
     vram: 0x80240000
     subsegments:
-    - [0x9B0DF0, c, sbk_32_1_main]
-    - [0x9B0E30, c, sbk_32_2_npc]
+    - [0x9B0DF0, c, main]
+    - [0x9B0E30, c, npc]
   - name: sbk_33
     dir: world/area_sbk/sbk_33
     type: code
     start: 0x9B1D60
     vram: 0x80240000
     subsegments:
-    - [0x9B1D60, c, sbk_33_0_header]
-    - [0x9B1D60, c, sbk_33_1_entity]
-    - [0x9B1D60, c, sbk_33_2_main]
+    - [0x9B1D60, c, settings]
+    - [0x9B1D60, c, entity]
+    - [0x9B1D60, c, main]
   - name: sbk_34
     dir: world/area_sbk/sbk_34
     type: code
     start: 0x9B2260
     vram: 0x80240000
     subsegments:
-    - [0x9B2260, c, sbk_34_1_main]
-    - [0x9B22A0, c, sbk_34_2_npc]
-    - [0x9B2A00, c, sbk_34_3_foliage]
+    - [0x9B2260, c, main]
+    - [0x9B22A0, c, npc]
+    - [0x9B2A00, c, foliage]
   - name: sbk_35
     dir: world/area_sbk/sbk_35
     type: code
     start: 0x9B4A40
     vram: 0x80240000
     subsegments:
-    - [0x9B4A40, c, sbk_35_1_main]
-    - [0x9B4A80, c, sbk_35_2_npc]
-    - [0x9B4B80, c, sbk_35_3_foliage]
+    - [0x9B4A40, c, main]
+    - [0x9B4A80, c, npc]
+    - [0x9B4B80, c, foliage]
   - name: sbk_36
     dir: world/area_sbk/sbk_36
     type: code
     start: 0x9B61F0
     vram: 0x80240000
     subsegments:
-    - [0x9B61F0, c, sbk_36_1_main]
-    - [0x9B6230, c, sbk_36_2_foliage]
-    - [0x9B6470, c, sbk_36_3_entity]
+    - [0x9B61F0, c, main]
+    - [0x9B6230, c, foliage]
+    - [0x9B6470, c, entity]
   - name: sbk_40
     dir: world/area_sbk/sbk_40
     type: code
     start: 0x9B7730
     vram: 0x80240000
     subsegments:
-    - [0x9B7730, c, sbk_40_1_main]
-    - [0x9B7770, c, sbk_40_2_npc]
-    - [0x9B7870, c, sbk_40_3_entity]
+    - [0x9B7730, c, main]
+    - [0x9B7770, c, npc]
+    - [0x9B7870, c, entity]
   - name: sbk_41
     dir: world/area_sbk/sbk_41
     type: code
     start: 0x9B83D0
     vram: 0x80240000
     subsegments:
-    - [0x9B83D0, c, sbk_41_1_main]
-    - [0x9B8410, c, sbk_41_2_entity]
+    - [0x9B83D0, c, main]
+    - [0x9B8410, c, entity]
   - name: sbk_42
     dir: world/area_sbk/sbk_42
     type: code
     start: 0x9B88A0
     vram: 0x80240000
     subsegments:
-    - [0x9B88A0, c, sbk_42_1_main]
-    - [0x9B88E0, c, sbk_42_2_npc]
+    - [0x9B88A0, c, main]
+    - [0x9B88E0, c, npc]
   - name: sbk_43
     dir: world/area_sbk/sbk_43
     type: code
     start: 0x9B9500
     vram: 0x80240000
     subsegments:
-    - [0x9B9500, c, sbk_43_1_main]
-    - [0x9B9540, c, sbk_43_2_entity]
+    - [0x9B9500, c, main]
+    - [0x9B9540, c, entity]
   - name: sbk_44
     dir: world/area_sbk/sbk_44
     type: code
     start: 0x9B9930
     vram: 0x80240000
     subsegments:
-    - [0x9B9930, c, sbk_44_1_main]
-    - [0x9B9970, c, sbk_44_2_npc]
+    - [0x9B9930, c, main]
+    - [0x9B9970, c, npc]
   - name: sbk_45
     dir: world/area_sbk/sbk_45
     type: code
     start: 0x9BA830
     vram: 0x80240000
     subsegments:
-    - [0x9BA830, c, sbk_45_1_main]
-    - [0x9BA870, c, sbk_45_2_entity]
+    - [0x9BA830, c, main]
+    - [0x9BA870, c, entity]
   - name: sbk_46
     dir: world/area_sbk/sbk_46
     type: code
     start: 0x9BAD30
     vram: 0x80240000
     subsegments:
-    - [0x9BAD30, c, sbk_46_1_main]
-    - [0x9BAD70, c, sbk_46_2_npc]
-    - [0x9BAE90, c, sbk_46_3_foliage]
-    - [0x9BB0D0, c, sbk_46_4_entity]
+    - [0x9BAD30, c, main]
+    - [0x9BAD70, c, npc]
+    - [0x9BAE90, c, foliage]
+    - [0x9BB0D0, c, entity]
   - name: sbk_50
     dir: world/area_sbk/sbk_50
     type: code
     start: 0x9BC9A0
     vram: 0x80240000
     subsegments:
-    - [0x9BC9A0, c, sbk_50_1_main]
+    - [0x9BC9A0, c, main]
   - name: sbk_51
     dir: world/area_sbk/sbk_51
     type: code
     start: 0x9BCD00
     vram: 0x80240000
     subsegments:
-    - [0x9BCD00, c, sbk_51_1_main]
-    - [0x9BCD40, c, sbk_51_2_npc]
+    - [0x9BCD00, c, main]
+    - [0x9BCD40, c, npc]
   - name: sbk_52
     dir: world/area_sbk/sbk_52
     type: code
     start: 0x9BDA00
     vram: 0x80240000
     subsegments:
-    - [0x9BDA00, c, sbk_52_1_main]
-    - [0x9BDA40, c, sbk_52_2_entity]
+    - [0x9BDA00, c, main]
+    - [0x9BDA40, c, entity]
   - name: sbk_53
     dir: world/area_sbk/sbk_53
     type: code
     start: 0x9BDE70
     vram: 0x80240000
     subsegments:
-    - [0x9BDE70, c, sbk_53_1_main]
-    - [0x9BDEB0, c, sbk_53_2_npc]
+    - [0x9BDE70, c, main]
+    - [0x9BDEB0, c, npc]
   - name: sbk_54
     dir: world/area_sbk/sbk_54
     type: code
     start: 0x9BE910
     vram: 0x80240000
     subsegments:
-    - [0x9BE910, c, sbk_54_1_main]
-    - [0x9BE950, c, sbk_54_2_entity]
+    - [0x9BE910, c, main]
+    - [0x9BE950, c, entity]
   - name: sbk_55
     dir: world/area_sbk/sbk_55
     type: code
     start: 0x9BEDE0
     vram: 0x80240000
     subsegments:
-    - [0x9BEDE0, c, sbk_55_1_main]
-    - [0x9BEE20, c, sbk_55_2_npc]
-    - [0x9BEE40, c, sbk_55_3_foliage]
-    - [0x9BF080, c, sbk_55_4_entity]
+    - [0x9BEDE0, c, main]
+    - [0x9BEE20, c, npc]
+    - [0x9BEE40, c, foliage]
+    - [0x9BF080, c, entity]
   - name: sbk_56
     dir: world/area_sbk/sbk_56
     type: code
     start: 0x9C0350
     vram: 0x80240000
     subsegments:
-    - [0x9C0350, c, sbk_56_1_main]
-    - [0x9C03D0, c, sbk_56_2_entity]
-    - [0x9C1110, c, sbk_56_3_foliage]
+    - [0x9C0350, c, main]
+    - [0x9C03D0, c, entity]
+    - [0x9C1110, c, foliage]
   - name: sbk_60
     dir: world/area_sbk/sbk_60
     type: code
     start: 0x9C2D80
     vram: 0x80240000
     subsegments:
-    - [0x9C2D80, c, sbk_60_1_main]
-    - [0x9C2DC0, c, sbk_60_2_npc]
+    - [0x9C2D80, c, main]
+    - [0x9C2DC0, c, npc]
   - name: sbk_61
     dir: world/area_sbk/sbk_61
     type: code
     start: 0x9C3320
     vram: 0x80240000
     subsegments:
-    - [0x9C3320, c, sbk_61_1_main]
-    - [0x9C3360, c, sbk_61_2_entity]
+    - [0x9C3320, c, main]
+    - [0x9C3360, c, entity]
   - name: sbk_62
     dir: world/area_sbk/sbk_62
     type: code
     start: 0x9C36E0
     vram: 0x80240000
     subsegments:
-    - [0x9C36E0, c, sbk_62_1_main]
-    - [0x9C3720, c, sbk_62_2_npc]
+    - [0x9C36E0, c, main]
+    - [0x9C3720, c, npc]
   - name: sbk_63
     dir: world/area_sbk/sbk_63
     type: code
     start: 0x9C4100
     vram: 0x80240000
     subsegments:
-    - [0x9C4100, c, sbk_63_1_main]
-    - [0x9C4140, c, sbk_63_2_npc]
+    - [0x9C4100, c, main]
+    - [0x9C4140, c, npc]
   - name: sbk_64
     dir: world/area_sbk/sbk_64
     type: code
     start: 0x9C4920
     vram: 0x80240000
     subsegments:
-    - [0x9C4920, c, sbk_64_1_main]
-    - [0x9C4960, c, sbk_64_2_entity]
+    - [0x9C4920, c, main]
+    - [0x9C4960, c, entity]
   - name: sbk_65
     dir: world/area_sbk/sbk_65
     type: code
     start: 0x9C4CE0
     vram: 0x80240000
     subsegments:
-    - [0x9C4CE0, c, sbk_65_1_main]
+    - [0x9C4CE0, c, main]
   - name: sbk_66
     dir: world/area_sbk/sbk_66
     type: code
     start: 0x9C5040
     vram: 0x80240000
     subsegments:
-    - [0x9C5040, c, sbk_66_1_main]
-    - [0x9C5080, c, sbk_66_2_npc]
-    - [0x9C5180, c, sbk_66_3_foliage]
-    - [0x9C53C0, c, sbk_66_4_entity]
+    - [0x9C5040, c, main]
+    - [0x9C5080, c, npc]
+    - [0x9C5180, c, foliage]
+    - [0x9C53C0, c, entity]
   - name: sbk_99
     dir: world/area_sbk/sbk_99
     type: code
     start: 0x9C7240
     vram: 0x80240000
     subsegments:
-    - [0x9C7240, c, sbk_99_1_main]
-    - [0x9C7240, c, sbk_99_2_entity]
+    - [0x9C7240, c, main]
+    - [0x9C7240, c, entity]
   - name: dro_01
     dir: world/area_dro/dro_01
     type: code
     start: 0x9C7590
     vram: 0x80240000
     subsegments:
-    - [0x9C7590, c, dro_01_0_header]
-    - [0x9C7590, c, dro_01_1_music]
-    - [0x9C7590, c, dro_01_2_main]
-    - [0x9C7B70, c, dro_01_3_npc]
-    - [0x9CA9F0, c, dro_01_4_shop]
-    - [0x9CAB30, c, dro_01_5_rooms]
-    - [0x9CAB30, c, dro_01_6_entity]
-    - [0x9CAE10, c, dro_01_7_foliage]
+    - [0x9C7590, c, settings]
+    - [0x9C7590, c, music]
+    - [0x9C7590, c, main]
+    - [0x9C7B70, c, npc]
+    - [0x9CA9F0, c, shop]
+    - [0x9CAB30, c, rooms]
+    - [0x9CAB30, c, entity]
+    - [0x9CAE10, c, foliage]
   - name: dro_02
     dir: world/area_dro/dro_02
     type: code
     start: 0x9D55A0
     vram: 0x80240000
     subsegments:
-    - [0x9D55A0, c, dro_02_0_header]
-    - [0x9D55A0, c, dro_02_1_music]
-    - [0x9D55A0, c, dro_02_2_entity]
-    - [0x9D55A0, c, dro_02_3_main]
-    - [0x9D58A0, c, dro_02_4_rooms]
-    - [0x9D58A0, c, dro_02_5_npc]
-    - [0x9D9010, .data, dro_02_0_header]
-    - [0x9D9090, .data, dro_02_1_music]
-    - [0x9D9170, .data, dro_02_2_entity]
-    - [0x9D91E0, .data, dro_02_3_main]
-    - [0x9D9760, .data, dro_02_4_rooms]
+    - [0x9D55A0, c, settings]
+    - [0x9D55A0, c, music]
+    - [0x9D55A0, c, entity]
+    - [0x9D55A0, c, main]
+    - [0x9D58A0, c, rooms]
+    - [0x9D58A0, c, npc]
+    - [0x9D9010, .data, settings]
+    - [0x9D9090, .data, music]
+    - [0x9D9170, .data, entity]
+    - [0x9D91E0, .data, main]
+    - [0x9D9760, .data, rooms]
     - start: 0x9DA380
       type: .data
-      name: dro_02_5_npc
+      name: npc
       subsegments:
       - [0x9DA380]
       - [0x9DCBC8, ci4, card, 32, 32]
@@ -8098,1459 +8098,1459 @@ segments:
     start: 0x9E4560
     vram: 0x80240000
     subsegments:
-    - [0x9E4560, c, isk_01_0_header]
-    - [0x9E4560, c, isk_01_1_music]
-    - [0x9E4560, c, isk_01_2_main]
-    - [0x9E4560, c, isk_01_3_haze]
-    - [0x9E4560, c, isk_01_4_entity]
+    - [0x9E4560, c, settings]
+    - [0x9E4560, c, music]
+    - [0x9E4560, c, main]
+    - [0x9E4560, c, haze]
+    - [0x9E4560, c, entity]
   - name: isk_02
     dir: world/area_isk/isk_02
     type: code
     start: 0x9E4AC0
     vram: 0x80240000
     subsegments:
-    - [0x9E4AC0, c, isk_02_0_header]
-    - [0x9E4AC0, c, isk_02_1_main]
-    - [0x9E4AC0, c, isk_02_2_lock]
-    - [0x9E4B00, c, isk_02_3_ambush]
-    - [0x9E4BB0, c, isk_02_4_entity]
-    - [0x9E4BB0, c, isk_02_5_npc]
+    - [0x9E4AC0, c, settings]
+    - [0x9E4AC0, c, main]
+    - [0x9E4AC0, c, lock]
+    - [0x9E4B00, c, ambush]
+    - [0x9E4BB0, c, entity]
+    - [0x9E4BB0, c, npc]
   - name: isk_03
     dir: world/area_isk/isk_03
     type: code
     start: 0x9E6190
     vram: 0x80240000
     subsegments:
-    - [0x9E6190, c, isk_03_0_header]
-    - [0x9E6190, c, isk_03_1_main]
-    - [0x9E6190, c, isk_03_2_sand]
-    - [0x9E6190, c, isk_03_3_entity]
-    - [0x9E6190, c, isk_03_4_switch]
+    - [0x9E6190, c, settings]
+    - [0x9E6190, c, main]
+    - [0x9E6190, c, sand]
+    - [0x9E6190, c, entity]
+    - [0x9E6190, c, switch]
   - name: isk_04
     dir: world/area_isk/isk_04
     type: code
     start: 0x9E7900
     vram: 0x80240000
     subsegments:
-    - [0x9E7900, c, isk_04_0_header]
-    - [0x9E7900, c, isk_04_1_music]
-    - [0x9E7900, c, isk_04_2_main]
-    - [0x9E7900, c, isk_04_3_obstructions]
-    - [0x9E7940, c, isk_04_4_entity]
-    - [0x9E7940, c, isk_04_5_npc]
-    - [0x9E8230, c, isk_04_6_demo]
+    - [0x9E7900, c, settings]
+    - [0x9E7900, c, music]
+    - [0x9E7900, c, main]
+    - [0x9E7900, c, obstructions]
+    - [0x9E7940, c, entity]
+    - [0x9E7940, c, npc]
+    - [0x9E8230, c, demo]
   - name: isk_05
     dir: world/area_isk/isk_05
     type: code
     start: 0x9E9D30
     vram: 0x80240000
     subsegments:
-    - [0x9E9D30, c, isk_05_0_header]
-    - [0x9E9D30, c, isk_05_1_main]
-    - [0x9E9D30, c, isk_05_2_entity]
-    - [0x9E9D30, c, isk_05_3_npc]
+    - [0x9E9D30, c, settings]
+    - [0x9E9D30, c, main]
+    - [0x9E9D30, c, entity]
+    - [0x9E9D30, c, npc]
   - name: isk_06
     dir: world/area_isk/isk_06
     type: code
     start: 0x9ECC10
     vram: 0x80240000
     subsegments:
-    - [0x9ECC10, c, isk_06_0_header]
-    - [0x9ECC10, c, isk_06_1_main]
-    - [0x9ECC10, c, isk_06_2_entity]
-    - [0x9ECC10, c, isk_06_3_sand]
-    - [0x9ECC10, c, isk_06_4_switch]
+    - [0x9ECC10, c, settings]
+    - [0x9ECC10, c, main]
+    - [0x9ECC10, c, entity]
+    - [0x9ECC10, c, sand]
+    - [0x9ECC10, c, switch]
   - name: isk_07
     dir: world/area_isk/isk_07
     type: code
     start: 0x9EE5C0
     vram: 0x80240000
     subsegments:
-    - [0x9EE5C0, c, isk_07_0_header]
-    - [0x9EE5C0, c, isk_07_1_main]
-    - [0x9EE5C0, c, isk_07_2_entity]
-    - [0x9EE5C0, c, isk_07_3_npc]
-    - [0x9EE670, c, isk_07_4_stairs]
-    - [0x9EE670, c, isk_07_5_lock]
-    - [0x9EE6B0, c, isk_07_6_switch]
-    - [0x9EE6D0, c, isk_07_7_ambush]
+    - [0x9EE5C0, c, settings]
+    - [0x9EE5C0, c, main]
+    - [0x9EE5C0, c, entity]
+    - [0x9EE5C0, c, npc]
+    - [0x9EE670, c, stairs]
+    - [0x9EE670, c, lock]
+    - [0x9EE6B0, c, switch]
+    - [0x9EE6D0, c, ambush]
   - name: isk_08
     dir: world/area_isk/isk_08
     type: code
     start: 0x9F0F40
     vram: 0x80240000
     subsegments:
-    - [0x9F0F40, c, isk_08_0_header]
-    - [0x9F0F40, c, isk_08_1_main]
-    - [0x9F0F40, c, isk_08_2_npc]
-    - [0x9F1830, c, isk_08_3_entity]
+    - [0x9F0F40, c, settings]
+    - [0x9F0F40, c, main]
+    - [0x9F0F40, c, npc]
+    - [0x9F1830, c, entity]
   - name: isk_09
     dir: world/area_isk/isk_09
     type: code
     start: 0x9F2580
     vram: 0x80240000
     subsegments:
-    - [0x9F2580, c, isk_09_0_header]
-    - [0x9F2580, c, isk_09_1_music]
-    - [0x9F2580, c, isk_09_2_main]
-    - [0x9F2580, c, isk_09_3_entity]
-    - [0x9F2870, c, isk_09_4_stairs]
-    - [0x9F2870, c, isk_09_5_switch]
+    - [0x9F2580, c, settings]
+    - [0x9F2580, c, music]
+    - [0x9F2580, c, main]
+    - [0x9F2580, c, entity]
+    - [0x9F2870, c, stairs]
+    - [0x9F2870, c, switch]
   - name: isk_10
     dir: world/area_isk/isk_10
     type: code
     start: 0x9F4B90
     vram: 0x80240000
     subsegments:
-    - [0x9F4B90, c, isk_10_0_header]
-    - [0x9F4B90, c, isk_10_1_main]
-    - [0x9F4B90, c, isk_10_2_entity]
-    - [0x9F5940, c, isk_10_3_bombable]
+    - [0x9F4B90, c, settings]
+    - [0x9F4B90, c, main]
+    - [0x9F4B90, c, entity]
+    - [0x9F5940, c, bombable]
   - name: isk_11
     dir: world/area_isk/isk_11
     type: code
     start: 0x9F69D0
     vram: 0x80240000
     subsegments:
-    - [0x9F69D0, c, isk_11_0_header]
-    - [0x9F69D0, c, isk_11_1_music]
-    - [0x9F69D0, c, isk_11_2_main]
-    - [0x9F69D0, c, isk_11_3_entity]
-    - [0x9F69D0, c, isk_11_4_scene]
-    - [0x9F6A80, c, isk_11_5_puzzle]
-    - [0x9F6AF0, c, isk_11_6_lock]
+    - [0x9F69D0, c, settings]
+    - [0x9F69D0, c, music]
+    - [0x9F69D0, c, main]
+    - [0x9F69D0, c, entity]
+    - [0x9F69D0, c, scene]
+    - [0x9F6A80, c, puzzle]
+    - [0x9F6AF0, c, lock]
   - name: isk_12
     dir: world/area_isk/isk_12
     type: code
     start: 0x9F9600
     vram: 0x80240000
     subsegments:
-    - [0x9F9600, c, isk_12_0_header]
-    - [0x9F9600, c, isk_12_1_main]
-    - [0x9F9600, c, isk_12_2_entity]
-    - [0x9F9600, c, isk_12_3_sand]
-    - [0x9F9600, c, isk_12_4_switch]
+    - [0x9F9600, c, settings]
+    - [0x9F9600, c, main]
+    - [0x9F9600, c, entity]
+    - [0x9F9600, c, sand]
+    - [0x9F9600, c, switch]
   - name: isk_13
     dir: world/area_isk/isk_13
     type: code
     start: 0x9FB730
     vram: 0x80240000
     subsegments:
-    - [0x9FB730, c, isk_13_0_header]
-    - [0x9FB730, c, isk_13_1_main]
-    - [0x9FB730, c, isk_13_2_entity]
-    - [0x9FB730, c, isk_13_3_npc]
+    - [0x9FB730, c, settings]
+    - [0x9FB730, c, main]
+    - [0x9FB730, c, entity]
+    - [0x9FB730, c, npc]
   - name: isk_14
     dir: world/area_isk/isk_14
     type: code
     start: 0x9FE610
     vram: 0x80240000
     subsegments:
-    - [0x9FE610, c, isk_14_0_header]
-    - [0x9FE610, c, isk_14_1_main]
-    - [0x9FE610, c, isk_14_2_entity]
-    - [0x9FE610, c, isk_14_3_npc]
+    - [0x9FE610, c, settings]
+    - [0x9FE610, c, main]
+    - [0x9FE610, c, entity]
+    - [0x9FE610, c, npc]
   - name: isk_16
     dir: world/area_isk/isk_16
     type: code
     start: 0xA01060
     vram: 0x80240000
     subsegments:
-    - [0xA01060, c, isk_16_0_header]
-    - [0xA01060, c, isk_16_1_main]
-    - [0xA01860, c, isk_16_2_npc]
-    - [0xA01860, c, isk_16_3_boss]
-    - [0xA01B60, c, isk_16_4_entity]
+    - [0xA01060, c, settings]
+    - [0xA01060, c, main]
+    - [0xA01860, c, npc]
+    - [0xA01860, c, boss]
+    - [0xA01B60, c, entity]
   - name: isk_18
     dir: world/area_isk/isk_18
     type: code
     start: 0xA03DE0
     vram: 0x80240000
     subsegments:
-    - [0xA03DE0, c, isk_18_0_header]
-    - [0xA03DE0, c, isk_18_1_main]
-    - [0xA03DE0, c, isk_18_2_npc]
-    - [0xA046D0, c, isk_18_3_entity]
+    - [0xA03DE0, c, settings]
+    - [0xA03DE0, c, main]
+    - [0xA03DE0, c, npc]
+    - [0xA046D0, c, entity]
   - name: isk_19
     dir: world/area_isk/isk_19
     type: code
     start: 0xA05540
     vram: 0x80240000
     subsegments:
-    - [0xA05540, c, isk_19_0_header]
-    - [0xA05540, c, isk_19_1_music]
-    - [0xA05540, c, isk_19_2_main]
-    - [0xA05540, c, isk_19_3_entity]
+    - [0xA05540, c, settings]
+    - [0xA05540, c, music]
+    - [0xA05540, c, main]
+    - [0xA05540, c, entity]
   - name: trd_00
     dir: world/area_trd/trd_00
     type: code
     start: 0xA05A70
     vram: 0x80240000
     subsegments:
-    - [0xA05A70, c, trd_00_0_header]
-    - [0xA05A70, c, trd_00_1_main]
-    - [0xA05D80, c, trd_00_2_entity]
-    - [0xA06040, c, trd_00_3_npc]
+    - [0xA05A70, c, settings]
+    - [0xA05A70, c, main]
+    - [0xA05D80, c, entity]
+    - [0xA06040, c, npc]
   - name: trd_01
     dir: world/area_trd/trd_01
     type: code
     start: 0xA08790
     vram: 0x80240000
     subsegments:
-    - [0xA08790, c, trd_01_0_header]
-    - [0xA08790, c, trd_01_1_main]
-    - [0xA08AA0, c, trd_01_2_entity]
-    - [0xA08B80, c, trd_01_3_npc]
+    - [0xA08790, c, settings]
+    - [0xA08790, c, main]
+    - [0xA08AA0, c, entity]
+    - [0xA08B80, c, npc]
   - name: trd_02
     dir: world/area_trd/trd_02
     type: code
     start: 0xA0CDE0
     vram: 0x80240000
     subsegments:
-    - [0xA0CDE0, c, trd_02_0_header]
-    - [0xA0CDE0, c, trd_02_1_main]
-    - [0xA0CDE0, c, trd_02_2_entity]
-    - [0xA0CEC0, c, trd_02_3_npc]
+    - [0xA0CDE0, c, settings]
+    - [0xA0CDE0, c, main]
+    - [0xA0CDE0, c, entity]
+    - [0xA0CEC0, c, npc]
   - name: trd_03
     dir: world/area_trd/trd_03
     type: code
     start: 0xA10450
     vram: 0x80240000
     subsegments:
-    - [0xA10450, c, trd_03_0_header]
-    - [0xA10450, c, trd_03_1_main]
-    - [0xA104F0, c, trd_03_2_entity]
-    - [0xA104F0, c, trd_03_3_npc]
-    - [0xA10CD0, c, trd_03_4_puzzle]
+    - [0xA10450, c, settings]
+    - [0xA10450, c, main]
+    - [0xA104F0, c, entity]
+    - [0xA104F0, c, npc]
+    - [0xA10CD0, c, puzzle]
   - name: trd_04
     dir: world/area_trd/trd_04
     type: code
     start: 0xA141F0
     vram: 0x80240000
     subsegments:
-    - [0xA141F0, c, trd_04_0_header]
-    - [0xA141F0, c, trd_04_1_main]
-    - [0xA14500, c, trd_04_2_entity]
-    - [0xA146A0, c, trd_04_3_npc]
+    - [0xA141F0, c, settings]
+    - [0xA141F0, c, main]
+    - [0xA14500, c, entity]
+    - [0xA146A0, c, npc]
   - name: trd_05
     dir: world/area_trd/trd_05
     type: code
     start: 0xA1A500
     vram: 0x80240000
     subsegments:
-    - [0xA1A500, c, trd_05_0_header]
-    - [0xA1A500, c, trd_05_1_main]
-    - [0xA1A520, c, trd_05_2_entity]
-    - [0xA1A520, c, trd_05_3_trap]
-    - [0xA1AC20, c, trd_05_4_npc]
+    - [0xA1A500, c, settings]
+    - [0xA1A500, c, main]
+    - [0xA1A520, c, entity]
+    - [0xA1A520, c, trap]
+    - [0xA1AC20, c, npc]
   - name: trd_06
     dir: world/area_trd/trd_06
     type: code
     start: 0xA1D590
     vram: 0x80240000
     subsegments:
-    - [0xA1D590, c, trd_06_0_header]
-    - [0xA1D590, c, trd_06_1_main]
-    - [0xA1D8A0, c, trd_06_2_falling]
-    - [0xA1E080, c, trd_06_3_npc_prisoners]
-    - [0xA1E210, c, trd_06_4_npc_koopa_bros]
-    - [0xA1E2B0, c, trd_06_5_entity]
+    - [0xA1D590, c, settings]
+    - [0xA1D590, c, main]
+    - [0xA1D8A0, c, falling]
+    - [0xA1E080, c, npc_prisoners]
+    - [0xA1E210, c, npc_koopa_bros]
+    - [0xA1E2B0, c, entity]
   - name: trd_07
     dir: world/area_trd/trd_07
     type: code
     start: 0xA22770
     vram: 0x80240000
     subsegments:
-    - [0xA22770, c, trd_07_0_header]
-    - [0xA22770, c, trd_07_1_main]
-    - [0xA22A80, c, trd_07_2_npc]
-    - [0xA24D70, c, trd_07_3_magic_doors]
+    - [0xA22770, c, settings]
+    - [0xA22770, c, main]
+    - [0xA22A80, c, npc]
+    - [0xA24D70, c, magic_doors]
   - name: trd_08
     dir: world/area_trd/trd_08
     type: code
     start: 0xA27090
     vram: 0x80240000
     subsegments:
-    - [0xA27090, c, trd_08_0_header]
-    - [0xA27090, c, trd_08_1_main]
-    - [0xA273A0, c, trd_08_2_entity]
-    - [0xA273A0, c, trd_08_3_npc]
+    - [0xA27090, c, settings]
+    - [0xA27090, c, main]
+    - [0xA273A0, c, entity]
+    - [0xA273A0, c, npc]
   - name: trd_09
     dir: world/area_trd/trd_09
     type: code
     start: 0xA29450
     vram: 0x80240000
     subsegments:
-    - [0xA29450, c, trd_09_0_header]
-    - [0xA29450, c, trd_09_1_main]
-    - [0xA29450, c, trd_09_2_entity]
-    - [0xA29450, c, trd_09_3_npc]
-    - [0xA29510, c, trd_09_4_demo]
+    - [0xA29450, c, settings]
+    - [0xA29450, c, main]
+    - [0xA29450, c, entity]
+    - [0xA29450, c, npc]
+    - [0xA29510, c, demo]
   - name: trd_10
     dir: world/area_trd/trd_10
     type: code
     start: 0xA2E700
     vram: 0x80240000
     subsegments:
-    - [0xA2E700, c, trd_10_0_header]
-    - [0xA2E700, c, trd_10_1_main]
-    - [0xA2EF20, c, trd_10_2_npc]
-    - [0xA2EF50, c, trd_10_3_fake_bowser]
+    - [0xA2E700, c, settings]
+    - [0xA2E700, c, main]
+    - [0xA2EF20, c, npc]
+    - [0xA2EF50, c, fake_bowser]
   - name: nok_01
     dir: world/area_nok/nok_01
     type: code
     start: 0xA311D0
     vram: 0x80240000
     subsegments:
-    - [0xA311D0, c, nok_01_0_header]
-    - [0xA311D0, c, nok_01_1_music]
-    - [0xA311D0, c, nok_01_2_main]
-    - [0xA311D0, c, nok_01_3_entity]
-    - [0xA311D0, c, nok_01_4_npc]
-    - [0xA33930, c, nok_01_5_shop]
-    - [0xA33930, c, nok_01_6_rooms]
-    - [0xA33990, c, nok_01_7_radio]
-    - [0xA33B00, c, nok_01_8_foliage]
+    - [0xA311D0, c, settings]
+    - [0xA311D0, c, music]
+    - [0xA311D0, c, main]
+    - [0xA311D0, c, entity]
+    - [0xA311D0, c, npc]
+    - [0xA33930, c, shop]
+    - [0xA33930, c, rooms]
+    - [0xA33990, c, radio]
+    - [0xA33B00, c, foliage]
   - name: nok_02
     dir: world/area_nok/nok_02
     type: code
     start: 0xA42E70
     vram: 0x80240000
     subsegments:
-    - [0xA42E70, c, nok_02_0_header]
-    - [0xA42E70, c, nok_02_1_music]
-    - [0xA42E70, c, nok_02_2_main]
-    - [0xA435C0, c, nok_02_3_entity]
-    - [0xA437E0, c, nok_02_4_rooms]
-    - [0xA438F0, c, nok_02_5_bookshelf]
-    - [0xA438F0, c, nok_02_6_npc]
-    - [0xA46740, c, nok_02_7_demo]
-    - [0xA46830, c, nok_02_8_koot_favors]
-    - [0xA471D0, c, nok_02_9_foliage]
-    - [0xA47410, c, nok_02_10_epilogue]
+    - [0xA42E70, c, settings]
+    - [0xA42E70, c, music]
+    - [0xA42E70, c, main]
+    - [0xA435C0, c, entity]
+    - [0xA437E0, c, rooms]
+    - [0xA438F0, c, bookshelf]
+    - [0xA438F0, c, npc]
+    - [0xA46740, c, demo]
+    - [0xA46830, c, koot_favors]
+    - [0xA471D0, c, foliage]
+    - [0xA47410, c, epilogue]
   - name: nok_03
     dir: world/area_nok/nok_03
     type: code
     start: 0xA57680
     vram: 0x80240000
     subsegments:
-    - [0xA57680, c, nok_03_0_header]
-    - [0xA57680, c, nok_03_1_music]
-    - [0xA57680, c, nok_03_2_main]
-    - [0xA57680, c, nok_03_3_entity]
-    - [0xA57680, c, nok_03_4_npc]
+    - [0xA57680, c, settings]
+    - [0xA57680, c, music]
+    - [0xA57680, c, main]
+    - [0xA57680, c, entity]
+    - [0xA57680, c, npc]
   - name: nok_04
     dir: world/area_nok/nok_04
     type: code
     start: 0xA59A80
     vram: 0x80240000
     subsegments:
-    - [0xA59A80, c, nok_04_0_header]
-    - [0xA59A80, c, nok_04_1_music]
-    - [0xA59A80, c, nok_04_2_main]
-    - [0xA59A80, c, nok_04_3_entity]
-    - [0xA59A80, c, nok_04_4_npc]
-    - [0xA5A910, c, nok_04_5_new_partner]
+    - [0xA59A80, c, settings]
+    - [0xA59A80, c, music]
+    - [0xA59A80, c, main]
+    - [0xA59A80, c, entity]
+    - [0xA59A80, c, npc]
+    - [0xA5A910, c, new_partner]
   - name: nok_11
     dir: world/area_nok/nok_11
     type: code
     start: 0xA608D0
     vram: 0x80240000
     subsegments:
-    - [0xA608D0, c, nok_11_0_header]
-    - [0xA608D0, c, nok_11_1_music]
-    - [0xA608D0, c, nok_11_2_main]
-    - [0xA608D0, c, nok_11_3_entity]
-    - [0xA608D0, c, nok_11_4_npc]
+    - [0xA608D0, c, settings]
+    - [0xA608D0, c, music]
+    - [0xA608D0, c, main]
+    - [0xA608D0, c, entity]
+    - [0xA608D0, c, npc]
   - name: nok_12
     dir: world/area_nok/nok_12
     type: code
     start: 0xA66680
     vram: 0x80240000
     subsegments:
-    - [0xA66680, c, nok_12_0_header]
-    - [0xA66680, c, nok_12_1_music]
-    - [0xA66680, c, nok_12_2_main]
-    - [0xA66800, c, nok_12_3_entity]
-    - [0xA66970, c, nok_12_4_bridge]
-    - [0xA669B0, c, nok_12_5_foliage]
-    - [0xA66BF0, c, nok_12_6_npc]
-    - [0xA68560, c, nok_12_7_demo]
+    - [0xA66680, c, settings]
+    - [0xA66680, c, music]
+    - [0xA66680, c, main]
+    - [0xA66800, c, entity]
+    - [0xA66970, c, bridge]
+    - [0xA669B0, c, foliage]
+    - [0xA66BF0, c, npc]
+    - [0xA68560, c, demo]
   - name: nok_13
     dir: world/area_nok/nok_13
     type: code
     start: 0xA6C490
     vram: 0x80240000
     subsegments:
-    - [0xA6C490, c, nok_13_0_header]
-    - [0xA6C490, c, nok_13_1_music]
-    - [0xA6C490, c, nok_13_2_main]
-    - [0xA6C490, c, nok_13_3_entity]
-    - [0xA6C490, c, nok_13_4_npc]
-    - [0xA6D2B0, c, nok_13_5]
+    - [0xA6C490, c, settings]
+    - [0xA6C490, c, music]
+    - [0xA6C490, c, main]
+    - [0xA6C490, c, entity]
+    - [0xA6C490, c, npc]
+    - [0xA6D2B0, c, musical_hill]
   - name: nok_14
     dir: world/area_nok/nok_14
     type: code
     start: 0xA6E6D0
     vram: 0x80240000
     subsegments:
-    - [0xA6E6D0, c, nok_14_0_header]
-    - [0xA6E6D0, c, nok_14_1_music]
-    - [0xA6E6D0, c, nok_14_2_main]
-    - [0xA6E850, c, nok_14_3_entity]
-    - [0xA6E850, c, nok_14_4_bridge]
-    - [0xA6E890, c, nok_14_5_npc]
+    - [0xA6E6D0, c, settings]
+    - [0xA6E6D0, c, music]
+    - [0xA6E6D0, c, main]
+    - [0xA6E850, c, entity]
+    - [0xA6E850, c, bridge]
+    - [0xA6E890, c, npc]
   - name: nok_15
     dir: world/area_nok/nok_15
     type: code
     start: 0xA72D90
     vram: 0x80240000
     subsegments:
-    - [0xA72D90, c, nok_15_0_header]
-    - [0xA72D90, c, nok_15_1_music]
-    - [0xA72D90, c, nok_15_2_main]
-    - [0xA73070, c, nok_15_3_entity]
-    - [0xA73070, c, nok_15_4_npc]
-    - [0xA752D0, c, nok_15_5_foliage]
+    - [0xA72D90, c, settings]
+    - [0xA72D90, c, music]
+    - [0xA72D90, c, main]
+    - [0xA73070, c, entity]
+    - [0xA73070, c, npc]
+    - [0xA752D0, c, foliage]
   - name: hos_00
     dir: world/area_hos/hos_00
     type: code
     start: 0xA77B80
     vram: 0x80240000
     subsegments:
-    - [0xA77B80, c, hos_00_0_header]
-    - [0xA77BD0, c, hos_00_1_music]
-    - [0xA77BD0, c, hos_00_2_main]
-    - [0xA78340, c, hos_00_3_unused]
-    - [0xA78340, c, hos_00_4_npc]
-    - [0xA78370, c, hos_00_5_entity]
-    - [0xA78370, c, hos_00_6_scenes]
-    - [0xA787C0, c, hos_00_7_shade_gfx]
+    - [0xA77B80, c, settings]
+    - [0xA77BD0, c, music]
+    - [0xA77BD0, c, main]
+    - [0xA78340, c, unused]
+    - [0xA78340, c, npc]
+    - [0xA78370, c, entity]
+    - [0xA78370, c, scenes]
+    - [0xA787C0, c, shade_gfx]
   - name: hos_01
     dir: world/area_hos/hos_01
     type: code
     start: 0xA7C710
     vram: 0x80240000
     subsegments:
-    - [0xA7C710, c, hos_01_0_header]
-    - [0xA7C710, c, hos_01_1_music]
-    - [0xA7C710, c, hos_01_2_main]
-    - [0xA7CEB0, c, hos_01_3_model_fx]
-    - [0xA7D3C0, c, hos_01_4_npc]
-    - [0xA7D4E0, c, hos_01_5_entity]
-    - [0xA7D4E0, c, hos_01_6_star_way]
+    - [0xA7C710, c, settings]
+    - [0xA7C710, c, music]
+    - [0xA7C710, c, main]
+    - [0xA7CEB0, c, model_fx]
+    - [0xA7D3C0, c, npc]
+    - [0xA7D4E0, c, entity]
+    - [0xA7D4E0, c, star_way]
   - name: hos_02
     dir: world/area_hos/hos_02
     type: code
     start: 0xA820E0
     vram: 0x80240000
     subsegments:
-    - [0xA820E0, c, hos_02_0_header]
-    - [0xA820E0, c, hos_02_1_music]
-    - [0xA820E0, c, hos_02_2_main]
-    - [0xA820E0, c, hos_02_3_model_fx]
-    - [0xA830B0, c, hos_02_4_unused]
-    - [0xA830D0, c, hos_02_5_npc]
-    - [0xA84BC0, c, hos_02_6_descent]
+    - [0xA820E0, c, settings]
+    - [0xA820E0, c, music]
+    - [0xA820E0, c, main]
+    - [0xA820E0, c, model_fx]
+    - [0xA830B0, c, unused]
+    - [0xA830D0, c, npc]
+    - [0xA84BC0, c, descent]
   - name: hos_03
     dir: world/area_hos/hos_03
     type: code
     start: 0xA86FC0
     vram: 0x80240000
     subsegments:
-    - [0xA86FC0, c, hos_03_0_header]
-    - [0xA86FC0, c, hos_03_1_music]
-    - [0xA86FC0, c, hos_03_2_main]
-    - [0xA86FF0, c, hos_03_3_model_fx]
-    - [0xA87A30, c, hos_03_4_rooms]
-    - [0xA87A30, c, hos_03_5_foliage]
-    - [0xA87C70, c, hos_03_6_npc]
-    - [0xA8A500, c, hos_03_7_shop]
-    - [0xA8A500, c, hos_03_8_entity]
+    - [0xA86FC0, c, settings]
+    - [0xA86FC0, c, music]
+    - [0xA86FC0, c, main]
+    - [0xA86FF0, c, model_fx]
+    - [0xA87A30, c, rooms]
+    - [0xA87A30, c, foliage]
+    - [0xA87C70, c, npc]
+    - [0xA8A500, c, shop]
+    - [0xA8A500, c, entity]
   - name: hos_04
     dir: world/area_hos/hos_04
     type: code
     start: 0xA92DD0
     vram: 0x80240000
     subsegments:
-    - [0xA92DD0, c, hos_04_0_header]
-    - [0xA92DD0, c, hos_04_1_music]
-    - [0xA92DD0, c, hos_04_2_main]
-    - [0xA92DD0, c, hos_04_3_fountains]
-    - [0xA93390, c, hos_04_4_unused]
-    - [0xA933B0, c, hos_04_6_intro]
-    - [0xA93930, c, hos_04_7_starship]
-    - [0xA939A0, c, hos_04_8_narrator]
+    - [0xA92DD0, c, settings]
+    - [0xA92DD0, c, music]
+    - [0xA92DD0, c, main]
+    - [0xA92DD0, c, fountains]
+    - [0xA93390, c, unused]
+    - [0xA933B0, c, intro]
+    - [0xA93930, c, starship]
+    - [0xA939A0, c, narrator]
   - name: hos_05
     dir: world/area_hos/hos_05
     type: code
     start: 0xA96140
     vram: 0x80240000
     subsegments:
-    - [0xA96140, c, hos_05_0_header]
-    - [0xA96140, c, hos_05_1_music]
-    - [0xA96140, c, hos_05_2_main]
-    - [0xA96140, c, hos_05_3_misc]
-    - [0xA96970, c, hos_05_4_npc]
-    - [0xA969C0, c, hos_05_5_intro]
-    - [0xA9AB20, c, hos_05_6_narrator]
-    - [0xA9ADF0, c, hos_05_7_model_fx]
-    - [0xA9B8F0, c, hos_05_8_star_ship]
+    - [0xA96140, c, settings]
+    - [0xA96140, c, music]
+    - [0xA96140, c, main]
+    - [0xA96140, c, misc]
+    - [0xA96970, c, npc]
+    - [0xA969C0, c, intro]
+    - [0xA9AB20, c, narrator]
+    - [0xA9ADF0, c, model_fx]
+    - [0xA9B8F0, c, star_ship]
   - name: hos_06
     dir: world/area_hos/hos_06
     type: code
     start: 0xAA5380
     vram: 0x80240000
     subsegments:
-    - [0xAA5380, c, hos_06_0_header]
-    - [0xAA5380, c, hos_06_1_entity]
-    - [0xAA5380, c, hos_06_2_main]
-    - [0xAA5690, c, hos_06_3_merlow]
-    - [0xAA60B0, c, hos_06_4_rooms]
-    - [0xAA60D0, c, hos_06_5_merluvlee]
-    - [0xAA7350, c, hos_06_6_chest]
+    - [0xAA5380, c, settings]
+    - [0xAA5380, c, entity]
+    - [0xAA5380, c, main]
+    - [0xAA5690, c, merlow]
+    - [0xAA60B0, c, rooms]
+    - [0xAA60D0, c, merluvlee]
+    - [0xAA7350, c, chest]
   - name: hos_10
     dir: world/area_hos/hos_10
     type: code
     start: 0xAAB5E0
     vram: 0x80240000
     subsegments:
-    - [0xAAB5E0, c, hos_10_0_header]
-    - [0xAAB600, c, hos_10_1_music]
-    - [0xAAB600, c, hos_10_2_npc1]
-    - [0xAAB600, c, hos_10_3_npc2]
-    - [0xAAB600, c, hos_10_4_main]
-    - [0xAAB600, c, hos_10_5_intro]
-    - [0xAABA40, c, hos_10_6_pre_title]
-    - [0xAABD50, c, hos_10_7_ending]
+    - [0xAAB5E0, c, settings]
+    - [0xAAB600, c, music]
+    - [0xAAB600, c, npc1]
+    - [0xAAB600, c, npc2]
+    - [0xAAB600, c, main]
+    - [0xAAB600, c, intro]
+    - [0xAABA40, c, pre_title]
+    - [0xAABD50, c, ending]
   - name: hos_20
     dir: world/area_hos/hos_20
     type: code
     start: 0xAB17D0
     vram: 0x80240000
     subsegments:
-    - [0xAB17D0, c, hos_20_0_header]
-    - [0xAB17D0, c, hos_20_1_main]
-    - [0xAB1AE0, c, hos_20_2_starship]
+    - [0xAB17D0, c, settings]
+    - [0xAB17D0, c, main]
+    - [0xAB1AE0, c, starship]
   - name: kpa_01
     dir: world/area_kpa/kpa_01
     type: code
     start: 0xAB2E00
     vram: 0x80240000
     subsegments:
-    - [0xAB2E00, c, kpa_01_0_header]
-    - [0xAB2E00, c, kpa_01_1_music]
-    - [0xAB2E00, c, kpa_01_2_main]
-    - [0xAB2F60, c, kpa_01_3_npc]
-    - [0xAB3850, c, kpa_01_4_entity]
+    - [0xAB2E00, c, settings]
+    - [0xAB2E00, c, music]
+    - [0xAB2E00, c, main]
+    - [0xAB2F60, c, npc]
+    - [0xAB3850, c, entity]
   - name: kpa_03
     dir: world/area_kpa/kpa_03
     type: code
     start: 0xAB4460
     vram: 0x80240000
     subsegments:
-    - [0xAB4460, c, kpa_03_0_header]
-    - [0xAB4460, c, kpa_03_1_music]
-    - [0xAB4460, c, kpa_03_2_main]
-    - [0xAB45C0, c, kpa_03_3_npc]
-    - [0xAB62B0, c, kpa_03_4_entity]
+    - [0xAB4460, c, settings]
+    - [0xAB4460, c, music]
+    - [0xAB4460, c, main]
+    - [0xAB45C0, c, npc]
+    - [0xAB62B0, c, entity]
   - name: kpa_04
     dir: world/area_kpa/kpa_04
     type: code
     start: 0xAB7E00
     vram: 0x80240000
     subsegments:
-    - [0xAB7E00, c, kpa_04_0_header]
-    - [0xAB7E00, c, kpa_04_1_music]
-    - [0xAB7E00, c, kpa_04_2_main]
-    - [0xAB7E00, c, kpa_04_3_statues]
+    - [0xAB7E00, c, settings]
+    - [0xAB7E00, c, music]
+    - [0xAB7E00, c, main]
+    - [0xAB7E00, c, statues]
   - name: kpa_08
     dir: world/area_kpa/kpa_08
     type: code
     start: 0xAB88C0
     vram: 0x80240000
     subsegments:
-    - [0xAB88C0, c, kpa_08_0_header]
-    - [0xAB88C0, c, kpa_08_1_music]
-    - [0xAB88C0, c, kpa_08_2_main]
-    - [0xAB88C0, c, kpa_08_3_entity]
-    - [0xAB8960, c, kpa_08_4_npc]
+    - [0xAB88C0, c, settings]
+    - [0xAB88C0, c, music]
+    - [0xAB88C0, c, main]
+    - [0xAB88C0, c, entity]
+    - [0xAB8960, c, npc]
   - name: kpa_09
     dir: world/area_kpa/kpa_09
     type: code
     start: 0xABAEA0
     vram: 0x80240000
     subsegments:
-    - [0xABAEA0, c, kpa_09_0_header]
-    - [0xABAEA0, c, kpa_09_1_music]
-    - [0xABAEA0, c, kpa_09_2_main]
-    - [0xABAEA0, c, kpa_09_3_entity]
-    - [0xABAF40, c, kpa_09_4_npc]
+    - [0xABAEA0, c, settings]
+    - [0xABAEA0, c, music]
+    - [0xABAEA0, c, main]
+    - [0xABAEA0, c, entity]
+    - [0xABAF40, c, npc]
   - name: kpa_10
     dir: world/area_kpa/kpa_10
     type: code
     start: 0xABD820
     vram: 0x80240000
     subsegments:
-    - [0xABD820, c, kpa_10_0_header]
-    - [0xABD820, c, kpa_10_1_music]
-    - [0xABD820, c, kpa_10_2_main]
-    - [0xABDB30, c, kpa_10_3_npc]
-    - [0xABDB30, c, kpa_10_4_entity]
+    - [0xABD820, c, settings]
+    - [0xABD820, c, music]
+    - [0xABD820, c, main]
+    - [0xABDB30, c, npc]
+    - [0xABDB30, c, entity]
   - name: kpa_11
     dir: world/area_kpa/kpa_11
     type: code
     start: 0xABE760
     vram: 0x80240000
     subsegments:
-    - [0xABE760, c, kpa_11_0_header]
-    - [0xABE760, c, kpa_11_1_music]
-    - [0xABE760, c, kpa_11_2_main]
-    - [0xABEA70, c, kpa_11_3_entity]
-    - [0xABEA70, c, kpa_11_4_npc]
+    - [0xABE760, c, settings]
+    - [0xABE760, c, music]
+    - [0xABE760, c, main]
+    - [0xABEA70, c, entity]
+    - [0xABEA70, c, npc]
   - name: kpa_12
     dir: world/area_kpa/kpa_12
     type: code
     start: 0xAC07F0
     vram: 0x80240000
     subsegments:
-    - [0xAC07F0, c, kpa_12_0_header]
-    - [0xAC0830, c, kpa_12_1_music]
-    - [0xAC0830, c, kpa_12_2_main]
-    - [0xAC0B40, c, kpa_12_3_platforms]
+    - [0xAC07F0, c, settings]
+    - [0xAC0830, c, music]
+    - [0xAC0830, c, main]
+    - [0xAC0B40, c, platforms]
   - name: kpa_13
     dir: world/area_kpa/kpa_13
     type: code
     start: 0xAC1DC0
     vram: 0x80240000
     subsegments:
-    - [0xAC1DC0, c, kpa_13_0_header]
-    - [0xAC1E00, c, kpa_13_1_music]
-    - [0xAC1E00, c, kpa_13_2_main]
-    - [0xAC2110, c, kpa_13_3_entity]
-    - [0xAC2110, c, kpa_13_4_platforms]
+    - [0xAC1DC0, c, settings]
+    - [0xAC1E00, c, music]
+    - [0xAC1E00, c, main]
+    - [0xAC2110, c, entity]
+    - [0xAC2110, c, platforms]
   - name: kpa_14
     dir: world/area_kpa/kpa_14
     type: code
     start: 0xAC3350
     vram: 0x80240000
     subsegments:
-    - [0xAC3350, c, kpa_14_0_header]
-    - [0xAC3390, c, kpa_14_1_music]
-    - [0xAC3390, c, kpa_14_2_main]
-    - [0xAC36D0, c, kpa_14_3_entity]
-    - [0xAC3A60, c, kpa_14_4_platforms]
+    - [0xAC3350, c, settings]
+    - [0xAC3390, c, music]
+    - [0xAC3390, c, main]
+    - [0xAC36D0, c, entity]
+    - [0xAC3A60, c, platforms]
   - name: kpa_15
     dir: world/area_kpa/kpa_15
     type: code
     start: 0xAC5230
     vram: 0x80240000
     subsegments:
-    - [0xAC5230, c, kpa_15_0_header]
-    - [0xAC5230, c, kpa_15_1_music]
-    - [0xAC5230, c, kpa_15_2_main]
-    - [0xAC5540, c, kpa_15_3_entity]
+    - [0xAC5230, c, settings]
+    - [0xAC5230, c, music]
+    - [0xAC5230, c, main]
+    - [0xAC5540, c, entity]
   - name: kpa_16
     dir: world/area_kpa/kpa_16
     type: code
     start: 0xAC5ED0
     vram: 0x80240000
     subsegments:
-    - [0xAC5ED0, c, kpa_16_0_header]
-    - [0xAC5ED0, c, kpa_16_1_music]
-    - [0xAC5ED0, c, kpa_16_2_main]
-    - [0xAC61E0, c, kpa_16_3_entity]
-    - [0xAC61E0, c, kpa_16_4_npc]
+    - [0xAC5ED0, c, settings]
+    - [0xAC5ED0, c, music]
+    - [0xAC5ED0, c, main]
+    - [0xAC61E0, c, entity]
+    - [0xAC61E0, c, npc]
   - name: kpa_17
     dir: world/area_kpa/kpa_17
     type: code
     start: 0xAC88C0
     vram: 0x80240000
     subsegments:
-    - [0xAC88C0, c, kpa_17_0_header]
-    - [0xAC88C0, c, kpa_17_1_music]
-    - [0xAC88C0, c, kpa_17_2_entity]
-    - [0xAC88C0, c, kpa_17_3_main]
-    - [0xAC88C0, c, kpa_17_4_npc]
+    - [0xAC88C0, c, settings]
+    - [0xAC88C0, c, music]
+    - [0xAC88C0, c, entity]
+    - [0xAC88C0, c, main]
+    - [0xAC88C0, c, npc]
   - name: kpa_32
     dir: world/area_kpa/kpa_32
     type: code
     start: 0xAC9F60
     vram: 0x80240000
     subsegments:
-    - [0xAC9F60, c, kpa_32_0_header]
-    - [0xAC9F60, c, kpa_32_1_music]
-    - [0xAC9F60, c, kpa_32_2_entity]
-    - [0xAC9F60, c, kpa_32_3_main]
+    - [0xAC9F60, c, settings]
+    - [0xAC9F60, c, music]
+    - [0xAC9F60, c, entity]
+    - [0xAC9F60, c, main]
   - name: kpa_33
     dir: world/area_kpa/kpa_33
     type: code
     start: 0xACAF20
     vram: 0x80240000
     subsegments:
-    - [0xACAF20, c, kpa_33_0_header]
-    - [0xACAF20, c, kpa_33_1_music]
-    - [0xACAF20, c, kpa_33_2_entity]
-    - [0xACAF20, c, kpa_33_3_main]
+    - [0xACAF20, c, settings]
+    - [0xACAF20, c, music]
+    - [0xACAF20, c, entity]
+    - [0xACAF20, c, main]
   - name: kpa_40
     dir: world/area_kpa/kpa_40
     type: code
     start: 0xACBEE0
     vram: 0x80240000
     subsegments:
-    - [0xACBEE0, c, kpa_40_0_header]
-    - [0xACBEE0, c, kpa_40_1_music]
-    - [0xACBEE0, c, kpa_40_2_main]
+    - [0xACBEE0, c, settings]
+    - [0xACBEE0, c, music]
+    - [0xACBEE0, c, main]
   - name: kpa_41
     dir: world/area_kpa/kpa_41
     type: code
     start: 0xACC310
     vram: 0x80240000
     subsegments:
-    - [0xACC310, c, kpa_41_0_header]
-    - [0xACC310, c, kpa_41_1_music]
-    - [0xACC310, c, kpa_41_2_main]
+    - [0xACC310, c, settings]
+    - [0xACC310, c, music]
+    - [0xACC310, c, main]
   - name: kpa_50
     dir: world/area_kpa/kpa_50
     type: code
     start: 0xACC870
     vram: 0x80240000
     subsegments:
-    - [0xACC870, c, kpa_50_0_header]
-    - [0xACC870, c, kpa_50_1_music]
-    - [0xACC870, c, kpa_50_2_main]
-    - [0xACC870, c, kpa_50_3_npc]
+    - [0xACC870, c, settings]
+    - [0xACC870, c, music]
+    - [0xACC870, c, main]
+    - [0xACC870, c, npc]
   - name: kpa_51
     dir: world/area_kpa/kpa_51
     type: code
     start: 0xACFF30
     vram: 0x80240000
     subsegments:
-    - [0xACFF30, c, kpa_51_0_header]
-    - [0xACFF30, c, kpa_51_1_music]
-    - [0xACFF30, c, kpa_51_2_main]
-    - [0xACFF80, c, kpa_51_3_npc]
+    - [0xACFF30, c, settings]
+    - [0xACFF30, c, music]
+    - [0xACFF30, c, main]
+    - [0xACFF80, c, npc]
   - name: kpa_52
     dir: world/area_kpa/kpa_52
     type: code
     start: 0xAD2FA0
     vram: 0x80240000
     subsegments:
-    - [0xAD2FA0, c, kpa_52_0_header]
-    - [0xAD2FA0, c, kpa_52_1_music]
-    - [0xAD2FA0, c, kpa_52_2_entity]
-    - [0xAD3080, c, kpa_52_3_main]
-    - [0xAD3080, c, kpa_52_4_npc]
+    - [0xAD2FA0, c, settings]
+    - [0xAD2FA0, c, music]
+    - [0xAD2FA0, c, entity]
+    - [0xAD3080, c, main]
+    - [0xAD3080, c, npc]
   - name: kpa_53
     dir: world/area_kpa/kpa_53
     type: code
     start: 0xAD6B40
     vram: 0x80240000
     subsegments:
-    - [0xAD6B40, c, kpa_53_0_header]
-    - [0xAD6B40, c, kpa_53_1_music]
-    - [0xAD6B40, c, kpa_53_2_main]
-    - [0xAD6B90, c, kpa_53_3_npc]
-    - [0xAD6CB0, c, kpa_53_4_entity]
+    - [0xAD6B40, c, settings]
+    - [0xAD6B40, c, music]
+    - [0xAD6B40, c, main]
+    - [0xAD6B90, c, npc]
+    - [0xAD6CB0, c, entity]
   - name: kpa_60
     dir: world/area_kpa/kpa_60
     type: code
     start: 0xAD89A0
     vram: 0x80240000
     subsegments:
-    - [0xAD89A0, c, kpa_60_0_header]
-    - [0xAD89A0, c, kpa_60_1_music]
-    - [0xAD89A0, c, kpa_60_2_entity]
-    - [0xAD8A80, c, kpa_60_3_main]
-    - [0xAD8D90, c, kpa_60_4_scenes]
+    - [0xAD89A0, c, settings]
+    - [0xAD89A0, c, music]
+    - [0xAD89A0, c, entity]
+    - [0xAD8A80, c, main]
+    - [0xAD8D90, c, scenes]
   - name: kpa_61
     dir: world/area_kpa/kpa_61
     type: code
     start: 0xADA280
     vram: 0x80240000
     subsegments:
-    - [0xADA280, c, kpa_61_0_header]
-    - [0xADA280, c, kpa_61_1_music]
-    - [0xADA280, c, kpa_61_2_main]
-    - [0xADA590, c, kpa_61_3_npc]
-    - [0xADC5C0, c, kpa_61_4_entity]
+    - [0xADA280, c, settings]
+    - [0xADA280, c, music]
+    - [0xADA280, c, main]
+    - [0xADA590, c, npc]
+    - [0xADC5C0, c, entity]
   - name: kpa_62
     dir: world/area_kpa/kpa_62
     type: code
     start: 0xADE0C0
     vram: 0x80240000
     subsegments:
-    - [0xADE0C0, c, kpa_62_0_header]
-    - [0xADE0C0, c, kpa_62_1_music]
-    - [0xADE0C0, c, kpa_62_2_entity]
-    - [0xADE1A0, c, kpa_62_3_main]
+    - [0xADE0C0, c, settings]
+    - [0xADE0C0, c, music]
+    - [0xADE0C0, c, entity]
+    - [0xADE1A0, c, main]
   - name: kpa_63
     dir: world/area_kpa/kpa_63
     type: code
     start: 0xADF450
     vram: 0x80240000
     subsegments:
-    - [0xADF450, c, kpa_63_0_header]
-    - [0xADF450, c, kpa_63_1_music]
-    - [0xADF450, c, kpa_63_2_entity]
-    - [0xADF450, c, kpa_63_3_main]
-    - [0xADF450, c, kpa_63_4_scenes]
+    - [0xADF450, c, settings]
+    - [0xADF450, c, music]
+    - [0xADF450, c, entity]
+    - [0xADF450, c, main]
+    - [0xADF450, c, scenes]
   - name: kpa_70
     dir: world/area_kpa/kpa_70
     type: code
     start: 0xAE0710
     vram: 0x80240000
     subsegments:
-    - [0xAE0710, c, kpa_70_0_header]
-    - [0xAE0710, c, kpa_70_1_music]
-    - [0xAE0710, c, kpa_70_2_main]
-    - [0xAE0A20, c, kpa_70_3_npc]
-    - [0xAE1200, c, kpa_70_4_chain_skele]
-    - [0xAE1200, c, kpa_70_5_chain_anim]
+    - [0xAE0710, c, settings]
+    - [0xAE0710, c, music]
+    - [0xAE0710, c, main]
+    - [0xAE0A20, c, npc]
+    - [0xAE1200, c, chain_skele]
+    - [0xAE1200, c, chain_anim]
   - name: kpa_81
     dir: world/area_kpa/kpa_81
     type: code
     start: 0xAE4360
     vram: 0x80240000
     subsegments:
-    - [0xAE4360, c, kpa_81_0_header]
-    - [0xAE4360, c, kpa_81_1_music]
-    - [0xAE4360, c, kpa_81_2_main]
-    - [0xAE43B0, c, kpa_81_3_npc]
+    - [0xAE4360, c, settings]
+    - [0xAE4360, c, music]
+    - [0xAE4360, c, main]
+    - [0xAE43B0, c, npc]
   - name: kpa_82
     dir: world/area_kpa/kpa_82
     type: code
     start: 0xAE63A0
     vram: 0x80240000
     subsegments:
-    - [0xAE63A0, c, kpa_82_0_header]
-    - [0xAE63A0, c, kpa_82_1_music]
-    - [0xAE63A0, c, kpa_82_2_main]
-    - [0xAE63F0, c, kpa_82_3_npc]
+    - [0xAE63A0, c, settings]
+    - [0xAE63A0, c, music]
+    - [0xAE63A0, c, main]
+    - [0xAE63F0, c, npc]
   - name: kpa_83
     dir: world/area_kpa/kpa_83
     type: code
     start: 0xAEF330
     vram: 0x80240000
     subsegments:
-    - [0xAEF330, c, kpa_83_0_header]
-    - [0xAEF330, c, kpa_83_1_music]
-    - [0xAEF330, c, kpa_83_2_main]
-    - [0xAEF380, c, kpa_83_3_npc]
+    - [0xAEF330, c, settings]
+    - [0xAEF330, c, music]
+    - [0xAEF330, c, main]
+    - [0xAEF380, c, npc]
   - name: kpa_90
     dir: world/area_kpa/kpa_90
     type: code
     start: 0xAF2650
     vram: 0x80240000
     subsegments:
-    - [0xAF2650, c, kpa_90_0_header]
-    - [0xAF2650, c, kpa_90_1_music]
-    - [0xAF2650, c, kpa_90_2_main]
+    - [0xAF2650, c, settings]
+    - [0xAF2650, c, music]
+    - [0xAF2650, c, main]
   - name: kpa_91
     dir: world/area_kpa/kpa_91
     type: code
     start: 0xAF28F0
     vram: 0x80240000
     subsegments:
-    - [0xAF28F0, c, kpa_91_0_header]
-    - [0xAF28F0, c, kpa_91_1_music]
-    - [0xAF28F0, c, kpa_91_2_main]
-    - [0xAF28F0, c, kpa_91_3_npc]
-    - [0xAF4120, c, kpa_91_4_entity]
+    - [0xAF28F0, c, settings]
+    - [0xAF28F0, c, music]
+    - [0xAF28F0, c, main]
+    - [0xAF28F0, c, npc]
+    - [0xAF4120, c, entity]
   - name: kpa_94
     dir: world/area_kpa/kpa_94
     type: code
     start: 0xAF8660
     vram: 0x80240000
     subsegments:
-    - [0xAF8660, c, kpa_94_0_header]
-    - [0xAF8660, c, kpa_94_1_music]
-    - [0xAF8660, c, kpa_94_2_main]
+    - [0xAF8660, c, settings]
+    - [0xAF8660, c, music]
+    - [0xAF8660, c, main]
   - name: kpa_95
     dir: world/area_kpa/kpa_95
     type: code
     start: 0xAF8920
     vram: 0x80240000
     subsegments:
-    - [0xAF8920, c, kpa_95_0_header]
-    - [0xAF8920, c, kpa_95_1_music]
-    - [0xAF8920, c, kpa_95_2_entity]
-    - [0xAF8A00, c, kpa_95_3_main]
-    - [0xAF8A00, c, kpa_95_4_npc]
+    - [0xAF8920, c, settings]
+    - [0xAF8920, c, music]
+    - [0xAF8920, c, entity]
+    - [0xAF8A00, c, main]
+    - [0xAF8A00, c, npc]
   - name: kpa_96
     dir: world/area_kpa/kpa_96
     type: code
     start: 0xAFE660
     vram: 0x80240000
     subsegments:
-    - [0xAFE660, c, kpa_96_0_header]
-    - [0xAFE660, c, kpa_96_1_music]
-    - [0xAFE660, c, kpa_96_2_main]
-    - [0xAFE660, c, kpa_96_3_npc]
+    - [0xAFE660, c, settings]
+    - [0xAFE660, c, music]
+    - [0xAFE660, c, main]
+    - [0xAFE660, c, npc]
   - name: kpa_100
     dir: world/area_kpa/kpa_100
     type: code
     start: 0xAFF000
     vram: 0x80240000
     subsegments:
-    - [0xAFF000, c, kpa_100_0_header]
-    - [0xAFF000, c, kpa_100_1_music]
-    - [0xAFF000, c, kpa_100_2_main]
-    - [0xAFF050, c, kpa_100_3_entity]
+    - [0xAFF000, c, settings]
+    - [0xAFF000, c, music]
+    - [0xAFF000, c, main]
+    - [0xAFF050, c, entity]
   - name: kpa_101
     dir: world/area_kpa/kpa_101
     type: code
     start: 0xAFF2E0
     vram: 0x80240000
     subsegments:
-    - [0xAFF2E0, c, kpa_101_0_header]
-    - [0xAFF2E0, c, kpa_101_1_music]
-    - [0xAFF2E0, c, kpa_101_2_main]
-    - [0xAFF330, c, kpa_101_3_entity]
+    - [0xAFF2E0, c, settings]
+    - [0xAFF2E0, c, music]
+    - [0xAFF2E0, c, main]
+    - [0xAFF330, c, entity]
   - name: kpa_102
     dir: world/area_kpa/kpa_102
     type: code
     start: 0xAFF5E0
     vram: 0x80240000
     subsegments:
-    - [0xAFF5E0, c, kpa_102_0_header]
-    - [0xAFF5E0, c, kpa_102_1_music]
-    - [0xAFF5E0, c, kpa_102_2_main]
-    - [0xAFF8F0, c, kpa_102_3_npc]
+    - [0xAFF5E0, c, settings]
+    - [0xAFF5E0, c, music]
+    - [0xAFF5E0, c, main]
+    - [0xAFF8F0, c, npc]
   - name: kpa_111
     dir: world/area_kpa/kpa_111
     type: code
     start: 0xB05430
     vram: 0x80240000
     subsegments:
-    - [0xB05430, c, kpa_111_0_header]
-    - [0xB05430, c, kpa_111_1_music]
-    - [0xB05430, c, kpa_111_2_main]
-    - [0xB05430, c, kpa_111_3_statues]
-    - [0xB055A0, c, kpa_111_4_npc]
-    - [0xB067F0, c, kpa_111_5_entity]
+    - [0xB05430, c, settings]
+    - [0xB05430, c, music]
+    - [0xB05430, c, main]
+    - [0xB05430, c, statues]
+    - [0xB055A0, c, npc]
+    - [0xB067F0, c, entity]
   - name: kpa_112
     dir: world/area_kpa/kpa_112
     type: code
     start: 0xB08830
     vram: 0x80240000
     subsegments:
-    - [0xB08830, c, kpa_112_0_header]
-    - [0xB08830, c, kpa_112_1_music]
-    - [0xB08830, c, kpa_112_2_main]
+    - [0xB08830, c, settings]
+    - [0xB08830, c, music]
+    - [0xB08830, c, main]
   - name: kpa_113
     dir: world/area_kpa/kpa_113
     type: code
     start: 0xB08AD0
     vram: 0x80240000
     subsegments:
-    - [0xB08AD0, c, kpa_113_0_header]
-    - [0xB08AD0, c, kpa_113_1_music]
-    - [0xB08AD0, c, kpa_113_2_main]
-    - [0xB08AD0, c, kpa_113_3_entity]
-    - [0xB08B10, c, kpa_113_4_statues]
-    - [0xB08C80, c, kpa_113_5_npc]
+    - [0xB08AD0, c, settings]
+    - [0xB08AD0, c, music]
+    - [0xB08AD0, c, main]
+    - [0xB08AD0, c, entity]
+    - [0xB08B10, c, statues]
+    - [0xB08C80, c, npc]
   - name: kpa_114
     dir: world/area_kpa/kpa_114
     type: code
     start: 0xB0A820
     vram: 0x80240000
     subsegments:
-    - [0xB0A820, c, kpa_114_0_header]
-    - [0xB0A820, c, kpa_114_1_music]
-    - [0xB0A820, c, kpa_114_2_main]
-    - [0xB0A870, c, kpa_114_3_entity]
+    - [0xB0A820, c, settings]
+    - [0xB0A820, c, music]
+    - [0xB0A820, c, main]
+    - [0xB0A870, c, entity]
   - name: kpa_115
     dir: world/area_kpa/kpa_115
     type: code
     start: 0xB0ABE0
     vram: 0x80240000
     subsegments:
-    - [0xB0ABE0, c, kpa_115_0_header]
-    - [0xB0ABE0, c, kpa_115_1_music]
-    - [0xB0ABE0, c, kpa_115_2_main]
-    - [0xB0ABE0, c, kpa_115_3_statues]
-    - [0xB0AD50, c, kpa_115_4_npc]
+    - [0xB0ABE0, c, settings]
+    - [0xB0ABE0, c, music]
+    - [0xB0ABE0, c, main]
+    - [0xB0ABE0, c, statues]
+    - [0xB0AD50, c, npc]
   - name: kpa_116
     dir: world/area_kpa/kpa_116
     type: code
     start: 0xB0DD80
     vram: 0x80240000
     subsegments:
-    - [0xB0DD80, c, kpa_116_0_header]
-    - [0xB0DD80, c, kpa_116_1_music]
-    - [0xB0DD80, c, kpa_116_2_main]
+    - [0xB0DD80, c, settings]
+    - [0xB0DD80, c, music]
+    - [0xB0DD80, c, main]
   - name: kpa_117
     dir: world/area_kpa/kpa_117
     type: code
     start: 0xB0E020
     vram: 0x80240000
     subsegments:
-    - [0xB0E020, c, kpa_117_0_header]
-    - [0xB0E020, c, kpa_117_1_music]
-    - [0xB0E020, c, kpa_117_2_main]
+    - [0xB0E020, c, settings]
+    - [0xB0E020, c, music]
+    - [0xB0E020, c, main]
   - name: kpa_118
     dir: world/area_kpa/kpa_118
     type: code
     start: 0xB0E260
     vram: 0x80240000
     subsegments:
-    - [0xB0E260, c, kpa_118_0_header]
-    - [0xB0E260, c, kpa_118_1_music]
-    - [0xB0E260, c, kpa_118_2_main]
+    - [0xB0E260, c, settings]
+    - [0xB0E260, c, music]
+    - [0xB0E260, c, main]
   - name: kpa_119
     dir: world/area_kpa/kpa_119
     type: code
     start: 0xB0E500
     vram: 0x80240000
     subsegments:
-    - [0xB0E500, c, kpa_119_0_header]
-    - [0xB0E500, c, kpa_119_1_music]
-    - [0xB0E500, c, kpa_119_2_entity]
-    - [0xB0E500, c, kpa_119_3_main]
+    - [0xB0E500, c, settings]
+    - [0xB0E500, c, music]
+    - [0xB0E500, c, entity]
+    - [0xB0E500, c, main]
   - name: kpa_121
     dir: world/area_kpa/kpa_121
     type: code
     start: 0xB0E790
     vram: 0x80240000
     subsegments:
-    - [0xB0E790, c, kpa_121_0_header]
-    - [0xB0E790, c, kpa_121_1_music]
-    - [0xB0E790, c, kpa_121_2_main]
+    - [0xB0E790, c, settings]
+    - [0xB0E790, c, music]
+    - [0xB0E790, c, main]
   - name: kpa_130
     dir: world/area_kpa/kpa_130
     type: code
     start: 0xB0EBC0
     vram: 0x80240000
     subsegments:
-    - [0xB0EBC0, c, kpa_130_0_header]
-    - [0xB0EBC0, c, kpa_130_1_music]
-    - [0xB0EBC0, c, kpa_130_2_main]
-    - [0xB0EBC0, c, kpa_130_3_npc]
+    - [0xB0EBC0, c, settings]
+    - [0xB0EBC0, c, music]
+    - [0xB0EBC0, c, main]
+    - [0xB0EBC0, c, npc]
   - name: kpa_133
     dir: world/area_kpa/kpa_133
     type: code
     start: 0xB13320
     vram: 0x80240000
     subsegments:
-    - [0xB13320, c, kpa_133_0_header]
-    - [0xB13320, c, kpa_133_1_music]
-    - [0xB13320, c, kpa_133_2_main]
-    - [0xB13630, c, kpa_133_3_entity]
-    - [0xB13790, c, kpa_133_4_npc]
-    - [0xB13790, c, kpa_133_5_water]
-    - [0xB13790, c, kpa_133_6]
+    - [0xB13320, c, settings]
+    - [0xB13320, c, music]
+    - [0xB13320, c, main]
+    - [0xB13630, c, entity]
+    - [0xB13790, c, npc]
+    - [0xB13790, c, water]
+    - [0xB13790, c, ease]
   - name: kpa_134
     dir: world/area_kpa/kpa_134
     type: code
     start: 0xB14E40
     vram: 0x80240000
     subsegments:
-    - [0xB14E40, c, kpa_134_0_header]
-    - [0xB14E40, c, kpa_134_1_music]
-    - [0xB14E40, c, kpa_134_2_main]
-    - [0xB15150, c, kpa_134_3_chains]
-    - [0xB15350, c, kpa_134_4_npc]
-    - [0xB15350, c, kpa_134_5_panels]
-    - [0xB15350, c, kpa_134_6_entity]
+    - [0xB14E40, c, settings]
+    - [0xB14E40, c, music]
+    - [0xB14E40, c, main]
+    - [0xB15150, c, chains]
+    - [0xB15350, c, npc]
+    - [0xB15350, c, panels]
+    - [0xB15350, c, entity]
   - name: osr_00
     dir: world/area_osr/osr_00
     type: code
     start: 0xB186D0
     vram: 0x80240000
     subsegments:
-    - [0xB186D0, c, osr_00_0_header]
-    - [0xB186D0, c, osr_00_1_music]
-    - [0xB186D0, c, osr_00_2_main]
-    - [0xB18A50, c, osr_00_3_npc_intro]
-    - [0xB18A50, c, osr_00_4_npc_epilogue]
-    - [0xB18A50, c, osr_00_5_scenes]
+    - [0xB186D0, c, settings]
+    - [0xB186D0, c, music]
+    - [0xB186D0, c, main]
+    - [0xB18A50, c, npc_intro]
+    - [0xB18A50, c, npc_epilogue]
+    - [0xB18A50, c, scenes]
   - name: osr_01
     dir: world/area_osr/osr_01
     type: code
     start: 0xB1BE90
     vram: 0x80240000
     subsegments:
-    - [0xB1BE90, c, osr_01_0_header]
-    - [0xB1BEE0, c, osr_01_1_music]
-    - [0xB1BEE0, c, osr_01_2_main]
-    - [0xB1C1F0, c, osr_01_3_npc]
+    - [0xB1BE90, c, settings]
+    - [0xB1BEE0, c, music]
+    - [0xB1BEE0, c, main]
+    - [0xB1C1F0, c, npc]
   - name: osr_02
     dir: world/area_osr/osr_02
     type: code
     start: 0xB1E010
     vram: 0x80240000
     subsegments:
-    - [0xB1E010, c, osr_02_0_header]
-    - [0xB1E030, c, osr_02_1_main]
-    - [0xB1E070, c, osr_02_2_entity]
-    - [0xB1E070, c, osr_02_3_npc]
-    - [0xB1E130, c, osr_02_4_npc_peach]
+    - [0xB1E010, c, settings]
+    - [0xB1E030, c, main]
+    - [0xB1E070, c, entity]
+    - [0xB1E070, c, npc]
+    - [0xB1E130, c, npc_peach]
   - name: osr_03
     dir: world/area_osr/osr_03
     type: code
     start: 0xB22130
     vram: 0x80240000
     subsegments:
-    - [0xB22130, c, osr_03_0_header]
-    - [0xB22150, c, osr_03_1_main]
-    - [0xB22150, c, osr_03_2_npc]
-    - [0xB22150, c, osr_03_3_intro]
-    - [0xB221C0, c, osr_03_4_starship]
-    - [0xB221C0, c, osr_03_5_interlude]
-    - [0xB222D0, c, osr_03_6_ending]
+    - [0xB22130, c, settings]
+    - [0xB22150, c, main]
+    - [0xB22150, c, npc]
+    - [0xB22150, c, intro]
+    - [0xB221C0, c, starship]
+    - [0xB221C0, c, interlude]
+    - [0xB222D0, c, ending]
   - name: osr_04
     dir: world/area_osr/osr_04
     type: code
     start: 0xB25150
     vram: 0x80240000
     subsegments:
-    - [0xB25150, c, osr_04_0_header]
-    - [0xB25150, c, osr_04_1_main]
-    - [0xB25150, c, osr_04_2_assault]
+    - [0xB25150, c, settings]
+    - [0xB25150, c, main]
+    - [0xB25150, c, assault]
   - name: kkj_00
     dir: world/area_kkj/kkj_00
     type: code
     start: 0xB27130
     vram: 0x80240000
     subsegments:
-    - [0xB27130, c, kkj_00_0_header]
-    - [0xB27170, c, kkj_00_1_music]
-    - [0xB27170, c, kkj_00_2_main]
-    - [0xB271E0, c, kkj_00_3_npc_intro]
-    - [0xB28070, c, kkj_00_4_scene_intro]
-    - [0xB28070, c, kkj_00_5_npc_ending]
-    - [0xB28070, c, kkj_00_6_scene_ending]
+    - [0xB27130, c, settings]
+    - [0xB27170, c, music]
+    - [0xB27170, c, main]
+    - [0xB271E0, c, npc_intro]
+    - [0xB28070, c, scene_intro]
+    - [0xB28070, c, npc_ending]
+    - [0xB28070, c, scene_ending]
   - name: kkj_01
     dir: world/area_kkj/kkj_01
     type: code
     start: 0xB31010
     vram: 0x80240000
     subsegments:
-    - [0xB31010, c, kkj_01_0_header]
-    - [0xB31010, c, kkj_01_1_music]
-    - [0xB31010, c, kkj_01_2_main]
-    - [0xB31010, c, kkj_01_3_npc]
+    - [0xB31010, c, settings]
+    - [0xB31010, c, music]
+    - [0xB31010, c, main]
+    - [0xB31010, c, npc]
   - name: kkj_02
     dir: world/area_kkj/kkj_02
     type: code
     start: 0xB34BC0
     vram: 0x80240000
     subsegments:
-    - [0xB34BC0, c, kkj_02_0_header]
-    - [0xB34BC0, c, kkj_02_1_music]
-    - [0xB34BC0, c, kkj_02_2_main]
-    - [0xB34BC0, c, kkj_02_3_npc]
+    - [0xB34BC0, c, settings]
+    - [0xB34BC0, c, music]
+    - [0xB34BC0, c, main]
+    - [0xB34BC0, c, npc]
   - name: kkj_03
     dir: world/area_kkj/kkj_03
     type: code
     start: 0xB355B0
     vram: 0x80240000
     subsegments:
-    - [0xB355B0, c, kkj_03_0_header]
-    - [0xB355D0, c, kkj_03_1_music]
-    - [0xB355D0, c, kkj_03_2_main]
-    - [0xB358E0, c, kkj_03_3_npc]
-    - [0xB358E0, c, kkj_03_4_scenes]
+    - [0xB355B0, c, settings]
+    - [0xB355D0, c, music]
+    - [0xB355D0, c, main]
+    - [0xB358E0, c, npc]
+    - [0xB358E0, c, scenes]
   - name: kkj_10
     dir: world/area_kkj/kkj_10
     type: code
     start: 0xB369C0
     vram: 0x80240000
     subsegments:
-    - [0xB369C0, c, kkj_10_0_header]
-    - [0xB369C0, c, kkj_10_1_main]
-    - [0xB36A30, c, kkj_10_2_entity]
-    - [0xB36A70, c, kkj_10_3_npcs_early]
-    - [0xB37260, c, kkj_10_4_npcs_later]
+    - [0xB369C0, c, settings]
+    - [0xB369C0, c, main]
+    - [0xB36A30, c, entity]
+    - [0xB36A70, c, npcs_early]
+    - [0xB37260, c, npcs_later]
   - name: kkj_11
     dir: world/area_kkj/kkj_11
     type: code
     start: 0xB39FE0
     vram: 0x80240000
     subsegments:
-    - [0xB39FE0, c, kkj_11_0_header]
-    - [0xB39FE0, c, kkj_11_1_main]
-    - [0xB3A050, c, kkj_11_2_entity]
-    - [0xB3A090, c, kkj_11_3_scene]
-    - [0xB3A090, c, kkj_11_4_demo]
-    - [0xB3A090, c, kkj_11_5_npcs_early]
-    - [0xB3A880, c, kkj_11_6_npcs_later]
+    - [0xB39FE0, c, settings]
+    - [0xB39FE0, c, main]
+    - [0xB3A050, c, entity]
+    - [0xB3A090, c, scene]
+    - [0xB3A090, c, demo]
+    - [0xB3A090, c, npcs_early]
+    - [0xB3A880, c, npcs_later]
   - name: kkj_12
     dir: world/area_kkj/kkj_12
     type: code
     start: 0xB3FF30
     vram: 0x80240000
     subsegments:
-    - [0xB3FF30, c, kkj_12_0_header]
-    - [0xB3FF30, c, kkj_12_1_main]
-    - [0xB3FFA0, c, kkj_12_2_npc]
+    - [0xB3FF30, c, settings]
+    - [0xB3FF30, c, main]
+    - [0xB3FFA0, c, npc]
   - name: kkj_13
     dir: world/area_kkj/kkj_13
     type: code
     start: 0xB41D70
     vram: 0x80240000
     subsegments:
-    - [0xB41D70, c, kkj_13_0_header]
-    - [0xB41D90, c, kkj_13_1_music]
-    - [0xB41D90, c, kkj_13_2_main]
-    - [0xB420A0, c, kkj_13_3_npcs_finale]
-    - [0xB42100, c, kkj_13_4_npcs_intro]
-    - [0xB42100, c, kkj_13_5_intro_scenes]
+    - [0xB41D70, c, settings]
+    - [0xB41D90, c, music]
+    - [0xB41D90, c, main]
+    - [0xB420A0, c, npcs_finale]
+    - [0xB42100, c, npcs_intro]
+    - [0xB42100, c, intro_scenes]
   - name: kkj_14
     dir: world/area_kkj/kkj_14
     type: code
     start: 0xB46D20
     vram: 0x80240000
     subsegments:
-    - [0xB46D20, c, kkj_14_0_header]
-    - [0xB46D70, c, kkj_14_1_music]
-    - [0xB46D70, c, kkj_14_2_main]
-    - [0xB470C0, c, kkj_14_3_interactables]
-    - [0xB471A0, c, kkj_14_4_npc_guards]
-    - [0xB471A0, c, kkj_14_5_npc_ch0]
-    - [0xB471A0, c, kkj_14_6_npc_ch2]
-    - [0xB471A0, c, kkj_14_7_npc_ch7]
-    - [0xB471A0, c, kkj_14_8_chapter0]
-    - [0xB471E0, c, kkj_14_9_chapter1]
-    - [0xB471E0, c, kkj_14_10_chapter2]
-    - [0xB471E0, c, kkj_14_11_chapter3]
-    - [0xB471E0, c, kkj_14_12_chapter4]
-    - [0xB471E0, c, kkj_14_13_chapter5]
-    - [0xB471E0, c, kkj_14_14_chapter6]
-    - [0xB471E0, c, kkj_14_15_chapter7]
+    - [0xB46D20, c, settings]
+    - [0xB46D70, c, music]
+    - [0xB46D70, c, main]
+    - [0xB470C0, c, interactables]
+    - [0xB471A0, c, npc_guards]
+    - [0xB471A0, c, npc_ch0]
+    - [0xB471A0, c, npc_ch2]
+    - [0xB471A0, c, npc_ch7]
+    - [0xB471A0, c, chapter0]
+    - [0xB471E0, c, chapter1]
+    - [0xB471E0, c, chapter2]
+    - [0xB471E0, c, chapter3]
+    - [0xB471E0, c, chapter4]
+    - [0xB471E0, c, chapter5]
+    - [0xB471E0, c, chapter6]
+    - [0xB471E0, c, chapter7]
   - name: kkj_15
     dir: world/area_kkj/kkj_15
     type: code
     start: 0xB51410
     vram: 0x80240000
     subsegments:
-    - [0xB51410, c, kkj_15_0_header]
-    - [0xB51410, c, kkj_15_1_music]
-    - [0xB51410, c, kkj_15_2_main]
-    - [0xB51750, c, kkj_15_3_rotating_wall]
-    - [0xB51910, c, kkj_15_4_chapter0]
-    - [0xB519E0, c, kkj_15_5_chapter1]
-    - [0xB519E0, c, kkj_15_6_chapter2]
-    - [0xB519E0, c, kkj_15_7_chapter3]
-    - [0xB51A20, c, kkj_15_8_npc_chapter0]
-    - [0xB51A20, c, kkj_15_9_npc_chapter1]
-    - [0xB51A20, c, kkj_15_10_npc_chapter3]
+    - [0xB51410, c, settings]
+    - [0xB51410, c, music]
+    - [0xB51410, c, main]
+    - [0xB51750, c, rotating_wall]
+    - [0xB51910, c, chapter0]
+    - [0xB519E0, c, chapter1]
+    - [0xB519E0, c, chapter2]
+    - [0xB519E0, c, chapter3]
+    - [0xB51A20, c, npc_chapter0]
+    - [0xB51A20, c, npc_chapter1]
+    - [0xB51A20, c, npc_chapter3]
   - name: kkj_16
     dir: world/area_kkj/kkj_16
     type: code
     start: 0xB59290
     vram: 0x80240000
     subsegments:
-    - [0xB59290, c, kkj_16_0_header]
-    - [0xB59290, c, kkj_16_1_main]
-    - [0xB592F0, c, kkj_16_2_npcs_early]
-    - [0xB59AE0, c, kkj_16_3_npcs_later]
-    - [0xB5A310, c, kkj_16_4_stealth]
-    - [0xB5A310, c, kkj_16_5_entity]
+    - [0xB59290, c, settings]
+    - [0xB59290, c, main]
+    - [0xB592F0, c, npcs_early]
+    - [0xB59AE0, c, npcs_later]
+    - [0xB5A310, c, stealth]
+    - [0xB5A310, c, entity]
   - name: kkj_17
     dir: world/area_kkj/kkj_17
     type: code
     start: 0xB5DAE0
     vram: 0x80240000
     subsegments:
-    - [0xB5DAE0, c, kkj_17_0_header]
-    - [0xB5DAE0, c, kkj_17_1_main]
-    - [0xB5DAE0, c, kkj_17_2_entity]
-    - [0xB5DAE0, c, kkj_17_3_chest]
+    - [0xB5DAE0, c, settings]
+    - [0xB5DAE0, c, main]
+    - [0xB5DAE0, c, entity]
+    - [0xB5DAE0, c, chest]
   - name: kkj_18
     dir: world/area_kkj/kkj_18
     type: code
     start: 0xB5EB20
     vram: 0x80240000
     subsegments:
-    - [0xB5EB20, c, kkj_18_0_header]
-    - [0xB5EB20, c, kkj_18_1_music]
-    - [0xB5EB20, c, kkj_18_2_main]
-    - [0xB5EE60, c, kkj_18_3_npc]
-    - [0xB5EE60, c, kkj_18_4_gourmet]
+    - [0xB5EB20, c, settings]
+    - [0xB5EB20, c, music]
+    - [0xB5EB20, c, main]
+    - [0xB5EE60, c, npc]
+    - [0xB5EE60, c, gourmet]
   - name: kkj_19
     dir: world/area_kkj/kkj_19
     type: code
     start: 0xB637D0
     vram: 0x80240000
     subsegments:
-    - [0xB637D0, c, kkj_19_0_header]
-    - [0xB637D0, c, kkj_19_1_music]
-    - [0xB637D0, c, kkj_19_2_main]
-    - [0xB63A80, c, kkj_19_3_npcs_intro]
-    - [0xB63A80, c, kkj_19_4_npcs_peach]
-    - [0xB63A80, c, kkj_19_5_baking]
+    - [0xB637D0, c, settings]
+    - [0xB637D0, c, music]
+    - [0xB637D0, c, main]
+    - [0xB63A80, c, npcs_intro]
+    - [0xB63A80, c, npcs_peach]
+    - [0xB63A80, c, baking]
   - name: kkj_20
     dir: world/area_kkj/kkj_20
     type: code
     start: 0xB69A30
     vram: 0x80240000
     subsegments:
-    - [0xB69A30, c, kkj_20_0_header]
-    - [0xB69A30, c, kkj_20_1_music]
-    - [0xB69A30, c, kkj_20_2_main]
-    - [0xB69A30, c, kkj_20_3_entity]
-    - [0xB69CF0, c, kkj_20_4_npc]
+    - [0xB69A30, c, settings]
+    - [0xB69A30, c, music]
+    - [0xB69A30, c, main]
+    - [0xB69A30, c, entity]
+    - [0xB69CF0, c, npc]
   - name: kkj_21
     dir: world/area_kkj/kkj_21
     type: code
     start: 0xB6E190
     vram: 0x80240000
     subsegments:
-    - [0xB6E190, c, kkj_21_0_header]
-    - [0xB6E190, c, kkj_21_1_main]
+    - [0xB6E190, c, settings]
+    - [0xB6E190, c, main]
   - name: kkj_22
     dir: world/area_kkj/kkj_22
     type: code
     start: 0xB6E3E0
     vram: 0x80240000
     subsegments:
-    - [0xB6E3E0, c, kkj_22_0_header]
-    - [0xB6E3E0, c, kkj_22_1_music]
-    - [0xB6E3E0, c, kkj_22_2_main]
+    - [0xB6E3E0, c, settings]
+    - [0xB6E3E0, c, music]
+    - [0xB6E3E0, c, main]
   - name: kkj_23
     dir: world/area_kkj/kkj_23
     type: code
     start: 0xB6E770
     vram: 0x80240000
     subsegments:
-    - [0xB6E770, c, kkj_23_0_header]
-    - [0xB6E790, c, kkj_23_1_music]
-    - [0xB6E790, c, kkj_23_2_main]
-    - [0xB6E7F0, c, kkj_23_3_npcs_finale]
-    - [0xB6E850, c, kkj_23_4_npcs_peach]
-    - [0xB6F080, c, kkj_23_5_scene]
+    - [0xB6E770, c, settings]
+    - [0xB6E790, c, music]
+    - [0xB6E790, c, main]
+    - [0xB6E7F0, c, npcs_finale]
+    - [0xB6E850, c, npcs_peach]
+    - [0xB6F080, c, scene]
   - name: kkj_24
     dir: world/area_kkj/kkj_24
     type: code
     start: 0xB72460
     vram: 0x80240000
     subsegments:
-    - [0xB72460, c, kkj_24_0_header]
-    - [0xB72460, c, kkj_24_1_music]
-    - [0xB72460, c, kkj_24_2_main]
-    - [0xB72480, c, kkj_24_3_entity]
+    - [0xB72460, c, settings]
+    - [0xB72460, c, music]
+    - [0xB72460, c, main]
+    - [0xB72480, c, entity]
   - name: kkj_25
     dir: world/area_kkj/kkj_25
     type: code
     start: 0xB728F0
     vram: 0x80240000
     subsegments:
-    - [0xB728F0, c, kkj_25_0_header]
-    - [0xB72910, c, kkj_25_1_main]
-    - [0xB72910, c, kkj_25_2_npc_initial]
-    - [0xB72940, c, kkj_25_3_npc_midpoint]
-    - [0xB72970, c, kkj_25_4_npc_final]
-    - [0xB72970, c, kkj_25_5_arena]
-    - [0xB72C00, c, kkj_25_6_peach_free]
-    - [0xB73550, c, kkj_25_7_kammy_defeated]
-    - [0xB73620, c, kkj_25_8_bowser_defeated]
-    - [0xB73830, c, kkj_25_9_entity]
+    - [0xB728F0, c, settings]
+    - [0xB72910, c, main]
+    - [0xB72910, c, npc_initial]
+    - [0xB72940, c, npc_midpoint]
+    - [0xB72970, c, npc_final]
+    - [0xB72970, c, arena]
+    - [0xB72C00, c, peach_free]
+    - [0xB73550, c, kammy_defeated]
+    - [0xB73620, c, bowser_defeated]
+    - [0xB73830, c, entity]
   - name: kkj_26
     dir: world/area_kkj/kkj_26
     type: code
     start: 0xB7F010
     vram: 0x80240000
     subsegments:
-    - [0xB7F010, c, kkj_26_0_header]
-    - [0xB7F010, c, kkj_26_1_main]
-    - [0xB7F040, c, kkj_26_2_scenes]
-    - [0xB7F040, c, kkj_26_3_demo]
+    - [0xB7F010, c, settings]
+    - [0xB7F010, c, main]
+    - [0xB7F040, c, scenes]
+    - [0xB7F040, c, demo]
   - name: kkj_27
     dir: world/area_kkj/kkj_27
     type: code
     start: 0xB7FC60
     vram: 0x80240000
     subsegments:
-    - [0xB7FC60, c, kkj_27_0_header]
-    - [0xB7FC60, c, kkj_27_1_music]
-    - [0xB7FC60, c, kkj_27_2_main]
-    - [0xB7FF70, c, kkj_27_3_rotating_wall]
+    - [0xB7FC60, c, settings]
+    - [0xB7FC60, c, music]
+    - [0xB7FC60, c, main]
+    - [0xB7FF70, c, rotating_wall]
   - name: kkj_28
     dir: world/area_kkj/kkj_28
     type: code
     start: 0xB80D90
     vram: 0x80240000
     subsegments:
-    - [0xB80D90, c, kkj_28_0_header]
-    - [0xB80D90, c, kkj_28_1_main]
+    - [0xB80D90, c, settings]
+    - [0xB80D90, c, main]
   - name: kkj_29
     dir: world/area_kkj/kkj_29
     type: code
     start: 0xB80FA0
     vram: 0x80240000
     subsegments:
-    - [0xB80FA0, c, kkj_29_0_header]
-    - [0xB80FA0, c, kkj_29_1_main]
-    - [0xB80FD0, c, kkj_29_2_npc]
-    - [0xB80FD0, c, kkj_29_3_quiz]
+    - [0xB80FA0, c, settings]
+    - [0xB80FA0, c, main]
+    - [0xB80FD0, c, npc]
+    - [0xB80FD0, c, quiz]
   - name: tst_01
     dir: world/area_tst/tst_01
     type: code
     start: 0xB867F0
     vram: 0x80240000
     subsegments:
-    - [0xB867F0, c, tst_01_1_main]
-    - [0xB867F0, c, tst_01_2_entity]
+    - [0xB867F0, c, main]
+    - [0xB867F0, c, entity]
   - name: tst_02
     dir: world/area_tst/tst_02
     type: code
     start: 0xB86B20
     vram: 0x80240000
     subsegments:
-    - [0xB86B20, c, tst_02_1_main]
-    - [0xB86B20, c, tst_02_2_entity]
+    - [0xB86B20, c, main]
+    - [0xB86B20, c, entity]
   - name: tst_03
     dir: world/area_tst/tst_03
     type: code
     start: 0xB86E70
     vram: 0x80240000
     subsegments:
-    - [0xB86E70, c, tst_03_1_main]
-    - [0xB86E70, c, tst_03_2_entity]
+    - [0xB86E70, c, main]
+    - [0xB86E70, c, entity]
   - name: tst_04
     dir: world/area_tst/tst_04
     type: code
     start: 0xB87460
     vram: 0x80240000
     subsegments:
-    - [0xB87460, c, tst_04_1_main]
-    - [0xB876C0, c, tst_04_2_entity]
-    - [0xB876C0, c, tst_04_3_reflection]
-    - [0xB87AC0, c, tst_04_4_npc]
+    - [0xB87460, c, main]
+    - [0xB876C0, c, entity]
+    - [0xB876C0, c, reflection]
+    - [0xB87AC0, c, npc]
   - name: tst_10
     dir: world/area_tst/tst_10
     type: code
     start: 0xB88430
     vram: 0x80240000
     subsegments:
-    - [0xB88430, c, tst_10_1_main]
+    - [0xB88430, c, main]
   - name: tst_11
     dir: world/area_tst/tst_11
     type: code
     start: 0xB88940
     vram: 0x80240000
     subsegments:
-    - [0xB88940, c, tst_11_1_main]
-    - [0xB88940, c, tst_11_2_extra]
+    - [0xB88940, c, main]
+    - [0xB88940, c, extra]
   - name: tst_12
     dir: world/area_tst/tst_12
     type: code
     start: 0xB891E0
     vram: 0x80240000
     subsegments:
-    - [0xB891E0, c, tst_12_1_main]
+    - [0xB891E0, c, main]
   - name: tst_13
     dir: world/area_tst/tst_13
     type: code
     start: 0xB89650
     vram: 0x80240000
     subsegments:
-    - [0xB89650, c, tst_13_1_main]
+    - [0xB89650, c, main]
     - start: 0xB89A10
       type: .data
-      name: tst_13_1_main
+      name: main
       subsegments:
       - [0xB89A10]
       - [0xB8B900, vtx, shockwave]
@@ -9562,764 +9562,764 @@ segments:
     start: 0xB8C360
     vram: 0x80240000
     subsegments:
-    - [0xB8C360, c, tst_20_1_main]
+    - [0xB8C360, c, main]
   - name: jan_00
     dir: world/area_jan/jan_00
     type: code
     start: 0xB8C430
     vram: 0x80240000
     subsegments:
-    - [0xB8C430, c, jan_00_0_header]
-    - [0xB8C430, c, jan_00_1_main]
-    - [0xB8C770, c, jan_00_2_npc]
-    - [0xB8D5D0, c, jan_00_3_entity]
-    - [0xB8D5D0, c, jan_00_4_whale]
-    - [0xB8DD90, c, jan_00_5_foliage]
+    - [0xB8C430, c, settings]
+    - [0xB8C430, c, main]
+    - [0xB8C770, c, npc]
+    - [0xB8D5D0, c, entity]
+    - [0xB8D5D0, c, whale]
+    - [0xB8DD90, c, foliage]
   - name: jan_01
     dir: world/area_jan/jan_01
     type: code
     start: 0xB93F20
     vram: 0x80240000
     subsegments:
-    - [0xB93F20, c, jan_01_0_header]
-    - [0xB93F20, c, jan_01_1_music]
-    - [0xB93F20, c, jan_01_2_main]
-    - [0xB94260, c, jan_01_3_npc]
-    - [0xB950B0, c, jan_01_4_entity]
-    - [0xB950B0, c, jan_01_5_foliage]
+    - [0xB93F20, c, settings]
+    - [0xB93F20, c, music]
+    - [0xB93F20, c, main]
+    - [0xB94260, c, npc]
+    - [0xB950B0, c, entity]
+    - [0xB950B0, c, foliage]
   - name: jan_02
     dir: world/area_jan/jan_02
     type: code
     start: 0xB98360
     vram: 0x80240000
     subsegments:
-    - [0xB98360, c, jan_02_0_header]
-    - [0xB98360, c, jan_02_1_music]
-    - [0xB98390, c, jan_02_2_main]
-    - [0xB98790, c, jan_02_3_npc]
-    - [0xB9AA40, c, jan_02_4_entity]
-    - [0xB9AA40, c, jan_02_5_foliage]
+    - [0xB98360, c, settings]
+    - [0xB98360, c, music]
+    - [0xB98390, c, main]
+    - [0xB98790, c, npc]
+    - [0xB9AA40, c, entity]
+    - [0xB9AA40, c, foliage]
   - name: jan_03
     dir: world/area_jan/jan_03
     type: code
     start: 0xBA0B20
     vram: 0x80240000
     subsegments:
-    - [0xBA0B20, c, jan_03_0_header]
-    - [0xBA0B20, c, jan_03_1_music]
-    - [0xBA0B20, c, jan_03_2_main]
-    - [0xBA1140, c, jan_03_3_shop]
-    - [0xBA1140, c, jan_03_4_npc]
-    - [0xBA3AC0, c, jan_03_5_entity]
-    - [0xBA3B70, c, jan_03_6_rooms]
-    - [0xBA3B70, c, jan_03_7_foliage]
+    - [0xBA0B20, c, settings]
+    - [0xBA0B20, c, music]
+    - [0xBA0B20, c, main]
+    - [0xBA1140, c, shop]
+    - [0xBA1140, c, npc]
+    - [0xBA3AC0, c, entity]
+    - [0xBA3B70, c, rooms]
+    - [0xBA3B70, c, foliage]
   - name: jan_04
     dir: world/area_jan/jan_04
     type: code
     start: 0xBB0700
     vram: 0x80240000
     subsegments:
-    - [0xBB0700, c, jan_04_0_header]
-    - [0xBB0740, c, jan_04_1_music]
-    - [0xBB0740, c, jan_04_2_main]
-    - [0xBB0A50, c, jan_04_3_entity]
-    - [0xBB0D10, c, jan_04_4_npc]
-    - [0xBB0EA0, c, jan_04_5_unused]
-    - [0xBB0EA0, c, jan_04_6_trees]
-    - [0xBB10E0, c, jan_04_7_scenes]
-    - [0xBB1180, c, jan_04_8_treasure]
-    - [0xBB1480, c, jan_04_9_bushes]
-    - [0xBB16C0, c, jan_04_10_demo]
+    - [0xBB0700, c, settings]
+    - [0xBB0740, c, music]
+    - [0xBB0740, c, main]
+    - [0xBB0A50, c, entity]
+    - [0xBB0D10, c, npc]
+    - [0xBB0EA0, c, unused]
+    - [0xBB0EA0, c, trees]
+    - [0xBB10E0, c, scenes]
+    - [0xBB1180, c, treasure]
+    - [0xBB1480, c, bushes]
+    - [0xBB16C0, c, demo]
   - name: jan_05
     dir: world/area_jan/jan_05
     type: code
     start: 0xBB6A00
     vram: 0x80240000
     subsegments:
-    - [0xBB6A00, c, jan_05_0_header]
-    - [0xBB6A40, c, jan_05_1_music]
-    - [0xBB6A40, c, jan_05_2_main]
-    - [0xBB6D50, c, jan_05_3_log]
-    - [0xBB6EA0, c, jan_05_4_bushes]
-    - [0xBB71F0, c, jan_05_5_npc]
-    - [0xBB8E50, c, jan_05_6_trees]
-    - [0xBB90D0, c, jan_05_7_entity]
+    - [0xBB6A00, c, settings]
+    - [0xBB6A40, c, music]
+    - [0xBB6A40, c, main]
+    - [0xBB6D50, c, log]
+    - [0xBB6EA0, c, bushes]
+    - [0xBB71F0, c, npc]
+    - [0xBB8E50, c, trees]
+    - [0xBB90D0, c, entity]
   - name: jan_06
     dir: world/area_jan/jan_06
     type: code
     start: 0xBBE7C0
     vram: 0x80240000
     subsegments:
-    - [0xBBE7C0, c, jan_06_0_header]
-    - [0xBBE7C0, c, jan_06_1_main]
-    - [0xBBEAD0, c, jan_06_2_statue]
-    - [0xBBEB70, c, jan_06_3_log]
-    - [0xBBECC0, c, jan_06_4_trees]
-    - [0xBBEF00, c, jan_06_5_entity]
-    - [0xBBEF00, c, jan_06_6_npc]
-    - [0xBC0B60, c, jan_06_7_bushes]
+    - [0xBBE7C0, c, settings]
+    - [0xBBE7C0, c, main]
+    - [0xBBEAD0, c, statue]
+    - [0xBBEB70, c, log]
+    - [0xBBECC0, c, trees]
+    - [0xBBEF00, c, entity]
+    - [0xBBEF00, c, npc]
+    - [0xBC0B60, c, bushes]
   - name: jan_07
     dir: world/area_jan/jan_07
     type: code
     start: 0xBC5800
     vram: 0x80240000
     subsegments:
-    - [0xBC5800, c, jan_07_0_header]
-    - [0xBC5800, c, jan_07_1_music]
-    - [0xBC5800, c, jan_07_2_main]
-    - [0xBC5800, c, jan_07_3_npc]
-    - [0xBC65A0, c, jan_07_4_trees]
-    - [0xBC67E0, c, jan_07_5_bushes]
+    - [0xBC5800, c, settings]
+    - [0xBC5800, c, music]
+    - [0xBC5800, c, main]
+    - [0xBC5800, c, npc]
+    - [0xBC65A0, c, trees]
+    - [0xBC67E0, c, bushes]
   - name: jan_08
     dir: world/area_jan/jan_08
     type: code
     start: 0xBCA1B0
     vram: 0x80240000
     subsegments:
-    - [0xBCA1B0, c, jan_08_0_header]
-    - [0xBCA1B0, c, jan_08_1_music]
-    - [0xBCA1B0, c, jan_08_2_main]
-    - [0xBCA4C0, c, jan_08_3_bushes]
-    - [0xBCA810, c, jan_08_4_entity]
-    - [0xBCB550, c, jan_08_5_npc]
-    - [0xBCC3A0, c, jan_08_6_trees]
+    - [0xBCA1B0, c, settings]
+    - [0xBCA1B0, c, music]
+    - [0xBCA1B0, c, main]
+    - [0xBCA4C0, c, bushes]
+    - [0xBCA810, c, entity]
+    - [0xBCB550, c, npc]
+    - [0xBCC3A0, c, trees]
   - name: jan_09
     dir: world/area_jan/jan_09
     type: code
     start: 0xBD19B0
     vram: 0x80240000
     subsegments:
-    - [0xBD19B0, c, jan_09_0_header]
-    - [0xBD19B0, c, jan_09_1_main]
-    - [0xBD1FA0, c, jan_09_2_bushes]
-    - [0xBD22F0, c, jan_09_3_npc]
-    - [0xBD3090, c, jan_09_4_trees]
-    - [0xBD32D0, c, jan_09_5_entity]
+    - [0xBD19B0, c, settings]
+    - [0xBD19B0, c, main]
+    - [0xBD1FA0, c, bushes]
+    - [0xBD22F0, c, npc]
+    - [0xBD3090, c, trees]
+    - [0xBD32D0, c, entity]
   - name: jan_10
     dir: world/area_jan/jan_10
     type: code
     start: 0xBD8290
     vram: 0x80240000
     subsegments:
-    - [0xBD8290, c, jan_10_0_header]
-    - [0xBD8290, c, jan_10_1_music]
-    - [0xBD8290, c, jan_10_2_main]
-    - [0xBD85A0, c, jan_10_3_npc]
-    - [0xBD93C0, c, jan_10_4_log]
-    - [0xBD9510, c, jan_10_5_trees]
-    - [0xBD9790, c, jan_10_6_bushes]
-    - [0xBD99D0, c, jan_10_7_entity]
+    - [0xBD8290, c, settings]
+    - [0xBD8290, c, music]
+    - [0xBD8290, c, main]
+    - [0xBD85A0, c, npc]
+    - [0xBD93C0, c, log]
+    - [0xBD9510, c, trees]
+    - [0xBD9790, c, bushes]
+    - [0xBD99D0, c, entity]
   - name: jan_11
     dir: world/area_jan/jan_11
     type: code
     start: 0xBDC760
     vram: 0x80240000
     subsegments:
-    - [0xBDC760, c, jan_11_0_header]
-    - [0xBDC760, c, jan_11_1_music]
-    - [0xBDC760, c, jan_11_2_main]
-    - [0xBDCF10, c, jan_11_3_npc]
+    - [0xBDC760, c, settings]
+    - [0xBDC760, c, music]
+    - [0xBDC760, c, main]
+    - [0xBDCF10, c, npc]
   - name: jan_12
     dir: world/area_jan/jan_12
     type: code
     start: 0xBDEFB0
     vram: 0x80240000
     subsegments:
-    - [0xBDEFB0, c, jan_12_0_header]
-    - [0xBDEFB0, c, jan_12_1_main]
-    - [0xBDEFB0, c, jan_12_2_vines]
-    - [0xBDF230, c, jan_12_3_trees]
-    - [0xBDF470, c, jan_12_4_entity]
-    - [0xBDF470, c, jan_12_5_npc]
+    - [0xBDEFB0, c, settings]
+    - [0xBDEFB0, c, main]
+    - [0xBDEFB0, c, vines]
+    - [0xBDF230, c, trees]
+    - [0xBDF470, c, entity]
+    - [0xBDF470, c, npc]
   - name: jan_13
     dir: world/area_jan/jan_13
     type: code
     start: 0xBE26B0
     vram: 0x80240000
     subsegments:
-    - [0xBE26B0, c, jan_13_0_header]
-    - [0xBE26B0, c, jan_13_1_main]
-    - [0xBE26B0, c, jan_13_2_puzzle]
-    - [0xBE2A40, c, jan_13_3_trees]
-    - [0xBE2C80, c, jan_13_4_entity]
+    - [0xBE26B0, c, settings]
+    - [0xBE26B0, c, main]
+    - [0xBE26B0, c, puzzle]
+    - [0xBE2A40, c, trees]
+    - [0xBE2C80, c, entity]
   - name: jan_14
     dir: world/area_jan/jan_14
     type: code
     start: 0xBE5F50
     vram: 0x80240000
     subsegments:
-    - [0xBE5F50, c, jan_14_0_header]
-    - [0xBE5F50, c, jan_14_1_main]
-    - [0xBE5F50, c, jan_14_2_vines]
-    - [0xBE61D0, c, jan_14_3_trees]
-    - [0xBE6410, c, jan_14_4_npc]
+    - [0xBE5F50, c, settings]
+    - [0xBE5F50, c, main]
+    - [0xBE5F50, c, vines]
+    - [0xBE61D0, c, trees]
+    - [0xBE6410, c, npc]
   - name: jan_15
     dir: world/area_jan/jan_15
     type: code
     start: 0xBE9820
     vram: 0x80240000
     subsegments:
-    - [0xBE9820, c, jan_15_0_header]
-    - [0xBE9820, c, jan_15_1_main]
-    - [0xBE9820, c, jan_15_2_npc]
-    - [0xBE98E0, c, jan_15_3_trees]
-    - [0xBE9B20, c, jan_15_4_entity]
+    - [0xBE9820, c, settings]
+    - [0xBE9820, c, main]
+    - [0xBE9820, c, npc]
+    - [0xBE98E0, c, trees]
+    - [0xBE9B20, c, entity]
   - name: jan_16
     dir: world/area_jan/jan_16
     type: code
     start: 0xBEBF00
     vram: 0x80240000
     subsegments:
-    - [0xBEBF00, c, jan_16_0_header]
-    - [0xBEBF00, c, jan_16_1_music]
-    - [0xBEBF00, c, jan_16_2_main]
-    - [0xBEC200, c, jan_16_3_npc]
-    - [0xBEC200, c, jan_16_4_entity]
-    - [0xBEC200, c, jan_16_5_bushes]
+    - [0xBEBF00, c, settings]
+    - [0xBEBF00, c, music]
+    - [0xBEBF00, c, main]
+    - [0xBEC200, c, npc]
+    - [0xBEC200, c, entity]
+    - [0xBEC200, c, bushes]
   - name: jan_17
     dir: world/area_jan/jan_17
     type: code
     start: 0xBEF6C0
     vram: 0x80240000
     subsegments:
-    - [0xBEF6C0, c, jan_17_0_header]
-    - [0xBEF6C0, c, jan_17_1_music]
-    - [0xBEF6C0, c, jan_17_2_main]
-    - [0xBEF6E0, c, jan_17_3_entity]
+    - [0xBEF6C0, c, settings]
+    - [0xBEF6C0, c, music]
+    - [0xBEF6C0, c, main]
+    - [0xBEF6E0, c, entity]
   - name: jan_18
     dir: world/area_jan/jan_18
     type: code
     start: 0xBEFA90
     vram: 0x80240000
     subsegments:
-    - [0xBEFA90, c, jan_18_0_header]
-    - [0xBEFA90, c, jan_18_1_music]
-    - [0xBEFA90, c, jan_18_2_main]
-    - [0xBEFA90, c, jan_18_3_entity]
+    - [0xBEFA90, c, settings]
+    - [0xBEFA90, c, music]
+    - [0xBEFA90, c, main]
+    - [0xBEFA90, c, entity]
   - name: jan_19
     dir: world/area_jan/jan_19
     type: code
     start: 0xBEFD60
     vram: 0x80240000
     subsegments:
-    - [0xBEFD60, c, jan_19_0_header]
-    - [0xBEFD60, c, jan_19_1_music]
-    - [0xBEFD60, c, jan_19_2_main]
-    - [0xBEFD80, c, jan_19_3_entity]
+    - [0xBEFD60, c, settings]
+    - [0xBEFD60, c, music]
+    - [0xBEFD60, c, main]
+    - [0xBEFD80, c, entity]
   - name: jan_22
     dir: world/area_jan/jan_22
     type: code
     start: 0xBF0080
     vram: 0x80240000
     subsegments:
-    - [0xBF0080, c, jan_22_0_header]
-    - [0xBF0080, c, jan_22_1_music]
-    - [0xBF0080, c, jan_22_2_main]
-    - [0xBF0080, c, jan_22_3_npc]
-    - [0xBF10A0, c, jan_22_4_entity]
-    - [0xBF10A0, c, jan_22_5_zipline]
-    - [0xBF1450, c, jan_22_6_bushes]
-    - [0xBF17A0, c, jan_22_7_trees]
+    - [0xBF0080, c, settings]
+    - [0xBF0080, c, music]
+    - [0xBF0080, c, main]
+    - [0xBF0080, c, npc]
+    - [0xBF10A0, c, entity]
+    - [0xBF10A0, c, zipline]
+    - [0xBF1450, c, bushes]
+    - [0xBF17A0, c, trees]
   - name: jan_23
     dir: world/area_jan/jan_23
     type: code
     start: 0xBFBBD0
     vram: 0x80240000
     subsegments:
-    - [0xBFBBD0, c, jan_23_0_header]
-    - [0xBFBBD0, c, jan_23_1_music]
-    - [0xBFBBD0, c, jan_23_2_main]
-    - [0xBFBBD0, c, jan_23_3_npc]
+    - [0xBFBBD0, c, settings]
+    - [0xBFBBD0, c, music]
+    - [0xBFBBD0, c, main]
+    - [0xBFBBD0, c, npc]
   - name: mim_01
     dir: world/area_mim/mim_01
     type: code
     start: 0xBFF340
     vram: 0x80240000
     subsegments:
-    - [0xBFF340, c, mim_01_0_header]
-    - [0xBFF340, c, mim_01_1_music]
-    - [0xBFF340, c, mim_01_2_main]
-    - [0xBFF3B0, c, mim_01_3_entity]
-    - [0xBFF3B0, c, mim_01_4_hint]
-    - [0xBFF840, c, mim_01_5_gate]
-    - [0xBFF840, c, mim_01_6_npc]
+    - [0xBFF340, c, settings]
+    - [0xBFF340, c, music]
+    - [0xBFF340, c, main]
+    - [0xBFF3B0, c, entity]
+    - [0xBFF3B0, c, hint]
+    - [0xBFF840, c, gate]
+    - [0xBFF840, c, npc]
   - name: mim_02
     dir: world/area_mim/mim_02
     type: code
     start: 0xC03B00
     vram: 0x80240000
     subsegments:
-    - [0xC03B00, c, mim_02_0_header]
-    - [0xC03B00, c, mim_02_1_music]
-    - [0xC03B00, c, mim_02_2_main]
-    - [0xC03B70, c, mim_02_3_npc]
-    - [0xC04CE0, c, mim_02_4_gate]
-    - [0xC04CE0, c, mim_02_5_hint]
+    - [0xC03B00, c, settings]
+    - [0xC03B00, c, music]
+    - [0xC03B00, c, main]
+    - [0xC03B70, c, npc]
+    - [0xC04CE0, c, gate]
+    - [0xC04CE0, c, hint]
   - name: mim_03
     dir: world/area_mim/mim_03
     type: code
     start: 0xC07380
     vram: 0x80240000
     subsegments:
-    - [0xC07380, c, mim_03_0_header]
-    - [0xC07380, c, mim_03_1_music]
-    - [0xC07380, c, mim_03_2_main]
-    - [0xC07420, c, mim_03_3_entity]
-    - [0xC07420, c, mim_03_4_hint]
-    - [0xC078B0, c, mim_03_5_gate]
-    - [0xC078B0, c, mim_03_6_npc]
+    - [0xC07380, c, settings]
+    - [0xC07380, c, music]
+    - [0xC07380, c, main]
+    - [0xC07420, c, entity]
+    - [0xC07420, c, hint]
+    - [0xC078B0, c, gate]
+    - [0xC078B0, c, npc]
   - name: mim_04
     dir: world/area_mim/mim_04
     type: code
     start: 0xC09860
     vram: 0x80240000
     subsegments:
-    - [0xC09860, c, mim_04_0_header]
-    - [0xC09860, c, mim_04_1_music]
-    - [0xC09860, c, mim_04_2_main]
-    - [0xC098D0, c, mim_04_3_entity]
-    - [0xC098D0, c, mim_04_4_hint]
-    - [0xC09A60, c, mim_04_5_gate]
-    - [0xC09A60, c, mim_04_6_npc]
+    - [0xC09860, c, settings]
+    - [0xC09860, c, music]
+    - [0xC09860, c, main]
+    - [0xC098D0, c, entity]
+    - [0xC098D0, c, hint]
+    - [0xC09A60, c, gate]
+    - [0xC09A60, c, npc]
   - name: mim_05
     dir: world/area_mim/mim_05
     type: code
     start: 0xC0C630
     vram: 0x80240000
     subsegments:
-    - [0xC0C630, c, mim_05_0_header]
-    - [0xC0C630, c, mim_05_1_music]
-    - [0xC0C630, c, mim_05_2_main]
-    - [0xC0C6A0, c, mim_05_3_entity]
-    - [0xC0C6A0, c, mim_05_4_hint]
-    - [0xC0C6A0, c, mim_05_5_gate]
-    - [0xC0C6A0, c, mim_05_6_npc]
+    - [0xC0C630, c, settings]
+    - [0xC0C630, c, music]
+    - [0xC0C630, c, main]
+    - [0xC0C6A0, c, entity]
+    - [0xC0C6A0, c, hint]
+    - [0xC0C6A0, c, gate]
+    - [0xC0C6A0, c, npc]
   - name: mim_06
     dir: world/area_mim/mim_06
     type: code
     start: 0xC10680
     vram: 0x80240000
     subsegments:
-    - [0xC10680, c, mim_06_0_header]
-    - [0xC10680, c, mim_06_1_music]
-    - [0xC10680, c, mim_06_2_main]
-    - [0xC106F0, c, mim_06_3_entity]
-    - [0xC106F0, c, mim_06_4_hint]
-    - [0xC10BF0, c, mim_06_5_gate]
-    - [0xC10BF0, c, mim_06_6_npc]
+    - [0xC10680, c, settings]
+    - [0xC10680, c, music]
+    - [0xC10680, c, main]
+    - [0xC106F0, c, entity]
+    - [0xC106F0, c, hint]
+    - [0xC10BF0, c, gate]
+    - [0xC10BF0, c, npc]
   - name: mim_07
     dir: world/area_mim/mim_07
     type: code
     start: 0xC16040
     vram: 0x80240000
     subsegments:
-    - [0xC16040, c, mim_07_0_header]
-    - [0xC16040, c, mim_07_1_music]
-    - [0xC16040, c, mim_07_2_main]
-    - [0xC160B0, c, mim_07_3_entity]
-    - [0xC160B0, c, mim_07_4_hint]
-    - [0xC162B0, c, mim_07_5_gate]
-    - [0xC162B0, c, mim_07_6_npc]
+    - [0xC16040, c, settings]
+    - [0xC16040, c, music]
+    - [0xC16040, c, main]
+    - [0xC160B0, c, entity]
+    - [0xC160B0, c, hint]
+    - [0xC162B0, c, gate]
+    - [0xC162B0, c, npc]
   - name: mim_08
     dir: world/area_mim/mim_08
     type: code
     start: 0xC19840
     vram: 0x80240000
     subsegments:
-    - [0xC19840, c, mim_08_0_header]
-    - [0xC19840, c, mim_08_1_music]
-    - [0xC19840, c, mim_08_2_main]
-    - [0xC198E0, c, mim_08_3_entity]
-    - [0xC198E0, c, mim_08_4_gate]
-    - [0xC198E0, c, mim_08_5_npc]
+    - [0xC19840, c, settings]
+    - [0xC19840, c, music]
+    - [0xC19840, c, main]
+    - [0xC198E0, c, entity]
+    - [0xC198E0, c, gate]
+    - [0xC198E0, c, npc]
   - name: mim_09
     dir: world/area_mim/mim_09
     type: code
     start: 0xC1ED00
     vram: 0x80240000
     subsegments:
-    - [0xC1ED00, c, mim_09_0_header]
-    - [0xC1ED00, c, mim_09_1_music]
-    - [0xC1ED00, c, mim_09_2_main]
-    - [0xC1EDA0, c, mim_09_3_entity]
-    - [0xC1EDA0, c, mim_09_4_hint]
-    - [0xC1EDA0, c, mim_09_5_gate]
-    - [0xC1EDA0, c, mim_09_6_npc]
+    - [0xC1ED00, c, settings]
+    - [0xC1ED00, c, music]
+    - [0xC1ED00, c, main]
+    - [0xC1EDA0, c, entity]
+    - [0xC1EDA0, c, hint]
+    - [0xC1EDA0, c, gate]
+    - [0xC1EDA0, c, npc]
   - name: mim_10
     dir: world/area_mim/mim_10
     type: code
     start: 0xC218E0
     vram: 0x80240000
     subsegments:
-    - [0xC218E0, c, mim_10_0_header]
-    - [0xC218E0, c, mim_10_1_music]
-    - [0xC218E0, c, mim_10_2_entity]
-    - [0xC218E0, c, mim_10_3_main]
-    - [0xC218E0, c, mim_10_4_npc]
+    - [0xC218E0, c, settings]
+    - [0xC218E0, c, music]
+    - [0xC218E0, c, entity]
+    - [0xC218E0, c, main]
+    - [0xC218E0, c, npc]
   - name: mim_11
     dir: world/area_mim/mim_11
     type: code
     start: 0xC22F70
     vram: 0x80240000
     subsegments:
-    - [0xC22F70, c, mim_11_0_header]
-    - [0xC22F70, c, mim_11_1_music]
-    - [0xC22F70, c, mim_11_2_main]
-    - [0xC23840, c, mim_11_3_gate]
-    - [0xC23840, c, mim_11_4_entity]
-    - [0xC23840, c, mim_11_5_npc]
-    - [0xC238F0, c, mim_11_6_foliage]
+    - [0xC22F70, c, settings]
+    - [0xC22F70, c, music]
+    - [0xC22F70, c, main]
+    - [0xC23840, c, gate]
+    - [0xC23840, c, entity]
+    - [0xC23840, c, npc]
+    - [0xC238F0, c, foliage]
   - name: mim_12
     dir: world/area_mim/mim_12
     type: code
     start: 0xC27280
     vram: 0x80240000
     subsegments:
-    - [0xC27280, c, mim_12_0_header]
-    - [0xC27280, c, mim_12_1_music]
-    - [0xC27280, c, mim_12_2_entity]
-    - [0xC27280, c, mim_12_3_main]
-    - [0xC27280, c, mim_12_4_npc]
-    - [0xC27280, c, mim_12_5_gate]
+    - [0xC27280, c, settings]
+    - [0xC27280, c, music]
+    - [0xC27280, c, entity]
+    - [0xC27280, c, main]
+    - [0xC27280, c, npc]
+    - [0xC27280, c, gate]
   - name: obk_01
     dir: world/area_obk/obk_01
     type: code
     start: 0xC290A0
     vram: 0x80240000
     subsegments:
-    - [0xC290A0, c, obk_01_0_header]
-    - [0xC290A0, c, obk_01_1_music]
-    - [0xC290A0, c, obk_01_2_main]
-    - [0xC290A0, c, obk_01_3_chandelier]
-    - [0xC29830, c, obk_01_4_portrait]
-    - [0xC29880, c, obk_01_5_jump_scare]
-    - [0xC29880, c, obk_01_6_npc]
-    - [0xC2A1E0, c, obk_01_7_entity]
+    - [0xC290A0, c, settings]
+    - [0xC290A0, c, music]
+    - [0xC290A0, c, main]
+    - [0xC290A0, c, chandelier]
+    - [0xC29830, c, portrait]
+    - [0xC29880, c, jump_scare]
+    - [0xC29880, c, npc]
+    - [0xC2A1E0, c, entity]
   - name: obk_02
     dir: world/area_obk/obk_02
     type: code
     start: 0xC2E990
     vram: 0x80240000
     subsegments:
-    - [0xC2E990, c, obk_02_0_header]
-    - [0xC2E990, c, obk_02_1_music]
-    - [0xC2E990, c, obk_02_2_main]
-    - [0xC2E990, c, obk_02_3_npc]
-    - [0xC2EBD0, c, obk_02_4_bombable]
-    - [0xC2EBD0, c, obk_02_5_clock]
-    - [0xC2EC40, c, obk_02_6_entity]
+    - [0xC2E990, c, settings]
+    - [0xC2E990, c, music]
+    - [0xC2E990, c, main]
+    - [0xC2E990, c, npc]
+    - [0xC2EBD0, c, bombable]
+    - [0xC2EBD0, c, clock]
+    - [0xC2EC40, c, entity]
   - name: obk_03
     dir: world/area_obk/obk_03
     type: code
     start: 0xC30180
     vram: 0x80240000
     subsegments:
-    - [0xC30180, c, obk_03_0_header]
-    - [0xC30180, c, obk_03_1_music]
-    - [0xC30180, c, obk_03_2_main]
-    - [0xC30180, c, obk_03_3_shop]
-    - [0xC30180, c, obk_03_4_entity]
-    - [0xC302F0, c, obk_03_5_stairs]
-    - [0xC302F0, c, obk_03_6_npc]
-    - [0xC30A50, c, obk_03_7_rocking_chair]
+    - [0xC30180, c, settings]
+    - [0xC30180, c, music]
+    - [0xC30180, c, main]
+    - [0xC30180, c, shop]
+    - [0xC30180, c, entity]
+    - [0xC302F0, c, stairs]
+    - [0xC302F0, c, npc]
+    - [0xC30A50, c, rocking_chair]
   - name: obk_04
     dir: world/area_obk/obk_04
     type: code
     start: 0xC33D60
     vram: 0x80240000
     subsegments:
-    - [0xC33D60, c, obk_04_0_header]
-    - [0xC33D60, c, obk_04_1_music]
-    - [0xC33D60, c, obk_04_2_entity]
-    - [0xC33DB0, c, obk_04_3_npc]
-    - [0xC34670, c, obk_04_4_main]
-    - [0xC34670, c, obk_04_5_hole]
-    - [0xC346A0, c, obk_04_6_game]
+    - [0xC33D60, c, settings]
+    - [0xC33D60, c, music]
+    - [0xC33D60, c, entity]
+    - [0xC33DB0, c, npc]
+    - [0xC34670, c, main]
+    - [0xC34670, c, hole]
+    - [0xC346A0, c, game]
   - name: obk_05
     dir: world/area_obk/obk_05
     type: code
     start: 0xC38F60
     vram: 0x80240000
     subsegments:
-    - [0xC38F60, c, obk_05_0_header]
-    - [0xC38F60, c, obk_05_1_music]
-    - [0xC38F60, c, obk_05_2_main]
-    - [0xC38FB0, c, obk_05_3_rocking_chair]
-    - [0xC396D0, c, obk_05_4_hole]
-    - [0xC39700, c, obk_05_5_npc]
-    - [0xC39940, c, obk_05_6_entity]
+    - [0xC38F60, c, settings]
+    - [0xC38F60, c, music]
+    - [0xC38F60, c, main]
+    - [0xC38FB0, c, rocking_chair]
+    - [0xC396D0, c, hole]
+    - [0xC39700, c, npc]
+    - [0xC39940, c, entity]
   - name: obk_06
     dir: world/area_obk/obk_06
     type: code
     start: 0xC3A590
     vram: 0x80240000
     subsegments:
-    - [0xC3A590, c, obk_06_0_header]
-    - [0xC3A590, c, obk_06_1_music]
-    - [0xC3A590, c, obk_06_2_main]
-    - [0xC3A590, c, obk_06_3_bombable]
-    - [0xC3A590, c, obk_06_4_entity]
+    - [0xC3A590, c, settings]
+    - [0xC3A590, c, music]
+    - [0xC3A590, c, main]
+    - [0xC3A590, c, bombable]
+    - [0xC3A590, c, entity]
   - name: obk_07
     dir: world/area_obk/obk_07
     type: code
     start: 0xC3AAF0
     vram: 0x80240000
     subsegments:
-    - [0xC3AAF0, c, obk_07_0_header]
-    - [0xC3AAF0, c, obk_07_1_music]
-    - [0xC3AAF0, c, obk_07_2_main]
-    - [0xC3AAF0, c, obk_07_3_entity]
-    - [0xC3ADB0, c, obk_07_4_fireplace]
-    - [0xC3ADB0, c, obk_07_5_npc]
-    - [0xC3AFF0, c, obk_07_6_phonograph]
+    - [0xC3AAF0, c, settings]
+    - [0xC3AAF0, c, music]
+    - [0xC3AAF0, c, main]
+    - [0xC3AAF0, c, entity]
+    - [0xC3ADB0, c, fireplace]
+    - [0xC3ADB0, c, npc]
+    - [0xC3AFF0, c, phonograph]
   - name: obk_08
     dir: world/area_obk/obk_08
     type: code
     start: 0xC3F770
     vram: 0x80240000
     subsegments:
-    - [0xC3F770, c, obk_08_0_header]
-    - [0xC3F770, c, obk_08_1_music]
-    - [0xC3F770, c, obk_08_2_main]
-    - [0xC3F770, c, obk_08_3_cabinets]
-    - [0xC3FFB0, c, obk_08_4_entity]
-    - [0xC40010, c, obk_08_5_npc]
-    - [0xC40990, c, obk_08_6_game]
+    - [0xC3F770, c, settings]
+    - [0xC3F770, c, music]
+    - [0xC3F770, c, main]
+    - [0xC3F770, c, cabinets]
+    - [0xC3FFB0, c, entity]
+    - [0xC40010, c, npc]
+    - [0xC40990, c, game]
   - name: obk_09
     dir: world/area_obk/obk_09
     type: code
     start: 0xC466B0
     vram: 0x80240000
     subsegments:
-    - [0xC466B0, c, obk_09_0_header]
-    - [0xC466B0, c, obk_09_1_music]
-    - [0xC466B0, c, obk_09_2_main]
-    - [0xC466B0, c, obk_09_3_meet_bow]
-    - [0xC46840, c, obk_09_4_npc]
-    - [0xC46A00, c, obk_09_5_new_partner]
-    - [0xC46AA0, c, obk_09_6_epilogue]
+    - [0xC466B0, c, settings]
+    - [0xC466B0, c, music]
+    - [0xC466B0, c, main]
+    - [0xC466B0, c, meet_bow]
+    - [0xC46840, c, npc]
+    - [0xC46A00, c, new_partner]
+    - [0xC46AA0, c, epilogue]
   - name: arn_02
     dir: world/area_arn/arn_02
     type: code
     start: 0xC490B0
     vram: 0x80240000
     subsegments:
-    - [0xC490B0, c, arn_02_0_header]
-    - [0xC490B0, c, arn_02_1_music]
-    - [0xC490B0, c, arn_02_2_main]
-    - [0xC490B0, c, arn_02_3_entity]
-    - [0xC490B0, c, arn_02_4_npc]
+    - [0xC490B0, c, settings]
+    - [0xC490B0, c, music]
+    - [0xC490B0, c, main]
+    - [0xC490B0, c, entity]
+    - [0xC490B0, c, npc]
   - name: arn_03
     dir: world/area_arn/arn_03
     type: code
     start: 0xC4AC90
     vram: 0x80240000
     subsegments:
-    - [0xC4AC90, c, arn_03_0_header]
-    - [0xC4AC90, c, arn_03_1_music]
-    - [0xC4AC90, c, arn_03_2_main]
-    - [0xC4AC90, c, arn_03_3_npc]
-    - [0xC4C3B0, c, arn_03_4_entity]
+    - [0xC4AC90, c, settings]
+    - [0xC4AC90, c, music]
+    - [0xC4AC90, c, main]
+    - [0xC4AC90, c, npc]
+    - [0xC4C3B0, c, entity]
   - name: arn_04
     dir: world/area_arn/arn_04
     type: code
     start: 0xC4F6B0
     vram: 0x80240000
     subsegments:
-    - [0xC4F6B0, c, arn_04_0_header]
-    - [0xC4F6B0, c, arn_04_1_music]
-    - [0xC4F6B0, c, arn_04_2_main]
-    - [0xC4F6B0, c, arn_04_3_npc]
-    - [0xC52A20, c, arn_04_4_entity]
+    - [0xC4F6B0, c, settings]
+    - [0xC4F6B0, c, music]
+    - [0xC4F6B0, c, main]
+    - [0xC4F6B0, c, npc]
+    - [0xC52A20, c, entity]
   - name: arn_05
     dir: world/area_arn/arn_05
     type: code
     start: 0xC53AE0
     vram: 0x80240000
     subsegments:
-    - [0xC53AE0, c, arn_05_0_header]
-    - [0xC53AE0, c, arn_05_1_music]
-    - [0xC53AE0, c, arn_05_2_main]
-    - [0xC53AE0, c, arn_05_3_npc]
-    - [0xC54DE0, c, arn_05_4_entity]
+    - [0xC53AE0, c, settings]
+    - [0xC53AE0, c, music]
+    - [0xC53AE0, c, main]
+    - [0xC53AE0, c, npc]
+    - [0xC54DE0, c, entity]
   - name: arn_07
     dir: world/area_arn/arn_07
     type: code
     start: 0xC58CF0
     vram: 0x80240000
     subsegments:
-    - [0xC58CF0, c, arn_07_0_header]
-    - [0xC58CF0, c, arn_07_1_music]
-    - [0xC58CF0, c, arn_07_2_main]
-    - [0xC594F0, c, arn_07_3_windmill]
-    - [0xC59560, c, arn_07_4_entity]
-    - [0xC59640, c, arn_07_5_npc]
+    - [0xC58CF0, c, settings]
+    - [0xC58CF0, c, music]
+    - [0xC58CF0, c, main]
+    - [0xC594F0, c, windmill]
+    - [0xC59560, c, entity]
+    - [0xC59640, c, npc]
   - name: arn_08
     dir: world/area_arn/arn_08
     type: code
     start: 0xC606A0
     vram: 0x80240000
     subsegments:
-    - [0xC606A0, c, arn_08_0_header]
-    - [0xC606A0, c, arn_08_1_music]
-    - [0xC606A0, c, arn_08_2_main]
-    - [0xC606A0, c, arn_08_3_well]
-    - [0xC60760, c, arn_08_4_gears]
-    - [0xC60760, c, arn_08_5_demo]
-    - [0xC60930, c, arn_08_6_npc]
-    - [0xC60930, c, arn_08_7_entity]
+    - [0xC606A0, c, settings]
+    - [0xC606A0, c, music]
+    - [0xC606A0, c, main]
+    - [0xC606A0, c, well]
+    - [0xC60760, c, gears]
+    - [0xC60760, c, demo]
+    - [0xC60930, c, npc]
+    - [0xC60930, c, entity]
   - name: arn_09
     dir: world/area_arn/arn_09
     type: code
     start: 0xC61F60
     vram: 0x80240000
     subsegments:
-    - [0xC61F60, c, arn_09_0_header]
-    - [0xC61F60, c, arn_09_1_music]
-    - [0xC61F60, c, arn_09_2_main]
-    - [0xC61F60, c, arn_09_3_entity]
-    - [0xC61F60, c, arn_09_4_launch]
-    - [0xC61F60, c, arn_09_5_npc]
+    - [0xC61F60, c, settings]
+    - [0xC61F60, c, music]
+    - [0xC61F60, c, main]
+    - [0xC61F60, c, entity]
+    - [0xC61F60, c, launch]
+    - [0xC61F60, c, npc]
   - name: arn_10
     dir: world/area_arn/arn_10
     type: code
     start: 0xC62900
     vram: 0x80240000
     subsegments:
-    - [0xC62900, c, arn_10_0_header]
-    - [0xC62900, c, arn_10_1_music]
-    - [0xC62900, c, arn_10_2_main]
-    - [0xC62900, c, arn_10_3_npc]
-    - [0xC62900, c, arn_10_4_entity]
+    - [0xC62900, c, settings]
+    - [0xC62900, c, music]
+    - [0xC62900, c, main]
+    - [0xC62900, c, npc]
+    - [0xC62900, c, entity]
   - name: arn_11
     dir: world/area_arn/arn_11
     type: code
     start: 0xC63580
     vram: 0x80240000
     subsegments:
-    - [0xC63580, c, arn_11_0_header]
-    - [0xC63580, c, arn_11_1_music]
-    - [0xC63580, c, arn_11_2_main]
-    - [0xC63580, c, arn_11_3_npc]
+    - [0xC63580, c, settings]
+    - [0xC63580, c, music]
+    - [0xC63580, c, main]
+    - [0xC63580, c, npc]
   - name: arn_12
     dir: world/area_arn/arn_12
     type: code
     start: 0xC64690
     vram: 0x80240000
     subsegments:
-    - [0xC64690, c, arn_12_0_header]
-    - [0xC64690, c, arn_12_1_music]
-    - [0xC64690, c, arn_12_2_main]
-    - [0xC64690, c, arn_12_3_npc]
-    - [0xC64690, c, arn_12_4_entity]
+    - [0xC64690, c, settings]
+    - [0xC64690, c, music]
+    - [0xC64690, c, main]
+    - [0xC64690, c, npc]
+    - [0xC64690, c, entity]
   - name: arn_13
     dir: world/area_arn/arn_13
     type: code
     start: 0xC65310
     vram: 0x80240000
     subsegments:
-    - [0xC65310, c, arn_13_0_header]
-    - [0xC65310, c, arn_13_1_music]
-    - [0xC65310, c, arn_13_2_main]
-    - [0xC65310, c, arn_13_3_npc]
-    - [0xC65310, c, arn_13_4_entity]
+    - [0xC65310, c, settings]
+    - [0xC65310, c, music]
+    - [0xC65310, c, main]
+    - [0xC65310, c, npc]
+    - [0xC65310, c, entity]
   - name: dgb_00
     dir: world/area_dgb/dgb_00
     type: code
     start: 0xC65FA0
     vram: 0x80240000
     subsegments:
-    - [0xC65FA0, c, dgb_00_0_header]
-    - [0xC65FA0, c, dgb_00_1_music]
-    - [0xC65FA0, c, dgb_00_2_main]
-    - [0xC66000, c, dgb_00_3_npc]
-    - [0xC66050, c, dgb_00_4_entity]
+    - [0xC65FA0, c, settings]
+    - [0xC65FA0, c, music]
+    - [0xC65FA0, c, main]
+    - [0xC66000, c, npc]
+    - [0xC66050, c, entity]
   - name: dgb_01
     dir: world/area_dgb/dgb_01
     type: code
     start: 0xC69780
     vram: 0x80240000
     subsegments:
-    - [0xC69780, c, dgb_01_0_header]
-    - [0xC69780, c, dgb_01_1_music]
-    - [0xC69780, c, dgb_01_2_main]
-    - [0xC69780, c, dgb_01_3_bridges]
-    - [0xC697C0, c, dgb_01_4_entity]
-    - [0xC698A0, c, dgb_01_5_npc]
-    - [0xC6CB70, c, dgb_01_6_img0]
-    - [0xC6CB70, c, dgb_01_6_img1]
-    - [0xC6CB70, c, dgb_01_6_img2]
-    - [0xC6CB70, c, dgb_01_6_img3]
-    - [0xC6CB70, c, dgb_01_6_img4]
-    - [0xC6CB70, c, dgb_01_6_img5]
-    - [0xC6CB70, c, dgb_01_6_img6]
-    - [0xC6CB70, c, dgb_01_6_img7]
-    - [0xC6CB70, c, dgb_01_7]
-    - [0xC6CB70, .data, dgb_01_0_header]
-    - [0xC6CC20, .data, dgb_01_1_music]
-    - [0xC6CCD0, .data, dgb_01_2_main]
-    - [0xC6D670, .data, dgb_01_3_bridges]
-    - [0xC6E250, .data, dgb_01_4_entity]
-    - [0xC6E450, .data, dgb_01_5_npc]
+    - [0xC69780, c, settings]
+    - [0xC69780, c, music]
+    - [0xC69780, c, main]
+    - [0xC69780, c, bridges]
+    - [0xC697C0, c, entity]
+    - [0xC698A0, c, npc]
+    - [0xC6CB70, c, img0]
+    - [0xC6CB70, c, img1]
+    - [0xC6CB70, c, img2]
+    - [0xC6CB70, c, img3]
+    - [0xC6CB70, c, img4]
+    - [0xC6CB70, c, img5]
+    - [0xC6CB70, c, img6]
+    - [0xC6CB70, c, img7]
+    - [0xC6CB70, c, gfx]
+    - [0xC6CB70, .data, settings]
+    - [0xC6CC20, .data, music]
+    - [0xC6CCD0, .data, main]
+    - [0xC6D670, .data, bridges]
+    - [0xC6E250, .data, entity]
+    - [0xC6E450, .data, npc]
     - start: 0xC706F0
       type: .data
-      name: dgb_01_6_img0
+      name: img0
       subsegments:
       - [0xC706F0, rgba16, img0, 64, 32]
       - [0xC716F0, gfx, img0]
     - start: 0xC71770
       type: .data
-      name: dgb_01_6_img1
+      name: img1
       subsegments:
       - [0xC71770, rgba16, img1, 64, 32]
       - [0xC72770, gfx, img1]
     - start: 0xC727F0
       type: .data
-      name: dgb_01_6_img2
+      name: img2
       subsegments:
       - [0xC727F0, rgba16, img2, 32, 32]
       - [0xC72FF0, gfx, img2]
     - start: 0xC73070
       type: .data
-      name: dgb_01_6_img3
+      name: img3
       subsegments:
       - [0xC73070, rgba16, img3, 16, 32]
       - [0xC73470, gfx, img3]
     - start: 0xC734F0
       type: .data
-      name: dgb_01_6_img4
+      name: img4
       subsegments:
       - [0xC734F0, rgba16, img4, 16, 32]
       - [0xC738F0, gfx, img4]
     - start: 0xC73970
       type: .data
-      name: dgb_01_6_img5
+      name: img5
       subsegments:
       - [0xC73970, rgba16, img5, 16, 32]
       - [0xC73D70, gfx, img5]
     - start: 0xC73DF0
       type: .data
-      name: dgb_01_6_img6
+      name: img6
       subsegments:
       - [0xC73DF0, rgba16, img6, 32, 32]
       - [0xC745F0, gfx, img6]
     - start: 0xC74670
       type: .data
-      name: dgb_01_6_img7
+      name: img7
       subsegments:
       - [0xC74670, rgba16, img7, 32, 32]
       - [0xC74E70, gfx, img7]
-    - [0xC74EF0, .data, dgb_01_7] # TODO needs additioanl cleanup and gfx splitting
+    - [0xC74EF0, .data, gfx] # TODO needs additioanl cleanup and gfx splitting
   - name: dgb_01_smash_bridges
     type: code
     dir: world/area_dgb
     start: 0xC8CE40
     vram: 0x80200000
     subsegments:
-    - [0xC8CE40, c, dgb_01_smash_bridges]
+    - [0xC8CE40, c, smash_bridges]
     - start: 0xC8CE40
       type: .data
-      name: dgb_01_smash_bridges
+      name: smash_bridges
       subsegments:
       - [0xC8CE40, vtx, vtx/C20F40]
       - [0xC8D000, vtx, vtx/C21100]
@@ -10617,686 +10617,686 @@ segments:
     start: 0xC9AAA0
     vram: 0x80240000
     subsegments:
-    - [0xC9AAA0, c, dgb_02_0_header]
-    - [0xC9AAA0, c, dgb_02_1_music]
-    - [0xC9AAA0, c, dgb_02_2_main]
-    - [0xC9AAA0, c, dgb_02_3_npc]
+    - [0xC9AAA0, c, settings]
+    - [0xC9AAA0, c, music]
+    - [0xC9AAA0, c, main]
+    - [0xC9AAA0, c, npc]
   - name: dgb_03
     dir: world/area_dgb/dgb_03
     type: code
     start: 0xC9D3E0
     vram: 0x80240000
     subsegments:
-    - [0xC9D3E0, c, dgb_03_0_header]
-    - [0xC9D3E0, c, dgb_03_1_music]
-    - [0xC9D3E0, c, dgb_03_2_main]
-    - [0xC9D3E0, c, dgb_03_3_clock]
-    - [0xC9D550, c, dgb_03_4_entity]
-    - [0xC9D630, c, dgb_03_5_npc]
+    - [0xC9D3E0, c, settings]
+    - [0xC9D3E0, c, music]
+    - [0xC9D3E0, c, main]
+    - [0xC9D3E0, c, clock]
+    - [0xC9D550, c, entity]
+    - [0xC9D630, c, npc]
   - name: dgb_04
     dir: world/area_dgb/dgb_04
     type: code
     start: 0xCA2430
     vram: 0x80240000
     subsegments:
-    - [0xCA2430, c, dgb_04_0_header]
-    - [0xCA2430, c, dgb_04_1_music]
-    - [0xCA2430, c, dgb_04_2_main]
-    - [0xCA2430, c, dgb_04_3_npc]
-    - [0xCA4800, c, dgb_04_4_entity]
+    - [0xCA2430, c, settings]
+    - [0xCA2430, c, music]
+    - [0xCA2430, c, main]
+    - [0xCA2430, c, npc]
+    - [0xCA4800, c, entity]
   - name: dgb_05
     dir: world/area_dgb/dgb_05
     type: code
     start: 0xCA6910
     vram: 0x80240000
     subsegments:
-    - [0xCA6910, c, dgb_05_0_header]
-    - [0xCA6910, c, dgb_05_1_music]
-    - [0xCA6910, c, dgb_05_2_main]
-    - [0xCA6910, c, dgb_05_3_hole]
-    - [0xCA6970, c, dgb_05_4_entity]
-    - [0xCA6970, c, dgb_05_5_npc]
+    - [0xCA6910, c, settings]
+    - [0xCA6910, c, music]
+    - [0xCA6910, c, main]
+    - [0xCA6910, c, hole]
+    - [0xCA6970, c, entity]
+    - [0xCA6970, c, npc]
   - name: dgb_06
     dir: world/area_dgb/dgb_06
     type: code
     start: 0xCA8F80
     vram: 0x80240000
     subsegments:
-    - [0xCA8F80, c, dgb_06_0_header]
-    - [0xCA8F80, c, dgb_06_1_music]
-    - [0xCA8F80, c, dgb_06_2_main]
-    - [0xCA8F80, c, dgb_06_3_entity]
-    - [0xCA9240, c, dgb_06_4_npc]
+    - [0xCA8F80, c, settings]
+    - [0xCA8F80, c, music]
+    - [0xCA8F80, c, main]
+    - [0xCA8F80, c, entity]
+    - [0xCA9240, c, npc]
   - name: dgb_07
     dir: world/area_dgb/dgb_07
     type: code
     start: 0xCA9AF0
     vram: 0x80240000
     subsegments:
-    - [0xCA9AF0, c, dgb_07_0_header]
-    - [0xCA9AF0, c, dgb_07_1_music]
-    - [0xCA9AF0, c, dgb_07_2_main]
-    - [0xCA9AF0, c, dgb_07_3_entity]
-    - [0xCA9AF0, c, dgb_07_4_npc]
+    - [0xCA9AF0, c, settings]
+    - [0xCA9AF0, c, music]
+    - [0xCA9AF0, c, main]
+    - [0xCA9AF0, c, entity]
+    - [0xCA9AF0, c, npc]
   - name: dgb_08
     dir: world/area_dgb/dgb_08
     type: code
     start: 0xCABCB0
     vram: 0x80240000
     subsegments:
-    - [0xCABCB0, c, dgb_08_0_header]
-    - [0xCABCB0, c, dgb_08_1_music]
-    - [0xCABCB0, c, dgb_08_2_main]
-    - [0xCABCB0, c, dgb_08_3_npc]
-    - [0xCAF940, c, dgb_08_4_entity]
+    - [0xCABCB0, c, settings]
+    - [0xCABCB0, c, music]
+    - [0xCABCB0, c, main]
+    - [0xCABCB0, c, npc]
+    - [0xCAF940, c, entity]
   - name: dgb_09
     dir: world/area_dgb/dgb_09
     type: code
     start: 0xCB2AE0
     vram: 0x80240000
     subsegments:
-    - [0xCB2AE0, c, dgb_09_0_header]
-    - [0xCB2AE0, c, dgb_09_1_music]
-    - [0xCB2AE0, c, dgb_09_2_main]
-    - [0xCB2AE0, c, dgb_09_3_breakable]
-    - [0xCB2AE0, c, dgb_09_4_npc]
+    - [0xCB2AE0, c, settings]
+    - [0xCB2AE0, c, music]
+    - [0xCB2AE0, c, main]
+    - [0xCB2AE0, c, breakable]
+    - [0xCB2AE0, c, npc]
   - name: dgb_10
     dir: world/area_dgb/dgb_10
     type: code
     start: 0xCB8290
     vram: 0x80240000
     subsegments:
-    - [0xCB8290, c, dgb_10_0_header]
-    - [0xCB8290, c, dgb_10_1_music]
-    - [0xCB8290, c, dgb_10_2_main]
-    - [0xCB8290, c, dgb_10_3_hole]
-    - [0xCB8480, c, dgb_10_4_entity]
+    - [0xCB8290, c, settings]
+    - [0xCB8290, c, music]
+    - [0xCB8290, c, main]
+    - [0xCB8290, c, hole]
+    - [0xCB8480, c, entity]
   - name: dgb_11
     dir: world/area_dgb/dgb_11
     type: code
     start: 0xCB9300
     vram: 0x80240000
     subsegments:
-    - [0xCB9300, c, dgb_11_0_header]
-    - [0xCB9300, c, dgb_11_1_music]
-    - [0xCB9300, c, dgb_11_2_main]
-    - [0xCB9300, c, dgb_11_3_entity]
+    - [0xCB9300, c, settings]
+    - [0xCB9300, c, music]
+    - [0xCB9300, c, main]
+    - [0xCB9300, c, entity]
   - name: dgb_12
     dir: world/area_dgb/dgb_12
     type: code
     start: 0xCB9E10
     vram: 0x80240000
     subsegments:
-    - [0xCB9E10, c, dgb_12_0_header]
-    - [0xCB9E10, c, dgb_12_1_music]
-    - [0xCB9E10, c, dgb_12_2_main]
-    - [0xCB9E10, c, dgb_12_3_spikes]
-    - [0xCB9E10, c, dgb_12_4_entity]
+    - [0xCB9E10, c, settings]
+    - [0xCB9E10, c, music]
+    - [0xCB9E10, c, main]
+    - [0xCB9E10, c, spikes]
+    - [0xCB9E10, c, entity]
   - name: dgb_13
     dir: world/area_dgb/dgb_13
     type: code
     start: 0xCBA880
     vram: 0x80240000
     subsegments:
-    - [0xCBA880, c, dgb_13_0_header]
-    - [0xCBA880, c, dgb_13_1_music]
-    - [0xCBA880, c, dgb_13_2_main]
-    - [0xCBA880, c, dgb_13_3_entity]
-    - [0xCBA880, c, dgb_13_4_drawer]
+    - [0xCBA880, c, settings]
+    - [0xCBA880, c, music]
+    - [0xCBA880, c, main]
+    - [0xCBA880, c, entity]
+    - [0xCBA880, c, drawer]
   - name: dgb_14
     dir: world/area_dgb/dgb_14
     type: code
     start: 0xCBAF50
     vram: 0x80240000
     subsegments:
-    - [0xCBAF50, c, dgb_14_0_header]
-    - [0xCBAF50, c, dgb_14_1_music]
-    - [0xCBAF50, c, dgb_14_2_main]
-    - [0xCBAF50, c, dgb_14_3_entity]
+    - [0xCBAF50, c, settings]
+    - [0xCBAF50, c, music]
+    - [0xCBAF50, c, main]
+    - [0xCBAF50, c, entity]
   - name: dgb_15
     dir: world/area_dgb/dgb_15
     type: code
     start: 0xCBB430
     vram: 0x80240000
     subsegments:
-    - [0xCBB430, c, dgb_15_0_header]
-    - [0xCBB430, c, dgb_15_1_music]
-    - [0xCBB430, c, dgb_15_2_main]
-    - [0xCBB430, c, dgb_15_3_npc]
-    - [0xCBCBC0, c, dgb_15_4_entity]
+    - [0xCBB430, c, settings]
+    - [0xCBB430, c, music]
+    - [0xCBB430, c, main]
+    - [0xCBB430, c, npc]
+    - [0xCBCBC0, c, entity]
   - name: dgb_16
     dir: world/area_dgb/dgb_16
     type: code
     start: 0xCBE460
     vram: 0x80240000
     subsegments:
-    - [0xCBE460, c, dgb_16_0_header]
-    - [0xCBE460, c, dgb_16_1_music]
-    - [0xCBE460, c, dgb_16_2_main]
-    - [0xCBE460, c, dgb_16_3_entity]
-    - [0xCBE460, c, dgb_16_4_npc]
+    - [0xCBE460, c, settings]
+    - [0xCBE460, c, music]
+    - [0xCBE460, c, main]
+    - [0xCBE460, c, entity]
+    - [0xCBE460, c, npc]
   - name: dgb_17
     dir: world/area_dgb/dgb_17
     type: code
     start: 0xCC1980
     vram: 0x80240000
     subsegments:
-    - [0xCC1980, c, dgb_17_0_header]
-    - [0xCC1980, c, dgb_17_1_music]
-    - [0xCC1980, c, dgb_17_2_main]
-    - [0xCC1980, c, dgb_17_3_entity]
+    - [0xCC1980, c, settings]
+    - [0xCC1980, c, music]
+    - [0xCC1980, c, main]
+    - [0xCC1980, c, entity]
   - name: dgb_18
     dir: world/area_dgb/dgb_18
     type: code
     start: 0xCC1E60
     vram: 0x80240000
     subsegments:
-    - [0xCC1E60, c, dgb_18_0_header]
-    - [0xCC1E60, c, dgb_18_1_music]
-    - [0xCC1E60, c, dgb_18_2_main]
-    - [0xCC1E60, c, dgb_18_3_npc]
-    - [0xCC2E10, c, dgb_18_4_entity]
+    - [0xCC1E60, c, settings]
+    - [0xCC1E60, c, music]
+    - [0xCC1E60, c, main]
+    - [0xCC1E60, c, npc]
+    - [0xCC2E10, c, entity]
   - name: kzn_01
     dir: world/area_kzn/kzn_01
     type: code
     start: 0xCC58F0
     vram: 0x80240000
     subsegments:
-    - [0xCC58F0, c, kzn_01_0_header]
-    - [0xCC58F0, c, kzn_01_1_main]
-    - [0xCC5C00, c, kzn_01_2_npc]
+    - [0xCC58F0, c, settings]
+    - [0xCC58F0, c, main]
+    - [0xCC5C00, c, npc]
   - name: kzn_02
     dir: world/area_kzn/kzn_02
     type: code
     start: 0xCC6660
     vram: 0x80240000
     subsegments:
-    - [0xCC6660, c, kzn_02_0_header]
-    - [0xCC6660, c, kzn_02_1_main]
-    - [0xCC6970, c, kzn_02_2_platforms]
-    - [0xCC6B40, c, kzn_02_3_npc]
-    - [0xCC8D90, c, kzn_02_4_demo]
+    - [0xCC6660, c, settings]
+    - [0xCC6660, c, main]
+    - [0xCC6970, c, platforms]
+    - [0xCC6B40, c, npc]
+    - [0xCC8D90, c, demo]
   - name: kzn_03
     dir: world/area_kzn/kzn_03
     type: code
     start: 0xCCCC30
     vram: 0x80240000
     subsegments:
-    - [0xCCCC30, c, kzn_03_0_header]
-    - [0xCCCC30, c, kzn_03_1_main]
-    - [0xCCCF40, c, kzn_03_2_npc]
-    - [0xCCF930, c, kzn_03_3_entity]
-    - [0xCCF9E0, c, kzn_03_4_ziplines]
+    - [0xCCCC30, c, settings]
+    - [0xCCCC30, c, main]
+    - [0xCCCF40, c, npc]
+    - [0xCCF930, c, entity]
+    - [0xCCF9E0, c, ziplines]
   - name: kzn_04
     dir: world/area_kzn/kzn_04
     type: code
     start: 0xCD4050
     vram: 0x80240000
     subsegments:
-    - [0xCD4050, c, kzn_04_0_header]
-    - [0xCD4050, c, kzn_04_1_main]
-    - [0xCD4360, c, kzn_04_2_entity]
-    - [0xCD50A0, c, kzn_04_3_npc]
+    - [0xCD4050, c, settings]
+    - [0xCD4050, c, main]
+    - [0xCD4360, c, entity]
+    - [0xCD50A0, c, npc]
   - name: kzn_05
     dir: world/area_kzn/kzn_05
     type: code
     start: 0xCD7FF0
     vram: 0x80240000
     subsegments:
-    - [0xCD7FF0, c, kzn_05_0_header]
-    - [0xCD7FF0, c, kzn_05_1_main]
+    - [0xCD7FF0, c, settings]
+    - [0xCD7FF0, c, main]
   - name: kzn_06
     dir: world/area_kzn/kzn_06
     type: code
     start: 0xCD8840
     vram: 0x80240000
     subsegments:
-    - [0xCD8840, c, kzn_06_0_header]
-    - [0xCD8840, c, kzn_06_1_main]
-    - [0xCD8B50, c, kzn_06_2_entity]
-    - [0xCD8C30, c, kzn_06_3_extra]
+    - [0xCD8840, c, settings]
+    - [0xCD8840, c, main]
+    - [0xCD8B50, c, entity]
+    - [0xCD8C30, c, extra]
   - name: kzn_07
     dir: world/area_kzn/kzn_07
     type: code
     start: 0xCDA250
     vram: 0x80240000
     subsegments:
-    - [0xCDA250, c, kzn_07_0_header]
-    - [0xCDA250, c, kzn_07_1_music]
-    - [0xCDA250, c, kzn_07_2_main]
-    - [0xCDA970, c, kzn_07_3_entity]
-    - [0xCDAA70, c, kzn_07_4_npc]
+    - [0xCDA250, c, settings]
+    - [0xCDA250, c, music]
+    - [0xCDA250, c, main]
+    - [0xCDA970, c, entity]
+    - [0xCDAA70, c, npc]
   - name: kzn_08
     dir: world/area_kzn/kzn_08
     type: code
     start: 0xCDD3A0
     vram: 0x80240000
     subsegments:
-    - [0xCDD3A0, c, kzn_08_0_header]
-    - [0xCDD3A0, c, kzn_08_1_main]
-    - [0xCDDB30, c, kzn_08_2_entity]
-    - [0xCDDDF0, c, kzn_08_3_npc]
-    - [0xCE1280, c, kzn_08_4_extra]
+    - [0xCDD3A0, c, settings]
+    - [0xCDD3A0, c, main]
+    - [0xCDDB30, c, entity]
+    - [0xCDDDF0, c, npc]
+    - [0xCE1280, c, extra]
   - name: kzn_09
     dir: world/area_kzn/kzn_09
     type: code
     start: 0xCE2C00
     vram: 0x80240000
     subsegments:
-    - [0xCE2C00, c, kzn_09_0_header]
-    - [0xCE2C00, c, kzn_09_1_main]
-    - [0xCE2C00, c, kzn_09_2_entity]
-    - [0xCE3940, c, kzn_09_3_zipline]
-    - [0xCE3C20, c, kzn_09_4_npc]
+    - [0xCE2C00, c, settings]
+    - [0xCE2C00, c, main]
+    - [0xCE2C00, c, entity]
+    - [0xCE3940, c, zipline]
+    - [0xCE3C20, c, npc]
   - name: kzn_10
     dir: world/area_kzn/kzn_10
     type: code
     start: 0xCEA0A0
     vram: 0x80240000
     subsegments:
-    - [0xCEA0A0, c, kzn_10_0_header]
-    - [0xCEA0A0, c, kzn_10_1_main]
-    - [0xCEA3D0, c, kzn_10_2_tromp]
+    - [0xCEA0A0, c, settings]
+    - [0xCEA0A0, c, main]
+    - [0xCEA3D0, c, tromp]
   - name: kzn_11
     dir: world/area_kzn/kzn_11
     type: code
     start: 0xCEC0C0
     vram: 0x80240000
     subsegments:
-    - [0xCEC0C0, c, kzn_11_0_header]
-    - [0xCEC0C0, c, kzn_11_1_main]
-    - [0xCEC3D0, c, kzn_11_2_platforms]
-    - [0xCEC520, c, kzn_11_3_npc]
+    - [0xCEC0C0, c, settings]
+    - [0xCEC0C0, c, main]
+    - [0xCEC3D0, c, platforms]
+    - [0xCEC520, c, npc]
   - name: kzn_17
     dir: world/area_kzn/kzn_17
     type: code
     start: 0xCF19D0
     vram: 0x80240000
     subsegments:
-    - [0xCF19D0, c, kzn_17_0_header]
-    - [0xCF19D0, c, kzn_17_1_main]
-    - [0xCF1CE0, c, kzn_17_2_entity]
-    - [0xCF1CE0, c, kzn_17_3_npc]
-    - [0xCF46D0, c, kzn_17_4_tromp]
+    - [0xCF19D0, c, settings]
+    - [0xCF19D0, c, main]
+    - [0xCF1CE0, c, entity]
+    - [0xCF1CE0, c, npc]
+    - [0xCF46D0, c, tromp]
   - name: kzn_18
     dir: world/area_kzn/kzn_18
     type: code
     start: 0xCF7FC0
     vram: 0x80240000
     subsegments:
-    - [0xCF7FC0, c, kzn_18_0_header]
-    - [0xCF8000, c, kzn_18_1_main]
-    - [0xCF8310, c, kzn_18_2_npc]
-    - [0xCF8380, c, kzn_18_3_entity]
+    - [0xCF7FC0, c, settings]
+    - [0xCF8000, c, main]
+    - [0xCF8310, c, npc]
+    - [0xCF8380, c, entity]
   - name: kzn_19
     dir: world/area_kzn/kzn_19
     type: code
     start: 0xCF9AD0
     vram: 0x80240000
     subsegments:
-    - [0xCF9AD0, c, kzn_19_0_header]
-    - [0xCF9AD0, c, kzn_19_1_music]
-    - [0xCF9AD0, c, kzn_19_2_main]
-    - [0xCFA5D0, c, kzn_19_3_npc_settings]
-    - [0xCFA5D0, c, kzn_19_4_npc]
-    - [0xCFB800, c, kzn_19_5_eruption]
-    - [0xCFB800, c, kzn_19_6_entity]
-    - [0xCFB800, .data, kzn_19_0_header]
-    - [0xCFB880, .data, kzn_19_1_music]
-    - [0xCFB960, .data, kzn_19_2_main]
-    - [0xCFCA30, .data, kzn_19_3_npc_settings]
+    - [0xCF9AD0, c, settings]
+    - [0xCF9AD0, c, music]
+    - [0xCF9AD0, c, main]
+    - [0xCFA5D0, c, npc_settings]
+    - [0xCFA5D0, c, npc]
+    - [0xCFB800, c, eruption]
+    - [0xCFB800, c, entity]
+    - [0xCFB800, .data, settings]
+    - [0xCFB880, .data, music]
+    - [0xCFB960, .data, main]
+    - [0xCFCA30, .data, npc_settings]
     - start: 0xCFCB10
       type: .data
-      name: kzn_19_4_npc
+      name: npc
       subsegments:
       - [0xCFCB10]
       - [0xCFCFA8, ci4, ../../lava_piranha/vine, 64, 32]
       - [0xCFD3A8, palette, ../../lava_piranha/vine]
       - [0xCFD5A8, gfx_common, ../../lava_piranha/vine]
       - [0xCFD688]
-    - [0xD018D0, .data, kzn_19_5_eruption]
-    - [0xD01D90, .data, kzn_19_6_entity]
+    - [0xD018D0, .data, eruption]
+    - [0xD01D90, .data, entity]
   - name: kzn_20
     dir: world/area_kzn/kzn_20
     type: code
     start: 0xD01E50
     vram: 0x80240000
     subsegments:
-    - [0xD01E50, c, kzn_20_0_header]
-    - [0xD01E50, c, kzn_20_1_music]
-    - [0xD01E50, c, kzn_20_2_main]
-    - [0xD02160, c, kzn_20_3_npc]
+    - [0xD01E50, c, settings]
+    - [0xD01E50, c, music]
+    - [0xD01E50, c, main]
+    - [0xD02160, c, npc]
   - name: kzn_22
     dir: world/area_kzn/kzn_22
     type: code
     start: 0xD06120
     vram: 0x80240000
     subsegments:
-    - [0xD06120, c, kzn_22_0_header]
-    - [0xD06120, c, kzn_22_1_music]
-    - [0xD06120, c, kzn_22_2_main]
-    - [0xD06460, c, kzn_22_3_entity]
-    - [0xD06460, c, kzn_22_4_npc]
+    - [0xD06120, c, settings]
+    - [0xD06120, c, music]
+    - [0xD06120, c, main]
+    - [0xD06460, c, entity]
+    - [0xD06460, c, npc]
   - name: kzn_23
     dir: world/area_kzn/kzn_23
     type: code
     start: 0xD08220
     vram: 0x80240000
     subsegments:
-    - [0xD08220, c, kzn_23_0_header]
-    - [0xD08220, c, kzn_23_1_music]
-    - [0xD08220, c, kzn_23_2_main]
-    - [0xD08530, c, kzn_23_3_npc]
+    - [0xD08220, c, settings]
+    - [0xD08220, c, music]
+    - [0xD08220, c, main]
+    - [0xD08530, c, npc]
   - name: flo_00
     dir: world/area_flo/flo_00
     type: code
     start: 0xD09E40
     vram: 0x80240000
     subsegments:
-    - [0xD09E40, c, flo_00_0_header]
-    - [0xD09E40, c, flo_00_1_music]
-    - [0xD09E40, c, flo_00_2_main]
-    - [0xD09E80, c, flo_00_3_npc]
-    - [0xD0AD50, c, flo_00_4_epilogue]
-    - [0xD0AD50, c, flo_00_5_beanstalk]
-    - [0xD0B220, c, flo_00_6_entity]
+    - [0xD09E40, c, settings]
+    - [0xD09E40, c, music]
+    - [0xD09E40, c, main]
+    - [0xD09E80, c, npc]
+    - [0xD0AD50, c, epilogue]
+    - [0xD0AD50, c, beanstalk]
+    - [0xD0B220, c, entity]
   - name: flo_03
     dir: world/area_flo/flo_03
     type: code
     start: 0xD131C0
     vram: 0x80240000
     subsegments:
-    - [0xD131C0, c, flo_03_0_header]
-    - [0xD131C0, c, flo_03_1_music]
-    - [0xD131C0, c, flo_03_2_main]
-    - [0xD13200, c, flo_03_3_npc]
-    - [0xD135B0, c, flo_03_4_foliage]
-    - [0xD137F0, c, flo_03_5_entity]
+    - [0xD131C0, c, settings]
+    - [0xD131C0, c, music]
+    - [0xD131C0, c, main]
+    - [0xD13200, c, npc]
+    - [0xD135B0, c, foliage]
+    - [0xD137F0, c, entity]
   - name: flo_07
     dir: world/area_flo/flo_07
     type: code
     start: 0xD18110
     vram: 0x80240000
     subsegments:
-    - [0xD18110, c, flo_07_0_header]
-    - [0xD18110, c, flo_07_1_music]
-    - [0xD18110, c, flo_07_2_main]
-    - [0xD184F0, c, flo_07_3_npc]
+    - [0xD18110, c, settings]
+    - [0xD18110, c, music]
+    - [0xD18110, c, main]
+    - [0xD184F0, c, npc]
   - name: flo_08
     dir: world/area_flo/flo_08
     type: code
     start: 0xD1AC60
     vram: 0x80240000
     subsegments:
-    - [0xD1AC60, c, flo_08_0_header]
-    - [0xD1AC60, c, flo_08_1_music]
-    - [0xD1AC60, c, flo_08_2_entity]
-    - [0xD1B9A0, c, flo_08_3_main]
-    - [0xD1B9E0, c, flo_08_4_npc]
-    - [0xD1C860, c, flo_08_5_foliage]
-    - [0xD1CAA0, c, flo_08_6_vines]
+    - [0xD1AC60, c, settings]
+    - [0xD1AC60, c, music]
+    - [0xD1AC60, c, entity]
+    - [0xD1B9A0, c, main]
+    - [0xD1B9E0, c, npc]
+    - [0xD1C860, c, foliage]
+    - [0xD1CAA0, c, vines]
   - name: flo_09
     dir: world/area_flo/flo_09
     type: code
     start: 0xD20F20
     vram: 0x80240000
     subsegments:
-    - [0xD20F20, c, flo_09_0_header]
-    - [0xD20F20, c, flo_09_1_music]
-    - [0xD20F20, c, flo_09_2_main]
-    - [0xD20F60, c, flo_09_3_vines]
-    - [0xD21000, c, flo_09_4_foliage]
-    - [0xD21240, c, flo_09_5_npc]
+    - [0xD20F20, c, settings]
+    - [0xD20F20, c, music]
+    - [0xD20F20, c, main]
+    - [0xD20F60, c, vines]
+    - [0xD21000, c, foliage]
+    - [0xD21240, c, npc]
   - name: flo_10
     dir: world/area_flo/flo_10
     type: code
     start: 0xD25120
     vram: 0x80240000
     subsegments:
-    - [0xD25120, c, flo_10_0_header]
-    - [0xD25160, c, flo_10_1_music]
-    - [0xD25160, c, flo_10_2_entity]
-    - [0xD25160, c, flo_10_3_main]
-    - [0xD251A0, c, flo_10_4_fountain]
-    - [0xD255D0, c, flo_10_5_npc]
-    - [0xD255D0, c, flo_10_6_waterfx]
-    - [0xD26350, c, flo_10_7_foliage]
+    - [0xD25120, c, settings]
+    - [0xD25160, c, music]
+    - [0xD25160, c, entity]
+    - [0xD25160, c, main]
+    - [0xD251A0, c, fountain]
+    - [0xD255D0, c, npc]
+    - [0xD255D0, c, waterfx]
+    - [0xD26350, c, foliage]
   - name: flo_11
     dir: world/area_flo/flo_11
     type: code
     start: 0xD29BF0
     vram: 0x80240000
     subsegments:
-    - [0xD29BF0, c, flo_11_0_header]
-    - [0xD29BF0, c, flo_11_1_music]
-    - [0xD29BF0, c, flo_11_2_main]
-    - [0xD29F10, c, flo_11_3_npc]
-    - [0xD29F10, c, flo_11_4_entity]
+    - [0xD29BF0, c, settings]
+    - [0xD29BF0, c, music]
+    - [0xD29BF0, c, main]
+    - [0xD29F10, c, npc]
+    - [0xD29F10, c, entity]
   - name: flo_12
     dir: world/area_flo/flo_12
     type: code
     start: 0xD2CD50
     vram: 0x80240000
     subsegments:
-    - [0xD2CD50, c, flo_12_0_header]
-    - [0xD2CD50, c, flo_12_1_music]
-    - [0xD2CD50, c, flo_12_2_main]
-    - [0xD2CD90, c, flo_12_3_npc]
+    - [0xD2CD50, c, settings]
+    - [0xD2CD50, c, music]
+    - [0xD2CD50, c, main]
+    - [0xD2CD90, c, npc]
   - name: flo_13
     dir: world/area_flo/flo_13
     type: code
     start: 0xD2F730
     vram: 0x80240000
     subsegments:
-    - [0xD2F730, c, flo_13_0_header]
-    - [0xD2F730, c, flo_13_1_music]
-    - [0xD2F730, c, flo_13_2_entity]
-    - [0xD2F730, c, flo_13_3_main]
-    - [0xD2F770, c, flo_13_4_npc]
-    - [0xD32D00, c, flo_13_5_new_partner]
+    - [0xD2F730, c, settings]
+    - [0xD2F730, c, music]
+    - [0xD2F730, c, entity]
+    - [0xD2F730, c, main]
+    - [0xD2F770, c, npc]
+    - [0xD32D00, c, new_partner]
   - name: flo_14
     dir: world/area_flo/flo_14
     type: code
     start: 0xD37230
     vram: 0x80240000
     subsegments:
-    - [0xD37230, c, flo_14_0_header]
-    - [0xD37230, c, flo_14_1_music]
-    - [0xD37230, c, flo_14_2_main]
-    - [0xD37570, c, flo_14_3_bubbles]
-    - [0xD37D40, c, flo_14_4_npc]
-    - [0xD39590, c, flo_14_5_entity]
-    - [0xD39590, c, flo_14_6_logs]
+    - [0xD37230, c, settings]
+    - [0xD37230, c, music]
+    - [0xD37230, c, main]
+    - [0xD37570, c, bubbles]
+    - [0xD37D40, c, npc]
+    - [0xD39590, c, entity]
+    - [0xD39590, c, logs]
   - name: flo_15
     dir: world/area_flo/flo_15
     type: code
     start: 0xD3C5E0
     vram: 0x80240000
     subsegments:
-    - [0xD3C5E0, c, flo_15_0_header]
-    - [0xD3C5E0, c, flo_15_1_music]
-    - [0xD3C5E0, c, flo_15_2_main]
-    - [0xD3C5E0, c, flo_15_3_npc]
-    - [0xD3C5E0, c, flo_15_4_entity]
-    - [0xD3C5E0, c, flo_15_5_stairs]
+    - [0xD3C5E0, c, settings]
+    - [0xD3C5E0, c, music]
+    - [0xD3C5E0, c, main]
+    - [0xD3C5E0, c, npc]
+    - [0xD3C5E0, c, entity]
+    - [0xD3C5E0, c, stairs]
   - name: flo_16
     dir: world/area_flo/flo_16
     type: code
     start: 0xD3DD50
     vram: 0x80240000
     subsegments:
-    - [0xD3DD50, c, flo_16_0_header]
-    - [0xD3DD50, c, flo_16_1_music]
-    - [0xD3DD50, c, flo_16_2_main]
-    - [0xD3DD90, c, flo_16_3_vines]
-    - [0xD3DE30, c, flo_16_4_entity]
-    - [0xD3EBA0, c, flo_16_5_npc]
-    - [0xD40690, c, flo_16_6_puzzle]
+    - [0xD3DD50, c, settings]
+    - [0xD3DD50, c, music]
+    - [0xD3DD50, c, main]
+    - [0xD3DD90, c, vines]
+    - [0xD3DE30, c, entity]
+    - [0xD3EBA0, c, npc]
+    - [0xD40690, c, puzzle]
   - name: flo_17
     dir: world/area_flo/flo_17
     type: code
     start: 0xD43200
     vram: 0x80240000
     subsegments:
-    - [0xD43200, c, flo_17_0_header]
-    - [0xD43200, c, flo_17_1_music]
-    - [0xD43200, c, flo_17_2_main]
-    - [0xD43240, c, flo_17_3_logs]
-    - [0xD43270, c, flo_17_4_npc]
-    - [0xD46420, c, flo_17_5_entity]
+    - [0xD43200, c, settings]
+    - [0xD43200, c, music]
+    - [0xD43200, c, main]
+    - [0xD43240, c, logs]
+    - [0xD43270, c, npc]
+    - [0xD46420, c, entity]
   - name: flo_18
     dir: world/area_flo/flo_18
     type: code
     start: 0xD485C0
     vram: 0x80240000
     subsegments:
-    - [0xD485C0, c, flo_18_0_header]
-    - [0xD485C0, c, flo_18_1_music]
-    - [0xD485C0, c, flo_18_2_main]
-    - [0xD48900, c, flo_18_3_machine]
-    - [0xD48AF0, c, flo_18_4_npc]
-    - [0xD48B50, c, flo_18_5_foliage]
+    - [0xD485C0, c, settings]
+    - [0xD485C0, c, music]
+    - [0xD485C0, c, main]
+    - [0xD48900, c, machine]
+    - [0xD48AF0, c, npc]
+    - [0xD48B50, c, foliage]
   - name: flo_19
     dir: world/area_flo/flo_19
     type: code
     start: 0xD4F610
     vram: 0x80240000
     subsegments:
-    - [0xD4F610, c, flo_19_0_header]
-    - [0xD4F610, c, flo_19_1_music]
-    - [0xD4F610, c, flo_19_2_entity]
-    - [0xD4F610, c, flo_19_3_main]
-    - [0xD4F950, c, flo_19_4_clouds]
-    - [0xD4FAE0, c, flo_19_5_beanstalk]
+    - [0xD4F610, c, settings]
+    - [0xD4F610, c, music]
+    - [0xD4F610, c, entity]
+    - [0xD4F610, c, main]
+    - [0xD4F950, c, clouds]
+    - [0xD4FAE0, c, beanstalk]
   - name: flo_21
     dir: world/area_flo/flo_21
     type: code
     start: 0xD52620
     vram: 0x80240000
     subsegments:
-    - [0xD52620, c, flo_21_0_header]
-    - [0xD52620, c, flo_21_1_music]
-    - [0xD52620, c, flo_21_2_main]
-    - [0xD53160, c, flo_21_3_clouds]
-    - [0xD532F0, c, flo_21_4_npc]
+    - [0xD52620, c, settings]
+    - [0xD52620, c, music]
+    - [0xD52620, c, main]
+    - [0xD53160, c, clouds]
+    - [0xD532F0, c, npc]
   - name: flo_22
     dir: world/area_flo/flo_22
     type: code
     start: 0xD58160
     vram: 0x80240000
     subsegments:
-    - [0xD58160, c, flo_22_0_header]
-    - [0xD58160, c, flo_22_1_music]
-    - [0xD58160, c, flo_22_2_main]
-    - [0xD581A0, c, flo_22_3_npc]
-    - [0xD581A0, c, flo_22_4_well]
-    - [0xD581B0, c, flo_22_5_foliage]
+    - [0xD58160, c, settings]
+    - [0xD58160, c, music]
+    - [0xD58160, c, main]
+    - [0xD581A0, c, npc]
+    - [0xD581A0, c, well]
+    - [0xD581B0, c, foliage]
   - name: flo_23
     dir: world/area_flo/flo_23
     type: code
     start: 0xD5A180
     vram: 0x80240000
     subsegments:
-    - [0xD5A180, c, flo_23_0_header]
-    - [0xD5A180, c, flo_23_1_music]
-    - [0xD5A180, c, flo_23_2_main]
-    - [0xD5A1C0, c, flo_23_3_npc]
-    - [0xD5AE50, c, flo_23_4_entity]
+    - [0xD5A180, c, settings]
+    - [0xD5A180, c, music]
+    - [0xD5A180, c, main]
+    - [0xD5A1C0, c, npc]
+    - [0xD5AE50, c, entity]
   - name: flo_24
     dir: world/area_flo/flo_24
     type: code
     start: 0xD5C860
     vram: 0x80240000
     subsegments:
-    - [0xD5C860, c, flo_24_0_header]
-    - [0xD5C860, c, flo_24_1_music]
-    - [0xD5C860, c, flo_24_2_main]
-    - [0xD5C8A0, c, flo_24_3_foliage]
-    - [0xD5CAE0, c, flo_24_4_water]
-    - [0xD5CDF0, c, flo_24_5_entity]
+    - [0xD5C860, c, settings]
+    - [0xD5C860, c, music]
+    - [0xD5C860, c, main]
+    - [0xD5C8A0, c, foliage]
+    - [0xD5CAE0, c, water]
+    - [0xD5CDF0, c, entity]
   - name: flo_25
     dir: world/area_flo/flo_25
     type: code
     start: 0xD5EAF0
     vram: 0x80240000
     subsegments:
-    - [0xD5EAF0, c, flo_25_0_header]
-    - [0xD5EAF0, c, flo_25_1_music]
-    - [0xD5EAF0, c, flo_25_2_main]
-    - [0xD5EB30, c, flo_25_3_npc]
-    - [0xD60AE0, c, flo_25_4_entity]
-    - [0xD60AE0, c, flo_25_5_foliage]
-    - [0xD60D20, c, flo_25_6_vine]
+    - [0xD5EAF0, c, settings]
+    - [0xD5EAF0, c, music]
+    - [0xD5EAF0, c, main]
+    - [0xD5EB30, c, npc]
+    - [0xD60AE0, c, entity]
+    - [0xD60AE0, c, foliage]
+    - [0xD60D20, c, vine]
   - name: sam_01
     dir: world/area_sam/sam_01
     type: code
     start: 0xD63A90
     vram: 0x80240000
     subsegments:
-    - [0xD63A90, c, sam_01_0_header]
-    - [0xD63A90, c, sam_01_1_music]
-    - [0xD63A90, c, sam_01_2_main]
-    - [0xD63DA0, c, sam_01_3_rooms]
-    - [0xD63DA0, c, sam_01_4_npc]
-    - [0xD65510, c, sam_01_5_scenes]
-    - [0xD65720, c, sam_01_6_entity]
+    - [0xD63A90, c, settings]
+    - [0xD63A90, c, music]
+    - [0xD63A90, c, main]
+    - [0xD63DA0, c, rooms]
+    - [0xD63DA0, c, npc]
+    - [0xD65510, c, scenes]
+    - [0xD65720, c, entity]
   - name: sam_02
     dir: world/area_sam/sam_02
     type: code
     start: 0xD71690
     vram: 0x80240000
     subsegments:
-    - [0xD71690, c, sam_02_0_header]
-    - [0xD71690, c, sam_02_1_music]
-    - [0xD71690, c, sam_02_2_main]
-    - [0xD71EC0, c, sam_02_3_rooms]
-    - [0xD71EC0, c, sam_02_4_npc]
-    - [0xD73250, c, sam_02_5_entity]
-    - [0xD73250, c, sam_02_6_shop]
+    - [0xD71690, c, settings]
+    - [0xD71690, c, music]
+    - [0xD71690, c, main]
+    - [0xD71EC0, c, rooms]
+    - [0xD71EC0, c, npc]
+    - [0xD73250, c, entity]
+    - [0xD73250, c, shop]
   - name: sam_03
     dir: world/area_sam/sam_03
     type: code
     start: 0xD7D070
     vram: 0x80240000
     subsegments:
-    - [0xD7D070, c, sam_03_0_header]
-    - [0xD7D070, c, sam_03_1_music]
-    - [0xD7D070, c, sam_03_2_main]
-    - [0xD7D070, c, sam_03_3_npc1]
-    - [0xD7D0C0, c, sam_03_4_npc2]
+    - [0xD7D070, c, settings]
+    - [0xD7D070, c, music]
+    - [0xD7D070, c, main]
+    - [0xD7D070, c, npc1]
+    - [0xD7D0C0, c, npc2]
   - name: sam_04
     dir: world/area_sam/sam_04
     type: code
     start: 0xD7F580
     vram: 0x80240000
     subsegments:
-    - [0xD7F580, c, sam_04_0_header]
-    - [0xD7F580, c, sam_04_1_music]
-    - [0xD7F580, c, sam_04_2_main]
-    - [0xD7F7C0, c, sam_04_3_snowmen]
-    - [0xD7F890, c, sam_04_4_npc]
-    - [0xD7FC80, c, sam_04_5_entity]
+    - [0xD7F580, c, settings]
+    - [0xD7F580, c, music]
+    - [0xD7F580, c, main]
+    - [0xD7F7C0, c, snowmen]
+    - [0xD7F890, c, npc]
+    - [0xD7FC80, c, entity]
   - name: sam_05
     dir: world/area_sam/sam_05
     type: code
     start: 0xD84790
     vram: 0x80240000
     subsegments:
-    - [0xD84790, c, sam_05_0_header]
-    - [0xD84790, c, sam_05_1_music]
-    - [0xD84790, c, sam_05_2_main]
-    - [0xD84790, c, sam_05_3_entity]
-    - [0xD84790, c, sam_05_4_npc]
-    - [0xD864D0, c, sam_05_5_scenes]
-    - [0xD864D0, c, sam_05_6_monstar_gfx]
-    - [0xD864D0, c, sam_05_7_monstar_vtx]
-    - [0xD864D0, .data, sam_05_0_header]
-    - [0xD86530, .data, sam_05_1_music]
-    - [0xD86560, .data, sam_05_2_main]
-    - [0xD86840, .data, sam_05_3_entity]
+    - [0xD84790, c, settings]
+    - [0xD84790, c, music]
+    - [0xD84790, c, main]
+    - [0xD84790, c, entity]
+    - [0xD84790, c, npc]
+    - [0xD864D0, c, scenes]
+    - [0xD864D0, c, monstar_gfx]
+    - [0xD864D0, c, monstar_vtx]
+    - [0xD864D0, .data, settings]
+    - [0xD86530, .data, music]
+    - [0xD86560, .data, main]
+    - [0xD86840, .data, entity]
     - start: 0xD868B0
       type: .data
-      name: sam_05_4_npc
+      name: npc
       subsegments:
       - [0xD868B0]
       - [0xD86F00, ci4, monstar, 32, 32]
@@ -11305,15 +11305,15 @@ segments:
       - [0xD87500, ia4, monstar_blank3, 32, 32]
       - [0xD87700, palette, monstar]
       - [0xD87720]
-    - [0xD8A590, .data, sam_05_5_scenes]
+    - [0xD8A590, .data, scenes]
     - start: 0xD8B730
       type: .data
-      name: sam_05_6_monstar_gfx
+      name: monstar_gfx
       subsegments:
       - [0xD8B730, gfx, monstar]
     - start: 0xD8B840
       type: .data
-      name: sam_05_7_monstar_vtx
+      name: monstar_vtx
       subsegments:
       - [0xD8B840, vtx, monstar]
     - [0xD8BC60]
@@ -11323,335 +11323,335 @@ segments:
     start: 0xD8BE40
     vram: 0x80240000
     subsegments:
-    - [0xD8BE40, c, sam_06_0_header]
-    - [0xD8BE40, c, sam_06_1_music]
-    - [0xD8BE40, c, sam_06_2_main]
-    - [0xD8C390, c, sam_06_3_rooms]
-    - [0xD8C390, c, sam_06_4_npc]
-    - [0xD8E460, c, sam_06_5_entity]
+    - [0xD8BE40, c, settings]
+    - [0xD8BE40, c, music]
+    - [0xD8BE40, c, main]
+    - [0xD8C390, c, rooms]
+    - [0xD8C390, c, npc]
+    - [0xD8E460, c, entity]
   - name: sam_07
     dir: world/area_sam/sam_07
     type: code
     start: 0xD97CE0
     vram: 0x80240000
     subsegments:
-    - [0xD97CE0, c, sam_07_0_header]
-    - [0xD97CE0, c, sam_07_1_music]
-    - [0xD97CE0, c, sam_07_2_main]
-    - [0xD97CE0, c, sam_07_3_entity]
-    - [0xD97CE0, c, sam_07_4_frozen_pit]
-    - [0xD98330, c, sam_07_5_npc]
+    - [0xD97CE0, c, settings]
+    - [0xD97CE0, c, music]
+    - [0xD97CE0, c, main]
+    - [0xD97CE0, c, entity]
+    - [0xD97CE0, c, frozen_pit]
+    - [0xD98330, c, npc]
   - name: sam_08
     dir: world/area_sam/sam_08
     type: code
     start: 0xD9BC30
     vram: 0x80240000
     subsegments:
-    - [0xD9BC30, c, sam_08_0_header]
-    - [0xD9BC30, c, sam_08_1_music]
-    - [0xD9BC30, c, sam_08_2_main]
-    - [0xD9BC30, c, sam_08_3_entity]
-    - [0xD9C970, c, sam_08_4_npc]
-    - [0xD9D240, c, sam_08_5_scenes]
+    - [0xD9BC30, c, settings]
+    - [0xD9BC30, c, music]
+    - [0xD9BC30, c, main]
+    - [0xD9BC30, c, entity]
+    - [0xD9C970, c, npc]
+    - [0xD9D240, c, scenes]
   - name: sam_09
     dir: world/area_sam/sam_09
     type: code
     start: 0xDA22A0
     vram: 0x80240000
     subsegments:
-    - [0xDA22A0, c, sam_09_0_header]
-    - [0xDA22A0, c, sam_09_1_music]
-    - [0xDA22A0, c, sam_09_2_main]
-    - [0xDA22A0, c, sam_09_3_entity]
-    - [0xDA22A0, c, sam_09_4_sockets]
+    - [0xDA22A0, c, settings]
+    - [0xDA22A0, c, music]
+    - [0xDA22A0, c, main]
+    - [0xDA22A0, c, entity]
+    - [0xDA22A0, c, sockets]
   - name: sam_10
     dir: world/area_sam/sam_10
     type: code
     start: 0xDA37B0
     vram: 0x80240000
     subsegments:
-    - [0xDA37B0, c, sam_10_0_header]
-    - [0xDA37B0, c, sam_10_1_music]
-    - [0xDA37B0, c, sam_10_2_main]
-    - [0xDA37B0, c, sam_10_3_entity]
-    - [0xDA3AA0, c, sam_10_4_stairs]
-    - [0xDA3B80, c, sam_10_5_npc]
+    - [0xDA37B0, c, settings]
+    - [0xDA37B0, c, music]
+    - [0xDA37B0, c, main]
+    - [0xDA37B0, c, entity]
+    - [0xDA3AA0, c, stairs]
+    - [0xDA3B80, c, npc]
   - name: sam_11
     dir: world/area_sam/sam_11
     type: code
     start: 0xDA6580
     vram: 0x80240000
     subsegments:
-    - [0xDA6580, c, sam_11_0_header]
-    - [0xDA65C0, c, sam_11_1_music]
-    - [0xDA65C0, c, sam_11_2_main]
-    - [0xDA6800, c, sam_11_3_rooms]
-    - [0xDA68E0, c, sam_11_4_entity]
-    - [0xDA6D50, c, sam_11_5_npc]
-    - [0xDA8020, c, sam_11_6_pond]
-    - [0xDA86F0, c, sam_11_7_staircase]
-    - [0xDA86F0, c, sam_11_8_pond_anim]
-    - [0xDA86F0, c, sam_11_9_pond_skele]
+    - [0xDA6580, c, settings]
+    - [0xDA65C0, c, music]
+    - [0xDA65C0, c, main]
+    - [0xDA6800, c, rooms]
+    - [0xDA68E0, c, entity]
+    - [0xDA6D50, c, npc]
+    - [0xDA8020, c, pond]
+    - [0xDA86F0, c, staircase]
+    - [0xDA86F0, c, pond_anim]
+    - [0xDA86F0, c, pond_skele]
   - name: sam_12
     dir: world/area_sam/sam_12
     type: code
     start: 0xDB7A10
     vram: 0x80240000
     subsegments:
-    - [0xDB7A10, c, sam_12_0_header]
-    - [0xDB7A10, c, sam_12_1_music]
-    - [0xDB7A10, c, sam_12_2_main]
-    - [0xDB7A10, c, sam_12_3_npc]
-    - [0xDB7AA0, c, sam_12_4_scenes]
-    - [0xDB7DB0, c, sam_12_5_entity]
+    - [0xDB7A10, c, settings]
+    - [0xDB7A10, c, music]
+    - [0xDB7A10, c, main]
+    - [0xDB7A10, c, npc]
+    - [0xDB7AA0, c, scenes]
+    - [0xDB7DB0, c, entity]
   - name: pra_01
     dir: world/area_pra/pra_01
     type: code
     start: 0xDB9030
     vram: 0x80240000
     subsegments:
-    - [0xDB9030, c, pra_01_0_header]
-    - [0xDB9050, c, pra_01_1_music]
-    - [0xDB9050, c, pra_01_2_main]
-    - [0xDB9FB0, c, pra_01_3_npc]
-    - [0xDBA3E0, c, pra_01_4_entity]
+    - [0xDB9030, c, settings]
+    - [0xDB9050, c, music]
+    - [0xDB9050, c, main]
+    - [0xDB9FB0, c, npc]
+    - [0xDBA3E0, c, entity]
   - name: pra_02
     dir: world/area_pra/pra_02
     type: code
     start: 0xDBBFE0
     vram: 0x80240000
     subsegments:
-    - [0xDBBFE0, c, pra_02_0_header]
-    - [0xDBC000, c, pra_02_1_music]
-    - [0xDBC000, c, pra_02_2_main]
-    - [0xDBCF00, c, pra_02_3_npc]
-    - [0xDBD2F0, c, pra_02_4_entity]
+    - [0xDBBFE0, c, settings]
+    - [0xDBC000, c, music]
+    - [0xDBC000, c, main]
+    - [0xDBCF00, c, npc]
+    - [0xDBD2F0, c, entity]
   - name: pra_03
     dir: world/area_pra/pra_03
     type: code
     start: 0xDBFCA0
     vram: 0x80240000
     subsegments:
-    - [0xDBFCA0, c, pra_03_0_header]
-    - [0xDBFCC0, c, pra_03_1_music]
-    - [0xDBFCC0, c, pra_03_2_main]
-    - [0xDBFCC0, c, pra_03_3_entity]
+    - [0xDBFCA0, c, settings]
+    - [0xDBFCC0, c, music]
+    - [0xDBFCC0, c, main]
+    - [0xDBFCC0, c, entity]
   - name: pra_04
     dir: world/area_pra/pra_04
     type: code
     start: 0xDC0680
     vram: 0x80240000
     subsegments:
-    - [0xDC0680, c, pra_04_0_header]
-    - [0xDC06A0, c, pra_04_1_music]
-    - [0xDC06A0, c, pra_04_2_main]
-    - [0xDC06A0, c, pra_04_3_entity]
-    - [0xDC0830, c, pra_04_4_npc]
+    - [0xDC0680, c, settings]
+    - [0xDC06A0, c, music]
+    - [0xDC06A0, c, main]
+    - [0xDC06A0, c, entity]
+    - [0xDC0830, c, npc]
   - name: pra_05
     dir: world/area_pra/pra_05
     type: code
     start: 0xDC1BA0
     vram: 0x80240000
     subsegments:
-    - [0xDC1BA0, c, pra_05_0_header]
-    - [0xDC1BC0, c, pra_05_1_music]
-    - [0xDC1BC0, c, pra_05_2_main]
-    - [0xDC2AC0, c, pra_05_3_entity]
+    - [0xDC1BA0, c, settings]
+    - [0xDC1BC0, c, music]
+    - [0xDC1BC0, c, main]
+    - [0xDC2AC0, c, entity]
   - name: pra_06
     dir: world/area_pra/pra_06
     type: code
     start: 0xDC3420
     vram: 0x80240000
     subsegments:
-    - [0xDC3420, c, pra_06_0_header]
-    - [0xDC3420, c, pra_06_1_music]
-    - [0xDC3420, c, pra_06_2_main]
-    - [0xDC4370, c, pra_06_3_entity]
+    - [0xDC3420, c, settings]
+    - [0xDC3420, c, music]
+    - [0xDC3420, c, main]
+    - [0xDC4370, c, entity]
   - name: pra_09
     dir: world/area_pra/pra_09
     type: code
     start: 0xDC4880
     vram: 0x80240000
     subsegments:
-    - [0xDC4880, c, pra_09_0_header]
-    - [0xDC48A0, c, pra_09_1_music]
-    - [0xDC48A0, c, pra_09_2_main]
-    - [0xDC57A0, c, pra_09_3_npc]
+    - [0xDC4880, c, settings]
+    - [0xDC48A0, c, music]
+    - [0xDC48A0, c, main]
+    - [0xDC57A0, c, npc]
   - name: pra_10
     dir: world/area_pra/pra_10
     type: code
     start: 0xDCB2A0
     vram: 0x80240000
     subsegments:
-    - [0xDCB2A0, c, pra_10_0_header]
-    - [0xDCB2C0, c, pra_10_1_music]
-    - [0xDCB2C0, c, pra_10_2_main]
-    - [0xDCC1C0, c, pra_10_3_npc]
+    - [0xDCB2A0, c, settings]
+    - [0xDCB2C0, c, music]
+    - [0xDCB2C0, c, main]
+    - [0xDCC1C0, c, npc]
   - name: pra_11
     dir: world/area_pra/pra_11
     type: code
     start: 0xDCD4F0
     vram: 0x80240000
     subsegments:
-    - [0xDCD4F0, c, pra_11_0_header]
-    - [0xDCD510, c, pra_11_1_music]
-    - [0xDCD510, c, pra_11_2_main]
-    - [0xDCE410, c, pra_11_3_entity]
+    - [0xDCD4F0, c, settings]
+    - [0xDCD510, c, music]
+    - [0xDCD510, c, main]
+    - [0xDCE410, c, entity]
   - name: pra_12
     dir: world/area_pra/pra_12
     type: code
     start: 0xDCED00
     vram: 0x80240000
     subsegments:
-    - [0xDCED00, c, pra_12_0_header]
-    - [0xDCED00, c, pra_12_1_music]
-    - [0xDCED00, c, pra_12_2_main]
-    - [0xDCFC50, c, pra_12_3_entity]
+    - [0xDCED00, c, settings]
+    - [0xDCED00, c, music]
+    - [0xDCED00, c, main]
+    - [0xDCFC50, c, entity]
   - name: pra_13
     dir: world/area_pra/pra_13
     type: code
     start: 0xDD05D0
     vram: 0x80240000
     subsegments:
-    - [0xDD05D0, c, pra_13_0_header]
-    - [0xDD05F0, c, pra_13_1_music]
-    - [0xDD05F0, c, pra_13_2_main]
-    - [0xDD14F0, c, pra_13_3_npc]
+    - [0xDD05D0, c, settings]
+    - [0xDD05F0, c, music]
+    - [0xDD05F0, c, main]
+    - [0xDD14F0, c, npc]
   - name: pra_14
     dir: world/area_pra/pra_14
     type: code
     start: 0xDD3CF0
     vram: 0x80240000
     subsegments:
-    - [0xDD3CF0, c, pra_14_0_header]
-    - [0xDD3D10, c, pra_14_1_music]
-    - [0xDD3D10, c, pra_14_2_main]
-    - [0xDD4C10, c, pra_14_3_entity]
+    - [0xDD3CF0, c, settings]
+    - [0xDD3D10, c, music]
+    - [0xDD3D10, c, main]
+    - [0xDD4C10, c, entity]
   - name: pra_15
     dir: world/area_pra/pra_15
     type: code
     start: 0xDD5800
     vram: 0x80240000
     subsegments:
-    - [0xDD5800, c, pra_15_0_header]
-    - [0xDD5820, c, pra_15_1_music]
-    - [0xDD5820, c, pra_15_2_main]
-    - [0xDD5840, c, pra_15_3_entity]
+    - [0xDD5800, c, settings]
+    - [0xDD5820, c, music]
+    - [0xDD5820, c, main]
+    - [0xDD5840, c, entity]
   - name: pra_16
     dir: world/area_pra/pra_16
     type: code
     start: 0xDD5B10
     vram: 0x80240000
     subsegments:
-    - [0xDD5B10, c, pra_16_0_header]
-    - [0xDD5B30, c, pra_16_1_music]
-    - [0xDD5B30, c, pra_16_2_main]
+    - [0xDD5B10, c, settings]
+    - [0xDD5B30, c, music]
+    - [0xDD5B30, c, main]
   - name: pra_18
     dir: world/area_pra/pra_18
     type: code
     start: 0xDD7610
     vram: 0x80240000
     subsegments:
-    - [0xDD7610, c, pra_18_0_header]
-    - [0xDD7630, c, pra_18_1_music]
-    - [0xDD7630, c, pra_18_2_main]
-    - [0xDD8530, c, pra_18_3_npc]
+    - [0xDD7610, c, settings]
+    - [0xDD7630, c, music]
+    - [0xDD7630, c, main]
+    - [0xDD8530, c, npc]
   - name: pra_19
     dir: world/area_pra/pra_19
     type: code
     start: 0xDDA9A0
     vram: 0x80240000
     subsegments:
-    - [0xDDA9A0, c, pra_19_0_header]
-    - [0xDDA9C0, c, pra_19_1_music]
-    - [0xDDA9C0, c, pra_19_2_main]
-    - [0xDDB8C0, c, pra_19_3_npc]
+    - [0xDDA9A0, c, settings]
+    - [0xDDA9C0, c, music]
+    - [0xDDA9C0, c, main]
+    - [0xDDB8C0, c, npc]
   - name: pra_20
     dir: world/area_pra/pra_20
     type: code
     start: 0xDE2390
     vram: 0x80240000
     subsegments:
-    - [0xDE2390, c, pra_20_0_header]
-    - [0xDE23B0, c, pra_20_1_music]
-    - [0xDE23B0, c, pra_20_2_main]
+    - [0xDE2390, c, settings]
+    - [0xDE23B0, c, music]
+    - [0xDE23B0, c, main]
   - name: pra_21
     dir: world/area_pra/pra_21
     type: code
     start: 0xDE3F10
     vram: 0x80240000
     subsegments:
-    - [0xDE3F10, c, pra_21_0_header]
-    - [0xDE3F30, c, pra_21_1_music]
-    - [0xDE3F30, c, pra_21_2_main]
-    - [0xDE3F30, c, pra_21_3_entity]
+    - [0xDE3F10, c, settings]
+    - [0xDE3F30, c, music]
+    - [0xDE3F30, c, main]
+    - [0xDE3F30, c, entity]
   - name: pra_22
     dir: world/area_pra/pra_22
     type: code
     start: 0xDE4870
     vram: 0x80240000
     subsegments:
-    - [0xDE4870, c, pra_22_0_header]
-    - [0xDE4890, c, pra_22_1_music]
-    - [0xDE4890, c, pra_22_2_main]
-    - [0xDE4A40, c, pra_22_3_entity]
+    - [0xDE4870, c, settings]
+    - [0xDE4890, c, music]
+    - [0xDE4890, c, main]
+    - [0xDE4A40, c, entity]
   - name: pra_27
     dir: world/area_pra/pra_27
     type: code
     start: 0xDE59E0
     vram: 0x80240000
     subsegments:
-    - [0xDE59E0, c, pra_27_0_header]
-    - [0xDE59E0, c, pra_27_1_music]
-    - [0xDE59E0, c, pra_27_2_main]
-    - [0xDE6930, c, pra_27_3_entity]
+    - [0xDE59E0, c, settings]
+    - [0xDE59E0, c, music]
+    - [0xDE59E0, c, main]
+    - [0xDE6930, c, entity]
   - name: pra_28
     dir: world/area_pra/pra_28
     type: code
     start: 0xDE7290
     vram: 0x80240000
     subsegments:
-    - [0xDE7290, c, pra_28_0_header]
-    - [0xDE7290, c, pra_28_1_music]
-    - [0xDE7290, c, pra_28_2_main]
-    - [0xDE81E0, c, pra_28_3_entity]
+    - [0xDE7290, c, settings]
+    - [0xDE7290, c, music]
+    - [0xDE7290, c, main]
+    - [0xDE81E0, c, entity]
   - name: pra_29
     dir: world/area_pra/pra_29
     type: code
     start: 0xDE8B40
     vram: 0x80240000
     subsegments:
-    - [0xDE8B40, c, pra_29_0_header]
-    - [0xDE8B60, c, pra_29_1_music]
-    - [0xDE8B60, c, pra_29_2_entity]
-    - [0xDE8B60, c, pra_29_3_main]
-    - [0xDE9A60, c, pra_29_4_bridge]
+    - [0xDE8B40, c, settings]
+    - [0xDE8B60, c, music]
+    - [0xDE8B60, c, entity]
+    - [0xDE8B60, c, main]
+    - [0xDE9A60, c, bridge]
   - name: pra_31
     dir: world/area_pra/pra_31
     type: code
     start: 0xDEAD50
     vram: 0x80240000
     subsegments:
-    - [0xDEAD50, c, pra_31_0_header]
-    - [0xDEAD70, c, pra_31_1_music]
-    - [0xDEAD70, c, pra_31_2_npc]
-    - [0xDEB260, c, pra_31_3_main]
-    - [0xDEB260, c, pra_31_4_puzzle]
-    - [0xDEBE00, c, pra_31_5_texture_1]
-    - [0xDEBE00, c, pra_31_6_texture_2]
-    - [0xDEBE00, c, pra_31_7_texture_3]
-    - [0xDEBE00, c, pra_31_8_stairs_skele]
-    - [0xDEBE00, c, pra_31_9_stairs_anim]
-    - [0xDEBE00, c, pra_31_10_stairs_lights]
-    - [0xDEBE00, c, pra_31_11_stairs_vtx]
-    - [0xDEBE00, .data, pra_31_0_header]
-    - [0xDEBE70, .data, pra_31_1_music]
-    - [0xDEBEB0, .data, pra_31_2_npc]
-    - [0xDECE10, .data, pra_31_3_main]
-    - [0xDED240, .data, pra_31_4_puzzle]
+    - [0xDEAD50, c, settings]
+    - [0xDEAD70, c, music]
+    - [0xDEAD70, c, npc]
+    - [0xDEB260, c, main]
+    - [0xDEB260, c, puzzle]
+    - [0xDEBE00, c, texture_1]
+    - [0xDEBE00, c, texture_2]
+    - [0xDEBE00, c, texture_3]
+    - [0xDEBE00, c, stairs_skele]
+    - [0xDEBE00, c, stairs_anim]
+    - [0xDEBE00, c, stairs_lights]
+    - [0xDEBE00, c, stairs_vtx]
+    - [0xDEBE00, .data, settings]
+    - [0xDEBE70, .data, music]
+    - [0xDEBEB0, .data, npc]
+    - [0xDECE10, .data, main]
+    - [0xDED240, .data, puzzle]
     - start: 0xDEE260
       type: .data
-      name: pra_31_5_texture_1
+      name: texture_1
       subsegments:
       - [0xDEE260, ci4, texture_1, 64, 64]
       - [0xDEEA60, palette, texture_1]
@@ -11659,7 +11659,7 @@ segments:
       - [0xDEEB40]
     - start: 0xDEEB40
       type: .data
-      name: pra_31_6_texture_2
+      name: texture_2
       subsegments:
       - [0xDEEB40, ci4, texture_2, 64, 64]
       - [0xDEF340, palette, texture_2]
@@ -11667,14 +11667,14 @@ segments:
       - [0xDEF410]
     - start: 0xDEF410
       type: .data
-      name: pra_31_7_texture_3
+      name: texture_3
       subsegments:
       - [0xDEF410, rgba16, texture_3, 32, 32]
       - [0xDEFC10, gfx, texture_3]
       - [0xDEFCA0]
     - start: 0xDEFCA0
       type: .data
-      name: pra_31_8_stairs_skele
+      name: stairs_skele
       subsegments:
       - [0xDEFCA0, gfx, unk_01]
       - [0xDEFD18, gfx, unk_02]
@@ -11711,11 +11711,11 @@ segments:
       - [0xDF0780, gfx, unk_33]
       - [0xDF07A8, gfx, unk_34]
       - [0xDF07D0]
-    - [0xDF0E80, .data, pra_31_9_stairs_anim]
-    - [0xDF2470, .data, pra_31_10_stairs_lights]
+    - [0xDF0E80, .data, stairs_anim]
+    - [0xDF2470, .data, stairs_lights]
     - start: 0xDF2490
       type: .data
-      name: pra_31_11_stairs_vtx
+      name: stairs_vtx
       subsegments:
       - [0xDF2490]
       - [0xDF2810, vtx, stairs]
@@ -11727,360 +11727,360 @@ segments:
     start: 0xDF29F0
     vram: 0x80240000
     subsegments:
-    - [0xDF29F0, c, pra_32_0_header]
-    - [0xDF2A10, c, pra_32_1_music]
-    - [0xDF2A10, c, pra_32_2_main]
-    - [0xDF3230, c, pra_32_3_npc]
+    - [0xDF29F0, c, settings]
+    - [0xDF2A10, c, music]
+    - [0xDF2A10, c, main]
+    - [0xDF3230, c, npc]
   - name: pra_33
     dir: world/area_pra/pra_33
     type: code
     start: 0xDF56D0
     vram: 0x80240000
     subsegments:
-    - [0xDF56D0, c, pra_33_0_header]
-    - [0xDF56F0, c, pra_33_1_music]
-    - [0xDF56F0, c, pra_33_2_main]
-    - [0xDF65F0, c, pra_33_3_entity]
+    - [0xDF56D0, c, settings]
+    - [0xDF56F0, c, music]
+    - [0xDF56F0, c, main]
+    - [0xDF65F0, c, entity]
   - name: pra_34
     dir: world/area_pra/pra_34
     type: code
     start: 0xDF73A0
     vram: 0x80240000
     subsegments:
-    - [0xDF73A0, c, pra_34_0_header]
-    - [0xDF73C0, c, pra_34_1_music]
-    - [0xDF73C0, c, pra_34_2_main]
-    - [0xDF83A0, c, pra_34_3_entity]
+    - [0xDF73A0, c, settings]
+    - [0xDF73C0, c, music]
+    - [0xDF73C0, c, main]
+    - [0xDF83A0, c, entity]
   - name: pra_35
     dir: world/area_pra/pra_35
     type: code
     start: 0xDF9240
     vram: 0x80240000
     subsegments:
-    - [0xDF9240, c, pra_35_0_header]
-    - [0xDF9260, c, pra_35_1_music]
-    - [0xDF9260, c, pra_35_2_main]
-    - [0xDFA160, c, pra_35_3_npc]
-    - [0xDFBB90, c, pra_35_4_entity]
+    - [0xDF9240, c, settings]
+    - [0xDF9260, c, music]
+    - [0xDF9260, c, main]
+    - [0xDFA160, c, npc]
+    - [0xDFBB90, c, entity]
   - name: pra_36
     dir: world/area_pra/pra_36
     type: code
     start: 0xDFD6F0
     vram: 0x80240000
     subsegments:
-    - [0xDFD6F0, c, pra_36_0_header]
-    - [0xDFD6F0, c, pra_36_1_music]
-    - [0xDFD6F0, c, pra_36_2_main]
-    - [0xDFE640, c, pra_36_3_npc]
+    - [0xDFD6F0, c, settings]
+    - [0xDFD6F0, c, music]
+    - [0xDFD6F0, c, main]
+    - [0xDFE640, c, npc]
   - name: pra_37
     dir: world/area_pra/pra_37
     type: code
     start: 0xDFEF30
     vram: 0x80240000
     subsegments:
-    - [0xDFEF30, c, pra_37_0_header]
-    - [0xDFEF30, c, pra_37_1_music]
-    - [0xDFEF30, c, pra_37_2_main]
-    - [0xDFFE80, c, pra_37_3_npc]
+    - [0xDFEF30, c, settings]
+    - [0xDFEF30, c, music]
+    - [0xDFEF30, c, main]
+    - [0xDFFE80, c, npc]
   - name: pra_38
     dir: world/area_pra/pra_38
     type: code
     start: 0xE015E0
     vram: 0x80240000
     subsegments:
-    - [0xE015E0, c, pra_38_0_header]
-    - [0xE015E0, c, pra_38_1_music]
-    - [0xE015E0, c, pra_38_2_main]
-    - [0xE02530, c, pra_38_3_npc]
+    - [0xE015E0, c, settings]
+    - [0xE015E0, c, music]
+    - [0xE015E0, c, main]
+    - [0xE02530, c, npc]
   - name: pra_39
     dir: world/area_pra/pra_39
     type: code
     start: 0xE03880
     vram: 0x80240000
     subsegments:
-    - [0xE03880, c, pra_39_0_header]
-    - [0xE03880, c, pra_39_1_music]
-    - [0xE03880, c, pra_39_2_main]
-    - [0xE047D0, c, pra_39_3_npc]
+    - [0xE03880, c, settings]
+    - [0xE03880, c, music]
+    - [0xE03880, c, main]
+    - [0xE047D0, c, npc]
   - name: pra_40
     dir: world/area_pra/pra_40
     type: code
     start: 0xE059A0
     vram: 0x80240000
     subsegments:
-    - [0xE059A0, c, pra_40_0_header]
-    - [0xE059C0, c, pra_40_1_music]
-    - [0xE059C0, c, pra_40_2_main]
-    - [0xE068C0, c, pra_40_3_entity]
+    - [0xE059A0, c, settings]
+    - [0xE059C0, c, music]
+    - [0xE059C0, c, main]
+    - [0xE068C0, c, entity]
   - name: omo_01
     dir: world/area_omo/omo_01
     type: code
     start: 0xE06EE0
     vram: 0x80240000
     subsegments:
-    - [0xE06EE0, c, omo_01_0_header]
-    - [0xE06EE0, c, omo_01_1_music]
-    - [0xE06EE0, c, omo_01_2_main]
-    - [0xE06EE0, c, omo_01_3_gizmos]
-    - [0xE07140, c, omo_01_4_npc]
-    - [0xE07B10, c, omo_01_5_entity]
+    - [0xE06EE0, c, settings]
+    - [0xE06EE0, c, music]
+    - [0xE06EE0, c, main]
+    - [0xE06EE0, c, gizmos]
+    - [0xE07140, c, npc]
+    - [0xE07B10, c, entity]
   - name: omo_02
     dir: world/area_omo/omo_02
     type: code
     start: 0xE094C0
     vram: 0x80240000
     subsegments:
-    - [0xE094C0, c, omo_02_0_header]
-    - [0xE094C0, c, omo_02_1_music]
-    - [0xE094C0, c, omo_02_2_main]
-    - [0xE094C0, c, omo_02_3_entity]
-    - [0xE09500, c, omo_02_4_gizmos]
-    - [0xE09780, c, omo_02_5_barricade]
-    - [0xE09E30, c, omo_02_6_npc]
+    - [0xE094C0, c, settings]
+    - [0xE094C0, c, music]
+    - [0xE094C0, c, main]
+    - [0xE094C0, c, entity]
+    - [0xE09500, c, gizmos]
+    - [0xE09780, c, barricade]
+    - [0xE09E30, c, npc]
   - name: omo_03
     dir: world/area_omo/omo_03
     type: code
     start: 0xE11230
     vram: 0x80240000
     subsegments:
-    - [0xE11230, c, omo_03_0_header]
-    - [0xE11230, c, omo_03_1_music]
-    - [0xE11230, c, omo_03_2_main]
-    - [0xE11230, c, omo_03_3_gizmos]
-    - [0xE11230, c, omo_03_4_entity]
-    - [0xE11250, c, omo_03_5_npc]
-    - [0xE11250, c, omo_03_6_train]
-    - [0xE11AC0, c, omo_03_7_train_drop]
-    - [0xE11AC0, c, omo_03_8_epilogue]
+    - [0xE11230, c, settings]
+    - [0xE11230, c, music]
+    - [0xE11230, c, main]
+    - [0xE11230, c, gizmos]
+    - [0xE11230, c, entity]
+    - [0xE11250, c, npc]
+    - [0xE11250, c, train]
+    - [0xE11AC0, c, train_drop]
+    - [0xE11AC0, c, epilogue]
   - name: omo_04
     dir: world/area_omo/omo_04
     type: code
     start: 0xE194A0
     vram: 0x80240000
     subsegments:
-    - [0xE194A0, c, omo_04_0_header]
-    - [0xE194A0, c, omo_04_1_music]
-    - [0xE194A0, c, omo_04_2_main]
-    - [0xE194A0, c, omo_04_3_gizmos]
-    - [0xE194A0, c, omo_04_4_entity]
-    - [0xE19840, c, omo_04_5_npc]
-    - [0xE1B2E0, c, omo_04_6_scenes]
+    - [0xE194A0, c, settings]
+    - [0xE194A0, c, music]
+    - [0xE194A0, c, main]
+    - [0xE194A0, c, gizmos]
+    - [0xE194A0, c, entity]
+    - [0xE19840, c, npc]
+    - [0xE1B2E0, c, scenes]
   - name: omo_05
     dir: world/area_omo/omo_05
     type: code
     start: 0xE1E360
     vram: 0x80240000
     subsegments:
-    - [0xE1E360, c, omo_05_0_header]
-    - [0xE1E360, c, omo_05_1_music]
-    - [0xE1E360, c, omo_05_2_main]
-    - [0xE1E360, c, omo_05_3_gizmos]
-    - [0xE1E360, c, omo_05_4_npc]
-    - [0xE20760, c, omo_05_5_entity]
+    - [0xE1E360, c, settings]
+    - [0xE1E360, c, music]
+    - [0xE1E360, c, main]
+    - [0xE1E360, c, gizmos]
+    - [0xE1E360, c, npc]
+    - [0xE20760, c, entity]
   - name: omo_06
     dir: world/area_omo/omo_06
     type: code
     start: 0xE239B0
     vram: 0x80240000
     subsegments:
-    - [0xE239B0, c, omo_06_0_header]
-    - [0xE239B0, c, omo_06_1_music]
-    - [0xE239B0, c, omo_06_2_main]
-    - [0xE239B0, c, omo_06_3_gizmos]
-    - [0xE239B0, c, omo_06_4_train]
-    - [0xE24220, c, omo_06_5_npc]
-    - [0xE24220, c, omo_06_6_entity]
+    - [0xE239B0, c, settings]
+    - [0xE239B0, c, music]
+    - [0xE239B0, c, main]
+    - [0xE239B0, c, gizmos]
+    - [0xE239B0, c, train]
+    - [0xE24220, c, npc]
+    - [0xE24220, c, entity]
   - name: omo_07
     dir: world/area_omo/omo_07
     type: code
     start: 0xE29410
     vram: 0x80240000
     subsegments:
-    - [0xE29410, c, omo_07_0_header]
-    - [0xE29410, c, omo_07_1_music]
-    - [0xE29410, c, omo_07_2_main]
-    - [0xE29410, c, omo_07_3_gizmos]
-    - [0xE29410, c, omo_07_4_npc]
-    - [0xE2C330, c, omo_07_5_entity]
-    - [0xE2C630, c, omo_07_6_scenes]
+    - [0xE29410, c, settings]
+    - [0xE29410, c, music]
+    - [0xE29410, c, main]
+    - [0xE29410, c, gizmos]
+    - [0xE29410, c, npc]
+    - [0xE2C330, c, entity]
+    - [0xE2C630, c, scenes]
   - name: omo_08
     dir: world/area_omo/omo_08
     type: code
     start: 0xE30530
     vram: 0x80240000
     subsegments:
-    - [0xE30530, c, omo_08_0_header]
-    - [0xE30530, c, omo_08_1_music]
-    - [0xE30530, c, omo_08_2_main]
-    - [0xE30530, c, omo_08_3_boxes]
-    - [0xE30530, c, omo_08_4_train]
-    - [0xE30DA0, c, omo_08_5_entity]
-    - [0xE30DA0, c, omo_08_6_npc]
+    - [0xE30530, c, settings]
+    - [0xE30530, c, music]
+    - [0xE30530, c, main]
+    - [0xE30530, c, boxes]
+    - [0xE30530, c, train]
+    - [0xE30DA0, c, entity]
+    - [0xE30DA0, c, npc]
   - name: omo_09
     dir: world/area_omo/omo_09
     type: code
     start: 0xE38EF0
     vram: 0x80240000
     subsegments:
-    - [0xE38EF0, c, omo_09_0_header]
-    - [0xE38EF0, c, omo_09_1_music]
-    - [0xE38EF0, c, omo_09_2_main]
-    - [0xE38EF0, c, omo_09_3_conveyors]
-    - [0xE391C0, c, omo_09_4_slot_machine]
-    - [0xE395D0, c, omo_09_5_gizmos]
-    - [0xE39610, c, omo_09_6_entity]
-    - [0xE398D0, c, omo_09_7_npc]
-    - [0xE3C500, c, omo_09_8_scenes]
+    - [0xE38EF0, c, settings]
+    - [0xE38EF0, c, music]
+    - [0xE38EF0, c, main]
+    - [0xE38EF0, c, conveyors]
+    - [0xE391C0, c, slot_machine]
+    - [0xE395D0, c, gizmos]
+    - [0xE39610, c, entity]
+    - [0xE398D0, c, npc]
+    - [0xE3C500, c, scenes]
   - name: omo_10
     dir: world/area_omo/omo_10
     type: code
     start: 0xE43C30
     vram: 0x80240000
     subsegments:
-    - [0xE43C30, c, omo_10_0_header]
-    - [0xE43C30, c, omo_10_1_music]
-    - [0xE43C30, c, omo_10_2_main]
-    - [0xE43C30, c, omo_10_3_gizmos]
-    - [0xE43C30, c, omo_10_4_train]
-    - [0xE444A0, c, omo_10_5_npc]
-    - [0xE444A0, c, omo_10_6_entity]
+    - [0xE43C30, c, settings]
+    - [0xE43C30, c, music]
+    - [0xE43C30, c, main]
+    - [0xE43C30, c, gizmos]
+    - [0xE43C30, c, train]
+    - [0xE444A0, c, npc]
+    - [0xE444A0, c, entity]
   - name: omo_11
     dir: world/area_omo/omo_11
     type: code
     start: 0xE48B60
     vram: 0x80240000
     subsegments:
-    - [0xE48B60, c, omo_11_0_header]
-    - [0xE48B60, c, omo_11_1_music]
-    - [0xE48B60, c, omo_11_2_main]
-    - [0xE48B60, c, omo_11_3_gizmos]
-    - [0xE492F0, c, omo_11_4_entity]
-    - [0xE4A030, c, omo_11_5_npc]
+    - [0xE48B60, c, settings]
+    - [0xE48B60, c, music]
+    - [0xE48B60, c, main]
+    - [0xE48B60, c, gizmos]
+    - [0xE492F0, c, entity]
+    - [0xE4A030, c, npc]
   - name: omo_12
     dir: world/area_omo/omo_12
     type: code
     start: 0xE4B640
     vram: 0x80240000
     subsegments:
-    - [0xE4B640, c, omo_12_0_header]
-    - [0xE4B640, c, omo_12_1_music]
-    - [0xE4B640, c, omo_12_2_main]
-    - [0xE4B640, c, omo_12_3_npc]
-    - [0xE4BA60, c, omo_12_4_new_partner]
+    - [0xE4B640, c, settings]
+    - [0xE4B640, c, music]
+    - [0xE4B640, c, main]
+    - [0xE4B640, c, npc]
+    - [0xE4BA60, c, new_partner]
   - name: omo_13
     dir: world/area_omo/omo_13
     type: code
     start: 0xE4E7C0
     vram: 0x80240000
     subsegments:
-    - [0xE4E7C0, c, omo_13_0_header]
-    - [0xE4E7C0, c, omo_13_1_music]
-    - [0xE4E7C0, c, omo_13_2_main]
-    - [0xE4E7C0, c, omo_13_3_gizmos]
-    - [0xE4EA40, c, omo_13_4_npc]
-    - [0xE4F9F0, c, omo_13_5_entity]
+    - [0xE4E7C0, c, settings]
+    - [0xE4E7C0, c, music]
+    - [0xE4E7C0, c, main]
+    - [0xE4E7C0, c, gizmos]
+    - [0xE4EA40, c, npc]
+    - [0xE4F9F0, c, entity]
   - name: omo_14
     dir: world/area_omo/omo_14
     type: code
     start: 0xE519E0
     vram: 0x80240000
     subsegments:
-    - [0xE519E0, c, omo_14_0_header]
-    - [0xE519E0, c, omo_14_1_music]
-    - [0xE519E0, c, omo_14_2_main]
-    - [0xE51B40, c, omo_14_3_npc]
+    - [0xE519E0, c, settings]
+    - [0xE519E0, c, music]
+    - [0xE519E0, c, main]
+    - [0xE51B40, c, npc]
   - name: omo_15
     dir: world/area_omo/omo_15
     type: code
     start: 0xE54AA0
     vram: 0x80240000
     subsegments:
-    - [0xE54AA0, c, omo_15_0_header]
-    - [0xE54AA0, c, omo_15_1_music]
-    - [0xE54AA0, c, omo_15_2_main]
-    - [0xE552A0, c, omo_15_3_npc]
+    - [0xE54AA0, c, settings]
+    - [0xE54AA0, c, music]
+    - [0xE54AA0, c, main]
+    - [0xE552A0, c, npc]
   - name: omo_16
     dir: world/area_omo/omo_16
     type: code
     start: 0xE58200
     vram: 0x80240000
     subsegments:
-    - [0xE58200, c, omo_16_0_header]
-    - [0xE58200, c, omo_16_1_main]
-    - [0xE58200, c, omo_16_2_train]
-    - [0xE58800, c, omo_16_3_npc]
+    - [0xE58200, c, settings]
+    - [0xE58200, c, main]
+    - [0xE58200, c, train]
+    - [0xE58800, c, npc]
   - name: omo_17
     dir: world/area_omo/omo_17
     type: code
     start: 0xE5B1D0
     vram: 0x80240000
     subsegments:
-    - [0xE5B1D0, c, omo_17_0_header]
-    - [0xE5B1D0, c, omo_17_1_main]
-    - [0xE5B1D0, c, omo_17_2_gizmos]
-    - [0xE5B1D0, c, omo_17_3_train]
-    - [0xE5B730, c, omo_17_4_npc]
-    - [0xE5E8E0, c, omo_17_5_entity]
+    - [0xE5B1D0, c, settings]
+    - [0xE5B1D0, c, main]
+    - [0xE5B1D0, c, gizmos]
+    - [0xE5B1D0, c, train]
+    - [0xE5B730, c, npc]
+    - [0xE5E8E0, c, entity]
   - name: end_00
     dir: world/area_end/end_00
     type: code
     start: 0xE62D30
     vram: 0x80240000
     subsegments:
-    - [0xE62D30, c, end_00_0_header]
-    - [0xE62D50, c, end_00_1_main]
-    - [0xE62D50, c, end_00_2_credits]
-    - [0xE653B0, c, end_00_3_parade_setup]
-    - [0xE65630, c, end_00_4_allies]
-    - [0xE65630, c, end_00_5_koopas]
-    - [0xE65840, c, end_00_6_caravan]
-    - [0xE65840, c, end_00_7_boos]
-    - [0xE65870, c, end_00_8_yoshis]
-    - [0xE65870, c, end_00_9_huff_n_puff]
-    - [0xE65870, c, end_00_A_crystal_king]
-    - [0xE65870, c, end_00_B_bowser]
+    - [0xE62D30, c, settings]
+    - [0xE62D50, c, main]
+    - [0xE62D50, c, credits]
+    - [0xE653B0, c, parade_setup]
+    - [0xE65630, c, allies]
+    - [0xE65630, c, koopas]
+    - [0xE65840, c, caravan]
+    - [0xE65840, c, boos]
+    - [0xE65870, c, yoshis]
+    - [0xE65870, c, huff_n_puff]
+    - [0xE65870, c, crystal_king]
+    - [0xE65870, c, bowser]
   - name: end_01
     dir: world/area_end/end_01
     type: code
     start: 0xE71930
     vram: 0x80240000
     subsegments:
-    - [0xE71930, c, end_01_0_header]
-    - [0xE71940, c, end_01_1_main]
-    - [0xE71960, c, end_01_2_credits]
-    - [0xE73FC0, c, end_01_3_parade_setup]
-    - [0xE741F0, c, end_01_4_opera_float]
-    - [0xE74620, c, end_01_5_flower_float]
-    - [0xE74620, c, end_01_6_shyguy_float]
-    - [0xE74920, c, end_01_7_peach_float]
+    - [0xE71930, c, settings]
+    - [0xE71940, c, main]
+    - [0xE71960, c, credits]
+    - [0xE73FC0, c, parade_setup]
+    - [0xE741F0, c, opera_float]
+    - [0xE74620, c, flower_float]
+    - [0xE74620, c, shyguy_float]
+    - [0xE74920, c, peach_float]
   - name: mgm_00
     dir: world/area_mgm/mgm_00
     type: code
     start: 0xE7AE20
     vram: 0x80240000
     subsegments:
-    - [0xE7AE20, c, mgm_00_0_header]
-    - [0xE7AE20, c, mgm_00_1_main]
-    - [0xE7B100, c, mgm_00_2_npc]
-    - [0xE7C000, c, mgm_00_3_scoreboard]
+    - [0xE7AE20, c, settings]
+    - [0xE7AE20, c, main]
+    - [0xE7B100, c, npc]
+    - [0xE7C000, c, scoreboard]
   - name: mgm_01
     dir: world/area_mgm/mgm_01
     type: code
     start: 0xE7F190
     vram: 0x80240000
     subsegments:
-    - [0xE7F190, c, mgm_01_0_header]
-    - [0xE7F190, c, mgm_01_1_main]
-    - [0xE7F360, c, mgm_01_2_npc]
-    - [0xE80940, c, mgm_01_3_entity]
-    - [0xE80940, c, mgm_01_4_images]
-    - [0xE80940, .data, mgm_01_0_header]
-    - [0xE80990, .data, mgm_01_1_main]
-    - [0xE80C00, .data, mgm_01_2_npc]
-    - [0xE81E10, .data, mgm_01_3_entity]
+    - [0xE7F190, c, settings]
+    - [0xE7F190, c, main]
+    - [0xE7F360, c, npc]
+    - [0xE80940, c, entity]
+    - [0xE80940, c, images]
+    - [0xE80940, .data, settings]
+    - [0xE80990, .data, main]
+    - [0xE80C00, .data, npc]
+    - [0xE81E10, .data, entity]
     - start: 0xE81EB0
       type: .data
-      name: mgm_01_4_images
+      name: images
       subsegments:
       - [0xE81EB0, ci4, panel_1_coin, 32, 32]
       - [0xE820B0, palette, panel_1_coin]
@@ -12097,16 +12097,16 @@ segments:
     start: 0xE827F0
     vram: 0x80240000
     subsegments:
-    - [0xE827F0, c, mgm_02_0_header]
-    - [0xE827F0, c, mgm_02_1_main]
-    - [0xE827F0, c, mgm_02_2_npc]
-    - [0xE84BF0, c, mgm_02_3_images]
-    - [0xE84C20, .data, mgm_02_0_header]
-    - [0xE84C70, .data, mgm_02_1_main]
-    - [0xE84E70, .data, mgm_02_2_npc]
+    - [0xE827F0, c, settings]
+    - [0xE827F0, c, main]
+    - [0xE827F0, c, npc]
+    - [0xE84BF0, c, images]
+    - [0xE84C20, .data, settings]
+    - [0xE84C70, .data, main]
+    - [0xE84E70, .data, npc]
     - start: 0xE8AB70
       type: .data
-      name: mgm_02_3_images
+      name: images
       subsegments:
       - [0xE8AB70, ci4, panel_peach, 32, 32]
       - [0xE8AD70, palette, panel_peach]
@@ -12117,16 +12117,16 @@ segments:
     start: 0xE8AED0
     vram: 0x80240000
     subsegments:
-    - [0xE8AED0, c, mgm_03_0_header]
-    - [0xE8AED0, c, mgm_03_1_main]
+    - [0xE8AED0, c, settings]
+    - [0xE8AED0, c, main]
   - name: gv_01
     dir: world/area_gv/gv_01
     type: code
     start: 0xE8AFB0
     vram: 0x80240000
     subsegments:
-    - [0xE8AFB0, c, gv_01_0_header]
-    - [0xE8AFB0, c, gv_01_1_main]
+    - [0xE8AFB0, c, settings]
+    - [0xE8AFB0, c, main]
 
 
 # todo: add heaps2
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 02a2aaf1e1..d2b8314dc6 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -7934,58 +7934,58 @@ segments:
     start: 0x7E73A0
     vram_class: map
     subsegments:
-    - [auto, c, machi_0_header]
-    - [auto, c, machi_1_tables]
-    - [auto, c, machi_2_main]
-    - [auto, c, machi_3_entity]
-    - [auto, c, machi_4_goomba_king]
-    - [auto, c, machi_5_npc]
-    - [auto, c, machi_6_misstar]
-    - [auto, c, machi_7_partner]
+    - [auto, c, settings]
+    - [auto, c, tables]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, goomba_king]
+    - [auto, c, npc]
+    - [auto, c, misstar]
+    - [auto, c, partner]
   - name: mac_00
     dir: world/area_mac/mac_00
     type: code
     start: 0x7EAD10
     vram_class: map
     subsegments:
-    - [auto, c, mac_00_0_header]
-    - [auto, c, mac_00_1_music]
-    - [auto, c, mac_00_2_main]
-    - [auto, c, mac_00_3_entity]
-    - [auto, c, mac_00_4_rooms]
-    - [auto, c, mac_00_5_npc]
-    - [auto, c, mac_00_6_shop]
-    - [auto, c, mac_00_7_music_mix]
-    - [auto, c, mac_00_8_demo]
-    - [auto, c, mac_00_9_water_gfx]
-    - [auto, c, mac_00_10_shared_npc]
-    - [auto, c, mac_00_11_intro_npc]
-    - [auto, c, mac_00_12_intro]
-    - [auto, c, mac_00_13_epilogue_npc]
-    - [auto, c, mac_00_14_epilogue]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, rooms]
+    - [auto, c, npc]
+    - [auto, c, shop]
+    - [auto, c, music_mix]
+    - [auto, c, demo]
+    - [auto, c, water_gfx]
+    - [auto, c, shared_npc]
+    - [auto, c, intro_npc]
+    - [auto, c, intro]
+    - [auto, c, epilogue_npc]
+    - [auto, c, epilogue]
   - name: mac_01
     dir: world/area_mac/mac_01
     type: code
     start: 0x800880
     vram_class: map
     subsegments:
-    - [auto, c, mac_01_0_header]
-    - [auto, c, mac_01_1_music]
-    - [auto, c, mac_01_2_main]
-    - [auto, c, mac_01_3_entity]
-    - [auto, c, mac_01_4_rooms]
-    - [auto, c, mac_01_5_shop]
-    - [auto, c, mac_01_6_crystal_ball_gfx]
-    - [auto, c, mac_01_7_bulletin]
-    - [auto, c, mac_01_8_music_mix]
-    - [auto, c, mac_01_9_npc]
-    - [auto, c, mac_01_10_intro_npc]
-    - [auto, c, mac_01_11_epilogue_npc]
-    - [auto, c, mac_01_12_intro]
-    - [auto, c, mac_01_13_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, rooms]
+    - [auto, c, shop]
+    - [auto, c, crystal_ball_gfx]
+    - [auto, c, bulletin]
+    - [auto, c, music_mix]
+    - [auto, c, npc]
+    - [auto, c, intro_npc]
+    - [auto, c, epilogue_npc]
+    - [auto, c, intro]
+    - [auto, c, foliage]
     - start: 0x8091F0
       type: .data
-      name: mac_01_9_npc
+      name: npc
       subsegments:
       - [0x970C40]
       - [0x80BE10, vtx_common, ../../toad_house/blanket]
@@ -7999,369 +7999,369 @@ segments:
     start: 0x8232C0
     vram_class: map
     subsegments:
-    - [auto, c, mac_02_0_header]
-    - [auto, c, mac_02_1_music]
-    - [auto, c, mac_02_2_main]
-    - [auto, c, mac_02_3_rooms]
-    - [auto, c, mac_02_4_foliage]
-    - [auto, c, mac_02_5_entity]
-    - [auto, c, mac_02_6_npc]
-    - [auto, c, mac_02_7_music_mix]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, foliage]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, music_mix]
   - name: mac_03
     dir: world/area_mac/mac_03
     type: code
     start: 0x831800
     vram_class: map
     subsegments:
-    - [auto, c, mac_03_0_header]
-    - [auto, c, mac_03_1_music]
-    - [auto, c, mac_03_2_main]
-    - [auto, c, mac_03_3_train]
-    - [auto, c, mac_03_4_npc]
-    - [auto, c, mac_03_5_entity]
-    - [auto, c, mac_03_6_foliage]
-    - [auto, c, mac_03_7_oinks]
-    - [auto, c, mac_03_8_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, train]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
+    - [auto, c, oinks]
+    - [auto, c, demo]
   - name: mac_04
     dir: world/area_mac/mac_04
     type: code
     start: 0x842BD0
     vram_class: map
     subsegments:
-    - [auto, c, mac_04_0_header]
-    - [auto, c, mac_04_1_music]
-    - [auto, c, mac_04_2_main]
-    - [auto, c, mac_04_3_rooms]
-    - [auto, c, mac_04_4_foliage]
-    - [auto, c, mac_04_5_shop]
-    - [auto, c, mac_04_6_npc]
-    - [auto, c, mac_04_7_wish_scene]
-    - [auto, c, mac_04_8_entity]
-    - [auto, c, mac_04_9_music_mix]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, foliage]
+    - [auto, c, shop]
+    - [auto, c, npc]
+    - [auto, c, wish_scene]
+    - [auto, c, entity]
+    - [auto, c, music_mix]
   - name: mac_05
     dir: world/area_mac/mac_05
     type: code
     start: 0x852170
     vram_class: map
     subsegments:
-    - [auto, c, mac_05_0_header]
-    - [auto, c, mac_05_1_music]
-    - [auto, c, mac_05_2_entity]
-    - [auto, c, mac_05_3_main]
-    - [auto, c, mac_05_4_npc]
-    - [auto, c, mac_05_5_whale]
-    - [auto, c, mac_05_6_rooms]
-    - [auto, c, mac_05_7_club64_sign]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, whale]
+    - [auto, c, rooms]
+    - [auto, c, club64_sign]
   - name: mac_06
     dir: world/area_mac/mac_06
     type: code
     start: 0x864B40
     vram_class: map
     subsegments:
-    - [auto, c, mac_06_0_header]
-    - [auto, c, mac_06_1_main]
-    - [auto, c, mac_06_2_whale]
-    - [auto, c, mac_06_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, whale]
+    - [auto, c, npc]
   - name: tik_01
     dir: world/area_tik/tik_01
     type: code
     start: 0x8694B0
     vram_class: map
     subsegments:
-    - [auto, c, tik_01_0_header]
-    - [auto, c, tik_01_1_music]
-    - [auto, c, tik_01_2_main]
-    - [auto, c, tik_01_3_drips]
-    - [auto, c, tik_01_4_entity]
-    - [auto, c, tik_01_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_02
     dir: world/area_tik/tik_02
     type: code
     start: 0x86C740
     vram_class: map
     subsegments:
-    - [auto, c, tik_02_0_header]
-    - [auto, c, tik_02_1_music]
-    - [auto, c, tik_02_2_main]
-    - [auto, c, tik_02_3_entity]
-    - [auto, c, tik_02_4_drips]
-    - [auto, c, tik_02_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, drips]
+    - [auto, c, npc]
   - name: tik_03
     dir: world/area_tik/tik_03
     type: code
     start: 0x86EB00
     vram_class: map
     subsegments:
-    - [auto, c, tik_03_0_header]
-    - [auto, c, tik_03_1_music]
-    - [auto, c, tik_03_2_main]
-    - [auto, c, tik_03_3_drips]
-    - [auto, c, tik_03_4_platforms]
-    - [auto, c, tik_03_5_entity]
-    - [auto, c, tik_03_6_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, platforms]
+    - [auto, c, entity]
+    - [auto, c, demo]
   - name: tik_04
     dir: world/area_tik/tik_04
     type: code
     start: 0x871A30
     vram_class: map
     subsegments:
-    - [auto, c, tik_04_0_header]
-    - [auto, c, tik_04_1_music]
-    - [auto, c, tik_04_2_main]
-    - [auto, c, tik_04_3_drips]
-    - [auto, c, tik_04_4_platforms]
-    - [auto, c, tik_04_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, platforms]
+    - [auto, c, npc]
   - name: tik_05
     dir: world/area_tik/tik_05
     type: code
     start: 0x874DC0
     vram_class: map
     subsegments:
-    - [auto, c, tik_05_0_header]
-    - [auto, c, tik_05_1_music]
-    - [auto, c, tik_05_2_main]
-    - [auto, c, tik_05_3_drips]
-    - [auto, c, tik_05_4_entity]
-    - [auto, c, tik_05_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_06
     dir: world/area_tik/tik_06
     type: code
     start: 0x876EE0
     vram_class: map
     subsegments:
-    - [auto, c, tik_06_0_header]
-    - [auto, c, tik_06_1_music]
-    - [auto, c, tik_06_2_main]
-    - [auto, c, tik_06_3_drips]
-    - [auto, c, tik_06_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
   - name: tik_07
     dir: world/area_tik/tik_07
     type: code
     start: 0x879BE0
     vram_class: map
     subsegments:
-    - [auto, c, tik_07_0_header]
-    - [auto, c, tik_07_1_music]
-    - [auto, c, tik_07_2_main]
-    - [auto, c, tik_07_3_entity]
-    - [auto, c, tik_07_4_drips]
-    - [auto, c, tik_07_5_platforms]
-    - [auto, c, tik_07_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, drips]
+    - [auto, c, platforms]
+    - [auto, c, npc]
   - name: tik_08
     dir: world/area_tik/tik_08
     type: code
     start: 0x87EDF0
     vram_class: map
     subsegments:
-    - [auto, c, tik_08_0_header]
-    - [auto, c, tik_08_1_music]
-    - [auto, c, tik_08_2_main]
-    - [auto, c, tik_08_3_drips]
-    - [auto, c, tik_08_4_entity]
-    - [auto, c, tik_08_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_09
     dir: world/area_tik/tik_09
     type: code
     start: 0x8821C0
     vram_class: map
     subsegments:
-    - [auto, c, tik_09_0_header]
-    - [auto, c, tik_09_1_music]
-    - [auto, c, tik_09_2_main]
-    - [auto, c, tik_09_3_drips]
-    - [auto, c, tik_09_4_entity]
-    - [auto, c, tik_09_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_10
     dir: world/area_tik/tik_10
     type: code
     start: 0x8863C0
     vram_class: map
     subsegments:
-    - [auto, c, tik_10_0_header]
-    - [auto, c, tik_10_1_music]
-    - [auto, c, tik_10_2_main]
-    - [auto, c, tik_10_3_drips]
-    - [auto, c, tik_10_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
   - name: tik_12
     dir: world/area_tik/tik_12
     type: code
     start: 0x888BD0
     vram_class: map
     subsegments:
-    - [auto, c, tik_12_0_header]
-    - [auto, c, tik_12_1_music]
-    - [auto, c, tik_12_2_main]
-    - [auto, c, tik_12_3_drips]
-    - [auto, c, tik_12_4_entity]
-    - [auto, c, tik_12_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_14
     dir: world/area_tik/tik_14
     type: code
     start: 0x88D600
     vram_class: map
     subsegments:
-    - [auto, c, tik_14_0_header]
-    - [auto, c, tik_14_1_music]
-    - [auto, c, tik_14_2_main]
-    - [auto, c, tik_14_3_drips]
-    - [auto, c, tik_14_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
   - name: tik_15
     dir: world/area_tik/tik_15
     type: code
     start: 0x88FBA0
     vram_class: map
     subsegments:
-    - [auto, c, tik_15_0_header]
-    - [auto, c, tik_15_1_music]
-    - [auto, c, tik_15_2_main]
-    - [auto, c, tik_15_3_entity]
-    - [auto, c, tik_15_4_drips]
-    - [auto, c, tik_15_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, drips]
+    - [auto, c, npc]
   - name: tik_17
     dir: world/area_tik/tik_17
     type: code
     start: 0x892A20
     vram_class: map
     subsegments:
-    - [auto, c, tik_17_0_header]
-    - [auto, c, tik_17_1_music]
-    - [auto, c, tik_17_2_entity]
-    - [auto, c, tik_17_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: tik_18
     dir: world/area_tik/tik_18
     type: code
     start: 0x8956E0
     vram_class: map
     subsegments:
-    - [auto, c, tik_18_0_header]
-    - [auto, c, tik_18_1_music]
-    - [auto, c, tik_18_2_main]
-    - [auto, c, tik_18_3_drips]
-    - [auto, c, tik_18_4_npc]
-    - [auto, c, tik_18_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: tik_19
     dir: world/area_tik/tik_19
     type: code
     start: 0x8975E0
     vram_class: map
     subsegments:
-    - [auto, c, tik_19_0_header]
-    - [auto, c, tik_19_1_music]
-    - [auto, c, tik_19_2_main]
-    - [auto, c, tik_19_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tik_20
     dir: world/area_tik/tik_20
     type: code
     start: 0x89A350
     vram_class: map
     subsegments:
-    - [auto, c, tik_20_0_header]
-    - [auto, c, tik_20_1_music]
-    - [auto, c, tik_20_2_main]
-    - [auto, c, tik_20_3_npc]
-    - [auto, c, tik_20_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: tik_21
     dir: world/area_tik/tik_21
     type: code
     start: 0x89D7A0
     vram_class: map
     subsegments:
-    - [auto, c, tik_21_0_header]
-    - [auto, c, tik_21_1_music]
-    - [auto, c, tik_21_2_main]
-    - [auto, c, tik_21_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tik_22
     dir: world/area_tik/tik_22
     type: code
     start: 0x89FEC0
     vram_class: map
     subsegments:
-    - [auto, c, tik_22_0_header]
-    - [auto, c, tik_22_1_music]
-    - [auto, c, tik_22_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: tik_23
     dir: world/area_tik/tik_23
     type: code
     start: 0x8A23D0
     vram_class: map
     subsegments:
-    - [auto, c, tik_23_0_header]
-    - [auto, c, tik_23_1_music]
-    - [auto, c, tik_23_2_main]
-    - [auto, c, tik_23_3_entity]
-    - [auto, c, tik_23_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_24
     dir: world/area_tik/tik_24
     type: code
     start: 0x8A5A80
     vram_class: map
     subsegments:
-    - [auto, c, tik_24_0_header]
-    - [auto, c, tik_24_1_music]
-    - [auto, c, tik_24_2_main]
-    - [auto, c, tik_24_3_drips]
-    - [auto, c, tik_24_4_entity]
-    - [auto, c, tik_24_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, drips]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: tik_25
     dir: world/area_tik/tik_25
     type: code
     start: 0x8A7F80
     vram_class: map
     subsegments:
-    - [auto, c, tik_25_0_header]
-    - [auto, c, tik_25_1_music]
-    - [auto, c, tik_25_2_main]
-    - [auto, c, tik_25_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kgr_01
     dir: world/area_kgr/kgr_01
     type: code
     start: 0x8A9A10
     vram_class: map
     subsegments:
-    - [auto, c, kgr_01_1_main]
-    - [auto, c, kgr_01_2_wiggle]
-    - [auto, c, kgr_01_3_extra]
+    - [auto, c, main]
+    - [auto, c, wiggle]
+    - [auto, c, extra]
   - name: kgr_02
     dir: world/area_kgr/kgr_02
     type: code
     start: 0x8AA450
     vram_class: map
     subsegments:
-    - [auto, c, kgr_02_1_main]
-    - [auto, c, kgr_02_2_unused]
-    - [auto, c, kgr_02_3_npc]
-    - [auto, c, kgr_02_4_extra]
+    - [auto, c, main]
+    - [auto, c, unused]
+    - [auto, c, npc]
+    - [auto, c, extra]
   - name: kmr_00
     dir: world/area_kmr/kmr_00
     type: code
     start: 0x8ABF90
     vram_class: map
     subsegments:
-    - [auto, c, kmr_00_0_header]
-    - [auto, c, kmr_00_1_music]
-    - [auto, c, kmr_00_2_main]
-    - [auto, c, kmr_00_3_revival]
-    - [auto, c, kmr_00_4_npc]
-    - [auto, c, kmr_00_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, revival]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kmr_02
     dir: world/area_kmr/kmr_02
     type: code
     start: 0x8B0070
     vram_class: map
     subsegments:
-    - [auto, c, kmr_02_0_header]
-    - [auto, c, kmr_02_1_music]
-    - [auto, c, kmr_02_2_main]
-    - [auto, c, kmr_02_3_npc]
-    - [auto, c, kmr_02_4_rooms_1]
-    - [auto, c, kmr_02_5_entity]
-    - [auto, c, kmr_02_6_rooms_2]
-    - [auto, c, kmr_02_7_kammy]
-    - [auto, c, kmr_02_8_foliage]
-    - [auto, c, kmr_02_9_images]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, rooms_1]
+    - [auto, c, entity]
+    - [auto, c, rooms_2]
+    - [auto, c, kammy]
+    - [auto, c, foliage]
+    - [auto, c, images]
     - start: 0x8C7B70
       type: .data
-      name: kmr_02_9_images
+      name: images
       subsegments:
       - [0x8C7B70, ci4, heart_block, 32, 32]
       - [0x8C7D70, palette, heart_block]
@@ -8372,28 +8372,28 @@ segments:
     start: 0x8C7F90
     vram_class: map
     subsegments:
-    - [auto, c, kmr_03_0_header]
-    - [auto, c, kmr_03_1_music]
-    - [auto, c, kmr_03_2_main]
-    - [auto, c, kmr_03_3_npc]
-    - [auto, c, kmr_03_4_entity]
-    - [auto, c, kmr_03_5_foliage]
-    - [auto, c, kmr_03_6_fall_down]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
+    - [auto, c, fall_down]
   - name: kmr_04
     dir: world/area_kmr/kmr_04
     type: code
     start: 0x8CA900
     vram_class: map
     subsegments:
-    - [auto, c, kmr_04_0_header]
-    - [auto, c, kmr_04_1_music]
-    - [auto, c, kmr_04_2_main]
-    - [auto, c, kmr_04_3_npc]
-    - [auto, c, kmr_04_4_entity]
-    - [auto, c, kmr_04_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
     - start: 0x8CC4F0
       type: .data
-      name: kmr_04_5_foliage
+      name: foliage
       subsegments:
       - [0x8CC4F0, ci4, hammer_block_message, 48, 48]
       - [0x8CC970, palette, hammer_block_message]
@@ -8404,110 +8404,110 @@ segments:
     start: 0x8CE070
     vram_class: map
     subsegments:
-    - [auto, c, kmr_05_0_header]
-    - [auto, c, kmr_05_1_music]
-    - [auto, c, kmr_05_2_main]
-    - [auto, c, kmr_05_3_npc]
-    - [auto, c, kmr_05_4_entity]
-    - [auto, c, kmr_05_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: kmr_06
     dir: world/area_kmr/kmr_06
     type: code
     start: 0x8D1510
     vram_class: map
     subsegments:
-    - [auto, c, kmr_06_0_header]
-    - [auto, c, kmr_06_1_music]
-    - [auto, c, kmr_06_2_main]
-    - [auto, c, kmr_06_3_npc]
-    - [auto, c, kmr_06_4_entity]
-    - [auto, c, kmr_06_5_sticker_sign]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, sticker_sign]
   - name: kmr_07
     dir: world/area_kmr/kmr_07
     type: code
     start: 0x8D3DC0
     vram_class: map
     subsegments:
-    - [auto, c, kmr_07_0_header]
-    - [auto, c, kmr_07_1_music]
-    - [auto, c, kmr_07_2_main]
-    - [auto, c, kmr_07_3_npc]
-    - [auto, c, kmr_07_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kmr_09
     dir: world/area_kmr/kmr_09
     type: code
     start: 0x8D5E00
     vram_class: map
     subsegments:
-    - [auto, c, kmr_09_0_header]
-    - [auto, c, kmr_09_1_music]
-    - [auto, c, kmr_09_2_main]
-    - [auto, c, kmr_09_3_npc]
-    - [auto, c, kmr_09_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kmr_10
     dir: world/area_kmr/kmr_10
     type: code
     start: 0x8D84D0
     vram_class: map
     subsegments:
-    - [auto, c, kmr_10_0_header]
-    - [auto, c, kmr_10_1_music]
-    - [auto, c, kmr_10_2_main]
-    - [auto, c, kmr_10_3_npc]
-    - [auto, c, kmr_10_4_entity]
-    - [auto, c, kmr_10_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: kmr_11
     dir: world/area_kmr/kmr_11
     type: code
     start: 0x8DA100
     vram_class: map
     subsegments:
-    - [auto, c, kmr_11_0_header]
-    - [auto, c, kmr_11_1_music]
-    - [auto, c, kmr_11_2_main]
-    - [auto, c, kmr_11_3_scenes]
-    - [auto, c, kmr_11_4_npc]
-    - [auto, c, kmr_11_5_entity]
-    - [auto, c, kmr_11_6_kammy]
-    - [auto, c, kmr_11_7_foliage]
-    - [auto, c, kmr_11_8_fortress_skeleton]
-    - [auto, c, kmr_11_9_fortress_animation]
-    - [auto, c, kmr_11_10_bridge_skeleton]
-    - [auto, c, kmr_11_11_bridge_animation]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, scenes]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, kammy]
+    - [auto, c, foliage]
+    - [auto, c, fortress_skeleton]
+    - [auto, c, fortress_animation]
+    - [auto, c, bridge_skeleton]
+    - [auto, c, bridge_animation]
   - name: kmr_12
     dir: world/area_kmr/kmr_12
     type: code
     start: 0x8EB360
     vram_class: map
     subsegments:
-    - [auto, c, kmr_12_0_header]
-    - [auto, c, kmr_12_1_music]
-    - [auto, c, kmr_12_2_main]
-    - [auto, c, kmr_12_3_npc]
-    - [auto, c, kmr_12_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kmr_20
     dir: world/area_kmr/kmr_20
     type: code
     start: 0x8EBE20
     vram_class: map
     subsegments:
-    - [auto, c, kmr_20_0_header]
-    - [auto, c, kmr_20_1_music]
-    - [auto, c, kmr_20_2_main]
-    - [auto, c, kmr_20_3_rooms]
-    - [auto, c, kmr_20_4_documents]
-    - [auto, c, kmr_20_5_entity]
-    - [auto, c, kmr_20_6_trees]
-    - [auto, c, kmr_20_7_bushes]
-    - [auto, c, kmr_20_8_bed]
-    - [auto, c, kmr_20_9_npc_scenes]
-    - [auto, c, kmr_20_10_npc]
-    - [auto, c, kmr_20_11_npc_intro]
-    - [auto, c, kmr_20_12_npc_epilogue]
-    - [auto, c, kmr_20_13_records]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, documents]
+    - [auto, c, entity]
+    - [auto, c, trees]
+    - [auto, c, bushes]
+    - [auto, c, bed]
+    - [auto, c, npc_scenes]
+    - [auto, c, npc]
+    - [auto, c, npc_intro]
+    - [auto, c, npc_epilogue]
+    - [auto, c, records]
     - start: 0x8FEB70
       type: .data
-      name: kmr_20_13_records
+      name: records
       subsegments:
       - [0x8FEB70, gfx, records_screen]
       - [0x8FEBE0]
@@ -8517,20 +8517,20 @@ segments:
     start: 0x8FEE80
     vram_class: map
     subsegments:
-    - [auto, c, kmr_21_0_header]
-    - [auto, c, kmr_21_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kmr_22
     dir: world/area_kmr/kmr_22
     type: code
     start: 0x8FF670
     vram_class: map
     subsegments:
-    - [auto, c, kmr_22_0_header]
-    - [auto, c, kmr_22_1_main]
-    - [auto, c, kmr_22_2_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
     - start: 0x900A80
       type: .data
-      name: kmr_22_2_npc
+      name: npc
       subsegments:
       - [0x900A80]
       - [0x900F70, ci4, lava_piranha_vine, 64, 32]
@@ -8543,12 +8543,12 @@ segments:
     start: 0x907A30
     vram_class: map
     subsegments:
-    - [auto, c, kmr_23_0_header]
-    - [auto, c, kmr_23_1_main]
-    - [auto, c, kmr_23_2_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
     - start: 0x909090
       type: .data
-      name: kmr_23_2_npc
+      name: npc
       subsegments:
       - [0x909090]
       - [0x9090F8, ia8, window_ul, 8, 8]
@@ -8562,44 +8562,44 @@ segments:
     start: 0x90B240
     vram_class: map
     subsegments:
-    - [auto, c, kmr_24_0_header]
-    - [auto, c, kmr_24_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kmr_30
     dir: world/area_kmr/kmr_30
     type: code
     start: 0x90B6D0
     vram_class: map
     subsegments:
-    - [auto, c, kmr_30_0_header]
-    - [auto, c, kmr_30_1_main]
-    - [auto, c, kmr_30_2_npc]
-    - [auto, c, kmr_30_3_the_end]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, the_end]
   - name: iwa_00
     dir: world/area_iwa/iwa_00
     type: code
     start: 0x90CC40
     vram_class: map
     subsegments:
-    - [auto, c, iwa_00_0_header]
-    - [auto, c, iwa_00_1_main]
-    - [auto, c, iwa_00_2_entity]
-    - [auto, c, iwa_00_3_npc]
-    - [auto, c, iwa_00_4_slide]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, slide]
   - name: iwa_01
     dir: world/area_iwa/iwa_01
     type: code
     start: 0x90F6B0
     vram_class: map
     subsegments:
-    - [auto, c, iwa_01_0_header]
-    - [auto, c, iwa_01_1_main]
-    - [auto, c, iwa_01_2_entity]
-    - [auto, c, iwa_01_3_splash]
-    - [auto, c, iwa_01_4_npc]
-    - [auto, c, iwa_01_5_slide]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, splash]
+    - [auto, c, npc]
+    - [auto, c, slide]
     - start: 0x913070
       type: .data
-      name: iwa_01_3_splash
+      name: splash
       subsegments:
       - [0x913070, i8, splash, 32, 32]
       - [0x913470, vtx, splash]
@@ -8611,516 +8611,516 @@ segments:
     start: 0x915D70
     vram_class: map
     subsegments:
-    - [auto, c, iwa_02_0_header]
-    - [auto, c, iwa_02_1_main]
-    - [auto, c, iwa_02_2_entity]
-    - [auto, c, iwa_02_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: iwa_03
     dir: world/area_iwa/iwa_03
     type: code
     start: 0x918BB0
     vram_class: map
     subsegments:
-    - [auto, c, iwa_03_0_header]
-    - [auto, c, iwa_03_1_main]
-    - [auto, c, iwa_03_2_entity]
-    - [auto, c, iwa_03_3_npc]
-    - [auto, c, iwa_03_4_slide]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, slide]
   - name: iwa_04
     dir: world/area_iwa/iwa_04
     type: code
     start: 0x91B8E0
     vram_class: map
     subsegments:
-    - [auto, c, iwa_04_0_header]
-    - [auto, c, iwa_04_1_music]
-    - [auto, c, iwa_04_2_main]
-    - [auto, c, iwa_04_3_entity]
-    - [auto, c, iwa_04_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: iwa_10
     dir: world/area_iwa/iwa_10
     type: code
     start: 0x91E570
     vram_class: map
     subsegments:
-    - [auto, c, iwa_10_0_header]
-    - [auto, c, iwa_10_1_music]
-    - [auto, c, iwa_10_2_main]
-    - [auto, c, iwa_10_3_npc]
-    - [auto, c, iwa_10_4_train]
-    - [auto, c, iwa_10_5_entity]
-    - [auto, c, iwa_10_6_parakarry]
-    - [auto, c, iwa_10_7_new_partner]
-    - [auto, c, iwa_10_8_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, train]
+    - [auto, c, entity]
+    - [auto, c, parakarry]
+    - [auto, c, new_partner]
+    - [auto, c, foliage]
   - name: iwa_11
     dir: world/area_iwa/iwa_11
     type: code
     start: 0x9269F0
     vram_class: map
     subsegments:
-    - [auto, c, iwa_11_0_header]
-    - [auto, c, iwa_11_1_music]
-    - [auto, c, iwa_11_2_main]
-    - [auto, c, iwa_11_3_train]
-    - [auto, c, iwa_11_4_scenery]
-    - [auto, c, iwa_11_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, train]
+    - [auto, c, scenery]
+    - [auto, c, npc]
   - name: sbk_00
     dir: world/area_sbk/sbk_00
     type: code
     start: 0x929270
     vram_class: map
     subsegments:
-    - [auto, c, sbk_00_0_header]
-    - [auto, c, sbk_00_1_main]
-    - [auto, c, sbk_00_2_npc]
-    - [auto, c, sbk_00_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sbk_01
     dir: world/area_sbk/sbk_01
     type: code
     start: 0x929A90
     vram_class: map
     subsegments:
-    - [auto, c, sbk_01_1_main]
-    - [auto, c, sbk_01_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_02 #TODO
     dir: world/area_sbk/sbk_02
     type: code
     start: 0x92A2B0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_02_0_header]
-    - [auto, c, sbk_02_1_music]
-    - [auto, c, sbk_02_2_main]
-    - [auto, c, sbk_02_3_ruins]
-    - [auto, c, sbk_02_4_npc]
-    - [auto, c, sbk_02_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, ruins]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sbk_03
     dir: world/area_sbk/sbk_03
     type: code
     start: 0x92F8B0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_03_1_main]
-    - [auto, c, sbk_03_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_04
     dir: world/area_sbk/sbk_04
     type: code
     start: 0x9304D0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_04_1_main]
-    - [auto, c, sbk_04_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_05
     dir: world/area_sbk/sbk_05
     type: code
     start: 0x930CF0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_05_1_main]
-    - [auto, c, sbk_05_2_entity]
-    - [auto, c, sbk_05_3_npc]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: sbk_06
     dir: world/area_sbk/sbk_06
     type: code
     start: 0x9325C0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_06_1_main]
-    - [auto, c, sbk_06_2_npc]
-    - [auto, c, sbk_06_3_foliage]
-    - [auto, c, sbk_06_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_10
     dir: world/area_sbk/sbk_10
     type: code
     start: 0x933C80
     vram_class: map
     subsegments:
-    - [auto, c, sbk_10_1_main]
-    - [auto, c, sbk_10_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_11
     dir: world/area_sbk/sbk_11
     type: code
     start: 0x934040
     vram_class: map
     subsegments:
-    - [auto, c, sbk_11_1_main]
-    - [auto, c, sbk_11_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_12
     dir: world/area_sbk/sbk_12
     type: code
     start: 0x934D40
     vram_class: map
     subsegments:
-    - [auto, c, sbk_12_1_main]
-    - [auto, c, sbk_12_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_13
     dir: world/area_sbk/sbk_13
     type: code
     start: 0x9357E0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_13_1_main]
-    - [auto, c, sbk_13_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_14
     dir: world/area_sbk/sbk_14
     type: code
     start: 0x9366E0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_14_1_main]
-    - [auto, c, sbk_14_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_15
     dir: world/area_sbk/sbk_15
     type: code
     start: 0x936CD0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_15_1_main]
-    - [auto, c, sbk_15_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_16
     dir: world/area_sbk/sbk_16
     type: code
     start: 0x937570
     vram_class: map
     subsegments:
-    - [auto, c, sbk_16_1_main]
-    - [auto, c, sbk_16_2_foliage]
+    - [auto, c, main]
+    - [auto, c, foliage]
   - name: sbk_20
     dir: world/area_sbk/sbk_20
     type: code
     start: 0x938590
     vram_class: map
     subsegments:
-    - [auto, c, sbk_20_1_main]
-    - [auto, c, sbk_20_2_entity]
-    - [auto, c, sbk_20_2_npc]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: sbk_21
     dir: world/area_sbk/sbk_21
     type: code
     start: 0x939560
     vram_class: map
     subsegments:
-    - [auto, c, sbk_21_1_main]
+    - [auto, c, main]
   - name: sbk_22
     dir: world/area_sbk/sbk_22
     type: code
     start: 0x939930
     vram_class: map
     subsegments:
-    - [auto, c, sbk_22_1_main]
-    - [auto, c, sbk_22_2_npc]
-    - [auto, c, sbk_22_3_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sbk_23
     dir: world/area_sbk/sbk_23
     type: code
     start: 0x93A760
     vram_class: map
     subsegments:
-    - [auto, c, sbk_23_1_main]
-    - [auto, c, sbk_23_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_24
     dir: world/area_sbk/sbk_24
     type: code
     start: 0x93AC30
     vram_class: map
     subsegments:
-    - [auto, c, sbk_24_1_main]
-    - [auto, c, sbk_24_2_npc]
-    - [auto, c, sbk_24_3_entity]
-    - [auto, c, sbk_24_4_foliage]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: sbk_25
     dir: world/area_sbk/sbk_25
     type: code
     start: 0x93C280
     vram_class: map
     subsegments:
-    - [auto, c, sbk_25_1_main]
-    - [auto, c, sbk_25_2_npc]
-    - [auto, c, sbk_25_3_foliage]
-    - [auto, c, sbk_25_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_26
     dir: world/area_sbk/sbk_26
     type: code
     start: 0x93DCD0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_26_1_main]
-    - [auto, c, sbk_26_2_npc]
-    - [auto, c, sbk_26_3_foliage]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: sbk_30
     dir: world/area_sbk/sbk_30
     type: code
     start: 0x93F5B0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_30_0_header]
-    - [auto, c, sbk_30_1_music]
-    - [auto, c, sbk_30_2_main]
-    - [auto, c, sbk_30_3_npc]
-    - [auto, c, sbk_30_4_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: sbk_31
     dir: world/area_sbk/sbk_31
     type: code
     start: 0x944000
     vram_class: map
     subsegments:
-    - [auto, c, sbk_31_1_main]
-    - [auto, c, sbk_31_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_32
     dir: world/area_sbk/sbk_32
     type: code
     start: 0x944A60
     vram_class: map
     subsegments:
-    - [auto, c, sbk_32_1_main]
-    - [auto, c, sbk_32_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_33
     dir: world/area_sbk/sbk_33
     type: code
     start: 0x9459D0
     vram_class: map
     subsegments: # unusual organization
-    - [auto, c, sbk_33_0_header]
-    - [auto, c, sbk_33_1_entity]
-    - [auto, c, sbk_33_2_main]
+    - [auto, c, settings]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: sbk_34
     dir: world/area_sbk/sbk_34
     type: code
     start: 0x945ED0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_34_1_main]
-    - [auto, c, sbk_34_2_npc]
-    - [auto, c, sbk_34_3_foliage]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: sbk_35
     dir: world/area_sbk/sbk_35
     type: code
     start: 0x9486B0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_35_1_main]
-    - [auto, c, sbk_35_2_npc]
-    - [auto, c, sbk_35_3_foliage]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: sbk_36
     dir: world/area_sbk/sbk_36
     type: code
     start: 0x949E60
     vram_class: map
     subsegments:
-    - [auto, c, sbk_36_1_main]
-    - [auto, c, sbk_36_2_foliage]
-    - [auto, c, sbk_36_3_entity]
+    - [auto, c, main]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_40
     dir: world/area_sbk/sbk_40
     type: code
     start: 0x94B3A0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_40_1_main]
-    - [auto, c, sbk_40_2_npc]
-    - [auto, c, sbk_40_3_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sbk_41
     dir: world/area_sbk/sbk_41
     type: code
     start: 0x94C040
     vram_class: map
     subsegments:
-    - [auto, c, sbk_41_1_main]
-    - [auto, c, sbk_41_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_42
     dir: world/area_sbk/sbk_42
     type: code
     start: 0x94C510
     vram_class: map
     subsegments:
-    - [auto, c, sbk_42_1_main]
-    - [auto, c, sbk_42_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_43
     dir: world/area_sbk/sbk_43
     type: code
     start: 0x94D170
     vram_class: map
     subsegments:
-    - [auto, c, sbk_43_1_main]
-    - [auto, c, sbk_43_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_44
     dir: world/area_sbk/sbk_44
     type: code
     start: 0x94D5A0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_44_1_main]
-    - [auto, c, sbk_44_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_45
     dir: world/area_sbk/sbk_45
     type: code
     start: 0x94E4A0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_45_1_main]
-    - [auto, c, sbk_45_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_46
     dir: world/area_sbk/sbk_46
     type: code
     start: 0x94E9A0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_46_1_main]
-    - [auto, c, sbk_46_2_npc]
-    - [auto, c, sbk_46_3_foliage]
-    - [auto, c, sbk_46_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_50
     dir: world/area_sbk/sbk_50
     type: code
     start: 0x950610
     vram_class: map
     subsegments:
-    - [auto, c, sbk_50_1_main]
+    - [auto, c, main]
   - name: sbk_51
     dir: world/area_sbk/sbk_51
     type: code
     start: 0x950970
     vram_class: map
     subsegments:
-    - [auto, c, sbk_51_1_main]
-    - [auto, c, sbk_51_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_52
     dir: world/area_sbk/sbk_52
     type: code
     start: 0x951670
     vram_class: map
     subsegments:
-    - [auto, c, sbk_52_1_main]
-    - [auto, c, sbk_52_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_53
     dir: world/area_sbk/sbk_53
     type: code
     start: 0x951AE0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_53_1_main]
-    - [auto, c, sbk_53_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_54
     dir: world/area_sbk/sbk_54
     type: code
     start: 0x952580
     vram_class: map
     subsegments:
-    - [auto, c, sbk_54_1_main]
-    - [auto, c, sbk_54_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_55
     dir: world/area_sbk/sbk_55
     type: code
     start: 0x952A50
     vram_class: map
     subsegments:
-    - [auto, c, sbk_55_1_main]
-    - [auto, c, sbk_55_2_npc]
-    - [auto, c, sbk_55_3_foliage]
-    - [auto, c, sbk_55_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_56
     dir: world/area_sbk/sbk_56
     type: code
     start: 0x953FC0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_56_1_main]
-    - [auto, c, sbk_56_2_entity]
-    - [auto, c, sbk_56_3_foliage]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: sbk_60
     dir: world/area_sbk/sbk_60
     type: code
     start: 0x9569F0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_60_1_main]
-    - [auto, c, sbk_60_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_61
     dir: world/area_sbk/sbk_61
     type: code
     start: 0x956F90
     vram_class: map
     subsegments:
-    - [auto, c, sbk_61_1_main]
-    - [auto, c, sbk_61_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_62
     dir: world/area_sbk/sbk_62
     type: code
     start: 0x957350
     vram_class: map
     subsegments:
-    - [auto, c, sbk_62_1_main]
-    - [auto, c, sbk_62_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_63
     dir: world/area_sbk/sbk_63
     type: code
     start: 0x957D70
     vram_class: map
     subsegments:
-    - [auto, c, sbk_63_1_main]
-    - [auto, c, sbk_63_2_npc]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: sbk_64
     dir: world/area_sbk/sbk_64
     type: code
     start: 0x958590
     vram_class: map
     subsegments:
-    - [auto, c, sbk_64_1_main]
-    - [auto, c, sbk_64_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: sbk_65
     dir: world/area_sbk/sbk_65
     type: code
     start: 0x958950
     vram_class: map
     subsegments:
-    - [auto, c, sbk_65_1_main]
+    - [auto, c, main]
   - name: sbk_66
     dir: world/area_sbk/sbk_66
     type: code
     start: 0x958CB0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_66_1_main]
-    - [auto, c, sbk_66_2_npc]
-    - [auto, c, sbk_66_3_foliage]
-    - [auto, c, sbk_66_4_entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: sbk_99
     dir: world/area_sbk/sbk_99
     type: code
     start: 0x95AEB0
     vram_class: map
     subsegments:
-    - [auto, c, sbk_99_1_main]
-    - [auto, c, sbk_99_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: dro_01
     dir: world/area_dro/dro_01
     type: code
     start: 0x95B200
     vram_class: map
     subsegments:
-    - [auto, c, dro_01_0_header]
-    - [auto, c, dro_01_1_music]
-    - [auto, c, dro_01_2_main]
-    - [auto, c, dro_01_3_npc]
-    - [auto, c, dro_01_4_shop]
-    - [auto, c, dro_01_5_rooms]
-    - [auto, c, dro_01_6_entity]
-    - [auto, c, dro_01_7_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, shop]
+    - [auto, c, rooms]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: dro_02
     dir: world/area_dro/dro_02
     type: code
     start: 0x9691C0
     vram_class: map
     subsegments:
-    - [auto, c, dro_02_0_header]
-    - [auto, c, dro_02_1_music]
-    - [auto, c, dro_02_2_entity]
-    - [auto, c, dro_02_3_main]
-    - [auto, c, dro_02_4_rooms]
-    - [auto, c, dro_02_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, npc]
     - start: 0x96DFA0
       type: .data
-      name: dro_02_5_npc
+      name: npc
       subsegments:
       - [0x96DFA0]
       - [0x9707A8, ci4, card, 32, 32]
@@ -9140,1459 +9140,1459 @@ segments:
     start: 0x978140
     vram_class: map
     subsegments:
-    - [auto, c, isk_01_0_header]
-    - [auto, c, isk_01_1_music]
-    - [auto, c, isk_01_2_main]
-    - [auto, c, isk_01_3_haze]
-    - [auto, c, isk_01_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, haze]
+    - [auto, c, entity]
   - name: isk_02
     dir: world/area_isk/isk_02
     type: code
     start: 0x978710
     vram_class: map
     subsegments:
-    - [auto, c, isk_02_0_header]
-    - [auto, c, isk_02_1_main]
-    - [auto, c, isk_02_2_lock]
-    - [auto, c, isk_02_3_ambush]
-    - [auto, c, isk_02_4_entity]
-    - [auto, c, isk_02_5_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, lock]
+    - [auto, c, ambush]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: isk_03
     dir: world/area_isk/isk_03
     type: code
     start: 0x979E50
     vram_class: map
     subsegments:
-    - [auto, c, isk_03_0_header]
-    - [auto, c, isk_03_1_main]
-    - [auto, c, isk_03_2_sand]
-    - [auto, c, isk_03_3_entity]
-    - [auto, c, isk_03_4_switch]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, sand]
+    - [auto, c, entity]
+    - [auto, c, switch]
   - name: isk_04
     dir: world/area_isk/isk_04
     type: code
     start: 0x97B630
     vram_class: map
     subsegments:
-    - [auto, c, isk_04_0_header]
-    - [auto, c, isk_04_1_music]
-    - [auto, c, isk_04_2_main]
-    - [auto, c, isk_04_3_obstructions]
-    - [auto, c, isk_04_4_entity]
-    - [auto, c, isk_04_5_npc]
-    - [auto, c, isk_04_6_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, obstructions]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, demo]
   - name: isk_05
     dir: world/area_isk/isk_05
     type: code
     start: 0x97DAD0
     vram_class: map
     subsegments:
-    - [auto, c, isk_05_0_header]
-    - [auto, c, isk_05_1_main]
-    - [auto, c, isk_05_2_entity]
-    - [auto, c, isk_05_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: isk_06
     dir: world/area_isk/isk_06
     type: code
     start: 0x980A20
     vram_class: map
     subsegments:
-    - [auto, c, isk_06_0_header]
-    - [auto, c, isk_06_1_main]
-    - [auto, c, isk_06_2_entity]
-    - [auto, c, isk_06_3_sand]
-    - [auto, c, isk_06_4_switch]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, sand]
+    - [auto, c, switch]
   - name: isk_07
     dir: world/area_isk/isk_07
     type: code
     start: 0x982440
     vram_class: map
     subsegments:
-    - [auto, c, isk_07_0_header]
-    - [auto, c, isk_07_1_main]
-    - [auto, c, isk_07_2_entity]
-    - [auto, c, isk_07_3_npc]
-    - [auto, c, isk_07_4_stairs]
-    - [auto, c, isk_07_5_lock]
-    - [auto, c, isk_07_6_switch]
-    - [auto, c, isk_07_7_ambush]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, stairs]
+    - [auto, c, lock]
+    - [auto, c, switch]
+    - [auto, c, ambush]
   - name: isk_08
     dir: world/area_isk/isk_08
     type: code
     start: 0x984E30
     vram_class: map
     subsegments:
-    - [auto, c, isk_08_0_header]
-    - [auto, c, isk_08_1_main]
-    - [auto, c, isk_08_2_npc]
-    - [auto, c, isk_08_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: isk_09
     dir: world/area_isk/isk_09
     type: code
     start: 0x9864E0
     vram_class: map
     subsegments:
-    - [auto, c, isk_09_0_header]
-    - [auto, c, isk_09_1_music]
-    - [auto, c, isk_09_2_main]
-    - [auto, c, isk_09_3_entity]
-    - [auto, c, isk_09_4_stairs]
-    - [auto, c, isk_09_5_switch]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, stairs]
+    - [auto, c, switch]
   - name: isk_10
     dir: world/area_isk/isk_10
     type: code
     start: 0x988B60
     vram_class: map
     subsegments:
-    - [auto, c, isk_10_0_header]
-    - [auto, c, isk_10_1_main]
-    - [auto, c, isk_10_2_entity]
-    - [auto, c, isk_10_3_bombable]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, bombable]
   - name: isk_11
     dir: world/area_isk/isk_11
     type: code
     start: 0x98AA10
     vram_class: map
     subsegments:
-    - [auto, c, isk_11_0_header]
-    - [auto, c, isk_11_1_music]
-    - [auto, c, isk_11_2_main]
-    - [auto, c, isk_11_3_entity]
-    - [auto, c, isk_11_4_scene]
-    - [auto, c, isk_11_5_puzzle]
-    - [auto, c, isk_11_6_lock]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, scene]
+    - [auto, c, puzzle]
+    - [auto, c, lock]
   - name: isk_12
     dir: world/area_isk/isk_12
     type: code
     start: 0x98D640
     vram_class: map
     subsegments:
-    - [auto, c, isk_12_0_header]
-    - [auto, c, isk_12_1_main]
-    - [auto, c, isk_12_2_entity]
-    - [auto, c, isk_12_3_sand]
-    - [auto, c, isk_12_4_switch]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, sand]
+    - [auto, c, switch]
   - name: isk_13
     dir: world/area_isk/isk_13
     type: code
     start: 0x98F7E0
     vram_class: map
     subsegments:
-    - [auto, c, isk_13_0_header]
-    - [auto, c, isk_13_1_main]
-    - [auto, c, isk_13_2_entity]
-    - [auto, c, isk_13_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: isk_14
     dir: world/area_isk/isk_14
     type: code
     start: 0x992730
     vram_class: map
     subsegments:
-    - [auto, c, isk_14_0_header]
-    - [auto, c, isk_14_1_main]
-    - [auto, c, isk_14_2_entity]
-    - [auto, c, isk_14_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: isk_16
     dir: world/area_isk/isk_16
     type: code
     start: 0x9951F0
     vram_class: map
     subsegments:
-    - [auto, c, isk_16_0_header]
-    - [auto, c, isk_16_1_main]
-    - [auto, c, isk_16_2_npc]
-    - [auto, c, isk_16_3_boss]
-    - [auto, c, isk_16_4_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, boss]
+    - [auto, c, entity]
   - name: isk_18
     dir: world/area_isk/isk_18
     type: code
     start: 0x997F70
     vram_class: map
     subsegments:
-    - [auto, c, isk_18_0_header]
-    - [auto, c, isk_18_1_main]
-    - [auto, c, isk_18_2_npc]
-    - [auto, c, isk_18_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: isk_19
     dir: world/area_isk/isk_19
     type: code
     start: 0x999740
     vram_class: map
     subsegments:
-    - [auto, c, isk_19_0_header]
-    - [auto, c, isk_19_1_music]
-    - [auto, c, isk_19_2_main]
-    - [auto, c, isk_19_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: trd_00
     dir: world/area_trd/trd_00
     type: code
     start: 0x999C70
     vram_class: map
     subsegments:
-    - [auto, c, trd_00_0_header]
-    - [auto, c, trd_00_1_main]
-    - [auto, c, trd_00_2_entity]
-    - [auto, c, trd_00_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_01
     dir: world/area_trd/trd_01
     type: code
     start: 0x99C990
     vram_class: map
     subsegments:
-    - [auto, c, trd_01_0_header]
-    - [auto, c, trd_01_1_main]
-    - [auto, c, trd_01_2_entity]
-    - [auto, c, trd_01_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_02
     dir: world/area_trd/trd_02
     type: code
     start: 0x9A0FE0
     vram_class: map
     subsegments:
-    - [auto, c, trd_02_0_header]
-    - [auto, c, trd_02_1_main]
-    - [auto, c, trd_02_2_entity]
-    - [auto, c, trd_02_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_03
     dir: world/area_trd/trd_03
     type: code
     start: 0x9A4650
     vram_class: map
     subsegments:
-    - [auto, c, trd_03_0_header]
-    - [auto, c, trd_03_1_main]
-    - [auto, c, trd_03_2_entity]
-    - [auto, c, trd_03_3_npc]
-    - [auto, c, trd_03_4_puzzle]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, puzzle]
   - name: trd_04
     dir: world/area_trd/trd_04
     type: code
     start: 0x9A83F0
     vram_class: map
     subsegments:
-    - [auto, c, trd_04_0_header]
-    - [auto, c, trd_04_1_main]
-    - [auto, c, trd_04_2_entity]
-    - [auto, c, trd_04_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_05
     dir: world/area_trd/trd_05
     type: code
     start: 0x9AE700
     vram_class: map
     subsegments:
-    - [auto, c, trd_05_0_header]
-    - [auto, c, trd_05_1_main]
-    - [auto, c, trd_05_2_entity]
-    - [auto, c, trd_05_3_trap]
-    - [auto, c, trd_05_4_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, trap]
+    - [auto, c, npc]
   - name: trd_06
     dir: world/area_trd/trd_06
     type: code
     start: 0x9B1790
     vram_class: map
     subsegments:
-    - [auto, c, trd_06_0_header]
-    - [auto, c, trd_06_1_main]
-    - [auto, c, trd_06_2_falling]
-    - [auto, c, trd_06_3_npc_prisoners]
-    - [auto, c, trd_06_4_npc_koopa_bros]
-    - [auto, c, trd_06_5_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, falling]
+    - [auto, c, npc_prisoners]
+    - [auto, c, npc_koopa_bros]
+    - [auto, c, entity]
   - name: trd_07
     dir: world/area_trd/trd_07
     type: code
     start: 0x9B6980
     vram_class: map
     subsegments:
-    - [auto, c, trd_07_0_header]
-    - [auto, c, trd_07_1_main]
-    - [auto, c, trd_07_2_npc]
-    - [auto, c, trd_07_3_magic_doors]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, magic_doors]
   - name: trd_08
     dir: world/area_trd/trd_08
     type: code
     start: 0x9BB2A0
     vram_class: map
     subsegments:
-    - [auto, c, trd_08_0_header]
-    - [auto, c, trd_08_1_main]
-    - [auto, c, trd_08_2_entity]
-    - [auto, c, trd_08_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: trd_09
     dir: world/area_trd/trd_09
     type: code
     start: 0x9BD660
     vram_class: map
     subsegments:
-    - [auto, c, trd_09_0_header]
-    - [auto, c, trd_09_1_main]
-    - [auto, c, trd_09_2_entity]
-    - [auto, c, trd_09_3_npc]
-    - [auto, c, trd_09_4_demo]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, demo]
   - name: trd_10
     dir: world/area_trd/trd_10
     type: code
     start: 0x9C2910
     vram_class: map
     subsegments:
-    - [auto, c, trd_10_0_header]
-    - [auto, c, trd_10_1_main]
-    - [auto, c, trd_10_2_npc]
-    - [auto, c, trd_10_3_fake_bowser]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, fake_bowser]
   - name: nok_01
     dir: world/area_nok/nok_01
     type: code
     start: 0x9C53E0
     vram_class: map
     subsegments:
-    - [auto, c, nok_01_0_header]
-    - [auto, c, nok_01_1_music]
-    - [auto, c, nok_01_2_main]
-    - [auto, c, nok_01_3_entity]
-    - [auto, c, nok_01_4_npc]
-    - [auto, c, nok_01_5_shop]
-    - [auto, c, nok_01_6_rooms]
-    - [auto, c, nok_01_7_radio]
-    - [auto, c, nok_01_8_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, shop]
+    - [auto, c, rooms]
+    - [auto, c, radio]
+    - [auto, c, foliage]
   - name: nok_02
     dir: world/area_nok/nok_02
     type: code
     start: 0x9D7020
     vram_class: map
     subsegments:
-    - [auto, c, nok_02_0_header]
-    - [auto, c, nok_02_1_music]
-    - [auto, c, nok_02_2_main]
-    - [auto, c, nok_02_3_entity]
-    - [auto, c, nok_02_4_rooms]
-    - [auto, c, nok_02_5_bookshelf]
-    - [auto, c, nok_02_6_npc]
-    - [auto, c, nok_02_7_demo]
-    - [auto, c, nok_02_8_koot_favors]
-    - [auto, c, nok_02_9_foliage]
-    - [auto, c, nok_02_10_epilogue]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, rooms]
+    - [auto, c, bookshelf]
+    - [auto, c, npc]
+    - [auto, c, demo]
+    - [auto, c, koot_favors]
+    - [auto, c, foliage]
+    - [auto, c, epilogue]
   - name: nok_03
     dir: world/area_nok/nok_03
     type: code
     start: 0x9EB7F0
     vram_class: map
     subsegments:
-    - [auto, c, nok_03_0_header]
-    - [auto, c, nok_03_1_music]
-    - [auto, c, nok_03_2_main]
-    - [auto, c, nok_03_3_entity]
-    - [auto, c, nok_03_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: nok_04
     dir: world/area_nok/nok_04
     type: code
     start: 0x9EDBF0
     vram_class: map
     subsegments:
-    - [auto, c, nok_04_0_header]
-    - [auto, c, nok_04_1_music]
-    - [auto, c, nok_04_2_main]
-    - [auto, c, nok_04_3_entity]
-    - [auto, c, nok_04_4_npc]
-    - [auto, c, nok_04_5_new_partner]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
   - name: nok_11
     dir: world/area_nok/nok_11
     type: code
     start: 0x9F4A40
     vram_class: map
     subsegments:
-    - [auto, c, nok_11_0_header]
-    - [auto, c, nok_11_1_music]
-    - [auto, c, nok_11_2_main]
-    - [auto, c, nok_11_3_entity]
-    - [auto, c, nok_11_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: nok_12
     dir: world/area_nok/nok_12
     type: code
     start: 0x9FA7F0
     vram_class: map
     subsegments:
-    - [auto, c, nok_12_0_header]
-    - [auto, c, nok_12_1_music]
-    - [auto, c, nok_12_2_main]
-    - [auto, c, nok_12_3_entity]
-    - [auto, c, nok_12_4_bridge]
-    - [auto, c, nok_12_5_foliage]
-    - [auto, c, nok_12_6_npc]
-    - [auto, c, nok_12_7_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, bridge]
+    - [auto, c, foliage]
+    - [auto, c, npc]
+    - [auto, c, demo]
   - name: nok_13
     dir: world/area_nok/nok_13
     type: code
     start: 0xA00600
     vram_class: map
     subsegments:
-    - [auto, c, nok_13_0_header]
-    - [auto, c, nok_13_1_music]
-    - [auto, c, nok_13_2_main]
-    - [auto, c, nok_13_3_entity]
-    - [auto, c, nok_13_4_npc]
-    - [auto, c, nok_13_5]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, musical_hill]
   - name: nok_14
     dir: world/area_nok/nok_14
     type: code
     start: 0xA02840
     vram_class: map
     subsegments:
-    - [auto, c, nok_14_0_header]
-    - [auto, c, nok_14_1_music]
-    - [auto, c, nok_14_2_main]
-    - [auto, c, nok_14_3_entity]
-    - [auto, c, nok_14_4_bridge]
-    - [auto, c, nok_14_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, bridge]
+    - [auto, c, npc]
   - name: nok_15
     dir: world/area_nok/nok_15
     type: code
     start: 0xA06F00
     vram_class: map
     subsegments:
-    - [auto, c, nok_15_0_header]
-    - [auto, c, nok_15_1_music]
-    - [auto, c, nok_15_2_main]
-    - [auto, c, nok_15_3_entity]
-    - [auto, c, nok_15_4_npc]
-    - [auto, c, nok_15_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: hos_00
     dir: world/area_hos/hos_00
     type: code
     start: 0xA0BCF0
     vram_class: map
     subsegments:
-    - [auto, c, hos_00_0_header]
-    - [auto, c, hos_00_1_music]
-    - [auto, c, hos_00_2_main]
-    - [auto, c, hos_00_3_unused]
-    - [auto, c, hos_00_4_npc]
-    - [auto, c, hos_00_5_entity]
-    - [auto, c, hos_00_6_scenes]
-    - [auto, c, hos_00_7_shade_gfx]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, unused]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, scenes]
+    - [auto, c, shade_gfx]
   - name: hos_01
     dir: world/area_hos/hos_01
     type: code
     start: 0xA10880
     vram_class: map
     subsegments:
-    - [auto, c, hos_01_0_header]
-    - [auto, c, hos_01_1_music]
-    - [auto, c, hos_01_2_main]
-    - [auto, c, hos_01_3_model_fx]
-    - [auto, c, hos_01_4_npc]
-    - [auto, c, hos_01_5_entity]
-    - [auto, c, hos_01_6_star_way]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, model_fx]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, star_way]
   - name: hos_02
     dir: world/area_hos/hos_02
     type: code
     start: 0xA16220
     vram_class: map
     subsegments:
-    - [auto, c, hos_02_0_header]
-    - [auto, c, hos_02_1_music]
-    - [auto, c, hos_02_2_main]
-    - [auto, c, hos_02_3_model_fx]
-    - [auto, c, hos_02_4_unused]
-    - [auto, c, hos_02_5_npc]
-    - [auto, c, hos_02_6_descent]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, model_fx]
+    - [auto, c, unused]
+    - [auto, c, npc]
+    - [auto, c, descent]
   - name: hos_03
     dir: world/area_hos/hos_03
     type: code
     start: 0xA1B100
     vram_class: map
     subsegments:
-    - [auto, c, hos_03_0_header]
-    - [auto, c, hos_03_1_music]
-    - [auto, c, hos_03_2_main]
-    - [auto, c, hos_03_3_model_fx]
-    - [auto, c, hos_03_4_rooms]
-    - [auto, c, hos_03_5_foliage]
-    - [auto, c, hos_03_6_npc]
-    - [auto, c, hos_03_7_shop]
-    - [auto, c, hos_03_8_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, model_fx]
+    - [auto, c, rooms]
+    - [auto, c, foliage]
+    - [auto, c, npc]
+    - [auto, c, shop]
+    - [auto, c, entity]
   - name: hos_04
     dir: world/area_hos/hos_04
     type: code
     start: 0xA26ED0
     vram_class: map
     subsegments:
-    - [auto, c, hos_04_0_header]
-    - [auto, c, hos_04_1_music]
-    - [auto, c, hos_04_2_main]
-    - [auto, c, hos_04_3_fountains]
-    - [auto, c, hos_04_4_unused]
-    - [auto, c, hos_04_6_intro]
-    - [auto, c, hos_04_7_starship]
-    - [auto, c, hos_04_8_narrator]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, fountains]
+    - [auto, c, unused]
+    - [auto, c, intro]
+    - [auto, c, starship]
+    - [auto, c, narrator]
   - name: hos_05
     dir: world/area_hos/hos_05
     type: code
     start: 0xA2A240
     vram_class: map
     subsegments:
-    - [auto, c, hos_05_0_header]
-    - [auto, c, hos_05_1_music]
-    - [auto, c, hos_05_2_main]
-    - [auto, c, hos_05_3_misc]
-    - [auto, c, hos_05_4_npc]
-    - [auto, c, hos_05_5_intro]
-    - [auto, c, hos_05_6_narrator]
-    - [auto, c, hos_05_7_model_fx]
-    - [auto, c, hos_05_8_star_ship]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, misc]
+    - [auto, c, npc]
+    - [auto, c, intro]
+    - [auto, c, narrator]
+    - [auto, c, model_fx]
+    - [auto, c, star_ship]
   - name: hos_06
     dir: world/area_hos/hos_06
     type: code
     start: 0xA394E0
     vram_class: map
     subsegments:
-    - [auto, c, hos_06_0_header]
-    - [auto, c, hos_06_1_entity]
-    - [auto, c, hos_06_2_main]
-    - [auto, c, hos_06_3_merlow]
-    - [auto, c, hos_06_4_rooms]
-    - [auto, c, hos_06_5_merluvlee]
-    - [auto, c, hos_06_6_chest]
+    - [auto, c, settings]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, merlow]
+    - [auto, c, rooms]
+    - [auto, c, merluvlee]
+    - [auto, c, chest]
   - name: hos_10
     dir: world/area_hos/hos_10
     type: code
     start: 0xA3F740
     vram_class: map
     subsegments:
-    - [auto, c, hos_10_0_header]
-    - [auto, c, hos_10_1_music]
-    - [auto, c, hos_10_2_npc1]
-    - [auto, c, hos_10_3_npc2]
-    - [auto, c, hos_10_4_main]
-    - [auto, c, hos_10_5_intro]
-    - [auto, c, hos_10_6_pre_title]
-    - [auto, c, hos_10_7_ending]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, npc1]
+    - [auto, c, npc2]
+    - [auto, c, main]
+    - [auto, c, intro]
+    - [auto, c, pre_title]
+    - [auto, c, ending]
   - name: hos_20
     dir: world/area_hos/hos_20
     type: code
     start: 0xA45930
     vram_class: map
     subsegments:
-    - [auto, c, hos_20_0_header]
-    - [auto, c, hos_20_1_main]
-    - [auto, c, hos_20_2_starship]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, starship]
   - name: kpa_01
     dir: world/area_kpa/kpa_01
     type: code
     start: 0xA46F60
     vram_class: map
     subsegments:
-    - [auto, c, kpa_01_0_header]
-    - [auto, c, kpa_01_1_music]
-    - [auto, c, kpa_01_2_main]
-    - [auto, c, kpa_01_3_npc]
-    - [auto, c, kpa_01_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_03
     dir: world/area_kpa/kpa_03
     type: code
     start: 0xA485C0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_03_0_header]
-    - [auto, c, kpa_03_1_music]
-    - [auto, c, kpa_03_2_main]
-    - [auto, c, kpa_03_3_npc]
-    - [auto, c, kpa_03_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_04
     dir: world/area_kpa/kpa_04
     type: code
     start: 0xA4BF60
     vram_class: map
     subsegments:
-    - [auto, c, kpa_04_0_header]
-    - [auto, c, kpa_04_1_music]
-    - [auto, c, kpa_04_2_main]
-    - [auto, c, kpa_04_3_statues]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, statues]
   - name: kpa_08
     dir: world/area_kpa/kpa_08
     type: code
     start: 0xA4CA20
     vram_class: map
     subsegments:
-    - [auto, c, kpa_08_0_header]
-    - [auto, c, kpa_08_1_music]
-    - [auto, c, kpa_08_2_main]
-    - [auto, c, kpa_08_3_entity]
-    - [auto, c, kpa_08_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kpa_09
     dir: world/area_kpa/kpa_09
     type: code
     start: 0xA4F000
     vram_class: map
     subsegments:
-    - [auto, c, kpa_09_0_header]
-    - [auto, c, kpa_09_1_music]
-    - [auto, c, kpa_09_2_main]
-    - [auto, c, kpa_09_3_entity]
-    - [auto, c, kpa_09_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kpa_10
     dir: world/area_kpa/kpa_10
     type: code
     start: 0xA51980
     vram_class: map
     subsegments:
-    - [auto, c, kpa_10_0_header]
-    - [auto, c, kpa_10_1_music]
-    - [auto, c, kpa_10_2_main]
-    - [auto, c, kpa_10_3_npc]
-    - [auto, c, kpa_10_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_11
     dir: world/area_kpa/kpa_11
     type: code
     start: 0xA528C0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_11_0_header]
-    - [auto, c, kpa_11_1_music]
-    - [auto, c, kpa_11_2_main]
-    - [auto, c, kpa_11_3_entity]
-    - [auto, c, kpa_11_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kpa_12
     dir: world/area_kpa/kpa_12
     type: code
     start: 0xA54950
     vram_class: map
     subsegments:
-    - [auto, c, kpa_12_0_header]
-    - [auto, c, kpa_12_1_music]
-    - [auto, c, kpa_12_2_main]
-    - [auto, c, kpa_12_3_platforms]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, platforms]
   - name: kpa_13
     dir: world/area_kpa/kpa_13
     type: code
     start: 0xA55F20
     vram_class: map
     subsegments:
-    - [auto, c, kpa_13_0_header]
-    - [auto, c, kpa_13_1_music]
-    - [auto, c, kpa_13_2_main]
-    - [auto, c, kpa_13_3_entity]
-    - [auto, c, kpa_13_4_platforms]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, platforms]
   - name: kpa_14
     dir: world/area_kpa/kpa_14
     type: code
     start: 0xA574B0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_14_0_header]
-    - [auto, c, kpa_14_1_music]
-    - [auto, c, kpa_14_2_main]
-    - [auto, c, kpa_14_3_entity]
-    - [auto, c, kpa_14_4_platforms]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, platforms]
   - name: kpa_15
     dir: world/area_kpa/kpa_15
     type: code
     start: 0xA59390
     vram_class: map
     subsegments:
-    - [auto, c, kpa_15_0_header]
-    - [auto, c, kpa_15_1_music]
-    - [auto, c, kpa_15_2_main]
-    - [auto, c, kpa_15_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kpa_16
     dir: world/area_kpa/kpa_16
     type: code
     start: 0xA5A030
     vram_class: map
     subsegments:
-    - [auto, c, kpa_16_0_header]
-    - [auto, c, kpa_16_1_music]
-    - [auto, c, kpa_16_2_main]
-    - [auto, c, kpa_16_3_entity]
-    - [auto, c, kpa_16_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kpa_17
     dir: world/area_kpa/kpa_17
     type: code
     start: 0xA5CA20
     vram_class: map
     subsegments:
-    - [auto, c, kpa_17_0_header]
-    - [auto, c, kpa_17_1_music]
-    - [auto, c, kpa_17_2_entity]
-    - [auto, c, kpa_17_3_main]
-    - [auto, c, kpa_17_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_32
     dir: world/area_kpa/kpa_32
     type: code
     start: 0xA5E0C0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_32_0_header]
-    - [auto, c, kpa_32_1_music]
-    - [auto, c, kpa_32_2_entity]
-    - [auto, c, kpa_32_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: kpa_33
     dir: world/area_kpa/kpa_33
     type: code
     start: 0xA5F080
     vram_class: map
     subsegments:
-    - [auto, c, kpa_33_0_header]
-    - [auto, c, kpa_33_1_music]
-    - [auto, c, kpa_33_2_entity]
-    - [auto, c, kpa_33_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: kpa_40
     dir: world/area_kpa/kpa_40
     type: code
     start: 0xA60040
     vram_class: map
     subsegments:
-    - [auto, c, kpa_40_0_header]
-    - [auto, c, kpa_40_1_music]
-    - [auto, c, kpa_40_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_41
     dir: world/area_kpa/kpa_41
     type: code
     start: 0xA60470
     vram_class: map
     subsegments:
-    - [auto, c, kpa_41_0_header]
-    - [auto, c, kpa_41_1_music]
-    - [auto, c, kpa_41_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_50
     dir: world/area_kpa/kpa_50
     type: code
     start: 0xA609D0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_50_0_header]
-    - [auto, c, kpa_50_1_music]
-    - [auto, c, kpa_50_2_main]
-    - [auto, c, kpa_50_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_51
     dir: world/area_kpa/kpa_51
     type: code
     start: 0xA64090
     vram_class: map
     subsegments:
-    - [auto, c, kpa_51_0_header]
-    - [auto, c, kpa_51_1_music]
-    - [auto, c, kpa_51_2_main]
-    - [auto, c, kpa_51_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_52
     dir: world/area_kpa/kpa_52
     type: code
     start: 0xA67100
     vram_class: map
     subsegments:
-    - [auto, c, kpa_52_0_header]
-    - [auto, c, kpa_52_1_music]
-    - [auto, c, kpa_52_2_entity]
-    - [auto, c, kpa_52_3_main]
-    - [auto, c, kpa_52_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_53
     dir: world/area_kpa/kpa_53
     type: code
     start: 0xA6ACA0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_53_0_header]
-    - [auto, c, kpa_53_1_music]
-    - [auto, c, kpa_53_2_main]
-    - [auto, c, kpa_53_3_npc]
-    - [auto, c, kpa_53_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_60
     dir: world/area_kpa/kpa_60
     type: code
     start: 0xA6CB00
     vram_class: map
     subsegments:
-    - [auto, c, kpa_60_0_header]
-    - [auto, c, kpa_60_1_music]
-    - [auto, c, kpa_60_2_entity]
-    - [auto, c, kpa_60_3_main]
-    - [auto, c, kpa_60_4_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, scenes]
   - name: kpa_61
     dir: world/area_kpa/kpa_61
     type: code
     start: 0xA6E3E0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_61_0_header]
-    - [auto, c, kpa_61_1_music]
-    - [auto, c, kpa_61_2_main]
-    - [auto, c, kpa_61_3_npc]
-    - [auto, c, kpa_61_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_62
     dir: world/area_kpa/kpa_62
     type: code
     start: 0xA72220
     vram_class: map
     subsegments:
-    - [auto, c, kpa_62_0_header]
-    - [auto, c, kpa_62_1_music]
-    - [auto, c, kpa_62_2_entity]
-    - [auto, c, kpa_62_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: kpa_63
     dir: world/area_kpa/kpa_63
     type: code
     start: 0xA735B0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_63_0_header]
-    - [auto, c, kpa_63_1_music]
-    - [auto, c, kpa_63_2_entity]
-    - [auto, c, kpa_63_3_main]
-    - [auto, c, kpa_63_4_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, scenes]
   - name: kpa_70
     dir: world/area_kpa/kpa_70
     type: code
     start: 0xA74870
     vram_class: map
     subsegments:
-    - [auto, c, kpa_70_0_header]
-    - [auto, c, kpa_70_1_music]
-    - [auto, c, kpa_70_2_main]
-    - [auto, c, kpa_70_3_npc]
-    - [auto, c, kpa_70_4_chain_skele]
-    - [auto, c, kpa_70_5_chain_anim]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, chain_skele]
+    - [auto, c, chain_anim]
   - name: kpa_81
     dir: world/area_kpa/kpa_81
     type: code
     start: 0xA784C0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_81_0_header]
-    - [auto, c, kpa_81_1_music]
-    - [auto, c, kpa_81_2_main]
-    - [auto, c, kpa_81_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_82
     dir: world/area_kpa/kpa_82
     type: code
     start: 0xA7A500
     vram_class: map
     subsegments:
-    - [auto, c, kpa_82_0_header]
-    - [auto, c, kpa_82_1_music]
-    - [auto, c, kpa_82_2_main]
-    - [auto, c, kpa_82_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_83
     dir: world/area_kpa/kpa_83
     type: code
     start: 0xA83490
     vram_class: map
     subsegments:
-    - [auto, c, kpa_83_0_header]
-    - [auto, c, kpa_83_1_music]
-    - [auto, c, kpa_83_2_main]
-    - [auto, c, kpa_83_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_90
     dir: world/area_kpa/kpa_90
     type: code
     start: 0xA867B0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_90_0_header]
-    - [auto, c, kpa_90_1_music]
-    - [auto, c, kpa_90_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_91
     dir: world/area_kpa/kpa_91
     type: code
     start: 0xA86A50
     vram_class: map
     subsegments:
-    - [auto, c, kpa_91_0_header]
-    - [auto, c, kpa_91_1_music]
-    - [auto, c, kpa_91_2_main]
-    - [auto, c, kpa_91_3_npc]
-    - [auto, c, kpa_91_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_94
     dir: world/area_kpa/kpa_94
     type: code
     start: 0xA8C7C0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_94_0_header]
-    - [auto, c, kpa_94_1_music]
-    - [auto, c, kpa_94_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_95
     dir: world/area_kpa/kpa_95
     type: code
     start: 0xA8CA80
     vram_class: map
     subsegments:
-    - [auto, c, kpa_95_0_header]
-    - [auto, c, kpa_95_1_music]
-    - [auto, c, kpa_95_2_entity]
-    - [auto, c, kpa_95_3_main]
-    - [auto, c, kpa_95_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_96
     dir: world/area_kpa/kpa_96
     type: code
     start: 0xA927C0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_96_0_header]
-    - [auto, c, kpa_96_1_music]
-    - [auto, c, kpa_96_2_main]
-    - [auto, c, kpa_96_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_100
     dir: world/area_kpa/kpa_100
     type: code
     start: 0xA93160
     vram_class: map
     subsegments:
-    - [auto, c, kpa_100_0_header]
-    - [auto, c, kpa_100_1_music]
-    - [auto, c, kpa_100_2_main]
-    - [auto, c, kpa_100_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kpa_101
     dir: world/area_kpa/kpa_101
     type: code
     start: 0xA93440
     vram_class: map
     subsegments:
-    - [auto, c, kpa_101_0_header]
-    - [auto, c, kpa_101_1_music]
-    - [auto, c, kpa_101_2_main]
-    - [auto, c, kpa_101_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kpa_102
     dir: world/area_kpa/kpa_102
     type: code
     start: 0xA93740
     vram_class: map
     subsegments:
-    - [auto, c, kpa_102_0_header]
-    - [auto, c, kpa_102_1_music]
-    - [auto, c, kpa_102_2_main]
-    - [auto, c, kpa_102_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_111
     dir: world/area_kpa/kpa_111
     type: code
     start: 0xA99590
     vram_class: map
     subsegments:
-    - [auto, c, kpa_111_0_header]
-    - [auto, c, kpa_111_1_music]
-    - [auto, c, kpa_111_2_main]
-    - [auto, c, kpa_111_3_statues]
-    - [auto, c, kpa_111_4_npc]
-    - [auto, c, kpa_111_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, statues]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kpa_112
     dir: world/area_kpa/kpa_112
     type: code
     start: 0xA9C990
     vram_class: map
     subsegments:
-    - [auto, c, kpa_112_0_header]
-    - [auto, c, kpa_112_1_music]
-    - [auto, c, kpa_112_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_113
     dir: world/area_kpa/kpa_113
     type: code
     start: 0xA9CC30
     vram_class: map
     subsegments:
-    - [auto, c, kpa_113_0_header]
-    - [auto, c, kpa_113_1_music]
-    - [auto, c, kpa_113_2_main]
-    - [auto, c, kpa_113_3_entity]
-    - [auto, c, kpa_113_4_statues]
-    - [auto, c, kpa_113_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, statues]
+    - [auto, c, npc]
   - name: kpa_114
     dir: world/area_kpa/kpa_114
     type: code
     start: 0xA9E980
     vram_class: map
     subsegments:
-    - [auto, c, kpa_114_0_header]
-    - [auto, c, kpa_114_1_music]
-    - [auto, c, kpa_114_2_main]
-    - [auto, c, kpa_114_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kpa_115
     dir: world/area_kpa/kpa_115
     type: code
     start: 0xA9ED40
     vram_class: map
     subsegments:
-    - [auto, c, kpa_115_0_header]
-    - [auto, c, kpa_115_1_music]
-    - [auto, c, kpa_115_2_main]
-    - [auto, c, kpa_115_3_statues]
-    - [auto, c, kpa_115_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, statues]
+    - [auto, c, npc]
   - name: kpa_116
     dir: world/area_kpa/kpa_116
     type: code
     start: 0xAA1EE0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_116_0_header]
-    - [auto, c, kpa_116_1_music]
-    - [auto, c, kpa_116_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_117
     dir: world/area_kpa/kpa_117
     type: code
     start: 0xAA2180
     vram_class: map
     subsegments:
-    - [auto, c, kpa_117_0_header]
-    - [auto, c, kpa_117_1_music]
-    - [auto, c, kpa_117_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_118
     dir: world/area_kpa/kpa_118
     type: code
     start: 0xAA23C0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_118_0_header]
-    - [auto, c, kpa_118_1_music]
-    - [auto, c, kpa_118_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_119
     dir: world/area_kpa/kpa_119
     type: code
     start: 0xAA2660
     vram_class: map
     subsegments:
-    - [auto, c, kpa_119_0_header]
-    - [auto, c, kpa_119_1_music]
-    - [auto, c, kpa_119_2_entity]
-    - [auto, c, kpa_119_3_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
   - name: kpa_121
     dir: world/area_kpa/kpa_121
     type: code
     start: 0xAA28F0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_121_0_header]
-    - [auto, c, kpa_121_1_music]
-    - [auto, c, kpa_121_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kpa_130
     dir: world/area_kpa/kpa_130
     type: code
     start: 0xAA2D20
     vram_class: map
     subsegments:
-    - [auto, c, kpa_130_0_header]
-    - [auto, c, kpa_130_1_music]
-    - [auto, c, kpa_130_2_main]
-    - [auto, c, kpa_130_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kpa_133
     dir: world/area_kpa/kpa_133
     type: code
     start: 0xAA7480
     vram_class: map
     subsegments:
-    - [auto, c, kpa_133_0_header]
-    - [auto, c, kpa_133_1_music]
-    - [auto, c, kpa_133_2_main]
-    - [auto, c, kpa_133_3_entity]
-    - [auto, c, kpa_133_4_npc]
-    - [auto, c, kpa_133_5_water]
-    - [auto, c, kpa_133_6]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, water]
+    - [auto, c, ease]
   - name: kpa_134
     dir: world/area_kpa/kpa_134
     type: code
     start: 0xAA8FA0
     vram_class: map
     subsegments:
-    - [auto, c, kpa_134_0_header]
-    - [auto, c, kpa_134_1_music]
-    - [auto, c, kpa_134_2_main]
-    - [auto, c, kpa_134_3_chains]
-    - [auto, c, kpa_134_4_npc]
-    - [auto, c, kpa_134_5_panels]
-    - [auto, c, kpa_134_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, chains]
+    - [auto, c, npc]
+    - [auto, c, panels]
+    - [auto, c, entity]
   - name: osr_00
     dir: world/area_osr/osr_00
     type: code
     start: 0xAAC830
     vram_class: map
     subsegments:
-    - [auto, c, osr_00_0_header]
-    - [auto, c, osr_00_1_music]
-    - [auto, c, osr_00_2_main]
-    - [auto, c, osr_00_3_npc_intro]
-    - [auto, c, osr_00_4_npc_epilogue]
-    - [auto, c, osr_00_5_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc_intro]
+    - [auto, c, npc_epilogue]
+    - [auto, c, scenes]
   - name: osr_01
     dir: world/area_osr/osr_01
     type: code
     start: 0xAAFFF0
     vram_class: map
     subsegments:
-    - [auto, c, osr_01_0_header]
-    - [auto, c, osr_01_1_music]
-    - [auto, c, osr_01_2_main]
-    - [auto, c, osr_01_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: osr_02
     dir: world/area_osr/osr_02
     type: code
     start: 0xAB2170
     vram_class: map
     subsegments:
-    - [auto, c, osr_02_0_header]
-    - [auto, c, osr_02_1_main]
-    - [auto, c, osr_02_2_entity]
-    - [auto, c, osr_02_3_npc]
-    - [auto, c, osr_02_4_npc_peach]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, npc_peach]
   - name: osr_03
     dir: world/area_osr/osr_03
     type: code
     start: 0xAB6290
     vram_class: map
     subsegments:
-    - [auto, c, osr_03_0_header]
-    - [auto, c, osr_03_1_main]
-    - [auto, c, osr_03_2_npc]
-    - [auto, c, osr_03_3_intro]
-    - [auto, c, osr_03_4_starship]
-    - [auto, c, osr_03_5_interlude]
-    - [auto, c, osr_03_6_ending]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, intro]
+    - [auto, c, starship]
+    - [auto, c, interlude]
+    - [auto, c, ending]
   - name: osr_04
     dir: world/area_osr/osr_04
     type: code
     start: 0xAB92B0
     vram_class: map
     subsegments:
-    - [auto, c, osr_04_0_header]
-    - [auto, c, osr_04_1_main]
-    - [auto, c, osr_04_2_assault]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, assault]
   - name: kkj_00
     dir: world/area_kkj/kkj_00
     type: code
     start: 0xABB290
     vram_class: map
     subsegments:
-    - [auto, c, kkj_00_0_header]
-    - [auto, c, kkj_00_1_music]
-    - [auto, c, kkj_00_2_main]
-    - [auto, c, kkj_00_3_npc_intro]
-    - [auto, c, kkj_00_4_scene_intro]
-    - [auto, c, kkj_00_5_npc_ending]
-    - [auto, c, kkj_00_6_scene_ending]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc_intro]
+    - [auto, c, scene_intro]
+    - [auto, c, npc_ending]
+    - [auto, c, scene_ending]
   - name: kkj_01
     dir: world/area_kkj/kkj_01
     type: code
     start: 0xAC5170
     vram_class: map
     subsegments:
-    - [auto, c, kkj_01_0_header]
-    - [auto, c, kkj_01_1_music]
-    - [auto, c, kkj_01_2_main]
-    - [auto, c, kkj_01_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kkj_02
     dir: world/area_kkj/kkj_02
     type: code
     start: 0xAC8D20
     vram_class: map
     subsegments:
-    - [auto, c, kkj_02_0_header]
-    - [auto, c, kkj_02_1_music]
-    - [auto, c, kkj_02_2_main]
-    - [auto, c, kkj_02_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kkj_03
     dir: world/area_kkj/kkj_03
     type: code
     start: 0xAC9710
     vram_class: map
     subsegments:
-    - [auto, c, kkj_03_0_header]
-    - [auto, c, kkj_03_1_music]
-    - [auto, c, kkj_03_2_main]
-    - [auto, c, kkj_03_3_npc]
-    - [auto, c, kkj_03_4_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, scenes]
   - name: kkj_10
     dir: world/area_kkj/kkj_10
     type: code
     start: 0xACAB20
     vram_class: map
     subsegments:
-    - [auto, c, kkj_10_0_header]
-    - [auto, c, kkj_10_1_main]
-    - [auto, c, kkj_10_2_entity]
-    - [auto, c, kkj_10_3_npcs_early]
-    - [auto, c, kkj_10_4_npcs_later]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npcs_early]
+    - [auto, c, npcs_later]
   - name: kkj_11
     dir: world/area_kkj/kkj_11
     type: code
     start: 0xACE140
     vram_class: map
     subsegments:
-    - [auto, c, kkj_11_0_header]
-    - [auto, c, kkj_11_1_main]
-    - [auto, c, kkj_11_2_entity]
-    - [auto, c, kkj_11_3_scene]
-    - [auto, c, kkj_11_4_demo]
-    - [auto, c, kkj_11_5_npcs_early]
-    - [auto, c, kkj_11_6_npcs_later]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, scene]
+    - [auto, c, demo]
+    - [auto, c, npcs_early]
+    - [auto, c, npcs_later]
   - name: kkj_12
     dir: world/area_kkj/kkj_12
     type: code
     start: 0xAD4090
     vram_class: map
     subsegments:
-    - [auto, c, kkj_12_0_header]
-    - [auto, c, kkj_12_1_main]
-    - [auto, c, kkj_12_2_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kkj_13
     dir: world/area_kkj/kkj_13
     type: code
     start: 0xAD5ED0
     vram_class: map
     subsegments:
-    - [auto, c, kkj_13_0_header]
-    - [auto, c, kkj_13_1_music]
-    - [auto, c, kkj_13_2_main]
-    - [auto, c, kkj_13_3_npcs_finale]
-    - [auto, c, kkj_13_4_npcs_intro]
-    - [auto, c, kkj_13_5_intro_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npcs_finale]
+    - [auto, c, npcs_intro]
+    - [auto, c, intro_scenes]
   - name: kkj_14
     dir: world/area_kkj/kkj_14
     type: code
     start: 0xADAEA0
     vram_class: map
     subsegments:
-    - [auto, c, kkj_14_0_header]
-    - [auto, c, kkj_14_1_music]
-    - [auto, c, kkj_14_2_main]
-    - [auto, c, kkj_14_3_interactables]
-    - [auto, c, kkj_14_4_npc_guards]
-    - [auto, c, kkj_14_5_npc_ch0]
-    - [auto, c, kkj_14_6_npc_ch2]
-    - [auto, c, kkj_14_7_npc_ch7]
-    - [auto, c, kkj_14_8_chapter0]
-    - [auto, c, kkj_14_9_chapter1]
-    - [auto, c, kkj_14_10_chapter2]
-    - [auto, c, kkj_14_11_chapter3]
-    - [auto, c, kkj_14_12_chapter4]
-    - [auto, c, kkj_14_13_chapter5]
-    - [auto, c, kkj_14_14_chapter6]
-    - [auto, c, kkj_14_15_chapter7]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, interactables]
+    - [auto, c, npc_guards]
+    - [auto, c, npc_ch0]
+    - [auto, c, npc_ch2]
+    - [auto, c, npc_ch7]
+    - [auto, c, chapter0]
+    - [auto, c, chapter1]
+    - [auto, c, chapter2]
+    - [auto, c, chapter3]
+    - [auto, c, chapter4]
+    - [auto, c, chapter5]
+    - [auto, c, chapter6]
+    - [auto, c, chapter7]
   - name: kkj_15
     dir: world/area_kkj/kkj_15
     type: code
     start: 0xAE5590
     vram_class: map
     subsegments:
-    - [auto, c, kkj_15_0_header]
-    - [auto, c, kkj_15_1_music]
-    - [auto, c, kkj_15_2_main]
-    - [auto, c, kkj_15_3_rotating_wall]
-    - [auto, c, kkj_15_4_chapter0]
-    - [auto, c, kkj_15_5_chapter1]
-    - [auto, c, kkj_15_6_chapter2]
-    - [auto, c, kkj_15_7_chapter3]
-    - [auto, c, kkj_15_8_npc_chapter0]
-    - [auto, c, kkj_15_9_npc_chapter1]
-    - [auto, c, kkj_15_10_npc_chapter3]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rotating_wall]
+    - [auto, c, chapter0]
+    - [auto, c, chapter1]
+    - [auto, c, chapter2]
+    - [auto, c, chapter3]
+    - [auto, c, npc_chapter0]
+    - [auto, c, npc_chapter1]
+    - [auto, c, npc_chapter3]
   - name: kkj_16
     dir: world/area_kkj/kkj_16
     type: code
     start: 0xAED410
     vram_class: map
     subsegments:
-    - [auto, c, kkj_16_0_header]
-    - [auto, c, kkj_16_1_main]
-    - [auto, c, kkj_16_2_npcs_early]
-    - [auto, c, kkj_16_3_npcs_later]
-    - [auto, c, kkj_16_4_stealth]
-    - [auto, c, kkj_16_5_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npcs_early]
+    - [auto, c, npcs_later]
+    - [auto, c, stealth]
+    - [auto, c, entity]
   - name: kkj_17
     dir: world/area_kkj/kkj_17
     type: code
     start: 0xAF1C60
     vram_class: map
     subsegments:
-    - [auto, c, kkj_17_0_header]
-    - [auto, c, kkj_17_1_main]
-    - [auto, c, kkj_17_2_entity]
-    - [auto, c, kkj_17_3_chest]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, chest]
   - name: kkj_18
     dir: world/area_kkj/kkj_18
     type: code
     start: 0xAF2CA0
     vram_class: map
     subsegments:
-    - [auto, c, kkj_18_0_header]
-    - [auto, c, kkj_18_1_music]
-    - [auto, c, kkj_18_2_main]
-    - [auto, c, kkj_18_3_npc]
-    - [auto, c, kkj_18_4_gourmet]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, gourmet]
   - name: kkj_19
     dir: world/area_kkj/kkj_19
     type: code
     start: 0xAF7950
     vram_class: map
     subsegments:
-    - [auto, c, kkj_19_0_header]
-    - [auto, c, kkj_19_1_music]
-    - [auto, c, kkj_19_2_main]
-    - [auto, c, kkj_19_3_npcs_intro]
-    - [auto, c, kkj_19_4_npcs_peach]
-    - [auto, c, kkj_19_5_baking]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npcs_intro]
+    - [auto, c, npcs_peach]
+    - [auto, c, baking]
   - name: kkj_20
     dir: world/area_kkj/kkj_20
     type: code
     start: 0xAFDB40
     vram_class: map
     subsegments:
-    - [auto, c, kkj_20_0_header]
-    - [auto, c, kkj_20_1_music]
-    - [auto, c, kkj_20_2_main]
-    - [auto, c, kkj_20_3_entity]
-    - [auto, c, kkj_20_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kkj_21
     dir: world/area_kkj/kkj_21
     type: code
     start: 0xB022A0
     vram_class: map
     subsegments:
-    - [auto, c, kkj_21_0_header]
-    - [auto, c, kkj_21_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kkj_22
     dir: world/area_kkj/kkj_22
     type: code
     start: 0xB024F0
     vram_class: map
     subsegments:
-    - [auto, c, kkj_22_0_header]
-    - [auto, c, kkj_22_1_music]
-    - [auto, c, kkj_22_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: kkj_23
     dir: world/area_kkj/kkj_23
     type: code
     start: 0xB02880
     vram_class: map
     subsegments:
-    - [auto, c, kkj_23_0_header]
-    - [auto, c, kkj_23_1_music]
-    - [auto, c, kkj_23_2_main]
-    - [auto, c, kkj_23_3_npcs_finale]
-    - [auto, c, kkj_23_4_npcs_peach]
-    - [auto, c, kkj_23_5_scene]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npcs_finale]
+    - [auto, c, npcs_peach]
+    - [auto, c, scene]
   - name: kkj_24
     dir: world/area_kkj/kkj_24
     type: code
     start: 0xB06570
     vram_class: map
     subsegments:
-    - [auto, c, kkj_24_0_header]
-    - [auto, c, kkj_24_1_music]
-    - [auto, c, kkj_24_2_main]
-    - [auto, c, kkj_24_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: kkj_25
     dir: world/area_kkj/kkj_25
     type: code
     start: 0xB06A00
     vram_class: map
     subsegments:
-    - [auto, c, kkj_25_0_header]
-    - [auto, c, kkj_25_1_main]
-    - [auto, c, kkj_25_2_npc_initial]
-    - [auto, c, kkj_25_3_npc_midpoint]
-    - [auto, c, kkj_25_4_npc_final]
-    - [auto, c, kkj_25_5_arena]
-    - [auto, c, kkj_25_6_peach_free]
-    - [auto, c, kkj_25_7_kammy_defeated]
-    - [auto, c, kkj_25_8_bowser_defeated]
-    - [auto, c, kkj_25_9_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc_initial]
+    - [auto, c, npc_midpoint]
+    - [auto, c, npc_final]
+    - [auto, c, arena]
+    - [auto, c, peach_free]
+    - [auto, c, kammy_defeated]
+    - [auto, c, bowser_defeated]
+    - [auto, c, entity]
   - name: kkj_26
     dir: world/area_kkj/kkj_26
     type: code
     start: 0xB13120
     vram_class: map
     subsegments:
-    - [auto, c, kkj_26_0_header]
-    - [auto, c, kkj_26_1_main]
-    - [auto, c, kkj_26_2_scenes]
-    - [auto, c, kkj_26_3_demo]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, scenes]
+    - [auto, c, demo]
   - name: kkj_27
     dir: world/area_kkj/kkj_27
     type: code
     start: 0xB13D70
     vram_class: map
     subsegments:
-    - [auto, c, kkj_27_0_header]
-    - [auto, c, kkj_27_1_music]
-    - [auto, c, kkj_27_2_main]
-    - [auto, c, kkj_27_3_rotating_wall]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rotating_wall]
   - name: kkj_28
     dir: world/area_kkj/kkj_28
     type: code
     start: 0xB14EA0
     vram_class: map
     subsegments:
-    - [auto, c, kkj_28_0_header]
-    - [auto, c, kkj_28_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kkj_29
     dir: world/area_kkj/kkj_29
     type: code
     start: 0xB150B0
     vram_class: map
     subsegments:
-    - [auto, c, kkj_29_0_header]
-    - [auto, c, kkj_29_1_main]
-    - [auto, c, kkj_29_2_npc]
-    - [auto, c, kkj_29_3_quiz]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, quiz]
   - name: tst_01
     dir: world/area_tst/tst_01
     type: code
     start: 0xB1A900
     vram_class: map
     subsegments:
-    - [auto, c, tst_01_1_main]
-    - [auto, c, tst_01_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tst_02
     dir: world/area_tst/tst_02
     type: code
     start: 0xB1AC30
     vram_class: map
     subsegments:
-    - [auto, c, tst_02_1_main]
-    - [auto, c, tst_02_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tst_03
     dir: world/area_tst/tst_03
     type: code
     start: 0xB1AF80
     vram_class: map
     subsegments:
-    - [auto, c, tst_03_1_main]
-    - [auto, c, tst_03_2_entity]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: tst_04
     dir: world/area_tst/tst_04
     type: code
     start: 0xB1B570
     vram_class: map
     subsegments:
-    - [auto, c, tst_04_1_main]
-    - [auto, c, tst_04_2_entity]
-    - [auto, c, tst_04_3_reflection]
-    - [auto, c, tst_04_4_npc]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, reflection]
+    - [auto, c, npc]
   - name: tst_10
     dir: world/area_tst/tst_10
     type: code
     start: 0xB1C540
     vram_class: map
     subsegments:
-    - [auto, c, tst_10_1_main]
+    - [auto, c, main]
   - name: tst_11
     dir: world/area_tst/tst_11
     type: code
     start: 0xB1CA50
     vram_class: map
     subsegments:
-    - [auto, c, tst_11_1_main]
-    - [auto, c, tst_11_2_extra]
+    - [auto, c, main]
+    - [auto, c, extra]
   - name: tst_12
     dir: world/area_tst/tst_12
     type: code
     start: 0xB1D2F0
     vram_class: map
     subsegments:
-    - [auto, c, tst_12_1_main]
+    - [auto, c, main]
   - name: tst_13
     dir: world/area_tst/tst_13
     type: code
     start: 0xB1D760
     vram_class: map
     subsegments:
-    - [auto, c, tst_13_1_main]
+    - [auto, c, main]
     - start: 0xB1DB20
       type: .data
-      name: tst_13_1_main
+      name: main
       subsegments:
       - [0xB1DB20]
       - [0xB1FA10, vtx, shockwave]
@@ -10604,748 +10604,748 @@ segments:
     start: 0xB20470
     vram_class: map
     subsegments:
-    - [auto, c, tst_20_1_main]
+    - [auto, c, main]
   - name: jan_00
     dir: world/area_jan/jan_00
     type: code
     start: 0xB20540
     vram_class: map
     subsegments:
-    - [auto, c, jan_00_0_header]
-    - [auto, c, jan_00_1_main]
-    - [auto, c, jan_00_2_npc]
-    - [auto, c, jan_00_3_entity]
-    - [auto, c, jan_00_4_whale]
-    - [auto, c, jan_00_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, whale]
+    - [auto, c, foliage]
   - name: jan_01
     dir: world/area_jan/jan_01
     type: code
     start: 0xB28030
     vram_class: map
     subsegments:
-    - [auto, c, jan_01_0_header]
-    - [auto, c, jan_01_1_music]
-    - [auto, c, jan_01_2_main]
-    - [auto, c, jan_01_3_npc]
-    - [auto, c, jan_01_4_entity]
-    - [auto, c, jan_01_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: jan_02
     dir: world/area_jan/jan_02
     type: code
     start: 0xB2C470
     vram_class: map
     subsegments:
-    - [auto, c, jan_02_0_header]
-    - [auto, c, jan_02_1_music]
-    - [auto, c, jan_02_2_main]
-    - [auto, c, jan_02_3_npc]
-    - [auto, c, jan_02_4_entity]
-    - [auto, c, jan_02_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
   - name: jan_03
     dir: world/area_jan/jan_03
     type: code
     start: 0xB34BD0
     vram_class: map
     subsegments:
-    - [auto, c, jan_03_0_header]
-    - [auto, c, jan_03_1_music]
-    - [auto, c, jan_03_2_main]
-    - [auto, c, jan_03_3_shop]
-    - [auto, c, jan_03_4_npc]
-    - [auto, c, jan_03_5_entity]
-    - [auto, c, jan_03_6_rooms]
-    - [auto, c, jan_03_7_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, shop]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, rooms]
+    - [auto, c, foliage]
   - name: jan_04
     dir: world/area_jan/jan_04
     type: code
     start: 0xB44770
     vram_class: map
     subsegments:
-    - [auto, c, jan_04_0_header]
-    - [auto, c, jan_04_1_music]
-    - [auto, c, jan_04_2_main]
-    - [auto, c, jan_04_3_entity]
-    - [auto, c, jan_04_4_npc]
-    - [auto, c, jan_04_5_unused]
-    - [auto, c, jan_04_6_trees]
-    - [auto, c, jan_04_7_scenes]
-    - [auto, c, jan_04_8_treasure]
-    - [auto, c, jan_04_9_bushes]
-    - [auto, c, jan_04_10_demo]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, unused]
+    - [auto, c, trees]
+    - [auto, c, scenes]
+    - [auto, c, treasure]
+    - [auto, c, bushes]
+    - [auto, c, demo]
   - name: jan_05
     dir: world/area_jan/jan_05
     type: code
     start: 0xB4AA70
     vram_class: map
     subsegments:
-    - [auto, c, jan_05_0_header]
-    - [auto, c, jan_05_1_music]
-    - [auto, c, jan_05_2_main]
-    - [auto, c, jan_05_3_log]
-    - [auto, c, jan_05_4_bushes]
-    - [auto, c, jan_05_5_npc]
-    - [auto, c, jan_05_6_trees]
-    - [auto, c, jan_05_7_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, log]
+    - [auto, c, bushes]
+    - [auto, c, npc]
+    - [auto, c, trees]
+    - [auto, c, entity]
   - name: jan_06
     dir: world/area_jan/jan_06
     type: code
     start: 0xB52830
     vram_class: map
     subsegments:
-    - [auto, c, jan_06_0_header]
-    - [auto, c, jan_06_1_main]
-    - [auto, c, jan_06_2_statue]
-    - [auto, c, jan_06_3_log]
-    - [auto, c, jan_06_4_trees]
-    - [auto, c, jan_06_5_entity]
-    - [auto, c, jan_06_6_npc]
-    - [auto, c, jan_06_7_bushes]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, statue]
+    - [auto, c, log]
+    - [auto, c, trees]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, bushes]
   - name: jan_07
     dir: world/area_jan/jan_07
     type: code
     start: 0xB59870
     vram_class: map
     subsegments:
-    - [auto, c, jan_07_0_header]
-    - [auto, c, jan_07_1_music]
-    - [auto, c, jan_07_2_main]
-    - [auto, c, jan_07_3_npc]
-    - [auto, c, jan_07_4_trees]
-    - [auto, c, jan_07_5_bushes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, trees]
+    - [auto, c, bushes]
   - name: jan_08
     dir: world/area_jan/jan_08
     type: code
     start: 0xB5E2B0
     vram_class: map
     subsegments:
-    - [auto, c, jan_08_0_header]
-    - [auto, c, jan_08_1_music]
-    - [auto, c, jan_08_2_main]
-    - [auto, c, jan_08_3_bushes]
-    - [auto, c, jan_08_4_entity]
-    - [auto, c, jan_08_5_npc]
-    - [auto, c, jan_08_6_trees]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bushes]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, trees]
   - name: jan_09
     dir: world/area_jan/jan_09
     type: code
     start: 0xB65AB0
     vram_class: map
     subsegments:
-    - [auto, c, jan_09_0_header]
-    - [auto, c, jan_09_1_main]
-    - [auto, c, jan_09_2_bushes]
-    - [auto, c, jan_09_3_npc]
-    - [auto, c, jan_09_4_trees]
-    - [auto, c, jan_09_5_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, bushes]
+    - [auto, c, npc]
+    - [auto, c, trees]
+    - [auto, c, entity]
   - name: jan_10
     dir: world/area_jan/jan_10
     type: code
     start: 0xB6C390
     vram_class: map
     subsegments:
-    - [auto, c, jan_10_0_header]
-    - [auto, c, jan_10_1_music]
-    - [auto, c, jan_10_2_main]
-    - [auto, c, jan_10_3_npc]
-    - [auto, c, jan_10_4_log]
-    - [auto, c, jan_10_5_trees]
-    - [auto, c, jan_10_6_bushes]
-    - [auto, c, jan_10_7_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, log]
+    - [auto, c, trees]
+    - [auto, c, bushes]
+    - [auto, c, entity]
   - name: jan_11
     dir: world/area_jan/jan_11
     type: code
     start: 0xB70860
     vram_class: map
     subsegments:
-    - [auto, c, jan_11_0_header]
-    - [auto, c, jan_11_1_music]
-    - [auto, c, jan_11_2_main]
-    - [auto, c, jan_11_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: jan_12
     dir: world/area_jan/jan_12
     type: code
     start: 0xB730B0
     vram_class: map
     subsegments:
-    - [auto, c, jan_12_0_header]
-    - [auto, c, jan_12_1_main]
-    - [auto, c, jan_12_2_vines]
-    - [auto, c, jan_12_3_trees]
-    - [auto, c, jan_12_4_entity]
-    - [auto, c, jan_12_5_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, trees]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: jan_13
     dir: world/area_jan/jan_13
     type: code
     start: 0xB767B0
     vram_class: map
     subsegments:
-    - [auto, c, jan_13_0_header]
-    - [auto, c, jan_13_1_main]
-    - [auto, c, jan_13_2_puzzle]
-    - [auto, c, jan_13_3_trees]
-    - [auto, c, jan_13_4_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, puzzle]
+    - [auto, c, trees]
+    - [auto, c, entity]
   - name: jan_14
     dir: world/area_jan/jan_14
     type: code
     start: 0xB7A050
     vram_class: map
     subsegments:
-    - [auto, c, jan_14_0_header]
-    - [auto, c, jan_14_1_main]
-    - [auto, c, jan_14_2_vines]
-    - [auto, c, jan_14_3_trees]
-    - [auto, c, jan_14_4_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, trees]
+    - [auto, c, npc]
   - name: jan_15
     dir: world/area_jan/jan_15
     type: code
     start: 0xB7D920
     vram_class: map
     subsegments:
-    - [auto, c, jan_15_0_header]
-    - [auto, c, jan_15_1_main]
-    - [auto, c, jan_15_2_npc]
-    - [auto, c, jan_15_3_trees]
-    - [auto, c, jan_15_4_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, trees]
+    - [auto, c, entity]
   - name: jan_16
     dir: world/area_jan/jan_16
     type: code
     start: 0xB80000
     vram_class: map
     subsegments:
-    - [auto, c, jan_16_0_header]
-    - [auto, c, jan_16_1_music]
-    - [auto, c, jan_16_2_main]
-    - [auto, c, jan_16_3_npc]
-    - [auto, c, jan_16_4_entity]
-    - [auto, c, jan_16_5_bushes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, bushes]
   - name: jan_17
     dir: world/area_jan/jan_17
     type: code
     start: 0xB837C0
     vram_class: map
     subsegments:
-    - [auto, c, jan_17_0_header]
-    - [auto, c, jan_17_1_music]
-    - [auto, c, jan_17_2_main]
-    - [auto, c, jan_17_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: jan_18
     dir: world/area_jan/jan_18
     type: code
     start: 0xB83B90
     vram_class: map
     subsegments:
-    - [auto, c, jan_18_0_header]
-    - [auto, c, jan_18_1_music]
-    - [auto, c, jan_18_2_main]
-    - [auto, c, jan_18_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: jan_19
     dir: world/area_jan/jan_19
     type: code
     start: 0xB83E60
     vram_class: map
     subsegments:
-    - [auto, c, jan_19_0_header]
-    - [auto, c, jan_19_1_music]
-    - [auto, c, jan_19_2_main]
-    - [auto, c, jan_19_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: jan_22
     dir: world/area_jan/jan_22
     type: code
     start: 0xB84180
     vram_class: map
     subsegments:
-    - [auto, c, jan_22_0_header]
-    - [auto, c, jan_22_1_music]
-    - [auto, c, jan_22_2_main]
-    - [auto, c, jan_22_3_npc]
-    - [auto, c, jan_22_4_entity]
-    - [auto, c, jan_22_5_zipline]
-    - [auto, c, jan_22_6_bushes]
-    - [auto, c, jan_22_7_trees]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, zipline]
+    - [auto, c, bushes]
+    - [auto, c, trees]
   - name: jan_23
     dir: world/area_jan/jan_23
     type: code
     start: 0xB8FCD0
     vram_class: map
     subsegments:
-    - [auto, c, jan_23_0_header]
-    - [auto, c, jan_23_1_music]
-    - [auto, c, jan_23_2_main]
-    - [auto, c, jan_23_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: mim_01
     dir: world/area_mim/mim_01
     type: code
     start: 0xB93440
     vram_class: map
     subsegments:
-    - [auto, c, mim_01_0_header]
-    - [auto, c, mim_01_1_music]
-    - [auto, c, mim_01_2_main]
-    - [auto, c, mim_01_3_entity]
-    - [auto, c, mim_01_4_hint]
-    - [auto, c, mim_01_5_gate]
-    - [auto, c, mim_01_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_02
     dir: world/area_mim/mim_02
     type: code
     start: 0xB97C00
     vram_class: map
     subsegments:
-    - [auto, c, mim_02_0_header]
-    - [auto, c, mim_02_1_music]
-    - [auto, c, mim_02_2_main]
-    - [auto, c, mim_02_3_npc]
-    - [auto, c, mim_02_4_gate]
-    - [auto, c, mim_02_5_hint]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, gate]
+    - [auto, c, hint]
   - name: mim_03
     dir: world/area_mim/mim_03
     type: code
     start: 0xB9B480
     vram_class: map
     subsegments:
-    - [auto, c, mim_03_0_header]
-    - [auto, c, mim_03_1_music]
-    - [auto, c, mim_03_2_main]
-    - [auto, c, mim_03_3_entity]
-    - [auto, c, mim_03_4_hint]
-    - [auto, c, mim_03_5_gate]
-    - [auto, c, mim_03_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_04
     dir: world/area_mim/mim_04
     type: code
     start: 0xB9D960
     vram_class: map
     subsegments:
-    - [auto, c, mim_04_0_header]
-    - [auto, c, mim_04_1_music]
-    - [auto, c, mim_04_2_main]
-    - [auto, c, mim_04_3_entity]
-    - [auto, c, mim_04_4_hint]
-    - [auto, c, mim_04_5_gate]
-    - [auto, c, mim_04_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_05
     dir: world/area_mim/mim_05
     type: code
     start: 0xBA0730
     vram_class: map
     subsegments:
-    - [auto, c, mim_05_0_header]
-    - [auto, c, mim_05_1_music]
-    - [auto, c, mim_05_2_main]
-    - [auto, c, mim_05_3_entity]
-    - [auto, c, mim_05_4_hint]
-    - [auto, c, mim_05_5_gate]
-    - [auto, c, mim_05_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_06
     dir: world/area_mim/mim_06
     type: code
     start: 0xBA4780
     vram_class: map
     subsegments:
-    - [auto, c, mim_06_0_header]
-    - [auto, c, mim_06_1_music]
-    - [auto, c, mim_06_2_main]
-    - [auto, c, mim_06_3_entity]
-    - [auto, c, mim_06_4_hint]
-    - [auto, c, mim_06_5_gate]
-    - [auto, c, mim_06_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_07
     dir: world/area_mim/mim_07
     type: code
     start: 0xBAA140
     vram_class: map
     subsegments:
-    - [auto, c, mim_07_0_header]
-    - [auto, c, mim_07_1_music]
-    - [auto, c, mim_07_2_main]
-    - [auto, c, mim_07_3_entity]
-    - [auto, c, mim_07_4_hint]
-    - [auto, c, mim_07_5_gate]
-    - [auto, c, mim_07_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_08
     dir: world/area_mim/mim_08
     type: code
     start: 0xBAD940
     vram_class: map
     subsegments:
-    - [auto, c, mim_08_0_header]
-    - [auto, c, mim_08_1_music]
-    - [auto, c, mim_08_2_main]
-    - [auto, c, mim_08_3_entity]
-    - [auto, c, mim_08_4_gate]
-    - [auto, c, mim_08_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_09
     dir: world/area_mim/mim_09
     type: code
     start: 0xBB2E00
     vram_class: map
     subsegments:
-    - [auto, c, mim_09_0_header]
-    - [auto, c, mim_09_1_music]
-    - [auto, c, mim_09_2_main]
-    - [auto, c, mim_09_3_entity]
-    - [auto, c, mim_09_4_hint]
-    - [auto, c, mim_09_5_gate]
-    - [auto, c, mim_09_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, hint]
+    - [auto, c, gate]
+    - [auto, c, npc]
   - name: mim_10
     dir: world/area_mim/mim_10
     type: code
     start: 0xBB59E0
     vram_class: map
     subsegments:
-    - [auto, c, mim_10_0_header]
-    - [auto, c, mim_10_1_music]
-    - [auto, c, mim_10_2_entity]
-    - [auto, c, mim_10_3_main]
-    - [auto, c, mim_10_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: mim_11
     dir: world/area_mim/mim_11
     type: code
     start: 0xBB7070
     vram_class: map
     subsegments:
-    - [auto, c, mim_11_0_header]
-    - [auto, c, mim_11_1_music]
-    - [auto, c, mim_11_2_main]
-    - [auto, c, mim_11_3_gate]
-    - [auto, c, mim_11_4_entity]
-    - [auto, c, mim_11_5_npc]
-    - [auto, c, mim_11_6_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gate]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: mim_12
     dir: world/area_mim/mim_12
     type: code
     start: 0xBBB380
     vram_class: map
     subsegments:
-    - [auto, c, mim_12_0_header]
-    - [auto, c, mim_12_1_music]
-    - [auto, c, mim_12_2_entity]
-    - [auto, c, mim_12_3_main]
-    - [auto, c, mim_12_4_npc]
-    - [auto, c, mim_12_5_gate]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, gate]
   - name: obk_01
     dir: world/area_obk/obk_01
     type: code
     start: 0xBBD1A0
     vram_class: map
     subsegments:
-    - [auto, c, obk_01_0_header]
-    - [auto, c, obk_01_1_music]
-    - [auto, c, obk_01_2_main]
-    - [auto, c, obk_01_3_chandelier]
-    - [auto, c, obk_01_4_portrait]
-    - [auto, c, obk_01_5_jump_scare]
-    - [auto, c, obk_01_6_npc]
-    - [auto, c, obk_01_7_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, chandelier]
+    - [auto, c, portrait]
+    - [auto, c, jump_scare]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: obk_02
     dir: world/area_obk/obk_02
     type: code
     start: 0xBC2A90
     vram_class: map
     subsegments:
-    - [auto, c, obk_02_0_header]
-    - [auto, c, obk_02_1_music]
-    - [auto, c, obk_02_2_main]
-    - [auto, c, obk_02_3_npc]
-    - [auto, c, obk_02_4_bombable]
-    - [auto, c, obk_02_5_clock]
-    - [auto, c, obk_02_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, bombable]
+    - [auto, c, clock]
+    - [auto, c, entity]
   - name: obk_03
     dir: world/area_obk/obk_03
     type: code
     start: 0xBC4280
     vram_class: map
     subsegments:
-    - [auto, c, obk_03_0_header]
-    - [auto, c, obk_03_1_music]
-    - [auto, c, obk_03_2_main]
-    - [auto, c, obk_03_3_shop]
-    - [auto, c, obk_03_4_entity]
-    - [auto, c, obk_03_5_stairs]
-    - [auto, c, obk_03_6_npc]
-    - [auto, c, obk_03_7_rocking_chair]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, shop]
+    - [auto, c, entity]
+    - [auto, c, stairs]
+    - [auto, c, npc]
+    - [auto, c, rocking_chair]
   - name: obk_04
     dir: world/area_obk/obk_04
     type: code
     start: 0xBC7E60
     vram_class: map
     subsegments:
-    - [auto, c, obk_04_0_header]
-    - [auto, c, obk_04_1_music]
-    - [auto, c, obk_04_2_entity]
-    - [auto, c, obk_04_3_npc]
-    - [auto, c, obk_04_4_main]
-    - [auto, c, obk_04_5_hole]
-    - [auto, c, obk_04_6_game]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, main]
+    - [auto, c, hole]
+    - [auto, c, game]
   - name: obk_05
     dir: world/area_obk/obk_05
     type: code
     start: 0xBCD060
     vram_class: map
     subsegments:
-    - [auto, c, obk_05_0_header]
-    - [auto, c, obk_05_1_music]
-    - [auto, c, obk_05_2_main]
-    - [auto, c, obk_05_3_rocking_chair]
-    - [auto, c, obk_05_4_hole]
-    - [auto, c, obk_05_5_npc]
-    - [auto, c, obk_05_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rocking_chair]
+    - [auto, c, hole]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: obk_06
     dir: world/area_obk/obk_06
     type: code
     start: 0xBCE690
     vram_class: map
     subsegments:
-    - [auto, c, obk_06_0_header]
-    - [auto, c, obk_06_1_music]
-    - [auto, c, obk_06_2_main]
-    - [auto, c, obk_06_3_bombable]
-    - [auto, c, obk_06_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bombable]
+    - [auto, c, entity]
   - name: obk_07
     dir: world/area_obk/obk_07
     type: code
     start: 0xBCEBF0
     vram_class: map
     subsegments:
-    - [auto, c, obk_07_0_header]
-    - [auto, c, obk_07_1_music]
-    - [auto, c, obk_07_2_main]
-    - [auto, c, obk_07_3_entity]
-    - [auto, c, obk_07_4_fireplace]
-    - [auto, c, obk_07_5_npc]
-    - [auto, c, obk_07_6_phonograph]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, fireplace]
+    - [auto, c, npc]
+    - [auto, c, phonograph]
   - name: obk_08
     dir: world/area_obk/obk_08
     type: code
     start: 0xBD3870
     vram_class: map
     subsegments:
-    - [auto, c, obk_08_0_header]
-    - [auto, c, obk_08_1_music]
-    - [auto, c, obk_08_2_main]
-    - [auto, c, obk_08_3_cabinets]
-    - [auto, c, obk_08_4_entity]
-    - [auto, c, obk_08_5_npc]
-    - [auto, c, obk_08_6_game]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, cabinets]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, game]
   - name: obk_09
     dir: world/area_obk/obk_09
     type: code
     start: 0xBDA7B0
     vram_class: map
     subsegments:
-    - [auto, c, obk_09_0_header]
-    - [auto, c, obk_09_1_music]
-    - [auto, c, obk_09_2_main]
-    - [auto, c, obk_09_3_meet_bow]
-    - [auto, c, obk_09_4_npc]
-    - [auto, c, obk_09_5_new_partner]
-    - [auto, c, obk_09_6_epilogue]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, meet_bow]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
+    - [auto, c, epilogue]
   - name: arn_02
     dir: world/area_arn/arn_02
     type: code
     start: 0xBDD1B0
     vram_class: map
     subsegments:
-    - [auto, c, arn_02_0_header]
-    - [auto, c, arn_02_1_music]
-    - [auto, c, arn_02_2_main]
-    - [auto, c, arn_02_3_entity]
-    - [auto, c, arn_02_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: arn_03
     dir: world/area_arn/arn_03
     type: code
     start: 0xBDED90
     vram_class: map
     subsegments:
-    - [auto, c, arn_03_0_header]
-    - [auto, c, arn_03_1_music]
-    - [auto, c, arn_03_2_main]
-    - [auto, c, arn_03_3_npc]
-    - [auto, c, arn_03_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_04
     dir: world/area_arn/arn_04
     type: code
     start: 0xBE37B0
     vram_class: map
     subsegments:
-    - [auto, c, arn_04_0_header]
-    - [auto, c, arn_04_1_music]
-    - [auto, c, arn_04_2_main]
-    - [auto, c, arn_04_3_npc]
-    - [auto, c, arn_04_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_05
     dir: world/area_arn/arn_05
     type: code
     start: 0xBE7BE0
     vram_class: map
     subsegments:
-    - [auto, c, arn_05_0_header]
-    - [auto, c, arn_05_1_music]
-    - [auto, c, arn_05_2_main]
-    - [auto, c, arn_05_3_npc]
-    - [auto, c, arn_05_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_07
     dir: world/area_arn/arn_07
     type: code
     start: 0xBECDF0
     vram_class: map
     subsegments:
-    - [auto, c, arn_07_0_header]
-    - [auto, c, arn_07_1_music]
-    - [auto, c, arn_07_2_main]
-    - [auto, c, arn_07_3_windmill]
-    - [auto, c, arn_07_4_entity]
-    - [auto, c, arn_07_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, windmill]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: arn_08
     dir: world/area_arn/arn_08
     type: code
     start: 0xBF47A0
     vram_class: map
     subsegments:
-    - [auto, c, arn_08_0_header]
-    - [auto, c, arn_08_1_music]
-    - [auto, c, arn_08_2_main]
-    - [auto, c, arn_08_3_well]
-    - [auto, c, arn_08_4_gears]
-    - [auto, c, arn_08_5_demo]
-    - [auto, c, arn_08_6_npc]
-    - [auto, c, arn_08_7_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, well]
+    - [auto, c, gears]
+    - [auto, c, demo]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_09
     dir: world/area_arn/arn_09
     type: code
     start: 0xBF6060
     vram_class: map
     subsegments:
-    - [auto, c, arn_09_0_header]
-    - [auto, c, arn_09_1_music]
-    - [auto, c, arn_09_2_main]
-    - [auto, c, arn_09_3_entity]
-    - [auto, c, arn_09_4_launch]
-    - [auto, c, arn_09_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, launch]
+    - [auto, c, npc]
   - name: arn_10
     dir: world/area_arn/arn_10
     type: code
     start: 0xBF6A00
     vram_class: map
     subsegments:
-    - [auto, c, arn_10_0_header]
-    - [auto, c, arn_10_1_music]
-    - [auto, c, arn_10_2_main]
-    - [auto, c, arn_10_3_npc]
-    - [auto, c, arn_10_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_11
     dir: world/area_arn/arn_11
     type: code
     start: 0xBF7680
     vram_class: map
     subsegments:
-    - [auto, c, arn_11_0_header]
-    - [auto, c, arn_11_1_music]
-    - [auto, c, arn_11_2_main]
-    - [auto, c, arn_11_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: arn_12
     dir: world/area_arn/arn_12
     type: code
     start: 0xBF8790
     vram_class: map
     subsegments:
-    - [auto, c, arn_12_0_header]
-    - [auto, c, arn_12_1_music]
-    - [auto, c, arn_12_2_main]
-    - [auto, c, arn_12_3_npc]
-    - [auto, c, arn_12_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: arn_13
     dir: world/area_arn/arn_13
     type: code
     start: 0xBF9410
     vram_class: map
     subsegments:
-    - [auto, c, arn_13_0_header]
-    - [auto, c, arn_13_1_music]
-    - [auto, c, arn_13_2_main]
-    - [auto, c, arn_13_3_npc]
-    - [auto, c, arn_13_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_00
     dir: world/area_dgb/dgb_00
     type: code
     start: 0xBFA0A0
     vram_class: map
     subsegments:
-    - [auto, c, dgb_00_0_header]
-    - [auto, c, dgb_00_1_music]
-    - [auto, c, dgb_00_2_main]
-    - [auto, c, dgb_00_3_npc]
-    - [auto, c, dgb_00_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_01
     dir: world/area_dgb/dgb_01
     type: code
     start: 0xBFD880
     vram_class: map
     subsegments:
-    - [auto, c, dgb_01_0_header]
-    - [auto, c, dgb_01_1_music]
-    - [auto, c, dgb_01_2_main]
-    - [auto, c, dgb_01_3_bridges]
-    - [auto, c, dgb_01_4_entity]
-    - [auto, c, dgb_01_5_npc]
-    - [auto, c, dgb_01_6_img0]
-    - [auto, c, dgb_01_6_img1]
-    - [auto, c, dgb_01_6_img2]
-    - [auto, c, dgb_01_6_img3]
-    - [auto, c, dgb_01_6_img4]
-    - [auto, c, dgb_01_6_img5]
-    - [auto, c, dgb_01_6_img6]
-    - [auto, c, dgb_01_6_img7]
-    - [auto, c, dgb_01_7]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bridges]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, img0]
+    - [auto, c, img1]
+    - [auto, c, img2]
+    - [auto, c, img3]
+    - [auto, c, img4]
+    - [auto, c, img5]
+    - [auto, c, img6]
+    - [auto, c, img7]
+    - [auto, c, gfx]
     - start: 0xC047F0
       type: .data
-      name: dgb_01_6_img0
+      name: img0
       subsegments:
       - [0xC047F0, rgba16, img0, 64, 32]
       - [0xC057F0, gfx, img0]
     - start: 0xC05870
       type: .data
-      name: dgb_01_6_img1
+      name: img1
       subsegments:
       - [0xC05870, rgba16, img1, 64, 32]
       - [0xC06870, gfx, img1]
     - start: 0xC068F0
       type: .data
-      name: dgb_01_6_img2
+      name: img2
       subsegments:
       - [0xC068F0, rgba16, img2, 32, 32]
       - [0xC070F0, gfx, img2]
     - start: 0xC07170
       type: .data
-      name: dgb_01_6_img3
+      name: img3
       subsegments:
       - [0xC07170, rgba16, img3, 16, 32]
       - [0xC07570, gfx, img3]
     - start: 0xC075F0
       type: .data
-      name: dgb_01_6_img4
+      name: img4
       subsegments:
       - [0xC075F0, rgba16, img4, 16, 32]
       - [0xC079F0, gfx, img4]
     - start: 0xC07A70
       type: .data
-      name: dgb_01_6_img5
+      name: img5
       subsegments:
       - [0xC07A70, rgba16, img5, 16, 32]
       - [0xC07E70, gfx, img5]
     - start: 0xC07EF0
       type: .data
-      name: dgb_01_6_img6
+      name: img6
       subsegments:
       - [0xC07EF0, rgba16, img6, 32, 32]
       - [0xC086F0, gfx, img6]
     - start: 0xC08770
       type: .data
-      name: dgb_01_6_img7
+      name: img7
       subsegments:
       - [0xC08770, rgba16, img7, 32, 32]
       - [0xC08F70, gfx, img7]
-    - [0xC08FF0, .data, dgb_01_7] # TODO needs additioanl cleanup and gfx splitting
+    - [0xC08FF0, .data, gfx] # TODO needs additioanl cleanup and gfx splitting
     - [0xC20C70]
   - name: dgb_01_smash_bridges # DMAd at the beginning of tubba blubba's castle (bridge cutscene)
     type: code
@@ -11353,10 +11353,10 @@ segments:
     start: 0xC20F40
     vram_class: dgb_01_smash_bridges
     subsegments:
-    - [auto, c, dgb_01_smash_bridges]
+    - [auto, c, smash_bridges]
     - start: 0xC20F40
       type: .data
-      name: dgb_01_smash_bridges
+      name: smash_bridges
       subsegments:
       - [0xC20F40, vtx, vtx/C20F40]
       - [0xC21100, vtx, vtx/C21100]
@@ -11654,333 +11654,333 @@ segments:
     start: 0xC2EBA0
     vram_class: map
     subsegments:
-    - [auto, c, dgb_02_0_header]
-    - [auto, c, dgb_02_1_music]
-    - [auto, c, dgb_02_2_main]
-    - [auto, c, dgb_02_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: dgb_03
     dir: world/area_dgb/dgb_03
     type: code
     start: 0xC314E0
     vram_class: map
     subsegments:
-    - [auto, c, dgb_03_0_header]
-    - [auto, c, dgb_03_1_music]
-    - [auto, c, dgb_03_2_main]
-    - [auto, c, dgb_03_3_clock]
-    - [auto, c, dgb_03_4_entity]
-    - [auto, c, dgb_03_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, clock]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_04
     dir: world/area_dgb/dgb_04
     type: code
     start: 0xC36530
     vram_class: map
     subsegments:
-    - [auto, c, dgb_04_0_header]
-    - [auto, c, dgb_04_1_music]
-    - [auto, c, dgb_04_2_main]
-    - [auto, c, dgb_04_3_npc]
-    - [auto, c, dgb_04_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_05
     dir: world/area_dgb/dgb_05
     type: code
     start: 0xC3AA10
     vram_class: map
     subsegments:
-    - [auto, c, dgb_05_0_header]
-    - [auto, c, dgb_05_1_music]
-    - [auto, c, dgb_05_2_main]
-    - [auto, c, dgb_05_3_hole]
-    - [auto, c, dgb_05_4_entity]
-    - [auto, c, dgb_05_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, hole]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_06
     dir: world/area_dgb/dgb_06
     type: code
     start: 0xC3D080
     vram_class: map
     subsegments:
-    - [auto, c, dgb_06_0_header]
-    - [auto, c, dgb_06_1_music]
-    - [auto, c, dgb_06_2_main]
-    - [auto, c, dgb_06_3_entity]
-    - [auto, c, dgb_06_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_07
     dir: world/area_dgb/dgb_07
     type: code
     start: 0xC3DBF0
     vram_class: map
     subsegments:
-    - [auto, c, dgb_07_0_header]
-    - [auto, c, dgb_07_1_music]
-    - [auto, c, dgb_07_2_main]
-    - [auto, c, dgb_07_3_entity]
-    - [auto, c, dgb_07_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_08
     dir: world/area_dgb/dgb_08
     type: code
     start: 0xC3FDB0
     vram_class: map
     subsegments:
-    - [auto, c, dgb_08_0_header]
-    - [auto, c, dgb_08_1_music]
-    - [auto, c, dgb_08_2_main]
-    - [auto, c, dgb_08_3_npc]
-    - [auto, c, dgb_08_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_09
     dir: world/area_dgb/dgb_09
     type: code
     start: 0xC46BE0
     vram_class: map
     subsegments:
-    - [auto, c, dgb_09_0_header]
-    - [auto, c, dgb_09_1_music]
-    - [auto, c, dgb_09_2_main]
-    - [auto, c, dgb_09_3_breakable]
-    - [auto, c, dgb_09_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, breakable]
+    - [auto, c, npc]
   - name: dgb_10
     dir: world/area_dgb/dgb_10
     type: code
     start: 0xC4C390
     vram_class: map
     subsegments:
-    - [auto, c, dgb_10_0_header]
-    - [auto, c, dgb_10_1_music]
-    - [auto, c, dgb_10_2_main]
-    - [auto, c, dgb_10_3_hole]
-    - [auto, c, dgb_10_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, hole]
+    - [auto, c, entity]
   - name: dgb_11
     dir: world/area_dgb/dgb_11
     type: code
     start: 0xC4D3E0
     vram_class: map
     subsegments:
-    - [auto, c, dgb_11_0_header]
-    - [auto, c, dgb_11_1_music]
-    - [auto, c, dgb_11_2_main]
-    - [auto, c, dgb_11_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: dgb_12
     dir: world/area_dgb/dgb_12
     type: code
     start: 0xC4DEF0
     vram_class: map
     subsegments:
-    - [auto, c, dgb_12_0_header]
-    - [auto, c, dgb_12_1_music]
-    - [auto, c, dgb_12_2_main]
-    - [auto, c, dgb_12_3_spikes]
-    - [auto, c, dgb_12_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, spikes]
+    - [auto, c, entity]
   - name: dgb_13
     dir: world/area_dgb/dgb_13
     type: code
     start: 0xC4E960
     vram_class: map
     subsegments:
-    - [auto, c, dgb_13_0_header]
-    - [auto, c, dgb_13_1_music]
-    - [auto, c, dgb_13_2_main]
-    - [auto, c, dgb_13_3_entity]
-    - [auto, c, dgb_13_4_drawer]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, drawer]
   - name: dgb_14
     dir: world/area_dgb/dgb_14
     type: code
     start: 0xC4F030
     vram_class: map
     subsegments:
-    - [auto, c, dgb_14_0_header]
-    - [auto, c, dgb_14_1_music]
-    - [auto, c, dgb_14_2_main]
-    - [auto, c, dgb_14_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: dgb_15
     dir: world/area_dgb/dgb_15
     type: code
     start: 0xC4F510
     vram_class: map
     subsegments:
-    - [auto, c, dgb_15_0_header]
-    - [auto, c, dgb_15_1_music]
-    - [auto, c, dgb_15_2_main]
-    - [auto, c, dgb_15_3_npc]
-    - [auto, c, dgb_15_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dgb_16
     dir: world/area_dgb/dgb_16
     type: code
     start: 0xC52540
     vram_class: map
     subsegments:
-    - [auto, c, dgb_16_0_header]
-    - [auto, c, dgb_16_1_music]
-    - [auto, c, dgb_16_2_main]
-    - [auto, c, dgb_16_3_entity]
-    - [auto, c, dgb_16_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dgb_17
     dir: world/area_dgb/dgb_17
     type: code
     start: 0xC55A60
     vram_class: map
     subsegments:
-    - [auto, c, dgb_17_0_header]
-    - [auto, c, dgb_17_1_music]
-    - [auto, c, dgb_17_2_main]
-    - [auto, c, dgb_17_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: dgb_18
     dir: world/area_dgb/dgb_18
     type: code
     start: 0xC55F40
     vram_class: map
     subsegments:
-    - [auto, c, dgb_18_0_header]
-    - [auto, c, dgb_18_1_music]
-    - [auto, c, dgb_18_2_main]
-    - [auto, c, dgb_18_3_npc]
-    - [auto, c, dgb_18_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kzn_01
     dir: world/area_kzn/kzn_01
     type: code
     start: 0xC599D0
     vram_class: map
     subsegments:
-    - [auto, c, kzn_01_0_header]
-    - [auto, c, kzn_01_1_main]
-    - [auto, c, kzn_01_2_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kzn_02
     dir: world/area_kzn/kzn_02
     type: code
     start: 0xC5A740
     vram_class: map
     subsegments:
-    - [auto, c, kzn_02_0_header]
-    - [auto, c, kzn_02_1_main]
-    - [auto, c, kzn_02_2_platforms]
-    - [auto, c, kzn_02_3_npc]
-    - [auto, c, kzn_02_4_demo]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, platforms]
+    - [auto, c, npc]
+    - [auto, c, demo]
   - name: kzn_03
     dir: world/area_kzn/kzn_03
     type: code
     start: 0xC60D10
     vram_class: map
     subsegments:
-    - [auto, c, kzn_03_0_header]
-    - [auto, c, kzn_03_1_main]
-    - [auto, c, kzn_03_2_npc]
-    - [auto, c, kzn_03_3_entity]
-    - [auto, c, kzn_03_4_ziplines]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, ziplines]
   - name: kzn_04
     dir: world/area_kzn/kzn_04
     type: code
     start: 0xC68130
     vram_class: map
     subsegments:
-    - [auto, c, kzn_04_0_header]
-    - [auto, c, kzn_04_1_main]
-    - [auto, c, kzn_04_2_entity]
-    - [auto, c, kzn_04_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kzn_05
     dir: world/area_kzn/kzn_05
     type: code
     start: 0xC6C0D0
     vram_class: map
     subsegments:
-    - [auto, c, kzn_05_0_header]
-    - [auto, c, kzn_05_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: kzn_06
     dir: world/area_kzn/kzn_06
     type: code
     start: 0xC6C920
     vram_class: map
     subsegments:
-    - [auto, c, kzn_06_0_header]
-    - [auto, c, kzn_06_1_main]
-    - [auto, c, kzn_06_2_entity]
-    - [auto, c, kzn_06_3_extra]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, extra]
   - name: kzn_07
     dir: world/area_kzn/kzn_07
     type: code
     start: 0xC6E330
     vram_class: map
     subsegments:
-    - [auto, c, kzn_07_0_header]
-    - [auto, c, kzn_07_1_music]
-    - [auto, c, kzn_07_2_main]
-    - [auto, c, kzn_07_3_entity]
-    - [auto, c, kzn_07_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kzn_08
     dir: world/area_kzn/kzn_08
     type: code
     start: 0xC71480
     vram_class: map
     subsegments:
-    - [auto, c, kzn_08_0_header]
-    - [auto, c, kzn_08_1_main]
-    - [auto, c, kzn_08_2_entity]
-    - [auto, c, kzn_08_3_npc]
-    - [auto, c, kzn_08_4_extra]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, extra]
   - name: kzn_09
     dir: world/area_kzn/kzn_09
     type: code
     start: 0xC76CE0
     vram_class: map
     subsegments:
-    - [auto, c, kzn_09_0_header]
-    - [auto, c, kzn_09_1_main]
-    - [auto, c, kzn_09_2_entity]
-    - [auto, c, kzn_09_3_zipline]
-    - [auto, c, kzn_09_4_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, zipline]
+    - [auto, c, npc]
   - name: kzn_10
     dir: world/area_kzn/kzn_10
     type: code
     start: 0xC7E180
     vram_class: map
     subsegments:
-    - [auto, c, kzn_10_0_header]
-    - [auto, c, kzn_10_1_main]
-    - [auto, c, kzn_10_2_tromp]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, tromp]
   - name: kzn_11
     dir: world/area_kzn/kzn_11
     type: code
     start: 0xC801A0
     vram_class: map
     subsegments:
-    - [auto, c, kzn_11_0_header]
-    - [auto, c, kzn_11_1_main]
-    - [auto, c, kzn_11_2_platforms]
-    - [auto, c, kzn_11_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, platforms]
+    - [auto, c, npc]
   - name: kzn_17
     dir: world/area_kzn/kzn_17
     type: code
     start: 0xC85AB0
     vram_class: map
     subsegments:
-    - [auto, c, kzn_17_0_header]
-    - [auto, c, kzn_17_1_main]
-    - [auto, c, kzn_17_2_entity]
-    - [auto, c, kzn_17_3_npc]
-    - [auto, c, kzn_17_4_tromp]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, tromp]
   - name: kzn_18
     dir: world/area_kzn/kzn_18
     type: code
     start: 0xC8C0A0
     vram_class: map
     subsegments:
-    - [auto, c, kzn_18_0_header]
-    - [auto, c, kzn_18_1_main]
-    - [auto, c, kzn_18_2_npc]
-    - [auto, c, kzn_18_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: kzn_19
     dir: world/area_kzn/kzn_19
     type: code
     start: 0xC8DBB0
     vram_class: map
     subsegments:
-    - [auto, c, kzn_19_0_header]
-    - [auto, c, kzn_19_1_music]
-    - [auto, c, kzn_19_2_main]
-    - [auto, c, kzn_19_3_npc_settings]
-    - [auto, c, kzn_19_4_npc]
-    - [auto, c, kzn_19_5_eruption]
-    - [auto, c, kzn_19_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc_settings]
+    - [auto, c, npc]
+    - [auto, c, eruption]
+    - [auto, c, entity]
     - start: 0xC90BF0
       type: .data
-      name: kzn_19_4_npc
+      name: npc
       subsegments:
       - [0xC90BF0]
       - [0xC91088, ci4, ../../lava_piranha/vine, 64, 32]
@@ -11993,337 +11993,337 @@ segments:
     start: 0xC95F30
     vram_class: map
     subsegments:
-    - [auto, c, kzn_20_0_header]
-    - [auto, c, kzn_20_1_music]
-    - [auto, c, kzn_20_2_main]
-    - [auto, c, kzn_20_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: kzn_22
     dir: world/area_kzn/kzn_22
     type: code
     start: 0xC9A200
     vram_class: map
     subsegments:
-    - [auto, c, kzn_22_0_header]
-    - [auto, c, kzn_22_1_music]
-    - [auto, c, kzn_22_2_main]
-    - [auto, c, kzn_22_3_entity]
-    - [auto, c, kzn_22_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: kzn_23
     dir: world/area_kzn/kzn_23
     type: code
     start: 0xC9C300
     vram_class: map
     subsegments:
-    - [auto, c, kzn_23_0_header]
-    - [auto, c, kzn_23_1_music]
-    - [auto, c, kzn_23_2_main]
-    - [auto, c, kzn_23_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: flo_00
     dir: world/area_flo/flo_00
     type: code
     start: 0xC9DF20
     vram_class: map
     subsegments:
-    - [auto, c, flo_00_0_header]
-    - [auto, c, flo_00_1_music]
-    - [auto, c, flo_00_2_main]
-    - [auto, c, flo_00_3_npc]
-    - [auto, c, flo_00_4_epilogue]
-    - [auto, c, flo_00_5_beanstalk]
-    - [auto, c, flo_00_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, epilogue]
+    - [auto, c, beanstalk]
+    - [auto, c, entity]
   - name: flo_03
     dir: world/area_flo/flo_03
     type: code
     start: 0xCA72A0
     vram_class: map
     subsegments:
-    - [auto, c, flo_03_0_header]
-    - [auto, c, flo_03_1_music]
-    - [auto, c, flo_03_2_main]
-    - [auto, c, flo_03_3_npc]
-    - [auto, c, flo_03_4_foliage]
-    - [auto, c, flo_03_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: flo_07
     dir: world/area_flo/flo_07
     type: code
     start: 0xCAC1F0
     vram_class: map
     subsegments:
-    - [auto, c, flo_07_0_header]
-    - [auto, c, flo_07_1_music]
-    - [auto, c, flo_07_2_main]
-    - [auto, c, flo_07_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: flo_08
     dir: world/area_flo/flo_08
     type: code
     start: 0xCAED40
     vram_class: map
     subsegments:
-    - [auto, c, flo_08_0_header]
-    - [auto, c, flo_08_1_music]
-    - [auto, c, flo_08_2_entity]
-    - [auto, c, flo_08_3_main]
-    - [auto, c, flo_08_4_npc]
-    - [auto, c, flo_08_5_foliage]
-    - [auto, c, flo_08_6_vines]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, vines]
   - name: flo_09
     dir: world/area_flo/flo_09
     type: code
     start: 0xCB5000
     vram_class: map
     subsegments:
-    - [auto, c, flo_09_0_header]
-    - [auto, c, flo_09_1_music]
-    - [auto, c, flo_09_2_main]
-    - [auto, c, flo_09_3_vines]
-    - [auto, c, flo_09_4_foliage]
-    - [auto, c, flo_09_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, foliage]
+    - [auto, c, npc]
   - name: flo_10
     dir: world/area_flo/flo_10
     type: code
     start: 0xCB9200
     vram_class: map
     subsegments:
-    - [auto, c, flo_10_0_header]
-    - [auto, c, flo_10_1_music]
-    - [auto, c, flo_10_2_entity]
-    - [auto, c, flo_10_3_main]
-    - [auto, c, flo_10_4_fountain]
-    - [auto, c, flo_10_5_npc]
-    - [auto, c, flo_10_6_waterfx]
-    - [auto, c, flo_10_7_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, fountain]
+    - [auto, c, npc]
+    - [auto, c, waterfx]
+    - [auto, c, foliage]
   - name: flo_11
     dir: world/area_flo/flo_11
     type: code
     start: 0xCBDCD0
     vram_class: map
     subsegments:
-    - [auto, c, flo_11_0_header]
-    - [auto, c, flo_11_1_music]
-    - [auto, c, flo_11_2_main]
-    - [auto, c, flo_11_3_npc]
-    - [auto, c, flo_11_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: flo_12
     dir: world/area_flo/flo_12
     type: code
     start: 0xCC0E30
     vram_class: map
     subsegments:
-    - [auto, c, flo_12_0_header]
-    - [auto, c, flo_12_1_music]
-    - [auto, c, flo_12_2_main]
-    - [auto, c, flo_12_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: flo_13
     dir: world/area_flo/flo_13
     type: code
     start: 0xCC3810
     vram_class: map
     subsegments:
-    - [auto, c, flo_13_0_header]
-    - [auto, c, flo_13_1_music]
-    - [auto, c, flo_13_2_entity]
-    - [auto, c, flo_13_3_main]
-    - [auto, c, flo_13_4_npc]
-    - [auto, c, flo_13_5_new_partner]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
   - name: flo_14
     dir: world/area_flo/flo_14
     type: code
     start: 0xCCB310
     vram_class: map
     subsegments:
-    - [auto, c, flo_14_0_header]
-    - [auto, c, flo_14_1_music]
-    - [auto, c, flo_14_2_main]
-    - [auto, c, flo_14_3_bubbles]
-    - [auto, c, flo_14_4_npc]
-    - [auto, c, flo_14_5_entity]
-    - [auto, c, flo_14_6_logs]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bubbles]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, logs]
   - name: flo_15
     dir: world/area_flo/flo_15
     type: code
     start: 0xCD06C0
     vram_class: map
     subsegments:
-    - [auto, c, flo_15_0_header]
-    - [auto, c, flo_15_1_music]
-    - [auto, c, flo_15_2_main]
-    - [auto, c, flo_15_3_npc]
-    - [auto, c, flo_15_4_entity]
-    - [auto, c, flo_15_5_stairs]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, stairs]
   - name: flo_16
     dir: world/area_flo/flo_16
     type: code
     start: 0xCD1E30
     vram_class: map
     subsegments:
-    - [auto, c, flo_16_0_header]
-    - [auto, c, flo_16_1_music]
-    - [auto, c, flo_16_2_main]
-    - [auto, c, flo_16_3_vines]
-    - [auto, c, flo_16_4_entity]
-    - [auto, c, flo_16_5_npc]
-    - [auto, c, flo_16_6_puzzle]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, puzzle]
   - name: flo_17
     dir: world/area_flo/flo_17
     type: code
     start: 0xCD72E0
     vram_class: map
     subsegments:
-    - [auto, c, flo_17_0_header]
-    - [auto, c, flo_17_1_music]
-    - [auto, c, flo_17_2_main]
-    - [auto, c, flo_17_3_logs]
-    - [auto, c, flo_17_4_npc]
-    - [auto, c, flo_17_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, logs]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: flo_18
     dir: world/area_flo/flo_18
     type: code
     start: 0xCDC6A0
     vram_class: map
     subsegments:
-    - [auto, c, flo_18_0_header]
-    - [auto, c, flo_18_1_music]
-    - [auto, c, flo_18_2_main]
-    - [auto, c, flo_18_3_machine]
-    - [auto, c, flo_18_4_npc]
-    - [auto, c, flo_18_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, machine]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: flo_19
     dir: world/area_flo/flo_19
     type: code
     start: 0xCE36F0
     vram_class: map
     subsegments:
-    - [auto, c, flo_19_0_header]
-    - [auto, c, flo_19_1_music]
-    - [auto, c, flo_19_2_entity]
-    - [auto, c, flo_19_3_main]
-    - [auto, c, flo_19_4_clouds]
-    - [auto, c, flo_19_5_beanstalk]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, clouds]
+    - [auto, c, beanstalk]
   - name: flo_21
     dir: world/area_flo/flo_21
     type: code
     start: 0xCE6700
     vram_class: map
     subsegments:
-    - [auto, c, flo_21_0_header]
-    - [auto, c, flo_21_1_music]
-    - [auto, c, flo_21_2_main]
-    - [auto, c, flo_21_3_clouds]
-    - [auto, c, flo_21_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, clouds]
+    - [auto, c, npc]
   - name: flo_22
     dir: world/area_flo/flo_22
     type: code
     start: 0xCEC240
     vram_class: map
     subsegments:
-    - [auto, c, flo_22_0_header]
-    - [auto, c, flo_22_1_music]
-    - [auto, c, flo_22_2_main]
-    - [auto, c, flo_22_3_npc]
-    - [auto, c, flo_22_4_well]
-    - [auto, c, flo_22_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, well]
+    - [auto, c, foliage]
   - name: flo_23
     dir: world/area_flo/flo_23
     type: code
     start: 0xCEE260
     vram_class: map
     subsegments:
-    - [auto, c, flo_23_0_header]
-    - [auto, c, flo_23_1_music]
-    - [auto, c, flo_23_2_main]
-    - [auto, c, flo_23_3_npc]
-    - [auto, c, flo_23_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: flo_24
     dir: world/area_flo/flo_24
     type: code
     start: 0xCF0940
     vram_class: map
     subsegments:
-    - [auto, c, flo_24_0_header]
-    - [auto, c, flo_24_1_music]
-    - [auto, c, flo_24_2_main]
-    - [auto, c, flo_24_3_foliage]
-    - [auto, c, flo_24_4_water]
-    - [auto, c, flo_24_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, foliage]
+    - [auto, c, water]
+    - [auto, c, entity]
   - name: flo_25
     dir: world/area_flo/flo_25
     type: code
     start: 0xCF2BD0
     vram_class: map
     subsegments:
-    - [auto, c, flo_25_0_header]
-    - [auto, c, flo_25_1_music]
-    - [auto, c, flo_25_2_main]
-    - [auto, c, flo_25_3_npc]
-    - [auto, c, flo_25_4_entity]
-    - [auto, c, flo_25_5_foliage]
-    - [auto, c, flo_25_6_vine]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, foliage]
+    - [auto, c, vine]
   - name: sam_01
     dir: world/area_sam/sam_01
     type: code
     start: 0xCF7B70
     vram_class: map
     subsegments:
-    - [auto, c, sam_01_0_header]
-    - [auto, c, sam_01_1_music]
-    - [auto, c, sam_01_2_main]
-    - [auto, c, sam_01_3_rooms]
-    - [auto, c, sam_01_4_npc]
-    - [auto, c, sam_01_5_scenes]
-    - [auto, c, sam_01_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, npc]
+    - [auto, c, scenes]
+    - [auto, c, entity]
   - name: sam_02
     dir: world/area_sam/sam_02
     type: code
     start: 0xD05730
     vram_class: map
     subsegments:
-    - [auto, c, sam_02_0_header]
-    - [auto, c, sam_02_1_music]
-    - [auto, c, sam_02_2_main]
-    - [auto, c, sam_02_3_rooms]
-    - [auto, c, sam_02_4_npc]
-    - [auto, c, sam_02_5_entity]
-    - [auto, c, sam_02_6_shop]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, shop]
   - name: sam_03
     dir: world/area_sam/sam_03
     type: code
     start: 0xD110C0
     vram_class: map
     subsegments:
-    - [auto, c, sam_03_0_header]
-    - [auto, c, sam_03_1_music]
-    - [auto, c, sam_03_2_main]
-    - [auto, c, sam_03_3_npc1]
-    - [auto, c, sam_03_4_npc2]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc1]
+    - [auto, c, npc2]
   - name: sam_04
     dir: world/area_sam/sam_04
     type: code
     start: 0xD135D0
     vram_class: map
     subsegments:
-    - [auto, c, sam_04_0_header]
-    - [auto, c, sam_04_1_music]
-    - [auto, c, sam_04_2_main]
-    - [auto, c, sam_04_3_snowmen]
-    - [auto, c, sam_04_4_npc]
-    - [auto, c, sam_04_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, snowmen]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sam_05
     dir: world/area_sam/sam_05
     type: code
     start: 0xD187E0
     vram_class: map
     subsegments:
-    - [auto, c, sam_05_0_header]
-    - [auto, c, sam_05_1_music]
-    - [auto, c, sam_05_2_main]
-    - [auto, c, sam_05_3_entity]
-    - [auto, c, sam_05_4_npc]
-    - [auto, c, sam_05_5_scenes]
-    - [auto, c, sam_05_6_monstar_gfx]
-    - [auto, c, sam_05_7_monstar_vtx]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, scenes]
+    - [auto, c, monstar_gfx]
+    - [auto, c, monstar_vtx]
     - start: 0xD1A900
       type: .data
-      name: sam_05_4_npc
+      name: npc
       subsegments:
       - [0xD1A900]
       - [0xD1AF50, ci4, monstar, 32, 32]
@@ -12334,12 +12334,12 @@ segments:
       - [0xD1B770]
     - start: 0xD1F780
       type: .data
-      name: sam_05_6_monstar_gfx
+      name: monstar_gfx
       subsegments:
       - [0xD1F780, gfx, monstar]
     - start: 0xD1F890
       type: .data
-      name: sam_05_7_monstar_vtx
+      name: monstar_vtx
       subsegments:
       - [0xD1F890, vtx, monstar]
     - [0xD1FCB0]
@@ -12349,330 +12349,330 @@ segments:
     start: 0xD1FE90
     vram_class: map
     subsegments:
-    - [auto, c, sam_06_0_header]
-    - [auto, c, sam_06_1_music]
-    - [auto, c, sam_06_2_main]
-    - [auto, c, sam_06_3_rooms]
-    - [auto, c, sam_06_4_npc]
-    - [auto, c, sam_06_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: sam_07
     dir: world/area_sam/sam_07
     type: code
     start: 0xD2BD30
     vram_class: map
     subsegments:
-    - [auto, c, sam_07_0_header]
-    - [auto, c, sam_07_1_music]
-    - [auto, c, sam_07_2_main]
-    - [auto, c, sam_07_3_entity]
-    - [auto, c, sam_07_4_frozen_pit]
-    - [auto, c, sam_07_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, frozen_pit]
+    - [auto, c, npc]
   - name: sam_08
     dir: world/area_sam/sam_08
     type: code
     start: 0xD2FC80
     vram_class: map
     subsegments:
-    - [auto, c, sam_08_0_header]
-    - [auto, c, sam_08_1_music]
-    - [auto, c, sam_08_2_main]
-    - [auto, c, sam_08_3_entity]
-    - [auto, c, sam_08_4_npc]
-    - [auto, c, sam_08_5_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, scenes]
   - name: sam_09
     dir: world/area_sam/sam_09
     type: code
     start: 0xD362F0
     vram_class: map
     subsegments:
-    - [auto, c, sam_09_0_header]
-    - [auto, c, sam_09_1_music]
-    - [auto, c, sam_09_2_main]
-    - [auto, c, sam_09_3_entity]
-    - [auto, c, sam_09_4_sockets]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, sockets]
   - name: sam_10
     dir: world/area_sam/sam_10
     type: code
     start: 0xD37800
     vram_class: map
     subsegments:
-    - [auto, c, sam_10_0_header]
-    - [auto, c, sam_10_1_music]
-    - [auto, c, sam_10_2_main]
-    - [auto, c, sam_10_3_entity]
-    - [auto, c, sam_10_4_stairs]
-    - [auto, c, sam_10_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, stairs]
+    - [auto, c, npc]
   - name: sam_11
     dir: world/area_sam/sam_11
     type: code
     start: 0xD3A5D0
     vram_class: map
     subsegments:
-    - [auto, c, sam_11_0_header]
-    - [auto, c, sam_11_1_music]
-    - [auto, c, sam_11_2_main]
-    - [auto, c, sam_11_3_rooms]
-    - [auto, c, sam_11_4_entity]
-    - [auto, c, sam_11_5_npc]
-    - [auto, c, sam_11_6_pond]
-    - [auto, c, sam_11_7_staircase]
-    - [auto, c, sam_11_8_pond_anim]
-    - [auto, c, sam_11_9_pond_skele]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, rooms]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, pond]
+    - [auto, c, staircase]
+    - [auto, c, pond_anim]
+    - [auto, c, pond_skele]
   - name: sam_12
     dir: world/area_sam/sam_12
     type: code
     start: 0xD4BA20
     vram_class: map
     subsegments:
-    - [auto, c, sam_12_0_header]
-    - [auto, c, sam_12_1_music]
-    - [auto, c, sam_12_2_main]
-    - [auto, c, sam_12_3_npc]
-    - [auto, c, sam_12_4_scenes]
-    - [auto, c, sam_12_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, scenes]
+    - [auto, c, entity]
   - name: pra_01
     dir: world/area_pra/pra_01
     type: code
     start: 0xD4D040
     vram_class: map
     subsegments:
-    - [auto, c, pra_01_0_header]
-    - [auto, c, pra_01_1_music]
-    - [auto, c, pra_01_2_main]
-    - [auto, c, pra_01_3_npc]
-    - [auto, c, pra_01_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: pra_02
     dir: world/area_pra/pra_02
     type: code
     start: 0xD4FFF0
     vram_class: map
     subsegments:
-    - [auto, c, pra_02_0_header]
-    - [auto, c, pra_02_1_music]
-    - [auto, c, pra_02_2_main]
-    - [auto, c, pra_02_3_npc]
-    - [auto, c, pra_02_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: pra_03
     dir: world/area_pra/pra_03
     type: code
     start: 0xD53CB0
     vram_class: map
     subsegments:
-    - [auto, c, pra_03_0_header]
-    - [auto, c, pra_03_1_music]
-    - [auto, c, pra_03_2_main]
-    - [auto, c, pra_03_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_04
     dir: world/area_pra/pra_04
     type: code
     start: 0xD54690
     vram_class: map
     subsegments:
-    - [auto, c, pra_04_0_header]
-    - [auto, c, pra_04_1_music]
-    - [auto, c, pra_04_2_main]
-    - [auto, c, pra_04_3_entity]
-    - [auto, c, pra_04_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: pra_05
     dir: world/area_pra/pra_05
     type: code
     start: 0xD55BB0
     vram_class: map
     subsegments:
-    - [auto, c, pra_05_0_header]
-    - [auto, c, pra_05_1_music]
-    - [auto, c, pra_05_2_main]
-    - [auto, c, pra_05_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_06
     dir: world/area_pra/pra_06
     type: code
     start: 0xD57430
     vram_class: map
     subsegments:
-    - [auto, c, pra_06_0_header]
-    - [auto, c, pra_06_1_music]
-    - [auto, c, pra_06_2_main]
-    - [auto, c, pra_06_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_09
     dir: world/area_pra/pra_09
     type: code
     start: 0xD58890
     vram_class: map
     subsegments:
-    - [auto, c, pra_09_0_header]
-    - [auto, c, pra_09_1_music]
-    - [auto, c, pra_09_2_main]
-    - [auto, c, pra_09_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_10
     dir: world/area_pra/pra_10
     type: code
     start: 0xD5F2B0
     vram_class: map
     subsegments:
-    - [auto, c, pra_10_0_header]
-    - [auto, c, pra_10_1_music]
-    - [auto, c, pra_10_2_main]
-    - [auto, c, pra_10_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_11
     dir: world/area_pra/pra_11
     type: code
     start: 0xD61500
     vram_class: map
     subsegments:
-    - [auto, c, pra_11_0_header]
-    - [auto, c, pra_11_1_music]
-    - [auto, c, pra_11_2_main]
-    - [auto, c, pra_11_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_12
     dir: world/area_pra/pra_12
     type: code
     start: 0xD62D10
     vram_class: map
     subsegments:
-    - [auto, c, pra_12_0_header]
-    - [auto, c, pra_12_1_music]
-    - [auto, c, pra_12_2_main]
-    - [auto, c, pra_12_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_13
     dir: world/area_pra/pra_13
     type: code
     start: 0xD645E0
     vram_class: map
     subsegments:
-    - [auto, c, pra_13_0_header]
-    - [auto, c, pra_13_1_music]
-    - [auto, c, pra_13_2_main]
-    - [auto, c, pra_13_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_14
     dir: world/area_pra/pra_14
     type: code
     start: 0xD67D00
     vram_class: map
     subsegments:
-    - [auto, c, pra_14_0_header]
-    - [auto, c, pra_14_1_music]
-    - [auto, c, pra_14_2_main]
-    - [auto, c, pra_14_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_15
     dir: world/area_pra/pra_15
     type: code
     start: 0xD69810
     vram_class: map
     subsegments:
-    - [auto, c, pra_15_0_header]
-    - [auto, c, pra_15_1_music]
-    - [auto, c, pra_15_2_main]
-    - [auto, c, pra_15_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_16
     dir: world/area_pra/pra_16
     type: code
     start: 0xD69B20
     vram_class: map
     subsegments:
-    - [auto, c, pra_16_0_header]
-    - [auto, c, pra_16_1_music]
-    - [auto, c, pra_16_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: pra_18
     dir: world/area_pra/pra_18
     type: code
     start: 0xD6B620
     vram_class: map
     subsegments:
-    - [auto, c, pra_18_0_header]
-    - [auto, c, pra_18_1_music]
-    - [auto, c, pra_18_2_main]
-    - [auto, c, pra_18_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_19
     dir: world/area_pra/pra_19
     type: code
     start: 0xD6E9B0
     vram_class: map
     subsegments:
-    - [auto, c, pra_19_0_header]
-    - [auto, c, pra_19_1_music]
-    - [auto, c, pra_19_2_main]
-    - [auto, c, pra_19_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_20
     dir: world/area_pra/pra_20
     type: code
     start: 0xD763A0
     vram_class: map
     subsegments:
-    - [auto, c, pra_20_0_header]
-    - [auto, c, pra_20_1_music]
-    - [auto, c, pra_20_2_main]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
   - name: pra_21
     dir: world/area_pra/pra_21
     type: code
     start: 0xD77F20
     vram_class: map
     subsegments:
-    - [auto, c, pra_21_0_header]
-    - [auto, c, pra_21_1_music]
-    - [auto, c, pra_21_2_main]
-    - [auto, c, pra_21_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_22
     dir: world/area_pra/pra_22
     type: code
     start: 0xD78880
     vram_class: map
     subsegments:
-    - [auto, c, pra_22_0_header]
-    - [auto, c, pra_22_1_music]
-    - [auto, c, pra_22_2_main]
-    - [auto, c, pra_22_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_27
     dir: world/area_pra/pra_27
     type: code
     start: 0xD799F0
     vram_class: map
     subsegments:
-    - [auto, c, pra_27_0_header]
-    - [auto, c, pra_27_1_music]
-    - [auto, c, pra_27_2_main]
-    - [auto, c, pra_27_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_28
     dir: world/area_pra/pra_28
     type: code
     start: 0xD7B2A0
     vram_class: map
     subsegments:
-    - [auto, c, pra_28_0_header]
-    - [auto, c, pra_28_1_music]
-    - [auto, c, pra_28_2_main]
-    - [auto, c, pra_28_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_29
     dir: world/area_pra/pra_29
     type: code
     start: 0xD7CB50
     vram_class: map
     subsegments:
-    - [auto, c, pra_29_0_header]
-    - [auto, c, pra_29_1_music]
-    - [auto, c, pra_29_2_entity]
-    - [auto, c, pra_29_3_main]
-    - [auto, c, pra_29_4_bridge]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, bridge]
   - name: pra_31
     dir: world/area_pra/pra_31
     type: code
     start: 0xD7ED60
     vram_class: map
     subsegments:
-    - [auto, c, pra_31_0_header]
-    - [auto, c, pra_31_1_music]
-    - [auto, c, pra_31_2_npc]
-    - [auto, c, pra_31_3_main]
-    - [auto, c, pra_31_4_puzzle]
-    - [auto, c, pra_31_5_texture_1]
-    - [auto, c, pra_31_6_texture_2]
-    - [auto, c, pra_31_7_texture_3]
-    - [auto, c, pra_31_8_stairs_skele]
-    - [auto, c, pra_31_9_stairs_anim]
-    - [auto, c, pra_31_10_stairs_lights]
-    - [auto, c, pra_31_11_stairs_vtx]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, npc]
+    - [auto, c, main]
+    - [auto, c, puzzle]
+    - [auto, c, texture_1]
+    - [auto, c, texture_2]
+    - [auto, c, texture_3]
+    - [auto, c, stairs_skele]
+    - [auto, c, stairs_anim]
+    - [auto, c, stairs_lights]
+    - [auto, c, stairs_vtx]
     - start: 0xD82270
       type: .data
-      name: pra_31_5_texture_1
+      name: texture_1
       subsegments:
       - [0xD82270, ci4, texture_1, 64, 64]
       - [0xD82A70, palette, texture_1]
@@ -12680,7 +12680,7 @@ segments:
       - [0xD82B48]
     - start: 0xD82B50
       type: .data
-      name: pra_31_6_texture_2
+      name: texture_2
       subsegments:
       - [0xD82B50, ci4, texture_2, 64, 64]
       - [0xD83350, palette, texture_2]
@@ -12688,14 +12688,14 @@ segments:
       - [0xD83418]
     - start: 0xD83420
       type: .data
-      name: pra_31_7_texture_3
+      name: texture_3
       subsegments:
       - [0xD83420, rgba16, texture_3, 32, 32]
       - [0xD83C20, gfx, texture_3]
       - [0xD83CA8]
     - start: 0xD83CB0
       type: .data
-      name: pra_31_8_stairs_skele
+      name: stairs_skele
       subsegments:
       - [0xD83CB0, gfx, unk_01]
       - [0xD83D28, gfx, unk_02]
@@ -12734,7 +12734,7 @@ segments:
       - [0xD847F0]
     - start: 0xD864A0
       type: .data
-      name: pra_31_11_stairs_vtx
+      name: stairs_vtx
       subsegments:
       - [0xD864A0]
       - [0xD86820, vtx, stairs]
@@ -12746,356 +12746,356 @@ segments:
     start: 0xD86A00
     vram_class: map
     subsegments:
-    - [auto, c, pra_32_0_header]
-    - [auto, c, pra_32_1_music]
-    - [auto, c, pra_32_2_main]
-    - [auto, c, pra_32_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_33
     dir: world/area_pra/pra_33
     type: code
     start: 0xD896E0
     vram_class: map
     subsegments:
-    - [auto, c, pra_33_0_header]
-    - [auto, c, pra_33_1_music]
-    - [auto, c, pra_33_2_main]
-    - [auto, c, pra_33_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_34
     dir: world/area_pra/pra_34
     type: code
     start: 0xD8B3B0
     vram_class: map
     subsegments:
-    - [auto, c, pra_34_0_header]
-    - [auto, c, pra_34_1_music]
-    - [auto, c, pra_34_2_main]
-    - [auto, c, pra_34_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: pra_35
     dir: world/area_pra/pra_35
     type: code
     start: 0xD8D250
     vram_class: map
     subsegments:
-    - [auto, c, pra_35_0_header]
-    - [auto, c, pra_35_1_music]
-    - [auto, c, pra_35_2_main]
-    - [auto, c, pra_35_3_npc]
-    - [auto, c, pra_35_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: pra_36
     dir: world/area_pra/pra_36
     type: code
     start: 0xD91700
     vram_class: map
     subsegments:
-    - [auto, c, pra_36_0_header]
-    - [auto, c, pra_36_1_music]
-    - [auto, c, pra_36_2_main]
-    - [auto, c, pra_36_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_37
     dir: world/area_pra/pra_37
     type: code
     start: 0xD92F40
     vram_class: map
     subsegments:
-    - [auto, c, pra_37_0_header]
-    - [auto, c, pra_37_1_music]
-    - [auto, c, pra_37_2_main]
-    - [auto, c, pra_37_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_38
     dir: world/area_pra/pra_38
     type: code
     start: 0xD955F0
     vram_class: map
     subsegments:
-    - [auto, c, pra_38_0_header]
-    - [auto, c, pra_38_1_music]
-    - [auto, c, pra_38_2_main]
-    - [auto, c, pra_38_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_39
     dir: world/area_pra/pra_39
     type: code
     start: 0xD97890
     vram_class: map
     subsegments:
-    - [auto, c, pra_39_0_header]
-    - [auto, c, pra_39_1_music]
-    - [auto, c, pra_39_2_main]
-    - [auto, c, pra_39_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: pra_40
     dir: world/area_pra/pra_40
     type: code
     start: 0xD999B0
     vram_class: map
     subsegments:
-    - [auto, c, pra_40_0_header]
-    - [auto, c, pra_40_1_music]
-    - [auto, c, pra_40_2_main]
-    - [auto, c, pra_40_3_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
   - name: omo_01
     dir: world/area_omo/omo_01
     type: code
     start: 0xD9AEF0
     vram_class: map
     subsegments:
-    - [auto, c, omo_01_0_header]
-    - [auto, c, omo_01_1_music]
-    - [auto, c, omo_01_2_main]
-    - [auto, c, omo_01_3_gizmos]
-    - [auto, c, omo_01_4_npc]
-    - [auto, c, omo_01_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_02
     dir: world/area_omo/omo_02
     type: code
     start: 0xD9D4D0
     vram_class: map
     subsegments:
-    - [auto, c, omo_02_0_header]
-    - [auto, c, omo_02_1_music]
-    - [auto, c, omo_02_2_main]
-    - [auto, c, omo_02_3_entity]
-    - [auto, c, omo_02_4_gizmos]
-    - [auto, c, omo_02_5_barricade]
-    - [auto, c, omo_02_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, gizmos]
+    - [auto, c, barricade]
+    - [auto, c, npc]
   - name: omo_03
     dir: world/area_omo/omo_03
     type: code
     start: 0xDA5240
     vram_class: map
     subsegments:
-    - [auto, c, omo_03_0_header]
-    - [auto, c, omo_03_1_music]
-    - [auto, c, omo_03_2_main]
-    - [auto, c, omo_03_3_gizmos]
-    - [auto, c, omo_03_4_entity]
-    - [auto, c, omo_03_5_npc]
-    - [auto, c, omo_03_6_train]
-    - [auto, c, omo_03_7_train_drop]
-    - [auto, c, omo_03_8_epilogue]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, train]
+    - [auto, c, train_drop]
+    - [auto, c, epilogue]
   - name: omo_04
     dir: world/area_omo/omo_04
     type: code
     start: 0xDAD400
     vram_class: map
     subsegments:
-    - [auto, c, omo_04_0_header]
-    - [auto, c, omo_04_1_music]
-    - [auto, c, omo_04_2_main]
-    - [auto, c, omo_04_3_gizmos]
-    - [auto, c, omo_04_4_entity]
-    - [auto, c, omo_04_5_npc]
-    - [auto, c, omo_04_6_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, scenes]
   - name: omo_05
     dir: world/area_omo/omo_05
     type: code
     start: 0xDB22C0
     vram_class: map
     subsegments:
-    - [auto, c, omo_05_0_header]
-    - [auto, c, omo_05_1_music]
-    - [auto, c, omo_05_2_main]
-    - [auto, c, omo_05_3_gizmos]
-    - [auto, c, omo_05_4_npc]
-    - [auto, c, omo_05_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_06
     dir: world/area_omo/omo_06
     type: code
     start: 0xDB7910
     vram_class: map
     subsegments:
-    - [auto, c, omo_06_0_header]
-    - [auto, c, omo_06_1_music]
-    - [auto, c, omo_06_2_main]
-    - [auto, c, omo_06_3_gizmos]
-    - [auto, c, omo_06_4_train]
-    - [auto, c, omo_06_5_npc]
-    - [auto, c, omo_06_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, train]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_07
     dir: world/area_omo/omo_07
     type: code
     start: 0xDBD2B0
     vram_class: map
     subsegments:
-    - [auto, c, omo_07_0_header]
-    - [auto, c, omo_07_1_music]
-    - [auto, c, omo_07_2_main]
-    - [auto, c, omo_07_3_gizmos]
-    - [auto, c, omo_07_4_npc]
-    - [auto, c, omo_07_5_entity]
-    - [auto, c, omo_07_6_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, scenes]
   - name: omo_08
     dir: world/area_omo/omo_08
     type: code
     start: 0xDC43D0
     vram_class: map
     subsegments:
-    - [auto, c, omo_08_0_header]
-    - [auto, c, omo_08_1_music]
-    - [auto, c, omo_08_2_main]
-    - [auto, c, omo_08_3_boxes]
-    - [auto, c, omo_08_4_train]
-    - [auto, c, omo_08_5_entity]
-    - [auto, c, omo_08_6_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, boxes]
+    - [auto, c, train]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: omo_09
     dir: world/area_omo/omo_09
     type: code
     start: 0xDCCCD0
     vram_class: map
     subsegments:
-    - [auto, c, omo_09_0_header]
-    - [auto, c, omo_09_1_music]
-    - [auto, c, omo_09_2_main]
-    - [auto, c, omo_09_3_conveyors]
-    - [auto, c, omo_09_4_slot_machine]
-    - [auto, c, omo_09_5_gizmos]
-    - [auto, c, omo_09_6_entity]
-    - [auto, c, omo_09_7_npc]
-    - [auto, c, omo_09_8_scenes]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, conveyors]
+    - [auto, c, slot_machine]
+    - [auto, c, gizmos]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, scenes]
   - name: omo_10
     dir: world/area_omo/omo_10
     type: code
     start: 0xDD79B0
     vram_class: map
     subsegments:
-    - [auto, c, omo_10_0_header]
-    - [auto, c, omo_10_1_music]
-    - [auto, c, omo_10_2_main]
-    - [auto, c, omo_10_3_gizmos]
-    - [auto, c, omo_10_4_train]
-    - [auto, c, omo_10_5_npc]
-    - [auto, c, omo_10_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, train]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_11
     dir: world/area_omo/omo_11
     type: code
     start: 0xDDC830
     vram_class: map
     subsegments:
-    - [auto, c, omo_11_0_header]
-    - [auto, c, omo_11_1_music]
-    - [auto, c, omo_11_2_main]
-    - [auto, c, omo_11_3_gizmos]
-    - [auto, c, omo_11_4_entity]
-    - [auto, c, omo_11_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: omo_12
     dir: world/area_omo/omo_12
     type: code
     start: 0xDDF310
     vram_class: map
     subsegments:
-    - [auto, c, omo_12_0_header]
-    - [auto, c, omo_12_1_music]
-    - [auto, c, omo_12_2_main]
-    - [auto, c, omo_12_3_npc]
-    - [auto, c, omo_12_4_new_partner]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
   - name: omo_13
     dir: world/area_omo/omo_13
     type: code
     start: 0xDE2490
     vram_class: map
     subsegments:
-    - [auto, c, omo_13_0_header]
-    - [auto, c, omo_13_1_music]
-    - [auto, c, omo_13_2_main]
-    - [auto, c, omo_13_3_gizmos]
-    - [auto, c, omo_13_4_npc]
-    - [auto, c, omo_13_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: omo_14
     dir: world/area_omo/omo_14
     type: code
     start: 0xDE56B0
     vram_class: map
     subsegments:
-    - [auto, c, omo_14_0_header]
-    - [auto, c, omo_14_1_music]
-    - [auto, c, omo_14_2_main]
-    - [auto, c, omo_14_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: omo_15
     dir: world/area_omo/omo_15
     type: code
     start: 0xDE8770
     vram_class: map
     subsegments:
-    - [auto, c, omo_15_0_header]
-    - [auto, c, omo_15_1_music]
-    - [auto, c, omo_15_2_main]
-    - [auto, c, omo_15_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: omo_16
     dir: world/area_omo/omo_16
     type: code
     start: 0xDEBED0
     vram_class: map
     subsegments:
-    - [auto, c, omo_16_0_header]
-    - [auto, c, omo_16_1_main]
-    - [auto, c, omo_16_2_train]
-    - [auto, c, omo_16_3_npc]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, train]
+    - [auto, c, npc]
   - name: omo_17
     dir: world/area_omo/omo_17
     type: code
     start: 0xDEEEA0
     vram_class: map
     subsegments:
-    - [auto, c, omo_17_0_header]
-    - [auto, c, omo_17_1_main]
-    - [auto, c, omo_17_2_gizmos]
-    - [auto, c, omo_17_3_train]
-    - [auto, c, omo_17_4_npc]
-    - [auto, c, omo_17_5_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, gizmos]
+    - [auto, c, train]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: end_00
     dir: world/area_end/end_00
     type: code
     start: 0xDF6A00
     vram_class: map
     subsegments:
-    - [auto, c, end_00_0_header]
-    - [auto, c, end_00_1_main]
-    - [auto, c, end_00_2_credits]
-    - [auto, c, end_00_3_parade_setup]
-    - [auto, c, end_00_4_allies]
-    - [auto, c, end_00_5_koopas]
-    - [auto, c, end_00_6_caravan]
-    - [auto, c, end_00_7_boos]
-    - [auto, c, end_00_8_yoshis]
-    - [auto, c, end_00_9_huff_n_puff]
-    - [auto, c, end_00_A_crystal_king]
-    - [auto, c, end_00_B_bowser]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, credits]
+    - [auto, c, parade_setup]
+    - [auto, c, allies]
+    - [auto, c, koopas]
+    - [auto, c, caravan]
+    - [auto, c, boos]
+    - [auto, c, yoshis]
+    - [auto, c, huff_n_puff]
+    - [auto, c, crystal_king]
+    - [auto, c, bowser]
   - name: end_01
     dir: world/area_end/end_01
     type: code
     start: 0xE05360
     vram_class: map
     subsegments:
-    - [auto, c, end_01_0_header]
-    - [auto, c, end_01_1_main]
-    - [auto, c, end_01_2_credits]
-    - [auto, c, end_01_3_parade_setup]
-    - [auto, c, end_01_4_opera_float]
-    - [auto, c, end_01_5_flower_float]
-    - [auto, c, end_01_6_shyguy_float]
-    - [auto, c, end_01_7_peach_float]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, credits]
+    - [auto, c, parade_setup]
+    - [auto, c, opera_float]
+    - [auto, c, flower_float]
+    - [auto, c, shyguy_float]
+    - [auto, c, peach_float]
   - name: mgm_00
     dir: world/area_mgm/mgm_00
     type: code
     start: 0xE0E7A0
     vram_class: map
     subsegments:
-    - [auto, c, mgm_00_0_header]
-    - [auto, c, mgm_00_1_main]
-    - [auto, c, mgm_00_2_npc]
-    - [auto, c, mgm_00_3_scoreboard]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, scoreboard]
   - name: mgm_01
     dir: world/area_mgm/mgm_01
     type: code
     start: 0xE12760
     vram_class: map
     subsegments:
-    - [auto, c, mgm_01_0_header]
-    - [auto, c, mgm_01_1_main]
-    - [auto, c, mgm_01_2_npc]
-    - [auto, c, mgm_01_3_entity]
-    - [auto, c, mgm_01_4_images]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, images]
     - start: 0xE15440
       type: .data
-      name: mgm_01_4_images
+      name: images
       subsegments:
       - [0xE15440, ci4, panel_1_coin, 32, 32]
       - [0xE15640, palette, panel_1_coin]
@@ -13112,13 +13112,13 @@ segments:
     start: 0xE15D80
     vram_class: map
     subsegments:
-    - [auto, c, mgm_02_0_header]
-    - [auto, c, mgm_02_1_main]
-    - [auto, c, mgm_02_2_npc]
-    - [auto, c, mgm_02_3_images]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, images]
     - start: 0xE1E020
       type: .data
-      name: mgm_02_3_images
+      name: images
       subsegments:
       - [0xE1E020, ci4, panel_peach, 32, 32]
       - [0xE1E220, palette, panel_peach]
@@ -13129,16 +13129,16 @@ segments:
     start: 0xE1E380
     vram_class: map
     subsegments:
-    - [auto, c, mgm_03_0_header]
-    - [auto, c, mgm_03_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: gv_01
     dir: world/area_gv/gv_01
     type: code
     start: 0xE1E460
     vram_class: map
     subsegments:
-    - [auto, c, gv_01_0_header]
-    - [auto, c, gv_01_1_main]
+    - [auto, c, settings]
+    - [auto, c, main]
   - name: heaps2
     type: code
     start: 0xE20110
@@ -14509,10 +14509,10 @@ segments:
   #  start: 0xE9AFF0
   #  vram_class: map
   #  subsegments:
-  #  - [auto, c, kzn_11_0_header]
-  #  - [auto, c, kzn_11_1_main]
-  #  - [auto, c, kzn_11_2_platforms]
-  #  - [auto, c, kzn_11_3_npc]
+  #  - [auto, c, settings]
+  #  - [auto, c, main]
+  #  - [auto, c, platforms]
+  #  - [auto, c, npc]
   #  - [0xE9D650]
   - name: dead_kzn_17
     dir: world/dead/area_kzn/kzn_17
@@ -14521,11 +14521,11 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, kzn_17_0_header]
-    - [auto, c, kzn_17_1_main]
-    - [auto, c, kzn_17_2_entity]
-    - [auto, c, kzn_17_3_npc]
-    - [auto, c, kzn_17_4_tromp]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, tromp]
   - name: dead_kzn_18
     dir: world/dead/area_kzn/kzn_18
     type: code
@@ -14533,10 +14533,10 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, kzn_18_0_header]
-    - [auto, c, kzn_18_1_main]
-    - [auto, c, kzn_18_2_npc]
-    - [auto, c, kzn_18_3_entity]
+    - [auto, c, settings]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dead_kzn_19
     dir: world/dead/area_kzn/kzn_19
     type: code
@@ -14544,16 +14544,16 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, kzn_19_0_header]
-    - [auto, c, kzn_19_1_music]
-    - [auto, c, kzn_19_2_main]
-    - [auto, c, kzn_19_3_npc_settings]
-    - [auto, c, kzn_19_4_npc]
-    - [auto, c, kzn_19_5_eruption]
-    - [auto, c, kzn_19_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc_settings]
+    - [auto, c, npc]
+    - [auto, c, eruption]
+    - [auto, c, entity]
     - start: 0xEABB20
       type: .data
-      name: kzn_19_4_npc
+      name: npc
       subsegments:
       - [0xEABB20]
       - [0xEABFB8, ci4, ../../lava_piranha/vine, 64, 32]
@@ -14567,10 +14567,10 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, kzn_20_0_header]
-    - [auto, c, kzn_20_1_music]
-    - [auto, c, kzn_20_2_main]
-    - [auto, c, kzn_20_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: dead_kzn_22
     dir: world/dead/area_kzn/kzn_22
     type: code
@@ -14578,11 +14578,11 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, kzn_22_0_header]
-    - [auto, c, kzn_22_1_music]
-    - [auto, c, kzn_22_2_main]
-    - [auto, c, kzn_22_3_entity]
-    - [auto, c, kzn_22_4_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, entity]
+    - [auto, c, npc]
   - name: dead_kzn_23
     dir: world/dead/area_kzn/kzn_23
     type: code
@@ -14590,10 +14590,10 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, kzn_23_0_header]
-    - [auto, c, kzn_23_1_music]
-    - [auto, c, kzn_23_2_main]
-    - [auto, c, kzn_23_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: dead_flo_00
     dir: world/dead/area_flo/flo_00
     type: code
@@ -14601,13 +14601,13 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_00_0_header]
-    - [auto, c, flo_00_1_music]
-    - [auto, c, flo_00_2_main]
-    - [auto, c, flo_00_3_npc]
-    - [auto, c, flo_00_4_epilogue]
-    - [auto, c, flo_00_5_beanstalk]
-    - [auto, c, flo_00_6_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, epilogue]
+    - [auto, c, beanstalk]
+    - [auto, c, entity]
   - name: dead_flo_03
     dir: world/dead/area_flo/flo_03
     type: code
@@ -14615,12 +14615,12 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_03_0_header]
-    - [auto, c, flo_03_1_music]
-    - [auto, c, flo_03_2_main]
-    - [auto, c, flo_03_3_npc]
-    - [auto, c, flo_03_4_foliage]
-    - [auto, c, flo_03_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, entity]
   - name: dead_flo_07
     dir: world/dead/area_flo/flo_07
     type: code
@@ -14628,10 +14628,10 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_07_0_header]
-    - [auto, c, flo_07_1_music]
-    - [auto, c, flo_07_2_main]
-    - [auto, c, flo_07_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: dead_flo_08
     dir: world/dead/area_flo/flo_08
     type: code
@@ -14639,13 +14639,13 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_08_0_header]
-    - [auto, c, flo_08_1_music]
-    - [auto, c, flo_08_2_entity]
-    - [auto, c, flo_08_3_main]
-    - [auto, c, flo_08_4_npc]
-    - [auto, c, flo_08_5_foliage]
-    - [auto, c, flo_08_6_vines]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, foliage]
+    - [auto, c, vines]
   - name: dead_flo_09
     dir: world/dead/area_flo/flo_09
     type: code
@@ -14653,12 +14653,12 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_09_0_header]
-    - [auto, c, flo_09_1_music]
-    - [auto, c, flo_09_2_main]
-    - [auto, c, flo_09_3_vines]
-    - [auto, c, flo_09_4_foliage]
-    - [auto, c, flo_09_5_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, foliage]
+    - [auto, c, npc]
   - name: dead_flo_10
     dir: world/dead/area_flo/flo_10
     type: code
@@ -14666,14 +14666,14 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_10_0_header]
-    - [auto, c, flo_10_1_music]
-    - [auto, c, flo_10_2_entity]
-    - [auto, c, flo_10_3_main]
-    - [auto, c, flo_10_4_fountain]
-    - [auto, c, flo_10_5_npc]
-    - [auto, c, flo_10_6_waterfx]
-    - [auto, c, flo_10_7_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, fountain]
+    - [auto, c, npc]
+    - [auto, c, waterfx]
+    - [auto, c, foliage]
   - name: dead_flo_11
     dir: world/dead/area_flo/flo_11
     type: code
@@ -14681,11 +14681,11 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_11_0_header]
-    - [auto, c, flo_11_1_music]
-    - [auto, c, flo_11_2_main]
-    - [auto, c, flo_11_3_npc]
-    - [auto, c, flo_11_4_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dead_flo_12
     dir: world/dead/area_flo/flo_12
     type: code
@@ -14693,10 +14693,10 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_12_0_header]
-    - [auto, c, flo_12_1_music]
-    - [auto, c, flo_12_2_main]
-    - [auto, c, flo_12_3_npc]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
   - name: dead_flo_13
     dir: world/dead/area_flo/flo_13
     type: code
@@ -14704,12 +14704,12 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_13_0_header]
-    - [auto, c, flo_13_1_music]
-    - [auto, c, flo_13_2_entity]
-    - [auto, c, flo_13_3_main]
-    - [auto, c, flo_13_4_npc]
-    - [auto, c, flo_13_5_new_partner]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, new_partner]
   - name: dead_flo_14
     dir: world/dead/area_flo/flo_14
     type: code
@@ -14717,13 +14717,13 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_14_0_header]
-    - [auto, c, flo_14_1_music]
-    - [auto, c, flo_14_2_main]
-    - [auto, c, flo_14_3_bubbles]
-    - [auto, c, flo_14_4_npc]
-    - [auto, c, flo_14_5_entity]
-    - [auto, c, flo_14_6_logs]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, bubbles]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, logs]
   - name: dead_flo_15
     dir: world/dead/area_flo/flo_15
     type: code
@@ -14731,12 +14731,12 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_15_0_header]
-    - [auto, c, flo_15_1_music]
-    - [auto, c, flo_15_2_main]
-    - [auto, c, flo_15_3_npc]
-    - [auto, c, flo_15_4_entity]
-    - [auto, c, flo_15_5_stairs]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, npc]
+    - [auto, c, entity]
+    - [auto, c, stairs]
   - name: dead_flo_16
     dir: world/dead/area_flo/flo_16
     type: code
@@ -14744,13 +14744,13 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_16_0_header]
-    - [auto, c, flo_16_1_music]
-    - [auto, c, flo_16_2_main]
-    - [auto, c, flo_16_3_vines]
-    - [auto, c, flo_16_4_entity]
-    - [auto, c, flo_16_5_npc]
-    - [auto, c, flo_16_6_puzzle]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, vines]
+    - [auto, c, entity]
+    - [auto, c, npc]
+    - [auto, c, puzzle]
   - name: dead_flo_17
     dir: world/dead/area_flo/flo_17
     type: code
@@ -14758,12 +14758,12 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_17_0_header]
-    - [auto, c, flo_17_1_music]
-    - [auto, c, flo_17_2_main]
-    - [auto, c, flo_17_3_logs]
-    - [auto, c, flo_17_4_npc]
-    - [auto, c, flo_17_5_entity]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, logs]
+    - [auto, c, npc]
+    - [auto, c, entity]
   - name: dead_flo_18
     dir: world/dead/area_flo/flo_18
     type: code
@@ -14771,12 +14771,12 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_18_0_header]
-    - [auto, c, flo_18_1_music]
-    - [auto, c, flo_18_2_main]
-    - [auto, c, flo_18_3_machine]
-    - [auto, c, flo_18_4_npc]
-    - [auto, c, flo_18_5_foliage]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, main]
+    - [auto, c, machine]
+    - [auto, c, npc]
+    - [auto, c, foliage]
   - name: dead_flo_19
     dir: world/dead/area_flo/flo_19
     type: code
@@ -14784,12 +14784,12 @@ segments:
     vram_class: map
     dead_code: True
     subsegments:
-    - [auto, c, flo_19_0_header]
-    - [auto, c, flo_19_1_music]
-    - [auto, c, flo_19_2_entity]
-    - [auto, c, flo_19_3_main]
-    - [auto, c, flo_19_4_clouds]
-    - [auto, c, flo_19_5_beanstalk]
+    - [auto, c, settings]
+    - [auto, c, music]
+    - [auto, c, entity]
+    - [auto, c, main]
+    - [auto, c, clouds]
+    - [auto, c, beanstalk]
 
   - [0xF00000, pm_sbn, audio]
   - [0x1942C40, bin, copy_1942C40] # copy of 0x1642C40 - 0x1643000