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 01/31] 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

From dcba4f1883e7062b35c82b69b8474cb3ae4246ef Mon Sep 17 00:00:00 2001
From: Rainchus <rainmachus@gmail.com>
Date: Fri, 19 Apr 2024 01:22:24 -0500
Subject: [PATCH 02/31] Fix hardcoding of moveID in battle/sushie.c (#1183)

---
 src/battle/partner/sushie.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/battle/partner/sushie.c b/src/battle/partner/sushie.c
index 3c37c2f9ab..c9f0a3530b 100644
--- a/src/battle/partner/sushie.c
+++ b/src/battle/partner/sushie.c
@@ -818,7 +818,7 @@ EvtScript N(bellyFlop) = {
         Else
             Call(GetMenuSelection, LVar0, LVar1, LVar2)
             Switch(LVar2)
-                CaseEq(167)
+                CaseEq(MOVE_BELLY_FLOP1)
                     Wait(13)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
                     Wait(1)
@@ -829,7 +829,7 @@ EvtScript N(bellyFlop) = {
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
                     Wait(1)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.0), Float(1.0), Float(1.0))
-                CaseEq(168)
+                CaseEq(MOVE_BELLY_FLOP2)
                     Wait(13)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.05), Float(1.05), Float(1.0))
                     Wait(1)
@@ -840,7 +840,7 @@ EvtScript N(bellyFlop) = {
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.2), Float(1.2), Float(1.0))
                     Wait(1)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.25), Float(1.25), Float(1.0))
-                CaseEq(169)
+                CaseEq(MOVE_BELLY_FLOP3)
                     Wait(13)
                     Call(SetActorScale, ACTOR_PARTNER, Float(1.1), Float(1.1), Float(1.0))
                     Wait(1)

