395 files changed, 1417 insertions, 1413 deletions

diff --git a/audio.asm b/audio.asm
index c18bc041..0ef71752 100644
--- a/audio.asm
+++ b/audio.asm
@@ -7,356 +7,356 @@ INCLUDE "constants.asm"
 
 
 SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1]
-INCLUDE "music/headers/sfxheaders02.asm"
+INCLUDE "audio/headers/sfxheaders02.asm"
 
 SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2]
-INCLUDE "music/headers/sfxheaders08.asm"
+INCLUDE "audio/headers/sfxheaders08.asm"
 
 SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3]
-INCLUDE "music/headers/sfxheaders1f.asm"
+INCLUDE "audio/headers/sfxheaders1f.asm"
 
 
 
 SECTION "Music Headers 1", ROMX, BANK[AUDIO_1]
-INCLUDE "music/headers/musicheaders02.asm"
+INCLUDE "audio/headers/musicheaders02.asm"
 
 SECTION "Music Headers 2", ROMX, BANK[AUDIO_2]
-INCLUDE "music/headers/musicheaders08.asm"
+INCLUDE "audio/headers/musicheaders08.asm"
 
 SECTION "Music Headers 3", ROMX, BANK[AUDIO_3]
-INCLUDE "music/headers/musicheaders1f.asm"
+INCLUDE "audio/headers/musicheaders1f.asm"
 
 
 
 SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1]
 
-INCLUDE "music/sfx/sfx_02_01.asm"
-INCLUDE "music/sfx/sfx_02_02.asm"
-INCLUDE "music/sfx/sfx_02_03.asm"
-INCLUDE "music/sfx/sfx_02_04.asm"
-INCLUDE "music/sfx/sfx_02_05.asm"
-INCLUDE "music/sfx/sfx_02_06.asm"
-INCLUDE "music/sfx/sfx_02_07.asm"
-INCLUDE "music/sfx/sfx_02_08.asm"
-INCLUDE "music/sfx/sfx_02_09.asm"
-INCLUDE "music/sfx/sfx_02_0a.asm"
-INCLUDE "music/sfx/sfx_02_0b.asm"
-INCLUDE "music/sfx/sfx_02_0c.asm"
-INCLUDE "music/sfx/sfx_02_0d.asm"
-INCLUDE "music/sfx/sfx_02_0e.asm"
-INCLUDE "music/sfx/sfx_02_0f.asm"
-INCLUDE "music/sfx/sfx_02_10.asm"
-INCLUDE "music/sfx/sfx_02_11.asm"
-INCLUDE "music/sfx/sfx_02_12.asm"
-INCLUDE "music/sfx/sfx_02_13.asm"
+INCLUDE "audio/sfx/sfx_02_01.asm"
+INCLUDE "audio/sfx/sfx_02_02.asm"
+INCLUDE "audio/sfx/sfx_02_03.asm"
+INCLUDE "audio/sfx/sfx_02_04.asm"
+INCLUDE "audio/sfx/sfx_02_05.asm"
+INCLUDE "audio/sfx/sfx_02_06.asm"
+INCLUDE "audio/sfx/sfx_02_07.asm"
+INCLUDE "audio/sfx/sfx_02_08.asm"
+INCLUDE "audio/sfx/sfx_02_09.asm"
+INCLUDE "audio/sfx/sfx_02_0a.asm"
+INCLUDE "audio/sfx/sfx_02_0b.asm"
+INCLUDE "audio/sfx/sfx_02_0c.asm"
+INCLUDE "audio/sfx/sfx_02_0d.asm"
+INCLUDE "audio/sfx/sfx_02_0e.asm"
+INCLUDE "audio/sfx/sfx_02_0f.asm"
+INCLUDE "audio/sfx/sfx_02_10.asm"
+INCLUDE "audio/sfx/sfx_02_11.asm"
+INCLUDE "audio/sfx/sfx_02_12.asm"
+INCLUDE "audio/sfx/sfx_02_13.asm"
 
 INCLUDE "audio/duty_1.asm"
 
-INCLUDE "music/sfx/sfx_02_3f.asm"
-INCLUDE "music/sfx/sfx_02_5e.asm"
-INCLUDE "music/sfx/sfx_02_56.asm"
-INCLUDE "music/sfx/sfx_02_57.asm"
-INCLUDE "music/sfx/sfx_02_58.asm"
-INCLUDE "music/sfx/sfx_02_3c.asm"
-INCLUDE "music/sfx/sfx_02_59.asm"
-INCLUDE "music/sfx/sfx_02_5a.asm"
-INCLUDE "music/sfx/sfx_02_5b.asm"
-INCLUDE "music/sfx/sfx_02_5c.asm"
-INCLUDE "music/sfx/sfx_02_40.asm"
-INCLUDE "music/sfx/sfx_02_5d.asm"
-INCLUDE "music/sfx/sfx_02_3d.asm"
-INCLUDE "music/sfx/sfx_02_43.asm"
-INCLUDE "music/sfx/sfx_02_3e.asm"
-INCLUDE "music/sfx/sfx_02_44.asm"
-INCLUDE "music/sfx/sfx_02_45.asm"
-INCLUDE "music/sfx/sfx_02_46.asm"
-INCLUDE "music/sfx/sfx_02_47.asm"
-INCLUDE "music/sfx/sfx_02_48.asm"
-INCLUDE "music/sfx/sfx_02_49.asm"
-INCLUDE "music/sfx/sfx_02_4a.asm"
-INCLUDE "music/sfx/sfx_02_4b.asm"
-INCLUDE "music/sfx/sfx_02_4c.asm"
-INCLUDE "music/sfx/sfx_02_4d.asm"
-INCLUDE "music/sfx/sfx_02_4e.asm"
-INCLUDE "music/sfx/sfx_02_4f.asm"
-INCLUDE "music/sfx/sfx_02_50.asm"
-INCLUDE "music/sfx/sfx_02_51.asm"
-INCLUDE "music/sfx/sfx_02_52.asm"
-INCLUDE "music/sfx/sfx_02_53.asm"
-INCLUDE "music/sfx/sfx_02_54.asm"
-INCLUDE "music/sfx/sfx_02_55.asm"
-INCLUDE "music/sfx/sfx_02_5f.asm"
-INCLUDE "music/sfx/sfx_02_unused.asm"
-INCLUDE "music/sfx/sfx_02_1d.asm"
-INCLUDE "music/sfx/sfx_02_37.asm"
-INCLUDE "music/sfx/sfx_02_38.asm"
-INCLUDE "music/sfx/sfx_02_25.asm"
-INCLUDE "music/sfx/sfx_02_39.asm"
-INCLUDE "music/sfx/sfx_02_17.asm"
-INCLUDE "music/sfx/sfx_02_23.asm"
-INCLUDE "music/sfx/sfx_02_24.asm"
-INCLUDE "music/sfx/sfx_02_14.asm"
-INCLUDE "music/sfx/sfx_02_22.asm"
-INCLUDE "music/sfx/sfx_02_1a.asm"
-INCLUDE "music/sfx/sfx_02_1b.asm"
-INCLUDE "music/sfx/sfx_02_19.asm"
-INCLUDE "music/sfx/sfx_02_1f.asm"
-INCLUDE "music/sfx/sfx_02_20.asm"
-INCLUDE "music/sfx/sfx_02_16.asm"
-INCLUDE "music/sfx/sfx_02_21.asm"
-INCLUDE "music/sfx/sfx_02_15.asm"
-INCLUDE "music/sfx/sfx_02_1e.asm"
-INCLUDE "music/sfx/sfx_02_1c.asm"
-INCLUDE "music/sfx/sfx_02_18.asm"
-INCLUDE "music/sfx/sfx_02_2d.asm"
-INCLUDE "music/sfx/sfx_02_2a.asm"
-INCLUDE "music/sfx/sfx_02_2f.asm"
-INCLUDE "music/sfx/sfx_02_26.asm"
-INCLUDE "music/sfx/sfx_02_27.asm"
-INCLUDE "music/sfx/sfx_02_28.asm"
-INCLUDE "music/sfx/sfx_02_32.asm"
-INCLUDE "music/sfx/sfx_02_29.asm"
-INCLUDE "music/sfx/sfx_02_2b.asm"
-INCLUDE "music/sfx/sfx_02_30.asm"
-INCLUDE "music/sfx/sfx_02_2e.asm"
-INCLUDE "music/sfx/sfx_02_31.asm"
-INCLUDE "music/sfx/sfx_02_2c.asm"
-INCLUDE "music/sfx/sfx_02_33.asm"
-INCLUDE "music/sfx/sfx_02_34.asm"
-INCLUDE "music/sfx/sfx_02_35.asm"
-INCLUDE "music/sfx/sfx_02_36.asm"
+INCLUDE "audio/sfx/sfx_02_3f.asm"
+INCLUDE "audio/sfx/sfx_02_5e.asm"
+INCLUDE "audio/sfx/sfx_02_56.asm"
+INCLUDE "audio/sfx/sfx_02_57.asm"
+INCLUDE "audio/sfx/sfx_02_58.asm"
+INCLUDE "audio/sfx/sfx_02_3c.asm"
+INCLUDE "audio/sfx/sfx_02_59.asm"
+INCLUDE "audio/sfx/sfx_02_5a.asm"
+INCLUDE "audio/sfx/sfx_02_5b.asm"
+INCLUDE "audio/sfx/sfx_02_5c.asm"
+INCLUDE "audio/sfx/sfx_02_40.asm"
+INCLUDE "audio/sfx/sfx_02_5d.asm"
+INCLUDE "audio/sfx/sfx_02_3d.asm"
+INCLUDE "audio/sfx/sfx_02_43.asm"
+INCLUDE "audio/sfx/sfx_02_3e.asm"
+INCLUDE "audio/sfx/sfx_02_44.asm"
+INCLUDE "audio/sfx/sfx_02_45.asm"
+INCLUDE "audio/sfx/sfx_02_46.asm"
+INCLUDE "audio/sfx/sfx_02_47.asm"
+INCLUDE "audio/sfx/sfx_02_48.asm"
+INCLUDE "audio/sfx/sfx_02_49.asm"
+INCLUDE "audio/sfx/sfx_02_4a.asm"
+INCLUDE "audio/sfx/sfx_02_4b.asm"
+INCLUDE "audio/sfx/sfx_02_4c.asm"
+INCLUDE "audio/sfx/sfx_02_4d.asm"
+INCLUDE "audio/sfx/sfx_02_4e.asm"
+INCLUDE "audio/sfx/sfx_02_4f.asm"
+INCLUDE "audio/sfx/sfx_02_50.asm"
+INCLUDE "audio/sfx/sfx_02_51.asm"
+INCLUDE "audio/sfx/sfx_02_52.asm"
+INCLUDE "audio/sfx/sfx_02_53.asm"
+INCLUDE "audio/sfx/sfx_02_54.asm"
+INCLUDE "audio/sfx/sfx_02_55.asm"
+INCLUDE "audio/sfx/sfx_02_5f.asm"
+INCLUDE "audio/sfx/sfx_02_unused.asm"
+INCLUDE "audio/sfx/sfx_02_1d.asm"
+INCLUDE "audio/sfx/sfx_02_37.asm"
+INCLUDE "audio/sfx/sfx_02_38.asm"
+INCLUDE "audio/sfx/sfx_02_25.asm"
+INCLUDE "audio/sfx/sfx_02_39.asm"
+INCLUDE "audio/sfx/sfx_02_17.asm"
+INCLUDE "audio/sfx/sfx_02_23.asm"
+INCLUDE "audio/sfx/sfx_02_24.asm"
+INCLUDE "audio/sfx/sfx_02_14.asm"
+INCLUDE "audio/sfx/sfx_02_22.asm"
+INCLUDE "audio/sfx/sfx_02_1a.asm"
+INCLUDE "audio/sfx/sfx_02_1b.asm"
+INCLUDE "audio/sfx/sfx_02_19.asm"
+INCLUDE "audio/sfx/sfx_02_1f.asm"
+INCLUDE "audio/sfx/sfx_02_20.asm"
+INCLUDE "audio/sfx/sfx_02_16.asm"
+INCLUDE "audio/sfx/sfx_02_21.asm"
+INCLUDE "audio/sfx/sfx_02_15.asm"
+INCLUDE "audio/sfx/sfx_02_1e.asm"
+INCLUDE "audio/sfx/sfx_02_1c.asm"
+INCLUDE "audio/sfx/sfx_02_18.asm"
+INCLUDE "audio/sfx/sfx_02_2d.asm"
+INCLUDE "audio/sfx/sfx_02_2a.asm"
+INCLUDE "audio/sfx/sfx_02_2f.asm"
+INCLUDE "audio/sfx/sfx_02_26.asm"
+INCLUDE "audio/sfx/sfx_02_27.asm"
+INCLUDE "audio/sfx/sfx_02_28.asm"
+INCLUDE "audio/sfx/sfx_02_32.asm"
+INCLUDE "audio/sfx/sfx_02_29.asm"
+INCLUDE "audio/sfx/sfx_02_2b.asm"
+INCLUDE "audio/sfx/sfx_02_30.asm"
+INCLUDE "audio/sfx/sfx_02_2e.asm"
+INCLUDE "audio/sfx/sfx_02_31.asm"
+INCLUDE "audio/sfx/sfx_02_2c.asm"
+INCLUDE "audio/sfx/sfx_02_33.asm"
+INCLUDE "audio/sfx/sfx_02_34.asm"
+INCLUDE "audio/sfx/sfx_02_35.asm"
+INCLUDE "audio/sfx/sfx_02_36.asm"
 
 
 SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2]
 
-INCLUDE "music/sfx/sfx_08_01.asm"
-INCLUDE "music/sfx/sfx_08_02.asm"
-INCLUDE "music/sfx/sfx_08_03.asm"
-INCLUDE "music/sfx/sfx_08_04.asm"
-INCLUDE "music/sfx/sfx_08_05.asm"
-INCLUDE "music/sfx/sfx_08_06.asm"
-INCLUDE "music/sfx/sfx_08_07.asm"
-INCLUDE "music/sfx/sfx_08_08.asm"
-INCLUDE "music/sfx/sfx_08_09.asm"
-INCLUDE "music/sfx/sfx_08_0a.asm"
-INCLUDE "music/sfx/sfx_08_0b.asm"
-INCLUDE "music/sfx/sfx_08_0c.asm"
-INCLUDE "music/sfx/sfx_08_0d.asm"
-INCLUDE "music/sfx/sfx_08_0e.asm"
-INCLUDE "music/sfx/sfx_08_0f.asm"
-INCLUDE "music/sfx/sfx_08_10.asm"
-INCLUDE "music/sfx/sfx_08_11.asm"
-INCLUDE "music/sfx/sfx_08_12.asm"
-INCLUDE "music/sfx/sfx_08_13.asm"
+INCLUDE "audio/sfx/sfx_08_01.asm"
+INCLUDE "audio/sfx/sfx_08_02.asm"
+INCLUDE "audio/sfx/sfx_08_03.asm"
+INCLUDE "audio/sfx/sfx_08_04.asm"
+INCLUDE "audio/sfx/sfx_08_05.asm"
+INCLUDE "audio/sfx/sfx_08_06.asm"
+INCLUDE "audio/sfx/sfx_08_07.asm"
+INCLUDE "audio/sfx/sfx_08_08.asm"
+INCLUDE "audio/sfx/sfx_08_09.asm"
+INCLUDE "audio/sfx/sfx_08_0a.asm"
+INCLUDE "audio/sfx/sfx_08_0b.asm"
+INCLUDE "audio/sfx/sfx_08_0c.asm"
+INCLUDE "audio/sfx/sfx_08_0d.asm"
+INCLUDE "audio/sfx/sfx_08_0e.asm"
+INCLUDE "audio/sfx/sfx_08_0f.asm"
+INCLUDE "audio/sfx/sfx_08_10.asm"
+INCLUDE "audio/sfx/sfx_08_11.asm"
+INCLUDE "audio/sfx/sfx_08_12.asm"
+INCLUDE "audio/sfx/sfx_08_13.asm"
 
 INCLUDE "audio/duty_2.asm"
 
-INCLUDE "music/sfx/sfx_08_40.asm"
-INCLUDE "music/sfx/sfx_08_3f.asm"
-INCLUDE "music/sfx/sfx_08_3c.asm"
-INCLUDE "music/sfx/sfx_08_3d.asm"
-INCLUDE "music/sfx/sfx_08_3e.asm"
-INCLUDE "music/sfx/sfx_08_77.asm"
-INCLUDE "music/sfx/sfx_08_41.asm"
-INCLUDE "music/sfx/sfx_08_42.asm"
-INCLUDE "music/sfx/sfx_08_43.asm"
-INCLUDE "music/sfx/sfx_08_44.asm"
-INCLUDE "music/sfx/sfx_08_45.asm"
-INCLUDE "music/sfx/sfx_08_pokeflute_ch3.asm"
-INCLUDE "music/sfx/sfx_08_47.asm"
-INCLUDE "music/sfx/sfx_08_48.asm"
-INCLUDE "music/sfx/sfx_08_49.asm"
-INCLUDE "music/sfx/sfx_08_4a.asm"
-INCLUDE "music/sfx/sfx_08_4b.asm"
-INCLUDE "music/sfx/sfx_08_4c.asm"
-INCLUDE "music/sfx/sfx_08_4d.asm"
-INCLUDE "music/sfx/sfx_08_4e.asm"
-INCLUDE "music/sfx/sfx_08_4f.asm"
-INCLUDE "music/sfx/sfx_08_50.asm"
-INCLUDE "music/sfx/sfx_08_51.asm"
-INCLUDE "music/sfx/sfx_08_52.asm"
-INCLUDE "music/sfx/sfx_08_53.asm"
-INCLUDE "music/sfx/sfx_08_54.asm"
-INCLUDE "music/sfx/sfx_08_55.asm"
-INCLUDE "music/sfx/sfx_08_56.asm"
-INCLUDE "music/sfx/sfx_08_57.asm"
-INCLUDE "music/sfx/sfx_08_58.asm"
-INCLUDE "music/sfx/sfx_08_59.asm"
-INCLUDE "music/sfx/sfx_08_5a.asm"
-INCLUDE "music/sfx/sfx_08_5b.asm"
-INCLUDE "music/sfx/sfx_08_5c.asm"
-INCLUDE "music/sfx/sfx_08_5d.asm"
-INCLUDE "music/sfx/sfx_08_5e.asm"
-INCLUDE "music/sfx/sfx_08_5f.asm"
-INCLUDE "music/sfx/sfx_08_60.asm"
-INCLUDE "music/sfx/sfx_08_61.asm"
-INCLUDE "music/sfx/sfx_08_62.asm"
-INCLUDE "music/sfx/sfx_08_63.asm"
-INCLUDE "music/sfx/sfx_08_64.asm"
-INCLUDE "music/sfx/sfx_08_65.asm"
-INCLUDE "music/sfx/sfx_08_66.asm"
-INCLUDE "music/sfx/sfx_08_67.asm"
-INCLUDE "music/sfx/sfx_08_68.asm"
-INCLUDE "music/sfx/sfx_08_69.asm"
-INCLUDE "music/sfx/sfx_08_6a.asm"
-INCLUDE "music/sfx/sfx_08_6b.asm"
-INCLUDE "music/sfx/sfx_08_6c.asm"
-INCLUDE "music/sfx/sfx_08_6d.asm"
-INCLUDE "music/sfx/sfx_08_6e.asm"
-INCLUDE "music/sfx/sfx_08_6f.asm"
-INCLUDE "music/sfx/sfx_08_70.asm"
-INCLUDE "music/sfx/sfx_08_71.asm"
-INCLUDE "music/sfx/sfx_08_72.asm"
-INCLUDE "music/sfx/sfx_08_73.asm"
-INCLUDE "music/sfx/sfx_08_74.asm"
-INCLUDE "music/sfx/sfx_08_75.asm"
-INCLUDE "music/sfx/sfx_08_76.asm"
-INCLUDE "music/sfx/sfx_08_unused.asm"
-INCLUDE "music/sfx/sfx_08_1d.asm"
-INCLUDE "music/sfx/sfx_08_37.asm"
-INCLUDE "music/sfx/sfx_08_38.asm"
-INCLUDE "music/sfx/sfx_08_25.asm"
-INCLUDE "music/sfx/sfx_08_39.asm"
-INCLUDE "music/sfx/sfx_08_17.asm"
-INCLUDE "music/sfx/sfx_08_23.asm"
-INCLUDE "music/sfx/sfx_08_24.asm"
-INCLUDE "music/sfx/sfx_08_14.asm"
-INCLUDE "music/sfx/sfx_08_22.asm"
-INCLUDE "music/sfx/sfx_08_1a.asm"
-INCLUDE "music/sfx/sfx_08_1b.asm"
-INCLUDE "music/sfx/sfx_08_19.asm"
-INCLUDE "music/sfx/sfx_08_1f.asm"
-INCLUDE "music/sfx/sfx_08_20.asm"
-INCLUDE "music/sfx/sfx_08_16.asm"
-INCLUDE "music/sfx/sfx_08_21.asm"
-INCLUDE "music/sfx/sfx_08_15.asm"
-INCLUDE "music/sfx/sfx_08_1e.asm"
-INCLUDE "music/sfx/sfx_08_1c.asm"
-INCLUDE "music/sfx/sfx_08_18.asm"
-INCLUDE "music/sfx/sfx_08_2d.asm"
-INCLUDE "music/sfx/sfx_08_2a.asm"
-INCLUDE "music/sfx/sfx_08_2f.asm"
-INCLUDE "music/sfx/sfx_08_26.asm"
-INCLUDE "music/sfx/sfx_08_27.asm"
-INCLUDE "music/sfx/sfx_08_28.asm"
-INCLUDE "music/sfx/sfx_08_32.asm"
-INCLUDE "music/sfx/sfx_08_29.asm"
-INCLUDE "music/sfx/sfx_08_2b.asm"
-INCLUDE "music/sfx/sfx_08_30.asm"
-INCLUDE "music/sfx/sfx_08_2e.asm"
-INCLUDE "music/sfx/sfx_08_31.asm"
-INCLUDE "music/sfx/sfx_08_2c.asm"
-INCLUDE "music/sfx/sfx_08_33.asm"
-INCLUDE "music/sfx/sfx_08_34.asm"
-INCLUDE "music/sfx/sfx_08_35.asm"
-INCLUDE "music/sfx/sfx_08_36.asm"
+INCLUDE "audio/sfx/sfx_08_40.asm"
+INCLUDE "audio/sfx/sfx_08_3f.asm"
+INCLUDE "audio/sfx/sfx_08_3c.asm"
+INCLUDE "audio/sfx/sfx_08_3d.asm"
+INCLUDE "audio/sfx/sfx_08_3e.asm"
+INCLUDE "audio/sfx/sfx_08_77.asm"
+INCLUDE "audio/sfx/sfx_08_41.asm"
+INCLUDE "audio/sfx/sfx_08_42.asm"
+INCLUDE "audio/sfx/sfx_08_43.asm"
+INCLUDE "audio/sfx/sfx_08_44.asm"
+INCLUDE "audio/sfx/sfx_08_45.asm"
+INCLUDE "audio/sfx/sfx_08_pokeflute_ch3.asm"
+INCLUDE "audio/sfx/sfx_08_47.asm"
+INCLUDE "audio/sfx/sfx_08_48.asm"
+INCLUDE "audio/sfx/sfx_08_49.asm"
+INCLUDE "audio/sfx/sfx_08_4a.asm"
+INCLUDE "audio/sfx/sfx_08_4b.asm"
+INCLUDE "audio/sfx/sfx_08_4c.asm"
+INCLUDE "audio/sfx/sfx_08_4d.asm"
+INCLUDE "audio/sfx/sfx_08_4e.asm"
+INCLUDE "audio/sfx/sfx_08_4f.asm"
+INCLUDE "audio/sfx/sfx_08_50.asm"
+INCLUDE "audio/sfx/sfx_08_51.asm"
+INCLUDE "audio/sfx/sfx_08_52.asm"
+INCLUDE "audio/sfx/sfx_08_53.asm"
+INCLUDE "audio/sfx/sfx_08_54.asm"
+INCLUDE "audio/sfx/sfx_08_55.asm"
+INCLUDE "audio/sfx/sfx_08_56.asm"
+INCLUDE "audio/sfx/sfx_08_57.asm"
+INCLUDE "audio/sfx/sfx_08_58.asm"
+INCLUDE "audio/sfx/sfx_08_59.asm"
+INCLUDE "audio/sfx/sfx_08_5a.asm"
+INCLUDE "audio/sfx/sfx_08_5b.asm"
+INCLUDE "audio/sfx/sfx_08_5c.asm"
+INCLUDE "audio/sfx/sfx_08_5d.asm"
+INCLUDE "audio/sfx/sfx_08_5e.asm"
+INCLUDE "audio/sfx/sfx_08_5f.asm"
+INCLUDE "audio/sfx/sfx_08_60.asm"
+INCLUDE "audio/sfx/sfx_08_61.asm"
+INCLUDE "audio/sfx/sfx_08_62.asm"
+INCLUDE "audio/sfx/sfx_08_63.asm"
+INCLUDE "audio/sfx/sfx_08_64.asm"
+INCLUDE "audio/sfx/sfx_08_65.asm"
+INCLUDE "audio/sfx/sfx_08_66.asm"
+INCLUDE "audio/sfx/sfx_08_67.asm"
+INCLUDE "audio/sfx/sfx_08_68.asm"
+INCLUDE "audio/sfx/sfx_08_69.asm"
+INCLUDE "audio/sfx/sfx_08_6a.asm"
+INCLUDE "audio/sfx/sfx_08_6b.asm"
+INCLUDE "audio/sfx/sfx_08_6c.asm"
+INCLUDE "audio/sfx/sfx_08_6d.asm"
+INCLUDE "audio/sfx/sfx_08_6e.asm"
+INCLUDE "audio/sfx/sfx_08_6f.asm"
+INCLUDE "audio/sfx/sfx_08_70.asm"
+INCLUDE "audio/sfx/sfx_08_71.asm"
+INCLUDE "audio/sfx/sfx_08_72.asm"
+INCLUDE "audio/sfx/sfx_08_73.asm"
+INCLUDE "audio/sfx/sfx_08_74.asm"
+INCLUDE "audio/sfx/sfx_08_75.asm"
+INCLUDE "audio/sfx/sfx_08_76.asm"
+INCLUDE "audio/sfx/sfx_08_unused.asm"
+INCLUDE "audio/sfx/sfx_08_1d.asm"
+INCLUDE "audio/sfx/sfx_08_37.asm"
+INCLUDE "audio/sfx/sfx_08_38.asm"
+INCLUDE "audio/sfx/sfx_08_25.asm"
+INCLUDE "audio/sfx/sfx_08_39.asm"
+INCLUDE "audio/sfx/sfx_08_17.asm"
+INCLUDE "audio/sfx/sfx_08_23.asm"
+INCLUDE "audio/sfx/sfx_08_24.asm"
+INCLUDE "audio/sfx/sfx_08_14.asm"
+INCLUDE "audio/sfx/sfx_08_22.asm"
+INCLUDE "audio/sfx/sfx_08_1a.asm"
+INCLUDE "audio/sfx/sfx_08_1b.asm"
+INCLUDE "audio/sfx/sfx_08_19.asm"
+INCLUDE "audio/sfx/sfx_08_1f.asm"
+INCLUDE "audio/sfx/sfx_08_20.asm"
+INCLUDE "audio/sfx/sfx_08_16.asm"
+INCLUDE "audio/sfx/sfx_08_21.asm"
+INCLUDE "audio/sfx/sfx_08_15.asm"
+INCLUDE "audio/sfx/sfx_08_1e.asm"
+INCLUDE "audio/sfx/sfx_08_1c.asm"
+INCLUDE "audio/sfx/sfx_08_18.asm"
+INCLUDE "audio/sfx/sfx_08_2d.asm"
+INCLUDE "audio/sfx/sfx_08_2a.asm"
+INCLUDE "audio/sfx/sfx_08_2f.asm"
+INCLUDE "audio/sfx/sfx_08_26.asm"
+INCLUDE "audio/sfx/sfx_08_27.asm"
+INCLUDE "audio/sfx/sfx_08_28.asm"
+INCLUDE "audio/sfx/sfx_08_32.asm"
+INCLUDE "audio/sfx/sfx_08_29.asm"
+INCLUDE "audio/sfx/sfx_08_2b.asm"
+INCLUDE "audio/sfx/sfx_08_30.asm"
+INCLUDE "audio/sfx/sfx_08_2e.asm"
+INCLUDE "audio/sfx/sfx_08_31.asm"
+INCLUDE "audio/sfx/sfx_08_2c.asm"
+INCLUDE "audio/sfx/sfx_08_33.asm"
+INCLUDE "audio/sfx/sfx_08_34.asm"
+INCLUDE "audio/sfx/sfx_08_35.asm"
+INCLUDE "audio/sfx/sfx_08_36.asm"
 
 
 SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3]
 
-INCLUDE "music/sfx/sfx_1f_01.asm"
-INCLUDE "music/sfx/sfx_1f_02.asm"
-INCLUDE "music/sfx/sfx_1f_03.asm"
-INCLUDE "music/sfx/sfx_1f_04.asm"
-INCLUDE "music/sfx/sfx_1f_05.asm"
-INCLUDE "music/sfx/sfx_1f_06.asm"
-INCLUDE "music/sfx/sfx_1f_07.asm"
-INCLUDE "music/sfx/sfx_1f_08.asm"
-INCLUDE "music/sfx/sfx_1f_09.asm"
-INCLUDE "music/sfx/sfx_1f_0a.asm"
-INCLUDE "music/sfx/sfx_1f_0b.asm"
-INCLUDE "music/sfx/sfx_1f_0c.asm"
-INCLUDE "music/sfx/sfx_1f_0d.asm"
-INCLUDE "music/sfx/sfx_1f_0e.asm"
-INCLUDE "music/sfx/sfx_1f_0f.asm"
-INCLUDE "music/sfx/sfx_1f_10.asm"
-INCLUDE "music/sfx/sfx_1f_11.asm"
-INCLUDE "music/sfx/sfx_1f_12.asm"
-INCLUDE "music/sfx/sfx_1f_13.asm"
+INCLUDE "audio/sfx/sfx_1f_01.asm"
+INCLUDE "audio/sfx/sfx_1f_02.asm"
+INCLUDE "audio/sfx/sfx_1f_03.asm"
+INCLUDE "audio/sfx/sfx_1f_04.asm"
+INCLUDE "audio/sfx/sfx_1f_05.asm"
+INCLUDE "audio/sfx/sfx_1f_06.asm"
+INCLUDE "audio/sfx/sfx_1f_07.asm"
+INCLUDE "audio/sfx/sfx_1f_08.asm"
+INCLUDE "audio/sfx/sfx_1f_09.asm"
+INCLUDE "audio/sfx/sfx_1f_0a.asm"
+INCLUDE "audio/sfx/sfx_1f_0b.asm"
+INCLUDE "audio/sfx/sfx_1f_0c.asm"
+INCLUDE "audio/sfx/sfx_1f_0d.asm"
+INCLUDE "audio/sfx/sfx_1f_0e.asm"
+INCLUDE "audio/sfx/sfx_1f_0f.asm"
+INCLUDE "audio/sfx/sfx_1f_10.asm"
+INCLUDE "audio/sfx/sfx_1f_11.asm"
+INCLUDE "audio/sfx/sfx_1f_12.asm"
+INCLUDE "audio/sfx/sfx_1f_13.asm"
 
 INCLUDE "audio/duty_3.asm"
 
-INCLUDE "music/sfx/sfx_1f_3f.asm"
-INCLUDE "music/sfx/sfx_1f_56.asm"
-INCLUDE "music/sfx/sfx_1f_57.asm"
-INCLUDE "music/sfx/sfx_1f_58.asm"
-INCLUDE "music/sfx/sfx_1f_3c.asm"
-INCLUDE "music/sfx/sfx_1f_59.asm"
-INCLUDE "music/sfx/sfx_1f_5a.asm"
-INCLUDE "music/sfx/sfx_1f_5b.asm"
-INCLUDE "music/sfx/sfx_1f_5c.asm"
-INCLUDE "music/sfx/sfx_1f_40.asm"
-INCLUDE "music/sfx/sfx_1f_5d.asm"
-INCLUDE "music/sfx/sfx_1f_3d.asm"
-INCLUDE "music/sfx/sfx_1f_43.asm"
-INCLUDE "music/sfx/sfx_1f_3e.asm"
-INCLUDE "music/sfx/sfx_1f_44.asm"
-INCLUDE "music/sfx/sfx_1f_45.asm"
-INCLUDE "music/sfx/sfx_1f_46.asm"
-INCLUDE "music/sfx/sfx_1f_47.asm"
-INCLUDE "music/sfx/sfx_1f_48.asm"
-INCLUDE "music/sfx/sfx_1f_49.asm"
-INCLUDE "music/sfx/sfx_1f_4a.asm"
-INCLUDE "music/sfx/sfx_1f_4b.asm"
-INCLUDE "music/sfx/sfx_1f_4c.asm"
-INCLUDE "music/sfx/sfx_1f_4d.asm"
-INCLUDE "music/sfx/sfx_1f_4e.asm"
-INCLUDE "music/sfx/sfx_1f_4f.asm"
-INCLUDE "music/sfx/sfx_1f_50.asm"
-INCLUDE "music/sfx/sfx_1f_51.asm"
-INCLUDE "music/sfx/sfx_1f_52.asm"
-INCLUDE "music/sfx/sfx_1f_53.asm"
-INCLUDE "music/sfx/sfx_1f_54.asm"
-INCLUDE "music/sfx/sfx_1f_55.asm"
-INCLUDE "music/sfx/sfx_1f_5e.asm"
-INCLUDE "music/sfx/sfx_1f_5f.asm"
-INCLUDE "music/sfx/sfx_1f_60.asm"
-INCLUDE "music/sfx/sfx_1f_61.asm"
-INCLUDE "music/sfx/sfx_1f_62.asm"
-INCLUDE "music/sfx/sfx_1f_63.asm"
-INCLUDE "music/sfx/sfx_1f_64.asm"
-INCLUDE "music/sfx/sfx_1f_65.asm"
-INCLUDE "music/sfx/sfx_1f_66.asm"
-INCLUDE "music/sfx/sfx_1f_67.asm"
-INCLUDE "music/sfx/sfx_1f_unused.asm"
-INCLUDE "music/sfx/sfx_1f_1d.asm"
-INCLUDE "music/sfx/sfx_1f_37.asm"
-INCLUDE "music/sfx/sfx_1f_38.asm"
-INCLUDE "music/sfx/sfx_1f_25.asm"
-INCLUDE "music/sfx/sfx_1f_39.asm"
-INCLUDE "music/sfx/sfx_1f_17.asm"
-INCLUDE "music/sfx/sfx_1f_23.asm"
-INCLUDE "music/sfx/sfx_1f_24.asm"
-INCLUDE "music/sfx/sfx_1f_14.asm"
-INCLUDE "music/sfx/sfx_1f_22.asm"
-INCLUDE "music/sfx/sfx_1f_1a.asm"
-INCLUDE "music/sfx/sfx_1f_1b.asm"
-INCLUDE "music/sfx/sfx_1f_19.asm"
-INCLUDE "music/sfx/sfx_1f_1f.asm"
-INCLUDE "music/sfx/sfx_1f_20.asm"
-INCLUDE "music/sfx/sfx_1f_16.asm"
-INCLUDE "music/sfx/sfx_1f_21.asm"
-INCLUDE "music/sfx/sfx_1f_15.asm"
-INCLUDE "music/sfx/sfx_1f_1e.asm"
-INCLUDE "music/sfx/sfx_1f_1c.asm"
-INCLUDE "music/sfx/sfx_1f_18.asm"
-INCLUDE "music/sfx/sfx_1f_2d.asm"
-INCLUDE "music/sfx/sfx_1f_2a.asm"
-INCLUDE "music/sfx/sfx_1f_2f.asm"
-INCLUDE "music/sfx/sfx_1f_26.asm"
-INCLUDE "music/sfx/sfx_1f_27.asm"
-INCLUDE "music/sfx/sfx_1f_28.asm"
-INCLUDE "music/sfx/sfx_1f_32.asm"
-INCLUDE "music/sfx/sfx_1f_29.asm"
-INCLUDE "music/sfx/sfx_1f_2b.asm"
-INCLUDE "music/sfx/sfx_1f_30.asm"
-INCLUDE "music/sfx/sfx_1f_2e.asm"
-INCLUDE "music/sfx/sfx_1f_31.asm"
-INCLUDE "music/sfx/sfx_1f_2c.asm"
-INCLUDE "music/sfx/sfx_1f_33.asm"
-INCLUDE "music/sfx/sfx_1f_34.asm"
-INCLUDE "music/sfx/sfx_1f_35.asm"
-INCLUDE "music/sfx/sfx_1f_36.asm"
+INCLUDE "audio/sfx/sfx_1f_3f.asm"
+INCLUDE "audio/sfx/sfx_1f_56.asm"
+INCLUDE "audio/sfx/sfx_1f_57.asm"
+INCLUDE "audio/sfx/sfx_1f_58.asm"
+INCLUDE "audio/sfx/sfx_1f_3c.asm"
+INCLUDE "audio/sfx/sfx_1f_59.asm"
+INCLUDE "audio/sfx/sfx_1f_5a.asm"
+INCLUDE "audio/sfx/sfx_1f_5b.asm"
+INCLUDE "audio/sfx/sfx_1f_5c.asm"
+INCLUDE "audio/sfx/sfx_1f_40.asm"
+INCLUDE "audio/sfx/sfx_1f_5d.asm"
+INCLUDE "audio/sfx/sfx_1f_3d.asm"
+INCLUDE "audio/sfx/sfx_1f_43.asm"
+INCLUDE "audio/sfx/sfx_1f_3e.asm"
+INCLUDE "audio/sfx/sfx_1f_44.asm"
+INCLUDE "audio/sfx/sfx_1f_45.asm"
+INCLUDE "audio/sfx/sfx_1f_46.asm"
+INCLUDE "audio/sfx/sfx_1f_47.asm"
+INCLUDE "audio/sfx/sfx_1f_48.asm"
+INCLUDE "audio/sfx/sfx_1f_49.asm"
+INCLUDE "audio/sfx/sfx_1f_4a.asm"
+INCLUDE "audio/sfx/sfx_1f_4b.asm"
+INCLUDE "audio/sfx/sfx_1f_4c.asm"
+INCLUDE "audio/sfx/sfx_1f_4d.asm"
+INCLUDE "audio/sfx/sfx_1f_4e.asm"
+INCLUDE "audio/sfx/sfx_1f_4f.asm"
+INCLUDE "audio/sfx/sfx_1f_50.asm"
+INCLUDE "audio/sfx/sfx_1f_51.asm"
+INCLUDE "audio/sfx/sfx_1f_52.asm"
+INCLUDE "audio/sfx/sfx_1f_53.asm"
+INCLUDE "audio/sfx/sfx_1f_54.asm"
+INCLUDE "audio/sfx/sfx_1f_55.asm"
+INCLUDE "audio/sfx/sfx_1f_5e.asm"
+INCLUDE "audio/sfx/sfx_1f_5f.asm"
+INCLUDE "audio/sfx/sfx_1f_60.asm"
+INCLUDE "audio/sfx/sfx_1f_61.asm"
+INCLUDE "audio/sfx/sfx_1f_62.asm"
+INCLUDE "audio/sfx/sfx_1f_63.asm"
+INCLUDE "audio/sfx/sfx_1f_64.asm"
+INCLUDE "audio/sfx/sfx_1f_65.asm"
+INCLUDE "audio/sfx/sfx_1f_66.asm"
+INCLUDE "audio/sfx/sfx_1f_67.asm"
+INCLUDE "audio/sfx/sfx_1f_unused.asm"
+INCLUDE "audio/sfx/sfx_1f_1d.asm"
+INCLUDE "audio/sfx/sfx_1f_37.asm"
+INCLUDE "audio/sfx/sfx_1f_38.asm"
+INCLUDE "audio/sfx/sfx_1f_25.asm"
+INCLUDE "audio/sfx/sfx_1f_39.asm"
+INCLUDE "audio/sfx/sfx_1f_17.asm"
+INCLUDE "audio/sfx/sfx_1f_23.asm"
+INCLUDE "audio/sfx/sfx_1f_24.asm"
+INCLUDE "audio/sfx/sfx_1f_14.asm"
+INCLUDE "audio/sfx/sfx_1f_22.asm"
+INCLUDE "audio/sfx/sfx_1f_1a.asm"
+INCLUDE "audio/sfx/sfx_1f_1b.asm"
+INCLUDE "audio/sfx/sfx_1f_19.asm"
+INCLUDE "audio/sfx/sfx_1f_1f.asm"
+INCLUDE "audio/sfx/sfx_1f_20.asm"
+INCLUDE "audio/sfx/sfx_1f_16.asm"
+INCLUDE "audio/sfx/sfx_1f_21.asm"
+INCLUDE "audio/sfx/sfx_1f_15.asm"
+INCLUDE "audio/sfx/sfx_1f_1e.asm"
+INCLUDE "audio/sfx/sfx_1f_1c.asm"
+INCLUDE "audio/sfx/sfx_1f_18.asm"
+INCLUDE "audio/sfx/sfx_1f_2d.asm"
+INCLUDE "audio/sfx/sfx_1f_2a.asm"
+INCLUDE "audio/sfx/sfx_1f_2f.asm"
+INCLUDE "audio/sfx/sfx_1f_26.asm"
+INCLUDE "audio/sfx/sfx_1f_27.asm"
+INCLUDE "audio/sfx/sfx_1f_28.asm"
+INCLUDE "audio/sfx/sfx_1f_32.asm"
+INCLUDE "audio/sfx/sfx_1f_29.asm"
+INCLUDE "audio/sfx/sfx_1f_2b.asm"
+INCLUDE "audio/sfx/sfx_1f_30.asm"
+INCLUDE "audio/sfx/sfx_1f_2e.asm"
+INCLUDE "audio/sfx/sfx_1f_31.asm"
+INCLUDE "audio/sfx/sfx_1f_2c.asm"
+INCLUDE "audio/sfx/sfx_1f_33.asm"
+INCLUDE "audio/sfx/sfx_1f_34.asm"
+INCLUDE "audio/sfx/sfx_1f_35.asm"
+INCLUDE "audio/sfx/sfx_1f_36.asm"
 
 
 
@@ -584,71 +584,71 @@ INCLUDE "audio/engine_3.asm"
 
 SECTION "Music 1", ROMX, BANK[AUDIO_1]
 
-INCLUDE "music/pkmnhealed.asm"
-INCLUDE "music/routes1.asm"
-INCLUDE "music/routes2.asm"
-INCLUDE "music/routes3.asm"
-INCLUDE "music/routes4.asm"
-INCLUDE "music/indigoplateau.asm"
-INCLUDE "music/pallettown.asm"
-INCLUDE "music/unusedsong.asm"
-INCLUDE "music/cities1.asm"
-INCLUDE "music/sfx/sfx_02_3a.asm"
-INCLUDE "music/museumguy.asm"
-INCLUDE "music/meetprofoak.asm"
-INCLUDE "music/meetrival.asm"
-INCLUDE "music/sfx/sfx_02_41.asm"
-INCLUDE "music/sfx/sfx_02_3b.asm"
-INCLUDE "music/sfx/sfx_02_42.asm"
-INCLUDE "music/ssanne.asm"
-INCLUDE "music/cities2.asm"
-INCLUDE "music/celadon.asm"
-INCLUDE "music/cinnabar.asm"
-INCLUDE "music/vermilion.asm"
-INCLUDE "music/lavender.asm"
-INCLUDE "music/safarizone.asm"
-INCLUDE "music/gym.asm"
-INCLUDE "music/pokecenter.asm"
+INCLUDE "audio/music/pkmnhealed.asm"
+INCLUDE "audio/music/routes1.asm"
+INCLUDE "audio/music/routes2.asm"
+INCLUDE "audio/music/routes3.asm"
+INCLUDE "audio/music/routes4.asm"
+INCLUDE "audio/music/indigoplateau.asm"
+INCLUDE "audio/music/pallettown.asm"
+INCLUDE "audio/music/unusedsong.asm"
+INCLUDE "audio/music/cities1.asm"
+INCLUDE "audio/sfx/sfx_02_3a.asm"
+INCLUDE "audio/music/museumguy.asm"
+INCLUDE "audio/music/meetprofoak.asm"
+INCLUDE "audio/music/meetrival.asm"
+INCLUDE "audio/sfx/sfx_02_41.asm"
+INCLUDE "audio/sfx/sfx_02_3b.asm"
+INCLUDE "audio/sfx/sfx_02_42.asm"
+INCLUDE "audio/music/ssanne.asm"
+INCLUDE "audio/music/cities2.asm"
+INCLUDE "audio/music/celadon.asm"
+INCLUDE "audio/music/cinnabar.asm"
+INCLUDE "audio/music/vermilion.asm"
+INCLUDE "audio/music/lavender.asm"
+INCLUDE "audio/music/safarizone.asm"
+INCLUDE "audio/music/gym.asm"
+INCLUDE "audio/music/pokecenter.asm"
 
 
 SECTION "Music 2", ROMX, BANK[AUDIO_2]
 
-INCLUDE "music/sfx/sfx_08_pokeflute.asm"
-INCLUDE "music/sfx/sfx_08_unused2.asm"
-INCLUDE "music/gymleaderbattle.asm"
-INCLUDE "music/trainerbattle.asm"
-INCLUDE "music/wildbattle.asm"
-INCLUDE "music/finalbattle.asm"
-INCLUDE "music/sfx/sfx_08_3a.asm"
-INCLUDE "music/sfx/sfx_08_3b.asm"
-INCLUDE "music/sfx/sfx_08_46.asm"
-INCLUDE "music/defeatedtrainer.asm"
-INCLUDE "music/defeatedwildmon.asm"
-INCLUDE "music/defeatedgymleader.asm"
+INCLUDE "audio/sfx/sfx_08_pokeflute.asm"
+INCLUDE "audio/sfx/sfx_08_unused2.asm"
+INCLUDE "audio/music/gymleaderbattle.asm"
+INCLUDE "audio/music/trainerbattle.asm"
+INCLUDE "audio/music/wildbattle.asm"
+INCLUDE "audio/music/finalbattle.asm"
+INCLUDE "audio/sfx/sfx_08_3a.asm"
+INCLUDE "audio/sfx/sfx_08_3b.asm"
+INCLUDE "audio/sfx/sfx_08_46.asm"
+INCLUDE "audio/music/defeatedtrainer.asm"
+INCLUDE "audio/music/defeatedwildmon.asm"
+INCLUDE "audio/music/defeatedgymleader.asm"
 
 
 SECTION "Music 3", ROMX, BANK[AUDIO_3]
 
-INCLUDE "music/bikeriding.asm"
-INCLUDE "music/dungeon1.asm"
-INCLUDE "music/gamecorner.asm"
-INCLUDE "music/titlescreen.asm"
-INCLUDE "music/sfx/sfx_1f_3a.asm"
-INCLUDE "music/dungeon2.asm"
-INCLUDE "music/dungeon3.asm"
-INCLUDE "music/cinnabarmansion.asm"
-INCLUDE "music/sfx/sfx_1f_41.asm"
-INCLUDE "music/sfx/sfx_1f_3b.asm"
-INCLUDE "music/sfx/sfx_1f_42.asm"
-INCLUDE "music/oakslab.asm"
-INCLUDE "music/pokemontower.asm"
-INCLUDE "music/silphco.asm"
-INCLUDE "music/meeteviltrainer.asm"
-INCLUDE "music/meetfemaletrainer.asm"
-INCLUDE "music/meetmaletrainer.asm"
-INCLUDE "music/introbattle.asm"
-INCLUDE "music/surfing.asm"
-INCLUDE "music/jigglypuffsong.asm"
-INCLUDE "music/halloffame.asm"
-INCLUDE "music/credits.asm"
+INCLUDE "audio/music/bikeriding.asm"
+INCLUDE "audio/music/dungeon1.asm"
+INCLUDE "audio/music/gamecorner.asm"
+INCLUDE "audio/music/titlescreen.asm"
+INCLUDE "audio/sfx/sfx_1f_3a.asm"
+INCLUDE "audio/music/dungeon2.asm"
+INCLUDE "audio/music/dungeon3.asm"
+INCLUDE "audio/music/cinnabarmansion.asm"
+INCLUDE "audio/sfx/sfx_1f_41.asm"
+INCLUDE "audio/sfx/sfx_1f_3b.asm"
+INCLUDE "audio/sfx/sfx_1f_42.asm"
+INCLUDE "audio/music/oakslab.asm"
+INCLUDE "audio/music/pokemontower.asm"
+INCLUDE "audio/music/silphco.asm"
+INCLUDE "audio/music/meeteviltrainer.asm"
+INCLUDE "audio/music/meetfemaletrainer.asm"
+INCLUDE "audio/music/meetmaletrainer.asm"
+INCLUDE "audio/music/introbattle.asm"
+INCLUDE "audio/music/surfing.asm"
+INCLUDE "audio/music/jigglypuffsong.asm"
+INCLUDE "audio/music/halloffame.asm"
+INCLUDE "audio/music/credits.asm"
 
diff --git a/music/headers/musicheaders02.asm b/audio/headers/musicheaders02.asm
index 3adb23c5..3adb23c5 100644
--- a/music/headers/musicheaders02.asm
+++ b/audio/headers/musicheaders02.asm
diff --git a/music/headers/musicheaders08.asm b/audio/headers/musicheaders08.asm
index fbc3f9ae..fbc3f9ae 100644
--- a/music/headers/musicheaders08.asm
+++ b/audio/headers/musicheaders08.asm
diff --git a/music/headers/musicheaders1f.asm b/audio/headers/musicheaders1f.asm
index beb70cf4..beb70cf4 100644
--- a/music/headers/musicheaders1f.asm
+++ b/audio/headers/musicheaders1f.asm
diff --git a/music/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm
index d1c185c0..d1c185c0 100644
--- a/music/headers/sfxheaders02.asm
+++ b/audio/headers/sfxheaders02.asm
diff --git a/music/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm
index 547c8d4a..547c8d4a 100644
--- a/music/headers/sfxheaders08.asm
+++ b/audio/headers/sfxheaders08.asm
diff --git a/music/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm
index 4db63a59..4db63a59 100644
--- a/music/headers/sfxheaders1f.asm
+++ b/audio/headers/sfxheaders1f.asm
diff --git a/music/bikeriding.asm b/audio/music/bikeriding.asm
index 13776fe1..13776fe1 100644
--- a/music/bikeriding.asm
+++ b/audio/music/bikeriding.asm
diff --git a/music/celadon.asm b/audio/music/celadon.asm
index a965bc80..a965bc80 100644
--- a/music/celadon.asm
+++ b/audio/music/celadon.asm
diff --git a/music/cinnabar.asm b/audio/music/cinnabar.asm
index db344c64..db344c64 100644
--- a/music/cinnabar.asm
+++ b/audio/music/cinnabar.asm
diff --git a/music/cinnabarmansion.asm b/audio/music/cinnabarmansion.asm
index 1560e89d..1560e89d 100644
--- a/music/cinnabarmansion.asm
+++ b/audio/music/cinnabarmansion.asm
diff --git a/music/cities1.asm b/audio/music/cities1.asm
index f7b9cc81..f7b9cc81 100644
--- a/music/cities1.asm
+++ b/audio/music/cities1.asm
diff --git a/music/cities2.asm b/audio/music/cities2.asm
index 97eadde8..97eadde8 100644
--- a/music/cities2.asm
+++ b/audio/music/cities2.asm
diff --git a/music/credits.asm b/audio/music/credits.asm
index cdedef62..cdedef62 100644
--- a/music/credits.asm
+++ b/audio/music/credits.asm
diff --git a/music/defeatedgymleader.asm b/audio/music/defeatedgymleader.asm
index 0e24d904..0e24d904 100644
--- a/music/defeatedgymleader.asm
+++ b/audio/music/defeatedgymleader.asm
diff --git a/music/defeatedtrainer.asm b/audio/music/defeatedtrainer.asm
index 5585066a..5585066a 100644
--- a/music/defeatedtrainer.asm
+++ b/audio/music/defeatedtrainer.asm
diff --git a/music/defeatedwildmon.asm b/audio/music/defeatedwildmon.asm
index c56c6471..c56c6471 100644
--- a/music/defeatedwildmon.asm
+++ b/audio/music/defeatedwildmon.asm
diff --git a/music/dungeon1.asm b/audio/music/dungeon1.asm
index c9bf6dba..c9bf6dba 100644
--- a/music/dungeon1.asm
+++ b/audio/music/dungeon1.asm
diff --git a/music/dungeon2.asm b/audio/music/dungeon2.asm
index 028d6785..028d6785 100644
--- a/music/dungeon2.asm
+++ b/audio/music/dungeon2.asm
diff --git a/music/dungeon3.asm b/audio/music/dungeon3.asm
index dd4acc4c..dd4acc4c 100644
--- a/music/dungeon3.asm
+++ b/audio/music/dungeon3.asm
diff --git a/music/finalbattle.asm b/audio/music/finalbattle.asm
index c0b7e144..c0b7e144 100644
--- a/music/finalbattle.asm
+++ b/audio/music/finalbattle.asm
diff --git a/music/gamecorner.asm b/audio/music/gamecorner.asm
index ea89ff2f..ea89ff2f 100644
--- a/music/gamecorner.asm
+++ b/audio/music/gamecorner.asm
diff --git a/music/gym.asm b/audio/music/gym.asm
index b846ca73..b846ca73 100644
--- a/music/gym.asm
+++ b/audio/music/gym.asm
diff --git a/music/gymleaderbattle.asm b/audio/music/gymleaderbattle.asm
index 97162408..97162408 100644
--- a/music/gymleaderbattle.asm
+++ b/audio/music/gymleaderbattle.asm
diff --git a/music/halloffame.asm b/audio/music/halloffame.asm
index 2900cec7..2900cec7 100644
--- a/music/halloffame.asm
+++ b/audio/music/halloffame.asm
diff --git a/music/indigoplateau.asm b/audio/music/indigoplateau.asm
index e0ea6ff3..e0ea6ff3 100644
--- a/music/indigoplateau.asm
+++ b/audio/music/indigoplateau.asm
diff --git a/music/introbattle.asm b/audio/music/introbattle.asm
index 81730736..81730736 100644
--- a/music/introbattle.asm
+++ b/audio/music/introbattle.asm
diff --git a/music/jigglypuffsong.asm b/audio/music/jigglypuffsong.asm
index b3c6fb4b..b3c6fb4b 100644
--- a/music/jigglypuffsong.asm
+++ b/audio/music/jigglypuffsong.asm
diff --git a/music/lavender.asm b/audio/music/lavender.asm
index 318da8a8..318da8a8 100644
--- a/music/lavender.asm
+++ b/audio/music/lavender.asm
diff --git a/music/meeteviltrainer.asm b/audio/music/meeteviltrainer.asm
index 46385127..46385127 100644
--- a/music/meeteviltrainer.asm
+++ b/audio/music/meeteviltrainer.asm
diff --git a/music/meetfemaletrainer.asm b/audio/music/meetfemaletrainer.asm
index 1b097f58..1b097f58 100644
--- a/music/meetfemaletrainer.asm
+++ b/audio/music/meetfemaletrainer.asm
diff --git a/music/meetmaletrainer.asm b/audio/music/meetmaletrainer.asm
index 3c56aca6..3c56aca6 100644
--- a/music/meetmaletrainer.asm
+++ b/audio/music/meetmaletrainer.asm
diff --git a/music/meetprofoak.asm b/audio/music/meetprofoak.asm
index 303dd2f7..303dd2f7 100644
--- a/music/meetprofoak.asm
+++ b/audio/music/meetprofoak.asm
diff --git a/music/meetrival.asm b/audio/music/meetrival.asm
index 1e45ba42..1e45ba42 100644
--- a/music/meetrival.asm
+++ b/audio/music/meetrival.asm
diff --git a/music/museumguy.asm b/audio/music/museumguy.asm
index 0f3b266f..0f3b266f 100644
--- a/music/museumguy.asm
+++ b/audio/music/museumguy.asm
diff --git a/music/oakslab.asm b/audio/music/oakslab.asm
index f7302471..f7302471 100644
--- a/music/oakslab.asm
+++ b/audio/music/oakslab.asm
diff --git a/music/pallettown.asm b/audio/music/pallettown.asm
index 15162c3a..15162c3a 100644
--- a/music/pallettown.asm
+++ b/audio/music/pallettown.asm
diff --git a/music/pkmnhealed.asm b/audio/music/pkmnhealed.asm
index 9a16b435..9a16b435 100644
--- a/music/pkmnhealed.asm
+++ b/audio/music/pkmnhealed.asm
diff --git a/music/pokecenter.asm b/audio/music/pokecenter.asm
index 4e139b9a..4e139b9a 100644
--- a/music/pokecenter.asm
+++ b/audio/music/pokecenter.asm
diff --git a/music/pokemontower.asm b/audio/music/pokemontower.asm
index 915c656d..915c656d 100644
--- a/music/pokemontower.asm
+++ b/audio/music/pokemontower.asm
diff --git a/music/routes1.asm b/audio/music/routes1.asm
index a5c1b40d..a5c1b40d 100644
--- a/music/routes1.asm
+++ b/audio/music/routes1.asm
diff --git a/music/routes2.asm b/audio/music/routes2.asm
index a1362569..a1362569 100644
--- a/music/routes2.asm
+++ b/audio/music/routes2.asm
diff --git a/music/routes3.asm b/audio/music/routes3.asm
index 781d5c32..781d5c32 100644
--- a/music/routes3.asm
+++ b/audio/music/routes3.asm
diff --git a/music/routes4.asm b/audio/music/routes4.asm
index 3f0858be..3f0858be 100644
--- a/music/routes4.asm
+++ b/audio/music/routes4.asm
diff --git a/music/safarizone.asm b/audio/music/safarizone.asm
index 679ba0bd..679ba0bd 100644
--- a/music/safarizone.asm
+++ b/audio/music/safarizone.asm
diff --git a/music/silphco.asm b/audio/music/silphco.asm
index b6c70ec7..b6c70ec7 100644
--- a/music/silphco.asm
+++ b/audio/music/silphco.asm
diff --git a/music/ssanne.asm b/audio/music/ssanne.asm
index 675b67d1..675b67d1 100644
--- a/music/ssanne.asm
+++ b/audio/music/ssanne.asm
diff --git a/music/surfing.asm b/audio/music/surfing.asm
index c96e796a..c96e796a 100644
--- a/music/surfing.asm
+++ b/audio/music/surfing.asm
diff --git a/music/titlescreen.asm b/audio/music/titlescreen.asm
index a3ab8031..a3ab8031 100644
--- a/music/titlescreen.asm
+++ b/audio/music/titlescreen.asm
diff --git a/music/trainerbattle.asm b/audio/music/trainerbattle.asm
index 2e4bcdaf..2e4bcdaf 100644
--- a/music/trainerbattle.asm
+++ b/audio/music/trainerbattle.asm
diff --git a/music/unusedsong.asm b/audio/music/unusedsong.asm
index ee73de3f..ee73de3f 100644
--- a/music/unusedsong.asm
+++ b/audio/music/unusedsong.asm
diff --git a/music/vermilion.asm b/audio/music/vermilion.asm
index 4d358528..4d358528 100644
--- a/music/vermilion.asm
+++ b/audio/music/vermilion.asm
diff --git a/music/wildbattle.asm b/audio/music/wildbattle.asm
index b2b80e6e..b2b80e6e 100644
--- a/music/wildbattle.asm
+++ b/audio/music/wildbattle.asm
diff --git a/music/yellow/meetjessiejames.asm b/audio/music/yellow/meetjessiejames.asm
index eeff798b..eeff798b 100644
--- a/music/yellow/meetjessiejames.asm
+++ b/audio/music/yellow/meetjessiejames.asm
diff --git a/music/yellow/surfingpikachu.asm b/audio/music/yellow/surfingpikachu.asm
index 46bec7c3..46bec7c3 100644
--- a/music/yellow/surfingpikachu.asm
+++ b/audio/music/yellow/surfingpikachu.asm
diff --git a/music/yellow/yellowintro.asm b/audio/music/yellow/yellowintro.asm
index ee716901..ee716901 100644
--- a/music/yellow/yellowintro.asm
+++ b/audio/music/yellow/yellowintro.asm
diff --git a/music/yellow/yellowunusedsong.asm b/audio/music/yellow/yellowunusedsong.asm
index 9c5c0aa6..9c5c0aa6 100644
--- a/music/yellow/yellowunusedsong.asm
+++ b/audio/music/yellow/yellowunusedsong.asm
diff --git a/music/sfx/sfx_02_01.asm b/audio/sfx/sfx_02_01.asm
index e92c35b8..e92c35b8 100644
--- a/music/sfx/sfx_02_01.asm
+++ b/audio/sfx/sfx_02_01.asm
diff --git a/music/sfx/sfx_02_02.asm b/audio/sfx/sfx_02_02.asm
index ca252725..ca252725 100644
--- a/music/sfx/sfx_02_02.asm
+++ b/audio/sfx/sfx_02_02.asm
diff --git a/music/sfx/sfx_02_03.asm b/audio/sfx/sfx_02_03.asm
index 4eb687a8..4eb687a8 100644
--- a/music/sfx/sfx_02_03.asm
+++ b/audio/sfx/sfx_02_03.asm
diff --git a/music/sfx/sfx_02_04.asm b/audio/sfx/sfx_02_04.asm
index 45caab6b..45caab6b 100644
--- a/music/sfx/sfx_02_04.asm
+++ b/audio/sfx/sfx_02_04.asm
diff --git a/music/sfx/sfx_02_05.asm b/audio/sfx/sfx_02_05.asm
index 156254e5..156254e5 100644
--- a/music/sfx/sfx_02_05.asm
+++ b/audio/sfx/sfx_02_05.asm
diff --git a/music/sfx/sfx_02_06.asm b/audio/sfx/sfx_02_06.asm
index 03f8d4aa..03f8d4aa 100644
--- a/music/sfx/sfx_02_06.asm
+++ b/audio/sfx/sfx_02_06.asm
diff --git a/music/sfx/sfx_02_07.asm b/audio/sfx/sfx_02_07.asm
index 02fd9e06..02fd9e06 100644
--- a/music/sfx/sfx_02_07.asm
+++ b/audio/sfx/sfx_02_07.asm
diff --git a/music/sfx/sfx_02_08.asm b/audio/sfx/sfx_02_08.asm
index 4efce48f..4efce48f 100644
--- a/music/sfx/sfx_02_08.asm
+++ b/audio/sfx/sfx_02_08.asm
diff --git a/music/sfx/sfx_02_09.asm b/audio/sfx/sfx_02_09.asm
index bb04efca..bb04efca 100644
--- a/music/sfx/sfx_02_09.asm
+++ b/audio/sfx/sfx_02_09.asm
diff --git a/music/sfx/sfx_02_0a.asm b/audio/sfx/sfx_02_0a.asm
index 128c9a74..128c9a74 100644
--- a/music/sfx/sfx_02_0a.asm
+++ b/audio/sfx/sfx_02_0a.asm
diff --git a/music/sfx/sfx_02_0b.asm b/audio/sfx/sfx_02_0b.asm
index de643bd6..de643bd6 100644
--- a/music/sfx/sfx_02_0b.asm
+++ b/audio/sfx/sfx_02_0b.asm
diff --git a/music/sfx/sfx_02_0c.asm b/audio/sfx/sfx_02_0c.asm
index 98c4ef19..98c4ef19 100644
--- a/music/sfx/sfx_02_0c.asm
+++ b/audio/sfx/sfx_02_0c.asm
diff --git a/music/sfx/sfx_02_0d.asm b/audio/sfx/sfx_02_0d.asm
index dfa8e738..dfa8e738 100644
--- a/music/sfx/sfx_02_0d.asm
+++ b/audio/sfx/sfx_02_0d.asm
diff --git a/music/sfx/sfx_02_0e.asm b/audio/sfx/sfx_02_0e.asm
index 52b0dd4d..52b0dd4d 100644
--- a/music/sfx/sfx_02_0e.asm
+++ b/audio/sfx/sfx_02_0e.asm
diff --git a/music/sfx/sfx_02_0f.asm b/audio/sfx/sfx_02_0f.asm
index 5a2404fc..5a2404fc 100644
--- a/music/sfx/sfx_02_0f.asm
+++ b/audio/sfx/sfx_02_0f.asm
diff --git a/music/sfx/sfx_02_10.asm b/audio/sfx/sfx_02_10.asm
index 057fd81b..057fd81b 100644
--- a/music/sfx/sfx_02_10.asm
+++ b/audio/sfx/sfx_02_10.asm
diff --git a/music/sfx/sfx_02_11.asm b/audio/sfx/sfx_02_11.asm
index 3ab56c2b..3ab56c2b 100644
--- a/music/sfx/sfx_02_11.asm
+++ b/audio/sfx/sfx_02_11.asm
diff --git a/music/sfx/sfx_02_12.asm b/audio/sfx/sfx_02_12.asm
index 608e341c..608e341c 100644
--- a/music/sfx/sfx_02_12.asm
+++ b/audio/sfx/sfx_02_12.asm
diff --git a/music/sfx/sfx_02_13.asm b/audio/sfx/sfx_02_13.asm
index 38b06431..38b06431 100644
--- a/music/sfx/sfx_02_13.asm
+++ b/audio/sfx/sfx_02_13.asm
diff --git a/music/sfx/sfx_02_14.asm b/audio/sfx/sfx_02_14.asm
index 70dfe276..70dfe276 100644
--- a/music/sfx/sfx_02_14.asm
+++ b/audio/sfx/sfx_02_14.asm
diff --git a/music/sfx/sfx_02_15.asm b/audio/sfx/sfx_02_15.asm
index 619cb208..619cb208 100644
--- a/music/sfx/sfx_02_15.asm
+++ b/audio/sfx/sfx_02_15.asm
diff --git a/music/sfx/sfx_02_16.asm b/audio/sfx/sfx_02_16.asm
index 4e095a04..4e095a04 100644
--- a/music/sfx/sfx_02_16.asm
+++ b/audio/sfx/sfx_02_16.asm
diff --git a/music/sfx/sfx_02_17.asm b/audio/sfx/sfx_02_17.asm
index f8b66456..f8b66456 100644
--- a/music/sfx/sfx_02_17.asm
+++ b/audio/sfx/sfx_02_17.asm
diff --git a/music/sfx/sfx_02_18.asm b/audio/sfx/sfx_02_18.asm
index 4d546cbf..4d546cbf 100644
--- a/music/sfx/sfx_02_18.asm
+++ b/audio/sfx/sfx_02_18.asm
diff --git a/music/sfx/sfx_02_19.asm b/audio/sfx/sfx_02_19.asm
index 3cc7ae73..3cc7ae73 100644
--- a/music/sfx/sfx_02_19.asm
+++ b/audio/sfx/sfx_02_19.asm
diff --git a/music/sfx/sfx_02_1a.asm b/audio/sfx/sfx_02_1a.asm
index 8b029d5c..8b029d5c 100644
--- a/music/sfx/sfx_02_1a.asm
+++ b/audio/sfx/sfx_02_1a.asm
diff --git a/music/sfx/sfx_02_1b.asm b/audio/sfx/sfx_02_1b.asm
index 8626d876..8626d876 100644
--- a/music/sfx/sfx_02_1b.asm
+++ b/audio/sfx/sfx_02_1b.asm
diff --git a/music/sfx/sfx_02_1c.asm b/audio/sfx/sfx_02_1c.asm
index d96c0eb8..d96c0eb8 100644
--- a/music/sfx/sfx_02_1c.asm
+++ b/audio/sfx/sfx_02_1c.asm
diff --git a/music/sfx/sfx_02_1d.asm b/audio/sfx/sfx_02_1d.asm
index f5db0868..f5db0868 100644
--- a/music/sfx/sfx_02_1d.asm
+++ b/audio/sfx/sfx_02_1d.asm
diff --git a/music/sfx/sfx_02_1e.asm b/audio/sfx/sfx_02_1e.asm
index 524d67d7..524d67d7 100644
--- a/music/sfx/sfx_02_1e.asm
+++ b/audio/sfx/sfx_02_1e.asm
diff --git a/music/sfx/sfx_02_1f.asm b/audio/sfx/sfx_02_1f.asm
index 9506fb43..9506fb43 100644
--- a/music/sfx/sfx_02_1f.asm
+++ b/audio/sfx/sfx_02_1f.asm
diff --git a/music/sfx/sfx_02_20.asm b/audio/sfx/sfx_02_20.asm
index 00923339..00923339 100644
--- a/music/sfx/sfx_02_20.asm
+++ b/audio/sfx/sfx_02_20.asm
diff --git a/music/sfx/sfx_02_21.asm b/audio/sfx/sfx_02_21.asm
index 60ecb431..60ecb431 100644
--- a/music/sfx/sfx_02_21.asm
+++ b/audio/sfx/sfx_02_21.asm
diff --git a/music/sfx/sfx_02_22.asm b/audio/sfx/sfx_02_22.asm
index 3f7a2783..3f7a2783 100644
--- a/music/sfx/sfx_02_22.asm
+++ b/audio/sfx/sfx_02_22.asm
diff --git a/music/sfx/sfx_02_23.asm b/audio/sfx/sfx_02_23.asm
index c7e0a345..c7e0a345 100644
--- a/music/sfx/sfx_02_23.asm
+++ b/audio/sfx/sfx_02_23.asm
diff --git a/music/sfx/sfx_02_24.asm b/audio/sfx/sfx_02_24.asm
index f092bae9..f092bae9 100644
--- a/music/sfx/sfx_02_24.asm
+++ b/audio/sfx/sfx_02_24.asm
diff --git a/music/sfx/sfx_02_25.asm b/audio/sfx/sfx_02_25.asm
index 4025d4f7..4025d4f7 100644
--- a/music/sfx/sfx_02_25.asm
+++ b/audio/sfx/sfx_02_25.asm
diff --git a/music/sfx/sfx_02_26.asm b/audio/sfx/sfx_02_26.asm
index eae085f4..eae085f4 100644
--- a/music/sfx/sfx_02_26.asm
+++ b/audio/sfx/sfx_02_26.asm
diff --git a/music/sfx/sfx_02_27.asm b/audio/sfx/sfx_02_27.asm
index c019aab3..c019aab3 100644
--- a/music/sfx/sfx_02_27.asm
+++ b/audio/sfx/sfx_02_27.asm
diff --git a/music/sfx/sfx_02_28.asm b/audio/sfx/sfx_02_28.asm
index c183df6b..c183df6b 100644
--- a/music/sfx/sfx_02_28.asm
+++ b/audio/sfx/sfx_02_28.asm
diff --git a/music/sfx/sfx_02_29.asm b/audio/sfx/sfx_02_29.asm
index 872fa90a..872fa90a 100644
--- a/music/sfx/sfx_02_29.asm
+++ b/audio/sfx/sfx_02_29.asm
diff --git a/music/sfx/sfx_02_2a.asm b/audio/sfx/sfx_02_2a.asm
index f5313860..f5313860 100644
--- a/music/sfx/sfx_02_2a.asm
+++ b/audio/sfx/sfx_02_2a.asm
diff --git a/music/sfx/sfx_02_2b.asm b/audio/sfx/sfx_02_2b.asm
index c0792c94..c0792c94 100644
--- a/music/sfx/sfx_02_2b.asm
+++ b/audio/sfx/sfx_02_2b.asm
diff --git a/music/sfx/sfx_02_2c.asm b/audio/sfx/sfx_02_2c.asm
index e923c9e1..e923c9e1 100644
--- a/music/sfx/sfx_02_2c.asm
+++ b/audio/sfx/sfx_02_2c.asm
diff --git a/music/sfx/sfx_02_2d.asm b/audio/sfx/sfx_02_2d.asm
index 70e71eb1..70e71eb1 100644
--- a/music/sfx/sfx_02_2d.asm
+++ b/audio/sfx/sfx_02_2d.asm
diff --git a/music/sfx/sfx_02_2e.asm b/audio/sfx/sfx_02_2e.asm
index d95bfbe3..d95bfbe3 100644
--- a/music/sfx/sfx_02_2e.asm
+++ b/audio/sfx/sfx_02_2e.asm
diff --git a/music/sfx/sfx_02_2f.asm b/audio/sfx/sfx_02_2f.asm
index 08ea2788..08ea2788 100644
--- a/music/sfx/sfx_02_2f.asm
+++ b/audio/sfx/sfx_02_2f.asm
diff --git a/music/sfx/sfx_02_30.asm b/audio/sfx/sfx_02_30.asm
index 7131fc1a..7131fc1a 100644
--- a/music/sfx/sfx_02_30.asm
+++ b/audio/sfx/sfx_02_30.asm
diff --git a/music/sfx/sfx_02_31.asm b/audio/sfx/sfx_02_31.asm
index 79d09433..79d09433 100644
--- a/music/sfx/sfx_02_31.asm
+++ b/audio/sfx/sfx_02_31.asm
diff --git a/music/sfx/sfx_02_32.asm b/audio/sfx/sfx_02_32.asm
index f2fbf611..f2fbf611 100644
--- a/music/sfx/sfx_02_32.asm
+++ b/audio/sfx/sfx_02_32.asm
diff --git a/music/sfx/sfx_02_33.asm b/audio/sfx/sfx_02_33.asm
index f4387a3a..f4387a3a 100644
--- a/music/sfx/sfx_02_33.asm
+++ b/audio/sfx/sfx_02_33.asm
diff --git a/music/sfx/sfx_02_34.asm b/audio/sfx/sfx_02_34.asm
index 4c2fa4cc..4c2fa4cc 100644
--- a/music/sfx/sfx_02_34.asm
+++ b/audio/sfx/sfx_02_34.asm
diff --git a/music/sfx/sfx_02_35.asm b/audio/sfx/sfx_02_35.asm
index 33685f61..33685f61 100644
--- a/music/sfx/sfx_02_35.asm
+++ b/audio/sfx/sfx_02_35.asm
diff --git a/music/sfx/sfx_02_36.asm b/audio/sfx/sfx_02_36.asm
index e648e3dd..e648e3dd 100644
--- a/music/sfx/sfx_02_36.asm
+++ b/audio/sfx/sfx_02_36.asm
diff --git a/music/sfx/sfx_02_37.asm b/audio/sfx/sfx_02_37.asm
index 0fc80e1a..0fc80e1a 100644
--- a/music/sfx/sfx_02_37.asm
+++ b/audio/sfx/sfx_02_37.asm
diff --git a/music/sfx/sfx_02_38.asm b/audio/sfx/sfx_02_38.asm
index 2c982a3d..2c982a3d 100644
--- a/music/sfx/sfx_02_38.asm
+++ b/audio/sfx/sfx_02_38.asm
diff --git a/music/sfx/sfx_02_39.asm b/audio/sfx/sfx_02_39.asm
index 5aa9b436..5aa9b436 100644
--- a/music/sfx/sfx_02_39.asm
+++ b/audio/sfx/sfx_02_39.asm
diff --git a/music/sfx/sfx_02_3a.asm b/audio/sfx/sfx_02_3a.asm
index 35808c35..35808c35 100644
--- a/music/sfx/sfx_02_3a.asm
+++ b/audio/sfx/sfx_02_3a.asm
diff --git a/music/sfx/sfx_02_3b.asm b/audio/sfx/sfx_02_3b.asm
index 538f2462..538f2462 100644
--- a/music/sfx/sfx_02_3b.asm
+++ b/audio/sfx/sfx_02_3b.asm
diff --git a/music/sfx/sfx_02_3c.asm b/audio/sfx/sfx_02_3c.asm
index e695705e..e695705e 100644
--- a/music/sfx/sfx_02_3c.asm
+++ b/audio/sfx/sfx_02_3c.asm
diff --git a/music/sfx/sfx_02_3d.asm b/audio/sfx/sfx_02_3d.asm
index 206c0c35..206c0c35 100644
--- a/music/sfx/sfx_02_3d.asm
+++ b/audio/sfx/sfx_02_3d.asm
diff --git a/music/sfx/sfx_02_3e.asm b/audio/sfx/sfx_02_3e.asm
index 18d49ff3..18d49ff3 100644
--- a/music/sfx/sfx_02_3e.asm
+++ b/audio/sfx/sfx_02_3e.asm
diff --git a/music/sfx/sfx_02_3f.asm b/audio/sfx/sfx_02_3f.asm
index b7009e79..b7009e79 100644
--- a/music/sfx/sfx_02_3f.asm
+++ b/audio/sfx/sfx_02_3f.asm
diff --git a/music/sfx/sfx_02_40.asm b/audio/sfx/sfx_02_40.asm
index a5789282..a5789282 100644
--- a/music/sfx/sfx_02_40.asm
+++ b/audio/sfx/sfx_02_40.asm
diff --git a/music/sfx/sfx_02_41.asm b/audio/sfx/sfx_02_41.asm
index 4ba0eb14..4ba0eb14 100644
--- a/music/sfx/sfx_02_41.asm
+++ b/audio/sfx/sfx_02_41.asm
diff --git a/music/sfx/sfx_02_42.asm b/audio/sfx/sfx_02_42.asm
index e9112a02..e9112a02 100644
--- a/music/sfx/sfx_02_42.asm
+++ b/audio/sfx/sfx_02_42.asm
diff --git a/music/sfx/sfx_02_43.asm b/audio/sfx/sfx_02_43.asm
index c8f88914..c8f88914 100644
--- a/music/sfx/sfx_02_43.asm
+++ b/audio/sfx/sfx_02_43.asm
diff --git a/music/sfx/sfx_02_44.asm b/audio/sfx/sfx_02_44.asm
index 8ecfc89b..8ecfc89b 100644
--- a/music/sfx/sfx_02_44.asm
+++ b/audio/sfx/sfx_02_44.asm
diff --git a/music/sfx/sfx_02_45.asm b/audio/sfx/sfx_02_45.asm
index d06160b0..d06160b0 100644
--- a/music/sfx/sfx_02_45.asm
+++ b/audio/sfx/sfx_02_45.asm
diff --git a/music/sfx/sfx_02_46.asm b/audio/sfx/sfx_02_46.asm
index 64d4acce..64d4acce 100644
--- a/music/sfx/sfx_02_46.asm
+++ b/audio/sfx/sfx_02_46.asm
diff --git a/music/sfx/sfx_02_47.asm b/audio/sfx/sfx_02_47.asm
index afcd01eb..afcd01eb 100644
--- a/music/sfx/sfx_02_47.asm
+++ b/audio/sfx/sfx_02_47.asm
diff --git a/music/sfx/sfx_02_48.asm b/audio/sfx/sfx_02_48.asm
index 0db1b90d..0db1b90d 100644
--- a/music/sfx/sfx_02_48.asm
+++ b/audio/sfx/sfx_02_48.asm
diff --git a/music/sfx/sfx_02_49.asm b/audio/sfx/sfx_02_49.asm
index b19c3fcc..b19c3fcc 100644
--- a/music/sfx/sfx_02_49.asm
+++ b/audio/sfx/sfx_02_49.asm
diff --git a/music/sfx/sfx_02_4a.asm b/audio/sfx/sfx_02_4a.asm
index 278c927d..278c927d 100644
--- a/music/sfx/sfx_02_4a.asm
+++ b/audio/sfx/sfx_02_4a.asm
diff --git a/music/sfx/sfx_02_4b.asm b/audio/sfx/sfx_02_4b.asm
index 923aa8e7..923aa8e7 100644
--- a/music/sfx/sfx_02_4b.asm
+++ b/audio/sfx/sfx_02_4b.asm
diff --git a/music/sfx/sfx_02_4c.asm b/audio/sfx/sfx_02_4c.asm
index b9063058..b9063058 100644
--- a/music/sfx/sfx_02_4c.asm
+++ b/audio/sfx/sfx_02_4c.asm
diff --git a/music/sfx/sfx_02_4d.asm b/audio/sfx/sfx_02_4d.asm
index 1d492dde..1d492dde 100644
--- a/music/sfx/sfx_02_4d.asm
+++ b/audio/sfx/sfx_02_4d.asm
diff --git a/music/sfx/sfx_02_4e.asm b/audio/sfx/sfx_02_4e.asm
index b690ee55..b690ee55 100644
--- a/music/sfx/sfx_02_4e.asm
+++ b/audio/sfx/sfx_02_4e.asm
diff --git a/music/sfx/sfx_02_4f.asm b/audio/sfx/sfx_02_4f.asm
index 32ebf8cc..32ebf8cc 100644
--- a/music/sfx/sfx_02_4f.asm
+++ b/audio/sfx/sfx_02_4f.asm
diff --git a/music/sfx/sfx_02_50.asm b/audio/sfx/sfx_02_50.asm
index 023b255f..023b255f 100644
--- a/music/sfx/sfx_02_50.asm
+++ b/audio/sfx/sfx_02_50.asm
diff --git a/music/sfx/sfx_02_51.asm b/audio/sfx/sfx_02_51.asm
index 956fb558..956fb558 100644
--- a/music/sfx/sfx_02_51.asm
+++ b/audio/sfx/sfx_02_51.asm
diff --git a/music/sfx/sfx_02_52.asm b/audio/sfx/sfx_02_52.asm
index 9534b08d..9534b08d 100644
--- a/music/sfx/sfx_02_52.asm
+++ b/audio/sfx/sfx_02_52.asm
diff --git a/music/sfx/sfx_02_53.asm b/audio/sfx/sfx_02_53.asm
index 4b739723..4b739723 100644
--- a/music/sfx/sfx_02_53.asm
+++ b/audio/sfx/sfx_02_53.asm
diff --git a/music/sfx/sfx_02_54.asm b/audio/sfx/sfx_02_54.asm
index 4f3343fb..4f3343fb 100644
--- a/music/sfx/sfx_02_54.asm
+++ b/audio/sfx/sfx_02_54.asm
diff --git a/music/sfx/sfx_02_55.asm b/audio/sfx/sfx_02_55.asm
index ec138968..ec138968 100644
--- a/music/sfx/sfx_02_55.asm
+++ b/audio/sfx/sfx_02_55.asm
diff --git a/music/sfx/sfx_02_56.asm b/audio/sfx/sfx_02_56.asm
index 5dfab306..5dfab306 100644
--- a/music/sfx/sfx_02_56.asm
+++ b/audio/sfx/sfx_02_56.asm
diff --git a/music/sfx/sfx_02_57.asm b/audio/sfx/sfx_02_57.asm
index 1b7e4237..1b7e4237 100644
--- a/music/sfx/sfx_02_57.asm
+++ b/audio/sfx/sfx_02_57.asm
diff --git a/music/sfx/sfx_02_58.asm b/audio/sfx/sfx_02_58.asm
index b98ad41e..b98ad41e 100644
--- a/music/sfx/sfx_02_58.asm
+++ b/audio/sfx/sfx_02_58.asm
diff --git a/music/sfx/sfx_02_59.asm b/audio/sfx/sfx_02_59.asm
index a4985d1f..a4985d1f 100644
--- a/music/sfx/sfx_02_59.asm
+++ b/audio/sfx/sfx_02_59.asm
diff --git a/music/sfx/sfx_02_5a.asm b/audio/sfx/sfx_02_5a.asm
index a9bb7f69..a9bb7f69 100644
--- a/music/sfx/sfx_02_5a.asm
+++ b/audio/sfx/sfx_02_5a.asm
diff --git a/music/sfx/sfx_02_5b.asm b/audio/sfx/sfx_02_5b.asm
index e14879ed..e14879ed 100644
--- a/music/sfx/sfx_02_5b.asm
+++ b/audio/sfx/sfx_02_5b.asm
diff --git a/music/sfx/sfx_02_5c.asm b/audio/sfx/sfx_02_5c.asm
index 34866769..34866769 100644
--- a/music/sfx/sfx_02_5c.asm
+++ b/audio/sfx/sfx_02_5c.asm
diff --git a/music/sfx/sfx_02_5d.asm b/audio/sfx/sfx_02_5d.asm
index 2a05d5dd..2a05d5dd 100644
--- a/music/sfx/sfx_02_5d.asm
+++ b/audio/sfx/sfx_02_5d.asm
diff --git a/music/sfx/sfx_02_5e.asm b/audio/sfx/sfx_02_5e.asm
index ad47ebf0..ad47ebf0 100644
--- a/music/sfx/sfx_02_5e.asm
+++ b/audio/sfx/sfx_02_5e.asm
diff --git a/music/sfx/sfx_02_5f.asm b/audio/sfx/sfx_02_5f.asm
index 48c6539e..48c6539e 100644
--- a/music/sfx/sfx_02_5f.asm
+++ b/audio/sfx/sfx_02_5f.asm
diff --git a/music/sfx/sfx_02_unused.asm b/audio/sfx/sfx_02_unused.asm
index db3a8b26..db3a8b26 100644
--- a/music/sfx/sfx_02_unused.asm
+++ b/audio/sfx/sfx_02_unused.asm
diff --git a/music/sfx/sfx_08_01.asm b/audio/sfx/sfx_08_01.asm
index e5e03793..e5e03793 100644
--- a/music/sfx/sfx_08_01.asm
+++ b/audio/sfx/sfx_08_01.asm
diff --git a/music/sfx/sfx_08_02.asm b/audio/sfx/sfx_08_02.asm
index d86123b5..d86123b5 100644
--- a/music/sfx/sfx_08_02.asm
+++ b/audio/sfx/sfx_08_02.asm
diff --git a/music/sfx/sfx_08_03.asm b/audio/sfx/sfx_08_03.asm
index 9b29488f..9b29488f 100644
--- a/music/sfx/sfx_08_03.asm
+++ b/audio/sfx/sfx_08_03.asm
diff --git a/music/sfx/sfx_08_04.asm b/audio/sfx/sfx_08_04.asm
index 63c3b508..63c3b508 100644
--- a/music/sfx/sfx_08_04.asm
+++ b/audio/sfx/sfx_08_04.asm
diff --git a/music/sfx/sfx_08_05.asm b/audio/sfx/sfx_08_05.asm
index 6fcd5f68..6fcd5f68 100644
--- a/music/sfx/sfx_08_05.asm
+++ b/audio/sfx/sfx_08_05.asm
diff --git a/music/sfx/sfx_08_06.asm b/audio/sfx/sfx_08_06.asm
index 6e8c2b8c..6e8c2b8c 100644
--- a/music/sfx/sfx_08_06.asm
+++ b/audio/sfx/sfx_08_06.asm
diff --git a/music/sfx/sfx_08_07.asm b/audio/sfx/sfx_08_07.asm
index 5281cc7b..5281cc7b 100644
--- a/music/sfx/sfx_08_07.asm
+++ b/audio/sfx/sfx_08_07.asm
diff --git a/music/sfx/sfx_08_08.asm b/audio/sfx/sfx_08_08.asm
index 4d28817b..4d28817b 100644
--- a/music/sfx/sfx_08_08.asm
+++ b/audio/sfx/sfx_08_08.asm
diff --git a/music/sfx/sfx_08_09.asm b/audio/sfx/sfx_08_09.asm
index 94eac4b0..94eac4b0 100644
--- a/music/sfx/sfx_08_09.asm
+++ b/audio/sfx/sfx_08_09.asm
diff --git a/music/sfx/sfx_08_0a.asm b/audio/sfx/sfx_08_0a.asm
index c7a3a090..c7a3a090 100644
--- a/music/sfx/sfx_08_0a.asm
+++ b/audio/sfx/sfx_08_0a.asm
diff --git a/music/sfx/sfx_08_0b.asm b/audio/sfx/sfx_08_0b.asm
index 8010f4c9..8010f4c9 100644
--- a/music/sfx/sfx_08_0b.asm
+++ b/audio/sfx/sfx_08_0b.asm
diff --git a/music/sfx/sfx_08_0c.asm b/audio/sfx/sfx_08_0c.asm
index 8a87cf9a..8a87cf9a 100644
--- a/music/sfx/sfx_08_0c.asm
+++ b/audio/sfx/sfx_08_0c.asm
diff --git a/music/sfx/sfx_08_0d.asm b/audio/sfx/sfx_08_0d.asm
index d5997986..d5997986 100644
--- a/music/sfx/sfx_08_0d.asm
+++ b/audio/sfx/sfx_08_0d.asm
diff --git a/music/sfx/sfx_08_0e.asm b/audio/sfx/sfx_08_0e.asm
index f98ceb2e..f98ceb2e 100644
--- a/music/sfx/sfx_08_0e.asm
+++ b/audio/sfx/sfx_08_0e.asm
diff --git a/music/sfx/sfx_08_0f.asm b/audio/sfx/sfx_08_0f.asm
index 22452696..22452696 100644
--- a/music/sfx/sfx_08_0f.asm
+++ b/audio/sfx/sfx_08_0f.asm
diff --git a/music/sfx/sfx_08_10.asm b/audio/sfx/sfx_08_10.asm
index cc94f730..cc94f730 100644
--- a/music/sfx/sfx_08_10.asm
+++ b/audio/sfx/sfx_08_10.asm
diff --git a/music/sfx/sfx_08_11.asm b/audio/sfx/sfx_08_11.asm
index 7ac28d21..7ac28d21 100644
--- a/music/sfx/sfx_08_11.asm
+++ b/audio/sfx/sfx_08_11.asm
diff --git a/music/sfx/sfx_08_12.asm b/audio/sfx/sfx_08_12.asm
index 3d5bebad..3d5bebad 100644
--- a/music/sfx/sfx_08_12.asm
+++ b/audio/sfx/sfx_08_12.asm
diff --git a/music/sfx/sfx_08_13.asm b/audio/sfx/sfx_08_13.asm
index e6712805..e6712805 100644
--- a/music/sfx/sfx_08_13.asm
+++ b/audio/sfx/sfx_08_13.asm
diff --git a/music/sfx/sfx_08_14.asm b/audio/sfx/sfx_08_14.asm
index b037b6a1..b037b6a1 100644
--- a/music/sfx/sfx_08_14.asm
+++ b/audio/sfx/sfx_08_14.asm
diff --git a/music/sfx/sfx_08_15.asm b/audio/sfx/sfx_08_15.asm
index 40cacf00..40cacf00 100644
--- a/music/sfx/sfx_08_15.asm
+++ b/audio/sfx/sfx_08_15.asm
diff --git a/music/sfx/sfx_08_16.asm b/audio/sfx/sfx_08_16.asm
index bbe80ddb..bbe80ddb 100644
--- a/music/sfx/sfx_08_16.asm
+++ b/audio/sfx/sfx_08_16.asm
diff --git a/music/sfx/sfx_08_17.asm b/audio/sfx/sfx_08_17.asm
index 03587fa4..03587fa4 100644
--- a/music/sfx/sfx_08_17.asm
+++ b/audio/sfx/sfx_08_17.asm
diff --git a/music/sfx/sfx_08_18.asm b/audio/sfx/sfx_08_18.asm
index b1e97f95..b1e97f95 100644
--- a/music/sfx/sfx_08_18.asm
+++ b/audio/sfx/sfx_08_18.asm
diff --git a/music/sfx/sfx_08_19.asm b/audio/sfx/sfx_08_19.asm
index 097796bc..097796bc 100644
--- a/music/sfx/sfx_08_19.asm
+++ b/audio/sfx/sfx_08_19.asm
diff --git a/music/sfx/sfx_08_1a.asm b/audio/sfx/sfx_08_1a.asm
index 089460e4..089460e4 100644
--- a/music/sfx/sfx_08_1a.asm
+++ b/audio/sfx/sfx_08_1a.asm
diff --git a/music/sfx/sfx_08_1b.asm b/audio/sfx/sfx_08_1b.asm
index 1eec17f5..1eec17f5 100644
--- a/music/sfx/sfx_08_1b.asm
+++ b/audio/sfx/sfx_08_1b.asm
diff --git a/music/sfx/sfx_08_1c.asm b/audio/sfx/sfx_08_1c.asm
index ec6b03a7..ec6b03a7 100644
--- a/music/sfx/sfx_08_1c.asm
+++ b/audio/sfx/sfx_08_1c.asm
diff --git a/music/sfx/sfx_08_1d.asm b/audio/sfx/sfx_08_1d.asm
index 7162b031..7162b031 100644
--- a/music/sfx/sfx_08_1d.asm
+++ b/audio/sfx/sfx_08_1d.asm
diff --git a/music/sfx/sfx_08_1e.asm b/audio/sfx/sfx_08_1e.asm
index 13475f11..13475f11 100644
--- a/music/sfx/sfx_08_1e.asm
+++ b/audio/sfx/sfx_08_1e.asm
diff --git a/music/sfx/sfx_08_1f.asm b/audio/sfx/sfx_08_1f.asm
index a882c512..a882c512 100644
--- a/music/sfx/sfx_08_1f.asm
+++ b/audio/sfx/sfx_08_1f.asm
diff --git a/music/sfx/sfx_08_20.asm b/audio/sfx/sfx_08_20.asm
index 94a54b0a..94a54b0a 100644
--- a/music/sfx/sfx_08_20.asm
+++ b/audio/sfx/sfx_08_20.asm
diff --git a/music/sfx/sfx_08_21.asm b/audio/sfx/sfx_08_21.asm
index 4bfaac76..4bfaac76 100644
--- a/music/sfx/sfx_08_21.asm
+++ b/audio/sfx/sfx_08_21.asm
diff --git a/music/sfx/sfx_08_22.asm b/audio/sfx/sfx_08_22.asm
index b922acb3..b922acb3 100644
--- a/music/sfx/sfx_08_22.asm
+++ b/audio/sfx/sfx_08_22.asm
diff --git a/music/sfx/sfx_08_23.asm b/audio/sfx/sfx_08_23.asm
index 9a78abd2..9a78abd2 100644
--- a/music/sfx/sfx_08_23.asm
+++ b/audio/sfx/sfx_08_23.asm
diff --git a/music/sfx/sfx_08_24.asm b/audio/sfx/sfx_08_24.asm
index 2bdc4e9d..2bdc4e9d 100644
--- a/music/sfx/sfx_08_24.asm
+++ b/audio/sfx/sfx_08_24.asm
diff --git a/music/sfx/sfx_08_25.asm b/audio/sfx/sfx_08_25.asm
index 84f8f816..84f8f816 100644
--- a/music/sfx/sfx_08_25.asm
+++ b/audio/sfx/sfx_08_25.asm
diff --git a/music/sfx/sfx_08_26.asm b/audio/sfx/sfx_08_26.asm
index 90ae7cb9..90ae7cb9 100644
--- a/music/sfx/sfx_08_26.asm
+++ b/audio/sfx/sfx_08_26.asm
diff --git a/music/sfx/sfx_08_27.asm b/audio/sfx/sfx_08_27.asm
index 6eb9474d..6eb9474d 100644
--- a/music/sfx/sfx_08_27.asm
+++ b/audio/sfx/sfx_08_27.asm
diff --git a/music/sfx/sfx_08_28.asm b/audio/sfx/sfx_08_28.asm
index 2d6b2a3c..2d6b2a3c 100644
--- a/music/sfx/sfx_08_28.asm
+++ b/audio/sfx/sfx_08_28.asm
diff --git a/music/sfx/sfx_08_29.asm b/audio/sfx/sfx_08_29.asm
index 66842f0a..66842f0a 100644
--- a/music/sfx/sfx_08_29.asm
+++ b/audio/sfx/sfx_08_29.asm
diff --git a/music/sfx/sfx_08_2a.asm b/audio/sfx/sfx_08_2a.asm
index d3494708..d3494708 100644
--- a/music/sfx/sfx_08_2a.asm
+++ b/audio/sfx/sfx_08_2a.asm
diff --git a/music/sfx/sfx_08_2b.asm b/audio/sfx/sfx_08_2b.asm
index 301c9712..301c9712 100644
--- a/music/sfx/sfx_08_2b.asm
+++ b/audio/sfx/sfx_08_2b.asm
diff --git a/music/sfx/sfx_08_2c.asm b/audio/sfx/sfx_08_2c.asm
index d3844d4a..d3844d4a 100644
--- a/music/sfx/sfx_08_2c.asm
+++ b/audio/sfx/sfx_08_2c.asm
diff --git a/music/sfx/sfx_08_2d.asm b/audio/sfx/sfx_08_2d.asm
index 3e28d648..3e28d648 100644
--- a/music/sfx/sfx_08_2d.asm
+++ b/audio/sfx/sfx_08_2d.asm
diff --git a/music/sfx/sfx_08_2e.asm b/audio/sfx/sfx_08_2e.asm
index fea62a2f..fea62a2f 100644
--- a/music/sfx/sfx_08_2e.asm
+++ b/audio/sfx/sfx_08_2e.asm
diff --git a/music/sfx/sfx_08_2f.asm b/audio/sfx/sfx_08_2f.asm
index fcfa40e0..fcfa40e0 100644
--- a/music/sfx/sfx_08_2f.asm
+++ b/audio/sfx/sfx_08_2f.asm
diff --git a/music/sfx/sfx_08_30.asm b/audio/sfx/sfx_08_30.asm
index 600b72f2..600b72f2 100644
--- a/music/sfx/sfx_08_30.asm
+++ b/audio/sfx/sfx_08_30.asm
diff --git a/music/sfx/sfx_08_31.asm b/audio/sfx/sfx_08_31.asm
index d43791b0..d43791b0 100644
--- a/music/sfx/sfx_08_31.asm
+++ b/audio/sfx/sfx_08_31.asm
diff --git a/music/sfx/sfx_08_32.asm b/audio/sfx/sfx_08_32.asm
index 886df035..886df035 100644
--- a/music/sfx/sfx_08_32.asm
+++ b/audio/sfx/sfx_08_32.asm
diff --git a/music/sfx/sfx_08_33.asm b/audio/sfx/sfx_08_33.asm
index 098dd501..098dd501 100644
--- a/music/sfx/sfx_08_33.asm
+++ b/audio/sfx/sfx_08_33.asm
diff --git a/music/sfx/sfx_08_34.asm b/audio/sfx/sfx_08_34.asm
index f355ed72..f355ed72 100644
--- a/music/sfx/sfx_08_34.asm
+++ b/audio/sfx/sfx_08_34.asm
diff --git a/music/sfx/sfx_08_35.asm b/audio/sfx/sfx_08_35.asm
index d55d627c..d55d627c 100644
--- a/music/sfx/sfx_08_35.asm
+++ b/audio/sfx/sfx_08_35.asm
diff --git a/music/sfx/sfx_08_36.asm b/audio/sfx/sfx_08_36.asm
index f51a37a0..f51a37a0 100644
--- a/music/sfx/sfx_08_36.asm
+++ b/audio/sfx/sfx_08_36.asm
diff --git a/music/sfx/sfx_08_37.asm b/audio/sfx/sfx_08_37.asm
index 813c4504..813c4504 100644
--- a/music/sfx/sfx_08_37.asm
+++ b/audio/sfx/sfx_08_37.asm
diff --git a/music/sfx/sfx_08_38.asm b/audio/sfx/sfx_08_38.asm
index b162539e..b162539e 100644
--- a/music/sfx/sfx_08_38.asm
+++ b/audio/sfx/sfx_08_38.asm
diff --git a/music/sfx/sfx_08_39.asm b/audio/sfx/sfx_08_39.asm
index ecce76f2..ecce76f2 100644
--- a/music/sfx/sfx_08_39.asm
+++ b/audio/sfx/sfx_08_39.asm
diff --git a/music/sfx/sfx_08_3a.asm b/audio/sfx/sfx_08_3a.asm
index b7791942..b7791942 100644
--- a/music/sfx/sfx_08_3a.asm
+++ b/audio/sfx/sfx_08_3a.asm
diff --git a/music/sfx/sfx_08_3b.asm b/audio/sfx/sfx_08_3b.asm
index cd123b01..cd123b01 100644
--- a/music/sfx/sfx_08_3b.asm
+++ b/audio/sfx/sfx_08_3b.asm
diff --git a/music/sfx/sfx_08_3c.asm b/audio/sfx/sfx_08_3c.asm
index e9ebca58..e9ebca58 100644
--- a/music/sfx/sfx_08_3c.asm
+++ b/audio/sfx/sfx_08_3c.asm
diff --git a/music/sfx/sfx_08_3d.asm b/audio/sfx/sfx_08_3d.asm
index c2d411af..c2d411af 100644
--- a/music/sfx/sfx_08_3d.asm
+++ b/audio/sfx/sfx_08_3d.asm
diff --git a/music/sfx/sfx_08_3e.asm b/audio/sfx/sfx_08_3e.asm
index 3ac78576..3ac78576 100644
--- a/music/sfx/sfx_08_3e.asm
+++ b/audio/sfx/sfx_08_3e.asm
diff --git a/music/sfx/sfx_08_3f.asm b/audio/sfx/sfx_08_3f.asm
index a834f917..a834f917 100644
--- a/music/sfx/sfx_08_3f.asm
+++ b/audio/sfx/sfx_08_3f.asm
diff --git a/music/sfx/sfx_08_40.asm b/audio/sfx/sfx_08_40.asm
index 7603a54a..7603a54a 100644
--- a/music/sfx/sfx_08_40.asm
+++ b/audio/sfx/sfx_08_40.asm
diff --git a/music/sfx/sfx_08_41.asm b/audio/sfx/sfx_08_41.asm
index f4825bb4..f4825bb4 100644
--- a/music/sfx/sfx_08_41.asm
+++ b/audio/sfx/sfx_08_41.asm
diff --git a/music/sfx/sfx_08_42.asm b/audio/sfx/sfx_08_42.asm
index 43232843..43232843 100644
--- a/music/sfx/sfx_08_42.asm
+++ b/audio/sfx/sfx_08_42.asm
diff --git a/music/sfx/sfx_08_43.asm b/audio/sfx/sfx_08_43.asm
index 53b1676d..53b1676d 100644
--- a/music/sfx/sfx_08_43.asm
+++ b/audio/sfx/sfx_08_43.asm
diff --git a/music/sfx/sfx_08_44.asm b/audio/sfx/sfx_08_44.asm
index 59a587bb..59a587bb 100644
--- a/music/sfx/sfx_08_44.asm
+++ b/audio/sfx/sfx_08_44.asm
diff --git a/music/sfx/sfx_08_45.asm b/audio/sfx/sfx_08_45.asm
index 5b22cbcc..5b22cbcc 100644
--- a/music/sfx/sfx_08_45.asm
+++ b/audio/sfx/sfx_08_45.asm
diff --git a/music/sfx/sfx_08_46.asm b/audio/sfx/sfx_08_46.asm
index 5f2b9d33..5f2b9d33 100644
--- a/music/sfx/sfx_08_46.asm
+++ b/audio/sfx/sfx_08_46.asm
diff --git a/music/sfx/sfx_08_47.asm b/audio/sfx/sfx_08_47.asm
index 87e76a17..87e76a17 100644
--- a/music/sfx/sfx_08_47.asm
+++ b/audio/sfx/sfx_08_47.asm
diff --git a/music/sfx/sfx_08_48.asm b/audio/sfx/sfx_08_48.asm
index ace8ada4..ace8ada4 100644
--- a/music/sfx/sfx_08_48.asm
+++ b/audio/sfx/sfx_08_48.asm
diff --git a/music/sfx/sfx_08_49.asm b/audio/sfx/sfx_08_49.asm
index 6219a615..6219a615 100644
--- a/music/sfx/sfx_08_49.asm
+++ b/audio/sfx/sfx_08_49.asm
diff --git a/music/sfx/sfx_08_4a.asm b/audio/sfx/sfx_08_4a.asm
index 3ebc3281..3ebc3281 100644
--- a/music/sfx/sfx_08_4a.asm
+++ b/audio/sfx/sfx_08_4a.asm
diff --git a/music/sfx/sfx_08_4b.asm b/audio/sfx/sfx_08_4b.asm
index 980af0c9..980af0c9 100644
--- a/music/sfx/sfx_08_4b.asm
+++ b/audio/sfx/sfx_08_4b.asm
diff --git a/music/sfx/sfx_08_4c.asm b/audio/sfx/sfx_08_4c.asm
index f7f32305..f7f32305 100644
--- a/music/sfx/sfx_08_4c.asm
+++ b/audio/sfx/sfx_08_4c.asm
diff --git a/music/sfx/sfx_08_4d.asm b/audio/sfx/sfx_08_4d.asm
index da4fa223..da4fa223 100644
--- a/music/sfx/sfx_08_4d.asm
+++ b/audio/sfx/sfx_08_4d.asm
diff --git a/music/sfx/sfx_08_4e.asm b/audio/sfx/sfx_08_4e.asm
index f371f7ee..f371f7ee 100644
--- a/music/sfx/sfx_08_4e.asm
+++ b/audio/sfx/sfx_08_4e.asm
diff --git a/music/sfx/sfx_08_4f.asm b/audio/sfx/sfx_08_4f.asm
index 3200b9aa..3200b9aa 100644
--- a/music/sfx/sfx_08_4f.asm
+++ b/audio/sfx/sfx_08_4f.asm
diff --git a/music/sfx/sfx_08_50.asm b/audio/sfx/sfx_08_50.asm
index 176da9c1..176da9c1 100644
--- a/music/sfx/sfx_08_50.asm
+++ b/audio/sfx/sfx_08_50.asm
diff --git a/music/sfx/sfx_08_51.asm b/audio/sfx/sfx_08_51.asm
index 85cd06bb..85cd06bb 100644
--- a/music/sfx/sfx_08_51.asm
+++ b/audio/sfx/sfx_08_51.asm
diff --git a/music/sfx/sfx_08_52.asm b/audio/sfx/sfx_08_52.asm
index d5ca41b6..d5ca41b6 100644
--- a/music/sfx/sfx_08_52.asm
+++ b/audio/sfx/sfx_08_52.asm
diff --git a/music/sfx/sfx_08_53.asm b/audio/sfx/sfx_08_53.asm
index 07215881..07215881 100644
--- a/music/sfx/sfx_08_53.asm
+++ b/audio/sfx/sfx_08_53.asm
diff --git a/music/sfx/sfx_08_54.asm b/audio/sfx/sfx_08_54.asm
index 019cb3a1..019cb3a1 100644
--- a/music/sfx/sfx_08_54.asm
+++ b/audio/sfx/sfx_08_54.asm
diff --git a/music/sfx/sfx_08_55.asm b/audio/sfx/sfx_08_55.asm
index 93049b71..93049b71 100644
--- a/music/sfx/sfx_08_55.asm
+++ b/audio/sfx/sfx_08_55.asm
diff --git a/music/sfx/sfx_08_56.asm b/audio/sfx/sfx_08_56.asm
index 05d62e90..05d62e90 100644
--- a/music/sfx/sfx_08_56.asm
+++ b/audio/sfx/sfx_08_56.asm
diff --git a/music/sfx/sfx_08_57.asm b/audio/sfx/sfx_08_57.asm
index d8fa8880..d8fa8880 100644
--- a/music/sfx/sfx_08_57.asm
+++ b/audio/sfx/sfx_08_57.asm
diff --git a/music/sfx/sfx_08_58.asm b/audio/sfx/sfx_08_58.asm
index 66a07ba4..66a07ba4 100644
--- a/music/sfx/sfx_08_58.asm
+++ b/audio/sfx/sfx_08_58.asm
diff --git a/music/sfx/sfx_08_59.asm b/audio/sfx/sfx_08_59.asm
index b67845d6..b67845d6 100644
--- a/music/sfx/sfx_08_59.asm
+++ b/audio/sfx/sfx_08_59.asm
diff --git a/music/sfx/sfx_08_5a.asm b/audio/sfx/sfx_08_5a.asm
index 6d9994ab..6d9994ab 100644
--- a/music/sfx/sfx_08_5a.asm
+++ b/audio/sfx/sfx_08_5a.asm
diff --git a/music/sfx/sfx_08_5b.asm b/audio/sfx/sfx_08_5b.asm
index 2a1cc2fa..2a1cc2fa 100644
--- a/music/sfx/sfx_08_5b.asm
+++ b/audio/sfx/sfx_08_5b.asm
diff --git a/music/sfx/sfx_08_5c.asm b/audio/sfx/sfx_08_5c.asm
index f395fa7e..f395fa7e 100644
--- a/music/sfx/sfx_08_5c.asm
+++ b/audio/sfx/sfx_08_5c.asm
diff --git a/music/sfx/sfx_08_5d.asm b/audio/sfx/sfx_08_5d.asm
index 2b54b1b9..2b54b1b9 100644
--- a/music/sfx/sfx_08_5d.asm
+++ b/audio/sfx/sfx_08_5d.asm
diff --git a/music/sfx/sfx_08_5e.asm b/audio/sfx/sfx_08_5e.asm
index 24159908..24159908 100644
--- a/music/sfx/sfx_08_5e.asm
+++ b/audio/sfx/sfx_08_5e.asm
diff --git a/music/sfx/sfx_08_5f.asm b/audio/sfx/sfx_08_5f.asm
index b8084264..b8084264 100644
--- a/music/sfx/sfx_08_5f.asm
+++ b/audio/sfx/sfx_08_5f.asm
diff --git a/music/sfx/sfx_08_60.asm b/audio/sfx/sfx_08_60.asm
index fcf2bb8b..fcf2bb8b 100644
--- a/music/sfx/sfx_08_60.asm
+++ b/audio/sfx/sfx_08_60.asm
diff --git a/music/sfx/sfx_08_61.asm b/audio/sfx/sfx_08_61.asm
index 39c12c1e..39c12c1e 100644
--- a/music/sfx/sfx_08_61.asm
+++ b/audio/sfx/sfx_08_61.asm
diff --git a/music/sfx/sfx_08_62.asm b/audio/sfx/sfx_08_62.asm
index 13f4b95a..13f4b95a 100644
--- a/music/sfx/sfx_08_62.asm
+++ b/audio/sfx/sfx_08_62.asm
diff --git a/music/sfx/sfx_08_63.asm b/audio/sfx/sfx_08_63.asm
index bd5b9e2f..bd5b9e2f 100644
--- a/music/sfx/sfx_08_63.asm
+++ b/audio/sfx/sfx_08_63.asm
diff --git a/music/sfx/sfx_08_64.asm b/audio/sfx/sfx_08_64.asm
index b615919f..b615919f 100644
--- a/music/sfx/sfx_08_64.asm
+++ b/audio/sfx/sfx_08_64.asm
diff --git a/music/sfx/sfx_08_65.asm b/audio/sfx/sfx_08_65.asm
index e0368e06..e0368e06 100644
--- a/music/sfx/sfx_08_65.asm
+++ b/audio/sfx/sfx_08_65.asm
diff --git a/music/sfx/sfx_08_66.asm b/audio/sfx/sfx_08_66.asm
index 07f1ab05..07f1ab05 100644
--- a/music/sfx/sfx_08_66.asm
+++ b/audio/sfx/sfx_08_66.asm
diff --git a/music/sfx/sfx_08_67.asm b/audio/sfx/sfx_08_67.asm
index aa327873..aa327873 100644
--- a/music/sfx/sfx_08_67.asm
+++ b/audio/sfx/sfx_08_67.asm
diff --git a/music/sfx/sfx_08_68.asm b/audio/sfx/sfx_08_68.asm
index efa46f92..efa46f92 100644
--- a/music/sfx/sfx_08_68.asm
+++ b/audio/sfx/sfx_08_68.asm
diff --git a/music/sfx/sfx_08_69.asm b/audio/sfx/sfx_08_69.asm
index 26395cfa..26395cfa 100644
--- a/music/sfx/sfx_08_69.asm
+++ b/audio/sfx/sfx_08_69.asm
diff --git a/music/sfx/sfx_08_6a.asm b/audio/sfx/sfx_08_6a.asm
index efe39d5d..efe39d5d 100644
--- a/music/sfx/sfx_08_6a.asm
+++ b/audio/sfx/sfx_08_6a.asm
diff --git a/music/sfx/sfx_08_6b.asm b/audio/sfx/sfx_08_6b.asm
index d0491d28..d0491d28 100644
--- a/music/sfx/sfx_08_6b.asm
+++ b/audio/sfx/sfx_08_6b.asm
diff --git a/music/sfx/sfx_08_6c.asm b/audio/sfx/sfx_08_6c.asm
index c9a020cd..c9a020cd 100644
--- a/music/sfx/sfx_08_6c.asm
+++ b/audio/sfx/sfx_08_6c.asm
diff --git a/music/sfx/sfx_08_6d.asm b/audio/sfx/sfx_08_6d.asm
index 6e94d9eb..6e94d9eb 100644
--- a/music/sfx/sfx_08_6d.asm
+++ b/audio/sfx/sfx_08_6d.asm
diff --git a/music/sfx/sfx_08_6e.asm b/audio/sfx/sfx_08_6e.asm
index 3f0a40d5..3f0a40d5 100644
--- a/music/sfx/sfx_08_6e.asm
+++ b/audio/sfx/sfx_08_6e.asm
diff --git a/music/sfx/sfx_08_6f.asm b/audio/sfx/sfx_08_6f.asm
index bb5ca6e8..bb5ca6e8 100644
--- a/music/sfx/sfx_08_6f.asm
+++ b/audio/sfx/sfx_08_6f.asm
diff --git a/music/sfx/sfx_08_70.asm b/audio/sfx/sfx_08_70.asm
index 01c90d9a..01c90d9a 100644
--- a/music/sfx/sfx_08_70.asm
+++ b/audio/sfx/sfx_08_70.asm
diff --git a/music/sfx/sfx_08_71.asm b/audio/sfx/sfx_08_71.asm
index a594e0be..a594e0be 100644
--- a/music/sfx/sfx_08_71.asm
+++ b/audio/sfx/sfx_08_71.asm
diff --git a/music/sfx/sfx_08_72.asm b/audio/sfx/sfx_08_72.asm
index cfd83636..cfd83636 100644
--- a/music/sfx/sfx_08_72.asm
+++ b/audio/sfx/sfx_08_72.asm
diff --git a/music/sfx/sfx_08_73.asm b/audio/sfx/sfx_08_73.asm
index 6097a9cb..6097a9cb 100644
--- a/music/sfx/sfx_08_73.asm
+++ b/audio/sfx/sfx_08_73.asm
diff --git a/music/sfx/sfx_08_74.asm b/audio/sfx/sfx_08_74.asm
index ed322dcb..ed322dcb 100644
--- a/music/sfx/sfx_08_74.asm
+++ b/audio/sfx/sfx_08_74.asm
diff --git a/music/sfx/sfx_08_75.asm b/audio/sfx/sfx_08_75.asm
index 39990ae3..39990ae3 100644
--- a/music/sfx/sfx_08_75.asm
+++ b/audio/sfx/sfx_08_75.asm
diff --git a/music/sfx/sfx_08_76.asm b/audio/sfx/sfx_08_76.asm
index 7a1891ae..7a1891ae 100644
--- a/music/sfx/sfx_08_76.asm
+++ b/audio/sfx/sfx_08_76.asm
diff --git a/music/sfx/sfx_08_77.asm b/audio/sfx/sfx_08_77.asm
index 84def9b8..84def9b8 100644
--- a/music/sfx/sfx_08_77.asm
+++ b/audio/sfx/sfx_08_77.asm
diff --git a/music/sfx/sfx_08_pokeflute.asm b/audio/sfx/sfx_08_pokeflute.asm
index 3160f87c..3160f87c 100755
--- a/music/sfx/sfx_08_pokeflute.asm
+++ b/audio/sfx/sfx_08_pokeflute.asm
diff --git a/music/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/sfx_08_pokeflute_ch3.asm
index 28f1dfd7..28f1dfd7 100755
--- a/music/sfx/sfx_08_pokeflute_ch3.asm
+++ b/audio/sfx/sfx_08_pokeflute_ch3.asm
diff --git a/music/sfx/sfx_08_unused.asm b/audio/sfx/sfx_08_unused.asm
index 4ba4c212..4ba4c212 100755
--- a/music/sfx/sfx_08_unused.asm
+++ b/audio/sfx/sfx_08_unused.asm
diff --git a/music/sfx/sfx_08_unused2.asm b/audio/sfx/sfx_08_unused2.asm
index be887476..be887476 100755
--- a/music/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/sfx_08_unused2.asm
diff --git a/music/sfx/sfx_1f_01.asm b/audio/sfx/sfx_1f_01.asm
index e7a40492..e7a40492 100644
--- a/music/sfx/sfx_1f_01.asm
+++ b/audio/sfx/sfx_1f_01.asm
diff --git a/music/sfx/sfx_1f_02.asm b/audio/sfx/sfx_1f_02.asm
index bb95fe0b..bb95fe0b 100644
--- a/music/sfx/sfx_1f_02.asm
+++ b/audio/sfx/sfx_1f_02.asm
diff --git a/music/sfx/sfx_1f_03.asm b/audio/sfx/sfx_1f_03.asm
index 3d6fa66a..3d6fa66a 100644
--- a/music/sfx/sfx_1f_03.asm
+++ b/audio/sfx/sfx_1f_03.asm
diff --git a/music/sfx/sfx_1f_04.asm b/audio/sfx/sfx_1f_04.asm
index 3d73e1a3..3d73e1a3 100644
--- a/music/sfx/sfx_1f_04.asm
+++ b/audio/sfx/sfx_1f_04.asm
diff --git a/music/sfx/sfx_1f_05.asm b/audio/sfx/sfx_1f_05.asm
index 3db77f2e..3db77f2e 100644
--- a/music/sfx/sfx_1f_05.asm
+++ b/audio/sfx/sfx_1f_05.asm
diff --git a/music/sfx/sfx_1f_06.asm b/audio/sfx/sfx_1f_06.asm
index 1d6c85cf..1d6c85cf 100644
--- a/music/sfx/sfx_1f_06.asm
+++ b/audio/sfx/sfx_1f_06.asm
diff --git a/music/sfx/sfx_1f_07.asm b/audio/sfx/sfx_1f_07.asm
index 69982127..69982127 100644
--- a/music/sfx/sfx_1f_07.asm
+++ b/audio/sfx/sfx_1f_07.asm
diff --git a/music/sfx/sfx_1f_08.asm b/audio/sfx/sfx_1f_08.asm
index 8798fc9b..8798fc9b 100644
--- a/music/sfx/sfx_1f_08.asm
+++ b/audio/sfx/sfx_1f_08.asm
diff --git a/music/sfx/sfx_1f_09.asm b/audio/sfx/sfx_1f_09.asm
index ef7a87bc..ef7a87bc 100644
--- a/music/sfx/sfx_1f_09.asm
+++ b/audio/sfx/sfx_1f_09.asm
diff --git a/music/sfx/sfx_1f_0a.asm b/audio/sfx/sfx_1f_0a.asm
index 4b3ffa3e..4b3ffa3e 100644
--- a/music/sfx/sfx_1f_0a.asm
+++ b/audio/sfx/sfx_1f_0a.asm
diff --git a/music/sfx/sfx_1f_0b.asm b/audio/sfx/sfx_1f_0b.asm
index a7f558fd..a7f558fd 100644
--- a/music/sfx/sfx_1f_0b.asm
+++ b/audio/sfx/sfx_1f_0b.asm
diff --git a/music/sfx/sfx_1f_0c.asm b/audio/sfx/sfx_1f_0c.asm
index 50d7d56f..50d7d56f 100644
--- a/music/sfx/sfx_1f_0c.asm
+++ b/audio/sfx/sfx_1f_0c.asm
diff --git a/music/sfx/sfx_1f_0d.asm b/audio/sfx/sfx_1f_0d.asm
index b329482b..b329482b 100644
--- a/music/sfx/sfx_1f_0d.asm
+++ b/audio/sfx/sfx_1f_0d.asm
diff --git a/music/sfx/sfx_1f_0e.asm b/audio/sfx/sfx_1f_0e.asm
index 7b36809b..7b36809b 100644
--- a/music/sfx/sfx_1f_0e.asm
+++ b/audio/sfx/sfx_1f_0e.asm
diff --git a/music/sfx/sfx_1f_0f.asm b/audio/sfx/sfx_1f_0f.asm
index f8e11b6d..f8e11b6d 100644
--- a/music/sfx/sfx_1f_0f.asm
+++ b/audio/sfx/sfx_1f_0f.asm
diff --git a/music/sfx/sfx_1f_10.asm b/audio/sfx/sfx_1f_10.asm
index 049d47a8..049d47a8 100644
--- a/music/sfx/sfx_1f_10.asm
+++ b/audio/sfx/sfx_1f_10.asm
diff --git a/music/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm
index 503396fb..503396fb 100644
--- a/music/sfx/sfx_1f_11.asm
+++ b/audio/sfx/sfx_1f_11.asm
diff --git a/music/sfx/sfx_1f_12.asm b/audio/sfx/sfx_1f_12.asm
index 344281f5..344281f5 100644
--- a/music/sfx/sfx_1f_12.asm
+++ b/audio/sfx/sfx_1f_12.asm
diff --git a/music/sfx/sfx_1f_13.asm b/audio/sfx/sfx_1f_13.asm
index 2eab2643..2eab2643 100644
--- a/music/sfx/sfx_1f_13.asm
+++ b/audio/sfx/sfx_1f_13.asm
diff --git a/music/sfx/sfx_1f_14.asm b/audio/sfx/sfx_1f_14.asm
index 373bb2c3..373bb2c3 100644
--- a/music/sfx/sfx_1f_14.asm
+++ b/audio/sfx/sfx_1f_14.asm
diff --git a/music/sfx/sfx_1f_15.asm b/audio/sfx/sfx_1f_15.asm
index b3edbdbd..b3edbdbd 100644
--- a/music/sfx/sfx_1f_15.asm
+++ b/audio/sfx/sfx_1f_15.asm
diff --git a/music/sfx/sfx_1f_16.asm b/audio/sfx/sfx_1f_16.asm
index 7c2346fb..7c2346fb 100644
--- a/music/sfx/sfx_1f_16.asm
+++ b/audio/sfx/sfx_1f_16.asm
diff --git a/music/sfx/sfx_1f_17.asm b/audio/sfx/sfx_1f_17.asm
index bfda0fe3..bfda0fe3 100644
--- a/music/sfx/sfx_1f_17.asm
+++ b/audio/sfx/sfx_1f_17.asm
diff --git a/music/sfx/sfx_1f_18.asm b/audio/sfx/sfx_1f_18.asm
index 7e532f3e..7e532f3e 100644
--- a/music/sfx/sfx_1f_18.asm
+++ b/audio/sfx/sfx_1f_18.asm
diff --git a/music/sfx/sfx_1f_19.asm b/audio/sfx/sfx_1f_19.asm
index c9609be5..c9609be5 100644
--- a/music/sfx/sfx_1f_19.asm
+++ b/audio/sfx/sfx_1f_19.asm
diff --git a/music/sfx/sfx_1f_1a.asm b/audio/sfx/sfx_1f_1a.asm
index 2498f122..2498f122 100644
--- a/music/sfx/sfx_1f_1a.asm
+++ b/audio/sfx/sfx_1f_1a.asm
diff --git a/music/sfx/sfx_1f_1b.asm b/audio/sfx/sfx_1f_1b.asm
index df3167b1..df3167b1 100644
--- a/music/sfx/sfx_1f_1b.asm
+++ b/audio/sfx/sfx_1f_1b.asm
diff --git a/music/sfx/sfx_1f_1c.asm b/audio/sfx/sfx_1f_1c.asm
index 4e7ac177..4e7ac177 100644
--- a/music/sfx/sfx_1f_1c.asm
+++ b/audio/sfx/sfx_1f_1c.asm
diff --git a/music/sfx/sfx_1f_1d.asm b/audio/sfx/sfx_1f_1d.asm
index 703b55d5..703b55d5 100644
--- a/music/sfx/sfx_1f_1d.asm
+++ b/audio/sfx/sfx_1f_1d.asm
diff --git a/music/sfx/sfx_1f_1e.asm b/audio/sfx/sfx_1f_1e.asm
index 4733a534..4733a534 100644
--- a/music/sfx/sfx_1f_1e.asm
+++ b/audio/sfx/sfx_1f_1e.asm
diff --git a/music/sfx/sfx_1f_1f.asm b/audio/sfx/sfx_1f_1f.asm
index 9188186b..9188186b 100644
--- a/music/sfx/sfx_1f_1f.asm
+++ b/audio/sfx/sfx_1f_1f.asm
diff --git a/music/sfx/sfx_1f_20.asm b/audio/sfx/sfx_1f_20.asm
index 2d0b1fc6..2d0b1fc6 100644
--- a/music/sfx/sfx_1f_20.asm
+++ b/audio/sfx/sfx_1f_20.asm
diff --git a/music/sfx/sfx_1f_21.asm b/audio/sfx/sfx_1f_21.asm
index 31c600b0..31c600b0 100644
--- a/music/sfx/sfx_1f_21.asm
+++ b/audio/sfx/sfx_1f_21.asm
diff --git a/music/sfx/sfx_1f_22.asm b/audio/sfx/sfx_1f_22.asm
index a239822f..a239822f 100644
--- a/music/sfx/sfx_1f_22.asm
+++ b/audio/sfx/sfx_1f_22.asm
diff --git a/music/sfx/sfx_1f_23.asm b/audio/sfx/sfx_1f_23.asm
index dd021169..dd021169 100644
--- a/music/sfx/sfx_1f_23.asm
+++ b/audio/sfx/sfx_1f_23.asm
diff --git a/music/sfx/sfx_1f_24.asm b/audio/sfx/sfx_1f_24.asm
index 448541e6..448541e6 100644
--- a/music/sfx/sfx_1f_24.asm
+++ b/audio/sfx/sfx_1f_24.asm
diff --git a/music/sfx/sfx_1f_25.asm b/audio/sfx/sfx_1f_25.asm
index b0db2369..b0db2369 100644
--- a/music/sfx/sfx_1f_25.asm
+++ b/audio/sfx/sfx_1f_25.asm
diff --git a/music/sfx/sfx_1f_26.asm b/audio/sfx/sfx_1f_26.asm
index f0b205d5..f0b205d5 100644
--- a/music/sfx/sfx_1f_26.asm
+++ b/audio/sfx/sfx_1f_26.asm
diff --git a/music/sfx/sfx_1f_27.asm b/audio/sfx/sfx_1f_27.asm
index de7adafb..de7adafb 100644
--- a/music/sfx/sfx_1f_27.asm
+++ b/audio/sfx/sfx_1f_27.asm
diff --git a/music/sfx/sfx_1f_28.asm b/audio/sfx/sfx_1f_28.asm
index c76c94a7..c76c94a7 100644
--- a/music/sfx/sfx_1f_28.asm
+++ b/audio/sfx/sfx_1f_28.asm
diff --git a/music/sfx/sfx_1f_29.asm b/audio/sfx/sfx_1f_29.asm
index bc19ea3b..bc19ea3b 100644
--- a/music/sfx/sfx_1f_29.asm
+++ b/audio/sfx/sfx_1f_29.asm
diff --git a/music/sfx/sfx_1f_2a.asm b/audio/sfx/sfx_1f_2a.asm
index b91e4c2e..b91e4c2e 100644
--- a/music/sfx/sfx_1f_2a.asm
+++ b/audio/sfx/sfx_1f_2a.asm
diff --git a/music/sfx/sfx_1f_2b.asm b/audio/sfx/sfx_1f_2b.asm
index da51e7c9..da51e7c9 100644
--- a/music/sfx/sfx_1f_2b.asm
+++ b/audio/sfx/sfx_1f_2b.asm
diff --git a/music/sfx/sfx_1f_2c.asm b/audio/sfx/sfx_1f_2c.asm
index a480b584..a480b584 100644
--- a/music/sfx/sfx_1f_2c.asm
+++ b/audio/sfx/sfx_1f_2c.asm
diff --git a/music/sfx/sfx_1f_2d.asm b/audio/sfx/sfx_1f_2d.asm
index f4c4ecd9..f4c4ecd9 100644
--- a/music/sfx/sfx_1f_2d.asm
+++ b/audio/sfx/sfx_1f_2d.asm
diff --git a/music/sfx/sfx_1f_2e.asm b/audio/sfx/sfx_1f_2e.asm
index 2c72b5a1..2c72b5a1 100644
--- a/music/sfx/sfx_1f_2e.asm
+++ b/audio/sfx/sfx_1f_2e.asm
diff --git a/music/sfx/sfx_1f_2f.asm b/audio/sfx/sfx_1f_2f.asm
index 9b0bf71b..9b0bf71b 100644
--- a/music/sfx/sfx_1f_2f.asm
+++ b/audio/sfx/sfx_1f_2f.asm
diff --git a/music/sfx/sfx_1f_30.asm b/audio/sfx/sfx_1f_30.asm
index b6833986..b6833986 100644
--- a/music/sfx/sfx_1f_30.asm
+++ b/audio/sfx/sfx_1f_30.asm
diff --git a/music/sfx/sfx_1f_31.asm b/audio/sfx/sfx_1f_31.asm
index b67f3863..b67f3863 100644
--- a/music/sfx/sfx_1f_31.asm
+++ b/audio/sfx/sfx_1f_31.asm
diff --git a/music/sfx/sfx_1f_32.asm b/audio/sfx/sfx_1f_32.asm
index 92bb6a6f..92bb6a6f 100644
--- a/music/sfx/sfx_1f_32.asm
+++ b/audio/sfx/sfx_1f_32.asm
diff --git a/music/sfx/sfx_1f_33.asm b/audio/sfx/sfx_1f_33.asm
index 607635c7..607635c7 100644
--- a/music/sfx/sfx_1f_33.asm
+++ b/audio/sfx/sfx_1f_33.asm
diff --git a/music/sfx/sfx_1f_34.asm b/audio/sfx/sfx_1f_34.asm
index 59a5bd3a..59a5bd3a 100644
--- a/music/sfx/sfx_1f_34.asm
+++ b/audio/sfx/sfx_1f_34.asm
diff --git a/music/sfx/sfx_1f_35.asm b/audio/sfx/sfx_1f_35.asm
index 10d4c3a2..10d4c3a2 100644
--- a/music/sfx/sfx_1f_35.asm
+++ b/audio/sfx/sfx_1f_35.asm
diff --git a/music/sfx/sfx_1f_36.asm b/audio/sfx/sfx_1f_36.asm
index 376b5f3a..376b5f3a 100644
--- a/music/sfx/sfx_1f_36.asm
+++ b/audio/sfx/sfx_1f_36.asm
diff --git a/music/sfx/sfx_1f_37.asm b/audio/sfx/sfx_1f_37.asm
index 41698fd9..41698fd9 100644
--- a/music/sfx/sfx_1f_37.asm
+++ b/audio/sfx/sfx_1f_37.asm
diff --git a/music/sfx/sfx_1f_38.asm b/audio/sfx/sfx_1f_38.asm
index 885eee1f..885eee1f 100644
--- a/music/sfx/sfx_1f_38.asm
+++ b/audio/sfx/sfx_1f_38.asm
diff --git a/music/sfx/sfx_1f_39.asm b/audio/sfx/sfx_1f_39.asm
index d29da9aa..d29da9aa 100644
--- a/music/sfx/sfx_1f_39.asm
+++ b/audio/sfx/sfx_1f_39.asm
diff --git a/music/sfx/sfx_1f_3a.asm b/audio/sfx/sfx_1f_3a.asm
index 2f7f3045..2f7f3045 100644
--- a/music/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/sfx_1f_3a.asm
diff --git a/music/sfx/sfx_1f_3b.asm b/audio/sfx/sfx_1f_3b.asm
index a167d4cf..a167d4cf 100644
--- a/music/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/sfx_1f_3b.asm
diff --git a/music/sfx/sfx_1f_3c.asm b/audio/sfx/sfx_1f_3c.asm
index fb476203..fb476203 100644
--- a/music/sfx/sfx_1f_3c.asm
+++ b/audio/sfx/sfx_1f_3c.asm
diff --git a/music/sfx/sfx_1f_3d.asm b/audio/sfx/sfx_1f_3d.asm
index f7acd76f..f7acd76f 100644
--- a/music/sfx/sfx_1f_3d.asm
+++ b/audio/sfx/sfx_1f_3d.asm
diff --git a/music/sfx/sfx_1f_3e.asm b/audio/sfx/sfx_1f_3e.asm
index 411b544d..411b544d 100644
--- a/music/sfx/sfx_1f_3e.asm
+++ b/audio/sfx/sfx_1f_3e.asm
diff --git a/music/sfx/sfx_1f_3f.asm b/audio/sfx/sfx_1f_3f.asm
index de7a44cf..de7a44cf 100644
--- a/music/sfx/sfx_1f_3f.asm
+++ b/audio/sfx/sfx_1f_3f.asm
diff --git a/music/sfx/sfx_1f_40.asm b/audio/sfx/sfx_1f_40.asm
index 216bd569..216bd569 100644
--- a/music/sfx/sfx_1f_40.asm
+++ b/audio/sfx/sfx_1f_40.asm
diff --git a/music/sfx/sfx_1f_41.asm b/audio/sfx/sfx_1f_41.asm
index 62153990..62153990 100644
--- a/music/sfx/sfx_1f_41.asm
+++ b/audio/sfx/sfx_1f_41.asm
diff --git a/music/sfx/sfx_1f_42.asm b/audio/sfx/sfx_1f_42.asm
index c0805196..c0805196 100644
--- a/music/sfx/sfx_1f_42.asm
+++ b/audio/sfx/sfx_1f_42.asm
diff --git a/music/sfx/sfx_1f_43.asm b/audio/sfx/sfx_1f_43.asm
index 59b7339c..59b7339c 100644
--- a/music/sfx/sfx_1f_43.asm
+++ b/audio/sfx/sfx_1f_43.asm
diff --git a/music/sfx/sfx_1f_44.asm b/audio/sfx/sfx_1f_44.asm
index bc2ff935..bc2ff935 100644
--- a/music/sfx/sfx_1f_44.asm
+++ b/audio/sfx/sfx_1f_44.asm
diff --git a/music/sfx/sfx_1f_45.asm b/audio/sfx/sfx_1f_45.asm
index c2f734ad..c2f734ad 100644
--- a/music/sfx/sfx_1f_45.asm
+++ b/audio/sfx/sfx_1f_45.asm
diff --git a/music/sfx/sfx_1f_46.asm b/audio/sfx/sfx_1f_46.asm
index 4e9026b7..4e9026b7 100644
--- a/music/sfx/sfx_1f_46.asm
+++ b/audio/sfx/sfx_1f_46.asm
diff --git a/music/sfx/sfx_1f_47.asm b/audio/sfx/sfx_1f_47.asm
index f56c49b7..f56c49b7 100644
--- a/music/sfx/sfx_1f_47.asm
+++ b/audio/sfx/sfx_1f_47.asm
diff --git a/music/sfx/sfx_1f_48.asm b/audio/sfx/sfx_1f_48.asm
index c46af22b..c46af22b 100644
--- a/music/sfx/sfx_1f_48.asm
+++ b/audio/sfx/sfx_1f_48.asm
diff --git a/music/sfx/sfx_1f_49.asm b/audio/sfx/sfx_1f_49.asm
index 0f20dcd3..0f20dcd3 100644
--- a/music/sfx/sfx_1f_49.asm
+++ b/audio/sfx/sfx_1f_49.asm
diff --git a/music/sfx/sfx_1f_4a.asm b/audio/sfx/sfx_1f_4a.asm
index c0d8324b..c0d8324b 100644
--- a/music/sfx/sfx_1f_4a.asm
+++ b/audio/sfx/sfx_1f_4a.asm
diff --git a/music/sfx/sfx_1f_4b.asm b/audio/sfx/sfx_1f_4b.asm
index c4d33187..c4d33187 100644
--- a/music/sfx/sfx_1f_4b.asm
+++ b/audio/sfx/sfx_1f_4b.asm
diff --git a/music/sfx/sfx_1f_4c.asm b/audio/sfx/sfx_1f_4c.asm
index 811d4bc7..811d4bc7 100644
--- a/music/sfx/sfx_1f_4c.asm
+++ b/audio/sfx/sfx_1f_4c.asm
diff --git a/music/sfx/sfx_1f_4d.asm b/audio/sfx/sfx_1f_4d.asm
index 8dcb0a8b..8dcb0a8b 100644
--- a/music/sfx/sfx_1f_4d.asm
+++ b/audio/sfx/sfx_1f_4d.asm
diff --git a/music/sfx/sfx_1f_4e.asm b/audio/sfx/sfx_1f_4e.asm
index 92f1a396..92f1a396 100644
--- a/music/sfx/sfx_1f_4e.asm
+++ b/audio/sfx/sfx_1f_4e.asm
diff --git a/music/sfx/sfx_1f_4f.asm b/audio/sfx/sfx_1f_4f.asm
index aab678ab..aab678ab 100644
--- a/music/sfx/sfx_1f_4f.asm
+++ b/audio/sfx/sfx_1f_4f.asm
diff --git a/music/sfx/sfx_1f_50.asm b/audio/sfx/sfx_1f_50.asm
index fba01b43..fba01b43 100644
--- a/music/sfx/sfx_1f_50.asm
+++ b/audio/sfx/sfx_1f_50.asm
diff --git a/music/sfx/sfx_1f_51.asm b/audio/sfx/sfx_1f_51.asm
index 4df2d1d8..4df2d1d8 100644
--- a/music/sfx/sfx_1f_51.asm
+++ b/audio/sfx/sfx_1f_51.asm
diff --git a/music/sfx/sfx_1f_52.asm b/audio/sfx/sfx_1f_52.asm
index 6fa9eaa2..6fa9eaa2 100644
--- a/music/sfx/sfx_1f_52.asm
+++ b/audio/sfx/sfx_1f_52.asm
diff --git a/music/sfx/sfx_1f_53.asm b/audio/sfx/sfx_1f_53.asm
index 86e7ce4a..86e7ce4a 100644
--- a/music/sfx/sfx_1f_53.asm
+++ b/audio/sfx/sfx_1f_53.asm
diff --git a/music/sfx/sfx_1f_54.asm b/audio/sfx/sfx_1f_54.asm
index acdc3da5..acdc3da5 100644
--- a/music/sfx/sfx_1f_54.asm
+++ b/audio/sfx/sfx_1f_54.asm
diff --git a/music/sfx/sfx_1f_55.asm b/audio/sfx/sfx_1f_55.asm
index 9a27c885..9a27c885 100644
--- a/music/sfx/sfx_1f_55.asm
+++ b/audio/sfx/sfx_1f_55.asm
diff --git a/music/sfx/sfx_1f_56.asm b/audio/sfx/sfx_1f_56.asm
index 77624440..77624440 100644
--- a/music/sfx/sfx_1f_56.asm
+++ b/audio/sfx/sfx_1f_56.asm
diff --git a/music/sfx/sfx_1f_57.asm b/audio/sfx/sfx_1f_57.asm
index 36880103..36880103 100644
--- a/music/sfx/sfx_1f_57.asm
+++ b/audio/sfx/sfx_1f_57.asm
diff --git a/music/sfx/sfx_1f_58.asm b/audio/sfx/sfx_1f_58.asm
index ac61fe40..ac61fe40 100644
--- a/music/sfx/sfx_1f_58.asm
+++ b/audio/sfx/sfx_1f_58.asm
diff --git a/music/sfx/sfx_1f_59.asm b/audio/sfx/sfx_1f_59.asm
index a50d05c0..a50d05c0 100644
--- a/music/sfx/sfx_1f_59.asm
+++ b/audio/sfx/sfx_1f_59.asm
diff --git a/music/sfx/sfx_1f_5a.asm b/audio/sfx/sfx_1f_5a.asm
index 8c050129..8c050129 100644
--- a/music/sfx/sfx_1f_5a.asm
+++ b/audio/sfx/sfx_1f_5a.asm
diff --git a/music/sfx/sfx_1f_5b.asm b/audio/sfx/sfx_1f_5b.asm
index 771aa496..771aa496 100644
--- a/music/sfx/sfx_1f_5b.asm
+++ b/audio/sfx/sfx_1f_5b.asm
diff --git a/music/sfx/sfx_1f_5c.asm b/audio/sfx/sfx_1f_5c.asm
index 8ac03d9c..8ac03d9c 100644
--- a/music/sfx/sfx_1f_5c.asm
+++ b/audio/sfx/sfx_1f_5c.asm
diff --git a/music/sfx/sfx_1f_5d.asm b/audio/sfx/sfx_1f_5d.asm
index 297f826d..297f826d 100644
--- a/music/sfx/sfx_1f_5d.asm
+++ b/audio/sfx/sfx_1f_5d.asm
diff --git a/music/sfx/sfx_1f_5e.asm b/audio/sfx/sfx_1f_5e.asm
index e6bbaa64..e6bbaa64 100644
--- a/music/sfx/sfx_1f_5e.asm
+++ b/audio/sfx/sfx_1f_5e.asm
diff --git a/music/sfx/sfx_1f_5f.asm b/audio/sfx/sfx_1f_5f.asm
index 7ae72e98..7ae72e98 100644
--- a/music/sfx/sfx_1f_5f.asm
+++ b/audio/sfx/sfx_1f_5f.asm
diff --git a/music/sfx/sfx_1f_60.asm b/audio/sfx/sfx_1f_60.asm
index 3f098eeb..3f098eeb 100644
--- a/music/sfx/sfx_1f_60.asm
+++ b/audio/sfx/sfx_1f_60.asm
diff --git a/music/sfx/sfx_1f_61.asm b/audio/sfx/sfx_1f_61.asm
index 745ce3a4..745ce3a4 100644
--- a/music/sfx/sfx_1f_61.asm
+++ b/audio/sfx/sfx_1f_61.asm
diff --git a/music/sfx/sfx_1f_62.asm b/audio/sfx/sfx_1f_62.asm
index 71be0e5d..71be0e5d 100644
--- a/music/sfx/sfx_1f_62.asm
+++ b/audio/sfx/sfx_1f_62.asm
diff --git a/music/sfx/sfx_1f_63.asm b/audio/sfx/sfx_1f_63.asm
index 88ce100d..88ce100d 100644
--- a/music/sfx/sfx_1f_63.asm
+++ b/audio/sfx/sfx_1f_63.asm
diff --git a/music/sfx/sfx_1f_64.asm b/audio/sfx/sfx_1f_64.asm
index 703343ad..703343ad 100644
--- a/music/sfx/sfx_1f_64.asm
+++ b/audio/sfx/sfx_1f_64.asm
diff --git a/music/sfx/sfx_1f_65.asm b/audio/sfx/sfx_1f_65.asm
index b8708858..b8708858 100644
--- a/music/sfx/sfx_1f_65.asm
+++ b/audio/sfx/sfx_1f_65.asm
diff --git a/music/sfx/sfx_1f_66.asm b/audio/sfx/sfx_1f_66.asm
index 1b581a91..1b581a91 100644
--- a/music/sfx/sfx_1f_66.asm
+++ b/audio/sfx/sfx_1f_66.asm
diff --git a/music/sfx/sfx_1f_67.asm b/audio/sfx/sfx_1f_67.asm
index 4bd391a1..4bd391a1 100644
--- a/music/sfx/sfx_1f_67.asm
+++ b/audio/sfx/sfx_1f_67.asm
diff --git a/music/sfx/sfx_1f_unused.asm b/audio/sfx/sfx_1f_unused.asm
index 773c069e..773c069e 100755
--- a/music/sfx/sfx_1f_unused.asm
+++ b/audio/sfx/sfx_1f_unused.asm
diff --git a/constants/map_constants.asm b/constants/map_constants.asm
index b1d36a4d..4e4e314f 100644
--- a/constants/map_constants.asm
+++ b/constants/map_constants.asm
@@ -85,7 +85,7 @@ POWER_PLANT EQU $53
 ROUTE_11_GATE_1F EQU $54
 DIGLETTS_CAVE_ENTRANCE EQU $55
 ROUTE_11_GATE_2F EQU $56
-ROUTE_12_GATE EQU $57
+ROUTE_12_GATE_1F EQU $57
 BILLS_HOUSE EQU $58
 VERMILION_POKECENTER EQU $59
 POKEMON_FAN_CLUB EQU $5A
@@ -135,7 +135,7 @@ CELADON_POKECENTER EQU $85
 CELADON_GYM EQU $86
 GAME_CORNER EQU $87
 CELADON_MART_5 EQU $88
-CELADONPRIZE_ROOM EQU $89
+CELADON_PRIZE_ROOM EQU $89
 CELADON_DINER EQU $8A
 CELADON_HOUSE EQU $8B
 CELADON_HOTEL EQU $8C
@@ -154,9 +154,9 @@ FUCHSIA_MART EQU $98
 FUCHSIA_HOUSE_1 EQU $99
 FUCHSIA_POKECENTER EQU $9A
 FUCHSIA_HOUSE_2 EQU $9B
-SAFARIZONEENTRANCE EQU $9C
+SAFARI_ZONE_ENTRANCE EQU $9C
 FUCHSIA_GYM EQU $9D
-FUCHSIAMEETINGROOM EQU $9E
+FUCHSIA_MEETING_ROOM EQU $9E
 SEAFOAM_ISLANDS_2 EQU $9F
 SEAFOAM_ISLANDS_3 EQU $A0
 SEAFOAM_ISLANDS_4 EQU $A1
@@ -175,7 +175,7 @@ CINNABAR_MART EQU $AC
 INDIGO_PLATEAU_LOBBY EQU $AE
 COPYCATS_HOUSE_1F EQU $AF
 COPYCATS_HOUSE_2F EQU $B0
-FIGHTINGDOJO EQU $B1
+FIGHTING_DOJO EQU $B1
 SAFFRON_GYM EQU $B2
 SAFFRON_HOUSE_1 EQU $B3
 SAFFRON_MART EQU $B4
diff --git a/constants/map_dimensions.asm b/constants/map_dimensions.asm
index 8bb41a25..7339e153 100644..100755
--- a/constants/map_dimensions.asm
+++ b/constants/map_dimensions.asm
@@ -184,7 +184,7 @@ VIRIDIAN_GYM_WIDTH  EQU $0a
 DIGLETTS_CAVE_EXIT_HEIGHT EQU $04
 DIGLETTS_CAVE_EXIT_WIDTH  EQU $04
 
-; ViridianForestexit_h map_id=47
+; ViridianForestExit_h map_id=47
 VIRIDIAN_FOREST_EXIT_HEIGHT EQU $04
 VIRIDIAN_FOREST_EXIT_WIDTH  EQU $05
 
@@ -248,9 +248,9 @@ MT_MOON_3_WIDTH  EQU $14
 TRASHED_HOUSE_HEIGHT EQU $04
 TRASHED_HOUSE_WIDTH  EQU $04
 
-; CeruleanHouse_h map_id=63
-CERULEAN_HOUSE_HEIGHT EQU $04
-CERULEAN_HOUSE_WIDTH  EQU $04
+; CeruleanHouse1_h map_id=63
+CERULEAN_HOUSE_1_HEIGHT EQU $04
+CERULEAN_HOUSE_1_WIDTH  EQU $04
 
 ; CeruleanPokecenter_h map_id=64
 CERULEAN_POKECENTER_HEIGHT EQU $04
@@ -300,6 +300,10 @@ ROUTE_7_GATE_WIDTH  EQU $03
 PATH_ENTRANCE_ROUTE_7_HEIGHT EQU $04
 PATH_ENTRANCE_ROUTE_7_WIDTH  EQU $04
 
+; UndergroundPathEntranceRoute7Copy_h map_id=78
+PATH_ENTRANCE_ROUTE_7_COPY_HEIGHT EQU $04
+PATH_ENTRANCE_ROUTE_7_COPY_WIDTH  EQU $04
+
 ; Route8Gate_h map_id=79
 ROUTE_8_GATE_HEIGHT EQU $04
 ROUTE_8_GATE_WIDTH  EQU $03
@@ -333,8 +337,8 @@ ROUTE_11_GATE_2F_HEIGHT EQU $04
 ROUTE_11_GATE_2F_WIDTH  EQU $04
 
 ; Route12Gate_h map_id=87
-ROUTE_12_GATE_HEIGHT EQU $04
-ROUTE_12_GATE_WIDTH  EQU $05
+ROUTE_12_GATE_1F_HEIGHT EQU $04
+ROUTE_12_GATE_1F_WIDTH  EQU $05
 
 ; BillsHouse_h map_id=88
 BILLS_HOUSE_HEIGHT EQU $04
@@ -489,8 +493,8 @@ CELADON_MART_5_HEIGHT EQU $04
 CELADON_MART_5_WIDTH  EQU $0a
 
 ; CeladonPrizeRoom_h map_id=137
-CELADONPRIZE_ROOM_HEIGHT EQU $04
-CELADONPRIZE_ROOM_WIDTH  EQU $05
+CELADON_PRIZE_ROOM_HEIGHT EQU $04
+CELADON_PRIZE_ROOM_WIDTH  EQU $05
 
 ; CeladonDiner_h map_id=138
 CELADON_DINER_HEIGHT EQU $04
@@ -501,8 +505,8 @@ CELADON_HOUSE_HEIGHT EQU $04
 CELADON_HOUSE_WIDTH  EQU $04
 
 ; CeladonHotel_h map_id=140
-CELADONHOTEL_HEIGHT EQU $04
-CELADONHOTEL_WIDTH  EQU $07
+CELADON_HOTEL_HEIGHT EQU $04
+CELADON_HOTEL_WIDTH  EQU $07
 
 ; LavenderPokecenter_h map_id=141
 LAVENDER_POKECENTER_HEIGHT EQU $04
@@ -565,16 +569,16 @@ FUCHSIA_HOUSE_2_HEIGHT EQU $04
 FUCHSIA_HOUSE_2_WIDTH  EQU $05
 
 ; SafariZoneEntrance_h map_id=156
-SAFARIZONEENTRANCE_HEIGHT EQU $03
-SAFARIZONEENTRANCE_WIDTH  EQU $04
+SAFARI_ZONE_ENTRANCE_HEIGHT EQU $03
+SAFARI_ZONE_ENTRANCE_WIDTH  EQU $04
 
 ; FuchsiaGym_h map_id=157
 FUCHSIA_GYM_HEIGHT EQU $09
 FUCHSIA_GYM_WIDTH  EQU $05
 
 ; FuchsiaMeetingRoom_h map_id=158
-FUCHSIAMEETINGROOM_HEIGHT EQU $04
-FUCHSIAMEETINGROOM_WIDTH  EQU $07
+FUCHSIA_MEETING_ROOM_HEIGHT EQU $04
+FUCHSIA_MEETING_ROOM_WIDTH  EQU $07
 
 ; SeafoamIslands2_h map_id=159
 SEAFOAM_ISLANDS_2_HEIGHT EQU $09
@@ -636,17 +640,17 @@ CINNABAR_MART_WIDTH  EQU $04
 INDIGO_PLATEAU_LOBBY_HEIGHT EQU $06
 INDIGO_PLATEAU_LOBBY_WIDTH  EQU $08
 
-; CopycatsHouseF1_h map_id=175
+; CopycatsHouse1F_h map_id=175
 COPYCATS_HOUSE_1F_HEIGHT EQU $04
 COPYCATS_HOUSE_1F_WIDTH  EQU $04
 
-; CopycatsHouseF2_h map_id=176
+; CopycatsHouse2F_h map_id=176
 COPYCATS_HOUSE_2F_HEIGHT EQU $04
 COPYCATS_HOUSE_2F_WIDTH  EQU $04
 
 ; FightingDojo_h map_id=177
-FIGHTINGDOJO_HEIGHT EQU $06
-FIGHTINGDOJO_WIDTH  EQU $05
+FIGHTING_DOJO_HEIGHT EQU $06
+FIGHTING_DOJO_WIDTH  EQU $05
 
 ; SaffronGym_h map_id=178
 SAFFRON_GYM_HEIGHT EQU $09
@@ -677,8 +681,8 @@ ROUTE_15_GATE_1F_HEIGHT EQU $05
 ROUTE_15_GATE_1F_WIDTH  EQU $04
 
 ; Route15GateUpstairs_h map_id=185
-ROUTE_15_GATE_2F_HEIGHT EQU 4
-ROUTE_15_GATE_2F_WIDTH  EQU 4
+ROUTE_15_GATE_2F_HEIGHT EQU $04
+ROUTE_15_GATE_2F_WIDTH  EQU $04
 
 ; Route16GateMap_h map_id=186
 ROUTE_16_GATE_1F_HEIGHT EQU $07
diff --git a/main.asm b/main.asm
index 7d02ab90..68efdc6b 100644..100755
--- a/main.asm
+++ b/main.asm
@@ -230,13 +230,13 @@ MapHeaderPointers:: ; 01ae (0:01ae)
 	dw ViridianHouse_h
 	dw ViridianGym_h
 	dw DiglettsCaveRoute2_h
-	dw ViridianForestexit_h
+	dw ViridianForestExit_h
 	dw Route2House_h
 	dw Route2Gate_h
 	dw ViridianForestEntrance_h ;id=50
 	dw ViridianForest_h
-	dw MuseumF1_h
-	dw MuseumF2_h
+	dw Museum1F_h
+	dw Museum2F_h
 	dw PewterGym_h
 	dw PewterHouse1_h
 	dw PewterMart_h
@@ -246,7 +246,7 @@ MapHeaderPointers:: ; 01ae (0:01ae)
 	dw MtMoon2_h ;id=60
 	dw MtMoon3_h
 	dw CeruleanHouseTrashed_h
-	dw CeruleanHouse_h
+	dw CeruleanHouse1_h
 	dw CeruleanPokecenter_h
 	dw CeruleanGym_h
 	dw BikeShop_h
@@ -358,8 +358,8 @@ MapHeaderPointers:: ; 01ae (0:01ae)
 	dw CinnabarMart_h
 	dw CinnabarMart_h ; unused
 	dw IndigoPlateauLobby_h
-	dw CopycatsHouseF1_h
-	dw CopycatsHouseF2_h
+	dw CopycatsHouse1F_h
+	dw CopycatsHouse2F_h
 	dw FightingDojo_h
 	dw SaffronGym_h
 	dw SaffronHouse1_h
@@ -369,7 +369,7 @@ MapHeaderPointers:: ; 01ae (0:01ae)
 	dw SaffronHouse2_h
 	dw Route15Gate_h
 	dw Route15GateUpstairs_h
-	dw Route16GateMap_h
+	dw Route16Gate_h
 	dw Route16GateUpstairs_h
 	dw Route16House_h
 	dw Route12House_h
@@ -414,7 +414,7 @@ MapHeaderPointers:: ; 01ae (0:01ae)
 	dw UnknownDungeon1_h
 	dw NameRater_h
 	dw CeruleanHouse2_h
-	dw Route16GateMap_h ; unused
+	dw Route16Gate_h ; unused
 	dw RockTunnel2_h
 	dw SilphCo9_h
 	dw SilphCo10_h
@@ -18413,13 +18413,13 @@ MapSongBanks: ; c04d (3:404d)
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianHouse
 	db MUSIC_GYM, BANK(Music_Gym) ; ViridianGym
 	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; DiglettsCaveRoute2
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestexit
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestExit
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2House
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route2Gate
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; ViridianForestEntrance
 	db MUSIC_DUNGEON2, BANK(Music_Dungeon2) ; ViridianForest
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; MuseumF1
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; MuseumF2
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum1F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; Museum2F
 	db MUSIC_GYM, BANK(Music_Gym) ; PewterGym
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; PewterHouse1
 	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; PewterMart
@@ -18429,7 +18429,7 @@ MapSongBanks: ; c04d (3:404d)
 	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon2
 	db MUSIC_DUNGEON3, BANK(Music_Dungeon3) ; MtMoon3
 	db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouseTrashed
-	db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse
+	db MUSIC_CITIES2, BANK(Music_Cities2) ; CeruleanHouse1
 	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CeruleanPokecenter
 	db MUSIC_GYM, BANK(Music_Gym) ; CeruleanGym
 	db MUSIC_CITIES2, BANK(Music_Cities2) ; BikeShop
@@ -18541,8 +18541,8 @@ MapSongBanks: ; c04d (3:404d)
 	db MUSIC_POKECENTER, BANK(Music_Pokecenter) ; CinnabarMart
 	db MUSIC_CINNABAR, BANK(Music_Cinnabar)
 	db MUSIC_INDIGO_PLATEAU, BANK(Music_IndigoPlateau) ; IndigoPlateauLobby
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouseF1
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouseF2
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse1F
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; CopycatsHouse2F
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; FightingDojo
 	db MUSIC_GYM, BANK(Music_Gym) ; SaffronGym
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse1
@@ -18552,7 +18552,7 @@ MapSongBanks: ; c04d (3:404d)
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; SaffronHouse2
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15Gate
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route15GateUpstairs
-	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateMap
+	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16Gate
 	db MUSIC_CITIES1, BANK(Music_Cities1) ; Route16GateUpstairs
 	db MUSIC_CELADON, BANK(Music_Celadon) ; Route16House
 	db MUSIC_CELADON, BANK(Music_Celadon) ; Route12House
@@ -18664,13 +18664,13 @@ MapHeaderBanks: ; c23d (3:423d)
 	db BANK(ViridianHouse_h)
 	db BANK(ViridianGym_h)
 	db BANK(DiglettsCaveRoute2_h)
-	db BANK(ViridianForestexit_h)
+	db BANK(ViridianForestExit_h)
 	db BANK(Route2House_h)
 	db BANK(Route2Gate_h)
 	db BANK(ViridianForestEntrance_h)
 	db BANK(ViridianForest_h)
-	db BANK(MuseumF1_h)
-	db BANK(MuseumF2_h)
+	db BANK(Museum1F_h)
+	db BANK(Museum2F_h)
 	db BANK(PewterGym_h)
 	db BANK(PewterHouse1_h)
 	db BANK(PewterMart_h)
@@ -18680,7 +18680,7 @@ MapHeaderBanks: ; c23d (3:423d)
 	db BANK(MtMoon2_h)
 	db BANK(MtMoon3_h)
 	db BANK(CeruleanHouseTrashed_h)
-	db BANK(CeruleanHouse_h)
+	db BANK(CeruleanHouse1_h)
 	db BANK(CeruleanPokecenter_h)
 	db BANK(CeruleanGym_h)
 	db BANK(BikeShop_h)
@@ -18792,8 +18792,8 @@ MapHeaderBanks: ; c23d (3:423d)
 	db BANK(CinnabarMart_h)
 	db BANK(CinnabarMart_h)
 	db BANK(IndigoPlateauLobby_h)
-	db BANK(CopycatsHouseF1_h)
-	db BANK(CopycatsHouseF2_h)
+	db BANK(CopycatsHouse1F_h)
+	db BANK(CopycatsHouse2F_h)
 	db BANK(FightingDojo_h)
 	db BANK(SaffronGym_h)
 	db BANK(SaffronHouse1_h)
@@ -18803,7 +18803,7 @@ MapHeaderBanks: ; c23d (3:423d)
 	db BANK(SaffronHouse2_h)
 	db BANK(Route15Gate_h)
 	db BANK(Route15GateUpstairs_h)
-	db BANK(Route16GateMap_h)
+	db BANK(Route16Gate_h)
 	db BANK(Route16GateUpstairs_h)
 	db BANK(Route16House_h)
 	db BANK(Route12House_h)
@@ -20044,8 +20044,8 @@ MapHSA5: ; cbc2 (3:4bc2)
 	db MANSION_1,$02,Show
 	db MANSION_1,$03,Show
 MapHSB1: ; cbc8 (3:4bc8)
-	db FIGHTINGDOJO,$06,Show
-	db FIGHTINGDOJO,$07,Show
+	db FIGHTING_DOJO,$06,Show
+	db FIGHTING_DOJO,$07,Show
 MapHSB5: ; cbce (3:4bce)
 	db SILPH_CO_1F,$01,Hide
 MapHS53: ; cbd1 (3:4bd1)
@@ -33509,7 +33509,7 @@ CeladonCityObject: ; 0x18022 (size=189)
 	db $1b, $c, $0, CELADON_GYM
 	db $13, $1c, $0, GAME_CORNER
 	db $13, $27, $0, CELADON_MART_5 ; beta warp! no longer used
-	db $13, $21, $0, CELADONPRIZE_ROOM
+	db $13, $21, $0, CELADON_PRIZE_ROOM
 	db $1b, $1f, $0, CELADON_DINER
 	db $1b, $23, $0, CELADON_HOUSE
 	db $1b, $2b, $0, CELADON_HOTEL
@@ -33537,19 +33537,19 @@ CeladonCityObject: ; 0x18022 (size=189)
 	db SPRITE_ROCKET, $e + 4, $2a + 4, $fe, $2, $9 ; person
 
 	; warp-to
-	EVENT_DISP $19, $d, $8 ; CELADON_MART_1
-	EVENT_DISP $19, $d, $a ; CELADON_MART_1
-	EVENT_DISP $19, $9, $18 ; CELADON_MANSION_1
-	EVENT_DISP $19, $3, $18 ; CELADON_MANSION_1
-	EVENT_DISP $19, $3, $19 ; CELADON_MANSION_1
-	EVENT_DISP $19, $9, $29 ; CELADON_POKECENTER
-	EVENT_DISP $19, $1b, $c ; CELADON_GYM
-	EVENT_DISP $19, $13, $1c ; GAME_CORNER
-	EVENT_DISP $19, $13, $27 ; CELADON_MART_5
-	EVENT_DISP $19, $13, $21 ; CELADONPRIZE_ROOM
-	EVENT_DISP $19, $1b, $1f ; CELADON_DINER
-	EVENT_DISP $19, $1b, $23 ; CELADON_HOUSE
-	EVENT_DISP $19, $1b, $2b ; CELADON_HOTEL
+	EVENT_DISP CELADON_CITY_WIDTH, $d, $8 ; CELADON_MART_1
+	EVENT_DISP CELADON_CITY_WIDTH, $d, $a ; CELADON_MART_1
+	EVENT_DISP CELADON_CITY_WIDTH, $9, $18 ; CELADON_MANSION_1
+	EVENT_DISP CELADON_CITY_WIDTH, $3, $18 ; CELADON_MANSION_1
+	EVENT_DISP CELADON_CITY_WIDTH, $3, $19 ; CELADON_MANSION_1
+	EVENT_DISP CELADON_CITY_WIDTH, $9, $29 ; CELADON_POKECENTER
+	EVENT_DISP CELADON_CITY_WIDTH, $1b, $c ; CELADON_GYM
+	EVENT_DISP CELADON_CITY_WIDTH, $13, $1c ; GAME_CORNER
+	EVENT_DISP CELADON_CITY_WIDTH, $13, $27 ; CELADON_MART_5
+	EVENT_DISP CELADON_CITY_WIDTH, $13, $21 ; CELADON_PRIZE_ROOM
+	EVENT_DISP CELADON_CITY_WIDTH, $1b, $1f ; CELADON_DINER
+	EVENT_DISP CELADON_CITY_WIDTH, $1b, $23 ; CELADON_HOUSE
+	EVENT_DISP CELADON_CITY_WIDTH, $1b, $2b ; CELADON_HOTEL
 
 CeladonCityBlocks: ; 180df (6:40df)
 	INCBIN "maps/celadoncity.blk"
@@ -33583,9 +33583,9 @@ PalletTownObject: ; 0x182c3 (size=58)
 	db SPRITE_FISHER2, $e + 4, $b + 4, $fe, $0, $3 ; person
 
 	; warp-to
-	EVENT_DISP $a, $5, $5 ; REDS_HOUSE_1F
-	EVENT_DISP $a, $5, $d ; BLUES_HOUSE
-	EVENT_DISP $a, $b, $c ; OAKS_LAB
+	EVENT_DISP PALLET_TOWN_WIDTH, $5, $5 ; REDS_HOUSE_1F
+	EVENT_DISP PALLET_TOWN_WIDTH, $5, $d ; BLUES_HOUSE
+	EVENT_DISP PALLET_TOWN_WIDTH, $b, $c ; OAKS_LAB
 
 PalletTownBlocks: ; 182fd (6:42fd)
 	INCBIN "maps/pallettown.blk"
@@ -33628,11 +33628,11 @@ ViridianCityObject: ; 0x18384 (size=104)
 	db SPRITE_GAMBLER, $5 + 4, $11 + 4, $fe, $2, $7 ; person
 
 	; warp-to
-	EVENT_DISP $14, $19, $17 ; VIRIDIAN_POKECENTER
-	EVENT_DISP $14, $13, $1d ; VIRIDIAN_MART
-	EVENT_DISP $14, $f, $15 ; VIRIDIAN_SCHOOL
-	EVENT_DISP $14, $9, $15 ; VIRIDIAN_HOUSE
-	EVENT_DISP $14, $7, $20 ; VIRIDIAN_GYM
+	EVENT_DISP VIRIDIAN_CITY_WIDTH, $19, $17 ; VIRIDIAN_POKECENTER
+	EVENT_DISP VIRIDIAN_CITY_WIDTH, $13, $1d ; VIRIDIAN_MART
+	EVENT_DISP VIRIDIAN_CITY_WIDTH, $f, $15 ; VIRIDIAN_SCHOOL
+	EVENT_DISP VIRIDIAN_CITY_WIDTH, $9, $15 ; VIRIDIAN_HOUSE
+	EVENT_DISP VIRIDIAN_CITY_WIDTH, $7, $20 ; VIRIDIAN_GYM
 
 ViridianCityBlocks: ; 183ec (6:43ec)
 	INCBIN "maps/viridiancity.blk"
@@ -33677,13 +33677,13 @@ PewterCityObject: ; 0x18577 (size=111)
 	db SPRITE_BUG_CATCHER, $10 + 4, $23 + 4, $ff, $d0, $5 ; person
 
 	; warp-to
-	EVENT_DISP $14, $7, $e ; MUSEUM_1F
-	EVENT_DISP $14, $5, $13 ; MUSEUM_1F
-	EVENT_DISP $14, $11, $10 ; PEWTER_GYM
-	EVENT_DISP $14, $d, $1d ; PEWTER_HOUSE_1
-	EVENT_DISP $14, $11, $17 ; PEWTER_MART
-	EVENT_DISP $14, $1d, $7 ; PEWTER_HOUSE_2
-	EVENT_DISP $14, $19, $d ; PEWTER_POKECENTER
+	EVENT_DISP PEWTER_CITY_WIDTH, $7, $e ; MUSEUM_1F
+	EVENT_DISP PEWTER_CITY_WIDTH, $5, $13 ; MUSEUM_1F
+	EVENT_DISP PEWTER_CITY_WIDTH, $11, $10 ; PEWTER_GYM
+	EVENT_DISP PEWTER_CITY_WIDTH, $d, $1d ; PEWTER_HOUSE_1
+	EVENT_DISP PEWTER_CITY_WIDTH, $11, $17 ; PEWTER_MART
+	EVENT_DISP PEWTER_CITY_WIDTH, $1d, $7 ; PEWTER_HOUSE_2
+	EVENT_DISP PEWTER_CITY_WIDTH, $19, $d ; PEWTER_POKECENTER
 
 PewterCityBlocks: ; 185e6 (6:45e6)
 	INCBIN "maps/pewtercity.blk"
@@ -33736,16 +33736,16 @@ CeruleanCityObject: ; 0x18786 (size=170)
 	db SPRITE_GUARD, $c + 4, $1b + 4, $ff, $d0, $b ; person
 
 	; warp-to
-	EVENT_DISP $14, $b, $1b ; TRASHED_HOUSE
-	EVENT_DISP $14, $f, $d ; CERULEAN_HOUSE
-	EVENT_DISP $14, $11, $13 ; CERULEAN_POKECENTER
-	EVENT_DISP $14, $13, $1e ; CERULEAN_GYM
-	EVENT_DISP $14, $19, $d ; BIKE_SHOP
-	EVENT_DISP $14, $19, $19 ; CERULEAN_MART
-	EVENT_DISP $14, $b, $4 ; UNKNOWN_DUNGEON_1
-	EVENT_DISP $14, $9, $1b ; TRASHED_HOUSE
-	EVENT_DISP $14, $b, $9 ; CERULEAN_HOUSE_3
-	EVENT_DISP $14, $9, $9 ; CERULEAN_HOUSE_3
+	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE
+	EVENT_DISP CERULEAN_CITY_WIDTH, $f, $d ; CERULEAN_HOUSE
+	EVENT_DISP CERULEAN_CITY_WIDTH, $11, $13 ; CERULEAN_POKECENTER
+	EVENT_DISP CERULEAN_CITY_WIDTH, $13, $1e ; CERULEAN_GYM
+	EVENT_DISP CERULEAN_CITY_WIDTH, $19, $d ; BIKE_SHOP
+	EVENT_DISP CERULEAN_CITY_WIDTH, $19, $19 ; CERULEAN_MART
+	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $4 ; UNKNOWN_DUNGEON_1
+	EVENT_DISP CERULEAN_CITY_WIDTH, $9, $1b ; TRASHED_HOUSE
+	EVENT_DISP CERULEAN_CITY_WIDTH, $b, $9 ; CERULEAN_HOUSE_3
+	EVENT_DISP CERULEAN_CITY_WIDTH, $9, $9 ; CERULEAN_HOUSE_3
 
 CeruleanCityBlocks: ; 18830 (6:4830)
 	INCBIN "maps/ceruleancity.blk"
@@ -33791,15 +33791,15 @@ VermilionCityObject: ; 0x189ba (size=133)
 	db SPRITE_SAILOR, $1b + 4, $19 + 4, $fe, $2, $6 ; person
 
 	; warp-to
-	EVENT_DISP $14, $3, $b ; VERMILION_POKECENTER
-	EVENT_DISP $14, $d, $9 ; POKEMON_FAN_CLUB
-	EVENT_DISP $14, $d, $17 ; VERMILION_MART
-	EVENT_DISP $14, $13, $c ; VERMILION_GYM
-	EVENT_DISP $14, $13, $17 ; VERMILION_HOUSE_1
-	EVENT_DISP $14, $1f, $12 ; VERMILION_DOCK
-	EVENT_DISP $14, $1f, $13 ; VERMILION_DOCK
-	EVENT_DISP $14, $d, $f ; VERMILION_HOUSE_3
-	EVENT_DISP $14, $3, $7 ; VERMILION_HOUSE_2
+	EVENT_DISP VERMILION_CITY_WIDTH, $3, $b ; VERMILION_POKECENTER
+	EVENT_DISP VERMILION_CITY_WIDTH, $d, $9 ; POKEMON_FAN_CLUB
+	EVENT_DISP VERMILION_CITY_WIDTH, $d, $17 ; VERMILION_MART
+	EVENT_DISP VERMILION_CITY_WIDTH, $13, $c ; VERMILION_GYM
+	EVENT_DISP VERMILION_CITY_WIDTH, $13, $17 ; VERMILION_HOUSE_1
+	EVENT_DISP VERMILION_CITY_WIDTH, $1f, $12 ; VERMILION_DOCK
+	EVENT_DISP VERMILION_CITY_WIDTH, $1f, $13 ; VERMILION_DOCK
+	EVENT_DISP VERMILION_CITY_WIDTH, $d, $f ; VERMILION_HOUSE_3
+	EVENT_DISP VERMILION_CITY_WIDTH, $3, $7 ; VERMILION_HOUSE_2
 
 VermilionCityBlocks: ; 18a3f (6:4a3f)
 	INCBIN "maps/vermilioncity.blk"
@@ -33822,9 +33822,9 @@ FuchsiaCityObject: ; 0x18bd4 (size=178)
 	db $1b, $b, $0, FUCHSIA_HOUSE_1
 	db $1b, $13, $0, FUCHSIA_POKECENTER
 	db $1b, $1b, $0, FUCHSIA_HOUSE_2
-	db $3, $12, $0, SAFARIZONEENTRANCE
+	db $3, $12, $0, SAFARI_ZONE_ENTRANCE
 	db $1b, $5, $0, FUCHSIA_GYM
-	db $d, $16, $0, FUCHSIAMEETINGROOM
+	db $d, $16, $0, FUCHSIA_MEETING_ROOM
 	db $1b, $1f, $1, FUCHSIA_HOUSE_3
 	db $18, $1f, $0, FUCHSIA_HOUSE_3
 
@@ -33857,15 +33857,15 @@ FuchsiaCityObject: ; 0x18bd4 (size=178)
 	db SPRITE_OMANYTE, $5 + 4, $6 + 4, $ff, $ff, $a ; person
 
 	; warp-to
-	EVENT_DISP $14, $d, $5 ; FUCHSIA_MART
-	EVENT_DISP $14, $1b, $b ; FUCHSIA_HOUSE_1
-	EVENT_DISP $14, $1b, $13 ; FUCHSIA_POKECENTER
-	EVENT_DISP $14, $1b, $1b ; FUCHSIA_HOUSE_2
-	EVENT_DISP $14, $3, $12 ; SAFARIZONEENTRANCE
-	EVENT_DISP $14, $1b, $5 ; FUCHSIA_GYM
-	EVENT_DISP $14, $d, $16 ; FUCHSIAMEETINGROOM
-	EVENT_DISP $14, $1b, $1f ; FUCHSIA_HOUSE_3
-	EVENT_DISP $14, $18, $1f ; FUCHSIA_HOUSE_3
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $5 ; FUCHSIA_MART
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $b ; FUCHSIA_HOUSE_1
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $13 ; FUCHSIA_POKECENTER
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1b ; FUCHSIA_HOUSE_2
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $3, $12 ; SAFARI_ZONE_ENTRANCE
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $5 ; FUCHSIA_GYM
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $d, $16 ; FUCHSIA_MEETING_ROOM
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $1b, $1f ; FUCHSIA_HOUSE_3
+	EVENT_DISP FUCHSIA_CITY_WIDTH, $18, $1f ; FUCHSIA_HOUSE_3
 
 FuchsiaCityBlocks: ; 18c86 (6:4c86)
 	INCBIN "maps/fuchsiacity.blk"
@@ -34512,7 +34512,7 @@ PewterCityScriptPointers: ; 19243 (6:5243)
 
 PewterCityScript0: ; 19251 (6:5251)
 	xor a
-	ld [W_MUSEUMF1CURSCRIPT], a
+	ld [W_MUSEUM1FCURSCRIPT], a
 	ld hl, $d754
 	res 0, [hl]
 	call PewterCityScript_1925e
@@ -36064,9 +36064,9 @@ IndigoPlateauLobbyObject: ; 0x19c95 (size=58)
 	db SPRITE_CABLE_CLUB_WOMAN, $6 + 4, $d + 4, $ff, $d0, $5 ; person
 
 	; warp-to
-	EVENT_DISP $8, $b, $7
-	EVENT_DISP $8, $b, $8
-	EVENT_DISP $8, $0, $8 ; LORELEIS_ROOM
+	EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $7
+	EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $b, $8
+	EVENT_DISP INDIGO_PLATEAU_LOBBY_WIDTH, $0, $8 ; LORELEIS_ROOM
 
 IndigoPlateauLobbyBlocks: ; 19ccf (6:5ccf)
 	INCBIN "maps/indigoplateaulobby.blk"
@@ -36304,13 +36304,13 @@ SilphCo4Object: ; 0x19e35 (size=111)
 	db SPRITE_BALL, $8 + 4, $5 + 4, $ff, $ff, $87, ESCAPE_ROPE ; item
 
 	; warp-to
-	EVENT_DISP $f, $0, $18 ; SILPH_CO_3F
-	EVENT_DISP $f, $0, $1a ; SILPH_CO_5F
-	EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $f, $7, $b ; SILPH_CO_10F
-	EVENT_DISP $f, $3, $11 ; SILPH_CO_6F
-	EVENT_DISP $f, $f, $3 ; SILPH_CO_10F
-	EVENT_DISP $f, $b, $11 ; SILPH_CO_10F
+	EVENT_DISP SILPH_CO_4F_WIDTH, $0, $18 ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_4F_WIDTH, $0, $1a ; SILPH_CO_5F
+	EVENT_DISP SILPH_CO_4F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_4F_WIDTH, $7, $b ; SILPH_CO_10F
+	EVENT_DISP SILPH_CO_4F_WIDTH, $3, $11 ; SILPH_CO_6F
+	EVENT_DISP SILPH_CO_4F_WIDTH, $f, $3 ; SILPH_CO_10F
+	EVENT_DISP SILPH_CO_4F_WIDTH, $b, $11 ; SILPH_CO_10F
 
 SilphCo4Blocks: ; 19ea4 (6:5ea4)
 	INCBIN "maps/silphco4.blk"
@@ -36574,13 +36574,13 @@ SilphCo5Object: ; 0x1a08d (size=137)
 	db SPRITE_CLIPBOARD, $6 + 4, $18 + 4, $ff, $ff, $b ; person
 
 	; warp-to
-	EVENT_DISP $f, $0, $18 ; SILPH_CO_6F
-	EVENT_DISP $f, $0, $1a ; SILPH_CO_4F
-	EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $f, $3, $1b ; SILPH_CO_7F
-	EVENT_DISP $f, $f, $9 ; SILPH_CO_9F
-	EVENT_DISP $f, $5, $b ; SILPH_CO_3F
-	EVENT_DISP $f, $f, $3 ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_5F_WIDTH, $0, $18 ; SILPH_CO_6F
+	EVENT_DISP SILPH_CO_5F_WIDTH, $0, $1a ; SILPH_CO_4F
+	EVENT_DISP SILPH_CO_5F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_5F_WIDTH, $3, $1b ; SILPH_CO_7F
+	EVENT_DISP SILPH_CO_5F_WIDTH, $f, $9 ; SILPH_CO_9F
+	EVENT_DISP SILPH_CO_5F_WIDTH, $5, $b ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_5F_WIDTH, $f, $3 ; SILPH_CO_3F
 
 SilphCo5Blocks: ; 1a116 (6:6116)
 	INCBIN "maps/silphco5.blk"
@@ -36843,11 +36843,11 @@ SilphCo6Object: ; 0x1a2fb (size=112)
 	db SPRITE_BALL, $f + 4, $2 + 4, $ff, $ff, $8a, X_ACCURACY ; item
 
 	; warp-to
-	EVENT_DISP $d, $0, $10 ; SILPH_CO_7F
-	EVENT_DISP $d, $0, $e ; SILPH_CO_5F
-	EVENT_DISP $d, $0, $12 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $d, $3, $3 ; SILPH_CO_4F
-	EVENT_DISP $d, $3, $17 ; SILPH_CO_2F
+	EVENT_DISP SILPH_CO_6F_WIDTH, $0, $10 ; SILPH_CO_7F
+	EVENT_DISP SILPH_CO_6F_WIDTH, $0, $e ; SILPH_CO_5F
+	EVENT_DISP SILPH_CO_6F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_6F_WIDTH, $3, $3 ; SILPH_CO_4F
+	EVENT_DISP SILPH_CO_6F_WIDTH, $3, $17 ; SILPH_CO_2F
 
 SilphCo6Blocks: ; 1a36b (6:636b)
 	INCBIN "maps/silphco6.blk"
@@ -37354,11 +37354,11 @@ CinnabarIslandObject: ; 0x1c022 (size=71)
 	db SPRITE_GAMBLER, $6 + 4, $e + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $a, $3, $6 ; MANSION_1
-	EVENT_DISP $a, $3, $12 ; CINNABAR_GYM
-	EVENT_DISP $a, $9, $6 ; CINNABAR_LAB_1
-	EVENT_DISP $a, $b, $b ; CINNABAR_POKECENTER
-	EVENT_DISP $a, $b, $f ; CINNABAR_MART
+	EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $6 ; MANSION_1
+	EVENT_DISP CINNABAR_ISLAND_WIDTH, $3, $12 ; CINNABAR_GYM
+	EVENT_DISP CINNABAR_ISLAND_WIDTH, $9, $6 ; CINNABAR_LAB_1
+	EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $b ; CINNABAR_POKECENTER
+	EVENT_DISP CINNABAR_ISLAND_WIDTH, $b, $f ; CINNABAR_MART
 
 CinnabarIslandBlocks: ; 1c069 (7:4069)
 	INCBIN "maps/cinnabarisland.blk"
@@ -37404,7 +37404,7 @@ VermilionHouse1Blocks: ; 1c1de (7:41de)
 NameRaterBlocks: ; 1c1de (7:41de)
 LavenderHouse1Blocks: ; 1c1de (7:41de)
 LavenderHouse2Blocks: ; 1c1de (7:41de)
-CeruleanHouseBlocks: ; 1c1de (7:41de)
+CeruleanHouse1Blocks: ; 1c1de (7:41de)
 PewterHouse1Blocks: ; 1c1de (7:41de)
 PewterHouse2Blocks: ; 1c1de (7:41de)
 ViridianHouseBlocks: ; 0x1c1de 41DE size=16
@@ -39106,8 +39106,8 @@ OaksLabObject: ; 0x1d40a (size=88)
 	db SPRITE_OAK_AIDE, $a + 4, $8 + 4, $ff, $ff, $b ; person
 
 	; warp-to
-	EVENT_DISP $5, $b, $4
-	EVENT_DISP $5, $b, $5
+	EVENT_DISP OAKS_LAB_WIDTH, $b, $4
+	EVENT_DISP OAKS_LAB_WIDTH, $b, $5
 
 ViridianMart_h: ; 0x1d462 to 0x1d46e (12 bytes) (bank=7) (id=42)
 	db MART ; tileset
@@ -39227,8 +39227,8 @@ ViridianMartObject: ; 0x1d50a (size=38)
 	db SPRITE_BLACK_HAIR_BOY_1, $3 + 4, $3 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
+	EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $3
+	EVENT_DISP VIRIDIAN_MART_WIDTH, $7, $4
 
 ViridianMartBlocks: ; 1d530 (7:5530)
 	INCBIN "maps/viridianmart.blk"
@@ -39269,8 +39269,8 @@ SchoolObject: ; 0x1d55d (size=32)
 	db SPRITE_LASS, $1 + 4, $4 + 4, $ff, $d0, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $2
+	EVENT_DISP VIRIDIAN_SCHOOL_WIDTH, $7, $3
 
 ViridianHouse_h: ; 0x1d57d to 0x1d589 (12 bytes) (bank=7) (id=44)
 	db HOUSE ; tileset
@@ -39331,8 +39331,8 @@ ViridianHouseObject: ; 0x1d5bb (size=44)
 	db SPRITE_CLIPBOARD, $0 + 4, $4 + 4, $ff, $ff, $4 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $2
+	EVENT_DISP VIRIDIAN_HOUSE_WIDTH, $7, $3
 
 PewterHouse1_h: ; 0x1d5e7 to 0x1d5f3 (12 bytes) (bank=7) (id=55)
 	db HOUSE ; tileset
@@ -39380,8 +39380,8 @@ PewterHouse1Object: ; 0x1d616 (size=38)
 	db SPRITE_FAT_BALD_GUY, $2 + 4, $1 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $2
+	EVENT_DISP PEWTER_HOUSE_1_WIDTH, $7, $3
 
 PewterHouse2_h: ; 0x1d63c to 0x1d648 (12 bytes) (bank=7) (id=57)
 	db HOUSE ; tileset
@@ -39419,8 +39419,8 @@ PewterHouse2Object: ; 0x1d659 (size=32)
 	db SPRITE_BUG_CATCHER, $5 + 4, $4 + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $2
+	EVENT_DISP PEWTER_HOUSE_2_WIDTH, $7, $3
 
 CeruleanHouseTrashed_h: ; 0x1d679 to 0x1d685 (12 bytes) (bank=7) (id=62)
 	db HOUSE ; tileset
@@ -39486,29 +39486,29 @@ CeruleanHouseTrashedObject: ; 0x1d6bf (size=43)
 	db SPRITE_GIRL, $6 + 4, $5 + 4, $fe, $2, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $0, $3
+	EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $2
+	EVENT_DISP TRASHED_HOUSE_WIDTH, $7, $3
+	EVENT_DISP TRASHED_HOUSE_WIDTH, $0, $3
 
-CeruleanHouse_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
+CeruleanHouse1_h: ; 0x1d6ea to 0x1d6f6 (12 bytes) (bank=7) (id=63)
 	db HOUSE ; tileset
-	db CERULEAN_HOUSE_HEIGHT, CERULEAN_HOUSE_WIDTH ; dimensions (y, x)
-	dw CeruleanHouseBlocks, CeruleanHouseTextPointers, CeruleanHouseScript ; blocks, texts, scripts
+	db CERULEAN_HOUSE_1_HEIGHT, CERULEAN_HOUSE_1_WIDTH ; dimensions (y, x)
+	dw CeruleanHouse1Blocks, CeruleanHouse1TextPointers, CeruleanHouse1Script ; blocks, texts, scripts
 	db $00 ; connections
-	dw CeruleanHouseObject ; objects
+	dw CeruleanHouse1Object ; objects
 
-CeruleanHouseScript: ; 1d6f6 (7:56f6)
+CeruleanHouse1Script: ; 1d6f6 (7:56f6)
 	jp EnableAutoTextBoxDrawing
 
-CeruleanHouseTextPointers: ; 1d6f9 (7:56f9)
-	dw CeruleanHouseText1
-	dw CeruleanHouseText2
+CeruleanHouse1TextPointers: ; 1d6f9 (7:56f9)
+	dw CeruleanHouse1Text1
+	dw CeruleanHouse1Text2
 
-CeruleanHouseText1: ; 1d6fd (7:56fd)
-	TX_FAR _CeruleanHouseText1
+CeruleanHouse1Text1: ; 1d6fd (7:56fd)
+	TX_FAR _CeruleanHouse1Text1
 	db "@"
 
-CeruleanHouseText2: ; 1d702 (7:5702)
+CeruleanHouse1Text2: ; 1d702 (7:5702)
 	db $08 ; asm
 	ld a, $6
 	ld [wWhichTrade], a
@@ -39516,7 +39516,7 @@ CeruleanHouseText2: ; 1d702 (7:5702)
 	call Predef
 	jp TextScriptEnd
 
-CeruleanHouseObject: ; 0x1d710 (size=32)
+CeruleanHouse1Object: ; 0x1d710 (size=32)
 	db $a ; border tile
 
 	db $2 ; warps
@@ -39530,8 +39530,8 @@ CeruleanHouseObject: ; 0x1d710 (size=32)
 	db SPRITE_GAMBLER, $2 + 4, $1 + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $2
+	EVENT_DISP CERULEAN_HOUSE_1_WIDTH, $7, $3
 
 BikeShop_h: ; 0x1d730 to 0x1d73c (12 bytes) (bank=7) (id=66)
 	db CLUB ; tileset
@@ -39709,8 +39709,8 @@ BikeShopObject: ; 0x1d866 (size=38)
 	db SPRITE_BUG_CATCHER, $3 + 4, $1 + 4, $ff, $d1, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP BIKE_SHOP_WIDTH, $7, $2
+	EVENT_DISP BIKE_SHOP_WIDTH, $7, $3
 
 BikeShopBlocks: ; 1d88c (7:588c)
 	INCBIN "maps/bikeshop.blk"
@@ -39857,8 +39857,8 @@ LavenderHouse1Object: ; 0x1d96a (size=56)
 	db SPRITE_BOOK_MAP_DEX, $3 + 4, $3 + 4, $ff, $ff, $6 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $2
+	EVENT_DISP LAVENDER_HOUSE_1_WIDTH, $7, $3
 
 LavenderHouse2_h: ; 0x1d9a2 to 0x1d9ae (12 bytes) (bank=7) (id=151)
 	db HOUSE ; tileset
@@ -39918,8 +39918,8 @@ LavenderHouse2Object: ; 0x1d9e6 (size=32)
 	db SPRITE_BRUNETTE_GIRL, $4 + 4, $2 + 4, $ff, $d3, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $2
+	EVENT_DISP LAVENDER_HOUSE_2_WIDTH, $7, $3
 
 NameRater_h: ; 0x1da06 to 0x1da12 (12 bytes) (bank=7) (id=229)
 	db HOUSE ; tileset
@@ -40051,8 +40051,8 @@ NameRaterObject: ; 0x1dad6 (size=26)
 	db SPRITE_MR_MASTERBALL, $3 + 4, $5 + 4, $ff, $d2, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $2
+	EVENT_DISP NAME_RATERS_HOUSE_WIDTH, $7, $3
 
 VermilionHouse1_h: ; 0x1daf0 to 0x1dafc (12 bytes) (bank=7) (id=93)
 	db HOUSE ; tileset
@@ -40101,8 +40101,8 @@ VermilionHouse1Object: ; 0x1db20 (size=38)
 	db SPRITE_PAPER_SHEET, $3 + 4, $4 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $2
+	EVENT_DISP VERMILION_HOUSE_1_WIDTH, $7, $3
 
 VermilionDock_h: ; 0x1db46 to 0x1db52 (12 bytes) (bank=7) (id=94)
 	db SHIP_PORT ; tileset
@@ -40334,8 +40334,8 @@ VermilionDockObject: ; 0x1dcc6 (size=20)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $e, $0, $e
-	EVENT_DISP $e, $2, $e ; SS_ANNE_1
+	EVENT_DISP VERMILION_DOCK_WIDTH, $0, $e
+	EVENT_DISP VERMILION_DOCK_WIDTH, $2, $e ; SS_ANNE_1
 
 VermilionDockBlocks: ; 1dcda (7:5cda)
 	INCBIN "maps/vermiliondock.blk"
@@ -40384,8 +40384,8 @@ CeladonMansion5Object: ; 0x1dd5c (size=32)
 	db SPRITE_BALL, $3 + 4, $4 + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; CELADON_MANSION_4
-	EVENT_DISP $4, $7, $3 ; CELADON_MANSION_4
+	EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $2 ; CELADON_MANSION_4
+	EVENT_DISP CELADON_MANSION_5_WIDTH, $7, $3 ; CELADON_MANSION_4
 
 FuchsiaMart_h: ; 0x1dd7c to 0x1dd88 (12 bytes) (bank=7) (id=152)
 	db MART ; tileset
@@ -40425,8 +40425,8 @@ FuchsiaMartObject: ; 0x1dd9b (size=38)
 	db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $1, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
+	EVENT_DISP FUCHSIA_MART_WIDTH, $7, $3
+	EVENT_DISP FUCHSIA_MART_WIDTH, $7, $4
 
 FuchsiaMartBlocks: ; 1ddc1 (7:5dc1)
 	INCBIN "maps/fuchsiamart.blk"
@@ -40482,8 +40482,8 @@ SaffronHouse1Object: ; 0x1de04 (size=44)
 	db SPRITE_PAPER_SHEET, $3 + 4, $3 + 4, $ff, $ff, $4 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $2
+	EVENT_DISP SAFFRON_HOUSE_1_WIDTH, $7, $3
 
 SaffronHouse2_h: ; 0x1de30 to 0x1de3c (12 bytes) (bank=7) (id=183)
 	db HOUSE ; tileset
@@ -40552,8 +40552,8 @@ SaffronHouse2Object: ; 0x1de8a (size=26)
 	db SPRITE_FISHER, $3 + 4, $5 + 4, $ff, $d2, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $2
+	EVENT_DISP SAFFRON_HOUSE_2_WIDTH, $7, $3
 
 DiglettsCaveRoute2_h: ; 0x1dea4 to 0x1deb0 (12 bytes) (bank=7) (id=46)
 	db CAVERN ; tileset
@@ -40588,9 +40588,9 @@ DiglettsCaveRoute2Object: ; 0x1debf (size=34)
 	db SPRITE_FISHER, $3 + 4, $3 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $4, $4 ; DIGLETTS_CAVE
+	EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $2
+	EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $7, $3
+	EVENT_DISP DIGLETTS_CAVE_EXIT_WIDTH, $4, $4 ; DIGLETTS_CAVE
 
 Route2House_h: ; 0x1dee1 to 0x1deed (12 bytes) (bank=7) (id=48)
 	db HOUSE ; tileset
@@ -40632,8 +40632,8 @@ Route2HouseObject: ; 0x1df07 (size=32)
 	db SPRITE_GAMEBOY_KID_COPY, $1 + 4, $4 + 4, $ff, $d0, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $2
+	EVENT_DISP ROUTE_2_HOUSE_WIDTH, $7, $3
 
 Route5Gate_h: ; 0x1df27 to 0x1df33 (12 bytes) (bank=7) (id=70)
 	db GATE ; tileset
@@ -40779,10 +40779,10 @@ Route5GateObject: ; 0x1dffb (size=42)
 	db SPRITE_GUARD, $3 + 4, $1 + 4, $ff, $d3, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $5, $3
-	EVENT_DISP $4, $5, $4
-	EVENT_DISP $4, $0, $3
-	EVENT_DISP $4, $0, $4
+	EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $3
+	EVENT_DISP ROUTE_5_GATE_WIDTH, $5, $4
+	EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $3
+	EVENT_DISP ROUTE_5_GATE_WIDTH, $0, $4
 
 Route5GateBlocks: ; 1e025 (7:6025)
 	INCBIN "maps/route5gate.blk"
@@ -40882,10 +40882,10 @@ Route6GateObject: ; 0x1e0be (size=42)
 	db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $5, $3
-	EVENT_DISP $4, $5, $4
-	EVENT_DISP $4, $0, $3
-	EVENT_DISP $4, $0, $4
+	EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $3
+	EVENT_DISP ROUTE_6_GATE_WIDTH, $5, $4
+	EVENT_DISP ROUTE_6_GATE_WIDTH, $0, $3
+	EVENT_DISP ROUTE_6_GATE_WIDTH, $0, $4
 
 Route6GateBlocks: ; 1e0e8 (7:60e8)
 	INCBIN "maps/route6gate.blk"
@@ -40988,10 +40988,10 @@ Route7GateObject: ; 0x1e185 (size=42)
 	db SPRITE_GUARD, $1 + 4, $3 + 4, $ff, $d0, $1 ; person
 
 	; warp-to
-	EVENT_DISP $3, $3, $0
-	EVENT_DISP $3, $4, $0
-	EVENT_DISP $3, $3, $5
-	EVENT_DISP $3, $4, $5
+	EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $0
+	EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $0
+	EVENT_DISP ROUTE_7_GATE_WIDTH, $3, $5
+	EVENT_DISP ROUTE_7_GATE_WIDTH, $4, $5
 
 Route7GateBlocks: ; 1e1af (7:61af)
 	INCBIN "maps/route7gate.blk"
@@ -41091,10 +41091,10 @@ Route8GateObject: ; 0x1e247 (size=42)
 	db SPRITE_GUARD, $1 + 4, $2 + 4, $ff, $d0, $1 ; person
 
 	; warp-to
-	EVENT_DISP $3, $3, $0
-	EVENT_DISP $3, $4, $0
-	EVENT_DISP $3, $3, $5
-	EVENT_DISP $3, $4, $5
+	EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $0
+	EVENT_DISP ROUTE_8_GATE_WIDTH, $4, $0
+	EVENT_DISP ROUTE_8_GATE_WIDTH, $3, $5
+	EVENT_DISP ROUTE_8_GATE_WIDTH, $4, $5
 
 Route8GateBlocks: ; 1e271 (7:6271)
 	INCBIN "maps/route8gate.blk"
@@ -41132,9 +41132,9 @@ UndergroundPathEntranceRoute8Object: ; 0x1e298 (size=34)
 	db SPRITE_GIRL, $4 + 4, $3 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
-	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
+	EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $3
+	EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $7, $4
+	EVENT_DISP PATH_ENTRANCE_ROUTE_8_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE
 
 PowerPlant_h: ; 0x1e2ba to 0x1e2c6 (12 bytes) (bank=7) (id=83)
 	db FACILITY ; tileset
@@ -41347,9 +41347,9 @@ PowerPlantObject: ; 0x1e3bf (size=135)
 	db SPRITE_BALL, $20 + 4, $14 + 4, $ff, $ff, $8e, TM_33 ; item
 
 	; warp-to
-	EVENT_DISP $14, $23, $4
-	EVENT_DISP $14, $23, $5
-	EVENT_DISP $14, $b, $0
+	EVENT_DISP POWER_PLANT_WIDTH, $23, $4
+	EVENT_DISP POWER_PLANT_WIDTH, $23, $5
+	EVENT_DISP POWER_PLANT_WIDTH, $b, $0
 
 PowerPlantBlocks: ; 1e446 (7:6446)
 	INCBIN "maps/powerplant.blk"
@@ -41388,9 +41388,9 @@ DiglettsCaveEntranceRoute11Object: ; 0x1e5ca (size=34)
 	db SPRITE_GAMBLER, $3 + 4, $2 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $4, $4 ; DIGLETTS_CAVE
+	EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $2
+	EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $7, $3
+	EVENT_DISP DIGLETTS_CAVE_ENTRANCE_WIDTH, $4, $4 ; DIGLETTS_CAVE
 
 Route16House_h: ; 0x1e5ec to 0x1e5f8 (12 bytes) (bank=7) (id=188)
 	db HOUSE ; tileset
@@ -41470,8 +41470,8 @@ Route16HouseObject: ; 0x1e657 (size=32)
 	db SPRITE_BIRD, $4 + 4, $6 + 4, $fe, $0, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $2
+	EVENT_DISP ROUTE_16_HOUSE_WIDTH, $7, $3
 
 Route22Gate_h: ; 0x1e677 to 0x1e683 (12 bytes) (bank=7) (id=193)
 	db GATE ; tileset
@@ -41588,10 +41588,10 @@ Route22GateObject: ; 0x1e720 (size=42)
 	db SPRITE_GUARD, $2 + 4, $6 + 4, $ff, $d2, $1 ; person
 
 	; warp-to
-	EVENT_DISP $5, $7, $4
-	EVENT_DISP $5, $7, $5
-	EVENT_DISP $5, $0, $4
-	EVENT_DISP $5, $0, $5
+	EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $4
+	EVENT_DISP ROUTE_22_GATE_WIDTH, $7, $5
+	EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $4
+	EVENT_DISP ROUTE_22_GATE_WIDTH, $0, $5
 
 Route22GateBlocks: ; 1e74a (7:674a)
 	INCBIN "maps/route22gate.blk"
@@ -41827,8 +41827,8 @@ BillsHouseObject: ; 0x1e8df (size=38)
 	db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $6 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP BILLS_HOUSE_WIDTH, $7, $2
+	EVENT_DISP BILLS_HOUSE_WIDTH, $7, $3
 
 BillsHouseBlocks: ; 1e905 (7:6905)
 	INCBIN "maps/billshouse.blk"
@@ -68275,12 +68275,12 @@ LavenderTownObject: ; 0x4402d (size=88)
 	db SPRITE_BLACK_HAIR_BOY_2, $7 + 4, $8 + 4, $fe, $2, $3 ; person
 
 	; warp-to
-	EVENT_DISP $a, $5, $3 ; LAVENDER_POKECENTER
-	EVENT_DISP $a, $5, $e ; POKEMONTOWER_1
-	EVENT_DISP $a, $9, $7 ; LAVENDER_HOUSE_1
-	EVENT_DISP $a, $d, $f ; LAVENDER_MART
-	EVENT_DISP $a, $d, $3 ; LAVENDER_HOUSE_2
-	EVENT_DISP $a, $d, $7 ; NAME_RATERS_HOUSE
+	EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $3 ; LAVENDER_POKECENTER
+	EVENT_DISP LAVENDER_TOWN_WIDTH, $5, $e ; POKEMONTOWER_1
+	EVENT_DISP LAVENDER_TOWN_WIDTH, $9, $7 ; LAVENDER_HOUSE_1
+	EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $f ; LAVENDER_MART
+	EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $3 ; LAVENDER_HOUSE_2
+	EVENT_DISP LAVENDER_TOWN_WIDTH, $d, $7 ; NAME_RATERS_HOUSE
 
 LavenderTownBlocks: ; 44085 (11:4085)
 	INCBIN "maps/lavendertown.blk"
@@ -68565,8 +68565,8 @@ ViridianPokecenterObject: ; 0x44277 (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP VIRIDIAN_POKECENTER_WIDTH, $7, $4
 
 Mansion1_h: ; 0x442a3 to 0x442af (12 bytes) (bank=11) (id=165)
 	db FACILITY ; tileset
@@ -68736,14 +68736,14 @@ Mansion1Object: ; 0x443a4 (size=90)
 	db SPRITE_BALL, $15 + 4, $12 + 4, $ff, $ff, $83, CARBOS ; item
 
 	; warp-to
-	EVENT_DISP $f, $1b, $4
-	EVENT_DISP $f, $1b, $5
-	EVENT_DISP $f, $1b, $6
-	EVENT_DISP $f, $1b, $7
-	EVENT_DISP $f, $a, $5 ; MANSION_2
-	EVENT_DISP $f, $17, $15 ; MANSION_4
-	EVENT_DISP $f, $1b, $1a
-	EVENT_DISP $f, $1b, $1b
+	EVENT_DISP MANSION_1_WIDTH, $1b, $4
+	EVENT_DISP MANSION_1_WIDTH, $1b, $5
+	EVENT_DISP MANSION_1_WIDTH, $1b, $6
+	EVENT_DISP MANSION_1_WIDTH, $1b, $7
+	EVENT_DISP MANSION_1_WIDTH, $a, $5 ; MANSION_2
+	EVENT_DISP MANSION_1_WIDTH, $17, $15 ; MANSION_4
+	EVENT_DISP MANSION_1_WIDTH, $1b, $1a
+	EVENT_DISP MANSION_1_WIDTH, $1b, $1b
 
 Mansion1Blocks: ; 443fe (11:43fe)
 	INCBIN "maps/mansion1.blk"
@@ -68996,14 +68996,14 @@ RockTunnel1Object: ; 0x445f6 (size=127)
 	db SPRITE_LASS, $18 + 4, $20 + 4, $ff, $d3, $47, JR__TRAINER_F + $C8, $13 ; trainer
 
 	; warp-to
-	EVENT_DISP $14, $3, $f
-	EVENT_DISP $14, $0, $f
-	EVENT_DISP $14, $21, $f
-	EVENT_DISP $14, $23, $f
-	EVENT_DISP $14, $3, $25 ; ROCK_TUNNEL_2
-	EVENT_DISP $14, $3, $5 ; ROCK_TUNNEL_2
-	EVENT_DISP $14, $b, $11 ; ROCK_TUNNEL_2
-	EVENT_DISP $14, $11, $25 ; ROCK_TUNNEL_2
+	EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f
+	EVENT_DISP ROCK_TUNNEL_1_WIDTH, $0, $f
+	EVENT_DISP ROCK_TUNNEL_1_WIDTH, $21, $f
+	EVENT_DISP ROCK_TUNNEL_1_WIDTH, $23, $f
+	EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $25 ; ROCK_TUNNEL_2
+	EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $5 ; ROCK_TUNNEL_2
+	EVENT_DISP ROCK_TUNNEL_1_WIDTH, $b, $11 ; ROCK_TUNNEL_2
+	EVENT_DISP ROCK_TUNNEL_1_WIDTH, $11, $25 ; ROCK_TUNNEL_2
 
 RockTunnel1Blocks: ; 44675 (11:4675)
 	INCBIN "maps/rocktunnel1.blk"
@@ -69085,17 +69085,17 @@ SeafoamIslands1Object: ; 0x4484f (size=72)
 	db SPRITE_BOULDER, $7 + 4, $1a + 4, $ff, $10, $2 ; person
 
 	; warp-to
-	EVENT_DISP $f, $11, $4
-	EVENT_DISP $f, $11, $5
-	EVENT_DISP $f, $11, $1a
-	EVENT_DISP $f, $11, $1b
-	EVENT_DISP $f, $5, $7 ; SEAFOAM_ISLANDS_2
-	EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_2
-	EVENT_DISP $f, $f, $17 ; SEAFOAM_ISLANDS_2
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $4
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $5
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1a
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $11, $1b
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_2
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_2
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_2
 
 	; holes
-	EVENT_DISP $f, $6, $11
-	EVENT_DISP $f, $6, $18
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $11
+	EVENT_DISP SEAFOAM_ISLANDS_1_WIDTH, $6, $18
 
 SeafoamIslands1Blocks: ; 4489f (11:489f)
 	INCBIN "maps/seafoamislands1.blk"
@@ -69130,8 +69130,8 @@ SSAnne3Object: ; 0x4493c (size=26)
 	db SPRITE_SAILOR, $3 + 4, $9 + 4, $fe, $2, $1 ; person
 
 	; warp-to
-	EVENT_DISP $a, $3, $0 ; SS_ANNE_5
-	EVENT_DISP $a, $3, $13 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_3_WIDTH, $3, $0 ; SS_ANNE_5
+	EVENT_DISP SS_ANNE_3_WIDTH, $3, $13 ; SS_ANNE_2
 
 SSAnne3Blocks: ; 44956 (11:4956)
 	INCBIN "maps/ssanne3.blk"
@@ -69373,10 +69373,10 @@ VictoryRoad3Object: ; 0x44acd (size=106)
 	db SPRITE_BOULDER, $f + 4, $16 + 4, $ff, $10, $a ; person
 
 	; warp-to
-	EVENT_DISP $f, $7, $17 ; VICTORY_ROAD_2
-	EVENT_DISP $f, $8, $1a ; VICTORY_ROAD_2
-	EVENT_DISP $f, $f, $1b ; VICTORY_ROAD_2
-	EVENT_DISP $f, $0, $2 ; VICTORY_ROAD_2
+	EVENT_DISP VICTORY_ROAD_3_WIDTH, $7, $17 ; VICTORY_ROAD_2
+	EVENT_DISP VICTORY_ROAD_3_WIDTH, $8, $1a ; VICTORY_ROAD_2
+	EVENT_DISP VICTORY_ROAD_3_WIDTH, $f, $1b ; VICTORY_ROAD_2
+	EVENT_DISP VICTORY_ROAD_3_WIDTH, $0, $2 ; VICTORY_ROAD_2
 
 VictoryRoad3Blocks: ; 44b37 (11:4b37)
 	INCBIN "maps/victoryroad3.blk"
@@ -69604,11 +69604,11 @@ RocketHideout1Object: ; 0x44ce7 (size=98)
 	db SPRITE_BALL, $11 + 4, $9 + 4, $ff, $ff, $87, HYPER_POTION ; item
 
 	; warp-to
-	EVENT_DISP $f, $2, $17 ; ROCKET_HIDEOUT_2
-	EVENT_DISP $f, $2, $15 ; GAME_CORNER
-	EVENT_DISP $f, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
-	EVENT_DISP $f, $18, $15 ; ROCKET_HIDEOUT_2
-	EVENT_DISP $f, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
+	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $17 ; ROCKET_HIDEOUT_2
+	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $2, $15 ; GAME_CORNER
+	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
+	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $18, $15 ; ROCKET_HIDEOUT_2
+	EVENT_DISP ROCKET_HIDEOUT_1_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
 
 RocketHideout1Blocks: ; 44d49 (11:4d49)
 	INCBIN "maps/rockethideout1.blk"
@@ -70142,11 +70142,11 @@ RocketHideout2Object: ; 0x450f7 (size=80)
 	db SPRITE_BALL, $15 + 4, $3 + 4, $ff, $ff, $85, SUPER_POTION ; item
 
 	; warp-to
-	EVENT_DISP $f, $8, $1b ; ROCKET_HIDEOUT_1
-	EVENT_DISP $f, $8, $15 ; ROCKET_HIDEOUT_3
-	EVENT_DISP $f, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
-	EVENT_DISP $f, $16, $15 ; ROCKET_HIDEOUT_1
-	EVENT_DISP $f, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
+	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $1b ; ROCKET_HIDEOUT_1
+	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $8, $15 ; ROCKET_HIDEOUT_3
+	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $18 ; ROCKET_HIDEOUT_ELEVATOR
+	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $16, $15 ; ROCKET_HIDEOUT_1
+	EVENT_DISP ROCKET_HIDEOUT_2_WIDTH, $13, $19 ; ROCKET_HIDEOUT_ELEVATOR
 
 RocketHideout2Blocks: ; 45147 (11:5147)
 	INCBIN "maps/rockethideout2.blk"
@@ -70386,8 +70386,8 @@ RocketHideout3Object: ; 0x4534d (size=50)
 	db SPRITE_BALL, $e + 4, $14 + 4, $ff, $ff, $84, RARE_CANDY ; item
 
 	; warp-to
-	EVENT_DISP $f, $6, $19 ; ROCKET_HIDEOUT_2
-	EVENT_DISP $f, $12, $13 ; ROCKET_HIDEOUT_4
+	EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $6, $19 ; ROCKET_HIDEOUT_2
+	EVENT_DISP ROCKET_HIDEOUT_3_WIDTH, $12, $13 ; ROCKET_HIDEOUT_4
 
 RocketHideout3Blocks: ; 4537f (11:537f)
 	INCBIN "maps/rockethideout3.blk"
@@ -70654,9 +70654,9 @@ RocketHideout4Object: ; 0x455f1 (size=95)
 	db SPRITE_BALL, $2 + 4, $a + 4, $ff, $ff, $89, LIFT_KEY ; item
 
 	; warp-to
-	EVENT_DISP $f, $a, $13 ; ROCKET_HIDEOUT_3
-	EVENT_DISP $f, $f, $18 ; ROCKET_HIDEOUT_ELEVATOR
-	EVENT_DISP $f, $f, $19 ; ROCKET_HIDEOUT_ELEVATOR
+	EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $a, $13 ; ROCKET_HIDEOUT_3
+	EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $18 ; ROCKET_HIDEOUT_ELEVATOR
+	EVENT_DISP ROCKET_HIDEOUT_4_WIDTH, $f, $19 ; ROCKET_HIDEOUT_ELEVATOR
 
 RocketHideout4Blocks: ; 45650 (11:5650)
 	INCBIN "maps/rockethideout4.blk"
@@ -70766,8 +70766,8 @@ RocketHideoutElevatorObject: ; 0x45791 (size=23)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $3, $1, $2 ; ROCKET_HIDEOUT_1
-	EVENT_DISP $3, $1, $3 ; ROCKET_HIDEOUT_1
+	EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $2 ; ROCKET_HIDEOUT_1
+	EVENT_DISP ROCKET_HIDEOUT_ELEVATOR_WIDTH, $1, $3 ; ROCKET_HIDEOUT_1
 
 RocketHideoutElevatorBlocks: ; 457a8 (11:57a8)
 	INCBIN "maps/rockethideoutelevator.blk"
@@ -70873,8 +70873,8 @@ SilphCoElevatorObject: ; 0x45844 (size=23)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $2, $3, $1
-	EVENT_DISP $2, $3, $2
+	EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $1
+	EVENT_DISP SILPH_CO_ELEVATOR_WIDTH, $3, $2
 
 SilphCoElevatorBlocks: ; 4585b (11:585b)
 	INCBIN "maps/silphcoelevator.blk"
@@ -70932,11 +70932,11 @@ SafariZoneEastObject: ; 0x4588b (size=81)
 	db SPRITE_BALL, $c + 4, $f + 4, $ff, $ff, $84, TM_37 ; item
 
 	; warp-to
-	EVENT_DISP $f, $4, $0 ; SAFARI_ZONE_NORTH
-	EVENT_DISP $f, $5, $0 ; SAFARI_ZONE_NORTH
-	EVENT_DISP $f, $16, $0 ; SAFARI_ZONE_CENTER
-	EVENT_DISP $f, $17, $0 ; SAFARI_ZONE_CENTER
-	EVENT_DISP $f, $9, $19 ; SAFARI_ZONE_REST_HOUSE_3
+	EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $4, $0 ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $5, $0 ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $16, $0 ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $17, $0 ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_EAST_WIDTH, $9, $19 ; SAFARI_ZONE_REST_HOUSE_3
 
 SafariZoneEastBlocks: ; 458dc (11:58dc)
 	INCBIN "maps/safarizoneeast.blk"
@@ -71006,15 +71006,15 @@ SafariZoneNorthObject: ; 0x459d5 (size=105)
 	db SPRITE_BALL, $7 + 4, $13 + 4, $ff, $ff, $82, TM_40 ; item
 
 	; warp-to
-	EVENT_DISP $14, $23, $2 ; SAFARI_ZONE_WEST
-	EVENT_DISP $14, $23, $3 ; SAFARI_ZONE_WEST
-	EVENT_DISP $14, $23, $8 ; SAFARI_ZONE_WEST
-	EVENT_DISP $14, $23, $9 ; SAFARI_ZONE_WEST
-	EVENT_DISP $14, $23, $14 ; SAFARI_ZONE_CENTER
-	EVENT_DISP $14, $23, $15 ; SAFARI_ZONE_CENTER
-	EVENT_DISP $14, $1e, $27 ; SAFARI_ZONE_EAST
-	EVENT_DISP $14, $1f, $27 ; SAFARI_ZONE_EAST
-	EVENT_DISP $14, $3, $23 ; SAFARI_ZONE_REST_HOUSE_4
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $2 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $3 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $8 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $9 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $14 ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $23, $15 ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1e, $27 ; SAFARI_ZONE_EAST
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $1f, $27 ; SAFARI_ZONE_EAST
+	EVENT_DISP SAFARI_ZONE_NORTH_WIDTH, $3, $23 ; SAFARI_ZONE_REST_HOUSE_4
 
 SafariZoneNorthBlocks: ; 45a3e (11:5a3e)
 	INCBIN "maps/safarizonenorth.blk"
@@ -71046,8 +71046,8 @@ SafariZoneCenterObject: ; 0x45bc5 (size=89)
 	db $0 ; border tile
 
 	db $9 ; warps
-	db $19, $e, $2, SAFARIZONEENTRANCE
-	db $19, $f, $3, SAFARIZONEENTRANCE
+	db $19, $e, $2, SAFARI_ZONE_ENTRANCE
+	db $19, $f, $3, SAFARI_ZONE_ENTRANCE
 	db $a, $0, $4, SAFARI_ZONE_WEST
 	db $b, $0, $5, SAFARI_ZONE_WEST
 	db $0, $e, $4, SAFARI_ZONE_NORTH
@@ -71064,15 +71064,15 @@ SafariZoneCenterObject: ; 0x45bc5 (size=89)
 	db SPRITE_BALL, $a + 4, $e + 4, $ff, $ff, $81, NUGGET ; item
 
 	; warp-to
-	EVENT_DISP $f, $19, $e ; SAFARIZONEENTRANCE
-	EVENT_DISP $f, $19, $f ; SAFARIZONEENTRANCE
-	EVENT_DISP $f, $a, $0 ; SAFARI_ZONE_WEST
-	EVENT_DISP $f, $b, $0 ; SAFARI_ZONE_WEST
-	EVENT_DISP $f, $0, $e ; SAFARI_ZONE_NORTH
-	EVENT_DISP $f, $0, $f ; SAFARI_ZONE_NORTH
-	EVENT_DISP $f, $a, $1d ; SAFARI_ZONE_EAST
-	EVENT_DISP $f, $b, $1d ; SAFARI_ZONE_EAST
-	EVENT_DISP $f, $13, $11 ; SAFARI_ZONE_REST_HOUSE_1
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $e ; SAFARI_ZONE_ENTRANCE
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $19, $f ; SAFARI_ZONE_ENTRANCE
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $0 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $0 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $e ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $0, $f ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $a, $1d ; SAFARI_ZONE_EAST
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $b, $1d ; SAFARI_ZONE_EAST
+	EVENT_DISP SAFARI_ZONE_CENTER_WIDTH, $13, $11 ; SAFARI_ZONE_REST_HOUSE_1
 
 SafariZoneCenterBlocks: ; 45c1e (11:5c1e)
 	INCBIN "maps/safarizonecenter.blk"
@@ -71113,8 +71113,8 @@ SafariZoneRestHouse1Object: ; 0x45cfe (size=32)
 	db SPRITE_OAK_AIDE, $4 + 4, $1 + 4, $fe, $1, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_CENTER
-	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $2 ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_REST_HOUSE_1_WIDTH, $7, $3 ; SAFARI_ZONE_CENTER
 
 SafariZoneRestHouse2_h: ; 0x45d1e to 0x45d2a (12 bytes) (bank=11) (id=223)
 	db GATE ; tileset
@@ -71159,8 +71159,8 @@ SafariZoneRestHouse2Object: ; 0x45d43 (size=38)
 	db SPRITE_ERIKA, $2 + 4, $6 + 4, $ff, $d0, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_WEST
-	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $2 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_REST_HOUSE_2_WIDTH, $7, $3 ; SAFARI_ZONE_WEST
 
 SafariZoneRestHouse3_h: ; 0x45d69 to 0x45d75 (12 bytes) (bank=11) (id=224)
 	db GATE ; tileset
@@ -71205,8 +71205,8 @@ SafariZoneRestHouse3Object: ; 0x45d8e (size=38)
 	db SPRITE_LAPRAS_GIVER, $2 + 4, $5 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_EAST
-	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_EAST
+	EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $2 ; SAFARI_ZONE_EAST
+	EVENT_DISP SAFARI_ZONE_REST_HOUSE_3_WIDTH, $7, $3 ; SAFARI_ZONE_EAST
 
 SafariZoneRestHouse4_h: ; 0x45db4 to 0x45dc0 (12 bytes) (bank=11) (id=225)
 	db GATE ; tileset
@@ -71251,8 +71251,8 @@ SafariZoneRestHouse4Object: ; 0x45dd9 (size=38)
 	db SPRITE_GENTLEMAN, $5 + 4, $1 + 4, $fe, $1, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_NORTH
-	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $2 ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_REST_HOUSE_4_WIDTH, $7, $3 ; SAFARI_ZONE_NORTH
 
 UnknownDungeon2_h: ; 0x45dff to 0x45e0b (12 bytes) (bank=11) (id=226)
 	db CAVERN ; tileset
@@ -71288,12 +71288,12 @@ UnknownDungeon2Object: ; 0x45e14 (size=73)
 	db SPRITE_BALL, $6 + 4, $d + 4, $ff, $ff, $83, FULL_RESTORE ; item
 
 	; warp-to
-	EVENT_DISP $f, $1, $1d ; UNKNOWN_DUNGEON_1
-	EVENT_DISP $f, $6, $16 ; UNKNOWN_DUNGEON_1
-	EVENT_DISP $f, $7, $13 ; UNKNOWN_DUNGEON_1
-	EVENT_DISP $f, $1, $9 ; UNKNOWN_DUNGEON_1
-	EVENT_DISP $f, $3, $1 ; UNKNOWN_DUNGEON_1
-	EVENT_DISP $f, $b, $3 ; UNKNOWN_DUNGEON_1
+	EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $1d ; UNKNOWN_DUNGEON_1
+	EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $6, $16 ; UNKNOWN_DUNGEON_1
+	EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $7, $13 ; UNKNOWN_DUNGEON_1
+	EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $1, $9 ; UNKNOWN_DUNGEON_1
+	EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_1
+	EVENT_DISP UNKNOWN_DUNGEON_2_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_1
 
 UnknownDungeon2Blocks: ; 45e5d (11:5e5d)
 	INCBIN "maps/unknowndungeon2.blk"
@@ -71364,7 +71364,7 @@ UnknownDungeon3Object: ; 0x45f36 (size=34)
 	db SPRITE_BALL, $1 + 4, $12 + 4, $ff, $ff, $83, MAX_REVIVE ; item
 
 	; warp-to
-	EVENT_DISP $f, $6, $3 ; UNKNOWN_DUNGEON_1
+	EVENT_DISP UNKNOWN_DUNGEON_3_WIDTH, $6, $3 ; UNKNOWN_DUNGEON_1
 
 UnknownDungeon3Blocks: ; 45f58 (11:5f58)
 	INCBIN "maps/unknowndungeon3.blk"
@@ -71641,10 +71641,10 @@ RockTunnel2Object: ; 0x4613d (size=100)
 	db SPRITE_BLACK_HAIR_BOY_2, $1e + 4, $1a + 4, $ff, $d0, $48, POKEMANIAC + $C8, $5 ; trainer
 
 	; warp-to
-	EVENT_DISP $14, $19, $21 ; ROCK_TUNNEL_1
-	EVENT_DISP $14, $3, $1b ; ROCK_TUNNEL_1
-	EVENT_DISP $14, $b, $17 ; ROCK_TUNNEL_1
-	EVENT_DISP $14, $3, $3 ; ROCK_TUNNEL_1
+	EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1
+	EVENT_DISP ROCK_TUNNEL_2_WIDTH, $3, $1b ; ROCK_TUNNEL_1
+	EVENT_DISP ROCK_TUNNEL_2_WIDTH, $b, $17 ; ROCK_TUNNEL_1
+	EVENT_DISP ROCK_TUNNEL_2_WIDTH, $3, $3 ; ROCK_TUNNEL_1
 
 RockTunnel2Blocks: ; 461a1 (11:61a1)
 	INCBIN "maps/rocktunnel2.blk"
@@ -71724,13 +71724,13 @@ SeafoamIslands2Object: ; 0x46376 (size=72)
 	db SPRITE_BOULDER, $6 + 4, $16 + 4, $ff, $10, $2 ; person
 
 	; warp-to
-	EVENT_DISP $f, $2, $4 ; SEAFOAM_ISLANDS_3
-	EVENT_DISP $f, $5, $7 ; SEAFOAM_ISLANDS_1
-	EVENT_DISP $f, $7, $d ; SEAFOAM_ISLANDS_3
-	EVENT_DISP $f, $f, $13 ; SEAFOAM_ISLANDS_3
-	EVENT_DISP $f, $f, $17 ; SEAFOAM_ISLANDS_1
-	EVENT_DISP $f, $b, $19 ; SEAFOAM_ISLANDS_3
-	EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_1
+	EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $2, $4 ; SEAFOAM_ISLANDS_3
+	EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $5, $7 ; SEAFOAM_ISLANDS_1
+	EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $7, $d ; SEAFOAM_ISLANDS_3
+	EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_3
+	EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $f, $17 ; SEAFOAM_ISLANDS_1
+	EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_3
+	EVENT_DISP SEAFOAM_ISLANDS_2_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_1
 
 SeafoamIslands2Blocks: ; 463be (11:63be)
 	INCBIN "maps/seafoamislands2.blk"
@@ -71810,13 +71810,13 @@ SeafoamIslands3Object: ; 0x464b2 (size=72)
 	db SPRITE_BOULDER, $6 + 4, $17 + 4, $ff, $10, $2 ; person
 
 	; warp-to
-	EVENT_DISP $f, $3, $5 ; SEAFOAM_ISLANDS_2
-	EVENT_DISP $f, $d, $5 ; SEAFOAM_ISLANDS_4
-	EVENT_DISP $f, $7, $d ; SEAFOAM_ISLANDS_2
-	EVENT_DISP $f, $f, $13 ; SEAFOAM_ISLANDS_2
-	EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_4
-	EVENT_DISP $f, $b, $19 ; SEAFOAM_ISLANDS_2
-	EVENT_DISP $f, $e, $19 ; SEAFOAM_ISLANDS_4
+	EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $5 ; SEAFOAM_ISLANDS_2
+	EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $d, $5 ; SEAFOAM_ISLANDS_4
+	EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $7, $d ; SEAFOAM_ISLANDS_2
+	EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $f, $13 ; SEAFOAM_ISLANDS_2
+	EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_4
+	EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $b, $19 ; SEAFOAM_ISLANDS_2
+	EVENT_DISP SEAFOAM_ISLANDS_3_WIDTH, $e, $19 ; SEAFOAM_ISLANDS_4
 
 SeafoamIslands3Blocks: ; 464fa (11:64fa)
 	INCBIN "maps/seafoamislands3.blk"
@@ -72000,13 +72000,13 @@ SeafoamIslands4Object: ; 0x466a6 (size=96)
 	db SPRITE_BOULDER, $6 + 4, $13 + 4, $ff, $ff, $6 ; person
 
 	; warp-to
-	EVENT_DISP $f, $c, $5 ; SEAFOAM_ISLANDS_3
-	EVENT_DISP $f, $6, $8 ; SEAFOAM_ISLANDS_5
-	EVENT_DISP $f, $4, $19 ; SEAFOAM_ISLANDS_5
-	EVENT_DISP $f, $3, $19 ; SEAFOAM_ISLANDS_3
-	EVENT_DISP $f, $e, $19 ; SEAFOAM_ISLANDS_3
-	EVENT_DISP $f, $11, $14 ; SEAFOAM_ISLANDS_5
-	EVENT_DISP $f, $11, $15 ; SEAFOAM_ISLANDS_5
+	EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $c, $5 ; SEAFOAM_ISLANDS_3
+	EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $6, $8 ; SEAFOAM_ISLANDS_5
+	EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_5
+	EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $3, $19 ; SEAFOAM_ISLANDS_3
+	EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $e, $19 ; SEAFOAM_ISLANDS_3
+	EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_5
+	EVENT_DISP SEAFOAM_ISLANDS_4_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_5
 
 SeafoamIslands4Blocks: ; 46706 (11:6706)
 	INCBIN "maps/seafoamislands4.blk"
@@ -72216,10 +72216,10 @@ SeafoamIslands5Object: ; 0x468bc (size=62)
 	db SPRITE_BIRD, $1 + 4, $6 + 4, $ff, $d0, $43, ARTICUNO, 50 ; trainer
 
 	; warp-to
-	EVENT_DISP $f, $11, $14 ; SEAFOAM_ISLANDS_4
-	EVENT_DISP $f, $11, $15 ; SEAFOAM_ISLANDS_4
-	EVENT_DISP $f, $7, $b ; SEAFOAM_ISLANDS_4
-	EVENT_DISP $f, $4, $19 ; SEAFOAM_ISLANDS_4
+	EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $14 ; SEAFOAM_ISLANDS_4
+	EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $11, $15 ; SEAFOAM_ISLANDS_4
+	EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $7, $b ; SEAFOAM_ISLANDS_4
+	EVENT_DISP SEAFOAM_ISLANDS_5_WIDTH, $4, $19 ; SEAFOAM_ISLANDS_4
 
 SeafoamIslands5Blocks: ; 468fa (11:68fa)
 	INCBIN "maps/seafoamislands5.blk"
@@ -72397,7 +72397,7 @@ HiddenObjectMaps: ; 46a40 (11:6a40)
 	db SAFFRON_POKECENTER
 	db POKEMONTOWER_5
 	db ROUTE_13
-	db SAFARIZONEENTRANCE
+	db SAFARI_ZONE_ENTRANCE
 	db SAFARI_ZONE_WEST
 	db SILPH_CO_5F
 	db SILPH_CO_9F
@@ -72420,7 +72420,7 @@ HiddenObjectMaps: ; 46a40 (11:6a40)
 	db $B9
 	db LAVENDER_HOUSE_1
 	db CELADON_MANSION_5
-	db FIGHTINGDOJO
+	db FIGHTING_DOJO
 	db ROUTE_10
 	db INDIGO_PLATEAU_LOBBY
 	db CINNABAR_LAB_4
@@ -73160,11 +73160,11 @@ Route7Object: ; 0x48022 (size=47)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $a, $9, $12 ; ROUTE_7_GATE
-	EVENT_DISP $a, $a, $12 ; ROUTE_7_GATE
-	EVENT_DISP $a, $9, $b ; ROUTE_7_GATE
-	EVENT_DISP $a, $a, $b ; ROUTE_7_GATE
-	EVENT_DISP $a, $d, $5 ; PATH_ENTRANCE_ROUTE_7
+	EVENT_DISP ROUTE_7_WIDTH, $9, $12 ; ROUTE_7_GATE
+	EVENT_DISP ROUTE_7_WIDTH, $a, $12 ; ROUTE_7_GATE
+	EVENT_DISP ROUTE_7_WIDTH, $9, $b ; ROUTE_7_GATE
+	EVENT_DISP ROUTE_7_WIDTH, $a, $b ; ROUTE_7_GATE
+	EVENT_DISP ROUTE_7_WIDTH, $d, $5 ; PATH_ENTRANCE_ROUTE_7
 
 Route7Blocks: ; 48051 (12:4051)
 	INCBIN "maps/route7.blk"
@@ -73507,9 +73507,9 @@ CeladonMart3Object: ; 0x482c4 (size=94)
 	db SPRITE_YOUNG_BOY, $5 + 4, $2 + 4, $ff, $d1, $5 ; person
 
 	; warp-to
-	EVENT_DISP $a, $1, $c ; CELADON_MART_4
-	EVENT_DISP $a, $1, $10 ; CELADON_MART_2
-	EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+	EVENT_DISP CELADON_MART_3_WIDTH, $1, $c ; CELADON_MART_4
+	EVENT_DISP CELADON_MART_3_WIDTH, $1, $10 ; CELADON_MART_2
+	EVENT_DISP CELADON_MART_3_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
 
 CeladonMart3Blocks: ; 48322 (12:4322)
 	INCBIN "maps/celadonmart3.blk"
@@ -73559,9 +73559,9 @@ CeladonMart4Object: ; 0x48370 (size=49)
 	db SPRITE_BUG_CATCHER, $2 + 4, $5 + 4, $fe, $2, $3 ; person
 
 	; warp-to
-	EVENT_DISP $a, $1, $c ; CELADON_MART_3
-	EVENT_DISP $a, $1, $10 ; CELADON_MART_5
-	EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+	EVENT_DISP CELADON_MART_4_WIDTH, $1, $c ; CELADON_MART_3
+	EVENT_DISP CELADON_MART_4_WIDTH, $1, $10 ; CELADON_MART_5
+	EVENT_DISP CELADON_MART_4_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
 
 CeladonMart4Blocks: ; 483a1 (12:43a1)
 	INCBIN "maps/celadonmart4.blk"
@@ -73854,7 +73854,7 @@ CeladonMartRoofObject: ; 0x485a8 (size=36)
 	db SPRITE_LITTLE_GIRL, $5 + 4, $5 + 4, $fe, $0, $2 ; person
 
 	; warp-to
-	EVENT_DISP $a, $2, $f ; CELADON_MART_5
+	EVENT_DISP CELADON_MART_ROOF_WIDTH, $2, $f ; CELADON_MART_5
 
 CeladonMartRoofBlocks: ; 485cc (12:45cc)
 	INCBIN "maps/celadonmartroof.blk"
@@ -73951,8 +73951,8 @@ CeladonMartElevatorObject: ; 0x4866d (size=23)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $2, $3, $1 ; CELADON_MART_1
-	EVENT_DISP $2, $3, $2 ; CELADON_MART_1
+	EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $1 ; CELADON_MART_1
+	EVENT_DISP CELADON_MART_ELEVATOR_WIDTH, $3, $2 ; CELADON_MART_1
 
 CeladonMartElevatorBlocks: ; 48684 (12:4684)
 	INCBIN "maps/celadonmartelevator.blk"
@@ -74024,11 +74024,11 @@ CeladonMansion1Object: ; 0x486cf (size=71)
 	db SPRITE_SLOWBRO, $4 + 4, $4 + 4, $fe, $1, $4 ; person
 
 	; warp-to
-	EVENT_DISP $4, $b, $4
-	EVENT_DISP $4, $b, $5
-	EVENT_DISP $4, $0, $4
-	EVENT_DISP $4, $1, $7 ; CELADON_MANSION_2
-	EVENT_DISP $4, $1, $2 ; CELADON_MANSION_2
+	EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $4
+	EVENT_DISP CELADON_MANSION_1_WIDTH, $b, $5
+	EVENT_DISP CELADON_MANSION_1_WIDTH, $0, $4
+	EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $7 ; CELADON_MANSION_2
+	EVENT_DISP CELADON_MANSION_1_WIDTH, $1, $2 ; CELADON_MANSION_2
 
 CeladonMansion1Blocks: ; 48716 (12:4716)
 	INCBIN "maps/celadonmansion1.blk"
@@ -74066,10 +74066,10 @@ CeladonMansion2Object: ; 0x48745 (size=39)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $4, $1, $6 ; CELADON_MANSION_3
-	EVENT_DISP $4, $1, $7 ; CELADON_MANSION_1
-	EVENT_DISP $4, $1, $2 ; CELADON_MANSION_1
-	EVENT_DISP $4, $1, $4 ; CELADON_MANSION_3
+	EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $6 ; CELADON_MANSION_3
+	EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $7 ; CELADON_MANSION_1
+	EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $2 ; CELADON_MANSION_1
+	EVENT_DISP CELADON_MANSION_2_WIDTH, $1, $4 ; CELADON_MANSION_3
 
 CeladonMansion2Blocks: ; 4876c (12:476c)
 	INCBIN "maps/celadonmansion2.blk"
@@ -74177,10 +74177,10 @@ CeladonMansion3Object: ; 0x487ff (size=72)
 	db SPRITE_LAPRAS_GIVER, $3 + 4, $2 + 4, $ff, $ff, $4 ; person
 
 	; warp-to
-	EVENT_DISP $4, $1, $6 ; CELADON_MANSION_2
-	EVENT_DISP $4, $1, $7 ; CELADON_MANSION_4
-	EVENT_DISP $4, $1, $2 ; CELADON_MANSION_4
-	EVENT_DISP $4, $1, $4 ; CELADON_MANSION_2
+	EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $6 ; CELADON_MANSION_2
+	EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $7 ; CELADON_MANSION_4
+	EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $2 ; CELADON_MANSION_4
+	EVENT_DISP CELADON_MANSION_3_WIDTH, $1, $4 ; CELADON_MANSION_2
 
 CeladonMansion3Blocks: ; 48847 (12:4847)
 	INCBIN "maps/celadonmansion3.blk"
@@ -74216,9 +74216,9 @@ CeladonMansion4Object: ; 0x48875 (size=31)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $4, $1, $6 ; CELADON_MANSION_3
-	EVENT_DISP $4, $1, $2 ; CELADON_MANSION_3
-	EVENT_DISP $4, $7, $2 ; CELADON_MANSION_5
+	EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $6 ; CELADON_MANSION_3
+	EVENT_DISP CELADON_MANSION_4_WIDTH, $1, $2 ; CELADON_MANSION_3
+	EVENT_DISP CELADON_MANSION_4_WIDTH, $7, $2 ; CELADON_MANSION_5
 
 CeladonMansion4Blocks: ; 48894 (12:4894)
 	INCBIN "maps/celadonmansion4.blk"
@@ -74270,8 +74270,8 @@ CeladonPokecenterObject: ; 0x488d2 (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP CELADON_POKECENTER_WIDTH, $7, $4
 
 CeladonGym_h: ; 0x488fe to 0x4890a (12 bytes) (bank=12) (id=134)
 	db GYM ; tileset
@@ -74642,8 +74642,8 @@ CeladonGymObject: ; 0x48b30 (size=84)
 	db SPRITE_LASS, $3 + 4, $5 + 4, $ff, $d0, $48, COOLTRAINER_F + $C8, $1 ; trainer
 
 	; warp-to
-	EVENT_DISP $5, $11, $4
-	EVENT_DISP $5, $11, $5
+	EVENT_DISP CELADON_GYM_WIDTH, $11, $4
+	EVENT_DISP CELADON_GYM_WIDTH, $11, $5
 
 CeladonGymBlocks: ; 48b84 (12:4b84)
 	INCBIN "maps/celadongym.blk"
@@ -75217,9 +75217,9 @@ CeladonGameCornerObject: ; 0x48fa0 (size=99)
 	db SPRITE_ROCKET, $5 + 4, $9 + 4, $ff, $d1, $4b, ROCKET + $C8, $7 ; trainer
 
 	; warp-to
-	EVENT_DISP $a, $11, $f
-	EVENT_DISP $a, $11, $10
-	EVENT_DISP $a, $4, $11 ; ROCKET_HIDEOUT_1
+	EVENT_DISP GAME_CORNER_WIDTH, $11, $f
+	EVENT_DISP GAME_CORNER_WIDTH, $11, $10
+	EVENT_DISP GAME_CORNER_WIDTH, $4, $11 ; ROCKET_HIDEOUT_1
 
 CeladonGameCornerBlocks: ; 49003 (12:5003)
 	INCBIN "maps/celadongamecorner.blk"
@@ -75271,16 +75271,16 @@ CeladonMart5Object: ; 0x49085 (size=55)
 	db SPRITE_MART_GUY, $3 + 4, $6 + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $a, $1, $c ; CELADON_MART_ROOF
-	EVENT_DISP $a, $1, $10 ; CELADON_MART_4
-	EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+	EVENT_DISP CELADON_MART_5_WIDTH, $1, $c ; CELADON_MART_ROOF
+	EVENT_DISP CELADON_MART_5_WIDTH, $1, $10 ; CELADON_MART_4
+	EVENT_DISP CELADON_MART_5_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
 
 CeladonMart5Blocks: ; 490bc (12:50bc)
 	INCBIN "maps/celadonmart5.blk"
 
 CeladonPrizeRoom_h: ; 0x490e4 to 0x490f0 (12 bytes) (bank=12) (id=137)
 	db LOBBY ; tileset
-	db CELADONPRIZE_ROOM_HEIGHT, CELADONPRIZE_ROOM_WIDTH ; dimensions (y, x)
+	db CELADON_PRIZE_ROOM_HEIGHT, CELADON_PRIZE_ROOM_WIDTH ; dimensions (y, x)
 	dw CeladonPrizeRoomBlocks, CeladonPrizeRoomTextPointers, CeladonPrizeRoomScript ; blocks, texts, scripts
 	db $00 ; connections
 	dw CeladonPrizeRoomObject ; objects
@@ -75323,8 +75323,8 @@ CeladonPrizeRoomObject: ; 0x49108 (size=41)
 	db SPRITE_GAMBLER, $3 + 4, $7 + 4, $fe, $2, $2 ; person
 
 	; warp-to
-	EVENT_DISP $5, $7, $4
-	EVENT_DISP $5, $7, $5
+	EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $4
+	EVENT_DISP CELADON_PRIZE_ROOM_WIDTH, $7, $5
 
 CeladonPrizeRoomBlocks: ; 49131 (12:5131)
 	INCBIN "maps/celadonprizeroom.blk"
@@ -75421,8 +75421,8 @@ CeladonDinerObject: ; 0x491bc (size=50)
 	db SPRITE_GYM_HELPER, $1 + 4, $0 + 4, $ff, $d0, $5 ; person
 
 	; warp-to
-	EVENT_DISP $5, $7, $3
-	EVENT_DISP $5, $7, $4
+	EVENT_DISP CELADON_DINER_WIDTH, $7, $3
+	EVENT_DISP CELADON_DINER_WIDTH, $7, $4
 
 CeladonDinerBlocks: ; 491ee (12:51ee)
 	INCBIN "maps/celadondiner.blk"
@@ -75470,15 +75470,15 @@ CeladonHouseObject: ; 0x49227 (size=38)
 	db SPRITE_SAILOR, $6 + 4, $5 + 4, $ff, $d2, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP CELADON_HOUSE_WIDTH, $7, $2
+	EVENT_DISP CELADON_HOUSE_WIDTH, $7, $3
 
 CeladonHouseBlocks: ; 4924d (12:524d)
 	INCBIN "maps/celadonhouse.blk"
 
 CeladonHotel_h: ; 0x4925d to 0x49269 (12 bytes) (bank=12) (id=140)
 	db POKECENTER ; tileset
-	db CELADONHOTEL_HEIGHT, CELADONHOTEL_WIDTH ; dimensions (y, x)
+	db CELADON_HOTEL_HEIGHT, CELADON_HOTEL_WIDTH ; dimensions (y, x)
 	dw CeladonHotelBlocks, CeladonHotelTextPointers, CeladonHotelScript ; blocks, texts, scripts
 	db $00 ; connections
 	dw CeladonHotelObject ; objects
@@ -75518,8 +75518,8 @@ CeladonHotelObject: ; 0x49281 (size=38)
 	db SPRITE_BLACK_HAIR_BOY_2, $4 + 4, $8 + 4, $fe, $2, $3 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP CELADON_HOTEL_WIDTH, $7, $3
+	EVENT_DISP CELADON_HOTEL_WIDTH, $7, $4
 
 CeladonHotelBlocks: ; 492a7 (12:52a7)
 	INCBIN "maps/celadonhotel.blk"
@@ -75647,8 +75647,8 @@ MtMoonPokecenterObject: ; 0x49376 (size=56)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $6 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP MT_MOON_POKECENTER_WIDTH, $7, $4
 
 RockTunnelPokecenter_h: ; 0x493ae to 0x493ba (12 bytes) (id=81)
 	db POKECENTER ; tileset
@@ -75697,8 +75697,8 @@ RockTunnelPokecenterObject: ; 0x493d4 (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP ROCK_TUNNEL_POKECENTER_WIDTH, $7, $4
 
 Route11Gate_h: ; 0x49400 to 0x4940c (12 bytes) (id=84)
 	db GATE ; tileset
@@ -75733,11 +75733,11 @@ Route11GateObject: ; 0x49416 (size=50)
 	db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $4, $0
-	EVENT_DISP $4, $5, $0
-	EVENT_DISP $4, $4, $7
-	EVENT_DISP $4, $5, $7
-	EVENT_DISP $4, $8, $6 ; ROUTE_11_GATE_2F
+	EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $0
+	EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $0
+	EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $4, $7
+	EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $5, $7
+	EVENT_DISP ROUTE_11_GATE_1F_WIDTH, $8, $6 ; ROUTE_11_GATE_2F
 
 Route11GateUpstairs_h: ; 0x49448 to 0x49454 (12 bytes) (id=86)
 	db GATE ; tileset
@@ -75843,11 +75843,11 @@ Route11GateUpstairsObject: ; 0x494da (size=30)
 	db SPRITE_OAK_AIDE, $6 + 4, $2 + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $7 ; ROUTE_11_GATE_1F
+	EVENT_DISP ROUTE_11_GATE_2F_WIDTH, $7, $7 ; ROUTE_11_GATE_1F
 
 Route12Gate_h: ; 0x494f8 to 0x49504 (12 bytes) (id=87)
 	db GATE ; tileset
-	db ROUTE_12_GATE_HEIGHT, ROUTE_12_GATE_WIDTH ; dimensions (y, x)
+	db ROUTE_12_GATE_1F_HEIGHT, ROUTE_12_GATE_1F_WIDTH ; dimensions (y, x)
 	dw Route12GateBlocks, Route12GateTextPointers, Route12GateScript ; blocks, texts, scripts
 	db $00 ; connections
 	dw Route12GateObject ; objects
@@ -75878,11 +75878,11 @@ Route12GateObject: ; 0x4950e (size=50)
 	db SPRITE_GUARD, $3 + 4, $1 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $5, $0, $4
-	EVENT_DISP $5, $0, $5
-	EVENT_DISP $5, $7, $4
-	EVENT_DISP $5, $7, $5
-	EVENT_DISP $5, $6, $8 ; ROUTE_12_GATE_2F
+	EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $4
+	EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $0, $5
+	EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $4
+	EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $7, $5
+	EVENT_DISP ROUTE_12_GATE_1F_WIDTH, $6, $8 ; ROUTE_12_GATE_2F
 
 Route12GateBlocks: ; 49540 (12:5540)
 	INCBIN "maps/route12gate.blk"
@@ -75978,7 +75978,7 @@ Route12GateUpstairsObject: ; 0x495de (size=24)
 	db $a ; border tile
 
 	db $1 ; warps
-	db $7, $7, $4, ROUTE_12_GATE
+	db $7, $7, $4, ROUTE_12_GATE_1F
 
 	db $2 ; signs
 	db $2, $1, $2 ; Route12GateUpstairsText2
@@ -75988,7 +75988,7 @@ Route12GateUpstairsObject: ; 0x495de (size=24)
 	db SPRITE_BRUNETTE_GIRL, $4 + 4, $3 + 4, $fe, $1, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $7 ; ROUTE_12_GATE
+	EVENT_DISP ROUTE_12_GATE_2F_WIDTH, $7, $7 ; ROUTE_12_GATE_1F
 
 Route15Gate_h: ; 0x495f6 to 0x49602 (12 bytes) (id=184)
 	db GATE ; tileset
@@ -76023,11 +76023,11 @@ Route15GateObject: ; 0x4960c (size=50)
 	db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $4, $0
-	EVENT_DISP $4, $5, $0
-	EVENT_DISP $4, $4, $7
-	EVENT_DISP $4, $5, $7
-	EVENT_DISP $4, $8, $6
+	EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $0
+	EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $0
+	EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $4, $7
+	EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $5, $7
+	EVENT_DISP ROUTE_15_GATE_1F_WIDTH, $8, $6 ; ROUTE_15_GATE_2F
 
 Route15GateUpstairs_h: ; 4963e (12:563e)
 	db GATE ; tileset
@@ -76097,30 +76097,30 @@ Route15GateUpstairsObject: ; 4969d (12:569d)
 	db SPRITE_OAK_AIDE, $2 + 4, $4 + 4, $ff, $d0, $1
 
 	; warp-to
-	EVENT_DISP $4, $7, $7 ; ROUTE_15_GATE_1F
+	EVENT_DISP ROUTE_15_GATE_2F_WIDTH, $7, $7 ; ROUTE_15_GATE_1F
 
-Route16GateMap_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
+Route16Gate_h: ; 0x496b2 to 0x496be (12 bytes) (id=186)
 	db GATE ; tileset
 	db ROUTE_16_GATE_1F_HEIGHT, ROUTE_16_GATE_1F_WIDTH ; dimensions (y, x)
-	dw Route16GateMapBlocks, Route16GateMapTextPointers, Route16GateMapScript ; blocks, texts, scripts
+	dw Route16GateBlocks, Route16GateTextPointers, Route16GateScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw Route16GateMapObject ; objects
+	dw Route16GateObject ; objects
 
-Route16GateMapScript: ; 496be (12:56be)
+Route16GateScript: ; 496be (12:56be)
 	ld hl, $d732
 	res 5, [hl]
 	call EnableAutoTextBoxDrawing
 	ld a, [W_ROUTE16GATECURSCRIPT]
-	ld hl, Route16GateMapScriptPointers
+	ld hl, Route16GateScriptPointers
 	jp CallFunctionInTable
 
-Route16GateMapScriptPointers: ; 496cf (12:56cf)
-	dw Route16GateMapScript0
-	dw Route16GateMapScript1
-	dw Route16GateMapScript2
-	dw Route16GateMapScript3
+Route16GateScriptPointers: ; 496cf (12:56cf)
+	dw Route16GateScript0
+	dw Route16GateScript1
+	dw Route16GateScript2
+	dw Route16GateScript3
 
-Route16GateMapScript0: ; 496d7 (12:56d7)
+Route16GateScript0: ; 496d7 (12:56d7)
 	call Func_49755
 	ret nz
 	ld hl, CoordsData_49714
@@ -76158,14 +76158,14 @@ CoordsData_49714: ; 49714 (12:5714)
 	db $0A,$04
 	db $FF
 
-Route16GateMapScript1: ; 4971d (12:571d)
+Route16GateScript1: ; 4971d (12:571d)
 	ld a, [$cd38]
 	and a
 	ret nz
 	ld a, $f0
 	ld [wJoypadForbiddenButtonsMask], a
 
-Route16GateMapScript2: ; 49727 (12:5727)
+Route16GateScript2: ; 49727 (12:5727)
 	ld a, $1
 	ld [H_SPRITEHEIGHT], a
 	call DisplayTextID
@@ -76178,7 +76178,7 @@ Route16GateMapScript2: ; 49727 (12:5727)
 	ld [W_ROUTE16GATECURSCRIPT], a
 	ret
 
-Route16GateMapScript3: ; 49741 (12:5741)
+Route16GateScript3: ; 49741 (12:5741)
 	ld a, [$cd38]
 	and a
 	ret nz
@@ -76194,12 +76194,12 @@ Func_49755: ; 49755 (12:5755)
 	ld b, $6
 	jp IsItemInBag
 
-Route16GateMapTextPointers: ; 4975a (12:575a)
-	dw Route16GateMapText1
-	dw Route16GateMapText2
-	dw Route16GateMapText3
+Route16GateTextPointers: ; 4975a (12:575a)
+	dw Route16GateText1
+	dw Route16GateText2
+	dw Route16GateText3
 
-Route16GateMapText1: ; 49760 (12:5760)
+Route16GateText1: ; 49760 (12:5760)
 	db $08 ; asm
 	call Func_49755
 	jr z, .asm_0bdf3 ; 0x49764
@@ -76220,15 +76220,15 @@ UnnamedText_4977c: ; 4977c (12:577c)
 	TX_FAR _UnnamedText_4977c
 	db "@"
 
-Route16GateMapText3: ; 49781 (12:5781)
+Route16GateText3: ; 49781 (12:5781)
 	TX_FAR _UnnamedText_49781
 	db "@"
 
-Route16GateMapText2: ; 49786 (12:5786)
-	TX_FAR _Route16GateMapText2
+Route16GateText2: ; 49786 (12:5786)
+	TX_FAR _Route16GateText2
 	db "@"
 
-Route16GateMapObject: ; 0x4978b (size=88)
+Route16GateObject: ; 0x4978b (size=88)
 	db $a ; border tile
 
 	db $9 ; warps
@@ -76249,18 +76249,18 @@ Route16GateMapObject: ; 0x4978b (size=88)
 	db SPRITE_GAMBLER, $3 + 4, $4 + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $8, $0
-	EVENT_DISP $4, $9, $0
-	EVENT_DISP $4, $8, $7
-	EVENT_DISP $4, $9, $7
-	EVENT_DISP $4, $2, $0
-	EVENT_DISP $4, $3, $0
-	EVENT_DISP $4, $2, $7
-	EVENT_DISP $4, $3, $7
-	EVENT_DISP $4, $c, $6 ; ROUTE_16_GATE_2F
-
-Route16GateMapBlocks: ; 497e3 (12:57e3)
-	INCBIN "maps/route16gatemap.blk"
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $0
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $9, $0
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $8, $7
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $9, $7
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $2, $0
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $3, $0
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $2, $7
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $3, $7
+	EVENT_DISP ROUTE_16_GATE_1F_WIDTH, $c, $6 ; ROUTE_16_GATE_2F
+
+Route16GateBlocks: ; 497e3 (12:57e3)
+	INCBIN "maps/route16gate.blk"
 
 Route16GateUpstairs_h: ; 0x497ff to 0x4980b (12 bytes) (id=187)
 	db GATE ; tileset
@@ -76331,7 +76331,7 @@ Route16GateUpstairsObject: ; 0x4984c (size=30)
 	db SPRITE_LITTLE_GIRL, $5 + 4, $2 + 4, $fe, $2, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $7 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_GATE_2F_WIDTH, $7, $7 ; ROUTE_16_GATE_1F
 
 Route18Gate_h: ; 0x4986a to 0x49876 (12 bytes) (id=190)
 	db GATE ; tileset
@@ -76469,11 +76469,11 @@ Route18GateObject: ; 0x49937 (size=50)
 	db SPRITE_GUARD, $1 + 4, $4 + 4, $ff, $d0, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $4, $0
-	EVENT_DISP $4, $5, $0
-	EVENT_DISP $4, $4, $7
-	EVENT_DISP $4, $5, $7
-	EVENT_DISP $4, $8, $6 ; ROUTE_18_GATE_2F
+	EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $0
+	EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $5, $0
+	EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $4, $7
+	EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $5, $7
+	EVENT_DISP ROUTE_18_GATE_1F_WIDTH, $8, $6 ; ROUTE_18_GATE_2F
 
 Route18GateUpstairs_h: ; 0x49969 to 0x49975 (12 bytes) (id=191)
 	db GATE ; tileset
@@ -76530,7 +76530,7 @@ Route18GateUpstairsObject: ; 0x499a4 (size=24)
 	db SPRITE_BUG_CATCHER, $2 + 4, $4 + 4, $fe, $2, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $7 ; ROUTE_18_GATE_1F
+	EVENT_DISP ROUTE_18_GATE_2F_WIDTH, $7, $7 ; ROUTE_18_GATE_1F
 
 MtMoon1_h: ; 0x499bc to 0x499c8 (12 bytes) (id=59)
 	db CAVERN ; tileset
@@ -76794,11 +76794,11 @@ MtMoon1Object: ; 0x49b06 (size=145)
 	db SPRITE_BALL, $20 + 4, $5 + 4, $ff, $ff, $8d, TM_12 ; item
 
 	; warp-to
-	EVENT_DISP $14, $23, $e
-	EVENT_DISP $14, $23, $f
-	EVENT_DISP $14, $5, $5 ; MT_MOON_2
-	EVENT_DISP $14, $b, $11 ; MT_MOON_2
-	EVENT_DISP $14, $f, $19 ; MT_MOON_2
+	EVENT_DISP MT_MOON_1_WIDTH, $23, $e
+	EVENT_DISP MT_MOON_1_WIDTH, $23, $f
+	EVENT_DISP MT_MOON_1_WIDTH, $5, $5 ; MT_MOON_2
+	EVENT_DISP MT_MOON_1_WIDTH, $b, $11 ; MT_MOON_2
+	EVENT_DISP MT_MOON_1_WIDTH, $f, $19 ; MT_MOON_2
 
 MtMoon1Blocks: ; 49b97 (12:5b97)
 	INCBIN "maps/mtmoon1.blk"
@@ -77248,10 +77248,10 @@ MtMoon3Object: ; 0x49fdb (size=102)
 	db SPRITE_BALL, $5 + 4, $1d + 4, $ff, $ff, $89, TM_01 ; item
 
 	; warp-to
-	EVENT_DISP $14, $9, $19 ; MT_MOON_2
-	EVENT_DISP $14, $11, $15 ; MT_MOON_2
-	EVENT_DISP $14, $1b, $f ; MT_MOON_2
-	EVENT_DISP $14, $7, $5 ; MT_MOON_2
+	EVENT_DISP MT_MOON_3_WIDTH, $9, $19 ; MT_MOON_2
+	EVENT_DISP MT_MOON_3_WIDTH, $11, $15 ; MT_MOON_2
+	EVENT_DISP MT_MOON_3_WIDTH, $1b, $f ; MT_MOON_2
+	EVENT_DISP MT_MOON_3_WIDTH, $7, $5 ; MT_MOON_2
 
 MtMoon3Blocks: ; 4a041 (12:6041)
 	INCBIN "maps/mtmoon3.blk"
@@ -77318,14 +77318,14 @@ SafariZoneWestObject: ; 0x4a1dc (size=108)
 	db SPRITE_BALL, $7 + 4, $13 + 4, $ff, $ff, $84, GOLD_TEETH ; item
 
 	; warp-to
-	EVENT_DISP $f, $0, $14 ; SAFARI_ZONE_NORTH
-	EVENT_DISP $f, $0, $15 ; SAFARI_ZONE_NORTH
-	EVENT_DISP $f, $0, $1a ; SAFARI_ZONE_NORTH
-	EVENT_DISP $f, $0, $1b ; SAFARI_ZONE_NORTH
-	EVENT_DISP $f, $16, $1d ; SAFARI_ZONE_CENTER
-	EVENT_DISP $f, $17, $1d ; SAFARI_ZONE_CENTER
-	EVENT_DISP $f, $3, $3 ; SAFARI_ZONE_SECRET_HOUSE
-	EVENT_DISP $f, $b, $b ; SAFARI_ZONE_REST_HOUSE_2
+	EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $14 ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $15 ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1a ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $0, $1b ; SAFARI_ZONE_NORTH
+	EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $16, $1d ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $17, $1d ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $3, $3 ; SAFARI_ZONE_SECRET_HOUSE
+	EVENT_DISP SAFARI_ZONE_WEST_WIDTH, $b, $b ; SAFARI_ZONE_REST_HOUSE_2
 
 SafariZoneWestBlocks: ; 4a248 (12:6248)
 	INCBIN "maps/safarizonewest.blk"
@@ -77397,8 +77397,8 @@ SafariZoneSecretHouseObject: ; 0x4a365 (size=26)
 	db SPRITE_FISHER, $3 + 4, $3 + 4, $ff, $d0, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; SAFARI_ZONE_WEST
-	EVENT_DISP $4, $7, $3 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $2 ; SAFARI_ZONE_WEST
+	EVENT_DISP SAFARI_ZONE_SECRET_HOUSE_WIDTH, $7, $3 ; SAFARI_ZONE_WEST
 
 SafariZoneSecretHouseBlocks: ; 4a37f (12:637f)
 	INCBIN "maps/safarizonesecrethouse.blk"
@@ -77877,7 +77877,7 @@ Route22Object: ; 0x50022 (size=27)
 	db SPRITE_BLUE, $5 + 4, $19 + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $14, $5, $8 ; ROUTE_22_GATE
+	EVENT_DISP ROUTE_22_WIDTH, $5, $8 ; ROUTE_22_GATE
 
 Route22Blocks: ; 5003d (14:403d)
 	INCBIN "maps/route22.blk"
@@ -77915,8 +77915,8 @@ Route20Object: ; 0x50113 (size=106)
 	db SPRITE_SWIMMER, $8 + 4, $f + 4, $ff, $d1, $4a, BEAUTY + $C8, $8 ; trainer
 
 	; warp-to
-	EVENT_DISP $32, $5, $30 ; SEAFOAM_ISLANDS_1
-	EVENT_DISP $32, $9, $3a ; SEAFOAM_ISLANDS_1
+	EVENT_DISP ROUTE_20_WIDTH, $5, $30 ; SEAFOAM_ISLANDS_1
+	EVENT_DISP ROUTE_20_WIDTH, $9, $3a ; SEAFOAM_ISLANDS_1
 
 Route20Blocks: ; 5017d (14:417d)
 	INCBIN "maps/route20.blk"
@@ -77952,10 +77952,10 @@ Route23Object: ; 0x50361 (size=81)
 	db SPRITE_GUARD, $88 + 4, $8 + 4, $ff, $d0, $7 ; person
 
 	; warp-to
-	EVENT_DISP $a, $8b, $7 ; ROUTE_22_GATE
-	EVENT_DISP $a, $8b, $8 ; ROUTE_22_GATE
-	EVENT_DISP $a, $1f, $4 ; VICTORY_ROAD_1
-	EVENT_DISP $a, $1f, $e ; VICTORY_ROAD_2
+	EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE
+	EVENT_DISP ROUTE_23_WIDTH, $8b, $8 ; ROUTE_22_GATE
+	EVENT_DISP ROUTE_23_WIDTH, $1f, $4 ; VICTORY_ROAD_1
+	EVENT_DISP ROUTE_23_WIDTH, $1f, $e ; VICTORY_ROAD_2
 
 Route23Blocks: ; 503b2 (14:43b2)
 	INCBIN "maps/route23.blk"
@@ -78019,7 +78019,7 @@ Route25Object: ; 0x507b2 (size=94)
 	db SPRITE_BALL, $2 + 4, $16 + 4, $ff, $ff, $8a, TM_19 ; item
 
 	; warp-to
-	EVENT_DISP $1e, $3, $2d ; BILLS_HOUSE
+	EVENT_DISP ROUTE_25_WIDTH, $3, $2d ; BILLS_HOUSE
 
 Route25Blocks: ; 50810 (14:4810)
 	INCBIN "maps/route25.blk"
@@ -78048,8 +78048,8 @@ IndigoPlateauObject: ; 0x50936 (size=20)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $a, $5, $9 ; INDIGO_PLATEAU_LOBBY
-	EVENT_DISP $a, $5, $a ; INDIGO_PLATEAU_LOBBY
+	EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $9 ; INDIGO_PLATEAU_LOBBY
+	EVENT_DISP INDIGO_PLATEAU_WIDTH, $5, $a ; INDIGO_PLATEAU_LOBBY
 
 IndigoPlateauBlocks: ; 5094a (14:494a)
 	INCBIN "maps/indigoplateau.blk"
@@ -78070,7 +78070,7 @@ SaffronCityObject: ; 0x509dc (size=188)
 
 	db $8 ; warps
 	db $5, $7, $0, COPYCATS_HOUSE_1F
-	db $3, $1a, $0, FIGHTINGDOJO
+	db $3, $1a, $0, FIGHTING_DOJO
 	db $3, $22, $0, SAFFRON_GYM
 	db $b, $d, $0, SAFFRON_HOUSE_1
 	db $b, $19, $0, SAFFRON_MART
@@ -78108,14 +78108,14 @@ SaffronCityObject: ; 0x509dc (size=188)
 	db SPRITE_ROCKET, $16 + 4, $13 + 4, $ff, $d0, $f ; person
 
 	; warp-to
-	EVENT_DISP $14, $5, $7 ; COPYCATS_HOUSE_1F
-	EVENT_DISP $14, $3, $1a ; FIGHTINGDOJO
-	EVENT_DISP $14, $3, $22 ; SAFFRON_GYM
-	EVENT_DISP $14, $b, $d ; SAFFRON_HOUSE_1
-	EVENT_DISP $14, $b, $19 ; SAFFRON_MART
-	EVENT_DISP $14, $15, $12 ; SILPH_CO_1F
-	EVENT_DISP $14, $1d, $9 ; SAFFRON_POKECENTER
-	EVENT_DISP $14, $1d, $1d ; SAFFRON_HOUSE_2
+	EVENT_DISP SAFFRON_CITY_WIDTH, $5, $7 ; COPYCATS_HOUSE_1F
+	EVENT_DISP SAFFRON_CITY_WIDTH, $3, $1a ; FIGHTING_DOJO
+	EVENT_DISP SAFFRON_CITY_WIDTH, $3, $22 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_CITY_WIDTH, $b, $d ; SAFFRON_HOUSE_1
+	EVENT_DISP SAFFRON_CITY_WIDTH, $b, $19 ; SAFFRON_MART
+	EVENT_DISP SAFFRON_CITY_WIDTH, $15, $12 ; SILPH_CO_1F
+	EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $9 ; SAFFRON_POKECENTER
+	EVENT_DISP SAFFRON_CITY_WIDTH, $1d, $1d ; SAFFRON_HOUSE_2
 
 SaffronCityBlocks: ; 50a98 (14:4a98)
 	INCBIN "maps/saffroncity.blk"
@@ -80209,13 +80209,13 @@ VictoryRoad2Object: ; 0x51915 (size=154)
 	db SPRITE_BOULDER, $10 + 4, $17 + 4, $ff, $10, $d ; person
 
 	; warp-to
-	EVENT_DISP $f, $8, $0 ; VICTORY_ROAD_1
-	EVENT_DISP $f, $7, $1d
-	EVENT_DISP $f, $8, $1d
-	EVENT_DISP $f, $7, $17 ; VICTORY_ROAD_3
-	EVENT_DISP $f, $e, $19 ; VICTORY_ROAD_3
-	EVENT_DISP $f, $7, $1b ; VICTORY_ROAD_3
-	EVENT_DISP $f, $1, $1 ; VICTORY_ROAD_3
+	EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1
+	EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $1d
+	EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $1d
+	EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $17 ; VICTORY_ROAD_3
+	EVENT_DISP VICTORY_ROAD_2_WIDTH, $e, $19 ; VICTORY_ROAD_3
+	EVENT_DISP VICTORY_ROAD_2_WIDTH, $7, $1b ; VICTORY_ROAD_3
+	EVENT_DISP VICTORY_ROAD_2_WIDTH, $1, $1 ; VICTORY_ROAD_3
 
 VictoryRoad2Blocks: ; 519af (14:59af)
 	INCBIN "maps/victoryroad2.blk"
@@ -80256,14 +80256,14 @@ MtMoon2Object: ; 0x51a4d (size=68)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $e, $5, $5 ; MT_MOON_1
-	EVENT_DISP $e, $b, $11 ; MT_MOON_3
-	EVENT_DISP $e, $9, $19 ; MT_MOON_1
-	EVENT_DISP $e, $f, $19 ; MT_MOON_1
-	EVENT_DISP $e, $11, $15 ; MT_MOON_3
-	EVENT_DISP $e, $1b, $d ; MT_MOON_3
-	EVENT_DISP $e, $3, $17 ; MT_MOON_3
-	EVENT_DISP $e, $3, $1b
+	EVENT_DISP MT_MOON_2_WIDTH, $5, $5 ; MT_MOON_1
+	EVENT_DISP MT_MOON_2_WIDTH, $b, $11 ; MT_MOON_3
+	EVENT_DISP MT_MOON_2_WIDTH, $9, $19 ; MT_MOON_1
+	EVENT_DISP MT_MOON_2_WIDTH, $f, $19 ; MT_MOON_1
+	EVENT_DISP MT_MOON_2_WIDTH, $11, $15 ; MT_MOON_3
+	EVENT_DISP MT_MOON_2_WIDTH, $1b, $d ; MT_MOON_3
+	EVENT_DISP MT_MOON_2_WIDTH, $3, $17 ; MT_MOON_3
+	EVENT_DISP MT_MOON_2_WIDTH, $3, $1b
 
 MtMoon2Blocks: ; 51a91 (14:5a91)
 	INCBIN "maps/mtmoon2.blk"
@@ -80827,12 +80827,12 @@ SilphCo7Object: ; 0x51ed7 (size=128)
 	db SPRITE_BALL, $b + 4, $18 + 4, $ff, $ff, $8b, TM_03 ; item
 
 	; warp-to
-	EVENT_DISP $d, $0, $10 ; SILPH_CO_8F
-	EVENT_DISP $d, $0, $16 ; SILPH_CO_6F
-	EVENT_DISP $d, $0, $12 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $d, $7, $5 ; SILPH_CO_11F
-	EVENT_DISP $d, $3, $5 ; SILPH_CO_3F
-	EVENT_DISP $d, $f, $15 ; SILPH_CO_5F
+	EVENT_DISP SILPH_CO_7F_WIDTH, $0, $10 ; SILPH_CO_8F
+	EVENT_DISP SILPH_CO_7F_WIDTH, $0, $16 ; SILPH_CO_6F
+	EVENT_DISP SILPH_CO_7F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_7F_WIDTH, $7, $5 ; SILPH_CO_11F
+	EVENT_DISP SILPH_CO_7F_WIDTH, $3, $5 ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_7F_WIDTH, $f, $15 ; SILPH_CO_5F
 
 SilphCo7Blocks: ; 51f57 (14:5f57)
 	INCBIN "maps/silphco7.blk"
@@ -81008,10 +81008,10 @@ Mansion2Object: ; 0x520d1 (size=63)
 	db SPRITE_BOOK_MAP_DEX, $16 + 4, $3 + 4, $ff, $ff, $4 ; person
 
 	; warp-to
-	EVENT_DISP $f, $a, $5 ; MANSION_1
-	EVENT_DISP $f, $a, $7 ; MANSION_3
-	EVENT_DISP $f, $e, $19 ; MANSION_3
-	EVENT_DISP $f, $1, $6 ; MANSION_3
+	EVENT_DISP MANSION_2_WIDTH, $a, $5 ; MANSION_1
+	EVENT_DISP MANSION_2_WIDTH, $a, $7 ; MANSION_3
+	EVENT_DISP MANSION_2_WIDTH, $e, $19 ; MANSION_3
+	EVENT_DISP MANSION_2_WIDTH, $1, $6 ; MANSION_3
 
 Mansion2Blocks: ; 52110 (14:6110)
 	INCBIN "maps/mansion2.blk"
@@ -81195,9 +81195,9 @@ Mansion3Object: ; 0x522e6 (size=64)
 	db SPRITE_BOOK_MAP_DEX, $c + 4, $6 + 4, $ff, $ff, $5 ; person
 
 	; warp-to
-	EVENT_DISP $f, $a, $7 ; MANSION_2
-	EVENT_DISP $f, $1, $6 ; MANSION_2
-	EVENT_DISP $f, $e, $19 ; MANSION_2
+	EVENT_DISP MANSION_3_WIDTH, $a, $7 ; MANSION_2
+	EVENT_DISP MANSION_3_WIDTH, $1, $6 ; MANSION_2
+	EVENT_DISP MANSION_3_WIDTH, $e, $19 ; MANSION_2
 
 Mansion3Blocks: ; 52326 (14:6326)
 	INCBIN "maps/mansion3.blk"
@@ -81361,7 +81361,7 @@ Mansion4Object: ; 0x52498 (size=69)
 	db SPRITE_BALL, $d + 4, $5 + 4, $ff, $ff, $88, SECRET_KEY ; item
 
 	; warp-to
-	EVENT_DISP $f, $16, $17 ; MANSION_1
+	EVENT_DISP MANSION_4_WIDTH, $16, $17 ; MANSION_1
 
 Mansion4Blocks: ; 524dd (14:64dd)
 	INCBIN "maps/mansion4.blk"
@@ -82115,12 +82115,12 @@ Route2Object: ; 0x54022 (size=72)
 	db SPRITE_BALL, $2d + 4, $d + 4, $ff, $ff, $82, HP_UP ; item
 
 	; warp-to
-	EVENT_DISP $a, $9, $c ; DIGLETTS_CAVE_EXIT
-	EVENT_DISP $a, $b, $3 ; VIRIDIAN_FOREST_EXIT
-	EVENT_DISP $a, $13, $f ; ROUTE_2_HOUSE
-	EVENT_DISP $a, $23, $10 ; ROUTE_2_GATE
-	EVENT_DISP $a, $27, $f ; ROUTE_2_GATE
-	EVENT_DISP $a, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE
+	EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT
+	EVENT_DISP ROUTE_2_WIDTH, $b, $3 ; VIRIDIAN_FOREST_EXIT
+	EVENT_DISP ROUTE_2_WIDTH, $13, $f ; ROUTE_2_HOUSE
+	EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE
+	EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE
+	EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE
 
 	; unused
 	EVENT_DISP $4, $7, $2
@@ -82191,9 +82191,9 @@ Route4Object: ; 0x543b2 (size=58)
 	db SPRITE_BALL, $3 + 4, $39 + 4, $ff, $ff, $83, TM_04 ; item
 
 	; warp-to
-	EVENT_DISP $2d, $5, $b ; MT_MOON_POKECENTER
-	EVENT_DISP $2d, $5, $12 ; MT_MOON_1
-	EVENT_DISP $2d, $5, $18 ; MT_MOON_2
+	EVENT_DISP ROUTE_4_WIDTH, $5, $b ; MT_MOON_POKECENTER
+	EVENT_DISP ROUTE_4_WIDTH, $5, $12 ; MT_MOON_1
+	EVENT_DISP ROUTE_4_WIDTH, $5, $18 ; MT_MOON_2
 
 Route4Blocks: ; 543ec (15:43ec)
 	INCBIN "maps/route4.blk"
@@ -82223,11 +82223,11 @@ Route5Object: ; 0x545a3 (size=47)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $a, $1d, $a ; ROUTE_5_GATE
-	EVENT_DISP $a, $1d, $9 ; ROUTE_5_GATE
-	EVENT_DISP $a, $21, $a ; ROUTE_5_GATE
-	EVENT_DISP $a, $1b, $11 ; PATH_ENTRANCE_ROUTE_5
-	EVENT_DISP $a, $15, $a ; DAYCAREM
+	EVENT_DISP ROUTE_5_WIDTH, $1d, $a ; ROUTE_5_GATE
+	EVENT_DISP ROUTE_5_WIDTH, $1d, $9 ; ROUTE_5_GATE
+	EVENT_DISP ROUTE_5_WIDTH, $21, $a ; ROUTE_5_GATE
+	EVENT_DISP ROUTE_5_WIDTH, $1b, $11 ; PATH_ENTRANCE_ROUTE_5
+	EVENT_DISP ROUTE_5_WIDTH, $15, $a ; DAYCAREM
 
 Route5Blocks: ; 545d2 (15:45d2)
 	INCBIN "maps/route5.blk"
@@ -85034,8 +85034,8 @@ VermilionHouse2Object: ; 0x560cf (size=26)
 	db SPRITE_FISHER, $4 + 4, $2 + 4, $ff, $d3, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $2
+	EVENT_DISP VERMILION_HOUSE_2_WIDTH, $7, $3
 
 CeladonMart2_h: ; 0x560e9 to 0x560f5 (12 bytes) (id=123)
 	db LOBBY ; tileset
@@ -85084,9 +85084,9 @@ CeladonMart2Object: ; 0x56111 (size=55)
 	db SPRITE_GIRL, $4 + 4, $e + 4, $fe, $1, $4 ; person
 
 	; warp-to
-	EVENT_DISP $a, $1, $c ; CELADON_MART_1
-	EVENT_DISP $a, $1, $10 ; CELADON_MART_3
-	EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+	EVENT_DISP CELADON_MART_2_WIDTH, $1, $c ; CELADON_MART_1
+	EVENT_DISP CELADON_MART_2_WIDTH, $1, $10 ; CELADON_MART_3
+	EVENT_DISP CELADON_MART_2_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
 
 CeladonMart2Blocks: ; 56148 (15:6148)
 	INCBIN "maps/celadonmart2.blk"
@@ -85188,9 +85188,9 @@ FuchsiaHouse3Object: ; 0x56221 (size=34)
 	db SPRITE_FISHER, $3 + 4, $5 + 4, $ff, $d3, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $0, $2
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $0, $2
+	EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $2
+	EVENT_DISP FUCHSIA_HOUSE_3_WIDTH, $7, $3
 
 DayCareM_h: ; 0x56243 to 0x5624f (12 bytes) (id=72)
 	db HOUSE ; tileset
@@ -85487,8 +85487,8 @@ DayCareMObject: ; 0x56459 (size=26)
 	db SPRITE_GENTLEMAN, $3 + 4, $2 + 4, $ff, $d3, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP DAYCAREM_WIDTH, $7, $2
+	EVENT_DISP DAYCAREM_WIDTH, $7, $3
 
 Route12House_h: ; 0x56473 to 0x5647f (12 bytes) (id=189)
 	db HOUSE ; tileset
@@ -85568,8 +85568,8 @@ Route12HouseObject: ; 0x564de (size=26)
 	db SPRITE_FISHER, $4 + 4, $2 + 4, $ff, $d3, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $2
+	EVENT_DISP ROUTE_12_HOUSE_WIDTH, $7, $3
 
 SilphCo8_h: ; 0x564f8 to 0x56504 (12 bytes) (id=213)
 	db FACILITY ; tileset
@@ -85787,13 +85787,13 @@ SilphCo8Object: ; 0x56613 (size=90)
 	db SPRITE_ROCKET, $f + 4, $c + 4, $ff, $d3, $44, ROCKET + $C8, $24 ; trainer
 
 	; warp-to
-	EVENT_DISP $d, $0, $10 ; SILPH_CO_9F
-	EVENT_DISP $d, $0, $e ; SILPH_CO_7F
-	EVENT_DISP $d, $0, $12 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $d, $b, $3 ; SILPH_CO_8F
-	EVENT_DISP $d, $f, $3 ; SILPH_CO_2F
-	EVENT_DISP $d, $5, $b ; SILPH_CO_2F
-	EVENT_DISP $d, $9, $b ; SILPH_CO_8F
+	EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F
+	EVENT_DISP SILPH_CO_8F_WIDTH, $0, $e ; SILPH_CO_7F
+	EVENT_DISP SILPH_CO_8F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_8F_WIDTH, $b, $3 ; SILPH_CO_8F
+	EVENT_DISP SILPH_CO_8F_WIDTH, $f, $3 ; SILPH_CO_2F
+	EVENT_DISP SILPH_CO_8F_WIDTH, $5, $b ; SILPH_CO_2F
+	EVENT_DISP SILPH_CO_8F_WIDTH, $9, $b ; SILPH_CO_8F
 
 SilphCo8Blocks: ; 5666d (15:666d)
 	INCBIN "maps/silphco8.blk"
@@ -86292,10 +86292,10 @@ Route6Object: ; 0x58022 (size=87)
 	db SPRITE_BUG_CATCHER, $1a + 4, $13 + 4, $ff, $d2, $46, BUG_CATCHER + $C8, $b ; trainer
 
 	; warp-to
-	EVENT_DISP $a, $1, $9 ; ROUTE_6_GATE
-	EVENT_DISP $a, $1, $a ; ROUTE_6_GATE
-	EVENT_DISP $a, $7, $a ; ROUTE_6_GATE
-	EVENT_DISP $a, $d, $11 ; PATH_ENTRANCE_ROUTE_6
+	EVENT_DISP ROUTE_6_WIDTH, $1, $9 ; ROUTE_6_GATE
+	EVENT_DISP ROUTE_6_WIDTH, $1, $a ; ROUTE_6_GATE
+	EVENT_DISP ROUTE_6_WIDTH, $7, $a ; ROUTE_6_GATE
+	EVENT_DISP ROUTE_6_WIDTH, $d, $11 ; PATH_ENTRANCE_ROUTE_6
 
 Route6Blocks: ; 58079 (16:4079)
 	INCBIN "maps/route6.blk"
@@ -86334,11 +86334,11 @@ Route8Object: ; 0x5814f (size=119)
 	db SPRITE_LASS, $c + 4, $33 + 4, $ff, $d2, $49, LASS + $C8, $10 ; trainer
 
 	; warp-to
-	EVENT_DISP $1e, $9, $1 ; ROUTE_8_GATE
-	EVENT_DISP $1e, $a, $1 ; ROUTE_8_GATE
-	EVENT_DISP $1e, $9, $8 ; ROUTE_8_GATE
-	EVENT_DISP $1e, $a, $8 ; ROUTE_8_GATE
-	EVENT_DISP $1e, $3, $d ; PATH_ENTRANCE_ROUTE_8
+	EVENT_DISP ROUTE_8_WIDTH, $9, $1 ; ROUTE_8_GATE
+	EVENT_DISP ROUTE_8_WIDTH, $a, $1 ; ROUTE_8_GATE
+	EVENT_DISP ROUTE_8_WIDTH, $9, $8 ; ROUTE_8_GATE
+	EVENT_DISP ROUTE_8_WIDTH, $a, $8 ; ROUTE_8_GATE
+	EVENT_DISP ROUTE_8_WIDTH, $3, $d ; PATH_ENTRANCE_ROUTE_8
 
 Route8Blocks: ; 581c6 (16:41c6)
 	INCBIN "maps/route8.blk"
@@ -86376,10 +86376,10 @@ Route10Object: ; 0x582f6 (size=96)
 	db SPRITE_LASS, $36 + 4, $7 + 4, $ff, $d0, $46, JR__TRAINER_F + $C8, $8 ; trainer
 
 	; warp-to
-	EVENT_DISP $a, $13, $b ; ROCK_TUNNEL_POKECENTER
-	EVENT_DISP $a, $11, $8 ; ROCK_TUNNEL_1
-	EVENT_DISP $a, $35, $8 ; ROCK_TUNNEL_1
-	EVENT_DISP $a, $27, $6 ; POWER_PLANT
+	EVENT_DISP ROUTE_10_WIDTH, $13, $b ; ROCK_TUNNEL_POKECENTER
+	EVENT_DISP ROUTE_10_WIDTH, $11, $8 ; ROCK_TUNNEL_1
+	EVENT_DISP ROUTE_10_WIDTH, $35, $8 ; ROCK_TUNNEL_1
+	EVENT_DISP ROUTE_10_WIDTH, $27, $6 ; POWER_PLANT
 
 Route10Blocks: ; 58356 (16:4356)
 	INCBIN "maps/route10.blk"
@@ -86419,11 +86419,11 @@ Route11Object: ; 0x584e0 (size=127)
 	db SPRITE_BUG_CATCHER, $c + 4, $16 + 4, $ff, $d1, $4a, YOUNGSTER + $C8, $c ; trainer
 
 	; warp-to
-	EVENT_DISP $1e, $8, $31 ; ROUTE_11_GATE_1F
-	EVENT_DISP $1e, $9, $31 ; ROUTE_11_GATE_1F
-	EVENT_DISP $1e, $8, $3a ; ROUTE_11_GATE_1F
-	EVENT_DISP $1e, $9, $3a ; ROUTE_11_GATE_1F
-	EVENT_DISP $1e, $5, $4 ; DIGLETTS_CAVE_ENTRANCE
+	EVENT_DISP ROUTE_11_WIDTH, $8, $31 ; ROUTE_11_GATE_1F
+	EVENT_DISP ROUTE_11_WIDTH, $9, $31 ; ROUTE_11_GATE_1F
+	EVENT_DISP ROUTE_11_WIDTH, $8, $3a ; ROUTE_11_GATE_1F
+	EVENT_DISP ROUTE_11_WIDTH, $9, $3a ; ROUTE_11_GATE_1F
+	EVENT_DISP ROUTE_11_WIDTH, $5, $4 ; DIGLETTS_CAVE_ENTRANCE
 
 Route11Blocks: ; 5855f (16:455f)
 	INCBIN "maps/route11.blk"
@@ -86442,9 +86442,9 @@ Route12Object: ; 0x5869a (size=118)
 	db $43 ; border tile
 
 	db $4 ; warps
-	db $f, $a, $0, ROUTE_12_GATE
-	db $f, $b, $1, ROUTE_12_GATE
-	db $15, $a, $2, ROUTE_12_GATE
+	db $f, $a, $0, ROUTE_12_GATE_1F
+	db $f, $b, $1, ROUTE_12_GATE_1F
+	db $15, $a, $2, ROUTE_12_GATE_1F
 	db $4d, $b, $0, ROUTE_12_HOUSE
 
 	db $2 ; signs
@@ -86464,10 +86464,10 @@ Route12Object: ; 0x5869a (size=118)
 	db SPRITE_BALL, $59 + 4, $5 + 4, $ff, $ff, $8a, IRON ; item
 
 	; warp-to
-	EVENT_DISP $a, $f, $a ; ROUTE_12_GATE
-	EVENT_DISP $a, $f, $b ; ROUTE_12_GATE
-	EVENT_DISP $a, $15, $a ; ROUTE_12_GATE
-	EVENT_DISP $a, $4d, $b ; ROUTE_12_HOUSE
+	EVENT_DISP ROUTE_12_WIDTH, $f, $a ; ROUTE_12_GATE_1F
+	EVENT_DISP ROUTE_12_WIDTH, $f, $b ; ROUTE_12_GATE_1F
+	EVENT_DISP ROUTE_12_WIDTH, $15, $a ; ROUTE_12_GATE_1F
+	EVENT_DISP ROUTE_12_WIDTH, $4d, $b ; ROUTE_12_HOUSE
 
 Route12Blocks: ; 58710 (16:4710)
 	INCBIN "maps/route12.blk"
@@ -86507,10 +86507,10 @@ Route15Object: ; 0x5894e (size=126)
 	db SPRITE_BALL, $5 + 4, $12 + 4, $ff, $ff, $8b, TM_20 ; item
 
 	; warp-to
-	EVENT_DISP $1e, $8, $7 ; ROUTE_15_GATE_1F
-	EVENT_DISP $1e, $9, $7 ; ROUTE_15_GATE_1F
-	EVENT_DISP $1e, $8, $e ; ROUTE_15_GATE_1F
-	EVENT_DISP $1e, $9, $e ; ROUTE_15_GATE_1F
+	EVENT_DISP ROUTE_15_WIDTH, $8, $7 ; ROUTE_15_GATE_1F
+	EVENT_DISP ROUTE_15_WIDTH, $9, $7 ; ROUTE_15_GATE_1F
+	EVENT_DISP ROUTE_15_WIDTH, $8, $e ; ROUTE_15_GATE_1F
+	EVENT_DISP ROUTE_15_WIDTH, $9, $e ; ROUTE_15_GATE_1F
 
 Route15Blocks: ; 589cc (16:49cc)
 	INCBIN "maps/route15.blk"
@@ -86552,15 +86552,15 @@ Route16Object: ; 0x58afc (size=136)
 	db SPRITE_SNORLAX, $a + 4, $1a + 4, $ff, $d0, $7 ; person
 
 	; warp-to
-	EVENT_DISP $14, $a, $11 ; ROUTE_16_GATE_1F
-	EVENT_DISP $14, $b, $11 ; ROUTE_16_GATE_1F
-	EVENT_DISP $14, $a, $18 ; ROUTE_16_GATE_1F
-	EVENT_DISP $14, $b, $18 ; ROUTE_16_GATE_1F
-	EVENT_DISP $14, $4, $11 ; ROUTE_16_GATE_1F
-	EVENT_DISP $14, $5, $11 ; ROUTE_16_GATE_1F
-	EVENT_DISP $14, $4, $18 ; ROUTE_16_GATE_1F
-	EVENT_DISP $14, $5, $18 ; ROUTE_16_GATE_1F
-	EVENT_DISP $14, $5, $7 ; ROUTE_16_HOUSE
+	EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_WIDTH, $b, $11 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_WIDTH, $a, $18 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_WIDTH, $b, $18 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_WIDTH, $4, $11 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_WIDTH, $5, $11 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_WIDTH, $4, $18 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_WIDTH, $5, $18 ; ROUTE_16_GATE_1F
+	EVENT_DISP ROUTE_16_WIDTH, $5, $7 ; ROUTE_16_HOUSE
 
 Route16Blocks: ; 58b84 (16:4b84)
 	INCBIN "maps/route16.blk"
@@ -86593,10 +86593,10 @@ Route18Object: ; 0x58c5a (size=66)
 	db SPRITE_BLACK_HAIR_BOY_1, $d + 4, $2a + 4, $ff, $d2, $43, BIRD_KEEPER + $C8, $a ; trainer
 
 	; warp-to
-	EVENT_DISP $19, $8, $21 ; ROUTE_18_GATE_1F
-	EVENT_DISP $19, $9, $21 ; ROUTE_18_GATE_1F
-	EVENT_DISP $19, $8, $28 ; ROUTE_18_GATE_1F
-	EVENT_DISP $19, $9, $28 ; ROUTE_18_GATE_1F
+	EVENT_DISP ROUTE_18_WIDTH, $8, $21 ; ROUTE_18_GATE_1F
+	EVENT_DISP ROUTE_18_WIDTH, $9, $21 ; ROUTE_18_GATE_1F
+	EVENT_DISP ROUTE_18_WIDTH, $8, $28 ; ROUTE_18_GATE_1F
+	EVENT_DISP ROUTE_18_WIDTH, $9, $28 ; ROUTE_18_GATE_1F
 
 Route18Blocks: ; 58c9c (16:4c9c)
 	INCBIN "maps/route18.blk"
@@ -89214,8 +89214,8 @@ FanClubObject: ; 0x59c97 (size=62)
 	db SPRITE_CABLE_CLUB_WOMAN, $1 + 4, $5 + 4, $ff, $d0, $6 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $2
+	EVENT_DISP POKEMON_FAN_CLUB_WIDTH, $7, $3
 
 FanClubBlocks: ; 59cd5 (16:5cd5)
 	INCBIN "maps/fanclub.blk"
@@ -89498,13 +89498,13 @@ SilphCo2Object: ; 0x59e66 (size=98)
 	db SPRITE_ROCKET, $7 + 4, $18 + 4, $ff, $d1, $45, ROCKET + $C8, $18 ; trainer
 
 	; warp-to
-	EVENT_DISP $f, $0, $18 ; SILPH_CO_1F
-	EVENT_DISP $f, $0, $1a ; SILPH_CO_3F
-	EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $f, $3, $3 ; SILPH_CO_3F
-	EVENT_DISP $f, $3, $d ; SILPH_CO_8F
-	EVENT_DISP $f, $f, $1b ; SILPH_CO_8F
-	EVENT_DISP $f, $f, $9 ; SILPH_CO_6F
+	EVENT_DISP SILPH_CO_2F_WIDTH, $0, $18 ; SILPH_CO_1F
+	EVENT_DISP SILPH_CO_2F_WIDTH, $0, $1a ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_2F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_2F_WIDTH, $3, $3 ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_2F_WIDTH, $3, $d ; SILPH_CO_8F
+	EVENT_DISP SILPH_CO_2F_WIDTH, $f, $1b ; SILPH_CO_8F
+	EVENT_DISP SILPH_CO_2F_WIDTH, $f, $9 ; SILPH_CO_6F
 
 SilphCo2Blocks: ; 59ec8 (16:5ec8)
 	INCBIN "maps/silphco2.blk"
@@ -89680,16 +89680,16 @@ SilphCo3Object: ; 0x5a035 (size=113)
 	db SPRITE_BALL, $5 + 4, $8 + 4, $ff, $ff, $84, HYPER_POTION ; item
 
 	; warp-to
-	EVENT_DISP $f, $0, $1a ; SILPH_CO_2F
-	EVENT_DISP $f, $0, $18 ; SILPH_CO_4F
-	EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $f, $b, $17 ; SILPH_CO_3F
-	EVENT_DISP $f, $3, $3 ; SILPH_CO_5F
-	EVENT_DISP $f, $f, $3 ; SILPH_CO_5F
-	EVENT_DISP $f, $3, $1b ; SILPH_CO_2F
-	EVENT_DISP $f, $b, $3 ; SILPH_CO_9F
-	EVENT_DISP $f, $b, $b ; SILPH_CO_7F
-	EVENT_DISP $f, $f, $1b ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $0, $1a ; SILPH_CO_2F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $0, $18 ; SILPH_CO_4F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_3F_WIDTH, $b, $17 ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $3, $3 ; SILPH_CO_5F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $f, $3 ; SILPH_CO_5F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $3, $1b ; SILPH_CO_2F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $b, $3 ; SILPH_CO_9F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $b, $b ; SILPH_CO_7F
+	EVENT_DISP SILPH_CO_3F_WIDTH, $f, $1b ; SILPH_CO_3F
 
 SilphCo3Blocks: ; 5a0a6 (16:60a6)
 	INCBIN "maps/silphco3.blk"
@@ -89850,12 +89850,12 @@ SilphCo10Object: ; 0x5a1fb (size=95)
 	db SPRITE_BALL, $b + 4, $5 + 4, $ff, $ff, $86, CARBOS ; item
 
 	; warp-to
-	EVENT_DISP $8, $0, $8 ; SILPH_CO_9F
-	EVENT_DISP $8, $0, $a ; SILPH_CO_11F
-	EVENT_DISP $8, $0, $c ; SILPH_CO_ELEVATOR
-	EVENT_DISP $8, $b, $9 ; SILPH_CO_4F
-	EVENT_DISP $8, $f, $d ; SILPH_CO_4F
-	EVENT_DISP $8, $7, $d ; SILPH_CO_4F
+	EVENT_DISP SILPH_CO_10F_WIDTH, $0, $8 ; SILPH_CO_9F
+	EVENT_DISP SILPH_CO_10F_WIDTH, $0, $a ; SILPH_CO_11F
+	EVENT_DISP SILPH_CO_10F_WIDTH, $0, $c ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_10F_WIDTH, $b, $9 ; SILPH_CO_4F
+	EVENT_DISP SILPH_CO_10F_WIDTH, $f, $d ; SILPH_CO_4F
+	EVENT_DISP SILPH_CO_10F_WIDTH, $7, $d ; SILPH_CO_4F
 
 SilphCo10Blocks: ; 5a25a (16:625a)
 	INCBIN "maps/silphco10.blk"
@@ -90048,9 +90048,9 @@ LanceObject: ; 0x5a3c5 (size=36)
 	db SPRITE_LANCE, $1 + 4, $6 + 4, $ff, $d0, $41, LANCE + $C8, $1 ; trainer
 
 	; warp-to
-	EVENT_DISP $d, $10, $18 ; AGATHAS_ROOM
-	EVENT_DISP $d, $0, $5 ; CHAMPIONS_ROOM
-	EVENT_DISP $d, $0, $6 ; CHAMPIONS_ROOM
+	EVENT_DISP LANCES_ROOM_WIDTH, $10, $18 ; AGATHAS_ROOM
+	EVENT_DISP LANCES_ROOM_WIDTH, $0, $5 ; CHAMPIONS_ROOM
+	EVENT_DISP LANCES_ROOM_WIDTH, $0, $6 ; CHAMPIONS_ROOM
 
 LanceBlocks: ; 5a3e9 (16:63e9)
 	INCBIN "maps/lance.blk"
@@ -90193,8 +90193,8 @@ HallofFameRoomObject: ; 0x5a571 (size=26)
 	db SPRITE_OAK, $2 + 4, $5 + 4, $ff, $d0, $1 ; person
 
 	; warp-to
-	EVENT_DISP $5, $7, $4 ; CHAMPIONS_ROOM
-	EVENT_DISP $5, $7, $5 ; CHAMPIONS_ROOM
+	EVENT_DISP HALL_OF_FAME_WIDTH, $7, $4 ; CHAMPIONS_ROOM
+	EVENT_DISP HALL_OF_FAME_WIDTH, $7, $5 ; CHAMPIONS_ROOM
 
 HallofFameRoomBlocks: ; 5a58b (16:658b)
 	INCBIN "maps/halloffameroom.blk"
@@ -90226,15 +90226,15 @@ CeruleanMartBlocks: ; 5c000 (17:4000)
 VermilionMartBlocks: ; 5c000 (17:4000)
 	INCBIN "maps/vermilionmart.blk"
 
-CopycatsHouseF2Blocks: ; 5c010 (17:4010)
+CopycatsHouse2FBlocks: ; 5c010 (17:4010)
 RedsHouse2FBlocks: ; 0x5c010 16?
 	INCBIN "maps/redshouse2f.blk"
 
-MuseumF1Blocks: ; 5c020 (17:4020)
-	INCBIN "maps/museumf1.blk"
+Museum1FBlocks: ; 5c020 (17:4020)
+	INCBIN "maps/museum1f.blk"
 
-MuseumF2Blocks: ; 5c048 (17:4048)
-	INCBIN "maps/museumf2.blk"
+Museum2FBlocks: ; 5c048 (17:4048)
+	INCBIN "maps/museum2f.blk"
 
 SaffronPokecenterBlocks: ; 5c064 (17:4064)
 VermilionPokecenterBlocks: ; 5c064 (17:4064)
@@ -90250,7 +90250,7 @@ UndergroundTunnelEntranceRoute5Blocks: ; 5c080 (17:4080)
 
 Route2GateBlocks: ; 5c090 (17:4090)
 ViridianForestEntranceBlocks: ; 5c090 (17:4090)
-ViridianForestexitBlocks: ; 5c090 (17:4090)
+ViridianForestExitBlocks: ; 5c090 (17:4090)
 	INCBIN "maps/viridianforestexit.blk"
 
 RedsHouse2F_h: ; 5c0a4 (17:40a4)
@@ -90307,27 +90307,27 @@ Func_5c0dc: ; 5c0dc (17:40dc)
 	ld [wPokedexOwned], a ; $d2f7
 	ret
 
-MuseumF1_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
+Museum1F_h: ; 0x5c0eb to 0x5c0f7 (12 bytes) (id=52)
 	db MUSEUM ; tileset
 	db MUSEUM_1F_HEIGHT, MUSEUM_1F_WIDTH ; dimensions (y, x)
-	dw MuseumF1Blocks, MuseumF1TextPointers, MuseumF1Script ; blocks, texts, scripts
+	dw Museum1FBlocks, Museum1FTextPointers, Museum1FScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw MuseumF1Object ; objects
+	dw Museum1FObject ; objects
 
-MuseumF1Script: ; 5c0f7 (17:40f7)
+Museum1FScript: ; 5c0f7 (17:40f7)
 	ld a, $1
 	ld [$cf0c], a
 	xor a
 	ld [$cc3c], a
-	ld hl, MuseumF1ScriptPointers
-	ld a, [W_MUSEUMF1CURSCRIPT]
+	ld hl, Museum1FScriptPointers
+	ld a, [W_MUSEUM1FCURSCRIPT]
 	jp CallFunctionInTable
 
-MuseumF1ScriptPointers: ; 5c109 (17:4109)
-	dw MuseumF1Script0
-	dw MuseumF1Script1
+Museum1FScriptPointers: ; 5c109 (17:4109)
+	dw Museum1FScript0
+	dw Museum1FScript1
 
-MuseumF1Script0: ; 5c10d (17:410d)
+Museum1FScript0: ; 5c10d (17:410d)
 	ld a, [$d361]
 	cp $4
 	ret nz
@@ -90344,17 +90344,17 @@ MuseumF1Script0: ; 5c10d (17:410d)
 	ld [$ff8c], a
 	jp DisplayTextID
 
-MuseumF1Script1: ; 5c12a (17:412a)
+Museum1FScript1: ; 5c12a (17:412a)
 	ret
 
-MuseumF1TextPointers: ; 5c12b (17:412b)
-	dw MuseumF1Text1
-	dw MuseumF1Text2
-	dw MuseumF1Text3
-	dw MuseumF1Text4
-	dw MuseumF1Text5
+Museum1FTextPointers: ; 5c12b (17:412b)
+	dw Museum1FText1
+	dw Museum1FText2
+	dw Museum1FText3
+	dw Museum1FText4
+	dw Museum1FText5
 
-MuseumF1Text1: ; 5c135 (17:4135)
+Museum1FText1: ; 5c135 (17:4135)
 	db $8
 	ld a, [$d361]
 	cp $4
@@ -90440,7 +90440,7 @@ asm_de133: ; 5c1da (17:41da)
 	jr asm_d1145 ; 0x5c1f0 $25
 asm_0b094: ; 5c1f2 (17:41f2)
 	ld a, $1
-	ld [W_MUSEUMF1CURSCRIPT], a
+	ld [W_MUSEUM1FCURSCRIPT], a
 	jr asm_d1145 ; 0x5c1f7 $1e
 
 Func_5c1f9: ; 5c1f9 (17:41f9)
@@ -90495,7 +90495,7 @@ UnnamedText_5c242: ; 5c242 (17:4242)
 	TX_FAR _UnnamedText_5c242
 	db "@"
 
-MuseumF1Text2: ; 5c247 (17:4247)
+Museum1FText2: ; 5c247 (17:4247)
 	db $08 ; asm
 	ld hl, UnnamedText_5c251
 	call PrintText
@@ -90505,7 +90505,7 @@ UnnamedText_5c251: ; 5c251 (17:4251)
 	TX_FAR _UnnamedText_5c251
 	db "@"
 
-MuseumF1Text3: ; 5c256 (17:4256)
+Museum1FText3: ; 5c256 (17:4256)
 	db $08 ; asm
 	ld a, [$d754]
 	bit 1, a
@@ -90548,7 +90548,7 @@ UnnamedText_5c29e: ; 5c29e (17:429e)
 	TX_FAR _UnnamedText_5c29e
 	db "@"
 
-MuseumF1Text4: ; 5c2a3 (17:42a3)
+Museum1FText4: ; 5c2a3 (17:42a3)
 	db $08 ; asm
 	ld hl, UnnamedText_5c2ad
 	call PrintText
@@ -90558,7 +90558,7 @@ UnnamedText_5c2ad: ; 5c2ad (17:42ad)
 	TX_FAR _UnnamedText_5c2ad
 	db "@"
 
-MuseumF1Text5: ; 5c2b2 (17:42b2)
+Museum1FText5: ; 5c2b2 (17:42b2)
 	db $08 ; asm
 	ld hl, UnnamedText_5c2bc
 	call PrintText
@@ -90568,7 +90568,7 @@ UnnamedText_5c2bc: ; 5c2bc (17:42bc)
 	TX_FAR _UnnamedText_5c2bc
 	db "@"
 
-MuseumF1Object: ; 0x5c2c1 (size=74)
+Museum1FObject: ; 0x5c2c1 (size=74)
 	db $a ; border tile
 
 	db $5 ; warps
@@ -90588,68 +90588,68 @@ MuseumF1Object: ; 0x5c2c1 (size=74)
 	db SPRITE_OLD_AMBER, $2 + 4, $10 + 4, $ff, $ff, $5 ; person
 
 	; warp-to
-	EVENT_DISP $a, $7, $a
-	EVENT_DISP $a, $7, $b
-	EVENT_DISP $a, $7, $10
-	EVENT_DISP $a, $7, $11
-	EVENT_DISP $a, $7, $7 ; MUSEUM_2F
+	EVENT_DISP MUSEUM_1F_WIDTH, $7, $a
+	EVENT_DISP MUSEUM_1F_WIDTH, $7, $b
+	EVENT_DISP MUSEUM_1F_WIDTH, $7, $10
+	EVENT_DISP MUSEUM_1F_WIDTH, $7, $11
+	EVENT_DISP MUSEUM_1F_WIDTH, $7, $7 ; MUSEUM_2F
 
-MuseumF2_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
+Museum2F_h: ; 0x5c30b to 0x5c317 (12 bytes) (id=53)
 	db MUSEUM ; tileset
 	db MUSEUM_2F_HEIGHT, MUSEUM_2F_WIDTH ; dimensions (y, x)
-	dw MuseumF2Blocks, MuseumF2TextPointers, MuseumF2Script ; blocks, texts, scripts
+	dw Museum2FBlocks, Museum2FTextPointers, Museum2FScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw MuseumF2Object ; objects
+	dw Museum2FObject ; objects
 
-MuseumF2Script: ; 5c317 (17:4317)
+Museum2FScript: ; 5c317 (17:4317)
 	jp EnableAutoTextBoxDrawing
 
-MuseumF2TextPointers: ; 5c31a (17:431a)
-	dw MuseumF2Text1
-	dw MuseumF2Text2
-	dw MuseumF2Text3
-	dw MuseumF2Text4
-	dw MuseumF2Text5
-	dw MuseumF2Text6
-	dw MuseumF2Text7
+Museum2FTextPointers: ; 5c31a (17:431a)
+	dw Museum2FText1
+	dw Museum2FText2
+	dw Museum2FText3
+	dw Museum2FText4
+	dw Museum2FText5
+	dw Museum2FText6
+	dw Museum2FText7
 
-MuseumF2Text1: ; 5c328 (17:4328)
-	TX_FAR _MuseumF2Text1
+Museum2FText1: ; 5c328 (17:4328)
+	TX_FAR _Museum2FText1
 	db "@"
 
-MuseumF2Text2: ; 5c32d (17:432d)
-	TX_FAR _MuseumF2Text2
+Museum2FText2: ; 5c32d (17:432d)
+	TX_FAR _Museum2FText2
 	db "@"
 
-MuseumF2Text3: ; 5c332 (17:4332)
-	TX_FAR _MuseumF2Text3
+Museum2FText3: ; 5c332 (17:4332)
+	TX_FAR _Museum2FText3
 	db "@"
 
-MuseumF2Text4: ; 5c337 (17:4337)
-	TX_FAR _MuseumF2Text4
+Museum2FText4: ; 5c337 (17:4337)
+	TX_FAR _Museum2FText4
 	db "@"
 
-MuseumF2Text5: ; 5c33c (17:433c)
-	TX_FAR _MuseumF2Text5
+Museum2FText5: ; 5c33c (17:433c)
+	TX_FAR _Museum2FText5
 	db "@"
 
-MuseumF2Text6: ; 5c341 (17:4341)
-	TX_FAR _MuseumF2Text6
+Museum2FText6: ; 5c341 (17:4341)
+	TX_FAR _Museum2FText6
 	db "@"
 
-MuseumF2Text7: ; 5c346 (17:4346)
-	TX_FAR _MuseumF2Text7
+Museum2FText7: ; 5c346 (17:4346)
+	TX_FAR _Museum2FText7
 	db "@"
 
-MuseumF2Object: ; 0x5c34b (size=48)
+Museum2FObject: ; 0x5c34b (size=48)
 	db $a ; border tile
 
 	db $1 ; warps
 	db $7, $7, $4, MUSEUM_1F
 
 	db $2 ; signs
-	db $2, $b, $6 ; MuseumF2Text6
-	db $5, $2, $7 ; MuseumF2Text7
+	db $2, $b, $6 ; Museum2FText6
+	db $5, $2, $7 ; Museum2FText7
 
 	db $5 ; people
 	db SPRITE_BUG_CATCHER, $7 + 4, $1 + 4, $fe, $2, $1 ; person
@@ -90659,7 +90659,7 @@ MuseumF2Object: ; 0x5c34b (size=48)
 	db SPRITE_HIKER, $5 + 4, $c + 4, $ff, $d0, $5 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $7 ; MUSEUM_1F
+	EVENT_DISP MUSEUM_2F_WIDTH, $7, $7 ; MUSEUM_1F
 
 PewterGym_h: ; 0x5c37b to 0x5c387 (12 bytes) (id=54)
 	db GYM ; tileset
@@ -90916,8 +90916,8 @@ PewterGymObject: ; 0x5c52e (size=42)
 	db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $3 ; person
 
 	; warp-to
-	EVENT_DISP $5, $d, $4
-	EVENT_DISP $5, $d, $5
+	EVENT_DISP PEWTER_GYM_WIDTH, $d, $4
+	EVENT_DISP PEWTER_GYM_WIDTH, $d, $5
 
 PewterGymBlocks: ; 5c558 (17:4558)
 	INCBIN "maps/pewtergym.blk"
@@ -91021,8 +91021,8 @@ PewterPokecenterObject: ; 0x5c60d (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP PEWTER_POKECENTER_WIDTH, $7, $4
 
 CeruleanPokecenter_h: ; 0x5c639 to 0x5c645 (12 bytes) (id=64)
 	db POKECENTER ; tileset
@@ -91071,8 +91071,8 @@ CeruleanPokecenterObject: ; 0x5c65f (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP CERULEAN_POKECENTER_WIDTH, $7, $4
 
 CeruleanPokecenterBlocks: ; 5c68b (17:468b)
 	INCBIN "maps/ceruleanpokecenter.blk"
@@ -91322,8 +91322,8 @@ CeruleanGymObject: ; 0x5c834 (size=50)
 	db SPRITE_GYM_HELPER, $a + 4, $7 + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $5, $d, $4
-	EVENT_DISP $5, $d, $5
+	EVENT_DISP CERULEAN_GYM_WIDTH, $d, $4
+	EVENT_DISP CERULEAN_GYM_WIDTH, $d, $5
 
 CeruleanGymBlocks: ; 5c866 (17:4866)
 	INCBIN "maps/ceruleangym.blk"
@@ -91366,8 +91366,8 @@ CeruleanMartObject: ; 0x5c8a8 (size=38)
 	db SPRITE_LASS, $2 + 4, $6 + 4, $fe, $2, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
+	EVENT_DISP CERULEAN_MART_WIDTH, $7, $3
+	EVENT_DISP CERULEAN_MART_WIDTH, $7, $4
 
 LavenderPokecenter_h: ; 0x5c8ce to 0x5c8da (12 bytes) (id=141)
 	db POKECENTER ; tileset
@@ -91416,8 +91416,8 @@ LavenderPokecenterObject: ; 0x5c8f4 (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP LAVENDER_POKECENTER_WIDTH, $7, $4
 
 LavenderMart_h: ; 0x5c920 to 0x5c92c (12 bytes) (id=150)
 	db MART ; tileset
@@ -91475,8 +91475,8 @@ LavenderMartObject: ; 0x5c95d (size=38)
 	db SPRITE_BLACK_HAIR_BOY_1, $2 + 4, $7 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
+	EVENT_DISP LAVENDER_MART_WIDTH, $7, $3
+	EVENT_DISP LAVENDER_MART_WIDTH, $7, $4
 
 VermilionPokecenter_h: ; 0x5c983 to 0x5c98f (12 bytes) (id=89)
 	db POKECENTER ; tileset
@@ -91525,8 +91525,8 @@ VermilionPokecenterObject: ; 0x5c9a9 (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP VERMILION_POKECENTER_WIDTH, $7, $4
 
 VermilionMart_h: ; 0x5c9d5 to 0x5c9e1 (12 bytes) (id=91)
 	db MART ; tileset
@@ -91566,8 +91566,8 @@ VermilionMartObject: ; 0x5c9f4 (size=38)
 	db SPRITE_LASS, $3 + 4, $3 + 4, $fe, $2, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
+	EVENT_DISP VERMILION_MART_WIDTH, $7, $3
+	EVENT_DISP VERMILION_MART_WIDTH, $7, $4
 
 VermilionGym_h: ; 0x5ca1a to 0x5ca26 (12 bytes) (id=92)
 	db GYM ; tileset
@@ -91866,32 +91866,32 @@ VermilionGymObject: ; 0x5cbfe (size=58)
 	db SPRITE_GYM_HELPER, $e + 4, $4 + 4, $ff, $d0, $5 ; person
 
 	; warp-to
-	EVENT_DISP $5, $11, $4
-	EVENT_DISP $5, $11, $5
+	EVENT_DISP VERMILION_GYM_WIDTH, $11, $4
+	EVENT_DISP VERMILION_GYM_WIDTH, $11, $5
 
 VermilionGymBlocks: ; 5cc38 (17:4c38)
 	INCBIN "maps/vermiliongym.blk"
 
-CopycatsHouseF2_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
+CopycatsHouse2F_h: ; 0x5cc65 to 0x5cc71 (12 bytes) (id=176)
 	db REDS_HOUSE_2 ; tileset
 	db COPYCATS_HOUSE_2F_HEIGHT, COPYCATS_HOUSE_2F_WIDTH ; dimensions (y, x)
-	dw CopycatsHouseF2Blocks, CopycatsHouseF2TextPointers, CopycatsHouseF2Script ; blocks, texts, scripts
+	dw CopycatsHouse2FBlocks, CopycatsHouse2FTextPointers, CopycatsHouse2FScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw CopycatsHouseF2Object ; objects
+	dw CopycatsHouse2FObject ; objects
 
-CopycatsHouseF2Script: ; 5cc71 (17:4c71)
+CopycatsHouse2FScript: ; 5cc71 (17:4c71)
 	jp EnableAutoTextBoxDrawing
 
-CopycatsHouseF2TextPointers: ; 5cc74 (17:4c74)
-	dw CopycatsHouseF2Text1
-	dw CopycatsHouseF2Text2
-	dw CopycatsHouseF2Text3
-	dw CopycatsHouseF2Text4
-	dw CopycatsHouseF2Text5
-	dw CopycatsHouseF2Text6
-	dw CopycatsHouseF2Text7
+CopycatsHouse2FTextPointers: ; 5cc74 (17:4c74)
+	dw CopycatsHouse2FText1
+	dw CopycatsHouse2FText2
+	dw CopycatsHouse2FText3
+	dw CopycatsHouse2FText4
+	dw CopycatsHouse2FText5
+	dw CopycatsHouse2FText6
+	dw CopycatsHouse2FText7
 
-CopycatsHouseF2Text1: ; 5cc82 (17:4c82)
+CopycatsHouse2FText1: ; 5cc82 (17:4c82)
 	db $08 ; asm
 	ld a, [$d7af]
 	bit 0, a
@@ -91951,21 +91951,21 @@ TM31NoRoomText: ; 5ccee (17:4cee)
 	TX_FAR _TM31NoRoomText ; 0xa1733
 	db $d, "@"
 
-CopycatsHouseF2Text2: ; 5ccf4 (17:4cf4)
-	TX_FAR _CopycatsHouseF2Text2
+CopycatsHouse2FText2: ; 5ccf4 (17:4cf4)
+	TX_FAR _CopycatsHouse2FText2
 	db "@"
 
-CopycatsHouseF2Text5: ; 5ccf9 (17:4cf9)
-CopycatsHouseF2Text4: ; 5ccf9 (17:4cf9)
-CopycatsHouseF2Text3: ; 5ccf9 (17:4cf9)
-	TX_FAR _CopycatsHouseF2Text3
+CopycatsHouse2FText5: ; 5ccf9 (17:4cf9)
+CopycatsHouse2FText4: ; 5ccf9 (17:4cf9)
+CopycatsHouse2FText3: ; 5ccf9 (17:4cf9)
+	TX_FAR _CopycatsHouse2FText3
 	db "@"
 
-CopycatsHouseF2Text6: ; 5ccfe (17:4cfe)
-	TX_FAR _CopycatsHouseF2Text6
+CopycatsHouse2FText6: ; 5ccfe (17:4cfe)
+	TX_FAR _CopycatsHouse2FText6
 	db "@"
 
-CopycatsHouseF2Text7: ; 5cd03 (17:4d03)
+CopycatsHouse2FText7: ; 5cd03 (17:4d03)
 	db $08 ; asm
 	ld a, [$c109]
 	cp $4
@@ -91984,15 +91984,15 @@ UnnamedText_5cd1c: ; 5cd1c (17:4d1c)
 	TX_FAR _UnnamedText_5cd1c
 	db "@"
 
-CopycatsHouseF2Object: ; 0x5cd21 (size=48)
+CopycatsHouse2FObject: ; 0x5cd21 (size=48)
 	db $a ; border tile
 
 	db $1 ; warps
 	db $1, $7, $2, COPYCATS_HOUSE_1F
 
 	db $2 ; signs
-	db $5, $3, $6 ; CopycatsHouseF2Text6
-	db $1, $0, $7 ; CopycatsHouseF2Text7
+	db $5, $3, $6 ; CopycatsHouse2FText6
+	db $1, $0, $7 ; CopycatsHouse2FText7
 
 	db $5 ; people
 	db SPRITE_BRUNETTE_GIRL, $3 + 4, $4 + 4, $fe, $0, $1 ; person
@@ -92002,11 +92002,11 @@ CopycatsHouseF2Object: ; 0x5cd21 (size=48)
 	db SPRITE_CLEFAIRY, $6 + 4, $1 + 4, $ff, $d3, $5 ; person
 
 	; warp-to
-	EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_1F
+	EVENT_DISP COPYCATS_HOUSE_2F_WIDTH, $1, $7 ; COPYCATS_HOUSE_1F
 
 FightingDojo_h: ; 0x5cd51 to 0x5cd5d (12 bytes) (id=177)
 	db DOJO ; tileset
-	db FIGHTINGDOJO_HEIGHT, FIGHTINGDOJO_WIDTH ; dimensions (y, x)
+	db FIGHTING_DOJO_HEIGHT, FIGHTING_DOJO_WIDTH ; dimensions (y, x)
 	dw FightingDojoBlocks, FightingDojoTextPointers, FightingDojoScript ; blocks, texts, scripts
 	db $00 ; connections
 	dw FightingDojoObject ; objects
@@ -92368,8 +92368,8 @@ FightingDojoObject: ; 0x5cf9b (size=72)
 	db SPRITE_BALL, $1 + 4, $5 + 4, $ff, $ff, $7 ; person
 
 	; warp-to
-	EVENT_DISP $5, $b, $4
-	EVENT_DISP $5, $b, $5
+	EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $4
+	EVENT_DISP FIGHTING_DOJO_WIDTH, $b, $5
 
 FightingDojoBlocks: ; 5cfe3 (17:4fe3)
 	INCBIN "maps/fightingdojo.blk"
@@ -92797,38 +92797,38 @@ SaffronGymObject: ; 0x5d259 (size=330)
 	db SPRITE_GYM_HELPER, $f + 4, $a + 4, $ff, $d0, $9 ; person
 
 	; warp-to
-	EVENT_DISP $a, $11, $8
-	EVENT_DISP $a, $11, $9
-	EVENT_DISP $a, $3, $1 ; SAFFRON_GYM
-	EVENT_DISP $a, $3, $5 ; SAFFRON_GYM
-	EVENT_DISP $a, $5, $1 ; SAFFRON_GYM
-	EVENT_DISP $a, $5, $5 ; SAFFRON_GYM
-	EVENT_DISP $a, $9, $1 ; SAFFRON_GYM
-	EVENT_DISP $a, $9, $5 ; SAFFRON_GYM
-	EVENT_DISP $a, $b, $1 ; SAFFRON_GYM
-	EVENT_DISP $a, $b, $5 ; SAFFRON_GYM
-	EVENT_DISP $a, $f, $1 ; SAFFRON_GYM
-	EVENT_DISP $a, $f, $5 ; SAFFRON_GYM
-	EVENT_DISP $a, $11, $1 ; SAFFRON_GYM
-	EVENT_DISP $a, $11, $5 ; SAFFRON_GYM
-	EVENT_DISP $a, $3, $9 ; SAFFRON_GYM
-	EVENT_DISP $a, $3, $b ; SAFFRON_GYM
-	EVENT_DISP $a, $5, $9 ; SAFFRON_GYM
-	EVENT_DISP $a, $5, $b ; SAFFRON_GYM
-	EVENT_DISP $a, $b, $b ; SAFFRON_GYM
-	EVENT_DISP $a, $f, $b ; SAFFRON_GYM
-	EVENT_DISP $a, $3, $f ; SAFFRON_GYM
-	EVENT_DISP $a, $3, $13 ; SAFFRON_GYM
-	EVENT_DISP $a, $5, $f ; SAFFRON_GYM
-	EVENT_DISP $a, $5, $13 ; SAFFRON_GYM
-	EVENT_DISP $a, $9, $f ; SAFFRON_GYM
-	EVENT_DISP $a, $9, $13 ; SAFFRON_GYM
-	EVENT_DISP $a, $b, $f ; SAFFRON_GYM
-	EVENT_DISP $a, $b, $13 ; SAFFRON_GYM
-	EVENT_DISP $a, $f, $f ; SAFFRON_GYM
-	EVENT_DISP $a, $f, $13 ; SAFFRON_GYM
-	EVENT_DISP $a, $11, $f ; SAFFRON_GYM
-	EVENT_DISP $a, $11, $13 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $11, $8
+	EVENT_DISP SAFFRON_GYM_WIDTH, $11, $9
+	EVENT_DISP SAFFRON_GYM_WIDTH, $3, $1 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $3, $5 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $5, $1 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $5, $5 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $9, $1 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $9, $5 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $b, $1 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $b, $5 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $f, $1 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $f, $5 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $11, $1 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $11, $5 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $3, $9 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $3, $b ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $5, $9 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $5, $b ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $b, $b ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $f, $b ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $3, $f ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $3, $13 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $5, $f ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $5, $13 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $9, $f ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $9, $13 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $b, $f ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $b, $13 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $f, $f ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $f, $13 ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $11, $f ; SAFFRON_GYM
+	EVENT_DISP SAFFRON_GYM_WIDTH, $11, $13 ; SAFFRON_GYM
 
 SaffronGymBlocks: ; 5d3a3 (17:53a3)
 	INCBIN "maps/saffrongym.blk"
@@ -92871,8 +92871,8 @@ SaffronMartObject: ; 0x5d41c (size=38)
 	db SPRITE_LASS, $5 + 4, $6 + 4, $fe, $0, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
+	EVENT_DISP SAFFRON_MART_WIDTH, $7, $3
+	EVENT_DISP SAFFRON_MART_WIDTH, $7, $4
 
 SilphCo1_h: ; 0x5d442 to 0x5d44e (12 bytes) (id=181)
 	db FACILITY ; tileset
@@ -92918,11 +92918,11 @@ SilphCo1Object: ; 0x5d470 (size=50)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $4 + 4, $ff, $d0, $1 ; person
 
 	; warp-to
-	EVENT_DISP $f, $11, $a
-	EVENT_DISP $f, $11, $b
-	EVENT_DISP $f, $0, $1a ; SILPH_CO_2F
-	EVENT_DISP $f, $0, $14 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $f, $a, $10 ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_1F_WIDTH, $11, $a
+	EVENT_DISP SILPH_CO_1F_WIDTH, $11, $b
+	EVENT_DISP SILPH_CO_1F_WIDTH, $0, $1a ; SILPH_CO_2F
+	EVENT_DISP SILPH_CO_1F_WIDTH, $0, $14 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_1F_WIDTH, $a, $10 ; SILPH_CO_3F
 
 SilphCo1Blocks: ; 5d4a2 (17:54a2)
 	INCBIN "maps/silphco1.blk"
@@ -92974,32 +92974,32 @@ SaffronPokecenterObject: ; 0x5d54f (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP SAFFRON_POKECENTER_WIDTH, $7, $4
 
-ViridianForestexit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
+ViridianForestExit_h: ; 0x5d57b to 0x5d587 (12 bytes) (id=47)
 	db FOREST_GATE ; tileset
 	db VIRIDIAN_FOREST_EXIT_HEIGHT, VIRIDIAN_FOREST_EXIT_WIDTH ; dimensions (y, x)
-	dw ViridianForestexitBlocks, ViridianForestexitTextPointers, ViridianForestexitScript ; blocks, texts, scripts
+	dw ViridianForestExitBlocks, ViridianForestExitTextPointers, ViridianForestExitScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw ViridianForestexitObject ; objects
+	dw ViridianForestExitObject ; objects
 
-ViridianForestexitScript: ; 5d587 (17:5587)
+ViridianForestExitScript: ; 5d587 (17:5587)
 	jp EnableAutoTextBoxDrawing
 
-ViridianForestexitTextPointers: ; 5d58a (17:558a)
-	dw ViridianForestexitText1
-	dw ViridianForestexitText2
+ViridianForestExitTextPointers: ; 5d58a (17:558a)
+	dw ViridianForestExitText1
+	dw ViridianForestExitText2
 
-ViridianForestexitText1: ; 5d58e (17:558e)
-	TX_FAR _ViridianForestexitText1
+ViridianForestExitText1: ; 5d58e (17:558e)
+	TX_FAR _ViridianForestExitText1
 	db "@"
 
-ViridianForestexitText2: ; 5d593 (17:5593)
-	TX_FAR _ViridianForestexitText2
+ViridianForestExitText2: ; 5d593 (17:5593)
+	TX_FAR _ViridianForestExitText2
 	db "@"
 
-ViridianForestexitObject: ; 0x5d598 (size=48)
+ViridianForestExitObject: ; 0x5d598 (size=48)
 	db $a ; border tile
 
 	db $4 ; warps
@@ -93015,10 +93015,10 @@ ViridianForestexitObject: ; 0x5d598 (size=48)
 	db SPRITE_OLD_PERSON, $5 + 4, $2 + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $5, $0, $4
-	EVENT_DISP $5, $0, $5
-	EVENT_DISP $5, $7, $4 ; VIRIDIAN_FOREST
-	EVENT_DISP $5, $7, $5 ; VIRIDIAN_FOREST
+	EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $4
+	EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $0, $5
+	EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $4 ; VIRIDIAN_FOREST
+	EVENT_DISP VIRIDIAN_FOREST_EXIT_WIDTH, $7, $5 ; VIRIDIAN_FOREST
 
 Route2Gate_h: ; 0x5d5c8 to 0x5d5d4 (12 bytes) (id=49)
 	db GATE ; tileset
@@ -93086,10 +93086,10 @@ Route2GateObject: ; 0x5d620 (size=48)
 	db SPRITE_BUG_CATCHER, $4 + 4, $5 + 4, $fe, $2, $2 ; person
 
 	; warp-to
-	EVENT_DISP $5, $0, $4
-	EVENT_DISP $5, $0, $5
-	EVENT_DISP $5, $7, $4
-	EVENT_DISP $5, $7, $5
+	EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $4
+	EVENT_DISP ROUTE_2_GATE_WIDTH, $0, $5
+	EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $4
+	EVENT_DISP ROUTE_2_GATE_WIDTH, $7, $5
 
 ViridianForestEntrance_h: ; 0x5d650 to 0x5d65c (12 bytes) (id=50)
 	db FOREST_GATE ; tileset
@@ -93129,10 +93129,10 @@ ViridianForestEntranceObject: ; 0x5d66d (size=48)
 	db SPRITE_LITTLE_GIRL, $4 + 4, $2 + 4, $fe, $1, $2 ; person
 
 	; warp-to
-	EVENT_DISP $5, $0, $4 ; VIRIDIAN_FOREST
-	EVENT_DISP $5, $0, $5 ; VIRIDIAN_FOREST
-	EVENT_DISP $5, $7, $4
-	EVENT_DISP $5, $7, $5
+	EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $4 ; VIRIDIAN_FOREST
+	EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $0, $5 ; VIRIDIAN_FOREST
+	EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $4
+	EVENT_DISP VIRIDIAN_FOREST_ENTRANCE_WIDTH, $7, $5
 
 UndergroundTunnelEntranceRoute5_h: ; 0x5d69d to 0x5d6a9 (12 bytes) (id=71)
 	db GATE ; tileset
@@ -93175,9 +93175,9 @@ UndergroundTunnelEntranceRoute5Object: ; 0x5d6c1 (size=34)
 	db SPRITE_LITTLE_GIRL, $3 + 4, $2 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
-	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_NS
+	EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $3
+	EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $7, $4
+	EVENT_DISP PATH_ENTRANCE_ROUTE_5_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS
 
 UndergroundTunnelEntranceRoute6_h: ; 0x5d6e3 to 0x5d6ef (12 bytes) (id=74)
 	db GATE ; tileset
@@ -93212,9 +93212,9 @@ UndergroundTunnelEntranceRoute6Object: ; 0x5d6fe (size=34)
 	db SPRITE_GIRL, $3 + 4, $2 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
-	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_NS
+	EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $3
+	EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $7, $4
+	EVENT_DISP PATH_ENTRANCE_ROUTE_6_WIDTH, $4, $4 ; UNDERGROUND_PATH_NS
 
 UndergroundPathEntranceRoute7_h: ; 0x5d720 to 0x5d72c (12 bytes) (id=77)
 	db GATE ; tileset
@@ -93249,9 +93249,9 @@ UndergroundPathEntranceRoute7Object: ; 0x5d73b (size=34)
 	db SPRITE_FAT_BALD_GUY, $4 + 4, $2 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
-	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
+	EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $3
+	EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $7, $4
+	EVENT_DISP PATH_ENTRANCE_ROUTE_7_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE
 
 UndergroundPathEntranceRoute7Copy_h: ; 5d75d (17:575d)
 	db GATE ; tileset
@@ -93300,9 +93300,9 @@ UndergroundPathEntranceRoute7CopyObject: ; 5d787 (17:5787)
 	db SPRITE_FAT_BALD_GUY, $4 + 4, $2 + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
-	EVENT_DISP $4, $4, $4 ; UNDERGROUND_PATH_WE
+	EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $3
+	EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $7, $4
+	EVENT_DISP PATH_ENTRANCE_ROUTE_7_COPY_WIDTH, $4, $4 ; UNDERGROUND_PATH_WE
 
 SilphCo9_h: ; 0x5d7af to 0x5d7bb (12 bytes) (id=233)
 	db FACILITY ; tileset
@@ -93579,11 +93579,11 @@ SilphCo9Object: ; 0x5d93f (size=74)
 	db SPRITE_ROCKET, $10 + 4, $d + 4, $ff, $d1, $44, ROCKET + $C8, $26 ; trainer
 
 	; warp-to
-	EVENT_DISP $d, $0, $e ; SILPH_CO_10F
-	EVENT_DISP $d, $0, $10 ; SILPH_CO_8F
-	EVENT_DISP $d, $0, $12 ; SILPH_CO_ELEVATOR
-	EVENT_DISP $d, $3, $9 ; SILPH_CO_3F
-	EVENT_DISP $d, $f, $11 ; SILPH_CO_5F
+	EVENT_DISP SILPH_CO_9F_WIDTH, $0, $e ; SILPH_CO_10F
+	EVENT_DISP SILPH_CO_9F_WIDTH, $0, $10 ; SILPH_CO_8F
+	EVENT_DISP SILPH_CO_9F_WIDTH, $0, $12 ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_9F_WIDTH, $3, $9 ; SILPH_CO_3F
+	EVENT_DISP SILPH_CO_9F_WIDTH, $f, $11 ; SILPH_CO_5F
 
 SilphCo9Blocks: ; 5d989 (17:5989)
 	INCBIN "maps/silphco9.blk"
@@ -93724,9 +93724,9 @@ VictoryRoad1Object: ; 0x5dab8 (size=76)
 	db SPRITE_BOULDER, $a + 4, $2 + 4, $ff, $10, $7 ; person
 
 	; warp-to
-	EVENT_DISP $a, $11, $8
-	EVENT_DISP $a, $11, $9
-	EVENT_DISP $a, $1, $1 ; VICTORY_ROAD_2
+	EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $8
+	EVENT_DISP VICTORY_ROAD_1_WIDTH, $11, $9
+	EVENT_DISP VICTORY_ROAD_1_WIDTH, $1, $1 ; VICTORY_ROAD_2
 
 VictoryRoad1Blocks: ; 5db04 (17:5b04)
 	INCBIN "maps/victoryroad1.blk"
@@ -94287,9 +94287,9 @@ PokemonTower1Object: ; 0x60452 (size=58)
 	db SPRITE_MEDIUM, $7 + 4, $11 + 4, $ff, $d2, $5 ; person
 
 	; warp-to
-	EVENT_DISP $a, $11, $a
-	EVENT_DISP $a, $11, $b
-	EVENT_DISP $a, $9, $12 ; POKEMONTOWER_2
+	EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $a
+	EVENT_DISP POKEMONTOWER_1_WIDTH, $11, $b
+	EVENT_DISP POKEMONTOWER_1_WIDTH, $9, $12 ; POKEMONTOWER_2
 
 PokemonTower1Blocks: ; 6048c (18:448c)
 	INCBIN "maps/pokemontower1.blk"
@@ -94496,8 +94496,8 @@ PokemonTower2Object: ; 0x60646 (size=32)
 	db SPRITE_MEDIUM, $7 + 4, $3 + 4, $ff, $d3, $2 ; person
 
 	; warp-to
-	EVENT_DISP $a, $9, $3 ; POKEMONTOWER_3
-	EVENT_DISP $a, $9, $12 ; POKEMONTOWER_1
+	EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $3 ; POKEMONTOWER_3
+	EVENT_DISP POKEMONTOWER_2_WIDTH, $9, $12 ; POKEMONTOWER_1
 
 PokemonTower2Blocks: ; 60666 (18:4666)
 	INCBIN "maps/pokemontower2.blk"
@@ -94628,8 +94628,8 @@ PokemonTower3Object: ; 0x6075d (size=51)
 	db SPRITE_BALL, $1 + 4, $c + 4, $ff, $ff, $84, ESCAPE_ROPE ; item
 
 	; warp-to
-	EVENT_DISP $a, $9, $3 ; POKEMONTOWER_2
-	EVENT_DISP $a, $9, $12 ; POKEMONTOWER_4
+	EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2
+	EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $12 ; POKEMONTOWER_4
 
 PokemonTower3Blocks: ; 60790 (18:4790)
 	INCBIN "maps/pokemontower3.blk"
@@ -94765,8 +94765,8 @@ PokemonTower4Object: ; 0x6088b (size=65)
 	db SPRITE_BALL, $10 + 4, $c + 4, $ff, $ff, $86, HP_UP ; item
 
 	; warp-to
-	EVENT_DISP $a, $9, $3 ; POKEMONTOWER_5
-	EVENT_DISP $a, $9, $12 ; POKEMONTOWER_3
+	EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5
+	EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $12 ; POKEMONTOWER_3
 
 PokemonTower4Blocks: ; 608cc (18:48cc)
 	INCBIN "maps/pokemontower4.blk"
@@ -94978,8 +94978,8 @@ PokemonTower5Object: ; 0x60a48 (size=65)
 	db SPRITE_BALL, $e + 4, $6 + 4, $ff, $ff, $86, NUGGET ; item
 
 	; warp-to
-	EVENT_DISP $a, $9, $3 ; POKEMONTOWER_4
-	EVENT_DISP $a, $9, $12 ; POKEMONTOWER_6
+	EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4
+	EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $12 ; POKEMONTOWER_6
 
 PokemonTower5Blocks: ; 60a89 (18:4a89)
 	INCBIN "maps/pokemontower5.blk"
@@ -95224,8 +95224,8 @@ PokemonTower6Object: ; 0x60c5b (size=58)
 	db SPRITE_BALL, $e + 4, $e + 4, $ff, $ff, $85, X_ACCURACY ; item
 
 	; warp-to
-	EVENT_DISP $a, $9, $12 ; POKEMONTOWER_5
-	EVENT_DISP $a, $10, $9 ; POKEMONTOWER_7
+	EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5
+	EVENT_DISP POKEMONTOWER_6_WIDTH, $10, $9 ; POKEMONTOWER_7
 
 PokemonTower6Blocks: ; 60c95 (18:4c95)
 	INCBIN "maps/pokemontower6.blk"
@@ -95537,7 +95537,7 @@ PokemonTower7Object: ; 0x60ef6 (size=42)
 	db SPRITE_MR_FUJI, $3 + 4, $a + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $a, $10, $9 ; POKEMONTOWER_6
+	EVENT_DISP POKEMONTOWER_7_WIDTH, $10, $9 ; POKEMONTOWER_6
 
 PokemonTower7Blocks: ; 60f20 (18:4f20)
 	INCBIN "maps/pokemontower7.blk"
@@ -95588,12 +95588,12 @@ CeladonMart1Object: ; 0x60f9e (size=64)
 	db SPRITE_CABLE_CLUB_WOMAN, $3 + 4, $8 + 4, $ff, $d0, $1 ; person
 
 	; warp-to
-	EVENT_DISP $a, $7, $2
-	EVENT_DISP $a, $7, $3
-	EVENT_DISP $a, $7, $10
-	EVENT_DISP $a, $7, $11
-	EVENT_DISP $a, $1, $c ; CELADON_MART_2
-	EVENT_DISP $a, $1, $1 ; CELADON_MART_ELEVATOR
+	EVENT_DISP CELADON_MART_1_WIDTH, $7, $2
+	EVENT_DISP CELADON_MART_1_WIDTH, $7, $3
+	EVENT_DISP CELADON_MART_1_WIDTH, $7, $10
+	EVENT_DISP CELADON_MART_1_WIDTH, $7, $11
+	EVENT_DISP CELADON_MART_1_WIDTH, $1, $c ; CELADON_MART_2
+	EVENT_DISP CELADON_MART_1_WIDTH, $1, $1 ; CELADON_MART_ELEVATOR
 
 CeladonMart1Blocks: ; 60fde (18:4fde)
 	INCBIN "maps/celadonmart1.blk"
@@ -95909,12 +95909,12 @@ ViridianForestObject: ; 0x611da (size=127)
 	db SPRITE_BUG_CATCHER, $28 + 4, $1b + 4, $ff, $ff, $8 ; person
 
 	; warp-to
-	EVENT_DISP $11, $0, $1 ; VIRIDIAN_FOREST_EXIT
-	EVENT_DISP $11, $0, $2 ; VIRIDIAN_FOREST_EXIT
-	EVENT_DISP $11, $2f, $f ; VIRIDIAN_FOREST_ENTRANCE
-	EVENT_DISP $11, $2f, $10 ; VIRIDIAN_FOREST_ENTRANCE
-	EVENT_DISP $11, $2f, $11 ; VIRIDIAN_FOREST_ENTRANCE
-	EVENT_DISP $11, $2f, $12 ; VIRIDIAN_FOREST_ENTRANCE
+	EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $1 ; VIRIDIAN_FOREST_EXIT
+	EVENT_DISP VIRIDIAN_FOREST_WIDTH, $0, $2 ; VIRIDIAN_FOREST_EXIT
+	EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $f ; VIRIDIAN_FOREST_ENTRANCE
+	EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $10 ; VIRIDIAN_FOREST_ENTRANCE
+	EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $11 ; VIRIDIAN_FOREST_ENTRANCE
+	EVENT_DISP VIRIDIAN_FOREST_WIDTH, $2f, $12 ; VIRIDIAN_FOREST_ENTRANCE
 
 SSAnne1_h: ; 0x61259 to 0x61265 (12 bytes) (id=95)
 	db SHIP ; tileset
@@ -95962,17 +95962,17 @@ SSAnne1Object: ; 0x61277 (size=104)
 	db SPRITE_SAILOR, $5 + 4, $1b + 4, $ff, $ff, $2 ; person
 
 	; warp-to
-	EVENT_DISP $14, $0, $1a ; VERMILION_DOCK
-	EVENT_DISP $14, $0, $1b ; VERMILION_DOCK
-	EVENT_DISP $14, $8, $1f ; SS_ANNE_8
-	EVENT_DISP $14, $8, $17 ; SS_ANNE_8
-	EVENT_DISP $14, $8, $13 ; SS_ANNE_8
-	EVENT_DISP $14, $8, $f ; SS_ANNE_8
-	EVENT_DISP $14, $8, $b ; SS_ANNE_8
-	EVENT_DISP $14, $8, $7 ; SS_ANNE_8
-	EVENT_DISP $14, $6, $2 ; SS_ANNE_2
-	EVENT_DISP $14, $f, $25 ; SS_ANNE_4
-	EVENT_DISP $14, $10, $3 ; SS_ANNE_6
+	EVENT_DISP SS_ANNE_1_WIDTH, $0, $1a ; VERMILION_DOCK
+	EVENT_DISP SS_ANNE_1_WIDTH, $0, $1b ; VERMILION_DOCK
+	EVENT_DISP SS_ANNE_1_WIDTH, $8, $1f ; SS_ANNE_8
+	EVENT_DISP SS_ANNE_1_WIDTH, $8, $17 ; SS_ANNE_8
+	EVENT_DISP SS_ANNE_1_WIDTH, $8, $13 ; SS_ANNE_8
+	EVENT_DISP SS_ANNE_1_WIDTH, $8, $f ; SS_ANNE_8
+	EVENT_DISP SS_ANNE_1_WIDTH, $8, $b ; SS_ANNE_8
+	EVENT_DISP SS_ANNE_1_WIDTH, $8, $7 ; SS_ANNE_8
+	EVENT_DISP SS_ANNE_1_WIDTH, $6, $2 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_1_WIDTH, $f, $25 ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_1_WIDTH, $10, $3 ; SS_ANNE_6
 
 SSAnne1Blocks: ; 612df (18:52df)
 	INCBIN "maps/ssanne1.blk"
@@ -96216,15 +96216,15 @@ SSAnne2Object: ; 0x61514 (size=90)
 	db SPRITE_BLUE, $4 + 4, $24 + 4, $ff, $d0, $42, SONY1 + $C8, $1 ; trainer
 
 	; warp-to
-	EVENT_DISP $14, $b, $9 ; SS_ANNE_9
-	EVENT_DISP $14, $b, $d ; SS_ANNE_9
-	EVENT_DISP $14, $b, $11 ; SS_ANNE_9
-	EVENT_DISP $14, $b, $15 ; SS_ANNE_9
-	EVENT_DISP $14, $b, $19 ; SS_ANNE_9
-	EVENT_DISP $14, $b, $1d ; SS_ANNE_9
-	EVENT_DISP $14, $4, $2 ; SS_ANNE_1
-	EVENT_DISP $14, $c, $2 ; SS_ANNE_3
-	EVENT_DISP $14, $4, $24 ; SS_ANNE_7
+	EVENT_DISP SS_ANNE_2_WIDTH, $b, $9 ; SS_ANNE_9
+	EVENT_DISP SS_ANNE_2_WIDTH, $b, $d ; SS_ANNE_9
+	EVENT_DISP SS_ANNE_2_WIDTH, $b, $11 ; SS_ANNE_9
+	EVENT_DISP SS_ANNE_2_WIDTH, $b, $15 ; SS_ANNE_9
+	EVENT_DISP SS_ANNE_2_WIDTH, $b, $19 ; SS_ANNE_9
+	EVENT_DISP SS_ANNE_2_WIDTH, $b, $1d ; SS_ANNE_9
+	EVENT_DISP SS_ANNE_2_WIDTH, $4, $2 ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_2_WIDTH, $c, $2 ; SS_ANNE_3
+	EVENT_DISP SS_ANNE_2_WIDTH, $4, $24 ; SS_ANNE_7
 
 SSAnne2Blocks: ; 6156e (18:556e)
 	INCBIN "maps/ssanne2.blk"
@@ -96258,12 +96258,12 @@ SSAnne4Object: ; 0x61632 (size=52)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $f, $3, $17 ; SS_ANNE_10
-	EVENT_DISP $f, $3, $13 ; SS_ANNE_10
-	EVENT_DISP $f, $3, $f ; SS_ANNE_10
-	EVENT_DISP $f, $3, $b ; SS_ANNE_10
-	EVENT_DISP $f, $3, $7 ; SS_ANNE_10
-	EVENT_DISP $f, $5, $1b ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_4_WIDTH, $3, $17 ; SS_ANNE_10
+	EVENT_DISP SS_ANNE_4_WIDTH, $3, $13 ; SS_ANNE_10
+	EVENT_DISP SS_ANNE_4_WIDTH, $3, $f ; SS_ANNE_10
+	EVENT_DISP SS_ANNE_4_WIDTH, $3, $b ; SS_ANNE_10
+	EVENT_DISP SS_ANNE_4_WIDTH, $3, $7 ; SS_ANNE_10
+	EVENT_DISP SS_ANNE_4_WIDTH, $5, $1b ; SS_ANNE_1
 
 SSAnne4Blocks: ; 61666 (18:5666)
 	INCBIN "maps/ssanne4.blk"
@@ -96382,8 +96382,8 @@ SSAnne5Object: ; 0x6172b (size=54)
 	db SPRITE_SAILOR, $8 + 4, $a + 4, $ff, $d1, $45, SAILOR + $C8, $2 ; trainer
 
 	; warp-to
-	EVENT_DISP $a, $6, $d ; SS_ANNE_3
-	EVENT_DISP $a, $7, $d ; SS_ANNE_3
+	EVENT_DISP SS_ANNE_5_WIDTH, $6, $d ; SS_ANNE_3
+	EVENT_DISP SS_ANNE_5_WIDTH, $7, $d ; SS_ANNE_3
 
 SSAnne5Blocks: ; 61761 (18:5761)
 	INCBIN "maps/ssanne5.blk"
@@ -96486,7 +96486,7 @@ SSAnne6Object: ; 0x6181b (size=54)
 	db SPRITE_COOK, $d + 4, $b + 4, $ff, $d1, $7 ; person
 
 	; warp-to
-	EVENT_DISP $7, $0, $6 ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_6_WIDTH, $0, $6 ; SS_ANNE_1
 
 SSAnne6Blocks: ; 61851 (18:5851)
 	INCBIN "maps/ssanne6.blk"
@@ -96609,7 +96609,7 @@ SSAnne7Object: ; 0x61946 (size=24)
 	db SPRITE_SS_CAPTAIN, $2 + 4, $4 + 4, $ff, $d1, $1 ; person
 
 	; warp-to
-	EVENT_DISP $3, $7, $0 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_7_WIDTH, $7, $0 ; SS_ANNE_2
 
 SSAnne7Blocks: ; 6195e (18:595e)
 	INCBIN "maps/ssanne7.blk"
@@ -96813,12 +96813,12 @@ SSAnne8Object: ; 0x61a60 (size=127)
 	db SPRITE_GENTLEMAN, $d + 4, $15 + 4, $fe, $2, $b ; person
 
 	; warp-to
-	EVENT_DISP $c, $0, $0 ; SS_ANNE_1
-	EVENT_DISP $c, $0, $a ; SS_ANNE_1
-	EVENT_DISP $c, $0, $14 ; SS_ANNE_1
-	EVENT_DISP $c, $a, $0 ; SS_ANNE_1
-	EVENT_DISP $c, $a, $a ; SS_ANNE_1
-	EVENT_DISP $c, $a, $14 ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_8_WIDTH, $0, $0 ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_8_WIDTH, $0, $a ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_8_WIDTH, $0, $14 ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_8_WIDTH, $a, $0 ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_8_WIDTH, $a, $a ; SS_ANNE_1
+	EVENT_DISP SS_ANNE_8_WIDTH, $a, $14 ; SS_ANNE_1
 
 SSAnne8Blocks: ; 61adf (18:5adf)
 	INCBIN "maps/ssanne8.blk"
@@ -97082,18 +97082,18 @@ SSAnne9Object: ; 0x61c8d (size=188)
 	db SPRITE_FOULARD_WOMAN, $c + 4, $14 + 4, $ff, $d3, $d ; person
 
 	; warp-to
-	EVENT_DISP $c, $5, $2 ; SS_ANNE_2
-	EVENT_DISP $c, $5, $3 ; SS_ANNE_2
-	EVENT_DISP $c, $5, $c ; SS_ANNE_2
-	EVENT_DISP $c, $5, $d ; SS_ANNE_2
-	EVENT_DISP $c, $5, $16 ; SS_ANNE_2
-	EVENT_DISP $c, $5, $17 ; SS_ANNE_2
-	EVENT_DISP $c, $f, $2 ; SS_ANNE_2
-	EVENT_DISP $c, $f, $3 ; SS_ANNE_2
-	EVENT_DISP $c, $f, $c ; SS_ANNE_2
-	EVENT_DISP $c, $f, $d ; SS_ANNE_2
-	EVENT_DISP $c, $f, $16 ; SS_ANNE_2
-	EVENT_DISP $c, $f, $17 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $5, $3 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $5, $c ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $5, $d ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $5, $16 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $5, $17 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $f, $2 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $f, $3 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $f, $c ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $f, $d ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $f, $16 ; SS_ANNE_2
+	EVENT_DISP SS_ANNE_9_WIDTH, $f, $17 ; SS_ANNE_2
 
 SSAnne10_h: ; 0x61d49 to 0x61d55 (12 bytes) (id=104)
 	db SHIP ; tileset
@@ -97336,16 +97336,16 @@ SSAnne10Object: ; 0x61e75 (size=165)
 	db SPRITE_BALL, $b + 4, $c + 4, $ff, $ff, $8b, MAX_POTION ; item
 
 	; warp-to
-	EVENT_DISP $c, $5, $2 ; SS_ANNE_4
-	EVENT_DISP $c, $5, $3 ; SS_ANNE_4
-	EVENT_DISP $c, $5, $c ; SS_ANNE_4
-	EVENT_DISP $c, $5, $d ; SS_ANNE_4
-	EVENT_DISP $c, $5, $16 ; SS_ANNE_4
-	EVENT_DISP $c, $5, $17 ; SS_ANNE_4
-	EVENT_DISP $c, $f, $2 ; SS_ANNE_4
-	EVENT_DISP $c, $f, $3 ; SS_ANNE_4
-	EVENT_DISP $c, $f, $c ; SS_ANNE_4
-	EVENT_DISP $c, $f, $d ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $5, $2 ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $5, $3 ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $5, $c ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $5, $d ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $5, $16 ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $5, $17 ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $f, $2 ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $f, $3 ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $f, $c ; SS_ANNE_4
+	EVENT_DISP SS_ANNE_10_WIDTH, $f, $d ; SS_ANNE_4
 
 UndergroundPathNS_h: ; 0x61f1a to 0x61f26 (12 bytes) (id=119)
 	db UNDERGROUND ; tileset
@@ -97372,8 +97372,8 @@ UndergroundPathNSObject: ; 0x61f2a (size=20)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $4, $4, $5 ; PATH_ENTRANCE_ROUTE_5
-	EVENT_DISP $4, $29, $2 ; PATH_ENTRANCE_ROUTE_6
+	EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $4, $5 ; PATH_ENTRANCE_ROUTE_5
+	EVENT_DISP UNDERGROUND_PATH_NS_WIDTH, $29, $2 ; PATH_ENTRANCE_ROUTE_6
 
 UndergroundPathWE_h: ; 0x61f3e to 0x61f4a (12 bytes) (id=121)
 	db UNDERGROUND ; tileset
@@ -97400,8 +97400,8 @@ UndergroundPathWEObject: ; 0x61f4e (size=20)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $19, $5, $2 ; PATH_ENTRANCE_ROUTE_7
-	EVENT_DISP $19, $2, $2f ; PATH_ENTRANCE_ROUTE_8
+	EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $5, $2 ; PATH_ENTRANCE_ROUTE_7
+	EVENT_DISP UNDERGROUND_PATH_WE_WIDTH, $2, $2f ; PATH_ENTRANCE_ROUTE_8
 
 DiglettsCave_h: ; 0x61f62 to 0x61f6e (12 bytes) (id=197)
 	db CAVERN ; tileset
@@ -97428,8 +97428,8 @@ DiglettsCaveObject: ; 0x61f72 (size=20)
 	db $0 ; people
 
 	; warp-to
-	EVENT_DISP $14, $5, $5 ; DIGLETTS_CAVE_EXIT
-	EVENT_DISP $14, $1f, $25 ; DIGLETTS_CAVE_ENTRANCE
+	EVENT_DISP DIGLETTS_CAVE_WIDTH, $5, $5 ; DIGLETTS_CAVE_EXIT
+	EVENT_DISP DIGLETTS_CAVE_WIDTH, $1f, $25 ; DIGLETTS_CAVE_ENTRANCE
 
 DiglettsCaveBlocks: ; 61f86 (18:5f86)
 	INCBIN "maps/diglettscave.blk"
@@ -97830,10 +97830,10 @@ SilphCo11Object: ; 0x62380 (size=72)
 	db SPRITE_ROCKET, $9 + 4, $f + 4, $ff, $d1, $45, ROCKET + $C8, $28 ; trainer
 
 	; warp-to
-	EVENT_DISP $9, $0, $9 ; SILPH_CO_10F
-	EVENT_DISP $9, $0, $d ; SILPH_CO_ELEVATOR
-	EVENT_DISP $9, $5, $5
-	EVENT_DISP $9, $2, $3 ; SILPH_CO_7F
+	EVENT_DISP SILPH_CO_11F_WIDTH, $0, $9 ; SILPH_CO_10F
+	EVENT_DISP SILPH_CO_11F_WIDTH, $0, $d ; SILPH_CO_ELEVATOR
+	EVENT_DISP SILPH_CO_11F_WIDTH, $5, $5
+	EVENT_DISP SILPH_CO_11F_WIDTH, $2, $3 ; SILPH_CO_7F
 
 SilphCo11Blocks: ; 623c8 (18:63c8)
 	INCBIN "maps/silphco11.blk"
@@ -103772,8 +103772,8 @@ PadSRAM_FF: ; 73b8f (1c:7b8f)
 
 SECTION "bank1D",ROMX,BANK[$1D]
 
-CopycatsHouseF1Blocks: ; 74000 (1d:4000)
-	INCBIN "maps/copycatshousef1.blk"
+CopycatsHouse1FBlocks: ; 74000 (1d:4000)
+	INCBIN "maps/copycatshouse1f.blk"
 
 CinnabarMartBlocks: ; 74010 (1d:4010)
 PewterMartBlocks: ; 74010 (1d:4010)
@@ -104970,8 +104970,8 @@ ViridianGymObject: ; 0x74bde (size=105)
 	db SPRITE_BALL, $9 + 4, $10 + 4, $ff, $ff, $8b, REVIVE ; item
 
 	; warp-to
-	EVENT_DISP $a, $11, $10
-	EVENT_DISP $a, $11, $11
+	EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10
+	EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $11
 
 ViridianGymBlocks: ; 74c47 (1d:4c47)
 	INCBIN "maps/viridiangym.blk"
@@ -105029,8 +105029,8 @@ PewterMartObject: ; 0x74cda (size=38)
 	db SPRITE_BLACK_HAIR_BOY_2, $5 + 4, $5 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
+	EVENT_DISP PEWTER_MART_WIDTH, $7, $3
+	EVENT_DISP PEWTER_MART_WIDTH, $7, $4
 
 UnknownDungeon1_h: ; 0x74d00 to 0x74d0c (12 bytes) (id=228)
 	db CAVERN ; tileset
@@ -105069,15 +105069,15 @@ UnknownDungeon1Object: ; 0x74d15 (size=97)
 	db SPRITE_BALL, $0 + 4, $5 + 4, $ff, $ff, $83, NUGGET ; item
 
 	; warp-to
-	EVENT_DISP $f, $11, $18
-	EVENT_DISP $f, $11, $19
-	EVENT_DISP $f, $1, $1b ; UNKNOWN_DUNGEON_2
-	EVENT_DISP $f, $7, $17 ; UNKNOWN_DUNGEON_2
-	EVENT_DISP $f, $9, $12 ; UNKNOWN_DUNGEON_2
-	EVENT_DISP $f, $1, $7 ; UNKNOWN_DUNGEON_2
-	EVENT_DISP $f, $3, $1 ; UNKNOWN_DUNGEON_2
-	EVENT_DISP $f, $b, $3 ; UNKNOWN_DUNGEON_2
-	EVENT_DISP $f, $6, $0 ; UNKNOWN_DUNGEON_3
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $18
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $11, $19
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $1b ; UNKNOWN_DUNGEON_2
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $7, $17 ; UNKNOWN_DUNGEON_2
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $9, $12 ; UNKNOWN_DUNGEON_2
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $1, $7 ; UNKNOWN_DUNGEON_2
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $3, $1 ; UNKNOWN_DUNGEON_2
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $b, $3 ; UNKNOWN_DUNGEON_2
+	EVENT_DISP UNKNOWN_DUNGEON_1_WIDTH, $6, $0 ; UNKNOWN_DUNGEON_3
 
 UnknownDungeon1Blocks: ; 74d76 (1d:4d76)
 	INCBIN "maps/unknowndungeon1.blk"
@@ -105213,9 +105213,9 @@ CeruleanHouse2Object: ; 0x74ebe (size=34)
 	db SPRITE_FAT_BALD_GUY, $3 + 4, $5 + 4, $ff, $d3, $1 ; person
 
 	; warp-to
-	EVENT_DISP $4, $0, $2
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $0, $2
+	EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $2
+	EVENT_DISP CERULEAN_HOUSE_2_WIDTH, $7, $3
 
 VendingMachineMenu: ; 74ee0 (1d:4ee0)
 	ld hl, VendingMachineText1
@@ -105399,8 +105399,8 @@ FuchsiaHouse1Object: ; 0x75031 (size=38)
 	db SPRITE_BUG_CATCHER, $5 + 4, $5 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
+	EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $2
+	EVENT_DISP FUCHSIA_HOUSE_1_WIDTH, $7, $3
 
 FuchsiaPokecenter_h: ; 0x75057 to 0x75063 (12 bytes) (id=154)
 	db POKECENTER ; tileset
@@ -105449,8 +105449,8 @@ FuchsiaPokecenterObject: ; 0x7507d (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP FUCHSIA_POKECENTER_WIDTH, $7, $4
 
 FuchsiaHouse2_h: ; 0x750a9 to 0x750b5 (12 bytes) (id=155)
 	db LAB ; tileset
@@ -105595,15 +105595,15 @@ FuchsiaHouse2Object: ; 0x75180 (size=45)
 	db SPRITE_BOULDER, $4 + 4, $8 + 4, $ff, $10, $3 ; person
 
 	; warp-to
-	EVENT_DISP $5, $7, $4
-	EVENT_DISP $5, $7, $5
+	EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $4
+	EVENT_DISP FUCHSIA_HOUSE_2_WIDTH, $7, $5
 
 FuchsiaHouse2Blocks: ; 751ad (1d:51ad)
 	INCBIN "maps/fuchsiahouse2.blk"
 
 SafariZoneEntrance_h: ; 0x751c1 to 0x751cd (12 bytes) (id=156)
 	db GATE ; tileset
-	db SAFARIZONEENTRANCE_HEIGHT, SAFARIZONEENTRANCE_WIDTH ; dimensions (y, x)
+	db SAFARI_ZONE_ENTRANCE_HEIGHT, SAFARI_ZONE_ENTRANCE_WIDTH ; dimensions (y, x)
 	dw SafariZoneEntranceBlocks, SafariZoneEntranceTextPointers, SafariZoneEntranceScript ; blocks, texts, scripts
 	db $00 ; connections
 	dw SafariZoneEntranceObject ; objects
@@ -105925,10 +105925,10 @@ SafariZoneEntranceObject: ; 0x753f5 (size=48)
 	db SPRITE_WHITE_PLAYER, $4 + 4, $1 + 4, $ff, $d3, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $5, $3
-	EVENT_DISP $4, $5, $4
-	EVENT_DISP $4, $0, $3 ; SAFARI_ZONE_CENTER
-	EVENT_DISP $4, $0, $4 ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $3
+	EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $5, $4
+	EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $3 ; SAFARI_ZONE_CENTER
+	EVENT_DISP SAFARI_ZONE_ENTRANCE_WIDTH, $0, $4 ; SAFARI_ZONE_CENTER
 
 SafariZoneEntranceBlocks: ; 75425 (1d:5425)
 	INCBIN "maps/safarizoneentrance.blk"
@@ -106294,15 +106294,15 @@ FuchsiaGymObject: ; 0x75658 (size=82)
 	db SPRITE_GYM_HELPER, $f + 4, $7 + 4, $ff, $d0, $8 ; person
 
 	; warp-to
-	EVENT_DISP $5, $11, $4
-	EVENT_DISP $5, $11, $5
+	EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $4
+	EVENT_DISP FUCHSIA_GYM_WIDTH, $11, $5
 
 FuchsiaGymBlocks: ; 756aa (1d:56aa)
 	INCBIN "maps/fuchsiagym.blk"
 
 FuchsiaMeetingRoom_h: ; 0x756d7 to 0x756e3 (12 bytes) (id=158)
 	db LAB ; tileset
-	db FUCHSIAMEETINGROOM_HEIGHT, FUCHSIAMEETINGROOM_WIDTH ; dimensions (y, x)
+	db FUCHSIA_MEETING_ROOM_HEIGHT, FUCHSIA_MEETING_ROOM_WIDTH ; dimensions (y, x)
 	dw FuchsiaMeetingRoomBlocks, FuchsiaMeetingRoomTextPointers, FuchsiaMeetingRoomScript ; blocks, texts, scripts
 	db $00 ; connections
 	dw FuchsiaMeetingRoomObject ; objects
@@ -106343,8 +106343,8 @@ FuchsiaMeetingRoomObject: ; 0x756fc (size=38)
 	db SPRITE_WHITE_PLAYER, $1 + 4, $a + 4, $ff, $d0, $3 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $4
-	EVENT_DISP $7, $7, $5
+	EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $4
+	EVENT_DISP FUCHSIA_MEETING_ROOM_WIDTH, $7, $5
 
 FuchsiaMeetingRoomBlocks: ; 75722 (1d:5722)
 	INCBIN "maps/fuchsiameetingroom.blk"
@@ -106857,8 +106857,8 @@ CinnabarGymObject: ; 0x75acc (size=90)
 	db SPRITE_GYM_HELPER, $d + 4, $10 + 4, $ff, $d0, $9 ; person
 
 	; warp-to
-	EVENT_DISP $a, $11, $10
-	EVENT_DISP $a, $11, $11
+	EVENT_DISP CINNABAR_GYM_WIDTH, $11, $10
+	EVENT_DISP CINNABAR_GYM_WIDTH, $11, $11
 
 CinnabarGymBlocks: ; 75b26 (1d:5b26)
 	INCBIN "maps/cinnabargym.blk"
@@ -106921,11 +106921,11 @@ Lab1Object: ; 0x75bb3 (size=62)
 	db SPRITE_FISHER, $3 + 4, $1 + 4, $ff, $ff, $1 ; person
 
 	; warp-to
-	EVENT_DISP $9, $7, $2
-	EVENT_DISP $9, $7, $3
-	EVENT_DISP $9, $4, $8 ; CINNABAR_LAB_2
-	EVENT_DISP $9, $4, $c ; CINNABAR_LAB_3
-	EVENT_DISP $9, $4, $10 ; CINNABAR_LAB_4
+	EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $2
+	EVENT_DISP CINNABAR_LAB_1_WIDTH, $7, $3
+	EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $8 ; CINNABAR_LAB_2
+	EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $c ; CINNABAR_LAB_3
+	EVENT_DISP CINNABAR_LAB_1_WIDTH, $4, $10 ; CINNABAR_LAB_4
 
 Lab1Blocks: ; 75bf1 (1d:5bf1)
 	INCBIN "maps/lab1.blk"
@@ -106979,8 +106979,8 @@ Lab2Object: ; 0x75c45 (size=38)
 	db SPRITE_FOULARD_WOMAN, $5 + 4, $5 + 4, $ff, $d1, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; CINNABAR_LAB_1
-	EVENT_DISP $4, $7, $3 ; CINNABAR_LAB_1
+	EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1
+	EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $3 ; CINNABAR_LAB_1
 
 Lab2Blocks: ; 75c6b (1d:5c6b)
 	INCBIN "maps/lab2.blk"
@@ -107073,8 +107073,8 @@ Lab3Object: ; 0x75cec (size=41)
 	db SPRITE_OAK_AIDE, $3 + 4, $2 + 4, $fe, $2, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; CINNABAR_LAB_1
-	EVENT_DISP $4, $7, $3 ; CINNABAR_LAB_1
+	EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $2 ; CINNABAR_LAB_1
+	EVENT_DISP CINNABAR_LAB_3_WIDTH, $7, $3 ; CINNABAR_LAB_1
 
 Lab3Blocks: ; 75d15 (1d:5d15)
 	INCBIN "maps/lab3.blk"
@@ -107218,8 +107218,8 @@ Lab4Object: ; 0x75df0 (size=32)
 	db SPRITE_OAK_AIDE, $6 + 4, $7 + 4, $ff, $d1, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2 ; CINNABAR_LAB_1
-	EVENT_DISP $4, $7, $3 ; CINNABAR_LAB_1
+	EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $2 ; CINNABAR_LAB_1
+	EVENT_DISP CINNABAR_LAB_4_WIDTH, $7, $3 ; CINNABAR_LAB_1
 
 Lab4Blocks: ; 75e10 (1d:5e10)
 	INCBIN "maps/lab4.blk"
@@ -107271,8 +107271,8 @@ CinnabarPokecenterObject: ; 0x75e46 (size=44)
 	db SPRITE_CABLE_CLUB_WOMAN, $2 + 4, $b + 4, $ff, $d0, $4 ; person
 
 	; warp-to
-	EVENT_DISP $7, $7, $3
-	EVENT_DISP $7, $7, $4
+	EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $3
+	EVENT_DISP CINNABAR_POKECENTER_WIDTH, $7, $4
 
 CinnabarMart_h: ; 0x75e72 to 0x75e7e (12 bytes) (id=172)
 	db MART ; tileset
@@ -107312,40 +107312,40 @@ CinnabarMartObject: ; 0x75e91 (size=38)
 	db SPRITE_OAK_AIDE, $4 + 4, $3 + 4, $ff, $ff, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $7, $4
+	EVENT_DISP CINNABAR_MART_WIDTH, $7, $3
+	EVENT_DISP CINNABAR_MART_WIDTH, $7, $4
 
-CopycatsHouseF1_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
+CopycatsHouse1F_h: ; 0x75eb7 to 0x75ec3 (12 bytes) (id=175)
 	db REDS_HOUSE_1 ; tileset
 	db COPYCATS_HOUSE_1F_HEIGHT, COPYCATS_HOUSE_1F_WIDTH ; dimensions (y, x)
-	dw CopycatsHouseF1Blocks, CopycatsHouseF1TextPointers, CopycatsHouseF1Script ; blocks, texts, scripts
+	dw CopycatsHouse1FBlocks, CopycatsHouse1FTextPointers, CopycatsHouse1FScript ; blocks, texts, scripts
 	db $00 ; connections
-	dw CopycatsHouseF1Object ; objects
+	dw CopycatsHouse1FObject ; objects
 
-CopycatsHouseF1Script: ; 75ec3 (1d:5ec3)
+CopycatsHouse1FScript: ; 75ec3 (1d:5ec3)
 	jp EnableAutoTextBoxDrawing
 
-CopycatsHouseF1TextPointers: ; 75ec6 (1d:5ec6)
-	dw CopycatsHouseF1Text1
-	dw CopycatsHouseF1Text2
-	dw CopycatsHouseF1Text3
+CopycatsHouse1FTextPointers: ; 75ec6 (1d:5ec6)
+	dw CopycatsHouse1FText1
+	dw CopycatsHouse1FText2
+	dw CopycatsHouse1FText3
 
-CopycatsHouseF1Text1: ; 75ecc (1d:5ecc)
-	TX_FAR _CopycatsHouseF1Text1
+CopycatsHouse1FText1: ; 75ecc (1d:5ecc)
+	TX_FAR _CopycatsHouse1FText1
 	db "@"
 
-CopycatsHouseF1Text2: ; 75ed1 (1d:5ed1)
-	TX_FAR _CopycatsHouseF1Text2
+CopycatsHouse1FText2: ; 75ed1 (1d:5ed1)
+	TX_FAR _CopycatsHouse1FText2
 	db "@"
 
-CopycatsHouseF1Text3: ; 75ed6 (1d:5ed6)
-	TX_FAR _CopycatsHouseF1Text3
+CopycatsHouse1FText3: ; 75ed6 (1d:5ed6)
+	TX_FAR _CopycatsHouse1FText3
 	db $8
 	ld a, CHANSEY
 	call PlayCry
 	jp TextScriptEnd
 
-CopycatsHouseF1Object: ; 0x75ee3 (size=46)
+CopycatsHouse1FObject: ; 0x75ee3 (size=46)
 	db $a ; border tile
 
 	db $3 ; warps
@@ -107361,9 +107361,9 @@ CopycatsHouseF1Object: ; 0x75ee3 (size=46)
 	db SPRITE_CLEFAIRY, $4 + 4, $1 + 4, $fe, $1, $3 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $2
-	EVENT_DISP $4, $7, $3
-	EVENT_DISP $4, $1, $7 ; COPYCATS_HOUSE_2F
+	EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $2
+	EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $7, $3
+	EVENT_DISP COPYCATS_HOUSE_1F_WIDTH, $1, $7 ; COPYCATS_HOUSE_2F
 
 Gary_h: ; 75f11 (1d:5f11)
 	db GYM ;tileset
@@ -107686,10 +107686,10 @@ GaryObject: ; 0x7612f (size=48)
 	db SPRITE_OAK, $7 + 4, $3 + 4, $ff, $d1, $2 ; person
 
 	; warp-to
-	EVENT_DISP $4, $7, $3 ; LANCES_ROOM
-	EVENT_DISP $4, $7, $4 ; LANCES_ROOM
-	EVENT_DISP $4, $0, $3 ; HALL_OF_FAME
-	EVENT_DISP $4, $0, $4 ; HALL_OF_FAME
+	EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $3 ; LANCES_ROOM
+	EVENT_DISP CHAMPIONS_ROOM_WIDTH, $7, $4 ; LANCES_ROOM
+	EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $3 ; HALL_OF_FAME
+	EVENT_DISP CHAMPIONS_ROOM_WIDTH, $0, $4 ; HALL_OF_FAME
 
 GaryBlocks: ; 7615f (1d:615f)
 	INCBIN "maps/gary.blk"
@@ -107870,10 +107870,10 @@ LoreleiObject: ; 0x76280 (size=44)
 	db SPRITE_LORELEI, $2 + 4, $5 + 4, $ff, $d0, $41, LORELEI + $C8, $1 ; trainer
 
 	; warp-to
-	EVENT_DISP $5, $b, $4 ; INDIGO_PLATEAU_LOBBY
-	EVENT_DISP $5, $b, $5 ; INDIGO_PLATEAU_LOBBY
-	EVENT_DISP $5, $0, $4 ; BRUNOS_ROOM
-	EVENT_DISP $5, $0, $5 ; BRUNOS_ROOM
+	EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $4 ; INDIGO_PLATEAU_LOBBY
+	EVENT_DISP LORELEIS_ROOM_WIDTH, $b, $5 ; INDIGO_PLATEAU_LOBBY
+	EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $4 ; BRUNOS_ROOM
+	EVENT_DISP LORELEIS_ROOM_WIDTH, $0, $5 ; BRUNOS_ROOM
 
 LoreleiBlocks: ; 762ac (1d:62ac)
 	INCBIN "maps/lorelei.blk"
@@ -108055,10 +108055,10 @@ BrunoObject: ; 0x763d7 (size=44)
 	db SPRITE_BRUNO, $2 + 4, $5 + 4, $ff, $d0, $41, BRUNO + $C8, $1 ; trainer
 
 	; warp-to
-	EVENT_DISP $5, $b, $4 ; LORELEIS_ROOM
-	EVENT_DISP $5, $b, $5 ; LORELEIS_ROOM
-	EVENT_DISP $5, $0, $4 ; AGATHAS_ROOM
-	EVENT_DISP $5, $0, $5 ; AGATHAS_ROOM
+	EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $4 ; LORELEIS_ROOM
+	EVENT_DISP BRUNOS_ROOM_WIDTH, $b, $5 ; LORELEIS_ROOM
+	EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $4 ; AGATHAS_ROOM
+	EVENT_DISP BRUNOS_ROOM_WIDTH, $0, $5 ; AGATHAS_ROOM
 
 BrunoBlocks: ; 76403 (1d:6403)
 	INCBIN "maps/bruno.blk"
@@ -108243,10 +108243,10 @@ AgathaObject: ; 0x76534 (size=44)
 	db SPRITE_AGATHA, $2 + 4, $5 + 4, $ff, $d0, $41, AGATHA + $C8, $1 ; trainer
 
 	; warp-to
-	EVENT_DISP $5, $b, $4 ; BRUNOS_ROOM
-	EVENT_DISP $5, $b, $5 ; BRUNOS_ROOM
-	EVENT_DISP $5, $0, $4 ; LANCES_ROOM
-	EVENT_DISP $5, $0, $5 ; LANCES_ROOM
+	EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $4 ; BRUNOS_ROOM
+	EVENT_DISP AGATHAS_ROOM_WIDTH, $b, $5 ; BRUNOS_ROOM
+	EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $4 ; LANCES_ROOM
+	EVENT_DISP AGATHAS_ROOM_WIDTH, $0, $5 ; LANCES_ROOM
 
 AgathaBlocks: ; 76560 (1d:6560)
 	INCBIN "maps/agatha.blk"
@@ -108418,7 +108418,7 @@ HiddenItemCoords: ; 766b8 (1d:66b8)
 	db ROUTE_13,$0e,$01
 	db ROUTE_13,$0d,$10
 	db MANSION_4,$09,$01
-	db SAFARIZONEENTRANCE,$01,$0a
+	db SAFARI_ZONE_ENTRANCE,$01,$0a
 	db SAFARI_ZONE_WEST,$05,$06
 	db SILPH_CO_5F,$03,$0c
 	db SILPH_CO_9F,$0f,$02
diff --git a/maps/copycatshousef1.blk b/maps/copycatshouse1f.blk
index 1b7d4f07..1b7d4f07 100644
--- a/maps/copycatshousef1.blk
+++ b/maps/copycatshouse1f.blk
diff --git a/maps/copycatshousef2.blk b/maps/copycatshouse2f.blk
index dd9d1ea4..dd9d1ea4 100644
--- a/maps/copycatshousef2.blk
+++ b/maps/copycatshouse2f.blk
diff --git a/maps/museumf1.blk b/maps/museum1f.blk
index a96771ba..a96771ba 100644
--- a/maps/museumf1.blk
+++ b/maps/museum1f.blk
diff --git a/maps/museumf2.blk b/maps/museum2f.blk
index 355e5d80..355e5d80 100644
--- a/maps/museumf2.blk
+++ b/maps/museum2f.blk
diff --git a/maps/route16gatemap.blk b/maps/route16gate.blk
index 9cd90e33..9cd90e33 100644
--- a/maps/route16gatemap.blk
+++ b/maps/route16gate.blk
diff --git a/text/maps/cerulean_trade_house.asm b/text/maps/cerulean_trade_house.asm
index 7ed628fa..78c9f76a 100644
--- a/text/maps/cerulean_trade_house.asm
+++ b/text/maps/cerulean_trade_house.asm
@@ -1,4 +1,4 @@
-_CeruleanHouseText1:: ; 9888c (26:488c)
+_CeruleanHouse1Text1:: ; 9888c (26:488c)
 	text "My husband likes"
 	line "trading #MON."
 
diff --git a/text/maps/copycats_house_1f.asm b/text/maps/copycats_house_1f.asm
index 872d52fc..0af104a4 100644
--- a/text/maps/copycats_house_1f.asm
+++ b/text/maps/copycats_house_1f.asm
@@ -1,11 +1,11 @@
-_CopycatsHouseF1Text1:: ; a14f7 (28:54f7)
+_CopycatsHouse1FText1:: ; a14f7 (28:54f7)
 	text "My daughter is so"
 	line "self-centered."
 	cont "She only has a"
 	cont "few friends."
 	done
 
-_CopycatsHouseF1Text2:: ; a1535 (28:5535)
+_CopycatsHouse1FText2:: ; a1535 (28:5535)
 	text "My daughter likes"
 	line "to mimic people."
 
@@ -15,7 +15,7 @@ _CopycatsHouseF1Text2:: ; a1535 (28:5535)
 	cont "around here!"
 	done
 
-_CopycatsHouseF1Text3:: ; a1596 (28:5596)
+_CopycatsHouse1FText3:: ; a1596 (28:5596)
 	text "CHANSEY: Chaan!"
 	line "Sii!@@"
 
diff --git a/text/maps/copycats_house_2f.asm b/text/maps/copycats_house_2f.asm
index 0f429f57..c818f034 100644
--- a/text/maps/copycats_house_2f.asm
+++ b/text/maps/copycats_house_2f.asm
@@ -58,7 +58,7 @@ _TM31NoRoomText:: ; a1733 (28:5733)
 	text "Don't you want"
 	line "this?@@"
 
-_CopycatsHouseF2Text2:: ; a1749 (28:5749)
+_CopycatsHouse2FText2:: ; a1749 (28:5749)
 	text "DODUO: Giiih!"
 
 	para "MIRROR MIRROR ON"
@@ -67,13 +67,13 @@ _CopycatsHouseF2Text2:: ; a1749 (28:5749)
 	cont "OF ALL?"
 	done
 
-_CopycatsHouseF2Text3:: ; a1792 (28:5792)
+_CopycatsHouse2FText3:: ; a1792 (28:5792)
 	text "This is a rare"
 	line "#MON! Huh?"
 	cont "It's only a doll!"
 	done
 
-_CopycatsHouseF2Text6:: ; a17be (28:57be)
+_CopycatsHouse2FText6:: ; a17be (28:57be)
 	text "A game with MARIO"
 	line "wearing a bucket"
 	cont "on his head!"
diff --git a/text/maps/museum_2f.asm b/text/maps/museum_2f.asm
index b986d823..7594c797 100644
--- a/text/maps/museum_2f.asm
+++ b/text/maps/museum_2f.asm
@@ -1,11 +1,11 @@
-_MuseumF2Text1:: ; 96841 (25:6841)
+_Museum2FText1:: ; 96841 (25:6841)
 	text "MOON STONE?"
 
 	para "What's so special"
 	line "about it?"
 	done
 
-_MuseumF2Text2:: ; 96869 (25:6869)
+_Museum2FText2:: ; 96869 (25:6869)
 	text "July 20, 1969!"
 
 	para "The 1st lunar"
@@ -15,12 +15,12 @@ _MuseumF2Text2:: ; 96869 (25:6869)
 	line "TV to watch it!"
 	done
 
-_MuseumF2Text3:: ; 968b1 (25:68b1)
+_Museum2FText3:: ; 968b1 (25:68b1)
 	text "We have a space"
 	line "exhibit now."
 	done
 
-_MuseumF2Text4:: ; 968cf (25:68cf)
+_Museum2FText4:: ; 968cf (25:68cf)
 	text "I want a PIKACHU!"
 	line "It's so cute!"
 
@@ -28,17 +28,17 @@ _MuseumF2Text4:: ; 968cf (25:68cf)
 	line "to catch me one!"
 	done
 
-_MuseumF2Text5:: ; 96911 (25:6911)
+_Museum2FText5:: ; 96911 (25:6911)
 	text "Yeah, a PIKACHU"
 	line "soon, I promise!"
 	done
 
-_MuseumF2Text6:: ; 96933 (25:6933)
+_Museum2FText6:: ; 96933 (25:6933)
 	text "SPACE SHUTTLE"
 	line "COLUMBIA"
 	done
 
-_MuseumF2Text7:: ; 9694b (25:694b)
+_Museum2FText7:: ; 9694b (25:694b)
 	text "Meteorite that"
 	line "fell on MT.MOON."
 	cont "(MOON STONE?)"
diff --git a/text/maps/route_16_gate.asm b/text/maps/route_16_gate.asm
index b83bbf50..22ac6788 100644
--- a/text/maps/route_16_gate.asm
+++ b/text/maps/route_16_gate.asm
@@ -16,7 +16,7 @@ _UnnamedText_49781:: ; 8cd0e (23:4d0e)
 	line "up please!"
 	done
 
-_Route16GateMapText2:: ; 8cd2a (23:4d2a)
+_Route16GateText2:: ; 8cd2a (23:4d2a)
 	text "How'd you get in?"
 	line "Good effort!"
 	done
diff --git a/text/maps/viridian_forest_exit.asm b/text/maps/viridian_forest_exit.asm
index 6cfb5ee0..e74474e9 100644
--- a/text/maps/viridian_forest_exit.asm
+++ b/text/maps/viridian_forest_exit.asm
@@ -1,4 +1,4 @@
-_ViridianForestexitText1:: ; 8a6fd (22:66fd)
+_ViridianForestExitText1:: ; 8a6fd (22:66fd)
 	text "Many #MON live"
 	line "only in forests "
 	cont "and caves."
@@ -8,7 +8,7 @@ _ViridianForestexitText1:: ; 8a6fd (22:66fd)
 	cont "different kinds!"
 	done
 
-_ViridianForestexitText2:: ; 8a75d (22:675d)
+_ViridianForestExitText2:: ; 8a75d (22:675d)
 	text "Have you noticed"
 	line "the bushes on the"
 	cont "roadside?"
diff --git a/wram.asm b/wram.asm
index d96fdaf8..0ea63121 100644..100755
--- a/wram.asm
+++ b/wram.asm
@@ -1142,7 +1142,7 @@ W_SSANNE5CURSCRIPT:: ; d617
 	ds 1
 W_VIRIDIANFORESTCURSCRIPT:: ; d618
 	ds 1
-W_MUSEUMF1CURSCRIPT:: ; d619
+W_MUSEUM1FCURSCRIPT:: ; d619
 	ds 1
 W_ROUTE13CURSCRIPT:: ; d61a
 	ds 1