shithub: pokered

Download patch

ref: b4081e851ac4b7ce5cf1fa7c9fc83a490a4c83ec
parent: 4d88812f40c4165e4b893a0631fa658e72d17874
author: dannye <corrnondacqb@yahoo.com>
date: Wed Jul 22 05:57:31 EDT 2015

Rename sound effect files

--- a/audio.asm
+++ b/audio.asm
@@ -30,333 +30,333 @@
 
 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"
+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"
 
 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/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/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/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"
+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"
 
 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/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/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/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/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/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"
+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"
 
 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/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/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/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"
 
 
 
@@ -585,13 +585,13 @@
 	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_CAUGHT_MON,     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
@@ -612,13 +612,13 @@
 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"
@@ -638,9 +638,9 @@
 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"
@@ -652,13 +652,13 @@
 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"
--- a/audio/headers/sfxheaders02.asm
+++ b/audio/headers/sfxheaders02.asm
@@ -1,562 +1,562 @@
 SFX_Headers_02::
 	db $ff, $ff, $ff ; padding
 
-SFX_02_01:: ; 8003 (2:4003)
+SFX_Snare1_1:: ; 8003 (2:4003)
 	db CH7
-	dw SFX_02_01_Ch1
+	dw SFX_Snare1_1_Ch1
 
-SFX_02_02:: ; 8006 (2:4006)
+SFX_Snare2_1:: ; 8006 (2:4006)
 	db CH7
-	dw SFX_02_02_Ch1
+	dw SFX_Snare2_1_Ch1
 
-SFX_02_03:: ; 8009 (2:4009)
+SFX_Snare3_1:: ; 8009 (2:4009)
 	db CH7
-	dw SFX_02_03_Ch1
+	dw SFX_Snare3_1_Ch1
 
-SFX_02_04:: ; 800c (2:400c)
+SFX_Snare4_1:: ; 800c (2:400c)
 	db CH7
-	dw SFX_02_04_Ch1
+	dw SFX_Snare4_1_Ch1
 
-SFX_02_05:: ; 800f (2:400f)
+SFX_Snare5_1:: ; 800f (2:400f)
 	db CH7
-	dw SFX_02_05_Ch1
+	dw SFX_Snare5_1_Ch1
 
-SFX_02_06:: ; 8012 (2:4012)
+SFX_Triangle1_1:: ; 8012 (2:4012)
 	db CH7
-	dw SFX_02_06_Ch1
+	dw SFX_Triangle1_1_Ch1
 
-SFX_02_07:: ; 8015 (2:4015)
+SFX_Triangle2_1:: ; 8015 (2:4015)
 	db CH7
-	dw SFX_02_07_Ch1
+	dw SFX_Triangle2_1_Ch1
 
-SFX_02_08:: ; 8018 (2:4018)
+SFX_Snare6_1:: ; 8018 (2:4018)
 	db CH7
-	dw SFX_02_08_Ch1
+	dw SFX_Snare6_1_Ch1
 
-SFX_02_09:: ; 801b (2:401b)
+SFX_Snare7_1:: ; 801b (2:401b)
 	db CH7
-	dw SFX_02_09_Ch1
+	dw SFX_Snare7_1_Ch1
 
-SFX_02_0a:: ; 801e (2:401e)
+SFX_Snare8_1:: ; 801e (2:401e)
 	db CH7
-	dw SFX_02_0a_Ch1
+	dw SFX_Snare8_1_Ch1
 
-SFX_02_0b:: ; 8021 (2:4021)
+SFX_Snare9_1:: ; 8021 (2:4021)
 	db CH7
-	dw SFX_02_0b_Ch1
+	dw SFX_Snare9_1_Ch1
 
-SFX_02_0c:: ; 8024 (2:4024)
+SFX_Cymbal1_1:: ; 8024 (2:4024)
 	db CH7
-	dw SFX_02_0c_Ch1
+	dw SFX_Cymbal1_1_Ch1
 
-SFX_02_0d:: ; 8027 (2:4027)
+SFX_Cymbal2_1:: ; 8027 (2:4027)
 	db CH7
-	dw SFX_02_0d_Ch1
+	dw SFX_Cymbal2_1_Ch1
 
-SFX_02_0e:: ; 802a (2:402a)
+SFX_Cymbal3_1:: ; 802a (2:402a)
 	db CH7
-	dw SFX_02_0e_Ch1
+	dw SFX_Cymbal3_1_Ch1
 
-SFX_02_0f:: ; 802d (2:402d)
+SFX_Muted_Snare1_1:: ; 802d (2:402d)
 	db CH7
-	dw SFX_02_0f_Ch1
+	dw SFX_Muted_Snare1_1_Ch1
 
-SFX_02_10:: ; 8030 (2:4030)
+SFX_Triangle3_1:: ; 8030 (2:4030)
 	db CH7
-	dw SFX_02_10_Ch1
+	dw SFX_Triangle3_1_Ch1
 
-SFX_02_11:: ; 8033 (2:4033)
+SFX_Muted_Snare2_1:: ; 8033 (2:4033)
 	db CH7
-	dw SFX_02_11_Ch1
+	dw SFX_Muted_Snare2_1_Ch1
 
-SFX_02_12:: ; 8036 (2:4036)
+SFX_Muted_Snare3_1:: ; 8036 (2:4036)
 	db CH7
-	dw SFX_02_12_Ch1
+	dw SFX_Muted_Snare3_1_Ch1
 
-SFX_02_13:: ; 8039 (2:4039)
+SFX_Muted_Snare4_1:: ; 8039 (2:4039)
 	db CH7
-	dw SFX_02_13_Ch1
+	dw SFX_Muted_Snare4_1_Ch1
 
-SFX_02_14:: ; 803c (2:403c)
+SFX_Cry00_1:: ; 803c (2:403c)
 	db ( $80 | CH4 )
-	dw SFX_02_14_Ch1
+	dw SFX_Cry00_1_Ch1
 	db CH5
-	dw SFX_02_14_Ch2
+	dw SFX_Cry00_1_Ch2
 	db CH7
-	dw SFX_02_14_Ch3
+	dw SFX_Cry00_1_Ch3
 
-SFX_02_15:: ; 8045 (2:4045)
+SFX_Cry01_1:: ; 8045 (2:4045)
 	db ( $80 | CH4 )
-	dw SFX_02_15_Ch1
+	dw SFX_Cry01_1_Ch1
 	db CH5
-	dw SFX_02_15_Ch2
+	dw SFX_Cry01_1_Ch2
 	db CH7
-	dw SFX_02_15_Ch3
+	dw SFX_Cry01_1_Ch3
 
-SFX_02_16:: ; 804e (2:404e)
+SFX_Cry02_1:: ; 804e (2:404e)
 	db ( $80 | CH4 )
-	dw SFX_02_16_Ch1
+	dw SFX_Cry02_1_Ch1
 	db CH5
-	dw SFX_02_16_Ch2
+	dw SFX_Cry02_1_Ch2
 	db CH7
-	dw SFX_02_16_Ch3
+	dw SFX_Cry02_1_Ch3
 
-SFX_02_17:: ; 8057 (2:4057)
+SFX_Cry03_1:: ; 8057 (2:4057)
 	db ( $80 | CH4 )
-	dw SFX_02_17_Ch1
+	dw SFX_Cry03_1_Ch1
 	db CH5
-	dw SFX_02_17_Ch2
+	dw SFX_Cry03_1_Ch2
 	db CH7
-	dw SFX_02_17_Ch3
+	dw SFX_Cry03_1_Ch3
 
-SFX_02_18:: ; 8060 (2:4060)
+SFX_Cry04_1:: ; 8060 (2:4060)
 	db ( $80 | CH4 )
-	dw SFX_02_18_Ch1
+	dw SFX_Cry04_1_Ch1
 	db CH5
-	dw SFX_02_18_Ch2
+	dw SFX_Cry04_1_Ch2
 	db CH7
-	dw SFX_02_18_Ch3
+	dw SFX_Cry04_1_Ch3
 
-SFX_02_19:: ; 8069 (2:4069)
+SFX_Cry05_1:: ; 8069 (2:4069)
 	db ( $80 | CH4 )
-	dw SFX_02_19_Ch1
+	dw SFX_Cry05_1_Ch1
 	db CH5
-	dw SFX_02_19_Ch2
+	dw SFX_Cry05_1_Ch2
 	db CH7
-	dw SFX_02_19_Ch3
+	dw SFX_Cry05_1_Ch3
 
-SFX_02_1a:: ; 8072 (2:4072)
+SFX_Cry06_1:: ; 8072 (2:4072)
 	db ( $80 | CH4 )
-	dw SFX_02_1a_Ch1
+	dw SFX_Cry06_1_Ch1
 	db CH5
-	dw SFX_02_1a_Ch2
+	dw SFX_Cry06_1_Ch2
 	db CH7
-	dw SFX_02_1a_Ch3
+	dw SFX_Cry06_1_Ch3
 
-SFX_02_1b:: ; 807b (2:407b)
+SFX_Cry07_1:: ; 807b (2:407b)
 	db ( $80 | CH4 )
-	dw SFX_02_1b_Ch1
+	dw SFX_Cry07_1_Ch1
 	db CH5
-	dw SFX_02_1b_Ch2
+	dw SFX_Cry07_1_Ch2
 	db CH7
-	dw SFX_02_1b_Ch3
+	dw SFX_Cry07_1_Ch3
 
-SFX_02_1c:: ; 8084 (2:4084)
+SFX_Cry08_1:: ; 8084 (2:4084)
 	db ( $80 | CH4 )
-	dw SFX_02_1c_Ch1
+	dw SFX_Cry08_1_Ch1
 	db CH5
-	dw SFX_02_1c_Ch2
+	dw SFX_Cry08_1_Ch2
 	db CH7
-	dw SFX_02_1c_Ch3
+	dw SFX_Cry08_1_Ch3
 
-SFX_02_1d:: ; 808d (2:408d)
+SFX_Cry09_1:: ; 808d (2:408d)
 	db ( $80 | CH4 )
-	dw SFX_02_1d_Ch1
+	dw SFX_Cry09_1_Ch1
 	db CH5
-	dw SFX_02_1d_Ch2
+	dw SFX_Cry09_1_Ch2
 	db CH7
-	dw SFX_02_1d_Ch3
+	dw SFX_Cry09_1_Ch3
 
-SFX_02_1e:: ; 8096 (2:4096)
+SFX_Cry0A_1:: ; 8096 (2:4096)
 	db ( $80 | CH4 )
-	dw SFX_02_1e_Ch1
+	dw SFX_Cry0A_1_Ch1
 	db CH5
-	dw SFX_02_1e_Ch2
+	dw SFX_Cry0A_1_Ch2
 	db CH7
-	dw SFX_02_1e_Ch3
+	dw SFX_Cry0A_1_Ch3
 
-SFX_02_1f:: ; 809f (2:409f)
+SFX_Cry0B_1:: ; 809f (2:409f)
 	db ( $80 | CH4 )
-	dw SFX_02_1f_Ch1
+	dw SFX_Cry0B_1_Ch1
 	db CH5
-	dw SFX_02_1f_Ch2
+	dw SFX_Cry0B_1_Ch2
 	db CH7
-	dw SFX_02_1f_Ch3
+	dw SFX_Cry0B_1_Ch3
 
-SFX_02_20:: ; 80a8 (2:40a8)
+SFX_Cry0C_1:: ; 80a8 (2:40a8)
 	db ( $80 | CH4 )
-	dw SFX_02_20_Ch1
+	dw SFX_Cry0C_1_Ch1
 	db CH5
-	dw SFX_02_20_Ch2
+	dw SFX_Cry0C_1_Ch2
 	db CH7
-	dw SFX_02_20_Ch3
+	dw SFX_Cry0C_1_Ch3
 
-SFX_02_21:: ; 80b1 (2:40b1)
+SFX_Cry0D_1:: ; 80b1 (2:40b1)
 	db ( $80 | CH4 )
-	dw SFX_02_21_Ch1
+	dw SFX_Cry0D_1_Ch1
 	db CH5
-	dw SFX_02_21_Ch2
+	dw SFX_Cry0D_1_Ch2
 	db CH7
-	dw SFX_02_21_Ch3
+	dw SFX_Cry0D_1_Ch3
 
-SFX_02_22:: ; 80ba (2:40ba)
+SFX_Cry0E_1:: ; 80ba (2:40ba)
 	db ( $80 | CH4 )
-	dw SFX_02_22_Ch1
+	dw SFX_Cry0E_1_Ch1
 	db CH5
-	dw SFX_02_22_Ch2
+	dw SFX_Cry0E_1_Ch2
 	db CH7
-	dw SFX_02_22_Ch3
+	dw SFX_Cry0E_1_Ch3
 
-SFX_02_23:: ; 80c3 (2:40c3)
+SFX_Cry0F_1:: ; 80c3 (2:40c3)
 	db ( $80 | CH4 )
-	dw SFX_02_23_Ch1
+	dw SFX_Cry0F_1_Ch1
 	db CH5
-	dw SFX_02_23_Ch2
+	dw SFX_Cry0F_1_Ch2
 	db CH7
-	dw SFX_02_23_Ch3
+	dw SFX_Cry0F_1_Ch3
 
-SFX_02_24:: ; 80cc (2:40cc)
+SFX_Cry10_1:: ; 80cc (2:40cc)
 	db ( $80 | CH4 )
-	dw SFX_02_24_Ch1
+	dw SFX_Cry10_1_Ch1
 	db CH5
-	dw SFX_02_24_Ch2
+	dw SFX_Cry10_1_Ch2
 	db CH7
-	dw SFX_02_24_Ch3
+	dw SFX_Cry10_1_Ch3
 
-SFX_02_25:: ; 80d5 (2:40d5)
+SFX_Cry11_1:: ; 80d5 (2:40d5)
 	db ( $80 | CH4 )
-	dw SFX_02_25_Ch1
+	dw SFX_Cry11_1_Ch1
 	db CH5
-	dw SFX_02_25_Ch2
+	dw SFX_Cry11_1_Ch2
 	db CH7
-	dw SFX_02_25_Ch3
+	dw SFX_Cry11_1_Ch3
 
-SFX_02_26:: ; 80de (2:40de)
+SFX_Cry12_1:: ; 80de (2:40de)
 	db ( $80 | CH4 )
-	dw SFX_02_26_Ch1
+	dw SFX_Cry12_1_Ch1
 	db CH5
-	dw SFX_02_26_Ch2
+	dw SFX_Cry12_1_Ch2
 	db CH7
-	dw SFX_02_26_Ch3
+	dw SFX_Cry12_1_Ch3
 
-SFX_02_27:: ; 80e7 (2:40e7)
+SFX_Cry13_1:: ; 80e7 (2:40e7)
 	db ( $80 | CH4 )
-	dw SFX_02_27_Ch1
+	dw SFX_Cry13_1_Ch1
 	db CH5
-	dw SFX_02_27_Ch2
+	dw SFX_Cry13_1_Ch2
 	db CH7
-	dw SFX_02_27_Ch3
+	dw SFX_Cry13_1_Ch3
 
-SFX_02_28:: ; 80f0 (2:40f0)
+SFX_Cry14_1:: ; 80f0 (2:40f0)
 	db ( $80 | CH4 )
-	dw SFX_02_28_Ch1
+	dw SFX_Cry14_1_Ch1
 	db CH5
-	dw SFX_02_28_Ch2
+	dw SFX_Cry14_1_Ch2
 	db CH7
-	dw SFX_02_28_Ch3
+	dw SFX_Cry14_1_Ch3
 
-SFX_02_29:: ; 80f9 (2:40f9)
+SFX_Cry15_1:: ; 80f9 (2:40f9)
 	db ( $80 | CH4 )
-	dw SFX_02_29_Ch1
+	dw SFX_Cry15_1_Ch1
 	db CH5
-	dw SFX_02_29_Ch2
+	dw SFX_Cry15_1_Ch2
 	db CH7
-	dw SFX_02_29_Ch3
+	dw SFX_Cry15_1_Ch3
 
-SFX_02_2a:: ; 8102 (2:4102)
+SFX_Cry16_1:: ; 8102 (2:4102)
 	db ( $80 | CH4 )
-	dw SFX_02_2a_Ch1
+	dw SFX_Cry16_1_Ch1
 	db CH5
-	dw SFX_02_2a_Ch2
+	dw SFX_Cry16_1_Ch2
 	db CH7
-	dw SFX_02_2a_Ch3
+	dw SFX_Cry16_1_Ch3
 
-SFX_02_2b:: ; 810b (2:410b)
+SFX_Cry17_1:: ; 810b (2:410b)
 	db ( $80 | CH4 )
-	dw SFX_02_2b_Ch1
+	dw SFX_Cry17_1_Ch1
 	db CH5
-	dw SFX_02_2b_Ch2
+	dw SFX_Cry17_1_Ch2
 	db CH7
-	dw SFX_02_2b_Ch3
+	dw SFX_Cry17_1_Ch3
 
-SFX_02_2c:: ; 8114 (2:4114)
+SFX_Cry18_1:: ; 8114 (2:4114)
 	db ( $80 | CH4 )
-	dw SFX_02_2c_Ch1
+	dw SFX_Cry18_1_Ch1
 	db CH5
-	dw SFX_02_2c_Ch2
+	dw SFX_Cry18_1_Ch2
 	db CH7
-	dw SFX_02_2c_Ch3
+	dw SFX_Cry18_1_Ch3
 
-SFX_02_2d:: ; 811d (2:411d)
+SFX_Cry19_1:: ; 811d (2:411d)
 	db ( $80 | CH4 )
-	dw SFX_02_2d_Ch1
+	dw SFX_Cry19_1_Ch1
 	db CH5
-	dw SFX_02_2d_Ch2
+	dw SFX_Cry19_1_Ch2
 	db CH7
-	dw SFX_02_2d_Ch3
+	dw SFX_Cry19_1_Ch3
 
-SFX_02_2e:: ; 8126 (2:4126)
+SFX_Cry1A_1:: ; 8126 (2:4126)
 	db ( $80 | CH4 )
-	dw SFX_02_2e_Ch1
+	dw SFX_Cry1A_1_Ch1
 	db CH5
-	dw SFX_02_2e_Ch2
+	dw SFX_Cry1A_1_Ch2
 	db CH7
-	dw SFX_02_2e_Ch3
+	dw SFX_Cry1A_1_Ch3
 
-SFX_02_2f:: ; 812f (2:412f)
+SFX_Cry1B_1:: ; 812f (2:412f)
 	db ( $80 | CH4 )
-	dw SFX_02_2f_Ch1
+	dw SFX_Cry1B_1_Ch1
 	db CH5
-	dw SFX_02_2f_Ch2
+	dw SFX_Cry1B_1_Ch2
 	db CH7
-	dw SFX_02_2f_Ch3
+	dw SFX_Cry1B_1_Ch3
 
-SFX_02_30:: ; 8138 (2:4138)
+SFX_Cry1C_1:: ; 8138 (2:4138)
 	db ( $80 | CH4 )
-	dw SFX_02_30_Ch1
+	dw SFX_Cry1C_1_Ch1
 	db CH5
-	dw SFX_02_30_Ch2
+	dw SFX_Cry1C_1_Ch2
 	db CH7
-	dw SFX_02_30_Ch3
+	dw SFX_Cry1C_1_Ch3
 
-SFX_02_31:: ; 8141 (2:4141)
+SFX_Cry1D_1:: ; 8141 (2:4141)
 	db ( $80 | CH4 )
-	dw SFX_02_31_Ch1
+	dw SFX_Cry1D_1_Ch1
 	db CH5
-	dw SFX_02_31_Ch2
+	dw SFX_Cry1D_1_Ch2
 	db CH7
-	dw SFX_02_31_Ch3
+	dw SFX_Cry1D_1_Ch3
 
-SFX_02_32:: ; 814a (2:414a)
+SFX_Cry1E_1:: ; 814a (2:414a)
 	db ( $80 | CH4 )
-	dw SFX_02_32_Ch1
+	dw SFX_Cry1E_1_Ch1
 	db CH5
-	dw SFX_02_32_Ch2
+	dw SFX_Cry1E_1_Ch2
 	db CH7
-	dw SFX_02_32_Ch3
+	dw SFX_Cry1E_1_Ch3
 
-SFX_02_33:: ; 8153 (2:4153)
+SFX_Cry1F_1:: ; 8153 (2:4153)
 	db ( $80 | CH4 )
-	dw SFX_02_33_Ch1
+	dw SFX_Cry1F_1_Ch1
 	db CH5
-	dw SFX_02_33_Ch2
+	dw SFX_Cry1F_1_Ch2
 	db CH7
-	dw SFX_02_33_Ch3
+	dw SFX_Cry1F_1_Ch3
 
-SFX_02_34:: ; 815c (2:415c)
+SFX_Cry20_1:: ; 815c (2:415c)
 	db ( $80 | CH4 )
-	dw SFX_02_34_Ch1
+	dw SFX_Cry20_1_Ch1
 	db CH5
-	dw SFX_02_34_Ch2
+	dw SFX_Cry20_1_Ch2
 	db CH7
-	dw SFX_02_34_Ch3
+	dw SFX_Cry20_1_Ch3
 
-SFX_02_35:: ; 8165 (2:4165)
+SFX_Cry21_1:: ; 8165 (2:4165)
 	db ( $80 | CH4 )
-	dw SFX_02_35_Ch1
+	dw SFX_Cry21_1_Ch1
 	db CH5
-	dw SFX_02_35_Ch2
+	dw SFX_Cry21_1_Ch2
 	db CH7
-	dw SFX_02_35_Ch3
+	dw SFX_Cry21_1_Ch3
 
-SFX_02_36:: ; 816e (2:416e)
+SFX_Cry22_1:: ; 816e (2:416e)
 	db ( $80 | CH4 )
-	dw SFX_02_36_Ch1
+	dw SFX_Cry22_1_Ch1
 	db CH5
-	dw SFX_02_36_Ch2
+	dw SFX_Cry22_1_Ch2
 	db CH7
-	dw SFX_02_36_Ch3
+	dw SFX_Cry22_1_Ch3
 
-SFX_02_37:: ; 8177 (2:4177)
+SFX_Cry23_1:: ; 8177 (2:4177)
 	db ( $80 | CH4 )
-	dw SFX_02_37_Ch1
+	dw SFX_Cry23_1_Ch1
 	db CH5
-	dw SFX_02_37_Ch2
+	dw SFX_Cry23_1_Ch2
 	db CH7
-	dw SFX_02_37_Ch3
+	dw SFX_Cry23_1_Ch3
 
-SFX_02_38:: ; 8180 (2:4180)
+SFX_Cry24_1:: ; 8180 (2:4180)
 	db ( $80 | CH4 )
-	dw SFX_02_38_Ch1
+	dw SFX_Cry24_1_Ch1
 	db CH5
-	dw SFX_02_38_Ch2
+	dw SFX_Cry24_1_Ch2
 	db CH7
-	dw SFX_02_38_Ch3
+	dw SFX_Cry24_1_Ch3
 
-SFX_02_39:: ; 8189 (2:4189)
+SFX_Cry25_1:: ; 8189 (2:4189)
 	db ( $80 | CH4 )
-	dw SFX_02_39_Ch1
+	dw SFX_Cry25_1_Ch1
 	db CH5
-	dw SFX_02_39_Ch2
+	dw SFX_Cry25_1_Ch2
 	db CH7
-	dw SFX_02_39_Ch3
+	dw SFX_Cry25_1_Ch3
 
-SFX_02_3a:: ; 8192 (2:4192)
+SFX_Get_Item1_1:: ; 8192 (2:4192)
 	db ( $80 | CH4 )
-	dw SFX_02_3a_Ch1
+	dw SFX_Get_Item1_1_Ch1
 	db CH5
-	dw SFX_02_3a_Ch2
+	dw SFX_Get_Item1_1_Ch2
 	db CH6
-	dw SFX_02_3a_Ch3
+	dw SFX_Get_Item1_1_Ch3
 
-SFX_02_3b:: ; 819b (2:419b)
+SFX_Get_Item2_1:: ; 819b (2:419b)
 	db ( $80 | CH4 )
-	dw SFX_02_3b_Ch1
+	dw SFX_Get_Item2_1_Ch1
 	db CH5
-	dw SFX_02_3b_Ch2
+	dw SFX_Get_Item2_1_Ch2
 	db CH6
-	dw SFX_02_3b_Ch3
+	dw SFX_Get_Item2_1_Ch3
 
-SFX_02_3c:: ; 81a4 (2:41a4)
+SFX_Tink_1:: ; 81a4 (2:41a4)
 	db CH4
-	dw SFX_02_3c_Ch1
+	dw SFX_Tink_1_Ch1
 
-SFX_02_3d:: ; 81a7 (2:41a7)
+SFX_Heal_HP_1:: ; 81a7 (2:41a7)
 	db CH4
-	dw SFX_02_3d_Ch1
+	dw SFX_Heal_HP_1_Ch1
 
-SFX_02_3e:: ; 81aa (2:41aa)
+SFX_Heal_Ailment_1:: ; 81aa (2:41aa)
 	db CH4
-	dw SFX_02_3e_Ch1
+	dw SFX_Heal_Ailment_1_Ch1
 
-SFX_02_3f:: ; 81ad (2:41ad)
+SFX_Start_Menu_1:: ; 81ad (2:41ad)
 	db CH7
-	dw SFX_02_3f_Ch1
+	dw SFX_Start_Menu_1_Ch1
 
-SFX_02_40:: ; 81b0 (2:41b0)
+SFX_Press_AB_1:: ; 81b0 (2:41b0)
 	db CH4
-	dw SFX_02_40_Ch1
+	dw SFX_Press_AB_1_Ch1
 
-SFX_02_41:: ; 81b3 (2:41b3)
+SFX_Pokedex_Rating_1:: ; 81b3 (2:41b3)
 	db ( $80 | CH4 )
-	dw SFX_02_41_Ch1
+	dw SFX_Pokedex_Rating_1_Ch1
 	db CH5
-	dw SFX_02_41_Ch2
+	dw SFX_Pokedex_Rating_1_Ch2
 	db CH6
-	dw SFX_02_41_Ch3
+	dw SFX_Pokedex_Rating_1_Ch3
 
-SFX_02_42:: ; 81bc (2:41bc)
+SFX_Get_Key_Item_1:: ; 81bc (2:41bc)
 	db ( $80 | CH4 )
-	dw SFX_02_42_Ch1
+	dw SFX_Get_Key_Item_1_Ch1
 	db CH5
-	dw SFX_02_42_Ch2
+	dw SFX_Get_Key_Item_1_Ch2
 	db CH6
-	dw SFX_02_42_Ch3
+	dw SFX_Get_Key_Item_1_Ch3
 
-SFX_02_43:: ; 81c5 (2:41c5)
+SFX_Poisoned_1:: ; 81c5 (2:41c5)
 	db CH4
-	dw SFX_02_43_Ch1
+	dw SFX_Poisoned_1_Ch1
 
-SFX_02_44:: ; 81c8 (2:41c8)
+SFX_Trade_Machine_1:: ; 81c8 (2:41c8)
 	db CH4
-	dw SFX_02_44_Ch1
+	dw SFX_Trade_Machine_1_Ch1
 
-SFX_02_45:: ; 81cb (2:41cb)
+SFX_Turn_On_PC_1:: ; 81cb (2:41cb)
 	db CH4
-	dw SFX_02_45_Ch1
+	dw SFX_Turn_On_PC_1_Ch1
 
-SFX_02_46:: ; 81ce (2:41ce)
+SFX_Turn_Off_PC_1:: ; 81ce (2:41ce)
 	db CH4
-	dw SFX_02_46_Ch1
+	dw SFX_Turn_Off_PC_1_Ch1
 
-SFX_02_47:: ; 81d1 (2:41d1)
+SFX_Enter_PC_1:: ; 81d1 (2:41d1)
 	db CH4
-	dw SFX_02_47_Ch1
+	dw SFX_Enter_PC_1_Ch1
 
-SFX_02_48:: ; 81d4 (2:41d4)
+SFX_Shrink_1:: ; 81d4 (2:41d4)
 	db CH4
-	dw SFX_02_48_Ch1
+	dw SFX_Shrink_1_Ch1
 
-SFX_02_49:: ; 81d7 (2:41d7)
+SFX_Switch_1:: ; 81d7 (2:41d7)
 	db CH4
-	dw SFX_02_49_Ch1
+	dw SFX_Switch_1_Ch1
 
-SFX_02_4a:: ; 81da (2:41da)
+SFX_Healing_Machine_1:: ; 81da (2:41da)
 	db CH4
-	dw SFX_02_4a_Ch1
+	dw SFX_Healing_Machine_1_Ch1
 
-SFX_02_4b:: ; 81dd (2:41dd)
+SFX_Teleport_Exit1_1:: ; 81dd (2:41dd)
 	db CH4
-	dw SFX_02_4b_Ch1
+	dw SFX_Teleport_Exit1_1_Ch1
 
-SFX_02_4c:: ; 81e0 (2:41e0)
+SFX_Teleport_Enter1_1:: ; 81e0 (2:41e0)
 	db CH4
-	dw SFX_02_4c_Ch1
+	dw SFX_Teleport_Enter1_1_Ch1
 
-SFX_02_4d:: ; 81e3 (2:41e3)
+SFX_Teleport_Exit2_1:: ; 81e3 (2:41e3)
 	db CH4
-	dw SFX_02_4d_Ch1
+	dw SFX_Teleport_Exit2_1_Ch1
 
-SFX_02_4e:: ; 81e6 (2:41e6)
+SFX_Ledge_1:: ; 81e6 (2:41e6)
 	db CH4
-	dw SFX_02_4e_Ch1
+	dw SFX_Ledge_1_Ch1
 
-SFX_02_4f:: ; 81e9 (2:41e9)
+SFX_Teleport_Enter2_1:: ; 81e9 (2:41e9)
 	db CH7
-	dw SFX_02_4f_Ch1
+	dw SFX_Teleport_Enter2_1_Ch1
 
-SFX_02_50:: ; 81ec (2:41ec)
+SFX_Fly_1:: ; 81ec (2:41ec)
 	db CH7
-	dw SFX_02_50_Ch1
+	dw SFX_Fly_1_Ch1
 
-SFX_02_51:: ; 81ef (2:41ef)
+SFX_Denied_1:: ; 81ef (2:41ef)
 	db ( $40 | CH4 )
-	dw SFX_02_51_Ch1
+	dw SFX_Denied_1_Ch1
 	db CH5
-	dw SFX_02_51_Ch2
+	dw SFX_Denied_1_Ch2
 
-SFX_02_52:: ; 81f5 (2:41f5)
+SFX_Arrow_Tiles_1:: ; 81f5 (2:41f5)
 	db CH4
-	dw SFX_02_52_Ch1
+	dw SFX_Arrow_Tiles_1_Ch1
 
-SFX_02_53:: ; 81f8 (2:41f8)
+SFX_Push_Boulder_1:: ; 81f8 (2:41f8)
 	db CH7
-	dw SFX_02_53_Ch1
+	dw SFX_Push_Boulder_1_Ch1
 
-SFX_02_54:: ; 81fb (2:41fb)
+SFX_SS_Anne_Horn_1:: ; 81fb (2:41fb)
 	db ( $40 | CH4 )
-	dw SFX_02_54_Ch1
+	dw SFX_SS_Anne_Horn_1_Ch1
 	db CH5
-	dw SFX_02_54_Ch2
+	dw SFX_SS_Anne_Horn_1_Ch2
 
-SFX_02_55:: ; 8201 (2:4201)
+SFX_Withdraw_Deposit_1:: ; 8201 (2:4201)
 	db CH4
-	dw SFX_02_55_Ch1
+	dw SFX_Withdraw_Deposit_1_Ch1
 
-SFX_02_56:: ; 8204 (2:4204)
+SFX_Cut_1:: ; 8204 (2:4204)
 	db CH7
-	dw SFX_02_56_Ch1
+	dw SFX_Cut_1_Ch1
 
-SFX_02_57:: ; 8207 (2:4207)
+SFX_Go_Inside_1:: ; 8207 (2:4207)
 	db CH7
-	dw SFX_02_57_Ch1
+	dw SFX_Go_Inside_1_Ch1
 
-SFX_02_58:: ; 820a (2:420a)
+SFX_Swap_1:: ; 820a (2:420a)
 	db ( $40 | CH4 )
-	dw SFX_02_58_Ch1
+	dw SFX_Swap_1_Ch1
 	db CH5
-	dw SFX_02_58_Ch2
+	dw SFX_Swap_1_Ch2
 
-SFX_02_59:: ; 8210 (2:4210)
+SFX_59_1:: ; 8210 (2:4210)
 	db ( $40 | CH4 )
-	dw SFX_02_59_Ch1
+	dw SFX_59_1_Ch1
 	db CH5
-	dw SFX_02_59_Ch2
+	dw SFX_59_1_Ch2
 
-SFX_02_5a:: ; 8216 (2:4216)
+SFX_Purchase_1:: ; 8216 (2:4216)
 	db ( $40 | CH4 )
-	dw SFX_02_5a_Ch1
+	dw SFX_Purchase_1_Ch1
 	db CH5
-	dw SFX_02_5a_Ch2
+	dw SFX_Purchase_1_Ch2
 
-SFX_02_5b:: ; 821c (2:421c)
+SFX_Collision_1:: ; 821c (2:421c)
 	db CH4
-	dw SFX_02_5b_Ch1
+	dw SFX_Collision_1_Ch1
 
-SFX_02_5c:: ; 821f (2:421f)
+SFX_Go_Outside_1:: ; 821f (2:421f)
 	db CH7
-	dw SFX_02_5c_Ch1
+	dw SFX_Go_Outside_1_Ch1
 
-SFX_02_5d:: ; 8222 (2:4222)
+SFX_Save_1:: ; 8222 (2:4222)
 	db ( $40 | CH4 )
-	dw SFX_02_5d_Ch1
+	dw SFX_Save_1_Ch1
 	db CH5
-	dw SFX_02_5d_Ch2
+	dw SFX_Save_1_Ch2
 
-SFX_02_5e:: ; 8228 (2:4228)
+SFX_Pokeflute:: ; 8228 (2:4228)
 	db CH2
-	dw SFX_02_5e_Ch1
+	dw SFX_Pokeflute_Ch1
 
-SFX_02_5f:: ; 822b (2:422b)
+SFX_Safari_Zone_PA:: ; 822b (2:422b)
 	db CH4
-	dw SFX_02_5f_Ch1
+	dw SFX_Safari_Zone_PA_Ch1
--- a/audio/headers/sfxheaders08.asm
+++ b/audio/headers/sfxheaders08.asm
@@ -1,706 +1,706 @@
 SFX_Headers_08::
 	db $ff, $ff, $ff ; padding
 
-SFX_08_01:: ; 20003 (8:4003)
+SFX_Snare1_2:: ; 20003 (8:4003)
 	db CH7
-	dw SFX_08_01_Ch1
+	dw SFX_Snare1_2_Ch1
 
-SFX_08_02:: ; 20006 (8:4006)
+SFX_Snare2_2:: ; 20006 (8:4006)
 	db CH7
-	dw SFX_08_02_Ch1
+	dw SFX_Snare2_2_Ch1
 
-SFX_08_03:: ; 20009 (8:4009)
+SFX_Snare3_2:: ; 20009 (8:4009)
 	db CH7
-	dw SFX_08_03_Ch1
+	dw SFX_Snare3_2_Ch1
 
-SFX_08_04:: ; 2000c (8:400c)
+SFX_Snare4_2:: ; 2000c (8:400c)
 	db CH7
-	dw SFX_08_04_Ch1
+	dw SFX_Snare4_2_Ch1
 
-SFX_08_05:: ; 2000f (8:400f)
+SFX_Snare5_2:: ; 2000f (8:400f)
 	db CH7
-	dw SFX_08_05_Ch1
+	dw SFX_Snare5_2_Ch1
 
-SFX_08_06:: ; 20012 (8:4012)
+SFX_Triangle1_2:: ; 20012 (8:4012)
 	db CH7
-	dw SFX_08_06_Ch1
+	dw SFX_Triangle1_2_Ch1
 
-SFX_08_07:: ; 20015 (8:4015)
+SFX_Triangle2_2:: ; 20015 (8:4015)
 	db CH7
-	dw SFX_08_07_Ch1
+	dw SFX_Triangle2_2_Ch1
 
-SFX_08_08:: ; 20018 (8:4018)
+SFX_Snare6_2:: ; 20018 (8:4018)
 	db CH7
-	dw SFX_08_08_Ch1
+	dw SFX_Snare6_2_Ch1
 
-SFX_08_09:: ; 2001b (8:401b)
+SFX_Snare7_2:: ; 2001b (8:401b)
 	db CH7
-	dw SFX_08_09_Ch1
+	dw SFX_Snare7_2_Ch1
 
-SFX_08_0a:: ; 2001e (8:401e)
+SFX_Snare8_2:: ; 2001e (8:401e)
 	db CH7
-	dw SFX_08_0a_Ch1
+	dw SFX_Snare8_2_Ch1
 
-SFX_08_0b:: ; 20021 (8:4021)
+SFX_Snare9_2:: ; 20021 (8:4021)
 	db CH7
-	dw SFX_08_0b_Ch1
+	dw SFX_Snare9_2_Ch1
 
-SFX_08_0c:: ; 20024 (8:4024)
+SFX_Cymbal1_2:: ; 20024 (8:4024)
 	db CH7
-	dw SFX_08_0c_Ch1
+	dw SFX_Cymbal1_2_Ch1
 
-SFX_08_0d:: ; 20027 (8:4027)
+SFX_Cymbal2_2:: ; 20027 (8:4027)
 	db CH7
-	dw SFX_08_0d_Ch1
+	dw SFX_Cymbal2_2_Ch1
 
-SFX_08_0e:: ; 2002a (8:402a)
+SFX_Cymbal3_2:: ; 2002a (8:402a)
 	db CH7
-	dw SFX_08_0e_Ch1
+	dw SFX_Cymbal3_2_Ch1
 
-SFX_08_0f:: ; 2002d (8:402d)
+SFX_Muted_Snare1_2:: ; 2002d (8:402d)
 	db CH7
-	dw SFX_08_0f_Ch1
+	dw SFX_Muted_Snare1_2_Ch1
 
-SFX_08_10:: ; 20030 (8:4030)
+SFX_Triangle3_2:: ; 20030 (8:4030)
 	db CH7
-	dw SFX_08_10_Ch1
+	dw SFX_Triangle3_2_Ch1
 
-SFX_08_11:: ; 20033 (8:4033)
+SFX_Muted_Snare2_2:: ; 20033 (8:4033)
 	db CH7
-	dw SFX_08_11_Ch1
+	dw SFX_Muted_Snare2_2_Ch1
 
-SFX_08_12:: ; 20036 (8:4036)
+SFX_Muted_Snare3_2:: ; 20036 (8:4036)
 	db CH7
-	dw SFX_08_12_Ch1
+	dw SFX_Muted_Snare3_2_Ch1
 
-SFX_08_13:: ; 20039 (8:4039)
+SFX_Muted_Snare4_2:: ; 20039 (8:4039)
 	db CH7
-	dw SFX_08_13_Ch1
+	dw SFX_Muted_Snare4_2_Ch1
 
-SFX_08_14:: ; 2003c (8:403c)
+SFX_Cry00_2:: ; 2003c (8:403c)
 	db ( $80 | CH4 )
-	dw SFX_08_14_Ch1
+	dw SFX_Cry00_2_Ch1
 	db CH5
-	dw SFX_08_14_Ch2
+	dw SFX_Cry00_2_Ch2
 	db CH7
-	dw SFX_08_14_Ch3
+	dw SFX_Cry00_2_Ch3
 
-SFX_08_15:: ; 20045 (8:4045)
+SFX_Cry01_2:: ; 20045 (8:4045)
 	db ( $80 | CH4 )
-	dw SFX_08_15_Ch1
+	dw SFX_Cry01_2_Ch1
 	db CH5
-	dw SFX_08_15_Ch2
+	dw SFX_Cry01_2_Ch2
 	db CH7
-	dw SFX_08_15_Ch3
+	dw SFX_Cry01_2_Ch3
 
-SFX_08_16:: ; 2004e (8:404e)
+SFX_Cry02_2:: ; 2004e (8:404e)
 	db ( $80 | CH4 )
-	dw SFX_08_16_Ch1
+	dw SFX_Cry02_2_Ch1
 	db CH5
-	dw SFX_08_16_Ch2
+	dw SFX_Cry02_2_Ch2
 	db CH7
-	dw SFX_08_16_Ch3
+	dw SFX_Cry02_2_Ch3
 
-SFX_08_17:: ; 20057 (8:4057)
+SFX_Cry03_2:: ; 20057 (8:4057)
 	db ( $80 | CH4 )
-	dw SFX_08_17_Ch1
+	dw SFX_Cry03_2_Ch1
 	db CH5
-	dw SFX_08_17_Ch2
+	dw SFX_Cry03_2_Ch2
 	db CH7
-	dw SFX_08_17_Ch3
+	dw SFX_Cry03_2_Ch3
 
-SFX_08_18:: ; 20060 (8:4060)
+SFX_Cry04_2:: ; 20060 (8:4060)
 	db ( $80 | CH4 )
-	dw SFX_08_18_Ch1
+	dw SFX_Cry04_2_Ch1
 	db CH5
-	dw SFX_08_18_Ch2
+	dw SFX_Cry04_2_Ch2
 	db CH7
-	dw SFX_08_18_Ch3
+	dw SFX_Cry04_2_Ch3
 
-SFX_08_19:: ; 20069 (8:4069)
+SFX_Cry05_2:: ; 20069 (8:4069)
 	db ( $80 | CH4 )
-	dw SFX_08_19_Ch1
+	dw SFX_Cry05_2_Ch1
 	db CH5
-	dw SFX_08_19_Ch2
+	dw SFX_Cry05_2_Ch2
 	db CH7
-	dw SFX_08_19_Ch3
+	dw SFX_Cry05_2_Ch3
 
-SFX_08_1a:: ; 20072 (8:4072)
+SFX_Cry06_2:: ; 20072 (8:4072)
 	db ( $80 | CH4 )
-	dw SFX_08_1a_Ch1
+	dw SFX_Cry06_2_Ch1
 	db CH5
-	dw SFX_08_1a_Ch2
+	dw SFX_Cry06_2_Ch2
 	db CH7
-	dw SFX_08_1a_Ch3
+	dw SFX_Cry06_2_Ch3
 
-SFX_08_1b:: ; 2007b (8:407b)
+SFX_Cry07_2:: ; 2007b (8:407b)
 	db ( $80 | CH4 )
-	dw SFX_08_1b_Ch1
+	dw SFX_Cry07_2_Ch1
 	db CH5
-	dw SFX_08_1b_Ch2
+	dw SFX_Cry07_2_Ch2
 	db CH7
-	dw SFX_08_1b_Ch3
+	dw SFX_Cry07_2_Ch3
 
-SFX_08_1c:: ; 20084 (8:4084)
+SFX_Cry08_2:: ; 20084 (8:4084)
 	db ( $80 | CH4 )
-	dw SFX_08_1c_Ch1
+	dw SFX_Cry08_2_Ch1
 	db CH5
-	dw SFX_08_1c_Ch2
+	dw SFX_Cry08_2_Ch2
 	db CH7
-	dw SFX_08_1c_Ch3
+	dw SFX_Cry08_2_Ch3
 
-SFX_08_1d:: ; 2008d (8:408d)
+SFX_Cry09_2:: ; 2008d (8:408d)
 	db ( $80 | CH4 )
-	dw SFX_08_1d_Ch1
+	dw SFX_Cry09_2_Ch1
 	db CH5
-	dw SFX_08_1d_Ch2
+	dw SFX_Cry09_2_Ch2
 	db CH7
-	dw SFX_08_1d_Ch3
+	dw SFX_Cry09_2_Ch3
 
-SFX_08_1e:: ; 20096 (8:4096)
+SFX_Cry0A_2:: ; 20096 (8:4096)
 	db ( $80 | CH4 )
-	dw SFX_08_1e_Ch1
+	dw SFX_Cry0A_2_Ch1
 	db CH5
-	dw SFX_08_1e_Ch2
+	dw SFX_Cry0A_2_Ch2
 	db CH7
-	dw SFX_08_1e_Ch3
+	dw SFX_Cry0A_2_Ch3
 
-SFX_08_1f:: ; 2009f (8:409f)
+SFX_Cry0B_2:: ; 2009f (8:409f)
 	db ( $80 | CH4 )
-	dw SFX_08_1f_Ch1
+	dw SFX_Cry0B_2_Ch1
 	db CH5
-	dw SFX_08_1f_Ch2
+	dw SFX_Cry0B_2_Ch2
 	db CH7
-	dw SFX_08_1f_Ch3
+	dw SFX_Cry0B_2_Ch3
 
-SFX_08_20:: ; 200a8 (8:40a8)
+SFX_Cry0C_2:: ; 200a8 (8:40a8)
 	db ( $80 | CH4 )
-	dw SFX_08_20_Ch1
+	dw SFX_Cry0C_2_Ch1
 	db CH5
-	dw SFX_08_20_Ch2
+	dw SFX_Cry0C_2_Ch2
 	db CH7
-	dw SFX_08_20_Ch3
+	dw SFX_Cry0C_2_Ch3
 
-SFX_08_21:: ; 200b1 (8:40b1)
+SFX_Cry0D_2:: ; 200b1 (8:40b1)
 	db ( $80 | CH4 )
-	dw SFX_08_21_Ch1
+	dw SFX_Cry0D_2_Ch1
 	db CH5
-	dw SFX_08_21_Ch2
+	dw SFX_Cry0D_2_Ch2
 	db CH7
-	dw SFX_08_21_Ch3
+	dw SFX_Cry0D_2_Ch3
 
-SFX_08_22:: ; 200ba (8:40ba)
+SFX_Cry0E_2:: ; 200ba (8:40ba)
 	db ( $80 | CH4 )
-	dw SFX_08_22_Ch1
+	dw SFX_Cry0E_2_Ch1
 	db CH5
-	dw SFX_08_22_Ch2
+	dw SFX_Cry0E_2_Ch2
 	db CH7
-	dw SFX_08_22_Ch3
+	dw SFX_Cry0E_2_Ch3
 
-SFX_08_23:: ; 200c3 (8:40c3)
+SFX_Cry0F_2:: ; 200c3 (8:40c3)
 	db ( $80 | CH4 )
-	dw SFX_08_23_Ch1
+	dw SFX_Cry0F_2_Ch1
 	db CH5
-	dw SFX_08_23_Ch2
+	dw SFX_Cry0F_2_Ch2
 	db CH7
-	dw SFX_08_23_Ch3
+	dw SFX_Cry0F_2_Ch3
 
-SFX_08_24:: ; 200cc (8:40cc)
+SFX_Cry10_2:: ; 200cc (8:40cc)
 	db ( $80 | CH4 )
-	dw SFX_08_24_Ch1
+	dw SFX_Cry10_2_Ch1
 	db CH5
-	dw SFX_08_24_Ch2
+	dw SFX_Cry10_2_Ch2
 	db CH7
-	dw SFX_08_24_Ch3
+	dw SFX_Cry10_2_Ch3
 
-SFX_08_25:: ; 200d5 (8:40d5)
+SFX_Cry11_2:: ; 200d5 (8:40d5)
 	db ( $80 | CH4 )
-	dw SFX_08_25_Ch1
+	dw SFX_Cry11_2_Ch1
 	db CH5
-	dw SFX_08_25_Ch2
+	dw SFX_Cry11_2_Ch2
 	db CH7
-	dw SFX_08_25_Ch3
+	dw SFX_Cry11_2_Ch3
 
-SFX_08_26:: ; 200de (8:40de)
+SFX_Cry12_2:: ; 200de (8:40de)
 	db ( $80 | CH4 )
-	dw SFX_08_26_Ch1
+	dw SFX_Cry12_2_Ch1
 	db CH5
-	dw SFX_08_26_Ch2
+	dw SFX_Cry12_2_Ch2
 	db CH7
-	dw SFX_08_26_Ch3
+	dw SFX_Cry12_2_Ch3
 
-SFX_08_27:: ; 200e7 (8:40e7)
+SFX_Cry13_2:: ; 200e7 (8:40e7)
 	db ( $80 | CH4 )
-	dw SFX_08_27_Ch1
+	dw SFX_Cry13_2_Ch1
 	db CH5
-	dw SFX_08_27_Ch2
+	dw SFX_Cry13_2_Ch2
 	db CH7
-	dw SFX_08_27_Ch3
+	dw SFX_Cry13_2_Ch3
 
-SFX_08_28:: ; 200f0 (8:40f0)
+SFX_Cry14_2:: ; 200f0 (8:40f0)
 	db ( $80 | CH4 )
-	dw SFX_08_28_Ch1
+	dw SFX_Cry14_2_Ch1
 	db CH5
-	dw SFX_08_28_Ch2
+	dw SFX_Cry14_2_Ch2
 	db CH7
-	dw SFX_08_28_Ch3
+	dw SFX_Cry14_2_Ch3
 
-SFX_08_29:: ; 200f9 (8:40f9)
+SFX_Cry15_2:: ; 200f9 (8:40f9)
 	db ( $80 | CH4 )
-	dw SFX_08_29_Ch1
+	dw SFX_Cry15_2_Ch1
 	db CH5
-	dw SFX_08_29_Ch2
+	dw SFX_Cry15_2_Ch2
 	db CH7
-	dw SFX_08_29_Ch3
+	dw SFX_Cry15_2_Ch3
 
-SFX_08_2a:: ; 20102 (8:4102)
+SFX_Cry16_2:: ; 20102 (8:4102)
 	db ( $80 | CH4 )
-	dw SFX_08_2a_Ch1
+	dw SFX_Cry16_2_Ch1
 	db CH5
-	dw SFX_08_2a_Ch2
+	dw SFX_Cry16_2_Ch2
 	db CH7
-	dw SFX_08_2a_Ch3
+	dw SFX_Cry16_2_Ch3
 
-SFX_08_2b:: ; 2010b (8:410b)
+SFX_Cry17_2:: ; 2010b (8:410b)
 	db ( $80 | CH4 )
-	dw SFX_08_2b_Ch1
+	dw SFX_Cry17_2_Ch1
 	db CH5
-	dw SFX_08_2b_Ch2
+	dw SFX_Cry17_2_Ch2
 	db CH7
-	dw SFX_08_2b_Ch3
+	dw SFX_Cry17_2_Ch3
 
-SFX_08_2c:: ; 20114 (8:4114)
+SFX_Cry18_2:: ; 20114 (8:4114)
 	db ( $80 | CH4 )
-	dw SFX_08_2c_Ch1
+	dw SFX_Cry18_2_Ch1
 	db CH5
-	dw SFX_08_2c_Ch2
+	dw SFX_Cry18_2_Ch2
 	db CH7
-	dw SFX_08_2c_Ch3
+	dw SFX_Cry18_2_Ch3
 
-SFX_08_2d:: ; 2011d (8:411d)
+SFX_Cry19_2:: ; 2011d (8:411d)
 	db ( $80 | CH4 )
-	dw SFX_08_2d_Ch1
+	dw SFX_Cry19_2_Ch1
 	db CH5
-	dw SFX_08_2d_Ch2
+	dw SFX_Cry19_2_Ch2
 	db CH7
-	dw SFX_08_2d_Ch3
+	dw SFX_Cry19_2_Ch3
 
-SFX_08_2e:: ; 20126 (8:4126)
+SFX_Cry1A_2:: ; 20126 (8:4126)
 	db ( $80 | CH4 )
-	dw SFX_08_2e_Ch1
+	dw SFX_Cry1A_2_Ch1
 	db CH5
-	dw SFX_08_2e_Ch2
+	dw SFX_Cry1A_2_Ch2
 	db CH7
-	dw SFX_08_2e_Ch3
+	dw SFX_Cry1A_2_Ch3
 
-SFX_08_2f:: ; 2012f (8:412f)
+SFX_Cry1B_2:: ; 2012f (8:412f)
 	db ( $80 | CH4 )
-	dw SFX_08_2f_Ch1
+	dw SFX_Cry1B_2_Ch1
 	db CH5
-	dw SFX_08_2f_Ch2
+	dw SFX_Cry1B_2_Ch2
 	db CH7
-	dw SFX_08_2f_Ch3
+	dw SFX_Cry1B_2_Ch3
 
-SFX_08_30:: ; 20138 (8:4138)
+SFX_Cry1C_2:: ; 20138 (8:4138)
 	db ( $80 | CH4 )
-	dw SFX_08_30_Ch1
+	dw SFX_Cry1C_2_Ch1
 	db CH5
-	dw SFX_08_30_Ch2
+	dw SFX_Cry1C_2_Ch2
 	db CH7
-	dw SFX_08_30_Ch3
+	dw SFX_Cry1C_2_Ch3
 
-SFX_08_31:: ; 20141 (8:4141)
+SFX_Cry1D_2:: ; 20141 (8:4141)
 	db ( $80 | CH4 )
-	dw SFX_08_31_Ch1
+	dw SFX_Cry1D_2_Ch1
 	db CH5
-	dw SFX_08_31_Ch2
+	dw SFX_Cry1D_2_Ch2
 	db CH7
-	dw SFX_08_31_Ch3
+	dw SFX_Cry1D_2_Ch3
 
-SFX_08_32:: ; 2014a (8:414a)
+SFX_Cry1E_2:: ; 2014a (8:414a)
 	db ( $80 | CH4 )
-	dw SFX_08_32_Ch1
+	dw SFX_Cry1E_2_Ch1
 	db CH5
-	dw SFX_08_32_Ch2
+	dw SFX_Cry1E_2_Ch2
 	db CH7
-	dw SFX_08_32_Ch3
+	dw SFX_Cry1E_2_Ch3
 
-SFX_08_33:: ; 20153 (8:4153)
+SFX_Cry1F_2:: ; 20153 (8:4153)
 	db ( $80 | CH4 )
-	dw SFX_08_33_Ch1
+	dw SFX_Cry1F_2_Ch1
 	db CH5
-	dw SFX_08_33_Ch2
+	dw SFX_Cry1F_2_Ch2
 	db CH7
-	dw SFX_08_33_Ch3
+	dw SFX_Cry1F_2_Ch3
 
-SFX_08_34:: ; 2015c (8:415c)
+SFX_Cry20_2:: ; 2015c (8:415c)
 	db ( $80 | CH4 )
-	dw SFX_08_34_Ch1
+	dw SFX_Cry20_2_Ch1
 	db CH5
-	dw SFX_08_34_Ch2
+	dw SFX_Cry20_2_Ch2
 	db CH7
-	dw SFX_08_34_Ch3
+	dw SFX_Cry20_2_Ch3
 
-SFX_08_35:: ; 20165 (8:4165)
+SFX_Cry21_2:: ; 20165 (8:4165)
 	db ( $80 | CH4 )
-	dw SFX_08_35_Ch1
+	dw SFX_Cry21_2_Ch1
 	db CH5
-	dw SFX_08_35_Ch2
+	dw SFX_Cry21_2_Ch2
 	db CH7
-	dw SFX_08_35_Ch3
+	dw SFX_Cry21_2_Ch3
 
-SFX_08_36:: ; 2016e (8:416e)
+SFX_Cry22_2:: ; 2016e (8:416e)
 	db ( $80 | CH4 )
-	dw SFX_08_36_Ch1
+	dw SFX_Cry22_2_Ch1
 	db CH5
-	dw SFX_08_36_Ch2
+	dw SFX_Cry22_2_Ch2
 	db CH7
-	dw SFX_08_36_Ch3
+	dw SFX_Cry22_2_Ch3
 
-SFX_08_37:: ; 20177 (8:4177)
+SFX_Cry23_2:: ; 20177 (8:4177)
 	db ( $80 | CH4 )
-	dw SFX_08_37_Ch1
+	dw SFX_Cry23_2_Ch1
 	db CH5
-	dw SFX_08_37_Ch2
+	dw SFX_Cry23_2_Ch2
 	db CH7
-	dw SFX_08_37_Ch3
+	dw SFX_Cry23_2_Ch3
 
-SFX_08_38:: ; 20180 (8:4180)
+SFX_Cry24_2:: ; 20180 (8:4180)
 	db ( $80 | CH4 )
-	dw SFX_08_38_Ch1
+	dw SFX_Cry24_2_Ch1
 	db CH5
-	dw SFX_08_38_Ch2
+	dw SFX_Cry24_2_Ch2
 	db CH7
-	dw SFX_08_38_Ch3
+	dw SFX_Cry24_2_Ch3
 
-SFX_08_39:: ; 20189 (8:4189)
+SFX_Cry25_2:: ; 20189 (8:4189)
 	db ( $80 | CH4 )
-	dw SFX_08_39_Ch1
+	dw SFX_Cry25_2_Ch1
 	db CH5
-	dw SFX_08_39_Ch2
+	dw SFX_Cry25_2_Ch2
 	db CH7
-	dw SFX_08_39_Ch3
+	dw SFX_Cry25_2_Ch3
 
-SFX_08_3a:: ; 20192 (8:4192)
+SFX_Level_Up:: ; 20192 (8:4192)
 	db ( $80 | CH4 )
-	dw SFX_08_3a_Ch1
+	dw SFX_Level_Up_Ch1
 	db CH5
-	dw SFX_08_3a_Ch2
+	dw SFX_Level_Up_Ch2
 	db CH6
-	dw SFX_08_3a_Ch3
+	dw SFX_Level_Up_Ch3
 
-SFX_08_3b:: ; 2019b (8:419b)
+SFX_Get_Item2_2:: ; 2019b (8:419b)
 	db ( $80 | CH4 )
-	dw SFX_08_3b_Ch1
+	dw SFX_Get_Item2_2_Ch1
 	db CH5
-	dw SFX_08_3b_Ch2
+	dw SFX_Get_Item2_2_Ch2
 	db CH6
-	dw SFX_08_3b_Ch3
+	dw SFX_Get_Item2_2_Ch3
 
-SFX_08_3c:: ; 201a4 (8:41a4)
+SFX_Tink_2:: ; 201a4 (8:41a4)
 	db CH4
-	dw SFX_08_3c_Ch1
+	dw SFX_Tink_2_Ch1
 
-SFX_08_3d:: ; 201a7 (8:41a7)
+SFX_Heal_HP_2:: ; 201a7 (8:41a7)
 	db CH4
-	dw SFX_08_3d_Ch1
+	dw SFX_Heal_HP_2_Ch1
 
-SFX_08_3e:: ; 201aa (8:41aa)
+SFX_Heal_Ailment_2:: ; 201aa (8:41aa)
 	db CH4
-	dw SFX_08_3e_Ch1
+	dw SFX_Heal_Ailment_2_Ch1
 
-SFX_08_3f:: ; 201ad (8:41ad)
+SFX_Start_Menu_2:: ; 201ad (8:41ad)
 	db CH7
-	dw SFX_08_3f_Ch1
+	dw SFX_Start_Menu_2_Ch1
 
-SFX_08_40:: ; 201b0 (8:41b0)
+SFX_Press_AB_2:: ; 201b0 (8:41b0)
 	db CH4
-	dw SFX_08_40_Ch1
+	dw SFX_Press_AB_2_Ch1
 
-SFX_08_41:: ; 201b3 (8:41b3)
+SFX_Ball_Toss:: ; 201b3 (8:41b3)
 	db ( $40 | CH4 )
-	dw SFX_08_41_Ch1
+	dw SFX_Ball_Toss_Ch1
 	db CH5
-	dw SFX_08_41_Ch2
+	dw SFX_Ball_Toss_Ch2
 
-SFX_08_42:: ; 201b9 (8:41b9)
+SFX_Ball_Poof:: ; 201b9 (8:41b9)
 	db ( $40 | CH4 )
-	dw SFX_08_42_Ch1
+	dw SFX_Ball_Poof_Ch1
 	db CH7
-	dw SFX_08_42_Ch2
+	dw SFX_Ball_Poof_Ch2
 
-SFX_08_43:: ; 201bf (8:41bf)
+SFX_Faint_Thud:: ; 201bf (8:41bf)
 	db ( $40 | CH4 )
-	dw SFX_08_43_Ch1
+	dw SFX_Faint_Thud_Ch1
 	db CH7
-	dw SFX_08_43_Ch2
+	dw SFX_Faint_Thud_Ch2
 
-SFX_08_44:: ; 201c5 (8:41c5)
+SFX_Run:: ; 201c5 (8:41c5)
 	db CH7
-	dw SFX_08_44_Ch1
+	dw SFX_Run_Ch1
 
-SFX_08_45:: ; 201c8 (8:41c8)
+SFX_Dex_Page_Added:: ; 201c8 (8:41c8)
 	db ( $40 | CH4 )
-	dw SFX_08_45_Ch1
+	dw SFX_Dex_Page_Added_Ch1
 	db CH5
-	dw SFX_08_45_Ch2
+	dw SFX_Dex_Page_Added_Ch2
 
-SFX_08_46:: ; 201ce (8:41ce)
+SFX_Caught_Mon:: ; 201ce (8:41ce)
 	db ( $80 | CH4 )
-	dw SFX_08_46_Ch1
+	dw SFX_Caught_Mon_Ch1
 	db CH5
-	dw SFX_08_46_Ch2
+	dw SFX_Caught_Mon_Ch2
 	db CH6
-	dw SFX_08_46_Ch3
+	dw SFX_Caught_Mon_Ch3
 
-SFX_08_47:: ; 201d7 (8:41d7)
+SFX_Peck:: ; 201d7 (8:41d7)
 	db CH7
-	dw SFX_08_47_Ch1
+	dw SFX_Peck_Ch1
 
-SFX_08_48:: ; 201da (8:41da)
+SFX_Faint_Fall:: ; 201da (8:41da)
 	db CH4
-	dw SFX_08_48_Ch1
+	dw SFX_Faint_Fall_Ch1
 
-SFX_08_49:: ; 201dd (8:41dd)
+SFX_Battle_09:: ; 201dd (8:41dd)
 	db CH4
-	dw SFX_08_49_Ch1
+	dw SFX_Battle_09_Ch1
 
-SFX_08_4a:: ; 201e0 (8:41e0)
+SFX_Pound:: ; 201e0 (8:41e0)
 	db CH7
-	dw SFX_08_4a_Ch1
+	dw SFX_Pound_Ch1
 
-SFX_08_4b:: ; 201e3 (8:41e3)
+SFX_Battle_0B:: ; 201e3 (8:41e3)
 	db CH7
-	dw SFX_08_4b_Ch1
+	dw SFX_Battle_0B_Ch1
 
-SFX_08_4c:: ; 201e6 (8:41e6)
+SFX_Battle_0C:: ; 201e6 (8:41e6)
 	db CH7
-	dw SFX_08_4c_Ch1
+	dw SFX_Battle_0C_Ch1
 
-SFX_08_4d:: ; 201e9 (8:41e9)
+SFX_Battle_0D:: ; 201e9 (8:41e9)
 	db CH7
-	dw SFX_08_4d_Ch1
+	dw SFX_Battle_0D_Ch1
 
-SFX_08_4e:: ; 201ec (8:41ec)
+SFX_Battle_0E:: ; 201ec (8:41ec)
 	db CH7
-	dw SFX_08_4e_Ch1
+	dw SFX_Battle_0E_Ch1
 
-SFX_08_4f:: ; 201ef (8:41ef)
+SFX_Battle_0F:: ; 201ef (8:41ef)
 	db CH7
-	dw SFX_08_4f_Ch1
+	dw SFX_Battle_0F_Ch1
 
-SFX_08_50:: ; 201f2 (8:41f2)
+SFX_Damage:: ; 201f2 (8:41f2)
 	db CH7
-	dw SFX_08_50_Ch1
+	dw SFX_Damage_Ch1
 
-SFX_08_51:: ; 201f5 (8:41f5)
+SFX_Not_Very_Effective:: ; 201f5 (8:41f5)
 	db CH7
-	dw SFX_08_51_Ch1
+	dw SFX_Not_Very_Effective_Ch1
 
-SFX_08_52:: ; 201f8 (8:41f8)
+SFX_Battle_12:: ; 201f8 (8:41f8)
 	db CH7
-	dw SFX_08_52_Ch1
+	dw SFX_Battle_12_Ch1
 
-SFX_08_53:: ; 201fb (8:41fb)
+SFX_Battle_13:: ; 201fb (8:41fb)
 	db CH7
-	dw SFX_08_53_Ch1
+	dw SFX_Battle_13_Ch1
 
-SFX_08_54:: ; 201fe (8:41fe)
+SFX_Battle_14:: ; 201fe (8:41fe)
 	db CH7
-	dw SFX_08_54_Ch1
+	dw SFX_Battle_14_Ch1
 
-SFX_08_55:: ; 20201 (8:4201)
+SFX_Vine_Whip:: ; 20201 (8:4201)
 	db CH7
-	dw SFX_08_55_Ch1
+	dw SFX_Vine_Whip_Ch1
 
-SFX_08_56:: ; 20204 (8:4204)
+SFX_Battle_16:: ; 20204 (8:4204)
 	db CH7
-	dw SFX_08_56_Ch1
+	dw SFX_Battle_16_Ch1
 
-SFX_08_57:: ; 20207 (8:4207)
+SFX_Battle_17:: ; 20207 (8:4207)
 	db CH7
-	dw SFX_08_57_Ch1
+	dw SFX_Battle_17_Ch1
 
-SFX_08_58:: ; 2020a (8:420a)
+SFX_Battle_18:: ; 2020a (8:420a)
 	db CH7
-	dw SFX_08_58_Ch1
+	dw SFX_Battle_18_Ch1
 
-SFX_08_59:: ; 2020d (8:420d)
+SFX_Battle_19:: ; 2020d (8:420d)
 	db CH7
-	dw SFX_08_59_Ch1
+	dw SFX_Battle_19_Ch1
 
-SFX_08_5a:: ; 20210 (8:4210)
+SFX_Super_Effective:: ; 20210 (8:4210)
 	db CH7
-	dw SFX_08_5a_Ch1
+	dw SFX_Super_Effective_Ch1
 
-SFX_08_5b:: ; 20213 (8:4213)
+SFX_Battle_1B:: ; 20213 (8:4213)
 	db CH7
-	dw SFX_08_5b_Ch1
+	dw SFX_Battle_1B_Ch1
 
-SFX_08_5c:: ; 20216 (8:4216)
+SFX_Battle_1C:: ; 20216 (8:4216)
 	db CH7
-	dw SFX_08_5c_Ch1
+	dw SFX_Battle_1C_Ch1
 
-SFX_08_5d:: ; 20219 (8:4219)
+SFX_Doubleslap:: ; 20219 (8:4219)
 	db CH7
-	dw SFX_08_5d_Ch1
+	dw SFX_Doubleslap_Ch1
 
-SFX_08_5e:: ; 2021c (8:421c)
+SFX_Battle_1E:: ; 2021c (8:421c)
 	db ( $40 | CH4 )
-	dw SFX_08_5e_Ch1
+	dw SFX_Battle_1E_Ch1
 	db CH7
-	dw SFX_08_5e_Ch2
+	dw SFX_Battle_1E_Ch2
 
-SFX_08_5f:: ; 20222 (8:4222)
+SFX_Horn_Drill:: ; 20222 (8:4222)
 	db CH7
-	dw SFX_08_5f_Ch1
+	dw SFX_Horn_Drill_Ch1
 
-SFX_08_60:: ; 20225 (8:4225)
+SFX_Battle_20:: ; 20225 (8:4225)
 	db CH7
-	dw SFX_08_60_Ch1
+	dw SFX_Battle_20_Ch1
 
-SFX_08_61:: ; 20228 (8:4228)
+SFX_Battle_21:: ; 20228 (8:4228)
 	db CH7
-	dw SFX_08_61_Ch1
+	dw SFX_Battle_21_Ch1
 
-SFX_08_62:: ; 2022b (8:422b)
+SFX_Battle_22:: ; 2022b (8:422b)
 	db CH7
-	dw SFX_08_62_Ch1
+	dw SFX_Battle_22_Ch1
 
-SFX_08_63:: ; 2022e (8:422e)
+SFX_Battle_23:: ; 2022e (8:422e)
 	db CH7
-	dw SFX_08_63_Ch1
+	dw SFX_Battle_23_Ch1
 
-SFX_08_64:: ; 20231 (8:4231)
+SFX_Battle_24:: ; 20231 (8:4231)
 	db ( $40 | CH4 )
-	dw SFX_08_64_Ch1
+	dw SFX_Battle_24_Ch1
 	db CH7
-	dw SFX_08_64_Ch2
+	dw SFX_Battle_24_Ch2
 
-SFX_08_65:: ; 20237 (8:4237)
+SFX_Battle_25:: ; 20237 (8:4237)
 	db CH7
-	dw SFX_08_65_Ch1
+	dw SFX_Battle_25_Ch1
 
-SFX_08_66:: ; 2023a (8:423a)
+SFX_Battle_26:: ; 2023a (8:423a)
 	db CH7
-	dw SFX_08_66_Ch1
+	dw SFX_Battle_26_Ch1
 
-SFX_08_67:: ; 2023d (8:423d)
+SFX_Battle_27:: ; 2023d (8:423d)
 	db ( $80 | CH4 )
-	dw SFX_08_67_Ch1
+	dw SFX_Battle_27_Ch1
 	db CH5
-	dw SFX_08_67_Ch2
+	dw SFX_Battle_27_Ch2
 	db CH7
-	dw SFX_08_67_Ch3
+	dw SFX_Battle_27_Ch3
 
-SFX_08_68:: ; 20246 (8:4246)
+SFX_Battle_28:: ; 20246 (8:4246)
 	db ( $80 | CH4 )
-	dw SFX_08_68_Ch1
+	dw SFX_Battle_28_Ch1
 	db CH5
-	dw SFX_08_68_Ch2
+	dw SFX_Battle_28_Ch2
 	db CH7
-	dw SFX_08_68_Ch3
+	dw SFX_Battle_28_Ch3
 
-SFX_08_69:: ; 2024f (8:424f)
+SFX_Battle_29:: ; 2024f (8:424f)
 	db ( $40 | CH4 )
-	dw SFX_08_69_Ch1
+	dw SFX_Battle_29_Ch1
 	db CH7
-	dw SFX_08_69_Ch2
+	dw SFX_Battle_29_Ch2
 
-SFX_08_6a:: ; 20255 (8:4255)
+SFX_Battle_2A:: ; 20255 (8:4255)
 	db ( $80 | CH4 )
-	dw SFX_08_6a_Ch1
+	dw SFX_Battle_2A_Ch1
 	db CH5
-	dw SFX_08_6a_Ch2
+	dw SFX_Battle_2A_Ch2
 	db CH7
-	dw SFX_08_6a_Ch3
+	dw SFX_Battle_2A_Ch3
 
-SFX_08_6b:: ; 2025e (8:425e)
+SFX_Battle_2B:: ; 2025e (8:425e)
 	db ( $40 | CH4 )
-	dw SFX_08_6b_Ch1
+	dw SFX_Battle_2B_Ch1
 	db CH7
-	dw SFX_08_6b_Ch2
+	dw SFX_Battle_2B_Ch2
 
-SFX_08_6c:: ; 20264 (8:4264)
+SFX_Battle_2C:: ; 20264 (8:4264)
 	db ( $80 | CH4 )
-	dw SFX_08_6c_Ch1
+	dw SFX_Battle_2C_Ch1
 	db CH5
-	dw SFX_08_6c_Ch2
+	dw SFX_Battle_2C_Ch2
 	db CH7
-	dw SFX_08_6c_Ch3
+	dw SFX_Battle_2C_Ch3
 
-SFX_08_6d:: ; 2026d (8:426d)
+SFX_Psybeam:: ; 2026d (8:426d)
 	db ( $80 | CH4 )
-	dw SFX_08_6d_Ch1
+	dw SFX_Psybeam_Ch1
 	db CH5
-	dw SFX_08_6d_Ch2
+	dw SFX_Psybeam_Ch2
 	db CH7
-	dw SFX_08_6d_Ch3
+	dw SFX_Psybeam_Ch3
 
-SFX_08_6e:: ; 20276 (8:4276)
+SFX_Battle_2E:: ; 20276 (8:4276)
 	db ( $80 | CH4 )
-	dw SFX_08_6e_Ch1
+	dw SFX_Battle_2E_Ch1
 	db CH5
-	dw SFX_08_6e_Ch2
+	dw SFX_Battle_2E_Ch2
 	db CH7
-	dw SFX_08_6e_Ch3
+	dw SFX_Battle_2E_Ch3
 
-SFX_08_6f:: ; 2027f (8:427f)
+SFX_Battle_2F:: ; 2027f (8:427f)
 	db ( $80 | CH4 )
-	dw SFX_08_6f_Ch1
+	dw SFX_Battle_2F_Ch1
 	db CH5
-	dw SFX_08_6f_Ch2
+	dw SFX_Battle_2F_Ch2
 	db CH7
-	dw SFX_08_6f_Ch3
+	dw SFX_Battle_2F_Ch3
 
-SFX_08_70:: ; 20288 (8:4288)
+SFX_Psychic_M:: ; 20288 (8:4288)
 	db ( $80 | CH4 )
-	dw SFX_08_70_Ch1
+	dw SFX_Psychic_M_Ch1
 	db CH5
-	dw SFX_08_70_Ch2
+	dw SFX_Psychic_M_Ch2
 	db CH7
-	dw SFX_08_70_Ch3
+	dw SFX_Psychic_M_Ch3
 
-SFX_08_71:: ; 20291 (8:4291)
+SFX_Battle_31:: ; 20291 (8:4291)
 	db ( $40 | CH4 )
-	dw SFX_08_71_Ch1
+	dw SFX_Battle_31_Ch1
 	db CH5
-	dw SFX_08_71_Ch2
+	dw SFX_Battle_31_Ch2
 
-SFX_08_72:: ; 20297 (8:4297)
+SFX_Battle_32:: ; 20297 (8:4297)
 	db ( $40 | CH4 )
-	dw SFX_08_72_Ch1
+	dw SFX_Battle_32_Ch1
 	db CH5
-	dw SFX_08_72_Ch2
+	dw SFX_Battle_32_Ch2
 
-SFX_08_73:: ; 2029d (8:429d)
+SFX_Battle_33:: ; 2029d (8:429d)
 	db ( $40 | CH4 )
-	dw SFX_08_73_Ch1
+	dw SFX_Battle_33_Ch1
 	db CH5
-	dw SFX_08_73_Ch2
+	dw SFX_Battle_33_Ch2
 
-SFX_08_74:: ; 202a3 (8:42a3)
+SFX_Battle_34:: ; 202a3 (8:42a3)
 	db ( $80 | CH4 )
-	dw SFX_08_74_Ch1
+	dw SFX_Battle_34_Ch1
 	db CH5
-	dw SFX_08_74_Ch2
+	dw SFX_Battle_34_Ch2
 	db CH7
-	dw SFX_08_74_Ch3
+	dw SFX_Battle_34_Ch3
 
-SFX_08_75:: ; 202ac (8:42ac)
+SFX_Battle_35:: ; 202ac (8:42ac)
 	db ( $40 | CH4 )
-	dw SFX_08_75_Ch1
+	dw SFX_Battle_35_Ch1
 	db CH5
-	dw SFX_08_75_Ch2
+	dw SFX_Battle_35_Ch2
 
-SFX_08_76:: ; 202b2 (8:42b2)
+SFX_Battle_36:: ; 202b2 (8:42b2)
 	db ( $80 | CH4 )
-	dw SFX_08_76_Ch1
+	dw SFX_Battle_36_Ch1
 	db CH5
-	dw SFX_08_76_Ch2
+	dw SFX_Battle_36_Ch2
 	db CH7
-	dw SFX_08_76_Ch3
+	dw SFX_Battle_36_Ch3
 
-SFX_08_77:: ; 202bb (8:42bb)
+SFX_Silph_Scope:: ; 202bb (8:42bb)
 	db CH4
-	dw SFX_08_77_Ch1
+	dw SFX_Silph_Scope_Ch1
--- a/audio/headers/sfxheaders1f.asm
+++ b/audio/headers/sfxheaders1f.asm
@@ -1,596 +1,596 @@
 SFX_Headers_1f::
 	db $ff, $ff, $ff ; padding
 
-SFX_1f_01:: ; 7c003 (1f:4003)
+SFX_Snare1_3:: ; 7c003 (1f:4003)
 	db CH7
-	dw SFX_1f_01_Ch1
+	dw SFX_Snare1_3_Ch1
 
-SFX_1f_02:: ; 7c006 (1f:4006)
+SFX_Snare2_3:: ; 7c006 (1f:4006)
 	db CH7
-	dw SFX_1f_02_Ch1
+	dw SFX_Snare2_3_Ch1
 
-SFX_1f_03:: ; 7c009 (1f:4009)
+SFX_Snare3_3:: ; 7c009 (1f:4009)
 	db CH7
-	dw SFX_1f_03_Ch1
+	dw SFX_Snare3_3_Ch1
 
-SFX_1f_04:: ; 7c00c (1f:400c)
+SFX_Snare4_3:: ; 7c00c (1f:400c)
 	db CH7
-	dw SFX_1f_04_Ch1
+	dw SFX_Snare4_3_Ch1
 
-SFX_1f_05:: ; 7c00f (1f:400f)
+SFX_Snare5_3:: ; 7c00f (1f:400f)
 	db CH7
-	dw SFX_1f_05_Ch1
+	dw SFX_Snare5_3_Ch1
 
-SFX_1f_06:: ; 7c012 (1f:4012)
+SFX_Triangle1_3:: ; 7c012 (1f:4012)
 	db CH7
-	dw SFX_1f_06_Ch1
+	dw SFX_Triangle1_3_Ch1
 
-SFX_1f_07:: ; 7c015 (1f:4015)
+SFX_Triangle2_3:: ; 7c015 (1f:4015)
 	db CH7
-	dw SFX_1f_07_Ch1
+	dw SFX_Triangle2_3_Ch1
 
-SFX_1f_08:: ; 7c018 (1f:4018)
+SFX_Snare6_3:: ; 7c018 (1f:4018)
 	db CH7
-	dw SFX_1f_08_Ch1
+	dw SFX_Snare6_3_Ch1
 
-SFX_1f_09:: ; 7c01b (1f:401b)
+SFX_Snare7_3:: ; 7c01b (1f:401b)
 	db CH7
-	dw SFX_1f_09_Ch1
+	dw SFX_Snare7_3_Ch1
 
-SFX_1f_0a:: ; 7c01e (1f:401e)
+SFX_Snare8_3:: ; 7c01e (1f:401e)
 	db CH7
-	dw SFX_1f_0a_Ch1
+	dw SFX_Snare8_3_Ch1
 
-SFX_1f_0b:: ; 7c021 (1f:4021)
+SFX_Snare9_3:: ; 7c021 (1f:4021)
 	db CH7
-	dw SFX_1f_0b_Ch1
+	dw SFX_Snare9_3_Ch1
 
-SFX_1f_0c:: ; 7c024 (1f:4024)
+SFX_Cymbal1_3:: ; 7c024 (1f:4024)
 	db CH7
-	dw SFX_1f_0c_Ch1
+	dw SFX_Cymbal1_3_Ch1
 
-SFX_1f_0d:: ; 7c027 (1f:4027)
+SFX_Cymbal2_3:: ; 7c027 (1f:4027)
 	db CH7
-	dw SFX_1f_0d_Ch1
+	dw SFX_Cymbal2_3_Ch1
 
-SFX_1f_0e:: ; 7c02a (1f:402a)
+SFX_Cymbal3_3:: ; 7c02a (1f:402a)
 	db CH7
-	dw SFX_1f_0e_Ch1
+	dw SFX_Cymbal3_3_Ch1
 
-SFX_1f_0f:: ; 7c02d (1f:402d)
+SFX_Muted_Snare1_3:: ; 7c02d (1f:402d)
 	db CH7
-	dw SFX_1f_0f_Ch1
+	dw SFX_Muted_Snare1_3_Ch1
 
-SFX_1f_10:: ; 7c030 (1f:4030)
+SFX_Triangle3_3:: ; 7c030 (1f:4030)
 	db CH7
-	dw SFX_1f_10_Ch1
+	dw SFX_Triangle3_3_Ch1
 
-SFX_1f_11:: ; 7c033 (1f:4033)
+SFX_Muted_Snare2_3:: ; 7c033 (1f:4033)
 	db CH7
-	dw SFX_1f_11_Ch1
+	dw SFX_Muted_Snare2_3_Ch1
 
-SFX_1f_12:: ; 7c036 (1f:4036)
+SFX_Muted_Snare3_3:: ; 7c036 (1f:4036)
 	db CH7
-	dw SFX_1f_12_Ch1
+	dw SFX_Muted_Snare3_3_Ch1
 
-SFX_1f_13:: ; 7c039 (1f:4039)
+SFX_Muted_Snare4_3:: ; 7c039 (1f:4039)
 	db CH7
-	dw SFX_1f_13_Ch1
+	dw SFX_Muted_Snare4_3_Ch1
 
-SFX_1f_14:: ; 7c03c (1f:403c)
+SFX_Cry00_3:: ; 7c03c (1f:403c)
 	db ( $80 | CH4 )
-	dw SFX_1f_14_Ch1
+	dw SFX_Cry00_3_Ch1
 	db CH5
-	dw SFX_1f_14_Ch2
+	dw SFX_Cry00_3_Ch2
 	db CH7
-	dw SFX_1f_14_Ch3
+	dw SFX_Cry00_3_Ch3
 
-SFX_1f_15:: ; 7c045 (1f:4045)
+SFX_Cry01_3:: ; 7c045 (1f:4045)
 	db ( $80 | CH4 )
-	dw SFX_1f_15_Ch1
+	dw SFX_Cry01_3_Ch1
 	db CH5
-	dw SFX_1f_15_Ch2
+	dw SFX_Cry01_3_Ch2
 	db CH7
-	dw SFX_1f_15_Ch3
+	dw SFX_Cry01_3_Ch3
 
-SFX_1f_16:: ; 7c04e (1f:404e)
+SFX_Cry02_3:: ; 7c04e (1f:404e)
 	db ( $80 | CH4 )
-	dw SFX_1f_16_Ch1
+	dw SFX_Cry02_3_Ch1
 	db CH5
-	dw SFX_1f_16_Ch2
+	dw SFX_Cry02_3_Ch2
 	db CH7
-	dw SFX_1f_16_Ch3
+	dw SFX_Cry02_3_Ch3
 
-SFX_1f_17:: ; 7c057 (1f:4057)
+SFX_Cry03_3:: ; 7c057 (1f:4057)
 	db ( $80 | CH4 )
-	dw SFX_1f_17_Ch1
+	dw SFX_Cry03_3_Ch1
 	db CH5
-	dw SFX_1f_17_Ch2
+	dw SFX_Cry03_3_Ch2
 	db CH7
-	dw SFX_1f_17_Ch3
+	dw SFX_Cry03_3_Ch3
 
-SFX_1f_18:: ; 7c060 (1f:4060)
+SFX_Cry04_3:: ; 7c060 (1f:4060)
 	db ( $80 | CH4 )
-	dw SFX_1f_18_Ch1
+	dw SFX_Cry04_3_Ch1
 	db CH5
-	dw SFX_1f_18_Ch2
+	dw SFX_Cry04_3_Ch2
 	db CH7
-	dw SFX_1f_18_Ch3
+	dw SFX_Cry04_3_Ch3
 
-SFX_1f_19:: ; 7c069 (1f:4069)
+SFX_Cry05_3:: ; 7c069 (1f:4069)
 	db ( $80 | CH4 )
-	dw SFX_1f_19_Ch1
+	dw SFX_Cry05_3_Ch1
 	db CH5
-	dw SFX_1f_19_Ch2
+	dw SFX_Cry05_3_Ch2
 	db CH7
-	dw SFX_1f_19_Ch3
+	dw SFX_Cry05_3_Ch3
 
-SFX_1f_1a:: ; 7c072 (1f:4072)
+SFX_Cry06_3:: ; 7c072 (1f:4072)
 	db ( $80 | CH4 )
-	dw SFX_1f_1a_Ch1
+	dw SFX_Cry06_3_Ch1
 	db CH5
-	dw SFX_1f_1a_Ch2
+	dw SFX_Cry06_3_Ch2
 	db CH7
-	dw SFX_1f_1a_Ch3
+	dw SFX_Cry06_3_Ch3
 
-SFX_1f_1b:: ; 7c07b (1f:407b)
+SFX_Cry07_3:: ; 7c07b (1f:407b)
 	db ( $80 | CH4 )
-	dw SFX_1f_1b_Ch1
+	dw SFX_Cry07_3_Ch1
 	db CH5
-	dw SFX_1f_1b_Ch2
+	dw SFX_Cry07_3_Ch2
 	db CH7
-	dw SFX_1f_1b_Ch3
+	dw SFX_Cry07_3_Ch3
 
-SFX_1f_1c:: ; 7c084 (1f:4084)
+SFX_Cry08_3:: ; 7c084 (1f:4084)
 	db ( $80 | CH4 )
-	dw SFX_1f_1c_Ch1
+	dw SFX_Cry08_3_Ch1
 	db CH5
-	dw SFX_1f_1c_Ch2
+	dw SFX_Cry08_3_Ch2
 	db CH7
-	dw SFX_1f_1c_Ch3
+	dw SFX_Cry08_3_Ch3
 
-SFX_1f_1d:: ; 7c08d (1f:408d)
+SFX_Cry09_3:: ; 7c08d (1f:408d)
 	db ( $80 | CH4 )
-	dw SFX_1f_1d_Ch1
+	dw SFX_Cry09_3_Ch1
 	db CH5
-	dw SFX_1f_1d_Ch2
+	dw SFX_Cry09_3_Ch2
 	db CH7
-	dw SFX_1f_1d_Ch3
+	dw SFX_Cry09_3_Ch3
 
-SFX_1f_1e:: ; 7c096 (1f:4096)
+SFX_Cry0A_3:: ; 7c096 (1f:4096)
 	db ( $80 | CH4 )
-	dw SFX_1f_1e_Ch1
+	dw SFX_Cry0A_3_Ch1
 	db CH5
-	dw SFX_1f_1e_Ch2
+	dw SFX_Cry0A_3_Ch2
 	db CH7
-	dw SFX_1f_1e_Ch3
+	dw SFX_Cry0A_3_Ch3
 
-SFX_1f_1f:: ; 7c09f (1f:409f)
+SFX_Cry0B_3:: ; 7c09f (1f:409f)
 	db ( $80 | CH4 )
-	dw SFX_1f_1f_Ch1
+	dw SFX_Cry0B_3_Ch1
 	db CH5
-	dw SFX_1f_1f_Ch2
+	dw SFX_Cry0B_3_Ch2
 	db CH7
-	dw SFX_1f_1f_Ch3
+	dw SFX_Cry0B_3_Ch3
 
-SFX_1f_20:: ; 7c0a8 (1f:40a8)
+SFX_Cry0C_3:: ; 7c0a8 (1f:40a8)
 	db ( $80 | CH4 )
-	dw SFX_1f_20_Ch1
+	dw SFX_Cry0C_3_Ch1
 	db CH5
-	dw SFX_1f_20_Ch2
+	dw SFX_Cry0C_3_Ch2
 	db CH7
-	dw SFX_1f_20_Ch3
+	dw SFX_Cry0C_3_Ch3
 
-SFX_1f_21:: ; 7c0b1 (1f:40b1)
+SFX_Cry0D_3:: ; 7c0b1 (1f:40b1)
 	db ( $80 | CH4 )
-	dw SFX_1f_21_Ch1
+	dw SFX_Cry0D_3_Ch1
 	db CH5
-	dw SFX_1f_21_Ch2
+	dw SFX_Cry0D_3_Ch2
 	db CH7
-	dw SFX_1f_21_Ch3
+	dw SFX_Cry0D_3_Ch3
 
-SFX_1f_22:: ; 7c0ba (1f:40ba)
+SFX_Cry0E_3:: ; 7c0ba (1f:40ba)
 	db ( $80 | CH4 )
-	dw SFX_1f_22_Ch1
+	dw SFX_Cry0E_3_Ch1
 	db CH5
-	dw SFX_1f_22_Ch2
+	dw SFX_Cry0E_3_Ch2
 	db CH7
-	dw SFX_1f_22_Ch3
+	dw SFX_Cry0E_3_Ch3
 
-SFX_1f_23:: ; 7c0c3 (1f:40c3)
+SFX_Cry0F_3:: ; 7c0c3 (1f:40c3)
 	db ( $80 | CH4 )
-	dw SFX_1f_23_Ch1
+	dw SFX_Cry0F_3_Ch1
 	db CH5
-	dw SFX_1f_23_Ch2
+	dw SFX_Cry0F_3_Ch2
 	db CH7
-	dw SFX_1f_23_Ch3
+	dw SFX_Cry0F_3_Ch3
 
-SFX_1f_24:: ; 7c0cc (1f:40cc)
+SFX_Cry10_3:: ; 7c0cc (1f:40cc)
 	db ( $80 | CH4 )
-	dw SFX_1f_24_Ch1
+	dw SFX_Cry10_3_Ch1
 	db CH5
-	dw SFX_1f_24_Ch2
+	dw SFX_Cry10_3_Ch2
 	db CH7
-	dw SFX_1f_24_Ch3
+	dw SFX_Cry10_3_Ch3
 
-SFX_1f_25:: ; 7c0d5 (1f:40d5)
+SFX_Cry11_3:: ; 7c0d5 (1f:40d5)
 	db ( $80 | CH4 )
-	dw SFX_1f_25_Ch1
+	dw SFX_Cry11_3_Ch1
 	db CH5
-	dw SFX_1f_25_Ch2
+	dw SFX_Cry11_3_Ch2
 	db CH7
-	dw SFX_1f_25_Ch3
+	dw SFX_Cry11_3_Ch3
 
-SFX_1f_26:: ; 7c0de (1f:40de)
+SFX_Cry12_3:: ; 7c0de (1f:40de)
 	db ( $80 | CH4 )
-	dw SFX_1f_26_Ch1
+	dw SFX_Cry12_3_Ch1
 	db CH5
-	dw SFX_1f_26_Ch2
+	dw SFX_Cry12_3_Ch2
 	db CH7
-	dw SFX_1f_26_Ch3
+	dw SFX_Cry12_3_Ch3
 
-SFX_1f_27:: ; 7c0e7 (1f:40e7)
+SFX_Cry13_3:: ; 7c0e7 (1f:40e7)
 	db ( $80 | CH4 )
-	dw SFX_1f_27_Ch1
+	dw SFX_Cry13_3_Ch1
 	db CH5
-	dw SFX_1f_27_Ch2
+	dw SFX_Cry13_3_Ch2
 	db CH7
-	dw SFX_1f_27_Ch3
+	dw SFX_Cry13_3_Ch3
 
-SFX_1f_28:: ; 7c0f0 (1f:40f0)
+SFX_Cry14_3:: ; 7c0f0 (1f:40f0)
 	db ( $80 | CH4 )
-	dw SFX_1f_28_Ch1
+	dw SFX_Cry14_3_Ch1
 	db CH5
-	dw SFX_1f_28_Ch2
+	dw SFX_Cry14_3_Ch2
 	db CH7
-	dw SFX_1f_28_Ch3
+	dw SFX_Cry14_3_Ch3
 
-SFX_1f_29:: ; 7c0f9 (1f:40f9)
+SFX_Cry15_3:: ; 7c0f9 (1f:40f9)
 	db ( $80 | CH4 )
-	dw SFX_1f_29_Ch1
+	dw SFX_Cry15_3_Ch1
 	db CH5
-	dw SFX_1f_29_Ch2
+	dw SFX_Cry15_3_Ch2
 	db CH7
-	dw SFX_1f_29_Ch3
+	dw SFX_Cry15_3_Ch3
 
-SFX_1f_2a:: ; 7c102 (1f:4102)
+SFX_Cry16_3:: ; 7c102 (1f:4102)
 	db ( $80 | CH4 )
-	dw SFX_1f_2a_Ch1
+	dw SFX_Cry16_3_Ch1
 	db CH5
-	dw SFX_1f_2a_Ch2
+	dw SFX_Cry16_3_Ch2
 	db CH7
-	dw SFX_1f_2a_Ch3
+	dw SFX_Cry16_3_Ch3
 
-SFX_1f_2b:: ; 7c10b (1f:410b)
+SFX_Cry17_3:: ; 7c10b (1f:410b)
 	db ( $80 | CH4 )
-	dw SFX_1f_2b_Ch1
+	dw SFX_Cry17_3_Ch1
 	db CH5
-	dw SFX_1f_2b_Ch2
+	dw SFX_Cry17_3_Ch2
 	db CH7
-	dw SFX_1f_2b_Ch3
+	dw SFX_Cry17_3_Ch3
 
-SFX_1f_2c:: ; 7c114 (1f:4114)
+SFX_Cry18_3:: ; 7c114 (1f:4114)
 	db ( $80 | CH4 )
-	dw SFX_1f_2c_Ch1
+	dw SFX_Cry18_3_Ch1
 	db CH5
-	dw SFX_1f_2c_Ch2
+	dw SFX_Cry18_3_Ch2
 	db CH7
-	dw SFX_1f_2c_Ch3
+	dw SFX_Cry18_3_Ch3
 
-SFX_1f_2d:: ; 7c11d (1f:411d)
+SFX_Cry19_3:: ; 7c11d (1f:411d)
 	db ( $80 | CH4 )
-	dw SFX_1f_2d_Ch1
+	dw SFX_Cry19_3_Ch1
 	db CH5
-	dw SFX_1f_2d_Ch2
+	dw SFX_Cry19_3_Ch2
 	db CH7
-	dw SFX_1f_2d_Ch3
+	dw SFX_Cry19_3_Ch3
 
-SFX_1f_2e:: ; 7c126 (1f:4126)
+SFX_Cry1A_3:: ; 7c126 (1f:4126)
 	db ( $80 | CH4 )
-	dw SFX_1f_2e_Ch1
+	dw SFX_Cry1A_3_Ch1
 	db CH5
-	dw SFX_1f_2e_Ch2
+	dw SFX_Cry1A_3_Ch2
 	db CH7
-	dw SFX_1f_2e_Ch3
+	dw SFX_Cry1A_3_Ch3
 
-SFX_1f_2f:: ; 7c12f (1f:412f)
+SFX_Cry1B_3:: ; 7c12f (1f:412f)
 	db ( $80 | CH4 )
-	dw SFX_1f_2f_Ch1
+	dw SFX_Cry1B_3_Ch1
 	db CH5
-	dw SFX_1f_2f_Ch2
+	dw SFX_Cry1B_3_Ch2
 	db CH7
-	dw SFX_1f_2f_Ch3
+	dw SFX_Cry1B_3_Ch3
 
-SFX_1f_30:: ; 7c138 (1f:4138)
+SFX_Cry1C_3:: ; 7c138 (1f:4138)
 	db ( $80 | CH4 )
-	dw SFX_1f_30_Ch1
+	dw SFX_Cry1C_3_Ch1
 	db CH5
-	dw SFX_1f_30_Ch2
+	dw SFX_Cry1C_3_Ch2
 	db CH7
-	dw SFX_1f_30_Ch3
+	dw SFX_Cry1C_3_Ch3
 
-SFX_1f_31:: ; 7c141 (1f:4141)
+SFX_Cry1D_3:: ; 7c141 (1f:4141)
 	db ( $80 | CH4 )
-	dw SFX_1f_31_Ch1
+	dw SFX_Cry1D_3_Ch1
 	db CH5
-	dw SFX_1f_31_Ch2
+	dw SFX_Cry1D_3_Ch2
 	db CH7
-	dw SFX_1f_31_Ch3
+	dw SFX_Cry1D_3_Ch3
 
-SFX_1f_32:: ; 7c14a (1f:414a)
+SFX_Cry1E_3:: ; 7c14a (1f:414a)
 	db ( $80 | CH4 )
-	dw SFX_1f_32_Ch1
+	dw SFX_Cry1E_3_Ch1
 	db CH5
-	dw SFX_1f_32_Ch2
+	dw SFX_Cry1E_3_Ch2
 	db CH7
-	dw SFX_1f_32_Ch3
+	dw SFX_Cry1E_3_Ch3
 
-SFX_1f_33:: ; 7c153 (1f:4153)
+SFX_Cry1F_3:: ; 7c153 (1f:4153)
 	db ( $80 | CH4 )
-	dw SFX_1f_33_Ch1
+	dw SFX_Cry1F_3_Ch1
 	db CH5
-	dw SFX_1f_33_Ch2
+	dw SFX_Cry1F_3_Ch2
 	db CH7
-	dw SFX_1f_33_Ch3
+	dw SFX_Cry1F_3_Ch3
 
-SFX_1f_34:: ; 7c15c (1f:415c)
+SFX_Cry20_3:: ; 7c15c (1f:415c)
 	db ( $80 | CH4 )
-	dw SFX_1f_34_Ch1
+	dw SFX_Cry20_3_Ch1
 	db CH5
-	dw SFX_1f_34_Ch2
+	dw SFX_Cry20_3_Ch2
 	db CH7
-	dw SFX_1f_34_Ch3
+	dw SFX_Cry20_3_Ch3
 
-SFX_1f_35:: ; 7c165 (1f:4165)
+SFX_Cry21_3:: ; 7c165 (1f:4165)
 	db ( $80 | CH4 )
-	dw SFX_1f_35_Ch1
+	dw SFX_Cry21_3_Ch1
 	db CH5
-	dw SFX_1f_35_Ch2
+	dw SFX_Cry21_3_Ch2
 	db CH7
-	dw SFX_1f_35_Ch3
+	dw SFX_Cry21_3_Ch3
 
-SFX_1f_36:: ; 7c16e (1f:416e)
+SFX_Cry22_3:: ; 7c16e (1f:416e)
 	db ( $80 | CH4 )
-	dw SFX_1f_36_Ch1
+	dw SFX_Cry22_3_Ch1
 	db CH5
-	dw SFX_1f_36_Ch2
+	dw SFX_Cry22_3_Ch2
 	db CH7
-	dw SFX_1f_36_Ch3
+	dw SFX_Cry22_3_Ch3
 
-SFX_1f_37:: ; 7c177 (1f:4177)
+SFX_Cry23_3:: ; 7c177 (1f:4177)
 	db ( $80 | CH4 )
-	dw SFX_1f_37_Ch1
+	dw SFX_Cry23_3_Ch1
 	db CH5
-	dw SFX_1f_37_Ch2
+	dw SFX_Cry23_3_Ch2
 	db CH7
-	dw SFX_1f_37_Ch3
+	dw SFX_Cry23_3_Ch3
 
-SFX_1f_38:: ; 7c180 (1f:4180)
+SFX_Cry24_3:: ; 7c180 (1f:4180)
 	db ( $80 | CH4 )
-	dw SFX_1f_38_Ch1
+	dw SFX_Cry24_3_Ch1
 	db CH5
-	dw SFX_1f_38_Ch2
+	dw SFX_Cry24_3_Ch2
 	db CH7
-	dw SFX_1f_38_Ch3
+	dw SFX_Cry24_3_Ch3
 
-SFX_1f_39:: ; 7c189 (1f:4189)
+SFX_Cry25_3:: ; 7c189 (1f:4189)
 	db ( $80 | CH4 )
-	dw SFX_1f_39_Ch1
+	dw SFX_Cry25_3_Ch1
 	db CH5
-	dw SFX_1f_39_Ch2
+	dw SFX_Cry25_3_Ch2
 	db CH7
-	dw SFX_1f_39_Ch3
+	dw SFX_Cry25_3_Ch3
 
-SFX_1f_3a:: ; 7c192 (1f:4192)
+SFX_Get_Item1_3:: ; 7c192 (1f:4192)
 	db ( $80 | CH4 )
-	dw SFX_1f_3a_Ch1
+	dw SFX_Get_Item1_3_Ch1
 	db CH5
-	dw SFX_1f_3a_Ch2
+	dw SFX_Get_Item1_3_Ch2
 	db CH6
-	dw SFX_1f_3a_Ch3
+	dw SFX_Get_Item1_3_Ch3
 
-SFX_1f_3b:: ; 7c19b (1f:419b)
+SFX_Get_Item2_3:: ; 7c19b (1f:419b)
 	db ( $80 | CH4 )
-	dw SFX_1f_3b_Ch1
+	dw SFX_Get_Item2_3_Ch1
 	db CH5
-	dw SFX_1f_3b_Ch2
+	dw SFX_Get_Item2_3_Ch2
 	db CH6
-	dw SFX_1f_3b_Ch3
+	dw SFX_Get_Item2_3_Ch3
 
-SFX_1f_3c:: ; 7c1a4 (1f:41a4)
+SFX_Tink_3:: ; 7c1a4 (1f:41a4)
 	db CH4
-	dw SFX_1f_3c_Ch1
+	dw SFX_Tink_3_Ch1
 
-SFX_1f_3d:: ; 7c1a7 (1f:41a7)
+SFX_Heal_HP_3:: ; 7c1a7 (1f:41a7)
 	db CH4
-	dw SFX_1f_3d_Ch1
+	dw SFX_Heal_HP_3_Ch1
 
-SFX_1f_3e:: ; 7c1aa (1f:41aa)
+SFX_Heal_Ailment_3:: ; 7c1aa (1f:41aa)
 	db CH4
-	dw SFX_1f_3e_Ch1
+	dw SFX_Heal_Ailment_3_Ch1
 
-SFX_1f_3f:: ; 7c1ad (1f:41ad)
+SFX_Start_Menu_3:: ; 7c1ad (1f:41ad)
 	db CH7
-	dw SFX_1f_3f_Ch1
+	dw SFX_Start_Menu_3_Ch1
 
-SFX_1f_40:: ; 7c1b0 (1f:41b0)
+SFX_Press_AB_3:: ; 7c1b0 (1f:41b0)
 	db CH4
-	dw SFX_1f_40_Ch1
+	dw SFX_Press_AB_3_Ch1
 
-SFX_1f_41:: ; 7c1b3 (1f:41b3)
+SFX_Pokedex_Rating_3:: ; 7c1b3 (1f:41b3)
 	db ( $80 | CH4 )
-	dw SFX_1f_41_Ch1
+	dw SFX_Pokedex_Rating_3_Ch1
 	db CH5
-	dw SFX_1f_41_Ch2
+	dw SFX_Pokedex_Rating_3_Ch2
 	db CH6
-	dw SFX_1f_41_Ch3
+	dw SFX_Pokedex_Rating_3_Ch3
 
-SFX_1f_42:: ; 7c1bc (1f:41bc)
+SFX_Get_Key_Item_3:: ; 7c1bc (1f:41bc)
 	db ( $80 | CH4 )
-	dw SFX_1f_42_Ch1
+	dw SFX_Get_Key_Item_3_Ch1
 	db CH5
-	dw SFX_1f_42_Ch2
+	dw SFX_Get_Key_Item_3_Ch2
 	db CH6
-	dw SFX_1f_42_Ch3
+	dw SFX_Get_Key_Item_3_Ch3
 
-SFX_1f_43:: ; 7c1c5 (1f:41c5)
+SFX_Poisoned_3:: ; 7c1c5 (1f:41c5)
 	db CH4
-	dw SFX_1f_43_Ch1
+	dw SFX_Poisoned_3_Ch1
 
-SFX_1f_44:: ; 7c1c8 (1f:41c8)
+SFX_Trade_Machine_3:: ; 7c1c8 (1f:41c8)
 	db CH4
-	dw SFX_1f_44_Ch1
+	dw SFX_Trade_Machine_3_Ch1
 
-SFX_1f_45:: ; 7c1cb (1f:41cb)
+SFX_Turn_On_PC_3:: ; 7c1cb (1f:41cb)
 	db CH4
-	dw SFX_1f_45_Ch1
+	dw SFX_Turn_On_PC_3_Ch1
 
-SFX_1f_46:: ; 7c1ce (1f:41ce)
+SFX_Turn_Off_PC_3:: ; 7c1ce (1f:41ce)
 	db CH4
-	dw SFX_1f_46_Ch1
+	dw SFX_Turn_Off_PC_3_Ch1
 
-SFX_1f_47:: ; 7c1d1 (1f:41d1)
+SFX_Enter_PC_3:: ; 7c1d1 (1f:41d1)
 	db CH4
-	dw SFX_1f_47_Ch1
+	dw SFX_Enter_PC_3_Ch1
 
-SFX_1f_48:: ; 7c1d4 (1f:41d4)
+SFX_Shrink_3:: ; 7c1d4 (1f:41d4)
 	db CH4
-	dw SFX_1f_48_Ch1
+	dw SFX_Shrink_3_Ch1
 
-SFX_1f_49:: ; 7c1d7 (1f:41d7)
+SFX_Switch_3:: ; 7c1d7 (1f:41d7)
 	db CH4
-	dw SFX_1f_49_Ch1
+	dw SFX_Switch_3_Ch1
 
-SFX_1f_4a:: ; 7c1da (1f:41da)
+SFX_Healing_Machine_3:: ; 7c1da (1f:41da)
 	db CH4
-	dw SFX_1f_4a_Ch1
+	dw SFX_Healing_Machine_3_Ch1
 
-SFX_1f_4b:: ; 7c1dd (1f:41dd)
+SFX_Teleport_Exit1_3:: ; 7c1dd (1f:41dd)
 	db CH4
-	dw SFX_1f_4b_Ch1
+	dw SFX_Teleport_Exit1_3_Ch1
 
-SFX_1f_4c:: ; 7c1e0 (1f:41e0)
+SFX_Teleport_Enter1_3:: ; 7c1e0 (1f:41e0)
 	db CH4
-	dw SFX_1f_4c_Ch1
+	dw SFX_Teleport_Enter1_3_Ch1
 
-SFX_1f_4d:: ; 7c1e3 (1f:41e3)
+SFX_Teleport_Exit2_3:: ; 7c1e3 (1f:41e3)
 	db CH4
-	dw SFX_1f_4d_Ch1
+	dw SFX_Teleport_Exit2_3_Ch1
 
-SFX_1f_4e:: ; 7c1e6 (1f:41e6)
+SFX_Ledge_3:: ; 7c1e6 (1f:41e6)
 	db CH4
-	dw SFX_1f_4e_Ch1
+	dw SFX_Ledge_3_Ch1
 
-SFX_1f_4f:: ; 7c1e9 (1f:41e9)
+SFX_Teleport_Enter2_3:: ; 7c1e9 (1f:41e9)
 	db CH7
-	dw SFX_1f_4f_Ch1
+	dw SFX_Teleport_Enter2_3_Ch1
 
-SFX_1f_50:: ; 7c1ec (1f:41ec)
+SFX_Fly_3:: ; 7c1ec (1f:41ec)
 	db CH7
-	dw SFX_1f_50_Ch1
+	dw SFX_Fly_3_Ch1
 
-SFX_1f_51:: ; 7c1ef (1f:41ef)
+SFX_Denied_3:: ; 7c1ef (1f:41ef)
 	db ( $40 | CH4 )
-	dw SFX_1f_51_Ch1
+	dw SFX_Denied_3_Ch1
 	db CH5
-	dw SFX_1f_51_Ch2
+	dw SFX_Denied_3_Ch2
 
-SFX_1f_52:: ; 7c1f5 (1f:41f5)
+SFX_Arrow_Tiles_3:: ; 7c1f5 (1f:41f5)
 	db CH4
-	dw SFX_1f_52_Ch1
+	dw SFX_Arrow_Tiles_3_Ch1
 
-SFX_1f_53:: ; 7c1f8 (1f:41f8)
+SFX_Push_Boulder_3:: ; 7c1f8 (1f:41f8)
 	db CH7
-	dw SFX_1f_53_Ch1
+	dw SFX_Push_Boulder_3_Ch1
 
-SFX_1f_54:: ; 7c1fb (1f:41fb)
+SFX_SS_Anne_Horn_3:: ; 7c1fb (1f:41fb)
 	db ( $40 | CH4 )
-	dw SFX_1f_54_Ch1
+	dw SFX_SS_Anne_Horn_3_Ch1
 	db CH5
-	dw SFX_1f_54_Ch2
+	dw SFX_SS_Anne_Horn_3_Ch2
 
-SFX_1f_55:: ; 7c201 (1f:4201)
+SFX_Withdraw_Deposit_3:: ; 7c201 (1f:4201)
 	db CH4
-	dw SFX_1f_55_Ch1
+	dw SFX_Withdraw_Deposit_3_Ch1
 
-SFX_1f_56:: ; 7c204 (1f:4204)
+SFX_Cut_3:: ; 7c204 (1f:4204)
 	db CH7
-	dw SFX_1f_56_Ch1
+	dw SFX_Cut_3_Ch1
 
-SFX_1f_57:: ; 7c207 (1f:4207)
+SFX_Go_Inside_3:: ; 7c207 (1f:4207)
 	db CH7
-	dw SFX_1f_57_Ch1
+	dw SFX_Go_Inside_3_Ch1
 
-SFX_1f_58:: ; 7c20a (1f:420a)
+SFX_Swap_3:: ; 7c20a (1f:420a)
 	db ( $40 | CH4 )
-	dw SFX_1f_58_Ch1
+	dw SFX_Swap_3_Ch1
 	db CH5
-	dw SFX_1f_58_Ch2
+	dw SFX_Swap_3_Ch2
 
-SFX_1f_59:: ; 7c210 (1f:4210)
+SFX_59_3:: ; 7c210 (1f:4210)
 	db ( $40 | CH4 )
-	dw SFX_1f_59_Ch1
+	dw SFX_59_3_Ch1
 	db CH5
-	dw SFX_1f_59_Ch2
+	dw SFX_59_3_Ch2
 
-SFX_1f_5a:: ; 7c216 (1f:4216)
+SFX_Purchase_3:: ; 7c216 (1f:4216)
 	db ( $40 | CH4 )
-	dw SFX_1f_5a_Ch1
+	dw SFX_Purchase_3_Ch1
 	db CH5
-	dw SFX_1f_5a_Ch2
+	dw SFX_Purchase_3_Ch2
 
-SFX_1f_5b:: ; 7c21c (1f:421c)
+SFX_Collision_3:: ; 7c21c (1f:421c)
 	db CH4
-	dw SFX_1f_5b_Ch1
+	dw SFX_Collision_3_Ch1
 
-SFX_1f_5c:: ; 7c21f (1f:421f)
+SFX_Go_Outside_3:: ; 7c21f (1f:421f)
 	db CH7
-	dw SFX_1f_5c_Ch1
+	dw SFX_Go_Outside_3_Ch1
 
-SFX_1f_5d:: ; 7c222 (1f:4222)
+SFX_Save_3:: ; 7c222 (1f:4222)
 	db ( $40 | CH4 )
-	dw SFX_1f_5d_Ch1
+	dw SFX_Save_3_Ch1
 	db CH5
-	dw SFX_1f_5d_Ch2
+	dw SFX_Save_3_Ch2
 
-SFX_1f_5e:: ; 7c228 (1f:4228)
+SFX_Intro_Lunge:: ; 7c228 (1f:4228)
 	db CH7
-	dw SFX_1f_5e_Ch1
+	dw SFX_Intro_Lunge_Ch1
 
-SFX_1f_5f:: ; 7c22b (1f:422b)
+SFX_Intro_Hip:: ; 7c22b (1f:422b)
 	db CH4
-	dw SFX_1f_5f_Ch1
+	dw SFX_Intro_Hip_Ch1
 
-SFX_1f_60:: ; 7c22e (1f:422e)
+SFX_Intro_Hop:: ; 7c22e (1f:422e)
 	db CH4
-	dw SFX_1f_60_Ch1
+	dw SFX_Intro_Hop_Ch1
 
-SFX_1f_61:: ; 7c231 (1f:4231)
+SFX_Intro_Raise:: ; 7c231 (1f:4231)
 	db CH7
-	dw SFX_1f_61_Ch1
+	dw SFX_Intro_Raise_Ch1
 
-SFX_1f_62:: ; 7c234 (1f:4234)
+SFX_Intro_Crash:: ; 7c234 (1f:4234)
 	db CH7
-	dw SFX_1f_62_Ch1
+	dw SFX_Intro_Crash_Ch1
 
-SFX_1f_63:: ; 7c237 (1f:4237)
+SFX_Intro_Whoosh:: ; 7c237 (1f:4237)
 	db CH7
-	dw SFX_1f_63_Ch1
+	dw SFX_Intro_Whoosh_Ch1
 
-SFX_1f_64:: ; 7c23a (1f:423a)
+SFX_Slots_Stop_Wheel:: ; 7c23a (1f:423a)
 	db CH4
-	dw SFX_1f_64_Ch1
+	dw SFX_Slots_Stop_Wheel_Ch1
 
-SFX_1f_65:: ; 7c23d (1f:423d)
+SFX_Slots_Reward:: ; 7c23d (1f:423d)
 	db CH4
-	dw SFX_1f_65_Ch1
+	dw SFX_Slots_Reward_Ch1
 
-SFX_1f_66:: ; 7c240 (1f:4240)
+SFX_Slots_New_Spin:: ; 7c240 (1f:4240)
 	db ( $40 | CH4 )
-	dw SFX_1f_66_Ch1
+	dw SFX_Slots_New_Spin_Ch1
 	db CH5
-	dw SFX_1f_66_Ch2
+	dw SFX_Slots_New_Spin_Ch2
 
-SFX_1f_67:: ; 7c246 (1f:4246)
+SFX_Shooting_Star:: ; 7c246 (1f:4246)
 	db CH4
-	dw SFX_1f_67_Ch1
+	dw SFX_Shooting_Star_Ch1
--- /dev/null
+++ b/audio/sfx/59_1.asm
@@ -1,0 +1,11 @@
+SFX_59_1_Ch1: ; 841b (2:441b)
+	duty 2
+	unknownsfx0x20 4, 241, 128, 7
+	endchannel
+
+
+SFX_59_1_Ch2: ; 8422 (2:4422)
+	duty 2
+	unknownsfx0x20 1, 8, 0, 0
+	unknownsfx0x20 4, 161, 97, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/59_3.asm
@@ -1,0 +1,11 @@
+SFX_59_3_Ch1: ; 7c404 (1f:4404)
+	duty 2
+	unknownsfx0x20 4, 241, 128, 7
+	endchannel
+
+
+SFX_59_3_Ch2: ; 7c40b (1f:440b)
+	duty 2
+	unknownsfx0x20 1, 8, 0, 0
+	unknownsfx0x20 4, 161, 97, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/arrow_tiles_1.asm
@@ -1,0 +1,6 @@
+SFX_Arrow_Tiles_1_Ch1: ; 8649 (2:4649)
+	duty 0
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 210, 0, 7
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/arrow_tiles_3.asm
@@ -1,0 +1,6 @@
+SFX_Arrow_Tiles_3_Ch1: ; 7c626 (1f:4626)
+	duty 0
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 210, 0, 7
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/ball_poof.asm
@@ -1,0 +1,11 @@
+SFX_Ball_Poof_Ch1: ; 2043d (8:443d)
+	duty 2
+	unknownsfx0x10 22
+	unknownsfx0x20 15, 242, 0, 4
+	unknownsfx0x10 8
+	endchannel
+
+
+SFX_Ball_Poof_Ch2: ; 20448 (8:4448)
+	unknownnoise0x20 15, 162, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/ball_toss.asm
@@ -1,0 +1,11 @@
+SFX_Ball_Toss_Ch1: ; 2042d (8:442d)
+	duty 2
+	unknownsfx0x10 47
+	unknownsfx0x20 15, 242, 128, 7
+	endchannel
+
+
+SFX_Ball_Toss_Ch2: ; 20436 (8:4436)
+	duty 2
+	unknownsfx0x20 15, 194, 130, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_09.asm
@@ -1,0 +1,6 @@
+SFX_Battle_09_Ch1: ; 204b9 (8:44b9)
+	duty 1
+	unknownsfx0x10 151
+	unknownsfx0x20 15, 242, 0, 5
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_0b.asm
@@ -1,0 +1,3 @@
+SFX_Battle_0B_Ch1: ; 204c8 (8:44c8)
+	unknownnoise0x20 8, 241, 84
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_0c.asm
@@ -1,0 +1,5 @@
+SFX_Battle_0C_Ch1: ; 204cc (8:44cc)
+	unknownnoise0x20 15, 143, 17
+	unknownnoise0x20 4, 255, 18
+	unknownnoise0x20 10, 241, 85
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_0d.asm
@@ -1,0 +1,5 @@
+SFX_Battle_0D_Ch1: ; 204d6 (8:44d6)
+	unknownnoise0x20 15, 143, 52
+	unknownnoise0x20 8, 242, 53
+	unknownnoise0x20 10, 241, 85
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_0e.asm
@@ -1,0 +1,4 @@
+SFX_Battle_0E_Ch1: ; 204e0 (8:44e0)
+	unknownnoise0x20 15, 159, 35
+	unknownnoise0x20 8, 241, 33
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_0f.asm
@@ -1,0 +1,6 @@
+SFX_Battle_0F_Ch1: ; 204e7 (8:44e7)
+	unknownnoise0x20 2, 225, 75
+	unknownnoise0x20 10, 241, 68
+	unknownnoise0x20 2, 225, 58
+	unknownnoise0x20 6, 241, 52
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_12.asm
@@ -1,0 +1,6 @@
+SFX_Battle_12_Ch1: ; 2050b (8:450b)
+	unknownnoise0x20 8, 79, 35
+	unknownnoise0x20 4, 196, 34
+	unknownnoise0x20 6, 242, 35
+	loopchannel 4, SFX_Battle_12_Ch1
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_13.asm
@@ -1,0 +1,6 @@
+SFX_Battle_13_Ch1: ; 20519 (8:4519)
+	unknownnoise0x20 8, 79, 51
+	unknownnoise0x20 4, 196, 34
+	unknownnoise0x20 6, 242, 35
+	unknownnoise0x20 15, 242, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_14.asm
@@ -1,0 +1,6 @@
+SFX_Battle_14_Ch1: ; 20526 (8:4526)
+	unknownnoise0x20 8, 255, 50
+	unknownnoise0x20 8, 244, 67
+	unknownnoise0x20 8, 242, 84
+	unknownnoise0x20 8, 241, 101
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_16.asm
@@ -1,0 +1,5 @@
+SFX_Battle_16_Ch1: ; 2054c (8:454c)
+	unknownnoise0x20 1, 148, 35
+	unknownnoise0x20 1, 180, 34
+	unknownnoise0x20 8, 241, 68
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_17.asm
@@ -1,0 +1,6 @@
+SFX_Battle_17_Ch1: ; 20556 (8:4556)
+	unknownnoise0x20 2, 148, 51
+	unknownnoise0x20 4, 180, 34
+	unknownnoise0x20 4, 241, 68
+	unknownnoise0x20 8, 241, 85
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_18.asm
@@ -1,0 +1,4 @@
+SFX_Battle_18_Ch1: ; 20563 (8:4563)
+	unknownnoise0x20 4, 255, 85
+	unknownnoise0x20 8, 241, 101
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_19.asm
@@ -1,0 +1,5 @@
+SFX_Battle_19_Ch1: ; 2056a (8:456a)
+	unknownnoise0x20 2, 132, 67
+	unknownnoise0x20 2, 196, 34
+	unknownnoise0x20 8, 242, 52
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_1b.asm
@@ -1,0 +1,4 @@
+SFX_Battle_1B_Ch1: ; 2057b (8:457b)
+	unknownnoise0x20 2, 241, 34
+	unknownnoise0x20 15, 242, 18
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_1c.asm
@@ -1,0 +1,5 @@
+SFX_Battle_1C_Ch1: ; 20582 (8:4582)
+	unknownnoise0x20 2, 194, 1
+	unknownnoise0x20 15, 244, 1
+	unknownnoise0x20 15, 242, 1
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_1e.asm
@@ -1,0 +1,16 @@
+SFX_Battle_1E_Ch1: ; 20593 (8:4593)
+	duty 0
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 2
+	unknownsfx0x10 34
+	unknownsfx0x20 8, 226, 0, 2
+	unknownsfx0x10 8
+	endchannel
+
+
+SFX_Battle_1E_Ch2: ; 205a4 (8:45a4)
+	unknownnoise0x20 0, 209, 66
+	unknownnoise0x20 4, 161, 50
+	unknownnoise0x20 0, 209, 34
+	unknownnoise0x20 6, 161, 50
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_20.asm
@@ -1,0 +1,4 @@
+SFX_Battle_20_Ch1: ; 205be (8:45be)
+	unknownnoise0x20 12, 241, 84
+	unknownnoise0x20 8, 241, 100
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_21.asm
@@ -1,0 +1,7 @@
+SFX_Battle_21_Ch1: ; 205c5 (8:45c5)
+	unknownnoise0x20 2, 241, 51
+	unknownnoise0x20 2, 193, 50
+	unknownnoise0x20 2, 161, 49
+	unknownnoise0x20 15, 130, 50
+	unknownnoise0x20 8, 241, 52
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_22.asm
@@ -1,0 +1,4 @@
+SFX_Battle_22_Ch1: ; 205d5 (8:45d5)
+	unknownnoise0x20 2, 210, 50
+	unknownnoise0x20 15, 242, 67
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_23.asm
@@ -1,0 +1,7 @@
+SFX_Battle_23_Ch1: ; 205dc (8:45dc)
+	unknownnoise0x20 2, 242, 67
+	unknownnoise0x20 4, 181, 50
+	unknownnoise0x20 9, 134, 49
+	unknownnoise0x20 7, 100, 0
+	unknownnoise0x20 15, 242, 85
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_24.asm
@@ -1,0 +1,12 @@
+SFX_Battle_24_Ch1: ; 205ec (8:45ec)
+	duty 1
+	unknownsfx0x10 151
+	unknownsfx0x20 15, 242, 0, 7
+	unknownsfx0x10 8
+	endchannel
+
+
+SFX_Battle_24_Ch2: ; 205f7 (8:45f7)
+	unknownnoise0x20 15, 63, 34
+	unknownnoise0x20 15, 242, 33
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_25.asm
@@ -1,0 +1,7 @@
+SFX_Battle_25_Ch1: ; 205fe (8:45fe)
+	unknownnoise0x20 15, 79, 65
+	unknownnoise0x20 8, 143, 65
+	unknownnoise0x20 8, 207, 65
+	unknownnoise0x20 8, 242, 66
+	unknownnoise0x20 15, 242, 65
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_26.asm
@@ -1,0 +1,9 @@
+SFX_Battle_26_Ch1: ; 2060e (8:460e)
+	unknownnoise0x20 10, 255, 80
+	unknownnoise0x20 15, 255, 81
+	unknownnoise0x20 8, 242, 81
+	unknownnoise0x20 6, 255, 82
+	unknownnoise0x20 6, 255, 83
+	unknownnoise0x20 8, 255, 84
+	unknownnoise0x20 15, 242, 84
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_27.asm
@@ -1,0 +1,27 @@
+SFX_Battle_27_Ch1: ; 20624 (8:4624)
+	duty 2
+	unknownsfx0x20 15, 63, 192, 7
+
+SFX_Battle_27_branch_2062a:
+	unknownsfx0x20 15, 223, 192, 7
+	loopchannel 4, SFX_Battle_27_branch_2062a
+	unknownsfx0x20 15, 209, 192, 7
+	endchannel
+
+
+SFX_Battle_27_Ch2: ; 20637 (8:4637)
+	dutycycle 179
+	unknownsfx0x20 15, 47, 200, 7
+
+SFX_Battle_27_branch_2063d:
+	unknownsfx0x20 15, 207, 199, 7
+	loopchannel 4, SFX_Battle_27_branch_2063d
+	unknownsfx0x20 15, 193, 200, 7
+	endchannel
+
+
+SFX_Battle_27_Ch3: ; 2064a (8:464a)
+	unknownnoise0x20 3, 151, 18
+	unknownnoise0x20 3, 161, 17
+	loopchannel 10, SFX_Battle_27_Ch3
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_28.asm
@@ -1,0 +1,21 @@
+SFX_Battle_28_Ch1: ; 20655 (8:4655)
+	duty 0
+	unknownsfx0x20 0, 241, 192, 7
+	unknownsfx0x20 0, 241, 0, 7
+	loopchannel 12, SFX_Battle_28_Ch1
+	endchannel
+
+
+SFX_Battle_28_Ch2: ; 20664 (8:4664)
+	dutycycle 179
+	unknownsfx0x20 0, 225, 193, 7
+	unknownsfx0x20 0, 225, 1, 7
+	loopchannel 12, SFX_Battle_28_Ch2
+	endchannel
+
+
+SFX_Battle_28_Ch3: ; 20673 (8:4673)
+	unknownnoise0x20 1, 209, 73
+	unknownnoise0x20 1, 209, 41
+	loopchannel 6, SFX_Battle_28_Ch3
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_29.asm
@@ -1,0 +1,18 @@
+SFX_Battle_29_Ch1: ; 2067e (8:467e)
+	dutycycle 201
+	unknownsfx0x20 11, 243, 32, 1
+	unknownsfx0x20 9, 211, 80, 1
+	loopchannel 5, SFX_Battle_29_Ch1
+	unknownsfx0x20 8, 227, 48, 1
+	unknownsfx0x20 15, 194, 16, 1
+	endchannel
+
+
+SFX_Battle_29_Ch2: ; 20695 (8:4695)
+	unknownnoise0x20 10, 243, 53
+	unknownnoise0x20 14, 246, 69
+	loopchannel 4, SFX_Battle_29_Ch2
+	unknownnoise0x20 12, 244, 188
+	unknownnoise0x20 12, 245, 156
+	unknownnoise0x20 15, 244, 172
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_2a.asm
@@ -1,0 +1,28 @@
+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_Battle_2A_Ch1
+	unknownsfx0x20 8, 209, 0, 6
+	endchannel
+
+
+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_Battle_2A_Ch2
+	endchannel
+
+
+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_Battle_2A_Ch3
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_2b.asm
@@ -1,0 +1,21 @@
+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_Battle_2B_Ch1
+	unknownsfx0x20 8, 129, 0, 4
+	endchannel
+
+
+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_Battle_2B_Ch2
+	unknownnoise0x20 8, 129, 18
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_2c.asm
@@ -1,0 +1,25 @@
+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_Battle_2C_Ch1
+	endchannel
+
+
+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_Battle_2C_Ch2
+	endchannel
+
+
+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_Battle_2C_Ch3
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_2e.asm
@@ -1,0 +1,27 @@
+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_Battle_2E_Ch1
+	endchannel
+
+
+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_Battle_2E_Ch2
+	endchannel
+
+
+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_Battle_2E_Ch3
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_2f.asm
@@ -1,0 +1,21 @@
+SFX_Battle_2F_Ch1: ; 207d1 (8:47d1)
+	dutycycle 43
+	unknownsfx0x20 3, 241, 240, 7
+	unknownsfx0x20 4, 242, 0, 2
+	loopchannel 8, SFX_Battle_2F_Ch1
+	endchannel
+
+
+SFX_Battle_2F_Ch2: ; 207e0 (8:47e0)
+	dutycycle 179
+	unknownsfx0x20 4, 226, 2, 2
+	unknownsfx0x20 4, 225, 226, 7
+	loopchannel 9, SFX_Battle_2F_Ch2
+	endchannel
+
+
+SFX_Battle_2F_Ch3: ; 207ef (8:47ef)
+	unknownnoise0x20 4, 255, 67
+	unknownnoise0x20 4, 242, 68
+	loopchannel 9, SFX_Battle_2F_Ch3
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_31.asm
@@ -1,0 +1,18 @@
+SFX_Battle_31_Ch1: ; 20847 (8:4847)
+	duty 2
+	unknownsfx0x20 15, 255, 224, 7
+	unknownsfx0x20 15, 255, 224, 7
+	unknownsfx0x20 15, 255, 224, 7
+	unknownsfx0x20 15, 255, 224, 7
+	unknownsfx0x20 15, 242, 224, 7
+	endchannel
+
+
+SFX_Battle_31_Ch2: ; 2085e (8:485e)
+	duty 3
+	unknownsfx0x20 15, 255, 226, 7
+	unknownsfx0x20 15, 255, 225, 7
+	unknownsfx0x20 15, 255, 226, 7
+	unknownsfx0x20 15, 255, 225, 7
+	unknownsfx0x20 15, 242, 226, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_32.asm
@@ -1,0 +1,12 @@
+SFX_Battle_32_Ch1: ; 20875 (8:4875)
+	duty 2
+	unknownsfx0x10 175
+	unknownsfx0x20 8, 241, 0, 7
+	unknownsfx0x10 8
+	endchannel
+
+
+SFX_Battle_32_Ch2: ; 20880 (8:4880)
+	duty 3
+	unknownsfx0x20 8, 241, 1, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_33.asm
@@ -1,0 +1,18 @@
+SFX_Battle_33_Ch1: ; 20887 (8:4887)
+	duty 2
+	unknownsfx0x20 6, 241, 0, 5
+	unknownsfx0x20 6, 241, 128, 5
+	unknownsfx0x20 6, 241, 0, 6
+	unknownsfx0x20 6, 241, 128, 6
+	unknownsfx0x20 8, 241, 0, 7
+	endchannel
+
+
+SFX_Battle_33_Ch2: ; 2089e (8:489e)
+	duty 3
+	unknownsfx0x20 6, 225, 16, 5
+	unknownsfx0x20 6, 225, 144, 5
+	unknownsfx0x20 6, 225, 16, 6
+	unknownsfx0x20 6, 225, 144, 6
+	unknownsfx0x20 8, 225, 16, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_34.asm
@@ -1,0 +1,22 @@
+SFX_Battle_34_Ch1: ; 208b5 (8:48b5)
+	dutycycle 237
+	unknownsfx0x20 8, 255, 248, 3
+	unknownsfx0x20 15, 255, 0, 4
+	unknownsfx0x20 15, 243, 0, 4
+	endchannel
+
+
+SFX_Battle_34_Ch2: ; 208c4 (8:48c4)
+	dutycycle 180
+	unknownsfx0x20 8, 239, 192, 3
+	unknownsfx0x20 15, 239, 192, 3
+	unknownsfx0x20 15, 227, 192, 3
+	endchannel
+
+
+SFX_Battle_34_Ch3: ; 208d3 (8:48d3)
+	unknownnoise0x20 4, 255, 81
+	unknownnoise0x20 8, 255, 84
+	unknownnoise0x20 15, 255, 85
+	unknownnoise0x20 15, 243, 86
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_35.asm
@@ -1,0 +1,29 @@
+SFX_Battle_35_Ch1: ; 208e0 (8:48e0)
+	executemusic
+	vibrato 10, 2, 4
+	duty 2
+	notetype 10, 8, 7
+	octave 5
+	G# 8
+	octave 6
+	F# 4
+	E_ 4
+	octave 5
+	G# 8
+	endchannel
+
+
+SFX_Battle_35_Ch2: ; 208f0 (8:48f0)
+	executemusic
+	vibrato 10, 2, 3
+	duty 2
+	notetype 11, 6, 7
+	octave 5
+	G# 8
+	notetype 10, 6, 7
+	octave 6
+	F# 4
+	E_ 4
+	octave 5
+	G# 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/battle_36.asm
@@ -1,0 +1,47 @@
+SFX_Battle_36_Ch1: ; 20902 (8:4902)
+	duty 0
+	unknownsfx0x20 2, 241, 128, 7
+	unknownsfx0x20 2, 241, 0, 7
+	unknownsfx0x20 2, 241, 144, 7
+	unknownsfx0x20 2, 241, 0, 7
+	unknownsfx0x20 2, 241, 160, 7
+	unknownsfx0x20 2, 241, 0, 7
+	unknownsfx0x20 2, 241, 176, 7
+	unknownsfx0x20 2, 241, 0, 7
+	unknownsfx0x20 2, 241, 192, 7
+	unknownsfx0x20 2, 241, 0, 7
+	unknownsfx0x20 2, 241, 208, 7
+
+SFX_Battle_36_branch_20930:
+	unknownsfx0x20 2, 241, 0, 7
+	unknownsfx0x20 2, 241, 224, 7
+	loopchannel 12, SFX_Battle_36_branch_20930
+	unknownsfx0x20 15, 241, 0, 7
+	endchannel
+
+
+SFX_Battle_36_Ch2: ; 20941 (8:4941)
+	dutycycle 179
+	unknownsfx0x20 2, 241, 129, 7
+	unknownsfx0x20 2, 241, 1, 7
+	unknownsfx0x20 2, 241, 145, 7
+	unknownsfx0x20 2, 241, 1, 7
+	unknownsfx0x20 2, 241, 161, 7
+	unknownsfx0x20 2, 241, 1, 7
+	unknownsfx0x20 2, 241, 177, 7
+	unknownsfx0x20 2, 241, 1, 7
+	unknownsfx0x20 2, 241, 193, 7
+	unknownsfx0x20 2, 241, 1, 7
+	unknownsfx0x20 2, 241, 209, 7
+	unknownsfx0x20 2, 241, 1, 7
+	unknownsfx0x20 2, 241, 225, 7
+	loopchannel 12, SFX_Battle_36_branch_20930
+	unknownsfx0x20 15, 241, 1, 7
+	endchannel
+
+
+SFX_Battle_36_Ch3: ; 20980 (8:4980)
+	unknownnoise0x20 1, 209, 73
+	unknownnoise0x20 1, 209, 41
+	loopchannel 26, SFX_Battle_36_Ch3
+	endchannel
--- /dev/null
+++ b/audio/sfx/caught_mon.asm
@@ -1,0 +1,61 @@
+SFX_Caught_Mon_Ch1: ; 23a13 (8:7a13)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 3
+	toggleperfectpitch
+	notetype 6, 11, 2
+	octave 3
+	E_ 2
+	F# 2
+	G# 2
+	G# 1
+	G# 1
+	B_ 2
+	octave 4
+	C# 2
+	D# 2
+	D# 1
+	D# 1
+	notetype 6, 11, 5
+	E_ 8
+	endchannel
+
+
+SFX_Caught_Mon_Ch2: ; 23a2e (8:7a2e)
+	executemusic
+	duty 2
+	notetype 6, 12, 2
+	octave 4
+	G# 2
+	G# 1
+	G# 1
+	E_ 2
+	E_ 1
+	E_ 1
+	B_ 2
+	B_ 1
+	B_ 1
+	A_ 2
+	A_ 1
+	A_ 1
+	notetype 6, 12, 5
+	G# 8
+	endchannel
+
+
+SFX_Caught_Mon_Ch3: ; 23a44 (8:7a44)
+	executemusic
+	notetype 6, 1, 0
+	octave 4
+	B_ 2
+	rest 2
+	octave 5
+	C# 2
+	rest 2
+	D# 2
+	rest 2
+	F# 2
+	G_ 2
+	G# 4
+	endchannel
--- /dev/null
+++ b/audio/sfx/collision_1.asm
@@ -1,0 +1,6 @@
+SFX_Collision_1_Ch1: ; 8447 (2:4447)
+	duty 2
+	unknownsfx0x10 90
+	unknownsfx0x20 15, 241, 0, 3
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/collision_3.asm
@@ -1,0 +1,6 @@
+SFX_Collision_3_Ch1: ; 7c430 (1f:4430)
+	duty 2
+	unknownsfx0x10 90
+	unknownsfx0x20 15, 241, 0, 3
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry00_1.asm
@@ -1,0 +1,21 @@
+SFX_Cry00_1_Ch1: ; 8987 (2:4987)
+	dutycycle 245
+	unknownsfx0x20 4, 243, 24, 7
+	unknownsfx0x20 15, 229, 152, 7
+	unknownsfx0x20 8, 145, 88, 7
+	endchannel
+
+
+SFX_Cry00_1_Ch2: ; 8996 (2:4996)
+	dutycycle 160
+	unknownsfx0x20 5, 179, 8, 7
+	unknownsfx0x20 15, 197, 136, 7
+	unknownsfx0x20 8, 113, 72, 7
+	endchannel
+
+
+SFX_Cry00_1_Ch3: ; 89a5 (2:49a5)
+	unknownnoise0x20 3, 161, 28
+	unknownnoise0x20 14, 148, 44
+	unknownnoise0x20 8, 129, 28
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry00_2.asm
@@ -1,0 +1,21 @@
+SFX_Cry00_2_Ch1: ; 20c2f (8:4c2f)
+	dutycycle 245
+	unknownsfx0x20 4, 243, 24, 7
+	unknownsfx0x20 15, 229, 152, 7
+	unknownsfx0x20 8, 145, 88, 7
+	endchannel
+
+
+SFX_Cry00_2_Ch2: ; 20c3e (8:4c3e)
+	dutycycle 160
+	unknownsfx0x20 5, 179, 8, 7
+	unknownsfx0x20 15, 197, 136, 7
+	unknownsfx0x20 8, 113, 72, 7
+	endchannel
+
+
+SFX_Cry00_2_Ch3: ; 20c4d (8:4c4d)
+	unknownnoise0x20 3, 161, 28
+	unknownnoise0x20 14, 148, 44
+	unknownnoise0x20 8, 129, 28
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry00_3.asm
@@ -1,0 +1,21 @@
+SFX_Cry00_3_Ch1: ; 7c9fc (1f:49fc)
+	dutycycle 245
+	unknownsfx0x20 4, 243, 24, 7
+	unknownsfx0x20 15, 229, 152, 7
+	unknownsfx0x20 8, 145, 88, 7
+	endchannel
+
+
+SFX_Cry00_3_Ch2: ; 7ca0b (1f:4a0b)
+	dutycycle 160
+	unknownsfx0x20 5, 179, 8, 7
+	unknownsfx0x20 15, 197, 136, 7
+	unknownsfx0x20 8, 113, 72, 7
+	endchannel
+
+
+SFX_Cry00_3_Ch3: ; 7ca1a (1f:4a1a)
+	unknownnoise0x20 3, 161, 28
+	unknownnoise0x20 14, 148, 44
+	unknownnoise0x20 8, 129, 28
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry01_1.asm
@@ -1,0 +1,24 @@
+SFX_Cry01_1_Ch1: ; 8b97 (2:4b97)
+	dutycycle 160
+	unknownsfx0x20 4, 243, 0, 6
+	unknownsfx0x20 8, 213, 96, 7
+	unknownsfx0x20 3, 226, 32, 7
+	unknownsfx0x20 8, 209, 16, 7
+	endchannel
+
+
+SFX_Cry01_1_Ch2: ; 8baa (2:4baa)
+	dutycycle 90
+	unknownsfx0x20 5, 179, 241, 6
+	unknownsfx0x20 7, 197, 82, 7
+	unknownsfx0x20 3, 162, 17, 7
+	unknownsfx0x20 8, 177, 1, 6
+	endchannel
+
+
+SFX_Cry01_1_Ch3: ; 8bbd (2:4bbd)
+	unknownnoise0x20 3, 162, 60
+	unknownnoise0x20 12, 148, 44
+	unknownnoise0x20 3, 130, 28
+	unknownnoise0x20 8, 113, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry01_2.asm
@@ -1,0 +1,24 @@
+SFX_Cry01_2_Ch1: ; 20e3f (8:4e3f)
+	dutycycle 160
+	unknownsfx0x20 4, 243, 0, 6
+	unknownsfx0x20 8, 213, 96, 7
+	unknownsfx0x20 3, 226, 32, 7
+	unknownsfx0x20 8, 209, 16, 7
+	endchannel
+
+
+SFX_Cry01_2_Ch2: ; 20e52 (8:4e52)
+	dutycycle 90
+	unknownsfx0x20 5, 179, 241, 6
+	unknownsfx0x20 7, 197, 82, 7
+	unknownsfx0x20 3, 162, 17, 7
+	unknownsfx0x20 8, 177, 1, 6
+	endchannel
+
+
+SFX_Cry01_2_Ch3: ; 20e65 (8:4e65)
+	unknownnoise0x20 3, 162, 60
+	unknownnoise0x20 12, 148, 44
+	unknownnoise0x20 3, 130, 28
+	unknownnoise0x20 8, 113, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry01_3.asm
@@ -1,0 +1,24 @@
+SFX_Cry01_3_Ch1: ; 7cc0c (1f:4c0c)
+	dutycycle 160
+	unknownsfx0x20 4, 243, 0, 6
+	unknownsfx0x20 8, 213, 96, 7
+	unknownsfx0x20 3, 226, 32, 7
+	unknownsfx0x20 8, 209, 16, 7
+	endchannel
+
+
+SFX_Cry01_3_Ch2: ; 7cc1f (1f:4c1f)
+	dutycycle 90
+	unknownsfx0x20 5, 179, 241, 6
+	unknownsfx0x20 7, 197, 82, 7
+	unknownsfx0x20 3, 162, 17, 7
+	unknownsfx0x20 8, 177, 1, 6
+	endchannel
+
+
+SFX_Cry01_3_Ch3: ; 7cc32 (1f:4c32)
+	unknownnoise0x20 3, 162, 60
+	unknownnoise0x20 12, 148, 44
+	unknownnoise0x20 3, 130, 28
+	unknownnoise0x20 8, 113, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry02_1.asm
@@ -1,0 +1,17 @@
+SFX_Cry02_1_Ch1: ; 8b0c (2:4b0c)
+	duty 0
+	unknownsfx0x20 8, 245, 128, 4
+	unknownsfx0x20 2, 225, 224, 5
+	unknownsfx0x20 8, 209, 220, 5
+	endchannel
+
+
+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_Cry02_1_Ch3: ; 8b29 (2:4b29)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry02_2.asm
@@ -1,0 +1,17 @@
+SFX_Cry02_2_Ch1: ; 20db4 (8:4db4)
+	duty 0
+	unknownsfx0x20 8, 245, 128, 4
+	unknownsfx0x20 2, 225, 224, 5
+	unknownsfx0x20 8, 209, 220, 5
+	endchannel
+
+
+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_Cry02_2_Ch3: ; 20dd1 (8:4dd1)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry02_3.asm
@@ -1,0 +1,17 @@
+SFX_Cry02_3_Ch1: ; 7cb81 (1f:4b81)
+	duty 0
+	unknownsfx0x20 8, 245, 128, 4
+	unknownsfx0x20 2, 225, 224, 5
+	unknownsfx0x20 8, 209, 220, 5
+	endchannel
+
+
+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_Cry02_3_Ch3: ; 7cb9e (1f:4b9e)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry03_1.asm
@@ -1,0 +1,30 @@
+SFX_Cry03_1_Ch1: ; 88a6 (2:48a6)
+	dutycycle 240
+	unknownsfx0x20 4, 247, 8, 6
+	unknownsfx0x20 6, 230, 0, 6
+	unknownsfx0x20 6, 215, 240, 5
+	unknownsfx0x20 6, 196, 224, 5
+	unknownsfx0x20 5, 211, 192, 5
+	unknownsfx0x20 4, 211, 160, 5
+	unknownsfx0x20 8, 225, 128, 5
+	endchannel
+
+
+SFX_Cry03_1_Ch2: ; 88c5 (2:48c5)
+	dutycycle 10
+	unknownsfx0x20 4, 199, 4, 5
+	unknownsfx0x20 6, 166, 2, 5
+	unknownsfx0x20 6, 151, 241, 4
+	unknownsfx0x20 4, 180, 225, 4
+	unknownsfx0x20 5, 163, 194, 4
+	unknownsfx0x20 4, 179, 163, 4
+	unknownsfx0x20 8, 193, 130, 4
+	endchannel
+
+
+SFX_Cry03_1_Ch3: ; 88e4 (2:48e4)
+	unknownnoise0x20 12, 228, 76
+	unknownnoise0x20 10, 199, 92
+	unknownnoise0x20 12, 182, 76
+	unknownnoise0x20 15, 162, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry03_2.asm
@@ -1,0 +1,30 @@
+SFX_Cry03_2_Ch1: ; 20b4e (8:4b4e)
+	dutycycle 240
+	unknownsfx0x20 4, 247, 8, 6
+	unknownsfx0x20 6, 230, 0, 6
+	unknownsfx0x20 6, 215, 240, 5
+	unknownsfx0x20 6, 196, 224, 5
+	unknownsfx0x20 5, 211, 192, 5
+	unknownsfx0x20 4, 211, 160, 5
+	unknownsfx0x20 8, 225, 128, 5
+	endchannel
+
+
+SFX_Cry03_2_Ch2: ; 20b6d (8:4b6d)
+	dutycycle 10
+	unknownsfx0x20 4, 199, 4, 5
+	unknownsfx0x20 6, 166, 2, 5
+	unknownsfx0x20 6, 151, 241, 4
+	unknownsfx0x20 4, 180, 225, 4
+	unknownsfx0x20 5, 163, 194, 4
+	unknownsfx0x20 4, 179, 163, 4
+	unknownsfx0x20 8, 193, 130, 4
+	endchannel
+
+
+SFX_Cry03_2_Ch3: ; 20b8c (8:4b8c)
+	unknownnoise0x20 12, 228, 76
+	unknownnoise0x20 10, 199, 92
+	unknownnoise0x20 12, 182, 76
+	unknownnoise0x20 15, 162, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry03_3.asm
@@ -1,0 +1,30 @@
+SFX_Cry03_3_Ch1: ; 7c91b (1f:491b)
+	dutycycle 240
+	unknownsfx0x20 4, 247, 8, 6
+	unknownsfx0x20 6, 230, 0, 6
+	unknownsfx0x20 6, 215, 240, 5
+	unknownsfx0x20 6, 196, 224, 5
+	unknownsfx0x20 5, 211, 192, 5
+	unknownsfx0x20 4, 211, 160, 5
+	unknownsfx0x20 8, 225, 128, 5
+	endchannel
+
+
+SFX_Cry03_3_Ch2: ; 7c93a (1f:493a)
+	dutycycle 10
+	unknownsfx0x20 4, 199, 4, 5
+	unknownsfx0x20 6, 166, 2, 5
+	unknownsfx0x20 6, 151, 241, 4
+	unknownsfx0x20 4, 180, 225, 4
+	unknownsfx0x20 5, 163, 194, 4
+	unknownsfx0x20 4, 179, 163, 4
+	unknownsfx0x20 8, 193, 130, 4
+	endchannel
+
+
+SFX_Cry03_3_Ch3: ; 7c959 (1f:4959)
+	unknownnoise0x20 12, 228, 76
+	unknownnoise0x20 10, 199, 92
+	unknownnoise0x20 12, 182, 76
+	unknownnoise0x20 15, 162, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry04_1.asm
@@ -1,0 +1,32 @@
+SFX_Cry04_1_Ch1: ; 8c55 (2:4c55)
+	dutycycle 240
+	unknownsfx0x20 4, 247, 160, 6
+	unknownsfx0x20 8, 230, 164, 6
+	unknownsfx0x20 4, 214, 160, 6
+	unknownsfx0x20 12, 211, 32, 6
+	unknownsfx0x20 8, 195, 36, 6
+	unknownsfx0x20 4, 194, 32, 6
+	unknownsfx0x20 8, 177, 16, 6
+	endchannel
+
+
+SFX_Cry04_1_Ch2: ; 8c74 (2:4c74)
+	dutycycle 90
+	unknownsfx0x20 4, 231, 1, 6
+	unknownsfx0x20 8, 214, 3, 6
+	unknownsfx0x20 4, 198, 1, 6
+	unknownsfx0x20 12, 195, 129, 5
+	unknownsfx0x20 8, 179, 131, 5
+	unknownsfx0x20 4, 178, 130, 5
+	unknownsfx0x20 8, 161, 113, 5
+	endchannel
+
+
+SFX_Cry04_1_Ch3: ; 8c93 (2:4c93)
+	unknownnoise0x20 7, 214, 92
+	unknownnoise0x20 8, 230, 76
+	unknownnoise0x20 4, 212, 92
+	unknownnoise0x20 4, 212, 76
+	unknownnoise0x20 7, 195, 76
+	unknownnoise0x20 8, 161, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry04_2.asm
@@ -1,0 +1,32 @@
+SFX_Cry04_2_Ch1: ; 20efd (8:4efd)
+	dutycycle 240
+	unknownsfx0x20 4, 247, 160, 6
+	unknownsfx0x20 8, 230, 164, 6
+	unknownsfx0x20 4, 214, 160, 6
+	unknownsfx0x20 12, 211, 32, 6
+	unknownsfx0x20 8, 195, 36, 6
+	unknownsfx0x20 4, 194, 32, 6
+	unknownsfx0x20 8, 177, 16, 6
+	endchannel
+
+
+SFX_Cry04_2_Ch2: ; 20f1c (8:4f1c)
+	dutycycle 90
+	unknownsfx0x20 4, 231, 1, 6
+	unknownsfx0x20 8, 214, 3, 6
+	unknownsfx0x20 4, 198, 1, 6
+	unknownsfx0x20 12, 195, 129, 5
+	unknownsfx0x20 8, 179, 131, 5
+	unknownsfx0x20 4, 178, 130, 5
+	unknownsfx0x20 8, 161, 113, 5
+	endchannel
+
+
+SFX_Cry04_2_Ch3: ; 20f3b (8:4f3b)
+	unknownnoise0x20 7, 214, 92
+	unknownnoise0x20 8, 230, 76
+	unknownnoise0x20 4, 212, 92
+	unknownnoise0x20 4, 212, 76
+	unknownnoise0x20 7, 195, 76
+	unknownnoise0x20 8, 161, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry04_3.asm
@@ -1,0 +1,32 @@
+SFX_Cry04_3_Ch1: ; 7ccca (1f:4cca)
+	dutycycle 240
+	unknownsfx0x20 4, 247, 160, 6
+	unknownsfx0x20 8, 230, 164, 6
+	unknownsfx0x20 4, 214, 160, 6
+	unknownsfx0x20 12, 211, 32, 6
+	unknownsfx0x20 8, 195, 36, 6
+	unknownsfx0x20 4, 194, 32, 6
+	unknownsfx0x20 8, 177, 16, 6
+	endchannel
+
+
+SFX_Cry04_3_Ch2: ; 7cce9 (1f:4ce9)
+	dutycycle 90
+	unknownsfx0x20 4, 231, 1, 6
+	unknownsfx0x20 8, 214, 3, 6
+	unknownsfx0x20 4, 198, 1, 6
+	unknownsfx0x20 12, 195, 129, 5
+	unknownsfx0x20 8, 179, 131, 5
+	unknownsfx0x20 4, 178, 130, 5
+	unknownsfx0x20 8, 161, 113, 5
+	endchannel
+
+
+SFX_Cry04_3_Ch3: ; 7cd08 (1f:4d08)
+	unknownnoise0x20 7, 214, 92
+	unknownnoise0x20 8, 230, 76
+	unknownnoise0x20 4, 212, 92
+	unknownnoise0x20 4, 212, 76
+	unknownnoise0x20 7, 195, 76
+	unknownnoise0x20 8, 161, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry05_1.asm
@@ -1,0 +1,19 @@
+SFX_Cry05_1_Ch1: ; 8a35 (2:4a35)
+	dutycycle 10
+	unknownsfx0x20 6, 226, 0, 5
+	unknownsfx0x20 6, 227, 128, 5
+	unknownsfx0x20 6, 211, 112, 5
+	unknownsfx0x20 8, 161, 96, 5
+	endchannel
+
+
+SFX_Cry05_1_Ch2: ; 8a48 (2:4a48)
+	dutycycle 245
+	unknownsfx0x20 6, 226, 130, 4
+	unknownsfx0x20 6, 211, 1, 5
+	unknownsfx0x20 6, 178, 226, 4
+	unknownsfx0x20 8, 129, 193, 4
+
+
+SFX_Cry05_1_Ch3: ; 8a5a (2:4a5a)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry05_2.asm
@@ -1,0 +1,19 @@
+SFX_Cry05_2_Ch1: ; 20cdd (8:4cdd)
+	dutycycle 10
+	unknownsfx0x20 6, 226, 0, 5
+	unknownsfx0x20 6, 227, 128, 5
+	unknownsfx0x20 6, 211, 112, 5
+	unknownsfx0x20 8, 161, 96, 5
+	endchannel
+
+
+SFX_Cry05_2_Ch2: ; 20cf0 (8:4cf0)
+	dutycycle 245
+	unknownsfx0x20 6, 226, 130, 4
+	unknownsfx0x20 6, 211, 1, 5
+	unknownsfx0x20 6, 178, 226, 4
+	unknownsfx0x20 8, 129, 193, 4
+
+
+SFX_Cry05_2_Ch3: ; 20d02 (8:4d02)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry05_3.asm
@@ -1,0 +1,19 @@
+SFX_Cry05_3_Ch1: ; 7caaa (1f:4aaa)
+	dutycycle 10
+	unknownsfx0x20 6, 226, 0, 5
+	unknownsfx0x20 6, 227, 128, 5
+	unknownsfx0x20 6, 211, 112, 5
+	unknownsfx0x20 8, 161, 96, 5
+	endchannel
+
+
+SFX_Cry05_3_Ch2: ; 7cabd (1f:4abd)
+	dutycycle 245
+	unknownsfx0x20 6, 226, 130, 4
+	unknownsfx0x20 6, 211, 1, 5
+	unknownsfx0x20 6, 178, 226, 4
+	unknownsfx0x20 8, 129, 193, 4
+
+
+SFX_Cry05_3_Ch3: ; 7cacf (1f:4acf)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry06_1.asm
@@ -1,0 +1,22 @@
+SFX_Cry06_1_Ch1: ; 89df (2:49df)
+	dutycycle 250
+	unknownsfx0x20 6, 131, 71, 2
+	unknownsfx0x20 15, 98, 38, 2
+	unknownsfx0x20 4, 82, 69, 2
+	unknownsfx0x20 9, 99, 6, 2
+	unknownsfx0x20 15, 130, 37, 2
+	unknownsfx0x20 15, 66, 7, 2
+
+
+SFX_Cry06_1_Ch2: ; 89f9 (2:49f9)
+	endchannel
+
+
+SFX_Cry06_1_Ch3: ; 89fa (2:49fa)
+	unknownnoise0x20 8, 212, 140
+	unknownnoise0x20 4, 226, 156
+	unknownnoise0x20 15, 198, 140
+	unknownnoise0x20 8, 228, 172
+	unknownnoise0x20 15, 215, 156
+	unknownnoise0x20 15, 242, 172
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry06_2.asm
@@ -1,0 +1,22 @@
+SFX_Cry06_2_Ch1: ; 20c87 (8:4c87)
+	dutycycle 250
+	unknownsfx0x20 6, 131, 71, 2
+	unknownsfx0x20 15, 98, 38, 2
+	unknownsfx0x20 4, 82, 69, 2
+	unknownsfx0x20 9, 99, 6, 2
+	unknownsfx0x20 15, 130, 37, 2
+	unknownsfx0x20 15, 66, 7, 2
+
+
+SFX_Cry06_2_Ch2: ; 20ca1 (8:4ca1)
+	endchannel
+
+
+SFX_Cry06_2_Ch3: ; 20ca2 (8:4ca2)
+	unknownnoise0x20 8, 212, 140
+	unknownnoise0x20 4, 226, 156
+	unknownnoise0x20 15, 198, 140
+	unknownnoise0x20 8, 228, 172
+	unknownnoise0x20 15, 215, 156
+	unknownnoise0x20 15, 242, 172
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry06_3.asm
@@ -1,0 +1,22 @@
+SFX_Cry06_3_Ch1: ; 7ca54 (1f:4a54)
+	dutycycle 250
+	unknownsfx0x20 6, 131, 71, 2
+	unknownsfx0x20 15, 98, 38, 2
+	unknownsfx0x20 4, 82, 69, 2
+	unknownsfx0x20 9, 99, 6, 2
+	unknownsfx0x20 15, 130, 37, 2
+	unknownsfx0x20 15, 66, 7, 2
+
+
+SFX_Cry06_3_Ch2: ; 7ca6e (1f:4a6e)
+	endchannel
+
+
+SFX_Cry06_3_Ch3: ; 7ca6f (1f:4a6f)
+	unknownnoise0x20 8, 212, 140
+	unknownnoise0x20 4, 226, 156
+	unknownnoise0x20 15, 198, 140
+	unknownnoise0x20 8, 228, 172
+	unknownnoise0x20 15, 215, 156
+	unknownnoise0x20 15, 242, 172
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry07_1.asm
@@ -1,0 +1,21 @@
+SFX_Cry07_1_Ch1: ; 8a0d (2:4a0d)
+	dutycycle 240
+	unknownsfx0x20 4, 243, 224, 6
+	unknownsfx0x20 15, 228, 64, 6
+	unknownsfx0x20 8, 193, 32, 6
+	endchannel
+
+
+SFX_Cry07_1_Ch2: ; 8a1c (2:4a1c)
+	dutycycle 10
+	unknownsfx0x20 3, 195, 131, 6
+	unknownsfx0x20 14, 180, 2, 6
+	unknownsfx0x20 8, 161, 1, 6
+	endchannel
+
+
+SFX_Cry07_1_Ch3: ; 8a2b (2:4a2b)
+	unknownnoise0x20 4, 211, 92
+	unknownnoise0x20 15, 230, 76
+	unknownnoise0x20 8, 177, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry07_2.asm
@@ -1,0 +1,21 @@
+SFX_Cry07_2_Ch1: ; 20cb5 (8:4cb5)
+	dutycycle 240
+	unknownsfx0x20 4, 243, 224, 6
+	unknownsfx0x20 15, 228, 64, 6
+	unknownsfx0x20 8, 193, 32, 6
+	endchannel
+
+
+SFX_Cry07_2_Ch2: ; 20cc4 (8:4cc4)
+	dutycycle 10
+	unknownsfx0x20 3, 195, 131, 6
+	unknownsfx0x20 14, 180, 2, 6
+	unknownsfx0x20 8, 161, 1, 6
+	endchannel
+
+
+SFX_Cry07_2_Ch3: ; 20cd3 (8:4cd3)
+	unknownnoise0x20 4, 211, 92
+	unknownnoise0x20 15, 230, 76
+	unknownnoise0x20 8, 177, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry07_3.asm
@@ -1,0 +1,21 @@
+SFX_Cry07_3_Ch1: ; 7ca82 (1f:4a82)
+	dutycycle 240
+	unknownsfx0x20 4, 243, 224, 6
+	unknownsfx0x20 15, 228, 64, 6
+	unknownsfx0x20 8, 193, 32, 6
+	endchannel
+
+
+SFX_Cry07_3_Ch2: ; 7ca91 (1f:4a91)
+	dutycycle 10
+	unknownsfx0x20 3, 195, 131, 6
+	unknownsfx0x20 14, 180, 2, 6
+	unknownsfx0x20 8, 161, 1, 6
+	endchannel
+
+
+SFX_Cry07_3_Ch3: ; 7caa0 (1f:4aa0)
+	unknownnoise0x20 4, 211, 92
+	unknownnoise0x20 15, 230, 76
+	unknownnoise0x20 8, 177, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry08_1.asm
@@ -1,0 +1,23 @@
+SFX_Cry08_1_Ch1: ; 8c25 (2:4c25)
+	dutycycle 240
+	unknownsfx0x20 15, 246, 101, 5
+	unknownsfx0x20 10, 228, 124, 5
+	unknownsfx0x20 3, 194, 92, 5
+	unknownsfx0x20 15, 178, 60, 5
+	endchannel
+
+
+SFX_Cry08_1_Ch2: ; 8c38 (2:4c38)
+	dutycycle 90
+	unknownsfx0x20 14, 214, 3, 5
+	unknownsfx0x20 9, 180, 27, 5
+	unknownsfx0x20 4, 146, 250, 4
+	unknownsfx0x20 15, 162, 219, 4
+	endchannel
+
+
+SFX_Cry08_1_Ch3: ; 8c4b (2:4c4b)
+	unknownnoise0x20 12, 230, 76
+	unknownnoise0x20 11, 215, 92
+	unknownnoise0x20 15, 194, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry08_2.asm
@@ -1,0 +1,23 @@
+SFX_Cry08_2_Ch1: ; 20ecd (8:4ecd)
+	dutycycle 240
+	unknownsfx0x20 15, 246, 101, 5
+	unknownsfx0x20 10, 228, 124, 5
+	unknownsfx0x20 3, 194, 92, 5
+	unknownsfx0x20 15, 178, 60, 5
+	endchannel
+
+
+SFX_Cry08_2_Ch2: ; 20ee0 (8:4ee0)
+	dutycycle 90
+	unknownsfx0x20 14, 214, 3, 5
+	unknownsfx0x20 9, 180, 27, 5
+	unknownsfx0x20 4, 146, 250, 4
+	unknownsfx0x20 15, 162, 219, 4
+	endchannel
+
+
+SFX_Cry08_2_Ch3: ; 20ef3 (8:4ef3)
+	unknownnoise0x20 12, 230, 76
+	unknownnoise0x20 11, 215, 92
+	unknownnoise0x20 15, 194, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry08_3.asm
@@ -1,0 +1,23 @@
+SFX_Cry08_3_Ch1: ; 7cc9a (1f:4c9a)
+	dutycycle 240
+	unknownsfx0x20 15, 246, 101, 5
+	unknownsfx0x20 10, 228, 124, 5
+	unknownsfx0x20 3, 194, 92, 5
+	unknownsfx0x20 15, 178, 60, 5
+	endchannel
+
+
+SFX_Cry08_3_Ch2: ; 7ccad (1f:4cad)
+	dutycycle 90
+	unknownsfx0x20 14, 214, 3, 5
+	unknownsfx0x20 9, 180, 27, 5
+	unknownsfx0x20 4, 146, 250, 4
+	unknownsfx0x20 15, 162, 219, 4
+	endchannel
+
+
+SFX_Cry08_3_Ch3: ; 7ccc0 (1f:4cc0)
+	unknownnoise0x20 12, 230, 76
+	unknownnoise0x20 11, 215, 92
+	unknownnoise0x20 15, 194, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry09_1.asm
@@ -1,0 +1,35 @@
+SFX_Cry09_1_Ch1: ; 872f (2:472f)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 160, 7
+	unknownsfx0x20 6, 230, 163, 7
+	unknownsfx0x20 10, 244, 160, 7
+	dutycycle 165
+	unknownsfx0x20 10, 246, 216, 7
+	unknownsfx0x20 4, 227, 215, 7
+	unknownsfx0x20 15, 242, 216, 7
+	endchannel
+
+
+SFX_Cry09_1_Ch2: ; 874c (2:474c)
+	dutycycle 5
+	unknownsfx0x20 2, 8, 0, 0
+	unknownsfx0x20 15, 167, 161, 6
+	unknownsfx0x20 6, 134, 162, 6
+	unknownsfx0x20 10, 116, 161, 6
+	dutycycle 95
+	unknownsfx0x20 10, 118, 214, 6
+	unknownsfx0x20 4, 131, 217, 6
+	unknownsfx0x20 15, 162, 215, 6
+	endchannel
+
+
+SFX_Cry09_1_Ch3: ; 876d (2:476d)
+	unknownnoise0x20 2, 242, 60
+	unknownnoise0x20 8, 228, 62
+	unknownnoise0x20 15, 215, 60
+	unknownnoise0x20 6, 197, 59
+	unknownnoise0x20 6, 228, 61
+	unknownnoise0x20 8, 182, 60
+	unknownnoise0x20 6, 212, 61
+	unknownnoise0x20 8, 193, 59
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry09_2.asm
@@ -1,0 +1,35 @@
+SFX_Cry09_2_Ch1: ; 209d7 (8:49d7)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 160, 7
+	unknownsfx0x20 6, 230, 163, 7
+	unknownsfx0x20 10, 244, 160, 7
+	dutycycle 165
+	unknownsfx0x20 10, 246, 216, 7
+	unknownsfx0x20 4, 227, 215, 7
+	unknownsfx0x20 15, 242, 216, 7
+	endchannel
+
+
+SFX_Cry09_2_Ch2: ; 209f4 (8:49f4)
+	dutycycle 5
+	unknownsfx0x20 2, 8, 0, 0
+	unknownsfx0x20 15, 167, 161, 6
+	unknownsfx0x20 6, 134, 162, 6
+	unknownsfx0x20 10, 116, 161, 6
+	dutycycle 95
+	unknownsfx0x20 10, 118, 214, 6
+	unknownsfx0x20 4, 131, 217, 6
+	unknownsfx0x20 15, 162, 215, 6
+	endchannel
+
+
+SFX_Cry09_2_Ch3: ; 20a15 (8:4a15)
+	unknownnoise0x20 2, 242, 60
+	unknownnoise0x20 8, 228, 62
+	unknownnoise0x20 15, 215, 60
+	unknownnoise0x20 6, 197, 59
+	unknownnoise0x20 6, 228, 61
+	unknownnoise0x20 8, 182, 60
+	unknownnoise0x20 6, 212, 61
+	unknownnoise0x20 8, 193, 59
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry09_3.asm
@@ -1,0 +1,35 @@
+SFX_Cry09_3_Ch1: ; 7c7a4 (1f:47a4)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 160, 7
+	unknownsfx0x20 6, 230, 163, 7
+	unknownsfx0x20 10, 244, 160, 7
+	dutycycle 165
+	unknownsfx0x20 10, 246, 216, 7
+	unknownsfx0x20 4, 227, 215, 7
+	unknownsfx0x20 15, 242, 216, 7
+	endchannel
+
+
+SFX_Cry09_3_Ch2: ; 7c7c1 (1f:47c1)
+	dutycycle 5
+	unknownsfx0x20 2, 8, 0, 0
+	unknownsfx0x20 15, 167, 161, 6
+	unknownsfx0x20 6, 134, 162, 6
+	unknownsfx0x20 10, 116, 161, 6
+	dutycycle 95
+	unknownsfx0x20 10, 118, 214, 6
+	unknownsfx0x20 4, 131, 217, 6
+	unknownsfx0x20 15, 162, 215, 6
+	endchannel
+
+
+SFX_Cry09_3_Ch3: ; 7c7e2 (1f:47e2)
+	unknownnoise0x20 2, 242, 60
+	unknownnoise0x20 8, 228, 62
+	unknownnoise0x20 15, 215, 60
+	unknownnoise0x20 6, 197, 59
+	unknownnoise0x20 6, 228, 61
+	unknownnoise0x20 8, 182, 60
+	unknownnoise0x20 6, 212, 61
+	unknownnoise0x20 8, 193, 59
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0a_1.asm
@@ -1,0 +1,35 @@
+SFX_Cry0A_1_Ch1: ; 8bca (2:4bca)
+	dutycycle 240
+	unknownsfx0x20 8, 247, 224, 6
+	unknownsfx0x20 6, 230, 229, 6
+	unknownsfx0x20 3, 244, 224, 6
+	unknownsfx0x20 3, 246, 208, 6
+	unknownsfx0x20 3, 227, 192, 6
+	unknownsfx0x20 4, 242, 176, 6
+	unknownsfx0x20 15, 162, 200, 6
+	endchannel
+
+
+SFX_Cry0A_1_Ch2: ; 8be9 (2:4be9)
+	dutycycle 5
+	unknownsfx0x20 3, 8, 0, 0
+	unknownsfx0x20 8, 167, 161, 6
+	unknownsfx0x20 6, 134, 163, 6
+	unknownsfx0x20 3, 116, 161, 6
+	unknownsfx0x20 3, 118, 145, 6
+	unknownsfx0x20 3, 131, 130, 6
+	unknownsfx0x20 4, 162, 113, 6
+	unknownsfx0x20 15, 114, 137, 6
+	endchannel
+
+
+SFX_Cry0A_1_Ch3: ; 8c0c (2:4c0c)
+	unknownnoise0x20 2, 242, 60
+	unknownnoise0x20 8, 228, 62
+	unknownnoise0x20 8, 215, 60
+	unknownnoise0x20 5, 197, 59
+	unknownnoise0x20 3, 212, 44
+	unknownnoise0x20 2, 182, 60
+	unknownnoise0x20 3, 164, 44
+	unknownnoise0x20 8, 145, 60
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0a_2.asm
@@ -1,0 +1,35 @@
+SFX_Cry0A_2_Ch1: ; 20e72 (8:4e72)
+	dutycycle 240
+	unknownsfx0x20 8, 247, 224, 6
+	unknownsfx0x20 6, 230, 229, 6
+	unknownsfx0x20 3, 244, 224, 6
+	unknownsfx0x20 3, 246, 208, 6
+	unknownsfx0x20 3, 227, 192, 6
+	unknownsfx0x20 4, 242, 176, 6
+	unknownsfx0x20 15, 162, 200, 6
+	endchannel
+
+
+SFX_Cry0A_2_Ch2: ; 20e91 (8:4e91)
+	dutycycle 5
+	unknownsfx0x20 3, 8, 0, 0
+	unknownsfx0x20 8, 167, 161, 6
+	unknownsfx0x20 6, 134, 163, 6
+	unknownsfx0x20 3, 116, 161, 6
+	unknownsfx0x20 3, 118, 145, 6
+	unknownsfx0x20 3, 131, 130, 6
+	unknownsfx0x20 4, 162, 113, 6
+	unknownsfx0x20 15, 114, 137, 6
+	endchannel
+
+
+SFX_Cry0A_2_Ch3: ; 20eb4 (8:4eb4)
+	unknownnoise0x20 2, 242, 60
+	unknownnoise0x20 8, 228, 62
+	unknownnoise0x20 8, 215, 60
+	unknownnoise0x20 5, 197, 59
+	unknownnoise0x20 3, 212, 44
+	unknownnoise0x20 2, 182, 60
+	unknownnoise0x20 3, 164, 44
+	unknownnoise0x20 8, 145, 60
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0a_3.asm
@@ -1,0 +1,35 @@
+SFX_Cry0A_3_Ch1: ; 7cc3f (1f:4c3f)
+	dutycycle 240
+	unknownsfx0x20 8, 247, 224, 6
+	unknownsfx0x20 6, 230, 229, 6
+	unknownsfx0x20 3, 244, 224, 6
+	unknownsfx0x20 3, 246, 208, 6
+	unknownsfx0x20 3, 227, 192, 6
+	unknownsfx0x20 4, 242, 176, 6
+	unknownsfx0x20 15, 162, 200, 6
+	endchannel
+
+
+SFX_Cry0A_3_Ch2: ; 7cc5e (1f:4c5e)
+	dutycycle 5
+	unknownsfx0x20 3, 8, 0, 0
+	unknownsfx0x20 8, 167, 161, 6
+	unknownsfx0x20 6, 134, 163, 6
+	unknownsfx0x20 3, 116, 161, 6
+	unknownsfx0x20 3, 118, 145, 6
+	unknownsfx0x20 3, 131, 130, 6
+	unknownsfx0x20 4, 162, 113, 6
+	unknownsfx0x20 15, 114, 137, 6
+	endchannel
+
+
+SFX_Cry0A_3_Ch3: ; 7cc81 (1f:4c81)
+	unknownnoise0x20 2, 242, 60
+	unknownnoise0x20 8, 228, 62
+	unknownnoise0x20 8, 215, 60
+	unknownnoise0x20 5, 197, 59
+	unknownnoise0x20 3, 212, 44
+	unknownnoise0x20 2, 182, 60
+	unknownnoise0x20 3, 164, 44
+	unknownnoise0x20 8, 145, 60
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0b_1.asm
@@ -1,0 +1,37 @@
+SFX_Cry0B_1_Ch1: ; 8a5b (2:4a5b)
+	dutycycle 204
+	unknownsfx0x20 4, 241, 0, 7
+	unknownsfx0x20 4, 225, 128, 7
+	unknownsfx0x20 4, 209, 64, 7
+	unknownsfx0x20 4, 225, 64, 7
+	unknownsfx0x20 4, 241, 128, 7
+	unknownsfx0x20 4, 209, 0, 7
+	unknownsfx0x20 4, 241, 1, 7
+	unknownsfx0x20 4, 209, 130, 7
+	unknownsfx0x20 4, 193, 66, 7
+	unknownsfx0x20 8, 177, 65, 7
+	endchannel
+
+
+SFX_Cry0B_1_Ch2: ; 8a86 (2:4a86)
+	dutycycle 68
+	unknownsfx0x20 12, 8, 0, 0
+	unknownsfx0x20 4, 241, 1, 7
+	unknownsfx0x20 4, 225, 130, 7
+	unknownsfx0x20 4, 209, 65, 7
+	unknownsfx0x20 4, 225, 65, 7
+	unknownsfx0x20 4, 241, 130, 7
+	unknownsfx0x20 8, 209, 1, 7
+	endchannel
+
+
+SFX_Cry0B_1_Ch3: ; 8aa5 (2:4aa5)
+	unknownnoise0x20 15, 8, 0
+	unknownnoise0x20 4, 8, 0
+	unknownnoise0x20 4, 209, 76
+	unknownnoise0x20 4, 177, 44
+	unknownnoise0x20 4, 209, 60
+	unknownnoise0x20 4, 177, 60
+	unknownnoise0x20 4, 193, 44
+	unknownnoise0x20 8, 161, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0b_2.asm
@@ -1,0 +1,37 @@
+SFX_Cry0B_2_Ch1: ; 20d03 (8:4d03)
+	dutycycle 204
+	unknownsfx0x20 4, 241, 0, 7
+	unknownsfx0x20 4, 225, 128, 7
+	unknownsfx0x20 4, 209, 64, 7
+	unknownsfx0x20 4, 225, 64, 7
+	unknownsfx0x20 4, 241, 128, 7
+	unknownsfx0x20 4, 209, 0, 7
+	unknownsfx0x20 4, 241, 1, 7
+	unknownsfx0x20 4, 209, 130, 7
+	unknownsfx0x20 4, 193, 66, 7
+	unknownsfx0x20 8, 177, 65, 7
+	endchannel
+
+
+SFX_Cry0B_2_Ch2: ; 20d2e (8:4d2e)
+	dutycycle 68
+	unknownsfx0x20 12, 8, 0, 0
+	unknownsfx0x20 4, 241, 1, 7
+	unknownsfx0x20 4, 225, 130, 7
+	unknownsfx0x20 4, 209, 65, 7
+	unknownsfx0x20 4, 225, 65, 7
+	unknownsfx0x20 4, 241, 130, 7
+	unknownsfx0x20 8, 209, 1, 7
+	endchannel
+
+
+SFX_Cry0B_2_Ch3: ; 20d4d (8:4d4d)
+	unknownnoise0x20 15, 8, 0
+	unknownnoise0x20 4, 8, 0
+	unknownnoise0x20 4, 209, 76
+	unknownnoise0x20 4, 177, 44
+	unknownnoise0x20 4, 209, 60
+	unknownnoise0x20 4, 177, 60
+	unknownnoise0x20 4, 193, 44
+	unknownnoise0x20 8, 161, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0b_3.asm
@@ -1,0 +1,37 @@
+SFX_Cry0B_3_Ch1: ; 7cad0 (1f:4ad0)
+	dutycycle 204
+	unknownsfx0x20 4, 241, 0, 7
+	unknownsfx0x20 4, 225, 128, 7
+	unknownsfx0x20 4, 209, 64, 7
+	unknownsfx0x20 4, 225, 64, 7
+	unknownsfx0x20 4, 241, 128, 7
+	unknownsfx0x20 4, 209, 0, 7
+	unknownsfx0x20 4, 241, 1, 7
+	unknownsfx0x20 4, 209, 130, 7
+	unknownsfx0x20 4, 193, 66, 7
+	unknownsfx0x20 8, 177, 65, 7
+	endchannel
+
+
+SFX_Cry0B_3_Ch2: ; 7cafb (1f:4afb)
+	dutycycle 68
+	unknownsfx0x20 12, 8, 0, 0
+	unknownsfx0x20 4, 241, 1, 7
+	unknownsfx0x20 4, 225, 130, 7
+	unknownsfx0x20 4, 209, 65, 7
+	unknownsfx0x20 4, 225, 65, 7
+	unknownsfx0x20 4, 241, 130, 7
+	unknownsfx0x20 8, 209, 1, 7
+	endchannel
+
+
+SFX_Cry0B_3_Ch3: ; 7cb1a (1f:4b1a)
+	unknownnoise0x20 15, 8, 0
+	unknownnoise0x20 4, 8, 0
+	unknownnoise0x20 4, 209, 76
+	unknownnoise0x20 4, 177, 44
+	unknownnoise0x20 4, 209, 60
+	unknownnoise0x20 4, 177, 60
+	unknownnoise0x20 4, 193, 44
+	unknownnoise0x20 8, 161, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0c_1.asm
@@ -1,0 +1,29 @@
+SFX_Cry0C_1_Ch1: ; 8abe (2:4abe)
+	dutycycle 204
+	unknownsfx0x20 8, 245, 0, 6
+	unknownsfx0x20 2, 210, 56, 6
+	unknownsfx0x20 2, 194, 48, 6
+	unknownsfx0x20 2, 194, 40, 6
+	unknownsfx0x20 2, 178, 32, 6
+	unknownsfx0x20 2, 178, 16, 6
+	unknownsfx0x20 2, 162, 24, 6
+	unknownsfx0x20 2, 178, 16, 6
+	unknownsfx0x20 8, 193, 32, 6
+	endchannel
+
+
+SFX_Cry0C_1_Ch2: ; 8ae5 (2:4ae5)
+	dutycycle 68
+	unknownsfx0x20 12, 195, 192, 5
+	unknownsfx0x20 3, 177, 249, 5
+	unknownsfx0x20 2, 161, 241, 5
+	unknownsfx0x20 2, 161, 233, 5
+	unknownsfx0x20 2, 145, 225, 5
+	unknownsfx0x20 2, 145, 217, 5
+	unknownsfx0x20 2, 129, 209, 5
+	unknownsfx0x20 2, 145, 217, 5
+	unknownsfx0x20 8, 145, 225, 5
+
+
+SFX_Cry0C_1_Ch3: ; 8b0b (2:4b0b)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0c_2.asm
@@ -1,0 +1,29 @@
+SFX_Cry0C_2_Ch1: ; 20d66 (8:4d66)
+	dutycycle 204
+	unknownsfx0x20 8, 245, 0, 6
+	unknownsfx0x20 2, 210, 56, 6
+	unknownsfx0x20 2, 194, 48, 6
+	unknownsfx0x20 2, 194, 40, 6
+	unknownsfx0x20 2, 178, 32, 6
+	unknownsfx0x20 2, 178, 16, 6
+	unknownsfx0x20 2, 162, 24, 6
+	unknownsfx0x20 2, 178, 16, 6
+	unknownsfx0x20 8, 193, 32, 6
+	endchannel
+
+
+SFX_Cry0C_2_Ch2: ; 20d8d (8:4d8d)
+	dutycycle 68
+	unknownsfx0x20 12, 195, 192, 5
+	unknownsfx0x20 3, 177, 249, 5
+	unknownsfx0x20 2, 161, 241, 5
+	unknownsfx0x20 2, 161, 233, 5
+	unknownsfx0x20 2, 145, 225, 5
+	unknownsfx0x20 2, 145, 217, 5
+	unknownsfx0x20 2, 129, 209, 5
+	unknownsfx0x20 2, 145, 217, 5
+	unknownsfx0x20 8, 145, 225, 5
+
+
+SFX_Cry0C_2_Ch3: ; 20db3 (8:4db3)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0c_3.asm
@@ -1,0 +1,29 @@
+SFX_Cry0C_3_Ch1: ; 7cb33 (1f:4b33)
+	dutycycle 204
+	unknownsfx0x20 8, 245, 0, 6
+	unknownsfx0x20 2, 210, 56, 6
+	unknownsfx0x20 2, 194, 48, 6
+	unknownsfx0x20 2, 194, 40, 6
+	unknownsfx0x20 2, 178, 32, 6
+	unknownsfx0x20 2, 178, 16, 6
+	unknownsfx0x20 2, 162, 24, 6
+	unknownsfx0x20 2, 178, 16, 6
+	unknownsfx0x20 8, 193, 32, 6
+	endchannel
+
+
+SFX_Cry0C_3_Ch2: ; 7cb5a (1f:4b5a)
+	dutycycle 68
+	unknownsfx0x20 12, 195, 192, 5
+	unknownsfx0x20 3, 177, 249, 5
+	unknownsfx0x20 2, 161, 241, 5
+	unknownsfx0x20 2, 161, 233, 5
+	unknownsfx0x20 2, 145, 225, 5
+	unknownsfx0x20 2, 145, 217, 5
+	unknownsfx0x20 2, 129, 209, 5
+	unknownsfx0x20 2, 145, 217, 5
+	unknownsfx0x20 8, 145, 225, 5
+
+
+SFX_Cry0C_3_Ch3: ; 7cb80 (1f:4b80)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0d_1.asm
@@ -1,0 +1,40 @@
+SFX_Cry0D_1_Ch1: ; 8b2a (2:4b2a)
+	dutycycle 136
+	unknownsfx0x20 5, 242, 80, 6
+	unknownsfx0x20 9, 209, 96, 6
+	unknownsfx0x20 5, 226, 18, 6
+	unknownsfx0x20 9, 193, 34, 6
+	unknownsfx0x20 5, 242, 16, 6
+	unknownsfx0x20 6, 209, 32, 6
+	loopchannel 2, SFX_Cry0D_1_Ch1
+	endchannel
+
+
+SFX_Cry0D_1_Ch2: ; 8b49 (2:4b49)
+	dutycycle 64
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 5, 242, 81, 6
+	unknownsfx0x20 9, 209, 97, 6
+	unknownsfx0x20 5, 226, 20, 6
+	unknownsfx0x20 8, 193, 36, 6
+	unknownsfx0x20 5, 242, 17, 6
+	unknownsfx0x20 12, 209, 33, 6
+	unknownsfx0x20 5, 226, 20, 6
+	unknownsfx0x20 8, 193, 36, 6
+	unknownsfx0x20 5, 242, 17, 6
+	unknownsfx0x20 4, 209, 33, 6
+	endchannel
+
+
+SFX_Cry0D_1_Ch3: ; 8b78 (2:4b78)
+	unknownnoise0x20 6, 210, 28
+	unknownnoise0x20 9, 177, 44
+	unknownnoise0x20 8, 194, 44
+	unknownnoise0x20 9, 177, 60
+	unknownnoise0x20 6, 194, 44
+	unknownnoise0x20 9, 162, 60
+	unknownnoise0x20 7, 194, 44
+	unknownnoise0x20 5, 161, 60
+	unknownnoise0x20 9, 194, 44
+	unknownnoise0x20 4, 161, 60
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0d_2.asm
@@ -1,0 +1,40 @@
+SFX_Cry0D_2_Ch1: ; 20dd2 (8:4dd2)
+	dutycycle 136
+	unknownsfx0x20 5, 242, 80, 6
+	unknownsfx0x20 9, 209, 96, 6
+	unknownsfx0x20 5, 226, 18, 6
+	unknownsfx0x20 9, 193, 34, 6
+	unknownsfx0x20 5, 242, 16, 6
+	unknownsfx0x20 6, 209, 32, 6
+	loopchannel 2, SFX_Cry0D_2_Ch1
+	endchannel
+
+
+SFX_Cry0D_2_Ch2: ; 20df1 (8:4df1)
+	dutycycle 64
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 5, 242, 81, 6
+	unknownsfx0x20 9, 209, 97, 6
+	unknownsfx0x20 5, 226, 20, 6
+	unknownsfx0x20 8, 193, 36, 6
+	unknownsfx0x20 5, 242, 17, 6
+	unknownsfx0x20 12, 209, 33, 6
+	unknownsfx0x20 5, 226, 20, 6
+	unknownsfx0x20 8, 193, 36, 6
+	unknownsfx0x20 5, 242, 17, 6
+	unknownsfx0x20 4, 209, 33, 6
+	endchannel
+
+
+SFX_Cry0D_2_Ch3: ; 20e20 (8:4e20)
+	unknownnoise0x20 6, 210, 28
+	unknownnoise0x20 9, 177, 44
+	unknownnoise0x20 8, 194, 44
+	unknownnoise0x20 9, 177, 60
+	unknownnoise0x20 6, 194, 44
+	unknownnoise0x20 9, 162, 60
+	unknownnoise0x20 7, 194, 44
+	unknownnoise0x20 5, 161, 60
+	unknownnoise0x20 9, 194, 44
+	unknownnoise0x20 4, 161, 60
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0d_3.asm
@@ -1,0 +1,40 @@
+SFX_Cry0D_3_Ch1: ; 7cb9f (1f:4b9f)
+	dutycycle 136
+	unknownsfx0x20 5, 242, 80, 6
+	unknownsfx0x20 9, 209, 96, 6
+	unknownsfx0x20 5, 226, 18, 6
+	unknownsfx0x20 9, 193, 34, 6
+	unknownsfx0x20 5, 242, 16, 6
+	unknownsfx0x20 6, 209, 32, 6
+	loopchannel 2, SFX_Cry0D_3_Ch1
+	endchannel
+
+
+SFX_Cry0D_3_Ch2: ; 7cbbe (1f:4bbe)
+	dutycycle 64
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 5, 242, 81, 6
+	unknownsfx0x20 9, 209, 97, 6
+	unknownsfx0x20 5, 226, 20, 6
+	unknownsfx0x20 8, 193, 36, 6
+	unknownsfx0x20 5, 242, 17, 6
+	unknownsfx0x20 12, 209, 33, 6
+	unknownsfx0x20 5, 226, 20, 6
+	unknownsfx0x20 8, 193, 36, 6
+	unknownsfx0x20 5, 242, 17, 6
+	unknownsfx0x20 4, 209, 33, 6
+	endchannel
+
+
+SFX_Cry0D_3_Ch3: ; 7cbed (1f:4bed)
+	unknownnoise0x20 6, 210, 28
+	unknownnoise0x20 9, 177, 44
+	unknownnoise0x20 8, 194, 44
+	unknownnoise0x20 9, 177, 60
+	unknownnoise0x20 6, 194, 44
+	unknownnoise0x20 9, 162, 60
+	unknownnoise0x20 7, 194, 44
+	unknownnoise0x20 5, 161, 60
+	unknownnoise0x20 9, 194, 44
+	unknownnoise0x20 4, 161, 60
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0e_1.asm
@@ -1,0 +1,23 @@
+SFX_Cry0E_1_Ch1: ; 89af (2:49af)
+	dutycycle 165
+	unknownsfx0x20 4, 225, 0, 7
+	unknownsfx0x20 4, 242, 128, 7
+	unknownsfx0x20 2, 146, 64, 7
+	unknownsfx0x20 8, 225, 0, 6
+	endchannel
+
+
+SFX_Cry0E_1_Ch2: ; 89c2 (2:49c2)
+	dutycycle 10
+	unknownsfx0x20 4, 177, 225, 6
+	unknownsfx0x20 3, 194, 225, 6
+	unknownsfx0x20 3, 98, 129, 6
+	unknownsfx0x20 8, 177, 225, 5
+	endchannel
+
+
+SFX_Cry0E_1_Ch3: ; 89d5 (2:49d5)
+	unknownnoise0x20 2, 97, 50
+	unknownnoise0x20 2, 97, 33
+	unknownnoise0x20 8, 97, 17
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0e_2.asm
@@ -1,0 +1,23 @@
+SFX_Cry0E_2_Ch1: ; 20c57 (8:4c57)
+	dutycycle 165
+	unknownsfx0x20 4, 225, 0, 7
+	unknownsfx0x20 4, 242, 128, 7
+	unknownsfx0x20 2, 146, 64, 7
+	unknownsfx0x20 8, 225, 0, 6
+	endchannel
+
+
+SFX_Cry0E_2_Ch2: ; 20c6a (8:4c6a)
+	dutycycle 10
+	unknownsfx0x20 4, 177, 225, 6
+	unknownsfx0x20 3, 194, 225, 6
+	unknownsfx0x20 3, 98, 129, 6
+	unknownsfx0x20 8, 177, 225, 5
+	endchannel
+
+
+SFX_Cry0E_2_Ch3: ; 20c7d (8:4c7d)
+	unknownnoise0x20 2, 97, 50
+	unknownnoise0x20 2, 97, 33
+	unknownnoise0x20 8, 97, 17
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0e_3.asm
@@ -1,0 +1,23 @@
+SFX_Cry0E_3_Ch1: ; 7ca24 (1f:4a24)
+	dutycycle 165
+	unknownsfx0x20 4, 225, 0, 7
+	unknownsfx0x20 4, 242, 128, 7
+	unknownsfx0x20 2, 146, 64, 7
+	unknownsfx0x20 8, 225, 0, 6
+	endchannel
+
+
+SFX_Cry0E_3_Ch2: ; 7ca37 (1f:4a37)
+	dutycycle 10
+	unknownsfx0x20 4, 177, 225, 6
+	unknownsfx0x20 3, 194, 225, 6
+	unknownsfx0x20 3, 98, 129, 6
+	unknownsfx0x20 8, 177, 225, 5
+	endchannel
+
+
+SFX_Cry0E_3_Ch3: ; 7ca4a (1f:4a4a)
+	unknownnoise0x20 2, 97, 50
+	unknownnoise0x20 2, 97, 33
+	unknownnoise0x20 8, 97, 17
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0f_1.asm
@@ -1,0 +1,29 @@
+SFX_Cry0F_1_Ch1: ; 88f1 (2:48f1)
+	dutycycle 241
+	unknownsfx0x20 4, 247, 192, 7
+	unknownsfx0x20 12, 230, 194, 7
+	unknownsfx0x20 6, 181, 128, 6
+	unknownsfx0x20 4, 196, 112, 6
+	unknownsfx0x20 4, 181, 96, 6
+	unknownsfx0x20 8, 193, 64, 6
+	endchannel
+
+
+SFX_Cry0F_1_Ch2: ; 890c (2:490c)
+	dutycycle 204
+	unknownsfx0x20 3, 199, 129, 7
+	unknownsfx0x20 12, 182, 128, 7
+	unknownsfx0x20 6, 165, 65, 6
+	unknownsfx0x20 4, 196, 50, 6
+	unknownsfx0x20 6, 181, 33, 6
+	unknownsfx0x20 8, 161, 2, 6
+	endchannel
+
+
+SFX_Cry0F_1_Ch3: ; 8927 (2:4927)
+	unknownnoise0x20 3, 228, 60
+	unknownnoise0x20 12, 214, 44
+	unknownnoise0x20 4, 228, 60
+	unknownnoise0x20 8, 183, 92
+	unknownnoise0x20 15, 194, 93
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0f_2.asm
@@ -1,0 +1,29 @@
+SFX_Cry0F_2_Ch1: ; 20b99 (8:4b99)
+	dutycycle 241
+	unknownsfx0x20 4, 247, 192, 7
+	unknownsfx0x20 12, 230, 194, 7
+	unknownsfx0x20 6, 181, 128, 6
+	unknownsfx0x20 4, 196, 112, 6
+	unknownsfx0x20 4, 181, 96, 6
+	unknownsfx0x20 8, 193, 64, 6
+	endchannel
+
+
+SFX_Cry0F_2_Ch2: ; 20bb4 (8:4bb4)
+	dutycycle 204
+	unknownsfx0x20 3, 199, 129, 7
+	unknownsfx0x20 12, 182, 128, 7
+	unknownsfx0x20 6, 165, 65, 6
+	unknownsfx0x20 4, 196, 50, 6
+	unknownsfx0x20 6, 181, 33, 6
+	unknownsfx0x20 8, 161, 2, 6
+	endchannel
+
+
+SFX_Cry0F_2_Ch3: ; 20bcf (8:4bcf)
+	unknownnoise0x20 3, 228, 60
+	unknownnoise0x20 12, 214, 44
+	unknownnoise0x20 4, 228, 60
+	unknownnoise0x20 8, 183, 92
+	unknownnoise0x20 15, 194, 93
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry0f_3.asm
@@ -1,0 +1,29 @@
+SFX_Cry0F_3_Ch1: ; 7c966 (1f:4966)
+	dutycycle 241
+	unknownsfx0x20 4, 247, 192, 7
+	unknownsfx0x20 12, 230, 194, 7
+	unknownsfx0x20 6, 181, 128, 6
+	unknownsfx0x20 4, 196, 112, 6
+	unknownsfx0x20 4, 181, 96, 6
+	unknownsfx0x20 8, 193, 64, 6
+	endchannel
+
+
+SFX_Cry0F_3_Ch2: ; 7c981 (1f:4981)
+	dutycycle 204
+	unknownsfx0x20 3, 199, 129, 7
+	unknownsfx0x20 12, 182, 128, 7
+	unknownsfx0x20 6, 165, 65, 6
+	unknownsfx0x20 4, 196, 50, 6
+	unknownsfx0x20 6, 181, 33, 6
+	unknownsfx0x20 8, 161, 2, 6
+	endchannel
+
+
+SFX_Cry0F_3_Ch3: ; 7c99c (1f:499c)
+	unknownnoise0x20 3, 228, 60
+	unknownnoise0x20 12, 214, 44
+	unknownnoise0x20 4, 228, 60
+	unknownnoise0x20 8, 183, 92
+	unknownnoise0x20 15, 194, 93
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry10_1.asm
@@ -1,0 +1,31 @@
+SFX_Cry10_1_Ch1: ; 8937 (2:4937)
+	dutycycle 201
+	unknownsfx0x20 8, 247, 128, 6
+	unknownsfx0x20 2, 247, 96, 6
+	unknownsfx0x20 1, 231, 64, 6
+	unknownsfx0x20 1, 231, 32, 6
+	unknownsfx0x20 15, 209, 0, 6
+	unknownsfx0x20 4, 199, 64, 7
+	unknownsfx0x20 4, 167, 48, 7
+	unknownsfx0x20 15, 145, 32, 7
+	endchannel
+
+
+SFX_Cry10_1_Ch2: ; 895a (2:495a)
+	dutycycle 121
+	unknownsfx0x20 10, 231, 130, 6
+	unknownsfx0x20 2, 231, 98, 6
+	unknownsfx0x20 1, 215, 66, 6
+	unknownsfx0x20 1, 215, 34, 6
+	unknownsfx0x20 15, 193, 2, 6
+	unknownsfx0x20 4, 183, 66, 7
+	unknownsfx0x20 2, 151, 50, 7
+	unknownsfx0x20 15, 129, 34, 7
+	endchannel
+
+
+SFX_Cry10_1_Ch3: ; 897d (2:497d)
+	unknownnoise0x20 4, 116, 33
+	unknownnoise0x20 4, 116, 16
+	unknownnoise0x20 4, 113, 32
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry10_2.asm
@@ -1,0 +1,31 @@
+SFX_Cry10_2_Ch1: ; 20bdf (8:4bdf)
+	dutycycle 201
+	unknownsfx0x20 8, 247, 128, 6
+	unknownsfx0x20 2, 247, 96, 6
+	unknownsfx0x20 1, 231, 64, 6
+	unknownsfx0x20 1, 231, 32, 6
+	unknownsfx0x20 15, 209, 0, 6
+	unknownsfx0x20 4, 199, 64, 7
+	unknownsfx0x20 4, 167, 48, 7
+	unknownsfx0x20 15, 145, 32, 7
+	endchannel
+
+
+SFX_Cry10_2_Ch2: ; 20c02 (8:4c02)
+	dutycycle 121
+	unknownsfx0x20 10, 231, 130, 6
+	unknownsfx0x20 2, 231, 98, 6
+	unknownsfx0x20 1, 215, 66, 6
+	unknownsfx0x20 1, 215, 34, 6
+	unknownsfx0x20 15, 193, 2, 6
+	unknownsfx0x20 4, 183, 66, 7
+	unknownsfx0x20 2, 151, 50, 7
+	unknownsfx0x20 15, 129, 34, 7
+	endchannel
+
+
+SFX_Cry10_2_Ch3: ; 20c25 (8:4c25)
+	unknownnoise0x20 4, 116, 33
+	unknownnoise0x20 4, 116, 16
+	unknownnoise0x20 4, 113, 32
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry10_3.asm
@@ -1,0 +1,31 @@
+SFX_Cry10_3_Ch1: ; 7c9ac (1f:49ac)
+	dutycycle 201
+	unknownsfx0x20 8, 247, 128, 6
+	unknownsfx0x20 2, 247, 96, 6
+	unknownsfx0x20 1, 231, 64, 6
+	unknownsfx0x20 1, 231, 32, 6
+	unknownsfx0x20 15, 209, 0, 6
+	unknownsfx0x20 4, 199, 64, 7
+	unknownsfx0x20 4, 167, 48, 7
+	unknownsfx0x20 15, 145, 32, 7
+	endchannel
+
+
+SFX_Cry10_3_Ch2: ; 7c9cf (1f:49cf)
+	dutycycle 121
+	unknownsfx0x20 10, 231, 130, 6
+	unknownsfx0x20 2, 231, 98, 6
+	unknownsfx0x20 1, 215, 66, 6
+	unknownsfx0x20 1, 215, 34, 6
+	unknownsfx0x20 15, 193, 2, 6
+	unknownsfx0x20 4, 183, 66, 7
+	unknownsfx0x20 2, 151, 50, 7
+	unknownsfx0x20 15, 129, 34, 7
+	endchannel
+
+
+SFX_Cry10_3_Ch3: ; 7c9f2 (1f:49f2)
+	unknownnoise0x20 4, 116, 33
+	unknownnoise0x20 4, 116, 16
+	unknownnoise0x20 4, 113, 32
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry11_1.asm
@@ -1,0 +1,34 @@
+SFX_Cry11_1_Ch1: ; 8813 (2:4813)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 160, 7
+	unknownsfx0x20 8, 230, 164, 7
+	unknownsfx0x20 4, 214, 160, 7
+	unknownsfx0x20 15, 211, 32, 7
+	unknownsfx0x20 8, 195, 35, 7
+	unknownsfx0x20 2, 194, 40, 7
+	unknownsfx0x20 8, 177, 48, 7
+	endchannel
+
+
+SFX_Cry11_1_Ch2: ; 8832 (2:4832)
+	dutycycle 10
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 6, 167, 65, 7
+	unknownsfx0x20 8, 134, 67, 7
+	unknownsfx0x20 4, 118, 65, 7
+	unknownsfx0x20 13, 131, 194, 6
+	unknownsfx0x20 7, 115, 193, 6
+	unknownsfx0x20 3, 130, 204, 6
+	unknownsfx0x20 8, 113, 216, 6
+	endchannel
+
+
+SFX_Cry11_1_Ch3: ; 8855 (2:4855)
+	unknownnoise0x20 2, 242, 76
+	unknownnoise0x20 6, 230, 58
+	unknownnoise0x20 4, 215, 58
+	unknownnoise0x20 6, 214, 44
+	unknownnoise0x20 8, 229, 60
+	unknownnoise0x20 12, 210, 61
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry11_2.asm
@@ -1,0 +1,34 @@
+SFX_Cry11_2_Ch1: ; 20abb (8:4abb)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 160, 7
+	unknownsfx0x20 8, 230, 164, 7
+	unknownsfx0x20 4, 214, 160, 7
+	unknownsfx0x20 15, 211, 32, 7
+	unknownsfx0x20 8, 195, 35, 7
+	unknownsfx0x20 2, 194, 40, 7
+	unknownsfx0x20 8, 177, 48, 7
+	endchannel
+
+
+SFX_Cry11_2_Ch2: ; 20ada (8:4ada)
+	dutycycle 10
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 6, 167, 65, 7
+	unknownsfx0x20 8, 134, 67, 7
+	unknownsfx0x20 4, 118, 65, 7
+	unknownsfx0x20 13, 131, 194, 6
+	unknownsfx0x20 7, 115, 193, 6
+	unknownsfx0x20 3, 130, 204, 6
+	unknownsfx0x20 8, 113, 216, 6
+	endchannel
+
+
+SFX_Cry11_2_Ch3: ; 20afd (8:4afd)
+	unknownnoise0x20 2, 242, 76
+	unknownnoise0x20 6, 230, 58
+	unknownnoise0x20 4, 215, 58
+	unknownnoise0x20 6, 214, 44
+	unknownnoise0x20 8, 229, 60
+	unknownnoise0x20 12, 210, 61
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry11_3.asm
@@ -1,0 +1,34 @@
+SFX_Cry11_3_Ch1: ; 7c888 (1f:4888)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 160, 7
+	unknownsfx0x20 8, 230, 164, 7
+	unknownsfx0x20 4, 214, 160, 7
+	unknownsfx0x20 15, 211, 32, 7
+	unknownsfx0x20 8, 195, 35, 7
+	unknownsfx0x20 2, 194, 40, 7
+	unknownsfx0x20 8, 177, 48, 7
+	endchannel
+
+
+SFX_Cry11_3_Ch2: ; 7c8a7 (1f:48a7)
+	dutycycle 10
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 6, 167, 65, 7
+	unknownsfx0x20 8, 134, 67, 7
+	unknownsfx0x20 4, 118, 65, 7
+	unknownsfx0x20 13, 131, 194, 6
+	unknownsfx0x20 7, 115, 193, 6
+	unknownsfx0x20 3, 130, 204, 6
+	unknownsfx0x20 8, 113, 216, 6
+	endchannel
+
+
+SFX_Cry11_3_Ch3: ; 7c8ca (1f:48ca)
+	unknownnoise0x20 2, 242, 76
+	unknownnoise0x20 6, 230, 58
+	unknownnoise0x20 4, 215, 58
+	unknownnoise0x20 6, 214, 44
+	unknownnoise0x20 8, 229, 60
+	unknownnoise0x20 12, 210, 61
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry12_1.asm
@@ -1,0 +1,24 @@
+SFX_Cry12_1_Ch1: ; 8d2b (2:4d2b)
+	dutycycle 165
+	unknownsfx0x20 12, 242, 64, 4
+	unknownsfx0x20 15, 227, 160, 4
+	unknownsfx0x20 4, 210, 144, 4
+	unknownsfx0x20 8, 209, 128, 4
+	endchannel
+
+
+SFX_Cry12_1_Ch2: ; 8d3e (2:4d3e)
+	dutycycle 238
+	unknownsfx0x20 11, 210, 56, 4
+	unknownsfx0x20 14, 198, 152, 4
+	unknownsfx0x20 3, 178, 136, 4
+	unknownsfx0x20 8, 177, 120, 4
+	endchannel
+
+
+SFX_Cry12_1_Ch3: ; 8d51 (2:4d51)
+	unknownnoise0x20 10, 230, 108
+	unknownnoise0x20 15, 210, 92
+	unknownnoise0x20 3, 194, 108
+	unknownnoise0x20 8, 209, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry12_2.asm
@@ -1,0 +1,24 @@
+SFX_Cry12_2_Ch1: ; 20fd3 (8:4fd3)
+	dutycycle 165
+	unknownsfx0x20 12, 242, 64, 4
+	unknownsfx0x20 15, 227, 160, 4
+	unknownsfx0x20 4, 210, 144, 4
+	unknownsfx0x20 8, 209, 128, 4
+	endchannel
+
+
+SFX_Cry12_2_Ch2: ; 20fe6 (8:4fe6)
+	dutycycle 238
+	unknownsfx0x20 11, 210, 56, 4
+	unknownsfx0x20 14, 198, 152, 4
+	unknownsfx0x20 3, 178, 136, 4
+	unknownsfx0x20 8, 177, 120, 4
+	endchannel
+
+
+SFX_Cry12_2_Ch3: ; 20ff9 (8:4ff9)
+	unknownnoise0x20 10, 230, 108
+	unknownnoise0x20 15, 210, 92
+	unknownnoise0x20 3, 194, 108
+	unknownnoise0x20 8, 209, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry12_3.asm
@@ -1,0 +1,24 @@
+SFX_Cry12_3_Ch1: ; 7cda0 (1f:4da0)
+	dutycycle 165
+	unknownsfx0x20 12, 242, 64, 4
+	unknownsfx0x20 15, 227, 160, 4
+	unknownsfx0x20 4, 210, 144, 4
+	unknownsfx0x20 8, 209, 128, 4
+	endchannel
+
+
+SFX_Cry12_3_Ch2: ; 7cdb3 (1f:4db3)
+	dutycycle 238
+	unknownsfx0x20 11, 210, 56, 4
+	unknownsfx0x20 14, 198, 152, 4
+	unknownsfx0x20 3, 178, 136, 4
+	unknownsfx0x20 8, 177, 120, 4
+	endchannel
+
+
+SFX_Cry12_3_Ch3: ; 7cdc6 (1f:4dc6)
+	unknownnoise0x20 10, 230, 108
+	unknownnoise0x20 15, 210, 92
+	unknownnoise0x20 3, 194, 108
+	unknownnoise0x20 8, 209, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry13_1.asm
@@ -1,0 +1,30 @@
+SFX_Cry13_1_Ch1: ; 8d5e (2:4d5e)
+	dutycycle 51
+	unknownsfx0x20 15, 246, 192, 5
+	unknownsfx0x20 8, 227, 188, 5
+	unknownsfx0x20 6, 210, 208, 5
+	unknownsfx0x20 6, 178, 224, 5
+	unknownsfx0x20 6, 194, 240, 5
+	unknownsfx0x20 8, 177, 0, 6
+	endchannel
+
+
+SFX_Cry13_1_Ch2: ; 8d79 (2:4d79)
+	dutycycle 153
+	unknownsfx0x20 14, 198, 177, 4
+	unknownsfx0x20 7, 195, 173, 4
+	unknownsfx0x20 5, 178, 193, 4
+	unknownsfx0x20 8, 146, 209, 4
+	unknownsfx0x20 6, 162, 225, 4
+	unknownsfx0x20 8, 145, 241, 4
+	endchannel
+
+
+SFX_Cry13_1_Ch3: ; 8d94 (2:4d94)
+	unknownnoise0x20 10, 230, 92
+	unknownnoise0x20 10, 214, 108
+	unknownnoise0x20 4, 194, 76
+	unknownnoise0x20 6, 211, 92
+	unknownnoise0x20 8, 179, 76
+	unknownnoise0x20 8, 161, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry13_2.asm
@@ -1,0 +1,30 @@
+SFX_Cry13_2_Ch1: ; 21006 (8:5006)
+	dutycycle 51
+	unknownsfx0x20 15, 246, 192, 5
+	unknownsfx0x20 8, 227, 188, 5
+	unknownsfx0x20 6, 210, 208, 5
+	unknownsfx0x20 6, 178, 224, 5
+	unknownsfx0x20 6, 194, 240, 5
+	unknownsfx0x20 8, 177, 0, 6
+	endchannel
+
+
+SFX_Cry13_2_Ch2: ; 21021 (8:5021)
+	dutycycle 153
+	unknownsfx0x20 14, 198, 177, 4
+	unknownsfx0x20 7, 195, 173, 4
+	unknownsfx0x20 5, 178, 193, 4
+	unknownsfx0x20 8, 146, 209, 4
+	unknownsfx0x20 6, 162, 225, 4
+	unknownsfx0x20 8, 145, 241, 4
+	endchannel
+
+
+SFX_Cry13_2_Ch3: ; 2103c (8:503c)
+	unknownnoise0x20 10, 230, 92
+	unknownnoise0x20 10, 214, 108
+	unknownnoise0x20 4, 194, 76
+	unknownnoise0x20 6, 211, 92
+	unknownnoise0x20 8, 179, 76
+	unknownnoise0x20 8, 161, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry13_3.asm
@@ -1,0 +1,30 @@
+SFX_Cry13_3_Ch1: ; 7cdd3 (1f:4dd3)
+	dutycycle 51
+	unknownsfx0x20 15, 246, 192, 5
+	unknownsfx0x20 8, 227, 188, 5
+	unknownsfx0x20 6, 210, 208, 5
+	unknownsfx0x20 6, 178, 224, 5
+	unknownsfx0x20 6, 194, 240, 5
+	unknownsfx0x20 8, 177, 0, 6
+	endchannel
+
+
+SFX_Cry13_3_Ch2: ; 7cdee (1f:4dee)
+	dutycycle 153
+	unknownsfx0x20 14, 198, 177, 4
+	unknownsfx0x20 7, 195, 173, 4
+	unknownsfx0x20 5, 178, 193, 4
+	unknownsfx0x20 8, 146, 209, 4
+	unknownsfx0x20 6, 162, 225, 4
+	unknownsfx0x20 8, 145, 241, 4
+	endchannel
+
+
+SFX_Cry13_3_Ch3: ; 7ce09 (1f:4e09)
+	unknownnoise0x20 10, 230, 92
+	unknownnoise0x20 10, 214, 108
+	unknownnoise0x20 4, 194, 76
+	unknownnoise0x20 6, 211, 92
+	unknownnoise0x20 8, 179, 76
+	unknownnoise0x20 8, 161, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry14_1.asm
@@ -1,0 +1,21 @@
+SFX_Cry14_1_Ch1: ; 8da7 (2:4da7)
+	dutycycle 240
+	unknownsfx0x20 8, 228, 144, 7
+	unknownsfx0x20 15, 245, 192, 7
+	unknownsfx0x20 8, 209, 216, 7
+	endchannel
+
+
+SFX_Cry14_1_Ch2: ; 8db6 (2:4db6)
+	dutycycle 165
+	unknownsfx0x20 10, 196, 113, 7
+	unknownsfx0x20 15, 182, 162, 7
+	unknownsfx0x20 8, 161, 183, 7
+	endchannel
+
+
+SFX_Cry14_1_Ch3: ; 8dc5 (2:4dc5)
+	unknownnoise0x20 8, 228, 76
+	unknownnoise0x20 14, 196, 60
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry14_2.asm
@@ -1,0 +1,21 @@
+SFX_Cry14_2_Ch1: ; 2104f (8:504f)
+	dutycycle 240
+	unknownsfx0x20 8, 228, 144, 7
+	unknownsfx0x20 15, 245, 192, 7
+	unknownsfx0x20 8, 209, 216, 7
+	endchannel
+
+
+SFX_Cry14_2_Ch2: ; 2105e (8:505e)
+	dutycycle 165
+	unknownsfx0x20 10, 196, 113, 7
+	unknownsfx0x20 15, 182, 162, 7
+	unknownsfx0x20 8, 161, 183, 7
+	endchannel
+
+
+SFX_Cry14_2_Ch3: ; 2106d (8:506d)
+	unknownnoise0x20 8, 228, 76
+	unknownnoise0x20 14, 196, 60
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry14_3.asm
@@ -1,0 +1,21 @@
+SFX_Cry14_3_Ch1: ; 7ce1c (1f:4e1c)
+	dutycycle 240
+	unknownsfx0x20 8, 228, 144, 7
+	unknownsfx0x20 15, 245, 192, 7
+	unknownsfx0x20 8, 209, 216, 7
+	endchannel
+
+
+SFX_Cry14_3_Ch2: ; 7ce2b (1f:4e2b)
+	dutycycle 165
+	unknownsfx0x20 10, 196, 113, 7
+	unknownsfx0x20 15, 182, 162, 7
+	unknownsfx0x20 8, 161, 183, 7
+	endchannel
+
+
+SFX_Cry14_3_Ch3: ; 7ce3a (1f:4e3a)
+	unknownnoise0x20 8, 228, 76
+	unknownnoise0x20 14, 196, 60
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry15_1.asm
@@ -1,0 +1,30 @@
+SFX_Cry15_1_Ch1: ; 8e35 (2:4e35)
+	dutycycle 240
+	unknownsfx0x20 4, 243, 128, 7
+	unknownsfx0x20 15, 231, 0, 7
+	unknownsfx0x20 8, 211, 16, 7
+	unknownsfx0x20 4, 194, 0, 7
+	unknownsfx0x20 4, 210, 240, 6
+	unknownsfx0x20 8, 193, 224, 6
+	endchannel
+
+
+SFX_Cry15_1_Ch2: ; 8e50 (2:4e50)
+	dutycycle 90
+	unknownsfx0x20 6, 195, 1, 7
+	unknownsfx0x20 14, 183, 129, 6
+	unknownsfx0x20 7, 179, 146, 6
+	unknownsfx0x20 3, 162, 129, 6
+	unknownsfx0x20 4, 178, 114, 6
+	unknownsfx0x20 8, 161, 97, 6
+	endchannel
+
+
+SFX_Cry15_1_Ch3: ; 8e6b (2:4e6b)
+	unknownnoise0x20 6, 227, 92
+	unknownnoise0x20 14, 214, 76
+	unknownnoise0x20 6, 198, 60
+	unknownnoise0x20 3, 179, 76
+	unknownnoise0x20 3, 162, 92
+	unknownnoise0x20 8, 177, 108
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry15_2.asm
@@ -1,0 +1,30 @@
+SFX_Cry15_2_Ch1: ; 210dd (8:50dd)
+	dutycycle 240
+	unknownsfx0x20 4, 243, 128, 7
+	unknownsfx0x20 15, 231, 0, 7
+	unknownsfx0x20 8, 211, 16, 7
+	unknownsfx0x20 4, 194, 0, 7
+	unknownsfx0x20 4, 210, 240, 6
+	unknownsfx0x20 8, 193, 224, 6
+	endchannel
+
+
+SFX_Cry15_2_Ch2: ; 210f8 (8:50f8)
+	dutycycle 90
+	unknownsfx0x20 6, 195, 1, 7
+	unknownsfx0x20 14, 183, 129, 6
+	unknownsfx0x20 7, 179, 146, 6
+	unknownsfx0x20 3, 162, 129, 6
+	unknownsfx0x20 4, 178, 114, 6
+	unknownsfx0x20 8, 161, 97, 6
+	endchannel
+
+
+SFX_Cry15_2_Ch3: ; 21113 (8:5113)
+	unknownnoise0x20 6, 227, 92
+	unknownnoise0x20 14, 214, 76
+	unknownnoise0x20 6, 198, 60
+	unknownnoise0x20 3, 179, 76
+	unknownnoise0x20 3, 162, 92
+	unknownnoise0x20 8, 177, 108
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry15_3.asm
@@ -1,0 +1,30 @@
+SFX_Cry15_3_Ch1: ; 7ceaa (1f:4eaa)
+	dutycycle 240
+	unknownsfx0x20 4, 243, 128, 7
+	unknownsfx0x20 15, 231, 0, 7
+	unknownsfx0x20 8, 211, 16, 7
+	unknownsfx0x20 4, 194, 0, 7
+	unknownsfx0x20 4, 210, 240, 6
+	unknownsfx0x20 8, 193, 224, 6
+	endchannel
+
+
+SFX_Cry15_3_Ch2: ; 7cec5 (1f:4ec5)
+	dutycycle 90
+	unknownsfx0x20 6, 195, 1, 7
+	unknownsfx0x20 14, 183, 129, 6
+	unknownsfx0x20 7, 179, 146, 6
+	unknownsfx0x20 3, 162, 129, 6
+	unknownsfx0x20 4, 178, 114, 6
+	unknownsfx0x20 8, 161, 97, 6
+	endchannel
+
+
+SFX_Cry15_3_Ch3: ; 7cee0 (1f:4ee0)
+	unknownnoise0x20 6, 227, 92
+	unknownnoise0x20 14, 214, 76
+	unknownnoise0x20 6, 198, 60
+	unknownnoise0x20 3, 179, 76
+	unknownnoise0x20 3, 162, 92
+	unknownnoise0x20 8, 177, 108
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry16_1.asm
@@ -1,0 +1,21 @@
+SFX_Cry16_1_Ch1: ; 8cc8 (2:4cc8)
+	dutycycle 240
+	unknownsfx0x20 15, 215, 128, 7
+	unknownsfx0x20 4, 230, 160, 7
+	unknownsfx0x20 15, 210, 64, 7
+	endchannel
+
+
+SFX_Cry16_1_Ch2: ; 8cd7 (2:4cd7)
+	dutycycle 90
+	unknownsfx0x20 15, 199, 83, 7
+	unknownsfx0x20 5, 182, 114, 7
+	unknownsfx0x20 15, 194, 17, 7
+	endchannel
+
+
+SFX_Cry16_1_Ch3: ; 8ce6 (2:4ce6)
+	unknownnoise0x20 13, 246, 76
+	unknownnoise0x20 4, 230, 60
+	unknownnoise0x20 15, 242, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry16_2.asm
@@ -1,0 +1,21 @@
+SFX_Cry16_2_Ch1: ; 20f70 (8:4f70)
+	dutycycle 240
+	unknownsfx0x20 15, 215, 128, 7
+	unknownsfx0x20 4, 230, 160, 7
+	unknownsfx0x20 15, 210, 64, 7
+	endchannel
+
+
+SFX_Cry16_2_Ch2: ; 20f7f (8:4f7f)
+	dutycycle 90
+	unknownsfx0x20 15, 199, 83, 7
+	unknownsfx0x20 5, 182, 114, 7
+	unknownsfx0x20 15, 194, 17, 7
+	endchannel
+
+
+SFX_Cry16_2_Ch3: ; 20f8e (8:4f8e)
+	unknownnoise0x20 13, 246, 76
+	unknownnoise0x20 4, 230, 60
+	unknownnoise0x20 15, 242, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry16_3.asm
@@ -1,0 +1,21 @@
+SFX_Cry16_3_Ch1: ; 7cd3d (1f:4d3d)
+	dutycycle 240
+	unknownsfx0x20 15, 215, 128, 7
+	unknownsfx0x20 4, 230, 160, 7
+	unknownsfx0x20 15, 210, 64, 7
+	endchannel
+
+
+SFX_Cry16_3_Ch2: ; 7cd4c (1f:4d4c)
+	dutycycle 90
+	unknownsfx0x20 15, 199, 83, 7
+	unknownsfx0x20 5, 182, 114, 7
+	unknownsfx0x20 15, 194, 17, 7
+	endchannel
+
+
+SFX_Cry16_3_Ch3: ; 7cd5b (1f:4d5b)
+	unknownnoise0x20 13, 246, 76
+	unknownnoise0x20 4, 230, 60
+	unknownnoise0x20 15, 242, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry17_1.asm
@@ -1,0 +1,24 @@
+SFX_Cry17_1_Ch1: ; 8e7e (2:4e7e)
+	dutycycle 15
+	unknownsfx0x20 15, 247, 0, 5
+	unknownsfx0x20 15, 231, 8, 5
+	unknownsfx0x20 8, 180, 128, 4
+	unknownsfx0x20 15, 162, 96, 4
+	endchannel
+
+
+SFX_Cry17_1_Ch2: ; 8e91 (2:4e91)
+	dutycycle 68
+	unknownsfx0x20 14, 215, 129, 4
+	unknownsfx0x20 14, 199, 137, 4
+	unknownsfx0x20 10, 180, 1, 4
+	unknownsfx0x20 15, 194, 225, 3
+	endchannel
+
+
+SFX_Cry17_1_Ch3: ; 8ea4 (2:4ea4)
+	unknownnoise0x20 14, 247, 124
+	unknownnoise0x20 12, 246, 108
+	unknownnoise0x20 9, 228, 124
+	unknownnoise0x20 15, 226, 108
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry17_2.asm
@@ -1,0 +1,24 @@
+SFX_Cry17_2_Ch1: ; 21126 (8:5126)
+	dutycycle 15
+	unknownsfx0x20 15, 247, 0, 5
+	unknownsfx0x20 15, 231, 8, 5
+	unknownsfx0x20 8, 180, 128, 4
+	unknownsfx0x20 15, 162, 96, 4
+	endchannel
+
+
+SFX_Cry17_2_Ch2: ; 21139 (8:5139)
+	dutycycle 68
+	unknownsfx0x20 14, 215, 129, 4
+	unknownsfx0x20 14, 199, 137, 4
+	unknownsfx0x20 10, 180, 1, 4
+	unknownsfx0x20 15, 194, 225, 3
+	endchannel
+
+
+SFX_Cry17_2_Ch3: ; 2114c (8:514c)
+	unknownnoise0x20 14, 247, 124
+	unknownnoise0x20 12, 246, 108
+	unknownnoise0x20 9, 228, 124
+	unknownnoise0x20 15, 226, 108
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry17_3.asm
@@ -1,0 +1,24 @@
+SFX_Cry17_3_Ch1: ; 7cef3 (1f:4ef3)
+	dutycycle 15
+	unknownsfx0x20 15, 247, 0, 5
+	unknownsfx0x20 15, 231, 8, 5
+	unknownsfx0x20 8, 180, 128, 4
+	unknownsfx0x20 15, 162, 96, 4
+	endchannel
+
+
+SFX_Cry17_3_Ch2: ; 7cf06 (1f:4f06)
+	dutycycle 68
+	unknownsfx0x20 14, 215, 129, 4
+	unknownsfx0x20 14, 199, 137, 4
+	unknownsfx0x20 10, 180, 1, 4
+	unknownsfx0x20 15, 194, 225, 3
+	endchannel
+
+
+SFX_Cry17_3_Ch3: ; 7cf19 (1f:4f19)
+	unknownnoise0x20 14, 247, 124
+	unknownnoise0x20 12, 246, 108
+	unknownnoise0x20 9, 228, 124
+	unknownnoise0x20 15, 226, 108
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry18_1.asm
@@ -1,0 +1,34 @@
+SFX_Cry18_1_Ch1: ; 8f8e (2:4f8e)
+	dutycycle 80
+	unknownsfx0x20 10, 245, 128, 6
+	unknownsfx0x20 3, 226, 160, 6
+	unknownsfx0x20 3, 242, 192, 6
+	unknownsfx0x20 3, 226, 224, 6
+	unknownsfx0x20 3, 210, 0, 7
+	unknownsfx0x20 3, 194, 224, 6
+	unknownsfx0x20 3, 210, 192, 6
+	unknownsfx0x20 8, 193, 160, 6
+	endchannel
+
+
+SFX_Cry18_1_Ch2: ; 8fb1 (2:4fb1)
+	dutycycle 15
+	unknownsfx0x20 9, 213, 49, 6
+	unknownsfx0x20 3, 210, 82, 6
+	unknownsfx0x20 3, 226, 113, 6
+	unknownsfx0x20 3, 178, 145, 6
+	unknownsfx0x20 3, 194, 178, 6
+	unknownsfx0x20 3, 178, 145, 6
+	unknownsfx0x20 3, 194, 113, 6
+	unknownsfx0x20 8, 177, 81, 6
+	endchannel
+
+
+SFX_Cry18_1_Ch3: ; 8fd4 (2:4fd4)
+	unknownnoise0x20 6, 227, 76
+	unknownnoise0x20 4, 195, 60
+	unknownnoise0x20 5, 212, 60
+	unknownnoise0x20 4, 196, 44
+	unknownnoise0x20 6, 180, 60
+	unknownnoise0x20 8, 193, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry18_2.asm
@@ -1,0 +1,34 @@
+SFX_Cry18_2_Ch1: ; 21236 (8:5236)
+	dutycycle 80
+	unknownsfx0x20 10, 245, 128, 6
+	unknownsfx0x20 3, 226, 160, 6
+	unknownsfx0x20 3, 242, 192, 6
+	unknownsfx0x20 3, 226, 224, 6
+	unknownsfx0x20 3, 210, 0, 7
+	unknownsfx0x20 3, 194, 224, 6
+	unknownsfx0x20 3, 210, 192, 6
+	unknownsfx0x20 8, 193, 160, 6
+	endchannel
+
+
+SFX_Cry18_2_Ch2: ; 21259 (8:5259)
+	dutycycle 15
+	unknownsfx0x20 9, 213, 49, 6
+	unknownsfx0x20 3, 210, 82, 6
+	unknownsfx0x20 3, 226, 113, 6
+	unknownsfx0x20 3, 178, 145, 6
+	unknownsfx0x20 3, 194, 178, 6
+	unknownsfx0x20 3, 178, 145, 6
+	unknownsfx0x20 3, 194, 113, 6
+	unknownsfx0x20 8, 177, 81, 6
+	endchannel
+
+
+SFX_Cry18_2_Ch3: ; 2127c (8:527c)
+	unknownnoise0x20 6, 227, 76
+	unknownnoise0x20 4, 195, 60
+	unknownnoise0x20 5, 212, 60
+	unknownnoise0x20 4, 196, 44
+	unknownnoise0x20 6, 180, 60
+	unknownnoise0x20 8, 193, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry18_3.asm
@@ -1,0 +1,34 @@
+SFX_Cry18_3_Ch1: ; 7d003 (1f:5003)
+	dutycycle 80
+	unknownsfx0x20 10, 245, 128, 6
+	unknownsfx0x20 3, 226, 160, 6
+	unknownsfx0x20 3, 242, 192, 6
+	unknownsfx0x20 3, 226, 224, 6
+	unknownsfx0x20 3, 210, 0, 7
+	unknownsfx0x20 3, 194, 224, 6
+	unknownsfx0x20 3, 210, 192, 6
+	unknownsfx0x20 8, 193, 160, 6
+	endchannel
+
+
+SFX_Cry18_3_Ch2: ; 7d026 (1f:5026)
+	dutycycle 15
+	unknownsfx0x20 9, 213, 49, 6
+	unknownsfx0x20 3, 210, 82, 6
+	unknownsfx0x20 3, 226, 113, 6
+	unknownsfx0x20 3, 178, 145, 6
+	unknownsfx0x20 3, 194, 178, 6
+	unknownsfx0x20 3, 178, 145, 6
+	unknownsfx0x20 3, 194, 113, 6
+	unknownsfx0x20 8, 177, 81, 6
+	endchannel
+
+
+SFX_Cry18_3_Ch3: ; 7d049 (1f:5049)
+	unknownnoise0x20 6, 227, 76
+	unknownnoise0x20 4, 195, 60
+	unknownnoise0x20 5, 212, 60
+	unknownnoise0x20 4, 196, 44
+	unknownnoise0x20 6, 180, 60
+	unknownnoise0x20 8, 193, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry19_1.asm
@@ -1,0 +1,18 @@
+SFX_Cry19_1_Ch1: ; 8ca6 (2:4ca6)
+	dutycycle 27
+	unknownsfx0x20 7, 210, 64, 7
+	unknownsfx0x20 15, 229, 96, 7
+	unknownsfx0x20 15, 193, 48, 7
+	endchannel
+
+
+SFX_Cry19_1_Ch2: ; 8cb5 (2:4cb5)
+	dutycycle 129
+	unknownsfx0x20 2, 194, 1, 7
+	unknownsfx0x20 4, 194, 8, 7
+	unknownsfx0x20 15, 215, 65, 7
+	unknownsfx0x20 15, 162, 1, 7
+
+
+SFX_Cry19_1_Ch3: ; 8cc7 (2:4cc7)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry19_2.asm
@@ -1,0 +1,18 @@
+SFX_Cry19_2_Ch1: ; 20f4e (8:4f4e)
+	dutycycle 27
+	unknownsfx0x20 7, 210, 64, 7
+	unknownsfx0x20 15, 229, 96, 7
+	unknownsfx0x20 15, 193, 48, 7
+	endchannel
+
+
+SFX_Cry19_2_Ch2: ; 20f5d (8:4f5d)
+	dutycycle 129
+	unknownsfx0x20 2, 194, 1, 7
+	unknownsfx0x20 4, 194, 8, 7
+	unknownsfx0x20 15, 215, 65, 7
+	unknownsfx0x20 15, 162, 1, 7
+
+
+SFX_Cry19_2_Ch3: ; 20f6f (8:4f6f)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry19_3.asm
@@ -1,0 +1,18 @@
+SFX_Cry19_3_Ch1: ; 7cd1b (1f:4d1b)
+	dutycycle 27
+	unknownsfx0x20 7, 210, 64, 7
+	unknownsfx0x20 15, 229, 96, 7
+	unknownsfx0x20 15, 193, 48, 7
+	endchannel
+
+
+SFX_Cry19_3_Ch2: ; 7cd2a (1f:4d2a)
+	dutycycle 129
+	unknownsfx0x20 2, 194, 1, 7
+	unknownsfx0x20 4, 194, 8, 7
+	unknownsfx0x20 15, 215, 65, 7
+	unknownsfx0x20 15, 162, 1, 7
+
+
+SFX_Cry19_3_Ch3: ; 7cd3c (1f:4d3c)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1a_1.asm
@@ -1,0 +1,30 @@
+SFX_Cry1A_1_Ch1: ; 8eff (2:4eff)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 64, 7
+	unknownsfx0x20 12, 230, 68, 7
+	unknownsfx0x20 6, 213, 80, 7
+	unknownsfx0x20 4, 195, 96, 7
+	unknownsfx0x20 3, 195, 128, 7
+	unknownsfx0x20 8, 209, 160, 7
+	endchannel
+
+
+SFX_Cry1A_1_Ch2: ; 8f1a (2:4f1a)
+	dutycycle 10
+	unknownsfx0x20 6, 199, 1, 7
+	unknownsfx0x20 11, 182, 2, 7
+	unknownsfx0x20 6, 165, 17, 7
+	unknownsfx0x20 4, 147, 33, 7
+	unknownsfx0x20 3, 163, 65, 7
+	unknownsfx0x20 8, 145, 98, 7
+	endchannel
+
+
+SFX_Cry1A_1_Ch3: ; 8f35 (2:4f35)
+	unknownnoise0x20 3, 226, 60
+	unknownnoise0x20 8, 214, 76
+	unknownnoise0x20 5, 212, 60
+	unknownnoise0x20 12, 199, 76
+	unknownnoise0x20 2, 226, 60
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1a_2.asm
@@ -1,0 +1,30 @@
+SFX_Cry1A_2_Ch1: ; 211a7 (8:51a7)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 64, 7
+	unknownsfx0x20 12, 230, 68, 7
+	unknownsfx0x20 6, 213, 80, 7
+	unknownsfx0x20 4, 195, 96, 7
+	unknownsfx0x20 3, 195, 128, 7
+	unknownsfx0x20 8, 209, 160, 7
+	endchannel
+
+
+SFX_Cry1A_2_Ch2: ; 211c2 (8:51c2)
+	dutycycle 10
+	unknownsfx0x20 6, 199, 1, 7
+	unknownsfx0x20 11, 182, 2, 7
+	unknownsfx0x20 6, 165, 17, 7
+	unknownsfx0x20 4, 147, 33, 7
+	unknownsfx0x20 3, 163, 65, 7
+	unknownsfx0x20 8, 145, 98, 7
+	endchannel
+
+
+SFX_Cry1A_2_Ch3: ; 211dd (8:51dd)
+	unknownnoise0x20 3, 226, 60
+	unknownnoise0x20 8, 214, 76
+	unknownnoise0x20 5, 212, 60
+	unknownnoise0x20 12, 199, 76
+	unknownnoise0x20 2, 226, 60
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1a_3.asm
@@ -1,0 +1,30 @@
+SFX_Cry1A_3_Ch1: ; 7cf74 (1f:4f74)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 64, 7
+	unknownsfx0x20 12, 230, 68, 7
+	unknownsfx0x20 6, 213, 80, 7
+	unknownsfx0x20 4, 195, 96, 7
+	unknownsfx0x20 3, 195, 128, 7
+	unknownsfx0x20 8, 209, 160, 7
+	endchannel
+
+
+SFX_Cry1A_3_Ch2: ; 7cf8f (1f:4f8f)
+	dutycycle 10
+	unknownsfx0x20 6, 199, 1, 7
+	unknownsfx0x20 11, 182, 2, 7
+	unknownsfx0x20 6, 165, 17, 7
+	unknownsfx0x20 4, 147, 33, 7
+	unknownsfx0x20 3, 163, 65, 7
+	unknownsfx0x20 8, 145, 98, 7
+	endchannel
+
+
+SFX_Cry1A_3_Ch3: ; 7cfaa (1f:4faa)
+	unknownnoise0x20 3, 226, 60
+	unknownnoise0x20 8, 214, 76
+	unknownnoise0x20 5, 212, 60
+	unknownnoise0x20 12, 199, 76
+	unknownnoise0x20 2, 226, 60
+	unknownnoise0x20 8, 209, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1b_1.asm
@@ -1,0 +1,26 @@
+SFX_Cry1B_1_Ch1: ; 8cf0 (2:4cf0)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 192, 6
+	unknownsfx0x20 15, 231, 0, 7
+	unknownsfx0x20 4, 244, 240, 6
+	unknownsfx0x20 4, 228, 224, 6
+	unknownsfx0x20 8, 209, 208, 6
+	endchannel
+
+
+SFX_Cry1B_1_Ch2: ; 8d07 (2:4d07)
+	dutycycle 10
+	unknownsfx0x20 7, 230, 129, 6
+	unknownsfx0x20 14, 213, 193, 6
+	unknownsfx0x20 4, 196, 177, 6
+	unknownsfx0x20 4, 212, 161, 6
+	unknownsfx0x20 8, 193, 145, 6
+	endchannel
+
+
+SFX_Cry1B_1_Ch3: ; 8d1e (2:4d1e)
+	unknownnoise0x20 10, 166, 60
+	unknownnoise0x20 14, 148, 44
+	unknownnoise0x20 5, 163, 60
+	unknownnoise0x20 8, 145, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1b_2.asm
@@ -1,0 +1,26 @@
+SFX_Cry1B_2_Ch1: ; 20f98 (8:4f98)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 192, 6
+	unknownsfx0x20 15, 231, 0, 7
+	unknownsfx0x20 4, 244, 240, 6
+	unknownsfx0x20 4, 228, 224, 6
+	unknownsfx0x20 8, 209, 208, 6
+	endchannel
+
+
+SFX_Cry1B_2_Ch2: ; 20faf (8:4faf)
+	dutycycle 10
+	unknownsfx0x20 7, 230, 129, 6
+	unknownsfx0x20 14, 213, 193, 6
+	unknownsfx0x20 4, 196, 177, 6
+	unknownsfx0x20 4, 212, 161, 6
+	unknownsfx0x20 8, 193, 145, 6
+	endchannel
+
+
+SFX_Cry1B_2_Ch3: ; 20fc6 (8:4fc6)
+	unknownnoise0x20 10, 166, 60
+	unknownnoise0x20 14, 148, 44
+	unknownnoise0x20 5, 163, 60
+	unknownnoise0x20 8, 145, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1b_3.asm
@@ -1,0 +1,26 @@
+SFX_Cry1B_3_Ch1: ; 7cd65 (1f:4d65)
+	dutycycle 240
+	unknownsfx0x20 6, 247, 192, 6
+	unknownsfx0x20 15, 231, 0, 7
+	unknownsfx0x20 4, 244, 240, 6
+	unknownsfx0x20 4, 228, 224, 6
+	unknownsfx0x20 8, 209, 208, 6
+	endchannel
+
+
+SFX_Cry1B_3_Ch2: ; 7cd7c (1f:4d7c)
+	dutycycle 10
+	unknownsfx0x20 7, 230, 129, 6
+	unknownsfx0x20 14, 213, 193, 6
+	unknownsfx0x20 4, 196, 177, 6
+	unknownsfx0x20 4, 212, 161, 6
+	unknownsfx0x20 8, 193, 145, 6
+	endchannel
+
+
+SFX_Cry1B_3_Ch3: ; 7cd93 (1f:4d93)
+	unknownnoise0x20 10, 166, 60
+	unknownnoise0x20 14, 148, 44
+	unknownnoise0x20 5, 163, 60
+	unknownnoise0x20 8, 145, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1c_1.asm
@@ -1,0 +1,31 @@
+SFX_Cry1C_1_Ch1: ; 8eb1 (2:4eb1)
+	dutycycle 245
+	unknownsfx0x20 7, 214, 225, 7
+	unknownsfx0x20 6, 198, 226, 7
+	unknownsfx0x20 9, 214, 225, 7
+	unknownsfx0x20 7, 198, 224, 7
+	unknownsfx0x20 5, 182, 226, 7
+	unknownsfx0x20 7, 198, 225, 7
+	unknownsfx0x20 6, 182, 224, 7
+	unknownsfx0x20 8, 161, 223, 7
+	endchannel
+
+
+SFX_Cry1C_1_Ch2: ; 8ed4 (2:4ed4)
+	dutycycle 68
+	unknownsfx0x20 6, 195, 201, 7
+	unknownsfx0x20 6, 179, 199, 7
+	unknownsfx0x20 10, 196, 195, 7
+	unknownsfx0x20 8, 180, 199, 7
+	unknownsfx0x20 6, 195, 201, 7
+	unknownsfx0x20 15, 162, 197, 7
+	endchannel
+
+
+SFX_Cry1C_1_Ch3: ; 8eef (2:4eef)
+	unknownnoise0x20 13, 25, 124
+	unknownnoise0x20 13, 247, 140
+	unknownnoise0x20 12, 214, 124
+	unknownnoise0x20 8, 196, 108
+	unknownnoise0x20 15, 179, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1c_2.asm
@@ -1,0 +1,31 @@
+SFX_Cry1C_2_Ch1: ; 21159 (8:5159)
+	dutycycle 245
+	unknownsfx0x20 7, 214, 225, 7
+	unknownsfx0x20 6, 198, 226, 7
+	unknownsfx0x20 9, 214, 225, 7
+	unknownsfx0x20 7, 198, 224, 7
+	unknownsfx0x20 5, 182, 226, 7
+	unknownsfx0x20 7, 198, 225, 7
+	unknownsfx0x20 6, 182, 224, 7
+	unknownsfx0x20 8, 161, 223, 7
+	endchannel
+
+
+SFX_Cry1C_2_Ch2: ; 2117c (8:517c)
+	dutycycle 68
+	unknownsfx0x20 6, 195, 201, 7
+	unknownsfx0x20 6, 179, 199, 7
+	unknownsfx0x20 10, 196, 195, 7
+	unknownsfx0x20 8, 180, 199, 7
+	unknownsfx0x20 6, 195, 201, 7
+	unknownsfx0x20 15, 162, 197, 7
+	endchannel
+
+
+SFX_Cry1C_2_Ch3: ; 21197 (8:5197)
+	unknownnoise0x20 13, 25, 124
+	unknownnoise0x20 13, 247, 140
+	unknownnoise0x20 12, 214, 124
+	unknownnoise0x20 8, 196, 108
+	unknownnoise0x20 15, 179, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1c_3.asm
@@ -1,0 +1,31 @@
+SFX_Cry1C_3_Ch1: ; 7cf26 (1f:4f26)
+	dutycycle 245
+	unknownsfx0x20 7, 214, 225, 7
+	unknownsfx0x20 6, 198, 226, 7
+	unknownsfx0x20 9, 214, 225, 7
+	unknownsfx0x20 7, 198, 224, 7
+	unknownsfx0x20 5, 182, 226, 7
+	unknownsfx0x20 7, 198, 225, 7
+	unknownsfx0x20 6, 182, 224, 7
+	unknownsfx0x20 8, 161, 223, 7
+	endchannel
+
+
+SFX_Cry1C_3_Ch2: ; 7cf49 (1f:4f49)
+	dutycycle 68
+	unknownsfx0x20 6, 195, 201, 7
+	unknownsfx0x20 6, 179, 199, 7
+	unknownsfx0x20 10, 196, 195, 7
+	unknownsfx0x20 8, 180, 199, 7
+	unknownsfx0x20 6, 195, 201, 7
+	unknownsfx0x20 15, 162, 197, 7
+	endchannel
+
+
+SFX_Cry1C_3_Ch3: ; 7cf64 (1f:4f64)
+	unknownnoise0x20 13, 25, 124
+	unknownnoise0x20 13, 247, 140
+	unknownnoise0x20 12, 214, 124
+	unknownnoise0x20 8, 196, 108
+	unknownnoise0x20 15, 179, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1d_1.asm
@@ -1,0 +1,29 @@
+SFX_Cry1D_1_Ch1: ; 8f48 (2:4f48)
+	dutycycle 244
+	unknownsfx0x20 15, 240, 5, 7
+	unknownsfx0x20 10, 224, 0, 7
+	unknownsfx0x20 6, 180, 16, 7
+	unknownsfx0x20 4, 211, 0, 7
+	unknownsfx0x20 6, 178, 32, 6
+	unknownsfx0x20 8, 161, 36, 6
+	endchannel
+
+
+SFX_Cry1D_1_Ch2: ; 8f63 (2:4f63)
+	dutycycle 34
+	unknownsfx0x20 15, 176, 195, 6
+	unknownsfx0x20 10, 160, 193, 6
+	unknownsfx0x20 6, 132, 210, 6
+	unknownsfx0x20 4, 147, 193, 6
+	unknownsfx0x20 6, 130, 225, 5
+	unknownsfx0x20 8, 97, 232, 5
+	endchannel
+
+
+SFX_Cry1D_1_Ch3: ; 8f7e (2:4f7e)
+	unknownnoise0x20 6, 230, 76
+	unknownnoise0x20 15, 214, 60
+	unknownnoise0x20 10, 197, 74
+	unknownnoise0x20 1, 178, 91
+	unknownnoise0x20 15, 194, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1d_2.asm
@@ -1,0 +1,29 @@
+SFX_Cry1D_2_Ch1: ; 211f0 (8:51f0)
+	dutycycle 244
+	unknownsfx0x20 15, 240, 5, 7
+	unknownsfx0x20 10, 224, 0, 7
+	unknownsfx0x20 6, 180, 16, 7
+	unknownsfx0x20 4, 211, 0, 7
+	unknownsfx0x20 6, 178, 32, 6
+	unknownsfx0x20 8, 161, 36, 6
+	endchannel
+
+
+SFX_Cry1D_2_Ch2: ; 2120b (8:520b)
+	dutycycle 34
+	unknownsfx0x20 15, 176, 195, 6
+	unknownsfx0x20 10, 160, 193, 6
+	unknownsfx0x20 6, 132, 210, 6
+	unknownsfx0x20 4, 147, 193, 6
+	unknownsfx0x20 6, 130, 225, 5
+	unknownsfx0x20 8, 97, 232, 5
+	endchannel
+
+
+SFX_Cry1D_2_Ch3: ; 21226 (8:5226)
+	unknownnoise0x20 6, 230, 76
+	unknownnoise0x20 15, 214, 60
+	unknownnoise0x20 10, 197, 74
+	unknownnoise0x20 1, 178, 91
+	unknownnoise0x20 15, 194, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1d_3.asm
@@ -1,0 +1,29 @@
+SFX_Cry1D_3_Ch1: ; 7cfbd (1f:4fbd)
+	dutycycle 244
+	unknownsfx0x20 15, 240, 5, 7
+	unknownsfx0x20 10, 224, 0, 7
+	unknownsfx0x20 6, 180, 16, 7
+	unknownsfx0x20 4, 211, 0, 7
+	unknownsfx0x20 6, 178, 32, 6
+	unknownsfx0x20 8, 161, 36, 6
+	endchannel
+
+
+SFX_Cry1D_3_Ch2: ; 7cfd8 (1f:4fd8)
+	dutycycle 34
+	unknownsfx0x20 15, 176, 195, 6
+	unknownsfx0x20 10, 160, 193, 6
+	unknownsfx0x20 6, 132, 210, 6
+	unknownsfx0x20 4, 147, 193, 6
+	unknownsfx0x20 6, 130, 225, 5
+	unknownsfx0x20 8, 97, 232, 5
+	endchannel
+
+
+SFX_Cry1D_3_Ch3: ; 7cff3 (1f:4ff3)
+	unknownnoise0x20 6, 230, 76
+	unknownnoise0x20 15, 214, 60
+	unknownnoise0x20 10, 197, 74
+	unknownnoise0x20 1, 178, 91
+	unknownnoise0x20 15, 194, 76
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1e_1.asm
@@ -1,0 +1,38 @@
+SFX_Cry1E_1_Ch1: ; 8dcf (2:4dcf)
+	dutycycle 240
+	unknownsfx0x20 6, 242, 0, 6
+	unknownsfx0x20 6, 226, 64, 6
+	unknownsfx0x20 6, 210, 128, 6
+	unknownsfx0x20 6, 226, 192, 6
+	unknownsfx0x20 6, 210, 0, 7
+	unknownsfx0x20 6, 194, 64, 7
+	unknownsfx0x20 6, 178, 128, 7
+	unknownsfx0x20 8, 161, 192, 7
+	endchannel
+
+
+SFX_Cry1E_1_Ch2: ; 8df2 (2:4df2)
+	dutycycle 17
+	unknownsfx0x20 3, 8, 1, 0
+	unknownsfx0x20 6, 194, 193, 5
+	unknownsfx0x20 6, 178, 2, 6
+	unknownsfx0x20 6, 162, 65, 6
+	unknownsfx0x20 6, 178, 130, 6
+	unknownsfx0x20 6, 162, 194, 6
+	unknownsfx0x20 6, 146, 1, 7
+	unknownsfx0x20 6, 162, 66, 7
+	unknownsfx0x20 8, 129, 129, 7
+	endchannel
+
+
+SFX_Cry1E_1_Ch3: ; 8e19 (2:4e19)
+	unknownnoise0x20 6, 8, 1
+	unknownnoise0x20 5, 226, 92
+	unknownnoise0x20 5, 194, 76
+	unknownnoise0x20 5, 210, 60
+	unknownnoise0x20 5, 178, 44
+	unknownnoise0x20 5, 194, 28
+	unknownnoise0x20 5, 162, 27
+	unknownnoise0x20 5, 146, 26
+	unknownnoise0x20 8, 129, 24
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1e_2.asm
@@ -1,0 +1,38 @@
+SFX_Cry1E_2_Ch1: ; 21077 (8:5077)
+	dutycycle 240
+	unknownsfx0x20 6, 242, 0, 6
+	unknownsfx0x20 6, 226, 64, 6
+	unknownsfx0x20 6, 210, 128, 6
+	unknownsfx0x20 6, 226, 192, 6
+	unknownsfx0x20 6, 210, 0, 7
+	unknownsfx0x20 6, 194, 64, 7
+	unknownsfx0x20 6, 178, 128, 7
+	unknownsfx0x20 8, 161, 192, 7
+	endchannel
+
+
+SFX_Cry1E_2_Ch2: ; 2109a (8:509a)
+	dutycycle 17
+	unknownsfx0x20 3, 8, 1, 0
+	unknownsfx0x20 6, 194, 193, 5
+	unknownsfx0x20 6, 178, 2, 6
+	unknownsfx0x20 6, 162, 65, 6
+	unknownsfx0x20 6, 178, 130, 6
+	unknownsfx0x20 6, 162, 194, 6
+	unknownsfx0x20 6, 146, 1, 7
+	unknownsfx0x20 6, 162, 66, 7
+	unknownsfx0x20 8, 129, 129, 7
+	endchannel
+
+
+SFX_Cry1E_2_Ch3: ; 210c1 (8:50c1)
+	unknownnoise0x20 6, 8, 1
+	unknownnoise0x20 5, 226, 92
+	unknownnoise0x20 5, 194, 76
+	unknownnoise0x20 5, 210, 60
+	unknownnoise0x20 5, 178, 44
+	unknownnoise0x20 5, 194, 28
+	unknownnoise0x20 5, 162, 27
+	unknownnoise0x20 5, 146, 26
+	unknownnoise0x20 8, 129, 24
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1e_3.asm
@@ -1,0 +1,38 @@
+SFX_Cry1E_3_Ch1: ; 7ce44 (1f:4e44)
+	dutycycle 240
+	unknownsfx0x20 6, 242, 0, 6
+	unknownsfx0x20 6, 226, 64, 6
+	unknownsfx0x20 6, 210, 128, 6
+	unknownsfx0x20 6, 226, 192, 6
+	unknownsfx0x20 6, 210, 0, 7
+	unknownsfx0x20 6, 194, 64, 7
+	unknownsfx0x20 6, 178, 128, 7
+	unknownsfx0x20 8, 161, 192, 7
+	endchannel
+
+
+SFX_Cry1E_3_Ch2: ; 7ce67 (1f:4e67)
+	dutycycle 17
+	unknownsfx0x20 3, 8, 1, 0
+	unknownsfx0x20 6, 194, 193, 5
+	unknownsfx0x20 6, 178, 2, 6
+	unknownsfx0x20 6, 162, 65, 6
+	unknownsfx0x20 6, 178, 130, 6
+	unknownsfx0x20 6, 162, 194, 6
+	unknownsfx0x20 6, 146, 1, 7
+	unknownsfx0x20 6, 162, 66, 7
+	unknownsfx0x20 8, 129, 129, 7
+	endchannel
+
+
+SFX_Cry1E_3_Ch3: ; 7ce8e (1f:4e8e)
+	unknownnoise0x20 6, 8, 1
+	unknownnoise0x20 5, 226, 92
+	unknownnoise0x20 5, 194, 76
+	unknownnoise0x20 5, 210, 60
+	unknownnoise0x20 5, 178, 44
+	unknownnoise0x20 5, 194, 28
+	unknownnoise0x20 5, 162, 27
+	unknownnoise0x20 5, 146, 26
+	unknownnoise0x20 8, 129, 24
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1f_1.asm
@@ -1,0 +1,24 @@
+SFX_Cry1F_1_Ch1: ; 8fe7 (2:4fe7)
+	dutycycle 165
+	unknownsfx0x20 3, 244, 65, 6
+	unknownsfx0x20 13, 214, 33, 7
+	unknownsfx0x20 8, 244, 25, 7
+	unknownsfx0x20 8, 193, 26, 7
+	endchannel
+
+
+SFX_Cry1F_1_Ch2: ; 8ffa (2:4ffa)
+	dutycycle 204
+	unknownsfx0x20 4, 244, 128, 5
+	unknownsfx0x20 14, 230, 224, 6
+	unknownsfx0x20 8, 213, 216, 6
+	unknownsfx0x20 8, 209, 220, 6
+	endchannel
+
+
+SFX_Cry1F_1_Ch3: ; 900d (2:500d)
+	unknownnoise0x20 5, 196, 70
+	unknownnoise0x20 13, 165, 68
+	unknownnoise0x20 8, 196, 69
+	unknownnoise0x20 8, 177, 68
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1f_2.asm
@@ -1,0 +1,24 @@
+SFX_Cry1F_2_Ch1: ; 2128f (8:528f)
+	dutycycle 165
+	unknownsfx0x20 3, 244, 65, 6
+	unknownsfx0x20 13, 214, 33, 7
+	unknownsfx0x20 8, 244, 25, 7
+	unknownsfx0x20 8, 193, 26, 7
+	endchannel
+
+
+SFX_Cry1F_2_Ch2: ; 212a2 (8:52a2)
+	dutycycle 204
+	unknownsfx0x20 4, 244, 128, 5
+	unknownsfx0x20 14, 230, 224, 6
+	unknownsfx0x20 8, 213, 216, 6
+	unknownsfx0x20 8, 209, 220, 6
+	endchannel
+
+
+SFX_Cry1F_2_Ch3: ; 212b5 (8:52b5)
+	unknownnoise0x20 5, 196, 70
+	unknownnoise0x20 13, 165, 68
+	unknownnoise0x20 8, 196, 69
+	unknownnoise0x20 8, 177, 68
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry1f_3.asm
@@ -1,0 +1,24 @@
+SFX_Cry1F_3_Ch1: ; 7d05c (1f:505c)
+	dutycycle 165
+	unknownsfx0x20 3, 244, 65, 6
+	unknownsfx0x20 13, 214, 33, 7
+	unknownsfx0x20 8, 244, 25, 7
+	unknownsfx0x20 8, 193, 26, 7
+	endchannel
+
+
+SFX_Cry1F_3_Ch2: ; 7d06f (1f:506f)
+	dutycycle 204
+	unknownsfx0x20 4, 244, 128, 5
+	unknownsfx0x20 14, 230, 224, 6
+	unknownsfx0x20 8, 213, 216, 6
+	unknownsfx0x20 8, 209, 220, 6
+	endchannel
+
+
+SFX_Cry1F_3_Ch3: ; 7d082 (1f:5082)
+	unknownnoise0x20 5, 196, 70
+	unknownnoise0x20 13, 165, 68
+	unknownnoise0x20 8, 196, 69
+	unknownnoise0x20 8, 177, 68
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry20_1.asm
@@ -1,0 +1,24 @@
+SFX_Cry20_1_Ch1: ; 901a (2:501a)
+	dutycycle 240
+	unknownsfx0x20 13, 241, 17, 5
+	unknownsfx0x20 13, 225, 21, 5
+	unknownsfx0x20 13, 225, 17, 5
+	unknownsfx0x20 8, 209, 17, 5
+	endchannel
+
+
+SFX_Cry20_1_Ch2: ; 902d (2:502d)
+	dutycycle 21
+	unknownsfx0x20 12, 225, 12, 5
+	unknownsfx0x20 12, 209, 16, 5
+	unknownsfx0x20 14, 193, 12, 5
+	unknownsfx0x20 8, 193, 10, 5
+	endchannel
+
+
+SFX_Cry20_1_Ch3: ; 9040 (2:5040)
+	unknownnoise0x20 14, 242, 101
+	unknownnoise0x20 13, 226, 85
+	unknownnoise0x20 14, 210, 86
+	unknownnoise0x20 8, 209, 102
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry20_2.asm
@@ -1,0 +1,24 @@
+SFX_Cry20_2_Ch1: ; 212c2 (8:52c2)
+	dutycycle 240
+	unknownsfx0x20 13, 241, 17, 5
+	unknownsfx0x20 13, 225, 21, 5
+	unknownsfx0x20 13, 225, 17, 5
+	unknownsfx0x20 8, 209, 17, 5
+	endchannel
+
+
+SFX_Cry20_2_Ch2: ; 212d5 (8:52d5)
+	dutycycle 21
+	unknownsfx0x20 12, 225, 12, 5
+	unknownsfx0x20 12, 209, 16, 5
+	unknownsfx0x20 14, 193, 12, 5
+	unknownsfx0x20 8, 193, 10, 5
+	endchannel
+
+
+SFX_Cry20_2_Ch3: ; 212e8 (8:52e8)
+	unknownnoise0x20 14, 242, 101
+	unknownnoise0x20 13, 226, 85
+	unknownnoise0x20 14, 210, 86
+	unknownnoise0x20 8, 209, 102
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry20_3.asm
@@ -1,0 +1,24 @@
+SFX_Cry20_3_Ch1: ; 7d08f (1f:508f)
+	dutycycle 240
+	unknownsfx0x20 13, 241, 17, 5
+	unknownsfx0x20 13, 225, 21, 5
+	unknownsfx0x20 13, 225, 17, 5
+	unknownsfx0x20 8, 209, 17, 5
+	endchannel
+
+
+SFX_Cry20_3_Ch2: ; 7d0a2 (1f:50a2)
+	dutycycle 21
+	unknownsfx0x20 12, 225, 12, 5
+	unknownsfx0x20 12, 209, 16, 5
+	unknownsfx0x20 14, 193, 12, 5
+	unknownsfx0x20 8, 193, 10, 5
+	endchannel
+
+
+SFX_Cry20_3_Ch3: ; 7d0b5 (1f:50b5)
+	unknownnoise0x20 14, 242, 101
+	unknownnoise0x20 13, 226, 85
+	unknownnoise0x20 14, 210, 86
+	unknownnoise0x20 8, 209, 102
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry21_1.asm
@@ -1,0 +1,27 @@
+SFX_Cry21_1_Ch1: ; 904d (2:504d)
+	dutycycle 27
+	unknownsfx0x20 3, 243, 100, 5
+	unknownsfx0x20 2, 226, 68, 5
+	unknownsfx0x20 5, 209, 34, 5
+	unknownsfx0x20 2, 178, 132, 4
+	unknownsfx0x20 8, 209, 162, 4
+	unknownsfx0x20 3, 243, 36, 5
+	unknownsfx0x20 4, 228, 228, 4
+	unknownsfx0x20 8, 209, 2, 5
+	endchannel
+
+
+SFX_Cry21_1_Ch2: ; 9070 (2:5070)
+	dutycycle 204
+	unknownsfx0x20 3, 211, 96, 5
+	unknownsfx0x20 2, 194, 64, 5
+	unknownsfx0x20 5, 193, 32, 5
+	unknownsfx0x20 2, 146, 128, 4
+	unknownsfx0x20 8, 193, 160, 4
+	unknownsfx0x20 3, 211, 32, 5
+	unknownsfx0x20 3, 196, 224, 4
+	unknownsfx0x20 8, 193, 0, 5
+
+
+SFX_Cry21_1_Ch3: ; 9092 (2:5092)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry21_2.asm
@@ -1,0 +1,27 @@
+SFX_Cry21_2_Ch1: ; 212f5 (8:52f5)
+	dutycycle 27
+	unknownsfx0x20 3, 243, 100, 5
+	unknownsfx0x20 2, 226, 68, 5
+	unknownsfx0x20 5, 209, 34, 5
+	unknownsfx0x20 2, 178, 132, 4
+	unknownsfx0x20 8, 209, 162, 4
+	unknownsfx0x20 3, 243, 36, 5
+	unknownsfx0x20 4, 228, 228, 4
+	unknownsfx0x20 8, 209, 2, 5
+	endchannel
+
+
+SFX_Cry21_2_Ch2: ; 21318 (8:5318)
+	dutycycle 204
+	unknownsfx0x20 3, 211, 96, 5
+	unknownsfx0x20 2, 194, 64, 5
+	unknownsfx0x20 5, 193, 32, 5
+	unknownsfx0x20 2, 146, 128, 4
+	unknownsfx0x20 8, 193, 160, 4
+	unknownsfx0x20 3, 211, 32, 5
+	unknownsfx0x20 3, 196, 224, 4
+	unknownsfx0x20 8, 193, 0, 5
+
+
+SFX_Cry21_2_Ch3: ; 2133a (8:533a)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry21_3.asm
@@ -1,0 +1,27 @@
+SFX_Cry21_3_Ch1: ; 7d0c2 (1f:50c2)
+	dutycycle 27
+	unknownsfx0x20 3, 243, 100, 5
+	unknownsfx0x20 2, 226, 68, 5
+	unknownsfx0x20 5, 209, 34, 5
+	unknownsfx0x20 2, 178, 132, 4
+	unknownsfx0x20 8, 209, 162, 4
+	unknownsfx0x20 3, 243, 36, 5
+	unknownsfx0x20 4, 228, 228, 4
+	unknownsfx0x20 8, 209, 2, 5
+	endchannel
+
+
+SFX_Cry21_3_Ch2: ; 7d0e5 (1f:50e5)
+	dutycycle 204
+	unknownsfx0x20 3, 211, 96, 5
+	unknownsfx0x20 2, 194, 64, 5
+	unknownsfx0x20 5, 193, 32, 5
+	unknownsfx0x20 2, 146, 128, 4
+	unknownsfx0x20 8, 193, 160, 4
+	unknownsfx0x20 3, 211, 32, 5
+	unknownsfx0x20 3, 196, 224, 4
+	unknownsfx0x20 8, 193, 0, 5
+
+
+SFX_Cry21_3_Ch3: ; 7d107 (1f:5107)
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry22_1.asm
@@ -1,0 +1,24 @@
+SFX_Cry22_1_Ch1: ; 9093 (2:5093)
+	dutycycle 17
+	unknownsfx0x20 2, 61, 129, 3
+	unknownsfx0x20 7, 245, 1, 6
+	unknownsfx0x20 1, 194, 129, 4
+	unknownsfx0x20 8, 145, 129, 3
+	endchannel
+
+
+SFX_Cry22_1_Ch2: ; 90a6 (2:50a6)
+	dutycycle 238
+	unknownsfx0x20 2, 62, 176, 5
+	unknownsfx0x20 7, 213, 93, 7
+	unknownsfx0x20 1, 178, 176, 6
+	unknownsfx0x20 8, 97, 176, 5
+	endchannel
+
+
+SFX_Cry22_1_Ch3: ; 90b9 (2:50b9)
+	unknownnoise0x20 2, 146, 73
+	unknownnoise0x20 7, 181, 41
+	unknownnoise0x20 1, 162, 57
+	unknownnoise0x20 8, 145, 73
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry22_2.asm
@@ -1,0 +1,24 @@
+SFX_Cry22_2_Ch1: ; 2133b (8:533b)
+	dutycycle 17
+	unknownsfx0x20 2, 61, 129, 3
+	unknownsfx0x20 7, 245, 1, 6
+	unknownsfx0x20 1, 194, 129, 4
+	unknownsfx0x20 8, 145, 129, 3
+	endchannel
+
+
+SFX_Cry22_2_Ch2: ; 2134e (8:534e)
+	dutycycle 238
+	unknownsfx0x20 2, 62, 176, 5
+	unknownsfx0x20 7, 213, 93, 7
+	unknownsfx0x20 1, 178, 176, 6
+	unknownsfx0x20 8, 97, 176, 5
+	endchannel
+
+
+SFX_Cry22_2_Ch3: ; 21361 (8:5361)
+	unknownnoise0x20 2, 146, 73
+	unknownnoise0x20 7, 181, 41
+	unknownnoise0x20 1, 162, 57
+	unknownnoise0x20 8, 145, 73
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry22_3.asm
@@ -1,0 +1,24 @@
+SFX_Cry22_3_Ch1: ; 7d108 (1f:5108)
+	dutycycle 17
+	unknownsfx0x20 2, 61, 129, 3
+	unknownsfx0x20 7, 245, 1, 6
+	unknownsfx0x20 1, 194, 129, 4
+	unknownsfx0x20 8, 145, 129, 3
+	endchannel
+
+
+SFX_Cry22_3_Ch2: ; 7d11b (1f:511b)
+	dutycycle 238
+	unknownsfx0x20 2, 62, 176, 5
+	unknownsfx0x20 7, 213, 93, 7
+	unknownsfx0x20 1, 178, 176, 6
+	unknownsfx0x20 8, 97, 176, 5
+	endchannel
+
+
+SFX_Cry22_3_Ch3: ; 7d12e (1f:512e)
+	unknownnoise0x20 2, 146, 73
+	unknownnoise0x20 7, 181, 41
+	unknownnoise0x20 1, 162, 57
+	unknownnoise0x20 8, 145, 73
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry23_1.asm
@@ -1,0 +1,25 @@
+SFX_Cry23_1_Ch1: ; 8786 (2:4786)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 192, 7
+	unknownsfx0x20 6, 228, 193, 7
+	unknownsfx0x20 10, 246, 192, 7
+	unknownsfx0x20 4, 211, 194, 7
+	unknownsfx0x20 8, 193, 192, 7
+	endchannel
+
+
+SFX_Cry23_1_Ch2: ; 879d (2:479d)
+	dutycycle 95
+	unknownsfx0x20 15, 151, 129, 7
+	unknownsfx0x20 6, 132, 128, 7
+	unknownsfx0x20 10, 150, 129, 7
+	unknownsfx0x20 15, 131, 129, 7
+	endchannel
+
+
+SFX_Cry23_1_Ch3: ; 87b0 (2:47b0)
+	unknownnoise0x20 3, 242, 60
+	unknownnoise0x20 13, 230, 44
+	unknownnoise0x20 15, 215, 60
+	unknownnoise0x20 8, 193, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry23_2.asm
@@ -1,0 +1,25 @@
+SFX_Cry23_2_Ch1: ; 20a2e (8:4a2e)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 192, 7
+	unknownsfx0x20 6, 228, 193, 7
+	unknownsfx0x20 10, 246, 192, 7
+	unknownsfx0x20 4, 211, 194, 7
+	unknownsfx0x20 8, 193, 192, 7
+	endchannel
+
+
+SFX_Cry23_2_Ch2: ; 20a45 (8:4a45)
+	dutycycle 95
+	unknownsfx0x20 15, 151, 129, 7
+	unknownsfx0x20 6, 132, 128, 7
+	unknownsfx0x20 10, 150, 129, 7
+	unknownsfx0x20 15, 131, 129, 7
+	endchannel
+
+
+SFX_Cry23_2_Ch3: ; 20a58 (8:4a58)
+	unknownnoise0x20 3, 242, 60
+	unknownnoise0x20 13, 230, 44
+	unknownnoise0x20 15, 215, 60
+	unknownnoise0x20 8, 193, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry23_3.asm
@@ -1,0 +1,25 @@
+SFX_Cry23_3_Ch1: ; 7c7fb (1f:47fb)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 192, 7
+	unknownsfx0x20 6, 228, 193, 7
+	unknownsfx0x20 10, 246, 192, 7
+	unknownsfx0x20 4, 211, 194, 7
+	unknownsfx0x20 8, 193, 192, 7
+	endchannel
+
+
+SFX_Cry23_3_Ch2: ; 7c812 (1f:4812)
+	dutycycle 95
+	unknownsfx0x20 15, 151, 129, 7
+	unknownsfx0x20 6, 132, 128, 7
+	unknownsfx0x20 10, 150, 129, 7
+	unknownsfx0x20 15, 131, 129, 7
+	endchannel
+
+
+SFX_Cry23_3_Ch3: ; 7c825 (1f:4825)
+	unknownnoise0x20 3, 242, 60
+	unknownnoise0x20 13, 230, 44
+	unknownnoise0x20 15, 215, 60
+	unknownnoise0x20 8, 193, 44
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry24_1.asm
@@ -1,0 +1,33 @@
+SFX_Cry24_1_Ch1: ; 87bd (2:47bd)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 128, 6
+	unknownsfx0x20 10, 230, 132, 6
+	unknownsfx0x20 15, 215, 144, 6
+	unknownsfx0x20 8, 213, 144, 6
+	unknownsfx0x20 6, 196, 136, 6
+	unknownsfx0x20 5, 211, 112, 6
+	unknownsfx0x20 4, 211, 96, 6
+	unknownsfx0x20 8, 193, 64, 6
+	endchannel
+
+
+SFX_Cry24_1_Ch2: ; 87e0 (2:47e0)
+	dutycycle 5
+	unknownsfx0x20 15, 183, 65, 6
+	unknownsfx0x20 10, 150, 66, 6
+	unknownsfx0x20 15, 167, 81, 6
+	unknownsfx0x20 8, 165, 81, 6
+	unknownsfx0x20 6, 148, 71, 6
+	unknownsfx0x20 5, 163, 49, 6
+	unknownsfx0x20 4, 147, 34, 6
+	unknownsfx0x20 8, 113, 1, 6
+	endchannel
+
+
+SFX_Cry24_1_Ch3: ; 8803 (2:4803)
+	unknownnoise0x20 15, 228, 60
+	unknownnoise0x20 10, 199, 76
+	unknownnoise0x20 10, 199, 60
+	unknownnoise0x20 12, 183, 76
+	unknownnoise0x20 15, 162, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry24_2.asm
@@ -1,0 +1,33 @@
+SFX_Cry24_2_Ch1: ; 20a65 (8:4a65)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 128, 6
+	unknownsfx0x20 10, 230, 132, 6
+	unknownsfx0x20 15, 215, 144, 6
+	unknownsfx0x20 8, 213, 144, 6
+	unknownsfx0x20 6, 196, 136, 6
+	unknownsfx0x20 5, 211, 112, 6
+	unknownsfx0x20 4, 211, 96, 6
+	unknownsfx0x20 8, 193, 64, 6
+	endchannel
+
+
+SFX_Cry24_2_Ch2: ; 20a88 (8:4a88)
+	dutycycle 5
+	unknownsfx0x20 15, 183, 65, 6
+	unknownsfx0x20 10, 150, 66, 6
+	unknownsfx0x20 15, 167, 81, 6
+	unknownsfx0x20 8, 165, 81, 6
+	unknownsfx0x20 6, 148, 71, 6
+	unknownsfx0x20 5, 163, 49, 6
+	unknownsfx0x20 4, 147, 34, 6
+	unknownsfx0x20 8, 113, 1, 6
+	endchannel
+
+
+SFX_Cry24_2_Ch3: ; 20aab (8:4aab)
+	unknownnoise0x20 15, 228, 60
+	unknownnoise0x20 10, 199, 76
+	unknownnoise0x20 10, 199, 60
+	unknownnoise0x20 12, 183, 76
+	unknownnoise0x20 15, 162, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry24_3.asm
@@ -1,0 +1,33 @@
+SFX_Cry24_3_Ch1: ; 7c832 (1f:4832)
+	dutycycle 240
+	unknownsfx0x20 15, 247, 128, 6
+	unknownsfx0x20 10, 230, 132, 6
+	unknownsfx0x20 15, 215, 144, 6
+	unknownsfx0x20 8, 213, 144, 6
+	unknownsfx0x20 6, 196, 136, 6
+	unknownsfx0x20 5, 211, 112, 6
+	unknownsfx0x20 4, 211, 96, 6
+	unknownsfx0x20 8, 193, 64, 6
+	endchannel
+
+
+SFX_Cry24_3_Ch2: ; 7c855 (1f:4855)
+	dutycycle 5
+	unknownsfx0x20 15, 183, 65, 6
+	unknownsfx0x20 10, 150, 66, 6
+	unknownsfx0x20 15, 167, 81, 6
+	unknownsfx0x20 8, 165, 81, 6
+	unknownsfx0x20 6, 148, 71, 6
+	unknownsfx0x20 5, 163, 49, 6
+	unknownsfx0x20 4, 147, 34, 6
+	unknownsfx0x20 8, 113, 1, 6
+	endchannel
+
+
+SFX_Cry24_3_Ch3: ; 7c878 (1f:4878)
+	unknownnoise0x20 15, 228, 60
+	unknownnoise0x20 10, 199, 76
+	unknownnoise0x20 10, 199, 60
+	unknownnoise0x20 12, 183, 76
+	unknownnoise0x20 15, 162, 92
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry25_1.asm
@@ -1,0 +1,26 @@
+SFX_Cry25_1_Ch1: ; 886b (2:486b)
+	dutycycle 165
+	unknownsfx0x20 6, 244, 64, 7
+	unknownsfx0x20 15, 227, 48, 7
+	unknownsfx0x20 4, 244, 64, 7
+	unknownsfx0x20 5, 179, 72, 7
+	unknownsfx0x20 8, 209, 80, 7
+	endchannel
+
+
+SFX_Cry25_1_Ch2: ; 8882 (2:4882)
+	dutycycle 119
+	unknownsfx0x20 6, 195, 18, 7
+	unknownsfx0x20 15, 179, 4, 7
+	unknownsfx0x20 3, 195, 18, 7
+	unknownsfx0x20 4, 195, 33, 7
+	unknownsfx0x20 8, 177, 50, 7
+	endchannel
+
+
+SFX_Cry25_1_Ch3: ; 8899 (2:4899)
+	unknownnoise0x20 8, 214, 44
+	unknownnoise0x20 12, 198, 60
+	unknownnoise0x20 10, 182, 44
+	unknownnoise0x20 8, 145, 28
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry25_2.asm
@@ -1,0 +1,26 @@
+SFX_Cry25_2_Ch1: ; 20b13 (8:4b13)
+	dutycycle 165
+	unknownsfx0x20 6, 244, 64, 7
+	unknownsfx0x20 15, 227, 48, 7
+	unknownsfx0x20 4, 244, 64, 7
+	unknownsfx0x20 5, 179, 72, 7
+	unknownsfx0x20 8, 209, 80, 7
+	endchannel
+
+
+SFX_Cry25_2_Ch2: ; 20b2a (8:4b2a)
+	dutycycle 119
+	unknownsfx0x20 6, 195, 18, 7
+	unknownsfx0x20 15, 179, 4, 7
+	unknownsfx0x20 3, 195, 18, 7
+	unknownsfx0x20 4, 195, 33, 7
+	unknownsfx0x20 8, 177, 50, 7
+	endchannel
+
+
+SFX_Cry25_2_Ch3: ; 20b41 (8:4b41)
+	unknownnoise0x20 8, 214, 44
+	unknownnoise0x20 12, 198, 60
+	unknownnoise0x20 10, 182, 44
+	unknownnoise0x20 8, 145, 28
+	endchannel
--- /dev/null
+++ b/audio/sfx/cry25_3.asm
@@ -1,0 +1,26 @@
+SFX_Cry25_3_Ch1: ; 7c8e0 (1f:48e0)
+	dutycycle 165
+	unknownsfx0x20 6, 244, 64, 7
+	unknownsfx0x20 15, 227, 48, 7
+	unknownsfx0x20 4, 244, 64, 7
+	unknownsfx0x20 5, 179, 72, 7
+	unknownsfx0x20 8, 209, 80, 7
+	endchannel
+
+
+SFX_Cry25_3_Ch2: ; 7c8f7 (1f:48f7)
+	dutycycle 119
+	unknownsfx0x20 6, 195, 18, 7
+	unknownsfx0x20 15, 179, 4, 7
+	unknownsfx0x20 3, 195, 18, 7
+	unknownsfx0x20 4, 195, 33, 7
+	unknownsfx0x20 8, 177, 50, 7
+	endchannel
+
+
+SFX_Cry25_3_Ch3: ; 7c90e (1f:490e)
+	unknownnoise0x20 8, 214, 44
+	unknownnoise0x20 12, 198, 60
+	unknownnoise0x20 10, 182, 44
+	unknownnoise0x20 8, 145, 28
+	endchannel
--- /dev/null
+++ b/audio/sfx/cut_1.asm
@@ -1,0 +1,7 @@
+SFX_Cut_1_Ch1: ; 83e1 (2:43e1)
+	unknownnoise0x20 2, 247, 36
+	unknownnoise0x20 2, 247, 52
+	unknownnoise0x20 4, 247, 68
+	unknownnoise0x20 8, 244, 85
+	unknownnoise0x20 8, 241, 68
+	endchannel
--- /dev/null
+++ b/audio/sfx/cut_3.asm
@@ -1,0 +1,7 @@
+SFX_Cut_3_Ch1: ; 7c3ca (1f:43ca)
+	unknownnoise0x20 2, 247, 36
+	unknownnoise0x20 2, 247, 52
+	unknownnoise0x20 4, 247, 68
+	unknownnoise0x20 8, 244, 85
+	unknownnoise0x20 8, 241, 68
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal1_1.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal1_1_Ch1: ; 833b (2:433b)
+	unknownnoise0x20 0, 161, 16
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal1_2.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal1_2_Ch1: ; 2033b (8:433b)
+	unknownnoise0x20 0, 161, 16
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal1_3.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal1_3_Ch1: ; 7c33b (1f:433b)
+	unknownnoise0x20 0, 161, 16
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal2_1.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal2_1_Ch1: ; 833f (2:433f)
+	unknownnoise0x20 0, 162, 17
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal2_2.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal2_2_Ch1: ; 2033f (8:433f)
+	unknownnoise0x20 0, 162, 17
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal2_3.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal2_3_Ch1: ; 7c33f (1f:433f)
+	unknownnoise0x20 0, 162, 17
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal3_1.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal3_1_Ch1: ; 8343 (2:4343)
+	unknownnoise0x20 0, 162, 80
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal3_2.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal3_2_Ch1: ; 20343 (8:4343)
+	unknownnoise0x20 0, 162, 80
+	endchannel
--- /dev/null
+++ b/audio/sfx/cymbal3_3.asm
@@ -1,0 +1,3 @@
+SFX_Cymbal3_3_Ch1: ; 7c343 (1f:4343)
+	unknownnoise0x20 0, 162, 80
+	endchannel
--- /dev/null
+++ b/audio/sfx/damage.asm
@@ -1,0 +1,5 @@
+SFX_Damage_Ch1: ; 204f4 (8:44f4)
+	unknownnoise0x20 2, 244, 68
+	unknownnoise0x20 2, 244, 20
+	unknownnoise0x20 15, 241, 50
+	endchannel
--- /dev/null
+++ b/audio/sfx/denied_1.asm
@@ -1,0 +1,18 @@
+SFX_Denied_1_Ch1: ; 861f (2:461f)
+	duty 3
+	unknownsfx0x10 90
+	unknownsfx0x20 4, 240, 0, 5
+	unknownsfx0x10 8
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
+
+
+SFX_Denied_1_Ch2: ; 8636 (2:4636)
+	duty 3
+	unknownsfx0x20 4, 240, 1, 4
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 1, 4
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/denied_3.asm
@@ -1,0 +1,18 @@
+SFX_Denied_3_Ch1: ; 7c5fc (1f:45fc)
+	duty 3
+	unknownsfx0x10 90
+	unknownsfx0x20 4, 240, 0, 5
+	unknownsfx0x10 8
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
+
+
+SFX_Denied_3_Ch2: ; 7c613 (1f:4613)
+	duty 3
+	unknownsfx0x20 4, 240, 1, 4
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 1, 4
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/dex_page_added.asm
@@ -1,0 +1,15 @@
+SFX_Dex_Page_Added_Ch1: ; 2047f (8:447f)
+	duty 2
+	unknownsfx0x10 68
+	unknownsfx0x20 15, 240, 240, 4
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 242, 80, 6
+	unknownsfx0x10 8
+	endchannel
+
+
+SFX_Dex_Page_Added_Ch2: ; 20490 (8:4490)
+	duty 2
+	unknownsfx0x20 15, 146, 0, 6
+	unknownsfx0x20 15, 146, 130, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/doubleslap.asm
@@ -1,0 +1,4 @@
+SFX_Doubleslap_Ch1: ; 2058c (8:458c)
+	unknownnoise0x20 8, 241, 50
+	unknownnoise0x20 8, 241, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/enter_pc_1.asm
@@ -1,0 +1,7 @@
+SFX_Enter_PC_1_Ch1: ; 853b (2:453b)
+	duty 2
+	unknownsfx0x20 6, 240, 0, 7
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 6, 240, 0, 7
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/enter_pc_3.asm
@@ -1,0 +1,7 @@
+SFX_Enter_PC_3_Ch1: ; 7c518 (1f:4518)
+	duty 2
+	unknownsfx0x20 4, 240, 0, 7
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 4, 240, 0, 7
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/faint_fall.asm
@@ -1,0 +1,6 @@
+SFX_Faint_Fall_Ch1: ; 204ae (8:44ae)
+	duty 1
+	unknownsfx0x10 175
+	unknownsfx0x20 15, 242, 128, 7
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/faint_thud.asm
@@ -1,0 +1,11 @@
+SFX_Faint_Thud_Ch1: ; 2044c (8:444c)
+	unknownsfx0x20 15, 209, 0, 2
+	unknownsfx0x10 8
+	endchannel
+
+
+SFX_Faint_Thud_Ch2: ; 20453 (8:4453)
+	unknownnoise0x20 4, 245, 51
+	unknownnoise0x20 8, 244, 34
+	unknownnoise0x20 15, 242, 33
+	endchannel
--- /dev/null
+++ b/audio/sfx/fly_1.asm
@@ -1,0 +1,18 @@
+SFX_Fly_1_Ch1: ; 85ee (2:45ee)
+	unknownnoise0x20 2, 241, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 161, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 209, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 129, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 177, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 97, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 145, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 65, 18
+	unknownnoise0x20 2, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/fly_3.asm
@@ -1,0 +1,18 @@
+SFX_Fly_3_Ch1: ; 7c5cb (1f:45cb)
+	unknownnoise0x20 2, 241, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 161, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 209, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 129, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 177, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 97, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 145, 18
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 65, 18
+	unknownnoise0x20 2, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/get_item1_1.asm
@@ -1,0 +1,47 @@
+SFX_Get_Item1_1_Ch1: ; ad77 (2:6d77)
+	executemusic
+	tempo 256
+	volume 7, 7
+	vibrato 6, 2, 6
+	duty 2
+	toggleperfectpitch
+	notetype 4, 11, 1
+	octave 3
+	G# 2
+	G# 2
+	G# 2
+	notetype 12, 11, 3
+	octave 4
+	E_ 4
+	endchannel
+
+
+SFX_Get_Item1_1_Ch2: ; ad8e (2:6d8e)
+	executemusic
+	vibrato 8, 2, 7
+	duty 2
+	notetype 4, 12, 1
+	octave 4
+	E_ 2
+	E_ 2
+	E_ 2
+	notetype 12, 12, 3
+	B_ 4
+	endchannel
+
+
+SFX_Get_Item1_1_Ch3: ; ad9e (2:6d9e)
+	executemusic
+	notetype 4, 1, 0
+	octave 4
+	B_ 1
+	rest 1
+	B_ 1
+	rest 1
+	B_ 1
+	rest 1
+	notetype 12, 1, 0
+	octave 4
+	B_ 2
+	rest 2
+	endchannel
--- /dev/null
+++ b/audio/sfx/get_item1_3.asm
@@ -1,0 +1,47 @@
+SFX_Get_Item1_3_Ch1: ; 7e850 (1f:6850)
+	executemusic
+	tempo 256
+	volume 7, 7
+	vibrato 6, 2, 6
+	duty 2
+	toggleperfectpitch
+	notetype 4, 11, 1
+	octave 3
+	G# 2
+	G# 2
+	G# 2
+	notetype 12, 11, 3
+	octave 4
+	E_ 4
+	endchannel
+
+
+SFX_Get_Item1_3_Ch2: ; 7e867 (1f:6867)
+	executemusic
+	vibrato 8, 2, 7
+	duty 2
+	notetype 4, 12, 1
+	octave 4
+	E_ 2
+	E_ 2
+	E_ 2
+	notetype 12, 12, 3
+	B_ 4
+	endchannel
+
+
+SFX_Get_Item1_3_Ch3: ; 7e877 (1f:6877)
+	executemusic
+	notetype 4, 1, 0
+	octave 4
+	B_ 1
+	rest 1
+	B_ 1
+	rest 1
+	B_ 1
+	rest 1
+	notetype 12, 1, 0
+	octave 4
+	B_ 2
+	rest 2
+	endchannel
--- /dev/null
+++ b/audio/sfx/get_item2_1.asm
@@ -1,0 +1,69 @@
+SFX_Get_Item2_1_Ch1: ; b316 (2:7316)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 2
+	toggleperfectpitch
+	notetype 5, 11, 4
+	octave 4
+	D_ 4
+	C_ 4
+	octave 3
+	A_ 8
+	notetype 5, 11, 2
+	octave 4
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
+	octave 3
+	A# 2
+	notetype 5, 11, 4
+	octave 4
+	C_ 8
+	endchannel
+
+
+SFX_Get_Item2_1_Ch2: ; b335 (2:7335)
+	executemusic
+	vibrato 8, 2, 7
+	duty 2
+	notetype 5, 12, 5
+	octave 4
+	A_ 4
+	F_ 4
+	C_ 8
+	notetype 5, 12, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
+	notetype 5, 12, 4
+	A_ 8
+	endchannel
+
+
+SFX_Get_Item2_1_Ch3: ; b34d (2:734d)
+	executemusic
+	notetype 5, 1, 0
+	octave 5
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
+	rest 1
+	D# 1
+	rest 1
+	E_ 1
+	rest 1
+	F_ 1
+	rest 1
+	F_ 1
+	rest 1
+	G_ 1
+	rest 1
+	A_ 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/get_item2_2.asm
@@ -1,0 +1,69 @@
+SFX_Get_Item2_2_Ch1: ; 239c7 (8:79c7)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 2
+	toggleperfectpitch
+	notetype 5, 11, 4
+	octave 4
+	D_ 4
+	C_ 4
+	octave 3
+	A_ 8
+	notetype 5, 11, 2
+	octave 4
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
+	octave 3
+	A# 2
+	notetype 5, 11, 4
+	octave 4
+	C_ 8
+	endchannel
+
+
+SFX_Get_Item2_2_Ch2: ; 239e6 (8:79e6)
+	executemusic
+	vibrato 8, 2, 7
+	duty 2
+	notetype 5, 12, 5
+	octave 4
+	A_ 4
+	F_ 4
+	C_ 8
+	notetype 5, 12, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
+	notetype 5, 12, 4
+	A_ 8
+	endchannel
+
+
+SFX_Get_Item2_2_Ch3: ; 239fe (8:79fe)
+	executemusic
+	notetype 5, 1, 0
+	octave 5
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
+	rest 1
+	D# 1
+	rest 1
+	E_ 1
+	rest 1
+	F_ 1
+	rest 1
+	F_ 1
+	rest 1
+	G_ 1
+	rest 1
+	A_ 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/get_item2_3.asm
@@ -1,0 +1,69 @@
+SFX_Get_Item2_3_Ch1: ; 7ee28 (1f:6e28)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 2
+	toggleperfectpitch
+	notetype 5, 11, 4
+	octave 4
+	D_ 4
+	C_ 4
+	octave 3
+	A_ 8
+	notetype 5, 11, 2
+	octave 4
+	D# 2
+	D# 2
+	D_ 2
+	C_ 2
+	C_ 2
+	octave 3
+	A# 2
+	notetype 5, 11, 4
+	octave 4
+	C_ 8
+	endchannel
+
+
+SFX_Get_Item2_3_Ch2: ; 7ee47 (1f:6e47)
+	executemusic
+	vibrato 8, 2, 7
+	duty 2
+	notetype 5, 12, 5
+	octave 4
+	A_ 4
+	F_ 4
+	C_ 8
+	notetype 5, 12, 2
+	A# 2
+	A# 2
+	A# 2
+	G_ 2
+	G_ 2
+	A# 2
+	notetype 5, 12, 4
+	A_ 8
+	endchannel
+
+
+SFX_Get_Item2_3_Ch3: ; 7ee5f (1f:6e5f)
+	executemusic
+	notetype 5, 1, 0
+	octave 5
+	F_ 4
+	D# 4
+	C_ 8
+	D# 1
+	rest 1
+	D# 1
+	rest 1
+	E_ 1
+	rest 1
+	F_ 1
+	rest 1
+	F_ 1
+	rest 1
+	G_ 1
+	rest 1
+	A_ 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/get_key_item_1.asm
@@ -1,0 +1,59 @@
+SFX_Get_Key_Item_1_Ch1: ; b362 (2:7362)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 2
+	toggleperfectpitch
+	notetype 5, 10, 4
+	octave 3
+	A# 4
+	notetype 5, 11, 1
+	octave 4
+	C_ 2
+	C_ 1
+	C_ 1
+	notetype 5, 10, 4
+	D# 4
+	notetype 5, 11, 1
+	F_ 2
+	F_ 1
+	F_ 1
+	notetype 5, 11, 4
+	A# 8
+	endchannel
+
+
+SFX_Get_Key_Item_1_Ch2: ; b381 (2:7381)
+	executemusic
+	vibrato 4, 2, 3
+	duty 2
+	notetype 5, 13, 1
+	octave 4
+	G_ 2
+	G_ 1
+	G_ 1
+	notetype 5, 12, 4
+	D# 4
+	notetype 5, 13, 1
+	G# 2
+	G# 1
+	G# 1
+	A# 2
+	A# 1
+	A# 1
+	notetype 5, 12, 4
+	octave 5
+	D# 8
+	endchannel
+
+
+SFX_Get_Key_Item_1_Ch3: ; b39d (2:739d)
+	executemusic
+	notetype 5, 1, 0
+	octave 4
+	D# 4
+	G# 4
+	G_ 4
+	F_ 4
+	D# 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/get_key_item_3.asm
@@ -1,0 +1,59 @@
+SFX_Get_Key_Item_3_Ch1: ; 7ee74 (1f:6e74)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 2
+	toggleperfectpitch
+	notetype 5, 10, 4
+	octave 3
+	A# 4
+	notetype 5, 11, 1
+	octave 4
+	C_ 2
+	C_ 1
+	C_ 1
+	notetype 5, 10, 4
+	D# 4
+	notetype 5, 11, 1
+	F_ 2
+	F_ 1
+	F_ 1
+	notetype 5, 11, 4
+	A# 8
+	endchannel
+
+
+SFX_Get_Key_Item_3_Ch2: ; 7ee93 (1f:6e93)
+	executemusic
+	vibrato 4, 2, 3
+	duty 2
+	notetype 5, 13, 1
+	octave 4
+	G_ 2
+	G_ 1
+	G_ 1
+	notetype 5, 12, 4
+	D# 4
+	notetype 5, 13, 1
+	G# 2
+	G# 1
+	G# 1
+	A# 2
+	A# 1
+	A# 1
+	notetype 5, 12, 4
+	octave 5
+	D# 8
+	endchannel
+
+
+SFX_Get_Key_Item_3_Ch3: ; 7eeaf (1f:6eaf)
+	executemusic
+	notetype 5, 1, 0
+	octave 4
+	D# 4
+	G# 4
+	G_ 4
+	F_ 4
+	D# 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/go_inside_1.asm
@@ -1,0 +1,4 @@
+SFX_Go_Inside_1_Ch1: ; 83f1 (2:43f1)
+	unknownnoise0x20 9, 241, 68
+	unknownnoise0x20 8, 209, 67
+	endchannel
--- /dev/null
+++ b/audio/sfx/go_inside_3.asm
@@ -1,0 +1,4 @@
+SFX_Go_Inside_3_Ch1: ; 7c3da (1f:43da)
+	unknownnoise0x20 9, 241, 68
+	unknownnoise0x20 8, 209, 67
+	endchannel
--- /dev/null
+++ b/audio/sfx/go_outside_1.asm
@@ -1,0 +1,7 @@
+SFX_Go_Outside_1_Ch1: ; 8452 (2:4452)
+	unknownnoise0x20 2, 241, 84
+	unknownnoise0x20 12, 113, 35
+	unknownnoise0x20 2, 177, 84
+	unknownnoise0x20 12, 97, 35
+	unknownnoise0x20 6, 65, 84
+	endchannel
--- /dev/null
+++ b/audio/sfx/go_outside_3.asm
@@ -1,0 +1,7 @@
+SFX_Go_Outside_3_Ch1: ; 7c43b (1f:443b)
+	unknownnoise0x20 2, 241, 84
+	unknownnoise0x20 12, 113, 35
+	unknownnoise0x20 2, 177, 84
+	unknownnoise0x20 12, 97, 35
+	unknownnoise0x20 6, 65, 84
+	endchannel
--- /dev/null
+++ b/audio/sfx/heal_ailment_1.asm
@@ -1,0 +1,9 @@
+SFX_Heal_Ailment_1_Ch1: ; 84d9 (2:44d9)
+	duty 2
+	unknownsfx0x10 20
+	unknownsfx0x20 4, 242, 0, 6
+	unknownsfx0x20 4, 242, 0, 6
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 242, 0, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/heal_ailment_2.asm
@@ -1,0 +1,9 @@
+SFX_Heal_Ailment_2_Ch1: ; 203fd (8:43fd)
+	duty 2
+	unknownsfx0x10 20
+	unknownsfx0x20 4, 242, 0, 6
+	unknownsfx0x20 4, 242, 0, 6
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 242, 0, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/heal_ailment_3.asm
@@ -1,0 +1,9 @@
+SFX_Heal_Ailment_3_Ch1: ; 7c4b2 (1f:44b2)
+	duty 2
+	unknownsfx0x10 20
+	unknownsfx0x20 4, 242, 0, 6
+	unknownsfx0x20 4, 242, 0, 6
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 242, 0, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/heal_hp_1.asm
@@ -1,0 +1,7 @@
+SFX_Heal_HP_1_Ch1: ; 84b7 (2:44b7)
+	duty 2
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 240, 240, 4
+	unknownsfx0x20 15, 242, 80, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/heal_hp_2.asm
@@ -1,0 +1,7 @@
+SFX_Heal_HP_2_Ch1: ; 203ee (8:43ee)
+	duty 2
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 240, 240, 4
+	unknownsfx0x20 15, 242, 80, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/heal_hp_3.asm
@@ -1,0 +1,7 @@
+SFX_Heal_HP_3_Ch1: ; 7c490 (1f:4490)
+	duty 2
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 240, 240, 4
+	unknownsfx0x20 15, 242, 80, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/healing_machine_1.asm
@@ -1,0 +1,9 @@
+SFX_Healing_Machine_1_Ch1: ; 8580 (2:4580)
+	duty 2
+	unknownsfx0x10 44
+	unknownsfx0x20 4, 242, 0, 5
+	unknownsfx0x10 34
+	unknownsfx0x20 2, 241, 0, 5
+	unknownsfx0x10 8
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/healing_machine_3.asm
@@ -1,0 +1,9 @@
+SFX_Healing_Machine_3_Ch1: ; 7c55d (1f:455d)
+	duty 2
+	unknownsfx0x10 44
+	unknownsfx0x20 4, 242, 0, 5
+	unknownsfx0x10 34
+	unknownsfx0x20 2, 241, 0, 5
+	unknownsfx0x10 8
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/horn_drill.asm
@@ -1,0 +1,6 @@
+SFX_Horn_Drill_Ch1: ; 205b1 (8:45b1)
+	unknownnoise0x20 3, 146, 49
+	unknownnoise0x20 3, 178, 50
+	unknownnoise0x20 3, 194, 51
+	unknownnoise0x20 8, 241, 84
+	endchannel
--- /dev/null
+++ b/audio/sfx/intro_crash.asm
@@ -1,0 +1,4 @@
+SFX_Intro_Crash_Ch1: ; 7c6de (1f:46de)
+	unknownnoise0x20 2, 210, 50
+	unknownnoise0x20 15, 242, 67
+	endchannel
--- /dev/null
+++ b/audio/sfx/intro_hip.asm
@@ -1,0 +1,6 @@
+SFX_Intro_Hip_Ch1: ; 7c6be (1f:46be)
+	duty 2
+	unknownsfx0x10 38
+	unknownsfx0x20 12, 194, 64, 7
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/intro_hop.asm
@@ -1,0 +1,6 @@
+SFX_Intro_Hop_Ch1: ; 7c6c9 (1f:46c9)
+	duty 2
+	unknownsfx0x10 38
+	unknownsfx0x20 12, 194, 128, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/intro_lunge.asm
@@ -1,0 +1,10 @@
+SFX_Intro_Lunge_Ch1: ; 7c6a5 (1f:46a5)
+	unknownnoise0x20 6, 32, 16
+	unknownnoise0x20 6, 47, 64
+	unknownnoise0x20 6, 79, 65
+	unknownnoise0x20 6, 143, 65
+	unknownnoise0x20 6, 207, 66
+	unknownnoise0x20 8, 215, 66
+	unknownnoise0x20 15, 231, 67
+	unknownnoise0x20 15, 242, 67
+	endchannel
--- /dev/null
+++ b/audio/sfx/intro_raise.asm
@@ -1,0 +1,5 @@
+SFX_Intro_Raise_Ch1: ; 7c6d4 (1f:46d4)
+	unknownnoise0x20 2, 111, 33
+	unknownnoise0x20 2, 175, 49
+	unknownnoise0x20 15, 242, 65
+	endchannel
--- /dev/null
+++ b/audio/sfx/intro_whoosh.asm
@@ -1,0 +1,7 @@
+SFX_Intro_Whoosh_Ch1: ; 7c6e5 (1f:46e5)
+	unknownnoise0x20 4, 44, 32
+	unknownnoise0x20 3, 160, 32
+	unknownnoise0x20 3, 176, 33
+	unknownnoise0x20 3, 192, 34
+	unknownnoise0x20 15, 210, 36
+	endchannel
--- /dev/null
+++ b/audio/sfx/ledge_1.asm
@@ -1,0 +1,6 @@
+SFX_Ledge_1_Ch1: ; 85d6 (2:45d6)
+	duty 2
+	unknownsfx0x10 149
+	unknownsfx0x20 15, 242, 0, 4
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/ledge_3.asm
@@ -1,0 +1,6 @@
+SFX_Ledge_3_Ch1: ; 7c5b3 (1f:45b3)
+	duty 2
+	unknownsfx0x10 149
+	unknownsfx0x20 15, 242, 0, 4
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/level_up.asm
@@ -1,0 +1,63 @@
+SFX_Level_Up_Ch1: ; 2397d (8:797d)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 2
+	toggleperfectpitch
+	notetype 6, 11, 4
+	octave 4
+	F_ 4
+	notetype 4, 11, 2
+	C_ 2
+	F_ 2
+	C_ 2
+	notetype 6, 11, 3
+	D# 2
+	D# 2
+	E_ 2
+	notetype 6, 11, 4
+	F_ 8
+	endchannel
+
+
+SFX_Level_Up_Ch2: ; 23998 (8:7998)
+	executemusic
+	vibrato 4, 2, 2
+	duty 2
+	notetype 6, 12, 4
+	octave 4
+	A_ 4
+	notetype 4, 12, 2
+	A_ 2
+	A_ 2
+	A_ 2
+	notetype 6, 12, 4
+	A# 2
+	A# 2
+	A# 2
+	notetype 6, 12, 4
+	A_ 8
+	endchannel
+
+
+SFX_Level_Up_Ch3: ; 239b0 (8:79b0)
+	executemusic
+	notetype 6, 1, 0
+	octave 5
+	A_ 4
+	notetype 4, 1, 0
+	F_ 1
+	rest 1
+	F_ 1
+	rest 1
+	F_ 1
+	rest 1
+	notetype 6, 1, 0
+	G_ 1
+	rest 1
+	D# 1
+	rest 1
+	G_ 1
+	rest 1
+	A_ 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare1_1.asm
@@ -1,0 +1,4 @@
+SFX_Muted_Snare1_1_Ch1: ; 8347 (2:4347)
+	unknownnoise0x20 0, 161, 24
+	unknownnoise0x20 0, 49, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare1_2.asm
@@ -1,0 +1,4 @@
+SFX_Muted_Snare1_2_Ch1: ; 20347 (8:4347)
+	unknownnoise0x20 0, 161, 24
+	unknownnoise0x20 0, 49, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare1_3.asm
@@ -1,0 +1,4 @@
+SFX_Muted_Snare1_3_Ch1: ; 7c347 (1f:4347)
+	unknownnoise0x20 0, 161, 24
+	unknownnoise0x20 0, 49, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare2_1.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare2_1_Ch1: ; 8355 (2:4355)
+	unknownnoise0x20 0, 145, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare2_2.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare2_2_Ch1: ; 20355 (8:4355)
+	unknownnoise0x20 0, 145, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare2_3.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare2_3_Ch1: ; 7c355 (1f:4355)
+	unknownnoise0x20 0, 145, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare3_1.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare3_1_Ch1: ; 8359 (2:4359)
+	unknownnoise0x20 0, 113, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare3_2.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare3_2_Ch1: ; 20359 (8:4359)
+	unknownnoise0x20 0, 113, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare3_3.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare3_3_Ch1: ; 7c359 (1f:4359)
+	unknownnoise0x20 0, 113, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare4_1.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare4_1_Ch1: ; 835d (2:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare4_2.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare4_2_Ch1: ; 2035d (8:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/muted_snare4_3.asm
@@ -1,0 +1,3 @@
+SFX_Muted_Snare4_3_Ch1: ; 7c35d (1f:435d)
+	unknownnoise0x20 0, 97, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/not_very_effective.asm
@@ -1,0 +1,6 @@
+SFX_Not_Very_Effective_Ch1: ; 204fe (8:44fe)
+	unknownnoise0x20 4, 143, 85
+	unknownnoise0x20 2, 244, 68
+	unknownnoise0x20 8, 244, 34
+	unknownnoise0x20 15, 242, 33
+	endchannel
--- /dev/null
+++ b/audio/sfx/peck.asm
@@ -1,0 +1,3 @@
+SFX_Peck_Ch1: ; 204aa (8:44aa)
+	unknownnoise0x20 2, 161, 18
+	endchannel
--- /dev/null
+++ b/audio/sfx/poisoned_1.asm
@@ -1,0 +1,8 @@
+SFX_Poisoned_1_Ch1: ; 84c6 (2:44c6)
+	duty 0
+	unknownsfx0x10 20
+	unknownsfx0x20 4, 242, 0, 6
+	loopchannel 4, SFX_Poisoned_1_Ch1
+	unknownsfx0x20 15, 243, 0, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/poisoned_3.asm
@@ -1,0 +1,8 @@
+SFX_Poisoned_3_Ch1: ; 7c49f (1f:449f)
+	duty 0
+	unknownsfx0x10 20
+	unknownsfx0x20 4, 242, 0, 6
+	loopchannel 4, SFX_Poisoned_3_Ch1
+	unknownsfx0x20 15, 243, 0, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/pokedex_rating_1.asm
@@ -1,0 +1,77 @@
+SFX_Pokedex_Rating_1_Ch1: ; b2c8 (2:72c8)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 2
+	notetype 5, 11, 1
+	octave 3
+	A_ 2
+	A_ 2
+	G_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	A_ 2
+	octave 4
+	C_ 4
+	E_ 4
+	octave 3
+	F_ 4
+	endchannel
+
+
+SFX_Pokedex_Rating_1_Ch2: ; b2e1 (2:72e1)
+	executemusic
+	duty 2
+	notetype 5, 12, 2
+	octave 5
+	F_ 2
+	E_ 1
+	rest 1
+	D_ 2
+	C_ 1
+	rest 1
+	octave 4
+	A# 2
+	octave 5
+	C_ 2
+	D_ 2
+	E_ 2
+	F_ 4
+	G_ 4
+	F_ 4
+	endchannel
+
+
+SFX_Pokedex_Rating_1_Ch3: ; b2f7 (2:72f7)
+	executemusic
+	notetype 5, 1, 0
+	octave 5
+	C_ 1
+	rest 1
+	octave 4
+	F_ 2
+	octave 5
+	C_ 1
+	rest 1
+	octave 4
+	A# 1
+	rest 1
+	A_ 1
+	rest 1
+	G_ 1
+	rest 1
+	F_ 1
+	rest 1
+	E_ 1
+	rest 1
+	octave 5
+	F_ 1
+	rest 3
+	C_ 1
+	rest 3
+	octave 4
+	F_ 2
+	rest 2
+	endchannel
--- /dev/null
+++ b/audio/sfx/pokedex_rating_3.asm
@@ -1,0 +1,77 @@
+SFX_Pokedex_Rating_3_Ch1: ; 7edda (1f:6dda)
+	executemusic
+	tempo 256
+	volume 7, 7
+	duty 2
+	notetype 5, 11, 1
+	octave 3
+	A_ 2
+	A_ 2
+	G_ 2
+	G_ 2
+	F_ 2
+	E_ 2
+	F_ 2
+	A_ 2
+	octave 4
+	C_ 4
+	E_ 4
+	octave 3
+	F_ 4
+	endchannel
+
+
+SFX_Pokedex_Rating_3_Ch2: ; 7edf3 (1f:6df3)
+	executemusic
+	duty 2
+	notetype 5, 12, 2
+	octave 5
+	F_ 2
+	E_ 1
+	rest 1
+	D_ 2
+	C_ 1
+	rest 1
+	octave 4
+	A# 2
+	octave 5
+	C_ 2
+	D_ 2
+	E_ 2
+	F_ 4
+	G_ 4
+	F_ 4
+	endchannel
+
+
+SFX_Pokedex_Rating_3_Ch3: ; 7ee09 (1f:6e09)
+	executemusic
+	notetype 5, 1, 0
+	octave 5
+	C_ 1
+	rest 1
+	octave 4
+	F_ 2
+	octave 5
+	C_ 1
+	rest 1
+	octave 4
+	A# 1
+	rest 1
+	A_ 1
+	rest 1
+	G_ 1
+	rest 1
+	F_ 1
+	rest 1
+	E_ 1
+	rest 1
+	octave 5
+	F_ 1
+	rest 3
+	C_ 1
+	rest 3
+	octave 4
+	F_ 2
+	rest 2
+	endchannel
--- /dev/null
+++ b/audio/sfx/pokeflute.asm
@@ -1,0 +1,21 @@
+SFX_Pokeflute_Ch1: ; 83ca (2:43ca)
+	vibrato 16, 1, 4
+	notetype 12, 1, 0
+	octave 5
+	E_ 2
+	F_ 2
+	G_ 4
+	A_ 2
+	G_ 2
+	octave 6
+	C_ 4
+	C_ 2
+	D_ 2
+	C_ 2
+	octave 5
+	G_ 2
+	A_ 2
+	F_ 2
+	G_ 8
+	rest 12
+	endchannel
--- /dev/null
+++ b/audio/sfx/pound.asm
@@ -1,0 +1,3 @@
+SFX_Pound_Ch1: ; 204c4 (8:44c4)
+	unknownnoise0x20 2, 161, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/press_ab_1.asm
@@ -1,0 +1,7 @@
+SFX_Press_AB_1_Ch1: ; 8462 (2:4462)
+	duty 2
+	unknownsfx0x20 0, 145, 192, 7
+	unknownsfx0x20 0, 129, 208, 7
+	unknownsfx0x20 0, 145, 192, 7
+	unknownsfx0x20 12, 161, 208, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/press_ab_2.asm
@@ -1,0 +1,7 @@
+SFX_Press_AB_2_Ch1: ; 203c3 (8:43c3)
+	duty 2
+	unknownsfx0x20 0, 145, 192, 7
+	unknownsfx0x20 0, 129, 208, 7
+	unknownsfx0x20 0, 145, 192, 7
+	unknownsfx0x20 12, 161, 208, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/press_ab_3.asm
@@ -1,0 +1,7 @@
+SFX_Press_AB_3_Ch1: ; 7c44b (1f:444b)
+	duty 2
+	unknownsfx0x20 0, 145, 192, 7
+	unknownsfx0x20 0, 129, 208, 7
+	unknownsfx0x20 0, 145, 192, 7
+	unknownsfx0x20 12, 161, 208, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/psybeam.asm
@@ -1,0 +1,25 @@
+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_Psybeam_Ch1
+	unknownsfx0x20 10, 241, 64, 6
+	endchannel
+
+
+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_Psybeam_Ch2
+	unknownsfx0x20 10, 241, 113, 5
+	endchannel
+
+
+SFX_Psybeam_Ch3: ; 20787 (8:4787)
+	unknownnoise0x20 2, 209, 74
+	unknownnoise0x20 2, 210, 42
+	loopchannel 21, SFX_Psybeam_Ch3
+	endchannel
--- /dev/null
+++ b/audio/sfx/psychic_m.asm
@@ -1,0 +1,32 @@
+SFX_Psychic_M_Ch1: ; 207fa (8:47fa)
+	duty 2
+	unknownsfx0x10 247
+	unknownsfx0x20 8, 196, 189, 7
+	unknownsfx0x20 8, 196, 190, 7
+	unknownsfx0x20 8, 196, 191, 7
+	unknownsfx0x20 8, 196, 192, 7
+	unknownsfx0x20 15, 196, 193, 7
+	unknownsfx0x20 15, 242, 192, 7
+	unknownsfx0x10 8
+	endchannel
+
+
+SFX_Psychic_M_Ch2: ; 20819 (8:4819)
+	duty 2
+	unknownsfx0x20 8, 196, 112, 7
+	unknownsfx0x20 8, 196, 97, 7
+	unknownsfx0x20 8, 196, 98, 7
+	unknownsfx0x20 8, 196, 99, 7
+	unknownsfx0x20 15, 196, 100, 7
+	unknownsfx0x20 15, 242, 100, 7
+	endchannel
+
+
+SFX_Psychic_M_Ch3: ; 20834 (8:4834)
+	unknownnoise0x20 15, 63, 20
+	unknownnoise0x20 15, 207, 19
+	unknownnoise0x20 15, 207, 18
+	unknownnoise0x20 15, 207, 17
+	unknownnoise0x20 15, 207, 16
+	unknownnoise0x20 15, 194, 16
+	endchannel
--- /dev/null
+++ b/audio/sfx/purchase_1.asm
@@ -1,0 +1,13 @@
+SFX_Purchase_1_Ch1: ; 842d (2:442d)
+	duty 2
+	unknownsfx0x20 4, 225, 0, 7
+	unknownsfx0x20 8, 242, 224, 7
+	endchannel
+
+
+SFX_Purchase_1_Ch2: ; 8438 (2:4438)
+	duty 2
+	unknownsfx0x20 1, 8, 0, 0
+	unknownsfx0x20 4, 145, 193, 6
+	unknownsfx0x20 8, 162, 161, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/purchase_3.asm
@@ -1,0 +1,13 @@
+SFX_Purchase_3_Ch1: ; 7c416 (1f:4416)
+	duty 2
+	unknownsfx0x20 4, 225, 0, 7
+	unknownsfx0x20 8, 242, 224, 7
+	endchannel
+
+
+SFX_Purchase_3_Ch2: ; 7c421 (1f:4421)
+	duty 2
+	unknownsfx0x20 1, 8, 0, 0
+	unknownsfx0x20 4, 145, 193, 6
+	unknownsfx0x20 8, 162, 161, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/push_boulder_1.asm
@@ -1,0 +1,10 @@
+SFX_Push_Boulder_1_Ch1: ; 8654 (2:4654)
+	unknownnoise0x20 4, 162, 35
+	unknownnoise0x20 8, 241, 52
+	unknownnoise0x20 15, 0, 0
+	unknownnoise0x20 2, 247, 36
+	unknownnoise0x20 2, 247, 52
+	unknownnoise0x20 4, 247, 68
+	unknownnoise0x20 8, 244, 85
+	unknownnoise0x20 8, 241, 68
+	endchannel
--- /dev/null
+++ b/audio/sfx/push_boulder_3.asm
@@ -1,0 +1,10 @@
+SFX_Push_Boulder_3_Ch1: ; 7c631 (1f:4631)
+	unknownnoise0x20 4, 162, 35
+	unknownnoise0x20 8, 241, 52
+	unknownnoise0x20 15, 0, 0
+	unknownnoise0x20 2, 247, 36
+	unknownnoise0x20 2, 247, 52
+	unknownnoise0x20 4, 247, 68
+	unknownnoise0x20 8, 244, 85
+	unknownnoise0x20 8, 241, 68
+	endchannel
--- /dev/null
+++ b/audio/sfx/run.asm
@@ -1,0 +1,13 @@
+SFX_Run_Ch1: ; 2045d (8:445d)
+	unknownnoise0x20 2, 97, 35
+	unknownnoise0x20 2, 161, 51
+	unknownnoise0x20 2, 193, 51
+	unknownnoise0x20 2, 81, 17
+	unknownnoise0x20 2, 241, 51
+	unknownnoise0x20 2, 65, 17
+	unknownnoise0x20 2, 193, 51
+	unknownnoise0x20 2, 49, 17
+	unknownnoise0x20 2, 129, 51
+	unknownnoise0x20 2, 49, 17
+	unknownnoise0x20 8, 65, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/safari_zone_pa.asm
@@ -1,0 +1,9 @@
+SFX_Safari_Zone_PA_Ch1: ; 86c8 (2:46c8)
+	duty 2
+	unknownsfx0x20 15, 243, 48, 7
+	unknownsfx0x20 8, 101, 48, 7
+	unknownsfx0x20 15, 244, 0, 7
+	unknownsfx0x20 15, 116, 0, 7
+	unknownsfx0x20 15, 68, 0, 7
+	unknownsfx0x20 15, 36, 0, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/save_1.asm
@@ -1,0 +1,23 @@
+SFX_Save_1_Ch1: ; 8475 (2:4475)
+	duty 2
+	unknownsfx0x20 4, 244, 0, 7
+	unknownsfx0x20 2, 228, 0, 6
+	unknownsfx0x20 2, 228, 128, 6
+	unknownsfx0x20 2, 228, 192, 6
+	unknownsfx0x20 2, 228, 0, 7
+	unknownsfx0x20 2, 228, 160, 7
+	unknownsfx0x20 15, 242, 224, 7
+	endchannel
+
+
+SFX_Save_1_Ch2: ; 8494 (2:4494)
+	duty 2
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 2, 212, 1, 7
+	unknownsfx0x20 2, 196, 1, 6
+	unknownsfx0x20 2, 196, 129, 6
+	unknownsfx0x20 2, 196, 193, 6
+	unknownsfx0x20 2, 196, 1, 7
+	unknownsfx0x20 2, 196, 161, 7
+	unknownsfx0x20 15, 210, 225, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/save_3.asm
@@ -1,0 +1,36 @@
+SFX_Save_3_Ch1: ; 7c45e (1f:445e)
+	duty 2
+IF DEF(_RED)
+	unknownsfx0x20 4, 244, 0, 7
+	unknownsfx0x20 3, 228, 128, 6
+	unknownsfx0x20 3, 228, 192, 6
+	unknownsfx0x20 3, 228, 0, 7
+	unknownsfx0x20 2, 228, 160, 7
+ELSE
+	unknownsfx0x20 3, 228, 0, 6
+	unknownsfx0x20 3, 228, 128, 6
+	unknownsfx0x20 3, 228, 192, 6
+	unknownsfx0x20 3, 228, 0, 7
+	unknownsfx0x20 15, 242, 224, 7
+ENDC
+	endchannel
+
+
+SFX_Save_3_Ch2: ; 7c475 (1f:4475)
+	duty 2
+IF DEF(_RED)
+	unknownsfx0x20 4, 8, 0, 0
+	unknownsfx0x20 3, 212, 1, 7
+	unknownsfx0x20 3, 196, 129, 6
+	unknownsfx0x20 3, 196, 193, 6
+	unknownsfx0x20 3, 196, 1, 7
+	unknownsfx0x20 2, 196, 161, 7
+ELSE
+	unknownsfx0x20 3, 8, 0, 0
+	unknownsfx0x20 3, 196, 1, 6
+	unknownsfx0x20 3, 196, 129, 6
+	unknownsfx0x20 3, 196, 193, 6
+	unknownsfx0x20 3, 196, 1, 7
+	unknownsfx0x20 15, 210, 225, 7
+ENDC
+	endchannel
--- a/audio/sfx/sfx_02_01.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_01_Ch1: ; 82fd (2:42fd)
-	unknownnoise0x20 0, 193, 51
-	endchannel
--- a/audio/sfx/sfx_02_02.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_02_Ch1: ; 8301 (2:4301)
-	unknownnoise0x20 0, 177, 51
-	endchannel
--- a/audio/sfx/sfx_02_03.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_03_Ch1: ; 8305 (2:4305)
-	unknownnoise0x20 0, 161, 51
-	endchannel
--- a/audio/sfx/sfx_02_04.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_04_Ch1: ; 8309 (2:4309)
-	unknownnoise0x20 0, 129, 51
-	endchannel
--- a/audio/sfx/sfx_02_05.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_02_05_Ch1: ; 830d (2:430d)
-	unknownnoise0x20 7, 132, 55
-	unknownnoise0x20 6, 132, 54
-	unknownnoise0x20 5, 131, 53
-	unknownnoise0x20 4, 131, 52
-	unknownnoise0x20 3, 130, 51
-	unknownnoise0x20 2, 129, 50
-	endchannel
--- a/audio/sfx/sfx_02_06.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_06_Ch1: ; 8320 (2:4320)
-	unknownnoise0x20 0, 81, 42
-	endchannel
--- a/audio/sfx/sfx_02_07.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_02_07_Ch1: ; 8324 (2:4324)
-	unknownnoise0x20 1, 65, 43
-	unknownnoise0x20 0, 97, 42
-	endchannel
--- a/audio/sfx/sfx_02_08.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_08_Ch1: ; 832b (2:432b)
-	unknownnoise0x20 0, 129, 16
-	endchannel
--- a/audio/sfx/sfx_02_09.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_09_Ch1: ; 832f (2:432f)
-	unknownnoise0x20 0, 130, 35
-	endchannel
--- a/audio/sfx/sfx_02_0a.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_0a_Ch1: ; 8333 (2:4333)
-	unknownnoise0x20 0, 130, 37
-	endchannel
--- a/audio/sfx/sfx_02_0b.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_0b_Ch1: ; 8337 (2:4337)
-	unknownnoise0x20 0, 130, 38
-	endchannel
--- a/audio/sfx/sfx_02_0c.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_0c_Ch1: ; 833b (2:433b)
-	unknownnoise0x20 0, 161, 16
-	endchannel
--- a/audio/sfx/sfx_02_0d.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_0d_Ch1: ; 833f (2:433f)
-	unknownnoise0x20 0, 162, 17
-	endchannel
--- a/audio/sfx/sfx_02_0e.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_0e_Ch1: ; 8343 (2:4343)
-	unknownnoise0x20 0, 162, 80
-	endchannel
--- a/audio/sfx/sfx_02_0f.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_02_0f_Ch1: ; 8347 (2:4347)
-	unknownnoise0x20 0, 161, 24
-	unknownnoise0x20 0, 49, 51
-	endchannel
--- a/audio/sfx/sfx_02_10.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_02_10_Ch1: ; 834e (2:434e)
-	unknownnoise0x20 2, 145, 40
-	unknownnoise0x20 0, 113, 24
-	endchannel
--- a/audio/sfx/sfx_02_11.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_11_Ch1: ; 8355 (2:4355)
-	unknownnoise0x20 0, 145, 34
-	endchannel
--- a/audio/sfx/sfx_02_12.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_12_Ch1: ; 8359 (2:4359)
-	unknownnoise0x20 0, 113, 34
-	endchannel
--- a/audio/sfx/sfx_02_13.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_02_13_Ch1: ; 835d (2:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
--- a/audio/sfx/sfx_02_14.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_02_14_Ch1: ; 8987 (2:4987)
-	dutycycle 245
-	unknownsfx0x20 4, 243, 24, 7
-	unknownsfx0x20 15, 229, 152, 7
-	unknownsfx0x20 8, 145, 88, 7
-	endchannel
-
-
-SFX_02_14_Ch2: ; 8996 (2:4996)
-	dutycycle 160
-	unknownsfx0x20 5, 179, 8, 7
-	unknownsfx0x20 15, 197, 136, 7
-	unknownsfx0x20 8, 113, 72, 7
-	endchannel
-
-
-SFX_02_14_Ch3: ; 89a5 (2:49a5)
-	unknownnoise0x20 3, 161, 28
-	unknownnoise0x20 14, 148, 44
-	unknownnoise0x20 8, 129, 28
-	endchannel
--- a/audio/sfx/sfx_02_15.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_02_15_Ch1: ; 8b97 (2:4b97)
-	dutycycle 160
-	unknownsfx0x20 4, 243, 0, 6
-	unknownsfx0x20 8, 213, 96, 7
-	unknownsfx0x20 3, 226, 32, 7
-	unknownsfx0x20 8, 209, 16, 7
-	endchannel
-
-
-SFX_02_15_Ch2: ; 8baa (2:4baa)
-	dutycycle 90
-	unknownsfx0x20 5, 179, 241, 6
-	unknownsfx0x20 7, 197, 82, 7
-	unknownsfx0x20 3, 162, 17, 7
-	unknownsfx0x20 8, 177, 1, 6
-	endchannel
-
-
-SFX_02_15_Ch3: ; 8bbd (2:4bbd)
-	unknownnoise0x20 3, 162, 60
-	unknownnoise0x20 12, 148, 44
-	unknownnoise0x20 3, 130, 28
-	unknownnoise0x20 8, 113, 44
-	endchannel
--- a/audio/sfx/sfx_02_16.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-SFX_02_16_Ch1: ; 8b0c (2:4b0c)
-	duty 0
-	unknownsfx0x20 8, 245, 128, 4
-	unknownsfx0x20 2, 225, 224, 5
-	unknownsfx0x20 8, 209, 220, 5
-	endchannel
-
-
-SFX_02_16_Ch2: ; 8b1b (2:4b1b)
-	dutycycle 165
-	unknownsfx0x20 7, 149, 65, 4
-	unknownsfx0x20 2, 129, 33, 5
-	unknownsfx0x20 8, 97, 26, 5
-
-
-SFX_02_16_Ch3: ; 8b29 (2:4b29)
-	endchannel
--- a/audio/sfx/sfx_02_17.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_02_17_Ch1: ; 88a6 (2:48a6)
-	dutycycle 240
-	unknownsfx0x20 4, 247, 8, 6
-	unknownsfx0x20 6, 230, 0, 6
-	unknownsfx0x20 6, 215, 240, 5
-	unknownsfx0x20 6, 196, 224, 5
-	unknownsfx0x20 5, 211, 192, 5
-	unknownsfx0x20 4, 211, 160, 5
-	unknownsfx0x20 8, 225, 128, 5
-	endchannel
-
-
-SFX_02_17_Ch2: ; 88c5 (2:48c5)
-	dutycycle 10
-	unknownsfx0x20 4, 199, 4, 5
-	unknownsfx0x20 6, 166, 2, 5
-	unknownsfx0x20 6, 151, 241, 4
-	unknownsfx0x20 4, 180, 225, 4
-	unknownsfx0x20 5, 163, 194, 4
-	unknownsfx0x20 4, 179, 163, 4
-	unknownsfx0x20 8, 193, 130, 4
-	endchannel
-
-
-SFX_02_17_Ch3: ; 88e4 (2:48e4)
-	unknownnoise0x20 12, 228, 76
-	unknownnoise0x20 10, 199, 92
-	unknownnoise0x20 12, 182, 76
-	unknownnoise0x20 15, 162, 92
-	endchannel
--- a/audio/sfx/sfx_02_18.asm
+++ /dev/null
@@ -1,32 +1,0 @@
-SFX_02_18_Ch1: ; 8c55 (2:4c55)
-	dutycycle 240
-	unknownsfx0x20 4, 247, 160, 6
-	unknownsfx0x20 8, 230, 164, 6
-	unknownsfx0x20 4, 214, 160, 6
-	unknownsfx0x20 12, 211, 32, 6
-	unknownsfx0x20 8, 195, 36, 6
-	unknownsfx0x20 4, 194, 32, 6
-	unknownsfx0x20 8, 177, 16, 6
-	endchannel
-
-
-SFX_02_18_Ch2: ; 8c74 (2:4c74)
-	dutycycle 90
-	unknownsfx0x20 4, 231, 1, 6
-	unknownsfx0x20 8, 214, 3, 6
-	unknownsfx0x20 4, 198, 1, 6
-	unknownsfx0x20 12, 195, 129, 5
-	unknownsfx0x20 8, 179, 131, 5
-	unknownsfx0x20 4, 178, 130, 5
-	unknownsfx0x20 8, 161, 113, 5
-	endchannel
-
-
-SFX_02_18_Ch3: ; 8c93 (2:4c93)
-	unknownnoise0x20 7, 214, 92
-	unknownnoise0x20 8, 230, 76
-	unknownnoise0x20 4, 212, 92
-	unknownnoise0x20 4, 212, 76
-	unknownnoise0x20 7, 195, 76
-	unknownnoise0x20 8, 161, 92
-	endchannel
--- a/audio/sfx/sfx_02_19.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-SFX_02_19_Ch1: ; 8a35 (2:4a35)
-	dutycycle 10
-	unknownsfx0x20 6, 226, 0, 5
-	unknownsfx0x20 6, 227, 128, 5
-	unknownsfx0x20 6, 211, 112, 5
-	unknownsfx0x20 8, 161, 96, 5
-	endchannel
-
-
-SFX_02_19_Ch2: ; 8a48 (2:4a48)
-	dutycycle 245
-	unknownsfx0x20 6, 226, 130, 4
-	unknownsfx0x20 6, 211, 1, 5
-	unknownsfx0x20 6, 178, 226, 4
-	unknownsfx0x20 8, 129, 193, 4
-
-
-SFX_02_19_Ch3: ; 8a5a (2:4a5a)
-	endchannel
--- a/audio/sfx/sfx_02_1a.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-SFX_02_1a_Ch1: ; 89df (2:49df)
-	dutycycle 250
-	unknownsfx0x20 6, 131, 71, 2
-	unknownsfx0x20 15, 98, 38, 2
-	unknownsfx0x20 4, 82, 69, 2
-	unknownsfx0x20 9, 99, 6, 2
-	unknownsfx0x20 15, 130, 37, 2
-	unknownsfx0x20 15, 66, 7, 2
-
-
-SFX_02_1a_Ch2: ; 89f9 (2:49f9)
-	endchannel
-
-
-SFX_02_1a_Ch3: ; 89fa (2:49fa)
-	unknownnoise0x20 8, 212, 140
-	unknownnoise0x20 4, 226, 156
-	unknownnoise0x20 15, 198, 140
-	unknownnoise0x20 8, 228, 172
-	unknownnoise0x20 15, 215, 156
-	unknownnoise0x20 15, 242, 172
-	endchannel
--- a/audio/sfx/sfx_02_1b.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_02_1b_Ch1: ; 8a0d (2:4a0d)
-	dutycycle 240
-	unknownsfx0x20 4, 243, 224, 6
-	unknownsfx0x20 15, 228, 64, 6
-	unknownsfx0x20 8, 193, 32, 6
-	endchannel
-
-
-SFX_02_1b_Ch2: ; 8a1c (2:4a1c)
-	dutycycle 10
-	unknownsfx0x20 3, 195, 131, 6
-	unknownsfx0x20 14, 180, 2, 6
-	unknownsfx0x20 8, 161, 1, 6
-	endchannel
-
-
-SFX_02_1b_Ch3: ; 8a2b (2:4a2b)
-	unknownnoise0x20 4, 211, 92
-	unknownnoise0x20 15, 230, 76
-	unknownnoise0x20 8, 177, 92
-	endchannel
--- a/audio/sfx/sfx_02_1c.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SFX_02_1c_Ch1: ; 8c25 (2:4c25)
-	dutycycle 240
-	unknownsfx0x20 15, 246, 101, 5
-	unknownsfx0x20 10, 228, 124, 5
-	unknownsfx0x20 3, 194, 92, 5
-	unknownsfx0x20 15, 178, 60, 5
-	endchannel
-
-
-SFX_02_1c_Ch2: ; 8c38 (2:4c38)
-	dutycycle 90
-	unknownsfx0x20 14, 214, 3, 5
-	unknownsfx0x20 9, 180, 27, 5
-	unknownsfx0x20 4, 146, 250, 4
-	unknownsfx0x20 15, 162, 219, 4
-	endchannel
-
-
-SFX_02_1c_Ch3: ; 8c4b (2:4c4b)
-	unknownnoise0x20 12, 230, 76
-	unknownnoise0x20 11, 215, 92
-	unknownnoise0x20 15, 194, 76
-	endchannel
--- a/audio/sfx/sfx_02_1d.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-SFX_02_1d_Ch1: ; 872f (2:472f)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 160, 7
-	unknownsfx0x20 6, 230, 163, 7
-	unknownsfx0x20 10, 244, 160, 7
-	dutycycle 165
-	unknownsfx0x20 10, 246, 216, 7
-	unknownsfx0x20 4, 227, 215, 7
-	unknownsfx0x20 15, 242, 216, 7
-	endchannel
-
-
-SFX_02_1d_Ch2: ; 874c (2:474c)
-	dutycycle 5
-	unknownsfx0x20 2, 8, 0, 0
-	unknownsfx0x20 15, 167, 161, 6
-	unknownsfx0x20 6, 134, 162, 6
-	unknownsfx0x20 10, 116, 161, 6
-	dutycycle 95
-	unknownsfx0x20 10, 118, 214, 6
-	unknownsfx0x20 4, 131, 217, 6
-	unknownsfx0x20 15, 162, 215, 6
-	endchannel
-
-
-SFX_02_1d_Ch3: ; 876d (2:476d)
-	unknownnoise0x20 2, 242, 60
-	unknownnoise0x20 8, 228, 62
-	unknownnoise0x20 15, 215, 60
-	unknownnoise0x20 6, 197, 59
-	unknownnoise0x20 6, 228, 61
-	unknownnoise0x20 8, 182, 60
-	unknownnoise0x20 6, 212, 61
-	unknownnoise0x20 8, 193, 59
-	endchannel
--- a/audio/sfx/sfx_02_1e.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-SFX_02_1e_Ch1: ; 8bca (2:4bca)
-	dutycycle 240
-	unknownsfx0x20 8, 247, 224, 6
-	unknownsfx0x20 6, 230, 229, 6
-	unknownsfx0x20 3, 244, 224, 6
-	unknownsfx0x20 3, 246, 208, 6
-	unknownsfx0x20 3, 227, 192, 6
-	unknownsfx0x20 4, 242, 176, 6
-	unknownsfx0x20 15, 162, 200, 6
-	endchannel
-
-
-SFX_02_1e_Ch2: ; 8be9 (2:4be9)
-	dutycycle 5
-	unknownsfx0x20 3, 8, 0, 0
-	unknownsfx0x20 8, 167, 161, 6
-	unknownsfx0x20 6, 134, 163, 6
-	unknownsfx0x20 3, 116, 161, 6
-	unknownsfx0x20 3, 118, 145, 6
-	unknownsfx0x20 3, 131, 130, 6
-	unknownsfx0x20 4, 162, 113, 6
-	unknownsfx0x20 15, 114, 137, 6
-	endchannel
-
-
-SFX_02_1e_Ch3: ; 8c0c (2:4c0c)
-	unknownnoise0x20 2, 242, 60
-	unknownnoise0x20 8, 228, 62
-	unknownnoise0x20 8, 215, 60
-	unknownnoise0x20 5, 197, 59
-	unknownnoise0x20 3, 212, 44
-	unknownnoise0x20 2, 182, 60
-	unknownnoise0x20 3, 164, 44
-	unknownnoise0x20 8, 145, 60
-	endchannel
--- a/audio/sfx/sfx_02_1f.asm
+++ /dev/null
@@ -1,37 +1,0 @@
-SFX_02_1f_Ch1: ; 8a5b (2:4a5b)
-	dutycycle 204
-	unknownsfx0x20 4, 241, 0, 7
-	unknownsfx0x20 4, 225, 128, 7
-	unknownsfx0x20 4, 209, 64, 7
-	unknownsfx0x20 4, 225, 64, 7
-	unknownsfx0x20 4, 241, 128, 7
-	unknownsfx0x20 4, 209, 0, 7
-	unknownsfx0x20 4, 241, 1, 7
-	unknownsfx0x20 4, 209, 130, 7
-	unknownsfx0x20 4, 193, 66, 7
-	unknownsfx0x20 8, 177, 65, 7
-	endchannel
-
-
-SFX_02_1f_Ch2: ; 8a86 (2:4a86)
-	dutycycle 68
-	unknownsfx0x20 12, 8, 0, 0
-	unknownsfx0x20 4, 241, 1, 7
-	unknownsfx0x20 4, 225, 130, 7
-	unknownsfx0x20 4, 209, 65, 7
-	unknownsfx0x20 4, 225, 65, 7
-	unknownsfx0x20 4, 241, 130, 7
-	unknownsfx0x20 8, 209, 1, 7
-	endchannel
-
-
-SFX_02_1f_Ch3: ; 8aa5 (2:4aa5)
-	unknownnoise0x20 15, 8, 0
-	unknownnoise0x20 4, 8, 0
-	unknownnoise0x20 4, 209, 76
-	unknownnoise0x20 4, 177, 44
-	unknownnoise0x20 4, 209, 60
-	unknownnoise0x20 4, 177, 60
-	unknownnoise0x20 4, 193, 44
-	unknownnoise0x20 8, 161, 76
-	endchannel
--- a/audio/sfx/sfx_02_20.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_02_20_Ch1: ; 8abe (2:4abe)
-	dutycycle 204
-	unknownsfx0x20 8, 245, 0, 6
-	unknownsfx0x20 2, 210, 56, 6
-	unknownsfx0x20 2, 194, 48, 6
-	unknownsfx0x20 2, 194, 40, 6
-	unknownsfx0x20 2, 178, 32, 6
-	unknownsfx0x20 2, 178, 16, 6
-	unknownsfx0x20 2, 162, 24, 6
-	unknownsfx0x20 2, 178, 16, 6
-	unknownsfx0x20 8, 193, 32, 6
-	endchannel
-
-
-SFX_02_20_Ch2: ; 8ae5 (2:4ae5)
-	dutycycle 68
-	unknownsfx0x20 12, 195, 192, 5
-	unknownsfx0x20 3, 177, 249, 5
-	unknownsfx0x20 2, 161, 241, 5
-	unknownsfx0x20 2, 161, 233, 5
-	unknownsfx0x20 2, 145, 225, 5
-	unknownsfx0x20 2, 145, 217, 5
-	unknownsfx0x20 2, 129, 209, 5
-	unknownsfx0x20 2, 145, 217, 5
-	unknownsfx0x20 8, 145, 225, 5
-
-
-SFX_02_20_Ch3: ; 8b0b (2:4b0b)
-	endchannel
--- a/audio/sfx/sfx_02_21.asm
+++ /dev/null
@@ -1,40 +1,0 @@
-SFX_02_21_Ch1: ; 8b2a (2:4b2a)
-	dutycycle 136
-	unknownsfx0x20 5, 242, 80, 6
-	unknownsfx0x20 9, 209, 96, 6
-	unknownsfx0x20 5, 226, 18, 6
-	unknownsfx0x20 9, 193, 34, 6
-	unknownsfx0x20 5, 242, 16, 6
-	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_02_21_Ch1
-	endchannel
-
-
-SFX_02_21_Ch2: ; 8b49 (2:4b49)
-	dutycycle 64
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 5, 242, 81, 6
-	unknownsfx0x20 9, 209, 97, 6
-	unknownsfx0x20 5, 226, 20, 6
-	unknownsfx0x20 8, 193, 36, 6
-	unknownsfx0x20 5, 242, 17, 6
-	unknownsfx0x20 12, 209, 33, 6
-	unknownsfx0x20 5, 226, 20, 6
-	unknownsfx0x20 8, 193, 36, 6
-	unknownsfx0x20 5, 242, 17, 6
-	unknownsfx0x20 4, 209, 33, 6
-	endchannel
-
-
-SFX_02_21_Ch3: ; 8b78 (2:4b78)
-	unknownnoise0x20 6, 210, 28
-	unknownnoise0x20 9, 177, 44
-	unknownnoise0x20 8, 194, 44
-	unknownnoise0x20 9, 177, 60
-	unknownnoise0x20 6, 194, 44
-	unknownnoise0x20 9, 162, 60
-	unknownnoise0x20 7, 194, 44
-	unknownnoise0x20 5, 161, 60
-	unknownnoise0x20 9, 194, 44
-	unknownnoise0x20 4, 161, 60
-	endchannel
--- a/audio/sfx/sfx_02_22.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SFX_02_22_Ch1: ; 89af (2:49af)
-	dutycycle 165
-	unknownsfx0x20 4, 225, 0, 7
-	unknownsfx0x20 4, 242, 128, 7
-	unknownsfx0x20 2, 146, 64, 7
-	unknownsfx0x20 8, 225, 0, 6
-	endchannel
-
-
-SFX_02_22_Ch2: ; 89c2 (2:49c2)
-	dutycycle 10
-	unknownsfx0x20 4, 177, 225, 6
-	unknownsfx0x20 3, 194, 225, 6
-	unknownsfx0x20 3, 98, 129, 6
-	unknownsfx0x20 8, 177, 225, 5
-	endchannel
-
-
-SFX_02_22_Ch3: ; 89d5 (2:49d5)
-	unknownnoise0x20 2, 97, 50
-	unknownnoise0x20 2, 97, 33
-	unknownnoise0x20 8, 97, 17
-	endchannel
--- a/audio/sfx/sfx_02_23.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_02_23_Ch1: ; 88f1 (2:48f1)
-	dutycycle 241
-	unknownsfx0x20 4, 247, 192, 7
-	unknownsfx0x20 12, 230, 194, 7
-	unknownsfx0x20 6, 181, 128, 6
-	unknownsfx0x20 4, 196, 112, 6
-	unknownsfx0x20 4, 181, 96, 6
-	unknownsfx0x20 8, 193, 64, 6
-	endchannel
-
-
-SFX_02_23_Ch2: ; 890c (2:490c)
-	dutycycle 204
-	unknownsfx0x20 3, 199, 129, 7
-	unknownsfx0x20 12, 182, 128, 7
-	unknownsfx0x20 6, 165, 65, 6
-	unknownsfx0x20 4, 196, 50, 6
-	unknownsfx0x20 6, 181, 33, 6
-	unknownsfx0x20 8, 161, 2, 6
-	endchannel
-
-
-SFX_02_23_Ch3: ; 8927 (2:4927)
-	unknownnoise0x20 3, 228, 60
-	unknownnoise0x20 12, 214, 44
-	unknownnoise0x20 4, 228, 60
-	unknownnoise0x20 8, 183, 92
-	unknownnoise0x20 15, 194, 93
-	endchannel
--- a/audio/sfx/sfx_02_24.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-SFX_02_24_Ch1: ; 8937 (2:4937)
-	dutycycle 201
-	unknownsfx0x20 8, 247, 128, 6
-	unknownsfx0x20 2, 247, 96, 6
-	unknownsfx0x20 1, 231, 64, 6
-	unknownsfx0x20 1, 231, 32, 6
-	unknownsfx0x20 15, 209, 0, 6
-	unknownsfx0x20 4, 199, 64, 7
-	unknownsfx0x20 4, 167, 48, 7
-	unknownsfx0x20 15, 145, 32, 7
-	endchannel
-
-
-SFX_02_24_Ch2: ; 895a (2:495a)
-	dutycycle 121
-	unknownsfx0x20 10, 231, 130, 6
-	unknownsfx0x20 2, 231, 98, 6
-	unknownsfx0x20 1, 215, 66, 6
-	unknownsfx0x20 1, 215, 34, 6
-	unknownsfx0x20 15, 193, 2, 6
-	unknownsfx0x20 4, 183, 66, 7
-	unknownsfx0x20 2, 151, 50, 7
-	unknownsfx0x20 15, 129, 34, 7
-	endchannel
-
-
-SFX_02_24_Ch3: ; 897d (2:497d)
-	unknownnoise0x20 4, 116, 33
-	unknownnoise0x20 4, 116, 16
-	unknownnoise0x20 4, 113, 32
-	endchannel
--- a/audio/sfx/sfx_02_25.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SFX_02_25_Ch1: ; 8813 (2:4813)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 160, 7
-	unknownsfx0x20 8, 230, 164, 7
-	unknownsfx0x20 4, 214, 160, 7
-	unknownsfx0x20 15, 211, 32, 7
-	unknownsfx0x20 8, 195, 35, 7
-	unknownsfx0x20 2, 194, 40, 7
-	unknownsfx0x20 8, 177, 48, 7
-	endchannel
-
-
-SFX_02_25_Ch2: ; 8832 (2:4832)
-	dutycycle 10
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 6, 167, 65, 7
-	unknownsfx0x20 8, 134, 67, 7
-	unknownsfx0x20 4, 118, 65, 7
-	unknownsfx0x20 13, 131, 194, 6
-	unknownsfx0x20 7, 115, 193, 6
-	unknownsfx0x20 3, 130, 204, 6
-	unknownsfx0x20 8, 113, 216, 6
-	endchannel
-
-
-SFX_02_25_Ch3: ; 8855 (2:4855)
-	unknownnoise0x20 2, 242, 76
-	unknownnoise0x20 6, 230, 58
-	unknownnoise0x20 4, 215, 58
-	unknownnoise0x20 6, 214, 44
-	unknownnoise0x20 8, 229, 60
-	unknownnoise0x20 12, 210, 61
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_02_26.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_02_26_Ch1: ; 8d2b (2:4d2b)
-	dutycycle 165
-	unknownsfx0x20 12, 242, 64, 4
-	unknownsfx0x20 15, 227, 160, 4
-	unknownsfx0x20 4, 210, 144, 4
-	unknownsfx0x20 8, 209, 128, 4
-	endchannel
-
-
-SFX_02_26_Ch2: ; 8d3e (2:4d3e)
-	dutycycle 238
-	unknownsfx0x20 11, 210, 56, 4
-	unknownsfx0x20 14, 198, 152, 4
-	unknownsfx0x20 3, 178, 136, 4
-	unknownsfx0x20 8, 177, 120, 4
-	endchannel
-
-
-SFX_02_26_Ch3: ; 8d51 (2:4d51)
-	unknownnoise0x20 10, 230, 108
-	unknownnoise0x20 15, 210, 92
-	unknownnoise0x20 3, 194, 108
-	unknownnoise0x20 8, 209, 92
-	endchannel
--- a/audio/sfx/sfx_02_27.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_02_27_Ch1: ; 8d5e (2:4d5e)
-	dutycycle 51
-	unknownsfx0x20 15, 246, 192, 5
-	unknownsfx0x20 8, 227, 188, 5
-	unknownsfx0x20 6, 210, 208, 5
-	unknownsfx0x20 6, 178, 224, 5
-	unknownsfx0x20 6, 194, 240, 5
-	unknownsfx0x20 8, 177, 0, 6
-	endchannel
-
-
-SFX_02_27_Ch2: ; 8d79 (2:4d79)
-	dutycycle 153
-	unknownsfx0x20 14, 198, 177, 4
-	unknownsfx0x20 7, 195, 173, 4
-	unknownsfx0x20 5, 178, 193, 4
-	unknownsfx0x20 8, 146, 209, 4
-	unknownsfx0x20 6, 162, 225, 4
-	unknownsfx0x20 8, 145, 241, 4
-	endchannel
-
-
-SFX_02_27_Ch3: ; 8d94 (2:4d94)
-	unknownnoise0x20 10, 230, 92
-	unknownnoise0x20 10, 214, 108
-	unknownnoise0x20 4, 194, 76
-	unknownnoise0x20 6, 211, 92
-	unknownnoise0x20 8, 179, 76
-	unknownnoise0x20 8, 161, 92
-	endchannel
--- a/audio/sfx/sfx_02_28.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_02_28_Ch1: ; 8da7 (2:4da7)
-	dutycycle 240
-	unknownsfx0x20 8, 228, 144, 7
-	unknownsfx0x20 15, 245, 192, 7
-	unknownsfx0x20 8, 209, 216, 7
-	endchannel
-
-
-SFX_02_28_Ch2: ; 8db6 (2:4db6)
-	dutycycle 165
-	unknownsfx0x20 10, 196, 113, 7
-	unknownsfx0x20 15, 182, 162, 7
-	unknownsfx0x20 8, 161, 183, 7
-	endchannel
-
-
-SFX_02_28_Ch3: ; 8dc5 (2:4dc5)
-	unknownnoise0x20 8, 228, 76
-	unknownnoise0x20 14, 196, 60
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_02_29.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_02_29_Ch1: ; 8e35 (2:4e35)
-	dutycycle 240
-	unknownsfx0x20 4, 243, 128, 7
-	unknownsfx0x20 15, 231, 0, 7
-	unknownsfx0x20 8, 211, 16, 7
-	unknownsfx0x20 4, 194, 0, 7
-	unknownsfx0x20 4, 210, 240, 6
-	unknownsfx0x20 8, 193, 224, 6
-	endchannel
-
-
-SFX_02_29_Ch2: ; 8e50 (2:4e50)
-	dutycycle 90
-	unknownsfx0x20 6, 195, 1, 7
-	unknownsfx0x20 14, 183, 129, 6
-	unknownsfx0x20 7, 179, 146, 6
-	unknownsfx0x20 3, 162, 129, 6
-	unknownsfx0x20 4, 178, 114, 6
-	unknownsfx0x20 8, 161, 97, 6
-	endchannel
-
-
-SFX_02_29_Ch3: ; 8e6b (2:4e6b)
-	unknownnoise0x20 6, 227, 92
-	unknownnoise0x20 14, 214, 76
-	unknownnoise0x20 6, 198, 60
-	unknownnoise0x20 3, 179, 76
-	unknownnoise0x20 3, 162, 92
-	unknownnoise0x20 8, 177, 108
-	endchannel
--- a/audio/sfx/sfx_02_2a.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_02_2a_Ch1: ; 8cc8 (2:4cc8)
-	dutycycle 240
-	unknownsfx0x20 15, 215, 128, 7
-	unknownsfx0x20 4, 230, 160, 7
-	unknownsfx0x20 15, 210, 64, 7
-	endchannel
-
-
-SFX_02_2a_Ch2: ; 8cd7 (2:4cd7)
-	dutycycle 90
-	unknownsfx0x20 15, 199, 83, 7
-	unknownsfx0x20 5, 182, 114, 7
-	unknownsfx0x20 15, 194, 17, 7
-	endchannel
-
-
-SFX_02_2a_Ch3: ; 8ce6 (2:4ce6)
-	unknownnoise0x20 13, 246, 76
-	unknownnoise0x20 4, 230, 60
-	unknownnoise0x20 15, 242, 76
-	endchannel
--- a/audio/sfx/sfx_02_2b.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_02_2b_Ch1: ; 8e7e (2:4e7e)
-	dutycycle 15
-	unknownsfx0x20 15, 247, 0, 5
-	unknownsfx0x20 15, 231, 8, 5
-	unknownsfx0x20 8, 180, 128, 4
-	unknownsfx0x20 15, 162, 96, 4
-	endchannel
-
-
-SFX_02_2b_Ch2: ; 8e91 (2:4e91)
-	dutycycle 68
-	unknownsfx0x20 14, 215, 129, 4
-	unknownsfx0x20 14, 199, 137, 4
-	unknownsfx0x20 10, 180, 1, 4
-	unknownsfx0x20 15, 194, 225, 3
-	endchannel
-
-
-SFX_02_2b_Ch3: ; 8ea4 (2:4ea4)
-	unknownnoise0x20 14, 247, 124
-	unknownnoise0x20 12, 246, 108
-	unknownnoise0x20 9, 228, 124
-	unknownnoise0x20 15, 226, 108
-	endchannel
--- a/audio/sfx/sfx_02_2c.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SFX_02_2c_Ch1: ; 8f8e (2:4f8e)
-	dutycycle 80
-	unknownsfx0x20 10, 245, 128, 6
-	unknownsfx0x20 3, 226, 160, 6
-	unknownsfx0x20 3, 242, 192, 6
-	unknownsfx0x20 3, 226, 224, 6
-	unknownsfx0x20 3, 210, 0, 7
-	unknownsfx0x20 3, 194, 224, 6
-	unknownsfx0x20 3, 210, 192, 6
-	unknownsfx0x20 8, 193, 160, 6
-	endchannel
-
-
-SFX_02_2c_Ch2: ; 8fb1 (2:4fb1)
-	dutycycle 15
-	unknownsfx0x20 9, 213, 49, 6
-	unknownsfx0x20 3, 210, 82, 6
-	unknownsfx0x20 3, 226, 113, 6
-	unknownsfx0x20 3, 178, 145, 6
-	unknownsfx0x20 3, 194, 178, 6
-	unknownsfx0x20 3, 178, 145, 6
-	unknownsfx0x20 3, 194, 113, 6
-	unknownsfx0x20 8, 177, 81, 6
-	endchannel
-
-
-SFX_02_2c_Ch3: ; 8fd4 (2:4fd4)
-	unknownnoise0x20 6, 227, 76
-	unknownnoise0x20 4, 195, 60
-	unknownnoise0x20 5, 212, 60
-	unknownnoise0x20 4, 196, 44
-	unknownnoise0x20 6, 180, 60
-	unknownnoise0x20 8, 193, 44
-	endchannel
--- a/audio/sfx/sfx_02_2d.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_02_2d_Ch1: ; 8ca6 (2:4ca6)
-	dutycycle 27
-	unknownsfx0x20 7, 210, 64, 7
-	unknownsfx0x20 15, 229, 96, 7
-	unknownsfx0x20 15, 193, 48, 7
-	endchannel
-
-
-SFX_02_2d_Ch2: ; 8cb5 (2:4cb5)
-	dutycycle 129
-	unknownsfx0x20 2, 194, 1, 7
-	unknownsfx0x20 4, 194, 8, 7
-	unknownsfx0x20 15, 215, 65, 7
-	unknownsfx0x20 15, 162, 1, 7
-
-
-SFX_02_2d_Ch3: ; 8cc7 (2:4cc7)
-	endchannel
--- a/audio/sfx/sfx_02_2e.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_02_2e_Ch1: ; 8eff (2:4eff)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 64, 7
-	unknownsfx0x20 12, 230, 68, 7
-	unknownsfx0x20 6, 213, 80, 7
-	unknownsfx0x20 4, 195, 96, 7
-	unknownsfx0x20 3, 195, 128, 7
-	unknownsfx0x20 8, 209, 160, 7
-	endchannel
-
-
-SFX_02_2e_Ch2: ; 8f1a (2:4f1a)
-	dutycycle 10
-	unknownsfx0x20 6, 199, 1, 7
-	unknownsfx0x20 11, 182, 2, 7
-	unknownsfx0x20 6, 165, 17, 7
-	unknownsfx0x20 4, 147, 33, 7
-	unknownsfx0x20 3, 163, 65, 7
-	unknownsfx0x20 8, 145, 98, 7
-	endchannel
-
-
-SFX_02_2e_Ch3: ; 8f35 (2:4f35)
-	unknownnoise0x20 3, 226, 60
-	unknownnoise0x20 8, 214, 76
-	unknownnoise0x20 5, 212, 60
-	unknownnoise0x20 12, 199, 76
-	unknownnoise0x20 2, 226, 60
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_02_2f.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-SFX_02_2f_Ch1: ; 8cf0 (2:4cf0)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 192, 6
-	unknownsfx0x20 15, 231, 0, 7
-	unknownsfx0x20 4, 244, 240, 6
-	unknownsfx0x20 4, 228, 224, 6
-	unknownsfx0x20 8, 209, 208, 6
-	endchannel
-
-
-SFX_02_2f_Ch2: ; 8d07 (2:4d07)
-	dutycycle 10
-	unknownsfx0x20 7, 230, 129, 6
-	unknownsfx0x20 14, 213, 193, 6
-	unknownsfx0x20 4, 196, 177, 6
-	unknownsfx0x20 4, 212, 161, 6
-	unknownsfx0x20 8, 193, 145, 6
-	endchannel
-
-
-SFX_02_2f_Ch3: ; 8d1e (2:4d1e)
-	unknownnoise0x20 10, 166, 60
-	unknownnoise0x20 14, 148, 44
-	unknownnoise0x20 5, 163, 60
-	unknownnoise0x20 8, 145, 44
-	endchannel
--- a/audio/sfx/sfx_02_30.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-SFX_02_30_Ch1: ; 8eb1 (2:4eb1)
-	dutycycle 245
-	unknownsfx0x20 7, 214, 225, 7
-	unknownsfx0x20 6, 198, 226, 7
-	unknownsfx0x20 9, 214, 225, 7
-	unknownsfx0x20 7, 198, 224, 7
-	unknownsfx0x20 5, 182, 226, 7
-	unknownsfx0x20 7, 198, 225, 7
-	unknownsfx0x20 6, 182, 224, 7
-	unknownsfx0x20 8, 161, 223, 7
-	endchannel
-
-
-SFX_02_30_Ch2: ; 8ed4 (2:4ed4)
-	dutycycle 68
-	unknownsfx0x20 6, 195, 201, 7
-	unknownsfx0x20 6, 179, 199, 7
-	unknownsfx0x20 10, 196, 195, 7
-	unknownsfx0x20 8, 180, 199, 7
-	unknownsfx0x20 6, 195, 201, 7
-	unknownsfx0x20 15, 162, 197, 7
-	endchannel
-
-
-SFX_02_30_Ch3: ; 8eef (2:4eef)
-	unknownnoise0x20 13, 25, 124
-	unknownnoise0x20 13, 247, 140
-	unknownnoise0x20 12, 214, 124
-	unknownnoise0x20 8, 196, 108
-	unknownnoise0x20 15, 179, 92
-	endchannel
--- a/audio/sfx/sfx_02_31.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_02_31_Ch1: ; 8f48 (2:4f48)
-	dutycycle 244
-	unknownsfx0x20 15, 240, 5, 7
-	unknownsfx0x20 10, 224, 0, 7
-	unknownsfx0x20 6, 180, 16, 7
-	unknownsfx0x20 4, 211, 0, 7
-	unknownsfx0x20 6, 178, 32, 6
-	unknownsfx0x20 8, 161, 36, 6
-	endchannel
-
-
-SFX_02_31_Ch2: ; 8f63 (2:4f63)
-	dutycycle 34
-	unknownsfx0x20 15, 176, 195, 6
-	unknownsfx0x20 10, 160, 193, 6
-	unknownsfx0x20 6, 132, 210, 6
-	unknownsfx0x20 4, 147, 193, 6
-	unknownsfx0x20 6, 130, 225, 5
-	unknownsfx0x20 8, 97, 232, 5
-	endchannel
-
-
-SFX_02_31_Ch3: ; 8f7e (2:4f7e)
-	unknownnoise0x20 6, 230, 76
-	unknownnoise0x20 15, 214, 60
-	unknownnoise0x20 10, 197, 74
-	unknownnoise0x20 1, 178, 91
-	unknownnoise0x20 15, 194, 76
-	endchannel
--- a/audio/sfx/sfx_02_32.asm
+++ /dev/null
@@ -1,38 +1,0 @@
-SFX_02_32_Ch1: ; 8dcf (2:4dcf)
-	dutycycle 240
-	unknownsfx0x20 6, 242, 0, 6
-	unknownsfx0x20 6, 226, 64, 6
-	unknownsfx0x20 6, 210, 128, 6
-	unknownsfx0x20 6, 226, 192, 6
-	unknownsfx0x20 6, 210, 0, 7
-	unknownsfx0x20 6, 194, 64, 7
-	unknownsfx0x20 6, 178, 128, 7
-	unknownsfx0x20 8, 161, 192, 7
-	endchannel
-
-
-SFX_02_32_Ch2: ; 8df2 (2:4df2)
-	dutycycle 17
-	unknownsfx0x20 3, 8, 1, 0
-	unknownsfx0x20 6, 194, 193, 5
-	unknownsfx0x20 6, 178, 2, 6
-	unknownsfx0x20 6, 162, 65, 6
-	unknownsfx0x20 6, 178, 130, 6
-	unknownsfx0x20 6, 162, 194, 6
-	unknownsfx0x20 6, 146, 1, 7
-	unknownsfx0x20 6, 162, 66, 7
-	unknownsfx0x20 8, 129, 129, 7
-	endchannel
-
-
-SFX_02_32_Ch3: ; 8e19 (2:4e19)
-	unknownnoise0x20 6, 8, 1
-	unknownnoise0x20 5, 226, 92
-	unknownnoise0x20 5, 194, 76
-	unknownnoise0x20 5, 210, 60
-	unknownnoise0x20 5, 178, 44
-	unknownnoise0x20 5, 194, 28
-	unknownnoise0x20 5, 162, 27
-	unknownnoise0x20 5, 146, 26
-	unknownnoise0x20 8, 129, 24
-	endchannel
--- a/audio/sfx/sfx_02_33.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_02_33_Ch1: ; 8fe7 (2:4fe7)
-	dutycycle 165
-	unknownsfx0x20 3, 244, 65, 6
-	unknownsfx0x20 13, 214, 33, 7
-	unknownsfx0x20 8, 244, 25, 7
-	unknownsfx0x20 8, 193, 26, 7
-	endchannel
-
-
-SFX_02_33_Ch2: ; 8ffa (2:4ffa)
-	dutycycle 204
-	unknownsfx0x20 4, 244, 128, 5
-	unknownsfx0x20 14, 230, 224, 6
-	unknownsfx0x20 8, 213, 216, 6
-	unknownsfx0x20 8, 209, 220, 6
-	endchannel
-
-
-SFX_02_33_Ch3: ; 900d (2:500d)
-	unknownnoise0x20 5, 196, 70
-	unknownnoise0x20 13, 165, 68
-	unknownnoise0x20 8, 196, 69
-	unknownnoise0x20 8, 177, 68
-	endchannel
--- a/audio/sfx/sfx_02_34.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_02_34_Ch1: ; 901a (2:501a)
-	dutycycle 240
-	unknownsfx0x20 13, 241, 17, 5
-	unknownsfx0x20 13, 225, 21, 5
-	unknownsfx0x20 13, 225, 17, 5
-	unknownsfx0x20 8, 209, 17, 5
-	endchannel
-
-
-SFX_02_34_Ch2: ; 902d (2:502d)
-	dutycycle 21
-	unknownsfx0x20 12, 225, 12, 5
-	unknownsfx0x20 12, 209, 16, 5
-	unknownsfx0x20 14, 193, 12, 5
-	unknownsfx0x20 8, 193, 10, 5
-	endchannel
-
-
-SFX_02_34_Ch3: ; 9040 (2:5040)
-	unknownnoise0x20 14, 242, 101
-	unknownnoise0x20 13, 226, 85
-	unknownnoise0x20 14, 210, 86
-	unknownnoise0x20 8, 209, 102
-	endchannel
--- a/audio/sfx/sfx_02_35.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-SFX_02_35_Ch1: ; 904d (2:504d)
-	dutycycle 27
-	unknownsfx0x20 3, 243, 100, 5
-	unknownsfx0x20 2, 226, 68, 5
-	unknownsfx0x20 5, 209, 34, 5
-	unknownsfx0x20 2, 178, 132, 4
-	unknownsfx0x20 8, 209, 162, 4
-	unknownsfx0x20 3, 243, 36, 5
-	unknownsfx0x20 4, 228, 228, 4
-	unknownsfx0x20 8, 209, 2, 5
-	endchannel
-
-
-SFX_02_35_Ch2: ; 9070 (2:5070)
-	dutycycle 204
-	unknownsfx0x20 3, 211, 96, 5
-	unknownsfx0x20 2, 194, 64, 5
-	unknownsfx0x20 5, 193, 32, 5
-	unknownsfx0x20 2, 146, 128, 4
-	unknownsfx0x20 8, 193, 160, 4
-	unknownsfx0x20 3, 211, 32, 5
-	unknownsfx0x20 3, 196, 224, 4
-	unknownsfx0x20 8, 193, 0, 5
-
-
-SFX_02_35_Ch3: ; 9092 (2:5092)
-	endchannel
--- a/audio/sfx/sfx_02_36.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_02_36_Ch1: ; 9093 (2:5093)
-	dutycycle 17
-	unknownsfx0x20 2, 61, 129, 3
-	unknownsfx0x20 7, 245, 1, 6
-	unknownsfx0x20 1, 194, 129, 4
-	unknownsfx0x20 8, 145, 129, 3
-	endchannel
-
-
-SFX_02_36_Ch2: ; 90a6 (2:50a6)
-	dutycycle 238
-	unknownsfx0x20 2, 62, 176, 5
-	unknownsfx0x20 7, 213, 93, 7
-	unknownsfx0x20 1, 178, 176, 6
-	unknownsfx0x20 8, 97, 176, 5
-	endchannel
-
-
-SFX_02_36_Ch3: ; 90b9 (2:50b9)
-	unknownnoise0x20 2, 146, 73
-	unknownnoise0x20 7, 181, 41
-	unknownnoise0x20 1, 162, 57
-	unknownnoise0x20 8, 145, 73
-	endchannel
--- a/audio/sfx/sfx_02_37.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-SFX_02_37_Ch1: ; 8786 (2:4786)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 192, 7
-	unknownsfx0x20 6, 228, 193, 7
-	unknownsfx0x20 10, 246, 192, 7
-	unknownsfx0x20 4, 211, 194, 7
-	unknownsfx0x20 8, 193, 192, 7
-	endchannel
-
-
-SFX_02_37_Ch2: ; 879d (2:479d)
-	dutycycle 95
-	unknownsfx0x20 15, 151, 129, 7
-	unknownsfx0x20 6, 132, 128, 7
-	unknownsfx0x20 10, 150, 129, 7
-	unknownsfx0x20 15, 131, 129, 7
-	endchannel
-
-
-SFX_02_37_Ch3: ; 87b0 (2:47b0)
-	unknownnoise0x20 3, 242, 60
-	unknownnoise0x20 13, 230, 44
-	unknownnoise0x20 15, 215, 60
-	unknownnoise0x20 8, 193, 44
-	endchannel
--- a/audio/sfx/sfx_02_38.asm
+++ /dev/null
@@ -1,33 +1,0 @@
-SFX_02_38_Ch1: ; 87bd (2:47bd)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 128, 6
-	unknownsfx0x20 10, 230, 132, 6
-	unknownsfx0x20 15, 215, 144, 6
-	unknownsfx0x20 8, 213, 144, 6
-	unknownsfx0x20 6, 196, 136, 6
-	unknownsfx0x20 5, 211, 112, 6
-	unknownsfx0x20 4, 211, 96, 6
-	unknownsfx0x20 8, 193, 64, 6
-	endchannel
-
-
-SFX_02_38_Ch2: ; 87e0 (2:47e0)
-	dutycycle 5
-	unknownsfx0x20 15, 183, 65, 6
-	unknownsfx0x20 10, 150, 66, 6
-	unknownsfx0x20 15, 167, 81, 6
-	unknownsfx0x20 8, 165, 81, 6
-	unknownsfx0x20 6, 148, 71, 6
-	unknownsfx0x20 5, 163, 49, 6
-	unknownsfx0x20 4, 147, 34, 6
-	unknownsfx0x20 8, 113, 1, 6
-	endchannel
-
-
-SFX_02_38_Ch3: ; 8803 (2:4803)
-	unknownnoise0x20 15, 228, 60
-	unknownnoise0x20 10, 199, 76
-	unknownnoise0x20 10, 199, 60
-	unknownnoise0x20 12, 183, 76
-	unknownnoise0x20 15, 162, 92
-	endchannel
--- a/audio/sfx/sfx_02_39.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-SFX_02_39_Ch1: ; 886b (2:486b)
-	dutycycle 165
-	unknownsfx0x20 6, 244, 64, 7
-	unknownsfx0x20 15, 227, 48, 7
-	unknownsfx0x20 4, 244, 64, 7
-	unknownsfx0x20 5, 179, 72, 7
-	unknownsfx0x20 8, 209, 80, 7
-	endchannel
-
-
-SFX_02_39_Ch2: ; 8882 (2:4882)
-	dutycycle 119
-	unknownsfx0x20 6, 195, 18, 7
-	unknownsfx0x20 15, 179, 4, 7
-	unknownsfx0x20 3, 195, 18, 7
-	unknownsfx0x20 4, 195, 33, 7
-	unknownsfx0x20 8, 177, 50, 7
-	endchannel
-
-
-SFX_02_39_Ch3: ; 8899 (2:4899)
-	unknownnoise0x20 8, 214, 44
-	unknownnoise0x20 12, 198, 60
-	unknownnoise0x20 10, 182, 44
-	unknownnoise0x20 8, 145, 28
-	endchannel
--- a/audio/sfx/sfx_02_3a.asm
+++ /dev/null
@@ -1,47 +1,0 @@
-SFX_02_3a_Ch1: ; ad77 (2:6d77)
-	executemusic
-	tempo 256
-	volume 7, 7
-	vibrato 6, 2, 6
-	duty 2
-	toggleperfectpitch
-	notetype 4, 11, 1
-	octave 3
-	G# 2
-	G# 2
-	G# 2
-	notetype 12, 11, 3
-	octave 4
-	E_ 4
-	endchannel
-
-
-SFX_02_3a_Ch2: ; ad8e (2:6d8e)
-	executemusic
-	vibrato 8, 2, 7
-	duty 2
-	notetype 4, 12, 1
-	octave 4
-	E_ 2
-	E_ 2
-	E_ 2
-	notetype 12, 12, 3
-	B_ 4
-	endchannel
-
-
-SFX_02_3a_Ch3: ; ad9e (2:6d9e)
-	executemusic
-	notetype 4, 1, 0
-	octave 4
-	B_ 1
-	rest 1
-	B_ 1
-	rest 1
-	B_ 1
-	rest 1
-	notetype 12, 1, 0
-	octave 4
-	B_ 2
-	rest 2
-	endchannel
--- a/audio/sfx/sfx_02_3b.asm
+++ /dev/null
@@ -1,69 +1,0 @@
-SFX_02_3b_Ch1: ; b316 (2:7316)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 11, 4
-	octave 4
-	D_ 4
-	C_ 4
-	octave 3
-	A_ 8
-	notetype 5, 11, 2
-	octave 4
-	D# 2
-	D# 2
-	D_ 2
-	C_ 2
-	C_ 2
-	octave 3
-	A# 2
-	notetype 5, 11, 4
-	octave 4
-	C_ 8
-	endchannel
-
-
-SFX_02_3b_Ch2: ; b335 (2:7335)
-	executemusic
-	vibrato 8, 2, 7
-	duty 2
-	notetype 5, 12, 5
-	octave 4
-	A_ 4
-	F_ 4
-	C_ 8
-	notetype 5, 12, 2
-	A# 2
-	A# 2
-	A# 2
-	G_ 2
-	G_ 2
-	A# 2
-	notetype 5, 12, 4
-	A_ 8
-	endchannel
-
-
-SFX_02_3b_Ch3: ; b34d (2:734d)
-	executemusic
-	notetype 5, 1, 0
-	octave 5
-	F_ 4
-	D# 4
-	C_ 8
-	D# 1
-	rest 1
-	D# 1
-	rest 1
-	E_ 1
-	rest 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	G_ 1
-	rest 1
-	A_ 8
-	endchannel
--- a/audio/sfx/sfx_02_3c.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_02_3c_Ch1: ; 840a (2:440a)
-	duty 2
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 2
-	unknownsfx0x10 34
-	unknownsfx0x20 8, 226, 0, 2
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_3d.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_02_3d_Ch1: ; 84b7 (2:44b7)
-	duty 2
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_3e.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-SFX_02_3e_Ch1: ; 84d9 (2:44d9)
-	duty 2
-	unknownsfx0x10 20
-	unknownsfx0x20 4, 242, 0, 6
-	unknownsfx0x20 4, 242, 0, 6
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 242, 0, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_3f.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_02_3f_Ch1: ; 83c3 (2:43c3)
-	unknownnoise0x20 1, 226, 51
-	unknownnoise0x20 8, 225, 34
-	endchannel
--- a/audio/sfx/sfx_02_40.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_02_40_Ch1: ; 8462 (2:4462)
-	duty 2
-	unknownsfx0x20 0, 145, 192, 7
-	unknownsfx0x20 0, 129, 208, 7
-	unknownsfx0x20 0, 145, 192, 7
-	unknownsfx0x20 12, 161, 208, 7
-	endchannel
--- a/audio/sfx/sfx_02_41.asm
+++ /dev/null
@@ -1,77 +1,0 @@
-SFX_02_41_Ch1: ; b2c8 (2:72c8)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 2
-	notetype 5, 11, 1
-	octave 3
-	A_ 2
-	A_ 2
-	G_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	A_ 2
-	octave 4
-	C_ 4
-	E_ 4
-	octave 3
-	F_ 4
-	endchannel
-
-
-SFX_02_41_Ch2: ; b2e1 (2:72e1)
-	executemusic
-	duty 2
-	notetype 5, 12, 2
-	octave 5
-	F_ 2
-	E_ 1
-	rest 1
-	D_ 2
-	C_ 1
-	rest 1
-	octave 4
-	A# 2
-	octave 5
-	C_ 2
-	D_ 2
-	E_ 2
-	F_ 4
-	G_ 4
-	F_ 4
-	endchannel
-
-
-SFX_02_41_Ch3: ; b2f7 (2:72f7)
-	executemusic
-	notetype 5, 1, 0
-	octave 5
-	C_ 1
-	rest 1
-	octave 4
-	F_ 2
-	octave 5
-	C_ 1
-	rest 1
-	octave 4
-	A# 1
-	rest 1
-	A_ 1
-	rest 1
-	G_ 1
-	rest 1
-	F_ 1
-	rest 1
-	E_ 1
-	rest 1
-	octave 5
-	F_ 1
-	rest 3
-	C_ 1
-	rest 3
-	octave 4
-	F_ 2
-	rest 2
-	endchannel
--- a/audio/sfx/sfx_02_42.asm
+++ /dev/null
@@ -1,59 +1,0 @@
-SFX_02_42_Ch1: ; b362 (2:7362)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 10, 4
-	octave 3
-	A# 4
-	notetype 5, 11, 1
-	octave 4
-	C_ 2
-	C_ 1
-	C_ 1
-	notetype 5, 10, 4
-	D# 4
-	notetype 5, 11, 1
-	F_ 2
-	F_ 1
-	F_ 1
-	notetype 5, 11, 4
-	A# 8
-	endchannel
-
-
-SFX_02_42_Ch2: ; b381 (2:7381)
-	executemusic
-	vibrato 4, 2, 3
-	duty 2
-	notetype 5, 13, 1
-	octave 4
-	G_ 2
-	G_ 1
-	G_ 1
-	notetype 5, 12, 4
-	D# 4
-	notetype 5, 13, 1
-	G# 2
-	G# 1
-	G# 1
-	A# 2
-	A# 1
-	A# 1
-	notetype 5, 12, 4
-	octave 5
-	D# 8
-	endchannel
-
-
-SFX_02_42_Ch3: ; b39d (2:739d)
-	executemusic
-	notetype 5, 1, 0
-	octave 4
-	D# 4
-	G# 4
-	G_ 4
-	F_ 4
-	D# 8
-	endchannel
--- a/audio/sfx/sfx_02_43.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_02_43_Ch1: ; 84c6 (2:44c6)
-	duty 0
-	unknownsfx0x10 20
-	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_02_43_Ch1
-	unknownsfx0x20 15, 243, 0, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_44.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_02_44_Ch1: ; 84ee (2:44ee)
-	duty 2
-	unknownsfx0x10 21
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_45.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-SFX_02_45_Ch1: ; 84fd (2:44fd)
-	duty 2
-	unknownsfx0x20 15, 242, 192, 7
-	unknownsfx0x20 15, 0, 0, 0
-	unknownsfx0x20 3, 161, 128, 7
-	unknownsfx0x20 3, 161, 0, 7
-	unknownsfx0x20 3, 161, 64, 7
-	unknownsfx0x20 3, 161, 0, 7
-	unknownsfx0x20 3, 161, 128, 7
-	unknownsfx0x20 3, 161, 0, 7
-	unknownsfx0x20 3, 161, 192, 7
-	unknownsfx0x20 8, 161, 0, 7
-	endchannel
--- a/audio/sfx/sfx_02_46.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_02_46_Ch1: ; 8528 (2:4528)
-	duty 2
-	unknownsfx0x20 4, 240, 0, 6
-	unknownsfx0x20 4, 240, 0, 4
-	unknownsfx0x20 4, 240, 0, 2
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_02_47.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_02_47_Ch1: ; 853b (2:453b)
-	duty 2
-	unknownsfx0x20 6, 240, 0, 7
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 6, 240, 0, 7
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_02_48.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_02_48_Ch1: ; 854e (2:454e)
-	duty 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 6
-	unknownsfx0x20 15, 183, 128, 5
-	unknownsfx0x20 15, 135, 0, 5
-	unknownsfx0x20 15, 71, 128, 4
-	unknownsfx0x20 15, 23, 0, 4
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_49.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_02_49_Ch1: ; 8569 (2:4569)
-	duty 2
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 2, 241, 128, 6
-	unknownsfx0x20 1, 0, 0, 0
-	unknownsfx0x20 4, 241, 128, 7
-	unknownsfx0x20 4, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_02_4a.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-SFX_02_4a_Ch1: ; 8580 (2:4580)
-	duty 2
-	unknownsfx0x10 44
-	unknownsfx0x20 4, 242, 0, 5
-	unknownsfx0x10 34
-	unknownsfx0x20 2, 241, 0, 5
-	unknownsfx0x10 8
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_02_4b.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_02_4b_Ch1: ; 8595 (2:4595)
-	duty 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 5
-	unknownsfx0x20 15, 183, 128, 5
-	unknownsfx0x20 15, 135, 0, 6
-	unknownsfx0x20 15, 71, 128, 6
-	unknownsfx0x20 15, 23, 0, 7
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_4c.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_02_4c_Ch1: ; 85b0 (2:45b0)
-	duty 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 7
-	unknownsfx0x20 15, 183, 128, 6
-	unknownsfx0x20 15, 135, 0, 6
-	unknownsfx0x20 15, 71, 128, 5
-	unknownsfx0x20 15, 23, 0, 5
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_4d.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_02_4d_Ch1: ; 85cb (2:45cb)
-	duty 1
-	unknownsfx0x10 22
-	unknownsfx0x20 15, 210, 0, 5
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_4e.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_02_4e_Ch1: ; 85d6 (2:45d6)
-	duty 2
-	unknownsfx0x10 149
-	unknownsfx0x20 15, 242, 0, 4
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_4f.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_02_4f_Ch1: ; 85e1 (2:45e1)
-	unknownnoise0x20 2, 241, 50
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 241, 34
-	unknownnoise0x20 1, 0, 0
-	endchannel
--- a/audio/sfx/sfx_02_50.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_02_50_Ch1: ; 85ee (2:45ee)
-	unknownnoise0x20 2, 241, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 161, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 209, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 129, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 177, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 97, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 145, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 65, 18
-	unknownnoise0x20 2, 0, 0
-	endchannel
--- a/audio/sfx/sfx_02_51.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_02_51_Ch1: ; 861f (2:461f)
-	duty 3
-	unknownsfx0x10 90
-	unknownsfx0x20 4, 240, 0, 5
-	unknownsfx0x10 8
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
-
-
-SFX_02_51_Ch2: ; 8636 (2:4636)
-	duty 3
-	unknownsfx0x20 4, 240, 1, 4
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 1, 4
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_02_52.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_02_52_Ch1: ; 8649 (2:4649)
-	duty 0
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 210, 0, 7
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_53.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_02_53_Ch1: ; 8654 (2:4654)
-	unknownnoise0x20 4, 162, 35
-	unknownnoise0x20 8, 241, 52
-	unknownnoise0x20 15, 0, 0
-	unknownnoise0x20 2, 247, 36
-	unknownnoise0x20 2, 247, 52
-	unknownnoise0x20 4, 247, 68
-	unknownnoise0x20 8, 244, 85
-	unknownnoise0x20 8, 241, 68
-	endchannel
--- a/audio/sfx/sfx_02_54.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-SFX_02_54_Ch1: ; 866d (2:466d)
-	duty 2
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 242, 0, 5
-	endchannel
-
-
-SFX_02_54_Ch2: ; 868c (2:468c)
-	duty 3
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 242, 130, 4
-	endchannel
--- a/audio/sfx/sfx_02_55.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-SFX_02_55_Ch1: ; 86ab (2:46ab)
-	duty 1
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 5
-	unknownsfx0x10 34
-	unknownsfx0x20 4, 226, 0, 5
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 7
-	unknownsfx0x10 34
-	unknownsfx0x20 15, 226, 0, 7
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_56.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_02_56_Ch1: ; 83e1 (2:43e1)
-	unknownnoise0x20 2, 247, 36
-	unknownnoise0x20 2, 247, 52
-	unknownnoise0x20 4, 247, 68
-	unknownnoise0x20 8, 244, 85
-	unknownnoise0x20 8, 241, 68
-	endchannel
--- a/audio/sfx/sfx_02_57.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_02_57_Ch1: ; 83f1 (2:43f1)
-	unknownnoise0x20 9, 241, 68
-	unknownnoise0x20 8, 209, 67
-	endchannel
--- a/audio/sfx/sfx_02_58.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-SFX_02_58_Ch1: ; 83f8 (2:43f8)
-	duty 2
-	unknownsfx0x20 8, 225, 64, 7
-	endchannel
-
-
-SFX_02_58_Ch2: ; 83ff (2:43ff)
-	duty 2
-	unknownsfx0x20 2, 8, 0, 0
-	unknownsfx0x20 8, 177, 65, 7
-	endchannel
--- a/audio/sfx/sfx_02_59.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-SFX_02_59_Ch1: ; 841b (2:441b)
-	duty 2
-	unknownsfx0x20 4, 241, 128, 7
-	endchannel
-
-
-SFX_02_59_Ch2: ; 8422 (2:4422)
-	duty 2
-	unknownsfx0x20 1, 8, 0, 0
-	unknownsfx0x20 4, 161, 97, 7
-	endchannel
--- a/audio/sfx/sfx_02_5a.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-SFX_02_5a_Ch1: ; 842d (2:442d)
-	duty 2
-	unknownsfx0x20 4, 225, 0, 7
-	unknownsfx0x20 8, 242, 224, 7
-	endchannel
-
-
-SFX_02_5a_Ch2: ; 8438 (2:4438)
-	duty 2
-	unknownsfx0x20 1, 8, 0, 0
-	unknownsfx0x20 4, 145, 193, 6
-	unknownsfx0x20 8, 162, 161, 7
-	endchannel
--- a/audio/sfx/sfx_02_5b.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_02_5b_Ch1: ; 8447 (2:4447)
-	duty 2
-	unknownsfx0x10 90
-	unknownsfx0x20 15, 241, 0, 3
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_02_5c.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_02_5c_Ch1: ; 8452 (2:4452)
-	unknownnoise0x20 2, 241, 84
-	unknownnoise0x20 12, 113, 35
-	unknownnoise0x20 2, 177, 84
-	unknownnoise0x20 12, 97, 35
-	unknownnoise0x20 6, 65, 84
-	endchannel
--- a/audio/sfx/sfx_02_5d.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SFX_02_5d_Ch1: ; 8475 (2:4475)
-	duty 2
-	unknownsfx0x20 4, 244, 0, 7
-	unknownsfx0x20 2, 228, 0, 6
-	unknownsfx0x20 2, 228, 128, 6
-	unknownsfx0x20 2, 228, 192, 6
-	unknownsfx0x20 2, 228, 0, 7
-	unknownsfx0x20 2, 228, 160, 7
-	unknownsfx0x20 15, 242, 224, 7
-	endchannel
-
-
-SFX_02_5d_Ch2: ; 8494 (2:4494)
-	duty 2
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 2, 212, 1, 7
-	unknownsfx0x20 2, 196, 1, 6
-	unknownsfx0x20 2, 196, 129, 6
-	unknownsfx0x20 2, 196, 193, 6
-	unknownsfx0x20 2, 196, 1, 7
-	unknownsfx0x20 2, 196, 161, 7
-	unknownsfx0x20 15, 210, 225, 7
-	endchannel
--- a/audio/sfx/sfx_02_5e.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_02_5e_Ch1: ; 83ca (2:43ca)
-	vibrato 16, 1, 4
-	notetype 12, 1, 0
-	octave 5
-	E_ 2
-	F_ 2
-	G_ 4
-	A_ 2
-	G_ 2
-	octave 6
-	C_ 4
-	C_ 2
-	D_ 2
-	C_ 2
-	octave 5
-	G_ 2
-	A_ 2
-	F_ 2
-	G_ 8
-	rest 12
-	endchannel
--- a/audio/sfx/sfx_02_5f.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-SFX_02_5f_Ch1: ; 86c8 (2:46c8)
-	duty 2
-	unknownsfx0x20 15, 243, 48, 7
-	unknownsfx0x20 8, 101, 48, 7
-	unknownsfx0x20 15, 244, 0, 7
-	unknownsfx0x20 15, 116, 0, 7
-	unknownsfx0x20 15, 68, 0, 7
-	unknownsfx0x20 15, 36, 0, 7
-	endchannel
--- a/audio/sfx/sfx_08_01.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_01_Ch1: ; 202fd (8:42fd)
-	unknownnoise0x20 0, 193, 51
-	endchannel
--- a/audio/sfx/sfx_08_02.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_02_Ch1: ; 20301 (8:4301)
-	unknownnoise0x20 0, 177, 51
-	endchannel
--- a/audio/sfx/sfx_08_03.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_03_Ch1: ; 20305 (8:4305)
-	unknownnoise0x20 0, 161, 51
-	endchannel
--- a/audio/sfx/sfx_08_04.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_04_Ch1: ; 20309 (8:4309)
-	unknownnoise0x20 0, 129, 51
-	endchannel
--- a/audio/sfx/sfx_08_05.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_08_05_Ch1: ; 2030d (8:430d)
-	unknownnoise0x20 7, 132, 55
-	unknownnoise0x20 6, 132, 54
-	unknownnoise0x20 5, 131, 53
-	unknownnoise0x20 4, 131, 52
-	unknownnoise0x20 3, 130, 51
-	unknownnoise0x20 2, 129, 50
-	endchannel
--- a/audio/sfx/sfx_08_06.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_06_Ch1: ; 20320 (8:4320)
-	unknownnoise0x20 0, 81, 42
-	endchannel
--- a/audio/sfx/sfx_08_07.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_07_Ch1: ; 20324 (8:4324)
-	unknownnoise0x20 1, 65, 43
-	unknownnoise0x20 0, 97, 42
-	endchannel
--- a/audio/sfx/sfx_08_08.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_08_Ch1: ; 2032b (8:432b)
-	unknownnoise0x20 0, 129, 16
-	endchannel
--- a/audio/sfx/sfx_08_09.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_09_Ch1: ; 2032f (8:432f)
-	unknownnoise0x20 0, 130, 35
-	endchannel
--- a/audio/sfx/sfx_08_0a.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_0a_Ch1: ; 20333 (8:4333)
-	unknownnoise0x20 0, 130, 37
-	endchannel
--- a/audio/sfx/sfx_08_0b.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_0b_Ch1: ; 20337 (8:4337)
-	unknownnoise0x20 0, 130, 38
-	endchannel
--- a/audio/sfx/sfx_08_0c.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_0c_Ch1: ; 2033b (8:433b)
-	unknownnoise0x20 0, 161, 16
-	endchannel
--- a/audio/sfx/sfx_08_0d.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_0d_Ch1: ; 2033f (8:433f)
-	unknownnoise0x20 0, 162, 17
-	endchannel
--- a/audio/sfx/sfx_08_0e.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_0e_Ch1: ; 20343 (8:4343)
-	unknownnoise0x20 0, 162, 80
-	endchannel
--- a/audio/sfx/sfx_08_0f.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_0f_Ch1: ; 20347 (8:4347)
-	unknownnoise0x20 0, 161, 24
-	unknownnoise0x20 0, 49, 51
-	endchannel
--- a/audio/sfx/sfx_08_10.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_10_Ch1: ; 2034e (8:434e)
-	unknownnoise0x20 2, 145, 40
-	unknownnoise0x20 0, 113, 24
-	endchannel
--- a/audio/sfx/sfx_08_11.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_11_Ch1: ; 20355 (8:4355)
-	unknownnoise0x20 0, 145, 34
-	endchannel
--- a/audio/sfx/sfx_08_12.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_12_Ch1: ; 20359 (8:4359)
-	unknownnoise0x20 0, 113, 34
-	endchannel
--- a/audio/sfx/sfx_08_13.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_13_Ch1: ; 2035d (8:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
--- a/audio/sfx/sfx_08_14.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_08_14_Ch1: ; 20c2f (8:4c2f)
-	dutycycle 245
-	unknownsfx0x20 4, 243, 24, 7
-	unknownsfx0x20 15, 229, 152, 7
-	unknownsfx0x20 8, 145, 88, 7
-	endchannel
-
-
-SFX_08_14_Ch2: ; 20c3e (8:4c3e)
-	dutycycle 160
-	unknownsfx0x20 5, 179, 8, 7
-	unknownsfx0x20 15, 197, 136, 7
-	unknownsfx0x20 8, 113, 72, 7
-	endchannel
-
-
-SFX_08_14_Ch3: ; 20c4d (8:4c4d)
-	unknownnoise0x20 3, 161, 28
-	unknownnoise0x20 14, 148, 44
-	unknownnoise0x20 8, 129, 28
-	endchannel
--- a/audio/sfx/sfx_08_15.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_08_15_Ch1: ; 20e3f (8:4e3f)
-	dutycycle 160
-	unknownsfx0x20 4, 243, 0, 6
-	unknownsfx0x20 8, 213, 96, 7
-	unknownsfx0x20 3, 226, 32, 7
-	unknownsfx0x20 8, 209, 16, 7
-	endchannel
-
-
-SFX_08_15_Ch2: ; 20e52 (8:4e52)
-	dutycycle 90
-	unknownsfx0x20 5, 179, 241, 6
-	unknownsfx0x20 7, 197, 82, 7
-	unknownsfx0x20 3, 162, 17, 7
-	unknownsfx0x20 8, 177, 1, 6
-	endchannel
-
-
-SFX_08_15_Ch3: ; 20e65 (8:4e65)
-	unknownnoise0x20 3, 162, 60
-	unknownnoise0x20 12, 148, 44
-	unknownnoise0x20 3, 130, 28
-	unknownnoise0x20 8, 113, 44
-	endchannel
--- a/audio/sfx/sfx_08_16.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-SFX_08_16_Ch1: ; 20db4 (8:4db4)
-	duty 0
-	unknownsfx0x20 8, 245, 128, 4
-	unknownsfx0x20 2, 225, 224, 5
-	unknownsfx0x20 8, 209, 220, 5
-	endchannel
-
-
-SFX_08_16_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)
-	endchannel
--- a/audio/sfx/sfx_08_17.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_08_17_Ch1: ; 20b4e (8:4b4e)
-	dutycycle 240
-	unknownsfx0x20 4, 247, 8, 6
-	unknownsfx0x20 6, 230, 0, 6
-	unknownsfx0x20 6, 215, 240, 5
-	unknownsfx0x20 6, 196, 224, 5
-	unknownsfx0x20 5, 211, 192, 5
-	unknownsfx0x20 4, 211, 160, 5
-	unknownsfx0x20 8, 225, 128, 5
-	endchannel
-
-
-SFX_08_17_Ch2: ; 20b6d (8:4b6d)
-	dutycycle 10
-	unknownsfx0x20 4, 199, 4, 5
-	unknownsfx0x20 6, 166, 2, 5
-	unknownsfx0x20 6, 151, 241, 4
-	unknownsfx0x20 4, 180, 225, 4
-	unknownsfx0x20 5, 163, 194, 4
-	unknownsfx0x20 4, 179, 163, 4
-	unknownsfx0x20 8, 193, 130, 4
-	endchannel
-
-
-SFX_08_17_Ch3: ; 20b8c (8:4b8c)
-	unknownnoise0x20 12, 228, 76
-	unknownnoise0x20 10, 199, 92
-	unknownnoise0x20 12, 182, 76
-	unknownnoise0x20 15, 162, 92
-	endchannel
--- a/audio/sfx/sfx_08_18.asm
+++ /dev/null
@@ -1,32 +1,0 @@
-SFX_08_18_Ch1: ; 20efd (8:4efd)
-	dutycycle 240
-	unknownsfx0x20 4, 247, 160, 6
-	unknownsfx0x20 8, 230, 164, 6
-	unknownsfx0x20 4, 214, 160, 6
-	unknownsfx0x20 12, 211, 32, 6
-	unknownsfx0x20 8, 195, 36, 6
-	unknownsfx0x20 4, 194, 32, 6
-	unknownsfx0x20 8, 177, 16, 6
-	endchannel
-
-
-SFX_08_18_Ch2: ; 20f1c (8:4f1c)
-	dutycycle 90
-	unknownsfx0x20 4, 231, 1, 6
-	unknownsfx0x20 8, 214, 3, 6
-	unknownsfx0x20 4, 198, 1, 6
-	unknownsfx0x20 12, 195, 129, 5
-	unknownsfx0x20 8, 179, 131, 5
-	unknownsfx0x20 4, 178, 130, 5
-	unknownsfx0x20 8, 161, 113, 5
-	endchannel
-
-
-SFX_08_18_Ch3: ; 20f3b (8:4f3b)
-	unknownnoise0x20 7, 214, 92
-	unknownnoise0x20 8, 230, 76
-	unknownnoise0x20 4, 212, 92
-	unknownnoise0x20 4, 212, 76
-	unknownnoise0x20 7, 195, 76
-	unknownnoise0x20 8, 161, 92
-	endchannel
--- a/audio/sfx/sfx_08_19.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-SFX_08_19_Ch1: ; 20cdd (8:4cdd)
-	dutycycle 10
-	unknownsfx0x20 6, 226, 0, 5
-	unknownsfx0x20 6, 227, 128, 5
-	unknownsfx0x20 6, 211, 112, 5
-	unknownsfx0x20 8, 161, 96, 5
-	endchannel
-
-
-SFX_08_19_Ch2: ; 20cf0 (8:4cf0)
-	dutycycle 245
-	unknownsfx0x20 6, 226, 130, 4
-	unknownsfx0x20 6, 211, 1, 5
-	unknownsfx0x20 6, 178, 226, 4
-	unknownsfx0x20 8, 129, 193, 4
-
-
-SFX_08_19_Ch3: ; 20d02 (8:4d02)
-	endchannel
--- a/audio/sfx/sfx_08_1a.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-SFX_08_1a_Ch1: ; 20c87 (8:4c87)
-	dutycycle 250
-	unknownsfx0x20 6, 131, 71, 2
-	unknownsfx0x20 15, 98, 38, 2
-	unknownsfx0x20 4, 82, 69, 2
-	unknownsfx0x20 9, 99, 6, 2
-	unknownsfx0x20 15, 130, 37, 2
-	unknownsfx0x20 15, 66, 7, 2
-
-
-SFX_08_1a_Ch2: ; 20ca1 (8:4ca1)
-	endchannel
-
-
-SFX_08_1a_Ch3: ; 20ca2 (8:4ca2)
-	unknownnoise0x20 8, 212, 140
-	unknownnoise0x20 4, 226, 156
-	unknownnoise0x20 15, 198, 140
-	unknownnoise0x20 8, 228, 172
-	unknownnoise0x20 15, 215, 156
-	unknownnoise0x20 15, 242, 172
-	endchannel
--- a/audio/sfx/sfx_08_1b.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_08_1b_Ch1: ; 20cb5 (8:4cb5)
-	dutycycle 240
-	unknownsfx0x20 4, 243, 224, 6
-	unknownsfx0x20 15, 228, 64, 6
-	unknownsfx0x20 8, 193, 32, 6
-	endchannel
-
-
-SFX_08_1b_Ch2: ; 20cc4 (8:4cc4)
-	dutycycle 10
-	unknownsfx0x20 3, 195, 131, 6
-	unknownsfx0x20 14, 180, 2, 6
-	unknownsfx0x20 8, 161, 1, 6
-	endchannel
-
-
-SFX_08_1b_Ch3: ; 20cd3 (8:4cd3)
-	unknownnoise0x20 4, 211, 92
-	unknownnoise0x20 15, 230, 76
-	unknownnoise0x20 8, 177, 92
-	endchannel
--- a/audio/sfx/sfx_08_1c.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SFX_08_1c_Ch1: ; 20ecd (8:4ecd)
-	dutycycle 240
-	unknownsfx0x20 15, 246, 101, 5
-	unknownsfx0x20 10, 228, 124, 5
-	unknownsfx0x20 3, 194, 92, 5
-	unknownsfx0x20 15, 178, 60, 5
-	endchannel
-
-
-SFX_08_1c_Ch2: ; 20ee0 (8:4ee0)
-	dutycycle 90
-	unknownsfx0x20 14, 214, 3, 5
-	unknownsfx0x20 9, 180, 27, 5
-	unknownsfx0x20 4, 146, 250, 4
-	unknownsfx0x20 15, 162, 219, 4
-	endchannel
-
-
-SFX_08_1c_Ch3: ; 20ef3 (8:4ef3)
-	unknownnoise0x20 12, 230, 76
-	unknownnoise0x20 11, 215, 92
-	unknownnoise0x20 15, 194, 76
-	endchannel
--- a/audio/sfx/sfx_08_1d.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-SFX_08_1d_Ch1: ; 209d7 (8:49d7)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 160, 7
-	unknownsfx0x20 6, 230, 163, 7
-	unknownsfx0x20 10, 244, 160, 7
-	dutycycle 165
-	unknownsfx0x20 10, 246, 216, 7
-	unknownsfx0x20 4, 227, 215, 7
-	unknownsfx0x20 15, 242, 216, 7
-	endchannel
-
-
-SFX_08_1d_Ch2: ; 209f4 (8:49f4)
-	dutycycle 5
-	unknownsfx0x20 2, 8, 0, 0
-	unknownsfx0x20 15, 167, 161, 6
-	unknownsfx0x20 6, 134, 162, 6
-	unknownsfx0x20 10, 116, 161, 6
-	dutycycle 95
-	unknownsfx0x20 10, 118, 214, 6
-	unknownsfx0x20 4, 131, 217, 6
-	unknownsfx0x20 15, 162, 215, 6
-	endchannel
-
-
-SFX_08_1d_Ch3: ; 20a15 (8:4a15)
-	unknownnoise0x20 2, 242, 60
-	unknownnoise0x20 8, 228, 62
-	unknownnoise0x20 15, 215, 60
-	unknownnoise0x20 6, 197, 59
-	unknownnoise0x20 6, 228, 61
-	unknownnoise0x20 8, 182, 60
-	unknownnoise0x20 6, 212, 61
-	unknownnoise0x20 8, 193, 59
-	endchannel
--- a/audio/sfx/sfx_08_1e.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-SFX_08_1e_Ch1: ; 20e72 (8:4e72)
-	dutycycle 240
-	unknownsfx0x20 8, 247, 224, 6
-	unknownsfx0x20 6, 230, 229, 6
-	unknownsfx0x20 3, 244, 224, 6
-	unknownsfx0x20 3, 246, 208, 6
-	unknownsfx0x20 3, 227, 192, 6
-	unknownsfx0x20 4, 242, 176, 6
-	unknownsfx0x20 15, 162, 200, 6
-	endchannel
-
-
-SFX_08_1e_Ch2: ; 20e91 (8:4e91)
-	dutycycle 5
-	unknownsfx0x20 3, 8, 0, 0
-	unknownsfx0x20 8, 167, 161, 6
-	unknownsfx0x20 6, 134, 163, 6
-	unknownsfx0x20 3, 116, 161, 6
-	unknownsfx0x20 3, 118, 145, 6
-	unknownsfx0x20 3, 131, 130, 6
-	unknownsfx0x20 4, 162, 113, 6
-	unknownsfx0x20 15, 114, 137, 6
-	endchannel
-
-
-SFX_08_1e_Ch3: ; 20eb4 (8:4eb4)
-	unknownnoise0x20 2, 242, 60
-	unknownnoise0x20 8, 228, 62
-	unknownnoise0x20 8, 215, 60
-	unknownnoise0x20 5, 197, 59
-	unknownnoise0x20 3, 212, 44
-	unknownnoise0x20 2, 182, 60
-	unknownnoise0x20 3, 164, 44
-	unknownnoise0x20 8, 145, 60
-	endchannel
--- a/audio/sfx/sfx_08_1f.asm
+++ /dev/null
@@ -1,37 +1,0 @@
-SFX_08_1f_Ch1: ; 20d03 (8:4d03)
-	dutycycle 204
-	unknownsfx0x20 4, 241, 0, 7
-	unknownsfx0x20 4, 225, 128, 7
-	unknownsfx0x20 4, 209, 64, 7
-	unknownsfx0x20 4, 225, 64, 7
-	unknownsfx0x20 4, 241, 128, 7
-	unknownsfx0x20 4, 209, 0, 7
-	unknownsfx0x20 4, 241, 1, 7
-	unknownsfx0x20 4, 209, 130, 7
-	unknownsfx0x20 4, 193, 66, 7
-	unknownsfx0x20 8, 177, 65, 7
-	endchannel
-
-
-SFX_08_1f_Ch2: ; 20d2e (8:4d2e)
-	dutycycle 68
-	unknownsfx0x20 12, 8, 0, 0
-	unknownsfx0x20 4, 241, 1, 7
-	unknownsfx0x20 4, 225, 130, 7
-	unknownsfx0x20 4, 209, 65, 7
-	unknownsfx0x20 4, 225, 65, 7
-	unknownsfx0x20 4, 241, 130, 7
-	unknownsfx0x20 8, 209, 1, 7
-	endchannel
-
-
-SFX_08_1f_Ch3: ; 20d4d (8:4d4d)
-	unknownnoise0x20 15, 8, 0
-	unknownnoise0x20 4, 8, 0
-	unknownnoise0x20 4, 209, 76
-	unknownnoise0x20 4, 177, 44
-	unknownnoise0x20 4, 209, 60
-	unknownnoise0x20 4, 177, 60
-	unknownnoise0x20 4, 193, 44
-	unknownnoise0x20 8, 161, 76
-	endchannel
--- a/audio/sfx/sfx_08_20.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_08_20_Ch1: ; 20d66 (8:4d66)
-	dutycycle 204
-	unknownsfx0x20 8, 245, 0, 6
-	unknownsfx0x20 2, 210, 56, 6
-	unknownsfx0x20 2, 194, 48, 6
-	unknownsfx0x20 2, 194, 40, 6
-	unknownsfx0x20 2, 178, 32, 6
-	unknownsfx0x20 2, 178, 16, 6
-	unknownsfx0x20 2, 162, 24, 6
-	unknownsfx0x20 2, 178, 16, 6
-	unknownsfx0x20 8, 193, 32, 6
-	endchannel
-
-
-SFX_08_20_Ch2: ; 20d8d (8:4d8d)
-	dutycycle 68
-	unknownsfx0x20 12, 195, 192, 5
-	unknownsfx0x20 3, 177, 249, 5
-	unknownsfx0x20 2, 161, 241, 5
-	unknownsfx0x20 2, 161, 233, 5
-	unknownsfx0x20 2, 145, 225, 5
-	unknownsfx0x20 2, 145, 217, 5
-	unknownsfx0x20 2, 129, 209, 5
-	unknownsfx0x20 2, 145, 217, 5
-	unknownsfx0x20 8, 145, 225, 5
-
-
-SFX_08_20_Ch3: ; 20db3 (8:4db3)
-	endchannel
--- a/audio/sfx/sfx_08_21.asm
+++ /dev/null
@@ -1,40 +1,0 @@
-SFX_08_21_Ch1: ; 20dd2 (8:4dd2)
-	dutycycle 136
-	unknownsfx0x20 5, 242, 80, 6
-	unknownsfx0x20 9, 209, 96, 6
-	unknownsfx0x20 5, 226, 18, 6
-	unknownsfx0x20 9, 193, 34, 6
-	unknownsfx0x20 5, 242, 16, 6
-	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_08_21_Ch1
-	endchannel
-
-
-SFX_08_21_Ch2: ; 20df1 (8:4df1)
-	dutycycle 64
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 5, 242, 81, 6
-	unknownsfx0x20 9, 209, 97, 6
-	unknownsfx0x20 5, 226, 20, 6
-	unknownsfx0x20 8, 193, 36, 6
-	unknownsfx0x20 5, 242, 17, 6
-	unknownsfx0x20 12, 209, 33, 6
-	unknownsfx0x20 5, 226, 20, 6
-	unknownsfx0x20 8, 193, 36, 6
-	unknownsfx0x20 5, 242, 17, 6
-	unknownsfx0x20 4, 209, 33, 6
-	endchannel
-
-
-SFX_08_21_Ch3: ; 20e20 (8:4e20)
-	unknownnoise0x20 6, 210, 28
-	unknownnoise0x20 9, 177, 44
-	unknownnoise0x20 8, 194, 44
-	unknownnoise0x20 9, 177, 60
-	unknownnoise0x20 6, 194, 44
-	unknownnoise0x20 9, 162, 60
-	unknownnoise0x20 7, 194, 44
-	unknownnoise0x20 5, 161, 60
-	unknownnoise0x20 9, 194, 44
-	unknownnoise0x20 4, 161, 60
-	endchannel
--- a/audio/sfx/sfx_08_22.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SFX_08_22_Ch1: ; 20c57 (8:4c57)
-	dutycycle 165
-	unknownsfx0x20 4, 225, 0, 7
-	unknownsfx0x20 4, 242, 128, 7
-	unknownsfx0x20 2, 146, 64, 7
-	unknownsfx0x20 8, 225, 0, 6
-	endchannel
-
-
-SFX_08_22_Ch2: ; 20c6a (8:4c6a)
-	dutycycle 10
-	unknownsfx0x20 4, 177, 225, 6
-	unknownsfx0x20 3, 194, 225, 6
-	unknownsfx0x20 3, 98, 129, 6
-	unknownsfx0x20 8, 177, 225, 5
-	endchannel
-
-
-SFX_08_22_Ch3: ; 20c7d (8:4c7d)
-	unknownnoise0x20 2, 97, 50
-	unknownnoise0x20 2, 97, 33
-	unknownnoise0x20 8, 97, 17
-	endchannel
--- a/audio/sfx/sfx_08_23.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_08_23_Ch1: ; 20b99 (8:4b99)
-	dutycycle 241
-	unknownsfx0x20 4, 247, 192, 7
-	unknownsfx0x20 12, 230, 194, 7
-	unknownsfx0x20 6, 181, 128, 6
-	unknownsfx0x20 4, 196, 112, 6
-	unknownsfx0x20 4, 181, 96, 6
-	unknownsfx0x20 8, 193, 64, 6
-	endchannel
-
-
-SFX_08_23_Ch2: ; 20bb4 (8:4bb4)
-	dutycycle 204
-	unknownsfx0x20 3, 199, 129, 7
-	unknownsfx0x20 12, 182, 128, 7
-	unknownsfx0x20 6, 165, 65, 6
-	unknownsfx0x20 4, 196, 50, 6
-	unknownsfx0x20 6, 181, 33, 6
-	unknownsfx0x20 8, 161, 2, 6
-	endchannel
-
-
-SFX_08_23_Ch3: ; 20bcf (8:4bcf)
-	unknownnoise0x20 3, 228, 60
-	unknownnoise0x20 12, 214, 44
-	unknownnoise0x20 4, 228, 60
-	unknownnoise0x20 8, 183, 92
-	unknownnoise0x20 15, 194, 93
-	endchannel
--- a/audio/sfx/sfx_08_24.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-SFX_08_24_Ch1: ; 20bdf (8:4bdf)
-	dutycycle 201
-	unknownsfx0x20 8, 247, 128, 6
-	unknownsfx0x20 2, 247, 96, 6
-	unknownsfx0x20 1, 231, 64, 6
-	unknownsfx0x20 1, 231, 32, 6
-	unknownsfx0x20 15, 209, 0, 6
-	unknownsfx0x20 4, 199, 64, 7
-	unknownsfx0x20 4, 167, 48, 7
-	unknownsfx0x20 15, 145, 32, 7
-	endchannel
-
-
-SFX_08_24_Ch2: ; 20c02 (8:4c02)
-	dutycycle 121
-	unknownsfx0x20 10, 231, 130, 6
-	unknownsfx0x20 2, 231, 98, 6
-	unknownsfx0x20 1, 215, 66, 6
-	unknownsfx0x20 1, 215, 34, 6
-	unknownsfx0x20 15, 193, 2, 6
-	unknownsfx0x20 4, 183, 66, 7
-	unknownsfx0x20 2, 151, 50, 7
-	unknownsfx0x20 15, 129, 34, 7
-	endchannel
-
-
-SFX_08_24_Ch3: ; 20c25 (8:4c25)
-	unknownnoise0x20 4, 116, 33
-	unknownnoise0x20 4, 116, 16
-	unknownnoise0x20 4, 113, 32
-	endchannel
--- a/audio/sfx/sfx_08_25.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SFX_08_25_Ch1: ; 20abb (8:4abb)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 160, 7
-	unknownsfx0x20 8, 230, 164, 7
-	unknownsfx0x20 4, 214, 160, 7
-	unknownsfx0x20 15, 211, 32, 7
-	unknownsfx0x20 8, 195, 35, 7
-	unknownsfx0x20 2, 194, 40, 7
-	unknownsfx0x20 8, 177, 48, 7
-	endchannel
-
-
-SFX_08_25_Ch2: ; 20ada (8:4ada)
-	dutycycle 10
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 6, 167, 65, 7
-	unknownsfx0x20 8, 134, 67, 7
-	unknownsfx0x20 4, 118, 65, 7
-	unknownsfx0x20 13, 131, 194, 6
-	unknownsfx0x20 7, 115, 193, 6
-	unknownsfx0x20 3, 130, 204, 6
-	unknownsfx0x20 8, 113, 216, 6
-	endchannel
-
-
-SFX_08_25_Ch3: ; 20afd (8:4afd)
-	unknownnoise0x20 2, 242, 76
-	unknownnoise0x20 6, 230, 58
-	unknownnoise0x20 4, 215, 58
-	unknownnoise0x20 6, 214, 44
-	unknownnoise0x20 8, 229, 60
-	unknownnoise0x20 12, 210, 61
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_08_26.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_08_26_Ch1: ; 20fd3 (8:4fd3)
-	dutycycle 165
-	unknownsfx0x20 12, 242, 64, 4
-	unknownsfx0x20 15, 227, 160, 4
-	unknownsfx0x20 4, 210, 144, 4
-	unknownsfx0x20 8, 209, 128, 4
-	endchannel
-
-
-SFX_08_26_Ch2: ; 20fe6 (8:4fe6)
-	dutycycle 238
-	unknownsfx0x20 11, 210, 56, 4
-	unknownsfx0x20 14, 198, 152, 4
-	unknownsfx0x20 3, 178, 136, 4
-	unknownsfx0x20 8, 177, 120, 4
-	endchannel
-
-
-SFX_08_26_Ch3: ; 20ff9 (8:4ff9)
-	unknownnoise0x20 10, 230, 108
-	unknownnoise0x20 15, 210, 92
-	unknownnoise0x20 3, 194, 108
-	unknownnoise0x20 8, 209, 92
-	endchannel
--- a/audio/sfx/sfx_08_27.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_08_27_Ch1: ; 21006 (8:5006)
-	dutycycle 51
-	unknownsfx0x20 15, 246, 192, 5
-	unknownsfx0x20 8, 227, 188, 5
-	unknownsfx0x20 6, 210, 208, 5
-	unknownsfx0x20 6, 178, 224, 5
-	unknownsfx0x20 6, 194, 240, 5
-	unknownsfx0x20 8, 177, 0, 6
-	endchannel
-
-
-SFX_08_27_Ch2: ; 21021 (8:5021)
-	dutycycle 153
-	unknownsfx0x20 14, 198, 177, 4
-	unknownsfx0x20 7, 195, 173, 4
-	unknownsfx0x20 5, 178, 193, 4
-	unknownsfx0x20 8, 146, 209, 4
-	unknownsfx0x20 6, 162, 225, 4
-	unknownsfx0x20 8, 145, 241, 4
-	endchannel
-
-
-SFX_08_27_Ch3: ; 2103c (8:503c)
-	unknownnoise0x20 10, 230, 92
-	unknownnoise0x20 10, 214, 108
-	unknownnoise0x20 4, 194, 76
-	unknownnoise0x20 6, 211, 92
-	unknownnoise0x20 8, 179, 76
-	unknownnoise0x20 8, 161, 92
-	endchannel
--- a/audio/sfx/sfx_08_28.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_08_28_Ch1: ; 2104f (8:504f)
-	dutycycle 240
-	unknownsfx0x20 8, 228, 144, 7
-	unknownsfx0x20 15, 245, 192, 7
-	unknownsfx0x20 8, 209, 216, 7
-	endchannel
-
-
-SFX_08_28_Ch2: ; 2105e (8:505e)
-	dutycycle 165
-	unknownsfx0x20 10, 196, 113, 7
-	unknownsfx0x20 15, 182, 162, 7
-	unknownsfx0x20 8, 161, 183, 7
-	endchannel
-
-
-SFX_08_28_Ch3: ; 2106d (8:506d)
-	unknownnoise0x20 8, 228, 76
-	unknownnoise0x20 14, 196, 60
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_08_29.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_08_29_Ch1: ; 210dd (8:50dd)
-	dutycycle 240
-	unknownsfx0x20 4, 243, 128, 7
-	unknownsfx0x20 15, 231, 0, 7
-	unknownsfx0x20 8, 211, 16, 7
-	unknownsfx0x20 4, 194, 0, 7
-	unknownsfx0x20 4, 210, 240, 6
-	unknownsfx0x20 8, 193, 224, 6
-	endchannel
-
-
-SFX_08_29_Ch2: ; 210f8 (8:50f8)
-	dutycycle 90
-	unknownsfx0x20 6, 195, 1, 7
-	unknownsfx0x20 14, 183, 129, 6
-	unknownsfx0x20 7, 179, 146, 6
-	unknownsfx0x20 3, 162, 129, 6
-	unknownsfx0x20 4, 178, 114, 6
-	unknownsfx0x20 8, 161, 97, 6
-	endchannel
-
-
-SFX_08_29_Ch3: ; 21113 (8:5113)
-	unknownnoise0x20 6, 227, 92
-	unknownnoise0x20 14, 214, 76
-	unknownnoise0x20 6, 198, 60
-	unknownnoise0x20 3, 179, 76
-	unknownnoise0x20 3, 162, 92
-	unknownnoise0x20 8, 177, 108
-	endchannel
--- a/audio/sfx/sfx_08_2a.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_08_2a_Ch1: ; 20f70 (8:4f70)
-	dutycycle 240
-	unknownsfx0x20 15, 215, 128, 7
-	unknownsfx0x20 4, 230, 160, 7
-	unknownsfx0x20 15, 210, 64, 7
-	endchannel
-
-
-SFX_08_2a_Ch2: ; 20f7f (8:4f7f)
-	dutycycle 90
-	unknownsfx0x20 15, 199, 83, 7
-	unknownsfx0x20 5, 182, 114, 7
-	unknownsfx0x20 15, 194, 17, 7
-	endchannel
-
-
-SFX_08_2a_Ch3: ; 20f8e (8:4f8e)
-	unknownnoise0x20 13, 246, 76
-	unknownnoise0x20 4, 230, 60
-	unknownnoise0x20 15, 242, 76
-	endchannel
--- a/audio/sfx/sfx_08_2b.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_08_2b_Ch1: ; 21126 (8:5126)
-	dutycycle 15
-	unknownsfx0x20 15, 247, 0, 5
-	unknownsfx0x20 15, 231, 8, 5
-	unknownsfx0x20 8, 180, 128, 4
-	unknownsfx0x20 15, 162, 96, 4
-	endchannel
-
-
-SFX_08_2b_Ch2: ; 21139 (8:5139)
-	dutycycle 68
-	unknownsfx0x20 14, 215, 129, 4
-	unknownsfx0x20 14, 199, 137, 4
-	unknownsfx0x20 10, 180, 1, 4
-	unknownsfx0x20 15, 194, 225, 3
-	endchannel
-
-
-SFX_08_2b_Ch3: ; 2114c (8:514c)
-	unknownnoise0x20 14, 247, 124
-	unknownnoise0x20 12, 246, 108
-	unknownnoise0x20 9, 228, 124
-	unknownnoise0x20 15, 226, 108
-	endchannel
--- a/audio/sfx/sfx_08_2c.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SFX_08_2c_Ch1: ; 21236 (8:5236)
-	dutycycle 80
-	unknownsfx0x20 10, 245, 128, 6
-	unknownsfx0x20 3, 226, 160, 6
-	unknownsfx0x20 3, 242, 192, 6
-	unknownsfx0x20 3, 226, 224, 6
-	unknownsfx0x20 3, 210, 0, 7
-	unknownsfx0x20 3, 194, 224, 6
-	unknownsfx0x20 3, 210, 192, 6
-	unknownsfx0x20 8, 193, 160, 6
-	endchannel
-
-
-SFX_08_2c_Ch2: ; 21259 (8:5259)
-	dutycycle 15
-	unknownsfx0x20 9, 213, 49, 6
-	unknownsfx0x20 3, 210, 82, 6
-	unknownsfx0x20 3, 226, 113, 6
-	unknownsfx0x20 3, 178, 145, 6
-	unknownsfx0x20 3, 194, 178, 6
-	unknownsfx0x20 3, 178, 145, 6
-	unknownsfx0x20 3, 194, 113, 6
-	unknownsfx0x20 8, 177, 81, 6
-	endchannel
-
-
-SFX_08_2c_Ch3: ; 2127c (8:527c)
-	unknownnoise0x20 6, 227, 76
-	unknownnoise0x20 4, 195, 60
-	unknownnoise0x20 5, 212, 60
-	unknownnoise0x20 4, 196, 44
-	unknownnoise0x20 6, 180, 60
-	unknownnoise0x20 8, 193, 44
-	endchannel
--- a/audio/sfx/sfx_08_2d.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_08_2d_Ch1: ; 20f4e (8:4f4e)
-	dutycycle 27
-	unknownsfx0x20 7, 210, 64, 7
-	unknownsfx0x20 15, 229, 96, 7
-	unknownsfx0x20 15, 193, 48, 7
-	endchannel
-
-
-SFX_08_2d_Ch2: ; 20f5d (8:4f5d)
-	dutycycle 129
-	unknownsfx0x20 2, 194, 1, 7
-	unknownsfx0x20 4, 194, 8, 7
-	unknownsfx0x20 15, 215, 65, 7
-	unknownsfx0x20 15, 162, 1, 7
-
-
-SFX_08_2d_Ch3: ; 20f6f (8:4f6f)
-	endchannel
--- a/audio/sfx/sfx_08_2e.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_08_2e_Ch1: ; 211a7 (8:51a7)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 64, 7
-	unknownsfx0x20 12, 230, 68, 7
-	unknownsfx0x20 6, 213, 80, 7
-	unknownsfx0x20 4, 195, 96, 7
-	unknownsfx0x20 3, 195, 128, 7
-	unknownsfx0x20 8, 209, 160, 7
-	endchannel
-
-
-SFX_08_2e_Ch2: ; 211c2 (8:51c2)
-	dutycycle 10
-	unknownsfx0x20 6, 199, 1, 7
-	unknownsfx0x20 11, 182, 2, 7
-	unknownsfx0x20 6, 165, 17, 7
-	unknownsfx0x20 4, 147, 33, 7
-	unknownsfx0x20 3, 163, 65, 7
-	unknownsfx0x20 8, 145, 98, 7
-	endchannel
-
-
-SFX_08_2e_Ch3: ; 211dd (8:51dd)
-	unknownnoise0x20 3, 226, 60
-	unknownnoise0x20 8, 214, 76
-	unknownnoise0x20 5, 212, 60
-	unknownnoise0x20 12, 199, 76
-	unknownnoise0x20 2, 226, 60
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_08_2f.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-SFX_08_2f_Ch1: ; 20f98 (8:4f98)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 192, 6
-	unknownsfx0x20 15, 231, 0, 7
-	unknownsfx0x20 4, 244, 240, 6
-	unknownsfx0x20 4, 228, 224, 6
-	unknownsfx0x20 8, 209, 208, 6
-	endchannel
-
-
-SFX_08_2f_Ch2: ; 20faf (8:4faf)
-	dutycycle 10
-	unknownsfx0x20 7, 230, 129, 6
-	unknownsfx0x20 14, 213, 193, 6
-	unknownsfx0x20 4, 196, 177, 6
-	unknownsfx0x20 4, 212, 161, 6
-	unknownsfx0x20 8, 193, 145, 6
-	endchannel
-
-
-SFX_08_2f_Ch3: ; 20fc6 (8:4fc6)
-	unknownnoise0x20 10, 166, 60
-	unknownnoise0x20 14, 148, 44
-	unknownnoise0x20 5, 163, 60
-	unknownnoise0x20 8, 145, 44
-	endchannel
--- a/audio/sfx/sfx_08_30.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-SFX_08_30_Ch1: ; 21159 (8:5159)
-	dutycycle 245
-	unknownsfx0x20 7, 214, 225, 7
-	unknownsfx0x20 6, 198, 226, 7
-	unknownsfx0x20 9, 214, 225, 7
-	unknownsfx0x20 7, 198, 224, 7
-	unknownsfx0x20 5, 182, 226, 7
-	unknownsfx0x20 7, 198, 225, 7
-	unknownsfx0x20 6, 182, 224, 7
-	unknownsfx0x20 8, 161, 223, 7
-	endchannel
-
-
-SFX_08_30_Ch2: ; 2117c (8:517c)
-	dutycycle 68
-	unknownsfx0x20 6, 195, 201, 7
-	unknownsfx0x20 6, 179, 199, 7
-	unknownsfx0x20 10, 196, 195, 7
-	unknownsfx0x20 8, 180, 199, 7
-	unknownsfx0x20 6, 195, 201, 7
-	unknownsfx0x20 15, 162, 197, 7
-	endchannel
-
-
-SFX_08_30_Ch3: ; 21197 (8:5197)
-	unknownnoise0x20 13, 25, 124
-	unknownnoise0x20 13, 247, 140
-	unknownnoise0x20 12, 214, 124
-	unknownnoise0x20 8, 196, 108
-	unknownnoise0x20 15, 179, 92
-	endchannel
--- a/audio/sfx/sfx_08_31.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_08_31_Ch1: ; 211f0 (8:51f0)
-	dutycycle 244
-	unknownsfx0x20 15, 240, 5, 7
-	unknownsfx0x20 10, 224, 0, 7
-	unknownsfx0x20 6, 180, 16, 7
-	unknownsfx0x20 4, 211, 0, 7
-	unknownsfx0x20 6, 178, 32, 6
-	unknownsfx0x20 8, 161, 36, 6
-	endchannel
-
-
-SFX_08_31_Ch2: ; 2120b (8:520b)
-	dutycycle 34
-	unknownsfx0x20 15, 176, 195, 6
-	unknownsfx0x20 10, 160, 193, 6
-	unknownsfx0x20 6, 132, 210, 6
-	unknownsfx0x20 4, 147, 193, 6
-	unknownsfx0x20 6, 130, 225, 5
-	unknownsfx0x20 8, 97, 232, 5
-	endchannel
-
-
-SFX_08_31_Ch3: ; 21226 (8:5226)
-	unknownnoise0x20 6, 230, 76
-	unknownnoise0x20 15, 214, 60
-	unknownnoise0x20 10, 197, 74
-	unknownnoise0x20 1, 178, 91
-	unknownnoise0x20 15, 194, 76
-	endchannel
--- a/audio/sfx/sfx_08_32.asm
+++ /dev/null
@@ -1,38 +1,0 @@
-SFX_08_32_Ch1: ; 21077 (8:5077)
-	dutycycle 240
-	unknownsfx0x20 6, 242, 0, 6
-	unknownsfx0x20 6, 226, 64, 6
-	unknownsfx0x20 6, 210, 128, 6
-	unknownsfx0x20 6, 226, 192, 6
-	unknownsfx0x20 6, 210, 0, 7
-	unknownsfx0x20 6, 194, 64, 7
-	unknownsfx0x20 6, 178, 128, 7
-	unknownsfx0x20 8, 161, 192, 7
-	endchannel
-
-
-SFX_08_32_Ch2: ; 2109a (8:509a)
-	dutycycle 17
-	unknownsfx0x20 3, 8, 1, 0
-	unknownsfx0x20 6, 194, 193, 5
-	unknownsfx0x20 6, 178, 2, 6
-	unknownsfx0x20 6, 162, 65, 6
-	unknownsfx0x20 6, 178, 130, 6
-	unknownsfx0x20 6, 162, 194, 6
-	unknownsfx0x20 6, 146, 1, 7
-	unknownsfx0x20 6, 162, 66, 7
-	unknownsfx0x20 8, 129, 129, 7
-	endchannel
-
-
-SFX_08_32_Ch3: ; 210c1 (8:50c1)
-	unknownnoise0x20 6, 8, 1
-	unknownnoise0x20 5, 226, 92
-	unknownnoise0x20 5, 194, 76
-	unknownnoise0x20 5, 210, 60
-	unknownnoise0x20 5, 178, 44
-	unknownnoise0x20 5, 194, 28
-	unknownnoise0x20 5, 162, 27
-	unknownnoise0x20 5, 146, 26
-	unknownnoise0x20 8, 129, 24
-	endchannel
--- a/audio/sfx/sfx_08_33.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_08_33_Ch1: ; 2128f (8:528f)
-	dutycycle 165
-	unknownsfx0x20 3, 244, 65, 6
-	unknownsfx0x20 13, 214, 33, 7
-	unknownsfx0x20 8, 244, 25, 7
-	unknownsfx0x20 8, 193, 26, 7
-	endchannel
-
-
-SFX_08_33_Ch2: ; 212a2 (8:52a2)
-	dutycycle 204
-	unknownsfx0x20 4, 244, 128, 5
-	unknownsfx0x20 14, 230, 224, 6
-	unknownsfx0x20 8, 213, 216, 6
-	unknownsfx0x20 8, 209, 220, 6
-	endchannel
-
-
-SFX_08_33_Ch3: ; 212b5 (8:52b5)
-	unknownnoise0x20 5, 196, 70
-	unknownnoise0x20 13, 165, 68
-	unknownnoise0x20 8, 196, 69
-	unknownnoise0x20 8, 177, 68
-	endchannel
--- a/audio/sfx/sfx_08_34.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_08_34_Ch1: ; 212c2 (8:52c2)
-	dutycycle 240
-	unknownsfx0x20 13, 241, 17, 5
-	unknownsfx0x20 13, 225, 21, 5
-	unknownsfx0x20 13, 225, 17, 5
-	unknownsfx0x20 8, 209, 17, 5
-	endchannel
-
-
-SFX_08_34_Ch2: ; 212d5 (8:52d5)
-	dutycycle 21
-	unknownsfx0x20 12, 225, 12, 5
-	unknownsfx0x20 12, 209, 16, 5
-	unknownsfx0x20 14, 193, 12, 5
-	unknownsfx0x20 8, 193, 10, 5
-	endchannel
-
-
-SFX_08_34_Ch3: ; 212e8 (8:52e8)
-	unknownnoise0x20 14, 242, 101
-	unknownnoise0x20 13, 226, 85
-	unknownnoise0x20 14, 210, 86
-	unknownnoise0x20 8, 209, 102
-	endchannel
--- a/audio/sfx/sfx_08_35.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-SFX_08_35_Ch1: ; 212f5 (8:52f5)
-	dutycycle 27
-	unknownsfx0x20 3, 243, 100, 5
-	unknownsfx0x20 2, 226, 68, 5
-	unknownsfx0x20 5, 209, 34, 5
-	unknownsfx0x20 2, 178, 132, 4
-	unknownsfx0x20 8, 209, 162, 4
-	unknownsfx0x20 3, 243, 36, 5
-	unknownsfx0x20 4, 228, 228, 4
-	unknownsfx0x20 8, 209, 2, 5
-	endchannel
-
-
-SFX_08_35_Ch2: ; 21318 (8:5318)
-	dutycycle 204
-	unknownsfx0x20 3, 211, 96, 5
-	unknownsfx0x20 2, 194, 64, 5
-	unknownsfx0x20 5, 193, 32, 5
-	unknownsfx0x20 2, 146, 128, 4
-	unknownsfx0x20 8, 193, 160, 4
-	unknownsfx0x20 3, 211, 32, 5
-	unknownsfx0x20 3, 196, 224, 4
-	unknownsfx0x20 8, 193, 0, 5
-
-
-SFX_08_35_Ch3: ; 2133a (8:533a)
-	endchannel
--- a/audio/sfx/sfx_08_36.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_08_36_Ch1: ; 2133b (8:533b)
-	dutycycle 17
-	unknownsfx0x20 2, 61, 129, 3
-	unknownsfx0x20 7, 245, 1, 6
-	unknownsfx0x20 1, 194, 129, 4
-	unknownsfx0x20 8, 145, 129, 3
-	endchannel
-
-
-SFX_08_36_Ch2: ; 2134e (8:534e)
-	dutycycle 238
-	unknownsfx0x20 2, 62, 176, 5
-	unknownsfx0x20 7, 213, 93, 7
-	unknownsfx0x20 1, 178, 176, 6
-	unknownsfx0x20 8, 97, 176, 5
-	endchannel
-
-
-SFX_08_36_Ch3: ; 21361 (8:5361)
-	unknownnoise0x20 2, 146, 73
-	unknownnoise0x20 7, 181, 41
-	unknownnoise0x20 1, 162, 57
-	unknownnoise0x20 8, 145, 73
-	endchannel
--- a/audio/sfx/sfx_08_37.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-SFX_08_37_Ch1: ; 20a2e (8:4a2e)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 192, 7
-	unknownsfx0x20 6, 228, 193, 7
-	unknownsfx0x20 10, 246, 192, 7
-	unknownsfx0x20 4, 211, 194, 7
-	unknownsfx0x20 8, 193, 192, 7
-	endchannel
-
-
-SFX_08_37_Ch2: ; 20a45 (8:4a45)
-	dutycycle 95
-	unknownsfx0x20 15, 151, 129, 7
-	unknownsfx0x20 6, 132, 128, 7
-	unknownsfx0x20 10, 150, 129, 7
-	unknownsfx0x20 15, 131, 129, 7
-	endchannel
-
-
-SFX_08_37_Ch3: ; 20a58 (8:4a58)
-	unknownnoise0x20 3, 242, 60
-	unknownnoise0x20 13, 230, 44
-	unknownnoise0x20 15, 215, 60
-	unknownnoise0x20 8, 193, 44
-	endchannel
--- a/audio/sfx/sfx_08_38.asm
+++ /dev/null
@@ -1,33 +1,0 @@
-SFX_08_38_Ch1: ; 20a65 (8:4a65)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 128, 6
-	unknownsfx0x20 10, 230, 132, 6
-	unknownsfx0x20 15, 215, 144, 6
-	unknownsfx0x20 8, 213, 144, 6
-	unknownsfx0x20 6, 196, 136, 6
-	unknownsfx0x20 5, 211, 112, 6
-	unknownsfx0x20 4, 211, 96, 6
-	unknownsfx0x20 8, 193, 64, 6
-	endchannel
-
-
-SFX_08_38_Ch2: ; 20a88 (8:4a88)
-	dutycycle 5
-	unknownsfx0x20 15, 183, 65, 6
-	unknownsfx0x20 10, 150, 66, 6
-	unknownsfx0x20 15, 167, 81, 6
-	unknownsfx0x20 8, 165, 81, 6
-	unknownsfx0x20 6, 148, 71, 6
-	unknownsfx0x20 5, 163, 49, 6
-	unknownsfx0x20 4, 147, 34, 6
-	unknownsfx0x20 8, 113, 1, 6
-	endchannel
-
-
-SFX_08_38_Ch3: ; 20aab (8:4aab)
-	unknownnoise0x20 15, 228, 60
-	unknownnoise0x20 10, 199, 76
-	unknownnoise0x20 10, 199, 60
-	unknownnoise0x20 12, 183, 76
-	unknownnoise0x20 15, 162, 92
-	endchannel
--- a/audio/sfx/sfx_08_39.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-SFX_08_39_Ch1: ; 20b13 (8:4b13)
-	dutycycle 165
-	unknownsfx0x20 6, 244, 64, 7
-	unknownsfx0x20 15, 227, 48, 7
-	unknownsfx0x20 4, 244, 64, 7
-	unknownsfx0x20 5, 179, 72, 7
-	unknownsfx0x20 8, 209, 80, 7
-	endchannel
-
-
-SFX_08_39_Ch2: ; 20b2a (8:4b2a)
-	dutycycle 119
-	unknownsfx0x20 6, 195, 18, 7
-	unknownsfx0x20 15, 179, 4, 7
-	unknownsfx0x20 3, 195, 18, 7
-	unknownsfx0x20 4, 195, 33, 7
-	unknownsfx0x20 8, 177, 50, 7
-	endchannel
-
-
-SFX_08_39_Ch3: ; 20b41 (8:4b41)
-	unknownnoise0x20 8, 214, 44
-	unknownnoise0x20 12, 198, 60
-	unknownnoise0x20 10, 182, 44
-	unknownnoise0x20 8, 145, 28
-	endchannel
--- a/audio/sfx/sfx_08_3a.asm
+++ /dev/null
@@ -1,63 +1,0 @@
-SFX_08_3a_Ch1: ; 2397d (8:797d)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 6, 11, 4
-	octave 4
-	F_ 4
-	notetype 4, 11, 2
-	C_ 2
-	F_ 2
-	C_ 2
-	notetype 6, 11, 3
-	D# 2
-	D# 2
-	E_ 2
-	notetype 6, 11, 4
-	F_ 8
-	endchannel
-
-
-SFX_08_3a_Ch2: ; 23998 (8:7998)
-	executemusic
-	vibrato 4, 2, 2
-	duty 2
-	notetype 6, 12, 4
-	octave 4
-	A_ 4
-	notetype 4, 12, 2
-	A_ 2
-	A_ 2
-	A_ 2
-	notetype 6, 12, 4
-	A# 2
-	A# 2
-	A# 2
-	notetype 6, 12, 4
-	A_ 8
-	endchannel
-
-
-SFX_08_3a_Ch3: ; 239b0 (8:79b0)
-	executemusic
-	notetype 6, 1, 0
-	octave 5
-	A_ 4
-	notetype 4, 1, 0
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	notetype 6, 1, 0
-	G_ 1
-	rest 1
-	D# 1
-	rest 1
-	G_ 1
-	rest 1
-	A_ 8
-	endchannel
--- a/audio/sfx/sfx_08_3b.asm
+++ /dev/null
@@ -1,69 +1,0 @@
-SFX_08_3b_Ch1: ; 239c7 (8:79c7)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 11, 4
-	octave 4
-	D_ 4
-	C_ 4
-	octave 3
-	A_ 8
-	notetype 5, 11, 2
-	octave 4
-	D# 2
-	D# 2
-	D_ 2
-	C_ 2
-	C_ 2
-	octave 3
-	A# 2
-	notetype 5, 11, 4
-	octave 4
-	C_ 8
-	endchannel
-
-
-SFX_08_3b_Ch2: ; 239e6 (8:79e6)
-	executemusic
-	vibrato 8, 2, 7
-	duty 2
-	notetype 5, 12, 5
-	octave 4
-	A_ 4
-	F_ 4
-	C_ 8
-	notetype 5, 12, 2
-	A# 2
-	A# 2
-	A# 2
-	G_ 2
-	G_ 2
-	A# 2
-	notetype 5, 12, 4
-	A_ 8
-	endchannel
-
-
-SFX_08_3b_Ch3: ; 239fe (8:79fe)
-	executemusic
-	notetype 5, 1, 0
-	octave 5
-	F_ 4
-	D# 4
-	C_ 8
-	D# 1
-	rest 1
-	D# 1
-	rest 1
-	E_ 1
-	rest 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	G_ 1
-	rest 1
-	A_ 8
-	endchannel
--- a/audio/sfx/sfx_08_3c.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_08_3c_Ch1: ; 203dd (8:43dd)
-	duty 2
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 2
-	unknownsfx0x10 34
-	unknownsfx0x20 8, 226, 0, 2
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_08_3d.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_08_3d_Ch1: ; 203ee (8:43ee)
-	duty 2
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_08_3e.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-SFX_08_3e_Ch1: ; 203fd (8:43fd)
-	duty 2
-	unknownsfx0x10 20
-	unknownsfx0x20 4, 242, 0, 6
-	unknownsfx0x20 4, 242, 0, 6
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 242, 0, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_08_3f.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_3f_Ch1: ; 203d6 (8:43d6)
-	unknownnoise0x20 1, 226, 51
-	unknownnoise0x20 8, 225, 34
-	endchannel
--- a/audio/sfx/sfx_08_40.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_08_40_Ch1: ; 203c3 (8:43c3)
-	duty 2
-	unknownsfx0x20 0, 145, 192, 7
-	unknownsfx0x20 0, 129, 208, 7
-	unknownsfx0x20 0, 145, 192, 7
-	unknownsfx0x20 12, 161, 208, 7
-	endchannel
--- a/audio/sfx/sfx_08_41.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-SFX_08_41_Ch1: ; 2042d (8:442d)
-	duty 2
-	unknownsfx0x10 47
-	unknownsfx0x20 15, 242, 128, 7
-	endchannel
-
-
-SFX_08_41_Ch2: ; 20436 (8:4436)
-	duty 2
-	unknownsfx0x20 15, 194, 130, 7
-	endchannel
--- a/audio/sfx/sfx_08_42.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-SFX_08_42_Ch1: ; 2043d (8:443d)
-	duty 2
-	unknownsfx0x10 22
-	unknownsfx0x20 15, 242, 0, 4
-	unknownsfx0x10 8
-	endchannel
-
-
-SFX_08_42_Ch2: ; 20448 (8:4448)
-	unknownnoise0x20 15, 162, 34
-	endchannel
--- a/audio/sfx/sfx_08_43.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-SFX_08_43_Ch1: ; 2044c (8:444c)
-	unknownsfx0x20 15, 209, 0, 2
-	unknownsfx0x10 8
-	endchannel
-
-
-SFX_08_43_Ch2: ; 20453 (8:4453)
-	unknownnoise0x20 4, 245, 51
-	unknownnoise0x20 8, 244, 34
-	unknownnoise0x20 15, 242, 33
-	endchannel
--- a/audio/sfx/sfx_08_44.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-SFX_08_44_Ch1: ; 2045d (8:445d)
-	unknownnoise0x20 2, 97, 35
-	unknownnoise0x20 2, 161, 51
-	unknownnoise0x20 2, 193, 51
-	unknownnoise0x20 2, 81, 17
-	unknownnoise0x20 2, 241, 51
-	unknownnoise0x20 2, 65, 17
-	unknownnoise0x20 2, 193, 51
-	unknownnoise0x20 2, 49, 17
-	unknownnoise0x20 2, 129, 51
-	unknownnoise0x20 2, 49, 17
-	unknownnoise0x20 8, 65, 51
-	endchannel
--- a/audio/sfx/sfx_08_45.asm
+++ /dev/null
@@ -1,15 +1,0 @@
-SFX_08_45_Ch1: ; 2047f (8:447f)
-	duty 2
-	unknownsfx0x10 68
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
-	endchannel
-
-
-SFX_08_45_Ch2: ; 20490 (8:4490)
-	duty 2
-	unknownsfx0x20 15, 146, 0, 6
-	unknownsfx0x20 15, 146, 130, 7
-	endchannel
--- a/audio/sfx/sfx_08_46.asm
+++ /dev/null
@@ -1,61 +1,0 @@
-SFX_08_46_Ch1: ; 23a13 (8:7a13)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 3
-	toggleperfectpitch
-	notetype 6, 11, 2
-	octave 3
-	E_ 2
-	F# 2
-	G# 2
-	G# 1
-	G# 1
-	B_ 2
-	octave 4
-	C# 2
-	D# 2
-	D# 1
-	D# 1
-	notetype 6, 11, 5
-	E_ 8
-	endchannel
-
-
-SFX_08_46_Ch2: ; 23a2e (8:7a2e)
-	executemusic
-	duty 2
-	notetype 6, 12, 2
-	octave 4
-	G# 2
-	G# 1
-	G# 1
-	E_ 2
-	E_ 1
-	E_ 1
-	B_ 2
-	B_ 1
-	B_ 1
-	A_ 2
-	A_ 1
-	A_ 1
-	notetype 6, 12, 5
-	G# 8
-	endchannel
-
-
-SFX_08_46_Ch3: ; 23a44 (8:7a44)
-	executemusic
-	notetype 6, 1, 0
-	octave 4
-	B_ 2
-	rest 2
-	octave 5
-	C# 2
-	rest 2
-	D# 2
-	rest 2
-	F# 2
-	G_ 2
-	G# 4
-	endchannel
--- a/audio/sfx/sfx_08_47.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_47_Ch1: ; 204aa (8:44aa)
-	unknownnoise0x20 2, 161, 18
-	endchannel
--- a/audio/sfx/sfx_08_48.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_48_Ch1: ; 204ae (8:44ae)
-	duty 1
-	unknownsfx0x10 175
-	unknownsfx0x20 15, 242, 128, 7
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_08_49.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_49_Ch1: ; 204b9 (8:44b9)
-	duty 1
-	unknownsfx0x10 151
-	unknownsfx0x20 15, 242, 0, 5
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_08_4a.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_4a_Ch1: ; 204c4 (8:44c4)
-	unknownnoise0x20 2, 161, 34
-	endchannel
--- a/audio/sfx/sfx_08_4b.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_08_4b_Ch1: ; 204c8 (8:44c8)
-	unknownnoise0x20 8, 241, 84
-	endchannel
--- a/audio/sfx/sfx_08_4c.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-SFX_08_4c_Ch1: ; 204cc (8:44cc)
-	unknownnoise0x20 15, 143, 17
-	unknownnoise0x20 4, 255, 18
-	unknownnoise0x20 10, 241, 85
-	endchannel
--- a/audio/sfx/sfx_08_4d.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-SFX_08_4d_Ch1: ; 204d6 (8:44d6)
-	unknownnoise0x20 15, 143, 52
-	unknownnoise0x20 8, 242, 53
-	unknownnoise0x20 10, 241, 85
-	endchannel
--- a/audio/sfx/sfx_08_4e.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_4e_Ch1: ; 204e0 (8:44e0)
-	unknownnoise0x20 15, 159, 35
-	unknownnoise0x20 8, 241, 33
-	endchannel
--- a/audio/sfx/sfx_08_4f.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_4f_Ch1: ; 204e7 (8:44e7)
-	unknownnoise0x20 2, 225, 75
-	unknownnoise0x20 10, 241, 68
-	unknownnoise0x20 2, 225, 58
-	unknownnoise0x20 6, 241, 52
-	endchannel
--- a/audio/sfx/sfx_08_50.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-SFX_08_50_Ch1: ; 204f4 (8:44f4)
-	unknownnoise0x20 2, 244, 68
-	unknownnoise0x20 2, 244, 20
-	unknownnoise0x20 15, 241, 50
-	endchannel
--- a/audio/sfx/sfx_08_51.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_51_Ch1: ; 204fe (8:44fe)
-	unknownnoise0x20 4, 143, 85
-	unknownnoise0x20 2, 244, 68
-	unknownnoise0x20 8, 244, 34
-	unknownnoise0x20 15, 242, 33
-	endchannel
--- a/audio/sfx/sfx_08_52.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_52_Ch1: ; 2050b (8:450b)
-	unknownnoise0x20 8, 79, 35
-	unknownnoise0x20 4, 196, 34
-	unknownnoise0x20 6, 242, 35
-	loopchannel 4, SFX_08_52_Ch1
-	endchannel
--- a/audio/sfx/sfx_08_53.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_53_Ch1: ; 20519 (8:4519)
-	unknownnoise0x20 8, 79, 51
-	unknownnoise0x20 4, 196, 34
-	unknownnoise0x20 6, 242, 35
-	unknownnoise0x20 15, 242, 34
-	endchannel
--- a/audio/sfx/sfx_08_54.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_54_Ch1: ; 20526 (8:4526)
-	unknownnoise0x20 8, 255, 50
-	unknownnoise0x20 8, 244, 67
-	unknownnoise0x20 8, 242, 84
-	unknownnoise0x20 8, 241, 101
-	endchannel
--- a/audio/sfx/sfx_08_55.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_08_55_Ch1: ; 20533 (8:4533)
-	unknownnoise0x20 1, 194, 51
-	unknownnoise0x20 2, 242, 33
-	unknownnoise0x20 1, 226, 51
-	unknownnoise0x20 1, 194, 50
-	unknownnoise0x20 1, 146, 18
-	unknownnoise0x20 1, 178, 49
-	unknownnoise0x20 12, 145, 16
-	unknownnoise0x20 8, 242, 65
-	endchannel
--- a/audio/sfx/sfx_08_56.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-SFX_08_56_Ch1: ; 2054c (8:454c)
-	unknownnoise0x20 1, 148, 35
-	unknownnoise0x20 1, 180, 34
-	unknownnoise0x20 8, 241, 68
-	endchannel
--- a/audio/sfx/sfx_08_57.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_57_Ch1: ; 20556 (8:4556)
-	unknownnoise0x20 2, 148, 51
-	unknownnoise0x20 4, 180, 34
-	unknownnoise0x20 4, 241, 68
-	unknownnoise0x20 8, 241, 85
-	endchannel
--- a/audio/sfx/sfx_08_58.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_58_Ch1: ; 20563 (8:4563)
-	unknownnoise0x20 4, 255, 85
-	unknownnoise0x20 8, 241, 101
-	endchannel
--- a/audio/sfx/sfx_08_59.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-SFX_08_59_Ch1: ; 2056a (8:456a)
-	unknownnoise0x20 2, 132, 67
-	unknownnoise0x20 2, 196, 34
-	unknownnoise0x20 8, 242, 52
-	endchannel
--- a/audio/sfx/sfx_08_5a.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_5a_Ch1: ; 20574 (8:4574)
-	unknownnoise0x20 4, 241, 52
-	unknownnoise0x20 15, 242, 100
-	endchannel
--- a/audio/sfx/sfx_08_5b.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_5b_Ch1: ; 2057b (8:457b)
-	unknownnoise0x20 2, 241, 34
-	unknownnoise0x20 15, 242, 18
-	endchannel
--- a/audio/sfx/sfx_08_5c.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-SFX_08_5c_Ch1: ; 20582 (8:4582)
-	unknownnoise0x20 2, 194, 1
-	unknownnoise0x20 15, 244, 1
-	unknownnoise0x20 15, 242, 1
-	endchannel
--- a/audio/sfx/sfx_08_5d.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_5d_Ch1: ; 2058c (8:458c)
-	unknownnoise0x20 8, 241, 50
-	unknownnoise0x20 8, 241, 51
-	endchannel
--- a/audio/sfx/sfx_08_5e.asm
+++ /dev/null
@@ -1,16 +1,0 @@
-SFX_08_5e_Ch1: ; 20593 (8:4593)
-	duty 0
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 2
-	unknownsfx0x10 34
-	unknownsfx0x20 8, 226, 0, 2
-	unknownsfx0x10 8
-	endchannel
-
-
-SFX_08_5e_Ch2: ; 205a4 (8:45a4)
-	unknownnoise0x20 0, 209, 66
-	unknownnoise0x20 4, 161, 50
-	unknownnoise0x20 0, 209, 34
-	unknownnoise0x20 6, 161, 50
-	endchannel
--- a/audio/sfx/sfx_08_5f.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_08_5f_Ch1: ; 205b1 (8:45b1)
-	unknownnoise0x20 3, 146, 49
-	unknownnoise0x20 3, 178, 50
-	unknownnoise0x20 3, 194, 51
-	unknownnoise0x20 8, 241, 84
-	endchannel
--- a/audio/sfx/sfx_08_60.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_60_Ch1: ; 205be (8:45be)
-	unknownnoise0x20 12, 241, 84
-	unknownnoise0x20 8, 241, 100
-	endchannel
--- a/audio/sfx/sfx_08_61.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_08_61_Ch1: ; 205c5 (8:45c5)
-	unknownnoise0x20 2, 241, 51
-	unknownnoise0x20 2, 193, 50
-	unknownnoise0x20 2, 161, 49
-	unknownnoise0x20 15, 130, 50
-	unknownnoise0x20 8, 241, 52
-	endchannel
--- a/audio/sfx/sfx_08_62.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_08_62_Ch1: ; 205d5 (8:45d5)
-	unknownnoise0x20 2, 210, 50
-	unknownnoise0x20 15, 242, 67
-	endchannel
--- a/audio/sfx/sfx_08_63.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_08_63_Ch1: ; 205dc (8:45dc)
-	unknownnoise0x20 2, 242, 67
-	unknownnoise0x20 4, 181, 50
-	unknownnoise0x20 9, 134, 49
-	unknownnoise0x20 7, 100, 0
-	unknownnoise0x20 15, 242, 85
-	endchannel
--- a/audio/sfx/sfx_08_64.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-SFX_08_64_Ch1: ; 205ec (8:45ec)
-	duty 1
-	unknownsfx0x10 151
-	unknownsfx0x20 15, 242, 0, 7
-	unknownsfx0x10 8
-	endchannel
-
-
-SFX_08_64_Ch2: ; 205f7 (8:45f7)
-	unknownnoise0x20 15, 63, 34
-	unknownnoise0x20 15, 242, 33
-	endchannel
--- a/audio/sfx/sfx_08_65.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_08_65_Ch1: ; 205fe (8:45fe)
-	unknownnoise0x20 15, 79, 65
-	unknownnoise0x20 8, 143, 65
-	unknownnoise0x20 8, 207, 65
-	unknownnoise0x20 8, 242, 66
-	unknownnoise0x20 15, 242, 65
-	endchannel
--- a/audio/sfx/sfx_08_66.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-SFX_08_66_Ch1: ; 2060e (8:460e)
-	unknownnoise0x20 10, 255, 80
-	unknownnoise0x20 15, 255, 81
-	unknownnoise0x20 8, 242, 81
-	unknownnoise0x20 6, 255, 82
-	unknownnoise0x20 6, 255, 83
-	unknownnoise0x20 8, 255, 84
-	unknownnoise0x20 15, 242, 84
-	endchannel
--- a/audio/sfx/sfx_08_67.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-SFX_08_67_Ch1: ; 20624 (8:4624)
-	duty 2
-	unknownsfx0x20 15, 63, 192, 7
-
-SFX_08_67_branch_2062a:
-	unknownsfx0x20 15, 223, 192, 7
-	loopchannel 4, SFX_08_67_branch_2062a
-	unknownsfx0x20 15, 209, 192, 7
-	endchannel
-
-
-SFX_08_67_Ch2: ; 20637 (8:4637)
-	dutycycle 179
-	unknownsfx0x20 15, 47, 200, 7
-
-SFX_08_67_branch_2063d:
-	unknownsfx0x20 15, 207, 199, 7
-	loopchannel 4, SFX_08_67_branch_2063d
-	unknownsfx0x20 15, 193, 200, 7
-	endchannel
-
-
-SFX_08_67_Ch3: ; 2064a (8:464a)
-	unknownnoise0x20 3, 151, 18
-	unknownnoise0x20 3, 161, 17
-	loopchannel 10, SFX_08_67_Ch3
-	endchannel
--- a/audio/sfx/sfx_08_68.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_08_68_Ch1: ; 20655 (8:4655)
-	duty 0
-	unknownsfx0x20 0, 241, 192, 7
-	unknownsfx0x20 0, 241, 0, 7
-	loopchannel 12, SFX_08_68_Ch1
-	endchannel
-
-
-SFX_08_68_Ch2: ; 20664 (8:4664)
-	dutycycle 179
-	unknownsfx0x20 0, 225, 193, 7
-	unknownsfx0x20 0, 225, 1, 7
-	loopchannel 12, SFX_08_68_Ch2
-	endchannel
-
-
-SFX_08_68_Ch3: ; 20673 (8:4673)
-	unknownnoise0x20 1, 209, 73
-	unknownnoise0x20 1, 209, 41
-	loopchannel 6, SFX_08_68_Ch3
-	endchannel
--- a/audio/sfx/sfx_08_69.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_08_69_Ch1: ; 2067e (8:467e)
-	dutycycle 201
-	unknownsfx0x20 11, 243, 32, 1
-	unknownsfx0x20 9, 211, 80, 1
-	loopchannel 5, SFX_08_69_Ch1
-	unknownsfx0x20 8, 227, 48, 1
-	unknownsfx0x20 15, 194, 16, 1
-	endchannel
-
-
-SFX_08_69_Ch2: ; 20695 (8:4695)
-	unknownnoise0x20 10, 243, 53
-	unknownnoise0x20 14, 246, 69
-	loopchannel 4, SFX_08_69_Ch2
-	unknownnoise0x20 12, 244, 188
-	unknownnoise0x20 12, 245, 156
-	unknownnoise0x20 15, 244, 172
-	endchannel
--- a/audio/sfx/sfx_08_6a.asm
+++ /dev/null
@@ -1,28 +1,0 @@
-SFX_08_6a_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
-	unknownsfx0x20 8, 209, 0, 6
-	endchannel
-
-
-SFX_08_6a_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
-	endchannel
-
-
-SFX_08_6a_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
-	endchannel
--- a/audio/sfx/sfx_08_6b.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_08_6b_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
-	unknownsfx0x20 8, 129, 0, 4
-	endchannel
-
-
-SFX_08_6b_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
-	unknownnoise0x20 8, 129, 18
-	endchannel
--- a/audio/sfx/sfx_08_6c.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-SFX_08_6c_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
-	endchannel
-
-
-SFX_08_6c_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
-	endchannel
-
-
-SFX_08_6c_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
-	endchannel
--- a/audio/sfx/sfx_08_6d.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-SFX_08_6d_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
-	unknownsfx0x20 10, 241, 64, 6
-	endchannel
-
-
-SFX_08_6d_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
-	unknownsfx0x20 10, 241, 113, 5
-	endchannel
-
-
-SFX_08_6d_Ch3: ; 20787 (8:4787)
-	unknownnoise0x20 2, 209, 74
-	unknownnoise0x20 2, 210, 42
-	loopchannel 21, SFX_08_6d_Ch3
-	endchannel
--- a/audio/sfx/sfx_08_6e.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-SFX_08_6e_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
-	endchannel
-
-
-SFX_08_6e_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
-	endchannel
-
-
-SFX_08_6e_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
-	endchannel
--- a/audio/sfx/sfx_08_6f.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_08_6f_Ch1: ; 207d1 (8:47d1)
-	dutycycle 43
-	unknownsfx0x20 3, 241, 240, 7
-	unknownsfx0x20 4, 242, 0, 2
-	loopchannel 8, SFX_08_6f_Ch1
-	endchannel
-
-
-SFX_08_6f_Ch2: ; 207e0 (8:47e0)
-	dutycycle 179
-	unknownsfx0x20 4, 226, 2, 2
-	unknownsfx0x20 4, 225, 226, 7
-	loopchannel 9, SFX_08_6f_Ch2
-	endchannel
-
-
-SFX_08_6f_Ch3: ; 207ef (8:47ef)
-	unknownnoise0x20 4, 255, 67
-	unknownnoise0x20 4, 242, 68
-	loopchannel 9, SFX_08_6f_Ch3
-	endchannel
--- a/audio/sfx/sfx_08_70.asm
+++ /dev/null
@@ -1,32 +1,0 @@
-SFX_08_70_Ch1: ; 207fa (8:47fa)
-	duty 2
-	unknownsfx0x10 247
-	unknownsfx0x20 8, 196, 189, 7
-	unknownsfx0x20 8, 196, 190, 7
-	unknownsfx0x20 8, 196, 191, 7
-	unknownsfx0x20 8, 196, 192, 7
-	unknownsfx0x20 15, 196, 193, 7
-	unknownsfx0x20 15, 242, 192, 7
-	unknownsfx0x10 8
-	endchannel
-
-
-SFX_08_70_Ch2: ; 20819 (8:4819)
-	duty 2
-	unknownsfx0x20 8, 196, 112, 7
-	unknownsfx0x20 8, 196, 97, 7
-	unknownsfx0x20 8, 196, 98, 7
-	unknownsfx0x20 8, 196, 99, 7
-	unknownsfx0x20 15, 196, 100, 7
-	unknownsfx0x20 15, 242, 100, 7
-	endchannel
-
-
-SFX_08_70_Ch3: ; 20834 (8:4834)
-	unknownnoise0x20 15, 63, 20
-	unknownnoise0x20 15, 207, 19
-	unknownnoise0x20 15, 207, 18
-	unknownnoise0x20 15, 207, 17
-	unknownnoise0x20 15, 207, 16
-	unknownnoise0x20 15, 194, 16
-	endchannel
--- a/audio/sfx/sfx_08_71.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_08_71_Ch1: ; 20847 (8:4847)
-	duty 2
-	unknownsfx0x20 15, 255, 224, 7
-	unknownsfx0x20 15, 255, 224, 7
-	unknownsfx0x20 15, 255, 224, 7
-	unknownsfx0x20 15, 255, 224, 7
-	unknownsfx0x20 15, 242, 224, 7
-	endchannel
-
-
-SFX_08_71_Ch2: ; 2085e (8:485e)
-	duty 3
-	unknownsfx0x20 15, 255, 226, 7
-	unknownsfx0x20 15, 255, 225, 7
-	unknownsfx0x20 15, 255, 226, 7
-	unknownsfx0x20 15, 255, 225, 7
-	unknownsfx0x20 15, 242, 226, 7
-	endchannel
--- a/audio/sfx/sfx_08_72.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-SFX_08_72_Ch1: ; 20875 (8:4875)
-	duty 2
-	unknownsfx0x10 175
-	unknownsfx0x20 8, 241, 0, 7
-	unknownsfx0x10 8
-	endchannel
-
-
-SFX_08_72_Ch2: ; 20880 (8:4880)
-	duty 3
-	unknownsfx0x20 8, 241, 1, 7
-	endchannel
--- a/audio/sfx/sfx_08_73.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_08_73_Ch1: ; 20887 (8:4887)
-	duty 2
-	unknownsfx0x20 6, 241, 0, 5
-	unknownsfx0x20 6, 241, 128, 5
-	unknownsfx0x20 6, 241, 0, 6
-	unknownsfx0x20 6, 241, 128, 6
-	unknownsfx0x20 8, 241, 0, 7
-	endchannel
-
-
-SFX_08_73_Ch2: ; 2089e (8:489e)
-	duty 3
-	unknownsfx0x20 6, 225, 16, 5
-	unknownsfx0x20 6, 225, 144, 5
-	unknownsfx0x20 6, 225, 16, 6
-	unknownsfx0x20 6, 225, 144, 6
-	unknownsfx0x20 8, 225, 16, 7
-	endchannel
--- a/audio/sfx/sfx_08_74.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-SFX_08_74_Ch1: ; 208b5 (8:48b5)
-	dutycycle 237
-	unknownsfx0x20 8, 255, 248, 3
-	unknownsfx0x20 15, 255, 0, 4
-	unknownsfx0x20 15, 243, 0, 4
-	endchannel
-
-
-SFX_08_74_Ch2: ; 208c4 (8:48c4)
-	dutycycle 180
-	unknownsfx0x20 8, 239, 192, 3
-	unknownsfx0x20 15, 239, 192, 3
-	unknownsfx0x20 15, 227, 192, 3
-	endchannel
-
-
-SFX_08_74_Ch3: ; 208d3 (8:48d3)
-	unknownnoise0x20 4, 255, 81
-	unknownnoise0x20 8, 255, 84
-	unknownnoise0x20 15, 255, 85
-	unknownnoise0x20 15, 243, 86
-	endchannel
--- a/audio/sfx/sfx_08_75.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_08_75_Ch1: ; 208e0 (8:48e0)
-	executemusic
-	vibrato 10, 2, 4
-	duty 2
-	notetype 10, 8, 7
-	octave 5
-	G# 8
-	octave 6
-	F# 4
-	E_ 4
-	octave 5
-	G# 8
-	endchannel
-
-
-SFX_08_75_Ch2: ; 208f0 (8:48f0)
-	executemusic
-	vibrato 10, 2, 3
-	duty 2
-	notetype 11, 6, 7
-	octave 5
-	G# 8
-	notetype 10, 6, 7
-	octave 6
-	F# 4
-	E_ 4
-	octave 5
-	G# 8
-	endchannel
--- a/audio/sfx/sfx_08_76.asm
+++ /dev/null
@@ -1,47 +1,0 @@
-SFX_08_76_Ch1: ; 20902 (8:4902)
-	duty 0
-	unknownsfx0x20 2, 241, 128, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 144, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 160, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 176, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 192, 7
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 208, 7
-
-SFX_08_76_branch_20930:
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 2, 241, 224, 7
-	loopchannel 12, SFX_08_76_branch_20930
-	unknownsfx0x20 15, 241, 0, 7
-	endchannel
-
-
-SFX_08_76_Ch2: ; 20941 (8:4941)
-	dutycycle 179
-	unknownsfx0x20 2, 241, 129, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 145, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 161, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 177, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 193, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 209, 7
-	unknownsfx0x20 2, 241, 1, 7
-	unknownsfx0x20 2, 241, 225, 7
-	loopchannel 12, SFX_08_76_branch_20930
-	unknownsfx0x20 15, 241, 1, 7
-	endchannel
-
-
-SFX_08_76_Ch3: ; 20980 (8:4980)
-	unknownnoise0x20 1, 209, 73
-	unknownnoise0x20 1, 209, 41
-	loopchannel 26, SFX_08_76_Ch3
-	endchannel
--- a/audio/sfx/sfx_08_77.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-SFX_08_77_Ch1: ; 20412 (8:4412)
-	duty 0
-	unknownsfx0x20 0, 210, 0, 7
-	unknownsfx0x20 0, 210, 64, 7
-	unknownsfx0x20 0, 210, 128, 7
-	unknownsfx0x20 0, 210, 192, 7
-	unknownsfx0x20 10, 225, 224, 7
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_1f_01.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_01_Ch1: ; 7c2fd (1f:42fd)
-	unknownnoise0x20 0, 193, 51
-	endchannel
--- a/audio/sfx/sfx_1f_02.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_02_Ch1: ; 7c301 (1f:4301)
-	unknownnoise0x20 0, 177, 51
-	endchannel
--- a/audio/sfx/sfx_1f_03.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_03_Ch1: ; 7c305 (1f:4305)
-	unknownnoise0x20 0, 161, 51
-	endchannel
--- a/audio/sfx/sfx_1f_04.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_04_Ch1: ; 7c309 (1f:4309)
-	unknownnoise0x20 0, 129, 51
-	endchannel
--- a/audio/sfx/sfx_1f_05.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_1f_05_Ch1: ; 7c30d (1f:430d)
-	unknownnoise0x20 7, 132, 55
-	unknownnoise0x20 6, 132, 54
-	unknownnoise0x20 5, 131, 53
-	unknownnoise0x20 4, 131, 52
-	unknownnoise0x20 3, 130, 51
-	unknownnoise0x20 2, 129, 50
-	endchannel
--- a/audio/sfx/sfx_1f_06.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_06_Ch1: ; 7c320 (1f:4320)
-	unknownnoise0x20 0, 81, 42
-	endchannel
--- a/audio/sfx/sfx_1f_07.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_1f_07_Ch1: ; 7c324 (1f:4324)
-	unknownnoise0x20 1, 65, 43
-	unknownnoise0x20 0, 97, 42
-	endchannel
--- a/audio/sfx/sfx_1f_08.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_08_Ch1: ; 7c32b (1f:432b)
-	unknownnoise0x20 0, 129, 16
-	endchannel
--- a/audio/sfx/sfx_1f_09.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_09_Ch1: ; 7c32f (1f:432f)
-	unknownnoise0x20 0, 130, 35
-	endchannel
--- a/audio/sfx/sfx_1f_0a.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_0a_Ch1: ; 7c333 (1f:4333)
-	unknownnoise0x20 0, 130, 37
-	endchannel
--- a/audio/sfx/sfx_1f_0b.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_0b_Ch1: ; 7c337 (1f:4337)
-	unknownnoise0x20 0, 130, 38
-	endchannel
--- a/audio/sfx/sfx_1f_0c.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_0c_Ch1: ; 7c33b (1f:433b)
-	unknownnoise0x20 0, 161, 16
-	endchannel
--- a/audio/sfx/sfx_1f_0d.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_0d_Ch1: ; 7c33f (1f:433f)
-	unknownnoise0x20 0, 162, 17
-	endchannel
--- a/audio/sfx/sfx_1f_0e.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_0e_Ch1: ; 7c343 (1f:4343)
-	unknownnoise0x20 0, 162, 80
-	endchannel
--- a/audio/sfx/sfx_1f_0f.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_1f_0f_Ch1: ; 7c347 (1f:4347)
-	unknownnoise0x20 0, 161, 24
-	unknownnoise0x20 0, 49, 51
-	endchannel
--- a/audio/sfx/sfx_1f_10.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_1f_10_Ch1: ; 7c34e (1f:434e)
-	unknownnoise0x20 2, 145, 40
-	unknownnoise0x20 0, 113, 24
-	endchannel
--- a/audio/sfx/sfx_1f_11.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_11_Ch1: ; 7c355 (1f:4355)
-	unknownnoise0x20 0, 145, 34
-	endchannel
--- a/audio/sfx/sfx_1f_12.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_12_Ch1: ; 7c359 (1f:4359)
-	unknownnoise0x20 0, 113, 34
-	endchannel
--- a/audio/sfx/sfx_1f_13.asm
+++ /dev/null
@@ -1,3 +1,0 @@
-SFX_1f_13_Ch1: ; 7c35d (1f:435d)
-	unknownnoise0x20 0, 97, 34
-	endchannel
--- a/audio/sfx/sfx_1f_14.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_1f_14_Ch1: ; 7c9fc (1f:49fc)
-	dutycycle 245
-	unknownsfx0x20 4, 243, 24, 7
-	unknownsfx0x20 15, 229, 152, 7
-	unknownsfx0x20 8, 145, 88, 7
-	endchannel
-
-
-SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b)
-	dutycycle 160
-	unknownsfx0x20 5, 179, 8, 7
-	unknownsfx0x20 15, 197, 136, 7
-	unknownsfx0x20 8, 113, 72, 7
-	endchannel
-
-
-SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a)
-	unknownnoise0x20 3, 161, 28
-	unknownnoise0x20 14, 148, 44
-	unknownnoise0x20 8, 129, 28
-	endchannel
--- a/audio/sfx/sfx_1f_15.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c)
-	dutycycle 160
-	unknownsfx0x20 4, 243, 0, 6
-	unknownsfx0x20 8, 213, 96, 7
-	unknownsfx0x20 3, 226, 32, 7
-	unknownsfx0x20 8, 209, 16, 7
-	endchannel
-
-
-SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f)
-	dutycycle 90
-	unknownsfx0x20 5, 179, 241, 6
-	unknownsfx0x20 7, 197, 82, 7
-	unknownsfx0x20 3, 162, 17, 7
-	unknownsfx0x20 8, 177, 1, 6
-	endchannel
-
-
-SFX_1f_15_Ch3: ; 7cc32 (1f:4c32)
-	unknownnoise0x20 3, 162, 60
-	unknownnoise0x20 12, 148, 44
-	unknownnoise0x20 3, 130, 28
-	unknownnoise0x20 8, 113, 44
-	endchannel
--- a/audio/sfx/sfx_1f_16.asm
+++ /dev/null
@@ -1,17 +1,0 @@
-SFX_1f_16_Ch1: ; 7cb81 (1f:4b81)
-	duty 0
-	unknownsfx0x20 8, 245, 128, 4
-	unknownsfx0x20 2, 225, 224, 5
-	unknownsfx0x20 8, 209, 220, 5
-	endchannel
-
-
-SFX_1f_16_Ch2: ; 7cb90 (1f:4b90)
-	dutycycle 165
-	unknownsfx0x20 7, 149, 65, 4
-	unknownsfx0x20 2, 129, 33, 5
-	unknownsfx0x20 8, 97, 26, 5
-
-
-SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e)
-	endchannel
--- a/audio/sfx/sfx_1f_17.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_1f_17_Ch1: ; 7c91b (1f:491b)
-	dutycycle 240
-	unknownsfx0x20 4, 247, 8, 6
-	unknownsfx0x20 6, 230, 0, 6
-	unknownsfx0x20 6, 215, 240, 5
-	unknownsfx0x20 6, 196, 224, 5
-	unknownsfx0x20 5, 211, 192, 5
-	unknownsfx0x20 4, 211, 160, 5
-	unknownsfx0x20 8, 225, 128, 5
-	endchannel
-
-
-SFX_1f_17_Ch2: ; 7c93a (1f:493a)
-	dutycycle 10
-	unknownsfx0x20 4, 199, 4, 5
-	unknownsfx0x20 6, 166, 2, 5
-	unknownsfx0x20 6, 151, 241, 4
-	unknownsfx0x20 4, 180, 225, 4
-	unknownsfx0x20 5, 163, 194, 4
-	unknownsfx0x20 4, 179, 163, 4
-	unknownsfx0x20 8, 193, 130, 4
-	endchannel
-
-
-SFX_1f_17_Ch3: ; 7c959 (1f:4959)
-	unknownnoise0x20 12, 228, 76
-	unknownnoise0x20 10, 199, 92
-	unknownnoise0x20 12, 182, 76
-	unknownnoise0x20 15, 162, 92
-	endchannel
--- a/audio/sfx/sfx_1f_18.asm
+++ /dev/null
@@ -1,32 +1,0 @@
-SFX_1f_18_Ch1: ; 7ccca (1f:4cca)
-	dutycycle 240
-	unknownsfx0x20 4, 247, 160, 6
-	unknownsfx0x20 8, 230, 164, 6
-	unknownsfx0x20 4, 214, 160, 6
-	unknownsfx0x20 12, 211, 32, 6
-	unknownsfx0x20 8, 195, 36, 6
-	unknownsfx0x20 4, 194, 32, 6
-	unknownsfx0x20 8, 177, 16, 6
-	endchannel
-
-
-SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9)
-	dutycycle 90
-	unknownsfx0x20 4, 231, 1, 6
-	unknownsfx0x20 8, 214, 3, 6
-	unknownsfx0x20 4, 198, 1, 6
-	unknownsfx0x20 12, 195, 129, 5
-	unknownsfx0x20 8, 179, 131, 5
-	unknownsfx0x20 4, 178, 130, 5
-	unknownsfx0x20 8, 161, 113, 5
-	endchannel
-
-
-SFX_1f_18_Ch3: ; 7cd08 (1f:4d08)
-	unknownnoise0x20 7, 214, 92
-	unknownnoise0x20 8, 230, 76
-	unknownnoise0x20 4, 212, 92
-	unknownnoise0x20 4, 212, 76
-	unknownnoise0x20 7, 195, 76
-	unknownnoise0x20 8, 161, 92
-	endchannel
--- a/audio/sfx/sfx_1f_19.asm
+++ /dev/null
@@ -1,19 +1,0 @@
-SFX_1f_19_Ch1: ; 7caaa (1f:4aaa)
-	dutycycle 10
-	unknownsfx0x20 6, 226, 0, 5
-	unknownsfx0x20 6, 227, 128, 5
-	unknownsfx0x20 6, 211, 112, 5
-	unknownsfx0x20 8, 161, 96, 5
-	endchannel
-
-
-SFX_1f_19_Ch2: ; 7cabd (1f:4abd)
-	dutycycle 245
-	unknownsfx0x20 6, 226, 130, 4
-	unknownsfx0x20 6, 211, 1, 5
-	unknownsfx0x20 6, 178, 226, 4
-	unknownsfx0x20 8, 129, 193, 4
-
-
-SFX_1f_19_Ch3: ; 7cacf (1f:4acf)
-	endchannel
--- a/audio/sfx/sfx_1f_1a.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54)
-	dutycycle 250
-	unknownsfx0x20 6, 131, 71, 2
-	unknownsfx0x20 15, 98, 38, 2
-	unknownsfx0x20 4, 82, 69, 2
-	unknownsfx0x20 9, 99, 6, 2
-	unknownsfx0x20 15, 130, 37, 2
-	unknownsfx0x20 15, 66, 7, 2
-
-
-SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e)
-	endchannel
-
-
-SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f)
-	unknownnoise0x20 8, 212, 140
-	unknownnoise0x20 4, 226, 156
-	unknownnoise0x20 15, 198, 140
-	unknownnoise0x20 8, 228, 172
-	unknownnoise0x20 15, 215, 156
-	unknownnoise0x20 15, 242, 172
-	endchannel
--- a/audio/sfx/sfx_1f_1b.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82)
-	dutycycle 240
-	unknownsfx0x20 4, 243, 224, 6
-	unknownsfx0x20 15, 228, 64, 6
-	unknownsfx0x20 8, 193, 32, 6
-	endchannel
-
-
-SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91)
-	dutycycle 10
-	unknownsfx0x20 3, 195, 131, 6
-	unknownsfx0x20 14, 180, 2, 6
-	unknownsfx0x20 8, 161, 1, 6
-	endchannel
-
-
-SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0)
-	unknownnoise0x20 4, 211, 92
-	unknownnoise0x20 15, 230, 76
-	unknownnoise0x20 8, 177, 92
-	endchannel
--- a/audio/sfx/sfx_1f_1c.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a)
-	dutycycle 240
-	unknownsfx0x20 15, 246, 101, 5
-	unknownsfx0x20 10, 228, 124, 5
-	unknownsfx0x20 3, 194, 92, 5
-	unknownsfx0x20 15, 178, 60, 5
-	endchannel
-
-
-SFX_1f_1c_Ch2: ; 7ccad (1f:4cad)
-	dutycycle 90
-	unknownsfx0x20 14, 214, 3, 5
-	unknownsfx0x20 9, 180, 27, 5
-	unknownsfx0x20 4, 146, 250, 4
-	unknownsfx0x20 15, 162, 219, 4
-	endchannel
-
-
-SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0)
-	unknownnoise0x20 12, 230, 76
-	unknownnoise0x20 11, 215, 92
-	unknownnoise0x20 15, 194, 76
-	endchannel
--- a/audio/sfx/sfx_1f_1d.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 160, 7
-	unknownsfx0x20 6, 230, 163, 7
-	unknownsfx0x20 10, 244, 160, 7
-	dutycycle 165
-	unknownsfx0x20 10, 246, 216, 7
-	unknownsfx0x20 4, 227, 215, 7
-	unknownsfx0x20 15, 242, 216, 7
-	endchannel
-
-
-SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1)
-	dutycycle 5
-	unknownsfx0x20 2, 8, 0, 0
-	unknownsfx0x20 15, 167, 161, 6
-	unknownsfx0x20 6, 134, 162, 6
-	unknownsfx0x20 10, 116, 161, 6
-	dutycycle 95
-	unknownsfx0x20 10, 118, 214, 6
-	unknownsfx0x20 4, 131, 217, 6
-	unknownsfx0x20 15, 162, 215, 6
-	endchannel
-
-
-SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2)
-	unknownnoise0x20 2, 242, 60
-	unknownnoise0x20 8, 228, 62
-	unknownnoise0x20 15, 215, 60
-	unknownnoise0x20 6, 197, 59
-	unknownnoise0x20 6, 228, 61
-	unknownnoise0x20 8, 182, 60
-	unknownnoise0x20 6, 212, 61
-	unknownnoise0x20 8, 193, 59
-	endchannel
--- a/audio/sfx/sfx_1f_1e.asm
+++ /dev/null
@@ -1,35 +1,0 @@
-SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f)
-	dutycycle 240
-	unknownsfx0x20 8, 247, 224, 6
-	unknownsfx0x20 6, 230, 229, 6
-	unknownsfx0x20 3, 244, 224, 6
-	unknownsfx0x20 3, 246, 208, 6
-	unknownsfx0x20 3, 227, 192, 6
-	unknownsfx0x20 4, 242, 176, 6
-	unknownsfx0x20 15, 162, 200, 6
-	endchannel
-
-
-SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e)
-	dutycycle 5
-	unknownsfx0x20 3, 8, 0, 0
-	unknownsfx0x20 8, 167, 161, 6
-	unknownsfx0x20 6, 134, 163, 6
-	unknownsfx0x20 3, 116, 161, 6
-	unknownsfx0x20 3, 118, 145, 6
-	unknownsfx0x20 3, 131, 130, 6
-	unknownsfx0x20 4, 162, 113, 6
-	unknownsfx0x20 15, 114, 137, 6
-	endchannel
-
-
-SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81)
-	unknownnoise0x20 2, 242, 60
-	unknownnoise0x20 8, 228, 62
-	unknownnoise0x20 8, 215, 60
-	unknownnoise0x20 5, 197, 59
-	unknownnoise0x20 3, 212, 44
-	unknownnoise0x20 2, 182, 60
-	unknownnoise0x20 3, 164, 44
-	unknownnoise0x20 8, 145, 60
-	endchannel
--- a/audio/sfx/sfx_1f_1f.asm
+++ /dev/null
@@ -1,37 +1,0 @@
-SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0)
-	dutycycle 204
-	unknownsfx0x20 4, 241, 0, 7
-	unknownsfx0x20 4, 225, 128, 7
-	unknownsfx0x20 4, 209, 64, 7
-	unknownsfx0x20 4, 225, 64, 7
-	unknownsfx0x20 4, 241, 128, 7
-	unknownsfx0x20 4, 209, 0, 7
-	unknownsfx0x20 4, 241, 1, 7
-	unknownsfx0x20 4, 209, 130, 7
-	unknownsfx0x20 4, 193, 66, 7
-	unknownsfx0x20 8, 177, 65, 7
-	endchannel
-
-
-SFX_1f_1f_Ch2: ; 7cafb (1f:4afb)
-	dutycycle 68
-	unknownsfx0x20 12, 8, 0, 0
-	unknownsfx0x20 4, 241, 1, 7
-	unknownsfx0x20 4, 225, 130, 7
-	unknownsfx0x20 4, 209, 65, 7
-	unknownsfx0x20 4, 225, 65, 7
-	unknownsfx0x20 4, 241, 130, 7
-	unknownsfx0x20 8, 209, 1, 7
-	endchannel
-
-
-SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a)
-	unknownnoise0x20 15, 8, 0
-	unknownnoise0x20 4, 8, 0
-	unknownnoise0x20 4, 209, 76
-	unknownnoise0x20 4, 177, 44
-	unknownnoise0x20 4, 209, 60
-	unknownnoise0x20 4, 177, 60
-	unknownnoise0x20 4, 193, 44
-	unknownnoise0x20 8, 161, 76
-	endchannel
--- a/audio/sfx/sfx_1f_20.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_1f_20_Ch1: ; 7cb33 (1f:4b33)
-	dutycycle 204
-	unknownsfx0x20 8, 245, 0, 6
-	unknownsfx0x20 2, 210, 56, 6
-	unknownsfx0x20 2, 194, 48, 6
-	unknownsfx0x20 2, 194, 40, 6
-	unknownsfx0x20 2, 178, 32, 6
-	unknownsfx0x20 2, 178, 16, 6
-	unknownsfx0x20 2, 162, 24, 6
-	unknownsfx0x20 2, 178, 16, 6
-	unknownsfx0x20 8, 193, 32, 6
-	endchannel
-
-
-SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a)
-	dutycycle 68
-	unknownsfx0x20 12, 195, 192, 5
-	unknownsfx0x20 3, 177, 249, 5
-	unknownsfx0x20 2, 161, 241, 5
-	unknownsfx0x20 2, 161, 233, 5
-	unknownsfx0x20 2, 145, 225, 5
-	unknownsfx0x20 2, 145, 217, 5
-	unknownsfx0x20 2, 129, 209, 5
-	unknownsfx0x20 2, 145, 217, 5
-	unknownsfx0x20 8, 145, 225, 5
-
-
-SFX_1f_20_Ch3: ; 7cb80 (1f:4b80)
-	endchannel
--- a/audio/sfx/sfx_1f_21.asm
+++ /dev/null
@@ -1,40 +1,0 @@
-SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f)
-	dutycycle 136
-	unknownsfx0x20 5, 242, 80, 6
-	unknownsfx0x20 9, 209, 96, 6
-	unknownsfx0x20 5, 226, 18, 6
-	unknownsfx0x20 9, 193, 34, 6
-	unknownsfx0x20 5, 242, 16, 6
-	unknownsfx0x20 6, 209, 32, 6
-	loopchannel 2, SFX_1f_21_Ch1
-	endchannel
-
-
-SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe)
-	dutycycle 64
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 5, 242, 81, 6
-	unknownsfx0x20 9, 209, 97, 6
-	unknownsfx0x20 5, 226, 20, 6
-	unknownsfx0x20 8, 193, 36, 6
-	unknownsfx0x20 5, 242, 17, 6
-	unknownsfx0x20 12, 209, 33, 6
-	unknownsfx0x20 5, 226, 20, 6
-	unknownsfx0x20 8, 193, 36, 6
-	unknownsfx0x20 5, 242, 17, 6
-	unknownsfx0x20 4, 209, 33, 6
-	endchannel
-
-
-SFX_1f_21_Ch3: ; 7cbed (1f:4bed)
-	unknownnoise0x20 6, 210, 28
-	unknownnoise0x20 9, 177, 44
-	unknownnoise0x20 8, 194, 44
-	unknownnoise0x20 9, 177, 60
-	unknownnoise0x20 6, 194, 44
-	unknownnoise0x20 9, 162, 60
-	unknownnoise0x20 7, 194, 44
-	unknownnoise0x20 5, 161, 60
-	unknownnoise0x20 9, 194, 44
-	unknownnoise0x20 4, 161, 60
-	endchannel
--- a/audio/sfx/sfx_1f_22.asm
+++ /dev/null
@@ -1,23 +1,0 @@
-SFX_1f_22_Ch1: ; 7ca24 (1f:4a24)
-	dutycycle 165
-	unknownsfx0x20 4, 225, 0, 7
-	unknownsfx0x20 4, 242, 128, 7
-	unknownsfx0x20 2, 146, 64, 7
-	unknownsfx0x20 8, 225, 0, 6
-	endchannel
-
-
-SFX_1f_22_Ch2: ; 7ca37 (1f:4a37)
-	dutycycle 10
-	unknownsfx0x20 4, 177, 225, 6
-	unknownsfx0x20 3, 194, 225, 6
-	unknownsfx0x20 3, 98, 129, 6
-	unknownsfx0x20 8, 177, 225, 5
-	endchannel
-
-
-SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a)
-	unknownnoise0x20 2, 97, 50
-	unknownnoise0x20 2, 97, 33
-	unknownnoise0x20 8, 97, 17
-	endchannel
--- a/audio/sfx/sfx_1f_23.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_1f_23_Ch1: ; 7c966 (1f:4966)
-	dutycycle 241
-	unknownsfx0x20 4, 247, 192, 7
-	unknownsfx0x20 12, 230, 194, 7
-	unknownsfx0x20 6, 181, 128, 6
-	unknownsfx0x20 4, 196, 112, 6
-	unknownsfx0x20 4, 181, 96, 6
-	unknownsfx0x20 8, 193, 64, 6
-	endchannel
-
-
-SFX_1f_23_Ch2: ; 7c981 (1f:4981)
-	dutycycle 204
-	unknownsfx0x20 3, 199, 129, 7
-	unknownsfx0x20 12, 182, 128, 7
-	unknownsfx0x20 6, 165, 65, 6
-	unknownsfx0x20 4, 196, 50, 6
-	unknownsfx0x20 6, 181, 33, 6
-	unknownsfx0x20 8, 161, 2, 6
-	endchannel
-
-
-SFX_1f_23_Ch3: ; 7c99c (1f:499c)
-	unknownnoise0x20 3, 228, 60
-	unknownnoise0x20 12, 214, 44
-	unknownnoise0x20 4, 228, 60
-	unknownnoise0x20 8, 183, 92
-	unknownnoise0x20 15, 194, 93
-	endchannel
--- a/audio/sfx/sfx_1f_24.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-SFX_1f_24_Ch1: ; 7c9ac (1f:49ac)
-	dutycycle 201
-	unknownsfx0x20 8, 247, 128, 6
-	unknownsfx0x20 2, 247, 96, 6
-	unknownsfx0x20 1, 231, 64, 6
-	unknownsfx0x20 1, 231, 32, 6
-	unknownsfx0x20 15, 209, 0, 6
-	unknownsfx0x20 4, 199, 64, 7
-	unknownsfx0x20 4, 167, 48, 7
-	unknownsfx0x20 15, 145, 32, 7
-	endchannel
-
-
-SFX_1f_24_Ch2: ; 7c9cf (1f:49cf)
-	dutycycle 121
-	unknownsfx0x20 10, 231, 130, 6
-	unknownsfx0x20 2, 231, 98, 6
-	unknownsfx0x20 1, 215, 66, 6
-	unknownsfx0x20 1, 215, 34, 6
-	unknownsfx0x20 15, 193, 2, 6
-	unknownsfx0x20 4, 183, 66, 7
-	unknownsfx0x20 2, 151, 50, 7
-	unknownsfx0x20 15, 129, 34, 7
-	endchannel
-
-
-SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2)
-	unknownnoise0x20 4, 116, 33
-	unknownnoise0x20 4, 116, 16
-	unknownnoise0x20 4, 113, 32
-	endchannel
--- a/audio/sfx/sfx_1f_25.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SFX_1f_25_Ch1: ; 7c888 (1f:4888)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 160, 7
-	unknownsfx0x20 8, 230, 164, 7
-	unknownsfx0x20 4, 214, 160, 7
-	unknownsfx0x20 15, 211, 32, 7
-	unknownsfx0x20 8, 195, 35, 7
-	unknownsfx0x20 2, 194, 40, 7
-	unknownsfx0x20 8, 177, 48, 7
-	endchannel
-
-
-SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7)
-	dutycycle 10
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 6, 167, 65, 7
-	unknownsfx0x20 8, 134, 67, 7
-	unknownsfx0x20 4, 118, 65, 7
-	unknownsfx0x20 13, 131, 194, 6
-	unknownsfx0x20 7, 115, 193, 6
-	unknownsfx0x20 3, 130, 204, 6
-	unknownsfx0x20 8, 113, 216, 6
-	endchannel
-
-
-SFX_1f_25_Ch3: ; 7c8ca (1f:48ca)
-	unknownnoise0x20 2, 242, 76
-	unknownnoise0x20 6, 230, 58
-	unknownnoise0x20 4, 215, 58
-	unknownnoise0x20 6, 214, 44
-	unknownnoise0x20 8, 229, 60
-	unknownnoise0x20 12, 210, 61
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_1f_26.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_1f_26_Ch1: ; 7cda0 (1f:4da0)
-	dutycycle 165
-	unknownsfx0x20 12, 242, 64, 4
-	unknownsfx0x20 15, 227, 160, 4
-	unknownsfx0x20 4, 210, 144, 4
-	unknownsfx0x20 8, 209, 128, 4
-	endchannel
-
-
-SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3)
-	dutycycle 238
-	unknownsfx0x20 11, 210, 56, 4
-	unknownsfx0x20 14, 198, 152, 4
-	unknownsfx0x20 3, 178, 136, 4
-	unknownsfx0x20 8, 177, 120, 4
-	endchannel
-
-
-SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6)
-	unknownnoise0x20 10, 230, 108
-	unknownnoise0x20 15, 210, 92
-	unknownnoise0x20 3, 194, 108
-	unknownnoise0x20 8, 209, 92
-	endchannel
--- a/audio/sfx/sfx_1f_27.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3)
-	dutycycle 51
-	unknownsfx0x20 15, 246, 192, 5
-	unknownsfx0x20 8, 227, 188, 5
-	unknownsfx0x20 6, 210, 208, 5
-	unknownsfx0x20 6, 178, 224, 5
-	unknownsfx0x20 6, 194, 240, 5
-	unknownsfx0x20 8, 177, 0, 6
-	endchannel
-
-
-SFX_1f_27_Ch2: ; 7cdee (1f:4dee)
-	dutycycle 153
-	unknownsfx0x20 14, 198, 177, 4
-	unknownsfx0x20 7, 195, 173, 4
-	unknownsfx0x20 5, 178, 193, 4
-	unknownsfx0x20 8, 146, 209, 4
-	unknownsfx0x20 6, 162, 225, 4
-	unknownsfx0x20 8, 145, 241, 4
-	endchannel
-
-
-SFX_1f_27_Ch3: ; 7ce09 (1f:4e09)
-	unknownnoise0x20 10, 230, 92
-	unknownnoise0x20 10, 214, 108
-	unknownnoise0x20 4, 194, 76
-	unknownnoise0x20 6, 211, 92
-	unknownnoise0x20 8, 179, 76
-	unknownnoise0x20 8, 161, 92
-	endchannel
--- a/audio/sfx/sfx_1f_28.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c)
-	dutycycle 240
-	unknownsfx0x20 8, 228, 144, 7
-	unknownsfx0x20 15, 245, 192, 7
-	unknownsfx0x20 8, 209, 216, 7
-	endchannel
-
-
-SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b)
-	dutycycle 165
-	unknownsfx0x20 10, 196, 113, 7
-	unknownsfx0x20 15, 182, 162, 7
-	unknownsfx0x20 8, 161, 183, 7
-	endchannel
-
-
-SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a)
-	unknownnoise0x20 8, 228, 76
-	unknownnoise0x20 14, 196, 60
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_1f_29.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa)
-	dutycycle 240
-	unknownsfx0x20 4, 243, 128, 7
-	unknownsfx0x20 15, 231, 0, 7
-	unknownsfx0x20 8, 211, 16, 7
-	unknownsfx0x20 4, 194, 0, 7
-	unknownsfx0x20 4, 210, 240, 6
-	unknownsfx0x20 8, 193, 224, 6
-	endchannel
-
-
-SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5)
-	dutycycle 90
-	unknownsfx0x20 6, 195, 1, 7
-	unknownsfx0x20 14, 183, 129, 6
-	unknownsfx0x20 7, 179, 146, 6
-	unknownsfx0x20 3, 162, 129, 6
-	unknownsfx0x20 4, 178, 114, 6
-	unknownsfx0x20 8, 161, 97, 6
-	endchannel
-
-
-SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0)
-	unknownnoise0x20 6, 227, 92
-	unknownnoise0x20 14, 214, 76
-	unknownnoise0x20 6, 198, 60
-	unknownnoise0x20 3, 179, 76
-	unknownnoise0x20 3, 162, 92
-	unknownnoise0x20 8, 177, 108
-	endchannel
--- a/audio/sfx/sfx_1f_2a.asm
+++ /dev/null
@@ -1,21 +1,0 @@
-SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d)
-	dutycycle 240
-	unknownsfx0x20 15, 215, 128, 7
-	unknownsfx0x20 4, 230, 160, 7
-	unknownsfx0x20 15, 210, 64, 7
-	endchannel
-
-
-SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c)
-	dutycycle 90
-	unknownsfx0x20 15, 199, 83, 7
-	unknownsfx0x20 5, 182, 114, 7
-	unknownsfx0x20 15, 194, 17, 7
-	endchannel
-
-
-SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b)
-	unknownnoise0x20 13, 246, 76
-	unknownnoise0x20 4, 230, 60
-	unknownnoise0x20 15, 242, 76
-	endchannel
--- a/audio/sfx/sfx_1f_2b.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3)
-	dutycycle 15
-	unknownsfx0x20 15, 247, 0, 5
-	unknownsfx0x20 15, 231, 8, 5
-	unknownsfx0x20 8, 180, 128, 4
-	unknownsfx0x20 15, 162, 96, 4
-	endchannel
-
-
-SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06)
-	dutycycle 68
-	unknownsfx0x20 14, 215, 129, 4
-	unknownsfx0x20 14, 199, 137, 4
-	unknownsfx0x20 10, 180, 1, 4
-	unknownsfx0x20 15, 194, 225, 3
-	endchannel
-
-
-SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19)
-	unknownnoise0x20 14, 247, 124
-	unknownnoise0x20 12, 246, 108
-	unknownnoise0x20 9, 228, 124
-	unknownnoise0x20 15, 226, 108
-	endchannel
--- a/audio/sfx/sfx_1f_2c.asm
+++ /dev/null
@@ -1,34 +1,0 @@
-SFX_1f_2c_Ch1: ; 7d003 (1f:5003)
-	dutycycle 80
-	unknownsfx0x20 10, 245, 128, 6
-	unknownsfx0x20 3, 226, 160, 6
-	unknownsfx0x20 3, 242, 192, 6
-	unknownsfx0x20 3, 226, 224, 6
-	unknownsfx0x20 3, 210, 0, 7
-	unknownsfx0x20 3, 194, 224, 6
-	unknownsfx0x20 3, 210, 192, 6
-	unknownsfx0x20 8, 193, 160, 6
-	endchannel
-
-
-SFX_1f_2c_Ch2: ; 7d026 (1f:5026)
-	dutycycle 15
-	unknownsfx0x20 9, 213, 49, 6
-	unknownsfx0x20 3, 210, 82, 6
-	unknownsfx0x20 3, 226, 113, 6
-	unknownsfx0x20 3, 178, 145, 6
-	unknownsfx0x20 3, 194, 178, 6
-	unknownsfx0x20 3, 178, 145, 6
-	unknownsfx0x20 3, 194, 113, 6
-	unknownsfx0x20 8, 177, 81, 6
-	endchannel
-
-
-SFX_1f_2c_Ch3: ; 7d049 (1f:5049)
-	unknownnoise0x20 6, 227, 76
-	unknownnoise0x20 4, 195, 60
-	unknownnoise0x20 5, 212, 60
-	unknownnoise0x20 4, 196, 44
-	unknownnoise0x20 6, 180, 60
-	unknownnoise0x20 8, 193, 44
-	endchannel
--- a/audio/sfx/sfx_1f_2d.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b)
-	dutycycle 27
-	unknownsfx0x20 7, 210, 64, 7
-	unknownsfx0x20 15, 229, 96, 7
-	unknownsfx0x20 15, 193, 48, 7
-	endchannel
-
-
-SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a)
-	dutycycle 129
-	unknownsfx0x20 2, 194, 1, 7
-	unknownsfx0x20 4, 194, 8, 7
-	unknownsfx0x20 15, 215, 65, 7
-	unknownsfx0x20 15, 162, 1, 7
-
-
-SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c)
-	endchannel
--- a/audio/sfx/sfx_1f_2e.asm
+++ /dev/null
@@ -1,30 +1,0 @@
-SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 64, 7
-	unknownsfx0x20 12, 230, 68, 7
-	unknownsfx0x20 6, 213, 80, 7
-	unknownsfx0x20 4, 195, 96, 7
-	unknownsfx0x20 3, 195, 128, 7
-	unknownsfx0x20 8, 209, 160, 7
-	endchannel
-
-
-SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f)
-	dutycycle 10
-	unknownsfx0x20 6, 199, 1, 7
-	unknownsfx0x20 11, 182, 2, 7
-	unknownsfx0x20 6, 165, 17, 7
-	unknownsfx0x20 4, 147, 33, 7
-	unknownsfx0x20 3, 163, 65, 7
-	unknownsfx0x20 8, 145, 98, 7
-	endchannel
-
-
-SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa)
-	unknownnoise0x20 3, 226, 60
-	unknownnoise0x20 8, 214, 76
-	unknownnoise0x20 5, 212, 60
-	unknownnoise0x20 12, 199, 76
-	unknownnoise0x20 2, 226, 60
-	unknownnoise0x20 8, 209, 44
-	endchannel
--- a/audio/sfx/sfx_1f_2f.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65)
-	dutycycle 240
-	unknownsfx0x20 6, 247, 192, 6
-	unknownsfx0x20 15, 231, 0, 7
-	unknownsfx0x20 4, 244, 240, 6
-	unknownsfx0x20 4, 228, 224, 6
-	unknownsfx0x20 8, 209, 208, 6
-	endchannel
-
-
-SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c)
-	dutycycle 10
-	unknownsfx0x20 7, 230, 129, 6
-	unknownsfx0x20 14, 213, 193, 6
-	unknownsfx0x20 4, 196, 177, 6
-	unknownsfx0x20 4, 212, 161, 6
-	unknownsfx0x20 8, 193, 145, 6
-	endchannel
-
-
-SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93)
-	unknownnoise0x20 10, 166, 60
-	unknownnoise0x20 14, 148, 44
-	unknownnoise0x20 5, 163, 60
-	unknownnoise0x20 8, 145, 44
-	endchannel
--- a/audio/sfx/sfx_1f_30.asm
+++ /dev/null
@@ -1,31 +1,0 @@
-SFX_1f_30_Ch1: ; 7cf26 (1f:4f26)
-	dutycycle 245
-	unknownsfx0x20 7, 214, 225, 7
-	unknownsfx0x20 6, 198, 226, 7
-	unknownsfx0x20 9, 214, 225, 7
-	unknownsfx0x20 7, 198, 224, 7
-	unknownsfx0x20 5, 182, 226, 7
-	unknownsfx0x20 7, 198, 225, 7
-	unknownsfx0x20 6, 182, 224, 7
-	unknownsfx0x20 8, 161, 223, 7
-	endchannel
-
-
-SFX_1f_30_Ch2: ; 7cf49 (1f:4f49)
-	dutycycle 68
-	unknownsfx0x20 6, 195, 201, 7
-	unknownsfx0x20 6, 179, 199, 7
-	unknownsfx0x20 10, 196, 195, 7
-	unknownsfx0x20 8, 180, 199, 7
-	unknownsfx0x20 6, 195, 201, 7
-	unknownsfx0x20 15, 162, 197, 7
-	endchannel
-
-
-SFX_1f_30_Ch3: ; 7cf64 (1f:4f64)
-	unknownnoise0x20 13, 25, 124
-	unknownnoise0x20 13, 247, 140
-	unknownnoise0x20 12, 214, 124
-	unknownnoise0x20 8, 196, 108
-	unknownnoise0x20 15, 179, 92
-	endchannel
--- a/audio/sfx/sfx_1f_31.asm
+++ /dev/null
@@ -1,29 +1,0 @@
-SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd)
-	dutycycle 244
-	unknownsfx0x20 15, 240, 5, 7
-	unknownsfx0x20 10, 224, 0, 7
-	unknownsfx0x20 6, 180, 16, 7
-	unknownsfx0x20 4, 211, 0, 7
-	unknownsfx0x20 6, 178, 32, 6
-	unknownsfx0x20 8, 161, 36, 6
-	endchannel
-
-
-SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8)
-	dutycycle 34
-	unknownsfx0x20 15, 176, 195, 6
-	unknownsfx0x20 10, 160, 193, 6
-	unknownsfx0x20 6, 132, 210, 6
-	unknownsfx0x20 4, 147, 193, 6
-	unknownsfx0x20 6, 130, 225, 5
-	unknownsfx0x20 8, 97, 232, 5
-	endchannel
-
-
-SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3)
-	unknownnoise0x20 6, 230, 76
-	unknownnoise0x20 15, 214, 60
-	unknownnoise0x20 10, 197, 74
-	unknownnoise0x20 1, 178, 91
-	unknownnoise0x20 15, 194, 76
-	endchannel
--- a/audio/sfx/sfx_1f_32.asm
+++ /dev/null
@@ -1,38 +1,0 @@
-SFX_1f_32_Ch1: ; 7ce44 (1f:4e44)
-	dutycycle 240
-	unknownsfx0x20 6, 242, 0, 6
-	unknownsfx0x20 6, 226, 64, 6
-	unknownsfx0x20 6, 210, 128, 6
-	unknownsfx0x20 6, 226, 192, 6
-	unknownsfx0x20 6, 210, 0, 7
-	unknownsfx0x20 6, 194, 64, 7
-	unknownsfx0x20 6, 178, 128, 7
-	unknownsfx0x20 8, 161, 192, 7
-	endchannel
-
-
-SFX_1f_32_Ch2: ; 7ce67 (1f:4e67)
-	dutycycle 17
-	unknownsfx0x20 3, 8, 1, 0
-	unknownsfx0x20 6, 194, 193, 5
-	unknownsfx0x20 6, 178, 2, 6
-	unknownsfx0x20 6, 162, 65, 6
-	unknownsfx0x20 6, 178, 130, 6
-	unknownsfx0x20 6, 162, 194, 6
-	unknownsfx0x20 6, 146, 1, 7
-	unknownsfx0x20 6, 162, 66, 7
-	unknownsfx0x20 8, 129, 129, 7
-	endchannel
-
-
-SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e)
-	unknownnoise0x20 6, 8, 1
-	unknownnoise0x20 5, 226, 92
-	unknownnoise0x20 5, 194, 76
-	unknownnoise0x20 5, 210, 60
-	unknownnoise0x20 5, 178, 44
-	unknownnoise0x20 5, 194, 28
-	unknownnoise0x20 5, 162, 27
-	unknownnoise0x20 5, 146, 26
-	unknownnoise0x20 8, 129, 24
-	endchannel
--- a/audio/sfx/sfx_1f_33.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_1f_33_Ch1: ; 7d05c (1f:505c)
-	dutycycle 165
-	unknownsfx0x20 3, 244, 65, 6
-	unknownsfx0x20 13, 214, 33, 7
-	unknownsfx0x20 8, 244, 25, 7
-	unknownsfx0x20 8, 193, 26, 7
-	endchannel
-
-
-SFX_1f_33_Ch2: ; 7d06f (1f:506f)
-	dutycycle 204
-	unknownsfx0x20 4, 244, 128, 5
-	unknownsfx0x20 14, 230, 224, 6
-	unknownsfx0x20 8, 213, 216, 6
-	unknownsfx0x20 8, 209, 220, 6
-	endchannel
-
-
-SFX_1f_33_Ch3: ; 7d082 (1f:5082)
-	unknownnoise0x20 5, 196, 70
-	unknownnoise0x20 13, 165, 68
-	unknownnoise0x20 8, 196, 69
-	unknownnoise0x20 8, 177, 68
-	endchannel
--- a/audio/sfx/sfx_1f_34.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_1f_34_Ch1: ; 7d08f (1f:508f)
-	dutycycle 240
-	unknownsfx0x20 13, 241, 17, 5
-	unknownsfx0x20 13, 225, 21, 5
-	unknownsfx0x20 13, 225, 17, 5
-	unknownsfx0x20 8, 209, 17, 5
-	endchannel
-
-
-SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2)
-	dutycycle 21
-	unknownsfx0x20 12, 225, 12, 5
-	unknownsfx0x20 12, 209, 16, 5
-	unknownsfx0x20 14, 193, 12, 5
-	unknownsfx0x20 8, 193, 10, 5
-	endchannel
-
-
-SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5)
-	unknownnoise0x20 14, 242, 101
-	unknownnoise0x20 13, 226, 85
-	unknownnoise0x20 14, 210, 86
-	unknownnoise0x20 8, 209, 102
-	endchannel
--- a/audio/sfx/sfx_1f_35.asm
+++ /dev/null
@@ -1,27 +1,0 @@
-SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2)
-	dutycycle 27
-	unknownsfx0x20 3, 243, 100, 5
-	unknownsfx0x20 2, 226, 68, 5
-	unknownsfx0x20 5, 209, 34, 5
-	unknownsfx0x20 2, 178, 132, 4
-	unknownsfx0x20 8, 209, 162, 4
-	unknownsfx0x20 3, 243, 36, 5
-	unknownsfx0x20 4, 228, 228, 4
-	unknownsfx0x20 8, 209, 2, 5
-	endchannel
-
-
-SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5)
-	dutycycle 204
-	unknownsfx0x20 3, 211, 96, 5
-	unknownsfx0x20 2, 194, 64, 5
-	unknownsfx0x20 5, 193, 32, 5
-	unknownsfx0x20 2, 146, 128, 4
-	unknownsfx0x20 8, 193, 160, 4
-	unknownsfx0x20 3, 211, 32, 5
-	unknownsfx0x20 3, 196, 224, 4
-	unknownsfx0x20 8, 193, 0, 5
-
-
-SFX_1f_35_Ch3: ; 7d107 (1f:5107)
-	endchannel
--- a/audio/sfx/sfx_1f_36.asm
+++ /dev/null
@@ -1,24 +1,0 @@
-SFX_1f_36_Ch1: ; 7d108 (1f:5108)
-	dutycycle 17
-	unknownsfx0x20 2, 61, 129, 3
-	unknownsfx0x20 7, 245, 1, 6
-	unknownsfx0x20 1, 194, 129, 4
-	unknownsfx0x20 8, 145, 129, 3
-	endchannel
-
-
-SFX_1f_36_Ch2: ; 7d11b (1f:511b)
-	dutycycle 238
-	unknownsfx0x20 2, 62, 176, 5
-	unknownsfx0x20 7, 213, 93, 7
-	unknownsfx0x20 1, 178, 176, 6
-	unknownsfx0x20 8, 97, 176, 5
-	endchannel
-
-
-SFX_1f_36_Ch3: ; 7d12e (1f:512e)
-	unknownnoise0x20 2, 146, 73
-	unknownnoise0x20 7, 181, 41
-	unknownnoise0x20 1, 162, 57
-	unknownnoise0x20 8, 145, 73
-	endchannel
--- a/audio/sfx/sfx_1f_37.asm
+++ /dev/null
@@ -1,25 +1,0 @@
-SFX_1f_37_Ch1: ; 7c7fb (1f:47fb)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 192, 7
-	unknownsfx0x20 6, 228, 193, 7
-	unknownsfx0x20 10, 246, 192, 7
-	unknownsfx0x20 4, 211, 194, 7
-	unknownsfx0x20 8, 193, 192, 7
-	endchannel
-
-
-SFX_1f_37_Ch2: ; 7c812 (1f:4812)
-	dutycycle 95
-	unknownsfx0x20 15, 151, 129, 7
-	unknownsfx0x20 6, 132, 128, 7
-	unknownsfx0x20 10, 150, 129, 7
-	unknownsfx0x20 15, 131, 129, 7
-	endchannel
-
-
-SFX_1f_37_Ch3: ; 7c825 (1f:4825)
-	unknownnoise0x20 3, 242, 60
-	unknownnoise0x20 13, 230, 44
-	unknownnoise0x20 15, 215, 60
-	unknownnoise0x20 8, 193, 44
-	endchannel
--- a/audio/sfx/sfx_1f_38.asm
+++ /dev/null
@@ -1,33 +1,0 @@
-SFX_1f_38_Ch1: ; 7c832 (1f:4832)
-	dutycycle 240
-	unknownsfx0x20 15, 247, 128, 6
-	unknownsfx0x20 10, 230, 132, 6
-	unknownsfx0x20 15, 215, 144, 6
-	unknownsfx0x20 8, 213, 144, 6
-	unknownsfx0x20 6, 196, 136, 6
-	unknownsfx0x20 5, 211, 112, 6
-	unknownsfx0x20 4, 211, 96, 6
-	unknownsfx0x20 8, 193, 64, 6
-	endchannel
-
-
-SFX_1f_38_Ch2: ; 7c855 (1f:4855)
-	dutycycle 5
-	unknownsfx0x20 15, 183, 65, 6
-	unknownsfx0x20 10, 150, 66, 6
-	unknownsfx0x20 15, 167, 81, 6
-	unknownsfx0x20 8, 165, 81, 6
-	unknownsfx0x20 6, 148, 71, 6
-	unknownsfx0x20 5, 163, 49, 6
-	unknownsfx0x20 4, 147, 34, 6
-	unknownsfx0x20 8, 113, 1, 6
-	endchannel
-
-
-SFX_1f_38_Ch3: ; 7c878 (1f:4878)
-	unknownnoise0x20 15, 228, 60
-	unknownnoise0x20 10, 199, 76
-	unknownnoise0x20 10, 199, 60
-	unknownnoise0x20 12, 183, 76
-	unknownnoise0x20 15, 162, 92
-	endchannel
--- a/audio/sfx/sfx_1f_39.asm
+++ /dev/null
@@ -1,26 +1,0 @@
-SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0)
-	dutycycle 165
-	unknownsfx0x20 6, 244, 64, 7
-	unknownsfx0x20 15, 227, 48, 7
-	unknownsfx0x20 4, 244, 64, 7
-	unknownsfx0x20 5, 179, 72, 7
-	unknownsfx0x20 8, 209, 80, 7
-	endchannel
-
-
-SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7)
-	dutycycle 119
-	unknownsfx0x20 6, 195, 18, 7
-	unknownsfx0x20 15, 179, 4, 7
-	unknownsfx0x20 3, 195, 18, 7
-	unknownsfx0x20 4, 195, 33, 7
-	unknownsfx0x20 8, 177, 50, 7
-	endchannel
-
-
-SFX_1f_39_Ch3: ; 7c90e (1f:490e)
-	unknownnoise0x20 8, 214, 44
-	unknownnoise0x20 12, 198, 60
-	unknownnoise0x20 10, 182, 44
-	unknownnoise0x20 8, 145, 28
-	endchannel
--- a/audio/sfx/sfx_1f_3a.asm
+++ /dev/null
@@ -1,47 +1,0 @@
-SFX_1f_3a_Ch1: ; 7e850 (1f:6850)
-	executemusic
-	tempo 256
-	volume 7, 7
-	vibrato 6, 2, 6
-	duty 2
-	toggleperfectpitch
-	notetype 4, 11, 1
-	octave 3
-	G# 2
-	G# 2
-	G# 2
-	notetype 12, 11, 3
-	octave 4
-	E_ 4
-	endchannel
-
-
-SFX_1f_3a_Ch2: ; 7e867 (1f:6867)
-	executemusic
-	vibrato 8, 2, 7
-	duty 2
-	notetype 4, 12, 1
-	octave 4
-	E_ 2
-	E_ 2
-	E_ 2
-	notetype 12, 12, 3
-	B_ 4
-	endchannel
-
-
-SFX_1f_3a_Ch3: ; 7e877 (1f:6877)
-	executemusic
-	notetype 4, 1, 0
-	octave 4
-	B_ 1
-	rest 1
-	B_ 1
-	rest 1
-	B_ 1
-	rest 1
-	notetype 12, 1, 0
-	octave 4
-	B_ 2
-	rest 2
-	endchannel
--- a/audio/sfx/sfx_1f_3b.asm
+++ /dev/null
@@ -1,69 +1,0 @@
-SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 11, 4
-	octave 4
-	D_ 4
-	C_ 4
-	octave 3
-	A_ 8
-	notetype 5, 11, 2
-	octave 4
-	D# 2
-	D# 2
-	D_ 2
-	C_ 2
-	C_ 2
-	octave 3
-	A# 2
-	notetype 5, 11, 4
-	octave 4
-	C_ 8
-	endchannel
-
-
-SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47)
-	executemusic
-	vibrato 8, 2, 7
-	duty 2
-	notetype 5, 12, 5
-	octave 4
-	A_ 4
-	F_ 4
-	C_ 8
-	notetype 5, 12, 2
-	A# 2
-	A# 2
-	A# 2
-	G_ 2
-	G_ 2
-	A# 2
-	notetype 5, 12, 4
-	A_ 8
-	endchannel
-
-
-SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f)
-	executemusic
-	notetype 5, 1, 0
-	octave 5
-	F_ 4
-	D# 4
-	C_ 8
-	D# 1
-	rest 1
-	D# 1
-	rest 1
-	E_ 1
-	rest 1
-	F_ 1
-	rest 1
-	F_ 1
-	rest 1
-	G_ 1
-	rest 1
-	A_ 8
-	endchannel
--- a/audio/sfx/sfx_1f_3c.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3)
-	duty 2
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 2
-	unknownsfx0x10 34
-	unknownsfx0x20 8, 226, 0, 2
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_3d.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_1f_3d_Ch1: ; 7c490 (1f:4490)
-	duty 2
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_3e.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2)
-	duty 2
-	unknownsfx0x10 20
-	unknownsfx0x20 4, 242, 0, 6
-	unknownsfx0x20 4, 242, 0, 6
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 242, 0, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_3f.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3)
-	unknownnoise0x20 1, 226, 51
-	unknownnoise0x20 8, 225, 34
-	endchannel
--- a/audio/sfx/sfx_1f_40.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_1f_40_Ch1: ; 7c44b (1f:444b)
-	duty 2
-	unknownsfx0x20 0, 145, 192, 7
-	unknownsfx0x20 0, 129, 208, 7
-	unknownsfx0x20 0, 145, 192, 7
-	unknownsfx0x20 12, 161, 208, 7
-	endchannel
--- a/audio/sfx/sfx_1f_41.asm
+++ /dev/null
@@ -1,77 +1,0 @@
-SFX_1f_41_Ch1: ; 7edda (1f:6dda)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 2
-	notetype 5, 11, 1
-	octave 3
-	A_ 2
-	A_ 2
-	G_ 2
-	G_ 2
-	F_ 2
-	E_ 2
-	F_ 2
-	A_ 2
-	octave 4
-	C_ 4
-	E_ 4
-	octave 3
-	F_ 4
-	endchannel
-
-
-SFX_1f_41_Ch2: ; 7edf3 (1f:6df3)
-	executemusic
-	duty 2
-	notetype 5, 12, 2
-	octave 5
-	F_ 2
-	E_ 1
-	rest 1
-	D_ 2
-	C_ 1
-	rest 1
-	octave 4
-	A# 2
-	octave 5
-	C_ 2
-	D_ 2
-	E_ 2
-	F_ 4
-	G_ 4
-	F_ 4
-	endchannel
-
-
-SFX_1f_41_Ch3: ; 7ee09 (1f:6e09)
-	executemusic
-	notetype 5, 1, 0
-	octave 5
-	C_ 1
-	rest 1
-	octave 4
-	F_ 2
-	octave 5
-	C_ 1
-	rest 1
-	octave 4
-	A# 1
-	rest 1
-	A_ 1
-	rest 1
-	G_ 1
-	rest 1
-	F_ 1
-	rest 1
-	E_ 1
-	rest 1
-	octave 5
-	F_ 1
-	rest 3
-	C_ 1
-	rest 3
-	octave 4
-	F_ 2
-	rest 2
-	endchannel
--- a/audio/sfx/sfx_1f_42.asm
+++ /dev/null
@@ -1,59 +1,0 @@
-SFX_1f_42_Ch1: ; 7ee74 (1f:6e74)
-	executemusic
-	tempo 256
-	volume 7, 7
-	duty 2
-	toggleperfectpitch
-	notetype 5, 10, 4
-	octave 3
-	A# 4
-	notetype 5, 11, 1
-	octave 4
-	C_ 2
-	C_ 1
-	C_ 1
-	notetype 5, 10, 4
-	D# 4
-	notetype 5, 11, 1
-	F_ 2
-	F_ 1
-	F_ 1
-	notetype 5, 11, 4
-	A# 8
-	endchannel
-
-
-SFX_1f_42_Ch2: ; 7ee93 (1f:6e93)
-	executemusic
-	vibrato 4, 2, 3
-	duty 2
-	notetype 5, 13, 1
-	octave 4
-	G_ 2
-	G_ 1
-	G_ 1
-	notetype 5, 12, 4
-	D# 4
-	notetype 5, 13, 1
-	G# 2
-	G# 1
-	G# 1
-	A# 2
-	A# 1
-	A# 1
-	notetype 5, 12, 4
-	octave 5
-	D# 8
-	endchannel
-
-
-SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf)
-	executemusic
-	notetype 5, 1, 0
-	octave 4
-	D# 4
-	G# 4
-	G_ 4
-	F_ 4
-	D# 8
-	endchannel
--- a/audio/sfx/sfx_1f_43.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_1f_43_Ch1: ; 7c49f (1f:449f)
-	duty 0
-	unknownsfx0x10 20
-	unknownsfx0x20 4, 242, 0, 6
-	loopchannel 4, SFX_1f_43_Ch1
-	unknownsfx0x20 15, 243, 0, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_44.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7)
-	duty 2
-	unknownsfx0x10 21
-	unknownsfx0x20 15, 240, 240, 4
-	unknownsfx0x20 15, 242, 80, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_45.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6)
-	duty 2
-	unknownsfx0x20 15, 242, 192, 7
-	unknownsfx0x20 15, 0, 0, 0
-	unknownsfx0x20 15, 0, 0, 0
-	unknownsfx0x20 3, 129, 128, 7
-	unknownsfx0x20 3, 129, 0, 7
-	unknownsfx0x20 3, 129, 64, 7
-	unknownsfx0x20 3, 129, 0, 7
-	unknownsfx0x20 3, 129, 128, 7
-	unknownsfx0x20 3, 129, 0, 7
-	unknownsfx0x20 3, 129, 192, 7
-	unknownsfx0x20 3, 129, 0, 7
-	endchannel
--- a/audio/sfx/sfx_1f_46.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_1f_46_Ch1: ; 7c505 (1f:4505)
-	duty 2
-	unknownsfx0x20 4, 240, 0, 6
-	unknownsfx0x20 4, 240, 0, 4
-	unknownsfx0x20 4, 240, 0, 2
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_1f_47.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_1f_47_Ch1: ; 7c518 (1f:4518)
-	duty 2
-	unknownsfx0x20 4, 240, 0, 7
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 4, 240, 0, 7
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_1f_48.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_1f_48_Ch1: ; 7c52b (1f:452b)
-	duty 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 6
-	unknownsfx0x20 15, 183, 128, 5
-	unknownsfx0x20 15, 135, 0, 5
-	unknownsfx0x20 15, 71, 128, 4
-	unknownsfx0x20 15, 23, 0, 4
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_49.asm
+++ /dev/null
@@ -1,8 +1,0 @@
-SFX_1f_49_Ch1: ; 7c546 (1f:4546)
-	duty 2
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 2, 241, 128, 6
-	unknownsfx0x20 1, 0, 0, 0
-	unknownsfx0x20 4, 241, 128, 7
-	unknownsfx0x20 4, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_1f_4a.asm
+++ /dev/null
@@ -1,9 +1,0 @@
-SFX_1f_4a_Ch1: ; 7c55d (1f:455d)
-	duty 2
-	unknownsfx0x10 44
-	unknownsfx0x20 4, 242, 0, 5
-	unknownsfx0x10 34
-	unknownsfx0x20 2, 241, 0, 5
-	unknownsfx0x10 8
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_1f_4b.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_1f_4b_Ch1: ; 7c572 (1f:4572)
-	duty 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 5
-	unknownsfx0x20 15, 183, 128, 5
-	unknownsfx0x20 15, 135, 0, 6
-	unknownsfx0x20 15, 71, 128, 6
-	unknownsfx0x20 15, 23, 0, 7
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_4c.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_1f_4c_Ch1: ; 7c58d (1f:458d)
-	duty 1
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 215, 0, 7
-	unknownsfx0x20 15, 183, 128, 6
-	unknownsfx0x20 15, 135, 0, 6
-	unknownsfx0x20 15, 71, 128, 5
-	unknownsfx0x20 15, 23, 0, 5
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_4d.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8)
-	duty 1
-	unknownsfx0x10 22
-	unknownsfx0x20 15, 210, 0, 5
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_4e.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3)
-	duty 2
-	unknownsfx0x10 149
-	unknownsfx0x20 15, 242, 0, 4
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_4f.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_1f_4f_Ch1: ; 7c5be (1f:45be)
-	unknownnoise0x20 2, 241, 50
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 241, 34
-	unknownnoise0x20 1, 0, 0
-	endchannel
--- a/audio/sfx/sfx_1f_50.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_1f_50_Ch1: ; 7c5cb (1f:45cb)
-	unknownnoise0x20 2, 241, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 161, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 209, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 129, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 177, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 97, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 145, 18
-	unknownnoise0x20 2, 0, 0
-	unknownnoise0x20 2, 65, 18
-	unknownnoise0x20 2, 0, 0
-	endchannel
--- a/audio/sfx/sfx_1f_51.asm
+++ /dev/null
@@ -1,18 +1,0 @@
-SFX_1f_51_Ch1: ; 7c5fc (1f:45fc)
-	duty 3
-	unknownsfx0x10 90
-	unknownsfx0x20 4, 240, 0, 5
-	unknownsfx0x10 8
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
-
-
-SFX_1f_51_Ch2: ; 7c613 (1f:4613)
-	duty 3
-	unknownsfx0x20 4, 240, 1, 4
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 1, 4
-	unknownsfx0x20 1, 0, 0, 0
-	endchannel
--- a/audio/sfx/sfx_1f_52.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_1f_52_Ch1: ; 7c626 (1f:4626)
-	duty 0
-	unknownsfx0x10 23
-	unknownsfx0x20 15, 210, 0, 7
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_53.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_1f_53_Ch1: ; 7c631 (1f:4631)
-	unknownnoise0x20 4, 162, 35
-	unknownnoise0x20 8, 241, 52
-	unknownnoise0x20 15, 0, 0
-	unknownnoise0x20 2, 247, 36
-	unknownnoise0x20 2, 247, 52
-	unknownnoise0x20 4, 247, 68
-	unknownnoise0x20 8, 244, 85
-	unknownnoise0x20 8, 241, 68
-	endchannel
--- a/audio/sfx/sfx_1f_54.asm
+++ /dev/null
@@ -1,22 +1,0 @@
-SFX_1f_54_Ch1: ; 7c64a (1f:464a)
-	duty 2
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 240, 0, 5
-	unknownsfx0x20 15, 242, 0, 5
-	endchannel
-
-
-SFX_1f_54_Ch2: ; 7c669 (1f:4669)
-	duty 3
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 4, 0, 0, 0
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 240, 130, 4
-	unknownsfx0x20 15, 242, 130, 4
-	endchannel
--- a/audio/sfx/sfx_1f_55.asm
+++ /dev/null
@@ -1,12 +1,0 @@
-SFX_1f_55_Ch1: ; 7c688 (1f:4688)
-	duty 1
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 5
-	unknownsfx0x10 34
-	unknownsfx0x20 4, 226, 0, 5
-	unknownsfx0x10 58
-	unknownsfx0x20 4, 242, 0, 7
-	unknownsfx0x10 34
-	unknownsfx0x20 15, 226, 0, 7
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_56.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_1f_56_Ch1: ; 7c3ca (1f:43ca)
-	unknownnoise0x20 2, 247, 36
-	unknownnoise0x20 2, 247, 52
-	unknownnoise0x20 4, 247, 68
-	unknownnoise0x20 8, 244, 85
-	unknownnoise0x20 8, 241, 68
-	endchannel
--- a/audio/sfx/sfx_1f_57.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_1f_57_Ch1: ; 7c3da (1f:43da)
-	unknownnoise0x20 9, 241, 68
-	unknownnoise0x20 8, 209, 67
-	endchannel
--- a/audio/sfx/sfx_1f_58.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1)
-	duty 2
-	unknownsfx0x20 8, 225, 64, 7
-	endchannel
-
-
-SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8)
-	duty 2
-	unknownsfx0x20 2, 8, 0, 0
-	unknownsfx0x20 8, 177, 65, 7
-	endchannel
--- a/audio/sfx/sfx_1f_59.asm
+++ /dev/null
@@ -1,11 +1,0 @@
-SFX_1f_59_Ch1: ; 7c404 (1f:4404)
-	duty 2
-	unknownsfx0x20 4, 241, 128, 7
-	endchannel
-
-
-SFX_1f_59_Ch2: ; 7c40b (1f:440b)
-	duty 2
-	unknownsfx0x20 1, 8, 0, 0
-	unknownsfx0x20 4, 161, 97, 7
-	endchannel
--- a/audio/sfx/sfx_1f_5a.asm
+++ /dev/null
@@ -1,13 +1,0 @@
-SFX_1f_5a_Ch1: ; 7c416 (1f:4416)
-	duty 2
-	unknownsfx0x20 4, 225, 0, 7
-	unknownsfx0x20 8, 242, 224, 7
-	endchannel
-
-
-SFX_1f_5a_Ch2: ; 7c421 (1f:4421)
-	duty 2
-	unknownsfx0x20 1, 8, 0, 0
-	unknownsfx0x20 4, 145, 193, 6
-	unknownsfx0x20 8, 162, 161, 7
-	endchannel
--- a/audio/sfx/sfx_1f_5b.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_1f_5b_Ch1: ; 7c430 (1f:4430)
-	duty 2
-	unknownsfx0x10 90
-	unknownsfx0x20 15, 241, 0, 3
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_5c.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_1f_5c_Ch1: ; 7c43b (1f:443b)
-	unknownnoise0x20 2, 241, 84
-	unknownnoise0x20 12, 113, 35
-	unknownnoise0x20 2, 177, 84
-	unknownnoise0x20 12, 97, 35
-	unknownnoise0x20 6, 65, 84
-	endchannel
--- a/audio/sfx/sfx_1f_5d.asm
+++ /dev/null
@@ -1,36 +1,0 @@
-SFX_1f_5d_Ch1: ; 7c45e (1f:445e)
-	duty 2
-IF DEF(_RED)
-	unknownsfx0x20 4, 244, 0, 7
-	unknownsfx0x20 3, 228, 128, 6
-	unknownsfx0x20 3, 228, 192, 6
-	unknownsfx0x20 3, 228, 0, 7
-	unknownsfx0x20 2, 228, 160, 7
-ELSE
-	unknownsfx0x20 3, 228, 0, 6
-	unknownsfx0x20 3, 228, 128, 6
-	unknownsfx0x20 3, 228, 192, 6
-	unknownsfx0x20 3, 228, 0, 7
-	unknownsfx0x20 15, 242, 224, 7
-ENDC
-	endchannel
-
-
-SFX_1f_5d_Ch2: ; 7c475 (1f:4475)
-	duty 2
-IF DEF(_RED)
-	unknownsfx0x20 4, 8, 0, 0
-	unknownsfx0x20 3, 212, 1, 7
-	unknownsfx0x20 3, 196, 129, 6
-	unknownsfx0x20 3, 196, 193, 6
-	unknownsfx0x20 3, 196, 1, 7
-	unknownsfx0x20 2, 196, 161, 7
-ELSE
-	unknownsfx0x20 3, 8, 0, 0
-	unknownsfx0x20 3, 196, 1, 6
-	unknownsfx0x20 3, 196, 129, 6
-	unknownsfx0x20 3, 196, 193, 6
-	unknownsfx0x20 3, 196, 1, 7
-	unknownsfx0x20 15, 210, 225, 7
-ENDC
-	endchannel
--- a/audio/sfx/sfx_1f_5e.asm
+++ /dev/null
@@ -1,10 +1,0 @@
-SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5)
-	unknownnoise0x20 6, 32, 16
-	unknownnoise0x20 6, 47, 64
-	unknownnoise0x20 6, 79, 65
-	unknownnoise0x20 6, 143, 65
-	unknownnoise0x20 6, 207, 66
-	unknownnoise0x20 8, 215, 66
-	unknownnoise0x20 15, 231, 67
-	unknownnoise0x20 15, 242, 67
-	endchannel
--- a/audio/sfx/sfx_1f_5f.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_1f_5f_Ch1: ; 7c6be (1f:46be)
-	duty 2
-	unknownsfx0x10 38
-	unknownsfx0x20 12, 194, 64, 7
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_60.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9)
-	duty 2
-	unknownsfx0x10 38
-	unknownsfx0x20 12, 194, 128, 6
-	unknownsfx0x10 8
-	endchannel
--- a/audio/sfx/sfx_1f_61.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4)
-	unknownnoise0x20 2, 111, 33
-	unknownnoise0x20 2, 175, 49
-	unknownnoise0x20 15, 242, 65
-	endchannel
--- a/audio/sfx/sfx_1f_62.asm
+++ /dev/null
@@ -1,4 +1,0 @@
-SFX_1f_62_Ch1: ; 7c6de (1f:46de)
-	unknownnoise0x20 2, 210, 50
-	unknownnoise0x20 15, 242, 67
-	endchannel
--- a/audio/sfx/sfx_1f_63.asm
+++ /dev/null
@@ -1,7 +1,0 @@
-SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5)
-	unknownnoise0x20 4, 44, 32
-	unknownnoise0x20 3, 160, 32
-	unknownnoise0x20 3, 176, 33
-	unknownnoise0x20 3, 192, 34
-	unknownnoise0x20 15, 210, 36
-	endchannel
--- a/audio/sfx/sfx_1f_64.asm
+++ /dev/null
@@ -1,6 +1,0 @@
-SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5)
-	duty 2
-	unknownsfx0x20 1, 242, 160, 6
-	unknownsfx0x20 1, 242, 224, 6
-	unknownsfx0x20 8, 241, 0, 7
-	endchannel
--- a/audio/sfx/sfx_1f_65.asm
+++ /dev/null
@@ -1,5 +1,0 @@
-SFX_1f_65_Ch1: ; 7c704 (1f:4704)
-	duty 2
-	unknownsfx0x20 2, 241, 0, 7
-	unknownsfx0x20 8, 129, 224, 7
-	endchannel
--- a/audio/sfx/sfx_1f_66.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-SFX_1f_66_Ch1: ; 7c70f (1f:470f)
-	duty 3
-	unknownsfx0x20 5, 225, 0, 7
-	unknownsfx0x20 2, 225, 128, 7
-	unknownsfx0x20 15, 241, 192, 7
-	endchannel
-
-
-SFX_1f_66_Ch2: ; 7c71e (1f:471e)
-	duty 2
-	unknownsfx0x20 4, 193, 193, 6
-	unknownsfx0x20 2, 193, 65, 7
-	unknownsfx0x20 15, 209, 129, 7
-	endchannel
--- a/audio/sfx/sfx_1f_67.asm
+++ /dev/null
@@ -1,14 +1,0 @@
-SFX_1f_67_Ch1: ; 7c72d (1f:472d)
-	dutycycle 228
-	unknownsfx0x10 47
-	unknownsfx0x20 4, 64, 224, 7
-	unknownsfx0x20 4, 96, 224, 7
-	unknownsfx0x20 4, 128, 224, 7
-	unknownsfx0x20 8, 160, 224, 7
-	unknownsfx0x20 8, 160, 224, 7
-	unknownsfx0x20 8, 128, 224, 7
-	unknownsfx0x20 8, 96, 224, 7
-	unknownsfx0x20 8, 48, 224, 7
-	unknownsfx0x20 15, 18, 224, 7
-	unknownsfx0x10 8
-	endchannel
--- /dev/null
+++ b/audio/sfx/shooting_star.asm
@@ -1,0 +1,14 @@
+SFX_Shooting_Star_Ch1: ; 7c72d (1f:472d)
+	dutycycle 228
+	unknownsfx0x10 47
+	unknownsfx0x20 4, 64, 224, 7
+	unknownsfx0x20 4, 96, 224, 7
+	unknownsfx0x20 4, 128, 224, 7
+	unknownsfx0x20 8, 160, 224, 7
+	unknownsfx0x20 8, 160, 224, 7
+	unknownsfx0x20 8, 128, 224, 7
+	unknownsfx0x20 8, 96, 224, 7
+	unknownsfx0x20 8, 48, 224, 7
+	unknownsfx0x20 15, 18, 224, 7
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/shrink_1.asm
@@ -1,0 +1,10 @@
+SFX_Shrink_1_Ch1: ; 854e (2:454e)
+	duty 1
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 6
+	unknownsfx0x20 15, 183, 128, 5
+	unknownsfx0x20 15, 135, 0, 5
+	unknownsfx0x20 15, 71, 128, 4
+	unknownsfx0x20 15, 23, 0, 4
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/shrink_3.asm
@@ -1,0 +1,10 @@
+SFX_Shrink_3_Ch1: ; 7c52b (1f:452b)
+	duty 1
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 6
+	unknownsfx0x20 15, 183, 128, 5
+	unknownsfx0x20 15, 135, 0, 5
+	unknownsfx0x20 15, 71, 128, 4
+	unknownsfx0x20 15, 23, 0, 4
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/silph_scope.asm
@@ -1,0 +1,9 @@
+SFX_Silph_Scope_Ch1: ; 20412 (8:4412)
+	duty 0
+	unknownsfx0x20 0, 210, 0, 7
+	unknownsfx0x20 0, 210, 64, 7
+	unknownsfx0x20 0, 210, 128, 7
+	unknownsfx0x20 0, 210, 192, 7
+	unknownsfx0x20 10, 225, 224, 7
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/slots_new_spin.asm
@@ -1,0 +1,14 @@
+SFX_Slots_New_Spin_Ch1: ; 7c70f (1f:470f)
+	duty 3
+	unknownsfx0x20 5, 225, 0, 7
+	unknownsfx0x20 2, 225, 128, 7
+	unknownsfx0x20 15, 241, 192, 7
+	endchannel
+
+
+SFX_Slots_New_Spin_Ch2: ; 7c71e (1f:471e)
+	duty 2
+	unknownsfx0x20 4, 193, 193, 6
+	unknownsfx0x20 2, 193, 65, 7
+	unknownsfx0x20 15, 209, 129, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/slots_reward.asm
@@ -1,0 +1,5 @@
+SFX_Slots_Reward_Ch1: ; 7c704 (1f:4704)
+	duty 2
+	unknownsfx0x20 2, 241, 0, 7
+	unknownsfx0x20 8, 129, 224, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/slots_stop_wheel.asm
@@ -1,0 +1,6 @@
+SFX_Slots_Stop_Wheel_Ch1: ; 7c6f5 (1f:46f5)
+	duty 2
+	unknownsfx0x20 1, 242, 160, 6
+	unknownsfx0x20 1, 242, 224, 6
+	unknownsfx0x20 8, 241, 0, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare1_1.asm
@@ -1,0 +1,3 @@
+SFX_Snare1_1_Ch1: ; 82fd (2:42fd)
+	unknownnoise0x20 0, 193, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare1_2.asm
@@ -1,0 +1,3 @@
+SFX_Snare1_2_Ch1: ; 202fd (8:42fd)
+	unknownnoise0x20 0, 193, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare1_3.asm
@@ -1,0 +1,3 @@
+SFX_Snare1_3_Ch1: ; 7c2fd (1f:42fd)
+	unknownnoise0x20 0, 193, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare2_1.asm
@@ -1,0 +1,3 @@
+SFX_Snare2_1_Ch1: ; 8301 (2:4301)
+	unknownnoise0x20 0, 177, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare2_2.asm
@@ -1,0 +1,3 @@
+SFX_Snare2_2_Ch1: ; 20301 (8:4301)
+	unknownnoise0x20 0, 177, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare2_3.asm
@@ -1,0 +1,3 @@
+SFX_Snare2_3_Ch1: ; 7c301 (1f:4301)
+	unknownnoise0x20 0, 177, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare3_1.asm
@@ -1,0 +1,3 @@
+SFX_Snare3_1_Ch1: ; 8305 (2:4305)
+	unknownnoise0x20 0, 161, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare3_2.asm
@@ -1,0 +1,3 @@
+SFX_Snare3_2_Ch1: ; 20305 (8:4305)
+	unknownnoise0x20 0, 161, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare3_3.asm
@@ -1,0 +1,3 @@
+SFX_Snare3_3_Ch1: ; 7c305 (1f:4305)
+	unknownnoise0x20 0, 161, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare4_1.asm
@@ -1,0 +1,3 @@
+SFX_Snare4_1_Ch1: ; 8309 (2:4309)
+	unknownnoise0x20 0, 129, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare4_2.asm
@@ -1,0 +1,3 @@
+SFX_Snare4_2_Ch1: ; 20309 (8:4309)
+	unknownnoise0x20 0, 129, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare4_3.asm
@@ -1,0 +1,3 @@
+SFX_Snare4_3_Ch1: ; 7c309 (1f:4309)
+	unknownnoise0x20 0, 129, 51
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare5_1.asm
@@ -1,0 +1,8 @@
+SFX_Snare5_1_Ch1: ; 830d (2:430d)
+	unknownnoise0x20 7, 132, 55
+	unknownnoise0x20 6, 132, 54
+	unknownnoise0x20 5, 131, 53
+	unknownnoise0x20 4, 131, 52
+	unknownnoise0x20 3, 130, 51
+	unknownnoise0x20 2, 129, 50
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare5_2.asm
@@ -1,0 +1,8 @@
+SFX_Snare5_2_Ch1: ; 2030d (8:430d)
+	unknownnoise0x20 7, 132, 55
+	unknownnoise0x20 6, 132, 54
+	unknownnoise0x20 5, 131, 53
+	unknownnoise0x20 4, 131, 52
+	unknownnoise0x20 3, 130, 51
+	unknownnoise0x20 2, 129, 50
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare5_3.asm
@@ -1,0 +1,8 @@
+SFX_Snare5_3_Ch1: ; 7c30d (1f:430d)
+	unknownnoise0x20 7, 132, 55
+	unknownnoise0x20 6, 132, 54
+	unknownnoise0x20 5, 131, 53
+	unknownnoise0x20 4, 131, 52
+	unknownnoise0x20 3, 130, 51
+	unknownnoise0x20 2, 129, 50
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare6_1.asm
@@ -1,0 +1,3 @@
+SFX_Snare6_1_Ch1: ; 832b (2:432b)
+	unknownnoise0x20 0, 129, 16
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare6_2.asm
@@ -1,0 +1,3 @@
+SFX_Snare6_2_Ch1: ; 2032b (8:432b)
+	unknownnoise0x20 0, 129, 16
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare6_3.asm
@@ -1,0 +1,3 @@
+SFX_Snare6_3_Ch1: ; 7c32b (1f:432b)
+	unknownnoise0x20 0, 129, 16
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare7_1.asm
@@ -1,0 +1,3 @@
+SFX_Snare7_1_Ch1: ; 832f (2:432f)
+	unknownnoise0x20 0, 130, 35
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare7_2.asm
@@ -1,0 +1,3 @@
+SFX_Snare7_2_Ch1: ; 2032f (8:432f)
+	unknownnoise0x20 0, 130, 35
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare7_3.asm
@@ -1,0 +1,3 @@
+SFX_Snare7_3_Ch1: ; 7c32f (1f:432f)
+	unknownnoise0x20 0, 130, 35
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare8_1.asm
@@ -1,0 +1,3 @@
+SFX_Snare8_1_Ch1: ; 8333 (2:4333)
+	unknownnoise0x20 0, 130, 37
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare8_2.asm
@@ -1,0 +1,3 @@
+SFX_Snare8_2_Ch1: ; 20333 (8:4333)
+	unknownnoise0x20 0, 130, 37
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare8_3.asm
@@ -1,0 +1,3 @@
+SFX_Snare8_3_Ch1: ; 7c333 (1f:4333)
+	unknownnoise0x20 0, 130, 37
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare9_1.asm
@@ -1,0 +1,3 @@
+SFX_Snare9_1_Ch1: ; 8337 (2:4337)
+	unknownnoise0x20 0, 130, 38
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare9_2.asm
@@ -1,0 +1,3 @@
+SFX_Snare9_2_Ch1: ; 20337 (8:4337)
+	unknownnoise0x20 0, 130, 38
+	endchannel
--- /dev/null
+++ b/audio/sfx/snare9_3.asm
@@ -1,0 +1,3 @@
+SFX_Snare9_3_Ch1: ; 7c337 (1f:4337)
+	unknownnoise0x20 0, 130, 38
+	endchannel
--- /dev/null
+++ b/audio/sfx/ss_anne_horn_1.asm
@@ -1,0 +1,22 @@
+SFX_SS_Anne_Horn_1_Ch1: ; 866d (2:466d)
+	duty 2
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 242, 0, 5
+	endchannel
+
+
+SFX_SS_Anne_Horn_1_Ch2: ; 868c (2:468c)
+	duty 3
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 242, 130, 4
+	endchannel
--- /dev/null
+++ b/audio/sfx/ss_anne_horn_3.asm
@@ -1,0 +1,22 @@
+SFX_SS_Anne_Horn_3_Ch1: ; 7c64a (1f:464a)
+	duty 2
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 240, 0, 5
+	unknownsfx0x20 15, 242, 0, 5
+	endchannel
+
+
+SFX_SS_Anne_Horn_3_Ch2: ; 7c669 (1f:4669)
+	duty 3
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 240, 130, 4
+	unknownsfx0x20 15, 242, 130, 4
+	endchannel
--- /dev/null
+++ b/audio/sfx/start_menu_1.asm
@@ -1,0 +1,4 @@
+SFX_Start_Menu_1_Ch1: ; 83c3 (2:43c3)
+	unknownnoise0x20 1, 226, 51
+	unknownnoise0x20 8, 225, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/start_menu_2.asm
@@ -1,0 +1,4 @@
+SFX_Start_Menu_2_Ch1: ; 203d6 (8:43d6)
+	unknownnoise0x20 1, 226, 51
+	unknownnoise0x20 8, 225, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/start_menu_3.asm
@@ -1,0 +1,4 @@
+SFX_Start_Menu_3_Ch1: ; 7c3c3 (1f:43c3)
+	unknownnoise0x20 1, 226, 51
+	unknownnoise0x20 8, 225, 34
+	endchannel
--- /dev/null
+++ b/audio/sfx/super_effective.asm
@@ -1,0 +1,4 @@
+SFX_Super_Effective_Ch1: ; 20574 (8:4574)
+	unknownnoise0x20 4, 241, 52
+	unknownnoise0x20 15, 242, 100
+	endchannel
--- /dev/null
+++ b/audio/sfx/swap_1.asm
@@ -1,0 +1,11 @@
+SFX_Swap_1_Ch1: ; 83f8 (2:43f8)
+	duty 2
+	unknownsfx0x20 8, 225, 64, 7
+	endchannel
+
+
+SFX_Swap_1_Ch2: ; 83ff (2:43ff)
+	duty 2
+	unknownsfx0x20 2, 8, 0, 0
+	unknownsfx0x20 8, 177, 65, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/swap_3.asm
@@ -1,0 +1,11 @@
+SFX_Swap_3_Ch1: ; 7c3e1 (1f:43e1)
+	duty 2
+	unknownsfx0x20 8, 225, 64, 7
+	endchannel
+
+
+SFX_Swap_3_Ch2: ; 7c3e8 (1f:43e8)
+	duty 2
+	unknownsfx0x20 2, 8, 0, 0
+	unknownsfx0x20 8, 177, 65, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/switch_1.asm
@@ -1,0 +1,8 @@
+SFX_Switch_1_Ch1: ; 8569 (2:4569)
+	duty 2
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 2, 241, 128, 6
+	unknownsfx0x20 1, 0, 0, 0
+	unknownsfx0x20 4, 241, 128, 7
+	unknownsfx0x20 4, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/switch_3.asm
@@ -1,0 +1,8 @@
+SFX_Switch_3_Ch1: ; 7c546 (1f:4546)
+	duty 2
+	unknownsfx0x20 4, 0, 0, 0
+	unknownsfx0x20 2, 241, 128, 6
+	unknownsfx0x20 1, 0, 0, 0
+	unknownsfx0x20 4, 241, 128, 7
+	unknownsfx0x20 4, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/teleport_enter1_1.asm
@@ -1,0 +1,10 @@
+SFX_Teleport_Enter1_1_Ch1: ; 85b0 (2:45b0)
+	duty 1
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 7
+	unknownsfx0x20 15, 183, 128, 6
+	unknownsfx0x20 15, 135, 0, 6
+	unknownsfx0x20 15, 71, 128, 5
+	unknownsfx0x20 15, 23, 0, 5
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/teleport_enter1_3.asm
@@ -1,0 +1,10 @@
+SFX_Teleport_Enter1_3_Ch1: ; 7c58d (1f:458d)
+	duty 1
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 7
+	unknownsfx0x20 15, 183, 128, 6
+	unknownsfx0x20 15, 135, 0, 6
+	unknownsfx0x20 15, 71, 128, 5
+	unknownsfx0x20 15, 23, 0, 5
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/teleport_enter2_1.asm
@@ -1,0 +1,6 @@
+SFX_Teleport_Enter2_1_Ch1: ; 85e1 (2:45e1)
+	unknownnoise0x20 2, 241, 50
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 241, 34
+	unknownnoise0x20 1, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/teleport_enter2_3.asm
@@ -1,0 +1,6 @@
+SFX_Teleport_Enter2_3_Ch1: ; 7c5be (1f:45be)
+	unknownnoise0x20 2, 241, 50
+	unknownnoise0x20 2, 0, 0
+	unknownnoise0x20 2, 241, 34
+	unknownnoise0x20 1, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/teleport_exit1_1.asm
@@ -1,0 +1,10 @@
+SFX_Teleport_Exit1_1_Ch1: ; 8595 (2:4595)
+	duty 1
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 5
+	unknownsfx0x20 15, 183, 128, 5
+	unknownsfx0x20 15, 135, 0, 6
+	unknownsfx0x20 15, 71, 128, 6
+	unknownsfx0x20 15, 23, 0, 7
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/teleport_exit1_3.asm
@@ -1,0 +1,10 @@
+SFX_Teleport_Exit1_3_Ch1: ; 7c572 (1f:4572)
+	duty 1
+	unknownsfx0x10 23
+	unknownsfx0x20 15, 215, 0, 5
+	unknownsfx0x20 15, 183, 128, 5
+	unknownsfx0x20 15, 135, 0, 6
+	unknownsfx0x20 15, 71, 128, 6
+	unknownsfx0x20 15, 23, 0, 7
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/teleport_exit2_1.asm
@@ -1,0 +1,6 @@
+SFX_Teleport_Exit2_1_Ch1: ; 85cb (2:45cb)
+	duty 1
+	unknownsfx0x10 22
+	unknownsfx0x20 15, 210, 0, 5
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/teleport_exit2_3.asm
@@ -1,0 +1,6 @@
+SFX_Teleport_Exit2_3_Ch1: ; 7c5a8 (1f:45a8)
+	duty 1
+	unknownsfx0x10 22
+	unknownsfx0x20 15, 210, 0, 5
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/tink_1.asm
@@ -1,0 +1,8 @@
+SFX_Tink_1_Ch1: ; 840a (2:440a)
+	duty 2
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 2
+	unknownsfx0x10 34
+	unknownsfx0x20 8, 226, 0, 2
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/tink_2.asm
@@ -1,0 +1,8 @@
+SFX_Tink_2_Ch1: ; 203dd (8:43dd)
+	duty 2
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 2
+	unknownsfx0x10 34
+	unknownsfx0x20 8, 226, 0, 2
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/tink_3.asm
@@ -1,0 +1,8 @@
+SFX_Tink_3_Ch1: ; 7c3f3 (1f:43f3)
+	duty 2
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 2
+	unknownsfx0x10 34
+	unknownsfx0x20 8, 226, 0, 2
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/trade_machine_1.asm
@@ -1,0 +1,7 @@
+SFX_Trade_Machine_1_Ch1: ; 84ee (2:44ee)
+	duty 2
+	unknownsfx0x10 21
+	unknownsfx0x20 15, 240, 240, 4
+	unknownsfx0x20 15, 242, 80, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/trade_machine_3.asm
@@ -1,0 +1,7 @@
+SFX_Trade_Machine_3_Ch1: ; 7c4c7 (1f:44c7)
+	duty 2
+	unknownsfx0x10 21
+	unknownsfx0x20 15, 240, 240, 4
+	unknownsfx0x20 15, 242, 80, 6
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle1_1.asm
@@ -1,0 +1,3 @@
+SFX_Triangle1_1_Ch1: ; 8320 (2:4320)
+	unknownnoise0x20 0, 81, 42
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle1_2.asm
@@ -1,0 +1,3 @@
+SFX_Triangle1_2_Ch1: ; 20320 (8:4320)
+	unknownnoise0x20 0, 81, 42
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle1_3.asm
@@ -1,0 +1,3 @@
+SFX_Triangle1_3_Ch1: ; 7c320 (1f:4320)
+	unknownnoise0x20 0, 81, 42
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle2_1.asm
@@ -1,0 +1,4 @@
+SFX_Triangle2_1_Ch1: ; 8324 (2:4324)
+	unknownnoise0x20 1, 65, 43
+	unknownnoise0x20 0, 97, 42
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle2_2.asm
@@ -1,0 +1,4 @@
+SFX_Triangle2_2_Ch1: ; 20324 (8:4324)
+	unknownnoise0x20 1, 65, 43
+	unknownnoise0x20 0, 97, 42
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle2_3.asm
@@ -1,0 +1,4 @@
+SFX_Triangle2_3_Ch1: ; 7c324 (1f:4324)
+	unknownnoise0x20 1, 65, 43
+	unknownnoise0x20 0, 97, 42
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle3_1.asm
@@ -1,0 +1,4 @@
+SFX_Triangle3_1_Ch1: ; 834e (2:434e)
+	unknownnoise0x20 2, 145, 40
+	unknownnoise0x20 0, 113, 24
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle3_2.asm
@@ -1,0 +1,4 @@
+SFX_Triangle3_2_Ch1: ; 2034e (8:434e)
+	unknownnoise0x20 2, 145, 40
+	unknownnoise0x20 0, 113, 24
+	endchannel
--- /dev/null
+++ b/audio/sfx/triangle3_3.asm
@@ -1,0 +1,4 @@
+SFX_Triangle3_3_Ch1: ; 7c34e (1f:434e)
+	unknownnoise0x20 2, 145, 40
+	unknownnoise0x20 0, 113, 24
+	endchannel
--- /dev/null
+++ b/audio/sfx/turn_off_pc_1.asm
@@ -1,0 +1,7 @@
+SFX_Turn_Off_PC_1_Ch1: ; 8528 (2:4528)
+	duty 2
+	unknownsfx0x20 4, 240, 0, 6
+	unknownsfx0x20 4, 240, 0, 4
+	unknownsfx0x20 4, 240, 0, 2
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/turn_off_pc_3.asm
@@ -1,0 +1,7 @@
+SFX_Turn_Off_PC_3_Ch1: ; 7c505 (1f:4505)
+	duty 2
+	unknownsfx0x20 4, 240, 0, 6
+	unknownsfx0x20 4, 240, 0, 4
+	unknownsfx0x20 4, 240, 0, 2
+	unknownsfx0x20 1, 0, 0, 0
+	endchannel
--- /dev/null
+++ b/audio/sfx/turn_on_pc_1.asm
@@ -1,0 +1,13 @@
+SFX_Turn_On_PC_1_Ch1: ; 84fd (2:44fd)
+	duty 2
+	unknownsfx0x20 15, 242, 192, 7
+	unknownsfx0x20 15, 0, 0, 0
+	unknownsfx0x20 3, 161, 128, 7
+	unknownsfx0x20 3, 161, 0, 7
+	unknownsfx0x20 3, 161, 64, 7
+	unknownsfx0x20 3, 161, 0, 7
+	unknownsfx0x20 3, 161, 128, 7
+	unknownsfx0x20 3, 161, 0, 7
+	unknownsfx0x20 3, 161, 192, 7
+	unknownsfx0x20 8, 161, 0, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/turn_on_pc_3.asm
@@ -1,0 +1,14 @@
+SFX_Turn_On_PC_3_Ch1: ; 7c4d6 (1f:44d6)
+	duty 2
+	unknownsfx0x20 15, 242, 192, 7
+	unknownsfx0x20 15, 0, 0, 0
+	unknownsfx0x20 15, 0, 0, 0
+	unknownsfx0x20 3, 129, 128, 7
+	unknownsfx0x20 3, 129, 0, 7
+	unknownsfx0x20 3, 129, 64, 7
+	unknownsfx0x20 3, 129, 0, 7
+	unknownsfx0x20 3, 129, 128, 7
+	unknownsfx0x20 3, 129, 0, 7
+	unknownsfx0x20 3, 129, 192, 7
+	unknownsfx0x20 3, 129, 0, 7
+	endchannel
--- /dev/null
+++ b/audio/sfx/vine_whip.asm
@@ -1,0 +1,10 @@
+SFX_Vine_Whip_Ch1: ; 20533 (8:4533)
+	unknownnoise0x20 1, 194, 51
+	unknownnoise0x20 2, 242, 33
+	unknownnoise0x20 1, 226, 51
+	unknownnoise0x20 1, 194, 50
+	unknownnoise0x20 1, 146, 18
+	unknownnoise0x20 1, 178, 49
+	unknownnoise0x20 12, 145, 16
+	unknownnoise0x20 8, 242, 65
+	endchannel
--- /dev/null
+++ b/audio/sfx/withdraw_deposit_1.asm
@@ -1,0 +1,12 @@
+SFX_Withdraw_Deposit_1_Ch1: ; 86ab (2:46ab)
+	duty 1
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 5
+	unknownsfx0x10 34
+	unknownsfx0x20 4, 226, 0, 5
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 7
+	unknownsfx0x10 34
+	unknownsfx0x20 15, 226, 0, 7
+	unknownsfx0x10 8
+	endchannel
--- /dev/null
+++ b/audio/sfx/withdraw_deposit_3.asm
@@ -1,0 +1,12 @@
+SFX_Withdraw_Deposit_3_Ch1: ; 7c688 (1f:4688)
+	duty 1
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 5
+	unknownsfx0x10 34
+	unknownsfx0x20 4, 226, 0, 5
+	unknownsfx0x10 58
+	unknownsfx0x20 4, 242, 0, 7
+	unknownsfx0x10 34
+	unknownsfx0x20 15, 226, 0, 7
+	unknownsfx0x10 8
+	endchannel
--- a/constants/music_constants.asm
+++ b/constants/music_constants.asm
@@ -56,175 +56,175 @@
 	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_LEVEL_UP,           SFX_Level_Up
 
-	music_const SFX_BALL_TOSS,          SFX_08_41
-	music_const SFX_BALL_POOF,          SFX_08_42
-	music_const SFX_FAINT_THUD,         SFX_08_43
-	music_const SFX_RUN,                SFX_08_44
-	music_const SFX_DEX_PAGE_ADDED,     SFX_08_45
-	music_const SFX_CAUGHT_MON,         SFX_08_46
-	music_const SFX_PECK,               SFX_08_47
-	music_const SFX_FAINT_FALL,         SFX_08_48
-	music_const SFX_BATTLE_09,          SFX_08_49
-	music_const SFX_POUND,              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_DAMAGE,             SFX_08_50
-	music_const SFX_NOT_VERY_EFFECTIVE, 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_VINE_WHIP,          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_SUPER_EFFECTIVE,    SFX_08_5a
-	music_const SFX_BATTLE_1B,          SFX_08_5b
-	music_const SFX_BATTLE_1C,          SFX_08_5c
-	music_const SFX_DOUBLESLAP,         SFX_08_5d
-	music_const SFX_BATTLE_1E,          SFX_08_5e
-	music_const SFX_HORN_DRILL,         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_PSYBEAM,            SFX_08_6d
-	music_const SFX_BATTLE_2E,          SFX_08_6e
-	music_const SFX_BATTLE_2F,          SFX_08_6f
-	music_const SFX_PSYCHIC_M,          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_SILPH_SCOPE,        SFX_08_77
+	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
--- a/engine/hidden_object_functions7.asm
+++ b/engine/hidden_object_functions7.asm
@@ -67,7 +67,7 @@
 	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
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -1719,7 +1719,7 @@
 	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]
--- a/engine/menu/pokedex.asm
+++ b/engine/menu/pokedex.asm
@@ -139,7 +139,7 @@
 ; play pokemon cry
 .choseCry
 	ld a,[wd11e]
-	call GetCryData ; get cry data
+	call GetCryData
 	call PlaySound
 	jr .handleMenuInput
 .choseArea
--- a/engine/overworld/elevator.asm
+++ b/engine/overworld/elevator.asm
@@ -17,7 +17,7 @@
 	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 @@
 	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
--- a/engine/overworld/player_animations.asm
+++ b/engine/overworld/player_animations.asm
@@ -9,7 +9,7 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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 @@
 	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
--- a/home/init.asm
+++ b/home/init.asm
@@ -97,7 +97,7 @@
 
 	predef LoadSGB
 
-	ld a, BANK(SFX_1f_67)
+	ld a, BANK(SFX_Shooting_Star)
 	ld [wc0ef], a
 	ld [wc0f0], a
 	ld a, $9c