380 files changed, 375 insertions, 375 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