combine audio and music folders

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"