From d35bdf466bcc520f115807e81a2451db9ee07ac9 Mon Sep 17 00:00:00 2001
From: Rainchus <rainmachus@gmail.com>
Date: Mon, 22 Apr 2024 07:09:34 -0500
Subject: [PATCH 03/31] Add missing pause_tabs enums, fix BlueNinjaKoopa ->
 BlackNinjaKoopa (#1184)

---
 src/battle/actors.yaml          |  4 ++--
 src/pause/pause_tabs.c          | 12 ++++++------
 tools/splat_ext/msg.yaml        |  4 ++--
 tools/splat_ext/msg_ique.yaml   |  4 ++--
 tools/splat_ext/msg_pal_en.yaml |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/battle/actors.yaml b/src/battle/actors.yaml
index d4c68a6dd3..699b88e651 100644
--- a/src/battle/actors.yaml
+++ b/src/battle/actors.yaml
@@ -1730,8 +1730,8 @@
     shadowOffset: 0
 - BlackNinjakoopa:
     level: 17
-    nameMsg: MSG_EnemyName_BlueNinjakoopa
-    tattleMsg: MSG_EnemyTattle_BlueNinjakoopa
+    nameMsg: MSG_EnemyName_BlackNinjakoopa
+    tattleMsg: MSG_EnemyTattle_BlackNinjakoopa
     walkSound: [ SOUND_ACTOR_STEP_A, SOUND_ACTOR_STEP_B ]
     flySound: [ SOUND_NONE, SOUND_NONE ]
     jumpSound: SOUND_ACTOR_JUMP
diff --git a/src/pause/pause_tabs.c b/src/pause/pause_tabs.c
index 38901d2f02..e875061151 100644
--- a/src/pause/pause_tabs.c
+++ b/src/pause/pause_tabs.c
@@ -213,7 +213,7 @@ void pause_tabs_draw_stats(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
     hud_element_set_render_pos(gPauseTabsIconIDs[0], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[0]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 25) {
+        if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_STATS) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -231,7 +231,7 @@ void pause_tabs_draw_badges(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s3
     hud_element_set_render_pos(gPauseTabsIconIDs[1], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[1]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 26) {
+        if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_BADGES) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -249,7 +249,7 @@ void pause_tabs_draw_items(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
     hud_element_set_render_pos(gPauseTabsIconIDs[2], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[2]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 27) {
+        if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_ITEMS) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -267,7 +267,7 @@ void pause_tabs_draw_party(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32
     hud_element_set_render_pos(gPauseTabsIconIDs[3], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[3]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 28) {
+        if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_PARTY) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -285,7 +285,7 @@ void pause_tabs_draw_spirits(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s
     hud_element_set_render_pos(gPauseTabsIconIDs[4], baseX + 22, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[4]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 29) {
+        if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_SPIRITS) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
@@ -303,7 +303,7 @@ void pause_tabs_draw_map(MenuPanel* menu, s32 baseX, s32 baseY, s32 width, s32 h
     hud_element_set_render_pos(gPauseTabsIconIDs[5], baseX + 23, baseY + 7);
     hud_element_draw_without_clipping(gPauseTabsIconIDs[5]);
     if (gPauseMenuCurrentTab == 0) {
-        if (gPauseTabsWindowIDs[menu->col] == 30) {
+        if (gPauseTabsWindowIDs[menu->col] == WINDOW_ID_PAUSE_TAB_MAP) {
             pause_set_cursor_pos(gPauseTabsWindowIDs[menu->col], baseX + TABS_CURSOR_OFFSET_X, baseY + 6);
         }
     }
diff --git a/tools/splat_ext/msg.yaml b/tools/splat_ext/msg.yaml
index 87683761e5..6df7b42760 100644
--- a/tools/splat_ext/msg.yaml
+++ b/tools/splat_ext/msg.yaml
@@ -5141,7 +5141,7 @@
 - [0x1C, 0x000C, EnemyTattle_BillBlaster]
 - [0x1C, 0x000D, EnemyTattle_FakeBowser]
 - [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
-- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
+- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
 - [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
 - [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
 - [0x1C, 0x0012, EnemyTattle_KoopaBros]
@@ -7570,7 +7570,7 @@
 - [0x29, 0x000C, EnemyName_BillBlaster]
 - [0x29, 0x000D, EnemyName_FakeBowser]
 - [0x29, 0x000E, EnemyName_RedNinjakoopa]
-- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
+- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
 - [0x29, 0x0010, EnemyName_YellowNinjakoopa]
 - [0x29, 0x0011, EnemyName_GreenNinjakoopa]
 - [0x29, 0x0012, EnemyName_KoopaBros]
diff --git a/tools/splat_ext/msg_ique.yaml b/tools/splat_ext/msg_ique.yaml
index 7511d55d67..a368014fe9 100644
--- a/tools/splat_ext/msg_ique.yaml
+++ b/tools/splat_ext/msg_ique.yaml
@@ -5141,7 +5141,7 @@
 - [0x1C, 0x000C, EnemyTattle_BillBlaster]
 - [0x1C, 0x000D, EnemyTattle_FakeBowser]
 - [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
-- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
+- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
 - [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
 - [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
 - [0x1C, 0x0012, EnemyTattle_KoopaBros]
@@ -7570,7 +7570,7 @@
 - [0x29, 0x000C, EnemyName_BillBlaster]
 - [0x29, 0x000D, EnemyName_FakeBowser]
 - [0x29, 0x000E, EnemyName_RedNinjakoopa]
-- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
+- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
 - [0x29, 0x0010, EnemyName_YellowNinjakoopa]
 - [0x29, 0x0011, EnemyName_GreenNinjakoopa]
 - [0x29, 0x0012, EnemyName_KoopaBros]
diff --git a/tools/splat_ext/msg_pal_en.yaml b/tools/splat_ext/msg_pal_en.yaml
index 8e90287811..01a409fefb 100644
--- a/tools/splat_ext/msg_pal_en.yaml
+++ b/tools/splat_ext/msg_pal_en.yaml
@@ -5146,7 +5146,7 @@
 - [0x1C, 0x000C, EnemyTattle_BillBlaster]
 - [0x1C, 0x000D, EnemyTattle_FakeBowser]
 - [0x1C, 0x000E, EnemyTattle_RedNinjakoopa]
-- [0x1C, 0x000F, EnemyTattle_BlueNinjakoopa]
+- [0x1C, 0x000F, EnemyTattle_BlackNinjakoopa]
 - [0x1C, 0x0010, EnemyTattle_YellowNinjakoopa]
 - [0x1C, 0x0011, EnemyTattle_GreenNinjakoopa]
 - [0x1C, 0x0012, EnemyTattle_KoopaBros]
@@ -7622,7 +7622,7 @@
 - [0x29, 0x000C, EnemyName_BillBlaster]
 - [0x29, 0x000D, EnemyName_FakeBowser]
 - [0x29, 0x000E, EnemyName_RedNinjakoopa]
-- [0x29, 0x000F, EnemyName_BlueNinjakoopa]
+- [0x29, 0x000F, EnemyName_BlackNinjakoopa]
 - [0x29, 0x0010, EnemyName_YellowNinjakoopa]
 - [0x29, 0x0011, EnemyName_GreenNinjakoopa]
 - [0x29, 0x0012, EnemyName_KoopaBros]

From f2ef0713ff4cfafe58a1218d4f75de61781e17f5 Mon Sep 17 00:00:00 2001
From: z64a <53960937+z64a@users.noreply.github.com>
Date: Thu, 25 Apr 2024 19:42:34 -0400
Subject: [PATCH 04/31] revert texture renaming (#1185)

Co-authored-by: HailSanta <Hail2Santa@gmail.com>
---
 tools/build/mapfs/tex.py        |  5 -----
 tools/splat_ext/tex_archives.py | 15 ++++-----------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/tools/build/mapfs/tex.py b/tools/build/mapfs/tex.py
index f560a907a3..de7b961f67 100644
--- a/tools/build/mapfs/tex.py
+++ b/tools/build/mapfs/tex.py
@@ -30,11 +30,6 @@ def img_from_json(json_data, tex_name: str, asset_stack: Tuple[Path, ...]) -> Te
 
     ret.img_name = json_data["name"]
 
-    if "ext" in json_data:
-        ret.raw_ext = json_data["ext"]
-    else:
-        ret.raw_ext = "tif"
-
     # read data for main tile
     main_data = json_data.get("main")
     if main_data == None:
diff --git a/tools/splat_ext/tex_archives.py b/tools/splat_ext/tex_archives.py
index 682efea105..3006136a02 100644
--- a/tools/splat_ext/tex_archives.py
+++ b/tools/splat_ext/tex_archives.py
@@ -222,9 +222,7 @@ def get_n64_pal(self, texbuf, fmt, depth):
     # extract texture properties and rasters from buffer
     def from_bytes(self, texbuf: TexBuffer):
         # strip area prefix and original extension suffix
-        raw_name = decode_null_terminated_ascii(texbuf.get(32))
-        self.img_name = raw_name[4:-3]
-        self.raw_ext = raw_name[-3:]
+        self.img_name = decode_null_terminated_ascii(texbuf.get(32))
 
         (
             self.aux_width,
@@ -339,10 +337,6 @@ def get_json_entry(self):
         out = {}
         out["name"] = self.img_name
 
-        # only a single texture in 'tst_tex' has 'rgb', otherwise this is always 'tif'
-        if self.raw_ext != "tif":
-            out["ext"] = self.raw_ext
-
         out["main"] = {
             "format": get_format_name(self.main_fmt, self.main_depth),
             "hwrap": wrap_modes.get(self.main_hwrap),
@@ -439,9 +433,8 @@ def pack_color(r, g, b, a):
     def add_bytes(self, tex_name: str, bytes: bytearray):
         pos = len(bytes)
 
-        # form raw name and write to header
-        raw_name = tex_name[:4] + self.img_name + self.raw_ext
-        name_bytes = raw_name.encode("ascii")
+        #  write name to header
+        name_bytes = self.img_name.encode("ascii")
         bytes += name_bytes
 
         # pad name out to 32 bytes
@@ -491,7 +484,7 @@ def add_bytes(self, tex_name: str, bytes: bytearray):
                 bytes += self.aux_pal
 
         size = len(bytes) - pos
-        assert size == self.expected_size(), f"{raw_name}: size mismatch: {size} != {self.expected_size()}"
+        assert size == self.expected_size(), f"{self.img_name}: size mismatch: {size} != {self.expected_size()}"
 
     def expected_size(self) -> int:
         """

From 5f1f696bdc2cce5ad64c8e11f114507262d620d2 Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 2 Jun 2024 19:48:57 +0900
Subject: [PATCH 05/31] Use crunch64 for compression (#1189)

---
 .gitignore                      |   1 -
 Jenkinsfile                     |   1 +
 tools/build/configure.py        |  54 ++++--
 tools/build/sprite/sprites.py   |   4 +-
 tools/build/yay0/.gitignore     |   1 -
 tools/build/yay0/Yay0compress.c | 285 --------------------------------
 6 files changed, 40 insertions(+), 306 deletions(-)
 delete mode 100644 tools/build/yay0/.gitignore
 delete mode 100644 tools/build/yay0/Yay0compress.c

diff --git a/.gitignore b/.gitignore
index 3d48315268..4703126e41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,5 +57,4 @@ build/
 *.backup
 *.crash
 
-/tools/Yay0compress
 /tools/n64crc
diff --git a/Jenkinsfile b/Jenkinsfile
index e3e46167ec..391934d3d6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -19,6 +19,7 @@ pipeline {
                 sh 'curl -L "https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/latest/download/mips-gcc-egcs-2.91.66-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
                 sh 'pip install -U -r requirements.txt'
                 sh 'cargo install pigment64'
+                sh 'cargo install crunch64-cli'
                 sh './configure'
             }
         }
diff --git a/tools/build/configure.py b/tools/build/configure.py
index 9ce2b8564a..9aedf143af 100755
--- a/tools/build/configure.py
+++ b/tools/build/configure.py
@@ -20,11 +20,15 @@
     ROOT = ROOT.relative_to(Path.cwd())
 
 BUILD_TOOLS = Path("tools/build")
-YAY0_COMPRESS_TOOL = f"{BUILD_TOOLS}/yay0/Yay0compress"
 CRC_TOOL = f"{BUILD_TOOLS}/rom/n64crc"
 
-PIGMENT = "pigment64"
-PIGMENT_REQ_VERSION = "0.4.2"
+PIGMENT64 = "pigment64"
+CRUNCH64 = "crunch64"
+
+RUST_TOOLS = [
+    (PIGMENT64, "pigment64", "0.4.2"),
+    (CRUNCH64, "crunch64-cli", "0.3.1"),
+]
 
 
 def exec_shell(command: List[str]) -> str:
@@ -212,7 +216,7 @@ def write_ninja_rules(
     ninja.rule(
         "pigment",
         description="img($img_type) $in",
-        command=f"{PIGMENT} to-bin $img_flags -f $img_type -o $out $in",
+        command=f"{PIGMENT64} to-bin $img_flags -f $img_type -o $out $in",
     )
 
     ninja.rule(
@@ -224,7 +228,7 @@ def write_ninja_rules(
     ninja.rule(
         "yay0",
         description="yay0 $in",
-        command=f"{BUILD_TOOLS}/yay0/Yay0compress $in $out",
+        command=f"crunch64 compress yay0 $in $out",
     )
 
     ninja.rule(
@@ -354,7 +358,6 @@ def write_ninja_for_tools(ninja: ninja_syntax.Writer):
         command=f"cc -w $in -O3 -o $out",
     )
 
-    ninja.build(YAY0_COMPRESS_TOOL, "cc_tool", f"{BUILD_TOOLS}/yay0/Yay0compress.c")
     ninja.build(CRC_TOOL, "cc_tool", f"{BUILD_TOOLS}/rom/n64crc.c")
 
 
@@ -549,9 +552,7 @@ def build(
                 implicit = []
                 order_only = []
 
-                if task == "yay0":
-                    implicit.append(YAY0_COMPRESS_TOOL)
-                elif task in ["cc", "cxx", "cc_modern"]:
+                if task in ["cc", "cxx", "cc_modern"]:
                     order_only.append("generated_code_" + self.version)
                     order_only.append("inc_img_bins_" + self.version)
 
@@ -1334,16 +1335,33 @@ def make_current(self, ninja: ninja_syntax.Writer):
             print(f"    ./configure --cpp {gcc_cpps[0]}")
             exit(1)
 
-    try:
-        version = exec_shell([PIGMENT, "--version"]).split(" ")[1].strip()
+    version_err_msg = ""
+    missing_tools = []
+    version_old_tools = []
+    for tool, crate_name, req_version in RUST_TOOLS:
+        try:
+            version = exec_shell([tool, "--version"]).split(" ")[1].strip()
 
-        if version < PIGMENT_REQ_VERSION:
-            print(f"error: {PIGMENT} version {PIGMENT_REQ_VERSION} or newer is required, system version is {version}\n")
-            exit(1)
-    except (FileNotFoundError, PermissionError):
-        print(f"error: {PIGMENT} is not installed\n")
-        print("To build and install it, obtain cargo:\n\tcurl https://sh.rustup.rs -sSf | sh")
-        print(f"and then run:\n\tcargo install {PIGMENT}")
+            if version < req_version:
+                version_err_msg += (
+                    f"error: {tool} version {req_version} or newer is required, system version is {version}"
+                )
+                version_old_tools.append(crate_name)
+        except (FileNotFoundError, PermissionError):
+            missing_tools.append(crate_name)
+
+    if version_old_tools or missing_tools:
+        if version_err_msg:
+            print(version_err_msg)
+        if missing_tools:
+            print(f"error: cannot find required Rust tool(s): {', '.join(missing_tools)}")
+        print()
+        print("To install/update dependencies, obtain cargo:\n\tcurl https://sh.rustup.rs -sSf | sh")
+        print(f"and then run:")
+        for tool in missing_tools:
+            print(f"\tcargo install {tool}")
+        for tool in version_old_tools:
+            print(f"\tcargo install {tool}")
         exit(1)
 
     # default version behaviour is to only do those that exist
diff --git a/tools/build/sprite/sprites.py b/tools/build/sprite/sprites.py
index a257e84ab6..393a5635b4 100755
--- a/tools/build/sprite/sprites.py
+++ b/tools/build/sprite/sprites.py
@@ -457,7 +457,9 @@ def build_player_sprites(sprite_order: List[str], build_dir: Path, asset_stack:
 
         subprocess.run(
             [
-                str(TOOLS_DIR / "build/yay0/Yay0compress"),
+                str("crunch64"),
+                "compress",
+                "yay0",
                 yay0_in_path,
                 yay0_out_path,
             ]
diff --git a/tools/build/yay0/.gitignore b/tools/build/yay0/.gitignore
deleted file mode 100644
index 7326e0559c..0000000000
--- a/tools/build/yay0/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-Yay0compress
diff --git a/tools/build/yay0/Yay0compress.c b/tools/build/yay0/Yay0compress.c
deleted file mode 100644
index 0dc49ea2a0..0000000000
--- a/tools/build/yay0/Yay0compress.c
+++ /dev/null
@@ -1,285 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-int  main(int argc, const char** argv, const char** envp);
-void encode(FILE* fp, int insize, unsigned char* bz);
-void search(unsigned int a1, int insize, int* a3, unsigned int* a4, unsigned char* bz);
-int  mischarsearch(unsigned char* pattern, int patternlen, unsigned char* data, int datalen);
-void initskip(unsigned short* skip, unsigned char* a1, int a2);
-void writeshort(FILE* fp, short a1);
-void writeint4(FILE* fp, int a1);
-
-int main(int argc, const char** argv, const char** envp) {
-    FILE*          fp; // idb
-    char           src[999];
-    char           dest[999];
-    int            insize; // idb
-    unsigned char* bz;
-
-    if (argc < 3) {
-        fprintf(stderr, "Yay0compress [infile] [outfile]\n");
-        return 1;
-    }
-
-    strcpy(src, argv[1]);
-    strcpy(dest, argv[2]);
-
-    if ((fp = fopen(src, "rb")) == NULL) {
-        fprintf(stderr, "FILE OPEN ERROR![%s]\n", src);
-        return 1;
-    }
-
-    fseek(fp, 0, SEEK_END);
-    insize = ftell(fp);
-    fseek(fp, 0, SEEK_SET);
-
-    bz = malloc(insize);
-    fread(bz, 1, insize, fp);
-    fclose(fp);
-
-    for (int i = 0; src[i]; i++) {
-        if (src[i] == '.') {
-            src[i] = 0;
-            break;
-        }
-    }
-
-    if ((fp = fopen(dest, "wb")) == NULL) {
-        fprintf(stderr, "FILE CREATE ERROR![%s]\n", dest);
-        exit(1);
-    }
-
-    encode(fp, insize, bz);
-
-    return 0;
-}
-
-void encode(FILE* fp, int insize, unsigned char* bz) {
-    int             pp; // weak
-    int             dp; // idb
-    unsigned int*   cmd;
-    unsigned char*  def;
-    unsigned short* pol;
-    unsigned int    v0;  // esi
-    unsigned int    v1 = 0;  // edi
-    int             v2 = 0;  // edx
-    int             v3 = 0;  // ebx
-    int             v4 = 0;  // edx
-    unsigned int    v6;  // [esp+10h] [ebp-14h]
-    unsigned int    v7 = 0;  // [esp+14h] [ebp-10h]
-    int             v8 = 0;  // [esp+18h] [ebp-Ch]
-    unsigned int    a4 = 0;  // [esp+1Ch] [ebp-8h]
-    int             a3 = 0;  // [esp+20h] [ebp-4h]
-    int             ncp; // weak
-    int             npp; // weak
-    int             ndp; // weak
-    int             cp;
-
-    dp  = 0;
-    pp  = 0;
-    cp  = 0;
-    npp = 0x1000;
-    ndp = 0x1000;
-    ncp = 0x1000;
-    cmd = calloc(0x4000, 1);
-    pol = malloc(2 * npp);
-    def = malloc(4 * ndp);
-    v0  = 0;
-    v6  = 1024;
-    v1  = 0x80000000;
-    while (v0 < insize) {
-        if (dp == 73) {
-            int dog = 5;
-        }
-
-        if (v6 < v0) {
-            v6 += 1024;
-        }
-        search(v0, insize, &a3, &a4, bz);
-        if (a4 <= 2) {
-            cmd[cp]   |= v1;
-            def[dp++]  = bz[v0++];
-            if (ndp == dp) {
-                ndp = dp + 0x1000;
-                def = realloc(def, dp + 0x1000);
-            }
-        } else {
-            search(v0 + 1, insize, &v8, &v7, bz);
-            if (v7 > a4 + 1) {
-                cmd[cp]   |= v1;
-                def[dp++]  = bz[v0++];
-                if (ndp == dp) {
-                    ndp = dp + 0x1000;
-                    def = realloc(def, dp + 0x1000);
-                }
-                v1 >>= 1;
-                if (!v1) {
-                    v1 = 0x80000000;
-                    v2 = cp++;
-                    if (cp == ncp) {
-                        ncp = v2 + 1025;
-                        cmd = realloc(cmd, 4 * (v2 + 1025));
-                    }
-                    cmd[cp] = 0;
-                }
-                a4 = v7;
-                a3 = v8;
-            }
-            v3 = v0 - a3 - 1;
-            a3 = v0 - a3 - 1;
-            if (a4 > 0x11) {
-                pol[pp++] = v3;
-                def[dp++] = a4 - 18;
-                if (ndp == dp) {
-                    ndp = dp + 0x1000;
-                    def = realloc(def, dp + 0x1000);
-                }
-            } else {
-                pol[pp++] = v3 | (((short)a4 - 2) << 12);
-            }
-            if (npp == pp) {
-                npp += 0x1000;
-                pol = realloc(pol, 2 * (pp + 0x1000));
-            }
-            v0 += a4;
-        }
-        v1 >>= 1;
-        if (!v1) {
-            v1 = 0x80000000;
-            v4 = cp++;
-            if (cp == ncp) {
-                ncp = v4 + 1025;
-                cmd = realloc(cmd, 4 * (v4 + 1025));
-            }
-            cmd[cp] = 0;
-        }
-    }
-    if (v1 != 0x80000000) {
-        cp++;
-    }
-
-    fprintf(fp, "Yay0");
-
-    writeint4(fp, insize);
-
-    writeint4(fp, 4 * cp + 16);
-    writeint4(fp, 2 * pp + 4 * cp + 16);
-
-    for (int i = 0; i < cp; i++)
-        writeint4(fp, cmd[i]);
-
-    for (int i = 0; i < pp; i++)
-        writeshort(fp, pol[i]);
-
-    fwrite(def, 1, dp, fp);
-    fclose(fp);
-}
-
-void search(unsigned int a1, int insize, int* a3, unsigned int* a4, unsigned char* bz) {
-    unsigned int  patternlen; // ebx
-    unsigned int  v5; // esi
-    unsigned int* v6 = 0; // edi
-    unsigned int  v7 = 0; // [esp+Ch] [ebp-10h]
-    int           v8 = 0; // [esp+14h] [ebp-8h]
-    unsigned int  v9; // [esp+18h] [ebp-4h]
-
-    patternlen = 3;
-    v5 = 0;
-    if (a1 > 0x1000) {
-        v5 = a1 - 0x1000;
-    }
-    v9 = 273;
-    if (insize - a1 <= 273) {
-        v9 = insize - a1;
-    }
-    if (v9 > 2) {
-        while (a1 > v5) {
-            v7 = mischarsearch(&bz[a1], patternlen, &bz[v5], patternlen + a1 - v5);
-
-            if (v7 >= a1 - v5) {
-                break;
-            }
-
-            for (; patternlen < v9; patternlen++) {
-                if (bz[patternlen + v5 + v7] != bz[patternlen + a1]) {
-                    break;
-                }
-            }
-            if (v9 == patternlen) {
-                *a3 = v7 + v5;
-                *a4 = patternlen;
-                return;
-            }
-            v8 = v5 + v7;
-            patternlen++;
-            v5 += v7 + 1;
-        }
-        *a3 = v8;
-        if (patternlen > 3) {
-            patternlen--;
-            *a4 = patternlen;
-            return;
-        }
-        v6 = a4;
-    } else {
-        *a4 = 0;
-        v6  = a3;
-    }
-    *v6 = 0;
-}
-
-int mischarsearch(unsigned char* pattern, int patternlen, unsigned char* data, int datalen) {
-    unsigned short skip[256]; // idb
-    int            i;         // ebx
-    int            v6;        // eax
-    int            j;         // ecx
-
-    if (patternlen <= datalen) {
-        // initskip
-        for (int k = 0; k < 256; k++) {
-            skip[k] = patternlen;
-        }
-
-        for (int k = 0; k < patternlen; k++) {
-            skip[pattern[k]] = patternlen - k - 1;
-        }
-
-        for (i = patternlen - 1;; i += v6) {
-            if (pattern[patternlen - 1] == data[i]) {
-                i--;
-                j = patternlen - 2;
-                if (j < 0) {
-                    return i + 1;
-                }
-
-                while (pattern[j] == data[i]) {
-                    i--;
-                    j--;
-                    if (j < 0) {
-                        return i + 1;
-                    }
-                }
-
-                if (skip[data[i]] <= patternlen - j) {
-                    v6 = patternlen - j;
-                    continue;
-                }
-            }
-            v6 = skip[data[i]];
-        }
-    }
-    return datalen;
-}
-
-void writeshort(FILE* fp, short val) {
-    fputc((val & 0xff00) >> 8, fp);
-    fputc((val & 0x00ff) >> 0, fp);
-}
-
-void writeint4(FILE* fp, int val) {
-    fputc((val & 0x00ff000000) >> 24, fp);
-    fputc((val & 0x0000ff0000) >> 16, fp);
-    fputc((val & 0x000000ff00) >> 8, fp);
-    fputc((val & 0x00000000ff) >> 0, fp);
-}

From b461a2a45c0a77ddfc54e8dd31cfc492b48f14f4 Mon Sep 17 00:00:00 2001
From: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
Date: Thu, 20 Jun 2024 14:40:34 +0200
Subject: [PATCH 06/31] Fix Action Commands not working before obtaining any
 badges

---
 src/battle/btl_states_actions.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle/btl_states_actions.c b/src/battle/btl_states_actions.c
index 871bb418f8..f0259a649f 100644
--- a/src/battle/btl_states_actions.c
+++ b/src/battle/btl_states_actions.c
@@ -261,7 +261,7 @@ void btl_state_update_normal_start(void) {
             gCameras[CAM_DEFAULT].flags |= CAMERA_FLAG_DISABLED;
             gCameras[CAM_BATTLE].flags |= CAMERA_FLAG_DISABLED;
             gCameras[CAM_TATTLE].flags |= CAMERA_FLAG_DISABLED;
-            if (is_ability_active(ABILITY_MYSTERY_SCROLL)) {
+            if (gPlayerData.hasActionCommands) {
                 battleStatus->actionCommandMode = ACTION_COMMAND_MODE_LEARNED;
             }
             battleStatus->actionSuccess = 0;

From 43c346d7e5980303c714c7240c5057ab62831f38 Mon Sep 17 00:00:00 2001
From: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
Date: Fri, 21 Jun 2024 16:44:48 +0200
Subject: [PATCH 07/31] Fix slide in iwa_03 (#83)

---
 src/world/area_iwa/iwa_03/iwa_03_1_main.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/world/area_iwa/iwa_03/iwa_03_1_main.c b/src/world/area_iwa/iwa_03/iwa_03_1_main.c
index 2f1e2b43fe..9103a86204 100644
--- a/src/world/area_iwa/iwa_03/iwa_03_1_main.c
+++ b/src/world/area_iwa/iwa_03/iwa_03_1_main.c
@@ -1,5 +1,17 @@
 #include "iwa_03.h"
 
+b32 N(should_player_be_sliding)(void) {
+    Shadow* shadow = get_shadow_by_index(gPlayerStatus.shadowID);
+    f32 angle = shadow->rot.z + 180.0;
+
+    return (angle != 0.0f) && (fabsf(angle) >= 20.0f);
+}
+
+API_CALLABLE(N(SetupSlidingCheck)) {
+    phys_set_player_sliding_check(N(should_player_be_sliding));
+    return ApiStatus_DONE2;
+}
+
 EvtScript N(EVS_ExitWalk_iwa_01_1) = EVT_EXIT_WALK(60, iwa_03_ENTRY_0, "iwa_01", iwa_01_ENTRY_1);
 
 EvtScript N(EVS_BindExitTriggers) = {
@@ -11,6 +23,7 @@ EvtScript N(EVS_BindExitTriggers) = {
 EvtScript N(EVS_Main) = {
     Set(GB_WorldLocation, LOCATION_MT_RUGGED)
     Call(SetSpriteShading, SHADING_NONE)
+    Call(N(SetupSlidingCheck))
     EVT_SETUP_CAMERA_DEFAULT(0, 0, 0)
     Call(MakeNpcs, TRUE, Ref(N(DefaultNPCs)))
     ExecWait(N(EVS_MakeEntities))

From 231ec931119d0c9fea40843398dc1c3cf8dea47b Mon Sep 17 00:00:00 2001
From: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
Date: Sun, 30 Jun 2024 15:20:08 +0200
Subject: [PATCH 08/31] Fix 5 BP cost positioning (#84)

---
 src/pause/pause_badges.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pause/pause_badges.c b/src/pause/pause_badges.c
index e55cb5193e..0963c1e2c9 100644
--- a/src/pause/pause_badges.c
+++ b/src/pause/pause_badges.c
@@ -549,7 +549,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width
                             gDPSetPrimColor(gMainGfxPos++, 0, 0, 227, 227, 227, 255);
                             orbX = baseX + 235 + pause_badges_scroll_offset_x(posX) + 1 + (j % 5) * 6;
                             orbY = baseY + 17 + pause_badges_scroll_offset_y(posY) + orbOffsetY;
-                            if (numOrbs >= 5) {
+                            if (numOrbs > 5) {
                                 orbY += j / 5 * 6 - 3;
                             }
                             pause_badges_draw_bp_orbs(0, orbX, orbY);
@@ -563,7 +563,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width
                             if (j < bpAvailable) {
                                 orbX = baseX + 235 + pause_badges_scroll_offset_x(posX) + 1 + (j % 5) * 6;
                                 orbY = baseY + 17 + pause_badges_scroll_offset_y(posY) + orbOffsetY;
-                                if (numOrbs >= 5) {
+                                if (numOrbs > 5) {
                                     orbY += j / 5 * 6 - 3;
                                 }
                                 pause_badges_draw_bp_orbs(1, orbX, orbY);
@@ -574,7 +574,7 @@ void pause_badges_draw_contents(MenuPanel* menu, s32 baseX, s32 baseY, s32 width
                         for (j = 0; j < numOrbs; j++) {
                             orbX = baseX + 235 + pause_badges_scroll_offset_x(posX) + 1 + (j % 5) * 6;
                             orbY = baseY + 17 + pause_badges_scroll_offset_y(posY) + orbOffsetY;
-                            if (numOrbs >= 5) {
+                            if (numOrbs > 5) {
                                 orbY += j / 5 * 6 - 3;
                             }
                             pause_badges_draw_bp_orbs(2, orbX, orbY);

From 30759995b1d4c4fdcc82569d636be41d1f4bb636 Mon Sep 17 00:00:00 2001
From: JaThePlayer <50085307+JaThePlayer@users.noreply.github.com>
Date: Sun, 30 Jun 2024 15:20:43 +0200
Subject: [PATCH 09/31] Fix enemy drops using weight for item (#85)

---
 src/23680.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/23680.c b/src/23680.c
index 0c2a72b27c..daced98efb 100644
--- a/src/23680.c
+++ b/src/23680.c
@@ -77,7 +77,7 @@ void spawn_drops(Enemy* enemy) {
             }
 
             if (curWeight >= dropCount) {
-                itemToDrop = drops->itemDrops[i].weight;
+                itemToDrop = drops->itemDrops[i].item;
                 break;
             }
         }

From ed4f4076a09482ea28db0cd3377b3ac81fbc2e8e Mon Sep 17 00:00:00 2001
From: icebound777 <8474023+icebound777@users.noreply.github.com>
Date: Fri, 26 Jul 2024 16:31:55 +0200
Subject: [PATCH 10/31] Fix dependency checksum error during initial setup
 (#86)

---
 shell.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shell.nix b/shell.nix
index 90bbfa5e7b..06d9a4a0db 100644
--- a/shell.nix
+++ b/shell.nix
@@ -39,7 +39,7 @@ let
 
   egcs-gcc = builtins.fetchurl {
     url =
-      "https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/latest/download/mips-gcc-egcs-2.91.66-linux.tar.gz";
+      "https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/download/0.2/mips-gcc-egcs-2.91.66-linux.tar.gz";
     sha256 = "03v1ci7j0hi53z639rwj60xwz0zzi82a9azi0yiw818r754faql0";
   };
 

From 318b110bb1f760c4b8ce6f51bfb3fc5c239864ce Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Wed, 14 Aug 2024 23:43:22 +0100
Subject: [PATCH 11/31] build mapfs headers when xml exists

---
 tools/build/configure.py        |  25 +++++++-
 tools/build/mapfs/map_header.py | 107 +++++++++-----------------------
 2 files changed, 54 insertions(+), 78 deletions(-)

diff --git a/tools/build/configure.py b/tools/build/configure.py
index ca9f3f6c2d..adf25b8464 100755
--- a/tools/build/configure.py
+++ b/tools/build/configure.py
@@ -306,7 +306,7 @@ def write_ninja_rules(
         command=f"$python {BUILD_TOOLS}/mapfs/pack_title_data.py $version $out $in",
     )
 
-    ninja.rule("map_header", command=f"$python {BUILD_TOOLS}/mapfs/map_header.py $in > $out")
+    ninja.rule("map_header", command=f"$python {BUILD_TOOLS}/mapfs/map_header.py $in $out")
 
     ninja.rule("charset", command=f"$python {BUILD_TOOLS}/pm_charset.py $out $in")
 
@@ -1068,6 +1068,7 @@ def build(
                         )
                     elif name.endswith("_shape_built"):
                         base_name = name[:-6]
+                        map_name = base_name[:-6]
                         raw_bin_path = self.resolve_asset_path(f"assets/x/mapfs/geom/{base_name}.bin")
                         bin_path = bin_path.parent / "geom" / (base_name + ".bin")
 
@@ -1093,8 +1094,30 @@ def build(
                         else:
                             build(bin_path, [raw_bin_path], "cp")
 
+                        try_xml_path = f"assets/x/mapfs/geom/{map_name}.xml"
+                        xml_path = self.resolve_asset_path(try_xml_path)
+                        if xml_path != try_xml_path:
+                            build(self.build_path() / "include/mapfs" / (base_name + ".h"), [xml_path], "map_header")
+
                         compress = True
                         out_dir = out_dir / "geom"
+                    elif name.endswith("_hit"):
+                        base_name = name
+                        map_name = base_name[:-4]
+                        raw_bin_path = self.resolve_asset_path(f"assets/x/mapfs/geom/{base_name}.bin")
+
+                        # TEMP: star rod compatiblity
+                        old_raw_bin_path = self.resolve_asset_path(f"assets/x/mapfs/{base_name}.bin")
+                        if old_raw_bin_path.is_file():
+                            raw_bin_path = old_raw_bin_path
+
+                        bin_path = bin_path.parent / "geom" / (base_name + ".bin")
+                        build(bin_path, [raw_bin_path], "cp")
+
+                        try_xml_path = f"assets/x/mapfs/geom/{map_name}.xml"
+                        xml_path = self.resolve_asset_path(try_xml_path)
+                        if xml_path != try_xml_path:
+                            build(self.build_path() / "include/mapfs" / (base_name + ".h"), [xml_path], "map_header")
                     else:
                         compress = True
                         bin_path = path
diff --git a/tools/build/mapfs/map_header.py b/tools/build/mapfs/map_header.py
index f62efcdb73..354c15ea59 100755
--- a/tools/build/mapfs/map_header.py
+++ b/tools/build/mapfs/map_header.py
@@ -3,97 +3,50 @@
 from sys import argv, stderr
 from os import path
 from xml.dom.minidom import parse
-
+from pathlib import Path
 
 def eprint(*args, **kwargs):
     print(*args, file=stderr, **kwargs)
 
 
 if __name__ == "__main__":
-    _, xml_path = argv
-    xml = parse(xml_path)
-
-    map_name = path.basename(xml_path)[:-4]
-
-    print('#include "common.h"')
-    print('#include "map.h"')
-    print("")
-    print("#ifndef NAMESPACE")
-    print(f"#define NAMESPACE {map_name}")
-    print("")
-
-    seen_names = set()
-    entrys = []
-    npc_id = 0
-
-    for marker in xml.getElementsByTagName("Marker"):
-        marker_type = marker.getAttribute("type")
-        if marker_type == "Root" or marker_type == "Group":
-            continue
-
-        map_object = marker.getElementsByTagName("MapObject")[0]
-        name = marker_type + "_" + map_object.getAttribute("name")
+    _, xml_path, out_path = argv
 
-        if name in seen_names:
-            continue
-        seen_names.add(name)
-
-        x, y, z = [p for p in marker.getAttribute("pos").split(",")]
-        yaw = marker.getAttribute("yaw") + "f"
-
-        if marker_type == "NPC":
-            npc_id += 1
-            print(f"#define {name} {npc_id}")
-
-        if marker_type == "Entry":
-            entrys.append(name)
-
-        print(f"#define {name}_x {x}")
-        print(f"#define {name}_y {y}")
-        print(f"#define {name}_z {z}")
-        print(f"#define {name}_vec3d {x}, {y}, {z}")
-        print(f"#define {name}_vec4d {x}, {y}, {z}, (((s32){yaw}))")
-        print(f"#define {name}_vec3f {x}.0f, {y}.0f, {z}.0f")
-        print(f"#define {name}_vec4f {x}.0f, {y}.0f, {z}.0f, {yaw}")
-        print(f"#define {name}_yaw {yaw}")
-        print("")
-
-    for i, entry in enumerate(entrys):
-        print(f"#define {entry} {i}")
-    print(f"EntryList {map_name}_entryList = {{")
-    for entry in entrys:
-        print("    " + entry + "_vec4f,")
-    print("};")
+    xml = parse(xml_path)
 
-    print("")
+    out_path = Path(out_path)
+    f = out_path.open("w")
 
-    for collider in xml.getElementsByTagName("Collider"):
-        map_object = collider.getElementsByTagName("MapObject")[0]
-        name = map_object.getAttribute("name")
-        idx = "0x" + map_object.getAttribute("id")
+    is_shape = out_path.stem.endswith("_shape")
+    is_hit = out_path.stem.endswith("_hit")
 
-        if name in seen_names or " " in name:
-            continue
-        seen_names.add(name)
+    map_name = path.basename(xml_path)[:-4]
 
-        print(f"#define Collider_{name} {idx}")
+    seen_names = set()
 
-    print("")
+    if is_shape:
+        for model in xml.getElementsByTagName("Model"):
+            map_object = model.getElementsByTagName("MapObject")[0]
+            name = map_object.getAttribute("name")
+            idx = "0x" + map_object.getAttribute("id")
 
-    for model in xml.getElementsByTagName("Model"):
-        map_object = model.getElementsByTagName("MapObject")[0]
-        name = map_object.getAttribute("name")
-        idx = "0x" + map_object.getAttribute("id")
+            if name in seen_names or " " in name:
+                continue
+            seen_names.add(name)
 
-        if name in seen_names or " " in name:
-            continue
-        seen_names.add(name)
+            f.write(f"#define MODEL_{name} {idx}\n")
+    elif is_hit:
+        for collider in xml.getElementsByTagName("Collider"):
+            map_object = collider.getElementsByTagName("MapObject")[0]
+            name = map_object.getAttribute("name")
+            idx = "0x" + map_object.getAttribute("id")
 
-        print(f"#define Model_{name} {idx}")
+            if name in seen_names or " " in name:
+                continue
+            seen_names.add(name)
 
-    print("")
-    print("#endif")
-    print("")
+            f.write(f"#define COLLIDER_{name} {idx}\n")
+    else:
+        raise ValueError("Invalid output file name")
 
-    for i, entry in enumerate(entrys):
-        print(f"#define {map_name}_{entry[len('Entry_'):]} {i}")
+    f.close()

From f1b227c4080beffde84d134ec25b9b6ca4e36f75 Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Thu, 15 Aug 2024 01:42:38 +0100
Subject: [PATCH 12/31] fix 'xml needed by h' error

---
 tools/build/configure.py | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/tools/build/configure.py b/tools/build/configure.py
index adf25b8464..f46a036ac8 100755
--- a/tools/build/configure.py
+++ b/tools/build/configure.py
@@ -1094,9 +1094,8 @@ def build(
                         else:
                             build(bin_path, [raw_bin_path], "cp")
 
-                        try_xml_path = f"assets/x/mapfs/geom/{map_name}.xml"
-                        xml_path = self.resolve_asset_path(try_xml_path)
-                        if xml_path != try_xml_path:
+                        xml_path = self.resolve_asset_path(f"assets/x/mapfs/geom/{map_name}.xml")
+                        if xml_path.exists():
                             build(self.build_path() / "include/mapfs" / (base_name + ".h"), [xml_path], "map_header")
 
                         compress = True
@@ -1114,9 +1113,8 @@ def build(
                         bin_path = bin_path.parent / "geom" / (base_name + ".bin")
                         build(bin_path, [raw_bin_path], "cp")
 
-                        try_xml_path = f"assets/x/mapfs/geom/{map_name}.xml"
-                        xml_path = self.resolve_asset_path(try_xml_path)
-                        if xml_path != try_xml_path:
+                        xml_path = self.resolve_asset_path(f"assets/x/mapfs/geom/{map_name}.xml")
+                        if xml_path.exists():
                             build(self.build_path() / "include/mapfs" / (base_name + ".h"), [xml_path], "map_header")
                     else:
                         compress = True

From 8fdf1db1261f247d666c32ca27b35447adf33dac Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Sun, 25 Aug 2024 02:43:53 +0100
Subject: [PATCH 13/31] fix crash when map uses last texture in archive

---
 src/model.c | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/model.c b/src/model.c
index f6ab4ea11a..47168e1b4c 100644
--- a/src/model.c
+++ b/src/model.c
@@ -2008,6 +2008,10 @@ void appendGfx_model(void* data) {
 void load_texture_impl(u32 romOffset, TextureHandle* handle, TextureHeader* header, s32 mainSize, s32 mainPalSize, s32 auxSize, s32 auxPalSize) {
     Gfx** temp;
 
+    s32 heapSize = WORLD_TEXTURE_MEMORY_SIZE;
+    if (gGameStatusPtr->isBattle) heapSize = BATTLE_TEXTURE_MEMORY_SIZE;
+    ASSERT_MSG((s32)TextureHeapPos - (s32)TextureHeapBase + mainSize + mainPalSize + auxSize + auxPalSize < heapSize, "Texture heap overflow");
+
     // load main img + palette to texture heap
     handle->raster = (IMG_PTR) TextureHeapPos;
     if (mainPalSize != 0) {
@@ -2186,6 +2190,10 @@ void load_texture_variants(u32 romOffset, s32 textureID, s32 baseOffset, s32 siz
         dma_copy((u8*)offset, (u8*)offset + sizeof(iterTextureHeader), &iterTextureHeader);
         header = &iterTextureHeader;
 
+        if (strcmp(header->name, "end_of_textures") == 0) {
+            return;
+        }
+
         if (!header->isVariant) {
             // done reading variants
             break;

From 00438a19032eccc3a1c757d3c2b426f02066c88e Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Sun, 25 Aug 2024 02:52:24 +0100
Subject: [PATCH 14/31] splat 0.27.0

---
 tools/splat_ext/a.py                          | 4 ++--
 tools/splat_ext/pm_charset.py                 | 4 ++--
 tools/splat_ext/pm_charset_palettes.py        | 4 ++--
 tools/splat_ext/pm_effect_loads.py            | 4 ++--
 tools/splat_ext/pm_effect_shims.py            | 4 ++--
 tools/splat_ext/pm_icons.py                   | 4 ++--
 tools/splat_ext/pm_imgfx_data.py              | 4 ++--
 tools/splat_ext/pm_map_data.py                | 4 ++--
 tools/splat_ext/pm_msg.py                     | 4 ++--
 tools/splat_ext/pm_sbn.py                     | 4 ++--
 tools/splat_ext/pm_sprite_shading_profiles.py | 4 ++--
 tools/splat_ext/pm_sprites.py                 | 4 ++--
 ver/us/splat.yaml                             | 5 -----
 13 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/tools/splat_ext/a.py b/tools/splat_ext/a.py
index d13e8e1d27..e62ae4002e 100644
--- a/tools/splat_ext/a.py
+++ b/tools/splat_ext/a.py
@@ -1,9 +1,9 @@
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.segtypes.linker_entry import LinkerEntry
 from splat.util import options
 
 
-class N64SegA(N64Segment):
+class N64SegA(Segment):
     def get_linker_entries(self):
         path = options.opts.asset_path / self.dir / (self.name + ".a")
 
diff --git a/tools/splat_ext/pm_charset.py b/tools/splat_ext/pm_charset.py
index 60de269c5f..61c33bade1 100644
--- a/tools/splat_ext/pm_charset.py
+++ b/tools/splat_ext/pm_charset.py
@@ -1,4 +1,4 @@
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 import png  # type: ignore
 
@@ -60,7 +60,7 @@ def get_palette_idx(charset_name, char_id):
     return pal_id
 
 
-class N64SegPm_charset(N64Segment):
+class N64SegPm_charset(Segment):
     def scan(self, rom_bytes):
         data = rom_bytes[self.rom_start : self.rom_end]
 
diff --git a/tools/splat_ext/pm_charset_palettes.py b/tools/splat_ext/pm_charset_palettes.py
index 48903c5b00..7e0f569573 100644
--- a/tools/splat_ext/pm_charset_palettes.py
+++ b/tools/splat_ext/pm_charset_palettes.py
@@ -1,10 +1,10 @@
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.segtypes.n64.palette import N64SegPalette
 from splat.util import options
 import png  # type: ignore
 
 
-class N64SegPm_charset_palettes(N64Segment):
+class N64SegPm_charset_palettes(Segment):
     require_unique_name = False
 
     def scan(self, rom_bytes):
diff --git a/tools/splat_ext/pm_effect_loads.py b/tools/splat_ext/pm_effect_loads.py
index 811231ef18..9278071af8 100644
--- a/tools/splat_ext/pm_effect_loads.py
+++ b/tools/splat_ext/pm_effect_loads.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 from typing import List
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 import yaml as yaml_loader
 
@@ -43,7 +43,7 @@ def effects_from_yaml(yaml_path: Path) -> List[Effect]:
     return effects
 
 
-class N64SegPm_effect_loads(N64Segment):
+class N64SegPm_effect_loads(Segment):
     effects: List[Effect] = []
 
     @staticmethod
diff --git a/tools/splat_ext/pm_effect_shims.py b/tools/splat_ext/pm_effect_shims.py
index d2802441ba..c07361ed5a 100644
--- a/tools/splat_ext/pm_effect_shims.py
+++ b/tools/splat_ext/pm_effect_shims.py
@@ -1,11 +1,11 @@
 from typing import List
 from yaml.loader import Loader
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 import yaml as yaml_loader
 
 
-class N64SegPm_effect_shims(N64Segment):
+class N64SegPm_effect_shims(Segment):
     shims: List[str] = []
 
     @staticmethod
diff --git a/tools/splat_ext/pm_icons.py b/tools/splat_ext/pm_icons.py
index c48370b6c8..732de51d8a 100644
--- a/tools/splat_ext/pm_icons.py
+++ b/tools/splat_ext/pm_icons.py
@@ -1,7 +1,7 @@
 import os
 import re
 from pathlib import Path
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 import n64img.image
 from splat.util.color import unpack_color
 from common import iter_in_groups
@@ -46,7 +46,7 @@ def parse_palette(data):
     return palette
 
 
-class N64SegPm_icons(N64Segment):
+class N64SegPm_icons(Segment):
     def split(self, rom_bytes):
         self.out_dir = options.opts.asset_path / "icon"
 
diff --git a/tools/splat_ext/pm_imgfx_data.py b/tools/splat_ext/pm_imgfx_data.py
index fa1de6f29b..dba97d7833 100644
--- a/tools/splat_ext/pm_imgfx_data.py
+++ b/tools/splat_ext/pm_imgfx_data.py
@@ -8,11 +8,11 @@
 sys.path.append(str(Path(TOOLS_DIR) / "build/imgfx"))
 from imgfx_data import Anim, Triangle, Vertex
 
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import log, options
 
 
-class N64SegPm_imgfx_data(N64Segment):
+class N64SegPm_imgfx_data(Segment):
     anims: List[Anim] = []
 
     OUT_DIR: Path = options.opts.asset_path / "imgfx"
diff --git a/tools/splat_ext/pm_map_data.py b/tools/splat_ext/pm_map_data.py
index e3061feec5..6b25960c6e 100644
--- a/tools/splat_ext/pm_map_data.py
+++ b/tools/splat_ext/pm_map_data.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 
 import crunch64
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from common import iter_in_groups
 from splat.util import options
 import png  # type: ignore
@@ -66,7 +66,7 @@ def add_file_ext(name: str, linker: bool = False) -> str:
         return name + ".bin"
 
 
-class N64SegPm_map_data(N64Segment):
+class N64SegPm_map_data(Segment):
     def __init__(
         self,
         rom_start,
diff --git a/tools/splat_ext/pm_msg.py b/tools/splat_ext/pm_msg.py
index d742158b94..952f960e3e 100644
--- a/tools/splat_ext/pm_msg.py
+++ b/tools/splat_ext/pm_msg.py
@@ -1,5 +1,5 @@
 import shutil
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from pathlib import Path
 from splat.util import options
 import re
@@ -3273,7 +3273,7 @@
 }
 
 
-class N64SegPm_msg(N64Segment):
+class N64SegPm_msg(Segment):
     def __init__(
         self,
         rom_start,
diff --git a/tools/splat_ext/pm_sbn.py b/tools/splat_ext/pm_sbn.py
index 9cd7a8f600..a7c8079c10 100644
--- a/tools/splat_ext/pm_sbn.py
+++ b/tools/splat_ext/pm_sbn.py
@@ -8,7 +8,7 @@
 
 # splat imports; will fail if script run directly
 try:
-    from splat.segtypes.n64.segment import N64Segment
+    from splat.segtypes.segment import Segment
     from splat.segtypes.linker_entry import LinkerEntry
     from splat.util import options
 
@@ -542,7 +542,7 @@ def __iter__(self):
 
 if splat_loaded:
 
-    class N64SegPm_sbn(N64Segment):
+    class N64SegPm_sbn(Segment):
         def split(self, rom_bytes):
             dir = options.opts.asset_path / self.dir / self.name
             data = rom_bytes[self.rom_start : self.rom_end]
diff --git a/tools/splat_ext/pm_sprite_shading_profiles.py b/tools/splat_ext/pm_sprite_shading_profiles.py
index 1b0b96b18c..f7c314c9ad 100644
--- a/tools/splat_ext/pm_sprite_shading_profiles.py
+++ b/tools/splat_ext/pm_sprite_shading_profiles.py
@@ -10,7 +10,7 @@
 import struct
 from typing import Literal
 
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 
 GROUPS = [
@@ -194,7 +194,7 @@ def extract(input_data: bytes, endian: Literal["big", "little"] = "big") -> str:
     )
 
 
-class N64SegPm_sprite_shading_profiles(N64Segment):
+class N64SegPm_sprite_shading_profiles(Segment):
     OUT_DIR: Path = options.opts.asset_path / "sprite"
 
     def scan(self, rom_bytes):
diff --git a/tools/splat_ext/pm_sprites.py b/tools/splat_ext/pm_sprites.py
index 5a2184b7c1..007f945e77 100644
--- a/tools/splat_ext/pm_sprites.py
+++ b/tools/splat_ext/pm_sprites.py
@@ -12,7 +12,7 @@
 import png  # type: ignore
 import yaml as yaml_loader
 from n64img.image import CI4
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 from splat.util.color import unpack_color
 
@@ -713,7 +713,7 @@ def write_to_dir(self, path):
         pretty_print_xml(xml, path / "SpriteSheet.xml")
 
 
-class N64SegPm_sprites(N64Segment):
+class N64SegPm_sprites(Segment):
     DEFAULT_NPC_SPRITE_NAMES = [f"{i:02X}" for i in range(0xEA)]
 
     def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml) -> None:
diff --git a/ver/us/splat.yaml b/ver/us/splat.yaml
index 9a3e9eeb73..fe20aed762 100644
--- a/ver/us/splat.yaml
+++ b/ver/us/splat.yaml
@@ -6411,7 +6411,6 @@ segments:
     - start: 0x59F530
       type: .data
       name: anim/unused_gfx
-      subalign: 8
       subsegments:
       - [0x59F530, vtx, vtx1]
       - [0x59F6B0, vtx, vtx2]
@@ -6446,7 +6445,6 @@ segments:
     - start: 0x5A2E80
       type: .data
       name: actor/lava_piranha
-      subalign: 8
       subsegments:
       - [0x5A2E80]
       - [0x5A3020, ci4, lava_piranha_vine, 64, 32]
@@ -6592,7 +6590,6 @@ segments:
     - start: 0x63F040
       type: .data
       name: actor/monstar
-      subalign: 8
       subsegments:
       - [0x63F040]
       - [0x63F278, ci4, actor/img, 32, 32]
@@ -6601,7 +6598,6 @@ segments:
     - start: 0x648860
       type: .data
       name: vtx
-      subalign: 8
       subsegments:
       - [0x648860, vtx, monstar_bubbles]
     - [0x648C80]
@@ -8436,7 +8432,6 @@ segments:
     - start: 0x8CC4F0
       type: .data
       name: kmr_04_5_foliage
-      subalign: 8
       subsegments:
       - [0x8CC4F0, ci4, hammer_block_message, 48, 48]
       - [0x8CC970, palette, hammer_block_message]

From 8624a2cdadd14516b06b6aaadca1ad61536dec9b Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Sun, 25 Aug 2024 05:10:31 +0100
Subject: [PATCH 15/31] remove broken tex heap check

---
 src/model.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/model.c b/src/model.c
index 47168e1b4c..937a3f4853 100644
--- a/src/model.c
+++ b/src/model.c
@@ -2008,10 +2008,6 @@ void appendGfx_model(void* data) {
 void load_texture_impl(u32 romOffset, TextureHandle* handle, TextureHeader* header, s32 mainSize, s32 mainPalSize, s32 auxSize, s32 auxPalSize) {
     Gfx** temp;
 
-    s32 heapSize = WORLD_TEXTURE_MEMORY_SIZE;
-    if (gGameStatusPtr->isBattle) heapSize = BATTLE_TEXTURE_MEMORY_SIZE;
-    ASSERT_MSG((s32)TextureHeapPos - (s32)TextureHeapBase + mainSize + mainPalSize + auxSize + auxPalSize < heapSize, "Texture heap overflow");
-
     // load main img + palette to texture heap
     handle->raster = (IMG_PTR) TextureHeapPos;
     if (mainPalSize != 0) {

From d6b881dc2c11e6f0ba1ae94411c14181607fa405 Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Fri, 30 Aug 2024 13:30:14 +0100
Subject: [PATCH 16/31] write ZONE_name macros to _hit.h files

---
 tools/build/mapfs/map_header.py | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/tools/build/mapfs/map_header.py b/tools/build/mapfs/map_header.py
index 354c15ea59..7ac74bcd08 100755
--- a/tools/build/mapfs/map_header.py
+++ b/tools/build/mapfs/map_header.py
@@ -22,30 +22,26 @@ def eprint(*args, **kwargs):
 
     map_name = path.basename(xml_path)[:-4]
 
-    seen_names = set()
-
     if is_shape:
         for model in xml.getElementsByTagName("Model"):
             map_object = model.getElementsByTagName("MapObject")[0]
             name = map_object.getAttribute("name")
             idx = "0x" + map_object.getAttribute("id")
-
-            if name in seen_names or " " in name:
-                continue
-            seen_names.add(name)
-
             f.write(f"#define MODEL_{name} {idx}\n")
     elif is_hit:
         for collider in xml.getElementsByTagName("Collider"):
             map_object = collider.getElementsByTagName("MapObject")[0]
             name = map_object.getAttribute("name")
             idx = "0x" + map_object.getAttribute("id")
+            f.write(f"#define COLLIDER_{name} {idx}\n")
 
-            if name in seen_names or " " in name:
-                continue
-            seen_names.add(name)
+        f.write("\n")
 
-            f.write(f"#define COLLIDER_{name} {idx}\n")
+        for zone in xml.getElementsByTagName("Zone"):
+            map_object = zone.getElementsByTagName("MapObject")[0]
+            name = map_object.getAttribute("name")
+            idx = "0x" + map_object.getAttribute("id")
+            f.write(f"#define ZONE_{name} {idx}\n")
     else:
         raise ValueError("Invalid output file name")
 

From 0bc83e1662805caf2f63c1d10937f97b70e7cec3 Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Fri, 16 Aug 2024 00:33:20 +0100
Subject: [PATCH 17/31] vendor flips and add ninja task for it

---
 .github/workflows/build.yaml     |  13 ++-----------
 tools/build/configure.py         |  15 +++++++++++++++
 tools/build/floating/flips       | Bin 0 -> 97384 bytes
 tools/build/floating/license.txt |  11 +++++++++++
 4 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100755 tools/build/floating/flips
 create mode 100644 tools/build/floating/license.txt

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index c556ec34b1..cb131a6be0 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -20,12 +20,6 @@ jobs:
         uses: cargo-bins/cargo-binstall@main
       - name: Install pigment64
         run: cargo binstall pigment64 -y
-      - name: Setup Flips
-        run: |
-          curl -L https://dl.smwcentral.net/11474/floating.zip -o floating.zip
-          unzip floating.zip
-          rm floating.zip
-          chmod +x flips-linux
       - name: Download baserom
         run: curl -L $BASEROM_US_URL -o ver/us/baserom.z64
         env:
@@ -35,15 +29,12 @@ jobs:
       - name: Configure
         run: ./configure
       - name: Build
-        run: ninja
-      - name: Create patch file
-        # flips works but returns a non-zero exit code if the rom shrunk
-        run: ./flips-linux ver/us/baserom.z64 ver/us/build/papermario.z64 papermario.bps || true
+        run: ninja ver/us/build/papermario.bps
       - name: Upload patch as artifact
         uses: actions/upload-artifact@v2
         with:
           name: papermario.bps
-          path: papermario.bps
+          path: ver/us/build/papermario.bps
   prerelease:
     name: Prerelease
     runs-on: ubuntu-latest
diff --git a/tools/build/configure.py b/tools/build/configure.py
index f46a036ac8..30e05a93a0 100755
--- a/tools/build/configure.py
+++ b/tools/build/configure.py
@@ -328,6 +328,8 @@ def write_ninja_rules(
 
     ninja.rule("pm_sbn", command=f"$python {BUILD_TOOLS}/audio/sbn.py $out $asset_stack")
 
+    ninja.rule("flips", command=f"bash -c '{BUILD_TOOLS}/floating/flips $baserom $in $out || true'")
+
 
 def write_ninja_for_tools(ninja: ninja_syntax.Writer):
     ninja.rule(
@@ -427,6 +429,12 @@ def rom_path(self) -> Path:
     def rom_ok_path(self) -> Path:
         return self.elf_path().with_suffix(".ok")
 
+    def patch_path(self) -> Path:
+        return self.elf_path().with_suffix(".bps")
+
+    def baserom_path(self) -> Path:
+        return Path(f"ver/{self.version}/baserom.z64")
+
     def linker_script_path(self) -> Path:
         # TODO: read from splat.yaml
         return Path(f"ver/{self.version}/papermario.ld")
@@ -1253,6 +1261,13 @@ def build(
                 implicit=[str(self.rom_path())],
             )
 
+        ninja.build(
+            str(self.patch_path()),
+            "flips",
+            str(self.rom_path()),
+            variables={"baserom": str(self.baserom_path())},
+        )
+
         ninja.build("generated_code_" + self.version, "phony", generated_code)
         ninja.build("inc_img_bins_" + self.version, "phony", inc_img_bins)
 
diff --git a/tools/build/floating/flips b/tools/build/floating/flips
new file mode 100755
index 0000000000000000000000000000000000000000..961933fc5b458343ce1ce1940cc46d68ef295632
GIT binary patch
literal 97384
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%0DK
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

literal 0
HcmV?d00001

diff --git a/tools/build/floating/license.txt b/tools/build/floating/license.txt
new file mode 100644
index 0000000000..c3bf78f11e
--- /dev/null
+++ b/tools/build/floating/license.txt
@@ -0,0 +1,11 @@
+Flips is licensed under GNU General Public License, version 3.0 or higher. The full legal text can
+  be found in boring.zip; a rough interpretation (for non-lawyers only) follows:
+
+- You must credit the author. Don't claim it as your own. You may modify it and take credit for your
+  modifications, but the author (Alcaro) must be credited for the original software.
+- If you modify this software, it must clearly be labeled as a modification.
+- Any applications containing any part of this software must provide the full source code needed to
+  modify and rebuild this application, under the same license. Including this interpretation is
+  optional.
+- The author claims no copyright over input, output, or error messages generated by this tool. Use
+  it however you want.

From 7f524ee10aaaaf3bbc694f92c77f3e668b9853cb Mon Sep 17 00:00:00 2001
From: Ethan Roseman <ethteck@gmail.com>
Date: Sun, 1 Sep 2024 20:20:38 +0900
Subject: [PATCH 18/31] Dep update & fix pip install (#1196)

---
 Jenkinsfile                                   |  2 +-
 decomp.yaml                                   | 41 +++++++++++++++++++
 requirements.txt                              |  7 ++--
 tools/splat_ext/pm_charset.py                 |  4 +-
 tools/splat_ext/pm_charset_palettes.py        |  4 +-
 tools/splat_ext/pm_effect_loads.py            |  4 +-
 tools/splat_ext/pm_effect_shims.py            |  4 +-
 tools/splat_ext/pm_icons.py                   |  4 +-
 tools/splat_ext/pm_imgfx_data.py              |  4 +-
 tools/splat_ext/pm_map_data.py                |  4 +-
 tools/splat_ext/pm_msg.py                     |  4 +-
 tools/splat_ext/pm_sbn.py                     |  4 +-
 tools/splat_ext/pm_sprite_shading_profiles.py |  4 +-
 tools/splat_ext/pm_sprites.py                 |  4 +-
 ver/pal/splat.yaml                            |  3 +-
 15 files changed, 69 insertions(+), 28 deletions(-)
 create mode 100644 decomp.yaml

diff --git a/Jenkinsfile b/Jenkinsfile
index 391934d3d6..431e0fdf93 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,7 @@ pipeline {
                 sh 'curl -L "https://github.com/decompals/mips-binutils-2.6/releases/download/main/binutils-2.6-linux.tar.gz" | tar zx -C tools/build/cc/gcc2.7.2'
                 sh 'curl -L "https://github.com/decompals/mips-binutils-egcs-2.9.5/releases/latest/download/mips-binutils-egcs-2.9.5-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
                 sh 'curl -L "https://github.com/decompals/mips-gcc-egcs-2.91.66/releases/latest/download/mips-gcc-egcs-2.91.66-linux.tar.gz" | tar zx -C tools/build/cc/egcs'
-                sh 'pip install -U -r requirements.txt'
+                sh 'pip install -U -r requirements.txt --break-system-packages'
                 sh 'cargo install pigment64'
                 sh 'cargo install crunch64-cli'
                 sh './configure'
diff --git a/decomp.yaml b/decomp.yaml
new file mode 100644
index 0000000000..bc7ce42dee
--- /dev/null
+++ b/decomp.yaml
@@ -0,0 +1,41 @@
+name: Paper Mario
+github: https://github.com/pmret/papermario
+platform: n64
+versions:
+- name: us
+  fullname: US
+  paths:
+    baserom: "ver/us/baserom.z64"
+    build: "ver/us/build/papermario.z64"
+    asm: "ver/us/asm"
+    nonmatchings: "ver/us/asm/nonmatchings"
+    map: "ver/us/build/papermario.map"
+    elf: "ver/us/build/papermario.elf"
+- name: pal
+  fullname: PAL
+  paths:
+    baserom: "ver/pal/baserom.z64"
+    build: "ver/pal/build/papermario.z64"
+    asm: "ver/pal/asm"
+    nonmatchings: "ver/pal/asm/nonmatchings"
+    map: "ver/pal/build/papermario.map"
+    elf: "ver/pal/build/papermario.elf"
+- name: ique
+  fullname: iQue
+  paths:
+    baserom: "ver/ique/baserom.z64"
+    build: "ver/ique/build/papermario.z64"
+    asm: "ver/ique/asm"
+    nonmatchings: "ver/ique/asm/nonmatchings"
+    map: "ver/ique/build/papermario.map"
+    elf: "ver/ique/build/papermario.elf"
+- name: jp
+  fullname: JP
+  paths:
+    baserom: "ver/jp/baserom.z64"
+    build: "ver/jp/build/papermario.z64"
+    asm: "ver/jp/asm"
+    nonmatchings: "ver/jp/asm/nonmatchings"
+    map: "ver/jp/build/papermario.map"
+    elf: "ver/jp/build/papermario.elf"
+tools:
diff --git a/requirements.txt b/requirements.txt
index 7f4826ade8..12dc1fd2cc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,12 +6,11 @@ ninja_syntax
 msgpack
 pylibyaml
 tqdm
-spimdisasm
 pygfxd
 intervaltree
-rabbitizer
 n64img
 python-githooks
-crunch64>=0.2.0
-splat64>=0.22.0
+crunch64>=0.5.1
+spimdisasm>=1.28.1
+splat64>=0.27.0
 requests
diff --git a/tools/splat_ext/pm_charset.py b/tools/splat_ext/pm_charset.py
index 60de269c5f..61c33bade1 100644
--- a/tools/splat_ext/pm_charset.py
+++ b/tools/splat_ext/pm_charset.py
@@ -1,4 +1,4 @@
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 import png  # type: ignore
 
@@ -60,7 +60,7 @@ def get_palette_idx(charset_name, char_id):
     return pal_id
 
 
-class N64SegPm_charset(N64Segment):
+class N64SegPm_charset(Segment):
     def scan(self, rom_bytes):
         data = rom_bytes[self.rom_start : self.rom_end]
 
diff --git a/tools/splat_ext/pm_charset_palettes.py b/tools/splat_ext/pm_charset_palettes.py
index 48903c5b00..7e0f569573 100644
--- a/tools/splat_ext/pm_charset_palettes.py
+++ b/tools/splat_ext/pm_charset_palettes.py
@@ -1,10 +1,10 @@
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.segtypes.n64.palette import N64SegPalette
 from splat.util import options
 import png  # type: ignore
 
 
-class N64SegPm_charset_palettes(N64Segment):
+class N64SegPm_charset_palettes(Segment):
     require_unique_name = False
 
     def scan(self, rom_bytes):
diff --git a/tools/splat_ext/pm_effect_loads.py b/tools/splat_ext/pm_effect_loads.py
index 811231ef18..9278071af8 100644
--- a/tools/splat_ext/pm_effect_loads.py
+++ b/tools/splat_ext/pm_effect_loads.py
@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 from typing import List
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 import yaml as yaml_loader
 
@@ -43,7 +43,7 @@ def effects_from_yaml(yaml_path: Path) -> List[Effect]:
     return effects
 
 
-class N64SegPm_effect_loads(N64Segment):
+class N64SegPm_effect_loads(Segment):
     effects: List[Effect] = []
 
     @staticmethod
diff --git a/tools/splat_ext/pm_effect_shims.py b/tools/splat_ext/pm_effect_shims.py
index ae5d35c320..c34571279e 100644
--- a/tools/splat_ext/pm_effect_shims.py
+++ b/tools/splat_ext/pm_effect_shims.py
@@ -1,11 +1,11 @@
 from typing import List
 from yaml.loader import Loader
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 import yaml as yaml_loader
 
 
-class N64SegPm_effect_shims(N64Segment):
+class N64SegPm_effect_shims(Segment):
     shims: List[str] = []
 
     @staticmethod
diff --git a/tools/splat_ext/pm_icons.py b/tools/splat_ext/pm_icons.py
index c48370b6c8..732de51d8a 100644
--- a/tools/splat_ext/pm_icons.py
+++ b/tools/splat_ext/pm_icons.py
@@ -1,7 +1,7 @@
 import os
 import re
 from pathlib import Path
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 import n64img.image
 from splat.util.color import unpack_color
 from common import iter_in_groups
@@ -46,7 +46,7 @@ def parse_palette(data):
     return palette
 
 
-class N64SegPm_icons(N64Segment):
+class N64SegPm_icons(Segment):
     def split(self, rom_bytes):
         self.out_dir = options.opts.asset_path / "icon"
 
diff --git a/tools/splat_ext/pm_imgfx_data.py b/tools/splat_ext/pm_imgfx_data.py
index fa1de6f29b..dba97d7833 100644
--- a/tools/splat_ext/pm_imgfx_data.py
+++ b/tools/splat_ext/pm_imgfx_data.py
@@ -8,11 +8,11 @@
 sys.path.append(str(Path(TOOLS_DIR) / "build/imgfx"))
 from imgfx_data import Anim, Triangle, Vertex
 
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import log, options
 
 
-class N64SegPm_imgfx_data(N64Segment):
+class N64SegPm_imgfx_data(Segment):
     anims: List[Anim] = []
 
     OUT_DIR: Path = options.opts.asset_path / "imgfx"
diff --git a/tools/splat_ext/pm_map_data.py b/tools/splat_ext/pm_map_data.py
index e3061feec5..6b25960c6e 100644
--- a/tools/splat_ext/pm_map_data.py
+++ b/tools/splat_ext/pm_map_data.py
@@ -4,7 +4,7 @@
 from pathlib import Path
 
 import crunch64
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from common import iter_in_groups
 from splat.util import options
 import png  # type: ignore
@@ -66,7 +66,7 @@ def add_file_ext(name: str, linker: bool = False) -> str:
         return name + ".bin"
 
 
-class N64SegPm_map_data(N64Segment):
+class N64SegPm_map_data(Segment):
     def __init__(
         self,
         rom_start,
diff --git a/tools/splat_ext/pm_msg.py b/tools/splat_ext/pm_msg.py
index d742158b94..952f960e3e 100644
--- a/tools/splat_ext/pm_msg.py
+++ b/tools/splat_ext/pm_msg.py
@@ -1,5 +1,5 @@
 import shutil
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from pathlib import Path
 from splat.util import options
 import re
@@ -3273,7 +3273,7 @@
 }
 
 
-class N64SegPm_msg(N64Segment):
+class N64SegPm_msg(Segment):
     def __init__(
         self,
         rom_start,
diff --git a/tools/splat_ext/pm_sbn.py b/tools/splat_ext/pm_sbn.py
index 9cd7a8f600..a7c8079c10 100644
--- a/tools/splat_ext/pm_sbn.py
+++ b/tools/splat_ext/pm_sbn.py
@@ -8,7 +8,7 @@
 
 # splat imports; will fail if script run directly
 try:
-    from splat.segtypes.n64.segment import N64Segment
+    from splat.segtypes.segment import Segment
     from splat.segtypes.linker_entry import LinkerEntry
     from splat.util import options
 
@@ -542,7 +542,7 @@ def __iter__(self):
 
 if splat_loaded:
 
-    class N64SegPm_sbn(N64Segment):
+    class N64SegPm_sbn(Segment):
         def split(self, rom_bytes):
             dir = options.opts.asset_path / self.dir / self.name
             data = rom_bytes[self.rom_start : self.rom_end]
diff --git a/tools/splat_ext/pm_sprite_shading_profiles.py b/tools/splat_ext/pm_sprite_shading_profiles.py
index 1b0b96b18c..f7c314c9ad 100644
--- a/tools/splat_ext/pm_sprite_shading_profiles.py
+++ b/tools/splat_ext/pm_sprite_shading_profiles.py
@@ -10,7 +10,7 @@
 import struct
 from typing import Literal
 
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 
 GROUPS = [
@@ -194,7 +194,7 @@ def extract(input_data: bytes, endian: Literal["big", "little"] = "big") -> str:
     )
 
 
-class N64SegPm_sprite_shading_profiles(N64Segment):
+class N64SegPm_sprite_shading_profiles(Segment):
     OUT_DIR: Path = options.opts.asset_path / "sprite"
 
     def scan(self, rom_bytes):
diff --git a/tools/splat_ext/pm_sprites.py b/tools/splat_ext/pm_sprites.py
index 5a2184b7c1..007f945e77 100644
--- a/tools/splat_ext/pm_sprites.py
+++ b/tools/splat_ext/pm_sprites.py
@@ -12,7 +12,7 @@
 import png  # type: ignore
 import yaml as yaml_loader
 from n64img.image import CI4
-from splat.segtypes.n64.segment import N64Segment
+from splat.segtypes.segment import Segment
 from splat.util import options
 from splat.util.color import unpack_color
 
@@ -713,7 +713,7 @@ def write_to_dir(self, path):
         pretty_print_xml(xml, path / "SpriteSheet.xml")
 
 
-class N64SegPm_sprites(N64Segment):
+class N64SegPm_sprites(Segment):
     DEFAULT_NPC_SPRITE_NAMES = [f"{i:02X}" for i in range(0xEA)]
 
     def __init__(self, rom_start, rom_end, type, name, vram_start, args, yaml) -> None:
diff --git a/ver/pal/splat.yaml b/ver/pal/splat.yaml
index dcc32e7d27..c384529c86 100644
--- a/ver/pal/splat.yaml
+++ b/ver/pal/splat.yaml
@@ -507,7 +507,8 @@ segments:
       - [auto, palette, ui/move_partner_3]
       - [auto, palette, ui/move_partner_3.disabled]
       - [0x9B5A0]
-      - [0x9B5A8, rgba32,  ui/stat_heart, 16, 16]
+      - [0x9B5A8, rgba32,  ui/stat_heart, 16, 16, 0x408]
+      - [0x9B9A8]
       - [0x9B9B0, rgba32,  ui/stat_flower, 16, 16]
       - [0x9BDB0]
     - start: 0xA1160

From 3526fa4970917d6634a8135940c99fb529f77484 Mon Sep 17 00:00:00 2001
From: mrshigure <mrshigure64@gmail.com>
Date: Sun, 1 Sep 2024 05:12:12 -0700
Subject: [PATCH 19/31] [JP] Action Commands, Battle Partners/Items/Moves and
 some more (#1195)

---
 include/enums.h                |    2 -
 src/evt/demo_api.c             |    5 -
 src/menu_hud_scripts.c         |    6 +
 src/world/actions.c            |    1 -
 src/world/partner/goombario.c  |   10 +
 src/world/partner/lakilester.c |   51 ++
 src/world/partner/sushie.c     |    4 +
 src/world/partner/watt.c       |   39 +
 src/world/partners.c           |   39 -
 src/world/script_api/shops.c   |   10 +
 src/world_use_item.c           |    4 +
 tools/splat_ext/msg_jp.yaml    |   45 +
 ver/jp/splat.yaml              | 1481 +++++++++++++++++++++++++++++++-
 ver/jp/symbol_addrs.txt        |   29 +
 ver/jp/undefined_syms.txt      |  395 ++++++---
 15 files changed, 1936 insertions(+), 185 deletions(-)

diff --git a/include/enums.h b/include/enums.h
index cb271c0dc7..9a3454b624 100644
--- a/include/enums.h
+++ b/include/enums.h
@@ -2414,9 +2414,7 @@ enum DoorSounds {
     DOOR_SOUNDS_UNUSED              = 6,
 };
 
-#if VERSION_US || VERSION_PAL || VERSION_IQUE
 #include "sprite/sprite_shading_profiles.h"
-#endif
 
 enum LightSourceFlags {
     LIGHT_SOURCE_DISABLED           = 0,
diff --git a/src/evt/demo_api.c b/src/evt/demo_api.c
index 42f63de298..0784f9564a 100644
--- a/src/evt/demo_api.c
+++ b/src/evt/demo_api.c
@@ -1,11 +1,6 @@
 #include "common.h"
 #include "ld_addrs.h"
 
-#if VERSION_JP // TODO remove once this part is split
-#define SHADING_NONE 0xFFFFFFFF
-extern Addr sprite_shading_profiles_ROM_START;
-#endif
-
 // TODO: not sure where these go
 u8 ReflectWallPrevAlpha = 254;
 u8 ReflectFloorPrevAlpha = 254;
diff --git a/src/menu_hud_scripts.c b/src/menu_hud_scripts.c
index 5b474c7422..f2a534f4ed 100644
--- a/src/menu_hud_scripts.c
+++ b/src/menu_hud_scripts.c
@@ -56,6 +56,11 @@ HudScript HES_FilenameCaret = {
 
 HudScript HES_FilenameSpace = HES_TEMPLATE_CI_CUSTOM_SIZE(ui_files_filename_space, 8, 8);
 
+#if VERSION_JP
+HudScript HES_HeaderStats = HES_TEMPLATE_CI_CUSTOM_SIZE(ui_pause_label_spirits, 32, 16);
+
+HudScript HES_HeaderBadges = HES_TEMPLATE_CI_CUSTOM_SIZE(ui_pause_label_map, 32, 16);
+#else
 HudScript HES_HeaderStats = HES_TEMPLATE_CI_CUSTOM_SIZE(ui_pause_label_stats, 48, 16);
 
 HudScript HES_HeaderBadges = HES_TEMPLATE_CI_CUSTOM_SIZE(ui_pause_label_badges, 48, 16);
@@ -67,6 +72,7 @@ HudScript HES_HeaderParty = HES_TEMPLATE_CI_CUSTOM_SIZE(ui_pause_label_party, 48
 HudScript HES_HeaderSpirits = HES_TEMPLATE_CI_CUSTOM_SIZE(ui_pause_label_spirits, 48, 16);
 
 HudScript HES_HeaderMap = HES_TEMPLATE_CI_CUSTOM_SIZE(ui_pause_label_map, 48, 16);
+#endif
 
 #if VERSION_PAL
 HudScript HES_HeaderStats_de = HES_TEMPLATE_CI_CUSTOM_SIZE(de_ui_pause_label_stats, 48, 16);
diff --git a/src/world/actions.c b/src/world/actions.c
index c409103ae7..09c7e1f1a6 100644
--- a/src/world/actions.c
+++ b/src/world/actions.c
@@ -38,7 +38,6 @@ void action_update_use_tweester(void);
 void action_update_state_23(void);
 
 #if VERSION_JP // TODO remove once segments are split
-extern Addr world_use_item_VRAM;
 extern Addr world_action_idle_ROM_START;
 extern Addr world_action_idle_ROM_END;
 extern Addr world_action_walk_ROM_START;
diff --git a/src/world/partner/goombario.c b/src/world/partner/goombario.c
index ad9d4ce21e..ca6bd7261d 100644
--- a/src/world/partner/goombario.c
+++ b/src/world/partner/goombario.c
@@ -255,10 +255,20 @@ API_CALLABLE(N(SelectTattleMsg)) {
 
     switch (script->USE_STATE) {
         case USE_TATTLE_INIT:
+#if VERSION_JP
+            if (!(goombario->flags & NPC_FLAG_GROUNDED)) {
+                return ApiStatus_DONE2;
+            }
+            if (playerStatus->inputDisabledCount != 0) {
+                script->VAR_MSG = -1;
+                return ApiStatus_DONE2;
+            }
+#else
             if (!(goombario->flags & NPC_FLAG_GROUNDED) || playerStatus->inputDisabledCount != 0) {
                 script->VAR_MSG = -1;
                 return ApiStatus_DONE2;
             }
+#endif
             script->functionTemp[1] = 3;
             disable_player_input();
             N(IsTattleActive) = TRUE;
diff --git a/src/world/partner/lakilester.c b/src/world/partner/lakilester.c
index b9e2b2588a..2883a764ca 100644
--- a/src/world/partner/lakilester.c
+++ b/src/world/partner/lakilester.c
@@ -278,6 +278,7 @@ s32 N(can_dismount)(void) {
     return canDismount;
 }
 
+#if !VERSION_JP
 s32 N(test_mounting_height_adjustment)(Npc* lakilester, f32 height, f32 dist) {
     f32 x = gPlayerStatus.pos.x;
     f32 y = gPlayerStatus.pos.y + height;
@@ -306,6 +307,7 @@ s32 N(test_mounting_height_adjustment)(Npc* lakilester, f32 height, f32 dist) {
     }
     return FALSE;
 }
+#endif
 
 void N(apply_riding_static_collisions)(Npc* lakilester) {
     f32 radius = lakilester->collisionDiameter * 0.8f;
@@ -543,6 +545,37 @@ void N(update_riding_physics)(Npc* lakilester) {
     }
 }
 
+#if VERSION_JP
+s32 N(test_mounting_height_adjustment)(Npc* lakilester, f32 height, f32 dist) {
+    f32 x = gPlayerStatus.pos.x;
+    f32 y = gPlayerStatus.pos.y + height;
+    f32 z = gPlayerStatus.pos.z;
+    f32 depth = dist;
+    f32 hitRx, hitRz;
+    f32 hitDirX, hitDirZ;
+    f32 deltaY;
+
+    N(MountingDeltaY) = 0;
+
+    if (npc_raycast_down_around(0, &x, &y, &z, &depth,
+            lakilester->yaw, lakilester->collisionDiameter))
+    {
+        deltaY = y - lakilester->moveToPos.y;
+        if (deltaY != 0.0f) {
+            if (fabs(deltaY) < 10.0) {
+                N(MountingDeltaY) = deltaY;
+                lakilester->moveToPos.y = y;
+                return TRUE;
+            } else {
+                return FALSE;
+            }
+        }
+        return TRUE;
+    }
+    return FALSE;
+}
+#endif
+
 s32 N(test_dismount_height)(f32* posY) {
     f32 colliderHeight = gPlayerStatus.colliderHeight;
     f32 hitDirX, hitDirZ;
@@ -643,7 +676,11 @@ API_CALLABLE(N(UseAbility)) {
 
     switch (N(AbilityState)) {
         case RIDE_STATE_BEGIN:
+#if VERSION_JP
+            if (playerStatus->inputDisabledCount != 0) {
+#else
             if (playerStatus->flags & PS_FLAG_HIT_FIRE || playerStatus->inputDisabledCount != 0) {
+#endif
                 playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED;
                 return ApiStatus_DONE2;
             }
@@ -653,6 +690,7 @@ API_CALLABLE(N(UseAbility)) {
             N(AbilityState)++; // RIDE_STATE_DELAY
             break;
         case RIDE_STATE_DELAY:
+#if !VERSION_JP
             if (playerStatus->flags & PS_FLAG_HIT_FIRE) {
                 playerStatus->flags &= ~PS_FLAG_PAUSE_DISABLED;
                 if (N(LockingPlayerInput)) {
@@ -661,6 +699,7 @@ API_CALLABLE(N(UseAbility)) {
                 }
                 return ApiStatus_DONE2;
             }
+#endif
 
             if (playerStatus->animFlags & PA_FLAG_CHANGING_MAP) {
                 if (script->functionTemp[2] < playerStatus->inputDisabledCount) {
@@ -733,7 +772,9 @@ API_CALLABLE(N(UseAbility)) {
             N(AbilityState)++;
             // fallthrough
         case RIDE_STATE_MOUNT_4:
+#if !VERSION_JP
             if (!(playerStatus->flags & PS_FLAG_HIT_FIRE)) {
+#endif
                 lakilester->pos.x += (lakilester->moveToPos.x - lakilester->pos.x) / lakilester->duration;
                 lakilester->pos.z += (lakilester->moveToPos.z - lakilester->pos.z) / lakilester->duration;
                 lakilester->pos.y += (lakilester->moveToPos.y - lakilester->pos.y) / lakilester->duration;
@@ -773,17 +814,27 @@ API_CALLABLE(N(UseAbility)) {
                     N(AbilityState) = RIDE_STATE_START_RIDING;
                     playerStatus->animFlags |= PA_FLAG_RIDING_PARTNER;
                 }
+#if !VERSION_JP
             } else {
                 N(AbilityState) = RIDE_STATE_FINISH_1;
             }
+#endif
             break;
         case RIDE_STATE_START_RIDING:
+#if !VERSION_JP
             if (playerStatus->flags & PS_FLAG_HIT_FIRE) {
                 N(AbilityState) = RIDE_STATE_FINISH_1;
                 break;
             }
+#endif
             lakilester->duration--;
             if (lakilester->duration != 0) {
+#if VERSION_JP
+                if (playerStatus->flags & PS_FLAG_HIT_FIRE) {
+                    N(AbilityState) = RIDE_STATE_FINISH_1;
+                    break;
+                }
+#endif
                 if (partnerStatus->pressedButtons & (BUTTON_B | D_CBUTTONS)) {
                     if (N(can_dismount)()) {
                         N(AbilityState) = RIDE_STATE_DISMOUNT_1;
diff --git a/src/world/partner/sushie.c b/src/world/partner/sushie.c
index bcf605244b..74ed071292 100644
--- a/src/world/partner/sushie.c
+++ b/src/world/partner/sushie.c
@@ -299,7 +299,11 @@ void N(update_riding_physics)(Npc* sushie) {
     z = sushie->pos.z;
     depth = (sushie->collisionHeight * 0.5f) + playerStatus->colliderHeight;
     if (npc_raycast_up_corners(sushie->collisionChannel, &x, &y, &z, &depth, sushie->yaw, sushie->collisionDiameter * 0.3f) > NO_COLLIDER) {
+#if VERSION_JP
+        sushie->moveToPos.y = y;
+#else
         sushie->moveToPos.y += (((sushie->moveToPos.y - y) + depth) - ((sushie->collisionHeight * 0.5f) + playerStatus->colliderHeight)) * 0.2f;
+#endif
         if (N(DiveTime) % 9 == 0) {
             fx_rising_bubble(0, sushie->pos.x, sushie->moveToPos.y + (sushie->collisionHeight * 0.5f), sushie->pos.z,
                 (N(WaterSurfaceY) - sushie->moveToPos.y) - (sushie->collisionHeight * 0.5f));
diff --git a/src/world/partner/watt.c b/src/world/partner/watt.c
index e0a5995b37..acee400b25 100644
--- a/src/world/partner/watt.c
+++ b/src/world/partner/watt.c
@@ -341,6 +341,42 @@ API_CALLABLE(N(UseAbility)) {
             break;
         case SHINING_STATE_HOLDING:
             N(sync_held_position)();
+#if VERSION_JP
+            // wait for begin holding cooldown
+            if (script->functionTemp[1] != 0) {
+                script->functionTemp[1]--;
+                break;
+            }
+            if (playerStatus->actionState == ACTION_STATE_USE_SPINNING_FLOWER) {
+                break;
+            }
+            // allow stop-holding input
+            actionState = playerStatus->actionState;
+            if ((actionState == ACTION_STATE_IDLE
+                    || actionState == ACTION_STATE_WALK
+                    || actionState == ACTION_STATE_RUN
+                    || actionState == ACTION_STATE_LAND)
+                && partnerStatus->pressedButtons & BUTTON_B
+                || playerStatus->flags & PS_FLAG_HIT_FIRE
+            ) {
+        case SHINING_STATE_RELEASE:
+                playerStatus->animFlags &= ~(PA_FLAG_WATT_IN_HANDS | PA_FLAG_USING_WATT);
+                npc->curAnim = ANIM_WorldWatt_Idle;
+                partner_clear_player_tracking(npc);
+                N(IsPlayerHolding) = FALSE;
+                partnerStatus->actingPartner = PARTNER_NONE;
+                partnerStatus->partnerActionState = PARTNER_ACTION_NONE;
+                gGameStatusPtr->keepUsingPartnerOnMapChange = FALSE;
+                N(AbilityState) = SHINING_STATE_BEGIN;
+                npc_set_palswap_mode_A(npc, NPC_PAL_ADJUST_NONE);
+                if (!(playerStatus->flags & PS_FLAG_HIT_FIRE)) {
+                    set_action_state(ACTION_STATE_IDLE);
+                } else {
+                    set_action_state(ACTION_STATE_HIT_LAVA);
+                }
+                return ApiStatus_DONE1;
+            }
+#else
             // immediately cancel state on touching fire
             if ((playerStatus->flags & PS_FLAG_HIT_FIRE)) {
                 N(AbilityState) = SHINING_STATE_RELEASE;
@@ -364,9 +400,11 @@ API_CALLABLE(N(UseAbility)) {
             ) {
                 N(AbilityState) = SHINING_STATE_RELEASE;
             }
+#endif
             break;
     }
 
+#if !VERSION_JP
     if (N(AbilityState) == SHINING_STATE_RELEASE) {
         playerStatus->animFlags &= ~(PA_FLAG_WATT_IN_HANDS | PA_FLAG_USING_WATT);
         npc->curAnim = ANIM_WorldWatt_Idle;
@@ -382,6 +420,7 @@ API_CALLABLE(N(UseAbility)) {
         }
         return ApiStatus_DONE1;
     }
+#endif
 
     if (N(StaticEffect) != NULL) {
         N(StaticEffect)->data.staticStatus->pos.x = npc->pos.x;
diff --git a/src/world/partners.c b/src/world/partners.c
index 92e8740afd..23ebf56efc 100644
--- a/src/world/partners.c
+++ b/src/world/partners.c
@@ -113,45 +113,6 @@ extern HudScript HES_StatusSPIncrement7;
 
 extern EvtScript EVS_World_UseItem;
 
-#if VERSION_JP // TODO remove once segments are split
-extern Addr world_use_item_ROM_START;
-extern Addr world_use_item_ROM_END;
-extern Addr world_use_item_VRAM;
-extern Addr world_partner_goombario_ROM_START;
-extern Addr world_partner_goombario_ROM_END;
-extern Addr world_partner_goombario_VRAM;
-extern Addr world_partner_kooper_ROM_START;
-extern Addr world_partner_kooper_ROM_END;
-extern Addr world_partner_kooper_VRAM;
-extern Addr world_partner_bombette_ROM_START;
-extern Addr world_partner_bombette_ROM_END;
-extern Addr world_partner_bombette_VRAM;
-extern Addr world_partner_parakarry_ROM_START;
-extern Addr world_partner_parakarry_ROM_END;
-extern Addr world_partner_parakarry_VRAM;
-extern Addr world_partner_goompa_ROM_START;
-extern Addr world_partner_goompa_ROM_END;
-extern Addr world_partner_goompa_VRAM;
-extern Addr world_partner_watt_ROM_START;
-extern Addr world_partner_watt_ROM_END;
-extern Addr world_partner_watt_VRAM;
-extern Addr world_partner_sushie_ROM_START;
-extern Addr world_partner_sushie_ROM_END;
-extern Addr world_partner_sushie_VRAM;
-extern Addr world_partner_lakilester_ROM_START;
-extern Addr world_partner_lakilester_ROM_END;
-extern Addr world_partner_lakilester_VRAM;
-extern Addr world_partner_bow_ROM_START;
-extern Addr world_partner_bow_ROM_END;
-extern Addr world_partner_bow_VRAM;
-extern Addr world_partner_goombaria_ROM_START;
-extern Addr world_partner_goombaria_ROM_END;
-extern Addr world_partner_goombaria_VRAM;
-extern Addr world_partner_twink_ROM_START;
-extern Addr world_partner_twink_ROM_END;
-extern Addr world_partner_twink_VRAM;
-#endif
-
 s32 partner_is_idle(Npc* partner);
 s32 world_partner_can_open_menus_default(Npc* partner);
 void _use_partner_ability(void);
diff --git a/src/world/script_api/shops.c b/src/world/script_api/shops.c
index 5a30a99b5a..5518c4d1bb 100644
--- a/src/world/script_api/shops.c
+++ b/src/world/script_api/shops.c
@@ -4,8 +4,10 @@
 #include "model.h"
 #include "pause/pause_common.h"
 
+#if !VERSION_JP
 extern u8 MessagePlural[];
 extern u8 MessageSingular[];
+#endif
 extern HudScript HES_Item_Coin;
 
 s32 shop_get_sell_price(s32 itemID);
@@ -98,6 +100,7 @@ s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCo
 
     if (bpCost > 0) {
         set_message_int_var(bpCost, 2);
+#if !VERSION_JP
     } else {
         if (coinCost == 1) {
             suffix = MessageSingular;
@@ -105,6 +108,7 @@ s32 shop_owner_buy_dialog(s32 messageIndex, s32 itemName, s32 coinCost, s32 bpCo
             suffix = MessagePlural;
         }
         set_message_text_var((s32) suffix, 2);
+#endif
     }
 
     script = start_script(&EVS_ShopBeginSpeech, EVT_PRIORITY_1, 0);
@@ -137,6 +141,7 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) {
 
     set_message_int_var(amount, 0);
 
+#if !VERSION_JP
     if (amount == 1) {
         suffixMsg = MessageSingular;
     } else {
@@ -144,6 +149,7 @@ s32 shop_owner_continue_speech_with_quantity(s32 messageIndex, s32 amount) {
     }
 
     set_message_text_var((s32) suffixMsg, 1);
+#endif
 
     script = start_script(&EVS_ShopContinueSpeech, EVT_PRIORITY_1, 0);
     script->varTable[0] = shopMsgID;
@@ -944,7 +950,11 @@ API_CALLABLE(MakeShop) {
     hud_element_clear_flags(shop->costIconID, HUD_ELEMENT_FLAG_FILTER_TEX);
     get_worker(create_worker_frontUI(NULL, draw_shop_items));
     set_window_properties(WINDOW_ID_ITEM_INFO_NAME, 100, 66, 120, 28, WINDOW_PRIORITY_0, shop_draw_item_name, NULL, -1);
+#if VERSION_JP
+    set_window_properties(WINDOW_ID_ITEM_INFO_DESC, 39, 184, 242, 32, WINDOW_PRIORITY_1, shop_draw_item_desc, NULL, -1);
+#else
     set_window_properties(WINDOW_ID_ITEM_INFO_DESC, 32, 184, 256, 32, WINDOW_PRIORITY_1, shop_draw_item_desc, NULL, -1);
+#endif
     gWindowStyles[10].defaultStyleID = WINDOW_STYLE_9;
     gWindowStyles[11].defaultStyleID = WINDOW_STYLE_3;
     shop->curItemSlot = 0;
diff --git a/src/world_use_item.c b/src/world_use_item.c
index 3b0a2b3bc5..862e490071 100644
--- a/src/world_use_item.c
+++ b/src/world_use_item.c
@@ -69,13 +69,17 @@ API_CALLABLE(WorldItem_RestoreFP) {
 
 API_CALLABLE(WorldItem_PauseTime) {
     set_time_freeze_mode(TIME_FREEZE_FULL);
+#if !VERSION_JP
     gOverrideFlags |= GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS;
+#endif
     return ApiStatus_DONE2;
 }
 
 API_CALLABLE(WorldItem_UnpauseTime) {
     set_time_freeze_mode(TIME_FREEZE_NORMAL);
+#if !VERSION_JP
     gOverrideFlags &= ~GLOBAL_OVERRIDES_CANT_PICK_UP_ITEMS;
+#endif
     return ApiStatus_DONE2;
 }
 
diff --git a/tools/splat_ext/msg_jp.yaml b/tools/splat_ext/msg_jp.yaml
index 70f7e30493..bf36d2b66f 100644
--- a/tools/splat_ext/msg_jp.yaml
+++ b/tools/splat_ext/msg_jp.yaml
@@ -1,6 +1,46 @@
 # This file describes what to name messages when splitting.
 
 - [0x00, 0x0000, NONE]
+- [0x0B, 0x00BA, CH0_00BA]
+- [0x13, 0x0096, CH8_0096]
+- [0x1D, 0x0000, EntityTattle_HammerBlock1_CanBreak]
+- [0x1D, 0x0001, EntityTattle_HammerBlock2_CantBreak]
+- [0x1D, 0x0002, EntityTattle_HammerBlock2_CanBreak]
+- [0x1D, 0x0003, EntityTattle_HammerBlock3_CantBreak]
+- [0x1D, 0x0004, EntityTattle_HammerBlock3_CanBreak]
+- [0x1D, 0x0005, EntityTattle_BrickBlock]
+- [0x1D, 0x0006, EntityTattle_ItemBlock]
+- [0x1D, 0x0007, EntityTattle_InertBlock]
+- [0x1D, 0x0008, EntityTattle_PushBlock]
+- [0x1D, 0x0009, EntityTattle_BadgeBlock]
+- [0x1D, 0x000A, EntityTattle_Spring]
+- [0x1D, 0x000B, EntityTattle_Switch]
+- [0x1D, 0x000C, EntityTattle_BigSwitch_SpinJump]
+- [0x1D, 0x000D, EntityTattle_BigSwitch_TornadoJump]
+- [0x1D, 0x000E, EntityTattle_FloorSwitch_SpinJump]
+- [0x1D, 0x000F, EntityTattle_FloorSwitch_TornadoJump]
+- [0x1D, 0x0010, EntityTattle_Pipe]
+- [0x1D, 0x0011, EntityTattle_PadLock]
+- [0x1D, 0x0012, EntityTattle_SignPost]
+- [0x1D, 0x0013, EntityTattle_ArrowSign]
+- [0x1D, 0x0014, EntityTattle_BombableRock]
+- [0x1D, 0x0015, EntityTattle_Chest]
+- [0x1D, 0x0016, EntityTattle_EmptyChest]
+- [0x1D, 0x0017, EntityTattle_WoodenCrate_CantBreak]
+- [0x1D, 0x0018, EntityTattle_WoodenCrate_SpinJump]
+- [0x1D, 0x0019, EntityTattle_WoodenCrate_TornadoJump]
+- [0x1D, 0x001A, EntityTattle_BoardedFloor_CantBreak]
+- [0x1D, 0x001B, EntityTattle_BoardedFloor_SpinJump]
+- [0x1D, 0x001C, EntityTattle_BoardedFloor_TornadoJump]
+- [0x1D, 0x001D, EntityTattle_JackInTheBox_SpinJump]
+- [0x1D, 0x001E, EntityTattle_JackInTheBox_TornadoJump]
+- [0x1D, 0x001F, EntityTattle_BellbellPlant]
+- [0x1D, 0x0020, EntityTattle_TrumpetPlant]
+- [0x1D, 0x0021, EntityTattle_CymbalBush]
+- [0x1D, 0x0022, EntityTattle_Munchlesia]
+- [0x1D, 0x0023, EntityTattle_SpinningFlower]
+- [0x1D, 0x0024, EntityTattle_BulbBush]
+- [0x1D, 0x0025, EntityTattle_Interact]
 - [0x20, 0x0000, Menus_Tutorial_SaveBlock]
 - [0x20, 0x0001, Menus_Tutorial_HeartBlock]
 - [0x20, 0x0002, Menus_Tutorial_GotItem]
@@ -85,6 +125,11 @@
 - [0x20, 0x00EA, Menus_00D0]
 - [0x20, 0x00F0, Menus_00D6]
 - [0x20, 0x00F1, Menus_00D7]
+- [0x21, 0x0002, Choice_0001]
+- [0x21, 0x0003, Choice_0002]
+- [0x21, 0x0004, Choice_0003]
+- [0x21, 0x0005, Choice_0004]
+- [0x21, 0x0006, Choice_0005]
 - [0x21, 0x000A, Choice_000A]
 - [0x21, 0x001D, Choice_001D]
 - [0x22, 0x0001, MenuTip_0032]
diff --git a/ver/jp/splat.yaml b/ver/jp/splat.yaml
index 56153f6110..b45015e59c 100644
--- a/ver/jp/splat.yaml
+++ b/ver/jp/splat.yaml
@@ -1039,8 +1039,157 @@ segments:
     - [0x1381B0, ci8,     letter_content_12, 70, 95]
     - [0x139BB0, linker_offset, letter_content_12_pal]
     - [0x139BB0, palette, letter_content_12]
-    - [0x139DB0]
-  - [0x139DB0, bin]
+    - [0x139DB0, bin]
+  - name: ui_images_filemenu_pause
+    type: code
+    start: 0x139DC0
+    vram: 0x8023E000
+    subsegments:
+    - [auto, ci4, ui/pause/unused_badge_points, 24, 24]
+    - [auto, palette, ui/pause/unused_badge_points]
+    - [auto, palette, ui/pause/unused_badge_points.disabled]
+    - [auto, ci4, ui/pause/unused_compass, 24, 24]
+    - [auto, palette, ui/pause/unused_compass]
+    - [auto, palette, ui/pause/unused_compass.disabled]
+    - [auto, ci4, ui/pause/cursor_hand, 16, 16]
+    - [auto, palette, ui/pause/cursor_hand]
+    - [auto, ci4, ui/files/filename_caret, 16, 16]
+    - [auto, palette, ui/files/filename_caret]
+    - [auto, ci4, ui/files/filename_space, 8, 8]
+    - [auto, palette, ui/files/filename_space]
+    - [auto, ci4, ui/pause/label_spirits, 32, 16]
+    - [auto, palette, ui/pause/label_spirits]
+    - [auto, ci4, ui/pause/label_map, 32, 16]
+    - [auto, palette, ui/pause/label_map]
+    - [auto, ci4, ui/pause/small_digit_0, 8, 8]
+    - [auto, palette, ui/pause/small_digit_0]
+    - [auto, ci4, ui/pause/small_digit_1, 8, 8]
+    - [auto, palette, ui/pause/small_digit_1]
+    - [auto, ci4, ui/pause/small_digit_2, 8, 8]
+    - [auto, palette, ui/pause/small_digit_2]
+    - [auto, ci4, ui/pause/small_digit_3, 8, 8]
+    - [auto, palette, ui/pause/small_digit_3]
+    - [auto, ci4, ui/pause/small_digit_4, 8, 8]
+    - [auto, palette, ui/pause/small_digit_4]
+    - [auto, ci4, ui/pause/small_digit_5, 8, 8]
+    - [auto, palette, ui/pause/small_digit_5]
+    - [auto, ci4, ui/pause/small_digit_6, 8, 8]
+    - [auto, palette, ui/pause/small_digit_6]
+    - [auto, ci4, ui/pause/small_digit_7, 8, 8]
+    - [auto, palette, ui/pause/small_digit_7]
+    - [auto, ci4, ui/pause/small_digit_8, 8, 8]
+    - [auto, palette, ui/pause/small_digit_8]
+    - [auto, ci4, ui/pause/small_digit_9, 8, 8]
+    - [auto, palette, ui/pause/small_digit_9]
+    - [auto, ci4, ui/pause/small_text_bp, 8, 8]
+    - [auto, palette, ui/pause/small_text_bp]
+    - [auto, ci4, ui/pause/label_jp_file, 32, 16]
+    - [auto, palette, ui/pause/label_jp_file]
+    - [auto, ci4, ui/pause/label_jp_file_disabled, 32, 16]
+    - [auto, palette, ui/pause/label_jp_file_disabled]
+    - [auto, ci4, ui/files/option_mono_on, 64, 16]
+    - [auto, palette, ui/files/option_mono_on]
+    - [auto, ci4, ui/files/option_mono_off, 64, 16]
+    - [auto, palette, ui/files/option_mono_off]
+    - [auto, ci4, ui/files/option_stereo_on, 64, 16]
+    - [auto, palette, ui/files/option_stereo_on]
+    - [auto, ci4, ui/files/option_stereo_off, 64, 16]
+    - [auto, palette, ui/files/option_stereo_off]
+    - [auto, ci4, ui/files/eldstar, 16, 16]
+    - [auto, palette, ui/files/eldstar]
+    - [auto, ci4, ui/files/eldstar_silhouette, 16, 16]
+    - [auto, palette, ui/files/eldstar_silhouette]
+    - [auto, ci4, ui/files/mamar, 16, 16]
+    - [auto, palette, ui/files/mamar]
+    - [auto, ci4, ui/files/mamar_silhouette, 16, 16]
+    - [auto, palette, ui/files/mamar_silhouette]
+    - [auto, ci4, ui/files/skolar, 16, 16]
+    - [auto, palette, ui/files/skolar]
+    - [auto, ci4, ui/files/skolar_silhouette, 16, 16]
+    - [auto, palette, ui/files/skolar_silhouette]
+    - [auto, ci4, ui/files/muskular, 16, 16]
+    - [auto, palette, ui/files/muskular]
+    - [auto, ci4, ui/files/muskular_silhouette, 16, 16]
+    - [auto, palette, ui/files/muskular_silhouette]
+    - [auto, ci4, ui/files/misstar, 16, 16]
+    - [auto, palette, ui/files/misstar]
+    - [auto, ci4, ui/files/misstar_silhouette, 16, 16]
+    - [auto, palette, ui/files/misstar_silhouette]
+    - [auto, ci4, ui/files/klevar, 16, 16]
+    - [auto, palette, ui/files/klevar]
+    - [auto, ci4, ui/files/klevar_silhouette, 16, 16]
+    - [auto, palette, ui/files/klevar_silhouette]
+    - [auto, ci4, ui/files/kalmar, 16, 16]
+    - [auto, palette, ui/files/kalmar]
+    - [auto, ci4, ui/files/kalmar_silhouette, 16, 16]
+    - [auto, palette, ui/files/kalmar_silhouette]
+    - [auto, ci4, ui/pause/map_walk0, 24, 24]
+    - [auto, palette, ui/pause/map_walk0]
+    - [auto, ci4, ui/pause/map_walk1, 24, 24]
+    - [auto, palette, ui/pause/map_walk1]
+    - [auto, ci4, ui/pause/map_walk2, 24, 24]
+    - [auto, palette, ui/pause/map_walk2]
+    - [auto, ci4, ui/pause/jp_super, 40, 16]
+    - [auto, palette, ui/pause/jp_super]
+    - [auto, ci4, ui/pause/jp_ultra, 40, 16]
+    - [auto, palette, ui/pause/jp_ultra]
+    - [auto, ci4, ui/pause/list_prev_page, 16, 16]
+    - [auto, palette, ui/pause/list_prev_page]
+    - [auto, ci4, ui/pause/list_next_page, 16, 16]
+    - [auto, palette, ui/pause/list_next_page]
+    - [auto, ci4, ui/pause/unused_z_up_arrow, 16, 16]
+    - [auto, palette, ui/pause/unused_z_up_arrow]
+    - [auto, ci4, ui/pause/unused_r_down_arrow, 16, 16]
+    - [auto, palette, ui/pause/unused_r_down_arrow]
+    - [auto, ci4, ui/pause/desc_msg_prev, 16, 16]
+    - [auto, palette, ui/pause/desc_msg_prev]
+    - [auto, ci4, ui/pause/desc_msg_next, 16, 16]
+    - [auto, palette, ui/pause/desc_msg_next]
+    - [auto, ci4, ui/pause/bp_needed, 48, 8]
+    - [auto, palette, ui/pause/bp_needed]
+    - [auto, ci4, ui/pause/mario_large, 32, 32]
+    - [auto, palette, ui/pause/mario_large]
+    - [auto, ci4, ui/pause/dash, 16, 8]
+    - [auto, palette, ui/pause/dash]
+    - [auto, ci4, ui/pause/stat_bp, 16, 16]
+    - [auto, palette, ui/pause/stat_bp]
+    - [auto, ci4, ui/pause/stat_mario, 16, 16]
+    - [auto, palette, ui/pause/stat_mario]
+    - [auto, ci4, ui/pause/stat_time, 16, 16]
+    - [auto, palette, ui/pause/stat_time]
+    - [auto, ci4, ui/pause/stat_star_piece0, 16, 16]
+    - [auto, palette, ui/pause/stat_star_piece0]
+    - [auto, ci4, ui/pause/stat_star_piece1, 16, 16]
+    - [auto, palette, ui/pause/stat_star_piece1]
+    - [auto, ci4, ui/pause/stat_star_piece2, 16, 16]
+    - [auto, palette, ui/pause/stat_star_piece2]
+    - [auto, ci4, ui/pause/stat_fp, 16, 16]
+    - [auto, palette, ui/pause/stat_fp]
+    - [auto, ci4, ui/pause/stat_times, 8, 8]
+    - [auto, palette, ui/pause/stat_times]
+    - [auto, ci4, ui/pause/stat_boots0, 16, 16]
+    - [auto, palette, ui/pause/stat_boots0]
+    - [auto, ci4, ui/pause/stat_boots1, 16, 16]
+    - [auto, palette, ui/pause/stat_boots1]
+    - [auto, ci4, ui/pause/stat_boots2, 16, 16]
+    - [auto, palette, ui/pause/stat_boots2]
+    - [auto, ci4, ui/pause/stat_boots3, 16, 16]
+    - [auto, palette, ui/pause/stat_boots3]
+    - [auto, ci4, ui/pause/stat_hammer0, 16, 16]
+    - [auto, palette, ui/pause/stat_hammer0]
+    - [auto, ci4, ui/pause/stat_hammer1, 16, 16]
+    - [auto, palette, ui/pause/stat_hammer1]
+    - [auto, ci4, ui/pause/stat_hammer2, 16, 16]
+    - [auto, palette, ui/pause/stat_hammer2]
+    - [auto, ci4, ui/pause/stat_hammer3, 16, 16]
+    - [auto, palette, ui/pause/stat_hammer3]
+    - [auto, ci4, ui/pause/partner_rank, 16, 16]
+    - [auto, palette, ui/pause/partner_rank]
+    - [auto, ci4, ui/pause/unused_bubble, 56, 16]
+    - [auto, palette, ui/pause/unused_bubble]
+    - [auto, .data, menu_hud_scripts]
+
+  - [0x13E130, bin]
 
   - name: battle_code
     type: bin
@@ -1048,12 +1197,136 @@ segments:
     vram: 0x8023E000
 
   - [0x1D4720, pm_icons, icon]
-
-  - name: logos
-    type: bin
+  - dir: logos
+    type: code
     start: 0x2065C0
+    subsegments:
+    - [auto, rgba16,  logo_n64, 128, 112]
+    - [auto, rgba16,  logo_is, 256, 112]
+    - [auto, rgba16,  logo_nintendo, 256, 48]
+  - [0x2215C0, ci8,     title/bg_1, 264, 162]
+  - [0x22BCD0, palette, title/bg_1]
+  - [0x22BED0, ci8,     title/bg_2, 264, 162]
+  - [0x2365E0, palette, title/bg_2]
+  - [0x2367E0, ci8,     title/bg_3, 264, 162]
+  - [0x240EF0, palette, title/bg_3]
+  - [0x2410F0, ci8,     title/bg_4, 264, 162]
+  - [0x24B800, palette, title/bg_4]
+  - [0x24BA00, ia8,     title/tape, 128, 128]
+  - [0x24FA00, ci8,     title/bowser_silhouette, 128, 128]
+  - [0x253A00, palette, title/bowser_silhouette]
+  - start: 0x253C00
+    type: pm_imgfx_data
+    name: imgfx_data
+    vram: 0
+    animations:
+    - ["shock", 0x14358]
+    - ["shiver", 0x18200]
+    - ["vertical_pipe_curl", 0x1A858]
+    - ["horizontal_pipe_curl", 0x1E830]
+    - ["startle", 0x29458]
+    - ["flutter_down", 0x314E0]
+    - ["unfurl", 0x33498]
+    - ["get_in_bed", 0x38988]
+    - ["spirit_capture", 0x39228]
+    - ["unused_1", 0x5B7A8]
+    - ["unused_2", 0x7CF10]
+    - ["unused_3", 0x86490]
+    - ["tutankoopa_gather", 0x96258]
+    - ["tutankoopa_swirl_2", 0xA1820]
+    - ["tutankoopa_swirl_1", 0xACDE8]
+    - ["shuffle_cards", 0xBBF68]
+    - ["flip_card_1", 0xC0490]
+    - ["flip_card_2", 0xC49B8]
+    - ["flip_card_3", 0xC6150]
+    - ["cymbal_crush", 0xCA380]
+  - [0x31DF90, pm_sprite_shading_profiles, sprite_shading_profiles]
 
-  - [0x2215C0, bin]
+  - [0x31EE00, bin]
+
+  - type: code
+    dir: world/partner
+    name: world_partner_goombario
+    start: 0x31F430
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, goombario]
+  - type: code
+    dir: world/partner
+    name: world_partner_bombette
+    start: 0x320260
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, bombette]
+  - type: code
+    dir: world/partner
+    name: world_partner_parakarry
+    start: 0x321A80
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, parakarry]
+  - type: code
+    dir: world/partner
+    name: world_partner_kooper
+    start: 0x323530
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, kooper]
+  - type: code
+    dir: world/partner
+    name: world_partner_watt
+    start: 0x325080
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, watt]
+  - type: code
+    dir: world/partner
+    name: world_partner_sushie
+    start: 0x326270
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, sushie]
+  - type: code
+    dir: world/partner
+    name: world_partner_lakilester
+    start: 0x328FF0
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, lakilester]
+  - type: code
+    dir: world/partner
+    name: world_partner_bow
+    start: 0x32BD80
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, bow]
+  - type: code
+    dir: world/partner
+    name: world_partner_goompa
+    start: 0x32CD40
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, goompa]
+  - type: code
+    dir: world/partner
+    name: world_partner_goombaria
+    start: 0x32D240
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, goombaria]
+  - type: code
+    dir: world/partner
+    name: world_partner_twink
+    start: 0x32D3A0
+    vram: 0x802BD100
+    subsegments:
+    - [auto, c, twink]
+  - type: code
+    name: world_use_item
+    start: 0x32D500
+    vram: 0x802C0000
+    subsegments:
+    - [auto, c, world_use_item]
 
 ###############
 ### Effects ###
@@ -1906,8 +2179,218 @@ segments:
   - name: effect_gfx_effect_86
     type: bin
     start: 0x41CA20
+
+#######################
+### Action Commands ###
+#######################
   - [0x41D750, bin]
 
+  - type: code
+    start: 0x429330
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_jump
+    subsegments:
+    - [auto, c, jump]
+  - type: code
+    start: 0x429940
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_hammer
+    subsegments:
+    - [auto, c, hammer]
+  - type: code
+    start: 0x42A410
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_flee
+    subsegments:
+    - [auto, c, flee]
+  - type: code
+    start: 0x42AD30
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_break_free
+    subsegments:
+    - [auto, c, break_free]
+  - type: code
+    start: 0x42B5B0
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_whirlwind
+    subsegments:
+    - [auto, c, whirlwind]
+    - start: 0x42BE90
+      type: .data
+      name: whirlwind
+      subsegments:
+      - [0x42BE90, ci4, whirlwind_1, 24, 24]
+      - [0x42BFB0, palette, whirlwind_1]
+      - [0x42BFD0, ci4, whirlwind_2, 24, 24]
+      - [0x42C0F0, palette, whirlwind_2]
+      - [0x42C110, ci4, whirlwind_3, 24, 24]
+      - [0x42C230, palette, whirlwind_3]
+      - [0x42C250, ci4, whirlwind_4, 24, 24]
+      - [0x42C370, palette, whirlwind_4]
+      - [0x42C390, ci4, whirlwind_5, 24, 24]
+      - [0x42C4B0, palette, whirlwind_5]
+      - [0x42C4D0, ci4, whirlwind_6, 24, 24]
+      - [0x42C5F0, palette, whirlwind_6]
+      - [0x42C610, ci4, whirlwind_7, 24, 24]
+      - [0x42C730, palette, whirlwind_7]
+      - [0x42C750, ci4, whirlwind_bubble, 56, 48]
+      - [0x42CC90, palette, whirlwind_bubble]
+      - [0x42CCB0]
+    - [0x42CE90]
+  - type: code
+    start: 0x42CED0
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_stop_leech
+    subsegments:
+    - [auto, c, stop_leech]
+  - type: code
+    start: 0x42D490
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_07
+    subsegments:
+    - [auto, c, "07"]
+  - type: code
+    start: 0x42DAB0
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_dizzy_shell
+    subsegments:
+    - [auto, c, dizzy_shell]
+  - type: code
+    start: 0x42E310
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_fire_shell
+    subsegments:
+    - [auto, c, fire_shell]
+  - type: code
+    start: 0x42ECF0
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_0A
+    subsegments:
+    - [auto, c, 0A]
+  - type: code
+    start: 0x42F3B0
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_bomb
+    subsegments:
+    - [auto, c, bomb]
+  - type: code
+    start: 0x42FC20
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_body_slam
+    subsegments:
+    - [auto, c, body_slam]
+  - type: code
+    start: 0x4303B0
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_air_lift
+    subsegments:
+    - [auto, c, air_lift]
+  - type: code
+    start: 0x430C60
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_air_raid
+    subsegments:
+    - [auto, c, air_raid]
+  - type: code
+    start: 0x431660
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_squirt
+    subsegments:
+    - [auto, c, squirt]
+  - type: code
+    start: 0x431E30
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_water_block
+    subsegments:
+    - [auto, c, water_block]
+    - start: 0x432F90
+      type: .data
+      name: water_block
+      subsegments:
+      - [0x432F90, ci4, water_block_1, 24, 24]
+      - [0x4330B0, palette, water_block_1]
+      - [0x4330D0, ci4, water_block_2, 24, 24]
+      - [0x4331F0, palette, water_block_2]
+      - [0x433210, ci4, water_block_3, 24, 24]
+      - [0x433330, palette, water_block_3]
+      - [0x433350, ci4, water_block_0, 24, 24]
+      - [0x433470, palette, water_block_0]
+      - [0x433490, ci4, water_block_block, 32, 32]
+      - [0x433690, palette, water_block_block]
+      - [0x4336B0, ci4, water_block_circle, 40, 40]
+      - [0x4339D0, palette, water_block_circle]
+      - [0x4339F0, ci4, water_block_cloud, 40, 40]
+      - [0x433D10, palette, water_block_cloud]
+      - [0x433D30, ci4, water_block_4, 24, 24]
+      - [0x433E50, palette, water_block_4]
+      - [0x433E70]
+    - [0x434030]
+  - type: code
+    start: 0x434030
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_tidal_wave
+    subsegments:
+    - [auto, c, tidal_wave]
+  - type: code
+    start: 0x434850
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_power_shock
+    subsegments:
+    - [auto, c, power_shock]
+  - type: code
+    start: 0x435350
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_mega_shock
+    subsegments:
+    - [auto, c, mega_shock]
+  - type: code
+    start: 0x435CE0
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_smack
+    subsegments:
+    - [auto, c, smack]
+  - type: code
+    start: 0x436760
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_spiny_surge
+    subsegments:
+    - [auto, c, spiny_surge]
+  - type: code
+    start: 0x437020
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_hurricane
+    subsegments:
+    - [auto, c, hurricane]
+  - type: code
+    start: 0x437960
+    vram: 0x802A9000
+    dir: battle/action_cmd
+    name: action_cmd_spook
+    subsegments:
+    - [auto, c, spook]
+
   ####################
   ### Battle Areas ###
   ####################
@@ -2096,12 +2579,992 @@ segments:
     start: 0x006E5700
     vram: 0x80218000
 
-  - [0x006F8470, bin]
+#######################
+### Battle Partners ###
+#######################
+  - name: battle_partner_goompa
+    dir: battle/partner
+    type: code
+    start: 0x6F8470
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, goompa]
+  - name: battle_partner_goombario
+    dir: battle/partner
+    type: code
+    start: 0x6F8A20
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, goombario]
+  - name: battle_partner_kooper
+    dir: battle/partner
+    type: code
+    start: 0x6FD7C0
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, kooper]
+  - name: battle_partner_bombette
+    dir: battle/partner
+    type: code
+    start: 0x702650
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, bombette]
+  - name: battle_partner_parakarry
+    dir: battle/partner
+    type: code
+    start: 0x7076C0
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, parakarry]
+  - name: battle_partner_watt
+    dir: battle/partner
+    type: code
+    start: 0x70B430
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, watt]
+  - name: battle_partner_sushie
+    dir: battle/partner
+    type: code
+    start: 0x70F5E0
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, sushie]
+  - name: battle_partner_lakilester
+    dir: battle/partner
+    type: code
+    start: 0x713650
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, lakilester]
+  - name: battle_partner_bow
+    dir: battle/partner
+    type: code
+    start: 0x718830
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, bow]
+  - name: battle_partner_twink
+    dir: battle/partner
+    type: code
+    start: 0x71C630
+    vram: 0x80238000
+    subsegments:
+    - [auto, c, twink]
 
-  - type: bin
-    name: world_script_api
+####################
+### Battle Items ###
+####################
+  - name: mushroom
+    dir: battle/move/item
+    type: code
+    start: 0x71D190
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, mushroom]
+  - name: fire_flower
+    dir: battle/move/item
+    type: code
+    start: 0x71E5A0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, fire_flower]
+  - name: dusty_hammer
+    dir: battle/move/item
+    type: code
+    start: 0x71F310
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, dusty_hammer]
+    - start: 0x71F550
+      type: .data
+      name: dusty_hammer
+      subsegments:
+      - [0x71FB10, ci4, dusty_hammer, 32, 32]
+      - [0x71FD10, palette, dusty_hammer]
+      - [0x71FD30]
+  - name: pow_block
+    dir: battle/move/item
+    type: code
+    start: 0x720190
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, pow_block]
+  - name: pebble
+    dir: battle/move/item
+    type: code
+    start: 0x7212B0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, pebble]
+    - start: 0x7214F0
+      type: .data
+      name: pebble
+      subsegments:
+      - [0x721AB0, ci4, pebble, 32, 32]
+      - [0x721CB0, palette, pebble]
+      - [0x721CD0]
+  - name: volt_shroom
+    dir: battle/move/item
+    type: code
+    start: 0x722130
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, volt_shroom]
+  - name: thunder_rage
+    dir: battle/move/item
+    type: code
+    start: 0x722AE0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, thunder_rage]
+  - name: snowman_doll
+    dir: battle/move/item
+    type: code
+    start: 0x723770
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, snowman_doll]
+  - name: dried_shroom
+    dir: battle/move/item
+    type: code
+    start: 0x724620
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, dried_shroom]
+  - name: shooting_star
+    dir: battle/move/item
+    type: code
+    start: 0x7250B0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, shooting_star]
+  - name: sleepy_sheep
+    dir: battle/move/item
+    type: code
+    start: 0x725F90
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, sleepy_sheep]
+    - start: 0x726900
+      type: .data
+      name: sleepy_sheep
+      subsegments:
+      - [0x726900]
+      - [0x726EC0, ci4, sleepy_sheep1, 56, 48]
+      - [0x727400, palette, sleepy_sheep1]
+      - [0x727420, ci4, sleepy_sheep2, 56, 48]
+      - [0x727960, palette, sleepy_sheep2]
+      - [0x727980, ci4, sleepy_sheep3, 56, 48]
+      - [0x727EC0, palette, sleepy_sheep3]
+      - [0x727EE0]
+  - name: stone_cap
+    dir: battle/move/item
+    type: code
+    start: 0x728EE0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, stone_cap]
+  - name: tasty_tonic
+    dir: battle/move/item
+    type: code
+    start: 0x729940
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, tasty_tonic]
+  - name: thunder_bolt
+    dir: battle/move/item
+    type: code
+    start: 0x72A480
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, thunder_bolt]
+  - name: ultra_shroom
+    dir: battle/move/item
+    type: code
+    start: 0x72B0C0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, ultra_shroom]
+  - name: unknown_item
+    dir: battle/move/item
+    type: code
+    start: 0x72BB80
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, unknown_item]
+  - name: super_soda
+    dir: battle/move/item
+    type: code
+    start: 0x72C620
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, super_soda]
+  - name: hustle_drink
+    dir: battle/move/item
+    type: code
+    start: 0x72D8A0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, hustle_drink]
+  - name: stop_watch
+    dir: battle/move/item
+    type: code
+    start: 0x72E710
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, stop_watch]
+  - name: dizzy_dial
+    dir: battle/move/item
+    type: code
+    start: 0x72F250
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, dizzy_dial]
+  - name: please_come_back
+    dir: battle/move/item
+    type: code
+    start: 0x72FF20
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, please_come_back]
+  - name: egg_missile
+    dir: battle/move/item
+    type: code
+    start: 0x730800
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, egg_missile]
+    - start: 0x730B10
+      type: .data
+      name: egg_missile
+      subsegments:
+      - [0x730B10]
+      - [0x7310D0, ci4, egg_missile1, 32, 32]
+      - [0x7312D0, palette, egg_missile1]
+      - [0x7312F0, ci4, egg_missile2, 32, 32]
+      - [0x7314F0, palette, egg_missile2]
+      - [0x731510, ci4, egg_missile3, 32, 32]
+      - [0x731710, palette, egg_missile3]
+      - [0x731730, ci4, egg_missile4, 32, 32]
+      - [0x731930, palette, egg_missile4]
+      - [0x731950]
+  - name: insecticide_herb
+    dir: battle/move/item
+    type: code
+    start: 0x732090
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, insecticide_herb]
+    - start: 0x7324B0
+      type: .data
+      name: insecticide_herb
+      subsegments:
+      - [0x7324B0]
+      - [0x732A70, ci4, insecticide_herb, 32, 32]
+      - [0x732C70, palette, insecticide_herb]
+      - [0x732C90]
+  - name: fright_jar
+    dir: battle/move/item
+    type: code
+    start: 0x733250
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, fright_jar]
+  - name: mystery
+    dir: battle/move/item
+    type: code
+    start: 0x733EF0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, mystery]
+    - start: 0x734840
+      type: .data
+      name: mystery
+      subsegments:
+      - [0x734840]
+      - [0x734E00, ci4, mystery, 32, 32]
+      - [0x735000, palette, mystery]
+      - [0x735020]
+  - name: repel_gel
+    dir: battle/move/item
+    type: code
+    start: 0x7354B0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, repel_gel]
+  - name: life_shroom
+    dir: battle/move/item
+    type: code
+    start: 0x735E70
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, life_shroom]
+  - name: coconut
+    dir: battle/move/item
+    type: code
+    start: 0x737060
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, coconut]
+    - start: 0x7372A0
+      type: .data
+      name: coconut
+      subsegments:
+      - [0x7372A0]
+      - [0x737860, ci4, coconut, 32, 32]
+      - [0x737A60, palette, coconut]
+      - [0x737A80]
+  - name: electro_pop
+    dir: battle/move/item
+    type: code
+    start: 0x737EE0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, electro_pop]
+  - name: strange_cake
+    dir: battle/move/item
+    type: code
+    start: 0x738C40
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, strange_cake]
+    - start: 0x7397E0
+      type: .data
+      name: strange_cake
+      subsegments:
+      - [0x7397E0]
+      - [0x739DB0, ci4, strange_cake1, 32, 32]
+      - [0x739FB0, palette, strange_cake1]
+      - [0x739FD0, ci4, strange_cake2, 32, 32]
+      - [0x73A1D0, palette, strange_cake2]
+      - [0x73A1F0, ci4, strange_cake3, 32, 32]
+      - [0x73A3F0, palette, strange_cake3]
+      - [0x73A410]
+  - name: food
+    dir: battle/move/item
+    type: code
+    start: 0x73AA10
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, food]
+
+####################
+### Battle Moves ###
+####################
+  - name: battle_move_hammer_attack
+    dir: battle/move/hammer
+    type: code
+    start: 0x73BEE0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, attack]
+  - name: battle_move_spin_smash
+    dir: battle/move/hammer
+    type: code
+    start: 0x73F1D0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, spin_smash]
+  - name: battle_move_quake_hammer
+    dir: battle/move/hammer
+    type: code
+    start: 0x742810
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, quake_hammer]
+  - name: battle_move_jump_attack
+    dir: battle/move/jump
+    type: code
+    start: 0x7451A0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, attack]
+  - name: battle_move_multibounce
+    dir: battle/move/jump
+    type: code
+    start: 0x748600
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, multibounce]
+  - name: battle_move_power_bounce
+    dir: battle/move/jump
+    type: code
+    start: 0x74B730
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, power_bounce]
+  - name: battle_move_sleep_stomp
+    dir: battle/move/jump
+    type: code
+    start: 0x74E750
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, sleep_stomp]
+  - name: battle_move_dizzy_stomp
+    dir: battle/move/jump
+    type: code
+    start: 0x750710
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, dizzy_stomp]
+  - name: battle_move_d_down_pound
+    dir: battle/move/hammer
+    type: code
+    start: 0x7526D0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, d_down_pound]
+  - name: battle_move_jump_charge_0
+    dir: battle/move/jump
+    type: code
+    start: 0x754EB0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, jump_charge_0]
+  - name: battle_move_hammer_charge_0
+    dir: battle/move/hammer
+    type: code
+    start: 0x756A70
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, hammer_charge_0]
+  - name: battle_move_hammer_throw
+    dir: battle/move/hammer
+    type: code
+    start: 0x759D90
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, hammer_throw]
+    - start: 0x759E40
+      type: .data
+      name: hammer_throw
+      subsegments:
+      - [0x759E40]
+      - [0x75BDD8, ci4, dusty_hammer, 32, 32]
+      - [0x75BFD8, palette, dusty_hammer]
+      - [0x75BFF8, ci4, basic_hammer, 32, 32]
+      - [0x75C1F8, palette, basic_hammer]
+      - [0x75C218, ci4, super_hammer, 32, 32]
+      - [0x75C418, palette, super_hammer]
+      - [0x75C438, ci4, ultra_hammer, 32, 32]
+      - [0x75C638, palette, ultra_hammer]
+      - [0x75C658, vtx, hammer_throw]
+      - [0x75C698, gfx, dusty_hammer]
+      - [0x75C788, gfx, basic_hammer]
+      - [0x75C878, gfx, super_hammer]
+      - [0x75C968, gfx, ultra_hammer]
+      - [0x75CA58]
+  - name: battle_move_mega_quake
+    dir: battle/move/hammer
+    type: code
+    start: 0x75E0C0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, mega_quake]
+  - name: battle_move_hammer_charge_1
+    dir: battle/move/hammer
+    type: code
+    start: 0x760EF0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, hammer_charge_1]
+  - name: battle_move_jump_charge_1
+    dir: battle/move/jump
+    type: code
+    start: 0x7642C0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, jump_charge_1]
+  - name: battle_move_hammer_charge_2
+    dir: battle/move/hammer
+    type: code
+    start: 0x765F10
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, hammer_charge_2]
+  - name: battle_move_jump_charge_2
+    dir: battle/move/jump
+    type: code
+    start: 0x769260
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, jump_charge_2]
+  - name: battle_move_auto_smash
+    dir: battle/move/hammer
+    type: code
+    start: 0x76AE80
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, auto_smash]
+  - name: battle_move_auto_jump
+    dir: battle/move/jump
+    type: code
+    start: 0x76D560
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, auto_jump]
+  - name: battle_move_power_quake
+    dir: battle/move/hammer
+    type: code
+    start: 0x76F5D0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, power_quake]
+  - name: battle_move_auto_multibounce
+    dir: battle/move/jump
+    type: code
+    start: 0x772170
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, auto_multibounce]
+  - name: battle_move_power_jump
+    dir: battle/move/jump
+    type: code
+    start: 0x7750A0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, power_jump]
+  - name: battle_move_super_jump
+    dir: battle/move/jump
+    type: code
+    start: 0x776C70
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, super_jump]
+  - name: battle_move_mega_jump
+    dir: battle/move/jump
+    type: code
+    start: 0x778870
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, mega_jump]
+  - name: battle_move_power_smash
+    dir: battle/move/hammer
+    type: code
+    start: 0x77A4E0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, power_smash]
+  - name: battle_move_super_smash
+    dir: battle/move/hammer
+    type: code
+    start: 0x77CA40
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, super_smash]
+  - name: battle_move_mega_smash
+    dir: battle/move/hammer
+    type: code
+    start: 0x77EFD0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, mega_smash]
+  - name: battle_move_demo_power_bounce
+    dir: battle/move/jump
+    type: code
+    start: 0x7815D0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, demo_power_bounce]
+  - name: battle_move_shrink_smash
+    dir: battle/move/hammer
+    type: code
+    start: 0x7844C0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, shrink_smash]
+  - name: battle_move_shell_crack
+    dir: battle/move/hammer
+    type: code
+    start: 0x786B80
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, shell_crack]
+  - name: battle_move_d_down_jump
+    dir: battle/move/jump
+    type: code
+    start: 0x789260
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, d_down_jump]
+  - name: battle_move_shrink_stomp
+    dir: battle/move/jump
+    type: code
+    start: 0x78B4E0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, shrink_stomp]
+  - name: battle_move_earthquake_jump
+    dir: battle/move/jump
+    type: code
+    start: 0x78D460
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, earthquake_jump]
+  - name: battle_move_focus
+    dir: battle/move/star_power
+    type: code
+    start: 0x7917A0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, focus]
+  - name: battle_move_refresh
+    dir: battle/move/star_power
+    type: code
+    start: 0x792F40
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, refresh]
+  - name: battle_move_lullaby
+    dir: battle/move/star_power
+    type: code
+    start: 0x794A90
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, lullaby]
+  - name: battle_move_star_storm
+    dir: battle/move/star_power
+    type: code
+    start: 0x796110
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, star_storm]
+  - name: battle_move_chill_out
+    dir: battle/move/star_power
+    type: code
+    start: 0x797A10
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, chill_out]
+  - name: battle_move_smooch
+    dir: battle/move/star_power
+    type: code
+    start: 0x7996D0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, smooch]
+  - name: battle_move_time_out
+    dir: battle/move/star_power
+    type: code
+    start: 0x79B660
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, time_out]
+  - name: battle_move_up_and_away
+    dir: battle/move/star_power
+    type: code
+    start: 0x79CC20
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, up_and_away]
+  - name: battle_move_star_beam
+    dir: battle/move/star_power
+    type: code
+    start: 0x79E900
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, star_beam]
+  - name: battle_move_peach_beam
+    dir: battle/move/star_power
+    type: code
+    start: 0x7A10F0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, peach_beam]
+  - name: battle_move_peach_focus
+    dir: battle/move/star_power
+    type: code
+    start: 0x7A38E0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, peach_focus]
+  - name: battle_move_peach_focus_alt
+    dir: battle/move/star_power
+    type: code
+    start: 0x7A51E0
+    vram: 0x802A1000
+    subsegments:
+    - [auto, c, peach_focus_alt]
+
+  - [0x7A6880, bin]
+
+  - name: world_model_anim_kzn_01
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7BD2F0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "01"]
+  - name: world_model_anim_kzn_00
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7BE020
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "00"]
+  - name: world_model_anim_kzn_04
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7BEA70
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "04"]
+  - name: world_model_anim_kzn_05
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7BF9C0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "05"]
+  - name: world_model_anim_kzn_06
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7C06C0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "06"]
+  - name: world_model_anim_kzn_07
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7C1170
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "07"]
+  - name: world_model_anim_kzn_08
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7C1C10
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "08"]
+  - name: world_model_anim_kzn_09
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7C29E0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "09"]
+  - name: world_model_anim_kzn_0A
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7C3710
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "0A"]
+  - name: world_model_anim_kzn_0B
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7C6760
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "0B"]
+  - name: world_model_anim_kzn_0C
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7C9050
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "0C"]
+  - name: world_model_anim_kzn_0D
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7CB390
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "0D"]
+  - name: world_model_anim_kzn_0E
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7CBE60
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "0E"]
+  - name: world_model_anim_kzn_02
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7CC8E0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "02"]
+  - name: world_model_anim_kzn_03
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7CEDA0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "03"]
+  - name: world_model_anim_kzn_0F
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7CF7E0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "0F"]
+  - name: world_model_anim_kzn_10
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7D21E0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "10"]
+  - name: world_model_anim_kzn_11
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7D4F80
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "11"]
+  - name: world_model_anim_kzn_12
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7D54C0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "12"]
+  - name: world_model_anim_kzn_13
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7D6980
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "13"]
+  - name: world_model_anim_kzn_14
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7D7650
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "14"]
+  - name: world_model_anim_kzn_15
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7D81F0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "15"]
+  - name: world_model_anim_kzn_16
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7D8E70
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "16"]
+  - name: world_model_anim_kzn_17
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7D9A10
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "17"]
+  - name: world_model_anim_kzn_18
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7DA2F0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "18"]
+  - name: world_model_anim_kzn_19
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7DABF0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "19"]
+  - name: world_model_anim_kzn_1A
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7DCF00
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "1A"]
+  - name: world_model_anim_kzn_1B
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7DE910
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "1B"]
+  - name: world_model_anim_kzn_1C
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7DF040
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "1C"]
+  - name: world_model_anim_kzn_1D
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7E0980
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "1D"]
+  - name: world_model_anim_kzn_1E
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7E1070
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "1E"]
+  - name: world_model_anim_kzn_1F
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7E1270
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "1F"]
+  - name: world_model_anim_kzn_20
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7E1AD0
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "20"]
+  - name: world_model_anim_kzn_21
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7E3B10
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "21"]
+  - name: world_model_anim_kzn_22
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7E6300
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "22"]
+  - name: world_model_anim_kzn_23
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7E6C40
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "23"]
+  - name: world_model_anim_kzn_24
+    dir: world/model_anim/kzn
+    type: code
+    start: 0x7E7D40
+    vram: 0x80234000
+    subsegments:
+    - [auto, c, "24"]
+  - name: world_script_api
+    dir: world/script_api
+    type: code
     start: 0x7E8810
     vram: 0x80280000
+    subsegments:
+    - [auto, c, shops]
+    - [auto, c, rooms]
+    - [auto, c, push_blocks]
+    - [auto, c, enter_exit]
+  - name: texture_memory
+    type: code
+    start: 0x7EECD0
+    vram: 0x8028E000
+    subsegments:
+    - [auto, c, texture_memory]
 
 ############
 ### Maps ###
diff --git a/ver/jp/symbol_addrs.txt b/ver/jp/symbol_addrs.txt
index 410036585b..6e1c1fe80a 100644
--- a/ver/jp/symbol_addrs.txt
+++ b/ver/jp/symbol_addrs.txt
@@ -3002,3 +3002,32 @@ MsgCharWidthKana = 0x802E6380; // rom:0x10CC20
 MsgCharWidthLatin = 0x802E6448; // rom:0x10CCE8
 MsgCharWidthKanji = 0x802E6464; // rom:0x10CD04
 MsgCharWidthButtons = 0x802E64E0; // rom:0x10CD80
+
+battle_action_cmd_whirlwind_bubble_png = 0x802AA1A0; // rom:0x42C7D0
+
+battle_item_dusty_hammer_png = 0x802A1800; // rom:0x71FB10
+battle_item_pebble_png = 0x802A1800; // rom:0x7212B0
+battle_item_sleepy_sheep1_png = 0x802A1F30; // rom:0x726EC0
+battle_item_sleepy_sheep2_png = 0x802A2490; // rom:0x727420
+battle_item_sleepy_sheep3_png = 0x802A29F0; // rom:0x727980
+battle_item_egg_missile1_png = 0x802A18D0; // rom:0x7310D0
+battle_item_egg_missile2_png = 0x802A1AF0; // rom:0x7312F0
+battle_item_egg_missile3_png = 0x802A1D10; // rom:0x731510
+battle_item_egg_missile4_png = 0x802A1F30; // rom:0x731730
+battle_item_insecticide_herb_png = 0x802A19E0; // rom:0x732A70
+battle_item_mystery_png = 0x802A1F10; // rom:0x734E00
+battle_item_coconut_png = 0x802A1800; // rom:0x737860
+
+battle_move_hammer_throw_dusty_hammer_png = 0x802A3048; // rom:0x75BDD8
+battle_move_hammer_throw_dusty_hammer_pal = 0x802A3248; // rom:0x75BFD8
+battle_move_hammer_throw_basic_hammer_png = 0x802A3268; // rom:0x75BFF8
+battle_move_hammer_throw_basic_hammer_pal = 0x802A3468; // rom:0x75C1F8
+battle_move_hammer_throw_super_hammer_png = 0x802A3488; // rom:0x75C218
+battle_move_hammer_throw_super_hammer_pal = 0x802A3688; // rom:0x75C418
+battle_move_hammer_throw_ultra_hammer_png = 0x802A36A8; // rom:0x75C438
+battle_move_hammer_throw_ultra_hammer_pal = 0x802A38A8; // rom:0x75C638
+battle_move_hammer_throw_vtx = 0x802A38C8;              // rom:0x75C658 size:0x40
+battle_move_hammer_throw_dusty_hammer_gfx = 0x802A3908; // rom:0x75C698
+battle_move_hammer_throw_basic_hammer_gfx = 0x802A39F8; // rom:0x75C788
+battle_move_hammer_throw_super_hammer_gfx = 0x802A3AE8; // rom:0x75C878
+battle_move_hammer_throw_ultra_hammer_gfx = 0x802A3BD8; // rom:0x75C968
diff --git a/ver/jp/undefined_syms.txt b/ver/jp/undefined_syms.txt
index 7025b55d8f..66f7cda033 100644
--- a/ver/jp/undefined_syms.txt
+++ b/ver/jp/undefined_syms.txt
@@ -782,17 +782,14 @@ pulse_stone_ROM_END = 0xE2B440;
 i_spy_ROM_START = 0xE2B440;
 i_spy_ROM_END = 0xE2C0F0;
 
-WorldTattleInteractionID = 0x802BDF60;
 interact_inspect_setup = 0x802B70B4;
 appendGfx_interact_prompt = 0x802B71E8;
 ispy_notification_setup = 0x802b72c0;
-world_watt_sync_held_position = 0x802BE06C;
 appendGfx_speech_bubble = 0x802B71C8;
 interact_speech_setup = 0x802B70B4;
 appendGfx_pulse_stone_icon = 0x802B71D4;
 appendGfx_ispy_icon = 0x802b7000;
 pulse_stone_notification_setup = 0x802B7140;
-world_lakilester_can_dismount = 0x802BD7DC;
 
 action_update_idle = 0x802B6000;
 world_action_idle_ROM_START = 0xE2C0F0;
@@ -861,133 +858,7 @@ action_update_ride = 0x802B6000;
 action_update_step_up = 0x802B6000;
 action_update_state_23 = 0x802B609C;
 
-world_use_item_ROM_START = 0x32d500;
-world_use_item_ROM_END = 0x32ddd0;
-world_use_item_VRAM = 0x802C0000;
-EVS_World_UseItem = 0x802C059C;
-
-world_partner_goombario_ROM_START = 0x31F430;
-world_partner_goombario_ROM_END = 0x320260;
-world_partner_goombario_VRAM = 0x802BD100;
-world_goombario_init = 0x802BD174;
-EVS_WorldGoombario_TakeOut = 0x802BDD6C;
-EVS_WorldGoombario_Update = 0x802BDD8C;
-EVS_WorldGoombario_UseAbility = 0x802BDDA8;
-EVS_WorldGoombario_PutAway = 0x802BDE60;
-world_goombario_can_open_menus = 0x802BD5A8;
-world_goombario_pre_battle = 0x802BDBC0;
-
-world_partner_kooper_ROM_START = 0x323530;
-world_partner_kooper_ROM_END = 0x325080;
-world_partner_kooper_VRAM = 0x802BD100;
-world_kooper_init = 0x802BD200;
-EVS_WorldKooper_TakeOut = 0x802BEB44;
-EVS_WorldKooper_Update = 0x802BEB64;
-EVS_WorldKooper_UseAbility = 0x802BEB80;
-EVS_WorldKooper_PutAway = 0x802BEB9C;
-world_kooper_test_first_strike = 0x802BE818;
-world_kooper_pre_battle = 0x802BEA24;
-world_kooper_post_battle = 0x802BEB10;
-
-world_partner_bombette_ROM_START = 0x320260;
-world_partner_bombette_ROM_END = 0x321a80;
-world_partner_bombette_VRAM = 0x802BD100;
-world_bombette_init = 0x802BD2D8;
-EVS_WorldBombette_TakeOut = 0x802BE880;
-EVS_WorldBombette_Update = 0x802BE8A0;
-EVS_WorldBombette_UseAbility = 0x802BE8BC;
-EVS_WorldBombette_PutAway = 0x802BE8D8;
-world_bombette_test_first_strike = 0x802BE520;
-world_bombette_can_use_ability = 0x802BD720;
-world_bombette_can_open_menus = 0x802BD748;
-world_bombette_pre_battle = 0x802BE6E8;
-
-world_partner_parakarry_ROM_START = 0x321a80;
-world_partner_parakarry_ROM_END = 0x323530;
-world_partner_parakarry_VRAM = 0x802BD100;
-world_parakarry_init = 0x802BD100;
-EVS_WorldParakarry_TakeOut = 0x802BEA90;
-EVS_WorldParakarry_Update = 0x802BEAB0;
-EVS_WorldParakarry_UseAbility = 0x802BEACC;
-EVS_WorldParakarry_PutAway = 0x802BEAE8;
-world_parakarry_pre_battle = 0x802BE90C;
-world_parakarry_post_battle = 0x802BE9D0;
-
-world_partner_goompa_ROM_START = 0x32cd40;
-world_partner_goompa_ROM_END = 0x32d240;
-world_partner_goompa_VRAM = 0x802BD100;
-world_goompa_init = 0x802BD100;
-EVS_WorldGoompa_TakeOut = 0x802BD570;
-EVS_WorldGoompa_Update = 0x802BD590;
-EVS_WorldGoompa_UseAbility = 0x802BD5AC;
-EVS_WorldGoompa_PutAway = 0x802BD5C8;
-
-world_partner_watt_ROM_START = 0x325080;
-world_partner_watt_ROM_END = 0x326270;
-world_partner_watt_VRAM = 0x802BD100;
-world_watt_init = 0x802BD23C;
-EVS_WorldWatt_TakeOut = 0x802BE248;
-EVS_WorldWatt_Update = 0x802BE26C;
-EVS_WorldWatt_UseAbility = 0x802BE288;
-EVS_WorldWatt_PutAway = 0x802BE2A4;
-world_watt_pre_battle = 0x802BDD98;
-world_watt_post_battle = 0x802BDE0C;
-EVS_WorldWatt_EnterMap = 0x802BE2C0;
-
-world_partner_sushie_ROM_START = 0x326270;
-world_partner_sushie_ROM_END = 0x328FF0;
-world_partner_sushie_VRAM = 0x802BD100;
-world_sushie_init = 0x802BF4C4;
-EVS_WorldSushie_TakeOut = 0x802BFD7C;
-EVS_WorldSushie_Update = 0x802BFD9C;
-EVS_WorldSushie_UseAbility = 0x802BFD60;
-EVS_WorldSushie_PutAway = 0x802BFDB8;
-world_sushie_pre_battle = 0x802BF95C;
-world_sushie_post_battle = 0x802BF9FC;
-EVS_WorldSushie_EnterMap = 0x802BFDD4;
-
-world_partner_lakilester_ROM_START = 0x328FF0;
-world_partner_lakilester_ROM_END = 0x32BD80;
-world_partner_lakilester_VRAM = 0x802BD100;
-world_lakilester_init = 0x802BD21C;
-EVS_WorldLakilester_TakeOut = 0x802BFDF0;
-EVS_WorldLakilester_Update = 0x802BFE10;
-EVS_WorldLakilester_UseAbility = 0x802BFE2C;
-EVS_WorldLakilester_PutAway = 0x802BFE48;
-world_lakilester_pre_battle = 0x802BF998;
-world_lakilester_post_battle = 0x802BFA40;
-EVS_WorldLakilester_EnterMap = 0x802BFE64;
-
-world_partner_bow_ROM_START = 0x32BD80;
-world_partner_bow_ROM_END = 0x32CD40;
-world_partner_bow_VRAM = 0x802BD100;
-world_bow_init = 0x802BD100;
-EVS_WorldBow_TakeOut = 0x802BDFE0;
-EVS_WorldBow_Update = 0x802BE000;
-EVS_WorldBow_UseAbility = 0x802BE01C;
-EVS_WorldBow_PutAway = 0x802BE038;
-world_bow_pre_battle = 0x802BDF64;
-
-world_partner_goombaria_ROM_START = 0x32D240;
-world_partner_goombaria_ROM_END = 0x32D3A0;
-world_partner_goombaria_VRAM = 0x802BD100;
-world_goombaria_init = 0x802BD100;
-EVS_WorldGoombaria_TakeOut = 0x802BD1F0;
-EVS_WorldGoombaria_Update = 0x802BD20C;
-EVS_WorldGoombaria_UseAbility = 0x802BD228;
-EVS_WorldGoombaria_PutAway = 0x802BD244;
-
-world_partner_twink_ROM_START = 0x32D3A0;
-world_partner_twink_ROM_END = 0x32D500;
-world_partner_twink_VRAM = 0x802BD100;
-world_twink_init = 0x802BD100;
-EVS_WorldTwink_TakeOut = 0x802BD1F0;
-EVS_WorldTwink_Update = 0x802BD20C;
-EVS_WorldTwink_UseAbility = 0x802BD228;
-EVS_WorldTwink_PutAway = 0x802BD244;
-
 heap_spriteHead = 0x8034F800;
-sprite_shading_profiles_ROM_START = 0x0031DF90;
 Entity_UltraBlockContent_Render = 0x0A000800;
 entity_model_SimpleSpring_gfx_ROM_END = 0x00E72BD0;
 Entity_SaveBlock_RenderNone = 0x0A003508;
@@ -1163,3 +1034,269 @@ cymbal_crush_header = 0x000CA380;
 startle_header = 0x00029458;
 get_in_bed_header = 0x00038988;
 shiver_header = 0x00018200;
+
+// battle
+btl_cam_use_preset = 0x8024E40C;
+btl_cam_move = 0x8024E4D8;
+UseBattleCamPreset = 0x8024E61C;
+UseBattleCamPresetImmediately = 0x8024E664;
+SetBattleCamTarget = 0x8024E90C;
+MoveBattleCamOver = 0x8024EC08;
+SetBattleCamZoom = 0x8024EC6C;
+AddBattleCamZoom = 0x8024ECAC;
+ShowMessageBox = 0x80251440;
+WaitForMessageBoxDone = 0x80251558;
+ItemDamageEnemy = 0x802528A8;
+ItemCheckHit = 0x80252EC0;
+ActorSpeak = 0x802530B0;
+EnableBattleStatusBar = 0x80253734;
+PlaySoundAtActor = 0x802539DC;
+SetForegroundModelsVisible = 0x80253C6C;
+StartRumble = 0x80254398;
+set_actor_anim = 0x80263E7C;
+get_actor_part = 0x802645DC;
+btl_update_ko_status = 0x802678FC;
+get_actor = 0x80269EEC;
+SetGoalToHome = 0x8026A044;
+SetGoalToTarget = 0x8026A528;
+SetGoalPos = 0x8026A690;
+GetGoalPos = 0x8026A9A0;
+GetActorPos = 0x8026AC28;
+SetActorPos = 0x8026AFC0;
+SetAnimation = 0x8026B330;
+SetActorYaw = 0x8026B4D8;
+SetActorJumpGravity = 0x8026B6DC;
+SetActorSpeed = 0x8026B7D4;
+SetJumpAnimations = 0x8026BA0C;
+GetActorVar = 0x8026C134;
+SetActorVar = 0x8026C1C4;
+SetActorRotationOffset = 0x8026C62C;
+SetActorScale = 0x8026CA84;
+SetActorScaleModifier = 0x8026CB44;
+SetBattleFlagBits = 0x8026CEBC;
+SetActorFlagBits = 0x8026D00C;
+GetOwnerID = 0x8026DF80;
+InitTargetIterator = 0x8026E4D4;
+ChooseNextTarget = 0x8026E594;
+GetOwnerTarget = 0x8026EA2C;
+ModifyActorDecoration = 0x8026F170;
+func_80273444 = 0x802735C0;
+PlayerRunToGoal = 0x80273DE0;
+PlayerDamageEnemy = 0x802743DC;
+PlayerYieldTurn = 0x80277078;
+dispatch_damage_event_actor_0 = 0x80278A78;
+RunToGoal = 0x80279FE4;
+RemoveActor = 0x8027C930;
+DispatchEvent = 0x8027D3E4;
+PartnerYieldTurn = 0x80280998;
+EMS_StarIcon = 0x802841E8;
+PartnerWishAnims = 0x8029CB90;
+CheckButtonPress = 0x8026E218;
+SetGoalToFirstTarget = 0x8026A61C;
+CancelablePlayerRunToGoal = 0x80274078;
+func_802693F0 = 0x80269570;
+AddGoalPos = 0x8026A8C8;
+EnablePlayerBlur = 0x80274AF4;
+PlayerLandJump = 0x80273C80;
+LoadActionCommand = 0x80268340;
+func_80274A18 = 0x80274B94;
+func_802752AC = 0x80275428;
+GetPlayerActionSuccess = 0x80277030;
+SetActionDifficultyTable = 0x8026931C;
+func_80275F00 = 0x8027607C;
+CloseActionCommandInfo = 0x80269590;
+SetActorRotation = 0x8026C52C;
+SetActorDispOffset = 0x8026BB84;
+ShowActionHud = 0x80269624;
+GetMenuSelection = 0x80273540;
+PlayerTestEnemy = 0x8027486C;
+SetActorSounds = 0x8026F8C0;
+GetTargetListLength = 0x8026E9E4;
+GetActionResult = 0x802696A4;
+GetCommandAutoSuccess = 0x802694F0;
+SetActionResult = 0x802696D0;
+SetDamageSource = 0x8026A02C;
+CheckButtonDown = 0x8026E288;
+SetBattleCamOffsetZ = 0x8024EA58;
+SetActionQuality = 0x80269754;
+GetActionQuality = 0x80269728;
+GetActionCommandMode = 0x80269498;
+GetActionSuccess = 0x80269414;
+SetActionCommandMode = 0x8026946C;
+PlayerPowerBounceEnemy = 0x8027461C;
+GetActionSuccessCopy = 0x80269678;
+UseIdleAnimation = 0x8026F26C;
+ShowVariableMessageBox = 0x80251498;
+IsMessageBoxDisplayed = 0x80251510;
+GetBattleFlags2 = 0x8026CF20;
+player_team_is_ability_active = 0x8026742C;
+dispatch_event_partner = 0x8027E000;
+inflict_status = 0x802660C0;
+EVS_PlaySleepHitFX = 0x802948E0;
+ItemSpookEnemy = 0x80252AA4;
+BattleCamTargetActor = 0x8024EB24;
+MakeStatusField = 0x80253D14;
+ItemAfflictEnemy = 0x80252CBC;
+func_8024ECF8 = 0x8024ECF8;
+MultiplyByActorScale = 0x8025415C;
+ApplyShrinkFromOwner = 0x80254318;
+MultiplyVec3ByActorScale = 0x8025425C;
+SetOwnerTarget = 0x8026E528;
+dispatch_event_actor = 0x802772E0;
+EVS_UseMystery = 0x80294140;
+SetTargetActor = 0x8027C6C8;
+DispatchDamagePlayerEvent = 0x80274A98;
+HES_ProjectorSpot = 0x80294F00;
+HES_ProjectorReel = 0x80292ED8;
+HES_ProjectorBeam = 0x80292F28;
+HES_SwapBackground = 0x80292FF4;
+HES_SwapZ = 0x80292F50;
+HES_SwapArrowLeft = 0x80292F7C;
+HES_SwapArrowRight = 0x80292FB8;
+actionCmdTableSpook = 0x80294740;
+gActionCommandStatus = 0x8029FED0;
+action_command_init_status = 0x802689D8;
+HES_100pct = 0x80292C74;
+adjust_action_command_difficulty = 0x802683A4;
+func_80269118 = 0x80269298;
+btl_set_popup_duration = 0x8024FAB4;
+func_80269160 = 0x802692E0;
+action_command_free = 0x80268E1C;
+draw_mash_meter_multicolor = 0x802688F0;
+draw_mash_meter_blink = 0x8026898C;
+actionCmdTableHurricane = 0x80294720;
+HES_BButton = 0x8029261C;
+HES_MashBButton1 = 0x80292674;
+draw_mash_meter_multicolor_with_divisor = 0x80268918;
+draw_mash_meter_blink_with_divisor = 0x802689B4;
+HES_PressBButton = 0x802926B0;
+HES_PressCDownButton = 0x802929C4;
+HES_BButtonHeld = 0x80292648;
+HES_CDownButtonHeld = 0x8029295C;
+HES_TimingBar3Chances = 0x80292DFC;
+HES_TimingWait = 0x80292A5C;
+HES_TimingOK = 0x80292E54;
+HES_TimingCharge4c = 0x80292BA0;
+HES_TimingCharge4b = 0x80292B48;
+HES_TimingCharge3 = 0x80292BCC;
+HES_TimingCharge2 = 0x80292B74;
+HES_TimingReady = 0x80292A88;
+HES_TimingMiss = 0x80292E80;
+actionCmdTableTidalWave = 0x802947A0;
+actionCmdTableSpinySurge = 0x80294700;
+actionCmdTableSmack = 0x802946E0;
+actionCmdTableMegaShock = 0x802946C0;
+actionCmdTablePowerShock = 0x802946A0;
+actionCmdTableWaterBlock = 0x80294760;
+actionCmdTableSquirt = 0x80294680;
+draw_mash_meter_mode_with_divisor = 0x80268964;
+actionCmdTableDizzyShell = 0x802945A0;
+actionCmdTableFireShell = 0x802945C0;
+actionCmdTable0A = 0x802945E0;
+actionCmdTableBomb = 0x80294600;
+actionCmdTableBodySlam = 0x80294620;
+HES_FillGaugeResult = 0x80292EAC;
+actionCmdTableAirLift = 0x80294640;
+actionCmdTableAirRaid = 0x80294660;
+actionCmdTable07 = 0x80294580;
+btl_message_unlock_box_pos = 0x8024FAEC;
+actionCmdTableStopLeech = 0x80294560;
+HES_RunningAway = 0x80292BF8;
+actionCmdTableBreakFree = 0x80294520;
+actionCmdTableHammer = 0x802944E0;
+HES_TimingBar1Chance = 0x802925F0;
+HES_TimingCharge4a = 0x80292AF0;
+HES_TimingCharge1 = 0x80292B1C;
+actionCmdTableFlee = 0x80294500;
+HES_RightOn = 0x80292D2C;
+actionCmdTableJump = 0x802944C0;
+actionCmdTableWhirlwind = 0x80294540;
+BindTakeTurn = 0x80278AB0;
+BindIdle = 0x80278C14;
+BindHandleEvent = 0x80278DA0;
+BindHandlePhase = 0x80278E14;
+AddActorDecoration = 0x8026F008;
+GetLastEvent = 0x8027C660;
+EVS_Enemy_Hit = 0x80299344;
+EVS_Enemy_NoDamageHit = 0x8029AF70;
+GetBattlePhase = 0x80269FA8;
+EVS_Partner_Celebrate = 0x80294A20;
+EVS_Partner_RunAway = 0x80294DFC;
+EnableIdleScript = 0x80278CCC;
+FlyToGoal = 0x8027B7A4;
+EnableActorBlur = 0x8027D6FC;
+PartnerDamageEnemy = 0x8027FF34;
+EVS_Partner_SpikeContact = 0x802952E4;
+EVS_Partner_BurnContact = 0x80294F68;
+EVS_Partner_Recover = 0x802961C4;
+bActorTattles = 0x80282D18;
+bActorOffsets = 0x80283068;
+EVS_Partner_Hit = 0x80297ABC;
+EVS_Partner_Drop = 0x80296314;
+EVS_Partner_NoDamageHit = 0x80297B14;
+EVS_Partner_BurnHit = 0x8029651C;
+EVS_Partner_ShockHit = 0x80295A44;
+LoadStarPowerScript = 0x80280AD0;
+LoadItemScript = 0x80268050;
+JumpToGoal = 0x80278E88;
+PartnerTestEnemy = 0x80280650;
+GetPartnerActionSuccess = 0x80280950;
+PartnerPowerBounceEnemy = 0x802803F0;
+ResetActorSounds = 0x8026F9B8;
+RemoveActorDecoration = 0x8026F0CC;
+GetActorLevel = 0x8027FEC8;
+SetupMashMeter = 0x80269348;
+PartnerAfflictEnemy = 0x80280184;
+SetActorPaletteEffect = 0x8026EBFC;
+SetActorPaletteSwapParams = 0x8026ED78;
+EnableActorPaletteEffects = 0x8026EEA0;
+EVS_Partner_BombetteSpikeContact = 0x80295650;
+ShowShockEffect = 0x8026FD30;
+add_xz_vec3f = 0x802642A8;
+play_movement_dust_effects = 0x80264470;
+save_tattle_flags = 0x80253E90;
+lookup_status_chance = 0x80266018;
+HES_AimMarkerF = 0x80293314;
+HES_AimMarkerE = 0x8029327C;
+HES_AimMarkerD = 0x802931E4;
+HES_AimMarkerC = 0x8029314C;
+HES_AimMarkerB = 0x802930B4;
+HES_AimMarkerA = 0x8029301C;
+HES_AimReticle = 0x8029399C;
+HES_AimShimmerF = 0x802937D4;
+HES_AimShimmerE = 0x8029373C;
+HES_AimShimmerD = 0x802936A4;
+HES_AimShimmerC = 0x8029360C;
+HES_AimShimmerB = 0x80293574;
+HES_AimShimmerA = 0x802934DC;
+HES_AimTarget = 0x802939D4;
+set_goal_pos_to_part = 0x802698D4;
+JumpWithBounce = 0x802798A8;
+SetActionHudPrepareTime = 0x802694C4;
+GetDistanceToGoal = 0x8026EB7C;
+SetAnimationRate = 0x8026B450;
+PlayLoopingSoundAtActor = 0x80253AF4;
+StopLoopingSoundAtActor = 0x80253B98;
+GetActorFlags = 0x8026D0A0;
+GetStatusFlags = 0x8026F3B0;
+LandJump = 0x80279C54;
+GetActorScale = 0x8026CC04;
+EVS_Partner_LakilesterHit = 0x802979E8;
+HES_AimBlinkA = 0x80293A0C;
+SetPartPos = 0x8026B098;
+SetPartFlagBits = 0x8026D190;
+SetPartDispOffset = 0x8026BDB8;
+SetPartJumpGravity = 0x8026B8CC;
+JumpPartTo = 0x8027A664;
+LandJumpPart = 0x8027ACDC;
+func_8024EDA4 = 0x8024EDA4;
+PlayerFallToGoal = 0x80273A10;
+FallToGoal = 0x80279D6C;
+bMarioHideAnims = 0x802834F0;
+bMarioIdleAnims = 0x802833B8;
+SetPartAlpha = 0x8026F5F0;
+func_80269600 = 0x80269780;
+SetBattleCamParam = 0x8024E748;
+
+// speech_bubble
+SpeechBubblePtr = 0x802B79A8;

From a37dfd3beef1e589062311566e8bae00762ae51c Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Sun, 1 Sep 2024 13:45:44 +0100
Subject: [PATCH 20/31] ci: install crunch64

Signed-off-by: Alex Bates <alex@bates64.com>
---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index cb131a6be0..548fdd9148 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -18,8 +18,8 @@ jobs:
         run: ./install_compilers.sh
       - name: Install cargo-binstall
         uses: cargo-bins/cargo-binstall@main
-      - name: Install pigment64
-        run: cargo binstall pigment64 -y
+      - name: Install pigment64 and crunch64
+        run: cargo binstall pigment64 crunch64-cli -y
       - name: Download baserom
         run: curl -L $BASEROM_US_URL -o ver/us/baserom.z64
         env:

From ba55339086acfbc9eba8e99cc8bb0938b8e41903 Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Sun, 1 Sep 2024 13:49:56 +0100
Subject: [PATCH 21/31] nix: install crunch64-cli

---
 shell.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell.nix b/shell.nix
index 06d9a4a0db..26dd9ffbc8 100644
--- a/shell.nix
+++ b/shell.nix
@@ -87,9 +87,9 @@ in pkgsCross.mkShell {
       done
     done
 
-    # Install pigment64
+    # Install Rust deps
     export PATH=$HOME/.cargo/bin:$PATH
-    cargo install pigment64
+    cargo install pigment64 crunch64-cli
 
     # Install python packages
     virtualenv venv

From 22b2c807c7f241c163992ffb74649d7176f0bd7f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 4 Sep 2024 14:13:38 +0000
Subject: [PATCH 22/31] Bump actions/download-artifact from 2 to 4.1.7 in
 /.github/workflows

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 4.1.7.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v2...v4.1.7)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 548fdd9148..5b6982e954 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -42,7 +42,7 @@ jobs:
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4.1.7
         with:
           name: papermario.bps
           path: papermario.bps
@@ -60,7 +60,7 @@ jobs:
     if: github.ref == 'refs/tags/v*'
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v2
+        uses: actions/download-artifact@v4.1.7
         with:
           name: papermario.bps
           path: papermario.bps

From a792fd85a93914e7f7b73315a776d06c0402231a Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Thu, 5 Sep 2024 01:04:44 +0100
Subject: [PATCH 23/31] use v4 of both download-artifact and upload-artifact

Signed-off-by: Alex Bates <alex@bates64.com>
---
 .github/workflows/build.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 5b6982e954..b756e1444c 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -31,7 +31,7 @@ jobs:
       - name: Build
         run: ninja ver/us/build/papermario.bps
       - name: Upload patch as artifact
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: papermario.bps
           path: ver/us/build/papermario.bps
@@ -42,7 +42,7 @@ jobs:
     if: github.ref == 'refs/heads/main'
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: papermario.bps
           path: papermario.bps
@@ -60,7 +60,7 @@ jobs:
     if: github.ref == 'refs/tags/v*'
     steps:
       - name: Download artifact
-        uses: actions/download-artifact@v4.1.7
+        uses: actions/download-artifact@v4
         with:
           name: papermario.bps
           path: papermario.bps

From cdf236ea2c777994bfe120591a2bf97a66334b87 Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Thu, 5 Sep 2024 01:44:09 +0100
Subject: [PATCH 24/31] implement DEBUG_CHEAT_FLY

---
 src/77480.c         | 7 +++++++
 src/dx/debug_menu.c | 4 ++--
 src/dx/debug_menu.h | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/77480.c b/src/77480.c
index fddde3f64c..e37ad6d630 100644
--- a/src/77480.c
+++ b/src/77480.c
@@ -743,6 +743,13 @@ void phys_update_standard(void) {
     check_input_use_partner();
     phys_update_action_state();
 
+    #if DX_DEBUG_MENU
+        if (dx_debug_is_cheat_enabled(DEBUG_CHEAT_FLY) && playerStatus->curButtons & BUTTON_L) {
+            playerStatus->pos.y += 5.0f;
+            playerStatus->flags |= PS_FLAG_JUMPING;
+        }
+    #endif
+
     if (!(playerStatus->flags & PS_FLAG_FLYING)) {
         if (playerStatus->flags & PS_FLAG_JUMPING) {
             phys_update_jump();
diff --git a/src/dx/debug_menu.c b/src/dx/debug_menu.c
index 2c347b4a63..0d7f5de7b8 100644
--- a/src/dx/debug_menu.c
+++ b/src/dx/debug_menu.c
@@ -1856,7 +1856,7 @@ typedef struct DebugCheatEntry {
 DebugCheatEntry DebugCheatMenu[] = {
     [DEBUG_CHEAT_GOD_MODE]      { "God Mode",   FALSE },
     [DEBUG_CHEAT_SPEED_MODE]    { "Speed Mode", FALSE },
-//  [DEBUG_CHEAT_FLY]           { "Fly With L", FALSE },
+    [DEBUG_CHEAT_FLY]           { "Fly With L", FALSE },
     [DEBUG_CHEAT_HIGH_JUMP]     { "High Jump", FALSE },
     [DEBUG_CHEAT_IGNORE_WALLS]  { "Ignore Walls", FALSE },
 };
@@ -1876,7 +1876,7 @@ void dx_debug_update_cheat_menu() {
         // actions to execute on state change
         switch (DebugCheatPos) {
             case DEBUG_CHEAT_GOD_MODE:
-        //  case DEBUG_CHEAT_FLY:
+            case DEBUG_CHEAT_FLY:
             case DEBUG_CHEAT_HIGH_JUMP:
             case DEBUG_CHEAT_IGNORE_WALLS:
                 break;
diff --git a/src/dx/debug_menu.h b/src/dx/debug_menu.h
index e857297215..1db089381a 100644
--- a/src/dx/debug_menu.h
+++ b/src/dx/debug_menu.h
@@ -7,7 +7,7 @@
 typedef enum DebugCheat {
     DEBUG_CHEAT_GOD_MODE,
     DEBUG_CHEAT_SPEED_MODE,
-//  DEBUG_CHEAT_FLY,
+    DEBUG_CHEAT_FLY,
     DEBUG_CHEAT_IGNORE_WALLS,
     DEBUG_CHEAT_HIGH_JUMP,
 } DebugCheat;

From cbc54385cd33af34727d8be9f2591b68beea1c45 Mon Sep 17 00:00:00 2001
From: Alex Bates <alex@bates64.com>
Date: Fri, 6 Sep 2024 00:26:44 +0100
Subject: [PATCH 25/31] fix PartnerAttack item using Gift HES instead of
 MoveDiamond

---
 src/item_table.yaml      |  1 +
 tools/build/item_data.py | 39 +++++++++++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/item_table.yaml b/src/item_table.yaml
index 22de3581a9..81483c9628 100644
--- a/src/item_table.yaml
+++ b/src/item_table.yaml
@@ -4804,6 +4804,7 @@
     icon: key/Gift
     itemEntityTemplate: STANDARD
     hudElementTemplate: ITEM
+    externHudScript: HES_MoveDiamond
     sellValue: 1
     sortValue: 0
     targetFlags: [ TARGET_FLAG_PLAYER ]
diff --git a/tools/build/item_data.py b/tools/build/item_data.py
index 320291dd55..5fb8b41757 100644
--- a/tools/build/item_data.py
+++ b/tools/build/item_data.py
@@ -5,7 +5,7 @@
 import yaml
 import argparse
 from pathlib import Path
-from typing import Dict, List, Tuple
+from typing import Dict, List, Tuple, Union
 from common import get_asset_path
 import xml.etree.ElementTree as ET
 from io import TextIOWrapper
@@ -26,6 +26,7 @@ def __init__(self, entry):
         self.itemEntityTemplate = data.get("itemEntityTemplate", "MISSING_TEMPLATE")
         self.skipScriptArg = data.get("noArgScripts", False)
         self.icon = data.get("icon", "key/Gift")
+        self.externHudScript = data.get("externHudScript")
         self.sellValue = data.get("sellValue", -1)
         self.sortValue = data.get("sortValue", 0)
         self.targetFlags = data.get("targetFlags", [])
@@ -158,17 +159,35 @@ def __init__(self, full_name: str, template: str, icon: str, pair: bool, index:
         self.skipArg = skipArg
 
 
+class ExternHudScriptEntry:
+    def __init__(self, full_name: str, index: int):
+        self.full_name = full_name
+        self.index = index
+        self.pair = True
+
+
 def snake_to_pascal(s: str) -> str:
     return s.replace("_", " ").title().replace(" ", "")
 
 
 def generate_hud_element_scripts(fout: TextIOWrapper, items: List[ItemEntry], pair_map: Dict[str, bool]):
-    hud_scripts: List[HudScriptEntry] = []
-    hud_script_map: Dict[str, HudScriptEntry] = {}
+    hud_scripts: List[Union[HudScriptEntry, ExternHudScriptEntry]] = []
+    hud_script_map: Dict[str, Union[HudScriptEntry, ExternHudScriptEntry]] = {}
 
     # determine a set of hud scripts to generate consisting of each unique pair of template + icon
     # and then assign the index of the generated scripts to each of the items using that pair
     for item in items:
+        if item.externHudScript:
+            script_name = item.externHudScript
+            if not script_name in hud_script_map:
+                cur_script = ExternHudScriptEntry(script_name, 1 + len(hud_scripts))
+                hud_scripts.append(cur_script)
+                hud_script_map[script_name] = cur_script
+            else:
+                cur_script = hud_script_map[script_name]
+            item.hudElemID = cur_script.index
+            continue
+
         if item.skipScriptArg:
             template_name = snake_to_pascal(item.hudElementTemplate.lower())
             script_name = f"HES_{template_name}"
@@ -198,12 +217,16 @@ def generate_hud_element_scripts(fout: TextIOWrapper, items: List[ItemEntry], pa
 
     # write the hud script bodies
     for script in hud_scripts:
-        script_arg = "" if script.skipArg else script.icon
-        fout.write(f"HudScript {script.full_name} = HES_TEMPLATE_{script.template}({script_arg});\n")
+        if isinstance(script, ExternHudScriptEntry):
+            fout.write(f"extern HudScript {script.full_name};\n")
+            fout.write(f"extern HudScript {script.full_name}_disabled;\n")
+        else:
+            script_arg = "" if script.skipArg else script.icon
+            fout.write(f"HudScript {script.full_name} = HES_TEMPLATE_{script.template}({script_arg});\n")
 
-        if script.pair:
-            script_arg = "" if script.skipArg else script.icon + "_disabled"
-            fout.write(f"HudScript {script.full_name}_disabled = HES_TEMPLATE_{script.template}({script_arg});\n")
+            if script.pair:
+                script_arg = "" if script.skipArg else script.icon + "_disabled"
+                fout.write(f"HudScript {script.full_name}_disabled = HES_TEMPLATE_{script.template}({script_arg});\n")
 
     fout.write("\n")
 

From 5e08dc1ab36c9dc9777eaa322319a435444c8140 Mon Sep 17 00:00:00 2001
From: JCog <42006114+JCog@users.noreply.github.com>
Date: Fri, 6 Sep 2024 01:16:21 -0500
Subject: [PATCH 26/31] set correct variable in evt_handle_OR() to fix broken
 toybox box puzzle

---
 src/evt/evt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/evt/evt.c b/src/evt/evt.c
index 60a6e8e3e9..a0523b95f1 100644
--- a/src/evt/evt.c
+++ b/src/evt/evt.c
@@ -869,7 +869,7 @@ ApiStatus evt_handle_OR(Evt* script) {
     s32 bits = evt_get_variable(script, *args++);
     s32 prev = evt_get_variable(script, var);
 
-    evt_set_variable(script, bits, prev | bits);
+    evt_set_variable(script, var, prev | bits);
     return ApiStatus_DONE2;
 }
 

From cff615255b88069a36292d5fe4df9fa137de1bc8 Mon Sep 17 00:00:00 2001
From: JCog <42006114+JCog@users.noreply.github.com>
Date: Fri, 6 Sep 2024 02:18:22 -0500
Subject: [PATCH 27/31] use correct function for freeing stop_leech action
 command

---
 src/battle/action_cmd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/battle/action_cmd.c b/src/battle/action_cmd.c
index 068232511c..082db2b904 100644
--- a/src/battle/action_cmd.c
+++ b/src/battle/action_cmd.c
@@ -465,7 +465,7 @@ void action_command_free(void) {
             action_command_whirlwind_free();
             break;
         case ACTION_COMMAND_STOP_LEECH:
-            action_command_jump_draw();
+            action_command_stop_leech_free();
             break;
         case ACTION_COMMAND_07:
             action_command_07_free();

From b167935265ed2d6fc4b6541b4c8544d43bae4c85 Mon Sep 17 00:00:00 2001
From: JCog <42006114+JCog@users.noreply.github.com>
Date: Sun, 8 Sep 2024 05:51:59 -0500
Subject: [PATCH 28/31] align profiler microseconds output

---
 src/dx/profiling.c | 165 +++++++++++++++++++++++++++++++--------------
 1 file changed, 114 insertions(+), 51 deletions(-)

diff --git a/src/dx/profiling.c b/src/dx/profiling.c
index 27c61980d8..cd7034fc3f 100644
--- a/src/dx/profiling.c
+++ b/src/dx/profiling.c
@@ -273,7 +273,8 @@ u32 profiler_get_rdp_microseconds() {
 
 void profiler_print_times() {
     u32 microseconds[PROFILER_TIME_COUNT];
-    char text_buffer[196];
+    char text_buffer_labels[196];
+    char text_buffer_time[196];
 
     update_fps_timer();
     update_total_timer();
@@ -304,21 +305,37 @@ void profiler_print_times() {
         u32 total_rsp = microseconds[PROFILER_TIME_RSP_GFX] + microseconds[PROFILER_TIME_RSP_AUDIO] * 2;
         u32 max_rdp = MAX(MAX(microseconds[PROFILER_TIME_TMEM], microseconds[PROFILER_TIME_CMD]), microseconds[PROFILER_TIME_PIPE]);
 
-        s32 text_buffer_len = sprintf(text_buffer,
+        s32 text_buffer_labels_len = sprintf(
+            text_buffer_labels,
             "    " // space for prepend
             "FPS: %5.2f\n"
             "CPU\t\t%d (%d%%)\n"
-            " Input\t\t%d\n"
-            " Workers\t\t%d\n"
-            " Triggers\t\t\t%d\n"
-            " EVT\t\t%d\n"
-            " Messages\t\t%d\n"
-            " HUD elements\t\t\t%d\n"
-            " Entities\t\t%d\n"
-            " Gfx\t\t\t%d\n"
-            " Audio\t\t\t%d\n",
+            " Input\n"
+            " Workers\n"
+            " Triggers\n"
+            " EVT\n"
+            " Messages\n"
+            " HUD elements\n"
+            " Entities\n"
+            " Gfx\n"
+            " Audio\n",
             1000000.0f / microseconds[PROFILER_TIME_FPS],
-            total_cpu, total_cpu / 333,
+            total_cpu, total_cpu / 333
+        );
+        s32 text_buffer_time_len = sprintf(
+            text_buffer_time,
+            "    " // space for prepend
+            "\n"
+            "\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n",
             microseconds[PROFILER_TIME_CONTROLLERS],
             microseconds[PROFILER_TIME_WORKERS],
             microseconds[PROFILER_TIME_TRIGGERS],
@@ -332,13 +349,21 @@ void profiler_print_times() {
 
         switch (get_game_mode()) {
             case GAME_MODE_WORLD:
-                sprintf(&text_buffer[text_buffer_len],
-                    " Encounters %d\n"
-                    " NPCs %d\n"
-                    " Player %d\n"
-                    " Item entities %d\n"
-                    " Effects %d\n"
-                    " Cameras %d\n",
+                sprintf(&text_buffer_labels[text_buffer_labels_len],
+                    " Encounters\n"
+                    " NPCs\n"
+                    " Player\n"
+                    " Item entities\n"
+                    " Effects\n"
+                    " Cameras\n"
+                );
+                sprintf(&text_buffer_time[text_buffer_time_len],
+                    "%d\n"
+                    "%d\n"
+                    "%d\n"
+                    "%d\n"
+                    "%d\n"
+                    "%d\n",
                     microseconds[PROFILE_TIME_WORLD_ENCOUNTERS],
                     microseconds[PROFILE_TIME_WORLD_NPCS],
                     microseconds[PROFILE_TIME_WORLD_PLAYER],
@@ -348,35 +373,58 @@ void profiler_print_times() {
                 );
                 break;
             default:
-                sprintf(&text_buffer[text_buffer_len],
-                    " Game mode step %d\n",
+                sprintf(&text_buffer_labels[text_buffer_labels_len],
+                    " Game mode step\n"
+                );
+                sprintf(&text_buffer_time[text_buffer_time_len],
+                    "%d\n",
                     microseconds[PROFILER_TIME_STEP_GAME_MODE]
                 );
                 break;
         }
 
-        dx_string_to_msg(&text_buffer, &text_buffer);
-        text_buffer[0] = MSG_CHAR_READ_FUNCTION;
-        text_buffer[1] = MSG_READ_FUNC_SIZE;
-        text_buffer[2] = 14;
-        text_buffer[3] = 14;
-        draw_msg((s32)&text_buffer, 3, 0, 255, 0, 0);
+        dx_string_to_msg(&text_buffer_labels, &text_buffer_labels);
+        dx_string_to_msg(&text_buffer_time, &text_buffer_time);
+        text_buffer_labels[0] = text_buffer_time[0] = MSG_CHAR_READ_FUNCTION;
+        text_buffer_labels[1] = text_buffer_time[1] = MSG_READ_FUNC_SIZE;
+        text_buffer_labels[2] = text_buffer_time[2] = 14;
+        text_buffer_labels[3] = text_buffer_time[3] = 14;
+        draw_msg((s32)&text_buffer_labels, 3, 0, 255, 0, 0);
+        draw_msg((s32)&text_buffer_time, 110, 0, 255, 0, 0);
 
 #ifdef GFX_PROFILING
-        sprintf(text_buffer,
+        s32 time_offset = 100;
+        sprintf(
+            text_buffer_labels,
             "    " // space for prepend
             "\n"
             "Gfx breakdown\n"
-            " Entities\t\t\t%d\n"
-            " Models\t\t\t%d\n"
-            " Player\t\t\t%d\n"
-            " Workers\t\t\t%d\n"
-            " NPCs\t\t\t%d\n"
-            " Effects\t\t\t%d\n"
-            " Render tasks\t\t\t%d\n"
-            " Hud elements\t\t\t%d\n"
-            " Back UI\t\t\t%d\n"
-            " Front UI\t\t\t%d\n",
+            " Entities\n"
+            " Models\n"
+            " Player\n"
+            " Workers\n"
+            " NPCs\n"
+            " Effects\n"
+            " Render tasks\n"
+            " Hud elements\n"
+            " Back UI\n"
+            " Front UI\n"
+        );
+        sprintf(
+            text_buffer_time,
+            "    " // space for prepend
+            "\n"
+            "\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "%d\n",
             microseconds[PROFILER_TIME_SUB_GFX_ENTITIES],
             microseconds[PROFILER_TIME_SUB_GFX_MODELS],
             microseconds[PROFILER_TIME_SUB_GFX_PLAYER],
@@ -389,32 +437,47 @@ void profiler_print_times() {
             microseconds[PROFILER_TIME_SUB_GFX_FRONT_UI]
         );
 #else
-        sprintf(text_buffer,
+        s32 time_offset = 50;
+        sprintf(text_buffer_labels,
             "    " // space for prepend
             "\n"
             "RDP\t\t\t%d (%d%%)\n"
-            " Tmem\t\t\t%d\n"
-            " Cmd\t\t\t%d\n"
-            " Pipe\t\t\t%d\n"
+            " Tmem\n"
+            " Cmd\n"
+            " Pipe\n"
             "\n"
             "RSP\t\t%d (%d%%)\n"
-            " Gfx\t\t\t%d\n"
-            " Audio\t\t\t%d\n",
+            " Gfx\n"
+            " Audio\n",
             max_rdp, max_rdp / 333,
+            total_rsp, total_rsp / 333
+        );
+        sprintf(text_buffer_time,
+            "    " // space for prepend
+            "\n"
+            "\n"
+            "%d\n"
+            "%d\n"
+            "%d\n"
+            "\n"
+            "\n"
+            "%d\n"
+            "%d\n",
             microseconds[PROFILER_TIME_TMEM],
             microseconds[PROFILER_TIME_CMD],
             microseconds[PROFILER_TIME_PIPE],
-            total_rsp, total_rsp / 333,
             microseconds[PROFILER_TIME_RSP_GFX],
             microseconds[PROFILER_TIME_RSP_AUDIO] * 2
         );
 #endif
-        dx_string_to_msg(&text_buffer, &text_buffer);
-        text_buffer[0] = MSG_CHAR_READ_FUNCTION;
-        text_buffer[1] = MSG_READ_FUNC_SIZE;
-        text_buffer[2] = 14;
-        text_buffer[3] = 14;
-        draw_msg((s32)&text_buffer, SCREEN_WIDTH/2, 0, 255, 0, 0);
+        dx_string_to_msg(&text_buffer_labels, &text_buffer_labels);
+        dx_string_to_msg(&text_buffer_time, &text_buffer_time);
+        text_buffer_labels[0] = text_buffer_time[0] = MSG_CHAR_READ_FUNCTION;
+        text_buffer_labels[1] = text_buffer_time[1] = MSG_READ_FUNC_SIZE;
+        text_buffer_labels[2] = text_buffer_time[2] = 14;
+        text_buffer_labels[3] = text_buffer_time[3] = 14;
+        draw_msg((s32)&text_buffer_labels, SCREEN_WIDTH/2, 0, 255, 0, 0);
+        draw_msg((s32)&text_buffer_time, SCREEN_WIDTH/2 + time_offset, 0, 255, 0, 0);
     }
 }
 

From 86f884c43574f884684df7bd725ff16a4f88b898 Mon Sep 17 00:00:00 2001
From: JCog <42006114+JCog@users.noreply.github.com>
Date: Sun, 8 Sep 2024 06:44:11 -0500
Subject: [PATCH 29/31] add background to profiler

---
 src/dx/profiling.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/dx/profiling.c b/src/dx/profiling.c
index cd7034fc3f..e0ac464984 100644
--- a/src/dx/profiling.c
+++ b/src/dx/profiling.c
@@ -292,6 +292,8 @@ void profiler_print_times() {
 #else
     if (show_profiler) {
 #endif
+        draw_box(0, (WindowStyle)21, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0x5F, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL,
+                 0, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL);
         for (int i = 0; i < PROFILER_TIME_COUNT; i++) {
             if (i < PROFILER_TIME_TMEM) {
                 microseconds[i] = OS_CYCLES_TO_USEC(all_profiling_data[i].total / PROFILING_BUFFER_SIZE);

From 163f8d1a5218189677aad4c2d3e54d43c9dcc4ef Mon Sep 17 00:00:00 2001
From: JCog <42006114+JCog@users.noreply.github.com>
Date: Mon, 9 Sep 2024 13:57:20 -0500
Subject: [PATCH 30/31] remove call to draw_box() for performance reasons

---
 src/dx/profiling.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/dx/profiling.c b/src/dx/profiling.c
index e0ac464984..cd7034fc3f 100644
--- a/src/dx/profiling.c
+++ b/src/dx/profiling.c
@@ -292,8 +292,6 @@ void profiler_print_times() {
 #else
     if (show_profiler) {
 #endif
-        draw_box(0, (WindowStyle)21, 0, 0, 0, SCREEN_WIDTH, SCREEN_HEIGHT, 0x5F, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, NULL,
-                 0, NULL, SCREEN_WIDTH, SCREEN_HEIGHT, NULL);
         for (int i = 0; i < PROFILER_TIME_COUNT; i++) {
             if (i < PROFILER_TIME_TMEM) {
                 microseconds[i] = OS_CYCLES_TO_USEC(all_profiling_data[i].total / PROFILING_BUFFER_SIZE);

From c8bb67e6faee4386061b7b55e6aac4fd7e60646a Mon Sep 17 00:00:00 2001
From: JCog <42006114+JCog@users.noreply.github.com>
Date: Mon, 9 Sep 2024 12:09:11 -0500
Subject: [PATCH 31/31] create AnimatorNode cache for ModelAnimators

---
 include/common_structs.h | 33 ++++++++-------
 src/animator.c           | 91 +++++++++++++++++++++++++++++++---------
 2 files changed, 88 insertions(+), 36 deletions(-)

diff --git a/include/common_structs.h b/include/common_structs.h
index 04e04641b0..aae6c978f9 100644
--- a/include/common_structs.h
+++ b/include/common_structs.h
@@ -1094,22 +1094,23 @@ typedef struct ModelAnimator {
     /* 0x008 */ s16* animReadPos;
     /* 0x00C */ s16* savedReadPos;
     /* 0x010 */ AnimatorNode* rootNode;
-    /* 0x014 */ u8 nextUniqueID;
-    /* 0x015 */ u8 staticNodeIDs[0x7A]; // ?
-    /* 0x08F */ char unk_08F[0x1];
-    /* 0x090 */ f32 nextUpdateTime;
-    /* 0x094 */ f32 timeScale;
-    /* 0x098 */ Mtx mtx;
-    /* 0x0D8 */ void* baseAddr;
-    /* 0x0DC */ s16* animationBuffer;
-    /* 0x0E0 */ StaticAnimatorNode* staticNodes[0x7A];
-    /* 0x2C8 */ StaticAnimatorNode** staticRoot;
-    /* 0x2CC */ s32 treeIndexPos;
-    /* 0x2D0 */ s32 savedTreePos;
-    /* 0x2D4 */ void (*fpRenderCallback)(void*);
-    /* 0x2D8 */ void* renderCallbackArg;
-    /* 0x2DC */ char unk_2DC[4];
-} ModelAnimator; // size = 0x2E0
+    /* 0x014 */ AnimatorNode* nodeCache[0x7A];
+    /* 0x08E */ u8 nextUniqueID;
+    /* 0x08F */ u8 staticNodeIDs[0x7A]; // ?
+    /* 0x109 */ char unk_08F[0x1];
+    /* 0x10A */ f32 nextUpdateTime;
+    /* 0x10E */ f32 timeScale;
+    /* 0x112 */ Mtx mtx;
+    /* 0x152 */ void* baseAddr;
+    /* 0x156 */ s16* animationBuffer;
+    /* 0x15A */ StaticAnimatorNode* staticNodes[0x7A];
+    /* 0x342 */ StaticAnimatorNode** staticRoot;
+    /* 0x346 */ s32 treeIndexPos;
+    /* 0x34A */ s32 savedTreePos;
+    /* 0x34E */ void (*fpRenderCallback)(void*);
+    /* 0x352 */ void* renderCallbackArg;
+    /* 0x356 */ char unk_2DC[4];
+} ModelAnimator; // size = 0x35A
 
 typedef ModelAnimator* AnimatedMeshList[MAX_ANIMATED_MESHES];
 
diff --git a/src/animator.c b/src/animator.c
index 3582952095..8a28b60da1 100644
--- a/src/animator.c
+++ b/src/animator.c
@@ -127,7 +127,7 @@ void animator_make_identity(Matrix4f mtx) {
     mtx[3][3] = 1.0f;
 }
 
-AnimatorNode* get_animator_child_with_id(AnimatorNode* node, s32 id) {
+AnimatorNode* get_animator_child_with_id_helper(AnimatorNode* node, s32 id) {
     s32 i;
 
     if (node->uniqueIndex == id) {
@@ -136,9 +136,33 @@ AnimatorNode* get_animator_child_with_id(AnimatorNode* node, s32 id) {
 
     for (i = 0; i < ARRAY_COUNT(node->children); i++) {
         if (node->children[i] != NULL) {
-            AnimatorNode* child = get_animator_child_with_id(node->children[i], id);
+            AnimatorNode* child = get_animator_child_with_id_helper(node->children[i], id);
+            if (child != NULL) {
+                return child;
+            }
+        }
+    }
+
+    return NULL;
+}
+
+AnimatorNode* get_animator_child_with_id(ModelAnimator* animator, s32 id) {
+    AnimatorNode *node = animator->rootNode;
+    s32 i;
+
+    if (animator->nodeCache[id] != NULL && animator->nodeCache[id]->uniqueIndex == id) {
+        return animator->nodeCache[id];
+    }
+    if (node->uniqueIndex == id) {
+        return node;
+    }
+
+    for (i = 0; i < ARRAY_COUNT(node->children); i++) {
+        if (node->children[i] != NULL) {
+            AnimatorNode* child = get_animator_child_with_id_helper(node->children[i], id);
 
             if (child != NULL) {
+                animator->nodeCache[id] = child;
                 return child;
             }
 
@@ -169,12 +193,27 @@ AnimatorNode* get_animator_child_for_model(AnimatorNode* node, s32 modelId) {
     return NULL;
 }
 
-void free_animator_nodes(AnimatorNode* root) {
+void free_animator_nodes_helper(AnimatorNode* node) {
     s32 i;
 
+    for (i = 0; i < ARRAY_COUNT(node->children); i++) {
+        if (node->children[i] != NULL) {
+            free_animator_nodes_helper(node->children[i]);
+        }
+    }
+    heap_free(node);
+}
+
+void free_animator_nodes(ModelAnimator* animator) {
+    AnimatorNode *root = animator->rootNode;
+    s32 i;
+
+    for (i = 0; i < ARRAY_COUNT(animator->nodeCache); i++) {
+        animator->nodeCache[i] = NULL;
+    }
     for (i = 0; i < ARRAY_COUNT(root->children); i++) {
         if (root->children[i] != NULL) {
-            free_animator_nodes(root->children[i]);
+            free_animator_nodes_helper(root->children[i]);
         }
     }
     heap_free(root);
@@ -243,8 +282,12 @@ void delete_model_animator_node(AnimatorNode* node) {
 }
 
 void delete_model_animator_nodes(ModelAnimator* animator) {
-    animator->nextUniqueID = 0;
+    s32 i;
 
+    animator->nextUniqueID = 0;
+    for (i = 0; i < ARRAY_COUNT(animator->nodeCache); i++) {
+        animator->nodeCache[i] = NULL;
+    }
     if (animator->rootNode != NULL) {
         delete_model_animator_node(animator->rootNode);
         animator->rootNode = NULL;
@@ -306,6 +349,10 @@ s32 create_model_animator(s16* animPos) {
     animator->rootNode = NULL;
     animator->nextUniqueID = 0;
 
+    for (j = 0; j < ARRAY_COUNT(animator->nodeCache); j++) {
+        animator->nodeCache[j] = NULL;
+    }
+
     for (j = 0; j < ARRAY_COUNT(animator->staticNodeIDs); j++) {
         animator->staticNodeIDs[j] = j + 1;
     }
@@ -346,6 +393,10 @@ s32 create_mesh_animator(s16* animPos, s16* animBuffer) {
     animator->animReadPos = animPos;
     animator->savedReadPos = animPos;
 
+    for (j = 0; j < ARRAY_COUNT(animator->nodeCache); j++) {
+        animator->nodeCache[j] = NULL;
+    }
+
     for (j = 0; j < ARRAY_COUNT(animator->staticNodeIDs); j++) {
         animator->staticNodeIDs[j] = j + 1;
     }
@@ -397,7 +448,7 @@ AnimatorNode* add_anim_node(ModelAnimator* animator, s32 parentNodeID, AnimatorN
         if (nullRootNode) {
             animator->rootNode = ret;
         } else {
-            child = get_animator_child_with_id(animator->rootNode, 1);
+            child = get_animator_child_with_id(animator, 1);
             ASSERT(child != NULL);
 
             for (i = 0; i < ARRAY_COUNT(child->children); i++) {
@@ -411,7 +462,7 @@ AnimatorNode* add_anim_node(ModelAnimator* animator, s32 parentNodeID, AnimatorN
         }
     } else {
         ret->uniqueIndex = nextUniqueID;
-        child = get_animator_child_with_id(animator->rootNode, parentNodeID);
+        child = get_animator_child_with_id(animator, parentNodeID);
         ASSERT(child != NULL);
 
         for (i = 0; i < ARRAY_COUNT(child->children); i++) {
@@ -586,13 +637,13 @@ s32 step_model_animator(ModelAnimator* animator) {
             animator->flags |= flags & 0xFFFF;
             return 1;
         case AS_SET_NODE_FLAGS:
-            node = get_animator_child_with_id(animator->rootNode, animator->staticNodeIDs[*args++ - 1]);
+            node = get_animator_child_with_id(animator, animator->staticNodeIDs[*args++ - 1]);
             flags = *args++;
             node->flags |= flags;
             animator->animReadPos = args;
             return 1;
         case AS_CLEAR_NODE_FLAGS:
-            node = get_animator_child_with_id(animator->rootNode, animator->staticNodeIDs[*args++ - 1]);
+            node = get_animator_child_with_id(animator, animator->staticNodeIDs[*args++ - 1]);
             flags = *args++;
             node->flags &= ~flags;
             animator->animReadPos = args;
@@ -608,7 +659,7 @@ s32 step_model_animator(ModelAnimator* animator) {
             z = (f32)*args++ * 180.0 / 32767.0;
             animator->animReadPos = args;
 
-            node = get_animator_child_with_id(animator->rootNode, nodeId);
+            node = get_animator_child_with_id(animator, nodeId);
             ASSERT(node != NULL);
             node->rot.x = x;
             node->rot.y = y;
@@ -621,7 +672,7 @@ s32 step_model_animator(ModelAnimator* animator) {
             z = (f32)*args++ * 180.0 / 32767.0;
             animator->animReadPos = args;
 
-            node = get_animator_child_with_id(animator->rootNode, nodeId);
+            node = get_animator_child_with_id(animator, nodeId);
             ASSERT(node != NULL);
             node->rot.x += x;
             node->rot.y += y;
@@ -633,7 +684,7 @@ s32 step_model_animator(ModelAnimator* animator) {
             y = *args++;
             z = *args++;
             animator->animReadPos = args;
-            node = get_animator_child_with_id(animator->rootNode, nodeId);
+            node = get_animator_child_with_id(animator, nodeId);
             ASSERT(node != NULL);
             node->pos.x = x;
             node->pos.y = y;
@@ -646,7 +697,7 @@ s32 step_model_animator(ModelAnimator* animator) {
             z = (f32)*args++ * 180.0 / 32767.0;
             animator->animReadPos = args;
 
-            node = get_animator_child_with_id(animator->rootNode, nodeId);
+            node = get_animator_child_with_id(animator, nodeId);
             ASSERT(node != NULL);
             node->scale.x = x;
             node->scale.y = y;
@@ -971,7 +1022,7 @@ void appendGfx_animator_node(ModelAnimator* animator, AnimatorNode* node, Matrix
 }
 
 AnimatorNode* get_animator_node_for_tree_index(ModelAnimator* animator, s32 arg1) {
-    return get_animator_child_with_id(animator->rootNode, animator->staticNodeIDs[arg1 - 1]);
+    return get_animator_child_with_id(animator, animator->staticNodeIDs[arg1 - 1]);
 }
 
 AnimatorNode* get_animator_node_with_id(ModelAnimator* animator, s32 id) {
@@ -1258,13 +1309,13 @@ s32 step_mesh_animator(ModelAnimator* animator) {
             animator->flags |= flags & 0xFFFF;
             return 1;
         case AS_SET_NODE_FLAGS:
-            node = get_animator_child_with_id(animator->rootNode, animator->staticNodeIDs[*args++ - 1]);
+            node = get_animator_child_with_id(animator, animator->staticNodeIDs[*args++ - 1]);
             flags = *args++;
             node->flags |= flags;
             animator->animReadPos = args;
             return 1;
         case AS_CLEAR_NODE_FLAGS:
-            node = get_animator_child_with_id(animator->rootNode, animator->staticNodeIDs[*args++ - 1]);
+            node = get_animator_child_with_id(animator, animator->staticNodeIDs[*args++ - 1]);
             flags = *args++;
             node->flags &= ~flags;
             animator->animReadPos = args;
@@ -1280,7 +1331,7 @@ s32 step_mesh_animator(ModelAnimator* animator) {
             z = (f32)*args++ * 180.0 / 32767.0;
             animator->animReadPos = args;
             if (nodeId != 0xFF) {
-                node = get_animator_child_with_id(animator->rootNode, nodeId);
+                node = get_animator_child_with_id(animator, nodeId);
                 if (node != NULL) {
                     node->rot.x = x;
                     node->rot.y = y;
@@ -1300,7 +1351,7 @@ s32 step_mesh_animator(ModelAnimator* animator) {
             z = (f32)*args++ * 180.0 / 32767.0;
             animator->animReadPos = args;
             if (nodeId != 0xFF) {
-                node = get_animator_child_with_id(animator->rootNode, nodeId);
+                node = get_animator_child_with_id(animator, nodeId);
                 if (node != NULL) {
                     node->rot.x += x;
                     node->rot.y += y;
@@ -1320,7 +1371,7 @@ s32 step_mesh_animator(ModelAnimator* animator) {
             z = *args++;
             animator->animReadPos = args;
             if (nodeId != 0xFF) {
-                node = get_animator_child_with_id(animator->rootNode, nodeId);
+                node = get_animator_child_with_id(animator, nodeId);
                 if (node != NULL) {
                     node->pos.x = x;
                     node->pos.y = y;
@@ -1340,7 +1391,7 @@ s32 step_mesh_animator(ModelAnimator* animator) {
             z = (f32)*args++ * 180.0 / 32767.0;
             animator->animReadPos = args;
             if (nodeId != 0xFF) {
-                node = get_animator_child_with_id(animator->rootNode, nodeId);
+                node = get_animator_child_with_id(animator, nodeId);
                 if (node != NULL) {
                     node->scale.x = x;
                     node->scale.y = y;