359 files changed, 3845 insertions, 3843 deletions

diff --git a/audio.asm b/audio.asm
index 27570b93..286dc7ed 100644
--- a/audio.asm
+++ b/audio.asm
@@ -7,356 +7,356 @@ INCLUDE "constants.asm"
 
 
 SECTION "Sound Effect Headers 1", ROMX, BANK[AUDIO_1]
-INCLUDE "audio/headers/sfxheaders02.asm"
+INCLUDE "audio/headers/sfxheaders1.asm"
 
 SECTION "Sound Effect Headers 2", ROMX, BANK[AUDIO_2]
-INCLUDE "audio/headers/sfxheaders08.asm"
+INCLUDE "audio/headers/sfxheaders2.asm"
 
 SECTION "Sound Effect Headers 3", ROMX, BANK[AUDIO_3]
-INCLUDE "audio/headers/sfxheaders1f.asm"
+INCLUDE "audio/headers/sfxheaders3.asm"
 
 
 
 SECTION "Music Headers 1", ROMX, BANK[AUDIO_1]
-INCLUDE "audio/headers/musicheaders02.asm"
+INCLUDE "audio/headers/musicheaders1.asm"
 
 SECTION "Music Headers 2", ROMX, BANK[AUDIO_2]
-INCLUDE "audio/headers/musicheaders08.asm"
+INCLUDE "audio/headers/musicheaders2.asm"
 
 SECTION "Music Headers 3", ROMX, BANK[AUDIO_3]
-INCLUDE "audio/headers/musicheaders1f.asm"
+INCLUDE "audio/headers/musicheaders3.asm"
 
 
 
 SECTION "Sound Effects 1", ROMX, BANK[AUDIO_1]
 
-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"
-
-Music2_WavePointers: INCLUDE "audio/wave_instruments.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"
+INCLUDE "audio/sfx/snare1_1.asm"
+INCLUDE "audio/sfx/snare2_1.asm"
+INCLUDE "audio/sfx/snare3_1.asm"
+INCLUDE "audio/sfx/snare4_1.asm"
+INCLUDE "audio/sfx/snare5_1.asm"
+INCLUDE "audio/sfx/triangle1_1.asm"
+INCLUDE "audio/sfx/triangle2_1.asm"
+INCLUDE "audio/sfx/snare6_1.asm"
+INCLUDE "audio/sfx/snare7_1.asm"
+INCLUDE "audio/sfx/snare8_1.asm"
+INCLUDE "audio/sfx/snare9_1.asm"
+INCLUDE "audio/sfx/cymbal1_1.asm"
+INCLUDE "audio/sfx/cymbal2_1.asm"
+INCLUDE "audio/sfx/cymbal3_1.asm"
+INCLUDE "audio/sfx/muted_snare1_1.asm"
+INCLUDE "audio/sfx/triangle3_1.asm"
+INCLUDE "audio/sfx/muted_snare2_1.asm"
+INCLUDE "audio/sfx/muted_snare3_1.asm"
+INCLUDE "audio/sfx/muted_snare4_1.asm"
+
+Audio1_WavePointers: INCLUDE "audio/wave_instruments.asm"
+
+INCLUDE "audio/sfx/start_menu_1.asm"
+INCLUDE "audio/sfx/pokeflute.asm"
+INCLUDE "audio/sfx/cut_1.asm"
+INCLUDE "audio/sfx/go_inside_1.asm"
+INCLUDE "audio/sfx/swap_1.asm"
+INCLUDE "audio/sfx/tink_1.asm"
+INCLUDE "audio/sfx/59_1.asm"
+INCLUDE "audio/sfx/purchase_1.asm"
+INCLUDE "audio/sfx/collision_1.asm"
+INCLUDE "audio/sfx/go_outside_1.asm"
+INCLUDE "audio/sfx/press_ab_1.asm"
+INCLUDE "audio/sfx/save_1.asm"
+INCLUDE "audio/sfx/heal_hp_1.asm"
+INCLUDE "audio/sfx/poisoned_1.asm"
+INCLUDE "audio/sfx/heal_ailment_1.asm"
+INCLUDE "audio/sfx/trade_machine_1.asm"
+INCLUDE "audio/sfx/turn_on_pc_1.asm"
+INCLUDE "audio/sfx/turn_off_pc_1.asm"
+INCLUDE "audio/sfx/enter_pc_1.asm"
+INCLUDE "audio/sfx/shrink_1.asm"
+INCLUDE "audio/sfx/switch_1.asm"
+INCLUDE "audio/sfx/healing_machine_1.asm"
+INCLUDE "audio/sfx/teleport_exit1_1.asm"
+INCLUDE "audio/sfx/teleport_enter1_1.asm"
+INCLUDE "audio/sfx/teleport_exit2_1.asm"
+INCLUDE "audio/sfx/ledge_1.asm"
+INCLUDE "audio/sfx/teleport_enter2_1.asm"
+INCLUDE "audio/sfx/fly_1.asm"
+INCLUDE "audio/sfx/denied_1.asm"
+INCLUDE "audio/sfx/arrow_tiles_1.asm"
+INCLUDE "audio/sfx/push_boulder_1.asm"
+INCLUDE "audio/sfx/ss_anne_horn_1.asm"
+INCLUDE "audio/sfx/withdraw_deposit_1.asm"
+INCLUDE "audio/sfx/safari_zone_pa.asm"
+INCLUDE "audio/sfx/unused_1.asm"
+INCLUDE "audio/sfx/cry09_1.asm"
+INCLUDE "audio/sfx/cry23_1.asm"
+INCLUDE "audio/sfx/cry24_1.asm"
+INCLUDE "audio/sfx/cry11_1.asm"
+INCLUDE "audio/sfx/cry25_1.asm"
+INCLUDE "audio/sfx/cry03_1.asm"
+INCLUDE "audio/sfx/cry0f_1.asm"
+INCLUDE "audio/sfx/cry10_1.asm"
+INCLUDE "audio/sfx/cry00_1.asm"
+INCLUDE "audio/sfx/cry0e_1.asm"
+INCLUDE "audio/sfx/cry06_1.asm"
+INCLUDE "audio/sfx/cry07_1.asm"
+INCLUDE "audio/sfx/cry05_1.asm"
+INCLUDE "audio/sfx/cry0b_1.asm"
+INCLUDE "audio/sfx/cry0c_1.asm"
+INCLUDE "audio/sfx/cry02_1.asm"
+INCLUDE "audio/sfx/cry0d_1.asm"
+INCLUDE "audio/sfx/cry01_1.asm"
+INCLUDE "audio/sfx/cry0a_1.asm"
+INCLUDE "audio/sfx/cry08_1.asm"
+INCLUDE "audio/sfx/cry04_1.asm"
+INCLUDE "audio/sfx/cry19_1.asm"
+INCLUDE "audio/sfx/cry16_1.asm"
+INCLUDE "audio/sfx/cry1b_1.asm"
+INCLUDE "audio/sfx/cry12_1.asm"
+INCLUDE "audio/sfx/cry13_1.asm"
+INCLUDE "audio/sfx/cry14_1.asm"
+INCLUDE "audio/sfx/cry1e_1.asm"
+INCLUDE "audio/sfx/cry15_1.asm"
+INCLUDE "audio/sfx/cry17_1.asm"
+INCLUDE "audio/sfx/cry1c_1.asm"
+INCLUDE "audio/sfx/cry1a_1.asm"
+INCLUDE "audio/sfx/cry1d_1.asm"
+INCLUDE "audio/sfx/cry18_1.asm"
+INCLUDE "audio/sfx/cry1f_1.asm"
+INCLUDE "audio/sfx/cry20_1.asm"
+INCLUDE "audio/sfx/cry21_1.asm"
+INCLUDE "audio/sfx/cry22_1.asm"
 
 
 SECTION "Sound Effects 2", ROMX, BANK[AUDIO_2]
 
-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"
-
-Music8_WavePointers: INCLUDE "audio/wave_instruments.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"
+INCLUDE "audio/sfx/snare1_2.asm"
+INCLUDE "audio/sfx/snare2_2.asm"
+INCLUDE "audio/sfx/snare3_2.asm"
+INCLUDE "audio/sfx/snare4_2.asm"
+INCLUDE "audio/sfx/snare5_2.asm"
+INCLUDE "audio/sfx/triangle1_2.asm"
+INCLUDE "audio/sfx/triangle2_2.asm"
+INCLUDE "audio/sfx/snare6_2.asm"
+INCLUDE "audio/sfx/snare7_2.asm"
+INCLUDE "audio/sfx/snare8_2.asm"
+INCLUDE "audio/sfx/snare9_2.asm"
+INCLUDE "audio/sfx/cymbal1_2.asm"
+INCLUDE "audio/sfx/cymbal2_2.asm"
+INCLUDE "audio/sfx/cymbal3_2.asm"
+INCLUDE "audio/sfx/muted_snare1_2.asm"
+INCLUDE "audio/sfx/triangle3_2.asm"
+INCLUDE "audio/sfx/muted_snare2_2.asm"
+INCLUDE "audio/sfx/muted_snare3_2.asm"
+INCLUDE "audio/sfx/muted_snare4_2.asm"
+
+Audio2_WavePointers: INCLUDE "audio/wave_instruments.asm"
+
+INCLUDE "audio/sfx/press_ab_2.asm"
+INCLUDE "audio/sfx/start_menu_2.asm"
+INCLUDE "audio/sfx/tink_2.asm"
+INCLUDE "audio/sfx/heal_hp_2.asm"
+INCLUDE "audio/sfx/heal_ailment_2.asm"
+INCLUDE "audio/sfx/silph_scope.asm"
+INCLUDE "audio/sfx/ball_toss.asm"
+INCLUDE "audio/sfx/ball_poof.asm"
+INCLUDE "audio/sfx/faint_thud.asm"
+INCLUDE "audio/sfx/run.asm"
+INCLUDE "audio/sfx/dex_page_added.asm"
+INCLUDE "audio/sfx/pokeflute_ch3.asm"
+INCLUDE "audio/sfx/peck.asm"
+INCLUDE "audio/sfx/faint_fall.asm"
+INCLUDE "audio/sfx/battle_09.asm"
+INCLUDE "audio/sfx/pound.asm"
+INCLUDE "audio/sfx/battle_0b.asm"
+INCLUDE "audio/sfx/battle_0c.asm"
+INCLUDE "audio/sfx/battle_0d.asm"
+INCLUDE "audio/sfx/battle_0e.asm"
+INCLUDE "audio/sfx/battle_0f.asm"
+INCLUDE "audio/sfx/damage.asm"
+INCLUDE "audio/sfx/not_very_effective.asm"
+INCLUDE "audio/sfx/battle_12.asm"
+INCLUDE "audio/sfx/battle_13.asm"
+INCLUDE "audio/sfx/battle_14.asm"
+INCLUDE "audio/sfx/vine_whip.asm"
+INCLUDE "audio/sfx/battle_16.asm"
+INCLUDE "audio/sfx/battle_17.asm"
+INCLUDE "audio/sfx/battle_18.asm"
+INCLUDE "audio/sfx/battle_19.asm"
+INCLUDE "audio/sfx/super_effective.asm"
+INCLUDE "audio/sfx/battle_1b.asm"
+INCLUDE "audio/sfx/battle_1c.asm"
+INCLUDE "audio/sfx/doubleslap.asm"
+INCLUDE "audio/sfx/battle_1e.asm"
+INCLUDE "audio/sfx/horn_drill.asm"
+INCLUDE "audio/sfx/battle_20.asm"
+INCLUDE "audio/sfx/battle_21.asm"
+INCLUDE "audio/sfx/battle_22.asm"
+INCLUDE "audio/sfx/battle_23.asm"
+INCLUDE "audio/sfx/battle_24.asm"
+INCLUDE "audio/sfx/battle_25.asm"
+INCLUDE "audio/sfx/battle_26.asm"
+INCLUDE "audio/sfx/battle_27.asm"
+INCLUDE "audio/sfx/battle_28.asm"
+INCLUDE "audio/sfx/battle_29.asm"
+INCLUDE "audio/sfx/battle_2a.asm"
+INCLUDE "audio/sfx/battle_2b.asm"
+INCLUDE "audio/sfx/battle_2c.asm"
+INCLUDE "audio/sfx/psybeam.asm"
+INCLUDE "audio/sfx/battle_2e.asm"
+INCLUDE "audio/sfx/battle_2f.asm"
+INCLUDE "audio/sfx/psychic_m.asm"
+INCLUDE "audio/sfx/battle_31.asm"
+INCLUDE "audio/sfx/battle_32.asm"
+INCLUDE "audio/sfx/battle_33.asm"
+INCLUDE "audio/sfx/battle_34.asm"
+INCLUDE "audio/sfx/battle_35.asm"
+INCLUDE "audio/sfx/battle_36.asm"
+INCLUDE "audio/sfx/unused_2.asm"
+INCLUDE "audio/sfx/cry09_2.asm"
+INCLUDE "audio/sfx/cry23_2.asm"
+INCLUDE "audio/sfx/cry24_2.asm"
+INCLUDE "audio/sfx/cry11_2.asm"
+INCLUDE "audio/sfx/cry25_2.asm"
+INCLUDE "audio/sfx/cry03_2.asm"
+INCLUDE "audio/sfx/cry0f_2.asm"
+INCLUDE "audio/sfx/cry10_2.asm"
+INCLUDE "audio/sfx/cry00_2.asm"
+INCLUDE "audio/sfx/cry0e_2.asm"
+INCLUDE "audio/sfx/cry06_2.asm"
+INCLUDE "audio/sfx/cry07_2.asm"
+INCLUDE "audio/sfx/cry05_2.asm"
+INCLUDE "audio/sfx/cry0b_2.asm"
+INCLUDE "audio/sfx/cry0c_2.asm"
+INCLUDE "audio/sfx/cry02_2.asm"
+INCLUDE "audio/sfx/cry0d_2.asm"
+INCLUDE "audio/sfx/cry01_2.asm"
+INCLUDE "audio/sfx/cry0a_2.asm"
+INCLUDE "audio/sfx/cry08_2.asm"
+INCLUDE "audio/sfx/cry04_2.asm"
+INCLUDE "audio/sfx/cry19_2.asm"
+INCLUDE "audio/sfx/cry16_2.asm"
+INCLUDE "audio/sfx/cry1b_2.asm"
+INCLUDE "audio/sfx/cry12_2.asm"
+INCLUDE "audio/sfx/cry13_2.asm"
+INCLUDE "audio/sfx/cry14_2.asm"
+INCLUDE "audio/sfx/cry1e_2.asm"
+INCLUDE "audio/sfx/cry15_2.asm"
+INCLUDE "audio/sfx/cry17_2.asm"
+INCLUDE "audio/sfx/cry1c_2.asm"
+INCLUDE "audio/sfx/cry1a_2.asm"
+INCLUDE "audio/sfx/cry1d_2.asm"
+INCLUDE "audio/sfx/cry18_2.asm"
+INCLUDE "audio/sfx/cry1f_2.asm"
+INCLUDE "audio/sfx/cry20_2.asm"
+INCLUDE "audio/sfx/cry21_2.asm"
+INCLUDE "audio/sfx/cry22_2.asm"
 
 
 SECTION "Sound Effects 3", ROMX, BANK[AUDIO_3]
 
-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"
-
-Music1f_WavePointers: INCLUDE "audio/wave_instruments.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"
+INCLUDE "audio/sfx/snare1_3.asm"
+INCLUDE "audio/sfx/snare2_3.asm"
+INCLUDE "audio/sfx/snare3_3.asm"
+INCLUDE "audio/sfx/snare4_3.asm"
+INCLUDE "audio/sfx/snare5_3.asm"
+INCLUDE "audio/sfx/triangle1_3.asm"
+INCLUDE "audio/sfx/triangle2_3.asm"
+INCLUDE "audio/sfx/snare6_3.asm"
+INCLUDE "audio/sfx/snare7_3.asm"
+INCLUDE "audio/sfx/snare8_3.asm"
+INCLUDE "audio/sfx/snare9_3.asm"
+INCLUDE "audio/sfx/cymbal1_3.asm"
+INCLUDE "audio/sfx/cymbal2_3.asm"
+INCLUDE "audio/sfx/cymbal3_3.asm"
+INCLUDE "audio/sfx/muted_snare1_3.asm"
+INCLUDE "audio/sfx/triangle3_3.asm"
+INCLUDE "audio/sfx/muted_snare2_3.asm"
+INCLUDE "audio/sfx/muted_snare3_3.asm"
+INCLUDE "audio/sfx/muted_snare4_3.asm"
+
+Audio3_WavePointers: INCLUDE "audio/wave_instruments.asm"
+
+INCLUDE "audio/sfx/start_menu_3.asm"
+INCLUDE "audio/sfx/cut_3.asm"
+INCLUDE "audio/sfx/go_inside_3.asm"
+INCLUDE "audio/sfx/swap_3.asm"
+INCLUDE "audio/sfx/tink_3.asm"
+INCLUDE "audio/sfx/59_3.asm"
+INCLUDE "audio/sfx/purchase_3.asm"
+INCLUDE "audio/sfx/collision_3.asm"
+INCLUDE "audio/sfx/go_outside_3.asm"
+INCLUDE "audio/sfx/press_ab_3.asm"
+INCLUDE "audio/sfx/save_3.asm"
+INCLUDE "audio/sfx/heal_hp_3.asm"
+INCLUDE "audio/sfx/poisoned_3.asm"
+INCLUDE "audio/sfx/heal_ailment_3.asm"
+INCLUDE "audio/sfx/trade_machine_3.asm"
+INCLUDE "audio/sfx/turn_on_pc_3.asm"
+INCLUDE "audio/sfx/turn_off_pc_3.asm"
+INCLUDE "audio/sfx/enter_pc_3.asm"
+INCLUDE "audio/sfx/shrink_3.asm"
+INCLUDE "audio/sfx/switch_3.asm"
+INCLUDE "audio/sfx/healing_machine_3.asm"
+INCLUDE "audio/sfx/teleport_exit1_3.asm"
+INCLUDE "audio/sfx/teleport_enter1_3.asm"
+INCLUDE "audio/sfx/teleport_exit2_3.asm"
+INCLUDE "audio/sfx/ledge_3.asm"
+INCLUDE "audio/sfx/teleport_enter2_3.asm"
+INCLUDE "audio/sfx/fly_3.asm"
+INCLUDE "audio/sfx/denied_3.asm"
+INCLUDE "audio/sfx/arrow_tiles_3.asm"
+INCLUDE "audio/sfx/push_boulder_3.asm"
+INCLUDE "audio/sfx/ss_anne_horn_3.asm"
+INCLUDE "audio/sfx/withdraw_deposit_3.asm"
+INCLUDE "audio/sfx/intro_lunge.asm"
+INCLUDE "audio/sfx/intro_hip.asm"
+INCLUDE "audio/sfx/intro_hop.asm"
+INCLUDE "audio/sfx/intro_raise.asm"
+INCLUDE "audio/sfx/intro_crash.asm"
+INCLUDE "audio/sfx/intro_whoosh.asm"
+INCLUDE "audio/sfx/slots_stop_wheel.asm"
+INCLUDE "audio/sfx/slots_reward.asm"
+INCLUDE "audio/sfx/slots_new_spin.asm"
+INCLUDE "audio/sfx/shooting_star.asm"
+INCLUDE "audio/sfx/unused_3.asm"
+INCLUDE "audio/sfx/cry09_3.asm"
+INCLUDE "audio/sfx/cry23_3.asm"
+INCLUDE "audio/sfx/cry24_3.asm"
+INCLUDE "audio/sfx/cry11_3.asm"
+INCLUDE "audio/sfx/cry25_3.asm"
+INCLUDE "audio/sfx/cry03_3.asm"
+INCLUDE "audio/sfx/cry0f_3.asm"
+INCLUDE "audio/sfx/cry10_3.asm"
+INCLUDE "audio/sfx/cry00_3.asm"
+INCLUDE "audio/sfx/cry0e_3.asm"
+INCLUDE "audio/sfx/cry06_3.asm"
+INCLUDE "audio/sfx/cry07_3.asm"
+INCLUDE "audio/sfx/cry05_3.asm"
+INCLUDE "audio/sfx/cry0b_3.asm"
+INCLUDE "audio/sfx/cry0c_3.asm"
+INCLUDE "audio/sfx/cry02_3.asm"
+INCLUDE "audio/sfx/cry0d_3.asm"
+INCLUDE "audio/sfx/cry01_3.asm"
+INCLUDE "audio/sfx/cry0a_3.asm"
+INCLUDE "audio/sfx/cry08_3.asm"
+INCLUDE "audio/sfx/cry04_3.asm"
+INCLUDE "audio/sfx/cry19_3.asm"
+INCLUDE "audio/sfx/cry16_3.asm"
+INCLUDE "audio/sfx/cry1b_3.asm"
+INCLUDE "audio/sfx/cry12_3.asm"
+INCLUDE "audio/sfx/cry13_3.asm"
+INCLUDE "audio/sfx/cry14_3.asm"
+INCLUDE "audio/sfx/cry1e_3.asm"
+INCLUDE "audio/sfx/cry15_3.asm"
+INCLUDE "audio/sfx/cry17_3.asm"
+INCLUDE "audio/sfx/cry1c_3.asm"
+INCLUDE "audio/sfx/cry1a_3.asm"
+INCLUDE "audio/sfx/cry1d_3.asm"
+INCLUDE "audio/sfx/cry18_3.asm"
+INCLUDE "audio/sfx/cry1f_3.asm"
+INCLUDE "audio/sfx/cry20_3.asm"
+INCLUDE "audio/sfx/cry21_3.asm"
+INCLUDE "audio/sfx/cry22_3.asm"
 
 
 
@@ -408,12 +408,12 @@ Music_RivalAlternateStart:: ; 0x9b47
 	call PlayMusic
 	ld hl, wc006
 	ld de, Music_MeetRival_branch_b1a2
-	call Music2_OverwriteChannelPointer
+	call Audio1_OverwriteChannelPointer
 	ld de, Music_MeetRival_branch_b21d
-	call Music2_OverwriteChannelPointer
+	call Audio1_OverwriteChannelPointer
 	ld de, Music_MeetRival_branch_b2b5
 
-Music2_OverwriteChannelPointer: ; 0x9b60
+Audio1_OverwriteChannelPointer: ; 0x9b60
 	ld a, e
 	ld [hli], a
 	ld a, d
@@ -427,14 +427,14 @@ Music_RivalAlternateTempo:: ; 0x9b65
 	call PlayMusic
 	ld hl, wc006
 	ld de, Music_MeetRival_branch_b119
-	jp Music2_OverwriteChannelPointer
+	jp Audio1_OverwriteChannelPointer
 
 ; applies both the alternate start and alternate tempo
 Music_RivalAlternateStartAndTempo:: ; 0x9b75
 	call Music_RivalAlternateStart
 	ld hl, wc006
 	ld de, Music_MeetRival_branch_b19b
-	jp Music2_OverwriteChannelPointer
+	jp Audio1_OverwriteChannelPointer
 
 ; an alternate tempo for Cities1 which is used for the Hall of Fame room
 Music_Cities1AlternateTempo:: ; 0x9b81
@@ -450,7 +450,7 @@ Music_Cities1AlternateTempo:: ; 0x9b81
 	call PlayMusic
 	ld hl, wc006
 	ld de, Music_Cities1_branch_aa6f
-	jp Music2_OverwriteChannelPointer
+	jp Audio1_OverwriteChannelPointer
 
 
 SECTION "Audio Engine 2", ROMX, BANK[AUDIO_2]
@@ -538,16 +538,18 @@ INCLUDE "audio/engine_2.asm"
 
 
 Music_PokeFluteInBattle:: ; 22306 (8:6306)
-	ld a, SFX_BATTLE_06 ; PokeFlute outside of battle
+	; begin playing the "caught mon" sound effect
+	ld a, SFX_CAUGHT_MON
 	call PlaySoundWaitForCurrent
+	; then immediately overwrtie the channel pointers
 	ld hl, wc00e
 	ld de, SFX_08_PokeFlute_Ch1
-	call Music8_OverwriteChannelPointer
+	call Audio2_OverwriteChannelPointer
 	ld de, SFX_08_PokeFlute_Ch2
-	call Music8_OverwriteChannelPointer
+	call Audio2_OverwriteChannelPointer
 	ld de, SFX_08_PokeFlute_Ch3
 
-Music8_OverwriteChannelPointer: ; 2231d (8:631d)
+Audio2_OverwriteChannelPointer: ; 2231d (8:631d)
 	ld a, e
 	ld [hli], a
 	ld a, d
@@ -583,13 +585,13 @@ PlayPokedexRatingSfx:: ; 7d13b (1f:513b)
 	jp PlayDefaultMusic
 
 PokedexRatingSfxPointers: ; 7d162 (1f:5162)
-	db SFX_DENIED,         BANK(SFX_1f_51)
-	db SFX_POKEDEX_RATING, BANK(SFX_02_41)
-	db SFX_GET_ITEM_1,     BANK(SFX_02_3a)
-	db SFX_BATTLE_06,      BANK(SFX_08_46)
-	db SFX_LEVEL_UP,       BANK(SFX_08_3a)
-	db SFX_GET_KEY_ITEM,   BANK(SFX_02_42)
-	db SFX_GET_ITEM_2,     BANK(SFX_02_3b)
+	db SFX_DENIED,         BANK(SFX_Denied_3)
+	db SFX_POKEDEX_RATING, BANK(SFX_Pokedex_Rating_1)
+	db SFX_GET_ITEM_1,     BANK(SFX_Get_Item1_1)
+	db SFX_CAUGHT_MON,     BANK(SFX_Caught_Mon)
+	db SFX_LEVEL_UP,       BANK(SFX_Level_Up)
+	db SFX_GET_KEY_ITEM,   BANK(SFX_Get_Key_Item_1)
+	db SFX_GET_ITEM_2,     BANK(SFX_Get_Item2_1)
 
 OwnedMonValues: ; 7d170 (1f:5170)
 	db 10, 40, 60, 90, 120, 150, $ff
@@ -610,13 +612,13 @@ 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/sfx/get_item1_1.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/sfx/pokedex_rating_1.asm"
+INCLUDE "audio/sfx/get_item2_1.asm"
+INCLUDE "audio/sfx/get_key_item_1.asm"
 INCLUDE "audio/music/ssanne.asm"
 INCLUDE "audio/music/cities2.asm"
 INCLUDE "audio/music/celadon.asm"
@@ -630,15 +632,15 @@ INCLUDE "audio/music/pokecenter.asm"
 
 SECTION "Music 2", ROMX, BANK[AUDIO_2]
 
-INCLUDE "audio/sfx/sfx_08_pokeflute.asm"
-INCLUDE "audio/sfx/sfx_08_unused2.asm"
+INCLUDE "audio/sfx/pokeflute_ch1_ch2.asm"
+INCLUDE "audio/sfx/unused2_2.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/sfx/level_up.asm"
+INCLUDE "audio/sfx/get_item2_2.asm"
+INCLUDE "audio/sfx/caught_mon.asm"
 INCLUDE "audio/music/defeatedtrainer.asm"
 INCLUDE "audio/music/defeatedwildmon.asm"
 INCLUDE "audio/music/defeatedgymleader.asm"
@@ -650,13 +652,13 @@ 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/sfx/get_item1_3.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/sfx/pokedex_rating_3.asm"
+INCLUDE "audio/sfx/get_item2_3.asm"
+INCLUDE "audio/sfx/get_key_item_3.asm"
 INCLUDE "audio/music/oakslab.asm"
 INCLUDE "audio/music/pokemontower.asm"
 INCLUDE "audio/music/silphco.asm"
diff --git a/audio/engine_1.asm b/audio/engine_1.asm
index fd74b16d..9a302ef3 100644
--- a/audio/engine_1.asm
+++ b/audio/engine_1.asm
@@ -1,6 +1,6 @@
 ; The first of three duplicated sound engines.
 
-Music2_UpdateMusic:: ; 0x9103
+Audio1_UpdateMusic:: ; 0x9103
 	ld c, CH0
 .loop
 	ld b, $0
@@ -26,7 +26,7 @@ Music2_UpdateMusic:: ; 0x9103
 	ld [$ff1a], a
 	jr .nextChannel
 .asm_912e
-	call Music2_ApplyMusicAffects
+	call Audio1_ApplyMusicAffects
 .nextChannel
 	ld a, c
 	inc c ; inc channel number
@@ -42,13 +42,13 @@ Music2_UpdateMusic:: ; 0x9103
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Music2_ApplyMusicAffects: ; 0x9138
+Audio1_ApplyMusicAffects: ; 0x9138
 	ld b, $0
 	ld hl, wc0b6 ; delay until next note
 	add hl, bc
 	ld a, [hl]
 	cp $1 ; if the delay is 1, play next note
-	jp z, Music2_PlayNextNote
+	jp z, Audio1_PlayNextNote
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
@@ -65,7 +65,7 @@ Music2_ApplyMusicAffects: ; 0x9138
 	add hl, bc
 	bit 6, [hl] ; dutycycle
 	jr z, .checkForExecuteMusic
-	call Music2_ApplyDutyCycle
+	call Audio1_ApplyDutyCycle
 .checkForExecuteMusic
 	ld b, $0
 	ld hl, wc036
@@ -81,7 +81,7 @@ Music2_ApplyMusicAffects: ; 0x9138
 	add hl, bc
 	bit 4, [hl] ; pitchbend
 	jr z, .checkVibratoDelay
-	jp Music2_ApplyPitchBend
+	jp Audio1_ApplyPitchBend
 .checkVibratoDelay
 	ld hl, wc04e ; vibrato delay
 	add hl, bc
@@ -141,14 +141,14 @@ Music2_ApplyMusicAffects: ; 0x9138
 .done
 	ld d, a
 	ld b, $3
-	call Music2_9838
+	call Audio1_9838
 	ld [hl], d
 	ret
 
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Music2_PlayNextNote: ; 0x91d0
+Audio1_PlayNextNote: ; 0x91d0
 	ld hl, wc06e
 	add hl, bc
 	ld a, [hl]
@@ -159,14 +159,14 @@ Music2_PlayNextNote: ; 0x91d0
 	add hl, bc
 	res 4, [hl]
 	res 5, [hl]
-	call Music2_endchannel
+	call Audio1_endchannel
 	ret
 
-Music2_endchannel: ; 0x91e6
-	call Music2_GetNextMusicByte
+Audio1_endchannel: ; 0x91e6
+	call Audio1_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
-	jp nz, Music2_callchannel ; no
+	jp nz, Audio1_callchannel ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
@@ -216,7 +216,7 @@ Music2_endchannel: ; 0x91e6
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Music2_endchannel
+	jp Audio1_endchannel
 .asm_923f
 	ld hl, Unknown_9b1f
 	add hl, bc
@@ -238,7 +238,7 @@ Music2_endchannel: ; 0x91e6
 	ld a, c
 	cp CH4
 	jr z, .asm_9265
-	call Music2_96c7
+	call Audio1_96c7
 	ret c
 .asm_9265
 	ld a, [wc005]
@@ -251,12 +251,12 @@ Music2_endchannel: ; 0x91e6
 	ld [hl], b
 	ret
 
-Music2_callchannel: ; 0x9274
+Audio1_callchannel: ; 0x9274
 	cp $fd ; is this command a callchannel?
-	jp nz, Music2_loopchannel ; no
-	call Music2_GetNextMusicByte ; yes
+	jp nz, Audio1_loopchannel ; no
+	call Audio1_GetNextMusicByte ; yes
 	push af
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
 	pop af
 	ld e, a
@@ -286,12 +286,12 @@ Music2_callchannel: ; 0x9274
 	ld hl, wc02e
 	add hl, bc
 	set 1, [hl] ; set the call flag
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_loopchannel: ; 0x92a9
+Audio1_loopchannel: ; 0x92a9
 	cp $fe ; is this command a loopchannel?
-	jp nz, Music2_notetype ; no
-	call Music2_GetNextMusicByte ; yes
+	jp nz, Audio1_notetype ; no
+	call Audio1_GetNextMusicByte ; yes
 	ld e, a
 	and a
 	jr z, .infiniteLoop
@@ -303,17 +303,17 @@ Music2_loopchannel: ; 0x92a9
 	jr nz, .loopAgain
 	ld a, $1 ; if no more loops to make,
 	ld [hl], a
-	call Music2_GetNextMusicByte ; skip pointer
-	call Music2_GetNextMusicByte
-	jp Music2_endchannel
+	call Audio1_GetNextMusicByte ; skip pointer
+	call Audio1_GetNextMusicByte
+	jp Audio1_endchannel
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
 	; fall through
 .infiniteLoop ; overwrite current address with pointer
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	push af
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld b, a
 	ld d, $0
 	ld a, c
@@ -324,12 +324,12 @@ Music2_loopchannel: ; 0x92a9
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_notetype: ; 0x92e4
+Audio1_notetype: ; 0x92e4
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music2_toggleperfectpitch ; no
+	jp nz, Audio1_toggleperfectpitch ; no
 	ld a, d ; yes
 	and $f
 	ld b, $0
@@ -339,7 +339,7 @@ Music2_notetype: ; 0x92e4
 	ld a, c
 	cp CH3
 	jr z, .noiseChannel ; noise channel has 0 params
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
 	ld a, c
 	cp CH2
@@ -368,24 +368,24 @@ Music2_notetype: ; 0x92e4
 	add hl, bc
 	ld [hl], d
 .noiseChannel
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_toggleperfectpitch: ; 0x9323
+Audio1_toggleperfectpitch: ; 0x9323
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
-	jr nz, Music2_vibrato ; no
+	jr nz, Audio1_vibrato ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
 	ld a, [hl]
 	xor $1
 	ld [hl], a ; flip bit 0 of wc02e
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_vibrato: ; 0x9335
+Audio1_vibrato: ; 0x9335
 	cp $ea ; is this command a vibrato?
-	jr nz, Music2_pitchbend ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_pitchbend ; no
+	call Audio1_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc04e
 	add hl, bc
@@ -393,7 +393,7 @@ Music2_vibrato: ; 0x9335
 	ld hl, wc06e
 	add hl, bc
 	ld [hl], a ; store delay
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
@@ -414,24 +414,24 @@ Music2_vibrato: ; 0x9335
 	swap a
 	or d
 	ld [hl], a ; store depth as both high and low nibbles
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_pitchbend: ; 0x936d
+Audio1_pitchbend: ; 0x936d
 	cp $eb ; is this command a pitchbend?
-	jr nz, Music2_duty ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_duty ; no
+	call Audio1_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc076
 	add hl, bc
 	ld [hl], a ; store first param
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
 	ld b, a
 	ld a, d
 	and $f
-	call Music2_9858
+	call Audio1_9858
 	ld b, $0
 	ld hl, wc0a6
 	add hl, bc
@@ -443,14 +443,14 @@ Music2_pitchbend: ; 0x936d
 	ld hl, wc02e
 	add hl, bc
 	set 4, [hl] ; set pitchbend flag
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
-	jp Music2_notelength
+	jp Audio1_notelength
 
-Music2_duty: ; 0x93a5
+Audio1_duty: ; 0x93a5
 	cp $ec ; is this command a duty?
-	jr nz, Music2_tempo ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_tempo ; no
+	call Audio1_GetNextMusicByte ; yes
 	rrca
 	rrca
 	and $c0
@@ -458,17 +458,17 @@ Music2_duty: ; 0x93a5
 	ld hl, wc03e
 	add hl, bc
 	ld [hl], a ; store duty
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_tempo: ; 0x93ba
+Audio1_tempo: ; 0x93ba
 	cp $ed ; is this command a tempo?
-	jr nz, Music2_stereopanning ; no
+	jr nz, Audio1_stereopanning ; no
 	ld a, c ; yes
 	cp CH4
 	jr nc, .sfxChannel
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld [wc0e8], a ; store first param
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld [wc0e9], a ; store second param
 	xor a
 	ld [wc0ce], a ; clear RAM
@@ -477,9 +477,9 @@ Music2_tempo: ; 0x93ba
 	ld [wc0d1], a
 	jr .musicChannelDone
 .sfxChannel
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld [wc0ea], a ; store first param
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld [wc0eb], a ; store second param
 	xor a
 	ld [wc0d2], a ; clear RAM
@@ -487,22 +487,22 @@ Music2_tempo: ; 0x93ba
 	ld [wc0d4], a
 	ld [wc0d5], a
 .musicChannelDone
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_stereopanning: ; 0x93fa
+Audio1_stereopanning: ; 0x93fa
 	cp $ee ; is this command a stereopanning?
-	jr nz, Music2_unknownmusic0xef ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_unknownmusic0xef ; no
+	call Audio1_GetNextMusicByte ; yes
 	ld [wc004], a ; store panning
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
 ; this appears to never be used
-Music2_unknownmusic0xef: ; 0x9407
+Audio1_unknownmusic0xef: ; 0x9407
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Music2_dutycycle ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_dutycycle ; no
+	call Audio1_GetNextMusicByte ; yes
 	push bc
-	call Music2_9876
+	call Audio1_9876
 	pop bc
 	ld a, [wc003]
 	and a
@@ -512,12 +512,12 @@ Music2_unknownmusic0xef: ; 0x9407
 	xor a
 	ld [wc02d], a
 .skip
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_dutycycle: ; 0x9426
+Audio1_dutycycle: ; 0x9426
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music2_volume ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_volume ; no
+	call Audio1_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc046
 	add hl, bc
@@ -529,48 +529,48 @@ Music2_dutycycle: ; 0x9426
 	ld hl, wc02e
 	add hl, bc
 	set 6, [hl] ; set dutycycle flag
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_volume: ; 0x9444
+Audio1_volume: ; 0x9444
 	cp $f0 ; is this command a volume?
-	jr nz, Music2_executemusic ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_executemusic ; no
+	call Audio1_GetNextMusicByte ; yes
 	ld [$ff24], a ; store volume
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_executemusic: ; 0x9450
+Audio1_executemusic: ; 0x9450
 	cp $f8 ; is this command an executemusic?
-	jr nz, Music2_octave ; no
+	jr nz, Audio1_octave ; no
 	ld b, $0 ; yes
 	ld hl, wc036
 	add hl, bc
 	set 0, [hl]
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_octave: ; 0x945f
+Audio1_octave: ; 0x945f
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Music2_unknownsfx0x20 ; no
+	jr nz, Audio1_unknownsfx0x20 ; no
 	ld hl, wc0d6 ; yes
 	ld b, $0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_unknownsfx0x20: ; 0x9472
+Audio1_unknownsfx0x20: ; 0x9472
 	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Music2_unknownsfx0x10 ; no
+	jr nz, Audio1_unknownsfx0x10 ; no
 	ld a, c
 	cp CH3 ; is this a noise or sfx channel?
-	jr c, Music2_unknownsfx0x10 ; no
+	jr c, Audio1_unknownsfx0x10 ; no
 	ld b, $0
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music2_unknownsfx0x10 ; no
-	call Music2_notelength ; yes
+	jr nz, Audio1_unknownsfx0x10 ; no
+	call Audio1_notelength ; yes
 	ld d, a
 	ld b, $0
 	ld hl, wc03e
@@ -579,56 +579,56 @@ Music2_unknownsfx0x20: ; 0x9472
 	or d
 	ld d, a
 	ld b, $1
-	call Music2_9838
+	call Audio1_9838
 	ld [hl], d
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld d, a
 	ld b, $2
-	call Music2_9838
+	call Audio1_9838
 	ld [hl], d
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	ld e, a
 	ld a, c
 	cp CH7
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
-	call Music2_GetNextMusicByte
+	call Audio1_GetNextMusicByte
 	pop de
 .sfxNoiseChannel
 	ld d, a
 	push de
-	call Music2_9629
-	call Music2_95f8
+	call Audio1_9629
+	call Audio1_95f8
 	pop de
-	call Music2_964b
+	call Audio1_964b
 	ret
 
-Music2_unknownsfx0x10:
+Audio1_unknownsfx0x10:
 	ld a, c
 	cp CH4
-	jr c, Music2_note ; if not a sfx
+	jr c, Audio1_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a unknownsfx0x10?
-	jr nz, Music2_note ; no
+	jr nz, Audio1_note ; no
 	ld b, $0
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music2_note ; no
-	call Music2_GetNextMusicByte ; yes
+	jr nz, Audio1_note ; no
+	call Audio1_GetNextMusicByte ; yes
 	ld [$ff10], a
-	jp Music2_endchannel
+	jp Audio1_endchannel
 
-Music2_note:
+Audio1_note:
 	ld a, c
 	cp CH3
-	jr nz, Music2_notelength ; if not noise channel
+	jr nz, Audio1_notelength ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Music2_dnote ; yes
-	jr nc, Music2_notelength ; no
+	jr z, Audio1_dnote ; yes
+	jr nc, Audio1_notelength ; no
 	swap a
 	ld b, a
 	ld a, d
@@ -639,24 +639,24 @@ Music2_note:
 	push bc
 	jr asm_94fd
 
-Music2_dnote:
+Audio1_dnote:
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Music2_GetNextMusicByte ; get dnote instrument
+	call Audio1_GetNextMusicByte ; get dnote instrument
 asm_94fd
 	ld d, a
 	ld a, [wc003]
 	and a
 	jr nz, .asm_9508
 	ld a, d
-	call Music2_9876
+	call Audio1_9876
 .asm_9508
 	pop bc
 	pop de
 
-Music2_notelength: ; 0x950a
+Audio1_notelength: ; 0x950a
 	ld a, d
 	push af
 	and $f
@@ -668,7 +668,7 @@ Music2_notelength: ; 0x950a
 	add hl, bc
 	ld a, [hl]
 	ld l, b
-	call Music2_9847
+	call Audio1_9847
 	ld a, c
 	cp CH4
 	jr nc, .sfxChannel
@@ -682,7 +682,7 @@ Music2_notelength: ; 0x950a
 	ld e, $0
 	cp CH7
 	jr z, .skip ; if noise channel
-	call Music2_9693
+	call Audio1_9693
 	ld a, [wc0ea]
 	ld d, a
 	ld a, [wc0eb]
@@ -693,7 +693,7 @@ Music2_notelength: ; 0x950a
 	ld hl, wc0ce
 	add hl, bc
 	ld l, [hl]
-	call Music2_9847
+	call Audio1_9847
 	ld e, l
 	ld d, h
 	ld hl, wc0ce
@@ -706,15 +706,15 @@ Music2_notelength: ; 0x950a
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music2_notepitch
+	jr nz, Audio1_notepitch
 	ld hl, wc02e
 	add hl, bc
 	bit 2, [hl]
-	jr z, Music2_notepitch
+	jr z, Audio1_notepitch
 	pop hl
 	ret
 
-Music2_notepitch: ; 0x9568
+Audio1_notepitch: ; 0x9568
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -744,7 +744,7 @@ Music2_notepitch: ; 0x9568
 	jr .done
 .notSfxChannel3
 	ld b, $2
-	call Music2_9838
+	call Audio1_9838
 	ld a, $8
 	ld [hli], a
 	inc hl
@@ -758,13 +758,13 @@ Music2_notepitch: ; 0x9568
 	ld hl, wc0d6
 	add hl, bc
 	ld b, [hl]
-	call Music2_9858
+	call Audio1_9858
 	ld b, $0
 	ld hl, wc02e
 	add hl, bc
 	bit 4, [hl]
 	jr z, .asm_95b8
-	call Music2_978f
+	call Audio1_978f
 .asm_95b8
 	push de
 	ld a, c
@@ -787,10 +787,10 @@ Music2_notepitch: ; 0x9568
 	add hl, bc
 	ld d, [hl]
 	ld b, $2
-	call Music2_9838
+	call Audio1_9838
 	ld [hl], d
-	call Music2_9629
-	call Music2_95f8
+	call Audio1_9629
+	call Audio1_95f8
 	pop de
 	ld b, $0
 	ld hl, wc02e
@@ -804,10 +804,10 @@ Music2_notepitch: ; 0x9568
 	ld hl, wc066
 	add hl, bc
 	ld [hl], e
-	call Music2_964b
+	call Audio1_964b
 	ret
 
-Music2_95f8: ; 0x95f8
+Audio1_95f8: ; 0x95f8
 	ld b, $0
 	ld hl, Unknown_9b27
 	add hl, bc
@@ -841,7 +841,7 @@ Music2_95f8: ; 0x95f8
 	ld [$ff25], a
 	ret
 
-Music2_9629: ; 0x9629
+Audio1_9629: ; 0x9629
 	ld b, $0
 	ld hl, wc0b6
 	add hl, bc
@@ -861,11 +861,11 @@ Music2_9629: ; 0x9629
 	ld d, a
 .channel3
 	ld b, $1
-	call Music2_9838
+	call Audio1_9838
 	ld [hl], d
 	ret
 
-Music2_964b: ; 0x964b
+Audio1_964b: ; 0x964b
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -883,7 +883,7 @@ Music2_964b: ; 0x964b
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, Music2_WavePointers
+	ld hl, Audio1_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -909,15 +909,15 @@ Music2_964b: ; 0x964b
 	and $c7
 	ld d, a
 	ld b, $3
-	call Music2_9838
+	call Audio1_9838
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	call Music2_96b5
+	call Audio1_96b5
 	ret
 
-Music2_9693: ; 0x9693
-	call Music2_96e5
+Audio1_9693: ; 0x9693
+	call Audio1_96e5
 	jr nc, .asm_96ab
 	ld d, $0
 	ld a, [wc0f2]
@@ -937,8 +937,8 @@ Music2_9693: ; 0x9693
 .asm_96b4
 	ret
 
-Music2_96b5: ; 0x96b5
-	call Music2_96e5
+Audio1_96b5: ; 0x96b5
+	call Audio1_96e5
 	jr nc, .asm_96c6
 	ld a, [wc0f1]
 	add e
@@ -953,8 +953,8 @@ Music2_96b5: ; 0x96b5
 .asm_96c6
 	ret
 
-Music2_96c7: ; 0x96c7
-	call Music2_96e5
+Audio1_96c7: ; 0x96c7
+	call Audio1_96e5
 	jr nc, .asm_96e2
 	ld hl, wc006
 	ld e, c
@@ -976,7 +976,7 @@ Music2_96c7: ; 0x96c7
 	ccf
 	ret
 
-Music2_96e5: ; 0x96e5
+Audio1_96e5: ; 0x96e5
 	ld a, [wc02a]
 	cp $14
 	jr nc, .asm_96ee
@@ -993,7 +993,7 @@ Music2_96e5: ; 0x96e5
 	scf
 	ret
 
-Music2_ApplyPitchBend: ; 0x96f9
+Audio1_ApplyPitchBend: ; 0x96f9
 	ld hl, wc02e
 	add hl, bc
 	bit 5, [hl]
@@ -1083,7 +1083,7 @@ Music2_ApplyPitchBend: ; 0x96f9
 	add hl, bc
 	ld [hl], d
 	ld b, $3
-	call Music2_9838
+	call Audio1_9838
 	ld a, e
 	ld [hli], a
 	ld [hl], d
@@ -1095,7 +1095,7 @@ Music2_ApplyPitchBend: ; 0x96f9
 	res 5, [hl]
 	ret
 
-Music2_978f: ; 0x978f
+Audio1_978f: ; 0x978f
 	ld hl, wc096
 	add hl, bc
 	ld [hl], d
@@ -1184,7 +1184,7 @@ Music2_978f: ; 0x978f
 	ld [hl], a
 	ret
 
-Music2_ApplyDutyCycle: ; 0x980d
+Audio1_ApplyDutyCycle: ; 0x980d
 	ld b, $0
 	ld hl, wc046
 	add hl, bc
@@ -1195,14 +1195,14 @@ Music2_ApplyDutyCycle: ; 0x980d
 	and $c0
 	ld d, a
 	ld b, $1
-	call Music2_9838
+	call Audio1_9838
 	ld a, [hl]
 	and $3f
 	or d
 	ld [hl], a
 	ret
 
-Music2_GetNextMusicByte: ; 0x9825
+Audio1_GetNextMusicByte: ; 0x9825
 	ld d, $0
 	ld a, c
 	add a
@@ -1220,7 +1220,7 @@ Music2_GetNextMusicByte: ; 0x9825
 	ld [hl], d
 	ret
 
-Music2_9838: ; 0x9838
+Audio1_9838: ; 0x9838
 	ld a, c
 	ld hl, Unknown_9b17
 	add l
@@ -1234,7 +1234,7 @@ Music2_9838: ; 0x9838
 	ld h, $ff
 	ret
 
-Music2_9847: ; 0x9847
+Audio1_9847: ; 0x9847
 	ld h, $0
 .loop
 	srl a
@@ -1249,13 +1249,13 @@ Music2_9847: ; 0x9847
 .done
 	ret
 
-Music2_9858: ; 0x9858
+Audio1_9858: ; 0x9858
 	ld h, $0
 	ld l, a
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Music2_Pitches
+	ld hl, Audio1_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1274,16 +1274,16 @@ Music2_9858: ; 0x9858
 	ld d, a
 	ret
 
-Music2_9876:: ; 0x9876
+Audio1_9876:: ; 0x9876
 	ld [wc001], a
 	cp $ff
-	jp z, Music2_9a34
+	jp z, Audio1_9a34
 	cp $b9
-	jp z, Music2_994e
-	jp c, Music2_994e
+	jp z, Audio1_994e
+	jp c, Audio1_994e
 	cp $fe
 	jr z, .asm_988d
-	jp nc, Music2_994e
+	jp nc, Audio1_994e
 .asm_988d
 	xor a
 	ld [wc000], a
@@ -1293,53 +1293,53 @@ Music2_9876:: ; 0x9876
 	ld [wc0e7], a
 	ld d, $8
 	ld hl, wc016
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc006
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld d, $4
 	ld hl, wc026
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc02e
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc03e
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc046
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc04e
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc056
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc05e
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc066
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc06e
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc036
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc076
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc07e
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc086
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc08e
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc096
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc09e
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc0a6
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc0ae
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld a, $1
 	ld hl, wc0be
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc0b6
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld hl, wc0c6
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld [wc0e8], a
 	ld a, $ff
 	ld [wc004], a
@@ -1355,16 +1355,16 @@ Music2_9876:: ; 0x9876
 	ld [$ff1a], a
 	ld a, $77
 	ld [$ff24], a
-	jp Music2_9a8f
+	jp Audio1_9a8f
 
-Music2_994e: ; 0x994e
+Audio1_994e: ; 0x994e
 	ld l, a
 	ld e, a
 	ld h, $0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_02
+	ld de, SFX_Headers_1
 	add hl, de
 	ld a, h
 	ld [wc0ec], a
@@ -1504,11 +1504,11 @@ Music2_994e: ; 0x994e
 .asm_9a2b
 	ld a, c
 	and a
-	jp z, Music2_9a8f
+	jp z, Audio1_9a8f
 	dec c
 	jp .asm_9967
 
-Music2_9a34: ; 0x9a34
+Audio1_9a34: ; 0x9a34
 	ld a, $80
 	ld [$ff26], a
 	ld [$ff1a], a
@@ -1536,11 +1536,11 @@ Music2_9a34: ; 0x9a34
 	ld [wc0e7], a
 	ld d, $a0
 	ld hl, wc006
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld a, $1
 	ld d, $18
 	ld hl, wc0b6
-	call FillMusicRAM2
+	call FillAudioRAM1
 	ld [wc0e8], a
 	ld [wc0ea], a
 	ld a, $ff
@@ -1548,7 +1548,7 @@ Music2_9a34: ; 0x9a34
 	ret
 
 ; fills d bytes at hl with a
-FillMusicRAM2: ; 0x9a89
+FillAudioRAM1: ; 0x9a89
 	ld b, d
 .loop
 	ld [hli], a
@@ -1556,7 +1556,7 @@ FillMusicRAM2: ; 0x9a89
 	jr nz, .loop
 	ret
 
-Music2_9a8f: ; 0x9a8f
+Audio1_9a8f: ; 0x9a8f
 	ld a, [wc001]
 	ld l, a
 	ld e, a
@@ -1564,7 +1564,7 @@ Music2_9a8f: ; 0x9a8f
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_02
+	ld de, SFX_Headers_1
 	add hl, de
 	ld e, l
 	ld d, h
@@ -1637,7 +1637,7 @@ Music2_9a8f: ; 0x9a8f
 	ld [hli], a
 	ld [hl], a
 	ld hl, wc012 ; sfx noise channel pointer
-	ld de, Noise2_endchannel
+	ld de, Noise1_endchannel
 	ld [hl], e
 	inc hl
 	ld [hl], d ; overwrite pointer to point to endchannel
@@ -1651,7 +1651,7 @@ Music2_9a8f: ; 0x9a8f
 .asm_9b15
 	ret
 
-Noise2_endchannel: ; 0x9b16
+Noise1_endchannel: ; 0x9b16
 	endchannel
 
 Unknown_9b17: ; 0x9b17
@@ -1666,7 +1666,7 @@ Unknown_9b27: ; 0x9b27
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Music2_Pitches: ; 0x9b2f
+Audio1_Pitches: ; 0x9b2f
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
diff --git a/audio/engine_2.asm b/audio/engine_2.asm
index 5940b55a..62b82cec 100644
--- a/audio/engine_2.asm
+++ b/audio/engine_2.asm
@@ -1,6 +1,6 @@
 ; The second of three duplicated sound engines.
 
-Music8_UpdateMusic:: ; 21879 (8:5879)
+Audio2_UpdateMusic:: ; 21879 (8:5879)
 	ld c, CH0
 .loop
 	ld b, $0
@@ -26,7 +26,7 @@ Music8_UpdateMusic:: ; 21879 (8:5879)
 	ld [$ff1a], a
 	jr .nextChannel
 .applyAffects
-	call Music8_ApplyMusicAffects
+	call Audio2_ApplyMusicAffects
 .nextChannel
 	ld a, c
 	inc c
@@ -42,13 +42,13 @@ Music8_UpdateMusic:: ; 21879 (8:5879)
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Music8_ApplyMusicAffects: ; 218ae (8:58ae)
+Audio2_ApplyMusicAffects: ; 218ae (8:58ae)
 	ld b, $0
 	ld hl, wc0b6 ; delay until next note
 	add hl, bc
 	ld a, [hl]
 	cp $1 ; if the delay is 1, play next note
-	jp z, Music8_PlayNextNote
+	jp z, Audio2_PlayNextNote
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
@@ -65,7 +65,7 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae)
 	add hl, bc
 	bit 6, [hl] ; dutycycle
 	jr z, .checkForExecuteMusic
-	call Music8_ApplyDutyCycle
+	call Audio2_ApplyDutyCycle
 .checkForExecuteMusic
 	ld b, $0
 	ld hl, wc036
@@ -81,7 +81,7 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae)
 	add hl, bc
 	bit 4, [hl] ; pitchbend
 	jr z, .checkVibratoDelay
-	jp Music8_ApplyPitchBend
+	jp Audio2_ApplyPitchBend
 .checkVibratoDelay
 	ld hl, wc04e ; vibrato delay
 	add hl, bc
@@ -141,14 +141,14 @@ Music8_ApplyMusicAffects: ; 218ae (8:58ae)
 .done
 	ld d, a
 	ld b, $3
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld [hl], d
 	ret
 
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Music8_PlayNextNote: ; 21946 (8:5946)
+Audio2_PlayNextNote: ; 21946 (8:5946)
 	ld hl, wc06e
 	add hl, bc
 	ld a, [hl]
@@ -166,14 +166,14 @@ Music8_PlayNextNote: ; 21946 (8:5946)
 	bit 7, a
 	ret nz
 .beginChecks
-	call Music8_endchannel
+	call Audio2_endchannel
 	ret
 
-Music8_endchannel: ; 21967 (8:5967)
-	call Music8_GetNextMusicByte
+Audio2_endchannel: ; 21967 (8:5967)
+	call Audio2_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
-	jp nz, Music8_callchannel ; no
+	jp nz, Audio2_callchannel ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
@@ -223,7 +223,7 @@ Music8_endchannel: ; 21967 (8:5967)
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Music8_endchannel
+	jp Audio2_endchannel
 .asm_219c0
 	ld hl, Unknown_222de
 	add hl, bc
@@ -245,7 +245,7 @@ Music8_endchannel: ; 21967 (8:5967)
 	ld a, c
 	cp CH4
 	jr z, .asm_219e6
-	call Music8_21e6d
+	call Audio2_21e6d
 	ret c
 .asm_219e6
 	ld a, [wc005]
@@ -258,12 +258,12 @@ Music8_endchannel: ; 21967 (8:5967)
 	ld [hl], b
 	ret
 
-Music8_callchannel: ; 219f5 (8:59f5)
+Audio2_callchannel: ; 219f5 (8:59f5)
 	cp $fd ; is this command a callchannel?
-	jp nz, Music8_loopchannel ; no
-	call Music8_GetNextMusicByte ; yes
+	jp nz, Audio2_loopchannel ; no
+	call Audio2_GetNextMusicByte ; yes
 	push af
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	pop af
 	ld e, a
@@ -293,12 +293,12 @@ Music8_callchannel: ; 219f5 (8:59f5)
 	ld hl, wc02e
 	add hl, bc
 	set 1, [hl] ; set the call flag
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_loopchannel: ; 21a2a (8:5a2a)
+Audio2_loopchannel: ; 21a2a (8:5a2a)
 	cp $fe ; is this command a loopchannel?
-	jp nz, Music8_notetype ; no
-	call Music8_GetNextMusicByte ; yes
+	jp nz, Audio2_notetype ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld e, a
 	and a
 	jr z, .infiniteLoop
@@ -310,17 +310,17 @@ Music8_loopchannel: ; 21a2a (8:5a2a)
 	jr nz, .loopAgain
 	ld a, $1 ; if no more loops to make,
 	ld [hl], a
-	call Music8_GetNextMusicByte ; skip pointer
-	call Music8_GetNextMusicByte
-	jp Music8_endchannel
+	call Audio2_GetNextMusicByte ; skip pointer
+	call Audio2_GetNextMusicByte
+	jp Audio2_endchannel
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
 	; fall through
 .infiniteLoop ; overwrite current address with pointer
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	push af
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld b, a
 	ld d, $0
 	ld a, c
@@ -331,12 +331,12 @@ Music8_loopchannel: ; 21a2a (8:5a2a)
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_notetype: ; 21a65 (8:5a65)
+Audio2_notetype: ; 21a65 (8:5a65)
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music8_toggleperfectpitch ; no
+	jp nz, Audio2_toggleperfectpitch ; no
 	ld a, d ; yes
 	and $f
 	ld b, $0
@@ -346,7 +346,7 @@ Music8_notetype: ; 21a65 (8:5a65)
 	ld a, c
 	cp CH3
 	jr z, .noiseChannel ; noise channel has 0 params
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	ld a, c
 	cp CH2
@@ -375,24 +375,24 @@ Music8_notetype: ; 21a65 (8:5a65)
 	add hl, bc
 	ld [hl], d
 .noiseChannel
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_toggleperfectpitch: ; 21aa4 (8:5aa4)
+Audio2_toggleperfectpitch: ; 21aa4 (8:5aa4)
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
-	jr nz, Music8_vibrato ; no
+	jr nz, Audio2_vibrato ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
 	ld a, [hl]
 	xor $1
 	ld [hl], a ; flip bit 0 of wc02e
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_vibrato: ; 21ab6 (8:5ab6)
+Audio2_vibrato: ; 21ab6 (8:5ab6)
 	cp $ea ; is this command a vibrato?
-	jr nz, Music8_pitchbend ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_pitchbend ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc04e
 	add hl, bc
@@ -400,7 +400,7 @@ Music8_vibrato: ; 21ab6 (8:5ab6)
 	ld hl, wc06e
 	add hl, bc
 	ld [hl], a ; store delay
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
@@ -421,24 +421,24 @@ Music8_vibrato: ; 21ab6 (8:5ab6)
 	swap a
 	or d
 	ld [hl], a ; store depth as both high and low nibbles
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_pitchbend: ; 21aee (8:5aee)
+Audio2_pitchbend: ; 21aee (8:5aee)
 	cp $eb ; is this command a pitchbend?
-	jr nz, Music8_duty ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_duty ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc076
 	add hl, bc
 	ld [hl], a ; store first param
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
 	ld b, a
 	ld a, d
 	and $f
-	call Music8_22017
+	call Audio2_22017
 	ld b, $0
 	ld hl, wc0a6
 	add hl, bc
@@ -450,14 +450,14 @@ Music8_pitchbend: ; 21aee (8:5aee)
 	ld hl, wc02e
 	add hl, bc
 	set 4, [hl] ; set pitchbend flag
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
-	jp Music8_notelength
+	jp Audio2_notelength
 
-Music8_duty: ; 21b26 (8:5b26)
+Audio2_duty: ; 21b26 (8:5b26)
 	cp $ec ; is this command a duty?
-	jr nz, Music8_tempo ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_tempo ; no
+	call Audio2_GetNextMusicByte ; yes
 	rrca
 	rrca
 	and $c0
@@ -465,17 +465,17 @@ Music8_duty: ; 21b26 (8:5b26)
 	ld hl, wc03e
 	add hl, bc
 	ld [hl], a ; store duty
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_tempo: ; 21b3b (8:5b3b)
+Audio2_tempo: ; 21b3b (8:5b3b)
 	cp $ed ; is this command a tempo?
-	jr nz, Music8_stereopanning ; no
+	jr nz, Audio2_stereopanning ; no
 	ld a, c ; yes
 	cp CH4
 	jr nc, .sfxChannel
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld [wc0e8], a ; store first param
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld [wc0e9], a ; store second param
 	xor a
 	ld [wc0ce], a ; clear RAM
@@ -484,9 +484,9 @@ Music8_tempo: ; 21b3b (8:5b3b)
 	ld [wc0d1], a
 	jr .musicChannelDone
 .sfxChannel
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld [wc0ea], a ; store first param
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld [wc0eb], a ; store second param
 	xor a
 	ld [wc0d2], a ; clear RAM
@@ -494,22 +494,22 @@ Music8_tempo: ; 21b3b (8:5b3b)
 	ld [wc0d4], a
 	ld [wc0d5], a
 .musicChannelDone
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_stereopanning: ; 21b7b (8:5b7b)
+Audio2_stereopanning: ; 21b7b (8:5b7b)
 	cp $ee ; is this command a stereopanning?
-	jr nz, Music8_unknownmusic0xef ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_unknownmusic0xef ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld [wc004], a ; store panning
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
 ; this appears to never be used
-Music8_unknownmusic0xef: ; 21b88 (8:5b88)
+Audio2_unknownmusic0xef: ; 21b88 (8:5b88)
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Music8_dutycycle ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_dutycycle ; no
+	call Audio2_GetNextMusicByte ; yes
 	push bc
-	call Music8_22035
+	call Audio2_22035
 	pop bc
 	ld a, [wc003]
 	and a
@@ -519,12 +519,12 @@ Music8_unknownmusic0xef: ; 21b88 (8:5b88)
 	xor a
 	ld [wc02d], a
 .skip
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_dutycycle: ; 21ba7 (8:5ba7)
+Audio2_dutycycle: ; 21ba7 (8:5ba7)
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music8_volume ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_volume ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc046
 	add hl, bc
@@ -536,48 +536,48 @@ Music8_dutycycle: ; 21ba7 (8:5ba7)
 	ld hl, wc02e
 	add hl, bc
 	set 6, [hl] ; set dutycycle flag
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_volume: ; 21bc5 (8:5bc5)
+Audio2_volume: ; 21bc5 (8:5bc5)
 	cp $f0 ; is this command a volume?
-	jr nz, Music8_executemusic ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_executemusic ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld [$ff24], a ; store volume
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_executemusic: ; 21bd1 (8:5bd1)
+Audio2_executemusic: ; 21bd1 (8:5bd1)
 	cp $f8 ; is this command an executemusic?
-	jr nz, Music8_octave ; no
+	jr nz, Audio2_octave ; no
 	ld b, $0 ; yes
 	ld hl, wc036
 	add hl, bc
 	set 0, [hl]
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_octave: ; 21be0 (8:5be0)
+Audio2_octave: ; 21be0 (8:5be0)
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Music8_unknownsfx0x20 ; no
+	jr nz, Audio2_unknownsfx0x20 ; no
 	ld hl, wc0d6 ; yes
 	ld b, $0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_unknownsfx0x20: ; 21bf3
+Audio2_unknownsfx0x20: ; 21bf3
 	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Music8_unknownsfx0x10 ; no
+	jr nz, Audio2_unknownsfx0x10 ; no
 	ld a, c
 	cp CH3 ; is this a noise or sfx channel?
-	jr c, Music8_unknownsfx0x10 ; no
+	jr c, Audio2_unknownsfx0x10 ; no
 	ld b, $0
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music8_unknownsfx0x10 ; no
-	call Music8_notelength
+	jr nz, Audio2_unknownsfx0x10 ; no
+	call Audio2_notelength
 	ld d, a
 	ld b, $0
 	ld hl, wc03e
@@ -586,56 +586,56 @@ Music8_unknownsfx0x20: ; 21bf3
 	or d
 	ld d, a
 	ld b, $1
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld [hl], d
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld d, a
 	ld b, $2
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld [hl], d
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	ld e, a
 	ld a, c
 	cp CH7
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
-	call Music8_GetNextMusicByte
+	call Audio2_GetNextMusicByte
 	pop de
 .sfxNoiseChannel
 	ld d, a
 	push de
-	call Music8_21daa
-	call Music8_21d79
+	call Audio2_21daa
+	call Audio2_21d79
 	pop de
-	call Music8_21dcc
+	call Audio2_21dcc
 	ret
 
-Music8_unknownsfx0x10: ; 21c40 (8:5c40)
+Audio2_unknownsfx0x10: ; 21c40 (8:5c40)
 	ld a, c
 	cp CH4
-	jr c, Music8_note ; if not a sfx
+	jr c, Audio2_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command a unknownsfx0x10?
-	jr nz, Music8_note ; no
+	jr nz, Audio2_note ; no
 	ld b, $0
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music8_note ; no
-	call Music8_GetNextMusicByte ; yes
+	jr nz, Audio2_note ; no
+	call Audio2_GetNextMusicByte ; yes
 	ld [$ff10], a
-	jp Music8_endchannel
+	jp Audio2_endchannel
 
-Music8_note: ; 21c5c (8:5c5c)
+Audio2_note: ; 21c5c (8:5c5c)
 	ld a, c
 	cp CH3
-	jr nz, Music8_notelength ; if not noise channel
+	jr nz, Audio2_notelength ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Music8_dnote ; yes
-	jr nc, Music8_notelength ; no
+	jr z, Audio2_dnote ; yes
+	jr nc, Audio2_notelength ; no
 	swap a
 	ld b, a
 	ld a, d
@@ -646,24 +646,24 @@ Music8_note: ; 21c5c (8:5c5c)
 	push bc
 	jr asm_21c7e
 
-Music8_dnote: ; 21c76 (8:5c76)
+Audio2_dnote: ; 21c76 (8:5c76)
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Music8_GetNextMusicByte ; get dnote instrument
+	call Audio2_GetNextMusicByte ; get dnote instrument
 asm_21c7e
 	ld d, a
 	ld a, [wc003]
 	and a
 	jr nz, .asm_21c89
 	ld a, d
-	call Music8_22035
+	call Audio2_22035
 .asm_21c89
 	pop bc
 	pop de
 
-Music8_notelength: ; 21c8b (8:5c8b)
+Audio2_notelength: ; 21c8b (8:5c8b)
 	ld a, d
 	push af
 	and $f
@@ -675,7 +675,7 @@ Music8_notelength: ; 21c8b (8:5c8b)
 	add hl, bc
 	ld a, [hl]
 	ld l, b
-	call Music8_22006
+	call Audio2_22006
 	ld a, c
 	cp CH4
 	jr nc, .sfxChannel
@@ -689,7 +689,7 @@ Music8_notelength: ; 21c8b (8:5c8b)
 	ld e, $0
 	cp CH7
 	jr z, .skip ; if noise channel
-	call Music8_21e2f
+	call Audio2_21e2f
 	ld a, [wc0ea]
 	ld d, a
 	ld a, [wc0eb]
@@ -700,7 +700,7 @@ Music8_notelength: ; 21c8b (8:5c8b)
 	ld hl, wc0ce
 	add hl, bc
 	ld l, [hl]
-	call Music8_22006
+	call Audio2_22006
 	ld e, l
 	ld d, h
 	ld hl, wc0ce
@@ -713,15 +713,15 @@ Music8_notelength: ; 21c8b (8:5c8b)
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music8_notepitch
+	jr nz, Audio2_notepitch
 	ld hl, wc02e
 	add hl, bc
 	bit 2, [hl]
-	jr z, Music8_notepitch
+	jr z, Audio2_notepitch
 	pop hl
 	ret
 
-Music8_notepitch: ; 21ce9 (8:5ce9)
+Audio2_notepitch: ; 21ce9 (8:5ce9)
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -751,7 +751,7 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	jr .done
 .notSfxChannel3
 	ld b, $2
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld a, $8
 	ld [hli], a
 	inc hl
@@ -765,13 +765,13 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	ld hl, wc0d6
 	add hl, bc
 	ld b, [hl]
-	call Music8_22017
+	call Audio2_22017
 	ld b, $0
 	ld hl, wc02e
 	add hl, bc
 	bit 4, [hl]
 	jr z, .asm_21d39
-	call Music8_21f4e
+	call Audio2_21f4e
 .asm_21d39
 	push de
 	ld a, c
@@ -794,10 +794,10 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	add hl, bc
 	ld d, [hl]
 	ld b, $2
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld [hl], d
-	call Music8_21daa
-	call Music8_21d79
+	call Audio2_21daa
+	call Audio2_21d79
 	pop de
 	ld b, $0
 	ld hl, wc02e
@@ -811,10 +811,10 @@ Music8_notepitch: ; 21ce9 (8:5ce9)
 	ld hl, wc066
 	add hl, bc
 	ld [hl], e
-	call Music8_21dcc
+	call Audio2_21dcc
 	ret
 
-Music8_21d79: ; 21d79 (8:5d79)
+Audio2_21d79: ; 21d79 (8:5d79)
 	ld b, $0
 	ld hl, Unknown_222e6
 	add hl, bc
@@ -848,7 +848,7 @@ Music8_21d79: ; 21d79 (8:5d79)
 	ld [$ff25], a
 	ret
 
-Music8_21daa: ; 21daa (8:5daa)
+Audio2_21daa: ; 21daa (8:5daa)
 	ld b, $0
 	ld hl, wc0b6
 	add hl, bc
@@ -868,11 +868,11 @@ Music8_21daa: ; 21daa (8:5daa)
 	ld d, a
 .channel3
 	ld b, $1
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld [hl], d
 	ret
 
-Music8_21dcc: ; 21dcc (8:5dcc)
+Audio2_21dcc: ; 21dcc (8:5dcc)
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -890,7 +890,7 @@ Music8_21dcc: ; 21dcc (8:5dcc)
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, Music8_WavePointers
+	ld hl, Audio2_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -916,18 +916,18 @@ Music8_21dcc: ; 21dcc (8:5dcc)
 	and $c7
 	ld d, a
 	ld b, $3
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld [hl], e
 	inc hl
 	ld [hl], d
 	ld a, c
 	cp CH4
 	jr c, .musicChannel
-	call Music8_21e56
+	call Audio2_21e56
 .musicChannel
 	ret
 
-Music8_21e19: ; 21e19 (8:5e19)
+Audio2_21e19: ; 21e19 (8:5e19)
 	ld a, c
 	cp CH4
 	jr nz, .asm_21e2e
@@ -941,10 +941,10 @@ Music8_21e19: ; 21e19 (8:5e19)
 .asm_21e2e
 	ret
 
-Music8_21e2f: ; 21e2f (8:5e2f)
-	call Music8_21e8b
+Audio2_21e2f: ; 21e2f (8:5e2f)
+	call Audio2_21e8b
 	jr c, .asm_21e39
-	call Music8_21e9f
+	call Audio2_21e9f
 	jr nc, .asm_21e4c
 .asm_21e39
 	ld d, $0
@@ -965,10 +965,10 @@ Music8_21e2f: ; 21e2f (8:5e2f)
 .asm_21e55
 	ret
 
-Music8_21e56: ; 21e56 (8:5e56)
-	call Music8_21e8b
+Audio2_21e56: ; 21e56 (8:5e56)
+	call Audio2_21e8b
 	jr c, .asm_21e60
-	call Music8_21e9f
+	call Audio2_21e9f
 	jr nc, .asm_21e6c
 .asm_21e60
 	ld a, [wc0f1]
@@ -984,8 +984,8 @@ Music8_21e56: ; 21e56 (8:5e56)
 .asm_21e6c
 	ret
 
-Music8_21e6d: ; 21e6d (8:5e6d)
-	call Music8_21e8b
+Audio2_21e6d: ; 21e6d (8:5e6d)
+	call Audio2_21e8b
 	jr nc, .asm_21e88
 	ld hl, wc006
 	ld e, c
@@ -1007,7 +1007,7 @@ Music8_21e6d: ; 21e6d (8:5e6d)
 	ccf
 	ret
 
-Music8_21e8b: ; 21e8b (8:5e8b)
+Audio2_21e8b: ; 21e8b (8:5e8b)
 	ld a, [wc02a]
 	cp $14
 	jr nc, .asm_21e94
@@ -1024,7 +1024,7 @@ Music8_21e8b: ; 21e8b (8:5e8b)
 	scf
 	ret
 
-Music8_21e9f: ; 21e9f (8:5e9f)
+Audio2_21e9f: ; 21e9f (8:5e9f)
 	ld a, [wc02d]
 	ld b, a
 	ld a, [wc02a]
@@ -1044,7 +1044,7 @@ Music8_21e9f: ; 21e9f (8:5e9f)
 	scf
 	ret
 
-Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
+Audio2_ApplyPitchBend: ; 21eb8 (8:5eb8)
 	ld hl, wc02e
 	add hl, bc
 	bit 5, [hl]
@@ -1134,7 +1134,7 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
 	add hl, bc
 	ld [hl], d
 	ld b, $3
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld a, e
 	ld [hli], a
 	ld [hl], d
@@ -1146,7 +1146,7 @@ Music8_ApplyPitchBend: ; 21eb8 (8:5eb8)
 	res 5, [hl]
 	ret
 
-Music8_21f4e: ; 21f4e (8:5f4e)
+Audio2_21f4e: ; 21f4e (8:5f4e)
 	ld hl, wc096
 	add hl, bc
 	ld [hl], d
@@ -1235,7 +1235,7 @@ Music8_21f4e: ; 21f4e (8:5f4e)
 	ld [hl], a
 	ret
 
-Music8_ApplyDutyCycle: ; 21fcc (8:5fcc)
+Audio2_ApplyDutyCycle: ; 21fcc (8:5fcc)
 	ld b, $0
 	ld hl, wc046
 	add hl, bc
@@ -1246,14 +1246,14 @@ Music8_ApplyDutyCycle: ; 21fcc (8:5fcc)
 	and $c0
 	ld d, a
 	ld b, $1
-	call Music8_21ff7
+	call Audio2_21ff7
 	ld a, [hl]
 	and $3f
 	or d
 	ld [hl], a
 	ret
 
-Music8_GetNextMusicByte: ; 21fe4 (8:5fe4)
+Audio2_GetNextMusicByte: ; 21fe4 (8:5fe4)
 	ld d, $0
 	ld a, c
 	add a
@@ -1271,7 +1271,7 @@ Music8_GetNextMusicByte: ; 21fe4 (8:5fe4)
 	ld [hl], d
 	ret
 
-Music8_21ff7: ; 21ff7 (8:5ff7)
+Audio2_21ff7: ; 21ff7 (8:5ff7)
 	ld a, c
 	ld hl, Unknown_222d6
 	add l
@@ -1285,7 +1285,7 @@ Music8_21ff7: ; 21ff7 (8:5ff7)
 	ld h, $ff
 	ret
 
-Music8_22006: ; 22006 (8:6006)
+Audio2_22006: ; 22006 (8:6006)
 	ld h, $0
 .loop
 	srl a
@@ -1300,13 +1300,13 @@ Music8_22006: ; 22006 (8:6006)
 .done
 	ret
 
-Music8_22017: ; 22017 (8:6017)
+Audio2_22017: ; 22017 (8:6017)
 	ld h, $0
 	ld l, a
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Music8_Pitches
+	ld hl, Audio2_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1325,16 +1325,16 @@ Music8_22017: ; 22017 (8:6017)
 	ld d, a
 	ret
 
-Music8_22035:: ; 22035 (8:6035)
+Audio2_22035:: ; 22035 (8:6035)
 	ld [wc001], a
 	cp $ff
-	jp z, Music8_221f3
+	jp z, Audio2_221f3
 	cp $e9
-	jp z, Music8_2210d
-	jp c, Music8_2210d
+	jp z, Audio2_2210d
+	jp c, Audio2_2210d
 	cp $fe
 	jr z, .asm_2204c
-	jp nc, Music8_2210d
+	jp nc, Audio2_2210d
 .asm_2204c
 	xor a
 	ld [wc000], a
@@ -1344,53 +1344,53 @@ Music8_22035:: ; 22035 (8:6035)
 	ld [wc0e7], a
 	ld d, $8
 	ld hl, wc016
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc006
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld d, $4
 	ld hl, wc026
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc02e
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc03e
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc046
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc04e
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc056
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc05e
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc066
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc06e
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc036
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc076
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc07e
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc086
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc08e
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc096
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc09e
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc0a6
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc0ae
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld a, $1
 	ld hl, wc0be
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc0b6
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld hl, wc0c6
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld [wc0e8], a
 	ld a, $ff
 	ld [wc004], a
@@ -1406,16 +1406,16 @@ Music8_22035:: ; 22035 (8:6035)
 	ld [$ff1a], a
 	ld a, $77
 	ld [$ff24], a
-	jp Music8_2224e
+	jp Audio2_2224e
 
-Music8_2210d: ; 2210d (8:610d)
+Audio2_2210d: ; 2210d (8:610d)
 	ld l, a
 	ld e, a
 	ld h, $0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_08
+	ld de, SFX_Headers_2
 	add hl, de
 	ld a, h
 	ld [wc0ec], a
@@ -1555,11 +1555,11 @@ Music8_2210d: ; 2210d (8:610d)
 .asm_221ea
 	ld a, c
 	and a
-	jp z, Music8_2224e
+	jp z, Audio2_2224e
 	dec c
 	jp .asm_22126
 
-Music8_221f3: ; 221f3 (8:61f3)
+Audio2_221f3: ; 221f3 (8:61f3)
 	ld a, $80
 	ld [$ff26], a
 	ld [$ff1a], a
@@ -1587,11 +1587,11 @@ Music8_221f3: ; 221f3 (8:61f3)
 	ld [wc0e7], a
 	ld d, $a0
 	ld hl, wc006
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld a, $1
 	ld d, $18
 	ld hl, wc0b6
-	call FillMusicRAM8
+	call FillAudioRAM2
 	ld [wc0e8], a
 	ld [wc0ea], a
 	ld a, $ff
@@ -1599,7 +1599,7 @@ Music8_221f3: ; 221f3 (8:61f3)
 	ret
 
 ; fills d bytes at hl with a
-FillMusicRAM8: ; 22248 (8:6248)
+FillAudioRAM2: ; 22248 (8:6248)
 	ld b, d
 .loop
 	ld [hli], a
@@ -1607,7 +1607,7 @@ FillMusicRAM8: ; 22248 (8:6248)
 	jr nz, .loop
 	ret
 
-Music8_2224e: ; 2224e (8:624e)
+Audio2_2224e: ; 2224e (8:624e)
 	ld a, [wc001]
 	ld l, a
 	ld e, a
@@ -1615,7 +1615,7 @@ Music8_2224e: ; 2224e (8:624e)
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_08
+	ld de, SFX_Headers_2
 	add hl, de
 	ld e, l
 	ld d, h
@@ -1688,7 +1688,7 @@ Music8_2224e: ; 2224e (8:624e)
 	ld [hli], a
 	ld [hl], a
 	ld hl, wc012 ; sfx noise channel pointer
-	ld de, Noise8_endchannel
+	ld de, Noise2_endchannel
 	ld [hl], e
 	inc hl
 	ld [hl], d ; overwrite pointer to point to endchannel
@@ -1702,7 +1702,7 @@ Music8_2224e: ; 2224e (8:624e)
 .asm_222d4
 	ret
 
-Noise8_endchannel: ; 222d5 (8:62d5)
+Noise2_endchannel: ; 222d5 (8:62d5)
 	endchannel
 
 Unknown_222d6: ; 222d6 (8:62d6)
@@ -1717,7 +1717,7 @@ Unknown_222e6: ; 222e6 (8:62e6)
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Music8_Pitches: ; 222ee (8:62ee)
+Audio2_Pitches: ; 222ee (8:62ee)
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
diff --git a/audio/engine_3.asm b/audio/engine_3.asm
index 718b6016..93fa62aa 100644
--- a/audio/engine_3.asm
+++ b/audio/engine_3.asm
@@ -1,6 +1,6 @@
 ; The third of three duplicated sound engines.
 
-Music1f_UpdateMusic:: ; 7d177 (1f:5177)
+Audio3_UpdateMusic:: ; 7d177 (1f:5177)
 	ld c, CH0
 .loop
 	ld b, $0
@@ -26,7 +26,7 @@ Music1f_UpdateMusic:: ; 7d177 (1f:5177)
 	ld [$ff1a], a
 	jr .nextChannel
 .applyAffects
-	call Music1f_ApplyMusicAffects
+	call Audio3_ApplyMusicAffects
 .nextChannel
 	ld a, c
 	inc c ; inc channel number
@@ -42,13 +42,13 @@ Music1f_UpdateMusic:: ; 7d177 (1f:5177)
 ;	3: a toggle used only by this routine for vibrato
 ;	4: pitchbend flag
 ;	6: dutycycle flag
-Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac)
+Audio3_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 	ld b, $0
 	ld hl, wc0b6 ; delay until next note
 	add hl, bc
 	ld a, [hl]
 	cp $1 ; if delay is 1, play next note
-	jp z, Music1f_PlayNextNote
+	jp z, Audio3_PlayNextNote
 	dec a ; otherwise, decrease the delay timer
 	ld [hl], a
 	ld a, c
@@ -65,7 +65,7 @@ Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 	add hl, bc
 	bit 6, [hl] ; dutycycle
 	jr z, .checkForExecuteMusic
-	call Music1f_ApplyDutyCycle
+	call Audio3_ApplyDutyCycle
 .checkForExecuteMusic
 	ld b, $0
 	ld hl, wc036
@@ -81,7 +81,7 @@ Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 	add hl, bc
 	bit 4, [hl] ; pitchbend
 	jr z, .checkVibratoDelay
-	jp Music1f_ApplyPitchBend
+	jp Audio3_ApplyPitchBend
 .checkVibratoDelay
 	ld hl, wc04e ; vibrato delay
 	add hl, bc
@@ -141,14 +141,14 @@ Music1f_ApplyMusicAffects: ; 7d1ac (1f:51ac)
 .done
 	ld d, a
 	ld b, $3
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
 	ret
 
 ; this routine executes all music commands that take up no time,
 ; like tempo changes, duty changes etc. and doesn't return
 ; until the first note is reached
-Music1f_PlayNextNote: ; 7d244 (1f:5244)
+Audio3_PlayNextNote: ; 7d244 (1f:5244)
 	ld hl, wc06e
 	add hl, bc
 	ld a, [hl]
@@ -159,14 +159,14 @@ Music1f_PlayNextNote: ; 7d244 (1f:5244)
 	add hl, bc
 	res 4, [hl]
 	res 5, [hl]
-	call Music1f_endchannel
+	call Audio3_endchannel
 	ret
 
-Music1f_endchannel: ; 7d25a (1f:525a)
-	call Music1f_GetNextMusicByte
+Audio3_endchannel: ; 7d25a (1f:525a)
+	call Audio3_GetNextMusicByte
 	ld d, a
 	cp $ff ; is this command an endchannel?
-	jp nz, Music1f_callchannel ; no
+	jp nz, Audio3_callchannel ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
@@ -216,7 +216,7 @@ Music1f_endchannel: ; 7d25a (1f:525a)
 	inc de
 	ld a, [de]
 	ld [hl], a ; loads channel address to return to
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 .asm_7d2b3
 	ld hl, Unknown_7db93
 	add hl, bc
@@ -238,7 +238,7 @@ Music1f_endchannel: ; 7d25a (1f:525a)
 	ld a, c
 	cp CH4
 	jr z, .asm_7d2d9
-	call Music1f_7d73b
+	call Audio3_7d73b
 	ret c
 .asm_7d2d9
 	ld a, [wc005]
@@ -251,12 +251,12 @@ Music1f_endchannel: ; 7d25a (1f:525a)
 	ld [hl], b
 	ret
 
-Music1f_callchannel: ; 7d2e8 (1f:52e8)
+Audio3_callchannel: ; 7d2e8 (1f:52e8)
 	cp $fd ; is this command a callchannel?
-	jp nz, Music1f_loopchannel ; no
-	call Music1f_GetNextMusicByte ; yes
+	jp nz, Audio3_loopchannel ; no
+	call Audio3_GetNextMusicByte ; yes
 	push af
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	pop af
 	ld e, a
@@ -286,12 +286,12 @@ Music1f_callchannel: ; 7d2e8 (1f:52e8)
 	ld hl, wc02e
 	add hl, bc
 	set 1, [hl] ; set the call flag
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_loopchannel: ; 7d31d (1f:531d)
+Audio3_loopchannel: ; 7d31d (1f:531d)
 	cp $fe ; is this command a loopchannel?
-	jp nz, Music1f_notetype ; no
-	call Music1f_GetNextMusicByte ; yes
+	jp nz, Audio3_notetype ; no
+	call Audio3_GetNextMusicByte ; yes
 	ld e, a
 	and a
 	jr z, .infiniteLoop
@@ -303,17 +303,17 @@ Music1f_loopchannel: ; 7d31d (1f:531d)
 	jr nz, .loopAgain
 	ld a, $1 ; if no more loops to make
 	ld [hl], a
-	call Music1f_GetNextMusicByte ; skip pointer
-	call Music1f_GetNextMusicByte
-	jp Music1f_endchannel
+	call Audio3_GetNextMusicByte ; skip pointer
+	call Audio3_GetNextMusicByte
+	jp Audio3_endchannel
 .loopAgain ; inc loop count
 	inc a
 	ld [hl], a
 	; fall through
 .infiniteLoop ; overwrite current address with pointer
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	push af
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld b, a
 	ld d, $0
 	ld a, c
@@ -324,12 +324,12 @@ Music1f_loopchannel: ; 7d31d (1f:531d)
 	pop af
 	ld [hli], a
 	ld [hl], b
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_notetype: ; 7d358 (1f:5358)
+Audio3_notetype: ; 7d358 (1f:5358)
 	and $f0
 	cp $d0 ; is this command a notetype?
-	jp nz, Music1f_toggleperfectpitch ; no
+	jp nz, Audio3_toggleperfectpitch ; no
 	ld a, d ; yes
 	and $f
 	ld b, $0
@@ -339,7 +339,7 @@ Music1f_notetype: ; 7d358 (1f:5358)
 	ld a, c
 	cp CH3
 	jr z, .noiseChannel ; noise channel has 0 params
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	ld a, c
 	cp CH2
@@ -368,24 +368,24 @@ Music1f_notetype: ; 7d358 (1f:5358)
 	add hl, bc
 	ld [hl], d
 .noiseChannel
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_toggleperfectpitch: ; 7d397 (1f:5397)
+Audio3_toggleperfectpitch: ; 7d397 (1f:5397)
 	ld a, d
 	cp $e8 ; is this command a toggleperfectpitch?
-	jr nz, Music1f_vibrato ; no
+	jr nz, Audio3_vibrato ; no
 	ld b, $0 ; yes
 	ld hl, wc02e
 	add hl, bc
 	ld a, [hl]
 	xor $1
 	ld [hl], a ; flip bit 0 of wc02e
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_vibrato: ; 7d3a9 (1f:53a9)
+Audio3_vibrato: ; 7d3a9 (1f:53a9)
 	cp $ea ; is this command a vibrato?
-	jr nz, Music1f_pitchbend ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_pitchbend ; no
+	call Audio3_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc04e
 	add hl, bc
@@ -393,7 +393,7 @@ Music1f_vibrato: ; 7d3a9 (1f:53a9)
 	ld hl, wc06e
 	add hl, bc
 	ld [hl], a ; store delay
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
@@ -414,24 +414,24 @@ Music1f_vibrato: ; 7d3a9 (1f:53a9)
 	swap a
 	or d
 	ld [hl], a ; store depth as both high and low nibbles
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_pitchbend: ; 7d3e1 (1f:53e1)
+Audio3_pitchbend: ; 7d3e1 (1f:53e1)
 	cp $eb ; is this command a pitchbend?
-	jr nz, Music1f_duty ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_duty ; no
+	call Audio3_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc076
 	add hl, bc
 	ld [hl], a ; store first param
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	and $f0
 	swap a
 	ld b, a
 	ld a, d
 	and $f
-	call Music1f_7d8cc
+	call Audio3_7d8cc
 	ld b, $0
 	ld hl, wc0a6
 	add hl, bc
@@ -443,14 +443,14 @@ Music1f_pitchbend: ; 7d3e1 (1f:53e1)
 	ld hl, wc02e
 	add hl, bc
 	set 4, [hl] ; set pitchbend flag
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
-	jp Music1f_notelength
+	jp Audio3_notelength
 
-Music1f_duty: ; 7d419 (1f:5419)
+Audio3_duty: ; 7d419 (1f:5419)
 	cp $ec ; is this command a duty?
-	jr nz, Music1f_tempo ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_tempo ; no
+	call Audio3_GetNextMusicByte ; yes
 	rrca
 	rrca
 	and $c0
@@ -458,17 +458,17 @@ Music1f_duty: ; 7d419 (1f:5419)
 	ld hl, wc03e
 	add hl, bc
 	ld [hl], a ; store duty
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_tempo: ; 7d42e (1f:542e)
+Audio3_tempo: ; 7d42e (1f:542e)
 	cp $ed ; is this command a tempo?
-	jr nz, Music1f_stereopanning ; no
+	jr nz, Audio3_stereopanning ; no
 	ld a, c ; yes
 	cp CH4
 	jr nc, .sfxChannel
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld [wc0e8], a ; store first param
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld [wc0e9], a ; store second param
 	xor a
 	ld [wc0ce], a ; clear RAM
@@ -477,9 +477,9 @@ Music1f_tempo: ; 7d42e (1f:542e)
 	ld [wc0d1], a
 	jr .musicChannelDone
 .sfxChannel
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld [wc0ea], a ; store first param
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld [wc0eb], a ; store second param
 	xor a
 	ld [wc0d2], a ; clear RAM
@@ -487,22 +487,22 @@ Music1f_tempo: ; 7d42e (1f:542e)
 	ld [wc0d4], a
 	ld [wc0d5], a
 .musicChannelDone
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_stereopanning: ; 7d46e (1f:546e)
+Audio3_stereopanning: ; 7d46e (1f:546e)
 	cp $ee ; is this command a stereopanning?
-	jr nz, Music1f_unknownmusic0xef ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_unknownmusic0xef ; no
+	call Audio3_GetNextMusicByte ; yes
 	ld [wc004], a ; store panning
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
 ; this appears to never be used
-Music1f_unknownmusic0xef: ; 7d47b (1f:547b)
+Audio3_unknownmusic0xef: ; 7d47b (1f:547b)
 	cp $ef ; is this command an unknownmusic0xef?
-	jr nz, Music1f_dutycycle ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_dutycycle ; no
+	call Audio3_GetNextMusicByte ; yes
 	push bc
-	call Music1f_7d8ea
+	call Audio3_7d8ea
 	pop bc
 	ld a, [wc003]
 	and a
@@ -512,12 +512,12 @@ Music1f_unknownmusic0xef: ; 7d47b (1f:547b)
 	xor a
 	ld [wc02d], a
 .skip
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_dutycycle: ; 7d49a (1f:549a)
+Audio3_dutycycle: ; 7d49a (1f:549a)
 	cp $fc ; is this command a dutycycle?
-	jr nz, Music1f_volume ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_volume ; no
+	call Audio3_GetNextMusicByte ; yes
 	ld b, $0
 	ld hl, wc046
 	add hl, bc
@@ -529,48 +529,48 @@ Music1f_dutycycle: ; 7d49a (1f:549a)
 	ld hl, wc02e
 	add hl, bc
 	set 6, [hl] ; set duty flag
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_volume: ; 7d4b8 (1f:54b8)
+Audio3_volume: ; 7d4b8 (1f:54b8)
 	cp $f0 ; is this command a volume?
-	jr nz, Music1f_executemusic ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_executemusic ; no
+	call Audio3_GetNextMusicByte ; yes
 	ld [$ff24], a ; store volume
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_executemusic: ; 7d4c4 (1f:54c4)
+Audio3_executemusic: ; 7d4c4 (1f:54c4)
 	cp $f8 ; is this command an executemusic?
-	jr nz, Music1f_octave ; no
+	jr nz, Audio3_octave ; no
 	ld b, $0 ; yes
 	ld hl, wc036
 	add hl, bc
 	set 0, [hl]
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_octave: ; 7d4d3 (1f:54d3)
+Audio3_octave: ; 7d4d3 (1f:54d3)
 	and $f0
 	cp $e0 ; is this command an octave?
-	jr nz, Music1f_unknownsfx0x20 ; no
+	jr nz, Audio3_unknownsfx0x20 ; no
 	ld hl, wc0d6 ; yes
 	ld b, $0
 	add hl, bc
 	ld a, d
 	and $f
 	ld [hl], a ; store low nibble as octave
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6)
+Audio3_unknownsfx0x20: ; 7d4e6 (1f:54e6)
 	cp $20 ; is this command an unknownsfx0x20?
-	jr nz, Music1f_unknownsfx0x10 ; no
+	jr nz, Audio3_unknownsfx0x10 ; no
 	ld a, c
 	cp CH3 ; is this a noise or sfx channel?
-	jr c, Music1f_unknownsfx0x10 ; no
+	jr c, Audio3_unknownsfx0x10 ; no
 	ld b, $0
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music1f_unknownsfx0x10 ; no
-	call Music1f_notelength ; yes
+	jr nz, Audio3_unknownsfx0x10 ; no
+	call Audio3_notelength ; yes
 	ld d, a
 	ld b, $0
 	ld hl, wc03e
@@ -579,56 +579,56 @@ Music1f_unknownsfx0x20: ; 7d4e6 (1f:54e6)
 	or d
 	ld d, a
 	ld b, $1
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld d, a
 	ld b, $2
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	ld e, a
 	ld a, c
 	cp CH7
 	ld a, $0
 	jr z, .sfxNoiseChannel ; only two params for noise channel
 	push de
-	call Music1f_GetNextMusicByte
+	call Audio3_GetNextMusicByte
 	pop de
 .sfxNoiseChannel
 	ld d, a
 	push de
-	call Music1f_7d69d
-	call Music1f_7d66c
+	call Audio3_7d69d
+	call Audio3_7d66c
 	pop de
-	call Music1f_7d6bf
+	call Audio3_7d6bf
 	ret
 
-Music1f_unknownsfx0x10: ; 7d533 (1f:5533)
+Audio3_unknownsfx0x10: ; 7d533 (1f:5533)
 	ld a, c
 	cp CH4
-	jr c, Music1f_note ; if not a sfx
+	jr c, Audio3_note ; if not a sfx
 	ld a, d
 	cp $10 ; is this command an unknownsfx0x10?
-	jr nz, Music1f_note ; no
+	jr nz, Audio3_note ; no
 	ld b, $0
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music1f_note ; no
-	call Music1f_GetNextMusicByte ; yes
+	jr nz, Audio3_note ; no
+	call Audio3_GetNextMusicByte ; yes
 	ld [$ff10], a
-	jp Music1f_endchannel
+	jp Audio3_endchannel
 
-Music1f_note: ; 7d54f (1f:554f)
+Audio3_note: ; 7d54f (1f:554f)
 	ld a, c
 	cp CH3
-	jr nz, Music1f_notelength ; if not noise channel
+	jr nz, Audio3_notelength ; if not noise channel
 	ld a, d
 	and $f0
 	cp $b0 ; is this command a dnote?
-	jr z, Music1f_dnote ; yes
-	jr nc, Music1f_notelength ; no
+	jr z, Audio3_dnote ; yes
+	jr nc, Audio3_notelength ; no
 	swap a
 	ld b, a
 	ld a, d
@@ -639,24 +639,24 @@ Music1f_note: ; 7d54f (1f:554f)
 	push bc
 	jr asm_7d571
 
-Music1f_dnote: ; 7d569 (1f:5569)
+Audio3_dnote: ; 7d569 (1f:5569)
 	ld a, d
 	and $f
 	push af
 	push bc
-	call Music1f_GetNextMusicByte ; get dnote instrument
+	call Audio3_GetNextMusicByte ; get dnote instrument
 asm_7d571
 	ld d, a
 	ld a, [wc003]
 	and a
 	jr nz, .asm_7d57c
 	ld a, d
-	call Music1f_7d8ea
+	call Audio3_7d8ea
 .asm_7d57c
 	pop bc
 	pop de
 
-Music1f_notelength: ; 7d57e (1f:557e)
+Audio3_notelength: ; 7d57e (1f:557e)
 	ld a, d
 	push af
 	and $f
@@ -668,7 +668,7 @@ Music1f_notelength: ; 7d57e (1f:557e)
 	add hl, bc
 	ld a, [hl]
 	ld l, b
-	call Music1f_7d8bb
+	call Audio3_7d8bb
 	ld a, c
 	cp CH4
 	jr nc, .sfxChannel
@@ -682,7 +682,7 @@ Music1f_notelength: ; 7d57e (1f:557e)
 	ld e, $0
 	cp CH7
 	jr z, .skip ; if noise channel
-	call Music1f_7d707
+	call Audio3_7d707
 	ld a, [wc0ea]
 	ld d, a
 	ld a, [wc0eb]
@@ -693,7 +693,7 @@ Music1f_notelength: ; 7d57e (1f:557e)
 	ld hl, wc0ce
 	add hl, bc
 	ld l, [hl]
-	call Music1f_7d8bb
+	call Audio3_7d8bb
 	ld e, l
 	ld d, h
 	ld hl, wc0ce
@@ -706,15 +706,15 @@ Music1f_notelength: ; 7d57e (1f:557e)
 	ld hl, wc036
 	add hl, bc
 	bit 0, [hl]
-	jr nz, Music1f_notepitch
+	jr nz, Audio3_notepitch
 	ld hl, wc02e
 	add hl, bc
 	bit 2, [hl]
-	jr z, Music1f_notepitch
+	jr z, Audio3_notepitch
 	pop hl
 	ret
 
-Music1f_notepitch: ; 7d5dc (1f:55dc)
+Audio3_notepitch: ; 7d5dc (1f:55dc)
 	pop af
 	and $f0
 	cp $c0 ; compare to rest
@@ -744,7 +744,7 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
 	jr .quit
 .notSfxChannel3
 	ld b, $2
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld a, $8
 	ld [hli], a
 	inc hl
@@ -758,13 +758,13 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
 	ld hl, wc0d6
 	add hl, bc
 	ld b, [hl]
-	call Music1f_7d8cc
+	call Audio3_7d8cc
 	ld b, $0
 	ld hl, wc02e
 	add hl, bc
 	bit 4, [hl]
 	jr z, .asm_7d62c
-	call Music1f_7d803
+	call Audio3_7d803
 .asm_7d62c
 	push de
 	ld a, c
@@ -787,10 +787,10 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
 	add hl, bc
 	ld d, [hl]
 	ld b, $2
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
-	call Music1f_7d69d
-	call Music1f_7d66c
+	call Audio3_7d69d
+	call Audio3_7d66c
 	pop de
 	ld b, $0
 	ld hl, wc02e
@@ -804,10 +804,10 @@ Music1f_notepitch: ; 7d5dc (1f:55dc)
 	ld hl, wc066
 	add hl, bc
 	ld [hl], e
-	call Music1f_7d6bf
+	call Audio3_7d6bf
 	ret
 
-Music1f_7d66c: ; 7d66c (1f:566c)
+Audio3_7d66c: ; 7d66c (1f:566c)
 	ld b, $0
 	ld hl, Unknown_7db9b
 	add hl, bc
@@ -841,7 +841,7 @@ Music1f_7d66c: ; 7d66c (1f:566c)
 	ld [$ff25], a
 	ret
 
-Music1f_7d69d: ; 7d69d (1f:569d)
+Audio3_7d69d: ; 7d69d (1f:569d)
 	ld b, $0
 	ld hl, wc0b6
 	add hl, bc
@@ -861,11 +861,11 @@ Music1f_7d69d: ; 7d69d (1f:569d)
 	ld d, a
 .channel3
 	ld b, $1
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld [hl], d
 	ret
 
-Music1f_7d6bf: ; 7d6bf (1f:56bf)
+Audio3_7d6bf: ; 7d6bf (1f:56bf)
 	ld a, c
 	cp CH2
 	jr z, .channel3
@@ -883,7 +883,7 @@ Music1f_7d6bf: ; 7d6bf (1f:56bf)
 	add a
 	ld d, $0
 	ld e, a
-	ld hl, Music1f_WavePointers
+	ld hl, Audio3_WavePointers
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -909,15 +909,15 @@ Music1f_7d6bf: ; 7d6bf (1f:56bf)
 	and $c7
 	ld d, a
 	ld b, $3
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld [hl], e
 	inc hl
 	ld [hl], d
-	call Music1f_7d729
+	call Audio3_7d729
 	ret
 
-Music1f_7d707: ; 7d707 (1f:5707)
-	call Music1f_7d759
+Audio3_7d707: ; 7d707 (1f:5707)
+	call Audio3_7d759
 	jr nc, .asm_7d71f
 	ld d, $0
 	ld a, [wc0f2]
@@ -937,8 +937,8 @@ Music1f_7d707: ; 7d707 (1f:5707)
 .asm_7d728
 	ret
 
-Music1f_7d729: ; 7d729 (1f:5729)
-	call Music1f_7d759
+Audio3_7d729: ; 7d729 (1f:5729)
+	call Audio3_7d759
 	jr nc, .asm_7d73a
 	ld a, [wc0f1]
 	add e
@@ -953,8 +953,8 @@ Music1f_7d729: ; 7d729 (1f:5729)
 .asm_7d73a
 	ret
 
-Music1f_7d73b: ; 7d73b (1f:573b)
-	call Music1f_7d759
+Audio3_7d73b: ; 7d73b (1f:573b)
+	call Audio3_7d759
 	jr nc, .asm_7d756
 	ld hl, wc006
 	ld e, c
@@ -976,7 +976,7 @@ Music1f_7d73b: ; 7d73b (1f:573b)
 	ccf
 	ret
 
-Music1f_7d759: ; 7d759 (1f:5759)
+Audio3_7d759: ; 7d759 (1f:5759)
 	ld a, [wc02a]
 	cp $14
 	jr nc, .asm_7d762
@@ -993,7 +993,7 @@ Music1f_7d759: ; 7d759 (1f:5759)
 	scf
 	ret
 
-Music1f_ApplyPitchBend: ; 7d76d (1f:576d)
+Audio3_ApplyPitchBend: ; 7d76d (1f:576d)
 	ld hl, wc02e
 	add hl, bc
 	bit 5, [hl]
@@ -1083,7 +1083,7 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d)
 	add hl, bc
 	ld [hl], d
 	ld b, $3
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld a, e
 	ld [hli], a
 	ld [hl], d
@@ -1095,7 +1095,7 @@ Music1f_ApplyPitchBend: ; 7d76d (1f:576d)
 	res 5, [hl]
 	ret
 
-Music1f_7d803: ; 7d803 (1f:5803)
+Audio3_7d803: ; 7d803 (1f:5803)
 	ld hl, wc096
 	add hl, bc
 	ld [hl], d
@@ -1184,7 +1184,7 @@ Music1f_7d803: ; 7d803 (1f:5803)
 	ld [hl], a
 	ret
 
-Music1f_ApplyDutyCycle: ; 7d881 (1f:5881)
+Audio3_ApplyDutyCycle: ; 7d881 (1f:5881)
 	ld b, $0
 	ld hl, wc046
 	add hl, bc
@@ -1195,14 +1195,14 @@ Music1f_ApplyDutyCycle: ; 7d881 (1f:5881)
 	and $c0
 	ld d, a
 	ld b, $1
-	call Music1f_7d8ac
+	call Audio3_7d8ac
 	ld a, [hl]
 	and $3f
 	or d
 	ld [hl], a
 	ret
 
-Music1f_GetNextMusicByte: ; 7d899 (1f:5899)
+Audio3_GetNextMusicByte: ; 7d899 (1f:5899)
 	ld d, $0
 	ld a, c
 	add a
@@ -1220,7 +1220,7 @@ Music1f_GetNextMusicByte: ; 7d899 (1f:5899)
 	ld [hl], d
 	ret
 
-Music1f_7d8ac: ; 7d8ac (1f:58ac)
+Audio3_7d8ac: ; 7d8ac (1f:58ac)
 	ld a, c
 	ld hl, Unknown_7db8b
 	add l
@@ -1234,7 +1234,7 @@ Music1f_7d8ac: ; 7d8ac (1f:58ac)
 	ld h, $ff
 	ret
 
-Music1f_7d8bb: ; 7d8bb (1f:58bb)
+Audio3_7d8bb: ; 7d8bb (1f:58bb)
 	ld h, $0
 .loop
 	srl a
@@ -1249,13 +1249,13 @@ Music1f_7d8bb: ; 7d8bb (1f:58bb)
 .done
 	ret
 
-Music1f_7d8cc: ; 7d8cc (1f:58cc)
+Audio3_7d8cc: ; 7d8cc (1f:58cc)
 	ld h, $0
 	ld l, a
 	add hl, hl
 	ld d, h
 	ld e, l
-	ld hl, Music1f_Pitches
+	ld hl, Audio3_Pitches
 	add hl, de
 	ld e, [hl]
 	inc hl
@@ -1274,16 +1274,16 @@ Music1f_7d8cc: ; 7d8cc (1f:58cc)
 	ld d, a
 	ret
 
-Music1f_7d8ea:: ; 7d8ea (1f:58ea)
+Audio3_7d8ea:: ; 7d8ea (1f:58ea)
 	ld [wc001], a
 	cp $ff
-	jp z, Music1f_7daa8
+	jp z, Audio3_7daa8
 	cp $c2
-	jp z, Music1f_7d9c2
-	jp c, Music1f_7d9c2
+	jp z, Audio3_7d9c2
+	jp c, Audio3_7d9c2
 	cp $fe
 	jr z, .asm_7d901
-	jp nc, Music1f_7d9c2
+	jp nc, Audio3_7d9c2
 .asm_7d901
 	xor a
 	ld [wc000], a
@@ -1293,53 +1293,53 @@ Music1f_7d8ea:: ; 7d8ea (1f:58ea)
 	ld [wc0e7], a
 	ld d, $8
 	ld hl, wc016
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc006
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld d, $4
 	ld hl, wc026
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc02e
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc03e
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc046
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc04e
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc056
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc05e
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc066
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc06e
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc036
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc076
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc07e
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc086
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc08e
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc096
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc09e
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc0a6
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc0ae
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld a, $1
 	ld hl, wc0be
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc0b6
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld hl, wc0c6
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld [wc0e8], a
 	ld a, $ff
 	ld [wc004], a
@@ -1355,16 +1355,16 @@ Music1f_7d8ea:: ; 7d8ea (1f:58ea)
 	ld [$ff1a], a
 	ld a, $77
 	ld [$ff24], a
-	jp Music1f_7db03
+	jp Audio3_7db03
 
-Music1f_7d9c2: ; 7d9c2 (1f:59c2)
+Audio3_7d9c2: ; 7d9c2 (1f:59c2)
 	ld l, a
 	ld e, a
 	ld h, $0
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_1f
+	ld de, SFX_Headers_3
 	add hl, de
 	ld a, h
 	ld [wc0ec], a
@@ -1504,11 +1504,11 @@ Music1f_7d9c2: ; 7d9c2 (1f:59c2)
 .asm_7da9f
 	ld a, c
 	and a
-	jp z, Music1f_7db03
+	jp z, Audio3_7db03
 	dec c
 	jp .asm_7d9db
 
-Music1f_7daa8: ; 7daa8 (1f:5aa8)
+Audio3_7daa8: ; 7daa8 (1f:5aa8)
 	ld a, $80
 	ld [$ff26], a
 	ld [$ff1a], a
@@ -1536,11 +1536,11 @@ Music1f_7daa8: ; 7daa8 (1f:5aa8)
 	ld [wc0e7], a
 	ld d, $a0
 	ld hl, wc006
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld a, $1
 	ld d, $18
 	ld hl, wc0b6
-	call FillMusicRAM1f
+	call FillAudioRAM3
 	ld [wc0e8], a
 	ld [wc0ea], a
 	ld a, $ff
@@ -1548,7 +1548,7 @@ Music1f_7daa8: ; 7daa8 (1f:5aa8)
 	ret
 
 ; fills d bytes at hl with a
-FillMusicRAM1f: ; 7dafd (1f:5afd)
+FillAudioRAM3: ; 7dafd (1f:5afd)
 	ld b, d
 .loop
 	ld [hli], a
@@ -1556,7 +1556,7 @@ FillMusicRAM1f: ; 7dafd (1f:5afd)
 	jr nz, .loop
 	ret
 
-Music1f_7db03: ; 7db03 (1f:5b03)
+Audio3_7db03: ; 7db03 (1f:5b03)
 	ld a, [wc001]
 	ld l, a
 	ld e, a
@@ -1564,7 +1564,7 @@ Music1f_7db03: ; 7db03 (1f:5b03)
 	ld d, h
 	add hl, hl
 	add hl, de
-	ld de, SFX_Headers_1f
+	ld de, SFX_Headers_3
 	add hl, de
 	ld e, l
 	ld d, h
@@ -1637,7 +1637,7 @@ Music1f_7db03: ; 7db03 (1f:5b03)
 	ld [hli], a
 	ld [hl], a
 	ld hl, wc012 ; sfx noise channel pointer
-	ld de, Noise1f_endchannel
+	ld de, Noise3_endchannel
 	ld [hl], e
 	inc hl
 	ld [hl], d ; overwrite pointer to point to endchannel
@@ -1651,7 +1651,7 @@ Music1f_7db03: ; 7db03 (1f:5b03)
 .asm_7db89
 	ret
 
-Noise1f_endchannel: ; 7db8a (1f:5b8a)
+Noise3_endchannel: ; 7db8a (1f:5b8a)
 	endchannel
 
 Unknown_7db8b: ; 7db8b (1f:5b8b)
@@ -1666,7 +1666,7 @@ Unknown_7db9b: ; 7db9b (1f:5b9b)
 	db $11, $22, $44, $88 ; channels 0-3
 	db $11, $22, $44, $88 ; channels 4-7
 
-Music1f_Pitches: ; 7dba3 (1f:5ba3)
+Audio3_Pitches: ; 7dba3 (1f:5ba3)
 	dw $F82C ; C_
 	dw $F89D ; C#
 	dw $F907 ; D_
diff --git a/audio/headers/musicheaders02.asm b/audio/headers/musicheaders1.asm
index a6449436..a6449436 100755
--- a/audio/headers/musicheaders02.asm
+++ b/audio/headers/musicheaders1.asm
diff --git a/audio/headers/musicheaders08.asm b/audio/headers/musicheaders2.asm
index 85cf2825..85cf2825 100755
--- a/audio/headers/musicheaders08.asm
+++ b/audio/headers/musicheaders2.asm
diff --git a/audio/headers/musicheaders1f.asm b/audio/headers/musicheaders3.asm
index 7846e48f..7846e48f 100755
--- a/audio/headers/musicheaders1f.asm
+++ b/audio/headers/musicheaders3.asm
diff --git a/audio/headers/sfxheaders02.asm b/audio/headers/sfxheaders02.asm
deleted file mode 100755
index b5cff17a..00000000
--- a/audio/headers/sfxheaders02.asm
+++ /dev/null
@@ -1,562 +0,0 @@
-SFX_Headers_02::
-	db $ff, $ff, $ff ; padding
-
-SFX_02_01:: ; 8003 (2:4003)
-	db CH7
-	dw SFX_02_01_Ch1
-
-SFX_02_02:: ; 8006 (2:4006)
-	db CH7
-	dw SFX_02_02_Ch1
-
-SFX_02_03:: ; 8009 (2:4009)
-	db CH7
-	dw SFX_02_03_Ch1
-
-SFX_02_04:: ; 800c (2:400c)
-	db CH7
-	dw SFX_02_04_Ch1
-
-SFX_02_05:: ; 800f (2:400f)
-	db CH7
-	dw SFX_02_05_Ch1
-
-SFX_02_06:: ; 8012 (2:4012)
-	db CH7
-	dw SFX_02_06_Ch1
-
-SFX_02_07:: ; 8015 (2:4015)
-	db CH7
-	dw SFX_02_07_Ch1
-
-SFX_02_08:: ; 8018 (2:4018)
-	db CH7
-	dw SFX_02_08_Ch1
-
-SFX_02_09:: ; 801b (2:401b)
-	db CH7
-	dw SFX_02_09_Ch1
-
-SFX_02_0a:: ; 801e (2:401e)
-	db CH7
-	dw SFX_02_0a_Ch1
-
-SFX_02_0b:: ; 8021 (2:4021)
-	db CH7
-	dw SFX_02_0b_Ch1
-
-SFX_02_0c:: ; 8024 (2:4024)
-	db CH7
-	dw SFX_02_0c_Ch1
-
-SFX_02_0d:: ; 8027 (2:4027)
-	db CH7
-	dw SFX_02_0d_Ch1
-
-SFX_02_0e:: ; 802a (2:402a)
-	db CH7
-	dw SFX_02_0e_Ch1
-
-SFX_02_0f:: ; 802d (2:402d)
-	db CH7
-	dw SFX_02_0f_Ch1
-
-SFX_02_10:: ; 8030 (2:4030)
-	db CH7
-	dw SFX_02_10_Ch1
-
-SFX_02_11:: ; 8033 (2:4033)
-	db CH7
-	dw SFX_02_11_Ch1
-
-SFX_02_12:: ; 8036 (2:4036)
-	db CH7
-	dw SFX_02_12_Ch1
-
-SFX_02_13:: ; 8039 (2:4039)
-	db CH7
-	dw SFX_02_13_Ch1
-
-SFX_02_14:: ; 803c (2:403c)
-	db ( $80 | CH4 )
-	dw SFX_02_14_Ch1
-	db CH5
-	dw SFX_02_14_Ch2
-	db CH7
-	dw SFX_02_14_Ch3
-
-SFX_02_15:: ; 8045 (2:4045)
-	db ( $80 | CH4 )
-	dw SFX_02_15_Ch1
-	db CH5
-	dw SFX_02_15_Ch2
-	db CH7
-	dw SFX_02_15_Ch3
-
-SFX_02_16:: ; 804e (2:404e)
-	db ( $80 | CH4 )
-	dw SFX_02_16_Ch1
-	db CH5
-	dw SFX_02_16_Ch2
-	db CH7
-	dw SFX_02_16_Ch3
-
-SFX_02_17:: ; 8057 (2:4057)
-	db ( $80 | CH4 )
-	dw SFX_02_17_Ch1
-	db CH5
-	dw SFX_02_17_Ch2
-	db CH7
-	dw SFX_02_17_Ch3
-
-SFX_02_18:: ; 8060 (2:4060)
-	db ( $80 | CH4 )
-	dw SFX_02_18_Ch1
-	db CH5
-	dw SFX_02_18_Ch2
-	db CH7
-	dw SFX_02_18_Ch3
-
-SFX_02_19:: ; 8069 (2:4069)
-	db ( $80 | CH4 )
-	dw SFX_02_19_Ch1
-	db CH5
-	dw SFX_02_19_Ch2
-	db CH7
-	dw SFX_02_19_Ch3
-
-SFX_02_1a:: ; 8072 (2:4072)
-	db ( $80 | CH4 )
-	dw SFX_02_1a_Ch1
-	db CH5
-	dw SFX_02_1a_Ch2
-	db CH7
-	dw SFX_02_1a_Ch3
-
-SFX_02_1b:: ; 807b (2:407b)
-	db ( $80 | CH4 )
-	dw SFX_02_1b_Ch1
-	db CH5
-	dw SFX_02_1b_Ch2
-	db CH7
-	dw SFX_02_1b_Ch3
-
-SFX_02_1c:: ; 8084 (2:4084)
-	db ( $80 | CH4 )
-	dw SFX_02_1c_Ch1
-	db CH5
-	dw SFX_02_1c_Ch2
-	db CH7
-	dw SFX_02_1c_Ch3
-
-SFX_02_1d:: ; 808d (2:408d)
-	db ( $80 | CH4 )
-	dw SFX_02_1d_Ch1
-	db CH5
-	dw SFX_02_1d_Ch2
-	db CH7
-	dw SFX_02_1d_Ch3
-
-SFX_02_1e:: ; 8096 (2:4096)
-	db ( $80 | CH4 )
-	dw SFX_02_1e_Ch1
-	db CH5
-	dw SFX_02_1e_Ch2
-	db CH7
-	dw SFX_02_1e_Ch3
-
-SFX_02_1f:: ; 809f (2:409f)
-	db ( $80 | CH4 )
-	dw SFX_02_1f_Ch1
-	db CH5
-	dw SFX_02_1f_Ch2
-	db CH7
-	dw SFX_02_1f_Ch3
-
-SFX_02_20:: ; 80a8 (2:40a8)
-	db ( $80 | CH4 )
-	dw SFX_02_20_Ch1
-	db CH5
-	dw SFX_02_20_Ch2
-	db CH7
-	dw SFX_02_20_Ch3
-
-SFX_02_21:: ; 80b1 (2:40b1)
-	db ( $80 | CH4 )
-	dw SFX_02_21_Ch1
-	db CH5
-	dw SFX_02_21_Ch2
-	db CH7
-	dw SFX_02_21_Ch3
-
-SFX_02_22:: ; 80ba (2:40ba)
-	db ( $80 | CH4 )
-	dw SFX_02_22_Ch1
-	db CH5
-	dw SFX_02_22_Ch2
-	db CH7
-	dw SFX_02_22_Ch3
-
-SFX_02_23:: ; 80c3 (2:40c3)
-	db ( $80 | CH4 )
-	dw SFX_02_23_Ch1
-	db CH5
-	dw SFX_02_23_Ch2
-	db CH7
-	dw SFX_02_23_Ch3
-
-SFX_02_24:: ; 80cc (2:40cc)
-	db ( $80 | CH4 )
-	dw SFX_02_24_Ch1
-	db CH5
-	dw SFX_02_24_Ch2
-	db CH7
-	dw SFX_02_24_Ch3
-
-SFX_02_25:: ; 80d5 (2:40d5)
-	db ( $80 | CH4 )
-	dw SFX_02_25_Ch1
-	db CH5
-	dw SFX_02_25_Ch2
-	db CH7
-	dw SFX_02_25_Ch3
-
-SFX_02_26:: ; 80de (2:40de)
-	db ( $80 | CH4 )
-	dw SFX_02_26_Ch1
-	db CH5
-	dw SFX_02_26_Ch2
-	db CH7
-	dw SFX_02_26_Ch3
-
-SFX_02_27:: ; 80e7 (2:40e7)
-	db ( $80 | CH4 )
-	dw SFX_02_27_Ch1
-	db CH5
-	dw SFX_02_27_Ch2
-	db CH7
-	dw SFX_02_27_Ch3
-
-SFX_02_28:: ; 80f0 (2:40f0)
-	db ( $80 | CH4 )
-	dw SFX_02_28_Ch1
-	db CH5
-	dw SFX_02_28_Ch2
-	db CH7
-	dw SFX_02_28_Ch3
-
-SFX_02_29:: ; 80f9 (2:40f9)
-	db ( $80 | CH4 )
-	dw SFX_02_29_Ch1
-	db CH5
-	dw SFX_02_29_Ch2
-	db CH7
-	dw SFX_02_29_Ch3
-
-SFX_02_2a:: ; 8102 (2:4102)
-	db ( $80 | CH4 )
-	dw SFX_02_2a_Ch1
-	db CH5
-	dw SFX_02_2a_Ch2
-	db CH7
-	dw SFX_02_2a_Ch3
-
-SFX_02_2b:: ; 810b (2:410b)
-	db ( $80 | CH4 )
-	dw SFX_02_2b_Ch1
-	db CH5
-	dw SFX_02_2b_Ch2
-	db CH7
-	dw SFX_02_2b_Ch3
-
-SFX_02_2c:: ; 8114 (2:4114)
-	db ( $80 | CH4 )
-	dw SFX_02_2c_Ch1
-	db CH5
-	dw SFX_02_2c_Ch2
-	db CH7
-	dw SFX_02_2c_Ch3
-
-SFX_02_2d:: ; 811d (2:411d)
-	db ( $80 | CH4 )
-	dw SFX_02_2d_Ch1
-	db CH5
-	dw SFX_02_2d_Ch2
-	db CH7
-	dw SFX_02_2d_Ch3
-
-SFX_02_2e:: ; 8126 (2:4126)
-	db ( $80 | CH4 )
-	dw SFX_02_2e_Ch1
-	db CH5
-	dw SFX_02_2e_Ch2
-	db CH7
-	dw SFX_02_2e_Ch3
-
-SFX_02_2f:: ; 812f (2:412f)
-	db ( $80 | CH4 )
-	dw SFX_02_2f_Ch1
-	db CH5
-	dw SFX_02_2f_Ch2
-	db CH7
-	dw SFX_02_2f_Ch3
-
-SFX_02_30:: ; 8138 (2:4138)
-	db ( $80 | CH4 )
-	dw SFX_02_30_Ch1
-	db CH5
-	dw SFX_02_30_Ch2
-	db CH7
-	dw SFX_02_30_Ch3
-
-SFX_02_31:: ; 8141 (2:4141)
-	db ( $80 | CH4 )
-	dw SFX_02_31_Ch1
-	db CH5
-	dw SFX_02_31_Ch2
-	db CH7
-	dw SFX_02_31_Ch3
-
-SFX_02_32:: ; 814a (2:414a)
-	db ( $80 | CH4 )
-	dw SFX_02_32_Ch1
-	db CH5
-	dw SFX_02_32_Ch2
-	db CH7
-	dw SFX_02_32_Ch3
-
-SFX_02_33:: ; 8153 (2:4153)
-	db ( $80 | CH4 )
-	dw SFX_02_33_Ch1
-	db CH5
-	dw SFX_02_33_Ch2
-	db CH7
-	dw SFX_02_33_Ch3
-
-SFX_02_34:: ; 815c (2:415c)
-	db ( $80 | CH4 )
-	dw SFX_02_34_Ch1
-	db CH5
-	dw SFX_02_34_Ch2
-	db CH7
-	dw SFX_02_34_Ch3
-
-SFX_02_35:: ; 8165 (2:4165)
-	db ( $80 | CH4 )
-	dw SFX_02_35_Ch1
-	db CH5
-	dw SFX_02_35_Ch2
-	db CH7
-	dw SFX_02_35_Ch3
-
-SFX_02_36:: ; 816e (2:416e)
-	db ( $80 | CH4 )
-	dw SFX_02_36_Ch1
-	db CH5
-	dw SFX_02_36_Ch2
-	db CH7
-	dw SFX_02_36_Ch3
-
-SFX_02_37:: ; 8177 (2:4177)
-	db ( $80 | CH4 )
-	dw SFX_02_37_Ch1
-	db CH5
-	dw SFX_02_37_Ch2
-	db CH7
-	dw SFX_02_37_Ch3
-
-SFX_02_38:: ; 8180 (2:4180)
-	db ( $80 | CH4 )
-	dw SFX_02_38_Ch1
-	db CH5
-	dw SFX_02_38_Ch2
-	db CH7
-	dw SFX_02_38_Ch3
-
-SFX_02_39:: ; 8189 (2:4189)
-	db ( $80 | CH4 )
-	dw SFX_02_39_Ch1
-	db CH5
-	dw SFX_02_39_Ch2
-	db CH7
-	dw SFX_02_39_Ch3
-
-SFX_02_3a:: ; 8192 (2:4192)
-	db ( $80 | CH4 )
-	dw SFX_02_3a_Ch1
-	db CH5
-	dw SFX_02_3a_Ch2
-	db CH6
-	dw SFX_02_3a_Ch3
-
-SFX_02_3b:: ; 819b (2:419b)
-	db ( $80 | CH4 )
-	dw SFX_02_3b_Ch1
-	db CH5
-	dw SFX_02_3b_Ch2
-	db CH6
-	dw SFX_02_3b_Ch3
-
-SFX_02_3c:: ; 81a4 (2:41a4)
-	db CH4
-	dw SFX_02_3c_Ch1
-
-SFX_02_3d:: ; 81a7 (2:41a7)
-	db CH4
-	dw SFX_02_3d_Ch1
-
-SFX_02_3e:: ; 81aa (2:41aa)
-	db CH4
-	dw SFX_02_3e_Ch1
-
-SFX_02_3f:: ; 81ad (2:41ad)
-	db CH7
-	dw SFX_02_3f_Ch1
-
-SFX_02_40:: ; 81b0 (2:41b0)
-	db CH4
-	dw SFX_02_40_Ch1
-
-SFX_02_41:: ; 81b3 (2:41b3)
-	db ( $80 | CH4 )
-	dw SFX_02_41_Ch1
-	db CH5
-	dw SFX_02_41_Ch2
-	db CH6
-	dw SFX_02_41_Ch3
-
-SFX_02_42:: ; 81bc (2:41bc)
-	db ( $80 | CH4 )
-	dw SFX_02_42_Ch1
-	db CH5
-	dw SFX_02_42_Ch2
-	db CH6
-	dw SFX_02_42_Ch3
-
-SFX_02_43:: ; 81c5 (2:41c5)
-	db CH4
-	dw SFX_02_43_Ch1
-
-SFX_02_44:: ; 81c8 (2:41c8)
-	db CH4
-	dw SFX_02_44_Ch1
-
-SFX_02_45:: ; 81cb (2:41cb)
-	db CH4
-	dw SFX_02_45_Ch1
-
-SFX_02_46:: ; 81ce (2:41ce)
-	db CH4
-	dw SFX_02_46_Ch1
-
-SFX_02_47:: ; 81d1 (2:41d1)
-	db CH4
-	dw SFX_02_47_Ch1
-
-SFX_02_48:: ; 81d4 (2:41d4)
-	db CH4
-	dw SFX_02_48_Ch1
-
-SFX_02_49:: ; 81d7 (2:41d7)
-	db CH4
-	dw SFX_02_49_Ch1
-
-SFX_02_4a:: ; 81da (2:41da)
-	db CH4
-	dw SFX_02_4a_Ch1
-
-SFX_02_4b:: ; 81dd (2:41dd)
-	db CH4
-	dw SFX_02_4b_Ch1
-
-SFX_02_4c:: ; 81e0 (2:41e0)
-	db CH4
-	dw SFX_02_4c_Ch1
-
-SFX_02_4d:: ; 81e3 (2:41e3)
-	db CH4
-	dw SFX_02_4d_Ch1
-
-SFX_02_4e:: ; 81e6 (2:41e6)
-	db CH4
-	dw SFX_02_4e_Ch1
-
-SFX_02_4f:: ; 81e9 (2:41e9)
-	db CH7
-	dw SFX_02_4f_Ch1
-
-SFX_02_50:: ; 81ec (2:41ec)
-	db CH7
-	dw SFX_02_50_Ch1
-
-SFX_02_51:: ; 81ef (2:41ef)
-	db ( $40 | CH4 )
-	dw SFX_02_51_Ch1
-	db CH5
-	dw SFX_02_51_Ch2
-
-SFX_02_52:: ; 81f5 (2:41f5)
-	db CH4
-	dw SFX_02_52_Ch1
-
-SFX_02_53:: ; 81f8 (2:41f8)
-	db CH7
-	dw SFX_02_53_Ch1
-
-SFX_02_54:: ; 81fb (2:41fb)
-	db ( $40 | CH4 )
-	dw SFX_02_54_Ch1
-	db CH5
-	dw SFX_02_54_Ch2
-
-SFX_02_55:: ; 8201 (2:4201)
-	db CH4
-	dw SFX_02_55_Ch1
-
-SFX_02_56:: ; 8204 (2:4204)
-	db CH7
-	dw SFX_02_56_Ch1
-
-SFX_02_57:: ; 8207 (2:4207)
-	db CH7
-	dw SFX_02_57_Ch1
-
-SFX_02_58:: ; 820a (2:420a)
-	db ( $40 | CH4 )
-	dw SFX_02_58_Ch1
-	db CH5
-	dw SFX_02_58_Ch2
-
-SFX_02_59:: ; 8210 (2:4210)
-	db ( $40 | CH4 )
-	dw SFX_02_59_Ch1
-	db CH5
-	dw SFX_02_59_Ch2
-
-SFX_02_5a:: ; 8216 (2:4216)
-	db ( $40 | CH4 )
-	dw SFX_02_5a_Ch1
-	db CH5
-	dw SFX_02_5a_Ch2
-
-SFX_02_5b:: ; 821c (2:421c)
-	db CH4
-	dw SFX_02_5b_Ch1
-
-SFX_02_5c:: ; 821f (2:421f)
-	db CH7
-	dw SFX_02_5c_Ch1
-
-SFX_02_5d:: ; 8222 (2:4222)
-	db ( $40 | CH4 )
-	dw SFX_02_5d_Ch1
-	db CH5
-	dw SFX_02_5d_Ch2
-
-SFX_02_5e:: ; 8228 (2:4228)
-	db CH2
-	dw SFX_02_5e_Ch1
-
-SFX_02_5f:: ; 822b (2:422b)
-	db CH4
-	dw SFX_02_5f_Ch1
diff --git a/audio/headers/sfxheaders08.asm b/audio/headers/sfxheaders08.asm
deleted file mode 100755
index 311c2877..00000000
--- a/audio/headers/sfxheaders08.asm
+++ /dev/null
@@ -1,706 +0,0 @@
-SFX_Headers_08::
-	db $ff, $ff, $ff ; padding
-
-SFX_08_01:: ; 20003 (8:4003)
-	db CH7
-	dw SFX_08_01_Ch1
-
-SFX_08_02:: ; 20006 (8:4006)
-	db CH7
-	dw SFX_08_02_Ch1
-
-SFX_08_03:: ; 20009 (8:4009)
-	db CH7
-	dw SFX_08_03_Ch1
-
-SFX_08_04:: ; 2000c (8:400c)
-	db CH7
-	dw SFX_08_04_Ch1
-
-SFX_08_05:: ; 2000f (8:400f)
-	db CH7
-	dw SFX_08_05_Ch1
-
-SFX_08_06:: ; 20012 (8:4012)
-	db CH7
-	dw SFX_08_06_Ch1
-
-SFX_08_07:: ; 20015 (8:4015)
-	db CH7
-	dw SFX_08_07_Ch1
-
-SFX_08_08:: ; 20018 (8:4018)
-	db CH7
-	dw SFX_08_08_Ch1
-
-SFX_08_09:: ; 2001b (8:401b)
-	db CH7
-	dw SFX_08_09_Ch1
-
-SFX_08_0a:: ; 2001e (8:401e)
-	db CH7
-	dw SFX_08_0a_Ch1
-
-SFX_08_0b:: ; 20021 (8:4021)
-	db CH7
-	dw SFX_08_0b_Ch1
-
-SFX_08_0c:: ; 20024 (8:4024)
-	db CH7
-	dw SFX_08_0c_Ch1
-
-SFX_08_0d:: ; 20027 (8:4027)
-	db CH7
-	dw SFX_08_0d_Ch1
-
-SFX_08_0e:: ; 2002a (8:402a)
-	db CH7
-	dw SFX_08_0e_Ch1
-
-SFX_08_0f:: ; 2002d (8:402d)
-	db CH7
-	dw SFX_08_0f_Ch1
-
-SFX_08_10:: ; 20030 (8:4030)
-	db CH7
-	dw SFX_08_10_Ch1
-
-SFX_08_11:: ; 20033 (8:4033)
-	db CH7
-	dw SFX_08_11_Ch1
-
-SFX_08_12:: ; 20036 (8:4036)
-	db CH7
-	dw SFX_08_12_Ch1
-
-SFX_08_13:: ; 20039 (8:4039)
-	db CH7
-	dw SFX_08_13_Ch1
-
-SFX_08_14:: ; 2003c (8:403c)
-	db ( $80 | CH4 )
-	dw SFX_08_14_Ch1
-	db CH5
-	dw SFX_08_14_Ch2
-	db CH7
-	dw SFX_08_14_Ch3
-
-SFX_08_15:: ; 20045 (8:4045)
-	db ( $80 | CH4 )
-	dw SFX_08_15_Ch1
-	db CH5
-	dw SFX_08_15_Ch2
-	db CH7
-	dw SFX_08_15_Ch3
-
-SFX_08_16:: ; 2004e (8:404e)
-	db ( $80 | CH4 )
-	dw SFX_08_16_Ch1
-	db CH5
-	dw SFX_08_16_Ch2
-	db CH7
-	dw SFX_08_16_Ch3
-
-SFX_08_17:: ; 20057 (8:4057)
-	db ( $80 | CH4 )
-	dw SFX_08_17_Ch1
-	db CH5
-	dw SFX_08_17_Ch2
-	db CH7
-	dw SFX_08_17_Ch3
-
-SFX_08_18:: ; 20060 (8:4060)
-	db ( $80 | CH4 )
-	dw SFX_08_18_Ch1
-	db CH5
-	dw SFX_08_18_Ch2
-	db CH7
-	dw SFX_08_18_Ch3
-
-SFX_08_19:: ; 20069 (8:4069)
-	db ( $80 | CH4 )
-	dw SFX_08_19_Ch1
-	db CH5
-	dw SFX_08_19_Ch2
-	db CH7
-	dw SFX_08_19_Ch3
-
-SFX_08_1a:: ; 20072 (8:4072)
-	db ( $80 | CH4 )
-	dw SFX_08_1a_Ch1
-	db CH5
-	dw SFX_08_1a_Ch2
-	db CH7
-	dw SFX_08_1a_Ch3
-
-SFX_08_1b:: ; 2007b (8:407b)
-	db ( $80 | CH4 )
-	dw SFX_08_1b_Ch1
-	db CH5
-	dw SFX_08_1b_Ch2
-	db CH7
-	dw SFX_08_1b_Ch3
-
-SFX_08_1c:: ; 20084 (8:4084)
-	db ( $80 | CH4 )
-	dw SFX_08_1c_Ch1
-	db CH5
-	dw SFX_08_1c_Ch2
-	db CH7
-	dw SFX_08_1c_Ch3
-
-SFX_08_1d:: ; 2008d (8:408d)
-	db ( $80 | CH4 )
-	dw SFX_08_1d_Ch1
-	db CH5
-	dw SFX_08_1d_Ch2
-	db CH7
-	dw SFX_08_1d_Ch3
-
-SFX_08_1e:: ; 20096 (8:4096)
-	db ( $80 | CH4 )
-	dw SFX_08_1e_Ch1
-	db CH5
-	dw SFX_08_1e_Ch2
-	db CH7
-	dw SFX_08_1e_Ch3
-
-SFX_08_1f:: ; 2009f (8:409f)
-	db ( $80 | CH4 )
-	dw SFX_08_1f_Ch1
-	db CH5
-	dw SFX_08_1f_Ch2
-	db CH7
-	dw SFX_08_1f_Ch3
-
-SFX_08_20:: ; 200a8 (8:40a8)
-	db ( $80 | CH4 )
-	dw SFX_08_20_Ch1
-	db CH5
-	dw SFX_08_20_Ch2
-	db CH7
-	dw SFX_08_20_Ch3
-
-SFX_08_21:: ; 200b1 (8:40b1)
-	db ( $80 | CH4 )
-	dw SFX_08_21_Ch1
-	db CH5
-	dw SFX_08_21_Ch2
-	db CH7
-	dw SFX_08_21_Ch3
-
-SFX_08_22:: ; 200ba (8:40ba)
-	db ( $80 | CH4 )
-	dw SFX_08_22_Ch1
-	db CH5
-	dw SFX_08_22_Ch2
-	db CH7
-	dw SFX_08_22_Ch3
-
-SFX_08_23:: ; 200c3 (8:40c3)
-	db ( $80 | CH4 )
-	dw SFX_08_23_Ch1
-	db CH5
-	dw SFX_08_23_Ch2
-	db CH7
-	dw SFX_08_23_Ch3
-
-SFX_08_24:: ; 200cc (8:40cc)
-	db ( $80 | CH4 )
-	dw SFX_08_24_Ch1
-	db CH5
-	dw SFX_08_24_Ch2
-	db CH7
-	dw SFX_08_24_Ch3
-
-SFX_08_25:: ; 200d5 (8:40d5)
-	db ( $80 | CH4 )
-	dw SFX_08_25_Ch1
-	db CH5
-	dw SFX_08_25_Ch2
-	db CH7
-	dw SFX_08_25_Ch3
-
-SFX_08_26:: ; 200de (8:40de)
-	db ( $80 | CH4 )
-	dw SFX_08_26_Ch1
-	db CH5
-	dw SFX_08_26_Ch2
-	db CH7
-	dw SFX_08_26_Ch3
-
-SFX_08_27:: ; 200e7 (8:40e7)
-	db ( $80 | CH4 )
-	dw SFX_08_27_Ch1
-	db CH5
-	dw SFX_08_27_Ch2
-	db CH7
-	dw SFX_08_27_Ch3
-
-SFX_08_28:: ; 200f0 (8:40f0)
-	db ( $80 | CH4 )
-	dw SFX_08_28_Ch1
-	db CH5
-	dw SFX_08_28_Ch2
-	db CH7
-	dw SFX_08_28_Ch3
-
-SFX_08_29:: ; 200f9 (8:40f9)
-	db ( $80 | CH4 )
-	dw SFX_08_29_Ch1
-	db CH5
-	dw SFX_08_29_Ch2
-	db CH7
-	dw SFX_08_29_Ch3
-
-SFX_08_2a:: ; 20102 (8:4102)
-	db ( $80 | CH4 )
-	dw SFX_08_2a_Ch1
-	db CH5
-	dw SFX_08_2a_Ch2
-	db CH7
-	dw SFX_08_2a_Ch3
-
-SFX_08_2b:: ; 2010b (8:410b)
-	db ( $80 | CH4 )
-	dw SFX_08_2b_Ch1
-	db CH5
-	dw SFX_08_2b_Ch2
-	db CH7
-	dw SFX_08_2b_Ch3
-
-SFX_08_2c:: ; 20114 (8:4114)
-	db ( $80 | CH4 )
-	dw SFX_08_2c_Ch1
-	db CH5
-	dw SFX_08_2c_Ch2
-	db CH7
-	dw SFX_08_2c_Ch3
-
-SFX_08_2d:: ; 2011d (8:411d)
-	db ( $80 | CH4 )
-	dw SFX_08_2d_Ch1
-	db CH5
-	dw SFX_08_2d_Ch2
-	db CH7
-	dw SFX_08_2d_Ch3
-
-SFX_08_2e:: ; 20126 (8:4126)
-	db ( $80 | CH4 )
-	dw SFX_08_2e_Ch1
-	db CH5
-	dw SFX_08_2e_Ch2
-	db CH7
-	dw SFX_08_2e_Ch3
-
-SFX_08_2f:: ; 2012f (8:412f)
-	db ( $80 | CH4 )
-	dw SFX_08_2f_Ch1
-	db CH5
-	dw SFX_08_2f_Ch2
-	db CH7
-	dw SFX_08_2f_Ch3
-
-SFX_08_30:: ; 20138 (8:4138)
-	db ( $80 | CH4 )
-	dw SFX_08_30_Ch1
-	db CH5
-	dw SFX_08_30_Ch2
-	db CH7
-	dw SFX_08_30_Ch3
-
-SFX_08_31:: ; 20141 (8:4141)
-	db ( $80 | CH4 )
-	dw SFX_08_31_Ch1
-	db CH5
-	dw SFX_08_31_Ch2
-	db CH7
-	dw SFX_08_31_Ch3
-
-SFX_08_32:: ; 2014a (8:414a)
-	db ( $80 | CH4 )
-	dw SFX_08_32_Ch1
-	db CH5
-	dw SFX_08_32_Ch2
-	db CH7
-	dw SFX_08_32_Ch3
-
-SFX_08_33:: ; 20153 (8:4153)
-	db ( $80 | CH4 )
-	dw SFX_08_33_Ch1
-	db CH5
-	dw SFX_08_33_Ch2
-	db CH7
-	dw SFX_08_33_Ch3
-
-SFX_08_34:: ; 2015c (8:415c)
-	db ( $80 | CH4 )
-	dw SFX_08_34_Ch1
-	db CH5
-	dw SFX_08_34_Ch2
-	db CH7
-	dw SFX_08_34_Ch3
-
-SFX_08_35:: ; 20165 (8:4165)
-	db ( $80 | CH4 )
-	dw SFX_08_35_Ch1
-	db CH5
-	dw SFX_08_35_Ch2
-	db CH7
-	dw SFX_08_35_Ch3
-
-SFX_08_36:: ; 2016e (8:416e)
-	db ( $80 | CH4 )
-	dw SFX_08_36_Ch1
-	db CH5
-	dw SFX_08_36_Ch2
-	db CH7
-	dw SFX_08_36_Ch3
-
-SFX_08_37:: ; 20177 (8:4177)
-	db ( $80 | CH4 )
-	dw SFX_08_37_Ch1
-	db CH5
-	dw SFX_08_37_Ch2
-	db CH7
-	dw SFX_08_37_Ch3
-
-SFX_08_38:: ; 20180 (8:4180)
-	db ( $80 | CH4 )
-	dw SFX_08_38_Ch1
-	db CH5
-	dw SFX_08_38_Ch2
-	db CH7
-	dw SFX_08_38_Ch3
-
-SFX_08_39:: ; 20189 (8:4189)
-	db ( $80 | CH4 )
-	dw SFX_08_39_Ch1
-	db CH5
-	dw SFX_08_39_Ch2
-	db CH7
-	dw SFX_08_39_Ch3
-
-SFX_08_3a:: ; 20192 (8:4192)
-	db ( $80 | CH4 )
-	dw SFX_08_3a_Ch1
-	db CH5
-	dw SFX_08_3a_Ch2
-	db CH6
-	dw SFX_08_3a_Ch3
-
-SFX_08_3b:: ; 2019b (8:419b)
-	db ( $80 | CH4 )
-	dw SFX_08_3b_Ch1
-	db CH5
-	dw SFX_08_3b_Ch2
-	db CH6
-	dw SFX_08_3b_Ch3
-
-SFX_08_3c:: ; 201a4 (8:41a4)
-	db CH4
-	dw SFX_08_3c_Ch1
-
-SFX_08_3d:: ; 201a7 (8:41a7)
-	db CH4
-	dw SFX_08_3d_Ch1
-
-SFX_08_3e:: ; 201aa (8:41aa)
-	db CH4
-	dw SFX_08_3e_Ch1
-
-SFX_08_3f:: ; 201ad (8:41ad)
-	db CH7
-	dw SFX_08_3f_Ch1
-
-SFX_08_40:: ; 201b0 (8:41b0)
-	db CH4
-	dw SFX_08_40_Ch1
-
-SFX_08_41:: ; 201b3 (8:41b3)
-	db ( $40 | CH4 )
-	dw SFX_08_41_Ch1
-	db CH5
-	dw SFX_08_41_Ch2
-
-SFX_08_42:: ; 201b9 (8:41b9)
-	db ( $40 | CH4 )
-	dw SFX_08_42_Ch1
-	db CH7
-	dw SFX_08_42_Ch2
-
-SFX_08_43:: ; 201bf (8:41bf)
-	db ( $40 | CH4 )
-	dw SFX_08_43_Ch1
-	db CH7
-	dw SFX_08_43_Ch2
-
-SFX_08_44:: ; 201c5 (8:41c5)
-	db CH7
-	dw SFX_08_44_Ch1
-
-SFX_08_45:: ; 201c8 (8:41c8)
-	db ( $40 | CH4 )
-	dw SFX_08_45_Ch1
-	db CH5
-	dw SFX_08_45_Ch2
-
-SFX_08_46:: ; 201ce (8:41ce)
-	db ( $80 | CH4 )
-	dw SFX_08_46_Ch1
-	db CH5
-	dw SFX_08_46_Ch2
-	db CH6
-	dw SFX_08_46_Ch3
-
-SFX_08_47:: ; 201d7 (8:41d7)
-	db CH7
-	dw SFX_08_47_Ch1
-
-SFX_08_48:: ; 201da (8:41da)
-	db CH4
-	dw SFX_08_48_Ch1
-
-SFX_08_49:: ; 201dd (8:41dd)
-	db CH4
-	dw SFX_08_49_Ch1
-
-SFX_08_4a:: ; 201e0 (8:41e0)
-	db CH7
-	dw SFX_08_4a_Ch1
-
-SFX_08_4b:: ; 201e3 (8:41e3)
-	db CH7
-	dw SFX_08_4b_Ch1
-
-SFX_08_4c:: ; 201e6 (8:41e6)
-	db CH7
-	dw SFX_08_4c_Ch1
-
-SFX_08_4d:: ; 201e9 (8:41e9)
-	db CH7
-	dw SFX_08_4d_Ch1
-
-SFX_08_4e:: ; 201ec (8:41ec)
-	db CH7
-	dw SFX_08_4e_Ch1
-
-SFX_08_4f:: ; 201ef (8:41ef)
-	db CH7
-	dw SFX_08_4f_Ch1
-
-SFX_08_50:: ; 201f2 (8:41f2)
-	db CH7
-	dw SFX_08_50_Ch1
-
-SFX_08_51:: ; 201f5 (8:41f5)
-	db CH7
-	dw SFX_08_51_Ch1
-
-SFX_08_52:: ; 201f8 (8:41f8)
-	db CH7
-	dw SFX_08_52_Ch1
-
-SFX_08_53:: ; 201fb (8:41fb)
-	db CH7
-	dw SFX_08_53_Ch1
-
-SFX_08_54:: ; 201fe (8:41fe)
-	db CH7
-	dw SFX_08_54_Ch1
-
-SFX_08_55:: ; 20201 (8:4201)
-	db CH7
-	dw SFX_08_55_Ch1
-
-SFX_08_56:: ; 20204 (8:4204)
-	db CH7
-	dw SFX_08_56_Ch1
-
-SFX_08_57:: ; 20207 (8:4207)
-	db CH7
-	dw SFX_08_57_Ch1
-
-SFX_08_58:: ; 2020a (8:420a)
-	db CH7
-	dw SFX_08_58_Ch1
-
-SFX_08_59:: ; 2020d (8:420d)
-	db CH7
-	dw SFX_08_59_Ch1
-
-SFX_08_5a:: ; 20210 (8:4210)
-	db CH7
-	dw SFX_08_5a_Ch1
-
-SFX_08_5b:: ; 20213 (8:4213)
-	db CH7
-	dw SFX_08_5b_Ch1
-
-SFX_08_5c:: ; 20216 (8:4216)
-	db CH7
-	dw SFX_08_5c_Ch1
-
-SFX_08_5d:: ; 20219 (8:4219)
-	db CH7
-	dw SFX_08_5d_Ch1
-
-SFX_08_5e:: ; 2021c (8:421c)
-	db ( $40 | CH4 )
-	dw SFX_08_5e_Ch1
-	db CH7
-	dw SFX_08_5e_Ch2
-
-SFX_08_5f:: ; 20222 (8:4222)
-	db CH7
-	dw SFX_08_5f_Ch1
-
-SFX_08_60:: ; 20225 (8:4225)
-	db CH7
-	dw SFX_08_60_Ch1
-
-SFX_08_61:: ; 20228 (8:4228)
-	db CH7
-	dw SFX_08_61_Ch1
-
-SFX_08_62:: ; 2022b (8:422b)
-	db CH7
-	dw SFX_08_62_Ch1
-
-SFX_08_63:: ; 2022e (8:422e)
-	db CH7
-	dw SFX_08_63_Ch1
-
-SFX_08_64:: ; 20231 (8:4231)
-	db ( $40 | CH4 )
-	dw SFX_08_64_Ch1
-	db CH7
-	dw SFX_08_64_Ch2
-
-SFX_08_65:: ; 20237 (8:4237)
-	db CH7
-	dw SFX_08_65_Ch1
-
-SFX_08_66:: ; 2023a (8:423a)
-	db CH7
-	dw SFX_08_66_Ch1
-
-SFX_08_67:: ; 2023d (8:423d)
-	db ( $80 | CH4 )
-	dw SFX_08_67_Ch1
-	db CH5
-	dw SFX_08_67_Ch2
-	db CH7
-	dw SFX_08_67_Ch3
-
-SFX_08_68:: ; 20246 (8:4246)
-	db ( $80 | CH4 )
-	dw SFX_08_68_Ch1
-	db CH5
-	dw SFX_08_68_Ch2
-	db CH7
-	dw SFX_08_68_Ch3
-
-SFX_08_69:: ; 2024f (8:424f)
-	db ( $40 | CH4 )
-	dw SFX_08_69_Ch1
-	db CH7
-	dw SFX_08_69_Ch2
-
-SFX_08_6a:: ; 20255 (8:4255)
-	db ( $80 | CH4 )
-	dw SFX_08_6a_Ch1
-	db CH5
-	dw SFX_08_6a_Ch2
-	db CH7
-	dw SFX_08_6a_Ch3
-
-SFX_08_6b:: ; 2025e (8:425e)
-	db ( $40 | CH4 )
-	dw SFX_08_6b_Ch1
-	db CH7
-	dw SFX_08_6b_Ch2
-
-SFX_08_6c:: ; 20264 (8:4264)
-	db ( $80 | CH4 )
-	dw SFX_08_6c_Ch1
-	db CH5
-	dw SFX_08_6c_Ch2
-	db CH7
-	dw SFX_08_6c_Ch3
-
-SFX_08_6d:: ; 2026d (8:426d)
-	db ( $80 | CH4 )
-	dw SFX_08_6d_Ch1
-	db CH5
-	dw SFX_08_6d_Ch2
-	db CH7
-	dw SFX_08_6d_Ch3
-
-SFX_08_6e:: ; 20276 (8:4276)
-	db ( $80 | CH4 )
-	dw SFX_08_6e_Ch1
-	db CH5
-	dw SFX_08_6e_Ch2
-	db CH7
-	dw SFX_08_6e_Ch3
-
-SFX_08_6f:: ; 2027f (8:427f)
-	db ( $80 | CH4 )
-	dw SFX_08_6f_Ch1
-	db CH5
-	dw SFX_08_6f_Ch2
-	db CH7
-	dw SFX_08_6f_Ch3
-
-SFX_08_70:: ; 20288 (8:4288)
-	db ( $80 | CH4 )
-	dw SFX_08_70_Ch1
-	db CH5
-	dw SFX_08_70_Ch2
-	db CH7
-	dw SFX_08_70_Ch3
-
-SFX_08_71:: ; 20291 (8:4291)
-	db ( $40 | CH4 )
-	dw SFX_08_71_Ch1
-	db CH5
-	dw SFX_08_71_Ch2
-
-SFX_08_72:: ; 20297 (8:4297)
-	db ( $40 | CH4 )
-	dw SFX_08_72_Ch1
-	db CH5
-	dw SFX_08_72_Ch2
-
-SFX_08_73:: ; 2029d (8:429d)
-	db ( $40 | CH4 )
-	dw SFX_08_73_Ch1
-	db CH5
-	dw SFX_08_73_Ch2
-
-SFX_08_74:: ; 202a3 (8:42a3)
-	db ( $80 | CH4 )
-	dw SFX_08_74_Ch1
-	db CH5
-	dw SFX_08_74_Ch2
-	db CH7
-	dw SFX_08_74_Ch3
-
-SFX_08_75:: ; 202ac (8:42ac)
-	db ( $40 | CH4 )
-	dw SFX_08_75_Ch1
-	db CH5
-	dw SFX_08_75_Ch2
-
-SFX_08_76:: ; 202b2 (8:42b2)
-	db ( $80 | CH4 )
-	dw SFX_08_76_Ch1
-	db CH5
-	dw SFX_08_76_Ch2
-	db CH7
-	dw SFX_08_76_Ch3
-
-SFX_08_77:: ; 202bb (8:42bb)
-	db CH4
-	dw SFX_08_77_Ch1
diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm
new file mode 100644
index 00000000..49370aa4
--- /dev/null
+++ b/audio/headers/sfxheaders1.asm
@@ -0,0 +1,562 @@
+SFX_Headers_1::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_1:: ; 8003 (2:4003)
+	db CH7
+	dw SFX_Snare1_1_Ch1
+
+SFX_Snare2_1:: ; 8006 (2:4006)
+	db CH7
+	dw SFX_Snare2_1_Ch1
+
+SFX_Snare3_1:: ; 8009 (2:4009)
+	db CH7
+	dw SFX_Snare3_1_Ch1
+
+SFX_Snare4_1:: ; 800c (2:400c)
+	db CH7
+	dw SFX_Snare4_1_Ch1
+
+SFX_Snare5_1:: ; 800f (2:400f)
+	db CH7
+	dw SFX_Snare5_1_Ch1
+
+SFX_Triangle1_1:: ; 8012 (2:4012)
+	db CH7
+	dw SFX_Triangle1_1_Ch1
+
+SFX_Triangle2_1:: ; 8015 (2:4015)
+	db CH7
+	dw SFX_Triangle2_1_Ch1
+
+SFX_Snare6_1:: ; 8018 (2:4018)
+	db CH7
+	dw SFX_Snare6_1_Ch1
+
+SFX_Snare7_1:: ; 801b (2:401b)
+	db CH7
+	dw SFX_Snare7_1_Ch1
+
+SFX_Snare8_1:: ; 801e (2:401e)
+	db CH7
+	dw SFX_Snare8_1_Ch1
+
+SFX_Snare9_1:: ; 8021 (2:4021)
+	db CH7
+	dw SFX_Snare9_1_Ch1
+
+SFX_Cymbal1_1:: ; 8024 (2:4024)
+	db CH7
+	dw SFX_Cymbal1_1_Ch1
+
+SFX_Cymbal2_1:: ; 8027 (2:4027)
+	db CH7
+	dw SFX_Cymbal2_1_Ch1
+
+SFX_Cymbal3_1:: ; 802a (2:402a)
+	db CH7
+	dw SFX_Cymbal3_1_Ch1
+
+SFX_Muted_Snare1_1:: ; 802d (2:402d)
+	db CH7
+	dw SFX_Muted_Snare1_1_Ch1
+
+SFX_Triangle3_1:: ; 8030 (2:4030)
+	db CH7
+	dw SFX_Triangle3_1_Ch1
+
+SFX_Muted_Snare2_1:: ; 8033 (2:4033)
+	db CH7
+	dw SFX_Muted_Snare2_1_Ch1
+
+SFX_Muted_Snare3_1:: ; 8036 (2:4036)
+	db CH7
+	dw SFX_Muted_Snare3_1_Ch1
+
+SFX_Muted_Snare4_1:: ; 8039 (2:4039)
+	db CH7
+	dw SFX_Muted_Snare4_1_Ch1
+
+SFX_Cry00_1:: ; 803c (2:403c)
+	db ( $80 | CH4 )
+	dw SFX_Cry00_1_Ch1
+	db CH5
+	dw SFX_Cry00_1_Ch2
+	db CH7
+	dw SFX_Cry00_1_Ch3
+
+SFX_Cry01_1:: ; 8045 (2:4045)
+	db ( $80 | CH4 )
+	dw SFX_Cry01_1_Ch1
+	db CH5
+	dw SFX_Cry01_1_Ch2
+	db CH7
+	dw SFX_Cry01_1_Ch3
+
+SFX_Cry02_1:: ; 804e (2:404e)
+	db ( $80 | CH4 )
+	dw SFX_Cry02_1_Ch1
+	db CH5
+	dw SFX_Cry02_1_Ch2
+	db CH7
+	dw SFX_Cry02_1_Ch3
+
+SFX_Cry03_1:: ; 8057 (2:4057)
+	db ( $80 | CH4 )
+	dw SFX_Cry03_1_Ch1
+	db CH5
+	dw SFX_Cry03_1_Ch2
+	db CH7
+	dw SFX_Cry03_1_Ch3
+
+SFX_Cry04_1:: ; 8060 (2:4060)
+	db ( $80 | CH4 )
+	dw SFX_Cry04_1_Ch1
+	db CH5
+	dw SFX_Cry04_1_Ch2
+	db CH7
+	dw SFX_Cry04_1_Ch3
+
+SFX_Cry05_1:: ; 8069 (2:4069)
+	db ( $80 | CH4 )
+	dw SFX_Cry05_1_Ch1
+	db CH5
+	dw SFX_Cry05_1_Ch2
+	db CH7
+	dw SFX_Cry05_1_Ch3
+
+SFX_Cry06_1:: ; 8072 (2:4072)
+	db ( $80 | CH4 )
+	dw SFX_Cry06_1_Ch1
+	db CH5
+	dw SFX_Cry06_1_Ch2
+	db CH7
+	dw SFX_Cry06_1_Ch3
+
+SFX_Cry07_1:: ; 807b (2:407b)
+	db ( $80 | CH4 )
+	dw SFX_Cry07_1_Ch1
+	db CH5
+	dw SFX_Cry07_1_Ch2
+	db CH7
+	dw SFX_Cry07_1_Ch3
+
+SFX_Cry08_1:: ; 8084 (2:4084)
+	db ( $80 | CH4 )
+	dw SFX_Cry08_1_Ch1
+	db CH5
+	dw SFX_Cry08_1_Ch2
+	db CH7
+	dw SFX_Cry08_1_Ch3
+
+SFX_Cry09_1:: ; 808d (2:408d)
+	db ( $80 | CH4 )
+	dw SFX_Cry09_1_Ch1
+	db CH5
+	dw SFX_Cry09_1_Ch2
+	db CH7
+	dw SFX_Cry09_1_Ch3
+
+SFX_Cry0A_1:: ; 8096 (2:4096)
+	db ( $80 | CH4 )
+	dw SFX_Cry0A_1_Ch1
+	db CH5
+	dw SFX_Cry0A_1_Ch2
+	db CH7
+	dw SFX_Cry0A_1_Ch3
+
+SFX_Cry0B_1:: ; 809f (2:409f)
+	db ( $80 | CH4 )
+	dw SFX_Cry0B_1_Ch1
+	db CH5
+	dw SFX_Cry0B_1_Ch2
+	db CH7
+	dw SFX_Cry0B_1_Ch3
+
+SFX_Cry0C_1:: ; 80a8 (2:40a8)
+	db ( $80 | CH4 )
+	dw SFX_Cry0C_1_Ch1
+	db CH5
+	dw SFX_Cry0C_1_Ch2
+	db CH7
+	dw SFX_Cry0C_1_Ch3
+
+SFX_Cry0D_1:: ; 80b1 (2:40b1)
+	db ( $80 | CH4 )
+	dw SFX_Cry0D_1_Ch1
+	db CH5
+	dw SFX_Cry0D_1_Ch2
+	db CH7
+	dw SFX_Cry0D_1_Ch3
+
+SFX_Cry0E_1:: ; 80ba (2:40ba)
+	db ( $80 | CH4 )
+	dw SFX_Cry0E_1_Ch1
+	db CH5
+	dw SFX_Cry0E_1_Ch2
+	db CH7
+	dw SFX_Cry0E_1_Ch3
+
+SFX_Cry0F_1:: ; 80c3 (2:40c3)
+	db ( $80 | CH4 )
+	dw SFX_Cry0F_1_Ch1
+	db CH5
+	dw SFX_Cry0F_1_Ch2
+	db CH7
+	dw SFX_Cry0F_1_Ch3
+
+SFX_Cry10_1:: ; 80cc (2:40cc)
+	db ( $80 | CH4 )
+	dw SFX_Cry10_1_Ch1
+	db CH5
+	dw SFX_Cry10_1_Ch2
+	db CH7
+	dw SFX_Cry10_1_Ch3
+
+SFX_Cry11_1:: ; 80d5 (2:40d5)
+	db ( $80 | CH4 )
+	dw SFX_Cry11_1_Ch1
+	db CH5
+	dw SFX_Cry11_1_Ch2
+	db CH7
+	dw SFX_Cry11_1_Ch3
+
+SFX_Cry12_1:: ; 80de (2:40de)
+	db ( $80 | CH4 )
+	dw SFX_Cry12_1_Ch1
+	db CH5
+	dw SFX_Cry12_1_Ch2
+	db CH7
+	dw SFX_Cry12_1_Ch3
+
+SFX_Cry13_1:: ; 80e7 (2:40e7)
+	db ( $80 | CH4 )
+	dw SFX_Cry13_1_Ch1
+	db CH5
+	dw SFX_Cry13_1_Ch2
+	db CH7
+	dw SFX_Cry13_1_Ch3
+
+SFX_Cry14_1:: ; 80f0 (2:40f0)
+	db ( $80 | CH4 )
+	dw SFX_Cry14_1_Ch1
+	db CH5
+	dw SFX_Cry14_1_Ch2
+	db CH7
+	dw SFX_Cry14_1_Ch3
+
+SFX_Cry15_1:: ; 80f9 (2:40f9)
+	db ( $80 | CH4 )
+	dw SFX_Cry15_1_Ch1
+	db CH5
+	dw SFX_Cry15_1_Ch2
+	db CH7
+	dw SFX_Cry15_1_Ch3
+
+SFX_Cry16_1:: ; 8102 (2:4102)
+	db ( $80 | CH4 )
+	dw SFX_Cry16_1_Ch1
+	db CH5
+	dw SFX_Cry16_1_Ch2
+	db CH7
+	dw SFX_Cry16_1_Ch3
+
+SFX_Cry17_1:: ; 810b (2:410b)
+	db ( $80 | CH4 )
+	dw SFX_Cry17_1_Ch1
+	db CH5
+	dw SFX_Cry17_1_Ch2
+	db CH7
+	dw SFX_Cry17_1_Ch3
+
+SFX_Cry18_1:: ; 8114 (2:4114)
+	db ( $80 | CH4 )
+	dw SFX_Cry18_1_Ch1
+	db CH5
+	dw SFX_Cry18_1_Ch2
+	db CH7
+	dw SFX_Cry18_1_Ch3
+
+SFX_Cry19_1:: ; 811d (2:411d)
+	db ( $80 | CH4 )
+	dw SFX_Cry19_1_Ch1
+	db CH5
+	dw SFX_Cry19_1_Ch2
+	db CH7
+	dw SFX_Cry19_1_Ch3
+
+SFX_Cry1A_1:: ; 8126 (2:4126)
+	db ( $80 | CH4 )
+	dw SFX_Cry1A_1_Ch1
+	db CH5
+	dw SFX_Cry1A_1_Ch2
+	db CH7
+	dw SFX_Cry1A_1_Ch3
+
+SFX_Cry1B_1:: ; 812f (2:412f)
+	db ( $80 | CH4 )
+	dw SFX_Cry1B_1_Ch1
+	db CH5
+	dw SFX_Cry1B_1_Ch2
+	db CH7
+	dw SFX_Cry1B_1_Ch3
+
+SFX_Cry1C_1:: ; 8138 (2:4138)
+	db ( $80 | CH4 )
+	dw SFX_Cry1C_1_Ch1
+	db CH5
+	dw SFX_Cry1C_1_Ch2
+	db CH7
+	dw SFX_Cry1C_1_Ch3
+
+SFX_Cry1D_1:: ; 8141 (2:4141)
+	db ( $80 | CH4 )
+	dw SFX_Cry1D_1_Ch1
+	db CH5
+	dw SFX_Cry1D_1_Ch2
+	db CH7
+	dw SFX_Cry1D_1_Ch3
+
+SFX_Cry1E_1:: ; 814a (2:414a)
+	db ( $80 | CH4 )
+	dw SFX_Cry1E_1_Ch1
+	db CH5
+	dw SFX_Cry1E_1_Ch2
+	db CH7
+	dw SFX_Cry1E_1_Ch3
+
+SFX_Cry1F_1:: ; 8153 (2:4153)
+	db ( $80 | CH4 )
+	dw SFX_Cry1F_1_Ch1
+	db CH5
+	dw SFX_Cry1F_1_Ch2
+	db CH7
+	dw SFX_Cry1F_1_Ch3
+
+SFX_Cry20_1:: ; 815c (2:415c)
+	db ( $80 | CH4 )
+	dw SFX_Cry20_1_Ch1
+	db CH5
+	dw SFX_Cry20_1_Ch2
+	db CH7
+	dw SFX_Cry20_1_Ch3
+
+SFX_Cry21_1:: ; 8165 (2:4165)
+	db ( $80 | CH4 )
+	dw SFX_Cry21_1_Ch1
+	db CH5
+	dw SFX_Cry21_1_Ch2
+	db CH7
+	dw SFX_Cry21_1_Ch3
+
+SFX_Cry22_1:: ; 816e (2:416e)
+	db ( $80 | CH4 )
+	dw SFX_Cry22_1_Ch1
+	db CH5
+	dw SFX_Cry22_1_Ch2
+	db CH7
+	dw SFX_Cry22_1_Ch3
+
+SFX_Cry23_1:: ; 8177 (2:4177)
+	db ( $80 | CH4 )
+	dw SFX_Cry23_1_Ch1
+	db CH5
+	dw SFX_Cry23_1_Ch2
+	db CH7
+	dw SFX_Cry23_1_Ch3
+
+SFX_Cry24_1:: ; 8180 (2:4180)
+	db ( $80 | CH4 )
+	dw SFX_Cry24_1_Ch1
+	db CH5
+	dw SFX_Cry24_1_Ch2
+	db CH7
+	dw SFX_Cry24_1_Ch3
+
+SFX_Cry25_1:: ; 8189 (2:4189)
+	db ( $80 | CH4 )
+	dw SFX_Cry25_1_Ch1
+	db CH5
+	dw SFX_Cry25_1_Ch2
+	db CH7
+	dw SFX_Cry25_1_Ch3
+
+SFX_Get_Item1_1:: ; 8192 (2:4192)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item1_1_Ch1
+	db CH5
+	dw SFX_Get_Item1_1_Ch2
+	db CH6
+	dw SFX_Get_Item1_1_Ch3
+
+SFX_Get_Item2_1:: ; 819b (2:419b)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item2_1_Ch1
+	db CH5
+	dw SFX_Get_Item2_1_Ch2
+	db CH6
+	dw SFX_Get_Item2_1_Ch3
+
+SFX_Tink_1:: ; 81a4 (2:41a4)
+	db CH4
+	dw SFX_Tink_1_Ch1
+
+SFX_Heal_HP_1:: ; 81a7 (2:41a7)
+	db CH4
+	dw SFX_Heal_HP_1_Ch1
+
+SFX_Heal_Ailment_1:: ; 81aa (2:41aa)
+	db CH4
+	dw SFX_Heal_Ailment_1_Ch1
+
+SFX_Start_Menu_1:: ; 81ad (2:41ad)
+	db CH7
+	dw SFX_Start_Menu_1_Ch1
+
+SFX_Press_AB_1:: ; 81b0 (2:41b0)
+	db CH4
+	dw SFX_Press_AB_1_Ch1
+
+SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3)
+	db ( $80 | CH4 )
+	dw SFX_Pokedex_Rating_1_Ch1
+	db CH5
+	dw SFX_Pokedex_Rating_1_Ch2
+	db CH6
+	dw SFX_Pokedex_Rating_1_Ch3
+
+SFX_Get_Key_Item_1:: ; 81bc (2:41bc)
+	db ( $80 | CH4 )
+	dw SFX_Get_Key_Item_1_Ch1
+	db CH5
+	dw SFX_Get_Key_Item_1_Ch2
+	db CH6
+	dw SFX_Get_Key_Item_1_Ch3
+
+SFX_Poisoned_1:: ; 81c5 (2:41c5)
+	db CH4
+	dw SFX_Poisoned_1_Ch1
+
+SFX_Trade_Machine_1:: ; 81c8 (2:41c8)
+	db CH4
+	dw SFX_Trade_Machine_1_Ch1
+
+SFX_Turn_On_PC_1:: ; 81cb (2:41cb)
+	db CH4
+	dw SFX_Turn_On_PC_1_Ch1
+
+SFX_Turn_Off_PC_1:: ; 81ce (2:41ce)
+	db CH4
+	dw SFX_Turn_Off_PC_1_Ch1
+
+SFX_Enter_PC_1:: ; 81d1 (2:41d1)
+	db CH4
+	dw SFX_Enter_PC_1_Ch1
+
+SFX_Shrink_1:: ; 81d4 (2:41d4)
+	db CH4
+	dw SFX_Shrink_1_Ch1
+
+SFX_Switch_1:: ; 81d7 (2:41d7)
+	db CH4
+	dw SFX_Switch_1_Ch1
+
+SFX_Healing_Machine_1:: ; 81da (2:41da)
+	db CH4
+	dw SFX_Healing_Machine_1_Ch1
+
+SFX_Teleport_Exit1_1:: ; 81dd (2:41dd)
+	db CH4
+	dw SFX_Teleport_Exit1_1_Ch1
+
+SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0)
+	db CH4
+	dw SFX_Teleport_Enter1_1_Ch1
+
+SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3)
+	db CH4
+	dw SFX_Teleport_Exit2_1_Ch1
+
+SFX_Ledge_1:: ; 81e6 (2:41e6)
+	db CH4
+	dw SFX_Ledge_1_Ch1
+
+SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9)
+	db CH7
+	dw SFX_Teleport_Enter2_1_Ch1
+
+SFX_Fly_1:: ; 81ec (2:41ec)
+	db CH7
+	dw SFX_Fly_1_Ch1
+
+SFX_Denied_1:: ; 81ef (2:41ef)
+	db ( $40 | CH4 )
+	dw SFX_Denied_1_Ch1
+	db CH5
+	dw SFX_Denied_1_Ch2
+
+SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5)
+	db CH4
+	dw SFX_Arrow_Tiles_1_Ch1
+
+SFX_Push_Boulder_1:: ; 81f8 (2:41f8)
+	db CH7
+	dw SFX_Push_Boulder_1_Ch1
+
+SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb)
+	db ( $40 | CH4 )
+	dw SFX_SS_Anne_Horn_1_Ch1
+	db CH5
+	dw SFX_SS_Anne_Horn_1_Ch2
+
+SFX_Withdraw_Deposit_1:: ; 8201 (2:4201)
+	db CH4
+	dw SFX_Withdraw_Deposit_1_Ch1
+
+SFX_Cut_1:: ; 8204 (2:4204)
+	db CH7
+	dw SFX_Cut_1_Ch1
+
+SFX_Go_Inside_1:: ; 8207 (2:4207)
+	db CH7
+	dw SFX_Go_Inside_1_Ch1
+
+SFX_Swap_1:: ; 820a (2:420a)
+	db ( $40 | CH4 )
+	dw SFX_Swap_1_Ch1
+	db CH5
+	dw SFX_Swap_1_Ch2
+
+SFX_59_1:: ; 8210 (2:4210)
+	db ( $40 | CH4 )
+	dw SFX_59_1_Ch1
+	db CH5
+	dw SFX_59_1_Ch2
+
+SFX_Purchase_1:: ; 8216 (2:4216)
+	db ( $40 | CH4 )
+	dw SFX_Purchase_1_Ch1
+	db CH5
+	dw SFX_Purchase_1_Ch2
+
+SFX_Collision_1:: ; 821c (2:421c)
+	db CH4
+	dw SFX_Collision_1_Ch1
+
+SFX_Go_Outside_1:: ; 821f (2:421f)
+	db CH7
+	dw SFX_Go_Outside_1_Ch1
+
+SFX_Save_1:: ; 8222 (2:4222)
+	db ( $40 | CH4 )
+	dw SFX_Save_1_Ch1
+	db CH5
+	dw SFX_Save_1_Ch2
+
+SFX_Pokeflute:: ; 8228 (2:4228)
+	db CH2
+	dw SFX_Pokeflute_Ch1
+
+SFX_Safari_Zone_PA:: ; 822b (2:422b)
+	db CH4
+	dw SFX_Safari_Zone_PA_Ch1
diff --git a/audio/headers/sfxheaders1f.asm b/audio/headers/sfxheaders1f.asm
deleted file mode 100755
index 52766a76..00000000
--- a/audio/headers/sfxheaders1f.asm
+++ /dev/null
@@ -1,596 +0,0 @@
-SFX_Headers_1f::
-	db $ff, $ff, $ff ; padding
-
-SFX_1f_01:: ; 7c003 (1f:4003)
-	db CH7
-	dw SFX_1f_01_Ch1
-
-SFX_1f_02:: ; 7c006 (1f:4006)
-	db CH7
-	dw SFX_1f_02_Ch1
-
-SFX_1f_03:: ; 7c009 (1f:4009)
-	db CH7
-	dw SFX_1f_03_Ch1
-
-SFX_1f_04:: ; 7c00c (1f:400c)
-	db CH7
-	dw SFX_1f_04_Ch1
-
-SFX_1f_05:: ; 7c00f (1f:400f)
-	db CH7
-	dw SFX_1f_05_Ch1
-
-SFX_1f_06:: ; 7c012 (1f:4012)
-	db CH7
-	dw SFX_1f_06_Ch1
-
-SFX_1f_07:: ; 7c015 (1f:4015)
-	db CH7
-	dw SFX_1f_07_Ch1
-
-SFX_1f_08:: ; 7c018 (1f:4018)
-	db CH7
-	dw SFX_1f_08_Ch1
-
-SFX_1f_09:: ; 7c01b (1f:401b)
-	db CH7
-	dw SFX_1f_09_Ch1
-
-SFX_1f_0a:: ; 7c01e (1f:401e)
-	db CH7
-	dw SFX_1f_0a_Ch1
-
-SFX_1f_0b:: ; 7c021 (1f:4021)
-	db CH7
-	dw SFX_1f_0b_Ch1
-
-SFX_1f_0c:: ; 7c024 (1f:4024)
-	db CH7
-	dw SFX_1f_0c_Ch1
-
-SFX_1f_0d:: ; 7c027 (1f:4027)
-	db CH7
-	dw SFX_1f_0d_Ch1
-
-SFX_1f_0e:: ; 7c02a (1f:402a)
-	db CH7
-	dw SFX_1f_0e_Ch1
-
-SFX_1f_0f:: ; 7c02d (1f:402d)
-	db CH7
-	dw SFX_1f_0f_Ch1
-
-SFX_1f_10:: ; 7c030 (1f:4030)
-	db CH7
-	dw SFX_1f_10_Ch1
-
-SFX_1f_11:: ; 7c033 (1f:4033)
-	db CH7
-	dw SFX_1f_11_Ch1
-
-SFX_1f_12:: ; 7c036 (1f:4036)
-	db CH7
-	dw SFX_1f_12_Ch1
-
-SFX_1f_13:: ; 7c039 (1f:4039)
-	db CH7
-	dw SFX_1f_13_Ch1
-
-SFX_1f_14:: ; 7c03c (1f:403c)
-	db ( $80 | CH4 )
-	dw SFX_1f_14_Ch1
-	db CH5
-	dw SFX_1f_14_Ch2
-	db CH7
-	dw SFX_1f_14_Ch3
-
-SFX_1f_15:: ; 7c045 (1f:4045)
-	db ( $80 | CH4 )
-	dw SFX_1f_15_Ch1
-	db CH5
-	dw SFX_1f_15_Ch2
-	db CH7
-	dw SFX_1f_15_Ch3
-
-SFX_1f_16:: ; 7c04e (1f:404e)
-	db ( $80 | CH4 )
-	dw SFX_1f_16_Ch1
-	db CH5
-	dw SFX_1f_16_Ch2
-	db CH7
-	dw SFX_1f_16_Ch3
-
-SFX_1f_17:: ; 7c057 (1f:4057)
-	db ( $80 | CH4 )
-	dw SFX_1f_17_Ch1
-	db CH5
-	dw SFX_1f_17_Ch2
-	db CH7
-	dw SFX_1f_17_Ch3
-
-SFX_1f_18:: ; 7c060 (1f:4060)
-	db ( $80 | CH4 )
-	dw SFX_1f_18_Ch1
-	db CH5
-	dw SFX_1f_18_Ch2
-	db CH7
-	dw SFX_1f_18_Ch3
-
-SFX_1f_19:: ; 7c069 (1f:4069)
-	db ( $80 | CH4 )
-	dw SFX_1f_19_Ch1
-	db CH5
-	dw SFX_1f_19_Ch2
-	db CH7
-	dw SFX_1f_19_Ch3
-
-SFX_1f_1a:: ; 7c072 (1f:4072)
-	db ( $80 | CH4 )
-	dw SFX_1f_1a_Ch1
-	db CH5
-	dw SFX_1f_1a_Ch2
-	db CH7
-	dw SFX_1f_1a_Ch3
-
-SFX_1f_1b:: ; 7c07b (1f:407b)
-	db ( $80 | CH4 )
-	dw SFX_1f_1b_Ch1
-	db CH5
-	dw SFX_1f_1b_Ch2
-	db CH7
-	dw SFX_1f_1b_Ch3
-
-SFX_1f_1c:: ; 7c084 (1f:4084)
-	db ( $80 | CH4 )
-	dw SFX_1f_1c_Ch1
-	db CH5
-	dw SFX_1f_1c_Ch2
-	db CH7
-	dw SFX_1f_1c_Ch3
-
-SFX_1f_1d:: ; 7c08d (1f:408d)
-	db ( $80 | CH4 )
-	dw SFX_1f_1d_Ch1
-	db CH5
-	dw SFX_1f_1d_Ch2
-	db CH7
-	dw SFX_1f_1d_Ch3
-
-SFX_1f_1e:: ; 7c096 (1f:4096)
-	db ( $80 | CH4 )
-	dw SFX_1f_1e_Ch1
-	db CH5
-	dw SFX_1f_1e_Ch2
-	db CH7
-	dw SFX_1f_1e_Ch3
-
-SFX_1f_1f:: ; 7c09f (1f:409f)
-	db ( $80 | CH4 )
-	dw SFX_1f_1f_Ch1
-	db CH5
-	dw SFX_1f_1f_Ch2
-	db CH7
-	dw SFX_1f_1f_Ch3
-
-SFX_1f_20:: ; 7c0a8 (1f:40a8)
-	db ( $80 | CH4 )
-	dw SFX_1f_20_Ch1
-	db CH5
-	dw SFX_1f_20_Ch2
-	db CH7
-	dw SFX_1f_20_Ch3
-
-SFX_1f_21:: ; 7c0b1 (1f:40b1)
-	db ( $80 | CH4 )
-	dw SFX_1f_21_Ch1
-	db CH5
-	dw SFX_1f_21_Ch2
-	db CH7
-	dw SFX_1f_21_Ch3
-
-SFX_1f_22:: ; 7c0ba (1f:40ba)
-	db ( $80 | CH4 )
-	dw SFX_1f_22_Ch1
-	db CH5
-	dw SFX_1f_22_Ch2
-	db CH7
-	dw SFX_1f_22_Ch3
-
-SFX_1f_23:: ; 7c0c3 (1f:40c3)
-	db ( $80 | CH4 )
-	dw SFX_1f_23_Ch1
-	db CH5
-	dw SFX_1f_23_Ch2
-	db CH7
-	dw SFX_1f_23_Ch3
-
-SFX_1f_24:: ; 7c0cc (1f:40cc)
-	db ( $80 | CH4 )
-	dw SFX_1f_24_Ch1
-	db CH5
-	dw SFX_1f_24_Ch2
-	db CH7
-	dw SFX_1f_24_Ch3
-
-SFX_1f_25:: ; 7c0d5 (1f:40d5)
-	db ( $80 | CH4 )
-	dw SFX_1f_25_Ch1
-	db CH5
-	dw SFX_1f_25_Ch2
-	db CH7
-	dw SFX_1f_25_Ch3
-
-SFX_1f_26:: ; 7c0de (1f:40de)
-	db ( $80 | CH4 )
-	dw SFX_1f_26_Ch1
-	db CH5
-	dw SFX_1f_26_Ch2
-	db CH7
-	dw SFX_1f_26_Ch3
-
-SFX_1f_27:: ; 7c0e7 (1f:40e7)
-	db ( $80 | CH4 )
-	dw SFX_1f_27_Ch1
-	db CH5
-	dw SFX_1f_27_Ch2
-	db CH7
-	dw SFX_1f_27_Ch3
-
-SFX_1f_28:: ; 7c0f0 (1f:40f0)
-	db ( $80 | CH4 )
-	dw SFX_1f_28_Ch1
-	db CH5
-	dw SFX_1f_28_Ch2
-	db CH7
-	dw SFX_1f_28_Ch3
-
-SFX_1f_29:: ; 7c0f9 (1f:40f9)
-	db ( $80 | CH4 )
-	dw SFX_1f_29_Ch1
-	db CH5
-	dw SFX_1f_29_Ch2
-	db CH7
-	dw SFX_1f_29_Ch3
-
-SFX_1f_2a:: ; 7c102 (1f:4102)
-	db ( $80 | CH4 )
-	dw SFX_1f_2a_Ch1
-	db CH5
-	dw SFX_1f_2a_Ch2
-	db CH7
-	dw SFX_1f_2a_Ch3
-
-SFX_1f_2b:: ; 7c10b (1f:410b)
-	db ( $80 | CH4 )
-	dw SFX_1f_2b_Ch1
-	db CH5
-	dw SFX_1f_2b_Ch2
-	db CH7
-	dw SFX_1f_2b_Ch3
-
-SFX_1f_2c:: ; 7c114 (1f:4114)
-	db ( $80 | CH4 )
-	dw SFX_1f_2c_Ch1
-	db CH5
-	dw SFX_1f_2c_Ch2
-	db CH7
-	dw SFX_1f_2c_Ch3
-
-SFX_1f_2d:: ; 7c11d (1f:411d)
-	db ( $80 | CH4 )
-	dw SFX_1f_2d_Ch1
-	db CH5
-	dw SFX_1f_2d_Ch2
-	db CH7
-	dw SFX_1f_2d_Ch3
-
-SFX_1f_2e:: ; 7c126 (1f:4126)
-	db ( $80 | CH4 )
-	dw SFX_1f_2e_Ch1
-	db CH5
-	dw SFX_1f_2e_Ch2
-	db CH7
-	dw SFX_1f_2e_Ch3
-
-SFX_1f_2f:: ; 7c12f (1f:412f)
-	db ( $80 | CH4 )
-	dw SFX_1f_2f_Ch1
-	db CH5
-	dw SFX_1f_2f_Ch2
-	db CH7
-	dw SFX_1f_2f_Ch3
-
-SFX_1f_30:: ; 7c138 (1f:4138)
-	db ( $80 | CH4 )
-	dw SFX_1f_30_Ch1
-	db CH5
-	dw SFX_1f_30_Ch2
-	db CH7
-	dw SFX_1f_30_Ch3
-
-SFX_1f_31:: ; 7c141 (1f:4141)
-	db ( $80 | CH4 )
-	dw SFX_1f_31_Ch1
-	db CH5
-	dw SFX_1f_31_Ch2
-	db CH7
-	dw SFX_1f_31_Ch3
-
-SFX_1f_32:: ; 7c14a (1f:414a)
-	db ( $80 | CH4 )
-	dw SFX_1f_32_Ch1
-	db CH5
-	dw SFX_1f_32_Ch2
-	db CH7
-	dw SFX_1f_32_Ch3
-
-SFX_1f_33:: ; 7c153 (1f:4153)
-	db ( $80 | CH4 )
-	dw SFX_1f_33_Ch1
-	db CH5
-	dw SFX_1f_33_Ch2
-	db CH7
-	dw SFX_1f_33_Ch3
-
-SFX_1f_34:: ; 7c15c (1f:415c)
-	db ( $80 | CH4 )
-	dw SFX_1f_34_Ch1
-	db CH5
-	dw SFX_1f_34_Ch2
-	db CH7
-	dw SFX_1f_34_Ch3
-
-SFX_1f_35:: ; 7c165 (1f:4165)
-	db ( $80 | CH4 )
-	dw SFX_1f_35_Ch1
-	db CH5
-	dw SFX_1f_35_Ch2
-	db CH7
-	dw SFX_1f_35_Ch3
-
-SFX_1f_36:: ; 7c16e (1f:416e)
-	db ( $80 | CH4 )
-	dw SFX_1f_36_Ch1
-	db CH5
-	dw SFX_1f_36_Ch2
-	db CH7
-	dw SFX_1f_36_Ch3
-
-SFX_1f_37:: ; 7c177 (1f:4177)
-	db ( $80 | CH4 )
-	dw SFX_1f_37_Ch1
-	db CH5
-	dw SFX_1f_37_Ch2
-	db CH7
-	dw SFX_1f_37_Ch3
-
-SFX_1f_38:: ; 7c180 (1f:4180)
-	db ( $80 | CH4 )
-	dw SFX_1f_38_Ch1
-	db CH5
-	dw SFX_1f_38_Ch2
-	db CH7
-	dw SFX_1f_38_Ch3
-
-SFX_1f_39:: ; 7c189 (1f:4189)
-	db ( $80 | CH4 )
-	dw SFX_1f_39_Ch1
-	db CH5
-	dw SFX_1f_39_Ch2
-	db CH7
-	dw SFX_1f_39_Ch3
-
-SFX_1f_3a:: ; 7c192 (1f:4192)
-	db ( $80 | CH4 )
-	dw SFX_1f_3a_Ch1
-	db CH5
-	dw SFX_1f_3a_Ch2
-	db CH6
-	dw SFX_1f_3a_Ch3
-
-SFX_1f_3b:: ; 7c19b (1f:419b)
-	db ( $80 | CH4 )
-	dw SFX_1f_3b_Ch1
-	db CH5
-	dw SFX_1f_3b_Ch2
-	db CH6
-	dw SFX_1f_3b_Ch3
-
-SFX_1f_3c:: ; 7c1a4 (1f:41a4)
-	db CH4
-	dw SFX_1f_3c_Ch1
-
-SFX_1f_3d:: ; 7c1a7 (1f:41a7)
-	db CH4
-	dw SFX_1f_3d_Ch1
-
-SFX_1f_3e:: ; 7c1aa (1f:41aa)
-	db CH4
-	dw SFX_1f_3e_Ch1
-
-SFX_1f_3f:: ; 7c1ad (1f:41ad)
-	db CH7
-	dw SFX_1f_3f_Ch1
-
-SFX_1f_40:: ; 7c1b0 (1f:41b0)
-	db CH4
-	dw SFX_1f_40_Ch1
-
-SFX_1f_41:: ; 7c1b3 (1f:41b3)
-	db ( $80 | CH4 )
-	dw SFX_1f_41_Ch1
-	db CH5
-	dw SFX_1f_41_Ch2
-	db CH6
-	dw SFX_1f_41_Ch3
-
-SFX_1f_42:: ; 7c1bc (1f:41bc)
-	db ( $80 | CH4 )
-	dw SFX_1f_42_Ch1
-	db CH5
-	dw SFX_1f_42_Ch2
-	db CH6
-	dw SFX_1f_42_Ch3
-
-SFX_1f_43:: ; 7c1c5 (1f:41c5)
-	db CH4
-	dw SFX_1f_43_Ch1
-
-SFX_1f_44:: ; 7c1c8 (1f:41c8)
-	db CH4
-	dw SFX_1f_44_Ch1
-
-SFX_1f_45:: ; 7c1cb (1f:41cb)
-	db CH4
-	dw SFX_1f_45_Ch1
-
-SFX_1f_46:: ; 7c1ce (1f:41ce)
-	db CH4
-	dw SFX_1f_46_Ch1
-
-SFX_1f_47:: ; 7c1d1 (1f:41d1)
-	db CH4
-	dw SFX_1f_47_Ch1
-
-SFX_1f_48:: ; 7c1d4 (1f:41d4)
-	db CH4
-	dw SFX_1f_48_Ch1
-
-SFX_1f_49:: ; 7c1d7 (1f:41d7)
-	db CH4
-	dw SFX_1f_49_Ch1
-
-SFX_1f_4a:: ; 7c1da (1f:41da)
-	db CH4
-	dw SFX_1f_4a_Ch1
-
-SFX_1f_4b:: ; 7c1dd (1f:41dd)
-	db CH4
-	dw SFX_1f_4b_Ch1
-
-SFX_1f_4c:: ; 7c1e0 (1f:41e0)
-	db CH4
-	dw SFX_1f_4c_Ch1
-
-SFX_1f_4d:: ; 7c1e3 (1f:41e3)
-	db CH4
-	dw SFX_1f_4d_Ch1
-
-SFX_1f_4e:: ; 7c1e6 (1f:41e6)
-	db CH4
-	dw SFX_1f_4e_Ch1
-
-SFX_1f_4f:: ; 7c1e9 (1f:41e9)
-	db CH7
-	dw SFX_1f_4f_Ch1
-
-SFX_1f_50:: ; 7c1ec (1f:41ec)
-	db CH7
-	dw SFX_1f_50_Ch1
-
-SFX_1f_51:: ; 7c1ef (1f:41ef)
-	db ( $40 | CH4 )
-	dw SFX_1f_51_Ch1
-	db CH5
-	dw SFX_1f_51_Ch2
-
-SFX_1f_52:: ; 7c1f5 (1f:41f5)
-	db CH4
-	dw SFX_1f_52_Ch1
-
-SFX_1f_53:: ; 7c1f8 (1f:41f8)
-	db CH7
-	dw SFX_1f_53_Ch1
-
-SFX_1f_54:: ; 7c1fb (1f:41fb)
-	db ( $40 | CH4 )
-	dw SFX_1f_54_Ch1
-	db CH5
-	dw SFX_1f_54_Ch2
-
-SFX_1f_55:: ; 7c201 (1f:4201)
-	db CH4
-	dw SFX_1f_55_Ch1
-
-SFX_1f_56:: ; 7c204 (1f:4204)
-	db CH7
-	dw SFX_1f_56_Ch1
-
-SFX_1f_57:: ; 7c207 (1f:4207)
-	db CH7
-	dw SFX_1f_57_Ch1
-
-SFX_1f_58:: ; 7c20a (1f:420a)
-	db ( $40 | CH4 )
-	dw SFX_1f_58_Ch1
-	db CH5
-	dw SFX_1f_58_Ch2
-
-SFX_1f_59:: ; 7c210 (1f:4210)
-	db ( $40 | CH4 )
-	dw SFX_1f_59_Ch1
-	db CH5
-	dw SFX_1f_59_Ch2
-
-SFX_1f_5a:: ; 7c216 (1f:4216)
-	db ( $40 | CH4 )
-	dw SFX_1f_5a_Ch1
-	db CH5
-	dw SFX_1f_5a_Ch2
-
-SFX_1f_5b:: ; 7c21c (1f:421c)
-	db CH4
-	dw SFX_1f_5b_Ch1
-
-SFX_1f_5c:: ; 7c21f (1f:421f)
-	db CH7
-	dw SFX_1f_5c_Ch1
-
-SFX_1f_5d:: ; 7c222 (1f:4222)
-	db ( $40 | CH4 )
-	dw SFX_1f_5d_Ch1
-	db CH5
-	dw SFX_1f_5d_Ch2
-
-SFX_1f_5e:: ; 7c228 (1f:4228)
-	db CH7
-	dw SFX_1f_5e_Ch1
-
-SFX_1f_5f:: ; 7c22b (1f:422b)
-	db CH4
-	dw SFX_1f_5f_Ch1
-
-SFX_1f_60:: ; 7c22e (1f:422e)
-	db CH4
-	dw SFX_1f_60_Ch1
-
-SFX_1f_61:: ; 7c231 (1f:4231)
-	db CH7
-	dw SFX_1f_61_Ch1
-
-SFX_1f_62:: ; 7c234 (1f:4234)
-	db CH7
-	dw SFX_1f_62_Ch1
-
-SFX_1f_63:: ; 7c237 (1f:4237)
-	db CH7
-	dw SFX_1f_63_Ch1
-
-SFX_1f_64:: ; 7c23a (1f:423a)
-	db CH4
-	dw SFX_1f_64_Ch1
-
-SFX_1f_65:: ; 7c23d (1f:423d)
-	db CH4
-	dw SFX_1f_65_Ch1
-
-SFX_1f_66:: ; 7c240 (1f:4240)
-	db ( $40 | CH4 )
-	dw SFX_1f_66_Ch1
-	db CH5
-	dw SFX_1f_66_Ch2
-
-SFX_1f_67:: ; 7c246 (1f:4246)
-	db CH4
-	dw SFX_1f_67_Ch1
diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm
new file mode 100644
index 00000000..1b30f5cc
--- /dev/null
+++ b/audio/headers/sfxheaders2.asm
@@ -0,0 +1,706 @@
+SFX_Headers_2::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_2:: ; 20003 (8:4003)
+	db CH7
+	dw SFX_Snare1_2_Ch1
+
+SFX_Snare2_2:: ; 20006 (8:4006)
+	db CH7
+	dw SFX_Snare2_2_Ch1
+
+SFX_Snare3_2:: ; 20009 (8:4009)
+	db CH7
+	dw SFX_Snare3_2_Ch1
+
+SFX_Snare4_2:: ; 2000c (8:400c)
+	db CH7
+	dw SFX_Snare4_2_Ch1
+
+SFX_Snare5_2:: ; 2000f (8:400f)
+	db CH7
+	dw SFX_Snare5_2_Ch1
+
+SFX_Triangle1_2:: ; 20012 (8:4012)
+	db CH7
+	dw SFX_Triangle1_2_Ch1
+
+SFX_Triangle2_2:: ; 20015 (8:4015)
+	db CH7
+	dw SFX_Triangle2_2_Ch1
+
+SFX_Snare6_2:: ; 20018 (8:4018)
+	db CH7
+	dw SFX_Snare6_2_Ch1
+
+SFX_Snare7_2:: ; 2001b (8:401b)
+	db CH7
+	dw SFX_Snare7_2_Ch1
+
+SFX_Snare8_2:: ; 2001e (8:401e)
+	db CH7
+	dw SFX_Snare8_2_Ch1
+
+SFX_Snare9_2:: ; 20021 (8:4021)
+	db CH7
+	dw SFX_Snare9_2_Ch1
+
+SFX_Cymbal1_2:: ; 20024 (8:4024)
+	db CH7
+	dw SFX_Cymbal1_2_Ch1
+
+SFX_Cymbal2_2:: ; 20027 (8:4027)
+	db CH7
+	dw SFX_Cymbal2_2_Ch1
+
+SFX_Cymbal3_2:: ; 2002a (8:402a)
+	db CH7
+	dw SFX_Cymbal3_2_Ch1
+
+SFX_Muted_Snare1_2:: ; 2002d (8:402d)
+	db CH7
+	dw SFX_Muted_Snare1_2_Ch1
+
+SFX_Triangle3_2:: ; 20030 (8:4030)
+	db CH7
+	dw SFX_Triangle3_2_Ch1
+
+SFX_Muted_Snare2_2:: ; 20033 (8:4033)
+	db CH7
+	dw SFX_Muted_Snare2_2_Ch1
+
+SFX_Muted_Snare3_2:: ; 20036 (8:4036)
+	db CH7
+	dw SFX_Muted_Snare3_2_Ch1
+
+SFX_Muted_Snare4_2:: ; 20039 (8:4039)
+	db CH7
+	dw SFX_Muted_Snare4_2_Ch1
+
+SFX_Cry00_2:: ; 2003c (8:403c)
+	db ( $80 | CH4 )
+	dw SFX_Cry00_2_Ch1
+	db CH5
+	dw SFX_Cry00_2_Ch2
+	db CH7
+	dw SFX_Cry00_2_Ch3
+
+SFX_Cry01_2:: ; 20045 (8:4045)
+	db ( $80 | CH4 )
+	dw SFX_Cry01_2_Ch1
+	db CH5
+	dw SFX_Cry01_2_Ch2
+	db CH7
+	dw SFX_Cry01_2_Ch3
+
+SFX_Cry02_2:: ; 2004e (8:404e)
+	db ( $80 | CH4 )
+	dw SFX_Cry02_2_Ch1
+	db CH5
+	dw SFX_Cry02_2_Ch2
+	db CH7
+	dw SFX_Cry02_2_Ch3
+
+SFX_Cry03_2:: ; 20057 (8:4057)
+	db ( $80 | CH4 )
+	dw SFX_Cry03_2_Ch1
+	db CH5
+	dw SFX_Cry03_2_Ch2
+	db CH7
+	dw SFX_Cry03_2_Ch3
+
+SFX_Cry04_2:: ; 20060 (8:4060)
+	db ( $80 | CH4 )
+	dw SFX_Cry04_2_Ch1
+	db CH5
+	dw SFX_Cry04_2_Ch2
+	db CH7
+	dw SFX_Cry04_2_Ch3
+
+SFX_Cry05_2:: ; 20069 (8:4069)
+	db ( $80 | CH4 )
+	dw SFX_Cry05_2_Ch1
+	db CH5
+	dw SFX_Cry05_2_Ch2
+	db CH7
+	dw SFX_Cry05_2_Ch3
+
+SFX_Cry06_2:: ; 20072 (8:4072)
+	db ( $80 | CH4 )
+	dw SFX_Cry06_2_Ch1
+	db CH5
+	dw SFX_Cry06_2_Ch2
+	db CH7
+	dw SFX_Cry06_2_Ch3
+
+SFX_Cry07_2:: ; 2007b (8:407b)
+	db ( $80 | CH4 )
+	dw SFX_Cry07_2_Ch1
+	db CH5
+	dw SFX_Cry07_2_Ch2
+	db CH7
+	dw SFX_Cry07_2_Ch3
+
+SFX_Cry08_2:: ; 20084 (8:4084)
+	db ( $80 | CH4 )
+	dw SFX_Cry08_2_Ch1
+	db CH5
+	dw SFX_Cry08_2_Ch2
+	db CH7
+	dw SFX_Cry08_2_Ch3
+
+SFX_Cry09_2:: ; 2008d (8:408d)
+	db ( $80 | CH4 )
+	dw SFX_Cry09_2_Ch1
+	db CH5
+	dw SFX_Cry09_2_Ch2
+	db CH7
+	dw SFX_Cry09_2_Ch3
+
+SFX_Cry0A_2:: ; 20096 (8:4096)
+	db ( $80 | CH4 )
+	dw SFX_Cry0A_2_Ch1
+	db CH5
+	dw SFX_Cry0A_2_Ch2
+	db CH7
+	dw SFX_Cry0A_2_Ch3
+
+SFX_Cry0B_2:: ; 2009f (8:409f)
+	db ( $80 | CH4 )
+	dw SFX_Cry0B_2_Ch1
+	db CH5
+	dw SFX_Cry0B_2_Ch2
+	db CH7
+	dw SFX_Cry0B_2_Ch3
+
+SFX_Cry0C_2:: ; 200a8 (8:40a8)
+	db ( $80 | CH4 )
+	dw SFX_Cry0C_2_Ch1
+	db CH5
+	dw SFX_Cry0C_2_Ch2
+	db CH7
+	dw SFX_Cry0C_2_Ch3
+
+SFX_Cry0D_2:: ; 200b1 (8:40b1)
+	db ( $80 | CH4 )
+	dw SFX_Cry0D_2_Ch1
+	db CH5
+	dw SFX_Cry0D_2_Ch2
+	db CH7
+	dw SFX_Cry0D_2_Ch3
+
+SFX_Cry0E_2:: ; 200ba (8:40ba)
+	db ( $80 | CH4 )
+	dw SFX_Cry0E_2_Ch1
+	db CH5
+	dw SFX_Cry0E_2_Ch2
+	db CH7
+	dw SFX_Cry0E_2_Ch3
+
+SFX_Cry0F_2:: ; 200c3 (8:40c3)
+	db ( $80 | CH4 )
+	dw SFX_Cry0F_2_Ch1
+	db CH5
+	dw SFX_Cry0F_2_Ch2
+	db CH7
+	dw SFX_Cry0F_2_Ch3
+
+SFX_Cry10_2:: ; 200cc (8:40cc)
+	db ( $80 | CH4 )
+	dw SFX_Cry10_2_Ch1
+	db CH5
+	dw SFX_Cry10_2_Ch2
+	db CH7
+	dw SFX_Cry10_2_Ch3
+
+SFX_Cry11_2:: ; 200d5 (8:40d5)
+	db ( $80 | CH4 )
+	dw SFX_Cry11_2_Ch1
+	db CH5
+	dw SFX_Cry11_2_Ch2
+	db CH7
+	dw SFX_Cry11_2_Ch3
+
+SFX_Cry12_2:: ; 200de (8:40de)
+	db ( $80 | CH4 )
+	dw SFX_Cry12_2_Ch1
+	db CH5
+	dw SFX_Cry12_2_Ch2
+	db CH7
+	dw SFX_Cry12_2_Ch3
+
+SFX_Cry13_2:: ; 200e7 (8:40e7)
+	db ( $80 | CH4 )
+	dw SFX_Cry13_2_Ch1
+	db CH5
+	dw SFX_Cry13_2_Ch2
+	db CH7
+	dw SFX_Cry13_2_Ch3
+
+SFX_Cry14_2:: ; 200f0 (8:40f0)
+	db ( $80 | CH4 )
+	dw SFX_Cry14_2_Ch1
+	db CH5
+	dw SFX_Cry14_2_Ch2
+	db CH7
+	dw SFX_Cry14_2_Ch3
+
+SFX_Cry15_2:: ; 200f9 (8:40f9)
+	db ( $80 | CH4 )
+	dw SFX_Cry15_2_Ch1
+	db CH5
+	dw SFX_Cry15_2_Ch2
+	db CH7
+	dw SFX_Cry15_2_Ch3
+
+SFX_Cry16_2:: ; 20102 (8:4102)
+	db ( $80 | CH4 )
+	dw SFX_Cry16_2_Ch1
+	db CH5
+	dw SFX_Cry16_2_Ch2
+	db CH7
+	dw SFX_Cry16_2_Ch3
+
+SFX_Cry17_2:: ; 2010b (8:410b)
+	db ( $80 | CH4 )
+	dw SFX_Cry17_2_Ch1
+	db CH5
+	dw SFX_Cry17_2_Ch2
+	db CH7
+	dw SFX_Cry17_2_Ch3
+
+SFX_Cry18_2:: ; 20114 (8:4114)
+	db ( $80 | CH4 )
+	dw SFX_Cry18_2_Ch1
+	db CH5
+	dw SFX_Cry18_2_Ch2
+	db CH7
+	dw SFX_Cry18_2_Ch3
+
+SFX_Cry19_2:: ; 2011d (8:411d)
+	db ( $80 | CH4 )
+	dw SFX_Cry19_2_Ch1
+	db CH5
+	dw SFX_Cry19_2_Ch2
+	db CH7
+	dw SFX_Cry19_2_Ch3
+
+SFX_Cry1A_2:: ; 20126 (8:4126)
+	db ( $80 | CH4 )
+	dw SFX_Cry1A_2_Ch1
+	db CH5
+	dw SFX_Cry1A_2_Ch2
+	db CH7
+	dw SFX_Cry1A_2_Ch3
+
+SFX_Cry1B_2:: ; 2012f (8:412f)
+	db ( $80 | CH4 )
+	dw SFX_Cry1B_2_Ch1
+	db CH5
+	dw SFX_Cry1B_2_Ch2
+	db CH7
+	dw SFX_Cry1B_2_Ch3
+
+SFX_Cry1C_2:: ; 20138 (8:4138)
+	db ( $80 | CH4 )
+	dw SFX_Cry1C_2_Ch1
+	db CH5
+	dw SFX_Cry1C_2_Ch2
+	db CH7
+	dw SFX_Cry1C_2_Ch3
+
+SFX_Cry1D_2:: ; 20141 (8:4141)
+	db ( $80 | CH4 )
+	dw SFX_Cry1D_2_Ch1
+	db CH5
+	dw SFX_Cry1D_2_Ch2
+	db CH7
+	dw SFX_Cry1D_2_Ch3
+
+SFX_Cry1E_2:: ; 2014a (8:414a)
+	db ( $80 | CH4 )
+	dw SFX_Cry1E_2_Ch1
+	db CH5
+	dw SFX_Cry1E_2_Ch2
+	db CH7
+	dw SFX_Cry1E_2_Ch3
+
+SFX_Cry1F_2:: ; 20153 (8:4153)
+	db ( $80 | CH4 )
+	dw SFX_Cry1F_2_Ch1
+	db CH5
+	dw SFX_Cry1F_2_Ch2
+	db CH7
+	dw SFX_Cry1F_2_Ch3
+
+SFX_Cry20_2:: ; 2015c (8:415c)
+	db ( $80 | CH4 )
+	dw SFX_Cry20_2_Ch1
+	db CH5
+	dw SFX_Cry20_2_Ch2
+	db CH7
+	dw SFX_Cry20_2_Ch3
+
+SFX_Cry21_2:: ; 20165 (8:4165)
+	db ( $80 | CH4 )
+	dw SFX_Cry21_2_Ch1
+	db CH5
+	dw SFX_Cry21_2_Ch2
+	db CH7
+	dw SFX_Cry21_2_Ch3
+
+SFX_Cry22_2:: ; 2016e (8:416e)
+	db ( $80 | CH4 )
+	dw SFX_Cry22_2_Ch1
+	db CH5
+	dw SFX_Cry22_2_Ch2
+	db CH7
+	dw SFX_Cry22_2_Ch3
+
+SFX_Cry23_2:: ; 20177 (8:4177)
+	db ( $80 | CH4 )
+	dw SFX_Cry23_2_Ch1
+	db CH5
+	dw SFX_Cry23_2_Ch2
+	db CH7
+	dw SFX_Cry23_2_Ch3
+
+SFX_Cry24_2:: ; 20180 (8:4180)
+	db ( $80 | CH4 )
+	dw SFX_Cry24_2_Ch1
+	db CH5
+	dw SFX_Cry24_2_Ch2
+	db CH7
+	dw SFX_Cry24_2_Ch3
+
+SFX_Cry25_2:: ; 20189 (8:4189)
+	db ( $80 | CH4 )
+	dw SFX_Cry25_2_Ch1
+	db CH5
+	dw SFX_Cry25_2_Ch2
+	db CH7
+	dw SFX_Cry25_2_Ch3
+
+SFX_Level_Up:: ; 20192 (8:4192)
+	db ( $80 | CH4 )
+	dw SFX_Level_Up_Ch1
+	db CH5
+	dw SFX_Level_Up_Ch2
+	db CH6
+	dw SFX_Level_Up_Ch3
+
+SFX_Get_Item2_2:: ; 2019b (8:419b)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item2_2_Ch1
+	db CH5
+	dw SFX_Get_Item2_2_Ch2
+	db CH6
+	dw SFX_Get_Item2_2_Ch3
+
+SFX_Tink_2:: ; 201a4 (8:41a4)
+	db CH4
+	dw SFX_Tink_2_Ch1
+
+SFX_Heal_HP_2:: ; 201a7 (8:41a7)
+	db CH4
+	dw SFX_Heal_HP_2_Ch1
+
+SFX_Heal_Ailment_2:: ; 201aa (8:41aa)
+	db CH4
+	dw SFX_Heal_Ailment_2_Ch1
+
+SFX_Start_Menu_2:: ; 201ad (8:41ad)
+	db CH7
+	dw SFX_Start_Menu_2_Ch1
+
+SFX_Press_AB_2:: ; 201b0 (8:41b0)
+	db CH4
+	dw SFX_Press_AB_2_Ch1
+
+SFX_Ball_Toss:: ; 201b3 (8:41b3)
+	db ( $40 | CH4 )
+	dw SFX_Ball_Toss_Ch1
+	db CH5
+	dw SFX_Ball_Toss_Ch2
+
+SFX_Ball_Poof:: ; 201b9 (8:41b9)
+	db ( $40 | CH4 )
+	dw SFX_Ball_Poof_Ch1
+	db CH7
+	dw SFX_Ball_Poof_Ch2
+
+SFX_Faint_Thud:: ; 201bf (8:41bf)
+	db ( $40 | CH4 )
+	dw SFX_Faint_Thud_Ch1
+	db CH7
+	dw SFX_Faint_Thud_Ch2
+
+SFX_Run:: ; 201c5 (8:41c5)
+	db CH7
+	dw SFX_Run_Ch1
+
+SFX_Dex_Page_Added:: ; 201c8 (8:41c8)
+	db ( $40 | CH4 )
+	dw SFX_Dex_Page_Added_Ch1
+	db CH5
+	dw SFX_Dex_Page_Added_Ch2
+
+SFX_Caught_Mon:: ; 201ce (8:41ce)
+	db ( $80 | CH4 )
+	dw SFX_Caught_Mon_Ch1
+	db CH5
+	dw SFX_Caught_Mon_Ch2
+	db CH6
+	dw SFX_Caught_Mon_Ch3
+
+SFX_Peck:: ; 201d7 (8:41d7)
+	db CH7
+	dw SFX_Peck_Ch1
+
+SFX_Faint_Fall:: ; 201da (8:41da)
+	db CH4
+	dw SFX_Faint_Fall_Ch1
+
+SFX_Battle_09:: ; 201dd (8:41dd)
+	db CH4
+	dw SFX_Battle_09_Ch1
+
+SFX_Pound:: ; 201e0 (8:41e0)
+	db CH7
+	dw SFX_Pound_Ch1
+
+SFX_Battle_0B:: ; 201e3 (8:41e3)
+	db CH7
+	dw SFX_Battle_0B_Ch1
+
+SFX_Battle_0C:: ; 201e6 (8:41e6)
+	db CH7
+	dw SFX_Battle_0C_Ch1
+
+SFX_Battle_0D:: ; 201e9 (8:41e9)
+	db CH7
+	dw SFX_Battle_0D_Ch1
+
+SFX_Battle_0E:: ; 201ec (8:41ec)
+	db CH7
+	dw SFX_Battle_0E_Ch1
+
+SFX_Battle_0F:: ; 201ef (8:41ef)
+	db CH7
+	dw SFX_Battle_0F_Ch1
+
+SFX_Damage:: ; 201f2 (8:41f2)
+	db CH7
+	dw SFX_Damage_Ch1
+
+SFX_Not_Very_Effective:: ; 201f5 (8:41f5)
+	db CH7
+	dw SFX_Not_Very_Effective_Ch1
+
+SFX_Battle_12:: ; 201f8 (8:41f8)
+	db CH7
+	dw SFX_Battle_12_Ch1
+
+SFX_Battle_13:: ; 201fb (8:41fb)
+	db CH7
+	dw SFX_Battle_13_Ch1
+
+SFX_Battle_14:: ; 201fe (8:41fe)
+	db CH7
+	dw SFX_Battle_14_Ch1
+
+SFX_Vine_Whip:: ; 20201 (8:4201)
+	db CH7
+	dw SFX_Vine_Whip_Ch1
+
+SFX_Battle_16:: ; 20204 (8:4204)
+	db CH7
+	dw SFX_Battle_16_Ch1
+
+SFX_Battle_17:: ; 20207 (8:4207)
+	db CH7
+	dw SFX_Battle_17_Ch1
+
+SFX_Battle_18:: ; 2020a (8:420a)
+	db CH7
+	dw SFX_Battle_18_Ch1
+
+SFX_Battle_19:: ; 2020d (8:420d)
+	db CH7
+	dw SFX_Battle_19_Ch1
+
+SFX_Super_Effective:: ; 20210 (8:4210)
+	db CH7
+	dw SFX_Super_Effective_Ch1
+
+SFX_Battle_1B:: ; 20213 (8:4213)
+	db CH7
+	dw SFX_Battle_1B_Ch1
+
+SFX_Battle_1C:: ; 20216 (8:4216)
+	db CH7
+	dw SFX_Battle_1C_Ch1
+
+SFX_Doubleslap:: ; 20219 (8:4219)
+	db CH7
+	dw SFX_Doubleslap_Ch1
+
+SFX_Battle_1E:: ; 2021c (8:421c)
+	db ( $40 | CH4 )
+	dw SFX_Battle_1E_Ch1
+	db CH7
+	dw SFX_Battle_1E_Ch2
+
+SFX_Horn_Drill:: ; 20222 (8:4222)
+	db CH7
+	dw SFX_Horn_Drill_Ch1
+
+SFX_Battle_20:: ; 20225 (8:4225)
+	db CH7
+	dw SFX_Battle_20_Ch1
+
+SFX_Battle_21:: ; 20228 (8:4228)
+	db CH7
+	dw SFX_Battle_21_Ch1
+
+SFX_Battle_22:: ; 2022b (8:422b)
+	db CH7
+	dw SFX_Battle_22_Ch1
+
+SFX_Battle_23:: ; 2022e (8:422e)
+	db CH7
+	dw SFX_Battle_23_Ch1
+
+SFX_Battle_24:: ; 20231 (8:4231)
+	db ( $40 | CH4 )
+	dw SFX_Battle_24_Ch1
+	db CH7
+	dw SFX_Battle_24_Ch2
+
+SFX_Battle_25:: ; 20237 (8:4237)
+	db CH7
+	dw SFX_Battle_25_Ch1
+
+SFX_Battle_26:: ; 2023a (8:423a)
+	db CH7
+	dw SFX_Battle_26_Ch1
+
+SFX_Battle_27:: ; 2023d (8:423d)
+	db ( $80 | CH4 )
+	dw SFX_Battle_27_Ch1
+	db CH5
+	dw SFX_Battle_27_Ch2
+	db CH7
+	dw SFX_Battle_27_Ch3
+
+SFX_Battle_28:: ; 20246 (8:4246)
+	db ( $80 | CH4 )
+	dw SFX_Battle_28_Ch1
+	db CH5
+	dw SFX_Battle_28_Ch2
+	db CH7
+	dw SFX_Battle_28_Ch3
+
+SFX_Battle_29:: ; 2024f (8:424f)
+	db ( $40 | CH4 )
+	dw SFX_Battle_29_Ch1
+	db CH7
+	dw SFX_Battle_29_Ch2
+
+SFX_Battle_2A:: ; 20255 (8:4255)
+	db ( $80 | CH4 )
+	dw SFX_Battle_2A_Ch1
+	db CH5
+	dw SFX_Battle_2A_Ch2
+	db CH7
+	dw SFX_Battle_2A_Ch3
+
+SFX_Battle_2B:: ; 2025e (8:425e)
+	db ( $40 | CH4 )
+	dw SFX_Battle_2B_Ch1
+	db CH7
+	dw SFX_Battle_2B_Ch2
+
+SFX_Battle_2C:: ; 20264 (8:4264)
+	db ( $80 | CH4 )
+	dw SFX_Battle_2C_Ch1
+	db CH5
+	dw SFX_Battle_2C_Ch2
+	db CH7
+	dw SFX_Battle_2C_Ch3
+
+SFX_Psybeam:: ; 2026d (8:426d)
+	db ( $80 | CH4 )
+	dw SFX_Psybeam_Ch1
+	db CH5
+	dw SFX_Psybeam_Ch2
+	db CH7
+	dw SFX_Psybeam_Ch3
+
+SFX_Battle_2E:: ; 20276 (8:4276)
+	db ( $80 | CH4 )
+	dw SFX_Battle_2E_Ch1
+	db CH5
+	dw SFX_Battle_2E_Ch2
+	db CH7
+	dw SFX_Battle_2E_Ch3
+
+SFX_Battle_2F:: ; 2027f (8:427f)
+	db ( $80 | CH4 )
+	dw SFX_Battle_2F_Ch1
+	db CH5
+	dw SFX_Battle_2F_Ch2
+	db CH7
+	dw SFX_Battle_2F_Ch3
+
+SFX_Psychic_M:: ; 20288 (8:4288)
+	db ( $80 | CH4 )
+	dw SFX_Psychic_M_Ch1
+	db CH5
+	dw SFX_Psychic_M_Ch2
+	db CH7
+	dw SFX_Psychic_M_Ch3
+
+SFX_Battle_31:: ; 20291 (8:4291)
+	db ( $40 | CH4 )
+	dw SFX_Battle_31_Ch1
+	db CH5
+	dw SFX_Battle_31_Ch2
+
+SFX_Battle_32:: ; 20297 (8:4297)
+	db ( $40 | CH4 )
+	dw SFX_Battle_32_Ch1
+	db CH5
+	dw SFX_Battle_32_Ch2
+
+SFX_Battle_33:: ; 2029d (8:429d)
+	db ( $40 | CH4 )
+	dw SFX_Battle_33_Ch1
+	db CH5
+	dw SFX_Battle_33_Ch2
+
+SFX_Battle_34:: ; 202a3 (8:42a3)
+	db ( $80 | CH4 )
+	dw SFX_Battle_34_Ch1
+	db CH5
+	dw SFX_Battle_34_Ch2
+	db CH7
+	dw SFX_Battle_34_Ch3
+
+SFX_Battle_35:: ; 202ac (8:42ac)
+	db ( $40 | CH4 )
+	dw SFX_Battle_35_Ch1
+	db CH5
+	dw SFX_Battle_35_Ch2
+
+SFX_Battle_36:: ; 202b2 (8:42b2)
+	db ( $80 | CH4 )
+	dw SFX_Battle_36_Ch1
+	db CH5
+	dw SFX_Battle_36_Ch2
+	db CH7
+	dw SFX_Battle_36_Ch3
+
+SFX_Silph_Scope:: ; 202bb (8:42bb)
+	db CH4
+	dw SFX_Silph_Scope_Ch1
diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm
new file mode 100644
index 00000000..321a33f5
--- /dev/null
+++ b/audio/headers/sfxheaders3.asm
@@ -0,0 +1,596 @@
+SFX_Headers_3::
+	db $ff, $ff, $ff ; padding
+
+SFX_Snare1_3:: ; 7c003 (1f:4003)
+	db CH7
+	dw SFX_Snare1_3_Ch1
+
+SFX_Snare2_3:: ; 7c006 (1f:4006)
+	db CH7
+	dw SFX_Snare2_3_Ch1
+
+SFX_Snare3_3:: ; 7c009 (1f:4009)
+	db CH7
+	dw SFX_Snare3_3_Ch1
+
+SFX_Snare4_3:: ; 7c00c (1f:400c)
+	db CH7
+	dw SFX_Snare4_3_Ch1
+
+SFX_Snare5_3:: ; 7c00f (1f:400f)
+	db CH7
+	dw SFX_Snare5_3_Ch1
+
+SFX_Triangle1_3:: ; 7c012 (1f:4012)
+	db CH7
+	dw SFX_Triangle1_3_Ch1
+
+SFX_Triangle2_3:: ; 7c015 (1f:4015)
+	db CH7
+	dw SFX_Triangle2_3_Ch1
+
+SFX_Snare6_3:: ; 7c018 (1f:4018)
+	db CH7
+	dw SFX_Snare6_3_Ch1
+
+SFX_Snare7_3:: ; 7c01b (1f:401b)
+	db CH7
+	dw SFX_Snare7_3_Ch1
+
+SFX_Snare8_3:: ; 7c01e (1f:401e)
+	db CH7
+	dw SFX_Snare8_3_Ch1
+
+SFX_Snare9_3:: ; 7c021 (1f:4021)
+	db CH7
+	dw SFX_Snare9_3_Ch1
+
+SFX_Cymbal1_3:: ; 7c024 (1f:4024)
+	db CH7
+	dw SFX_Cymbal1_3_Ch1
+
+SFX_Cymbal2_3:: ; 7c027 (1f:4027)
+	db CH7
+	dw SFX_Cymbal2_3_Ch1
+
+SFX_Cymbal3_3:: ; 7c02a (1f:402a)
+	db CH7
+	dw SFX_Cymbal3_3_Ch1
+
+SFX_Muted_Snare1_3:: ; 7c02d (1f:402d)
+	db CH7
+	dw SFX_Muted_Snare1_3_Ch1
+
+SFX_Triangle3_3:: ; 7c030 (1f:4030)
+	db CH7
+	dw SFX_Triangle3_3_Ch1
+
+SFX_Muted_Snare2_3:: ; 7c033 (1f:4033)
+	db CH7
+	dw SFX_Muted_Snare2_3_Ch1
+
+SFX_Muted_Snare3_3:: ; 7c036 (1f:4036)
+	db CH7
+	dw SFX_Muted_Snare3_3_Ch1
+
+SFX_Muted_Snare4_3:: ; 7c039 (1f:4039)
+	db CH7
+	dw SFX_Muted_Snare4_3_Ch1
+
+SFX_Cry00_3:: ; 7c03c (1f:403c)
+	db ( $80 | CH4 )
+	dw SFX_Cry00_3_Ch1
+	db CH5
+	dw SFX_Cry00_3_Ch2
+	db CH7
+	dw SFX_Cry00_3_Ch3
+
+SFX_Cry01_3:: ; 7c045 (1f:4045)
+	db ( $80 | CH4 )
+	dw SFX_Cry01_3_Ch1
+	db CH5
+	dw SFX_Cry01_3_Ch2
+	db CH7
+	dw SFX_Cry01_3_Ch3
+
+SFX_Cry02_3:: ; 7c04e (1f:404e)
+	db ( $80 | CH4 )
+	dw SFX_Cry02_3_Ch1
+	db CH5
+	dw SFX_Cry02_3_Ch2
+	db CH7
+	dw SFX_Cry02_3_Ch3
+
+SFX_Cry03_3:: ; 7c057 (1f:4057)
+	db ( $80 | CH4 )
+	dw SFX_Cry03_3_Ch1
+	db CH5
+	dw SFX_Cry03_3_Ch2
+	db CH7
+	dw SFX_Cry03_3_Ch3
+
+SFX_Cry04_3:: ; 7c060 (1f:4060)
+	db ( $80 | CH4 )
+	dw SFX_Cry04_3_Ch1
+	db CH5
+	dw SFX_Cry04_3_Ch2
+	db CH7
+	dw SFX_Cry04_3_Ch3
+
+SFX_Cry05_3:: ; 7c069 (1f:4069)
+	db ( $80 | CH4 )
+	dw SFX_Cry05_3_Ch1
+	db CH5
+	dw SFX_Cry05_3_Ch2
+	db CH7
+	dw SFX_Cry05_3_Ch3
+
+SFX_Cry06_3:: ; 7c072 (1f:4072)
+	db ( $80 | CH4 )
+	dw SFX_Cry06_3_Ch1
+	db CH5
+	dw SFX_Cry06_3_Ch2
+	db CH7
+	dw SFX_Cry06_3_Ch3
+
+SFX_Cry07_3:: ; 7c07b (1f:407b)
+	db ( $80 | CH4 )
+	dw SFX_Cry07_3_Ch1
+	db CH5
+	dw SFX_Cry07_3_Ch2
+	db CH7
+	dw SFX_Cry07_3_Ch3
+
+SFX_Cry08_3:: ; 7c084 (1f:4084)
+	db ( $80 | CH4 )
+	dw SFX_Cry08_3_Ch1
+	db CH5
+	dw SFX_Cry08_3_Ch2
+	db CH7
+	dw SFX_Cry08_3_Ch3
+
+SFX_Cry09_3:: ; 7c08d (1f:408d)
+	db ( $80 | CH4 )
+	dw SFX_Cry09_3_Ch1
+	db CH5
+	dw SFX_Cry09_3_Ch2
+	db CH7
+	dw SFX_Cry09_3_Ch3
+
+SFX_Cry0A_3:: ; 7c096 (1f:4096)
+	db ( $80 | CH4 )
+	dw SFX_Cry0A_3_Ch1
+	db CH5
+	dw SFX_Cry0A_3_Ch2
+	db CH7
+	dw SFX_Cry0A_3_Ch3
+
+SFX_Cry0B_3:: ; 7c09f (1f:409f)
+	db ( $80 | CH4 )
+	dw SFX_Cry0B_3_Ch1
+	db CH5
+	dw SFX_Cry0B_3_Ch2
+	db CH7
+	dw SFX_Cry0B_3_Ch3
+
+SFX_Cry0C_3:: ; 7c0a8 (1f:40a8)
+	db ( $80 | CH4 )
+	dw SFX_Cry0C_3_Ch1
+	db CH5
+	dw SFX_Cry0C_3_Ch2
+	db CH7
+	dw SFX_Cry0C_3_Ch3
+
+SFX_Cry0D_3:: ; 7c0b1 (1f:40b1)
+	db ( $80 | CH4 )
+	dw SFX_Cry0D_3_Ch1
+	db CH5
+	dw SFX_Cry0D_3_Ch2
+	db CH7
+	dw SFX_Cry0D_3_Ch3
+
+SFX_Cry0E_3:: ; 7c0ba (1f:40ba)
+	db ( $80 | CH4 )
+	dw SFX_Cry0E_3_Ch1
+	db CH5
+	dw SFX_Cry0E_3_Ch2
+	db CH7
+	dw SFX_Cry0E_3_Ch3
+
+SFX_Cry0F_3:: ; 7c0c3 (1f:40c3)
+	db ( $80 | CH4 )
+	dw SFX_Cry0F_3_Ch1
+	db CH5
+	dw SFX_Cry0F_3_Ch2
+	db CH7
+	dw SFX_Cry0F_3_Ch3
+
+SFX_Cry10_3:: ; 7c0cc (1f:40cc)
+	db ( $80 | CH4 )
+	dw SFX_Cry10_3_Ch1
+	db CH5
+	dw SFX_Cry10_3_Ch2
+	db CH7
+	dw SFX_Cry10_3_Ch3
+
+SFX_Cry11_3:: ; 7c0d5 (1f:40d5)
+	db ( $80 | CH4 )
+	dw SFX_Cry11_3_Ch1
+	db CH5
+	dw SFX_Cry11_3_Ch2
+	db CH7
+	dw SFX_Cry11_3_Ch3
+
+SFX_Cry12_3:: ; 7c0de (1f:40de)
+	db ( $80 | CH4 )
+	dw SFX_Cry12_3_Ch1
+	db CH5
+	dw SFX_Cry12_3_Ch2
+	db CH7
+	dw SFX_Cry12_3_Ch3
+
+SFX_Cry13_3:: ; 7c0e7 (1f:40e7)
+	db ( $80 | CH4 )
+	dw SFX_Cry13_3_Ch1
+	db CH5
+	dw SFX_Cry13_3_Ch2
+	db CH7
+	dw SFX_Cry13_3_Ch3
+
+SFX_Cry14_3:: ; 7c0f0 (1f:40f0)
+	db ( $80 | CH4 )
+	dw SFX_Cry14_3_Ch1
+	db CH5
+	dw SFX_Cry14_3_Ch2
+	db CH7
+	dw SFX_Cry14_3_Ch3
+
+SFX_Cry15_3:: ; 7c0f9 (1f:40f9)
+	db ( $80 | CH4 )
+	dw SFX_Cry15_3_Ch1
+	db CH5
+	dw SFX_Cry15_3_Ch2
+	db CH7
+	dw SFX_Cry15_3_Ch3
+
+SFX_Cry16_3:: ; 7c102 (1f:4102)
+	db ( $80 | CH4 )
+	dw SFX_Cry16_3_Ch1
+	db CH5
+	dw SFX_Cry16_3_Ch2
+	db CH7
+	dw SFX_Cry16_3_Ch3
+
+SFX_Cry17_3:: ; 7c10b (1f:410b)
+	db ( $80 | CH4 )
+	dw SFX_Cry17_3_Ch1
+	db CH5
+	dw SFX_Cry17_3_Ch2
+	db CH7
+	dw SFX_Cry17_3_Ch3
+
+SFX_Cry18_3:: ; 7c114 (1f:4114)
+	db ( $80 | CH4 )
+	dw SFX_Cry18_3_Ch1
+	db CH5
+	dw SFX_Cry18_3_Ch2
+	db CH7
+	dw SFX_Cry18_3_Ch3
+
+SFX_Cry19_3:: ; 7c11d (1f:411d)
+	db ( $80 | CH4 )
+	dw SFX_Cry19_3_Ch1
+	db CH5
+	dw SFX_Cry19_3_Ch2
+	db CH7
+	dw SFX_Cry19_3_Ch3
+
+SFX_Cry1A_3:: ; 7c126 (1f:4126)
+	db ( $80 | CH4 )
+	dw SFX_Cry1A_3_Ch1
+	db CH5
+	dw SFX_Cry1A_3_Ch2
+	db CH7
+	dw SFX_Cry1A_3_Ch3
+
+SFX_Cry1B_3:: ; 7c12f (1f:412f)
+	db ( $80 | CH4 )
+	dw SFX_Cry1B_3_Ch1
+	db CH5
+	dw SFX_Cry1B_3_Ch2
+	db CH7
+	dw SFX_Cry1B_3_Ch3
+
+SFX_Cry1C_3:: ; 7c138 (1f:4138)
+	db ( $80 | CH4 )
+	dw SFX_Cry1C_3_Ch1
+	db CH5
+	dw SFX_Cry1C_3_Ch2
+	db CH7
+	dw SFX_Cry1C_3_Ch3
+
+SFX_Cry1D_3:: ; 7c141 (1f:4141)
+	db ( $80 | CH4 )
+	dw SFX_Cry1D_3_Ch1
+	db CH5
+	dw SFX_Cry1D_3_Ch2
+	db CH7
+	dw SFX_Cry1D_3_Ch3
+
+SFX_Cry1E_3:: ; 7c14a (1f:414a)
+	db ( $80 | CH4 )
+	dw SFX_Cry1E_3_Ch1
+	db CH5
+	dw SFX_Cry1E_3_Ch2
+	db CH7
+	dw SFX_Cry1E_3_Ch3
+
+SFX_Cry1F_3:: ; 7c153 (1f:4153)
+	db ( $80 | CH4 )
+	dw SFX_Cry1F_3_Ch1
+	db CH5
+	dw SFX_Cry1F_3_Ch2
+	db CH7
+	dw SFX_Cry1F_3_Ch3
+
+SFX_Cry20_3:: ; 7c15c (1f:415c)
+	db ( $80 | CH4 )
+	dw SFX_Cry20_3_Ch1
+	db CH5
+	dw SFX_Cry20_3_Ch2
+	db CH7
+	dw SFX_Cry20_3_Ch3
+
+SFX_Cry21_3:: ; 7c165 (1f:4165)
+	db ( $80 | CH4 )
+	dw SFX_Cry21_3_Ch1
+	db CH5
+	dw SFX_Cry21_3_Ch2
+	db CH7
+	dw SFX_Cry21_3_Ch3
+
+SFX_Cry22_3:: ; 7c16e (1f:416e)
+	db ( $80 | CH4 )
+	dw SFX_Cry22_3_Ch1
+	db CH5
+	dw SFX_Cry22_3_Ch2
+	db CH7
+	dw SFX_Cry22_3_Ch3
+
+SFX_Cry23_3:: ; 7c177 (1f:4177)
+	db ( $80 | CH4 )
+	dw SFX_Cry23_3_Ch1
+	db CH5
+	dw SFX_Cry23_3_Ch2
+	db CH7
+	dw SFX_Cry23_3_Ch3
+
+SFX_Cry24_3:: ; 7c180 (1f:4180)
+	db ( $80 | CH4 )
+	dw SFX_Cry24_3_Ch1
+	db CH5
+	dw SFX_Cry24_3_Ch2
+	db CH7
+	dw SFX_Cry24_3_Ch3
+
+SFX_Cry25_3:: ; 7c189 (1f:4189)
+	db ( $80 | CH4 )
+	dw SFX_Cry25_3_Ch1
+	db CH5
+	dw SFX_Cry25_3_Ch2
+	db CH7
+	dw SFX_Cry25_3_Ch3
+
+SFX_Get_Item1_3:: ; 7c192 (1f:4192)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item1_3_Ch1
+	db CH5
+	dw SFX_Get_Item1_3_Ch2
+	db CH6
+	dw SFX_Get_Item1_3_Ch3
+
+SFX_Get_Item2_3:: ; 7c19b (1f:419b)
+	db ( $80 | CH4 )
+	dw SFX_Get_Item2_3_Ch1
+	db CH5
+	dw SFX_Get_Item2_3_Ch2
+	db CH6
+	dw SFX_Get_Item2_3_Ch3
+
+SFX_Tink_3:: ; 7c1a4 (1f:41a4)
+	db CH4
+	dw SFX_Tink_3_Ch1
+
+SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7)
+	db CH4
+	dw SFX_Heal_HP_3_Ch1
+
+SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa)
+	db CH4
+	dw SFX_Heal_Ailment_3_Ch1
+
+SFX_Start_Menu_3:: ; 7c1ad (1f:41ad)
+	db CH7
+	dw SFX_Start_Menu_3_Ch1
+
+SFX_Press_AB_3:: ; 7c1b0 (1f:41b0)
+	db CH4
+	dw SFX_Press_AB_3_Ch1
+
+SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3)
+	db ( $80 | CH4 )
+	dw SFX_Pokedex_Rating_3_Ch1
+	db CH5
+	dw SFX_Pokedex_Rating_3_Ch2
+	db CH6
+	dw SFX_Pokedex_Rating_3_Ch3
+
+SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc)
+	db ( $80 | CH4 )
+	dw SFX_Get_Key_Item_3_Ch1
+	db CH5
+	dw SFX_Get_Key_Item_3_Ch2
+	db CH6
+	dw SFX_Get_Key_Item_3_Ch3
+
+SFX_Poisoned_3:: ; 7c1c5 (1f:41c5)
+	db CH4
+	dw SFX_Poisoned_3_Ch1
+
+SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8)
+	db CH4
+	dw SFX_Trade_Machine_3_Ch1
+
+SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb)
+	db CH4
+	dw SFX_Turn_On_PC_3_Ch1
+
+SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce)
+	db CH4
+	dw SFX_Turn_Off_PC_3_Ch1
+
+SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1)
+	db CH4
+	dw SFX_Enter_PC_3_Ch1
+
+SFX_Shrink_3:: ; 7c1d4 (1f:41d4)
+	db CH4
+	dw SFX_Shrink_3_Ch1
+
+SFX_Switch_3:: ; 7c1d7 (1f:41d7)
+	db CH4
+	dw SFX_Switch_3_Ch1
+
+SFX_Healing_Machine_3:: ; 7c1da (1f:41da)
+	db CH4
+	dw SFX_Healing_Machine_3_Ch1
+
+SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd)
+	db CH4
+	dw SFX_Teleport_Exit1_3_Ch1
+
+SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0)
+	db CH4
+	dw SFX_Teleport_Enter1_3_Ch1
+
+SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3)
+	db CH4
+	dw SFX_Teleport_Exit2_3_Ch1
+
+SFX_Ledge_3:: ; 7c1e6 (1f:41e6)
+	db CH4
+	dw SFX_Ledge_3_Ch1
+
+SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9)
+	db CH7
+	dw SFX_Teleport_Enter2_3_Ch1
+
+SFX_Fly_3:: ; 7c1ec (1f:41ec)
+	db CH7
+	dw SFX_Fly_3_Ch1
+
+SFX_Denied_3:: ; 7c1ef (1f:41ef)
+	db ( $40 | CH4 )
+	dw SFX_Denied_3_Ch1
+	db CH5
+	dw SFX_Denied_3_Ch2
+
+SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5)
+	db CH4
+	dw SFX_Arrow_Tiles_3_Ch1
+
+SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8)
+	db CH7
+	dw SFX_Push_Boulder_3_Ch1
+
+SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb)
+	db ( $40 | CH4 )
+	dw SFX_SS_Anne_Horn_3_Ch1
+	db CH5
+	dw SFX_SS_Anne_Horn_3_Ch2
+
+SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201)
+	db CH4
+	dw SFX_Withdraw_Deposit_3_Ch1
+
+SFX_Cut_3:: ; 7c204 (1f:4204)
+	db CH7
+	dw SFX_Cut_3_Ch1
+
+SFX_Go_Inside_3:: ; 7c207 (1f:4207)
+	db CH7
+	dw SFX_Go_Inside_3_Ch1
+
+SFX_Swap_3:: ; 7c20a (1f:420a)
+	db ( $40 | CH4 )
+	dw SFX_Swap_3_Ch1
+	db CH5
+	dw SFX_Swap_3_Ch2
+
+SFX_59_3:: ; 7c210 (1f:4210)
+	db ( $40 | CH4 )
+	dw SFX_59_3_Ch1
+	db CH5
+	dw SFX_59_3_Ch2
+
+SFX_Purchase_3:: ; 7c216 (1f:4216)
+	db ( $40 | CH4 )
+	dw SFX_Purchase_3_Ch1
+	db CH5
+	dw SFX_Purchase_3_Ch2
+
+SFX_Collision_3:: ; 7c21c (1f:421c)
+	db CH4
+	dw SFX_Collision_3_Ch1
+
+SFX_Go_Outside_3:: ; 7c21f (1f:421f)
+	db CH7
+	dw SFX_Go_Outside_3_Ch1
+
+SFX_Save_3:: ; 7c222 (1f:4222)
+	db ( $40 | CH4 )
+	dw SFX_Save_3_Ch1
+	db CH5
+	dw SFX_Save_3_Ch2
+
+SFX_Intro_Lunge:: ; 7c228 (1f:4228)
+	db CH7
+	dw SFX_Intro_Lunge_Ch1
+
+SFX_Intro_Hip:: ; 7c22b (1f:422b)
+	db CH4
+	dw SFX_Intro_Hip_Ch1
+
+SFX_Intro_Hop:: ; 7c22e (1f:422e)
+	db CH4
+	dw SFX_Intro_Hop_Ch1
+
+SFX_Intro_Raise:: ; 7c231 (1f:4231)
+	db CH7
+	dw SFX_Intro_Raise_Ch1
+
+SFX_Intro_Crash:: ; 7c234 (1f:4234)
+	db CH7
+	dw SFX_Intro_Crash_Ch1
+
+SFX_Intro_Whoosh:: ; 7c237 (1f:4237)
+	db CH7
+	dw SFX_Intro_Whoosh_Ch1
+
+SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a)
+	db CH4
+	dw SFX_Slots_Stop_Wheel_Ch1
+
+SFX_Slots_Reward:: ; 7c23d (1f:423d)
+	db CH4
+	dw SFX_Slots_Reward_Ch1
+
+SFX_Slots_New_Spin:: ; 7c240 (1f:4240)
+	db ( $40 | CH4 )
+	dw SFX_Slots_New_Spin_Ch1
+	db CH5
+	dw SFX_Slots_New_Spin_Ch2
+
+SFX_Shooting_Star:: ; 7c246 (1f:4246)
+	db CH4
+	dw SFX_Shooting_Star_Ch1
diff --git a/audio/sfx/sfx_02_59.asm b/audio/sfx/59_1.asm
index c4ea93f7..6cbfdb16 100755..100644
--- a/audio/sfx/sfx_02_59.asm
+++ b/audio/sfx/59_1.asm
@@ -1,10 +1,10 @@
-SFX_02_59_Ch1: ; 841b (2:441b)
+SFX_59_1_Ch1: ; 841b (2:441b)
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_02_59_Ch2: ; 8422 (2:4422)
+SFX_59_1_Ch2: ; 8422 (2:4422)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
diff --git a/audio/sfx/sfx_1f_59.asm b/audio/sfx/59_3.asm
index 9c17156f..9c808359 100755..100644
--- a/audio/sfx/sfx_1f_59.asm
+++ b/audio/sfx/59_3.asm
@@ -1,10 +1,10 @@
-SFX_1f_59_Ch1: ; 7c404 (1f:4404)
+SFX_59_3_Ch1: ; 7c404 (1f:4404)
 	duty 2
 	unknownsfx0x20 4, 241, 128, 7
 	endchannel
 
 
-SFX_1f_59_Ch2: ; 7c40b (1f:440b)
+SFX_59_3_Ch2: ; 7c40b (1f:440b)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 161, 97, 7
diff --git a/audio/sfx/sfx_02_52.asm b/audio/sfx/arrow_tiles_1.asm
index 22b72929..172907a8 100755..100644
--- a/audio/sfx/sfx_02_52.asm
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -1,4 +1,4 @@
-SFX_02_52_Ch1: ; 8649 (2:4649)
+SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649)
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
diff --git a/audio/sfx/sfx_1f_52.asm b/audio/sfx/arrow_tiles_3.asm
index 98ef0d30..fd225a5f 100755..100644
--- a/audio/sfx/sfx_1f_52.asm
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_52_Ch1: ; 7c626 (1f:4626)
+SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626)
 	duty 0
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 210, 0, 7
diff --git a/audio/sfx/sfx_08_42.asm b/audio/sfx/ball_poof.asm
index 247a68f3..46fb2a07 100755..100644
--- a/audio/sfx/sfx_08_42.asm
+++ b/audio/sfx/ball_poof.asm
@@ -1,4 +1,4 @@
-SFX_08_42_Ch1: ; 2043d (8:443d)
+SFX_Ball_Poof_Ch1: ; 2043d (8:443d)
 	duty 2
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 242, 0, 4
@@ -6,6 +6,6 @@ SFX_08_42_Ch1: ; 2043d (8:443d)
 	endchannel
 
 
-SFX_08_42_Ch2: ; 20448 (8:4448)
+SFX_Ball_Poof_Ch2: ; 20448 (8:4448)
 	unknownnoise0x20 15, 162, 34
 	endchannel
diff --git a/audio/sfx/sfx_08_41.asm b/audio/sfx/ball_toss.asm
index ef5998cd..fc9f81cc 100755..100644
--- a/audio/sfx/sfx_08_41.asm
+++ b/audio/sfx/ball_toss.asm
@@ -1,11 +1,11 @@
-SFX_08_41_Ch1: ; 2042d (8:442d)
+SFX_Ball_Toss_Ch1: ; 2042d (8:442d)
 	duty 2
 	unknownsfx0x10 47
 	unknownsfx0x20 15, 242, 128, 7
 	endchannel
 
 
-SFX_08_41_Ch2: ; 20436 (8:4436)
+SFX_Ball_Toss_Ch2: ; 20436 (8:4436)
 	duty 2
 	unknownsfx0x20 15, 194, 130, 7
 	endchannel
diff --git a/audio/sfx/sfx_08_49.asm b/audio/sfx/battle_09.asm
index 0d4ef5e7..19e9b9e7 100755..100644
--- a/audio/sfx/sfx_08_49.asm
+++ b/audio/sfx/battle_09.asm
@@ -1,4 +1,4 @@
-SFX_08_49_Ch1: ; 204b9 (8:44b9)
+SFX_Battle_09_Ch1: ; 204b9 (8:44b9)
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 5
diff --git a/audio/sfx/sfx_08_4b.asm b/audio/sfx/battle_0b.asm
index 5b654931..1a7e17ec 100755..100644
--- a/audio/sfx/sfx_08_4b.asm
+++ b/audio/sfx/battle_0b.asm
@@ -1,3 +1,3 @@
-SFX_08_4b_Ch1: ; 204c8 (8:44c8)
+SFX_Battle_0B_Ch1: ; 204c8 (8:44c8)
 	unknownnoise0x20 8, 241, 84
 	endchannel
diff --git a/audio/sfx/sfx_08_4c.asm b/audio/sfx/battle_0c.asm
index b80af081..b2fdf455 100755..100644
--- a/audio/sfx/sfx_08_4c.asm
+++ b/audio/sfx/battle_0c.asm
@@ -1,4 +1,4 @@
-SFX_08_4c_Ch1: ; 204cc (8:44cc)
+SFX_Battle_0C_Ch1: ; 204cc (8:44cc)
 	unknownnoise0x20 15, 143, 17
 	unknownnoise0x20 4, 255, 18
 	unknownnoise0x20 10, 241, 85
diff --git a/audio/sfx/sfx_08_4d.asm b/audio/sfx/battle_0d.asm
index 3dc43ae0..c70b281d 100755..100644
--- a/audio/sfx/sfx_08_4d.asm
+++ b/audio/sfx/battle_0d.asm
@@ -1,4 +1,4 @@
-SFX_08_4d_Ch1: ; 204d6 (8:44d6)
+SFX_Battle_0D_Ch1: ; 204d6 (8:44d6)
 	unknownnoise0x20 15, 143, 52
 	unknownnoise0x20 8, 242, 53
 	unknownnoise0x20 10, 241, 85
diff --git a/audio/sfx/sfx_08_4e.asm b/audio/sfx/battle_0e.asm
index db621af9..20c20628 100755..100644
--- a/audio/sfx/sfx_08_4e.asm
+++ b/audio/sfx/battle_0e.asm
@@ -1,4 +1,4 @@
-SFX_08_4e_Ch1: ; 204e0 (8:44e0)
+SFX_Battle_0E_Ch1: ; 204e0 (8:44e0)
 	unknownnoise0x20 15, 159, 35
 	unknownnoise0x20 8, 241, 33
 	endchannel
diff --git a/audio/sfx/sfx_08_4f.asm b/audio/sfx/battle_0f.asm
index 74337020..d84aed37 100755..100644
--- a/audio/sfx/sfx_08_4f.asm
+++ b/audio/sfx/battle_0f.asm
@@ -1,4 +1,4 @@
-SFX_08_4f_Ch1: ; 204e7 (8:44e7)
+SFX_Battle_0F_Ch1: ; 204e7 (8:44e7)
 	unknownnoise0x20 2, 225, 75
 	unknownnoise0x20 10, 241, 68
 	unknownnoise0x20 2, 225, 58
diff --git a/audio/sfx/sfx_08_52.asm b/audio/sfx/battle_12.asm
index 9bf7c91d..324ce9b9 100755..100644
--- a/audio/sfx/sfx_08_52.asm
+++ b/audio/sfx/battle_12.asm
@@ -1,6 +1,6 @@
-SFX_08_52_Ch1: ; 2050b (8:450b)
+SFX_Battle_12_Ch1: ; 2050b (8:450b)
 	unknownnoise0x20 8, 79, 35
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
-	loopchannel 4, SFX_08_52_Ch1
+	loopchannel 4, SFX_Battle_12_Ch1
 	endchannel
diff --git a/audio/sfx/sfx_08_53.asm b/audio/sfx/battle_13.asm
index c61465e9..74349bb5 100755..100644
--- a/audio/sfx/sfx_08_53.asm
+++ b/audio/sfx/battle_13.asm
@@ -1,4 +1,4 @@
-SFX_08_53_Ch1: ; 20519 (8:4519)
+SFX_Battle_13_Ch1: ; 20519 (8:4519)
 	unknownnoise0x20 8, 79, 51
 	unknownnoise0x20 4, 196, 34
 	unknownnoise0x20 6, 242, 35
diff --git a/audio/sfx/sfx_08_54.asm b/audio/sfx/battle_14.asm
index 25a2c4fd..82234904 100755..100644
--- a/audio/sfx/sfx_08_54.asm
+++ b/audio/sfx/battle_14.asm
@@ -1,4 +1,4 @@
-SFX_08_54_Ch1: ; 20526 (8:4526)
+SFX_Battle_14_Ch1: ; 20526 (8:4526)
 	unknownnoise0x20 8, 255, 50
 	unknownnoise0x20 8, 244, 67
 	unknownnoise0x20 8, 242, 84
diff --git a/audio/sfx/sfx_08_56.asm b/audio/sfx/battle_16.asm
index d5653379..a2b5031e 100755..100644
--- a/audio/sfx/sfx_08_56.asm
+++ b/audio/sfx/battle_16.asm
@@ -1,4 +1,4 @@
-SFX_08_56_Ch1: ; 2054c (8:454c)
+SFX_Battle_16_Ch1: ; 2054c (8:454c)
 	unknownnoise0x20 1, 148, 35
 	unknownnoise0x20 1, 180, 34
 	unknownnoise0x20 8, 241, 68
diff --git a/audio/sfx/sfx_08_57.asm b/audio/sfx/battle_17.asm
index 40e0ea8f..4be1d96b 100755..100644
--- a/audio/sfx/sfx_08_57.asm
+++ b/audio/sfx/battle_17.asm
@@ -1,4 +1,4 @@
-SFX_08_57_Ch1: ; 20556 (8:4556)
+SFX_Battle_17_Ch1: ; 20556 (8:4556)
 	unknownnoise0x20 2, 148, 51
 	unknownnoise0x20 4, 180, 34
 	unknownnoise0x20 4, 241, 68
diff --git a/audio/sfx/sfx_08_58.asm b/audio/sfx/battle_18.asm
index 3cb23fb0..6c201d38 100755..100644
--- a/audio/sfx/sfx_08_58.asm
+++ b/audio/sfx/battle_18.asm
@@ -1,4 +1,4 @@
-SFX_08_58_Ch1: ; 20563 (8:4563)
+SFX_Battle_18_Ch1: ; 20563 (8:4563)
 	unknownnoise0x20 4, 255, 85
 	unknownnoise0x20 8, 241, 101
 	endchannel
diff --git a/audio/sfx/sfx_08_59.asm b/audio/sfx/battle_19.asm
index c42f6127..6b54f8cd 100755..100644
--- a/audio/sfx/sfx_08_59.asm
+++ b/audio/sfx/battle_19.asm
@@ -1,4 +1,4 @@
-SFX_08_59_Ch1: ; 2056a (8:456a)
+SFX_Battle_19_Ch1: ; 2056a (8:456a)
 	unknownnoise0x20 2, 132, 67
 	unknownnoise0x20 2, 196, 34
 	unknownnoise0x20 8, 242, 52
diff --git a/audio/sfx/sfx_08_5b.asm b/audio/sfx/battle_1b.asm
index 7bf3e2c8..3bb451d5 100755..100644
--- a/audio/sfx/sfx_08_5b.asm
+++ b/audio/sfx/battle_1b.asm
@@ -1,4 +1,4 @@
-SFX_08_5b_Ch1: ; 2057b (8:457b)
+SFX_Battle_1B_Ch1: ; 2057b (8:457b)
 	unknownnoise0x20 2, 241, 34
 	unknownnoise0x20 15, 242, 18
 	endchannel
diff --git a/audio/sfx/sfx_08_5c.asm b/audio/sfx/battle_1c.asm
index 25618291..579e36cc 100755..100644
--- a/audio/sfx/sfx_08_5c.asm
+++ b/audio/sfx/battle_1c.asm
@@ -1,4 +1,4 @@
-SFX_08_5c_Ch1: ; 20582 (8:4582)
+SFX_Battle_1C_Ch1: ; 20582 (8:4582)
 	unknownnoise0x20 2, 194, 1
 	unknownnoise0x20 15, 244, 1
 	unknownnoise0x20 15, 242, 1
diff --git a/audio/sfx/sfx_08_5e.asm b/audio/sfx/battle_1e.asm
index a765d263..df556540 100755..100644
--- a/audio/sfx/sfx_08_5e.asm
+++ b/audio/sfx/battle_1e.asm
@@ -1,4 +1,4 @@
-SFX_08_5e_Ch1: ; 20593 (8:4593)
+SFX_Battle_1E_Ch1: ; 20593 (8:4593)
 	duty 0
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
@@ -8,7 +8,7 @@ SFX_08_5e_Ch1: ; 20593 (8:4593)
 	endchannel
 
 
-SFX_08_5e_Ch2: ; 205a4 (8:45a4)
+SFX_Battle_1E_Ch2: ; 205a4 (8:45a4)
 	unknownnoise0x20 0, 209, 66
 	unknownnoise0x20 4, 161, 50
 	unknownnoise0x20 0, 209, 34
diff --git a/audio/sfx/sfx_08_60.asm b/audio/sfx/battle_20.asm
index 7aa37833..142030ee 100755..100644
--- a/audio/sfx/sfx_08_60.asm
+++ b/audio/sfx/battle_20.asm
@@ -1,4 +1,4 @@
-SFX_08_60_Ch1: ; 205be (8:45be)
+SFX_Battle_20_Ch1: ; 205be (8:45be)
 	unknownnoise0x20 12, 241, 84
 	unknownnoise0x20 8, 241, 100
 	endchannel
diff --git a/audio/sfx/sfx_08_61.asm b/audio/sfx/battle_21.asm
index 343a5c0c..10ad350e 100755..100644
--- a/audio/sfx/sfx_08_61.asm
+++ b/audio/sfx/battle_21.asm
@@ -1,4 +1,4 @@
-SFX_08_61_Ch1: ; 205c5 (8:45c5)
+SFX_Battle_21_Ch1: ; 205c5 (8:45c5)
 	unknownnoise0x20 2, 241, 51
 	unknownnoise0x20 2, 193, 50
 	unknownnoise0x20 2, 161, 49
diff --git a/audio/sfx/sfx_08_62.asm b/audio/sfx/battle_22.asm
index a7cfed2d..c6b0d972 100755..100644
--- a/audio/sfx/sfx_08_62.asm
+++ b/audio/sfx/battle_22.asm
@@ -1,4 +1,4 @@
-SFX_08_62_Ch1: ; 205d5 (8:45d5)
+SFX_Battle_22_Ch1: ; 205d5 (8:45d5)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
diff --git a/audio/sfx/sfx_08_63.asm b/audio/sfx/battle_23.asm
index 432d088c..474e43b6 100755..100644
--- a/audio/sfx/sfx_08_63.asm
+++ b/audio/sfx/battle_23.asm
@@ -1,4 +1,4 @@
-SFX_08_63_Ch1: ; 205dc (8:45dc)
+SFX_Battle_23_Ch1: ; 205dc (8:45dc)
 	unknownnoise0x20 2, 242, 67
 	unknownnoise0x20 4, 181, 50
 	unknownnoise0x20 9, 134, 49
diff --git a/audio/sfx/sfx_08_64.asm b/audio/sfx/battle_24.asm
index c34d64ce..4fea9cf9 100755..100644
--- a/audio/sfx/sfx_08_64.asm
+++ b/audio/sfx/battle_24.asm
@@ -1,4 +1,4 @@
-SFX_08_64_Ch1: ; 205ec (8:45ec)
+SFX_Battle_24_Ch1: ; 205ec (8:45ec)
 	duty 1
 	unknownsfx0x10 151
 	unknownsfx0x20 15, 242, 0, 7
@@ -6,7 +6,7 @@ SFX_08_64_Ch1: ; 205ec (8:45ec)
 	endchannel
 
 
-SFX_08_64_Ch2: ; 205f7 (8:45f7)
+SFX_Battle_24_Ch2: ; 205f7 (8:45f7)
 	unknownnoise0x20 15, 63, 34
 	unknownnoise0x20 15, 242, 33
 	endchannel
diff --git a/audio/sfx/sfx_08_65.asm b/audio/sfx/battle_25.asm
index a92539c3..18a70f45 100755..100644
--- a/audio/sfx/sfx_08_65.asm
+++ b/audio/sfx/battle_25.asm
@@ -1,4 +1,4 @@
-SFX_08_65_Ch1: ; 205fe (8:45fe)
+SFX_Battle_25_Ch1: ; 205fe (8:45fe)
 	unknownnoise0x20 15, 79, 65
 	unknownnoise0x20 8, 143, 65
 	unknownnoise0x20 8, 207, 65
diff --git a/audio/sfx/sfx_08_66.asm b/audio/sfx/battle_26.asm
index d72b0349..943078e1 100755..100644
--- a/audio/sfx/sfx_08_66.asm
+++ b/audio/sfx/battle_26.asm
@@ -1,4 +1,4 @@
-SFX_08_66_Ch1: ; 2060e (8:460e)
+SFX_Battle_26_Ch1: ; 2060e (8:460e)
 	unknownnoise0x20 10, 255, 80
 	unknownnoise0x20 15, 255, 81
 	unknownnoise0x20 8, 242, 81
diff --git a/audio/sfx/sfx_08_67.asm b/audio/sfx/battle_27.asm
index 6e94addf..ddd4e452 100755..100644
--- a/audio/sfx/sfx_08_67.asm
+++ b/audio/sfx/battle_27.asm
@@ -1,27 +1,27 @@
-SFX_08_67_Ch1: ; 20624 (8:4624)
+SFX_Battle_27_Ch1: ; 20624 (8:4624)
 	duty 2
 	unknownsfx0x20 15, 63, 192, 7
 
-SFX_08_67_branch_2062a:
+SFX_Battle_27_branch_2062a:
 	unknownsfx0x20 15, 223, 192, 7
-	loopchannel 4, SFX_08_67_branch_2062a
+	loopchannel 4, SFX_Battle_27_branch_2062a
 	unknownsfx0x20 15, 209, 192, 7
 	endchannel
 
 
-SFX_08_67_Ch2: ; 20637 (8:4637)
+SFX_Battle_27_Ch2: ; 20637 (8:4637)
 	dutycycle 179
 	unknownsfx0x20 15, 47, 200, 7
 
-SFX_08_67_branch_2063d:
+SFX_Battle_27_branch_2063d:
 	unknownsfx0x20 15, 207, 199, 7
-	loopchannel 4, SFX_08_67_branch_2063d
+	loopchannel 4, SFX_Battle_27_branch_2063d
 	unknownsfx0x20 15, 193, 200, 7
 	endchannel
 
 
-SFX_08_67_Ch3: ; 2064a (8:464a)
+SFX_Battle_27_Ch3: ; 2064a (8:464a)
 	unknownnoise0x20 3, 151, 18
 	unknownnoise0x20 3, 161, 17
-	loopchannel 10, SFX_08_67_Ch3
+	loopchannel 10, SFX_Battle_27_Ch3
 	endchannel
diff --git a/audio/sfx/sfx_08_68.asm b/audio/sfx/battle_28.asm
index 691b9b1f..73855179 100755..100644
--- a/audio/sfx/sfx_08_68.asm
+++ b/audio/sfx/battle_28.asm
@@ -1,21 +1,21 @@
-SFX_08_68_Ch1: ; 20655 (8:4655)
+SFX_Battle_28_Ch1: ; 20655 (8:4655)
 	duty 0
 	unknownsfx0x20 0, 241, 192, 7
 	unknownsfx0x20 0, 241, 0, 7
-	loopchannel 12, SFX_08_68_Ch1
+	loopchannel 12, SFX_Battle_28_Ch1
 	endchannel
 
 
-SFX_08_68_Ch2: ; 20664 (8:4664)
+SFX_Battle_28_Ch2: ; 20664 (8:4664)
 	dutycycle 179
 	unknownsfx0x20 0, 225, 193, 7
 	unknownsfx0x20 0, 225, 1, 7
-	loopchannel 12, SFX_08_68_Ch2
+	loopchannel 12, SFX_Battle_28_Ch2
 	endchannel
 
 
-SFX_08_68_Ch3: ; 20673 (8:4673)
+SFX_Battle_28_Ch3: ; 20673 (8:4673)
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
-	loopchannel 6, SFX_08_68_Ch3
+	loopchannel 6, SFX_Battle_28_Ch3
 	endchannel
diff --git a/audio/sfx/sfx_08_69.asm b/audio/sfx/battle_29.asm
index f202a156..e766a453 100755..100644
--- a/audio/sfx/sfx_08_69.asm
+++ b/audio/sfx/battle_29.asm
@@ -1,17 +1,17 @@
-SFX_08_69_Ch1: ; 2067e (8:467e)
+SFX_Battle_29_Ch1: ; 2067e (8:467e)
 	dutycycle 201
 	unknownsfx0x20 11, 243, 32, 1
 	unknownsfx0x20 9, 211, 80, 1
-	loopchannel 5, SFX_08_69_Ch1
+	loopchannel 5, SFX_Battle_29_Ch1
 	unknownsfx0x20 8, 227, 48, 1
 	unknownsfx0x20 15, 194, 16, 1
 	endchannel
 
 
-SFX_08_69_Ch2: ; 20695 (8:4695)
+SFX_Battle_29_Ch2: ; 20695 (8:4695)
 	unknownnoise0x20 10, 243, 53
 	unknownnoise0x20 14, 246, 69
-	loopchannel 4, SFX_08_69_Ch2
+	loopchannel 4, SFX_Battle_29_Ch2
 	unknownnoise0x20 12, 244, 188
 	unknownnoise0x20 12, 245, 156
 	unknownnoise0x20 15, 244, 172
diff --git a/audio/sfx/sfx_08_6a.asm b/audio/sfx/battle_2a.asm
index 3076956a..d7334aae 100755..100644
--- a/audio/sfx/sfx_08_6a.asm
+++ b/audio/sfx/battle_2a.asm
@@ -1,28 +1,28 @@
-SFX_08_6a_Ch1: ; 206a9 (8:46a9)
+SFX_Battle_2A_Ch1: ; 206a9 (8:46a9)
 	dutycycle 57
 	unknownsfx0x20 4, 244, 0, 6
 	unknownsfx0x20 3, 196, 0, 5
 	unknownsfx0x20 5, 181, 0, 6
 	unknownsfx0x20 13, 226, 192, 6
-	loopchannel 3, SFX_08_6a_Ch1
+	loopchannel 3, SFX_Battle_2A_Ch1
 	unknownsfx0x20 8, 209, 0, 6
 	endchannel
 
 
-SFX_08_6a_Ch2: ; 206c4 (8:46c4)
+SFX_Battle_2A_Ch2: ; 206c4 (8:46c4)
 	dutycycle 141
 	unknownsfx0x20 5, 228, 224, 5
 	unknownsfx0x20 4, 180, 224, 4
 	unknownsfx0x20 6, 165, 232, 5
 	unknownsfx0x20 14, 209, 160, 6
-	loopchannel 3, SFX_08_6a_Ch2
+	loopchannel 3, SFX_Battle_2A_Ch2
 	endchannel
 
 
-SFX_08_6a_Ch3: ; 206db (8:46db)
+SFX_Battle_2A_Ch3: ; 206db (8:46db)
 	unknownnoise0x20 5, 195, 51
 	unknownnoise0x20 3, 146, 67
 	unknownnoise0x20 10, 181, 51
 	unknownnoise0x20 15, 195, 50
-	loopchannel 2, SFX_08_6a_Ch3
+	loopchannel 2, SFX_Battle_2A_Ch3
 	endchannel
diff --git a/audio/sfx/sfx_08_6b.asm b/audio/sfx/battle_2b.asm
index 60783be6..276627c3 100755..100644
--- a/audio/sfx/sfx_08_6b.asm
+++ b/audio/sfx/battle_2b.asm
@@ -1,21 +1,21 @@
-SFX_08_6b_Ch1: ; 206ec (8:46ec)
+SFX_Battle_2B_Ch1: ; 206ec (8:46ec)
 	dutycycle 210
 	unknownsfx0x20 3, 129, 0, 3
 	unknownsfx0x20 3, 193, 0, 4
 	unknownsfx0x20 3, 241, 0, 5
 	unknownsfx0x20 3, 177, 0, 4
 	unknownsfx0x20 3, 113, 0, 3
-	loopchannel 5, SFX_08_6b_Ch1
+	loopchannel 5, SFX_Battle_2B_Ch1
 	unknownsfx0x20 8, 129, 0, 4
 	endchannel
 
 
-SFX_08_6b_Ch2: ; 2070b (8:470b)
+SFX_Battle_2B_Ch2: ; 2070b (8:470b)
 	unknownnoise0x20 3, 98, 34
 	unknownnoise0x20 3, 162, 50
 	unknownnoise0x20 3, 210, 51
 	unknownnoise0x20 3, 146, 35
 	unknownnoise0x20 3, 82, 18
-	loopchannel 5, SFX_08_6b_Ch2
+	loopchannel 5, SFX_Battle_2B_Ch2
 	unknownnoise0x20 8, 129, 18
 	endchannel
diff --git a/audio/sfx/sfx_08_6c.asm b/audio/sfx/battle_2c.asm
index cf83608d..22b902f1 100755..100644
--- a/audio/sfx/sfx_08_6c.asm
+++ b/audio/sfx/battle_2c.asm
@@ -1,25 +1,25 @@
-SFX_08_6c_Ch1: ; 20722 (8:4722)
+SFX_Battle_2C_Ch1: ; 20722 (8:4722)
 	dutycycle 57
 	unknownsfx0x20 15, 244, 0, 5
 	unknownsfx0x20 15, 196, 0, 4
 	unknownsfx0x20 15, 226, 192, 5
-	loopchannel 3, SFX_08_6c_Ch1
+	loopchannel 3, SFX_Battle_2C_Ch1
 	endchannel
 
 
-SFX_08_6c_Ch2: ; 20735 (8:4735)
+SFX_Battle_2C_Ch2: ; 20735 (8:4735)
 	dutycycle 141
 	unknownsfx0x20 7, 228, 48, 4
 	unknownsfx0x20 15, 180, 48, 3
 	unknownsfx0x20 15, 162, 56, 4
-	loopchannel 4, SFX_08_6c_Ch2
+	loopchannel 4, SFX_Battle_2C_Ch2
 	endchannel
 
 
-SFX_08_6c_Ch3: ; 20748 (8:4748)
+SFX_Battle_2C_Ch3: ; 20748 (8:4748)
 	unknownnoise0x20 9, 244, 68
 	unknownnoise0x20 9, 242, 67
 	unknownnoise0x20 15, 244, 66
 	unknownnoise0x20 15, 244, 65
-	loopchannel 3, SFX_08_6c_Ch3
+	loopchannel 3, SFX_Battle_2C_Ch3
 	endchannel
diff --git a/audio/sfx/sfx_08_6e.asm b/audio/sfx/battle_2e.asm
index 00b2c148..91dda605 100755..100644
--- a/audio/sfx/sfx_08_6e.asm
+++ b/audio/sfx/battle_2e.asm
@@ -1,27 +1,27 @@
-SFX_08_6e_Ch1: ; 20792 (8:4792)
+SFX_Battle_2E_Ch1: ; 20792 (8:4792)
 	duty 0
 	unknownsfx0x20 2, 241, 0, 2
 	unknownsfx0x20 3, 241, 0, 7
 	unknownsfx0x20 4, 241, 0, 5
 	unknownsfx0x20 5, 241, 240, 7
-	loopchannel 8, SFX_08_6e_Ch1
+	loopchannel 8, SFX_Battle_2E_Ch1
 	endchannel
 
 
-SFX_08_6e_Ch2: ; 207a9 (8:47a9)
+SFX_Battle_2E_Ch2: ; 207a9 (8:47a9)
 	dutycycle 179
 	unknownsfx0x20 2, 225, 2, 3
 	unknownsfx0x20 3, 225, 242, 7
 	unknownsfx0x20 4, 225, 2, 6
 	unknownsfx0x20 5, 225, 2, 7
-	loopchannel 8, SFX_08_6e_Ch2
+	loopchannel 8, SFX_Battle_2E_Ch2
 	endchannel
 
 
-SFX_08_6e_Ch3: ; 207c0 (8:47c0)
+SFX_Battle_2E_Ch3: ; 207c0 (8:47c0)
 	unknownnoise0x20 2, 211, 16
 	unknownnoise0x20 3, 211, 17
 	unknownnoise0x20 2, 210, 16
 	unknownnoise0x20 5, 210, 18
-	loopchannel 9, SFX_08_6e_Ch3
+	loopchannel 9, SFX_Battle_2E_Ch3
 	endchannel
diff --git a/audio/sfx/sfx_08_6f.asm b/audio/sfx/battle_2f.asm
index 69b85d33..4b1d9b2c 100755..100644
--- a/audio/sfx/sfx_08_6f.asm
+++ b/audio/sfx/battle_2f.asm
@@ -1,21 +1,21 @@
-SFX_08_6f_Ch1: ; 207d1 (8:47d1)
+SFX_Battle_2F_Ch1: ; 207d1 (8:47d1)
 	dutycycle 43
 	unknownsfx0x20 3, 241, 240, 7
 	unknownsfx0x20 4, 242, 0, 2
-	loopchannel 8, SFX_08_6f_Ch1
+	loopchannel 8, SFX_Battle_2F_Ch1
 	endchannel
 
 
-SFX_08_6f_Ch2: ; 207e0 (8:47e0)
+SFX_Battle_2F_Ch2: ; 207e0 (8:47e0)
 	dutycycle 179
 	unknownsfx0x20 4, 226, 2, 2
 	unknownsfx0x20 4, 225, 226, 7
-	loopchannel 9, SFX_08_6f_Ch2
+	loopchannel 9, SFX_Battle_2F_Ch2
 	endchannel
 
 
-SFX_08_6f_Ch3: ; 207ef (8:47ef)
+SFX_Battle_2F_Ch3: ; 207ef (8:47ef)
 	unknownnoise0x20 4, 255, 67
 	unknownnoise0x20 4, 242, 68
-	loopchannel 9, SFX_08_6f_Ch3
+	loopchannel 9, SFX_Battle_2F_Ch3
 	endchannel
diff --git a/audio/sfx/sfx_08_71.asm b/audio/sfx/battle_31.asm
index 7b306557..5d3e2e40 100755..100644
--- a/audio/sfx/sfx_08_71.asm
+++ b/audio/sfx/battle_31.asm
@@ -1,4 +1,4 @@
-SFX_08_71_Ch1: ; 20847 (8:4847)
+SFX_Battle_31_Ch1: ; 20847 (8:4847)
 	duty 2
 	unknownsfx0x20 15, 255, 224, 7
 	unknownsfx0x20 15, 255, 224, 7
@@ -8,7 +8,7 @@ SFX_08_71_Ch1: ; 20847 (8:4847)
 	endchannel
 
 
-SFX_08_71_Ch2: ; 2085e (8:485e)
+SFX_Battle_31_Ch2: ; 2085e (8:485e)
 	duty 3
 	unknownsfx0x20 15, 255, 226, 7
 	unknownsfx0x20 15, 255, 225, 7
diff --git a/audio/sfx/sfx_08_72.asm b/audio/sfx/battle_32.asm
index 13000d01..c949fb5b 100755..100644
--- a/audio/sfx/sfx_08_72.asm
+++ b/audio/sfx/battle_32.asm
@@ -1,4 +1,4 @@
-SFX_08_72_Ch1: ; 20875 (8:4875)
+SFX_Battle_32_Ch1: ; 20875 (8:4875)
 	duty 2
 	unknownsfx0x10 175
 	unknownsfx0x20 8, 241, 0, 7
@@ -6,7 +6,7 @@ SFX_08_72_Ch1: ; 20875 (8:4875)
 	endchannel
 
 
-SFX_08_72_Ch2: ; 20880 (8:4880)
+SFX_Battle_32_Ch2: ; 20880 (8:4880)
 	duty 3
 	unknownsfx0x20 8, 241, 1, 7
 	endchannel
diff --git a/audio/sfx/sfx_08_73.asm b/audio/sfx/battle_33.asm
index 7829fbcd..8b2bd17d 100755..100644
--- a/audio/sfx/sfx_08_73.asm
+++ b/audio/sfx/battle_33.asm
@@ -1,4 +1,4 @@
-SFX_08_73_Ch1: ; 20887 (8:4887)
+SFX_Battle_33_Ch1: ; 20887 (8:4887)
 	duty 2
 	unknownsfx0x20 6, 241, 0, 5
 	unknownsfx0x20 6, 241, 128, 5
@@ -8,7 +8,7 @@ SFX_08_73_Ch1: ; 20887 (8:4887)
 	endchannel
 
 
-SFX_08_73_Ch2: ; 2089e (8:489e)
+SFX_Battle_33_Ch2: ; 2089e (8:489e)
 	duty 3
 	unknownsfx0x20 6, 225, 16, 5
 	unknownsfx0x20 6, 225, 144, 5
diff --git a/audio/sfx/sfx_08_74.asm b/audio/sfx/battle_34.asm
index f8144908..ac80eeea 100755..100644
--- a/audio/sfx/sfx_08_74.asm
+++ b/audio/sfx/battle_34.asm
@@ -1,4 +1,4 @@
-SFX_08_74_Ch1: ; 208b5 (8:48b5)
+SFX_Battle_34_Ch1: ; 208b5 (8:48b5)
 	dutycycle 237
 	unknownsfx0x20 8, 255, 248, 3
 	unknownsfx0x20 15, 255, 0, 4
@@ -6,7 +6,7 @@ SFX_08_74_Ch1: ; 208b5 (8:48b5)
 	endchannel
 
 
-SFX_08_74_Ch2: ; 208c4 (8:48c4)
+SFX_Battle_34_Ch2: ; 208c4 (8:48c4)
 	dutycycle 180
 	unknownsfx0x20 8, 239, 192, 3
 	unknownsfx0x20 15, 239, 192, 3
@@ -14,7 +14,7 @@ SFX_08_74_Ch2: ; 208c4 (8:48c4)
 	endchannel
 
 
-SFX_08_74_Ch3: ; 208d3 (8:48d3)
+SFX_Battle_34_Ch3: ; 208d3 (8:48d3)
 	unknownnoise0x20 4, 255, 81
 	unknownnoise0x20 8, 255, 84
 	unknownnoise0x20 15, 255, 85
diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/battle_35.asm
index cda1c65f..7e64aca9 100755..100644
--- a/audio/sfx/sfx_08_75.asm
+++ b/audio/sfx/battle_35.asm
@@ -1,4 +1,4 @@
-SFX_08_75_Ch1: ; 208e0 (8:48e0)
+SFX_Battle_35_Ch1: ; 208e0 (8:48e0)
 	executemusic
 	vibrato 10, 2, 4
 	duty 2
@@ -13,7 +13,7 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0)
 	endchannel
 
 
-SFX_08_75_Ch2: ; 208f0 (8:48f0)
+SFX_Battle_35_Ch2: ; 208f0 (8:48f0)
 	executemusic
 	vibrato 10, 2, 3
 	duty 2
diff --git a/audio/sfx/sfx_08_76.asm b/audio/sfx/battle_36.asm
index b60e51aa..f878a1c8 100755..100644
--- a/audio/sfx/sfx_08_76.asm
+++ b/audio/sfx/battle_36.asm
@@ -1,4 +1,4 @@
-SFX_08_76_Ch1: ; 20902 (8:4902)
+SFX_Battle_36_Ch1: ; 20902 (8:4902)
 	duty 0
 	unknownsfx0x20 2, 241, 128, 7
 	unknownsfx0x20 2, 241, 0, 7
@@ -12,15 +12,15 @@ SFX_08_76_Ch1: ; 20902 (8:4902)
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 2, 241, 208, 7
 
-SFX_08_76_branch_20930:
+SFX_Battle_36_branch_20930:
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 2, 241, 224, 7
-	loopchannel 12, SFX_08_76_branch_20930
+	loopchannel 12, SFX_Battle_36_branch_20930
 	unknownsfx0x20 15, 241, 0, 7
 	endchannel
 
 
-SFX_08_76_Ch2: ; 20941 (8:4941)
+SFX_Battle_36_Ch2: ; 20941 (8:4941)
 	dutycycle 179
 	unknownsfx0x20 2, 241, 129, 7
 	unknownsfx0x20 2, 241, 1, 7
@@ -35,13 +35,13 @@ SFX_08_76_Ch2: ; 20941 (8:4941)
 	unknownsfx0x20 2, 241, 209, 7
 	unknownsfx0x20 2, 241, 1, 7
 	unknownsfx0x20 2, 241, 225, 7
-	loopchannel 12, SFX_08_76_branch_20930
+	loopchannel 12, SFX_Battle_36_branch_20930
 	unknownsfx0x20 15, 241, 1, 7
 	endchannel
 
 
-SFX_08_76_Ch3: ; 20980 (8:4980)
+SFX_Battle_36_Ch3: ; 20980 (8:4980)
 	unknownnoise0x20 1, 209, 73
 	unknownnoise0x20 1, 209, 41
-	loopchannel 26, SFX_08_76_Ch3
+	loopchannel 26, SFX_Battle_36_Ch3
 	endchannel
diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/caught_mon.asm
index de64873a..d841f57a 100755..100644
--- a/audio/sfx/sfx_08_46.asm
+++ b/audio/sfx/caught_mon.asm
@@ -1,4 +1,4 @@
-SFX_08_46_Ch1: ; 23a13 (8:7a13)
+SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -22,7 +22,7 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13)
 	endchannel
 
 
-SFX_08_46_Ch2: ; 23a2e (8:7a2e)
+SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e)
 	executemusic
 	duty 2
 	notetype 6, 12, 2
@@ -44,7 +44,7 @@ SFX_08_46_Ch2: ; 23a2e (8:7a2e)
 	endchannel
 
 
-SFX_08_46_Ch3: ; 23a44 (8:7a44)
+SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44)
 	executemusic
 	notetype 6, 1, 0
 	octave 4
diff --git a/audio/sfx/sfx_02_5b.asm b/audio/sfx/collision_1.asm
index b09369db..4b9c4a7e 100755..100644
--- a/audio/sfx/sfx_02_5b.asm
+++ b/audio/sfx/collision_1.asm
@@ -1,4 +1,4 @@
-SFX_02_5b_Ch1: ; 8447 (2:4447)
+SFX_Collision_1_Ch1: ; 8447 (2:4447)
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
diff --git a/audio/sfx/sfx_1f_5b.asm b/audio/sfx/collision_3.asm
index bc2e6fef..18806c1f 100755..100644
--- a/audio/sfx/sfx_1f_5b.asm
+++ b/audio/sfx/collision_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_5b_Ch1: ; 7c430 (1f:4430)
+SFX_Collision_3_Ch1: ; 7c430 (1f:4430)
 	duty 2
 	unknownsfx0x10 90
 	unknownsfx0x20 15, 241, 0, 3
diff --git a/audio/sfx/sfx_02_14.asm b/audio/sfx/cry00_1.asm
index 3a289882..f29e29ab 100755..100644
--- a/audio/sfx/sfx_02_14.asm
+++ b/audio/sfx/cry00_1.asm
@@ -1,4 +1,4 @@
-SFX_02_14_Ch1: ; 8987 (2:4987)
+SFX_Cry00_1_Ch1: ; 8987 (2:4987)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_02_14_Ch1: ; 8987 (2:4987)
 	endchannel
 
 
-SFX_02_14_Ch2: ; 8996 (2:4996)
+SFX_Cry00_1_Ch2: ; 8996 (2:4996)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@ SFX_02_14_Ch2: ; 8996 (2:4996)
 	endchannel
 
 
-SFX_02_14_Ch3: ; 89a5 (2:49a5)
+SFX_Cry00_1_Ch3: ; 89a5 (2:49a5)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
diff --git a/audio/sfx/sfx_1f_14.asm b/audio/sfx/cry00_2.asm
index 4f52b842..fa069f18 100755..100644
--- a/audio/sfx/sfx_1f_14.asm
+++ b/audio/sfx/cry00_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_14_Ch1: ; 7c9fc (1f:49fc)
+SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_1f_14_Ch1: ; 7c9fc (1f:49fc)
 	endchannel
 
 
-SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b)
+SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@ SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b)
 	endchannel
 
 
-SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a)
+SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
diff --git a/audio/sfx/sfx_08_14.asm b/audio/sfx/cry00_3.asm
index 83837768..bdeadab5 100755..100644
--- a/audio/sfx/sfx_08_14.asm
+++ b/audio/sfx/cry00_3.asm
@@ -1,4 +1,4 @@
-SFX_08_14_Ch1: ; 20c2f (8:4c2f)
+SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc)
 	dutycycle 245
 	unknownsfx0x20 4, 243, 24, 7
 	unknownsfx0x20 15, 229, 152, 7
@@ -6,7 +6,7 @@ SFX_08_14_Ch1: ; 20c2f (8:4c2f)
 	endchannel
 
 
-SFX_08_14_Ch2: ; 20c3e (8:4c3e)
+SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b)
 	dutycycle 160
 	unknownsfx0x20 5, 179, 8, 7
 	unknownsfx0x20 15, 197, 136, 7
@@ -14,7 +14,7 @@ SFX_08_14_Ch2: ; 20c3e (8:4c3e)
 	endchannel
 
 
-SFX_08_14_Ch3: ; 20c4d (8:4c4d)
+SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a)
 	unknownnoise0x20 3, 161, 28
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 8, 129, 28
diff --git a/audio/sfx/sfx_1f_15.asm b/audio/sfx/cry01_1.asm
index 0f16cb0e..835d41f7 100755..100644
--- a/audio/sfx/sfx_1f_15.asm
+++ b/audio/sfx/cry01_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c)
+SFX_Cry01_1_Ch1: ; 8b97 (2:4b97)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c)
 	endchannel
 
 
-SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f)
+SFX_Cry01_1_Ch2: ; 8baa (2:4baa)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@ SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f)
 	endchannel
 
 
-SFX_1f_15_Ch3: ; 7cc32 (1f:4c32)
+SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
diff --git a/audio/sfx/sfx_02_15.asm b/audio/sfx/cry01_2.asm
index 91b6c951..bcafa873 100755..100644
--- a/audio/sfx/sfx_02_15.asm
+++ b/audio/sfx/cry01_2.asm
@@ -1,4 +1,4 @@
-SFX_02_15_Ch1: ; 8b97 (2:4b97)
+SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_02_15_Ch1: ; 8b97 (2:4b97)
 	endchannel
 
 
-SFX_02_15_Ch2: ; 8baa (2:4baa)
+SFX_Cry01_2_Ch2: ; 20e52 (8:4e52)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@ SFX_02_15_Ch2: ; 8baa (2:4baa)
 	endchannel
 
 
-SFX_02_15_Ch3: ; 8bbd (2:4bbd)
+SFX_Cry01_2_Ch3: ; 20e65 (8:4e65)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
diff --git a/audio/sfx/sfx_08_15.asm b/audio/sfx/cry01_3.asm
index 94705f71..1a31c7ca 100755..100644
--- a/audio/sfx/sfx_08_15.asm
+++ b/audio/sfx/cry01_3.asm
@@ -1,4 +1,4 @@
-SFX_08_15_Ch1: ; 20e3f (8:4e3f)
+SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c)
 	dutycycle 160
 	unknownsfx0x20 4, 243, 0, 6
 	unknownsfx0x20 8, 213, 96, 7
@@ -7,7 +7,7 @@ SFX_08_15_Ch1: ; 20e3f (8:4e3f)
 	endchannel
 
 
-SFX_08_15_Ch2: ; 20e52 (8:4e52)
+SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f)
 	dutycycle 90
 	unknownsfx0x20 5, 179, 241, 6
 	unknownsfx0x20 7, 197, 82, 7
@@ -16,7 +16,7 @@ SFX_08_15_Ch2: ; 20e52 (8:4e52)
 	endchannel
 
 
-SFX_08_15_Ch3: ; 20e65 (8:4e65)
+SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32)
 	unknownnoise0x20 3, 162, 60
 	unknownnoise0x20 12, 148, 44
 	unknownnoise0x20 3, 130, 28
diff --git a/audio/sfx/sfx_1f_16.asm b/audio/sfx/cry02_1.asm
index 450403b4..97cff95e 100755..100644
--- a/audio/sfx/sfx_1f_16.asm
+++ b/audio/sfx/cry02_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_16_Ch1: ; 7cb81 (1f:4b81)
+SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,12 +6,12 @@ SFX_1f_16_Ch1: ; 7cb81 (1f:4b81)
 	endchannel
 
 
-SFX_1f_16_Ch2: ; 7cb90 (1f:4b90)
+SFX_Cry02_1_Ch2: ; 8b1b (2:4b1b)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e)
+SFX_Cry02_1_Ch3: ; 8b29 (2:4b29)
 	endchannel
diff --git a/audio/sfx/sfx_08_16.asm b/audio/sfx/cry02_2.asm
index e2109f2b..7d67fc4a 100755..100644
--- a/audio/sfx/sfx_08_16.asm
+++ b/audio/sfx/cry02_2.asm
@@ -1,4 +1,4 @@
-SFX_08_16_Ch1: ; 20db4 (8:4db4)
+SFX_Cry02_2_Ch1: ; 20db4 (8:4db4)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,12 +6,12 @@ SFX_08_16_Ch1: ; 20db4 (8:4db4)
 	endchannel
 
 
-SFX_08_16_Ch2: ; 20dc3 (8:4dc3)
+SFX_Cry02_2_Ch2: ; 20dc3 (8:4dc3)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_08_16_Ch3: ; 20dd1 (8:4dd1)
+SFX_Cry02_2_Ch3: ; 20dd1 (8:4dd1)
 	endchannel
diff --git a/audio/sfx/sfx_02_16.asm b/audio/sfx/cry02_3.asm
index fe15f6b6..604d084a 100755..100644
--- a/audio/sfx/sfx_02_16.asm
+++ b/audio/sfx/cry02_3.asm
@@ -1,4 +1,4 @@
-SFX_02_16_Ch1: ; 8b0c (2:4b0c)
+SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81)
 	duty 0
 	unknownsfx0x20 8, 245, 128, 4
 	unknownsfx0x20 2, 225, 224, 5
@@ -6,12 +6,12 @@ SFX_02_16_Ch1: ; 8b0c (2:4b0c)
 	endchannel
 
 
-SFX_02_16_Ch2: ; 8b1b (2:4b1b)
+SFX_Cry02_3_Ch2: ; 7cb90 (1f:4b90)
 	dutycycle 165
 	unknownsfx0x20 7, 149, 65, 4
 	unknownsfx0x20 2, 129, 33, 5
 	unknownsfx0x20 8, 97, 26, 5
 
 
-SFX_02_16_Ch3: ; 8b29 (2:4b29)
+SFX_Cry02_3_Ch3: ; 7cb9e (1f:4b9e)
 	endchannel
diff --git a/audio/sfx/sfx_08_17.asm b/audio/sfx/cry03_1.asm
index c8efc25f..42f2c5d3 100755..100644
--- a/audio/sfx/sfx_08_17.asm
+++ b/audio/sfx/cry03_1.asm
@@ -1,4 +1,4 @@
-SFX_08_17_Ch1: ; 20b4e (8:4b4e)
+SFX_Cry03_1_Ch1: ; 88a6 (2:48a6)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_08_17_Ch1: ; 20b4e (8:4b4e)
 	endchannel
 
 
-SFX_08_17_Ch2: ; 20b6d (8:4b6d)
+SFX_Cry03_1_Ch2: ; 88c5 (2:48c5)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@ SFX_08_17_Ch2: ; 20b6d (8:4b6d)
 	endchannel
 
 
-SFX_08_17_Ch3: ; 20b8c (8:4b8c)
+SFX_Cry03_1_Ch3: ; 88e4 (2:48e4)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
diff --git a/audio/sfx/sfx_1f_17.asm b/audio/sfx/cry03_2.asm
index 7f0d0fad..92dab482 100755..100644
--- a/audio/sfx/sfx_1f_17.asm
+++ b/audio/sfx/cry03_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_17_Ch1: ; 7c91b (1f:491b)
+SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_1f_17_Ch1: ; 7c91b (1f:491b)
 	endchannel
 
 
-SFX_1f_17_Ch2: ; 7c93a (1f:493a)
+SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@ SFX_1f_17_Ch2: ; 7c93a (1f:493a)
 	endchannel
 
 
-SFX_1f_17_Ch3: ; 7c959 (1f:4959)
+SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
diff --git a/audio/sfx/sfx_02_17.asm b/audio/sfx/cry03_3.asm
index ecc34899..0161b820 100755..100644
--- a/audio/sfx/sfx_02_17.asm
+++ b/audio/sfx/cry03_3.asm
@@ -1,4 +1,4 @@
-SFX_02_17_Ch1: ; 88a6 (2:48a6)
+SFX_Cry03_3_Ch1: ; 7c91b (1f:491b)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 8, 6
 	unknownsfx0x20 6, 230, 0, 6
@@ -10,7 +10,7 @@ SFX_02_17_Ch1: ; 88a6 (2:48a6)
 	endchannel
 
 
-SFX_02_17_Ch2: ; 88c5 (2:48c5)
+SFX_Cry03_3_Ch2: ; 7c93a (1f:493a)
 	dutycycle 10
 	unknownsfx0x20 4, 199, 4, 5
 	unknownsfx0x20 6, 166, 2, 5
@@ -22,7 +22,7 @@ SFX_02_17_Ch2: ; 88c5 (2:48c5)
 	endchannel
 
 
-SFX_02_17_Ch3: ; 88e4 (2:48e4)
+SFX_Cry03_3_Ch3: ; 7c959 (1f:4959)
 	unknownnoise0x20 12, 228, 76
 	unknownnoise0x20 10, 199, 92
 	unknownnoise0x20 12, 182, 76
diff --git a/audio/sfx/sfx_08_18.asm b/audio/sfx/cry04_1.asm
index fce2f3e8..c80a6bd9 100755..100644
--- a/audio/sfx/sfx_08_18.asm
+++ b/audio/sfx/cry04_1.asm
@@ -1,4 +1,4 @@
-SFX_08_18_Ch1: ; 20efd (8:4efd)
+SFX_Cry04_1_Ch1: ; 8c55 (2:4c55)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_08_18_Ch1: ; 20efd (8:4efd)
 	endchannel
 
 
-SFX_08_18_Ch2: ; 20f1c (8:4f1c)
+SFX_Cry04_1_Ch2: ; 8c74 (2:4c74)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_08_18_Ch2: ; 20f1c (8:4f1c)
 	endchannel
 
 
-SFX_08_18_Ch3: ; 20f3b (8:4f3b)
+SFX_Cry04_1_Ch3: ; 8c93 (2:4c93)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
diff --git a/audio/sfx/sfx_02_18.asm b/audio/sfx/cry04_2.asm
index 73f8f41e..dcd866da 100755..100644
--- a/audio/sfx/sfx_02_18.asm
+++ b/audio/sfx/cry04_2.asm
@@ -1,4 +1,4 @@
-SFX_02_18_Ch1: ; 8c55 (2:4c55)
+SFX_Cry04_2_Ch1: ; 20efd (8:4efd)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_02_18_Ch1: ; 8c55 (2:4c55)
 	endchannel
 
 
-SFX_02_18_Ch2: ; 8c74 (2:4c74)
+SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_02_18_Ch2: ; 8c74 (2:4c74)
 	endchannel
 
 
-SFX_02_18_Ch3: ; 8c93 (2:4c93)
+SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
diff --git a/audio/sfx/sfx_1f_18.asm b/audio/sfx/cry04_3.asm
index 066128bb..5d8c6df9 100755..100644
--- a/audio/sfx/sfx_1f_18.asm
+++ b/audio/sfx/cry04_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_18_Ch1: ; 7ccca (1f:4cca)
+SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca)
 	dutycycle 240
 	unknownsfx0x20 4, 247, 160, 6
 	unknownsfx0x20 8, 230, 164, 6
@@ -10,7 +10,7 @@ SFX_1f_18_Ch1: ; 7ccca (1f:4cca)
 	endchannel
 
 
-SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9)
+SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9)
 	dutycycle 90
 	unknownsfx0x20 4, 231, 1, 6
 	unknownsfx0x20 8, 214, 3, 6
@@ -22,7 +22,7 @@ SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9)
 	endchannel
 
 
-SFX_1f_18_Ch3: ; 7cd08 (1f:4d08)
+SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08)
 	unknownnoise0x20 7, 214, 92
 	unknownnoise0x20 8, 230, 76
 	unknownnoise0x20 4, 212, 92
diff --git a/audio/sfx/sfx_08_19.asm b/audio/sfx/cry05_1.asm
index ad3a22ad..891cc50e 100755..100644
--- a/audio/sfx/sfx_08_19.asm
+++ b/audio/sfx/cry05_1.asm
@@ -1,4 +1,4 @@
-SFX_08_19_Ch1: ; 20cdd (8:4cdd)
+SFX_Cry05_1_Ch1: ; 8a35 (2:4a35)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_08_19_Ch1: ; 20cdd (8:4cdd)
 	endchannel
 
 
-SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
+SFX_Cry05_1_Ch2: ; 8a48 (2:4a48)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@ SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_08_19_Ch3: ; 20d02 (8:4d02)
+SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a)
 	endchannel
diff --git a/audio/sfx/sfx_02_19.asm b/audio/sfx/cry05_2.asm
index d78b66b4..98df4c1d 100755..100644
--- a/audio/sfx/sfx_02_19.asm
+++ b/audio/sfx/cry05_2.asm
@@ -1,4 +1,4 @@
-SFX_02_19_Ch1: ; 8a35 (2:4a35)
+SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_02_19_Ch1: ; 8a35 (2:4a35)
 	endchannel
 
 
-SFX_02_19_Ch2: ; 8a48 (2:4a48)
+SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@ SFX_02_19_Ch2: ; 8a48 (2:4a48)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_02_19_Ch3: ; 8a5a (2:4a5a)
+SFX_Cry05_2_Ch3: ; 20d02 (8:4d02)
 	endchannel
diff --git a/audio/sfx/sfx_1f_19.asm b/audio/sfx/cry05_3.asm
index 119a5f9f..a7f88abf 100755..100644
--- a/audio/sfx/sfx_1f_19.asm
+++ b/audio/sfx/cry05_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_19_Ch1: ; 7caaa (1f:4aaa)
+SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa)
 	dutycycle 10
 	unknownsfx0x20 6, 226, 0, 5
 	unknownsfx0x20 6, 227, 128, 5
@@ -7,7 +7,7 @@ SFX_1f_19_Ch1: ; 7caaa (1f:4aaa)
 	endchannel
 
 
-SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
+SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd)
 	dutycycle 245
 	unknownsfx0x20 6, 226, 130, 4
 	unknownsfx0x20 6, 211, 1, 5
@@ -15,5 +15,5 @@ SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
 	unknownsfx0x20 8, 129, 193, 4
 
 
-SFX_1f_19_Ch3: ; 7cacf (1f:4acf)
+SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf)
 	endchannel
diff --git a/audio/sfx/sfx_08_1a.asm b/audio/sfx/cry06_1.asm
index 96df0f42..b26004e2 100755..100644
--- a/audio/sfx/sfx_08_1a.asm
+++ b/audio/sfx/cry06_1.asm
@@ -1,4 +1,4 @@
-SFX_08_1a_Ch1: ; 20c87 (8:4c87)
+SFX_Cry06_1_Ch1: ; 89df (2:49df)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_08_1a_Ch1: ; 20c87 (8:4c87)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_08_1a_Ch2: ; 20ca1 (8:4ca1)
+SFX_Cry06_1_Ch2: ; 89f9 (2:49f9)
 	endchannel
 
 
-SFX_08_1a_Ch3: ; 20ca2 (8:4ca2)
+SFX_Cry06_1_Ch3: ; 89fa (2:49fa)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
diff --git a/audio/sfx/sfx_02_1a.asm b/audio/sfx/cry06_2.asm
index 036703b5..283c1360 100755..100644
--- a/audio/sfx/sfx_02_1a.asm
+++ b/audio/sfx/cry06_2.asm
@@ -1,4 +1,4 @@
-SFX_02_1a_Ch1: ; 89df (2:49df)
+SFX_Cry06_2_Ch1: ; 20c87 (8:4c87)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_02_1a_Ch1: ; 89df (2:49df)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_02_1a_Ch2: ; 89f9 (2:49f9)
+SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1)
 	endchannel
 
 
-SFX_02_1a_Ch3: ; 89fa (2:49fa)
+SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
diff --git a/audio/sfx/sfx_1f_1a.asm b/audio/sfx/cry06_3.asm
index 38a6df2a..9feecc3b 100755..100644
--- a/audio/sfx/sfx_1f_1a.asm
+++ b/audio/sfx/cry06_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54)
+SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54)
 	dutycycle 250
 	unknownsfx0x20 6, 131, 71, 2
 	unknownsfx0x20 15, 98, 38, 2
@@ -8,11 +8,11 @@ SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54)
 	unknownsfx0x20 15, 66, 7, 2
 
 
-SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e)
+SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e)
 	endchannel
 
 
-SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f)
+SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f)
 	unknownnoise0x20 8, 212, 140
 	unknownnoise0x20 4, 226, 156
 	unknownnoise0x20 15, 198, 140
diff --git a/audio/sfx/sfx_02_1b.asm b/audio/sfx/cry07_1.asm
index 0e1112f6..b1346b94 100755..100644
--- a/audio/sfx/sfx_02_1b.asm
+++ b/audio/sfx/cry07_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1b_Ch1: ; 8a0d (2:4a0d)
+SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_02_1b_Ch1: ; 8a0d (2:4a0d)
 	endchannel
 
 
-SFX_02_1b_Ch2: ; 8a1c (2:4a1c)
+SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@ SFX_02_1b_Ch2: ; 8a1c (2:4a1c)
 	endchannel
 
 
-SFX_02_1b_Ch3: ; 8a2b (2:4a2b)
+SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
diff --git a/audio/sfx/sfx_1f_1b.asm b/audio/sfx/cry07_2.asm
index 12c4a66b..075b7139 100755..100644
--- a/audio/sfx/sfx_1f_1b.asm
+++ b/audio/sfx/cry07_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82)
+SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82)
 	endchannel
 
 
-SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91)
+SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@ SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91)
 	endchannel
 
 
-SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0)
+SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
diff --git a/audio/sfx/sfx_08_1b.asm b/audio/sfx/cry07_3.asm
index bd7e288f..4955e115 100755..100644
--- a/audio/sfx/sfx_08_1b.asm
+++ b/audio/sfx/cry07_3.asm
@@ -1,4 +1,4 @@
-SFX_08_1b_Ch1: ; 20cb5 (8:4cb5)
+SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 224, 6
 	unknownsfx0x20 15, 228, 64, 6
@@ -6,7 +6,7 @@ SFX_08_1b_Ch1: ; 20cb5 (8:4cb5)
 	endchannel
 
 
-SFX_08_1b_Ch2: ; 20cc4 (8:4cc4)
+SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91)
 	dutycycle 10
 	unknownsfx0x20 3, 195, 131, 6
 	unknownsfx0x20 14, 180, 2, 6
@@ -14,7 +14,7 @@ SFX_08_1b_Ch2: ; 20cc4 (8:4cc4)
 	endchannel
 
 
-SFX_08_1b_Ch3: ; 20cd3 (8:4cd3)
+SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0)
 	unknownnoise0x20 4, 211, 92
 	unknownnoise0x20 15, 230, 76
 	unknownnoise0x20 8, 177, 92
diff --git a/audio/sfx/sfx_02_1c.asm b/audio/sfx/cry08_1.asm
index 3a06819f..65131766 100755..100644
--- a/audio/sfx/sfx_02_1c.asm
+++ b/audio/sfx/cry08_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1c_Ch1: ; 8c25 (2:4c25)
+SFX_Cry08_1_Ch1: ; 8c25 (2:4c25)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_02_1c_Ch1: ; 8c25 (2:4c25)
 	endchannel
 
 
-SFX_02_1c_Ch2: ; 8c38 (2:4c38)
+SFX_Cry08_1_Ch2: ; 8c38 (2:4c38)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@ SFX_02_1c_Ch2: ; 8c38 (2:4c38)
 	endchannel
 
 
-SFX_02_1c_Ch3: ; 8c4b (2:4c4b)
+SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
diff --git a/audio/sfx/sfx_1f_1c.asm b/audio/sfx/cry08_2.asm
index 4ed5efc6..71a0e205 100755..100644
--- a/audio/sfx/sfx_1f_1c.asm
+++ b/audio/sfx/cry08_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a)
+SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a)
 	endchannel
 
 
-SFX_1f_1c_Ch2: ; 7ccad (1f:4cad)
+SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@ SFX_1f_1c_Ch2: ; 7ccad (1f:4cad)
 	endchannel
 
 
-SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0)
+SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
diff --git a/audio/sfx/sfx_08_1c.asm b/audio/sfx/cry08_3.asm
index e3b904b0..bfda8c3d 100755..100644
--- a/audio/sfx/sfx_08_1c.asm
+++ b/audio/sfx/cry08_3.asm
@@ -1,4 +1,4 @@
-SFX_08_1c_Ch1: ; 20ecd (8:4ecd)
+SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a)
 	dutycycle 240
 	unknownsfx0x20 15, 246, 101, 5
 	unknownsfx0x20 10, 228, 124, 5
@@ -7,7 +7,7 @@ SFX_08_1c_Ch1: ; 20ecd (8:4ecd)
 	endchannel
 
 
-SFX_08_1c_Ch2: ; 20ee0 (8:4ee0)
+SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad)
 	dutycycle 90
 	unknownsfx0x20 14, 214, 3, 5
 	unknownsfx0x20 9, 180, 27, 5
@@ -16,7 +16,7 @@ SFX_08_1c_Ch2: ; 20ee0 (8:4ee0)
 	endchannel
 
 
-SFX_08_1c_Ch3: ; 20ef3 (8:4ef3)
+SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0)
 	unknownnoise0x20 12, 230, 76
 	unknownnoise0x20 11, 215, 92
 	unknownnoise0x20 15, 194, 76
diff --git a/audio/sfx/sfx_02_1d.asm b/audio/sfx/cry09_1.asm
index 1501e2ab..29dffdb6 100755..100644
--- a/audio/sfx/sfx_02_1d.asm
+++ b/audio/sfx/cry09_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1d_Ch1: ; 872f (2:472f)
+SFX_Cry09_1_Ch1: ; 872f (2:472f)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_02_1d_Ch1: ; 872f (2:472f)
 	endchannel
 
 
-SFX_02_1d_Ch2: ; 874c (2:474c)
+SFX_Cry09_1_Ch2: ; 874c (2:474c)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_02_1d_Ch2: ; 874c (2:474c)
 	endchannel
 
 
-SFX_02_1d_Ch3: ; 876d (2:476d)
+SFX_Cry09_1_Ch3: ; 876d (2:476d)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/sfx_08_1d.asm b/audio/sfx/cry09_2.asm
index a6f82cf2..c0e61ec7 100755..100644
--- a/audio/sfx/sfx_08_1d.asm
+++ b/audio/sfx/cry09_2.asm
@@ -1,4 +1,4 @@
-SFX_08_1d_Ch1: ; 209d7 (8:49d7)
+SFX_Cry09_2_Ch1: ; 209d7 (8:49d7)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_08_1d_Ch1: ; 209d7 (8:49d7)
 	endchannel
 
 
-SFX_08_1d_Ch2: ; 209f4 (8:49f4)
+SFX_Cry09_2_Ch2: ; 209f4 (8:49f4)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_08_1d_Ch2: ; 209f4 (8:49f4)
 	endchannel
 
 
-SFX_08_1d_Ch3: ; 20a15 (8:4a15)
+SFX_Cry09_2_Ch3: ; 20a15 (8:4a15)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/sfx_1f_1d.asm b/audio/sfx/cry09_3.asm
index ce7f4b4c..c5c0f599 100755..100644
--- a/audio/sfx/sfx_1f_1d.asm
+++ b/audio/sfx/cry09_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4)
+SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 160, 7
 	unknownsfx0x20 6, 230, 163, 7
@@ -10,7 +10,7 @@ SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4)
 	endchannel
 
 
-SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1)
+SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1)
 	dutycycle 5
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 15, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1)
 	endchannel
 
 
-SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2)
+SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/sfx_1f_1e.asm b/audio/sfx/cry0a_1.asm
index 86f88f54..9a8e616b 100755..100644
--- a/audio/sfx/sfx_1f_1e.asm
+++ b/audio/sfx/cry0a_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f)
+SFX_Cry0A_1_Ch1: ; 8bca (2:4bca)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f)
 	endchannel
 
 
-SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e)
+SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e)
 	endchannel
 
 
-SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81)
+SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
diff --git a/audio/sfx/sfx_02_1e.asm b/audio/sfx/cry0a_2.asm
index 1036f953..0386099d 100755..100644
--- a/audio/sfx/sfx_02_1e.asm
+++ b/audio/sfx/cry0a_2.asm
@@ -1,4 +1,4 @@
-SFX_02_1e_Ch1: ; 8bca (2:4bca)
+SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_02_1e_Ch1: ; 8bca (2:4bca)
 	endchannel
 
 
-SFX_02_1e_Ch2: ; 8be9 (2:4be9)
+SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_02_1e_Ch2: ; 8be9 (2:4be9)
 	endchannel
 
 
-SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
+SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
diff --git a/audio/sfx/sfx_08_1e.asm b/audio/sfx/cry0a_3.asm
index 1312f6f2..4cf59333 100755..100644
--- a/audio/sfx/sfx_08_1e.asm
+++ b/audio/sfx/cry0a_3.asm
@@ -1,4 +1,4 @@
-SFX_08_1e_Ch1: ; 20e72 (8:4e72)
+SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f)
 	dutycycle 240
 	unknownsfx0x20 8, 247, 224, 6
 	unknownsfx0x20 6, 230, 229, 6
@@ -10,7 +10,7 @@ SFX_08_1e_Ch1: ; 20e72 (8:4e72)
 	endchannel
 
 
-SFX_08_1e_Ch2: ; 20e91 (8:4e91)
+SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e)
 	dutycycle 5
 	unknownsfx0x20 3, 8, 0, 0
 	unknownsfx0x20 8, 167, 161, 6
@@ -23,7 +23,7 @@ SFX_08_1e_Ch2: ; 20e91 (8:4e91)
 	endchannel
 
 
-SFX_08_1e_Ch3: ; 20eb4 (8:4eb4)
+SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81)
 	unknownnoise0x20 2, 242, 60
 	unknownnoise0x20 8, 228, 62
 	unknownnoise0x20 8, 215, 60
diff --git a/audio/sfx/sfx_02_1f.asm b/audio/sfx/cry0b_1.asm
index 8f603856..0f0edca7 100755..100644
--- a/audio/sfx/sfx_02_1f.asm
+++ b/audio/sfx/cry0b_1.asm
@@ -1,4 +1,4 @@
-SFX_02_1f_Ch1: ; 8a5b (2:4a5b)
+SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_02_1f_Ch1: ; 8a5b (2:4a5b)
 	endchannel
 
 
-SFX_02_1f_Ch2: ; 8a86 (2:4a86)
+SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_02_1f_Ch2: ; 8a86 (2:4a86)
 	endchannel
 
 
-SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
+SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
diff --git a/audio/sfx/sfx_1f_1f.asm b/audio/sfx/cry0b_2.asm
index 2733036b..071cd9b1 100755..100644
--- a/audio/sfx/sfx_1f_1f.asm
+++ b/audio/sfx/cry0b_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0)
+SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0)
 	endchannel
 
 
-SFX_1f_1f_Ch2: ; 7cafb (1f:4afb)
+SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_1f_1f_Ch2: ; 7cafb (1f:4afb)
 	endchannel
 
 
-SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a)
+SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
diff --git a/audio/sfx/sfx_08_1f.asm b/audio/sfx/cry0b_3.asm
index ab708929..c2bd1809 100755..100644
--- a/audio/sfx/sfx_08_1f.asm
+++ b/audio/sfx/cry0b_3.asm
@@ -1,4 +1,4 @@
-SFX_08_1f_Ch1: ; 20d03 (8:4d03)
+SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0)
 	dutycycle 204
 	unknownsfx0x20 4, 241, 0, 7
 	unknownsfx0x20 4, 225, 128, 7
@@ -13,7 +13,7 @@ SFX_08_1f_Ch1: ; 20d03 (8:4d03)
 	endchannel
 
 
-SFX_08_1f_Ch2: ; 20d2e (8:4d2e)
+SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb)
 	dutycycle 68
 	unknownsfx0x20 12, 8, 0, 0
 	unknownsfx0x20 4, 241, 1, 7
@@ -25,7 +25,7 @@ SFX_08_1f_Ch2: ; 20d2e (8:4d2e)
 	endchannel
 
 
-SFX_08_1f_Ch3: ; 20d4d (8:4d4d)
+SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a)
 	unknownnoise0x20 15, 8, 0
 	unknownnoise0x20 4, 8, 0
 	unknownnoise0x20 4, 209, 76
diff --git a/audio/sfx/sfx_1f_20.asm b/audio/sfx/cry0c_1.asm
index 8449e4db..1c0f9f65 100755..100644
--- a/audio/sfx/sfx_1f_20.asm
+++ b/audio/sfx/cry0c_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_20_Ch1: ; 7cb33 (1f:4b33)
+SFX_Cry0C_1_Ch1: ; 8abe (2:4abe)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_1f_20_Ch1: ; 7cb33 (1f:4b33)
 	endchannel
 
 
-SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
+SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@ SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_1f_20_Ch3: ; 7cb80 (1f:4b80)
+SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b)
 	endchannel
diff --git a/audio/sfx/sfx_08_20.asm b/audio/sfx/cry0c_2.asm
index 633276a8..ef598b3e 100755..100644
--- a/audio/sfx/sfx_08_20.asm
+++ b/audio/sfx/cry0c_2.asm
@@ -1,4 +1,4 @@
-SFX_08_20_Ch1: ; 20d66 (8:4d66)
+SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_08_20_Ch1: ; 20d66 (8:4d66)
 	endchannel
 
 
-SFX_08_20_Ch2: ; 20d8d (8:4d8d)
+SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@ SFX_08_20_Ch2: ; 20d8d (8:4d8d)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_08_20_Ch3: ; 20db3 (8:4db3)
+SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3)
 	endchannel
diff --git a/audio/sfx/sfx_02_20.asm b/audio/sfx/cry0c_3.asm
index 741ae0e8..4075ac51 100755..100644
--- a/audio/sfx/sfx_02_20.asm
+++ b/audio/sfx/cry0c_3.asm
@@ -1,4 +1,4 @@
-SFX_02_20_Ch1: ; 8abe (2:4abe)
+SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33)
 	dutycycle 204
 	unknownsfx0x20 8, 245, 0, 6
 	unknownsfx0x20 2, 210, 56, 6
@@ -12,7 +12,7 @@ SFX_02_20_Ch1: ; 8abe (2:4abe)
 	endchannel
 
 
-SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
+SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a)
 	dutycycle 68
 	unknownsfx0x20 12, 195, 192, 5
 	unknownsfx0x20 3, 177, 249, 5
@@ -25,5 +25,5 @@ SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
 	unknownsfx0x20 8, 145, 225, 5
 
 
-SFX_02_20_Ch3: ; 8b0b (2:4b0b)
+SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80)
 	endchannel
diff --git a/audio/sfx/sfx_02_21.asm b/audio/sfx/cry0d_1.asm
index 4c7bebee..591bf58e 100755..100644
--- a/audio/sfx/sfx_02_21.asm
+++ b/audio/sfx/cry0d_1.asm
@@ -1,4 +1,4 @@
-SFX_02_21_Ch1: ; 8b2a (2:4b2a)
+SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_02_21_Ch1: ; 8b2a (2:4b2a)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_02_21_Ch1
+	loopchannel 2, SFX_Cry0D_1_Ch1
 	endchannel
 
 
-SFX_02_21_Ch2: ; 8b49 (2:4b49)
+SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_02_21_Ch2: ; 8b49 (2:4b49)
 	endchannel
 
 
-SFX_02_21_Ch3: ; 8b78 (2:4b78)
+SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
diff --git a/audio/sfx/sfx_1f_21.asm b/audio/sfx/cry0d_2.asm
index faf056f2..a7ca34f1 100755..100644
--- a/audio/sfx/sfx_1f_21.asm
+++ b/audio/sfx/cry0d_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f)
+SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_1f_21_Ch1
+	loopchannel 2, SFX_Cry0D_2_Ch1
 	endchannel
 
 
-SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe)
+SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe)
 	endchannel
 
 
-SFX_1f_21_Ch3: ; 7cbed (1f:4bed)
+SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
diff --git a/audio/sfx/sfx_08_21.asm b/audio/sfx/cry0d_3.asm
index 5279435a..a9187dc8 100755..100644
--- a/audio/sfx/sfx_08_21.asm
+++ b/audio/sfx/cry0d_3.asm
@@ -1,4 +1,4 @@
-SFX_08_21_Ch1: ; 20dd2 (8:4dd2)
+SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f)
 	dutycycle 136
 	unknownsfx0x20 5, 242, 80, 6
 	unknownsfx0x20 9, 209, 96, 6
@@ -6,11 +6,11 @@ SFX_08_21_Ch1: ; 20dd2 (8:4dd2)
 	unknownsfx0x20 9, 193, 34, 6
 	unknownsfx0x20 5, 242, 16, 6
 	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_08_21_Ch1
+	loopchannel 2, SFX_Cry0D_3_Ch1
 	endchannel
 
 
-SFX_08_21_Ch2: ; 20df1 (8:4df1)
+SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe)
 	dutycycle 64
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 5, 242, 81, 6
@@ -26,7 +26,7 @@ SFX_08_21_Ch2: ; 20df1 (8:4df1)
 	endchannel
 
 
-SFX_08_21_Ch3: ; 20e20 (8:4e20)
+SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed)
 	unknownnoise0x20 6, 210, 28
 	unknownnoise0x20 9, 177, 44
 	unknownnoise0x20 8, 194, 44
diff --git a/audio/sfx/sfx_02_22.asm b/audio/sfx/cry0e_1.asm
index 6d4a8f7d..1e778dea 100755..100644
--- a/audio/sfx/sfx_02_22.asm
+++ b/audio/sfx/cry0e_1.asm
@@ -1,4 +1,4 @@
-SFX_02_22_Ch1: ; 89af (2:49af)
+SFX_Cry0E_1_Ch1: ; 89af (2:49af)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_02_22_Ch1: ; 89af (2:49af)
 	endchannel
 
 
-SFX_02_22_Ch2: ; 89c2 (2:49c2)
+SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@ SFX_02_22_Ch2: ; 89c2 (2:49c2)
 	endchannel
 
 
-SFX_02_22_Ch3: ; 89d5 (2:49d5)
+SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
diff --git a/audio/sfx/sfx_08_22.asm b/audio/sfx/cry0e_2.asm
index 6a54311f..bab74449 100755..100644
--- a/audio/sfx/sfx_08_22.asm
+++ b/audio/sfx/cry0e_2.asm
@@ -1,4 +1,4 @@
-SFX_08_22_Ch1: ; 20c57 (8:4c57)
+SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_08_22_Ch1: ; 20c57 (8:4c57)
 	endchannel
 
 
-SFX_08_22_Ch2: ; 20c6a (8:4c6a)
+SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@ SFX_08_22_Ch2: ; 20c6a (8:4c6a)
 	endchannel
 
 
-SFX_08_22_Ch3: ; 20c7d (8:4c7d)
+SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
diff --git a/audio/sfx/sfx_1f_22.asm b/audio/sfx/cry0e_3.asm
index bc9c9690..da14b3a7 100755..100644
--- a/audio/sfx/sfx_1f_22.asm
+++ b/audio/sfx/cry0e_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_22_Ch1: ; 7ca24 (1f:4a24)
+SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24)
 	dutycycle 165
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 4, 242, 128, 7
@@ -7,7 +7,7 @@ SFX_1f_22_Ch1: ; 7ca24 (1f:4a24)
 	endchannel
 
 
-SFX_1f_22_Ch2: ; 7ca37 (1f:4a37)
+SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37)
 	dutycycle 10
 	unknownsfx0x20 4, 177, 225, 6
 	unknownsfx0x20 3, 194, 225, 6
@@ -16,7 +16,7 @@ SFX_1f_22_Ch2: ; 7ca37 (1f:4a37)
 	endchannel
 
 
-SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a)
+SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a)
 	unknownnoise0x20 2, 97, 50
 	unknownnoise0x20 2, 97, 33
 	unknownnoise0x20 8, 97, 17
diff --git a/audio/sfx/sfx_08_23.asm b/audio/sfx/cry0f_1.asm
index 03b63546..84563293 100755..100644
--- a/audio/sfx/sfx_08_23.asm
+++ b/audio/sfx/cry0f_1.asm
@@ -1,4 +1,4 @@
-SFX_08_23_Ch1: ; 20b99 (8:4b99)
+SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_08_23_Ch1: ; 20b99 (8:4b99)
 	endchannel
 
 
-SFX_08_23_Ch2: ; 20bb4 (8:4bb4)
+SFX_Cry0F_1_Ch2: ; 890c (2:490c)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@ SFX_08_23_Ch2: ; 20bb4 (8:4bb4)
 	endchannel
 
 
-SFX_08_23_Ch3: ; 20bcf (8:4bcf)
+SFX_Cry0F_1_Ch3: ; 8927 (2:4927)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
diff --git a/audio/sfx/sfx_02_23.asm b/audio/sfx/cry0f_2.asm
index fb0ff58c..0fbaeb7a 100755..100644
--- a/audio/sfx/sfx_02_23.asm
+++ b/audio/sfx/cry0f_2.asm
@@ -1,4 +1,4 @@
-SFX_02_23_Ch1: ; 88f1 (2:48f1)
+SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_02_23_Ch1: ; 88f1 (2:48f1)
 	endchannel
 
 
-SFX_02_23_Ch2: ; 890c (2:490c)
+SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@ SFX_02_23_Ch2: ; 890c (2:490c)
 	endchannel
 
 
-SFX_02_23_Ch3: ; 8927 (2:4927)
+SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
diff --git a/audio/sfx/sfx_1f_23.asm b/audio/sfx/cry0f_3.asm
index 51066146..810ab949 100755..100644
--- a/audio/sfx/sfx_1f_23.asm
+++ b/audio/sfx/cry0f_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_23_Ch1: ; 7c966 (1f:4966)
+SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966)
 	dutycycle 241
 	unknownsfx0x20 4, 247, 192, 7
 	unknownsfx0x20 12, 230, 194, 7
@@ -9,7 +9,7 @@ SFX_1f_23_Ch1: ; 7c966 (1f:4966)
 	endchannel
 
 
-SFX_1f_23_Ch2: ; 7c981 (1f:4981)
+SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981)
 	dutycycle 204
 	unknownsfx0x20 3, 199, 129, 7
 	unknownsfx0x20 12, 182, 128, 7
@@ -20,7 +20,7 @@ SFX_1f_23_Ch2: ; 7c981 (1f:4981)
 	endchannel
 
 
-SFX_1f_23_Ch3: ; 7c99c (1f:499c)
+SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c)
 	unknownnoise0x20 3, 228, 60
 	unknownnoise0x20 12, 214, 44
 	unknownnoise0x20 4, 228, 60
diff --git a/audio/sfx/sfx_02_24.asm b/audio/sfx/cry10_1.asm
index c1ff6fcc..956fc910 100755..100644
--- a/audio/sfx/sfx_02_24.asm
+++ b/audio/sfx/cry10_1.asm
@@ -1,4 +1,4 @@
-SFX_02_24_Ch1: ; 8937 (2:4937)
+SFX_Cry10_1_Ch1: ; 8937 (2:4937)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_02_24_Ch1: ; 8937 (2:4937)
 	endchannel
 
 
-SFX_02_24_Ch2: ; 895a (2:495a)
+SFX_Cry10_1_Ch2: ; 895a (2:495a)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@ SFX_02_24_Ch2: ; 895a (2:495a)
 	endchannel
 
 
-SFX_02_24_Ch3: ; 897d (2:497d)
+SFX_Cry10_1_Ch3: ; 897d (2:497d)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
diff --git a/audio/sfx/sfx_08_24.asm b/audio/sfx/cry10_2.asm
index f94e2535..5d4cc3aa 100755..100644
--- a/audio/sfx/sfx_08_24.asm
+++ b/audio/sfx/cry10_2.asm
@@ -1,4 +1,4 @@
-SFX_08_24_Ch1: ; 20bdf (8:4bdf)
+SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_08_24_Ch1: ; 20bdf (8:4bdf)
 	endchannel
 
 
-SFX_08_24_Ch2: ; 20c02 (8:4c02)
+SFX_Cry10_2_Ch2: ; 20c02 (8:4c02)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@ SFX_08_24_Ch2: ; 20c02 (8:4c02)
 	endchannel
 
 
-SFX_08_24_Ch3: ; 20c25 (8:4c25)
+SFX_Cry10_2_Ch3: ; 20c25 (8:4c25)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
diff --git a/audio/sfx/sfx_1f_24.asm b/audio/sfx/cry10_3.asm
index f4d4e4de..2d5df465 100755..100644
--- a/audio/sfx/sfx_1f_24.asm
+++ b/audio/sfx/cry10_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_24_Ch1: ; 7c9ac (1f:49ac)
+SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac)
 	dutycycle 201
 	unknownsfx0x20 8, 247, 128, 6
 	unknownsfx0x20 2, 247, 96, 6
@@ -11,7 +11,7 @@ SFX_1f_24_Ch1: ; 7c9ac (1f:49ac)
 	endchannel
 
 
-SFX_1f_24_Ch2: ; 7c9cf (1f:49cf)
+SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf)
 	dutycycle 121
 	unknownsfx0x20 10, 231, 130, 6
 	unknownsfx0x20 2, 231, 98, 6
@@ -24,7 +24,7 @@ SFX_1f_24_Ch2: ; 7c9cf (1f:49cf)
 	endchannel
 
 
-SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2)
+SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2)
 	unknownnoise0x20 4, 116, 33
 	unknownnoise0x20 4, 116, 16
 	unknownnoise0x20 4, 113, 32
diff --git a/audio/sfx/sfx_1f_25.asm b/audio/sfx/cry11_1.asm
index 4b137a75..dd354c90 100755..100644
--- a/audio/sfx/sfx_1f_25.asm
+++ b/audio/sfx/cry11_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_25_Ch1: ; 7c888 (1f:4888)
+SFX_Cry11_1_Ch1: ; 8813 (2:4813)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_1f_25_Ch1: ; 7c888 (1f:4888)
 	endchannel
 
 
-SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7)
+SFX_Cry11_1_Ch2: ; 8832 (2:4832)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7)
 	endchannel
 
 
-SFX_1f_25_Ch3: ; 7c8ca (1f:48ca)
+SFX_Cry11_1_Ch3: ; 8855 (2:4855)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
diff --git a/audio/sfx/sfx_08_25.asm b/audio/sfx/cry11_2.asm
index 55954029..37546fe1 100755..100644
--- a/audio/sfx/sfx_08_25.asm
+++ b/audio/sfx/cry11_2.asm
@@ -1,4 +1,4 @@
-SFX_08_25_Ch1: ; 20abb (8:4abb)
+SFX_Cry11_2_Ch1: ; 20abb (8:4abb)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_08_25_Ch1: ; 20abb (8:4abb)
 	endchannel
 
 
-SFX_08_25_Ch2: ; 20ada (8:4ada)
+SFX_Cry11_2_Ch2: ; 20ada (8:4ada)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_08_25_Ch2: ; 20ada (8:4ada)
 	endchannel
 
 
-SFX_08_25_Ch3: ; 20afd (8:4afd)
+SFX_Cry11_2_Ch3: ; 20afd (8:4afd)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
diff --git a/audio/sfx/sfx_02_25.asm b/audio/sfx/cry11_3.asm
index f324be84..75b9a861 100755..100644
--- a/audio/sfx/sfx_02_25.asm
+++ b/audio/sfx/cry11_3.asm
@@ -1,4 +1,4 @@
-SFX_02_25_Ch1: ; 8813 (2:4813)
+SFX_Cry11_3_Ch1: ; 7c888 (1f:4888)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 160, 7
 	unknownsfx0x20 8, 230, 164, 7
@@ -10,7 +10,7 @@ SFX_02_25_Ch1: ; 8813 (2:4813)
 	endchannel
 
 
-SFX_02_25_Ch2: ; 8832 (2:4832)
+SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7)
 	dutycycle 10
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 6, 167, 65, 7
@@ -23,7 +23,7 @@ SFX_02_25_Ch2: ; 8832 (2:4832)
 	endchannel
 
 
-SFX_02_25_Ch3: ; 8855 (2:4855)
+SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca)
 	unknownnoise0x20 2, 242, 76
 	unknownnoise0x20 6, 230, 58
 	unknownnoise0x20 4, 215, 58
diff --git a/audio/sfx/sfx_08_26.asm b/audio/sfx/cry12_1.asm
index c166605b..a6b1a0f8 100755..100644
--- a/audio/sfx/sfx_08_26.asm
+++ b/audio/sfx/cry12_1.asm
@@ -1,4 +1,4 @@
-SFX_08_26_Ch1: ; 20fd3 (8:4fd3)
+SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_08_26_Ch1: ; 20fd3 (8:4fd3)
 	endchannel
 
 
-SFX_08_26_Ch2: ; 20fe6 (8:4fe6)
+SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@ SFX_08_26_Ch2: ; 20fe6 (8:4fe6)
 	endchannel
 
 
-SFX_08_26_Ch3: ; 20ff9 (8:4ff9)
+SFX_Cry12_1_Ch3: ; 8d51 (2:4d51)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
diff --git a/audio/sfx/sfx_02_26.asm b/audio/sfx/cry12_2.asm
index 6ecd820f..e2b29de7 100755..100644
--- a/audio/sfx/sfx_02_26.asm
+++ b/audio/sfx/cry12_2.asm
@@ -1,4 +1,4 @@
-SFX_02_26_Ch1: ; 8d2b (2:4d2b)
+SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_02_26_Ch1: ; 8d2b (2:4d2b)
 	endchannel
 
 
-SFX_02_26_Ch2: ; 8d3e (2:4d3e)
+SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@ SFX_02_26_Ch2: ; 8d3e (2:4d3e)
 	endchannel
 
 
-SFX_02_26_Ch3: ; 8d51 (2:4d51)
+SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
diff --git a/audio/sfx/sfx_1f_26.asm b/audio/sfx/cry12_3.asm
index f3613315..143f8045 100755..100644
--- a/audio/sfx/sfx_1f_26.asm
+++ b/audio/sfx/cry12_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_26_Ch1: ; 7cda0 (1f:4da0)
+SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0)
 	dutycycle 165
 	unknownsfx0x20 12, 242, 64, 4
 	unknownsfx0x20 15, 227, 160, 4
@@ -7,7 +7,7 @@ SFX_1f_26_Ch1: ; 7cda0 (1f:4da0)
 	endchannel
 
 
-SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3)
+SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3)
 	dutycycle 238
 	unknownsfx0x20 11, 210, 56, 4
 	unknownsfx0x20 14, 198, 152, 4
@@ -16,7 +16,7 @@ SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3)
 	endchannel
 
 
-SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6)
+SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6)
 	unknownnoise0x20 10, 230, 108
 	unknownnoise0x20 15, 210, 92
 	unknownnoise0x20 3, 194, 108
diff --git a/audio/sfx/sfx_02_27.asm b/audio/sfx/cry13_1.asm
index 2449cf89..c2f1002f 100755..100644
--- a/audio/sfx/sfx_02_27.asm
+++ b/audio/sfx/cry13_1.asm
@@ -1,4 +1,4 @@
-SFX_02_27_Ch1: ; 8d5e (2:4d5e)
+SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_02_27_Ch1: ; 8d5e (2:4d5e)
 	endchannel
 
 
-SFX_02_27_Ch2: ; 8d79 (2:4d79)
+SFX_Cry13_1_Ch2: ; 8d79 (2:4d79)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_02_27_Ch2: ; 8d79 (2:4d79)
 	endchannel
 
 
-SFX_02_27_Ch3: ; 8d94 (2:4d94)
+SFX_Cry13_1_Ch3: ; 8d94 (2:4d94)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
diff --git a/audio/sfx/sfx_1f_27.asm b/audio/sfx/cry13_2.asm
index 81ec2ab1..b072fb07 100755..100644
--- a/audio/sfx/sfx_1f_27.asm
+++ b/audio/sfx/cry13_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3)
+SFX_Cry13_2_Ch1: ; 21006 (8:5006)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3)
 	endchannel
 
 
-SFX_1f_27_Ch2: ; 7cdee (1f:4dee)
+SFX_Cry13_2_Ch2: ; 21021 (8:5021)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_1f_27_Ch2: ; 7cdee (1f:4dee)
 	endchannel
 
 
-SFX_1f_27_Ch3: ; 7ce09 (1f:4e09)
+SFX_Cry13_2_Ch3: ; 2103c (8:503c)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
diff --git a/audio/sfx/sfx_08_27.asm b/audio/sfx/cry13_3.asm
index 9443379c..f2c110b8 100755..100644
--- a/audio/sfx/sfx_08_27.asm
+++ b/audio/sfx/cry13_3.asm
@@ -1,4 +1,4 @@
-SFX_08_27_Ch1: ; 21006 (8:5006)
+SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3)
 	dutycycle 51
 	unknownsfx0x20 15, 246, 192, 5
 	unknownsfx0x20 8, 227, 188, 5
@@ -9,7 +9,7 @@ SFX_08_27_Ch1: ; 21006 (8:5006)
 	endchannel
 
 
-SFX_08_27_Ch2: ; 21021 (8:5021)
+SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee)
 	dutycycle 153
 	unknownsfx0x20 14, 198, 177, 4
 	unknownsfx0x20 7, 195, 173, 4
@@ -20,7 +20,7 @@ SFX_08_27_Ch2: ; 21021 (8:5021)
 	endchannel
 
 
-SFX_08_27_Ch3: ; 2103c (8:503c)
+SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09)
 	unknownnoise0x20 10, 230, 92
 	unknownnoise0x20 10, 214, 108
 	unknownnoise0x20 4, 194, 76
diff --git a/audio/sfx/sfx_08_28.asm b/audio/sfx/cry14_1.asm
index 178ce5de..125fe86e 100755..100644
--- a/audio/sfx/sfx_08_28.asm
+++ b/audio/sfx/cry14_1.asm
@@ -1,4 +1,4 @@
-SFX_08_28_Ch1: ; 2104f (8:504f)
+SFX_Cry14_1_Ch1: ; 8da7 (2:4da7)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_08_28_Ch1: ; 2104f (8:504f)
 	endchannel
 
 
-SFX_08_28_Ch2: ; 2105e (8:505e)
+SFX_Cry14_1_Ch2: ; 8db6 (2:4db6)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@ SFX_08_28_Ch2: ; 2105e (8:505e)
 	endchannel
 
 
-SFX_08_28_Ch3: ; 2106d (8:506d)
+SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
diff --git a/audio/sfx/sfx_1f_28.asm b/audio/sfx/cry14_2.asm
index 2a510f48..3ba2ac26 100755..100644
--- a/audio/sfx/sfx_1f_28.asm
+++ b/audio/sfx/cry14_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c)
+SFX_Cry14_2_Ch1: ; 2104f (8:504f)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c)
 	endchannel
 
 
-SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b)
+SFX_Cry14_2_Ch2: ; 2105e (8:505e)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@ SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b)
 	endchannel
 
 
-SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a)
+SFX_Cry14_2_Ch3: ; 2106d (8:506d)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
diff --git a/audio/sfx/sfx_02_28.asm b/audio/sfx/cry14_3.asm
index bb872795..fe2cd1e8 100755..100644
--- a/audio/sfx/sfx_02_28.asm
+++ b/audio/sfx/cry14_3.asm
@@ -1,4 +1,4 @@
-SFX_02_28_Ch1: ; 8da7 (2:4da7)
+SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c)
 	dutycycle 240
 	unknownsfx0x20 8, 228, 144, 7
 	unknownsfx0x20 15, 245, 192, 7
@@ -6,7 +6,7 @@ SFX_02_28_Ch1: ; 8da7 (2:4da7)
 	endchannel
 
 
-SFX_02_28_Ch2: ; 8db6 (2:4db6)
+SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b)
 	dutycycle 165
 	unknownsfx0x20 10, 196, 113, 7
 	unknownsfx0x20 15, 182, 162, 7
@@ -14,7 +14,7 @@ SFX_02_28_Ch2: ; 8db6 (2:4db6)
 	endchannel
 
 
-SFX_02_28_Ch3: ; 8dc5 (2:4dc5)
+SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a)
 	unknownnoise0x20 8, 228, 76
 	unknownnoise0x20 14, 196, 60
 	unknownnoise0x20 8, 209, 44
diff --git a/audio/sfx/sfx_02_29.asm b/audio/sfx/cry15_1.asm
index 466a8bc8..54f94deb 100755..100644
--- a/audio/sfx/sfx_02_29.asm
+++ b/audio/sfx/cry15_1.asm
@@ -1,4 +1,4 @@
-SFX_02_29_Ch1: ; 8e35 (2:4e35)
+SFX_Cry15_1_Ch1: ; 8e35 (2:4e35)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_02_29_Ch1: ; 8e35 (2:4e35)
 	endchannel
 
 
-SFX_02_29_Ch2: ; 8e50 (2:4e50)
+SFX_Cry15_1_Ch2: ; 8e50 (2:4e50)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_02_29_Ch2: ; 8e50 (2:4e50)
 	endchannel
 
 
-SFX_02_29_Ch3: ; 8e6b (2:4e6b)
+SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
diff --git a/audio/sfx/sfx_1f_29.asm b/audio/sfx/cry15_2.asm
index cb7b5b0c..14b1af72 100755..100644
--- a/audio/sfx/sfx_1f_29.asm
+++ b/audio/sfx/cry15_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa)
+SFX_Cry15_2_Ch1: ; 210dd (8:50dd)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa)
 	endchannel
 
 
-SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5)
+SFX_Cry15_2_Ch2: ; 210f8 (8:50f8)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5)
 	endchannel
 
 
-SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0)
+SFX_Cry15_2_Ch3: ; 21113 (8:5113)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
diff --git a/audio/sfx/sfx_08_29.asm b/audio/sfx/cry15_3.asm
index ff22501f..36951439 100755..100644
--- a/audio/sfx/sfx_08_29.asm
+++ b/audio/sfx/cry15_3.asm
@@ -1,4 +1,4 @@
-SFX_08_29_Ch1: ; 210dd (8:50dd)
+SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa)
 	dutycycle 240
 	unknownsfx0x20 4, 243, 128, 7
 	unknownsfx0x20 15, 231, 0, 7
@@ -9,7 +9,7 @@ SFX_08_29_Ch1: ; 210dd (8:50dd)
 	endchannel
 
 
-SFX_08_29_Ch2: ; 210f8 (8:50f8)
+SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5)
 	dutycycle 90
 	unknownsfx0x20 6, 195, 1, 7
 	unknownsfx0x20 14, 183, 129, 6
@@ -20,7 +20,7 @@ SFX_08_29_Ch2: ; 210f8 (8:50f8)
 	endchannel
 
 
-SFX_08_29_Ch3: ; 21113 (8:5113)
+SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0)
 	unknownnoise0x20 6, 227, 92
 	unknownnoise0x20 14, 214, 76
 	unknownnoise0x20 6, 198, 60
diff --git a/audio/sfx/sfx_02_2a.asm b/audio/sfx/cry16_1.asm
index 13356384..91fa2596 100755..100644
--- a/audio/sfx/sfx_02_2a.asm
+++ b/audio/sfx/cry16_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2a_Ch1: ; 8cc8 (2:4cc8)
+SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_02_2a_Ch1: ; 8cc8 (2:4cc8)
 	endchannel
 
 
-SFX_02_2a_Ch2: ; 8cd7 (2:4cd7)
+SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@ SFX_02_2a_Ch2: ; 8cd7 (2:4cd7)
 	endchannel
 
 
-SFX_02_2a_Ch3: ; 8ce6 (2:4ce6)
+SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
diff --git a/audio/sfx/sfx_1f_2a.asm b/audio/sfx/cry16_2.asm
index fb0d330f..5e29eba8 100755..100644
--- a/audio/sfx/sfx_1f_2a.asm
+++ b/audio/sfx/cry16_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d)
+SFX_Cry16_2_Ch1: ; 20f70 (8:4f70)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d)
 	endchannel
 
 
-SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c)
+SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@ SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c)
 	endchannel
 
 
-SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b)
+SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
diff --git a/audio/sfx/sfx_08_2a.asm b/audio/sfx/cry16_3.asm
index 8b9aeeaf..af32e9ef 100755..100644
--- a/audio/sfx/sfx_08_2a.asm
+++ b/audio/sfx/cry16_3.asm
@@ -1,4 +1,4 @@
-SFX_08_2a_Ch1: ; 20f70 (8:4f70)
+SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d)
 	dutycycle 240
 	unknownsfx0x20 15, 215, 128, 7
 	unknownsfx0x20 4, 230, 160, 7
@@ -6,7 +6,7 @@ SFX_08_2a_Ch1: ; 20f70 (8:4f70)
 	endchannel
 
 
-SFX_08_2a_Ch2: ; 20f7f (8:4f7f)
+SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c)
 	dutycycle 90
 	unknownsfx0x20 15, 199, 83, 7
 	unknownsfx0x20 5, 182, 114, 7
@@ -14,7 +14,7 @@ SFX_08_2a_Ch2: ; 20f7f (8:4f7f)
 	endchannel
 
 
-SFX_08_2a_Ch3: ; 20f8e (8:4f8e)
+SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b)
 	unknownnoise0x20 13, 246, 76
 	unknownnoise0x20 4, 230, 60
 	unknownnoise0x20 15, 242, 76
diff --git a/audio/sfx/sfx_02_2b.asm b/audio/sfx/cry17_1.asm
index 5aa42f68..2f2cde11 100755..100644
--- a/audio/sfx/sfx_02_2b.asm
+++ b/audio/sfx/cry17_1.asm
@@ -1,4 +1,4 @@
-SFX_02_2b_Ch1: ; 8e7e (2:4e7e)
+SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_02_2b_Ch1: ; 8e7e (2:4e7e)
 	endchannel
 
 
-SFX_02_2b_Ch2: ; 8e91 (2:4e91)
+SFX_Cry17_1_Ch2: ; 8e91 (2:4e91)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@ SFX_02_2b_Ch2: ; 8e91 (2:4e91)
 	endchannel
 
 
-SFX_02_2b_Ch3: ; 8ea4 (2:4ea4)
+SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
diff --git a/audio/sfx/sfx_08_2b.asm b/audio/sfx/cry17_2.asm
index b35755a4..cca78ae2 100755..100644
--- a/audio/sfx/sfx_08_2b.asm
+++ b/audio/sfx/cry17_2.asm
@@ -1,4 +1,4 @@
-SFX_08_2b_Ch1: ; 21126 (8:5126)
+SFX_Cry17_2_Ch1: ; 21126 (8:5126)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_08_2b_Ch1: ; 21126 (8:5126)
 	endchannel
 
 
-SFX_08_2b_Ch2: ; 21139 (8:5139)
+SFX_Cry17_2_Ch2: ; 21139 (8:5139)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@ SFX_08_2b_Ch2: ; 21139 (8:5139)
 	endchannel
 
 
-SFX_08_2b_Ch3: ; 2114c (8:514c)
+SFX_Cry17_2_Ch3: ; 2114c (8:514c)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
diff --git a/audio/sfx/sfx_1f_2b.asm b/audio/sfx/cry17_3.asm
index 1b588221..6aad35d0 100755..100644
--- a/audio/sfx/sfx_1f_2b.asm
+++ b/audio/sfx/cry17_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3)
+SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3)
 	dutycycle 15
 	unknownsfx0x20 15, 247, 0, 5
 	unknownsfx0x20 15, 231, 8, 5
@@ -7,7 +7,7 @@ SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3)
 	endchannel
 
 
-SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06)
+SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06)
 	dutycycle 68
 	unknownsfx0x20 14, 215, 129, 4
 	unknownsfx0x20 14, 199, 137, 4
@@ -16,7 +16,7 @@ SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06)
 	endchannel
 
 
-SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19)
+SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19)
 	unknownnoise0x20 14, 247, 124
 	unknownnoise0x20 12, 246, 108
 	unknownnoise0x20 9, 228, 124
diff --git a/audio/sfx/sfx_08_2c.asm b/audio/sfx/cry18_1.asm
index b2dbc764..576ea693 100755..100644
--- a/audio/sfx/sfx_08_2c.asm
+++ b/audio/sfx/cry18_1.asm
@@ -1,4 +1,4 @@
-SFX_08_2c_Ch1: ; 21236 (8:5236)
+SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_08_2c_Ch1: ; 21236 (8:5236)
 	endchannel
 
 
-SFX_08_2c_Ch2: ; 21259 (8:5259)
+SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_08_2c_Ch2: ; 21259 (8:5259)
 	endchannel
 
 
-SFX_08_2c_Ch3: ; 2127c (8:527c)
+SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/sfx_02_2c.asm b/audio/sfx/cry18_2.asm
index 39f2a7da..333ddb9e 100755..100644
--- a/audio/sfx/sfx_02_2c.asm
+++ b/audio/sfx/cry18_2.asm
@@ -1,4 +1,4 @@
-SFX_02_2c_Ch1: ; 8f8e (2:4f8e)
+SFX_Cry18_2_Ch1: ; 21236 (8:5236)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_02_2c_Ch1: ; 8f8e (2:4f8e)
 	endchannel
 
 
-SFX_02_2c_Ch2: ; 8fb1 (2:4fb1)
+SFX_Cry18_2_Ch2: ; 21259 (8:5259)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_02_2c_Ch2: ; 8fb1 (2:4fb1)
 	endchannel
 
 
-SFX_02_2c_Ch3: ; 8fd4 (2:4fd4)
+SFX_Cry18_2_Ch3: ; 2127c (8:527c)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/sfx_1f_2c.asm b/audio/sfx/cry18_3.asm
index 9c051799..3c7b1a99 100755..100644
--- a/audio/sfx/sfx_1f_2c.asm
+++ b/audio/sfx/cry18_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2c_Ch1: ; 7d003 (1f:5003)
+SFX_Cry18_3_Ch1: ; 7d003 (1f:5003)
 	dutycycle 80
 	unknownsfx0x20 10, 245, 128, 6
 	unknownsfx0x20 3, 226, 160, 6
@@ -11,7 +11,7 @@ SFX_1f_2c_Ch1: ; 7d003 (1f:5003)
 	endchannel
 
 
-SFX_1f_2c_Ch2: ; 7d026 (1f:5026)
+SFX_Cry18_3_Ch2: ; 7d026 (1f:5026)
 	dutycycle 15
 	unknownsfx0x20 9, 213, 49, 6
 	unknownsfx0x20 3, 210, 82, 6
@@ -24,7 +24,7 @@ SFX_1f_2c_Ch2: ; 7d026 (1f:5026)
 	endchannel
 
 
-SFX_1f_2c_Ch3: ; 7d049 (1f:5049)
+SFX_Cry18_3_Ch3: ; 7d049 (1f:5049)
 	unknownnoise0x20 6, 227, 76
 	unknownnoise0x20 4, 195, 60
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/sfx_08_2d.asm b/audio/sfx/cry19_1.asm
index 4f7f5422..94607b9b 100755..100644
--- a/audio/sfx/sfx_08_2d.asm
+++ b/audio/sfx/cry19_1.asm
@@ -1,4 +1,4 @@
-SFX_08_2d_Ch1: ; 20f4e (8:4f4e)
+SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_08_2d_Ch1: ; 20f4e (8:4f4e)
 	endchannel
 
 
-SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
+SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@ SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_08_2d_Ch3: ; 20f6f (8:4f6f)
+SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7)
 	endchannel
diff --git a/audio/sfx/sfx_02_2d.asm b/audio/sfx/cry19_2.asm
index 1e9ef3e5..717a5d2b 100755..100644
--- a/audio/sfx/sfx_02_2d.asm
+++ b/audio/sfx/cry19_2.asm
@@ -1,4 +1,4 @@
-SFX_02_2d_Ch1: ; 8ca6 (2:4ca6)
+SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_02_2d_Ch1: ; 8ca6 (2:4ca6)
 	endchannel
 
 
-SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
+SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@ SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_02_2d_Ch3: ; 8cc7 (2:4cc7)
+SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f)
 	endchannel
diff --git a/audio/sfx/sfx_1f_2d.asm b/audio/sfx/cry19_3.asm
index c46af9f2..535be2b6 100755..100644
--- a/audio/sfx/sfx_1f_2d.asm
+++ b/audio/sfx/cry19_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b)
+SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b)
 	dutycycle 27
 	unknownsfx0x20 7, 210, 64, 7
 	unknownsfx0x20 15, 229, 96, 7
@@ -6,7 +6,7 @@ SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b)
 	endchannel
 
 
-SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
+SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a)
 	dutycycle 129
 	unknownsfx0x20 2, 194, 1, 7
 	unknownsfx0x20 4, 194, 8, 7
@@ -14,5 +14,5 @@ SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
 	unknownsfx0x20 15, 162, 1, 7
 
 
-SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c)
+SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c)
 	endchannel
diff --git a/audio/sfx/sfx_08_2e.asm b/audio/sfx/cry1a_1.asm
index 7a6e9257..0217deef 100755..100644
--- a/audio/sfx/sfx_08_2e.asm
+++ b/audio/sfx/cry1a_1.asm
@@ -1,4 +1,4 @@
-SFX_08_2e_Ch1: ; 211a7 (8:51a7)
+SFX_Cry1A_1_Ch1: ; 8eff (2:4eff)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_08_2e_Ch1: ; 211a7 (8:51a7)
 	endchannel
 
 
-SFX_08_2e_Ch2: ; 211c2 (8:51c2)
+SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_08_2e_Ch2: ; 211c2 (8:51c2)
 	endchannel
 
 
-SFX_08_2e_Ch3: ; 211dd (8:51dd)
+SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/sfx_02_2e.asm b/audio/sfx/cry1a_2.asm
index d0c25b47..c94fc657 100755..100644
--- a/audio/sfx/sfx_02_2e.asm
+++ b/audio/sfx/cry1a_2.asm
@@ -1,4 +1,4 @@
-SFX_02_2e_Ch1: ; 8eff (2:4eff)
+SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_02_2e_Ch1: ; 8eff (2:4eff)
 	endchannel
 
 
-SFX_02_2e_Ch2: ; 8f1a (2:4f1a)
+SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_02_2e_Ch2: ; 8f1a (2:4f1a)
 	endchannel
 
 
-SFX_02_2e_Ch3: ; 8f35 (2:4f35)
+SFX_Cry1A_2_Ch3: ; 211dd (8:51dd)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/sfx_1f_2e.asm b/audio/sfx/cry1a_3.asm
index 50f9f172..29ff2ec0 100755..100644
--- a/audio/sfx/sfx_1f_2e.asm
+++ b/audio/sfx/cry1a_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74)
+SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 64, 7
 	unknownsfx0x20 12, 230, 68, 7
@@ -9,7 +9,7 @@ SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74)
 	endchannel
 
 
-SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f)
+SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f)
 	dutycycle 10
 	unknownsfx0x20 6, 199, 1, 7
 	unknownsfx0x20 11, 182, 2, 7
@@ -20,7 +20,7 @@ SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f)
 	endchannel
 
 
-SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa)
+SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa)
 	unknownnoise0x20 3, 226, 60
 	unknownnoise0x20 8, 214, 76
 	unknownnoise0x20 5, 212, 60
diff --git a/audio/sfx/sfx_1f_2f.asm b/audio/sfx/cry1b_1.asm
index 10b6698c..858d724a 100755..100644
--- a/audio/sfx/sfx_1f_2f.asm
+++ b/audio/sfx/cry1b_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65)
+SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65)
 	endchannel
 
 
-SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c)
+SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@ SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c)
 	endchannel
 
 
-SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93)
+SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
diff --git a/audio/sfx/sfx_02_2f.asm b/audio/sfx/cry1b_2.asm
index ba0ecd23..423258ee 100755..100644
--- a/audio/sfx/sfx_02_2f.asm
+++ b/audio/sfx/cry1b_2.asm
@@ -1,4 +1,4 @@
-SFX_02_2f_Ch1: ; 8cf0 (2:4cf0)
+SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_02_2f_Ch1: ; 8cf0 (2:4cf0)
 	endchannel
 
 
-SFX_02_2f_Ch2: ; 8d07 (2:4d07)
+SFX_Cry1B_2_Ch2: ; 20faf (8:4faf)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@ SFX_02_2f_Ch2: ; 8d07 (2:4d07)
 	endchannel
 
 
-SFX_02_2f_Ch3: ; 8d1e (2:4d1e)
+SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
diff --git a/audio/sfx/sfx_08_2f.asm b/audio/sfx/cry1b_3.asm
index d26e86c0..7fe6019f 100755..100644
--- a/audio/sfx/sfx_08_2f.asm
+++ b/audio/sfx/cry1b_3.asm
@@ -1,4 +1,4 @@
-SFX_08_2f_Ch1: ; 20f98 (8:4f98)
+SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65)
 	dutycycle 240
 	unknownsfx0x20 6, 247, 192, 6
 	unknownsfx0x20 15, 231, 0, 7
@@ -8,7 +8,7 @@ SFX_08_2f_Ch1: ; 20f98 (8:4f98)
 	endchannel
 
 
-SFX_08_2f_Ch2: ; 20faf (8:4faf)
+SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c)
 	dutycycle 10
 	unknownsfx0x20 7, 230, 129, 6
 	unknownsfx0x20 14, 213, 193, 6
@@ -18,7 +18,7 @@ SFX_08_2f_Ch2: ; 20faf (8:4faf)
 	endchannel
 
 
-SFX_08_2f_Ch3: ; 20fc6 (8:4fc6)
+SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93)
 	unknownnoise0x20 10, 166, 60
 	unknownnoise0x20 14, 148, 44
 	unknownnoise0x20 5, 163, 60
diff --git a/audio/sfx/sfx_1f_30.asm b/audio/sfx/cry1c_1.asm
index 8862b34c..f7e66dfb 100755..100644
--- a/audio/sfx/sfx_1f_30.asm
+++ b/audio/sfx/cry1c_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_30_Ch1: ; 7cf26 (1f:4f26)
+SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_1f_30_Ch1: ; 7cf26 (1f:4f26)
 	endchannel
 
 
-SFX_1f_30_Ch2: ; 7cf49 (1f:4f49)
+SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@ SFX_1f_30_Ch2: ; 7cf49 (1f:4f49)
 	endchannel
 
 
-SFX_1f_30_Ch3: ; 7cf64 (1f:4f64)
+SFX_Cry1C_1_Ch3: ; 8eef (2:4eef)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
diff --git a/audio/sfx/sfx_02_30.asm b/audio/sfx/cry1c_2.asm
index 41a18486..8037fc96 100755..100644
--- a/audio/sfx/sfx_02_30.asm
+++ b/audio/sfx/cry1c_2.asm
@@ -1,4 +1,4 @@
-SFX_02_30_Ch1: ; 8eb1 (2:4eb1)
+SFX_Cry1C_2_Ch1: ; 21159 (8:5159)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_02_30_Ch1: ; 8eb1 (2:4eb1)
 	endchannel
 
 
-SFX_02_30_Ch2: ; 8ed4 (2:4ed4)
+SFX_Cry1C_2_Ch2: ; 2117c (8:517c)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@ SFX_02_30_Ch2: ; 8ed4 (2:4ed4)
 	endchannel
 
 
-SFX_02_30_Ch3: ; 8eef (2:4eef)
+SFX_Cry1C_2_Ch3: ; 21197 (8:5197)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
diff --git a/audio/sfx/sfx_08_30.asm b/audio/sfx/cry1c_3.asm
index 08e7da69..853eb1c6 100755..100644
--- a/audio/sfx/sfx_08_30.asm
+++ b/audio/sfx/cry1c_3.asm
@@ -1,4 +1,4 @@
-SFX_08_30_Ch1: ; 21159 (8:5159)
+SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26)
 	dutycycle 245
 	unknownsfx0x20 7, 214, 225, 7
 	unknownsfx0x20 6, 198, 226, 7
@@ -11,7 +11,7 @@ SFX_08_30_Ch1: ; 21159 (8:5159)
 	endchannel
 
 
-SFX_08_30_Ch2: ; 2117c (8:517c)
+SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49)
 	dutycycle 68
 	unknownsfx0x20 6, 195, 201, 7
 	unknownsfx0x20 6, 179, 199, 7
@@ -22,7 +22,7 @@ SFX_08_30_Ch2: ; 2117c (8:517c)
 	endchannel
 
 
-SFX_08_30_Ch3: ; 21197 (8:5197)
+SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64)
 	unknownnoise0x20 13, 25, 124
 	unknownnoise0x20 13, 247, 140
 	unknownnoise0x20 12, 214, 124
diff --git a/audio/sfx/sfx_02_31.asm b/audio/sfx/cry1d_1.asm
index 331413d3..6e2818c1 100755..100644
--- a/audio/sfx/sfx_02_31.asm
+++ b/audio/sfx/cry1d_1.asm
@@ -1,4 +1,4 @@
-SFX_02_31_Ch1: ; 8f48 (2:4f48)
+SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_02_31_Ch1: ; 8f48 (2:4f48)
 	endchannel
 
 
-SFX_02_31_Ch2: ; 8f63 (2:4f63)
+SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@ SFX_02_31_Ch2: ; 8f63 (2:4f63)
 	endchannel
 
 
-SFX_02_31_Ch3: ; 8f7e (2:4f7e)
+SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
diff --git a/audio/sfx/sfx_08_31.asm b/audio/sfx/cry1d_2.asm
index 4c06c624..c7a2c512 100755..100644
--- a/audio/sfx/sfx_08_31.asm
+++ b/audio/sfx/cry1d_2.asm
@@ -1,4 +1,4 @@
-SFX_08_31_Ch1: ; 211f0 (8:51f0)
+SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_08_31_Ch1: ; 211f0 (8:51f0)
 	endchannel
 
 
-SFX_08_31_Ch2: ; 2120b (8:520b)
+SFX_Cry1D_2_Ch2: ; 2120b (8:520b)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@ SFX_08_31_Ch2: ; 2120b (8:520b)
 	endchannel
 
 
-SFX_08_31_Ch3: ; 21226 (8:5226)
+SFX_Cry1D_2_Ch3: ; 21226 (8:5226)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
diff --git a/audio/sfx/sfx_1f_31.asm b/audio/sfx/cry1d_3.asm
index 018a0298..7210406c 100755..100644
--- a/audio/sfx/sfx_1f_31.asm
+++ b/audio/sfx/cry1d_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd)
+SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd)
 	dutycycle 244
 	unknownsfx0x20 15, 240, 5, 7
 	unknownsfx0x20 10, 224, 0, 7
@@ -9,7 +9,7 @@ SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd)
 	endchannel
 
 
-SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8)
+SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8)
 	dutycycle 34
 	unknownsfx0x20 15, 176, 195, 6
 	unknownsfx0x20 10, 160, 193, 6
@@ -20,7 +20,7 @@ SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8)
 	endchannel
 
 
-SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3)
+SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3)
 	unknownnoise0x20 6, 230, 76
 	unknownnoise0x20 15, 214, 60
 	unknownnoise0x20 10, 197, 74
diff --git a/audio/sfx/sfx_02_32.asm b/audio/sfx/cry1e_1.asm
index a38da7fd..e445fdd7 100755..100644
--- a/audio/sfx/sfx_02_32.asm
+++ b/audio/sfx/cry1e_1.asm
@@ -1,4 +1,4 @@
-SFX_02_32_Ch1: ; 8dcf (2:4dcf)
+SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_02_32_Ch1: ; 8dcf (2:4dcf)
 	endchannel
 
 
-SFX_02_32_Ch2: ; 8df2 (2:4df2)
+SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_02_32_Ch2: ; 8df2 (2:4df2)
 	endchannel
 
 
-SFX_02_32_Ch3: ; 8e19 (2:4e19)
+SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
diff --git a/audio/sfx/sfx_08_32.asm b/audio/sfx/cry1e_2.asm
index 255d24c7..59c9985f 100755..100644
--- a/audio/sfx/sfx_08_32.asm
+++ b/audio/sfx/cry1e_2.asm
@@ -1,4 +1,4 @@
-SFX_08_32_Ch1: ; 21077 (8:5077)
+SFX_Cry1E_2_Ch1: ; 21077 (8:5077)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_08_32_Ch1: ; 21077 (8:5077)
 	endchannel
 
 
-SFX_08_32_Ch2: ; 2109a (8:509a)
+SFX_Cry1E_2_Ch2: ; 2109a (8:509a)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_08_32_Ch2: ; 2109a (8:509a)
 	endchannel
 
 
-SFX_08_32_Ch3: ; 210c1 (8:50c1)
+SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
diff --git a/audio/sfx/sfx_1f_32.asm b/audio/sfx/cry1e_3.asm
index 853b9da3..1c50d4b8 100755..100644
--- a/audio/sfx/sfx_1f_32.asm
+++ b/audio/sfx/cry1e_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_32_Ch1: ; 7ce44 (1f:4e44)
+SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44)
 	dutycycle 240
 	unknownsfx0x20 6, 242, 0, 6
 	unknownsfx0x20 6, 226, 64, 6
@@ -11,7 +11,7 @@ SFX_1f_32_Ch1: ; 7ce44 (1f:4e44)
 	endchannel
 
 
-SFX_1f_32_Ch2: ; 7ce67 (1f:4e67)
+SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67)
 	dutycycle 17
 	unknownsfx0x20 3, 8, 1, 0
 	unknownsfx0x20 6, 194, 193, 5
@@ -25,7 +25,7 @@ SFX_1f_32_Ch2: ; 7ce67 (1f:4e67)
 	endchannel
 
 
-SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e)
+SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e)
 	unknownnoise0x20 6, 8, 1
 	unknownnoise0x20 5, 226, 92
 	unknownnoise0x20 5, 194, 76
diff --git a/audio/sfx/sfx_08_33.asm b/audio/sfx/cry1f_1.asm
index 55b09fb1..52be80df 100755..100644
--- a/audio/sfx/sfx_08_33.asm
+++ b/audio/sfx/cry1f_1.asm
@@ -1,4 +1,4 @@
-SFX_08_33_Ch1: ; 2128f (8:528f)
+SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_08_33_Ch1: ; 2128f (8:528f)
 	endchannel
 
 
-SFX_08_33_Ch2: ; 212a2 (8:52a2)
+SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@ SFX_08_33_Ch2: ; 212a2 (8:52a2)
 	endchannel
 
 
-SFX_08_33_Ch3: ; 212b5 (8:52b5)
+SFX_Cry1F_1_Ch3: ; 900d (2:500d)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
diff --git a/audio/sfx/sfx_02_33.asm b/audio/sfx/cry1f_2.asm
index 555f9b14..da7df61a 100755..100644
--- a/audio/sfx/sfx_02_33.asm
+++ b/audio/sfx/cry1f_2.asm
@@ -1,4 +1,4 @@
-SFX_02_33_Ch1: ; 8fe7 (2:4fe7)
+SFX_Cry1F_2_Ch1: ; 2128f (8:528f)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_02_33_Ch1: ; 8fe7 (2:4fe7)
 	endchannel
 
 
-SFX_02_33_Ch2: ; 8ffa (2:4ffa)
+SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@ SFX_02_33_Ch2: ; 8ffa (2:4ffa)
 	endchannel
 
 
-SFX_02_33_Ch3: ; 900d (2:500d)
+SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
diff --git a/audio/sfx/sfx_1f_33.asm b/audio/sfx/cry1f_3.asm
index a15fb1d6..2f6c1eda 100755..100644
--- a/audio/sfx/sfx_1f_33.asm
+++ b/audio/sfx/cry1f_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_33_Ch1: ; 7d05c (1f:505c)
+SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c)
 	dutycycle 165
 	unknownsfx0x20 3, 244, 65, 6
 	unknownsfx0x20 13, 214, 33, 7
@@ -7,7 +7,7 @@ SFX_1f_33_Ch1: ; 7d05c (1f:505c)
 	endchannel
 
 
-SFX_1f_33_Ch2: ; 7d06f (1f:506f)
+SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f)
 	dutycycle 204
 	unknownsfx0x20 4, 244, 128, 5
 	unknownsfx0x20 14, 230, 224, 6
@@ -16,7 +16,7 @@ SFX_1f_33_Ch2: ; 7d06f (1f:506f)
 	endchannel
 
 
-SFX_1f_33_Ch3: ; 7d082 (1f:5082)
+SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082)
 	unknownnoise0x20 5, 196, 70
 	unknownnoise0x20 13, 165, 68
 	unknownnoise0x20 8, 196, 69
diff --git a/audio/sfx/sfx_02_34.asm b/audio/sfx/cry20_1.asm
index a8b21680..d6586bdd 100755..100644
--- a/audio/sfx/sfx_02_34.asm
+++ b/audio/sfx/cry20_1.asm
@@ -1,4 +1,4 @@
-SFX_02_34_Ch1: ; 901a (2:501a)
+SFX_Cry20_1_Ch1: ; 901a (2:501a)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_02_34_Ch1: ; 901a (2:501a)
 	endchannel
 
 
-SFX_02_34_Ch2: ; 902d (2:502d)
+SFX_Cry20_1_Ch2: ; 902d (2:502d)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@ SFX_02_34_Ch2: ; 902d (2:502d)
 	endchannel
 
 
-SFX_02_34_Ch3: ; 9040 (2:5040)
+SFX_Cry20_1_Ch3: ; 9040 (2:5040)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
diff --git a/audio/sfx/sfx_08_34.asm b/audio/sfx/cry20_2.asm
index cabd1ebe..b345eba5 100755..100644
--- a/audio/sfx/sfx_08_34.asm
+++ b/audio/sfx/cry20_2.asm
@@ -1,4 +1,4 @@
-SFX_08_34_Ch1: ; 212c2 (8:52c2)
+SFX_Cry20_2_Ch1: ; 212c2 (8:52c2)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_08_34_Ch1: ; 212c2 (8:52c2)
 	endchannel
 
 
-SFX_08_34_Ch2: ; 212d5 (8:52d5)
+SFX_Cry20_2_Ch2: ; 212d5 (8:52d5)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@ SFX_08_34_Ch2: ; 212d5 (8:52d5)
 	endchannel
 
 
-SFX_08_34_Ch3: ; 212e8 (8:52e8)
+SFX_Cry20_2_Ch3: ; 212e8 (8:52e8)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
diff --git a/audio/sfx/sfx_1f_34.asm b/audio/sfx/cry20_3.asm
index 1bd919ec..5bcdf3df 100755..100644
--- a/audio/sfx/sfx_1f_34.asm
+++ b/audio/sfx/cry20_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_34_Ch1: ; 7d08f (1f:508f)
+SFX_Cry20_3_Ch1: ; 7d08f (1f:508f)
 	dutycycle 240
 	unknownsfx0x20 13, 241, 17, 5
 	unknownsfx0x20 13, 225, 21, 5
@@ -7,7 +7,7 @@ SFX_1f_34_Ch1: ; 7d08f (1f:508f)
 	endchannel
 
 
-SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2)
+SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2)
 	dutycycle 21
 	unknownsfx0x20 12, 225, 12, 5
 	unknownsfx0x20 12, 209, 16, 5
@@ -16,7 +16,7 @@ SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2)
 	endchannel
 
 
-SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5)
+SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5)
 	unknownnoise0x20 14, 242, 101
 	unknownnoise0x20 13, 226, 85
 	unknownnoise0x20 14, 210, 86
diff --git a/audio/sfx/sfx_08_35.asm b/audio/sfx/cry21_1.asm
index 732f7a1e..9b81e2a3 100755..100644
--- a/audio/sfx/sfx_08_35.asm
+++ b/audio/sfx/cry21_1.asm
@@ -1,4 +1,4 @@
-SFX_08_35_Ch1: ; 212f5 (8:52f5)
+SFX_Cry21_1_Ch1: ; 904d (2:504d)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_08_35_Ch1: ; 212f5 (8:52f5)
 	endchannel
 
 
-SFX_08_35_Ch2: ; 21318 (8:5318)
+SFX_Cry21_1_Ch2: ; 9070 (2:5070)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@ SFX_08_35_Ch2: ; 21318 (8:5318)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_08_35_Ch3: ; 2133a (8:533a)
+SFX_Cry21_1_Ch3: ; 9092 (2:5092)
 	endchannel
diff --git a/audio/sfx/sfx_02_35.asm b/audio/sfx/cry21_2.asm
index 61b2a5ac..f5571642 100755..100644
--- a/audio/sfx/sfx_02_35.asm
+++ b/audio/sfx/cry21_2.asm
@@ -1,4 +1,4 @@
-SFX_02_35_Ch1: ; 904d (2:504d)
+SFX_Cry21_2_Ch1: ; 212f5 (8:52f5)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_02_35_Ch1: ; 904d (2:504d)
 	endchannel
 
 
-SFX_02_35_Ch2: ; 9070 (2:5070)
+SFX_Cry21_2_Ch2: ; 21318 (8:5318)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@ SFX_02_35_Ch2: ; 9070 (2:5070)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_02_35_Ch3: ; 9092 (2:5092)
+SFX_Cry21_2_Ch3: ; 2133a (8:533a)
 	endchannel
diff --git a/audio/sfx/sfx_1f_35.asm b/audio/sfx/cry21_3.asm
index befa3e39..d91177b8 100755..100644
--- a/audio/sfx/sfx_1f_35.asm
+++ b/audio/sfx/cry21_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2)
+SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2)
 	dutycycle 27
 	unknownsfx0x20 3, 243, 100, 5
 	unknownsfx0x20 2, 226, 68, 5
@@ -11,7 +11,7 @@ SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2)
 	endchannel
 
 
-SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
+SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5)
 	dutycycle 204
 	unknownsfx0x20 3, 211, 96, 5
 	unknownsfx0x20 2, 194, 64, 5
@@ -23,5 +23,5 @@ SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
 	unknownsfx0x20 8, 193, 0, 5
 
 
-SFX_1f_35_Ch3: ; 7d107 (1f:5107)
+SFX_Cry21_3_Ch3: ; 7d107 (1f:5107)
 	endchannel
diff --git a/audio/sfx/sfx_02_36.asm b/audio/sfx/cry22_1.asm
index 972f87a6..90961298 100755..100644
--- a/audio/sfx/sfx_02_36.asm
+++ b/audio/sfx/cry22_1.asm
@@ -1,4 +1,4 @@
-SFX_02_36_Ch1: ; 9093 (2:5093)
+SFX_Cry22_1_Ch1: ; 9093 (2:5093)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_02_36_Ch1: ; 9093 (2:5093)
 	endchannel
 
 
-SFX_02_36_Ch2: ; 90a6 (2:50a6)
+SFX_Cry22_1_Ch2: ; 90a6 (2:50a6)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@ SFX_02_36_Ch2: ; 90a6 (2:50a6)
 	endchannel
 
 
-SFX_02_36_Ch3: ; 90b9 (2:50b9)
+SFX_Cry22_1_Ch3: ; 90b9 (2:50b9)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
diff --git a/audio/sfx/sfx_1f_36.asm b/audio/sfx/cry22_2.asm
index 9382bb60..861c3bfb 100755..100644
--- a/audio/sfx/sfx_1f_36.asm
+++ b/audio/sfx/cry22_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_36_Ch1: ; 7d108 (1f:5108)
+SFX_Cry22_2_Ch1: ; 2133b (8:533b)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_1f_36_Ch1: ; 7d108 (1f:5108)
 	endchannel
 
 
-SFX_1f_36_Ch2: ; 7d11b (1f:511b)
+SFX_Cry22_2_Ch2: ; 2134e (8:534e)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@ SFX_1f_36_Ch2: ; 7d11b (1f:511b)
 	endchannel
 
 
-SFX_1f_36_Ch3: ; 7d12e (1f:512e)
+SFX_Cry22_2_Ch3: ; 21361 (8:5361)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
diff --git a/audio/sfx/sfx_08_36.asm b/audio/sfx/cry22_3.asm
index 47d08af1..42b3039c 100755..100644
--- a/audio/sfx/sfx_08_36.asm
+++ b/audio/sfx/cry22_3.asm
@@ -1,4 +1,4 @@
-SFX_08_36_Ch1: ; 2133b (8:533b)
+SFX_Cry22_3_Ch1: ; 7d108 (1f:5108)
 	dutycycle 17
 	unknownsfx0x20 2, 61, 129, 3
 	unknownsfx0x20 7, 245, 1, 6
@@ -7,7 +7,7 @@ SFX_08_36_Ch1: ; 2133b (8:533b)
 	endchannel
 
 
-SFX_08_36_Ch2: ; 2134e (8:534e)
+SFX_Cry22_3_Ch2: ; 7d11b (1f:511b)
 	dutycycle 238
 	unknownsfx0x20 2, 62, 176, 5
 	unknownsfx0x20 7, 213, 93, 7
@@ -16,7 +16,7 @@ SFX_08_36_Ch2: ; 2134e (8:534e)
 	endchannel
 
 
-SFX_08_36_Ch3: ; 21361 (8:5361)
+SFX_Cry22_3_Ch3: ; 7d12e (1f:512e)
 	unknownnoise0x20 2, 146, 73
 	unknownnoise0x20 7, 181, 41
 	unknownnoise0x20 1, 162, 57
diff --git a/audio/sfx/sfx_02_37.asm b/audio/sfx/cry23_1.asm
index c286b018..02868042 100755..100644
--- a/audio/sfx/sfx_02_37.asm
+++ b/audio/sfx/cry23_1.asm
@@ -1,4 +1,4 @@
-SFX_02_37_Ch1: ; 8786 (2:4786)
+SFX_Cry23_1_Ch1: ; 8786 (2:4786)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_02_37_Ch1: ; 8786 (2:4786)
 	endchannel
 
 
-SFX_02_37_Ch2: ; 879d (2:479d)
+SFX_Cry23_1_Ch2: ; 879d (2:479d)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@ SFX_02_37_Ch2: ; 879d (2:479d)
 	endchannel
 
 
-SFX_02_37_Ch3: ; 87b0 (2:47b0)
+SFX_Cry23_1_Ch3: ; 87b0 (2:47b0)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/sfx_1f_37.asm b/audio/sfx/cry23_2.asm
index b8812f2a..089a233c 100755..100644
--- a/audio/sfx/sfx_1f_37.asm
+++ b/audio/sfx/cry23_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_37_Ch1: ; 7c7fb (1f:47fb)
+SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_1f_37_Ch1: ; 7c7fb (1f:47fb)
 	endchannel
 
 
-SFX_1f_37_Ch2: ; 7c812 (1f:4812)
+SFX_Cry23_2_Ch2: ; 20a45 (8:4a45)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@ SFX_1f_37_Ch2: ; 7c812 (1f:4812)
 	endchannel
 
 
-SFX_1f_37_Ch3: ; 7c825 (1f:4825)
+SFX_Cry23_2_Ch3: ; 20a58 (8:4a58)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/sfx_08_37.asm b/audio/sfx/cry23_3.asm
index 8df47703..31ba3743 100755..100644
--- a/audio/sfx/sfx_08_37.asm
+++ b/audio/sfx/cry23_3.asm
@@ -1,4 +1,4 @@
-SFX_08_37_Ch1: ; 20a2e (8:4a2e)
+SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 192, 7
 	unknownsfx0x20 6, 228, 193, 7
@@ -8,7 +8,7 @@ SFX_08_37_Ch1: ; 20a2e (8:4a2e)
 	endchannel
 
 
-SFX_08_37_Ch2: ; 20a45 (8:4a45)
+SFX_Cry23_3_Ch2: ; 7c812 (1f:4812)
 	dutycycle 95
 	unknownsfx0x20 15, 151, 129, 7
 	unknownsfx0x20 6, 132, 128, 7
@@ -17,7 +17,7 @@ SFX_08_37_Ch2: ; 20a45 (8:4a45)
 	endchannel
 
 
-SFX_08_37_Ch3: ; 20a58 (8:4a58)
+SFX_Cry23_3_Ch3: ; 7c825 (1f:4825)
 	unknownnoise0x20 3, 242, 60
 	unknownnoise0x20 13, 230, 44
 	unknownnoise0x20 15, 215, 60
diff --git a/audio/sfx/sfx_1f_38.asm b/audio/sfx/cry24_1.asm
index 62bd652c..061ed65a 100755..100644
--- a/audio/sfx/sfx_1f_38.asm
+++ b/audio/sfx/cry24_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_38_Ch1: ; 7c832 (1f:4832)
+SFX_Cry24_1_Ch1: ; 87bd (2:47bd)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_1f_38_Ch1: ; 7c832 (1f:4832)
 	endchannel
 
 
-SFX_1f_38_Ch2: ; 7c855 (1f:4855)
+SFX_Cry24_1_Ch2: ; 87e0 (2:47e0)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@ SFX_1f_38_Ch2: ; 7c855 (1f:4855)
 	endchannel
 
 
-SFX_1f_38_Ch3: ; 7c878 (1f:4878)
+SFX_Cry24_1_Ch3: ; 8803 (2:4803)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
diff --git a/audio/sfx/sfx_02_38.asm b/audio/sfx/cry24_2.asm
index 9b6ba80f..52986829 100755..100644
--- a/audio/sfx/sfx_02_38.asm
+++ b/audio/sfx/cry24_2.asm
@@ -1,4 +1,4 @@
-SFX_02_38_Ch1: ; 87bd (2:47bd)
+SFX_Cry24_2_Ch1: ; 20a65 (8:4a65)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_02_38_Ch1: ; 87bd (2:47bd)
 	endchannel
 
 
-SFX_02_38_Ch2: ; 87e0 (2:47e0)
+SFX_Cry24_2_Ch2: ; 20a88 (8:4a88)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@ SFX_02_38_Ch2: ; 87e0 (2:47e0)
 	endchannel
 
 
-SFX_02_38_Ch3: ; 8803 (2:4803)
+SFX_Cry24_2_Ch3: ; 20aab (8:4aab)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
diff --git a/audio/sfx/sfx_08_38.asm b/audio/sfx/cry24_3.asm
index 77df04e1..8c9cfc81 100755..100644
--- a/audio/sfx/sfx_08_38.asm
+++ b/audio/sfx/cry24_3.asm
@@ -1,4 +1,4 @@
-SFX_08_38_Ch1: ; 20a65 (8:4a65)
+SFX_Cry24_3_Ch1: ; 7c832 (1f:4832)
 	dutycycle 240
 	unknownsfx0x20 15, 247, 128, 6
 	unknownsfx0x20 10, 230, 132, 6
@@ -11,7 +11,7 @@ SFX_08_38_Ch1: ; 20a65 (8:4a65)
 	endchannel
 
 
-SFX_08_38_Ch2: ; 20a88 (8:4a88)
+SFX_Cry24_3_Ch2: ; 7c855 (1f:4855)
 	dutycycle 5
 	unknownsfx0x20 15, 183, 65, 6
 	unknownsfx0x20 10, 150, 66, 6
@@ -24,7 +24,7 @@ SFX_08_38_Ch2: ; 20a88 (8:4a88)
 	endchannel
 
 
-SFX_08_38_Ch3: ; 20aab (8:4aab)
+SFX_Cry24_3_Ch3: ; 7c878 (1f:4878)
 	unknownnoise0x20 15, 228, 60
 	unknownnoise0x20 10, 199, 76
 	unknownnoise0x20 10, 199, 60
diff --git a/audio/sfx/sfx_02_39.asm b/audio/sfx/cry25_1.asm
index 3d50aef5..ce238db2 100755..100644
--- a/audio/sfx/sfx_02_39.asm
+++ b/audio/sfx/cry25_1.asm
@@ -1,4 +1,4 @@
-SFX_02_39_Ch1: ; 886b (2:486b)
+SFX_Cry25_1_Ch1: ; 886b (2:486b)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_02_39_Ch1: ; 886b (2:486b)
 	endchannel
 
 
-SFX_02_39_Ch2: ; 8882 (2:4882)
+SFX_Cry25_1_Ch2: ; 8882 (2:4882)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@ SFX_02_39_Ch2: ; 8882 (2:4882)
 	endchannel
 
 
-SFX_02_39_Ch3: ; 8899 (2:4899)
+SFX_Cry25_1_Ch3: ; 8899 (2:4899)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
diff --git a/audio/sfx/sfx_08_39.asm b/audio/sfx/cry25_2.asm
index a4d0e0a4..b00210a9 100755..100644
--- a/audio/sfx/sfx_08_39.asm
+++ b/audio/sfx/cry25_2.asm
@@ -1,4 +1,4 @@
-SFX_08_39_Ch1: ; 20b13 (8:4b13)
+SFX_Cry25_2_Ch1: ; 20b13 (8:4b13)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_08_39_Ch1: ; 20b13 (8:4b13)
 	endchannel
 
 
-SFX_08_39_Ch2: ; 20b2a (8:4b2a)
+SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@ SFX_08_39_Ch2: ; 20b2a (8:4b2a)
 	endchannel
 
 
-SFX_08_39_Ch3: ; 20b41 (8:4b41)
+SFX_Cry25_2_Ch3: ; 20b41 (8:4b41)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
diff --git a/audio/sfx/sfx_1f_39.asm b/audio/sfx/cry25_3.asm
index 30703f3a..7c93b0e6 100755..100644
--- a/audio/sfx/sfx_1f_39.asm
+++ b/audio/sfx/cry25_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0)
+SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0)
 	dutycycle 165
 	unknownsfx0x20 6, 244, 64, 7
 	unknownsfx0x20 15, 227, 48, 7
@@ -8,7 +8,7 @@ SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0)
 	endchannel
 
 
-SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7)
+SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7)
 	dutycycle 119
 	unknownsfx0x20 6, 195, 18, 7
 	unknownsfx0x20 15, 179, 4, 7
@@ -18,7 +18,7 @@ SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7)
 	endchannel
 
 
-SFX_1f_39_Ch3: ; 7c90e (1f:490e)
+SFX_Cry25_3_Ch3: ; 7c90e (1f:490e)
 	unknownnoise0x20 8, 214, 44
 	unknownnoise0x20 12, 198, 60
 	unknownnoise0x20 10, 182, 44
diff --git a/audio/sfx/sfx_02_56.asm b/audio/sfx/cut_1.asm
index d27fba19..c1b763e0 100755..100644
--- a/audio/sfx/sfx_02_56.asm
+++ b/audio/sfx/cut_1.asm
@@ -1,4 +1,4 @@
-SFX_02_56_Ch1: ; 83e1 (2:43e1)
+SFX_Cut_1_Ch1: ; 83e1 (2:43e1)
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
diff --git a/audio/sfx/sfx_1f_56.asm b/audio/sfx/cut_3.asm
index 30de8cd2..4ad5551d 100755..100644
--- a/audio/sfx/sfx_1f_56.asm
+++ b/audio/sfx/cut_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_56_Ch1: ; 7c3ca (1f:43ca)
+SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca)
 	unknownnoise0x20 2, 247, 36
 	unknownnoise0x20 2, 247, 52
 	unknownnoise0x20 4, 247, 68
diff --git a/audio/sfx/sfx_02_0c.asm b/audio/sfx/cymbal1_1.asm
index 4f3568e1..d001b750 100755..100644
--- a/audio/sfx/sfx_02_0c.asm
+++ b/audio/sfx/cymbal1_1.asm
@@ -1,3 +1,3 @@
-SFX_02_0c_Ch1: ; 833b (2:433b)
+SFX_Cymbal1_1_Ch1: ; 833b (2:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
diff --git a/audio/sfx/sfx_08_0c.asm b/audio/sfx/cymbal1_2.asm
index 782ecf90..8987d85f 100755..100644
--- a/audio/sfx/sfx_08_0c.asm
+++ b/audio/sfx/cymbal1_2.asm
@@ -1,3 +1,3 @@
-SFX_08_0c_Ch1: ; 2033b (8:433b)
+SFX_Cymbal1_2_Ch1: ; 2033b (8:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
diff --git a/audio/sfx/sfx_1f_0c.asm b/audio/sfx/cymbal1_3.asm
index bd3fb373..597a8b61 100755..100644
--- a/audio/sfx/sfx_1f_0c.asm
+++ b/audio/sfx/cymbal1_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_0c_Ch1: ; 7c33b (1f:433b)
+SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b)
 	unknownnoise0x20 0, 161, 16
 	endchannel
diff --git a/audio/sfx/sfx_02_0d.asm b/audio/sfx/cymbal2_1.asm
index 154b5c1e..3f50299a 100755..100644
--- a/audio/sfx/sfx_02_0d.asm
+++ b/audio/sfx/cymbal2_1.asm
@@ -1,3 +1,3 @@
-SFX_02_0d_Ch1: ; 833f (2:433f)
+SFX_Cymbal2_1_Ch1: ; 833f (2:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
diff --git a/audio/sfx/sfx_08_0d.asm b/audio/sfx/cymbal2_2.asm
index d9ef41d0..5224a20d 100755..100644
--- a/audio/sfx/sfx_08_0d.asm
+++ b/audio/sfx/cymbal2_2.asm
@@ -1,3 +1,3 @@
-SFX_08_0d_Ch1: ; 2033f (8:433f)
+SFX_Cymbal2_2_Ch1: ; 2033f (8:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
diff --git a/audio/sfx/sfx_1f_0d.asm b/audio/sfx/cymbal2_3.asm
index 2f48df5b..dd3a4fc9 100755..100644
--- a/audio/sfx/sfx_1f_0d.asm
+++ b/audio/sfx/cymbal2_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_0d_Ch1: ; 7c33f (1f:433f)
+SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f)
 	unknownnoise0x20 0, 162, 17
 	endchannel
diff --git a/audio/sfx/sfx_02_0e.asm b/audio/sfx/cymbal3_1.asm
index d1333575..8aa5ebe5 100755..100644
--- a/audio/sfx/sfx_02_0e.asm
+++ b/audio/sfx/cymbal3_1.asm
@@ -1,3 +1,3 @@
-SFX_02_0e_Ch1: ; 8343 (2:4343)
+SFX_Cymbal3_1_Ch1: ; 8343 (2:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
diff --git a/audio/sfx/sfx_08_0e.asm b/audio/sfx/cymbal3_2.asm
index 885225ea..d1fd3b90 100755..100644
--- a/audio/sfx/sfx_08_0e.asm
+++ b/audio/sfx/cymbal3_2.asm
@@ -1,3 +1,3 @@
-SFX_08_0e_Ch1: ; 20343 (8:4343)
+SFX_Cymbal3_2_Ch1: ; 20343 (8:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
diff --git a/audio/sfx/sfx_1f_0e.asm b/audio/sfx/cymbal3_3.asm
index 88ba9d30..45e41c15 100755..100644
--- a/audio/sfx/sfx_1f_0e.asm
+++ b/audio/sfx/cymbal3_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_0e_Ch1: ; 7c343 (1f:4343)
+SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343)
 	unknownnoise0x20 0, 162, 80
 	endchannel
diff --git a/audio/sfx/sfx_08_50.asm b/audio/sfx/damage.asm
index ae3f9974..4022fcbf 100755..100644
--- a/audio/sfx/sfx_08_50.asm
+++ b/audio/sfx/damage.asm
@@ -1,4 +1,4 @@
-SFX_08_50_Ch1: ; 204f4 (8:44f4)
+SFX_Damage_Ch1: ; 204f4 (8:44f4)
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 2, 244, 20
 	unknownnoise0x20 15, 241, 50
diff --git a/audio/sfx/sfx_02_51.asm b/audio/sfx/denied_1.asm
index cb55b512..46520151 100755..100644
--- a/audio/sfx/sfx_02_51.asm
+++ b/audio/sfx/denied_1.asm
@@ -1,4 +1,4 @@
-SFX_02_51_Ch1: ; 861f (2:461f)
+SFX_Denied_1_Ch1: ; 861f (2:461f)
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,7 +9,7 @@ SFX_02_51_Ch1: ; 861f (2:461f)
 	endchannel
 
 
-SFX_02_51_Ch2: ; 8636 (2:4636)
+SFX_Denied_1_Ch2: ; 8636 (2:4636)
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/sfx_1f_51.asm b/audio/sfx/denied_3.asm
index 438877f1..2cebd766 100755..100644
--- a/audio/sfx/sfx_1f_51.asm
+++ b/audio/sfx/denied_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_51_Ch1: ; 7c5fc (1f:45fc)
+SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc)
 	duty 3
 	unknownsfx0x10 90
 	unknownsfx0x20 4, 240, 0, 5
@@ -9,7 +9,7 @@ SFX_1f_51_Ch1: ; 7c5fc (1f:45fc)
 	endchannel
 
 
-SFX_1f_51_Ch2: ; 7c613 (1f:4613)
+SFX_Denied_3_Ch2: ; 7c613 (1f:4613)
 	duty 3
 	unknownsfx0x20 4, 240, 1, 4
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/sfx_08_45.asm b/audio/sfx/dex_page_added.asm
index 00e5a659..dac55ed9 100755..100644
--- a/audio/sfx/sfx_08_45.asm
+++ b/audio/sfx/dex_page_added.asm
@@ -1,4 +1,4 @@
-SFX_08_45_Ch1: ; 2047f (8:447f)
+SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f)
 	duty 2
 	unknownsfx0x10 68
 	unknownsfx0x20 15, 240, 240, 4
@@ -8,7 +8,7 @@ SFX_08_45_Ch1: ; 2047f (8:447f)
 	endchannel
 
 
-SFX_08_45_Ch2: ; 20490 (8:4490)
+SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490)
 	duty 2
 	unknownsfx0x20 15, 146, 0, 6
 	unknownsfx0x20 15, 146, 130, 7
diff --git a/audio/sfx/sfx_08_5d.asm b/audio/sfx/doubleslap.asm
index 9bd39269..0918238a 100755..100644
--- a/audio/sfx/sfx_08_5d.asm
+++ b/audio/sfx/doubleslap.asm
@@ -1,4 +1,4 @@
-SFX_08_5d_Ch1: ; 2058c (8:458c)
+SFX_Doubleslap_Ch1: ; 2058c (8:458c)
 	unknownnoise0x20 8, 241, 50
 	unknownnoise0x20 8, 241, 51
 	endchannel
diff --git a/audio/sfx/sfx_02_47.asm b/audio/sfx/enter_pc_1.asm
index f498077c..5c1a189a 100755..100644
--- a/audio/sfx/sfx_02_47.asm
+++ b/audio/sfx/enter_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_02_47_Ch1: ; 853b (2:453b)
+SFX_Enter_PC_1_Ch1: ; 853b (2:453b)
 	duty 2
 	unknownsfx0x20 6, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/sfx_1f_47.asm b/audio/sfx/enter_pc_3.asm
index 729369e8..5907a7e5 100755..100644
--- a/audio/sfx/sfx_1f_47.asm
+++ b/audio/sfx/enter_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_47_Ch1: ; 7c518 (1f:4518)
+SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 7
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/sfx_08_48.asm b/audio/sfx/faint_fall.asm
index f974a6f9..c252b93a 100755..100644
--- a/audio/sfx/sfx_08_48.asm
+++ b/audio/sfx/faint_fall.asm
@@ -1,4 +1,4 @@
-SFX_08_48_Ch1: ; 204ae (8:44ae)
+SFX_Faint_Fall_Ch1: ; 204ae (8:44ae)
 	duty 1
 	unknownsfx0x10 175
 	unknownsfx0x20 15, 242, 128, 7
diff --git a/audio/sfx/sfx_08_43.asm b/audio/sfx/faint_thud.asm
index 23e3b5f0..5ef100c5 100755..100644
--- a/audio/sfx/sfx_08_43.asm
+++ b/audio/sfx/faint_thud.asm
@@ -1,10 +1,10 @@
-SFX_08_43_Ch1: ; 2044c (8:444c)
+SFX_Faint_Thud_Ch1: ; 2044c (8:444c)
 	unknownsfx0x20 15, 209, 0, 2
 	unknownsfx0x10 8
 	endchannel
 
 
-SFX_08_43_Ch2: ; 20453 (8:4453)
+SFX_Faint_Thud_Ch2: ; 20453 (8:4453)
 	unknownnoise0x20 4, 245, 51
 	unknownnoise0x20 8, 244, 34
 	unknownnoise0x20 15, 242, 33
diff --git a/audio/sfx/sfx_02_50.asm b/audio/sfx/fly_1.asm
index 5a5cd2b6..c2ecf435 100755..100644
--- a/audio/sfx/sfx_02_50.asm
+++ b/audio/sfx/fly_1.asm
@@ -1,4 +1,4 @@
-SFX_02_50_Ch1: ; 85ee (2:45ee)
+SFX_Fly_1_Ch1: ; 85ee (2:45ee)
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
diff --git a/audio/sfx/sfx_1f_50.asm b/audio/sfx/fly_3.asm
index 50cc4ee7..043d4b51 100755..100644
--- a/audio/sfx/sfx_1f_50.asm
+++ b/audio/sfx/fly_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_50_Ch1: ; 7c5cb (1f:45cb)
+SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb)
 	unknownnoise0x20 2, 241, 18
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 161, 18
diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/get_item1_1.asm
index 96c93702..471124d7 100755..100644
--- a/audio/sfx/sfx_02_3a.asm
+++ b/audio/sfx/get_item1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3a_Ch1: ; ad77 (2:6d77)
+SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77)
 	endchannel
 
 
-SFX_02_3a_Ch2: ; ad8e (2:6d8e)
+SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e)
 	endchannel
 
 
-SFX_02_3a_Ch3: ; ad9e (2:6d9e)
+SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e)
 	executemusic
 	notetype 4, 1, 0
 	octave 4
diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/get_item1_3.asm
index f39fe5f6..6a7ebabc 100755..100644
--- a/audio/sfx/sfx_1f_3a.asm
+++ b/audio/sfx/get_item1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
+SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -16,7 +16,7 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
 	endchannel
 
 
-SFX_1f_3a_Ch2: ; 7e867 (1f:6867)
+SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -30,7 +30,7 @@ SFX_1f_3a_Ch2: ; 7e867 (1f:6867)
 	endchannel
 
 
-SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
+SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877)
 	executemusic
 	notetype 4, 1, 0
 	octave 4
diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/get_item2_1.asm
index 66e3ba03..6fda3404 100755..100644
--- a/audio/sfx/sfx_1f_3b.asm
+++ b/audio/sfx/get_item2_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
+SFX_Get_Item2_1_Ch1: ; b316 (2:7316)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
 	endchannel
 
 
-SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47)
+SFX_Get_Item2_1_Ch2: ; b335 (2:7335)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47)
 	endchannel
 
 
-SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
+SFX_Get_Item2_1_Ch3: ; b34d (2:734d)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/get_item2_2.asm
index 190b1299..25e40744 100755..100644
--- a/audio/sfx/sfx_02_3b.asm
+++ b/audio/sfx/get_item2_2.asm
@@ -1,4 +1,4 @@
-SFX_02_3b_Ch1: ; b316 (2:7316)
+SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_02_3b_Ch1: ; b316 (2:7316)
 	endchannel
 
 
-SFX_02_3b_Ch2: ; b335 (2:7335)
+SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_02_3b_Ch2: ; b335 (2:7335)
 	endchannel
 
 
-SFX_02_3b_Ch3: ; b34d (2:734d)
+SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/get_item2_3.asm
index cb7c9a52..20a0ee04 100755..100644
--- a/audio/sfx/sfx_08_3b.asm
+++ b/audio/sfx/get_item2_3.asm
@@ -1,4 +1,4 @@
-SFX_08_3b_Ch1: ; 239c7 (8:79c7)
+SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -25,7 +25,7 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7)
 	endchannel
 
 
-SFX_08_3b_Ch2: ; 239e6 (8:79e6)
+SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47)
 	executemusic
 	vibrato 8, 2, 7
 	duty 2
@@ -46,7 +46,7 @@ SFX_08_3b_Ch2: ; 239e6 (8:79e6)
 	endchannel
 
 
-SFX_08_3b_Ch3: ; 239fe (8:79fe)
+SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/get_key_item_1.asm
index 103b01c6..233ea01b 100755..100644
--- a/audio/sfx/sfx_1f_42.asm
+++ b/audio/sfx/get_key_item_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
+SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
 	endchannel
 
 
-SFX_1f_42_Ch2: ; 7ee93 (1f:6e93)
+SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381)
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@ SFX_1f_42_Ch2: ; 7ee93 (1f:6e93)
 	endchannel
 
 
-SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
+SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d)
 	executemusic
 	notetype 5, 1, 0
 	octave 4
diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/get_key_item_3.asm
index 9f997b36..f918e1bf 100755..100644
--- a/audio/sfx/sfx_02_42.asm
+++ b/audio/sfx/get_key_item_3.asm
@@ -1,4 +1,4 @@
-SFX_02_42_Ch1: ; b362 (2:7362)
+SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -23,7 +23,7 @@ SFX_02_42_Ch1: ; b362 (2:7362)
 	endchannel
 
 
-SFX_02_42_Ch2: ; b381 (2:7381)
+SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93)
 	executemusic
 	vibrato 4, 2, 3
 	duty 2
@@ -47,7 +47,7 @@ SFX_02_42_Ch2: ; b381 (2:7381)
 	endchannel
 
 
-SFX_02_42_Ch3: ; b39d (2:739d)
+SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf)
 	executemusic
 	notetype 5, 1, 0
 	octave 4
diff --git a/audio/sfx/sfx_02_57.asm b/audio/sfx/go_inside_1.asm
index 8f8d06e2..1eb1e2ca 100755..100644
--- a/audio/sfx/sfx_02_57.asm
+++ b/audio/sfx/go_inside_1.asm
@@ -1,4 +1,4 @@
-SFX_02_57_Ch1: ; 83f1 (2:43f1)
+SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
diff --git a/audio/sfx/sfx_1f_57.asm b/audio/sfx/go_inside_3.asm
index b73bb687..d8e18b7d 100755..100644
--- a/audio/sfx/sfx_1f_57.asm
+++ b/audio/sfx/go_inside_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_57_Ch1: ; 7c3da (1f:43da)
+SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da)
 	unknownnoise0x20 9, 241, 68
 	unknownnoise0x20 8, 209, 67
 	endchannel
diff --git a/audio/sfx/sfx_02_5c.asm b/audio/sfx/go_outside_1.asm
index 477fd03b..2e8a8b31 100755..100644
--- a/audio/sfx/sfx_02_5c.asm
+++ b/audio/sfx/go_outside_1.asm
@@ -1,4 +1,4 @@
-SFX_02_5c_Ch1: ; 8452 (2:4452)
+SFX_Go_Outside_1_Ch1: ; 8452 (2:4452)
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
diff --git a/audio/sfx/sfx_1f_5c.asm b/audio/sfx/go_outside_3.asm
index 8671002c..2dc4242d 100755..100644
--- a/audio/sfx/sfx_1f_5c.asm
+++ b/audio/sfx/go_outside_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_5c_Ch1: ; 7c43b (1f:443b)
+SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b)
 	unknownnoise0x20 2, 241, 84
 	unknownnoise0x20 12, 113, 35
 	unknownnoise0x20 2, 177, 84
diff --git a/audio/sfx/sfx_02_3e.asm b/audio/sfx/heal_ailment_1.asm
index 36824962..5937f3a2 100755..100644
--- a/audio/sfx/sfx_02_3e.asm
+++ b/audio/sfx/heal_ailment_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3e_Ch1: ; 84d9 (2:44d9)
+SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
diff --git a/audio/sfx/sfx_08_3e.asm b/audio/sfx/heal_ailment_2.asm
index 30aefce4..4b39895a 100755..100644
--- a/audio/sfx/sfx_08_3e.asm
+++ b/audio/sfx/heal_ailment_2.asm
@@ -1,4 +1,4 @@
-SFX_08_3e_Ch1: ; 203fd (8:43fd)
+SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
diff --git a/audio/sfx/sfx_1f_3e.asm b/audio/sfx/heal_ailment_3.asm
index 604e553b..b2805f3d 100755..100644
--- a/audio/sfx/sfx_1f_3e.asm
+++ b/audio/sfx/heal_ailment_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2)
+SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2)
 	duty 2
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
diff --git a/audio/sfx/sfx_1f_3d.asm b/audio/sfx/heal_hp_1.asm
index f5eb6afa..eb8063f7 100755..100644
--- a/audio/sfx/sfx_1f_3d.asm
+++ b/audio/sfx/heal_hp_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_3d_Ch1: ; 7c490 (1f:4490)
+SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/sfx_02_3d.asm b/audio/sfx/heal_hp_2.asm
index 469776a4..890a2151 100755..100644
--- a/audio/sfx/sfx_02_3d.asm
+++ b/audio/sfx/heal_hp_2.asm
@@ -1,4 +1,4 @@
-SFX_02_3d_Ch1: ; 84b7 (2:44b7)
+SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/sfx_08_3d.asm b/audio/sfx/heal_hp_3.asm
index aa9867a1..da80d48f 100755..100644
--- a/audio/sfx/sfx_08_3d.asm
+++ b/audio/sfx/heal_hp_3.asm
@@ -1,4 +1,4 @@
-SFX_08_3d_Ch1: ; 203ee (8:43ee)
+SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490)
 	duty 2
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/sfx_02_4a.asm b/audio/sfx/healing_machine_1.asm
index 1cb0e857..4babf6b0 100755..100644
--- a/audio/sfx/sfx_02_4a.asm
+++ b/audio/sfx/healing_machine_1.asm
@@ -1,4 +1,4 @@
-SFX_02_4a_Ch1: ; 8580 (2:4580)
+SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580)
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
diff --git a/audio/sfx/sfx_1f_4a.asm b/audio/sfx/healing_machine_3.asm
index 187e9b10..c72f7905 100755..100644
--- a/audio/sfx/sfx_1f_4a.asm
+++ b/audio/sfx/healing_machine_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_4a_Ch1: ; 7c55d (1f:455d)
+SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d)
 	duty 2
 	unknownsfx0x10 44
 	unknownsfx0x20 4, 242, 0, 5
diff --git a/audio/sfx/sfx_08_5f.asm b/audio/sfx/horn_drill.asm
index 0cb02ba3..e68e5834 100755..100644
--- a/audio/sfx/sfx_08_5f.asm
+++ b/audio/sfx/horn_drill.asm
@@ -1,4 +1,4 @@
-SFX_08_5f_Ch1: ; 205b1 (8:45b1)
+SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1)
 	unknownnoise0x20 3, 146, 49
 	unknownnoise0x20 3, 178, 50
 	unknownnoise0x20 3, 194, 51
diff --git a/audio/sfx/sfx_1f_62.asm b/audio/sfx/intro_crash.asm
index 8029ff02..65e475f8 100755..100644
--- a/audio/sfx/sfx_1f_62.asm
+++ b/audio/sfx/intro_crash.asm
@@ -1,4 +1,4 @@
-SFX_1f_62_Ch1: ; 7c6de (1f:46de)
+SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de)
 	unknownnoise0x20 2, 210, 50
 	unknownnoise0x20 15, 242, 67
 	endchannel
diff --git a/audio/sfx/sfx_1f_5f.asm b/audio/sfx/intro_hip.asm
index efc1a5e3..70d0f8b1 100755..100644
--- a/audio/sfx/sfx_1f_5f.asm
+++ b/audio/sfx/intro_hip.asm
@@ -1,4 +1,4 @@
-SFX_1f_5f_Ch1: ; 7c6be (1f:46be)
+SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be)
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 64, 7
diff --git a/audio/sfx/sfx_1f_60.asm b/audio/sfx/intro_hop.asm
index 907aa79f..223c7f25 100755..100644
--- a/audio/sfx/sfx_1f_60.asm
+++ b/audio/sfx/intro_hop.asm
@@ -1,4 +1,4 @@
-SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9)
+SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9)
 	duty 2
 	unknownsfx0x10 38
 	unknownsfx0x20 12, 194, 128, 6
diff --git a/audio/sfx/sfx_1f_5e.asm b/audio/sfx/intro_lunge.asm
index 6adbb979..ad00f56f 100755..100644
--- a/audio/sfx/sfx_1f_5e.asm
+++ b/audio/sfx/intro_lunge.asm
@@ -1,4 +1,4 @@
-SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5)
+SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5)
 	unknownnoise0x20 6, 32, 16
 	unknownnoise0x20 6, 47, 64
 	unknownnoise0x20 6, 79, 65
diff --git a/audio/sfx/sfx_1f_61.asm b/audio/sfx/intro_raise.asm
index 0afe5055..d6ee1430 100755..100644
--- a/audio/sfx/sfx_1f_61.asm
+++ b/audio/sfx/intro_raise.asm
@@ -1,4 +1,4 @@
-SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4)
+SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4)
 	unknownnoise0x20 2, 111, 33
 	unknownnoise0x20 2, 175, 49
 	unknownnoise0x20 15, 242, 65
diff --git a/audio/sfx/sfx_1f_63.asm b/audio/sfx/intro_whoosh.asm
index 2114130a..903b7252 100755..100644
--- a/audio/sfx/sfx_1f_63.asm
+++ b/audio/sfx/intro_whoosh.asm
@@ -1,4 +1,4 @@
-SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5)
+SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5)
 	unknownnoise0x20 4, 44, 32
 	unknownnoise0x20 3, 160, 32
 	unknownnoise0x20 3, 176, 33
diff --git a/audio/sfx/sfx_02_4e.asm b/audio/sfx/ledge_1.asm
index 78b64198..dfd7c819 100755..100644
--- a/audio/sfx/sfx_02_4e.asm
+++ b/audio/sfx/ledge_1.asm
@@ -1,4 +1,4 @@
-SFX_02_4e_Ch1: ; 85d6 (2:45d6)
+SFX_Ledge_1_Ch1: ; 85d6 (2:45d6)
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
diff --git a/audio/sfx/sfx_1f_4e.asm b/audio/sfx/ledge_3.asm
index 624c2137..2bf172e7 100755..100644
--- a/audio/sfx/sfx_1f_4e.asm
+++ b/audio/sfx/ledge_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3)
+SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3)
 	duty 2
 	unknownsfx0x10 149
 	unknownsfx0x20 15, 242, 0, 4
diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/level_up.asm
index afbc50d4..03e077ec 100755..100644
--- a/audio/sfx/sfx_08_3a.asm
+++ b/audio/sfx/level_up.asm
@@ -1,4 +1,4 @@
-SFX_08_3a_Ch1: ; 2397d (8:797d)
+SFX_Level_Up_Ch1: ; 2397d (8:797d)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -20,7 +20,7 @@ SFX_08_3a_Ch1: ; 2397d (8:797d)
 	endchannel
 
 
-SFX_08_3a_Ch2: ; 23998 (8:7998)
+SFX_Level_Up_Ch2: ; 23998 (8:7998)
 	executemusic
 	vibrato 4, 2, 2
 	duty 2
@@ -40,7 +40,7 @@ SFX_08_3a_Ch2: ; 23998 (8:7998)
 	endchannel
 
 
-SFX_08_3a_Ch3: ; 239b0 (8:79b0)
+SFX_Level_Up_Ch3: ; 239b0 (8:79b0)
 	executemusic
 	notetype 6, 1, 0
 	octave 5
diff --git a/audio/sfx/sfx_02_0f.asm b/audio/sfx/muted_snare1_1.asm
index 32156d7d..5d10ecc1 100755..100644
--- a/audio/sfx/sfx_02_0f.asm
+++ b/audio/sfx/muted_snare1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_0f_Ch1: ; 8347 (2:4347)
+SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
diff --git a/audio/sfx/sfx_08_0f.asm b/audio/sfx/muted_snare1_2.asm
index 64f1cbe4..ea3cfc8c 100755..100644
--- a/audio/sfx/sfx_08_0f.asm
+++ b/audio/sfx/muted_snare1_2.asm
@@ -1,4 +1,4 @@
-SFX_08_0f_Ch1: ; 20347 (8:4347)
+SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
diff --git a/audio/sfx/sfx_1f_0f.asm b/audio/sfx/muted_snare1_3.asm
index e314bae2..27caa37b 100755..100644
--- a/audio/sfx/sfx_1f_0f.asm
+++ b/audio/sfx/muted_snare1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_0f_Ch1: ; 7c347 (1f:4347)
+SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347)
 	unknownnoise0x20 0, 161, 24
 	unknownnoise0x20 0, 49, 51
 	endchannel
diff --git a/audio/sfx/sfx_02_11.asm b/audio/sfx/muted_snare2_1.asm
index f4bde465..7ab6252b 100755..100644
--- a/audio/sfx/sfx_02_11.asm
+++ b/audio/sfx/muted_snare2_1.asm
@@ -1,3 +1,3 @@
-SFX_02_11_Ch1: ; 8355 (2:4355)
+SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
diff --git a/audio/sfx/sfx_08_11.asm b/audio/sfx/muted_snare2_2.asm
index bec0220f..a9359226 100755..100644
--- a/audio/sfx/sfx_08_11.asm
+++ b/audio/sfx/muted_snare2_2.asm
@@ -1,3 +1,3 @@
-SFX_08_11_Ch1: ; 20355 (8:4355)
+SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355)
 	unknownnoise0x20 0, 145, 34
 	endchannel
diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm
new file mode 100644
index 00000000..7ac9705d
--- /dev/null
+++ b/audio/sfx/muted_snare2_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355)
+	unknownnoise0x20 0, 145, 34
+	endchannel
diff --git a/audio/sfx/sfx_02_12.asm b/audio/sfx/muted_snare3_1.asm
index 908c3fb2..1cd27319 100755..100644
--- a/audio/sfx/sfx_02_12.asm
+++ b/audio/sfx/muted_snare3_1.asm
@@ -1,3 +1,3 @@
-SFX_02_12_Ch1: ; 8359 (2:4359)
+SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
diff --git a/audio/sfx/sfx_08_12.asm b/audio/sfx/muted_snare3_2.asm
index 7e93326b..1606b6d5 100755..100644
--- a/audio/sfx/sfx_08_12.asm
+++ b/audio/sfx/muted_snare3_2.asm
@@ -1,3 +1,3 @@
-SFX_08_12_Ch1: ; 20359 (8:4359)
+SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359)
 	unknownnoise0x20 0, 113, 34
 	endchannel
diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm
new file mode 100644
index 00000000..c0fe7efb
--- /dev/null
+++ b/audio/sfx/muted_snare3_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359)
+	unknownnoise0x20 0, 113, 34
+	endchannel
diff --git a/audio/sfx/sfx_02_13.asm b/audio/sfx/muted_snare4_1.asm
index bd985ab4..bcac6440 100755..100644
--- a/audio/sfx/sfx_02_13.asm
+++ b/audio/sfx/muted_snare4_1.asm
@@ -1,3 +1,3 @@
-SFX_02_13_Ch1: ; 835d (2:435d)
+SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d)
 	unknownnoise0x20 0, 97, 34
 	endchannel
diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm
new file mode 100644
index 00000000..6910c20d
--- /dev/null
+++ b/audio/sfx/muted_snare4_2.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm
new file mode 100644
index 00000000..52f14f21
--- /dev/null
+++ b/audio/sfx/muted_snare4_3.asm
@@ -0,0 +1,3 @@
+SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
diff --git a/audio/sfx/sfx_08_51.asm b/audio/sfx/not_very_effective.asm
index bd4f3b24..959f33e3 100755..100644
--- a/audio/sfx/sfx_08_51.asm
+++ b/audio/sfx/not_very_effective.asm
@@ -1,4 +1,4 @@
-SFX_08_51_Ch1: ; 204fe (8:44fe)
+SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe)
 	unknownnoise0x20 4, 143, 85
 	unknownnoise0x20 2, 244, 68
 	unknownnoise0x20 8, 244, 34
diff --git a/audio/sfx/sfx_08_47.asm b/audio/sfx/peck.asm
index 6ca2e38c..e4632281 100755..100644
--- a/audio/sfx/sfx_08_47.asm
+++ b/audio/sfx/peck.asm
@@ -1,3 +1,3 @@
-SFX_08_47_Ch1: ; 204aa (8:44aa)
+SFX_Peck_Ch1: ; 204aa (8:44aa)
 	unknownnoise0x20 2, 161, 18
 	endchannel
diff --git a/audio/sfx/sfx_1f_43.asm b/audio/sfx/poisoned_1.asm
index 1f238fb0..4760696d 100755..100644
--- a/audio/sfx/sfx_1f_43.asm
+++ b/audio/sfx/poisoned_1.asm
@@ -1,8 +1,8 @@
-SFX_1f_43_Ch1: ; 7c49f (1f:449f)
+SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6)
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_1f_43_Ch1
+	loopchannel 4, SFX_Poisoned_1_Ch1
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
diff --git a/audio/sfx/sfx_02_43.asm b/audio/sfx/poisoned_3.asm
index 3bb6f7ed..b6d69dc6 100755..100644
--- a/audio/sfx/sfx_02_43.asm
+++ b/audio/sfx/poisoned_3.asm
@@ -1,8 +1,8 @@
-SFX_02_43_Ch1: ; 84c6 (2:44c6)
+SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f)
 	duty 0
 	unknownsfx0x10 20
 	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_02_43_Ch1
+	loopchannel 4, SFX_Poisoned_3_Ch1
 	unknownsfx0x20 15, 243, 0, 6
 	unknownsfx0x10 8
 	endchannel
diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/pokedex_rating_1.asm
index 415d43d5..21503d16 100755..100644
--- a/audio/sfx/sfx_1f_41.asm
+++ b/audio/sfx/pokedex_rating_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_41_Ch1: ; 7edda (1f:6dda)
+SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda)
 	endchannel
 
 
-SFX_1f_41_Ch2: ; 7edf3 (1f:6df3)
+SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1)
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@ SFX_1f_41_Ch2: ; 7edf3 (1f:6df3)
 	endchannel
 
 
-SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
+SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/pokedex_rating_3.asm
index a21595f3..a9ea1c75 100755..100644
--- a/audio/sfx/sfx_02_41.asm
+++ b/audio/sfx/pokedex_rating_3.asm
@@ -1,4 +1,4 @@
-SFX_02_41_Ch1: ; b2c8 (2:72c8)
+SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda)
 	executemusic
 	tempo 256
 	volume 7, 7
@@ -21,7 +21,7 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8)
 	endchannel
 
 
-SFX_02_41_Ch2: ; b2e1 (2:72e1)
+SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3)
 	executemusic
 	duty 2
 	notetype 5, 12, 2
@@ -44,7 +44,7 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1)
 	endchannel
 
 
-SFX_02_41_Ch3: ; b2f7 (2:72f7)
+SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09)
 	executemusic
 	notetype 5, 1, 0
 	octave 5
diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/pokeflute.asm
index 5f631c2d..4abf1713 100755..100644
--- a/audio/sfx/sfx_02_5e.asm
+++ b/audio/sfx/pokeflute.asm
@@ -1,4 +1,4 @@
-SFX_02_5e_Ch1: ; 83ca (2:43ca)
+SFX_Pokeflute_Ch1: ; 83ca (2:43ca)
 	vibrato 16, 1, 4
 	notetype 12, 1, 0
 	octave 5
diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/pokeflute_ch1_ch2.asm
index 4ccf89d8..4ccf89d8 100755
--- a/audio/sfx/sfx_08_pokeflute.asm
+++ b/audio/sfx/pokeflute_ch1_ch2.asm
diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/pokeflute_ch3.asm
index 0652e673..0652e673 100755
--- a/audio/sfx/sfx_08_pokeflute_ch3.asm
+++ b/audio/sfx/pokeflute_ch3.asm
diff --git a/audio/sfx/sfx_08_4a.asm b/audio/sfx/pound.asm
index d79cef4e..102d7d6d 100755..100644
--- a/audio/sfx/sfx_08_4a.asm
+++ b/audio/sfx/pound.asm
@@ -1,3 +1,3 @@
-SFX_08_4a_Ch1: ; 204c4 (8:44c4)
+SFX_Pound_Ch1: ; 204c4 (8:44c4)
 	unknownnoise0x20 2, 161, 34
 	endchannel
diff --git a/audio/sfx/sfx_08_40.asm b/audio/sfx/press_ab_1.asm
index 7dfae9a7..5925b788 100755..100644
--- a/audio/sfx/sfx_08_40.asm
+++ b/audio/sfx/press_ab_1.asm
@@ -1,4 +1,4 @@
-SFX_08_40_Ch1: ; 203c3 (8:43c3)
+SFX_Press_AB_1_Ch1: ; 8462 (2:4462)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
diff --git a/audio/sfx/sfx_1f_40.asm b/audio/sfx/press_ab_2.asm
index 04f89afb..e15dadc4 100755..100644
--- a/audio/sfx/sfx_1f_40.asm
+++ b/audio/sfx/press_ab_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_40_Ch1: ; 7c44b (1f:444b)
+SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
diff --git a/audio/sfx/sfx_02_40.asm b/audio/sfx/press_ab_3.asm
index 2aa521b4..8af4a335 100755..100644
--- a/audio/sfx/sfx_02_40.asm
+++ b/audio/sfx/press_ab_3.asm
@@ -1,4 +1,4 @@
-SFX_02_40_Ch1: ; 8462 (2:4462)
+SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b)
 	duty 2
 	unknownsfx0x20 0, 145, 192, 7
 	unknownsfx0x20 0, 129, 208, 7
diff --git a/audio/sfx/sfx_08_6d.asm b/audio/sfx/psybeam.asm
index 6971a30e..65fcc229 100755..100644
--- a/audio/sfx/sfx_08_6d.asm
+++ b/audio/sfx/psybeam.asm
@@ -1,25 +1,25 @@
-SFX_08_6d_Ch1: ; 20759 (8:4759)
+SFX_Psybeam_Ch1: ; 20759 (8:4759)
 	dutycycle 161
 	unknownsfx0x20 10, 241, 64, 6
 	unknownsfx0x20 10, 243, 128, 6
 	unknownsfx0x20 10, 242, 32, 6
-	loopchannel 4, SFX_08_6d_Ch1
+	loopchannel 4, SFX_Psybeam_Ch1
 	unknownsfx0x20 10, 241, 64, 6
 	endchannel
 
 
-SFX_08_6d_Ch2: ; 20770 (8:4770)
+SFX_Psybeam_Ch2: ; 20770 (8:4770)
 	dutycycle 179
 	unknownsfx0x20 10, 243, 113, 5
 	unknownsfx0x20 7, 227, 49, 5
 	unknownsfx0x20 10, 241, 81, 5
-	loopchannel 4, SFX_08_6d_Ch2
+	loopchannel 4, SFX_Psybeam_Ch2
 	unknownsfx0x20 10, 241, 113, 5
 	endchannel
 
 
-SFX_08_6d_Ch3: ; 20787 (8:4787)
+SFX_Psybeam_Ch3: ; 20787 (8:4787)
 	unknownnoise0x20 2, 209, 74
 	unknownnoise0x20 2, 210, 42
-	loopchannel 21, SFX_08_6d_Ch3
+	loopchannel 21, SFX_Psybeam_Ch3
 	endchannel
diff --git a/audio/sfx/sfx_08_70.asm b/audio/sfx/psychic_m.asm
index 7a07b340..e734b7ac 100755..100644
--- a/audio/sfx/sfx_08_70.asm
+++ b/audio/sfx/psychic_m.asm
@@ -1,4 +1,4 @@
-SFX_08_70_Ch1: ; 207fa (8:47fa)
+SFX_Psychic_M_Ch1: ; 207fa (8:47fa)
 	duty 2
 	unknownsfx0x10 247
 	unknownsfx0x20 8, 196, 189, 7
@@ -11,7 +11,7 @@ SFX_08_70_Ch1: ; 207fa (8:47fa)
 	endchannel
 
 
-SFX_08_70_Ch2: ; 20819 (8:4819)
+SFX_Psychic_M_Ch2: ; 20819 (8:4819)
 	duty 2
 	unknownsfx0x20 8, 196, 112, 7
 	unknownsfx0x20 8, 196, 97, 7
@@ -22,7 +22,7 @@ SFX_08_70_Ch2: ; 20819 (8:4819)
 	endchannel
 
 
-SFX_08_70_Ch3: ; 20834 (8:4834)
+SFX_Psychic_M_Ch3: ; 20834 (8:4834)
 	unknownnoise0x20 15, 63, 20
 	unknownnoise0x20 15, 207, 19
 	unknownnoise0x20 15, 207, 18
diff --git a/audio/sfx/sfx_1f_5a.asm b/audio/sfx/purchase_1.asm
index 29b947b7..fc0cecb5 100755..100644
--- a/audio/sfx/sfx_1f_5a.asm
+++ b/audio/sfx/purchase_1.asm
@@ -1,11 +1,11 @@
-SFX_1f_5a_Ch1: ; 7c416 (1f:4416)
+SFX_Purchase_1_Ch1: ; 842d (2:442d)
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
 	endchannel
 
 
-SFX_1f_5a_Ch2: ; 7c421 (1f:4421)
+SFX_Purchase_1_Ch2: ; 8438 (2:4438)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
diff --git a/audio/sfx/sfx_02_5a.asm b/audio/sfx/purchase_3.asm
index d0d6f875..5d649958 100755..100644
--- a/audio/sfx/sfx_02_5a.asm
+++ b/audio/sfx/purchase_3.asm
@@ -1,11 +1,11 @@
-SFX_02_5a_Ch1: ; 842d (2:442d)
+SFX_Purchase_3_Ch1: ; 7c416 (1f:4416)
 	duty 2
 	unknownsfx0x20 4, 225, 0, 7
 	unknownsfx0x20 8, 242, 224, 7
 	endchannel
 
 
-SFX_02_5a_Ch2: ; 8438 (2:4438)
+SFX_Purchase_3_Ch2: ; 7c421 (1f:4421)
 	duty 2
 	unknownsfx0x20 1, 8, 0, 0
 	unknownsfx0x20 4, 145, 193, 6
diff --git a/audio/sfx/sfx_02_53.asm b/audio/sfx/push_boulder_1.asm
index e81724b0..31096861 100755..100644
--- a/audio/sfx/sfx_02_53.asm
+++ b/audio/sfx/push_boulder_1.asm
@@ -1,4 +1,4 @@
-SFX_02_53_Ch1: ; 8654 (2:4654)
+SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654)
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
diff --git a/audio/sfx/sfx_1f_53.asm b/audio/sfx/push_boulder_3.asm
index 04415233..ca7d2cd1 100755..100644
--- a/audio/sfx/sfx_1f_53.asm
+++ b/audio/sfx/push_boulder_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_53_Ch1: ; 7c631 (1f:4631)
+SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631)
 	unknownnoise0x20 4, 162, 35
 	unknownnoise0x20 8, 241, 52
 	unknownnoise0x20 15, 0, 0
diff --git a/audio/sfx/sfx_08_44.asm b/audio/sfx/run.asm
index d626f3a1..653b0f6b 100755..100644
--- a/audio/sfx/sfx_08_44.asm
+++ b/audio/sfx/run.asm
@@ -1,4 +1,4 @@
-SFX_08_44_Ch1: ; 2045d (8:445d)
+SFX_Run_Ch1: ; 2045d (8:445d)
 	unknownnoise0x20 2, 97, 35
 	unknownnoise0x20 2, 161, 51
 	unknownnoise0x20 2, 193, 51
diff --git a/audio/sfx/sfx_02_5f.asm b/audio/sfx/safari_zone_pa.asm
index c4fe674c..fb8c4d1f 100755..100644
--- a/audio/sfx/sfx_02_5f.asm
+++ b/audio/sfx/safari_zone_pa.asm
@@ -1,4 +1,4 @@
-SFX_02_5f_Ch1: ; 86c8 (2:46c8)
+SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8)
 	duty 2
 	unknownsfx0x20 15, 243, 48, 7
 	unknownsfx0x20 8, 101, 48, 7
diff --git a/audio/sfx/sfx_02_5d.asm b/audio/sfx/save_1.asm
index 2411c9ee..2e6c1f2b 100755..100644
--- a/audio/sfx/sfx_02_5d.asm
+++ b/audio/sfx/save_1.asm
@@ -1,4 +1,4 @@
-SFX_02_5d_Ch1: ; 8475 (2:4475)
+SFX_Save_1_Ch1: ; 8475 (2:4475)
 	duty 2
 	unknownsfx0x20 4, 244, 0, 7
 	unknownsfx0x20 2, 228, 0, 6
@@ -10,7 +10,7 @@ SFX_02_5d_Ch1: ; 8475 (2:4475)
 	endchannel
 
 
-SFX_02_5d_Ch2: ; 8494 (2:4494)
+SFX_Save_1_Ch2: ; 8494 (2:4494)
 	duty 2
 	unknownsfx0x20 4, 8, 0, 0
 	unknownsfx0x20 2, 212, 1, 7
diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/save_3.asm
index 3a325f27..47142bb4 100755..100644
--- a/audio/sfx/sfx_1f_5d.asm
+++ b/audio/sfx/save_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
+SFX_Save_3_Ch1: ; 7c45e (1f:445e)
 	duty 2
 IF DEF(_RED)
 	unknownsfx0x20 4, 244, 0, 7
@@ -16,7 +16,7 @@ ENDC
 	endchannel
 
 
-SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
+SFX_Save_3_Ch2: ; 7c475 (1f:4475)
 	duty 2
 IF DEF(_RED)
 	unknownsfx0x20 4, 8, 0, 0
diff --git a/audio/sfx/sfx_08_13.asm b/audio/sfx/sfx_08_13.asm
deleted file mode 100755
index 7feb8deb..00000000
--- a/audio/sfx/sfx_08_13.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_08_13_Ch1: ; 2035d (8:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
diff --git a/audio/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm
deleted file mode 100755
index b36fd06b..00000000
--- a/audio/sfx/sfx_1f_11.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_1f_11_Ch1: ; 7c355 (1f:4355)
-	unknownnoise0x20 0, 145, 34
-	endchannel
diff --git a/audio/sfx/sfx_1f_12.asm b/audio/sfx/sfx_1f_12.asm
deleted file mode 100755
index 21913c25..00000000
--- a/audio/sfx/sfx_1f_12.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_1f_12_Ch1: ; 7c359 (1f:4359)
-	unknownnoise0x20 0, 113, 34
-	endchannel
diff --git a/audio/sfx/sfx_1f_13.asm b/audio/sfx/sfx_1f_13.asm
deleted file mode 100755
index d9294eaa..00000000
--- a/audio/sfx/sfx_1f_13.asm
+++ /dev/null
@@ -1,3 +0,0 @@
-SFX_1f_13_Ch1: ; 7c35d (1f:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
diff --git a/audio/sfx/sfx_1f_67.asm b/audio/sfx/shooting_star.asm
index a81d47bf..2cb831c8 100755..100644
--- a/audio/sfx/sfx_1f_67.asm
+++ b/audio/sfx/shooting_star.asm
@@ -1,4 +1,4 @@
-SFX_1f_67_Ch1: ; 7c72d (1f:472d)
+SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d)
 	dutycycle 228
 	unknownsfx0x10 47
 	unknownsfx0x20 4, 64, 224, 7
diff --git a/audio/sfx/sfx_02_48.asm b/audio/sfx/shrink_1.asm
index e22443cc..61ca1933 100755..100644
--- a/audio/sfx/sfx_02_48.asm
+++ b/audio/sfx/shrink_1.asm
@@ -1,4 +1,4 @@
-SFX_02_48_Ch1: ; 854e (2:454e)
+SFX_Shrink_1_Ch1: ; 854e (2:454e)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
diff --git a/audio/sfx/sfx_1f_48.asm b/audio/sfx/shrink_3.asm
index 35aa7ad5..59fe1556 100755..100644
--- a/audio/sfx/sfx_1f_48.asm
+++ b/audio/sfx/shrink_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_48_Ch1: ; 7c52b (1f:452b)
+SFX_Shrink_3_Ch1: ; 7c52b (1f:452b)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 6
diff --git a/audio/sfx/sfx_08_77.asm b/audio/sfx/silph_scope.asm
index 840a0ea5..66e4fe95 100755..100644
--- a/audio/sfx/sfx_08_77.asm
+++ b/audio/sfx/silph_scope.asm
@@ -1,4 +1,4 @@
-SFX_08_77_Ch1: ; 20412 (8:4412)
+SFX_Silph_Scope_Ch1: ; 20412 (8:4412)
 	duty 0
 	unknownsfx0x20 0, 210, 0, 7
 	unknownsfx0x20 0, 210, 64, 7
diff --git a/audio/sfx/sfx_1f_66.asm b/audio/sfx/slots_new_spin.asm
index 068917bb..d122517d 100755..100644
--- a/audio/sfx/sfx_1f_66.asm
+++ b/audio/sfx/slots_new_spin.asm
@@ -1,4 +1,4 @@
-SFX_1f_66_Ch1: ; 7c70f (1f:470f)
+SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f)
 	duty 3
 	unknownsfx0x20 5, 225, 0, 7
 	unknownsfx0x20 2, 225, 128, 7
@@ -6,7 +6,7 @@ SFX_1f_66_Ch1: ; 7c70f (1f:470f)
 	endchannel
 
 
-SFX_1f_66_Ch2: ; 7c71e (1f:471e)
+SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e)
 	duty 2
 	unknownsfx0x20 4, 193, 193, 6
 	unknownsfx0x20 2, 193, 65, 7
diff --git a/audio/sfx/sfx_1f_65.asm b/audio/sfx/slots_reward.asm
index dc564910..2400c0df 100755..100644
--- a/audio/sfx/sfx_1f_65.asm
+++ b/audio/sfx/slots_reward.asm
@@ -1,4 +1,4 @@
-SFX_1f_65_Ch1: ; 7c704 (1f:4704)
+SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704)
 	duty 2
 	unknownsfx0x20 2, 241, 0, 7
 	unknownsfx0x20 8, 129, 224, 7
diff --git a/audio/sfx/sfx_1f_64.asm b/audio/sfx/slots_stop_wheel.asm
index ab5a4c04..e67af4c4 100755..100644
--- a/audio/sfx/sfx_1f_64.asm
+++ b/audio/sfx/slots_stop_wheel.asm
@@ -1,4 +1,4 @@
-SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5)
+SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5)
 	duty 2
 	unknownsfx0x20 1, 242, 160, 6
 	unknownsfx0x20 1, 242, 224, 6
diff --git a/audio/sfx/sfx_02_01.asm b/audio/sfx/snare1_1.asm
index 0de37099..3aa0f74e 100755..100644
--- a/audio/sfx/sfx_02_01.asm
+++ b/audio/sfx/snare1_1.asm
@@ -1,3 +1,3 @@
-SFX_02_01_Ch1: ; 82fd (2:42fd)
+SFX_Snare1_1_Ch1: ; 82fd (2:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
diff --git a/audio/sfx/sfx_08_01.asm b/audio/sfx/snare1_2.asm
index 7d86e4ad..7d0c3413 100755..100644
--- a/audio/sfx/sfx_08_01.asm
+++ b/audio/sfx/snare1_2.asm
@@ -1,3 +1,3 @@
-SFX_08_01_Ch1: ; 202fd (8:42fd)
+SFX_Snare1_2_Ch1: ; 202fd (8:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
diff --git a/audio/sfx/sfx_1f_01.asm b/audio/sfx/snare1_3.asm
index bd3a2efe..8d92bff6 100755..100644
--- a/audio/sfx/sfx_1f_01.asm
+++ b/audio/sfx/snare1_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_01_Ch1: ; 7c2fd (1f:42fd)
+SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd)
 	unknownnoise0x20 0, 193, 51
 	endchannel
diff --git a/audio/sfx/sfx_08_02.asm b/audio/sfx/snare2_1.asm
index 1fe0d185..7636a4f3 100755..100644
--- a/audio/sfx/sfx_08_02.asm
+++ b/audio/sfx/snare2_1.asm
@@ -1,3 +1,3 @@
-SFX_08_02_Ch1: ; 20301 (8:4301)
+SFX_Snare2_1_Ch1: ; 8301 (2:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
diff --git a/audio/sfx/sfx_02_02.asm b/audio/sfx/snare2_2.asm
index ce8efcf0..4c34e91a 100755..100644
--- a/audio/sfx/sfx_02_02.asm
+++ b/audio/sfx/snare2_2.asm
@@ -1,3 +1,3 @@
-SFX_02_02_Ch1: ; 8301 (2:4301)
+SFX_Snare2_2_Ch1: ; 20301 (8:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
diff --git a/audio/sfx/sfx_1f_02.asm b/audio/sfx/snare2_3.asm
index 9ee8923b..eb816f54 100755..100644
--- a/audio/sfx/sfx_1f_02.asm
+++ b/audio/sfx/snare2_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_02_Ch1: ; 7c301 (1f:4301)
+SFX_Snare2_3_Ch1: ; 7c301 (1f:4301)
 	unknownnoise0x20 0, 177, 51
 	endchannel
diff --git a/audio/sfx/sfx_08_03.asm b/audio/sfx/snare3_1.asm
index 141c4e5b..b7e319b2 100755..100644
--- a/audio/sfx/sfx_08_03.asm
+++ b/audio/sfx/snare3_1.asm
@@ -1,3 +1,3 @@
-SFX_08_03_Ch1: ; 20305 (8:4305)
+SFX_Snare3_1_Ch1: ; 8305 (2:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
diff --git a/audio/sfx/sfx_1f_03.asm b/audio/sfx/snare3_2.asm
index 55d249a7..ce889e55 100755..100644
--- a/audio/sfx/sfx_1f_03.asm
+++ b/audio/sfx/snare3_2.asm
@@ -1,3 +1,3 @@
-SFX_1f_03_Ch1: ; 7c305 (1f:4305)
+SFX_Snare3_2_Ch1: ; 20305 (8:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
diff --git a/audio/sfx/sfx_02_03.asm b/audio/sfx/snare3_3.asm
index 3fc19143..c94f436f 100755..100644
--- a/audio/sfx/sfx_02_03.asm
+++ b/audio/sfx/snare3_3.asm
@@ -1,3 +1,3 @@
-SFX_02_03_Ch1: ; 8305 (2:4305)
+SFX_Snare3_3_Ch1: ; 7c305 (1f:4305)
 	unknownnoise0x20 0, 161, 51
 	endchannel
diff --git a/audio/sfx/sfx_08_04.asm b/audio/sfx/snare4_1.asm
index 923fd349..20c62731 100755..100644
--- a/audio/sfx/sfx_08_04.asm
+++ b/audio/sfx/snare4_1.asm
@@ -1,3 +1,3 @@
-SFX_08_04_Ch1: ; 20309 (8:4309)
+SFX_Snare4_1_Ch1: ; 8309 (2:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
diff --git a/audio/sfx/sfx_1f_04.asm b/audio/sfx/snare4_2.asm
index 8906de66..da38dd62 100755..100644
--- a/audio/sfx/sfx_1f_04.asm
+++ b/audio/sfx/snare4_2.asm
@@ -1,3 +1,3 @@
-SFX_1f_04_Ch1: ; 7c309 (1f:4309)
+SFX_Snare4_2_Ch1: ; 20309 (8:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
diff --git a/audio/sfx/sfx_02_04.asm b/audio/sfx/snare4_3.asm
index 35abd908..4496260b 100755..100644
--- a/audio/sfx/sfx_02_04.asm
+++ b/audio/sfx/snare4_3.asm
@@ -1,3 +1,3 @@
-SFX_02_04_Ch1: ; 8309 (2:4309)
+SFX_Snare4_3_Ch1: ; 7c309 (1f:4309)
 	unknownnoise0x20 0, 129, 51
 	endchannel
diff --git a/audio/sfx/sfx_02_05.asm b/audio/sfx/snare5_1.asm
index 5aca7085..e0ae8b4c 100755..100644
--- a/audio/sfx/sfx_02_05.asm
+++ b/audio/sfx/snare5_1.asm
@@ -1,4 +1,4 @@
-SFX_02_05_Ch1: ; 830d (2:430d)
+SFX_Snare5_1_Ch1: ; 830d (2:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
diff --git a/audio/sfx/sfx_08_05.asm b/audio/sfx/snare5_2.asm
index 54745d1f..649463cc 100755..100644
--- a/audio/sfx/sfx_08_05.asm
+++ b/audio/sfx/snare5_2.asm
@@ -1,4 +1,4 @@
-SFX_08_05_Ch1: ; 2030d (8:430d)
+SFX_Snare5_2_Ch1: ; 2030d (8:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
diff --git a/audio/sfx/sfx_1f_05.asm b/audio/sfx/snare5_3.asm
index 9c0e679b..33a169b9 100755..100644
--- a/audio/sfx/sfx_1f_05.asm
+++ b/audio/sfx/snare5_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_05_Ch1: ; 7c30d (1f:430d)
+SFX_Snare5_3_Ch1: ; 7c30d (1f:430d)
 	unknownnoise0x20 7, 132, 55
 	unknownnoise0x20 6, 132, 54
 	unknownnoise0x20 5, 131, 53
diff --git a/audio/sfx/sfx_02_08.asm b/audio/sfx/snare6_1.asm
index 5a172e25..4779226f 100755..100644
--- a/audio/sfx/sfx_02_08.asm
+++ b/audio/sfx/snare6_1.asm
@@ -1,3 +1,3 @@
-SFX_02_08_Ch1: ; 832b (2:432b)
+SFX_Snare6_1_Ch1: ; 832b (2:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
diff --git a/audio/sfx/sfx_08_08.asm b/audio/sfx/snare6_2.asm
index 6def0c55..36359d02 100755..100644
--- a/audio/sfx/sfx_08_08.asm
+++ b/audio/sfx/snare6_2.asm
@@ -1,3 +1,3 @@
-SFX_08_08_Ch1: ; 2032b (8:432b)
+SFX_Snare6_2_Ch1: ; 2032b (8:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
diff --git a/audio/sfx/sfx_1f_08.asm b/audio/sfx/snare6_3.asm
index f741bdf1..d4807ff6 100755..100644
--- a/audio/sfx/sfx_1f_08.asm
+++ b/audio/sfx/snare6_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_08_Ch1: ; 7c32b (1f:432b)
+SFX_Snare6_3_Ch1: ; 7c32b (1f:432b)
 	unknownnoise0x20 0, 129, 16
 	endchannel
diff --git a/audio/sfx/sfx_02_09.asm b/audio/sfx/snare7_1.asm
index 47f85e16..c53642ed 100755..100644
--- a/audio/sfx/sfx_02_09.asm
+++ b/audio/sfx/snare7_1.asm
@@ -1,3 +1,3 @@
-SFX_02_09_Ch1: ; 832f (2:432f)
+SFX_Snare7_1_Ch1: ; 832f (2:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
diff --git a/audio/sfx/sfx_08_09.asm b/audio/sfx/snare7_2.asm
index c49c5cb7..066aaa53 100755..100644
--- a/audio/sfx/sfx_08_09.asm
+++ b/audio/sfx/snare7_2.asm
@@ -1,3 +1,3 @@
-SFX_08_09_Ch1: ; 2032f (8:432f)
+SFX_Snare7_2_Ch1: ; 2032f (8:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
diff --git a/audio/sfx/sfx_1f_09.asm b/audio/sfx/snare7_3.asm
index 73ed88fa..1b058a9b 100755..100644
--- a/audio/sfx/sfx_1f_09.asm
+++ b/audio/sfx/snare7_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_09_Ch1: ; 7c32f (1f:432f)
+SFX_Snare7_3_Ch1: ; 7c32f (1f:432f)
 	unknownnoise0x20 0, 130, 35
 	endchannel
diff --git a/audio/sfx/sfx_02_0a.asm b/audio/sfx/snare8_1.asm
index 3d43afa9..6269c7dc 100755..100644
--- a/audio/sfx/sfx_02_0a.asm
+++ b/audio/sfx/snare8_1.asm
@@ -1,3 +1,3 @@
-SFX_02_0a_Ch1: ; 8333 (2:4333)
+SFX_Snare8_1_Ch1: ; 8333 (2:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
diff --git a/audio/sfx/sfx_08_0a.asm b/audio/sfx/snare8_2.asm
index f5f2ab3c..4c5bb18e 100755..100644
--- a/audio/sfx/sfx_08_0a.asm
+++ b/audio/sfx/snare8_2.asm
@@ -1,3 +1,3 @@
-SFX_08_0a_Ch1: ; 20333 (8:4333)
+SFX_Snare8_2_Ch1: ; 20333 (8:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
diff --git a/audio/sfx/sfx_1f_0a.asm b/audio/sfx/snare8_3.asm
index fb2f620f..d1f0edc0 100755..100644
--- a/audio/sfx/sfx_1f_0a.asm
+++ b/audio/sfx/snare8_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_0a_Ch1: ; 7c333 (1f:4333)
+SFX_Snare8_3_Ch1: ; 7c333 (1f:4333)
 	unknownnoise0x20 0, 130, 37
 	endchannel
diff --git a/audio/sfx/sfx_02_0b.asm b/audio/sfx/snare9_1.asm
index 9c8d38ca..44b2e8c7 100755..100644
--- a/audio/sfx/sfx_02_0b.asm
+++ b/audio/sfx/snare9_1.asm
@@ -1,3 +1,3 @@
-SFX_02_0b_Ch1: ; 8337 (2:4337)
+SFX_Snare9_1_Ch1: ; 8337 (2:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
diff --git a/audio/sfx/sfx_08_0b.asm b/audio/sfx/snare9_2.asm
index 2d45ef7e..1d20de2d 100755..100644
--- a/audio/sfx/sfx_08_0b.asm
+++ b/audio/sfx/snare9_2.asm
@@ -1,3 +1,3 @@
-SFX_08_0b_Ch1: ; 20337 (8:4337)
+SFX_Snare9_2_Ch1: ; 20337 (8:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
diff --git a/audio/sfx/sfx_1f_0b.asm b/audio/sfx/snare9_3.asm
index 46adb73d..849f4404 100755..100644
--- a/audio/sfx/sfx_1f_0b.asm
+++ b/audio/sfx/snare9_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_0b_Ch1: ; 7c337 (1f:4337)
+SFX_Snare9_3_Ch1: ; 7c337 (1f:4337)
 	unknownnoise0x20 0, 130, 38
 	endchannel
diff --git a/audio/sfx/sfx_02_54.asm b/audio/sfx/ss_anne_horn_1.asm
index 72f79c78..3989c148 100755..100644
--- a/audio/sfx/sfx_02_54.asm
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -1,4 +1,4 @@
-SFX_02_54_Ch1: ; 866d (2:466d)
+SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d)
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@ SFX_02_54_Ch1: ; 866d (2:466d)
 	endchannel
 
 
-SFX_02_54_Ch2: ; 868c (2:468c)
+SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c)
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/sfx_1f_54.asm b/audio/sfx/ss_anne_horn_3.asm
index faf5304e..c671b6cb 100755..100644
--- a/audio/sfx/sfx_1f_54.asm
+++ b/audio/sfx/ss_anne_horn_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_54_Ch1: ; 7c64a (1f:464a)
+SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a)
 	duty 2
 	unknownsfx0x20 15, 240, 0, 5
 	unknownsfx0x20 4, 0, 0, 0
@@ -10,7 +10,7 @@ SFX_1f_54_Ch1: ; 7c64a (1f:464a)
 	endchannel
 
 
-SFX_1f_54_Ch2: ; 7c669 (1f:4669)
+SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669)
 	duty 3
 	unknownsfx0x20 15, 240, 130, 4
 	unknownsfx0x20 4, 0, 0, 0
diff --git a/audio/sfx/sfx_02_3f.asm b/audio/sfx/start_menu_1.asm
index dffd99cb..350b08ce 100755..100644
--- a/audio/sfx/sfx_02_3f.asm
+++ b/audio/sfx/start_menu_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3f_Ch1: ; 83c3 (2:43c3)
+SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
diff --git a/audio/sfx/sfx_08_3f.asm b/audio/sfx/start_menu_2.asm
index 800684d3..aabd41ce 100755..100644
--- a/audio/sfx/sfx_08_3f.asm
+++ b/audio/sfx/start_menu_2.asm
@@ -1,4 +1,4 @@
-SFX_08_3f_Ch1: ; 203d6 (8:43d6)
+SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
diff --git a/audio/sfx/sfx_1f_3f.asm b/audio/sfx/start_menu_3.asm
index 68ab34d5..566f11f4 100755..100644
--- a/audio/sfx/sfx_1f_3f.asm
+++ b/audio/sfx/start_menu_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3)
+SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3)
 	unknownnoise0x20 1, 226, 51
 	unknownnoise0x20 8, 225, 34
 	endchannel
diff --git a/audio/sfx/sfx_08_5a.asm b/audio/sfx/super_effective.asm
index 282fea80..6759ef6a 100755..100644
--- a/audio/sfx/sfx_08_5a.asm
+++ b/audio/sfx/super_effective.asm
@@ -1,4 +1,4 @@
-SFX_08_5a_Ch1: ; 20574 (8:4574)
+SFX_Super_Effective_Ch1: ; 20574 (8:4574)
 	unknownnoise0x20 4, 241, 52
 	unknownnoise0x20 15, 242, 100
 	endchannel
diff --git a/audio/sfx/sfx_02_58.asm b/audio/sfx/swap_1.asm
index 3a9836fb..c96d8522 100755..100644
--- a/audio/sfx/sfx_02_58.asm
+++ b/audio/sfx/swap_1.asm
@@ -1,10 +1,10 @@
-SFX_02_58_Ch1: ; 83f8 (2:43f8)
+SFX_Swap_1_Ch1: ; 83f8 (2:43f8)
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_02_58_Ch2: ; 83ff (2:43ff)
+SFX_Swap_1_Ch2: ; 83ff (2:43ff)
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
diff --git a/audio/sfx/sfx_1f_58.asm b/audio/sfx/swap_3.asm
index f5844495..95aa3f19 100755..100644
--- a/audio/sfx/sfx_1f_58.asm
+++ b/audio/sfx/swap_3.asm
@@ -1,10 +1,10 @@
-SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1)
+SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1)
 	duty 2
 	unknownsfx0x20 8, 225, 64, 7
 	endchannel
 
 
-SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8)
+SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8)
 	duty 2
 	unknownsfx0x20 2, 8, 0, 0
 	unknownsfx0x20 8, 177, 65, 7
diff --git a/audio/sfx/sfx_02_49.asm b/audio/sfx/switch_1.asm
index 6cf3e647..040e95aa 100755..100644
--- a/audio/sfx/sfx_02_49.asm
+++ b/audio/sfx/switch_1.asm
@@ -1,4 +1,4 @@
-SFX_02_49_Ch1: ; 8569 (2:4569)
+SFX_Switch_1_Ch1: ; 8569 (2:4569)
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
diff --git a/audio/sfx/sfx_1f_49.asm b/audio/sfx/switch_3.asm
index 160979ac..cbe6c8b2 100755..100644
--- a/audio/sfx/sfx_1f_49.asm
+++ b/audio/sfx/switch_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_49_Ch1: ; 7c546 (1f:4546)
+SFX_Switch_3_Ch1: ; 7c546 (1f:4546)
 	duty 2
 	unknownsfx0x20 4, 0, 0, 0
 	unknownsfx0x20 2, 241, 128, 6
diff --git a/audio/sfx/sfx_02_4c.asm b/audio/sfx/teleport_enter1_1.asm
index a52fefcf..f9fc5ee2 100755..100644
--- a/audio/sfx/sfx_02_4c.asm
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -1,4 +1,4 @@
-SFX_02_4c_Ch1: ; 85b0 (2:45b0)
+SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
diff --git a/audio/sfx/sfx_1f_4c.asm b/audio/sfx/teleport_enter1_3.asm
index 56004e05..24220173 100755..100644
--- a/audio/sfx/sfx_1f_4c.asm
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_4c_Ch1: ; 7c58d (1f:458d)
+SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 7
diff --git a/audio/sfx/sfx_02_4f.asm b/audio/sfx/teleport_enter2_1.asm
index 53e523d0..c3c593b2 100755..100644
--- a/audio/sfx/sfx_02_4f.asm
+++ b/audio/sfx/teleport_enter2_1.asm
@@ -1,4 +1,4 @@
-SFX_02_4f_Ch1: ; 85e1 (2:45e1)
+SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1)
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
diff --git a/audio/sfx/sfx_1f_4f.asm b/audio/sfx/teleport_enter2_3.asm
index 91394f9f..628bb9fa 100755..100644
--- a/audio/sfx/sfx_1f_4f.asm
+++ b/audio/sfx/teleport_enter2_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_4f_Ch1: ; 7c5be (1f:45be)
+SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be)
 	unknownnoise0x20 2, 241, 50
 	unknownnoise0x20 2, 0, 0
 	unknownnoise0x20 2, 241, 34
diff --git a/audio/sfx/sfx_1f_4b.asm b/audio/sfx/teleport_exit1_1.asm
index b3065b2f..46ba29cf 100755..100644
--- a/audio/sfx/sfx_1f_4b.asm
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_4b_Ch1: ; 7c572 (1f:4572)
+SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
diff --git a/audio/sfx/sfx_02_4b.asm b/audio/sfx/teleport_exit1_3.asm
index 173a6c9d..8d203212 100755..100644
--- a/audio/sfx/sfx_02_4b.asm
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -1,4 +1,4 @@
-SFX_02_4b_Ch1: ; 8595 (2:4595)
+SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572)
 	duty 1
 	unknownsfx0x10 23
 	unknownsfx0x20 15, 215, 0, 5
diff --git a/audio/sfx/sfx_1f_4d.asm b/audio/sfx/teleport_exit2_1.asm
index c57299c0..37159083 100755..100644
--- a/audio/sfx/sfx_1f_4d.asm
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8)
+SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb)
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
diff --git a/audio/sfx/sfx_02_4d.asm b/audio/sfx/teleport_exit2_3.asm
index c7063722..c7ad054b 100755..100644
--- a/audio/sfx/sfx_02_4d.asm
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -1,4 +1,4 @@
-SFX_02_4d_Ch1: ; 85cb (2:45cb)
+SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8)
 	duty 1
 	unknownsfx0x10 22
 	unknownsfx0x20 15, 210, 0, 5
diff --git a/audio/sfx/sfx_02_3c.asm b/audio/sfx/tink_1.asm
index 95e2029d..a8099ae1 100755..100644
--- a/audio/sfx/sfx_02_3c.asm
+++ b/audio/sfx/tink_1.asm
@@ -1,4 +1,4 @@
-SFX_02_3c_Ch1: ; 840a (2:440a)
+SFX_Tink_1_Ch1: ; 840a (2:440a)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
diff --git a/audio/sfx/sfx_1f_3c.asm b/audio/sfx/tink_2.asm
index 688e89d2..cca37381 100755..100644
--- a/audio/sfx/sfx_1f_3c.asm
+++ b/audio/sfx/tink_2.asm
@@ -1,4 +1,4 @@
-SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3)
+SFX_Tink_2_Ch1: ; 203dd (8:43dd)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
diff --git a/audio/sfx/sfx_08_3c.asm b/audio/sfx/tink_3.asm
index 0ac2343c..7299b7ae 100755..100644
--- a/audio/sfx/sfx_08_3c.asm
+++ b/audio/sfx/tink_3.asm
@@ -1,4 +1,4 @@
-SFX_08_3c_Ch1: ; 203dd (8:43dd)
+SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3)
 	duty 2
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 2
diff --git a/audio/sfx/sfx_1f_44.asm b/audio/sfx/trade_machine_1.asm
index fc404eab..ce2bbc0a 100755..100644
--- a/audio/sfx/sfx_1f_44.asm
+++ b/audio/sfx/trade_machine_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7)
+SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee)
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/sfx_02_44.asm b/audio/sfx/trade_machine_3.asm
index c03155d1..f7515ffb 100755..100644
--- a/audio/sfx/sfx_02_44.asm
+++ b/audio/sfx/trade_machine_3.asm
@@ -1,4 +1,4 @@
-SFX_02_44_Ch1: ; 84ee (2:44ee)
+SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7)
 	duty 2
 	unknownsfx0x10 21
 	unknownsfx0x20 15, 240, 240, 4
diff --git a/audio/sfx/sfx_02_06.asm b/audio/sfx/triangle1_1.asm
index f2031c3f..fded5b94 100755..100644
--- a/audio/sfx/sfx_02_06.asm
+++ b/audio/sfx/triangle1_1.asm
@@ -1,3 +1,3 @@
-SFX_02_06_Ch1: ; 8320 (2:4320)
+SFX_Triangle1_1_Ch1: ; 8320 (2:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
diff --git a/audio/sfx/sfx_08_06.asm b/audio/sfx/triangle1_2.asm
index ecd2b191..4f4474ee 100755..100644
--- a/audio/sfx/sfx_08_06.asm
+++ b/audio/sfx/triangle1_2.asm
@@ -1,3 +1,3 @@
-SFX_08_06_Ch1: ; 20320 (8:4320)
+SFX_Triangle1_2_Ch1: ; 20320 (8:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
diff --git a/audio/sfx/sfx_1f_06.asm b/audio/sfx/triangle1_3.asm
index 429f18ff..d1ad9390 100755..100644
--- a/audio/sfx/sfx_1f_06.asm
+++ b/audio/sfx/triangle1_3.asm
@@ -1,3 +1,3 @@
-SFX_1f_06_Ch1: ; 7c320 (1f:4320)
+SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320)
 	unknownnoise0x20 0, 81, 42
 	endchannel
diff --git a/audio/sfx/sfx_02_07.asm b/audio/sfx/triangle2_1.asm
index 58ae12fd..f9c4bc6a 100755..100644
--- a/audio/sfx/sfx_02_07.asm
+++ b/audio/sfx/triangle2_1.asm
@@ -1,4 +1,4 @@
-SFX_02_07_Ch1: ; 8324 (2:4324)
+SFX_Triangle2_1_Ch1: ; 8324 (2:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
diff --git a/audio/sfx/sfx_08_07.asm b/audio/sfx/triangle2_2.asm
index a520de0d..feddf1af 100755..100644
--- a/audio/sfx/sfx_08_07.asm
+++ b/audio/sfx/triangle2_2.asm
@@ -1,4 +1,4 @@
-SFX_08_07_Ch1: ; 20324 (8:4324)
+SFX_Triangle2_2_Ch1: ; 20324 (8:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
diff --git a/audio/sfx/sfx_1f_07.asm b/audio/sfx/triangle2_3.asm
index 1dd80c9e..a4acff1b 100755..100644
--- a/audio/sfx/sfx_1f_07.asm
+++ b/audio/sfx/triangle2_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_07_Ch1: ; 7c324 (1f:4324)
+SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324)
 	unknownnoise0x20 1, 65, 43
 	unknownnoise0x20 0, 97, 42
 	endchannel
diff --git a/audio/sfx/sfx_02_10.asm b/audio/sfx/triangle3_1.asm
index 61d57b01..e4c3c919 100755..100644
--- a/audio/sfx/sfx_02_10.asm
+++ b/audio/sfx/triangle3_1.asm
@@ -1,4 +1,4 @@
-SFX_02_10_Ch1: ; 834e (2:434e)
+SFX_Triangle3_1_Ch1: ; 834e (2:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
diff --git a/audio/sfx/sfx_08_10.asm b/audio/sfx/triangle3_2.asm
index 3643a769..7a642878 100755..100644
--- a/audio/sfx/sfx_08_10.asm
+++ b/audio/sfx/triangle3_2.asm
@@ -1,4 +1,4 @@
-SFX_08_10_Ch1: ; 2034e (8:434e)
+SFX_Triangle3_2_Ch1: ; 2034e (8:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
diff --git a/audio/sfx/sfx_1f_10.asm b/audio/sfx/triangle3_3.asm
index 7c22724d..73ad42ce 100755..100644
--- a/audio/sfx/sfx_1f_10.asm
+++ b/audio/sfx/triangle3_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_10_Ch1: ; 7c34e (1f:434e)
+SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e)
 	unknownnoise0x20 2, 145, 40
 	unknownnoise0x20 0, 113, 24
 	endchannel
diff --git a/audio/sfx/sfx_1f_46.asm b/audio/sfx/turn_off_pc_1.asm
index 3cd98880..7b4e999d 100755..100644
--- a/audio/sfx/sfx_1f_46.asm
+++ b/audio/sfx/turn_off_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_1f_46_Ch1: ; 7c505 (1f:4505)
+SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
diff --git a/audio/sfx/sfx_02_46.asm b/audio/sfx/turn_off_pc_3.asm
index b75ef176..057ab9a4 100755..100644
--- a/audio/sfx/sfx_02_46.asm
+++ b/audio/sfx/turn_off_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_02_46_Ch1: ; 8528 (2:4528)
+SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505)
 	duty 2
 	unknownsfx0x20 4, 240, 0, 6
 	unknownsfx0x20 4, 240, 0, 4
diff --git a/audio/sfx/sfx_02_45.asm b/audio/sfx/turn_on_pc_1.asm
index a2b9f83d..b537791c 100755..100644
--- a/audio/sfx/sfx_02_45.asm
+++ b/audio/sfx/turn_on_pc_1.asm
@@ -1,4 +1,4 @@
-SFX_02_45_Ch1: ; 84fd (2:44fd)
+SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd)
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
diff --git a/audio/sfx/sfx_1f_45.asm b/audio/sfx/turn_on_pc_3.asm
index f6548431..df654cfa 100755..100644
--- a/audio/sfx/sfx_1f_45.asm
+++ b/audio/sfx/turn_on_pc_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6)
+SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6)
 	duty 2
 	unknownsfx0x20 15, 242, 192, 7
 	unknownsfx0x20 15, 0, 0, 0
diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/unused2_2.asm
index 1eca4432..1eca4432 100755
--- a/audio/sfx/sfx_08_unused2.asm
+++ b/audio/sfx/unused2_2.asm
diff --git a/audio/sfx/sfx_02_unused.asm b/audio/sfx/unused_1.asm
index bd9bdfb3..bd9bdfb3 100755
--- a/audio/sfx/sfx_02_unused.asm
+++ b/audio/sfx/unused_1.asm
diff --git a/audio/sfx/sfx_08_unused.asm b/audio/sfx/unused_2.asm
index 25e4840c..25e4840c 100755
--- a/audio/sfx/sfx_08_unused.asm
+++ b/audio/sfx/unused_2.asm
diff --git a/audio/sfx/sfx_1f_unused.asm b/audio/sfx/unused_3.asm
index dfb16ee1..dfb16ee1 100755
--- a/audio/sfx/sfx_1f_unused.asm
+++ b/audio/sfx/unused_3.asm
diff --git a/audio/sfx/sfx_08_55.asm b/audio/sfx/vine_whip.asm
index caecb7ce..c1e610b6 100755..100644
--- a/audio/sfx/sfx_08_55.asm
+++ b/audio/sfx/vine_whip.asm
@@ -1,4 +1,4 @@
-SFX_08_55_Ch1: ; 20533 (8:4533)
+SFX_Vine_Whip_Ch1: ; 20533 (8:4533)
 	unknownnoise0x20 1, 194, 51
 	unknownnoise0x20 2, 242, 33
 	unknownnoise0x20 1, 226, 51
diff --git a/audio/sfx/sfx_02_55.asm b/audio/sfx/withdraw_deposit_1.asm
index 57182f34..bb7a8d6e 100755..100644
--- a/audio/sfx/sfx_02_55.asm
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -1,4 +1,4 @@
-SFX_02_55_Ch1: ; 86ab (2:46ab)
+SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab)
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
diff --git a/audio/sfx/sfx_1f_55.asm b/audio/sfx/withdraw_deposit_3.asm
index e2fbffae..99e47fee 100755..100644
--- a/audio/sfx/sfx_1f_55.asm
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -1,4 +1,4 @@
-SFX_1f_55_Ch1: ; 7c688 (1f:4688)
+SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688)
 	duty 1
 	unknownsfx0x10 58
 	unknownsfx0x20 4, 242, 0, 5
diff --git a/constants/music_constants.asm b/constants/music_constants.asm
index 260ccd39..f239acea 100644
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -1,7 +1,7 @@
 ; Song ids are calculated by address to save space.
 
 music_const: MACRO
-\1 EQUS "((\2 - SFX_Headers_02) / 3)"
+\1 EQUS "((\2 - SFX_Headers_1) / 3)"
 ENDM
 
 	; AUDIO_1
@@ -56,175 +56,175 @@ ENDM
 	music_const MUSIC_MEET_MALE_TRAINER,   Music_MeetMaleTrainer
 
 	; AUDIO_1 AUDIO_2 AUDIO_3
-	music_const SFX_SNARE_1,          SFX_02_01
-	music_const SFX_SNARE_2,          SFX_02_02
-	music_const SFX_SNARE_3,          SFX_02_03
-	music_const SFX_SNARE_4,          SFX_02_04
-	music_const SFX_SNARE_5,          SFX_02_05
-	music_const SFX_TRIANGLE_1,       SFX_02_06
-	music_const SFX_TRIANGLE_2,       SFX_02_07
-	music_const SFX_SNARE_6,          SFX_02_08
-	music_const SFX_SNARE_7,          SFX_02_09
-	music_const SFX_SNARE_8,          SFX_02_0a
-	music_const SFX_SNARE_9,          SFX_02_0b
-	music_const SFX_CYMBAL_1,         SFX_02_0c
-	music_const SFX_CYMBAL_2,         SFX_02_0d
-	music_const SFX_CYMBAL_3,         SFX_02_0e
-	music_const SFX_MUTED_SNARE_1,    SFX_02_0f
-	music_const SFX_TRIANGLE_3,       SFX_02_10
-	music_const SFX_MUTED_SNARE_2,    SFX_02_11
-	music_const SFX_MUTED_SNARE_3,    SFX_02_12
-	music_const SFX_MUTED_SNARE_4,    SFX_02_13
-	music_const SFX_CRY_00,           SFX_02_14
-	music_const SFX_CRY_01,           SFX_02_15
-	music_const SFX_CRY_02,           SFX_02_16
-	music_const SFX_CRY_03,           SFX_02_17
-	music_const SFX_CRY_04,           SFX_02_18
-	music_const SFX_CRY_05,           SFX_02_19
-	music_const SFX_CRY_06,           SFX_02_1a
-	music_const SFX_CRY_07,           SFX_02_1b
-	music_const SFX_CRY_08,           SFX_02_1c
-	music_const SFX_CRY_09,           SFX_02_1d
-	music_const SFX_CRY_0A,           SFX_02_1e
-	music_const SFX_CRY_0B,           SFX_02_1f
-	music_const SFX_CRY_0C,           SFX_02_20
-	music_const SFX_CRY_0D,           SFX_02_21
-	music_const SFX_CRY_0E,           SFX_02_22
-	music_const SFX_CRY_0F,           SFX_02_23
-	music_const SFX_CRY_10,           SFX_02_24
-	music_const SFX_CRY_11,           SFX_02_25
-	music_const SFX_CRY_12,           SFX_02_26
-	music_const SFX_CRY_13,           SFX_02_27
-	music_const SFX_CRY_14,           SFX_02_28
-	music_const SFX_CRY_15,           SFX_02_29
-	music_const SFX_CRY_16,           SFX_02_2a
-	music_const SFX_CRY_17,           SFX_02_2b
-	music_const SFX_CRY_18,           SFX_02_2c
-	music_const SFX_CRY_19,           SFX_02_2d
-	music_const SFX_CRY_1A,           SFX_02_2e
-	music_const SFX_CRY_1B,           SFX_02_2f
-	music_const SFX_CRY_1C,           SFX_02_30
-	music_const SFX_CRY_1D,           SFX_02_31
-	music_const SFX_CRY_1E,           SFX_02_32
-	music_const SFX_CRY_1F,           SFX_02_33
-	music_const SFX_CRY_20,           SFX_02_34
-	music_const SFX_CRY_21,           SFX_02_35
-	music_const SFX_CRY_22,           SFX_02_36
-	music_const SFX_CRY_23,           SFX_02_37
-	music_const SFX_CRY_24,           SFX_02_38
-	music_const SFX_CRY_25,           SFX_02_39
+	music_const SFX_SNARE_1,            SFX_Snare1_1
+	music_const SFX_SNARE_2,            SFX_Snare2_1
+	music_const SFX_SNARE_3,            SFX_Snare3_1
+	music_const SFX_SNARE_4,            SFX_Snare4_1
+	music_const SFX_SNARE_5,            SFX_Snare5_1
+	music_const SFX_TRIANGLE_1,         SFX_Triangle1_1
+	music_const SFX_TRIANGLE_2,         SFX_Triangle2_1
+	music_const SFX_SNARE_6,            SFX_Snare6_1
+	music_const SFX_SNARE_7,            SFX_Snare7_1
+	music_const SFX_SNARE_8,            SFX_Snare8_1
+	music_const SFX_SNARE_9,            SFX_Snare9_1
+	music_const SFX_CYMBAL_1,           SFX_Cymbal1_1
+	music_const SFX_CYMBAL_2,           SFX_Cymbal2_1
+	music_const SFX_CYMBAL_3,           SFX_Cymbal3_1
+	music_const SFX_MUTED_SNARE_1,      SFX_Muted_Snare1_1
+	music_const SFX_TRIANGLE_3,         SFX_Triangle3_1
+	music_const SFX_MUTED_SNARE_2,      SFX_Muted_Snare2_1
+	music_const SFX_MUTED_SNARE_3,      SFX_Muted_Snare3_1
+	music_const SFX_MUTED_SNARE_4,      SFX_Muted_Snare4_1
+	music_const SFX_CRY_00,             SFX_Cry00_1
+	music_const SFX_CRY_01,             SFX_Cry01_1
+	music_const SFX_CRY_02,             SFX_Cry02_1
+	music_const SFX_CRY_03,             SFX_Cry03_1
+	music_const SFX_CRY_04,             SFX_Cry04_1
+	music_const SFX_CRY_05,             SFX_Cry05_1
+	music_const SFX_CRY_06,             SFX_Cry06_1
+	music_const SFX_CRY_07,             SFX_Cry07_1
+	music_const SFX_CRY_08,             SFX_Cry08_1
+	music_const SFX_CRY_09,             SFX_Cry09_1
+	music_const SFX_CRY_0A,             SFX_Cry0A_1
+	music_const SFX_CRY_0B,             SFX_Cry0B_1
+	music_const SFX_CRY_0C,             SFX_Cry0C_1
+	music_const SFX_CRY_0D,             SFX_Cry0D_1
+	music_const SFX_CRY_0E,             SFX_Cry0E_1
+	music_const SFX_CRY_0F,             SFX_Cry0F_1
+	music_const SFX_CRY_10,             SFX_Cry10_1
+	music_const SFX_CRY_11,             SFX_Cry11_1
+	music_const SFX_CRY_12,             SFX_Cry12_1
+	music_const SFX_CRY_13,             SFX_Cry13_1
+	music_const SFX_CRY_14,             SFX_Cry14_1
+	music_const SFX_CRY_15,             SFX_Cry15_1
+	music_const SFX_CRY_16,             SFX_Cry16_1
+	music_const SFX_CRY_17,             SFX_Cry17_1
+	music_const SFX_CRY_18,             SFX_Cry18_1
+	music_const SFX_CRY_19,             SFX_Cry19_1
+	music_const SFX_CRY_1A,             SFX_Cry1A_1
+	music_const SFX_CRY_1B,             SFX_Cry1B_1
+	music_const SFX_CRY_1C,             SFX_Cry1C_1
+	music_const SFX_CRY_1D,             SFX_Cry1D_1
+	music_const SFX_CRY_1E,             SFX_Cry1E_1
+	music_const SFX_CRY_1F,             SFX_Cry1F_1
+	music_const SFX_CRY_20,             SFX_Cry20_1
+	music_const SFX_CRY_21,             SFX_Cry21_1
+	music_const SFX_CRY_22,             SFX_Cry22_1
+	music_const SFX_CRY_23,             SFX_Cry23_1
+	music_const SFX_CRY_24,             SFX_Cry24_1
+	music_const SFX_CRY_25,             SFX_Cry25_1
 
-	music_const SFX_GET_ITEM_2,       SFX_02_3b
-	music_const SFX_TINK,             SFX_02_3c
-	music_const SFX_HEAL_HP,          SFX_02_3d
-	music_const SFX_HEAL_AILMENT,     SFX_02_3e
-	music_const SFX_START_MENU,       SFX_02_3f
-	music_const SFX_PRESS_AB,         SFX_02_40
+	music_const SFX_GET_ITEM_2,         SFX_Get_Item2_1
+	music_const SFX_TINK,               SFX_Tink_1
+	music_const SFX_HEAL_HP,            SFX_Heal_HP_1
+	music_const SFX_HEAL_AILMENT,       SFX_Heal_Ailment_1
+	music_const SFX_START_MENU,         SFX_Start_Menu_1
+	music_const SFX_PRESS_AB,           SFX_Press_AB_1
 
 	; AUDIO_1 AUDIO_3
-	music_const SFX_GET_ITEM_1,       SFX_02_3a
+	music_const SFX_GET_ITEM_1,         SFX_Get_Item1_1
 
-	music_const SFX_POKEDEX_RATING,   SFX_02_41
-	music_const SFX_GET_KEY_ITEM,     SFX_02_42
-	music_const SFX_POISONED,         SFX_02_43
-	music_const SFX_TRADE_MACHINE,    SFX_02_44
-	music_const SFX_TURN_ON_PC,       SFX_02_45
-	music_const SFX_TURN_OFF_PC,      SFX_02_46
-	music_const SFX_ENTER_PC,         SFX_02_47
-	music_const SFX_SHRINK,           SFX_02_48
-	music_const SFX_SWITCH,           SFX_02_49
-	music_const SFX_HEALING_MACHINE,  SFX_02_4a
-	music_const SFX_TELEPORT_1,       SFX_02_4b
-	music_const SFX_TELEPORT_2,       SFX_02_4c
-	music_const SFX_TELEPORT_3,       SFX_02_4d
-	music_const SFX_LEDGE,            SFX_02_4e
-	music_const SFX_FLY_1,            SFX_02_4f
-	music_const SFX_FLY_2,            SFX_02_50
-	music_const SFX_DENIED,           SFX_02_51
-	music_const SFX_ARROW_TILES,      SFX_02_52
-	music_const SFX_PUSH_BOULDER,     SFX_02_53
-	music_const SFX_SS_ANNE_HORN,     SFX_02_54
-	music_const SFX_WITHDRAW_DEPOSIT, SFX_02_55
-	music_const SFX_CUT,              SFX_02_56
-	music_const SFX_GO_INSIDE,        SFX_02_57
-	music_const SFX_SWAP,             SFX_02_58
-	music_const SFX_59,               SFX_02_59 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL
-	music_const SFX_PURCHASE,         SFX_02_5a
-	music_const SFX_COLLISION,        SFX_02_5b
-	music_const SFX_GO_OUTSIDE,       SFX_02_5c
-	music_const SFX_SAVE,             SFX_02_5d
+	music_const SFX_POKEDEX_RATING,     SFX_Pokedex_Rating_1
+	music_const SFX_GET_KEY_ITEM,       SFX_Get_Key_Item_1
+	music_const SFX_POISONED,           SFX_Poisoned_1
+	music_const SFX_TRADE_MACHINE,      SFX_Trade_Machine_1
+	music_const SFX_TURN_ON_PC,         SFX_Turn_On_PC_1
+	music_const SFX_TURN_OFF_PC,        SFX_Turn_Off_PC_1
+	music_const SFX_ENTER_PC,           SFX_Enter_PC_1
+	music_const SFX_SHRINK,             SFX_Shrink_1
+	music_const SFX_SWITCH,             SFX_Switch_1
+	music_const SFX_HEALING_MACHINE,    SFX_Healing_Machine_1
+	music_const SFX_TELEPORT_EXIT_1,    SFX_Teleport_Exit1_1
+	music_const SFX_TELEPORT_ENTER_1,   SFX_Teleport_Enter1_1
+	music_const SFX_TELEPORT_EXIT_2,    SFX_Teleport_Exit2_1
+	music_const SFX_LEDGE,              SFX_Ledge_1
+	music_const SFX_TELEPORT_ENTER_2,   SFX_Teleport_Enter2_1
+	music_const SFX_FLY,                SFX_Fly_1
+	music_const SFX_DENIED,             SFX_Denied_1
+	music_const SFX_ARROW_TILES,        SFX_Arrow_Tiles_1
+	music_const SFX_PUSH_BOULDER,       SFX_Push_Boulder_1
+	music_const SFX_SS_ANNE_HORN,       SFX_SS_Anne_Horn_1
+	music_const SFX_WITHDRAW_DEPOSIT,   SFX_Withdraw_Deposit_1
+	music_const SFX_CUT,                SFX_Cut_1
+	music_const SFX_GO_INSIDE,          SFX_Go_Inside_1
+	music_const SFX_SWAP,               SFX_Swap_1
+	music_const SFX_59,                 SFX_59_1 ; unused, sounds similar to SFX_SLOTS_STOP_WHEEL
+	music_const SFX_PURCHASE,           SFX_Purchase_1
+	music_const SFX_COLLISION,          SFX_Collision_1
+	music_const SFX_GO_OUTSIDE,         SFX_Go_Outside_1
+	music_const SFX_SAVE,               SFX_Save_1
 
 	; AUDIO_1
-	music_const SFX_POKEFLUE,         SFX_02_5e
-	music_const SFX_SAFARI_ZONE_PA,   SFX_02_5f
+	music_const SFX_POKEFLUE,           SFX_Pokeflute
+	music_const SFX_SAFARI_ZONE_PA,     SFX_Safari_Zone_PA
 
 	; AUDIO_2
-	music_const SFX_LEVEL_UP,         SFX_08_3a
-	
-	music_const SFX_BATTLE_01,        SFX_08_41
-	music_const SFX_BATTLE_02,        SFX_08_42
-	music_const SFX_BATTLE_03,        SFX_08_43
-	music_const SFX_BATTLE_04,        SFX_08_44
-	music_const SFX_BATTLE_05,        SFX_08_45
-	music_const SFX_BATTLE_06,        SFX_08_46
-	music_const SFX_BATTLE_07,        SFX_08_47
-	music_const SFX_BATTLE_08,        SFX_08_48
-	music_const SFX_BATTLE_09,        SFX_08_49
-	music_const SFX_BATTLE_0A,        SFX_08_4a
-	music_const SFX_BATTLE_0B,        SFX_08_4b
-	music_const SFX_BATTLE_0C,        SFX_08_4c
-	music_const SFX_BATTLE_0D,        SFX_08_4d
-	music_const SFX_BATTLE_0E,        SFX_08_4e
-	music_const SFX_BATTLE_0F,        SFX_08_4f
-	music_const SFX_BATTLE_10,        SFX_08_50
-	music_const SFX_BATTLE_11,        SFX_08_51
-	music_const SFX_BATTLE_12,        SFX_08_52
-	music_const SFX_BATTLE_13,        SFX_08_53
-	music_const SFX_BATTLE_14,        SFX_08_54
-	music_const SFX_BATTLE_15,        SFX_08_55
-	music_const SFX_BATTLE_16,        SFX_08_56 ; unused?
-	music_const SFX_BATTLE_17,        SFX_08_57
-	music_const SFX_BATTLE_18,        SFX_08_58
-	music_const SFX_BATTLE_19,        SFX_08_59
-	music_const SFX_BATTLE_1A,        SFX_08_5a
-	music_const SFX_BATTLE_1B,        SFX_08_5b
-	music_const SFX_BATTLE_1C,        SFX_08_5c
-	music_const SFX_BATTLE_1D,        SFX_08_5d
-	music_const SFX_BATTLE_1E,        SFX_08_5e
-	music_const SFX_BATTLE_1F,        SFX_08_5f
-	music_const SFX_BATTLE_20,        SFX_08_60
-	music_const SFX_BATTLE_21,        SFX_08_61
-	music_const SFX_BATTLE_22,        SFX_08_62
-	music_const SFX_BATTLE_23,        SFX_08_63
-	music_const SFX_BATTLE_24,        SFX_08_64
-	music_const SFX_BATTLE_25,        SFX_08_65
-	music_const SFX_BATTLE_26,        SFX_08_66
-	music_const SFX_BATTLE_27,        SFX_08_67
-	music_const SFX_BATTLE_28,        SFX_08_68
-	music_const SFX_BATTLE_29,        SFX_08_69
-	music_const SFX_BATTLE_2A,        SFX_08_6a
-	music_const SFX_BATTLE_2B,        SFX_08_6b
-	music_const SFX_BATTLE_2C,        SFX_08_6c
-	music_const SFX_BATTLE_2D,        SFX_08_6d
-	music_const SFX_BATTLE_2E,        SFX_08_6e
-	music_const SFX_BATTLE_2F,        SFX_08_6f
-	music_const SFX_BATTLE_30,        SFX_08_70
-	music_const SFX_BATTLE_31,        SFX_08_71
-	music_const SFX_BATTLE_32,        SFX_08_72
-	music_const SFX_BATTLE_33,        SFX_08_73
-	music_const SFX_BATTLE_34,        SFX_08_74
-	music_const SFX_BATTLE_35,        SFX_08_75
-	music_const SFX_BATTLE_36,        SFX_08_76
-	music_const SFX_BATTLE_37,        SFX_08_77
+	music_const SFX_LEVEL_UP,           SFX_Level_Up
+
+	music_const SFX_BALL_TOSS,          SFX_Ball_Toss
+	music_const SFX_BALL_POOF,          SFX_Ball_Poof
+	music_const SFX_FAINT_THUD,         SFX_Faint_Thud
+	music_const SFX_RUN,                SFX_Run
+	music_const SFX_DEX_PAGE_ADDED,     SFX_Dex_Page_Added
+	music_const SFX_CAUGHT_MON,         SFX_Caught_Mon
+	music_const SFX_PECK,               SFX_Peck
+	music_const SFX_FAINT_FALL,         SFX_Faint_Fall
+	music_const SFX_BATTLE_09,          SFX_Battle_09
+	music_const SFX_POUND,              SFX_Pound
+	music_const SFX_BATTLE_0B,          SFX_Battle_0B
+	music_const SFX_BATTLE_0C,          SFX_Battle_0C
+	music_const SFX_BATTLE_0D,          SFX_Battle_0D
+	music_const SFX_BATTLE_0E,          SFX_Battle_0E
+	music_const SFX_BATTLE_0F,          SFX_Battle_0F
+	music_const SFX_DAMAGE,             SFX_Damage
+	music_const SFX_NOT_VERY_EFFECTIVE, SFX_Not_Very_Effective
+	music_const SFX_BATTLE_12,          SFX_Battle_12
+	music_const SFX_BATTLE_13,          SFX_Battle_13
+	music_const SFX_BATTLE_14,          SFX_Battle_14
+	music_const SFX_VINE_WHIP,          SFX_Vine_Whip
+	music_const SFX_BATTLE_16,          SFX_Battle_16 ; unused?
+	music_const SFX_BATTLE_17,          SFX_Battle_17
+	music_const SFX_BATTLE_18,          SFX_Battle_18
+	music_const SFX_BATTLE_19,          SFX_Battle_19
+	music_const SFX_SUPER_EFFECTIVE,    SFX_Super_Effective
+	music_const SFX_BATTLE_1B,          SFX_Battle_1B
+	music_const SFX_BATTLE_1C,          SFX_Battle_1C
+	music_const SFX_DOUBLESLAP,         SFX_Doubleslap
+	music_const SFX_BATTLE_1E,          SFX_Battle_1E
+	music_const SFX_HORN_DRILL,         SFX_Horn_Drill
+	music_const SFX_BATTLE_20,          SFX_Battle_20
+	music_const SFX_BATTLE_21,          SFX_Battle_21
+	music_const SFX_BATTLE_22,          SFX_Battle_22
+	music_const SFX_BATTLE_23,          SFX_Battle_23
+	music_const SFX_BATTLE_24,          SFX_Battle_24
+	music_const SFX_BATTLE_25,          SFX_Battle_25
+	music_const SFX_BATTLE_26,          SFX_Battle_26
+	music_const SFX_BATTLE_27,          SFX_Battle_27
+	music_const SFX_BATTLE_28,          SFX_Battle_28
+	music_const SFX_BATTLE_29,          SFX_Battle_29
+	music_const SFX_BATTLE_2A,          SFX_Battle_2A
+	music_const SFX_BATTLE_2B,          SFX_Battle_2B
+	music_const SFX_BATTLE_2C,          SFX_Battle_2C
+	music_const SFX_PSYBEAM,            SFX_Psybeam
+	music_const SFX_BATTLE_2E,          SFX_Battle_2E
+	music_const SFX_BATTLE_2F,          SFX_Battle_2F
+	music_const SFX_PSYCHIC_M,          SFX_Psychic_M
+	music_const SFX_BATTLE_31,          SFX_Battle_31
+	music_const SFX_BATTLE_32,          SFX_Battle_32
+	music_const SFX_BATTLE_33,          SFX_Battle_33
+	music_const SFX_BATTLE_34,          SFX_Battle_34
+	music_const SFX_BATTLE_35,          SFX_Battle_35
+	music_const SFX_BATTLE_36,          SFX_Battle_36
+	music_const SFX_SILPH_SCOPE,        SFX_Silph_Scope
 
 	; AUDIO_3
-	music_const SFX_INTRO_LUNGE,      SFX_1f_5e
-	music_const SFX_INTRO_HIP,        SFX_1f_5f
-	music_const SFX_INTRO_HOP,        SFX_1f_60
-	music_const SFX_INTRO_RAISE,      SFX_1f_61
-	music_const SFX_INTRO_CRASH,      SFX_1f_62
-	music_const SFX_INTRO_WHOOSH,     SFX_1f_63
-	music_const SFX_SLOTS_STOP_WHEEL, SFX_1f_64
-	music_const SFX_SLOTS_REWARD,     SFX_1f_65
-	music_const SFX_SLOTS_NEW_SPIN,   SFX_1f_66
-	music_const SFX_SHOOTING_STAR,    SFX_1f_67
+	music_const SFX_INTRO_LUNGE,        SFX_Intro_Lunge
+	music_const SFX_INTRO_HIP,          SFX_Intro_Hip
+	music_const SFX_INTRO_HOP,          SFX_Intro_Hop
+	music_const SFX_INTRO_RAISE,        SFX_Intro_Raise
+	music_const SFX_INTRO_CRASH,        SFX_Intro_Crash
+	music_const SFX_INTRO_WHOOSH,       SFX_Intro_Whoosh
+	music_const SFX_SLOTS_STOP_WHEEL,   SFX_Slots_Stop_Wheel
+	music_const SFX_SLOTS_REWARD,       SFX_Slots_Reward
+	music_const SFX_SLOTS_NEW_SPIN,     SFX_Slots_New_Spin
+	music_const SFX_SHOOTING_STAR,      SFX_Shooting_Star
diff --git a/engine/HoF_room_pc.asm b/engine/HoF_room_pc.asm
index 5e3ff37b..104d32ff 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/HoF_room_pc.asm
@@ -76,7 +76,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb)
 	ld hl,vBGMap1
 	call CopyTileMapToVRAM
 	call FillMiddleOfScreenWithWhite
-	ld a,%11111100 ; make the mon a black silhouette 
+	ld a,%11111100 ; make the mon a black silhouette
 	ld [rBGP],a
 
 ; scroll the mon left by one tile 7 times
@@ -88,7 +88,7 @@ DisplayCreditsMon: ; 740cb (1d:40cb)
 
 ; scroll the mon left by one tile 20 times
 ; This time, we have to move the window left too in order to hide the text that
-; is wrapping around to the right side of the screen. 
+; is wrapping around to the right side of the screen.
 	ld c,20
 .scrollLoop2
 	call ScrollCreditsMonLeft
diff --git a/engine/battle/animations.asm b/engine/battle/animations.asm
index d9406257..73d152b8 100755
--- a/engine/battle/animations.asm
+++ b/engine/battle/animations.asm
@@ -741,7 +741,7 @@ DoBallTossSpecialEffects: ; 78f3e (1e:4f3e)
 	cp a,11 ; is it the beginning of the subanimation?
 	jr nz,.skipPlayingSound
 ; if it is the beginning of the subanimation, play a sound
-	ld a,SFX_BATTLE_01
+	ld a,SFX_BALL_TOSS
 	call PlaySound
 .skipPlayingSound
 	ld a,[W_ISINBATTLE]
@@ -820,7 +820,7 @@ DoPoofSpecialEffects: ; 78fce (1e:4fce)
 	ld a,[W_SUBANIMCOUNTER]
 	cp a,5
 	ret nz
-	ld a,SFX_BATTLE_02
+	ld a,SFX_BALL_POOF
 	jp PlaySound
 
 DoRockSlideSpecialEffects: ; 78fd9 (1e:4fd9)
@@ -2274,7 +2274,7 @@ GetMoveSoundB: ; 79869 (1e:5869)
 	ld b, a
 	ret
 
-; get the sound of the move id in a
+; get the sound of the (move id - 1) in a
 GetMoveSound: ; 7986f (1e:586f)
 	ld hl,MoveSoundTable
 	ld e,a
@@ -2329,172 +2329,172 @@ IsCryMove: ; 798ad (1e:58ad)
 	ret
 
 MoveSoundTable: ; 798bc (1e:58bc)
-	db SFX_BATTLE_0A,$00,$80
-	db SFX_BATTLE_0C,$10,$80
-	db SFX_BATTLE_1D,$00,$80
-	db SFX_BATTLE_0B,$01,$80
-	db SFX_BATTLE_0D,$00,$40
-	db SFX_BATTLE_37,$00,$ff
-	db SFX_BATTLE_0D,$10,$60
-	db SFX_BATTLE_0D,$20,$80
-	db SFX_BATTLE_0D,$00,$a0
-	db SFX_BATTLE_10,$00,$80
-	db SFX_BATTLE_0F,$20,$40
-	db SFX_BATTLE_0F,$00,$80
-	db SFX_BATTLE_0E,$00,$a0
-	db SFX_BATTLE_11,$10,$c0
-	db SFX_BATTLE_11,$00,$a0
-	db SFX_BATTLE_12,$00,$c0
-	db SFX_BATTLE_12,$10,$a0
-	db SFX_BATTLE_13,$00,$e0
-	db SFX_BATTLE_11,$20,$c0
-	db SFX_BATTLE_14,$00,$80
-	db SFX_BATTLE_22,$00,$80
-	db SFX_BATTLE_15,$01,$80
-	db SFX_BATTLE_20,$00,$80
-	db SFX_BATTLE_17,$f0,$40
-	db SFX_BATTLE_1A,$00,$80
-	db SFX_BATTLE_17,$00,$80
-	db SFX_BATTLE_21,$10,$80
-	db SFX_BATTLE_1B,$01,$a0
-	db SFX_BATTLE_18,$00,$80
-	db SFX_BATTLE_1E,$00,$60
-	db SFX_BATTLE_1E,$01,$40
-	db SFX_BATTLE_1F,$00,$a0
-	db SFX_BATTLE_1A,$10,$a0
-	db SFX_BATTLE_20,$00,$c0
-	db SFX_BATTLE_14,$10,$60
-	db SFX_BATTLE_1A,$00,$a0
-	db SFX_BATTLE_22,$11,$c0
-	db SFX_BATTLE_1A,$20,$c0
-	db SFX_BATTLE_21,$00,$80
-	db SFX_BATTLE_1B,$00,$80
-	db SFX_BATTLE_1B,$20,$c0
-	db SFX_BATTLE_19,$00,$80
-	db SFX_BATTLE_31,$ff,$40
-	db SFX_BATTLE_1E,$00,$80
-	db SFX_BATTLE_0B,$00,$c0
-	db SFX_BATTLE_0B,$00,$40
-	db SFX_BATTLE_35,$00,$80
-	db SFX_BATTLE_27,$40,$60
-	db SFX_BATTLE_27,$00,$80
-	db SFX_BATTLE_27,$ff,$40
-	db SFX_BATTLE_2A,$80,$c0
-	db SFX_BATTLE_19,$10,$a0
-	db SFX_BATTLE_19,$21,$e0
-	db SFX_BATTLE_29,$00,$80
-	db SFX_BATTLE_24,$20,$60
-	db SFX_BATTLE_2A,$00,$80
-	db SFX_BATTLE_2C,$00,$80
-	db SFX_BATTLE_28,$40,$80
-	db SFX_BATTLE_29,$f0,$e0
-	db SFX_BATTLE_2D,$00,$80
-	db SFX_BATTLE_2A,$f0,$60
-	db SFX_BATTLE_28,$00,$80
-	db SFX_BATTLE_36,$00,$80
-	db SFX_BATTLE_07,$01,$a0
-	db SFX_BATTLE_13,$f0,$20
-	db SFX_BATTLE_23,$01,$c0
-	db SFX_BATTLE_23,$00,$80
-	db SFX_BATTLE_1A,$00,$e0
-	db SFX_BATTLE_26,$01,$60
-	db SFX_BATTLE_26,$20,$40
-	db SFX_BATTLE_24,$00,$80
-	db SFX_BATTLE_24,$40,$c0
-	db SFX_BATTLE_1B,$03,$60
-	db SFX_BATTLE_25,$11,$e0
-	db SFX_BATTLE_12,$20,$e0
-	db SFX_BATTLE_2E,$00,$80
-	db SFX_BATTLE_1C,$00,$80
-	db SFX_BATTLE_1C,$11,$a0
-	db SFX_BATTLE_1C,$01,$c0
-	db SFX_BATTLE_13,$14,$c0
-	db SFX_BATTLE_1B,$02,$a0
-	db SFX_BATTLE_29,$f0,$80
-	db SFX_BATTLE_29,$20,$c0
-	db SFX_BATTLE_2F,$00,$20
-	db SFX_BATTLE_2F,$20,$80
-	db SFX_BATTLE_2E,$12,$60
-	db SFX_BATTLE_26,$00,$80
-	db SFX_BATTLE_14,$01,$e0
-	db SFX_BATTLE_29,$0f,$e0
-	db SFX_BATTLE_29,$11,$20
-	db SFX_BATTLE_10,$10,$40
-	db SFX_BATTLE_0F,$10,$c0
-	db SFX_BATTLE_14,$00,$20
-	db SFX_BATTLE_30,$00,$80
-	db SFX_BATTLE_35,$11,$18
-	db SFX_BATTLE_09,$20,$c0
-	db SFX_BATTLE_08,$20,$c0
-	db SFX_BATTLE_25,$00,$10
-	db SFX_BATTLE_26,$f0,$20
-	db SFX_BATTLE_33,$f0,$c0
-	db SFX_BATTLE_11,$f0,$e0
-	db SFX_BATTLE_09,$f0,$40
-	db SFX_BATTLE_31,$00,$80
-	db SFX_BATTLE_33,$80,$40
-	db SFX_BATTLE_33,$00,$80
-	db SFX_BATTLE_14,$11,$20
-	db SFX_BATTLE_14,$22,$10
-	db SFX_BATTLE_1B,$f1,$ff
-	db SFX_BATTLE_13,$f1,$ff
-	db SFX_BATTLE_14,$33,$30
-	db SFX_BATTLE_32,$40,$c0
-	db SFX_BATTLE_0E,$20,$20
-	db SFX_BATTLE_0E,$f0,$10
-	db SFX_BATTLE_0F,$f8,$10
-	db SFX_BATTLE_11,$f0,$10
-	db SFX_BATTLE_25,$00,$80
-	db SFX_BATTLE_18,$00,$c0
-	db SFX_BATTLE_32,$c0,$ff
-	db SFX_BATTLE_09,$f2,$20
-	db SFX_BATTLE_34,$00,$80
-	db SFX_BATTLE_34,$00,$40
-	db SFX_BATTLE_09,$00,$40
-	db SFX_BATTLE_11,$10,$ff
-	db SFX_BATTLE_2A,$20,$20
-	db SFX_BATTLE_32,$00,$80
-	db SFX_BATTLE_29,$1f,$20
-	db SFX_BATTLE_25,$2f,$80
-	db SFX_BATTLE_0F,$1f,$ff
-	db SFX_BATTLE_2B,$1f,$60
-	db SFX_BATTLE_26,$1e,$20
-	db SFX_BATTLE_26,$1f,$18
-	db SFX_BATTLE_14,$0f,$80
-	db SFX_BATTLE_09,$f8,$10
-	db SFX_BATTLE_08,$18,$20
-	db SFX_BATTLE_32,$08,$40
-	db SFX_BATTLE_17,$01,$e0
-	db SFX_BATTLE_11,$09,$ff
-	db SFX_BATTLE_35,$42,$01
-	db SFX_BATTLE_1C,$00,$ff
-	db SFX_BATTLE_32,$08,$e0
-	db SFX_BATTLE_24,$00,$80
-	db SFX_BATTLE_09,$88,$10
-	db SFX_BATTLE_25,$48,$ff
-	db SFX_BATTLE_08,$ff,$ff
-	db SFX_BATTLE_24,$ff,$10
-	db SFX_BATTLE_08,$ff,$04
-	db SFX_BATTLE_1C,$01,$ff
-	db SFX_BATTLE_13,$f8,$ff
-	db SFX_BATTLE_0C,$f0,$f0
-	db SFX_BATTLE_0F,$08,$10
-	db SFX_BATTLE_0D,$f0,$ff
-	db SFX_BATTLE_1A,$f0,$ff
-	db SFX_BATTLE_34,$10,$ff
-	db SFX_BATTLE_0E,$f0,$20
-	db SFX_BATTLE_2B,$f0,$60
-	db SFX_BATTLE_21,$12,$10
-	db SFX_BATTLE_36,$f0,$20
-	db SFX_BATTLE_1E,$12,$ff
-	db SFX_BATTLE_31,$80,$04
-	db SFX_BATTLE_33,$f0,$10
-	db SFX_BATTLE_29,$f8,$ff
-	db SFX_BATTLE_26,$f0,$ff
-	db SFX_BATTLE_11,$01,$ff
-	db SFX_BATTLE_2C,$d8,$04
-	db SFX_BATTLE_0B,$00,$80
-	db SFX_BATTLE_0B,$00,$80
+	db SFX_POUND,             $00,$80 ; POUND
+	db SFX_BATTLE_0C,         $10,$80 ; KARATE_CHOP
+	db SFX_DOUBLESLAP,        $00,$80 ; DOUBLESLAP
+	db SFX_BATTLE_0B,         $01,$80 ; COMET_PUNCH
+	db SFX_BATTLE_0D,         $00,$40 ; MEGA_PUNCH
+	db SFX_SILPH_SCOPE,       $00,$ff ; PAY_DAY
+	db SFX_BATTLE_0D,         $10,$60 ; FIRE_PUNCH
+	db SFX_BATTLE_0D,         $20,$80 ; ICE_PUNCH
+	db SFX_BATTLE_0D,         $00,$a0 ; THUNDERPUNCH
+	db SFX_DAMAGE,            $00,$80 ; SCRATCH
+	db SFX_BATTLE_0F,         $20,$40 ; VICEGRIP
+	db SFX_BATTLE_0F,         $00,$80 ; GUILLOTINE
+	db SFX_BATTLE_0E,         $00,$a0 ; RAZOR_WIND
+	db SFX_NOT_VERY_EFFECTIVE,$10,$c0 ; SWORDS_DANCE
+	db SFX_NOT_VERY_EFFECTIVE,$00,$a0 ; CUT
+	db SFX_BATTLE_12,         $00,$c0 ; GUST
+	db SFX_BATTLE_12,         $10,$a0 ; WING_ATTACK
+	db SFX_BATTLE_13,         $00,$e0 ; WHIRLWIND
+	db SFX_NOT_VERY_EFFECTIVE,$20,$c0 ; FLY
+	db SFX_BATTLE_14,         $00,$80 ; BIND
+	db SFX_BATTLE_22,         $00,$80 ; SLAM
+	db SFX_VINE_WHIP,         $01,$80 ; VINE_WHIP
+	db SFX_BATTLE_20,         $00,$80 ; STOMP
+	db SFX_BATTLE_17,         $f0,$40 ; DOUBLE_KICK
+	db SFX_SUPER_EFFECTIVE,   $00,$80 ; MEGA_KICK
+	db SFX_BATTLE_17,         $00,$80 ; JUMP_KICK
+	db SFX_BATTLE_21,         $10,$80 ; ROLLING_KICK
+	db SFX_BATTLE_1B,         $01,$a0 ; SAND_ATTACK
+	db SFX_BATTLE_18,         $00,$80 ; HEADBUTT
+	db SFX_BATTLE_1E,         $00,$60 ; HORN_ATTACK
+	db SFX_BATTLE_1E,         $01,$40 ; FURY_ATTACK
+	db SFX_HORN_DRILL,        $00,$a0 ; HORN_DRILL
+	db SFX_SUPER_EFFECTIVE,   $10,$a0 ; TACKLE
+	db SFX_BATTLE_20,         $00,$c0 ; BODY_SLAM
+	db SFX_BATTLE_14,         $10,$60 ; WRAP
+	db SFX_SUPER_EFFECTIVE,   $00,$a0 ; TAKE_DOWN
+	db SFX_BATTLE_22,         $11,$c0 ; THRASH
+	db SFX_SUPER_EFFECTIVE,   $20,$c0 ; DOUBLE_EDGE
+	db SFX_BATTLE_21,         $00,$80 ; TAIL_WHIP
+	db SFX_BATTLE_1B,         $00,$80 ; POISON_STING
+	db SFX_BATTLE_1B,         $20,$c0 ; TWINEEDLE
+	db SFX_BATTLE_19,         $00,$80 ; PIN_MISSILE
+	db SFX_BATTLE_31,         $ff,$40 ; LEER
+	db SFX_BATTLE_1E,         $00,$80 ; BITE
+	db SFX_BATTLE_0B,         $00,$c0 ; GROWL
+	db SFX_BATTLE_0B,         $00,$40 ; ROAR
+	db SFX_BATTLE_35,         $00,$80 ; SING
+	db SFX_BATTLE_27,         $40,$60 ; SUPERSONIC
+	db SFX_BATTLE_27,         $00,$80 ; SONICBOOM
+	db SFX_BATTLE_27,         $ff,$40 ; DISABLE
+	db SFX_BATTLE_2A,         $80,$c0 ; ACID
+	db SFX_BATTLE_19,         $10,$a0 ; EMBER
+	db SFX_BATTLE_19,         $21,$e0 ; FLAMETHROWER
+	db SFX_BATTLE_29,         $00,$80 ; MIST
+	db SFX_BATTLE_24,         $20,$60 ; WATER_GUN
+	db SFX_BATTLE_2A,         $00,$80 ; HYDRO_PUMP
+	db SFX_BATTLE_2C,         $00,$80 ; SURF
+	db SFX_BATTLE_28,         $40,$80 ; ICE_BEAM
+	db SFX_BATTLE_29,         $f0,$e0 ; BLIZZARD
+	db SFX_PSYBEAM,           $00,$80 ; PSYBEAM
+	db SFX_BATTLE_2A,         $f0,$60 ; BUBBLEBEAM
+	db SFX_BATTLE_28,         $00,$80 ; AURORA_BEAM
+	db SFX_BATTLE_36,         $00,$80 ; HYPER_BEAM
+	db SFX_PECK,$01,          $a0 ; PECK
+	db SFX_BATTLE_13,         $f0,$20 ; DRILL_PECK
+	db SFX_BATTLE_23,         $01,$c0 ; SUBMISSION
+	db SFX_BATTLE_23,         $00,$80 ; LOW_KICK
+	db SFX_SUPER_EFFECTIVE,   $00,$e0 ; COUNTER
+	db SFX_BATTLE_26,         $01,$60 ; SEISMIC_TOSS
+	db SFX_BATTLE_26,         $20,$40 ; STRENGTH
+	db SFX_BATTLE_24,         $00,$80 ; ABSORB
+	db SFX_BATTLE_24,         $40,$c0 ; MEGA_DRAIN
+	db SFX_BATTLE_1B,         $03,$60 ; LEECH_SEED
+	db SFX_BATTLE_25,         $11,$e0 ; GROWTH
+	db SFX_BATTLE_12,         $20,$e0 ; RAZOR_LEAF
+	db SFX_BATTLE_2E,         $00,$80 ; SOLARBEAM
+	db SFX_BATTLE_1C,         $00,$80 ; POISONPOWDER
+	db SFX_BATTLE_1C,         $11,$a0 ; STUN_SPORE
+	db SFX_BATTLE_1C,         $01,$c0 ; SLEEP_POWDER
+	db SFX_BATTLE_13,         $14,$c0 ; PETAL_DANCE
+	db SFX_BATTLE_1B,         $02,$a0 ; STRING_SHOT
+	db SFX_BATTLE_29,         $f0,$80 ; DRAGON_RAGE
+	db SFX_BATTLE_29,         $20,$c0 ; FIRE_SPIN
+	db SFX_BATTLE_2F,         $00,$20 ; THUNDERSHOCK
+	db SFX_BATTLE_2F,         $20,$80 ; THUNDERBOLT
+	db SFX_BATTLE_2E,         $12,$60 ; THUNDER_WAVE
+	db SFX_BATTLE_26,         $00,$80 ; THUNDER
+	db SFX_BATTLE_14,         $01,$e0 ; ROCK_THROW
+	db SFX_BATTLE_29,         $0f,$e0 ; EARTHQUAKE
+	db SFX_BATTLE_29,         $11,$20 ; FISSURE
+	db SFX_DAMAGE,            $10,$40 ; DIG
+	db SFX_BATTLE_0F,         $10,$c0 ; TOXIC
+	db SFX_BATTLE_14,         $00,$20 ; CONFUSION
+	db SFX_PSYCHIC_M,         $00,$80 ; PSYCHIC_M
+	db SFX_BATTLE_35,         $11,$18 ; HYPNOSIS
+	db SFX_BATTLE_09,         $20,$c0 ; MEDITATE
+	db SFX_FAINT_FALL,        $20,$c0 ; AGILITY
+	db SFX_BATTLE_25,         $00,$10 ; QUICK_ATTACK
+	db SFX_BATTLE_26,         $f0,$20 ; RAGE
+	db SFX_BATTLE_33,         $f0,$c0 ; TELEPORT
+	db SFX_NOT_VERY_EFFECTIVE,$f0,$e0 ; NIGHT_SHADE
+	db SFX_BATTLE_09,         $f0,$40 ; MIMIC
+	db SFX_BATTLE_31,         $00,$80 ; SCREECH
+	db SFX_BATTLE_33,         $80,$40 ; DOUBLE_TEAM
+	db SFX_BATTLE_33,         $00,$80 ; RECOVER
+	db SFX_BATTLE_14,         $11,$20 ; HARDEN
+	db SFX_BATTLE_14,         $22,$10 ; MINIMIZE
+	db SFX_BATTLE_1B,         $f1,$ff ; SMOKESCREEN
+	db SFX_BATTLE_13,         $f1,$ff ; CONFUSE_RAY
+	db SFX_BATTLE_14,         $33,$30 ; WITHDRAW
+	db SFX_BATTLE_32,         $40,$c0 ; DEFENSE_CURL
+	db SFX_BATTLE_0E,         $20,$20 ; BARRIER
+	db SFX_BATTLE_0E,         $f0,$10 ; LIGHT_SCREEN
+	db SFX_BATTLE_0F,         $f8,$10 ; HAZE
+	db SFX_NOT_VERY_EFFECTIVE,$f0,$10 ; REFLECT
+	db SFX_BATTLE_25,         $00,$80 ; FOCUS_ENERGY
+	db SFX_BATTLE_18,         $00,$c0 ; BIDE
+	db SFX_BATTLE_32,         $c0,$ff ; METRONOME
+	db SFX_BATTLE_09,         $f2,$20 ; MIRROR_MOVE
+	db SFX_BATTLE_34,         $00,$80 ; SELFDESTRUCT
+	db SFX_BATTLE_34,         $00,$40 ; EGG_BOMB
+	db SFX_BATTLE_09,         $00,$40 ; LICK
+	db SFX_NOT_VERY_EFFECTIVE,$10,$ff ; SMOG
+	db SFX_BATTLE_2A,         $20,$20 ; SLUDGE
+	db SFX_BATTLE_32,         $00,$80 ; BONE_CLUB
+	db SFX_BATTLE_29,         $1f,$20 ; FIRE_BLAST
+	db SFX_BATTLE_25,         $2f,$80 ; WATERFALL
+	db SFX_BATTLE_0F,         $1f,$ff ; CLAMP
+	db SFX_BATTLE_2B,         $1f,$60 ; SWIFT
+	db SFX_BATTLE_26,         $1e,$20 ; SKULL_BASH
+	db SFX_BATTLE_26,         $1f,$18 ; SPIKE_CANNON
+	db SFX_BATTLE_14,         $0f,$80 ; CONSTRICT
+	db SFX_BATTLE_09,         $f8,$10 ; AMNESIA
+	db SFX_FAINT_FALL,        $18,$20 ; KINESIS
+	db SFX_BATTLE_32,         $08,$40 ; SOFTBOILED
+	db SFX_BATTLE_17,         $01,$e0 ; HI_JUMP_KICK
+	db SFX_NOT_VERY_EFFECTIVE,$09,$ff ; GLARE
+	db SFX_BATTLE_35,         $42,$01 ; DREAM_EATER
+	db SFX_BATTLE_1C,         $00,$ff ; POISON_GAS
+	db SFX_BATTLE_32,         $08,$e0 ; BARRAGE
+	db SFX_BATTLE_24,         $00,$80 ; LEECH_LIFE
+	db SFX_BATTLE_09,         $88,$10 ; LOVELY_KISS
+	db SFX_BATTLE_25,         $48,$ff ; SKY_ATTACK
+	db SFX_FAINT_FALL,        $ff,$ff ; TRANSFORM
+	db SFX_BATTLE_24,         $ff,$10 ; BUBBLE
+	db SFX_FAINT_FALL,        $ff,$04 ; DIZZY_PUNCH
+	db SFX_BATTLE_1C,         $01,$ff ; SPORE
+	db SFX_BATTLE_13,         $f8,$ff ; FLASH
+	db SFX_BATTLE_0C,         $f0,$f0 ; PSYWAVE
+	db SFX_BATTLE_0F,         $08,$10 ; SPLASH
+	db SFX_BATTLE_0D,         $f0,$ff ; ACID_ARMOR
+	db SFX_SUPER_EFFECTIVE,   $f0,$ff ; CRABHAMMER
+	db SFX_BATTLE_34,         $10,$ff ; EXPLOSION
+	db SFX_BATTLE_0E,         $f0,$20 ; FURY_SWIPES
+	db SFX_BATTLE_2B,         $f0,$60 ; BONEMERANG
+	db SFX_BATTLE_21,         $12,$10 ; REST
+	db SFX_BATTLE_36,         $f0,$20 ; ROCK_SLIDE
+	db SFX_BATTLE_1E,         $12,$ff ; HYPER_FANG
+	db SFX_BATTLE_31,         $80,$04 ; SHARPEN
+	db SFX_BATTLE_33,         $f0,$10 ; CONVERSION
+	db SFX_BATTLE_29,         $f8,$ff ; TRI_ATTACK
+	db SFX_BATTLE_26,         $f0,$ff ; SUPER_FANG
+	db SFX_NOT_VERY_EFFECTIVE,$01,$ff ; SLASH
+	db SFX_BATTLE_2C,         $d8,$04 ; SUBSTITUTE
+	db SFX_BATTLE_0B,         $00,$80 ; STRUGGLE
+	db SFX_BATTLE_0B,         $00,$80
 
 CopyPicTiles: ; 79aae (1e:5aae)
 	ld a, [H_WHOSETURN]
@@ -2929,7 +2929,7 @@ TossBallAnimation: ; 79e16 (1e:5e16)
 	ld a,TOSS_ANIM
 	ld [W_ANIMATIONID],a
 	call PlayAnimation
-	ld a,SFX_BATTLE_03
+	ld a,SFX_FAINT_THUD
 	call PlaySound
 	ld a,BLOCKBALL_ANIM
 	ld [W_ANIMATIONID],a
@@ -2945,15 +2945,15 @@ PlayApplyingAttackSound: ; 79e6a (1e:5e6a)
 	cp $a
 	ld a, $20
 	ld b, $30
-	ld c, SFX_BATTLE_10
+	ld c, SFX_DAMAGE
 	jr z, .asm_79e8b
 	ld a, $e0
 	ld b, $ff
-	ld c, SFX_BATTLE_1A
+	ld c, SFX_SUPER_EFFECTIVE
 	jr nc, .asm_79e8b
 	ld a, $50
 	ld b, $1
-	ld c, SFX_BATTLE_11
+	ld c, SFX_NOT_VERY_EFFECTIVE
 .asm_79e8b
 	ld [wc0f1], a
 	ld a, b
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm
index 41e402f3..1acef280 100644
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -64,7 +64,7 @@ PrintBeginningBattleText: ; 58d99 (16:4d99)
 	ld [wc0f1], a
 	ld a, $80
 	ld [wc0f2], a
-	ld a, SFX_BATTLE_37
+	ld a, SFX_SILPH_SCOPE
 	call PlaySound
 	jp WaitForSoundToFinish
 .done
diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index a74e0a27..4c29e003 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -353,7 +353,7 @@ EnemyRan: ; 3c202 (f:4202)
 	ld hl, EnemyRanText
 .printText
 	call PrintText
-	ld a, SFX_BATTLE_04
+	ld a, SFX_RUN
 	call PlaySoundWaitForCurrent
 	xor a
 	ld [H_WHOSETURN], a
@@ -860,13 +860,13 @@ FaintEnemyPokemon: ; 0x3c567
 	xor a
 	ld [wc0f1], a
 	ld [wc0f2], a
-	ld a, SFX_BATTLE_08 ; SFX_FALL?
+	ld a, SFX_FAINT_FALL
 	call PlaySoundWaitForCurrent
 .sfxwait
 	ld a, [wc02a]
-	cp SFX_BATTLE_08
+	cp SFX_FAINT_FALL
 	jr z, .sfxwait
-	ld a, SFX_BATTLE_03 ; SFX_DROP
+	ld a, SFX_FAINT_THUD
 	call PlaySound
 	call WaitForSoundToFinish
 	jr .sfxplayed
@@ -1672,7 +1672,7 @@ TryRunningFromBattle: ; 3cab9 (f:4ab9)
 	dec a
 .playSound
 	ld [wBattleResult], a
-	ld a, SFX_BATTLE_04
+	ld a, SFX_RUN
 	call PlaySoundWaitForCurrent
 	ld hl, GotAwayText
 	call PrintText
diff --git a/engine/evos_moves.asm b/engine/evos_moves.asm
index 2c668d63..b9b4bb0f 100755
--- a/engine/evos_moves.asm
+++ b/engine/evos_moves.asm
@@ -443,7 +443,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8)
 	jr nz, .findEmptySlotLoop
 
 ; no empty move slots found
-	pop de                        
+	pop de
 	push de
 	push hl
 	ld h, d
@@ -472,7 +472,7 @@ WriteMonMoves: ; 3afb8 (e:6fb8)
 	jr z, .nextMove
 
 ; write move PP value if learning moves from day care
-	push hl            
+	push hl
 	ld a, [hl]
 	ld hl, wPartyMon1PP - wPartyMon1Moves
 	add hl, de
diff --git a/engine/hidden_object_functions7.asm b/engine/hidden_object_functions7.asm
index 08aadf02..6f1eef61 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -66,7 +66,7 @@ SafariZoneGameOver: ; 1e9b0 (7:69b0)
 	ld [wMusicHeaderPointer], a
 	dec a
 	call PlaySound
-	ld c, BANK(SFX_02_5f)
+	ld c, BANK(SFX_Safari_Zone_PA)
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .asm_1e9c2
diff --git a/engine/items/items.asm b/engine/items/items.asm
index eb9f5663..a60d765a 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1713,7 +1713,7 @@ PlayedFluteHadEffectText: ; e215 (3:6215)
 	ld a,$ff
 	call PlaySound ; turn off music
 	ld a, SFX_POKEFLUE
-	ld c, BANK(SFX_02_5e)
+	ld c, BANK(SFX_Pokeflute)
 	call PlayMusic
 .musicWaitLoop ; wait for music to finish playing
 	ld a,[wc028]
diff --git a/engine/menu/pokedex.asm b/engine/menu/pokedex.asm
index 2f22f78e..76eb7450 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -139,7 +139,7 @@ HandlePokedexSideMenu: ; 4006d (10:406d)
 ; play pokemon cry
 .choseCry
 	ld a,[wd11e]
-	call GetCryData ; get cry data
+	call GetCryData
 	call PlaySound
 	jr .handleMenuInput
 .choseArea
diff --git a/engine/overworld/elevator.asm b/engine/overworld/elevator.asm
index 09a38012..eb62fee7 100755
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -17,7 +17,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
 	add d
 	ld [hSCY], a
 	push bc
-	ld c, BANK(SFX_02_5b)
+	ld c, BANK(SFX_Collision_1)
 	ld a, SFX_COLLISION
 	call PlayMusic
 	pop bc
@@ -29,7 +29,7 @@ ShakeElevator: ; 7bf15 (1e:7f15)
 	ld [hSCY], a
 	ld a, $ff
 	call PlaySound
-	ld c, BANK(SFX_02_5f)
+	ld c, BANK(SFX_Safari_Zone_PA)
 	ld a, SFX_SAFARI_ZONE_PA
 	call PlayMusic
 .musicLoop
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index f9dcc3a5..b123f33f 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -35,7 +35,7 @@ AnimateHealingMachine: ; 70433 (1c:4433)
 	dec b
 	jr nz, .asm_7046e
 	ld a, [wc0ef]
-	cp BANK(Music1f_UpdateMusic)
+	cp BANK(Audio3_UpdateMusic)
 	ld [wc0f0], a
 	jr nz, .asm_70495
 	ld a, $ff
diff --git a/engine/overworld/player_animations.asm b/engine/overworld/player_animations.asm
index 5ce2b2a6..a9aa2cf2 100755
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -9,7 +9,7 @@ EnterMapAnim: ; 70510 (1c:4510)
 	bit 7, [hl] ; used fly out of battle?
 	res 7, [hl]
 	jr nz, .flyAnimation
-	ld a, SFX_TELEPORT_2
+	ld a, SFX_TELEPORT_ENTER_1
 	call PlaySound
 	ld hl, wd732
 	bit 4, [hl] ; used dungeon warp?
@@ -17,7 +17,7 @@ EnterMapAnim: ; 70510 (1c:4510)
 	pop hl
 	jr nz, .dungeonWarpAnimation
 	call PlayerSpinWhileMovingDown
-	ld a, SFX_FLY_1
+	ld a, SFX_TELEPORT_ENTER_2
 	call PlaySound
 	call IsPlayerStandingOnWarpPadOrHole
 	ld a, b
@@ -50,7 +50,7 @@ EnterMapAnim: ; 70510 (1c:4510)
 	ld bc, (BANK(BirdSprite) << 8) + $0c
 	call CopyVideoData
 	call LoadBirdSpriteGraphics
-	ld a, SFX_FLY_2
+	ld a, SFX_FLY
 	call PlaySound
 	ld hl, wFlyAnimUsingCoordList
 	xor a ; is using coord list
@@ -99,7 +99,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba)
 	dec a
 	jp nz, LeaveMapThroughHoleAnim
 .spinWhileMovingUp
-	ld a, SFX_TELEPORT_1
+	ld a, SFX_TELEPORT_EXIT_1
 	call PlaySound
 	ld hl, wPlayerSpinWhileMovingUpOrDownAnimDeltaY
 	ld a, -$10
@@ -133,7 +133,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba)
 	ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayDelta
 	xor a
 	ld [hli], a ; wPlayerSpinInPlaceAnimFrameDelayEndValue
-	ld [hl], SFX_TELEPORT_3 ; wPlayerSpinInPlaceAnimSoundID
+	ld [hl], SFX_TELEPORT_EXIT_2 ; wPlayerSpinInPlaceAnimSoundID
 	ld hl, wFacingDirectionList
 	call PlayerSpinInPlace
 	jr .spinWhileMovingUp
@@ -146,7 +146,7 @@ _LeaveMapAnim: ; 705ba (1c:45ba)
 	ld [hli], a ; wFlyAnimCounter
 	ld [hl], $c ; wFlyAnimBirdSpriteImageIndex
 	call DoFlyAnimation
-	ld a, SFX_FLY_2
+	ld a, SFX_FLY
 	call PlaySound
 	ld hl, wFlyAnimUsingCoordList
 	xor a ; is using coord list
diff --git a/home.asm b/home.asm
index f58f6c16..ddb3e190 100644
--- a/home.asm
+++ b/home.asm
@@ -1463,7 +1463,7 @@ DisplayListMenuIDLoop:: ; 2c53 (0:2c53)
 ; pointless because both values are overwritten before they are read
 	ld a,$01
 	ld [wMenuExitMethod],a
-	ld [wChosenMenuItem],a 
+	ld [wChosenMenuItem],a
 
 	xor a
 	ld [wMenuWatchMovingOutOfBounds],a
diff --git a/home/audio.asm b/home/audio.asm
index 1301550c..033f4067 100644
--- a/home/audio.asm
+++ b/home/audio.asm
@@ -56,19 +56,19 @@ Func_2324:: ; 2324 (0:2324)
 Func_235f:: ; 235f (0:235f)
 	ld a, [wc0ef]
 	ld b, a
-	cp BANK(Music2_UpdateMusic)
-	jr nz, .checkForBank08
-.bank02
-	ld hl, Music2_UpdateMusic
+	cp BANK(Audio1_UpdateMusic)
+	jr nz, .checkForAudio2
+.audio1
+	ld hl, Audio1_UpdateMusic
 	jr .asm_2378
-.checkForBank08
-	cp BANK(Music8_UpdateMusic)
-	jr nz, .bank1F
-.bank08
-	ld hl, Music8_UpdateMusic
+.checkForAudio2
+	cp BANK(Audio2_UpdateMusic)
+	jr nz, .audio3
+.audio2
+	ld hl, Audio2_UpdateMusic
 	jr .asm_2378
-.bank1F
-	ld hl, Music1f_UpdateMusic
+.audio3
+	ld hl, Audio3_UpdateMusic
 .asm_2378
 	ld c, $6
 .asm_237a
@@ -147,22 +147,22 @@ PlaySound:: ; 23b1 (0:23b1)
 	ld a, [wc0ef]
 	ld [H_LOADEDROMBANK], a
 	ld [MBC1RomBank], a
-	cp BANK(Music2_9876)
-	jr nz, .checkForBank08
-.bank02
+	cp BANK(Audio1_9876)
+	jr nz, .checkForAudio2
+.audio1
 	ld a, b
-	call Music2_9876
+	call Audio1_9876
 	jr .asm_240b
-.checkForBank08
-	cp BANK(Music8_22035)
-	jr nz, .bank1F
-.bank08
+.checkForAudio2
+	cp BANK(Audio2_22035)
+	jr nz, .audio3
+.audio2
 	ld a, b
-	call Music8_22035
+	call Audio2_22035
 	jr .asm_240b
-.bank1F
+.audio3
 	ld a, b
-	call Music1f_7d8ea
+	call Audio3_7d8ea
 .asm_240b
 	ld a, [$ffb9]
 	ld [H_LOADEDROMBANK], a
diff --git a/home/init.asm b/home/init.asm
index 3e8d1d2b..624a4d6a 100644
--- a/home/init.asm
+++ b/home/init.asm
@@ -97,7 +97,7 @@ rLCDC_DEFAULT EQU %11100011
 
 	predef LoadSGB
 
-	ld a, BANK(SFX_1f_67)
+	ld a, BANK(SFX_Shooting_Star)
 	ld [wc0ef], a
 	ld [wc0f0], a
 	ld a, $9c
@@ -126,7 +126,7 @@ ClearVram:
 
 
 StopAllSounds::
-	ld a, BANK(Music2_UpdateMusic)
+	ld a, BANK(Audio1_UpdateMusic)
 	ld [wc0ef], a
 	ld [wc0f0], a
 	xor a
diff --git a/home/text.asm b/home/text.asm
index 89708306..d57fc03f 100644
--- a/home/text.asm
+++ b/home/text.asm
@@ -627,12 +627,12 @@ TextCommand0B:: ; 1c31 (0:1c31)
 ; format: text command ID, sound ID or cry ID
 TextCommandSounds:: ; 1c64 (0:1c64)
 	db $0B,SFX_GET_ITEM_1
-	db $12,SFX_BATTLE_06
+	db $12,SFX_CAUGHT_MON
 	db $0E,SFX_POKEDEX_RATING
 	db $0F,SFX_GET_ITEM_1
 	db $10,SFX_GET_ITEM_2
 	db $11,SFX_GET_KEY_ITEM
-	db $13,SFX_BATTLE_05
+	db $13,SFX_DEX_PAGE_ADDED
 	db $14,NIDORINA ; used in OakSpeech
 	db $15,PIDGEOT  ; used in SaffronCityText12
 	db $16,DEWGONG  ; unused?
diff --git a/home/vblank.asm b/home/vblank.asm
index 9adf537c..05b01a3d 100644
--- a/home/vblank.asm
+++ b/home/vblank.asm
@@ -56,20 +56,20 @@ VBlank::
 	ld [H_LOADEDROMBANK], a
 	ld [MBC1RomBank], a
 
-	cp BANK(Music2_UpdateMusic)
-	jr nz, .notbank2
-.bank2
-	call Music2_UpdateMusic
+	cp BANK(Audio1_UpdateMusic)
+	jr nz, .checkForAudio2
+.audio1
+	call Audio1_UpdateMusic
 	jr .afterMusic
-.notbank2
-	cp BANK(Music8_UpdateMusic)
-	jr nz, .bank1F
-.bank8
+.checkForAudio2
+	cp BANK(Audio2_UpdateMusic)
+	jr nz, .audio3
+.audio2
 	call Music_DoLowHealthAlarm
-	call Music8_UpdateMusic
+	call Audio2_UpdateMusic
 	jr .afterMusic
-.bank1F
-	call Music1f_UpdateMusic
+.audio3
+	call Audio3_UpdateMusic
 .afterMusic
 
 	callba TrackPlayTime ; keep track of time played
diff --git a/macros.asm b/macros.asm
index 659b0722..5223b9d8 100644
--- a/macros.asm
+++ b/macros.asm
@@ -66,15 +66,15 @@ jpab: MACRO
 	ENDM
 
 bcd2: MACRO
-    dn ((\1) / 1000) % 10, ((\1) / 100) % 10
-    dn ((\1) / 10) % 10, (\1) % 10
-    ENDM
+	dn ((\1) / 1000) % 10, ((\1) / 100) % 10
+	dn ((\1) / 10) % 10, (\1) % 10
+	ENDM
 
 bcd3: MACRO
-    dn ((\1) / 100000) % 10, ((\1) / 10000) % 10
-    dn ((\1) / 1000) % 10, ((\1) / 100) % 10
-    dn ((\1) / 10) % 10, (\1) % 10
-    ENDM
+	dn ((\1) / 100000) % 10, ((\1) / 10000) % 10
+	dn ((\1) / 1000) % 10, ((\1) / 100) % 10
+	dn ((\1) / 10) % 10, (\1) % 10
+	ENDM
 
 coins equs "bcd2"
 money equs "bcd3"
@@ -263,7 +263,7 @@ NONE  EQU $FF
 ;\7 trainers only: trainer class/pokemon id
 ;\8 trainers only: trainer number/pokemon level
 object: MACRO
-    db \1
+	db \1
 	db \3 + 4
 	db \2 + 4
 	db \4
diff --git a/scripts/ssanne7.asm b/scripts/ssanne7.asm
index a445ad46..9bb4aac6 100755
--- a/scripts/ssanne7.asm
+++ b/scripts/ssanne7.asm
@@ -45,7 +45,7 @@ SSAnne7RubText: ; 618ec (18:58ec)
 	TX_FAR _SSAnne7RubText
 	TX_ASM
 	ld a, [wc0ef]
-	cp BANK(Music1f_UpdateMusic)
+	cp BANK(Audio3_UpdateMusic)
 	ld [wc0f0], a
 	jr nz, .asm_61908
 	ld a, $ff