diff options
Diffstat (limited to 'audio/sfx')
| -rw-r--r-- | audio/sfx/59_1.asm (renamed from audio/sfx/sfx_02_59.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/59_3.asm (renamed from audio/sfx/sfx_1f_59.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/arrow_tiles_1.asm (renamed from audio/sfx/sfx_02_52.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/arrow_tiles_3.asm (renamed from audio/sfx/sfx_1f_52.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/ball_poof.asm (renamed from audio/sfx/sfx_08_42.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/ball_toss.asm (renamed from audio/sfx/sfx_08_41.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/battle_09.asm (renamed from audio/sfx/sfx_08_49.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_0b.asm (renamed from audio/sfx/sfx_08_4b.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_0c.asm (renamed from audio/sfx/sfx_08_4c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_0d.asm (renamed from audio/sfx/sfx_08_4d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_0e.asm (renamed from audio/sfx/sfx_08_4e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_0f.asm (renamed from audio/sfx/sfx_08_4f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_12.asm (renamed from audio/sfx/sfx_08_52.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/battle_13.asm (renamed from audio/sfx/sfx_08_53.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_14.asm (renamed from audio/sfx/sfx_08_54.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_16.asm (renamed from audio/sfx/sfx_08_56.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_17.asm (renamed from audio/sfx/sfx_08_57.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_18.asm (renamed from audio/sfx/sfx_08_58.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_19.asm (renamed from audio/sfx/sfx_08_59.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_1b.asm (renamed from audio/sfx/sfx_08_5b.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_1c.asm (renamed from audio/sfx/sfx_08_5c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_1e.asm (renamed from audio/sfx/sfx_08_5e.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/battle_20.asm (renamed from audio/sfx/sfx_08_60.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_21.asm (renamed from audio/sfx/sfx_08_61.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_22.asm (renamed from audio/sfx/sfx_08_62.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_23.asm (renamed from audio/sfx/sfx_08_63.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_24.asm (renamed from audio/sfx/sfx_08_64.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/battle_25.asm (renamed from audio/sfx/sfx_08_65.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_26.asm (renamed from audio/sfx/sfx_08_66.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/battle_27.asm (renamed from audio/sfx/sfx_08_67.asm) | 17 | ||||
| -rw-r--r-- | audio/sfx/battle_28.asm (renamed from audio/sfx/sfx_08_68.asm) | 13 | ||||
| -rw-r--r-- | audio/sfx/battle_29.asm (renamed from audio/sfx/sfx_08_69.asm) | 9 | ||||
| -rw-r--r-- | audio/sfx/battle_2a.asm (renamed from audio/sfx/sfx_08_6a.asm) | 13 | ||||
| -rw-r--r-- | audio/sfx/battle_2b.asm (renamed from audio/sfx/sfx_08_6b.asm) | 9 | ||||
| -rw-r--r-- | audio/sfx/battle_2c.asm (renamed from audio/sfx/sfx_08_6c.asm) | 13 | ||||
| -rw-r--r-- | audio/sfx/battle_2e.asm (renamed from audio/sfx/sfx_08_6e.asm) | 13 | ||||
| -rw-r--r-- | audio/sfx/battle_2f.asm (renamed from audio/sfx/sfx_08_6f.asm) | 13 | ||||
| -rw-r--r-- | audio/sfx/battle_31.asm (renamed from audio/sfx/sfx_08_71.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/battle_32.asm (renamed from audio/sfx/sfx_08_72.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/battle_33.asm (renamed from audio/sfx/sfx_08_73.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/battle_34.asm (renamed from audio/sfx/sfx_08_74.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/battle_35.asm (renamed from audio/sfx/sfx_08_75.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/battle_36.asm (renamed from audio/sfx/sfx_08_76.asm) | 15 | ||||
| -rw-r--r-- | audio/sfx/caught_mon.asm (renamed from audio/sfx/sfx_08_46.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/collision_1.asm (renamed from audio/sfx/sfx_02_5b.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/collision_3.asm (renamed from audio/sfx/sfx_1f_5b.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cry00_1.asm (renamed from audio/sfx/sfx_02_14.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry00_2.asm (renamed from audio/sfx/sfx_08_14.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry00_3.asm (renamed from audio/sfx/sfx_1f_14.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry01_1.asm (renamed from audio/sfx/sfx_02_15.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry01_2.asm (renamed from audio/sfx/sfx_08_15.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry01_3.asm (renamed from audio/sfx/sfx_1f_15.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry02_1.asm (renamed from audio/sfx/sfx_02_16.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry02_2.asm (renamed from audio/sfx/sfx_08_16.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry02_3.asm (renamed from audio/sfx/sfx_1f_16.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry03_1.asm (renamed from audio/sfx/sfx_02_17.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry03_2.asm (renamed from audio/sfx/sfx_08_17.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry03_3.asm (renamed from audio/sfx/sfx_1f_17.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry04_1.asm (renamed from audio/sfx/sfx_02_18.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry04_2.asm (renamed from audio/sfx/sfx_08_18.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry04_3.asm (renamed from audio/sfx/sfx_1f_18.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry05_1.asm (renamed from audio/sfx/sfx_02_19.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry05_2.asm (renamed from audio/sfx/sfx_08_19.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry05_3.asm (renamed from audio/sfx/sfx_1f_19.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry06_1.asm (renamed from audio/sfx/sfx_02_1a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry06_2.asm (renamed from audio/sfx/sfx_08_1a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry06_3.asm (renamed from audio/sfx/sfx_1f_1a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry07_1.asm (renamed from audio/sfx/sfx_02_1b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry07_2.asm (renamed from audio/sfx/sfx_08_1b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry07_3.asm (renamed from audio/sfx/sfx_1f_1b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry08_1.asm (renamed from audio/sfx/sfx_02_1c.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry08_2.asm (renamed from audio/sfx/sfx_08_1c.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry08_3.asm (renamed from audio/sfx/sfx_1f_1c.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry09_1.asm (renamed from audio/sfx/sfx_02_1d.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry09_2.asm (renamed from audio/sfx/sfx_08_1d.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry09_3.asm (renamed from audio/sfx/sfx_1f_1d.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0a_1.asm (renamed from audio/sfx/sfx_02_1e.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0a_2.asm (renamed from audio/sfx/sfx_08_1e.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0a_3.asm (renamed from audio/sfx/sfx_1f_1e.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0b_1.asm (renamed from audio/sfx/sfx_02_1f.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0b_2.asm (renamed from audio/sfx/sfx_08_1f.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0b_3.asm (renamed from audio/sfx/sfx_1f_1f.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0c_1.asm (renamed from audio/sfx/sfx_02_20.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0c_2.asm (renamed from audio/sfx/sfx_08_20.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0c_3.asm (renamed from audio/sfx/sfx_1f_20.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0d_1.asm (renamed from audio/sfx/sfx_02_21.asm) | 9 | ||||
| -rw-r--r-- | audio/sfx/cry0d_2.asm (renamed from audio/sfx/sfx_08_21.asm) | 9 | ||||
| -rw-r--r-- | audio/sfx/cry0d_3.asm (renamed from audio/sfx/sfx_1f_21.asm) | 9 | ||||
| -rw-r--r-- | audio/sfx/cry0e_1.asm (renamed from audio/sfx/sfx_02_22.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0e_2.asm (renamed from audio/sfx/sfx_08_22.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0e_3.asm (renamed from audio/sfx/sfx_1f_22.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0f_1.asm (renamed from audio/sfx/sfx_02_23.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0f_2.asm (renamed from audio/sfx/sfx_08_23.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry0f_3.asm (renamed from audio/sfx/sfx_1f_23.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry10_1.asm (renamed from audio/sfx/sfx_02_24.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry10_2.asm (renamed from audio/sfx/sfx_08_24.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry10_3.asm (renamed from audio/sfx/sfx_1f_24.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry11_1.asm (renamed from audio/sfx/sfx_02_25.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry11_2.asm (renamed from audio/sfx/sfx_08_25.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry11_3.asm (renamed from audio/sfx/sfx_1f_25.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry12_1.asm (renamed from audio/sfx/sfx_02_26.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry12_2.asm (renamed from audio/sfx/sfx_08_26.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry12_3.asm (renamed from audio/sfx/sfx_1f_26.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry13_1.asm (renamed from audio/sfx/sfx_02_27.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry13_2.asm (renamed from audio/sfx/sfx_08_27.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry13_3.asm (renamed from audio/sfx/sfx_1f_27.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry14_1.asm (renamed from audio/sfx/sfx_02_28.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry14_2.asm (renamed from audio/sfx/sfx_08_28.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry14_3.asm (renamed from audio/sfx/sfx_1f_28.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry15_1.asm (renamed from audio/sfx/sfx_02_29.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry15_2.asm (renamed from audio/sfx/sfx_08_29.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry15_3.asm (renamed from audio/sfx/sfx_1f_29.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry16_1.asm (renamed from audio/sfx/sfx_02_2a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry16_2.asm (renamed from audio/sfx/sfx_08_2a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry16_3.asm (renamed from audio/sfx/sfx_1f_2a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry17_1.asm (renamed from audio/sfx/sfx_02_2b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry17_2.asm (renamed from audio/sfx/sfx_08_2b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry17_3.asm (renamed from audio/sfx/sfx_1f_2b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry18_1.asm (renamed from audio/sfx/sfx_02_2c.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry18_2.asm (renamed from audio/sfx/sfx_08_2c.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry18_3.asm (renamed from audio/sfx/sfx_1f_2c.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry19_1.asm (renamed from audio/sfx/sfx_02_2d.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry19_2.asm (renamed from audio/sfx/sfx_08_2d.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry19_3.asm (renamed from audio/sfx/sfx_1f_2d.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1a_1.asm (renamed from audio/sfx/sfx_02_2e.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1a_2.asm (renamed from audio/sfx/sfx_08_2e.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1a_3.asm (renamed from audio/sfx/sfx_1f_2e.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1b_1.asm (renamed from audio/sfx/sfx_02_2f.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1b_2.asm (renamed from audio/sfx/sfx_08_2f.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1b_3.asm (renamed from audio/sfx/sfx_1f_2f.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1c_1.asm (renamed from audio/sfx/sfx_02_30.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1c_2.asm (renamed from audio/sfx/sfx_08_30.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1c_3.asm (renamed from audio/sfx/sfx_1f_30.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1d_1.asm (renamed from audio/sfx/sfx_02_31.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1d_2.asm (renamed from audio/sfx/sfx_08_31.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1d_3.asm (renamed from audio/sfx/sfx_1f_31.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1e_1.asm (renamed from audio/sfx/sfx_02_32.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1e_2.asm (renamed from audio/sfx/sfx_08_32.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1e_3.asm (renamed from audio/sfx/sfx_1f_32.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1f_1.asm (renamed from audio/sfx/sfx_02_33.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1f_2.asm (renamed from audio/sfx/sfx_08_33.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry1f_3.asm (renamed from audio/sfx/sfx_1f_33.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry20_1.asm (renamed from audio/sfx/sfx_02_34.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry20_2.asm (renamed from audio/sfx/sfx_08_34.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry20_3.asm (renamed from audio/sfx/sfx_1f_34.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry21_1.asm (renamed from audio/sfx/sfx_02_35.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry21_2.asm (renamed from audio/sfx/sfx_08_35.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry21_3.asm (renamed from audio/sfx/sfx_1f_35.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry22_1.asm (renamed from audio/sfx/sfx_02_36.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry22_2.asm (renamed from audio/sfx/sfx_08_36.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry22_3.asm (renamed from audio/sfx/sfx_1f_36.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry23_1.asm (renamed from audio/sfx/sfx_02_37.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry23_2.asm (renamed from audio/sfx/sfx_08_37.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry23_3.asm (renamed from audio/sfx/sfx_1f_37.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry24_1.asm (renamed from audio/sfx/sfx_02_38.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry24_2.asm (renamed from audio/sfx/sfx_08_38.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry24_3.asm (renamed from audio/sfx/sfx_1f_38.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry25_1.asm (renamed from audio/sfx/sfx_02_39.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry25_2.asm (renamed from audio/sfx/sfx_08_39.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cry25_3.asm (renamed from audio/sfx/sfx_1f_39.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/cut_1.asm (renamed from audio/sfx/sfx_02_56.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cut_3.asm (renamed from audio/sfx/sfx_1f_56.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal1_1.asm (renamed from audio/sfx/sfx_02_0c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal1_2.asm (renamed from audio/sfx/sfx_08_0c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal1_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal2_1.asm (renamed from audio/sfx/sfx_02_0d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal2_2.asm (renamed from audio/sfx/sfx_08_0d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal2_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal3_1.asm (renamed from audio/sfx/sfx_02_0e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal3_2.asm (renamed from audio/sfx/sfx_08_0e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/cymbal3_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/damage.asm (renamed from audio/sfx/sfx_08_50.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/denied_1.asm (renamed from audio/sfx/sfx_02_51.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/denied_3.asm (renamed from audio/sfx/sfx_1f_51.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/dex_page_added.asm (renamed from audio/sfx/sfx_08_45.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/doubleslap.asm (renamed from audio/sfx/sfx_08_5d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/enter_pc_1.asm (renamed from audio/sfx/sfx_02_47.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/enter_pc_3.asm (renamed from audio/sfx/sfx_1f_47.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/faint_fall.asm (renamed from audio/sfx/sfx_08_48.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/faint_thud.asm (renamed from audio/sfx/sfx_08_43.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/fly_1.asm (renamed from audio/sfx/sfx_02_50.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/fly_3.asm (renamed from audio/sfx/sfx_1f_50.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/get_item1_1.asm (renamed from audio/sfx/sfx_02_3a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/get_item1_3.asm (renamed from audio/sfx/sfx_1f_3a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/get_item2_1.asm (renamed from audio/sfx/sfx_02_3b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/get_item2_2.asm (renamed from audio/sfx/sfx_08_3b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/get_item2_3.asm (renamed from audio/sfx/sfx_1f_3b.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/get_key_item_1.asm (renamed from audio/sfx/sfx_02_42.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/get_key_item_3.asm (renamed from audio/sfx/sfx_1f_42.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/go_inside_1.asm (renamed from audio/sfx/sfx_02_57.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/go_inside_3.asm (renamed from audio/sfx/sfx_1f_57.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/go_outside_1.asm (renamed from audio/sfx/sfx_02_5c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/go_outside_3.asm (renamed from audio/sfx/sfx_1f_5c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/heal_ailment_1.asm (renamed from audio/sfx/sfx_02_3e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/heal_ailment_2.asm (renamed from audio/sfx/sfx_08_3e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/heal_ailment_3.asm (renamed from audio/sfx/sfx_1f_3e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/heal_hp_1.asm (renamed from audio/sfx/sfx_02_3d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/heal_hp_2.asm (renamed from audio/sfx/sfx_08_3d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/heal_hp_3.asm (renamed from audio/sfx/sfx_1f_3d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/healing_machine_1.asm (renamed from audio/sfx/sfx_02_4a.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/healing_machine_3.asm (renamed from audio/sfx/sfx_1f_4a.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/horn_drill.asm (renamed from audio/sfx/sfx_08_5f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/intro_crash.asm (renamed from audio/sfx/sfx_1f_62.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/intro_hip.asm (renamed from audio/sfx/sfx_1f_5f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/intro_hop.asm (renamed from audio/sfx/sfx_1f_60.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/intro_lunge.asm (renamed from audio/sfx/sfx_1f_5e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/intro_raise.asm (renamed from audio/sfx/sfx_1f_61.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/intro_whoosh.asm (renamed from audio/sfx/sfx_1f_63.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/ledge_1.asm (renamed from audio/sfx/sfx_02_4e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/ledge_3.asm (renamed from audio/sfx/sfx_1f_4e.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/level_up.asm (renamed from audio/sfx/sfx_08_3a.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/muted_snare1_1.asm (renamed from audio/sfx/sfx_02_0f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare1_2.asm (renamed from audio/sfx/sfx_08_0f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare1_3.asm (renamed from audio/sfx/sfx_1f_0f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare2_1.asm (renamed from audio/sfx/sfx_02_11.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare2_2.asm (renamed from audio/sfx/sfx_08_11.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare2_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare3_1.asm (renamed from audio/sfx/sfx_02_12.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare3_2.asm (renamed from audio/sfx/sfx_08_12.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare3_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare4_1.asm (renamed from audio/sfx/sfx_02_13.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare4_2.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/muted_snare4_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/not_very_effective.asm (renamed from audio/sfx/sfx_08_51.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/peck.asm (renamed from audio/sfx/sfx_08_47.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/poisoned_1.asm (renamed from audio/sfx/sfx_02_43.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/poisoned_3.asm (renamed from audio/sfx/sfx_1f_43.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/pokedex_rating_1.asm (renamed from audio/sfx/sfx_02_41.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/pokedex_rating_3.asm (renamed from audio/sfx/sfx_1f_41.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/pokeflute.asm (renamed from audio/sfx/sfx_02_5e.asm) | 3 | ||||
| -rwxr-xr-x | audio/sfx/pokeflute_ch4_ch5.asm (renamed from audio/sfx/sfx_08_pokeflute.asm) | 5 | ||||
| -rwxr-xr-x | audio/sfx/pokeflute_ch6.asm (renamed from audio/sfx/sfx_08_pokeflute_ch3.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/pound.asm (renamed from audio/sfx/sfx_08_4a.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/press_ab_1.asm (renamed from audio/sfx/sfx_02_40.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/press_ab_2.asm (renamed from audio/sfx/sfx_08_40.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/press_ab_3.asm (renamed from audio/sfx/sfx_1f_40.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/psybeam.asm (renamed from audio/sfx/sfx_08_6d.asm) | 13 | ||||
| -rw-r--r-- | audio/sfx/psychic_m.asm (renamed from audio/sfx/sfx_08_70.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/purchase_1.asm (renamed from audio/sfx/sfx_02_5a.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/purchase_3.asm (renamed from audio/sfx/sfx_1f_5a.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/push_boulder_1.asm (renamed from audio/sfx/sfx_02_53.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/push_boulder_3.asm (renamed from audio/sfx/sfx_1f_53.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/run.asm (renamed from audio/sfx/sfx_08_44.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/safari_zone_pa.asm (renamed from audio/sfx/sfx_02_5f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/save_1.asm (renamed from audio/sfx/sfx_02_5d.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/save_3.asm (renamed from audio/sfx/sfx_1f_5d.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/sfx_08_06.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_08_13.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_01.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_02.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_03.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_04.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_06.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_08.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_09.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_0a.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_0b.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_0c.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_0d.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_0e.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_11.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_12.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/sfx_1f_13.asm | 4 | ||||
| -rw-r--r-- | audio/sfx/shooting_star.asm (renamed from audio/sfx/sfx_1f_67.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/shrink_1.asm (renamed from audio/sfx/sfx_02_48.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/shrink_3.asm (renamed from audio/sfx/sfx_1f_48.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/silph_scope.asm (renamed from audio/sfx/sfx_08_77.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/slots_new_spin.asm (renamed from audio/sfx/sfx_1f_66.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/slots_reward.asm (renamed from audio/sfx/sfx_1f_65.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/slots_stop_wheel.asm (renamed from audio/sfx/sfx_1f_64.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare1_1.asm (renamed from audio/sfx/sfx_02_01.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare1_2.asm (renamed from audio/sfx/sfx_08_01.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare1_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/snare2_1.asm (renamed from audio/sfx/sfx_02_02.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare2_2.asm (renamed from audio/sfx/sfx_08_02.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare2_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/snare3_1.asm (renamed from audio/sfx/sfx_02_03.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare3_2.asm (renamed from audio/sfx/sfx_08_03.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare3_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/snare4_1.asm (renamed from audio/sfx/sfx_02_04.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare4_2.asm (renamed from audio/sfx/sfx_08_04.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare4_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/snare5_1.asm (renamed from audio/sfx/sfx_02_05.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare5_2.asm (renamed from audio/sfx/sfx_08_05.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare5_3.asm (renamed from audio/sfx/sfx_1f_05.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare6_1.asm (renamed from audio/sfx/sfx_02_08.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare6_2.asm (renamed from audio/sfx/sfx_08_08.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare6_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/snare7_1.asm (renamed from audio/sfx/sfx_02_09.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare7_2.asm (renamed from audio/sfx/sfx_08_09.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare7_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/snare8_1.asm (renamed from audio/sfx/sfx_02_0a.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare8_2.asm (renamed from audio/sfx/sfx_08_0a.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare8_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/snare9_1.asm (renamed from audio/sfx/sfx_02_0b.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare9_2.asm (renamed from audio/sfx/sfx_08_0b.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/snare9_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/ss_anne_horn_1.asm (renamed from audio/sfx/sfx_02_54.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/ss_anne_horn_3.asm (renamed from audio/sfx/sfx_1f_54.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/start_menu_1.asm (renamed from audio/sfx/sfx_02_3f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/start_menu_2.asm (renamed from audio/sfx/sfx_08_3f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/start_menu_3.asm (renamed from audio/sfx/sfx_1f_3f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/super_effective.asm (renamed from audio/sfx/sfx_08_5a.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/swap_1.asm (renamed from audio/sfx/sfx_02_58.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/swap_3.asm (renamed from audio/sfx/sfx_1f_58.asm) | 5 | ||||
| -rw-r--r-- | audio/sfx/switch_1.asm (renamed from audio/sfx/sfx_02_49.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/switch_3.asm (renamed from audio/sfx/sfx_1f_49.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/teleport_enter1_1.asm (renamed from audio/sfx/sfx_02_4c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/teleport_enter1_3.asm (renamed from audio/sfx/sfx_1f_4c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/teleport_enter2_1.asm (renamed from audio/sfx/sfx_02_4f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/teleport_enter2_3.asm (renamed from audio/sfx/sfx_1f_4f.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/teleport_exit1_1.asm (renamed from audio/sfx/sfx_02_4b.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/teleport_exit1_3.asm (renamed from audio/sfx/sfx_1f_4b.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/teleport_exit2_1.asm (renamed from audio/sfx/sfx_02_4d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/teleport_exit2_3.asm (renamed from audio/sfx/sfx_1f_4d.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/tink_1.asm (renamed from audio/sfx/sfx_02_3c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/tink_2.asm (renamed from audio/sfx/sfx_08_3c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/tink_3.asm (renamed from audio/sfx/sfx_1f_3c.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/trade_machine_1.asm (renamed from audio/sfx/sfx_02_44.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/trade_machine_3.asm (renamed from audio/sfx/sfx_1f_44.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle1_1.asm (renamed from audio/sfx/sfx_02_06.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle1_2.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle1_3.asm | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle2_1.asm (renamed from audio/sfx/sfx_02_07.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle2_2.asm (renamed from audio/sfx/sfx_08_07.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle2_3.asm (renamed from audio/sfx/sfx_1f_07.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle3_1.asm (renamed from audio/sfx/sfx_02_10.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle3_2.asm (renamed from audio/sfx/sfx_08_10.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/triangle3_3.asm (renamed from audio/sfx/sfx_1f_10.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/turn_off_pc_1.asm (renamed from audio/sfx/sfx_02_46.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/turn_off_pc_3.asm (renamed from audio/sfx/sfx_1f_46.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/turn_on_pc_1.asm (renamed from audio/sfx/sfx_02_45.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/turn_on_pc_3.asm (renamed from audio/sfx/sfx_1f_45.asm) | 3 | ||||
| -rwxr-xr-x | audio/sfx/unused2_2.asm (renamed from audio/sfx/sfx_08_unused2.asm) | 7 | ||||
| -rwxr-xr-x[-rw-r--r--] | audio/sfx/unused_1.asm (renamed from audio/sfx/sfx_02_unused.asm) | 7 | ||||
| -rwxr-xr-x | audio/sfx/unused_2.asm (renamed from audio/sfx/sfx_08_unused.asm) | 7 | ||||
| -rwxr-xr-x | audio/sfx/unused_3.asm (renamed from audio/sfx/sfx_1f_unused.asm) | 7 | ||||
| -rw-r--r-- | audio/sfx/vine_whip.asm (renamed from audio/sfx/sfx_08_55.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/withdraw_deposit_1.asm (renamed from audio/sfx/sfx_02_55.asm) | 3 | ||||
| -rw-r--r-- | audio/sfx/withdraw_deposit_3.asm (renamed from audio/sfx/sfx_1f_55.asm) | 3 |
340 files changed, 698 insertions, 1021 deletions
diff --git a/audio/sfx/sfx_02_59.asm b/audio/sfx/59_1.asm index a4985d1f..f36f9e1e 100644 --- a/audio/sfx/sfx_02_59.asm +++ b/audio/sfx/59_1.asm @@ -1,12 +1,11 @@ -SFX_02_59_Ch1: ; 841b (2:441b) +SFX_59_1_Ch4: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_02_59_Ch2: ; 8422 (2:4422) +SFX_59_1_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 endchannel -; 0x842d
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_59.asm b/audio/sfx/59_3.asm index a50d05c0..559318ba 100644 --- a/audio/sfx/sfx_1f_59.asm +++ b/audio/sfx/59_3.asm @@ -1,12 +1,11 @@ -SFX_1f_59_Ch1: ; 7c404 (1f:4404) +SFX_59_3_Ch4: duty 2 unknownsfx0x20 4, 241, 128, 7 endchannel -SFX_1f_59_Ch2: ; 7c40b (1f:440b) +SFX_59_3_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 161, 97, 7 endchannel -; 0x7c416
\ No newline at end of file diff --git a/audio/sfx/sfx_02_52.asm b/audio/sfx/arrow_tiles_1.asm index 9534b08d..c9ef1564 100644 --- a/audio/sfx/sfx_02_52.asm +++ b/audio/sfx/arrow_tiles_1.asm @@ -1,7 +1,6 @@ -SFX_02_52_Ch1: ; 8649 (2:4649) +SFX_Arrow_Tiles_1_Ch4: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 unknownsfx0x10 8 endchannel -; 0x8654
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_52.asm b/audio/sfx/arrow_tiles_3.asm index 6fa9eaa2..f88b9c83 100644 --- a/audio/sfx/sfx_1f_52.asm +++ b/audio/sfx/arrow_tiles_3.asm @@ -1,7 +1,6 @@ -SFX_1f_52_Ch1: ; 7c626 (1f:4626) +SFX_Arrow_Tiles_3_Ch4: duty 0 unknownsfx0x10 23 unknownsfx0x20 15, 210, 0, 7 unknownsfx0x10 8 endchannel -; 0x7c631
\ No newline at end of file diff --git a/audio/sfx/sfx_08_42.asm b/audio/sfx/ball_poof.asm index 43232843..7068c66c 100644 --- a/audio/sfx/sfx_08_42.asm +++ b/audio/sfx/ball_poof.asm @@ -1,4 +1,4 @@ -SFX_08_42_Ch1: ; 2043d (8:443d) +SFX_Ball_Poof_Ch4: duty 2 unknownsfx0x10 22 unknownsfx0x20 15, 242, 0, 4 @@ -6,7 +6,6 @@ SFX_08_42_Ch1: ; 2043d (8:443d) endchannel -SFX_08_42_Ch2: ; 20448 (8:4448) +SFX_Ball_Poof_Ch7: unknownnoise0x20 15, 162, 34 endchannel -; 0x2044c
\ No newline at end of file diff --git a/audio/sfx/sfx_08_41.asm b/audio/sfx/ball_toss.asm index f4825bb4..e9beac77 100644 --- a/audio/sfx/sfx_08_41.asm +++ b/audio/sfx/ball_toss.asm @@ -1,12 +1,11 @@ -SFX_08_41_Ch1: ; 2042d (8:442d) +SFX_Ball_Toss_Ch4: duty 2 unknownsfx0x10 47 unknownsfx0x20 15, 242, 128, 7 endchannel -SFX_08_41_Ch2: ; 20436 (8:4436) +SFX_Ball_Toss_Ch5: duty 2 unknownsfx0x20 15, 194, 130, 7 endchannel -; 0x2043d
\ No newline at end of file diff --git a/audio/sfx/sfx_08_49.asm b/audio/sfx/battle_09.asm index 6219a615..11f156cb 100644 --- a/audio/sfx/sfx_08_49.asm +++ b/audio/sfx/battle_09.asm @@ -1,7 +1,6 @@ -SFX_08_49_Ch1: ; 204b9 (8:44b9) +SFX_Battle_09_Ch4: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 5 unknownsfx0x10 8 endchannel -; 0x204c4
\ No newline at end of file diff --git a/audio/sfx/sfx_08_4b.asm b/audio/sfx/battle_0b.asm index 980af0c9..d6feba8e 100644 --- a/audio/sfx/sfx_08_4b.asm +++ b/audio/sfx/battle_0b.asm @@ -1,4 +1,3 @@ -SFX_08_4b_Ch1: ; 204c8 (8:44c8) +SFX_Battle_0B_Ch7: unknownnoise0x20 8, 241, 84 endchannel -; 0x204cc
\ No newline at end of file diff --git a/audio/sfx/sfx_08_4c.asm b/audio/sfx/battle_0c.asm index f7f32305..f193fc20 100644 --- a/audio/sfx/sfx_08_4c.asm +++ b/audio/sfx/battle_0c.asm @@ -1,6 +1,5 @@ -SFX_08_4c_Ch1: ; 204cc (8:44cc) +SFX_Battle_0C_Ch7: unknownnoise0x20 15, 143, 17 unknownnoise0x20 4, 255, 18 unknownnoise0x20 10, 241, 85 endchannel -; 0x204d6
\ No newline at end of file diff --git a/audio/sfx/sfx_08_4d.asm b/audio/sfx/battle_0d.asm index da4fa223..f9d423ad 100644 --- a/audio/sfx/sfx_08_4d.asm +++ b/audio/sfx/battle_0d.asm @@ -1,6 +1,5 @@ -SFX_08_4d_Ch1: ; 204d6 (8:44d6) +SFX_Battle_0D_Ch7: unknownnoise0x20 15, 143, 52 unknownnoise0x20 8, 242, 53 unknownnoise0x20 10, 241, 85 endchannel -; 0x204e0
\ No newline at end of file diff --git a/audio/sfx/sfx_08_4e.asm b/audio/sfx/battle_0e.asm index f371f7ee..92a660b2 100644 --- a/audio/sfx/sfx_08_4e.asm +++ b/audio/sfx/battle_0e.asm @@ -1,5 +1,4 @@ -SFX_08_4e_Ch1: ; 204e0 (8:44e0) +SFX_Battle_0E_Ch7: unknownnoise0x20 15, 159, 35 unknownnoise0x20 8, 241, 33 endchannel -; 0x204e7
\ No newline at end of file diff --git a/audio/sfx/sfx_08_4f.asm b/audio/sfx/battle_0f.asm index 3200b9aa..846a9053 100644 --- a/audio/sfx/sfx_08_4f.asm +++ b/audio/sfx/battle_0f.asm @@ -1,7 +1,6 @@ -SFX_08_4f_Ch1: ; 204e7 (8:44e7) +SFX_Battle_0F_Ch7: unknownnoise0x20 2, 225, 75 unknownnoise0x20 10, 241, 68 unknownnoise0x20 2, 225, 58 unknownnoise0x20 6, 241, 52 endchannel -; 0x204f4
\ No newline at end of file diff --git a/audio/sfx/sfx_08_52.asm b/audio/sfx/battle_12.asm index d5ca41b6..77be75c0 100644 --- a/audio/sfx/sfx_08_52.asm +++ b/audio/sfx/battle_12.asm @@ -1,7 +1,6 @@ -SFX_08_52_Ch1: ; 2050b (8:450b) +SFX_Battle_12_Ch7: unknownnoise0x20 8, 79, 35 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 - loopchannel 4, SFX_08_52_Ch1 + loopchannel 4, SFX_Battle_12_Ch7 endchannel -; 0x20519
\ No newline at end of file diff --git a/audio/sfx/sfx_08_53.asm b/audio/sfx/battle_13.asm index 07215881..81e1a0ef 100644 --- a/audio/sfx/sfx_08_53.asm +++ b/audio/sfx/battle_13.asm @@ -1,7 +1,6 @@ -SFX_08_53_Ch1: ; 20519 (8:4519) +SFX_Battle_13_Ch7: unknownnoise0x20 8, 79, 51 unknownnoise0x20 4, 196, 34 unknownnoise0x20 6, 242, 35 unknownnoise0x20 15, 242, 34 endchannel -; 0x20526
\ No newline at end of file diff --git a/audio/sfx/sfx_08_54.asm b/audio/sfx/battle_14.asm index 019cb3a1..8cecfb37 100644 --- a/audio/sfx/sfx_08_54.asm +++ b/audio/sfx/battle_14.asm @@ -1,7 +1,6 @@ -SFX_08_54_Ch1: ; 20526 (8:4526) +SFX_Battle_14_Ch7: unknownnoise0x20 8, 255, 50 unknownnoise0x20 8, 244, 67 unknownnoise0x20 8, 242, 84 unknownnoise0x20 8, 241, 101 endchannel -; 0x20533
\ No newline at end of file diff --git a/audio/sfx/sfx_08_56.asm b/audio/sfx/battle_16.asm index 05d62e90..dcc7014d 100644 --- a/audio/sfx/sfx_08_56.asm +++ b/audio/sfx/battle_16.asm @@ -1,6 +1,5 @@ -SFX_08_56_Ch1: ; 2054c (8:454c) +SFX_Battle_16_Ch7: unknownnoise0x20 1, 148, 35 unknownnoise0x20 1, 180, 34 unknownnoise0x20 8, 241, 68 endchannel -; 0x20556
\ No newline at end of file diff --git a/audio/sfx/sfx_08_57.asm b/audio/sfx/battle_17.asm index d8fa8880..82bb2117 100644 --- a/audio/sfx/sfx_08_57.asm +++ b/audio/sfx/battle_17.asm @@ -1,7 +1,6 @@ -SFX_08_57_Ch1: ; 20556 (8:4556) +SFX_Battle_17_Ch7: unknownnoise0x20 2, 148, 51 unknownnoise0x20 4, 180, 34 unknownnoise0x20 4, 241, 68 unknownnoise0x20 8, 241, 85 endchannel -; 0x20563
\ No newline at end of file diff --git a/audio/sfx/sfx_08_58.asm b/audio/sfx/battle_18.asm index 66a07ba4..14aac5c1 100644 --- a/audio/sfx/sfx_08_58.asm +++ b/audio/sfx/battle_18.asm @@ -1,5 +1,4 @@ -SFX_08_58_Ch1: ; 20563 (8:4563) +SFX_Battle_18_Ch7: unknownnoise0x20 4, 255, 85 unknownnoise0x20 8, 241, 101 endchannel -; 0x2056a
\ No newline at end of file diff --git a/audio/sfx/sfx_08_59.asm b/audio/sfx/battle_19.asm index b67845d6..6bc1804d 100644 --- a/audio/sfx/sfx_08_59.asm +++ b/audio/sfx/battle_19.asm @@ -1,6 +1,5 @@ -SFX_08_59_Ch1: ; 2056a (8:456a) +SFX_Battle_19_Ch7: unknownnoise0x20 2, 132, 67 unknownnoise0x20 2, 196, 34 unknownnoise0x20 8, 242, 52 endchannel -; 0x20574
\ No newline at end of file diff --git a/audio/sfx/sfx_08_5b.asm b/audio/sfx/battle_1b.asm index 2a1cc2fa..a4d8992b 100644 --- a/audio/sfx/sfx_08_5b.asm +++ b/audio/sfx/battle_1b.asm @@ -1,5 +1,4 @@ -SFX_08_5b_Ch1: ; 2057b (8:457b) +SFX_Battle_1B_Ch7: unknownnoise0x20 2, 241, 34 unknownnoise0x20 15, 242, 18 endchannel -; 0x20582
\ No newline at end of file diff --git a/audio/sfx/sfx_08_5c.asm b/audio/sfx/battle_1c.asm index f395fa7e..05cdd091 100644 --- a/audio/sfx/sfx_08_5c.asm +++ b/audio/sfx/battle_1c.asm @@ -1,6 +1,5 @@ -SFX_08_5c_Ch1: ; 20582 (8:4582) +SFX_Battle_1C_Ch7: unknownnoise0x20 2, 194, 1 unknownnoise0x20 15, 244, 1 unknownnoise0x20 15, 242, 1 endchannel -; 0x2058c
\ No newline at end of file diff --git a/audio/sfx/sfx_08_5e.asm b/audio/sfx/battle_1e.asm index 24159908..8d3f4745 100644 --- a/audio/sfx/sfx_08_5e.asm +++ b/audio/sfx/battle_1e.asm @@ -1,4 +1,4 @@ -SFX_08_5e_Ch1: ; 20593 (8:4593) +SFX_Battle_1E_Ch4: duty 0 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -8,10 +8,9 @@ SFX_08_5e_Ch1: ; 20593 (8:4593) endchannel -SFX_08_5e_Ch2: ; 205a4 (8:45a4) +SFX_Battle_1E_Ch7: unknownnoise0x20 0, 209, 66 unknownnoise0x20 4, 161, 50 unknownnoise0x20 0, 209, 34 unknownnoise0x20 6, 161, 50 endchannel -; 0x205b1
\ No newline at end of file diff --git a/audio/sfx/sfx_08_60.asm b/audio/sfx/battle_20.asm index fcf2bb8b..f7413e63 100644 --- a/audio/sfx/sfx_08_60.asm +++ b/audio/sfx/battle_20.asm @@ -1,5 +1,4 @@ -SFX_08_60_Ch1: ; 205be (8:45be) +SFX_Battle_20_Ch7: unknownnoise0x20 12, 241, 84 unknownnoise0x20 8, 241, 100 endchannel -; 0x205c5
\ No newline at end of file diff --git a/audio/sfx/sfx_08_61.asm b/audio/sfx/battle_21.asm index 39c12c1e..a6b63a6c 100644 --- a/audio/sfx/sfx_08_61.asm +++ b/audio/sfx/battle_21.asm @@ -1,8 +1,7 @@ -SFX_08_61_Ch1: ; 205c5 (8:45c5) +SFX_Battle_21_Ch7: unknownnoise0x20 2, 241, 51 unknownnoise0x20 2, 193, 50 unknownnoise0x20 2, 161, 49 unknownnoise0x20 15, 130, 50 unknownnoise0x20 8, 241, 52 endchannel -; 0x205d5
\ No newline at end of file diff --git a/audio/sfx/sfx_08_62.asm b/audio/sfx/battle_22.asm index 13f4b95a..6a20c3ae 100644 --- a/audio/sfx/sfx_08_62.asm +++ b/audio/sfx/battle_22.asm @@ -1,5 +1,4 @@ -SFX_08_62_Ch1: ; 205d5 (8:45d5) +SFX_Battle_22_Ch7: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel -; 0x205dc
\ No newline at end of file diff --git a/audio/sfx/sfx_08_63.asm b/audio/sfx/battle_23.asm index bd5b9e2f..e532cf08 100644 --- a/audio/sfx/sfx_08_63.asm +++ b/audio/sfx/battle_23.asm @@ -1,8 +1,7 @@ -SFX_08_63_Ch1: ; 205dc (8:45dc) +SFX_Battle_23_Ch7: unknownnoise0x20 2, 242, 67 unknownnoise0x20 4, 181, 50 unknownnoise0x20 9, 134, 49 unknownnoise0x20 7, 100, 0 unknownnoise0x20 15, 242, 85 endchannel -; 0x205ec
\ No newline at end of file diff --git a/audio/sfx/sfx_08_64.asm b/audio/sfx/battle_24.asm index b615919f..46e9d29f 100644 --- a/audio/sfx/sfx_08_64.asm +++ b/audio/sfx/battle_24.asm @@ -1,4 +1,4 @@ -SFX_08_64_Ch1: ; 205ec (8:45ec) +SFX_Battle_24_Ch4: duty 1 unknownsfx0x10 151 unknownsfx0x20 15, 242, 0, 7 @@ -6,8 +6,7 @@ SFX_08_64_Ch1: ; 205ec (8:45ec) endchannel -SFX_08_64_Ch2: ; 205f7 (8:45f7) +SFX_Battle_24_Ch7: unknownnoise0x20 15, 63, 34 unknownnoise0x20 15, 242, 33 endchannel -; 0x205fe
\ No newline at end of file diff --git a/audio/sfx/sfx_08_65.asm b/audio/sfx/battle_25.asm index e0368e06..3a46e505 100644 --- a/audio/sfx/sfx_08_65.asm +++ b/audio/sfx/battle_25.asm @@ -1,8 +1,7 @@ -SFX_08_65_Ch1: ; 205fe (8:45fe) +SFX_Battle_25_Ch7: unknownnoise0x20 15, 79, 65 unknownnoise0x20 8, 143, 65 unknownnoise0x20 8, 207, 65 unknownnoise0x20 8, 242, 66 unknownnoise0x20 15, 242, 65 endchannel -; 0x2060e
\ No newline at end of file diff --git a/audio/sfx/sfx_08_66.asm b/audio/sfx/battle_26.asm index 07f1ab05..ce1ac2f9 100644 --- a/audio/sfx/sfx_08_66.asm +++ b/audio/sfx/battle_26.asm @@ -1,4 +1,4 @@ -SFX_08_66_Ch1: ; 2060e (8:460e) +SFX_Battle_26_Ch7: unknownnoise0x20 10, 255, 80 unknownnoise0x20 15, 255, 81 unknownnoise0x20 8, 242, 81 @@ -7,4 +7,3 @@ SFX_08_66_Ch1: ; 2060e (8:460e) unknownnoise0x20 8, 255, 84 unknownnoise0x20 15, 242, 84 endchannel -; 0x20624
\ No newline at end of file diff --git a/audio/sfx/sfx_08_67.asm b/audio/sfx/battle_27.asm index aa327873..1e662c29 100644 --- a/audio/sfx/sfx_08_67.asm +++ b/audio/sfx/battle_27.asm @@ -1,28 +1,27 @@ -SFX_08_67_Ch1: ; 20624 (8:4624) +SFX_Battle_27_Ch4: duty 2 unknownsfx0x20 15, 63, 192, 7 -SFX_08_67_branch_2062a: +SFX_Battle_27_branch_2062a: unknownsfx0x20 15, 223, 192, 7 - loopchannel 4, SFX_08_67_branch_2062a + loopchannel 4, SFX_Battle_27_branch_2062a unknownsfx0x20 15, 209, 192, 7 endchannel -SFX_08_67_Ch2: ; 20637 (8:4637) +SFX_Battle_27_Ch5: dutycycle 179 unknownsfx0x20 15, 47, 200, 7 -SFX_08_67_branch_2063d: +SFX_Battle_27_branch_2063d: unknownsfx0x20 15, 207, 199, 7 - loopchannel 4, SFX_08_67_branch_2063d + loopchannel 4, SFX_Battle_27_branch_2063d unknownsfx0x20 15, 193, 200, 7 endchannel -SFX_08_67_Ch3: ; 2064a (8:464a) +SFX_Battle_27_Ch7: unknownnoise0x20 3, 151, 18 unknownnoise0x20 3, 161, 17 - loopchannel 10, SFX_08_67_Ch3 + loopchannel 10, SFX_Battle_27_Ch7 endchannel -; 0x20655
\ No newline at end of file diff --git a/audio/sfx/sfx_08_68.asm b/audio/sfx/battle_28.asm index efa46f92..298ddb7a 100644 --- a/audio/sfx/sfx_08_68.asm +++ b/audio/sfx/battle_28.asm @@ -1,22 +1,21 @@ -SFX_08_68_Ch1: ; 20655 (8:4655) +SFX_Battle_28_Ch4: duty 0 unknownsfx0x20 0, 241, 192, 7 unknownsfx0x20 0, 241, 0, 7 - loopchannel 12, SFX_08_68_Ch1 + loopchannel 12, SFX_Battle_28_Ch4 endchannel -SFX_08_68_Ch2: ; 20664 (8:4664) +SFX_Battle_28_Ch5: dutycycle 179 unknownsfx0x20 0, 225, 193, 7 unknownsfx0x20 0, 225, 1, 7 - loopchannel 12, SFX_08_68_Ch2 + loopchannel 12, SFX_Battle_28_Ch5 endchannel -SFX_08_68_Ch3: ; 20673 (8:4673) +SFX_Battle_28_Ch7: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 - loopchannel 6, SFX_08_68_Ch3 + loopchannel 6, SFX_Battle_28_Ch7 endchannel -; 0x2067e
\ No newline at end of file diff --git a/audio/sfx/sfx_08_69.asm b/audio/sfx/battle_29.asm index 26395cfa..e36c18dc 100644 --- a/audio/sfx/sfx_08_69.asm +++ b/audio/sfx/battle_29.asm @@ -1,19 +1,18 @@ -SFX_08_69_Ch1: ; 2067e (8:467e) +SFX_Battle_29_Ch4: dutycycle 201 unknownsfx0x20 11, 243, 32, 1 unknownsfx0x20 9, 211, 80, 1 - loopchannel 5, SFX_08_69_Ch1 + loopchannel 5, SFX_Battle_29_Ch4 unknownsfx0x20 8, 227, 48, 1 unknownsfx0x20 15, 194, 16, 1 endchannel -SFX_08_69_Ch2: ; 20695 (8:4695) +SFX_Battle_29_Ch7: unknownnoise0x20 10, 243, 53 unknownnoise0x20 14, 246, 69 - loopchannel 4, SFX_08_69_Ch2 + loopchannel 4, SFX_Battle_29_Ch7 unknownnoise0x20 12, 244, 188 unknownnoise0x20 12, 245, 156 unknownnoise0x20 15, 244, 172 endchannel -; 0x206a9
\ No newline at end of file diff --git a/audio/sfx/sfx_08_6a.asm b/audio/sfx/battle_2a.asm index efe39d5d..710a45f1 100644 --- a/audio/sfx/sfx_08_6a.asm +++ b/audio/sfx/battle_2a.asm @@ -1,29 +1,28 @@ -SFX_08_6a_Ch1: ; 206a9 (8:46a9) +SFX_Battle_2A_Ch4: dutycycle 57 unknownsfx0x20 4, 244, 0, 6 unknownsfx0x20 3, 196, 0, 5 unknownsfx0x20 5, 181, 0, 6 unknownsfx0x20 13, 226, 192, 6 - loopchannel 3, SFX_08_6a_Ch1 + loopchannel 3, SFX_Battle_2A_Ch4 unknownsfx0x20 8, 209, 0, 6 endchannel -SFX_08_6a_Ch2: ; 206c4 (8:46c4) +SFX_Battle_2A_Ch5: dutycycle 141 unknownsfx0x20 5, 228, 224, 5 unknownsfx0x20 4, 180, 224, 4 unknownsfx0x20 6, 165, 232, 5 unknownsfx0x20 14, 209, 160, 6 - loopchannel 3, SFX_08_6a_Ch2 + loopchannel 3, SFX_Battle_2A_Ch5 endchannel -SFX_08_6a_Ch3: ; 206db (8:46db) +SFX_Battle_2A_Ch7: unknownnoise0x20 5, 195, 51 unknownnoise0x20 3, 146, 67 unknownnoise0x20 10, 181, 51 unknownnoise0x20 15, 195, 50 - loopchannel 2, SFX_08_6a_Ch3 + loopchannel 2, SFX_Battle_2A_Ch7 endchannel -; 0x206ec
\ No newline at end of file diff --git a/audio/sfx/sfx_08_6b.asm b/audio/sfx/battle_2b.asm index d0491d28..da57c7a7 100644 --- a/audio/sfx/sfx_08_6b.asm +++ b/audio/sfx/battle_2b.asm @@ -1,22 +1,21 @@ -SFX_08_6b_Ch1: ; 206ec (8:46ec) +SFX_Battle_2B_Ch4: dutycycle 210 unknownsfx0x20 3, 129, 0, 3 unknownsfx0x20 3, 193, 0, 4 unknownsfx0x20 3, 241, 0, 5 unknownsfx0x20 3, 177, 0, 4 unknownsfx0x20 3, 113, 0, 3 - loopchannel 5, SFX_08_6b_Ch1 + loopchannel 5, SFX_Battle_2B_Ch4 unknownsfx0x20 8, 129, 0, 4 endchannel -SFX_08_6b_Ch2: ; 2070b (8:470b) +SFX_Battle_2B_Ch7: unknownnoise0x20 3, 98, 34 unknownnoise0x20 3, 162, 50 unknownnoise0x20 3, 210, 51 unknownnoise0x20 3, 146, 35 unknownnoise0x20 3, 82, 18 - loopchannel 5, SFX_08_6b_Ch2 + loopchannel 5, SFX_Battle_2B_Ch7 unknownnoise0x20 8, 129, 18 endchannel -; 0x20722
\ No newline at end of file diff --git a/audio/sfx/sfx_08_6c.asm b/audio/sfx/battle_2c.asm index c9a020cd..2f8bdc49 100644 --- a/audio/sfx/sfx_08_6c.asm +++ b/audio/sfx/battle_2c.asm @@ -1,26 +1,25 @@ -SFX_08_6c_Ch1: ; 20722 (8:4722) +SFX_Battle_2C_Ch4: dutycycle 57 unknownsfx0x20 15, 244, 0, 5 unknownsfx0x20 15, 196, 0, 4 unknownsfx0x20 15, 226, 192, 5 - loopchannel 3, SFX_08_6c_Ch1 + loopchannel 3, SFX_Battle_2C_Ch4 endchannel -SFX_08_6c_Ch2: ; 20735 (8:4735) +SFX_Battle_2C_Ch5: dutycycle 141 unknownsfx0x20 7, 228, 48, 4 unknownsfx0x20 15, 180, 48, 3 unknownsfx0x20 15, 162, 56, 4 - loopchannel 4, SFX_08_6c_Ch2 + loopchannel 4, SFX_Battle_2C_Ch5 endchannel -SFX_08_6c_Ch3: ; 20748 (8:4748) +SFX_Battle_2C_Ch7: unknownnoise0x20 9, 244, 68 unknownnoise0x20 9, 242, 67 unknownnoise0x20 15, 244, 66 unknownnoise0x20 15, 244, 65 - loopchannel 3, SFX_08_6c_Ch3 + loopchannel 3, SFX_Battle_2C_Ch7 endchannel -; 0x20759
\ No newline at end of file diff --git a/audio/sfx/sfx_08_6e.asm b/audio/sfx/battle_2e.asm index 3f0a40d5..20c86033 100644 --- a/audio/sfx/sfx_08_6e.asm +++ b/audio/sfx/battle_2e.asm @@ -1,28 +1,27 @@ -SFX_08_6e_Ch1: ; 20792 (8:4792) +SFX_Battle_2E_Ch4: duty 0 unknownsfx0x20 2, 241, 0, 2 unknownsfx0x20 3, 241, 0, 7 unknownsfx0x20 4, 241, 0, 5 unknownsfx0x20 5, 241, 240, 7 - loopchannel 8, SFX_08_6e_Ch1 + loopchannel 8, SFX_Battle_2E_Ch4 endchannel -SFX_08_6e_Ch2: ; 207a9 (8:47a9) +SFX_Battle_2E_Ch5: dutycycle 179 unknownsfx0x20 2, 225, 2, 3 unknownsfx0x20 3, 225, 242, 7 unknownsfx0x20 4, 225, 2, 6 unknownsfx0x20 5, 225, 2, 7 - loopchannel 8, SFX_08_6e_Ch2 + loopchannel 8, SFX_Battle_2E_Ch5 endchannel -SFX_08_6e_Ch3: ; 207c0 (8:47c0) +SFX_Battle_2E_Ch7: unknownnoise0x20 2, 211, 16 unknownnoise0x20 3, 211, 17 unknownnoise0x20 2, 210, 16 unknownnoise0x20 5, 210, 18 - loopchannel 9, SFX_08_6e_Ch3 + loopchannel 9, SFX_Battle_2E_Ch7 endchannel -; 0x207d1
\ No newline at end of file diff --git a/audio/sfx/sfx_08_6f.asm b/audio/sfx/battle_2f.asm index bb5ca6e8..fb4c7a14 100644 --- a/audio/sfx/sfx_08_6f.asm +++ b/audio/sfx/battle_2f.asm @@ -1,22 +1,21 @@ -SFX_08_6f_Ch1: ; 207d1 (8:47d1) +SFX_Battle_2F_Ch4: dutycycle 43 unknownsfx0x20 3, 241, 240, 7 unknownsfx0x20 4, 242, 0, 2 - loopchannel 8, SFX_08_6f_Ch1 + loopchannel 8, SFX_Battle_2F_Ch4 endchannel -SFX_08_6f_Ch2: ; 207e0 (8:47e0) +SFX_Battle_2F_Ch5: dutycycle 179 unknownsfx0x20 4, 226, 2, 2 unknownsfx0x20 4, 225, 226, 7 - loopchannel 9, SFX_08_6f_Ch2 + loopchannel 9, SFX_Battle_2F_Ch5 endchannel -SFX_08_6f_Ch3: ; 207ef (8:47ef) +SFX_Battle_2F_Ch7: unknownnoise0x20 4, 255, 67 unknownnoise0x20 4, 242, 68 - loopchannel 9, SFX_08_6f_Ch3 + loopchannel 9, SFX_Battle_2F_Ch7 endchannel -; 0x207fa
\ No newline at end of file diff --git a/audio/sfx/sfx_08_71.asm b/audio/sfx/battle_31.asm index a594e0be..cc1169eb 100644 --- a/audio/sfx/sfx_08_71.asm +++ b/audio/sfx/battle_31.asm @@ -1,4 +1,4 @@ -SFX_08_71_Ch1: ; 20847 (8:4847) +SFX_Battle_31_Ch4: duty 2 unknownsfx0x20 15, 255, 224, 7 unknownsfx0x20 15, 255, 224, 7 @@ -8,7 +8,7 @@ SFX_08_71_Ch1: ; 20847 (8:4847) endchannel -SFX_08_71_Ch2: ; 2085e (8:485e) +SFX_Battle_31_Ch5: duty 3 unknownsfx0x20 15, 255, 226, 7 unknownsfx0x20 15, 255, 225, 7 @@ -16,4 +16,3 @@ SFX_08_71_Ch2: ; 2085e (8:485e) unknownsfx0x20 15, 255, 225, 7 unknownsfx0x20 15, 242, 226, 7 endchannel -; 0x20875
\ No newline at end of file diff --git a/audio/sfx/sfx_08_72.asm b/audio/sfx/battle_32.asm index cfd83636..c7bff4b2 100644 --- a/audio/sfx/sfx_08_72.asm +++ b/audio/sfx/battle_32.asm @@ -1,4 +1,4 @@ -SFX_08_72_Ch1: ; 20875 (8:4875) +SFX_Battle_32_Ch4: duty 2 unknownsfx0x10 175 unknownsfx0x20 8, 241, 0, 7 @@ -6,8 +6,7 @@ SFX_08_72_Ch1: ; 20875 (8:4875) endchannel -SFX_08_72_Ch2: ; 20880 (8:4880) +SFX_Battle_32_Ch5: duty 3 unknownsfx0x20 8, 241, 1, 7 endchannel -; 0x20887
\ No newline at end of file diff --git a/audio/sfx/sfx_08_73.asm b/audio/sfx/battle_33.asm index 6097a9cb..c92b5482 100644 --- a/audio/sfx/sfx_08_73.asm +++ b/audio/sfx/battle_33.asm @@ -1,4 +1,4 @@ -SFX_08_73_Ch1: ; 20887 (8:4887) +SFX_Battle_33_Ch4: duty 2 unknownsfx0x20 6, 241, 0, 5 unknownsfx0x20 6, 241, 128, 5 @@ -8,7 +8,7 @@ SFX_08_73_Ch1: ; 20887 (8:4887) endchannel -SFX_08_73_Ch2: ; 2089e (8:489e) +SFX_Battle_33_Ch5: duty 3 unknownsfx0x20 6, 225, 16, 5 unknownsfx0x20 6, 225, 144, 5 @@ -16,4 +16,3 @@ SFX_08_73_Ch2: ; 2089e (8:489e) unknownsfx0x20 6, 225, 144, 6 unknownsfx0x20 8, 225, 16, 7 endchannel -; 0x208b5
\ No newline at end of file diff --git a/audio/sfx/sfx_08_74.asm b/audio/sfx/battle_34.asm index ed322dcb..38576ecb 100644 --- a/audio/sfx/sfx_08_74.asm +++ b/audio/sfx/battle_34.asm @@ -1,4 +1,4 @@ -SFX_08_74_Ch1: ; 208b5 (8:48b5) +SFX_Battle_34_Ch4: dutycycle 237 unknownsfx0x20 8, 255, 248, 3 unknownsfx0x20 15, 255, 0, 4 @@ -6,7 +6,7 @@ SFX_08_74_Ch1: ; 208b5 (8:48b5) endchannel -SFX_08_74_Ch2: ; 208c4 (8:48c4) +SFX_Battle_34_Ch5: dutycycle 180 unknownsfx0x20 8, 239, 192, 3 unknownsfx0x20 15, 239, 192, 3 @@ -14,10 +14,9 @@ SFX_08_74_Ch2: ; 208c4 (8:48c4) endchannel -SFX_08_74_Ch3: ; 208d3 (8:48d3) +SFX_Battle_34_Ch7: unknownnoise0x20 4, 255, 81 unknownnoise0x20 8, 255, 84 unknownnoise0x20 15, 255, 85 unknownnoise0x20 15, 243, 86 endchannel -; 0x208e0
\ No newline at end of file diff --git a/audio/sfx/sfx_08_75.asm b/audio/sfx/battle_35.asm index 0a25cb45..7ce3afb4 100644 --- a/audio/sfx/sfx_08_75.asm +++ b/audio/sfx/battle_35.asm @@ -1,4 +1,4 @@ -SFX_08_75_Ch1: ; 208e0 (8:48e0) +SFX_Battle_35_Ch4: executemusic vibrato 10, 2, 4 duty 2 @@ -13,7 +13,7 @@ SFX_08_75_Ch1: ; 208e0 (8:48e0) endchannel -SFX_08_75_Ch2: ; 208f0 (8:48f0) +SFX_Battle_35_Ch5: executemusic vibrato 10, 2, 3 duty 2 @@ -27,4 +27,3 @@ SFX_08_75_Ch2: ; 208f0 (8:48f0) octave 5 G# 8 endchannel -; 0x20902
\ No newline at end of file diff --git a/audio/sfx/sfx_08_76.asm b/audio/sfx/battle_36.asm index 7a1891ae..df23fb37 100644 --- a/audio/sfx/sfx_08_76.asm +++ b/audio/sfx/battle_36.asm @@ -1,4 +1,4 @@ -SFX_08_76_Ch1: ; 20902 (8:4902) +SFX_Battle_36_Ch4: duty 0 unknownsfx0x20 2, 241, 128, 7 unknownsfx0x20 2, 241, 0, 7 @@ -12,15 +12,15 @@ SFX_08_76_Ch1: ; 20902 (8:4902) unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 2, 241, 208, 7 -SFX_08_76_branch_20930: +SFX_Battle_36_branch_20930: unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 2, 241, 224, 7 - loopchannel 12, SFX_08_76_branch_20930 + loopchannel 12, SFX_Battle_36_branch_20930 unknownsfx0x20 15, 241, 0, 7 endchannel -SFX_08_76_Ch2: ; 20941 (8:4941) +SFX_Battle_36_Ch5: dutycycle 179 unknownsfx0x20 2, 241, 129, 7 unknownsfx0x20 2, 241, 1, 7 @@ -35,14 +35,13 @@ SFX_08_76_Ch2: ; 20941 (8:4941) unknownsfx0x20 2, 241, 209, 7 unknownsfx0x20 2, 241, 1, 7 unknownsfx0x20 2, 241, 225, 7 - loopchannel 12, SFX_08_76_branch_20930 + loopchannel 12, SFX_Battle_36_branch_20930 unknownsfx0x20 15, 241, 1, 7 endchannel -SFX_08_76_Ch3: ; 20980 (8:4980) +SFX_Battle_36_Ch7: unknownnoise0x20 1, 209, 73 unknownnoise0x20 1, 209, 41 - loopchannel 26, SFX_08_76_Ch3 + loopchannel 26, SFX_Battle_36_Ch7 endchannel -; 0x2098b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_46.asm b/audio/sfx/caught_mon.asm index b1d35eb1..b844a54a 100644 --- a/audio/sfx/sfx_08_46.asm +++ b/audio/sfx/caught_mon.asm @@ -1,4 +1,4 @@ -SFX_08_46_Ch1: ; 23a13 (8:7a13) +SFX_Caught_Mon_Ch4: executemusic tempo 256 volume 7, 7 @@ -22,7 +22,7 @@ SFX_08_46_Ch1: ; 23a13 (8:7a13) endchannel -SFX_08_46_Ch2: ; 23a2e (8:7a2e) +SFX_Caught_Mon_Ch5: executemusic duty 2 notetype 6, 12, 2 @@ -44,7 +44,7 @@ SFX_08_46_Ch2: ; 23a2e (8:7a2e) endchannel -SFX_08_46_Ch3: ; 23a44 (8:7a44) +SFX_Caught_Mon_Ch6: executemusic notetype 6, 1, 0 octave 4 @@ -59,4 +59,3 @@ SFX_08_46_Ch3: ; 23a44 (8:7a44) G_ 2 G# 4 endchannel -; 0x23a53
\ No newline at end of file diff --git a/audio/sfx/sfx_02_5b.asm b/audio/sfx/collision_1.asm index e14879ed..241a5e68 100644 --- a/audio/sfx/sfx_02_5b.asm +++ b/audio/sfx/collision_1.asm @@ -1,7 +1,6 @@ -SFX_02_5b_Ch1: ; 8447 (2:4447) +SFX_Collision_1_Ch4: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 unknownsfx0x10 8 endchannel -; 0x8452
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_5b.asm b/audio/sfx/collision_3.asm index 771aa496..649792eb 100644 --- a/audio/sfx/sfx_1f_5b.asm +++ b/audio/sfx/collision_3.asm @@ -1,7 +1,6 @@ -SFX_1f_5b_Ch1: ; 7c430 (1f:4430) +SFX_Collision_3_Ch4: duty 2 unknownsfx0x10 90 unknownsfx0x20 15, 241, 0, 3 unknownsfx0x10 8 endchannel -; 0x7c43b
\ No newline at end of file diff --git a/audio/sfx/sfx_02_14.asm b/audio/sfx/cry00_1.asm index 70dfe276..98920dfc 100644 --- a/audio/sfx/sfx_02_14.asm +++ b/audio/sfx/cry00_1.asm @@ -1,4 +1,4 @@ -SFX_02_14_Ch1: ; 8987 (2:4987) +SFX_Cry00_1_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_02_14_Ch1: ; 8987 (2:4987) endchannel -SFX_02_14_Ch2: ; 8996 (2:4996) +SFX_Cry00_1_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,9 +14,8 @@ SFX_02_14_Ch2: ; 8996 (2:4996) endchannel -SFX_02_14_Ch3: ; 89a5 (2:49a5) +SFX_Cry00_1_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 endchannel -; 0x89af
\ No newline at end of file diff --git a/audio/sfx/sfx_08_14.asm b/audio/sfx/cry00_2.asm index b037b6a1..17a9207e 100644 --- a/audio/sfx/sfx_08_14.asm +++ b/audio/sfx/cry00_2.asm @@ -1,4 +1,4 @@ -SFX_08_14_Ch1: ; 20c2f (8:4c2f) +SFX_Cry00_2_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_08_14_Ch1: ; 20c2f (8:4c2f) endchannel -SFX_08_14_Ch2: ; 20c3e (8:4c3e) +SFX_Cry00_2_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,9 +14,8 @@ SFX_08_14_Ch2: ; 20c3e (8:4c3e) endchannel -SFX_08_14_Ch3: ; 20c4d (8:4c4d) +SFX_Cry00_2_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 endchannel -; 0x20c57
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_14.asm b/audio/sfx/cry00_3.asm index 373bb2c3..81ad7edf 100644 --- a/audio/sfx/sfx_1f_14.asm +++ b/audio/sfx/cry00_3.asm @@ -1,4 +1,4 @@ -SFX_1f_14_Ch1: ; 7c9fc (1f:49fc) +SFX_Cry00_3_Ch4: dutycycle 245 unknownsfx0x20 4, 243, 24, 7 unknownsfx0x20 15, 229, 152, 7 @@ -6,7 +6,7 @@ SFX_1f_14_Ch1: ; 7c9fc (1f:49fc) endchannel -SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b) +SFX_Cry00_3_Ch5: dutycycle 160 unknownsfx0x20 5, 179, 8, 7 unknownsfx0x20 15, 197, 136, 7 @@ -14,9 +14,8 @@ SFX_1f_14_Ch2: ; 7ca0b (1f:4a0b) endchannel -SFX_1f_14_Ch3: ; 7ca1a (1f:4a1a) +SFX_Cry00_3_Ch7: unknownnoise0x20 3, 161, 28 unknownnoise0x20 14, 148, 44 unknownnoise0x20 8, 129, 28 endchannel -; 0x7ca24
\ No newline at end of file diff --git a/audio/sfx/sfx_02_15.asm b/audio/sfx/cry01_1.asm index 619cb208..392adbe3 100644 --- a/audio/sfx/sfx_02_15.asm +++ b/audio/sfx/cry01_1.asm @@ -1,4 +1,4 @@ -SFX_02_15_Ch1: ; 8b97 (2:4b97) +SFX_Cry01_1_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_02_15_Ch1: ; 8b97 (2:4b97) endchannel -SFX_02_15_Ch2: ; 8baa (2:4baa) +SFX_Cry01_1_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,10 +16,9 @@ SFX_02_15_Ch2: ; 8baa (2:4baa) endchannel -SFX_02_15_Ch3: ; 8bbd (2:4bbd) +SFX_Cry01_1_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 unknownnoise0x20 8, 113, 44 endchannel -; 0x8bca
\ No newline at end of file diff --git a/audio/sfx/sfx_08_15.asm b/audio/sfx/cry01_2.asm index 40cacf00..a7397fd8 100644 --- a/audio/sfx/sfx_08_15.asm +++ b/audio/sfx/cry01_2.asm @@ -1,4 +1,4 @@ -SFX_08_15_Ch1: ; 20e3f (8:4e3f) +SFX_Cry01_2_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_08_15_Ch1: ; 20e3f (8:4e3f) endchannel -SFX_08_15_Ch2: ; 20e52 (8:4e52) +SFX_Cry01_2_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,10 +16,9 @@ SFX_08_15_Ch2: ; 20e52 (8:4e52) endchannel -SFX_08_15_Ch3: ; 20e65 (8:4e65) +SFX_Cry01_2_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 unknownnoise0x20 8, 113, 44 endchannel -; 0x20e72
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_15.asm b/audio/sfx/cry01_3.asm index b3edbdbd..19235f9e 100644 --- a/audio/sfx/sfx_1f_15.asm +++ b/audio/sfx/cry01_3.asm @@ -1,4 +1,4 @@ -SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c) +SFX_Cry01_3_Ch4: dutycycle 160 unknownsfx0x20 4, 243, 0, 6 unknownsfx0x20 8, 213, 96, 7 @@ -7,7 +7,7 @@ SFX_1f_15_Ch1: ; 7cc0c (1f:4c0c) endchannel -SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f) +SFX_Cry01_3_Ch5: dutycycle 90 unknownsfx0x20 5, 179, 241, 6 unknownsfx0x20 7, 197, 82, 7 @@ -16,10 +16,9 @@ SFX_1f_15_Ch2: ; 7cc1f (1f:4c1f) endchannel -SFX_1f_15_Ch3: ; 7cc32 (1f:4c32) +SFX_Cry01_3_Ch7: unknownnoise0x20 3, 162, 60 unknownnoise0x20 12, 148, 44 unknownnoise0x20 3, 130, 28 unknownnoise0x20 8, 113, 44 endchannel -; 0x7cc3f
\ No newline at end of file diff --git a/audio/sfx/sfx_02_16.asm b/audio/sfx/cry02_1.asm index 4e095a04..62834724 100644 --- a/audio/sfx/sfx_02_16.asm +++ b/audio/sfx/cry02_1.asm @@ -1,4 +1,4 @@ -SFX_02_16_Ch1: ; 8b0c (2:4b0c) +SFX_Cry02_1_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,13 +6,12 @@ SFX_02_16_Ch1: ; 8b0c (2:4b0c) endchannel -SFX_02_16_Ch2: ; 8b1b (2:4b1b) +SFX_Cry02_1_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_02_16_Ch3: ; 8b29 (2:4b29) +SFX_Cry02_1_Ch7: endchannel -; 0x8b2a
\ No newline at end of file diff --git a/audio/sfx/sfx_08_16.asm b/audio/sfx/cry02_2.asm index bbe80ddb..ae40372a 100644 --- a/audio/sfx/sfx_08_16.asm +++ b/audio/sfx/cry02_2.asm @@ -1,4 +1,4 @@ -SFX_08_16_Ch1: ; 20db4 (8:4db4) +SFX_Cry02_2_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,13 +6,12 @@ SFX_08_16_Ch1: ; 20db4 (8:4db4) endchannel -SFX_08_16_Ch2: ; 20dc3 (8:4dc3) +SFX_Cry02_2_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_08_16_Ch3: ; 20dd1 (8:4dd1) +SFX_Cry02_2_Ch7: endchannel -; 0x20dd2
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_16.asm b/audio/sfx/cry02_3.asm index 7c2346fb..32be5608 100644 --- a/audio/sfx/sfx_1f_16.asm +++ b/audio/sfx/cry02_3.asm @@ -1,4 +1,4 @@ -SFX_1f_16_Ch1: ; 7cb81 (1f:4b81) +SFX_Cry02_3_Ch4: duty 0 unknownsfx0x20 8, 245, 128, 4 unknownsfx0x20 2, 225, 224, 5 @@ -6,13 +6,12 @@ SFX_1f_16_Ch1: ; 7cb81 (1f:4b81) endchannel -SFX_1f_16_Ch2: ; 7cb90 (1f:4b90) +SFX_Cry02_3_Ch5: dutycycle 165 unknownsfx0x20 7, 149, 65, 4 unknownsfx0x20 2, 129, 33, 5 unknownsfx0x20 8, 97, 26, 5 -SFX_1f_16_Ch3: ; 7cb9e (1f:4b9e) +SFX_Cry02_3_Ch7: endchannel -; 0x7cb9f
\ No newline at end of file diff --git a/audio/sfx/sfx_02_17.asm b/audio/sfx/cry03_1.asm index f8b66456..706d2325 100644 --- a/audio/sfx/sfx_02_17.asm +++ b/audio/sfx/cry03_1.asm @@ -1,4 +1,4 @@ -SFX_02_17_Ch1: ; 88a6 (2:48a6) +SFX_Cry03_1_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_02_17_Ch1: ; 88a6 (2:48a6) endchannel -SFX_02_17_Ch2: ; 88c5 (2:48c5) +SFX_Cry03_1_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,10 +22,9 @@ SFX_02_17_Ch2: ; 88c5 (2:48c5) endchannel -SFX_02_17_Ch3: ; 88e4 (2:48e4) +SFX_Cry03_1_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 unknownnoise0x20 15, 162, 92 endchannel -; 0x88f1
\ No newline at end of file diff --git a/audio/sfx/sfx_08_17.asm b/audio/sfx/cry03_2.asm index 03587fa4..89e98ae4 100644 --- a/audio/sfx/sfx_08_17.asm +++ b/audio/sfx/cry03_2.asm @@ -1,4 +1,4 @@ -SFX_08_17_Ch1: ; 20b4e (8:4b4e) +SFX_Cry03_2_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_08_17_Ch1: ; 20b4e (8:4b4e) endchannel -SFX_08_17_Ch2: ; 20b6d (8:4b6d) +SFX_Cry03_2_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,10 +22,9 @@ SFX_08_17_Ch2: ; 20b6d (8:4b6d) endchannel -SFX_08_17_Ch3: ; 20b8c (8:4b8c) +SFX_Cry03_2_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 unknownnoise0x20 15, 162, 92 endchannel -; 0x20b99
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_17.asm b/audio/sfx/cry03_3.asm index bfda0fe3..d472d37b 100644 --- a/audio/sfx/sfx_1f_17.asm +++ b/audio/sfx/cry03_3.asm @@ -1,4 +1,4 @@ -SFX_1f_17_Ch1: ; 7c91b (1f:491b) +SFX_Cry03_3_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 8, 6 unknownsfx0x20 6, 230, 0, 6 @@ -10,7 +10,7 @@ SFX_1f_17_Ch1: ; 7c91b (1f:491b) endchannel -SFX_1f_17_Ch2: ; 7c93a (1f:493a) +SFX_Cry03_3_Ch5: dutycycle 10 unknownsfx0x20 4, 199, 4, 5 unknownsfx0x20 6, 166, 2, 5 @@ -22,10 +22,9 @@ SFX_1f_17_Ch2: ; 7c93a (1f:493a) endchannel -SFX_1f_17_Ch3: ; 7c959 (1f:4959) +SFX_Cry03_3_Ch7: unknownnoise0x20 12, 228, 76 unknownnoise0x20 10, 199, 92 unknownnoise0x20 12, 182, 76 unknownnoise0x20 15, 162, 92 endchannel -; 0x7c966
\ No newline at end of file diff --git a/audio/sfx/sfx_02_18.asm b/audio/sfx/cry04_1.asm index 4d546cbf..d1bb26c6 100644 --- a/audio/sfx/sfx_02_18.asm +++ b/audio/sfx/cry04_1.asm @@ -1,4 +1,4 @@ -SFX_02_18_Ch1: ; 8c55 (2:4c55) +SFX_Cry04_1_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_02_18_Ch1: ; 8c55 (2:4c55) endchannel -SFX_02_18_Ch2: ; 8c74 (2:4c74) +SFX_Cry04_1_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_02_18_Ch2: ; 8c74 (2:4c74) endchannel -SFX_02_18_Ch3: ; 8c93 (2:4c93) +SFX_Cry04_1_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 @@ -30,4 +30,3 @@ SFX_02_18_Ch3: ; 8c93 (2:4c93) unknownnoise0x20 7, 195, 76 unknownnoise0x20 8, 161, 92 endchannel -; 0x8ca6
\ No newline at end of file diff --git a/audio/sfx/sfx_08_18.asm b/audio/sfx/cry04_2.asm index b1e97f95..aa5baf29 100644 --- a/audio/sfx/sfx_08_18.asm +++ b/audio/sfx/cry04_2.asm @@ -1,4 +1,4 @@ -SFX_08_18_Ch1: ; 20efd (8:4efd) +SFX_Cry04_2_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_08_18_Ch1: ; 20efd (8:4efd) endchannel -SFX_08_18_Ch2: ; 20f1c (8:4f1c) +SFX_Cry04_2_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_08_18_Ch2: ; 20f1c (8:4f1c) endchannel -SFX_08_18_Ch3: ; 20f3b (8:4f3b) +SFX_Cry04_2_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 @@ -30,4 +30,3 @@ SFX_08_18_Ch3: ; 20f3b (8:4f3b) unknownnoise0x20 7, 195, 76 unknownnoise0x20 8, 161, 92 endchannel -; 0x20f4e
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_18.asm b/audio/sfx/cry04_3.asm index 7e532f3e..b4d9cf2e 100644 --- a/audio/sfx/sfx_1f_18.asm +++ b/audio/sfx/cry04_3.asm @@ -1,4 +1,4 @@ -SFX_1f_18_Ch1: ; 7ccca (1f:4cca) +SFX_Cry04_3_Ch4: dutycycle 240 unknownsfx0x20 4, 247, 160, 6 unknownsfx0x20 8, 230, 164, 6 @@ -10,7 +10,7 @@ SFX_1f_18_Ch1: ; 7ccca (1f:4cca) endchannel -SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9) +SFX_Cry04_3_Ch5: dutycycle 90 unknownsfx0x20 4, 231, 1, 6 unknownsfx0x20 8, 214, 3, 6 @@ -22,7 +22,7 @@ SFX_1f_18_Ch2: ; 7cce9 (1f:4ce9) endchannel -SFX_1f_18_Ch3: ; 7cd08 (1f:4d08) +SFX_Cry04_3_Ch7: unknownnoise0x20 7, 214, 92 unknownnoise0x20 8, 230, 76 unknownnoise0x20 4, 212, 92 @@ -30,4 +30,3 @@ SFX_1f_18_Ch3: ; 7cd08 (1f:4d08) unknownnoise0x20 7, 195, 76 unknownnoise0x20 8, 161, 92 endchannel -; 0x7cd1b
\ No newline at end of file diff --git a/audio/sfx/sfx_02_19.asm b/audio/sfx/cry05_1.asm index 3cc7ae73..dc68e77d 100644 --- a/audio/sfx/sfx_02_19.asm +++ b/audio/sfx/cry05_1.asm @@ -1,4 +1,4 @@ -SFX_02_19_Ch1: ; 8a35 (2:4a35) +SFX_Cry05_1_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_02_19_Ch1: ; 8a35 (2:4a35) endchannel -SFX_02_19_Ch2: ; 8a48 (2:4a48) +SFX_Cry05_1_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,6 +15,5 @@ SFX_02_19_Ch2: ; 8a48 (2:4a48) unknownsfx0x20 8, 129, 193, 4 -SFX_02_19_Ch3: ; 8a5a (2:4a5a) +SFX_Cry05_1_Ch7: endchannel -; 0x8a5b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_19.asm b/audio/sfx/cry05_2.asm index 097796bc..f7e09dcc 100644 --- a/audio/sfx/sfx_08_19.asm +++ b/audio/sfx/cry05_2.asm @@ -1,4 +1,4 @@ -SFX_08_19_Ch1: ; 20cdd (8:4cdd) +SFX_Cry05_2_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_08_19_Ch1: ; 20cdd (8:4cdd) endchannel -SFX_08_19_Ch2: ; 20cf0 (8:4cf0) +SFX_Cry05_2_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,6 +15,5 @@ SFX_08_19_Ch2: ; 20cf0 (8:4cf0) unknownsfx0x20 8, 129, 193, 4 -SFX_08_19_Ch3: ; 20d02 (8:4d02) +SFX_Cry05_2_Ch7: endchannel -; 0x20d03
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_19.asm b/audio/sfx/cry05_3.asm index c9609be5..2e8839c9 100644 --- a/audio/sfx/sfx_1f_19.asm +++ b/audio/sfx/cry05_3.asm @@ -1,4 +1,4 @@ -SFX_1f_19_Ch1: ; 7caaa (1f:4aaa) +SFX_Cry05_3_Ch4: dutycycle 10 unknownsfx0x20 6, 226, 0, 5 unknownsfx0x20 6, 227, 128, 5 @@ -7,7 +7,7 @@ SFX_1f_19_Ch1: ; 7caaa (1f:4aaa) endchannel -SFX_1f_19_Ch2: ; 7cabd (1f:4abd) +SFX_Cry05_3_Ch5: dutycycle 245 unknownsfx0x20 6, 226, 130, 4 unknownsfx0x20 6, 211, 1, 5 @@ -15,6 +15,5 @@ SFX_1f_19_Ch2: ; 7cabd (1f:4abd) unknownsfx0x20 8, 129, 193, 4 -SFX_1f_19_Ch3: ; 7cacf (1f:4acf) +SFX_Cry05_3_Ch7: endchannel -; 0x7cad0
\ No newline at end of file diff --git a/audio/sfx/sfx_02_1a.asm b/audio/sfx/cry06_1.asm index 8b029d5c..d3b051c8 100644 --- a/audio/sfx/sfx_02_1a.asm +++ b/audio/sfx/cry06_1.asm @@ -1,4 +1,4 @@ -SFX_02_1a_Ch1: ; 89df (2:49df) +SFX_Cry06_1_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_02_1a_Ch1: ; 89df (2:49df) unknownsfx0x20 15, 66, 7, 2 -SFX_02_1a_Ch2: ; 89f9 (2:49f9) +SFX_Cry06_1_Ch5: endchannel -SFX_02_1a_Ch3: ; 89fa (2:49fa) +SFX_Cry06_1_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 @@ -20,4 +20,3 @@ SFX_02_1a_Ch3: ; 89fa (2:49fa) unknownnoise0x20 15, 215, 156 unknownnoise0x20 15, 242, 172 endchannel -; 0x8a0d
\ No newline at end of file diff --git a/audio/sfx/sfx_08_1a.asm b/audio/sfx/cry06_2.asm index 089460e4..6a46246c 100644 --- a/audio/sfx/sfx_08_1a.asm +++ b/audio/sfx/cry06_2.asm @@ -1,4 +1,4 @@ -SFX_08_1a_Ch1: ; 20c87 (8:4c87) +SFX_Cry06_2_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_08_1a_Ch1: ; 20c87 (8:4c87) unknownsfx0x20 15, 66, 7, 2 -SFX_08_1a_Ch2: ; 20ca1 (8:4ca1) +SFX_Cry06_2_Ch5: endchannel -SFX_08_1a_Ch3: ; 20ca2 (8:4ca2) +SFX_Cry06_2_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 @@ -20,4 +20,3 @@ SFX_08_1a_Ch3: ; 20ca2 (8:4ca2) unknownnoise0x20 15, 215, 156 unknownnoise0x20 15, 242, 172 endchannel -; 0x20cb5
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_1a.asm b/audio/sfx/cry06_3.asm index 2498f122..692cd1cf 100644 --- a/audio/sfx/sfx_1f_1a.asm +++ b/audio/sfx/cry06_3.asm @@ -1,4 +1,4 @@ -SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54) +SFX_Cry06_3_Ch4: dutycycle 250 unknownsfx0x20 6, 131, 71, 2 unknownsfx0x20 15, 98, 38, 2 @@ -8,11 +8,11 @@ SFX_1f_1a_Ch1: ; 7ca54 (1f:4a54) unknownsfx0x20 15, 66, 7, 2 -SFX_1f_1a_Ch2: ; 7ca6e (1f:4a6e) +SFX_Cry06_3_Ch5: endchannel -SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f) +SFX_Cry06_3_Ch7: unknownnoise0x20 8, 212, 140 unknownnoise0x20 4, 226, 156 unknownnoise0x20 15, 198, 140 @@ -20,4 +20,3 @@ SFX_1f_1a_Ch3: ; 7ca6f (1f:4a6f) unknownnoise0x20 15, 215, 156 unknownnoise0x20 15, 242, 172 endchannel -; 0x7ca82
\ No newline at end of file diff --git a/audio/sfx/sfx_02_1b.asm b/audio/sfx/cry07_1.asm index 8626d876..2eebb7f9 100644 --- a/audio/sfx/sfx_02_1b.asm +++ b/audio/sfx/cry07_1.asm @@ -1,4 +1,4 @@ -SFX_02_1b_Ch1: ; 8a0d (2:4a0d) +SFX_Cry07_1_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_02_1b_Ch1: ; 8a0d (2:4a0d) endchannel -SFX_02_1b_Ch2: ; 8a1c (2:4a1c) +SFX_Cry07_1_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,9 +14,8 @@ SFX_02_1b_Ch2: ; 8a1c (2:4a1c) endchannel -SFX_02_1b_Ch3: ; 8a2b (2:4a2b) +SFX_Cry07_1_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 endchannel -; 0x8a35
\ No newline at end of file diff --git a/audio/sfx/sfx_08_1b.asm b/audio/sfx/cry07_2.asm index 1eec17f5..e0381424 100644 --- a/audio/sfx/sfx_08_1b.asm +++ b/audio/sfx/cry07_2.asm @@ -1,4 +1,4 @@ -SFX_08_1b_Ch1: ; 20cb5 (8:4cb5) +SFX_Cry07_2_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_08_1b_Ch1: ; 20cb5 (8:4cb5) endchannel -SFX_08_1b_Ch2: ; 20cc4 (8:4cc4) +SFX_Cry07_2_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,9 +14,8 @@ SFX_08_1b_Ch2: ; 20cc4 (8:4cc4) endchannel -SFX_08_1b_Ch3: ; 20cd3 (8:4cd3) +SFX_Cry07_2_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 endchannel -; 0x20cdd
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_1b.asm b/audio/sfx/cry07_3.asm index df3167b1..92a401a9 100644 --- a/audio/sfx/sfx_1f_1b.asm +++ b/audio/sfx/cry07_3.asm @@ -1,4 +1,4 @@ -SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82) +SFX_Cry07_3_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 224, 6 unknownsfx0x20 15, 228, 64, 6 @@ -6,7 +6,7 @@ SFX_1f_1b_Ch1: ; 7ca82 (1f:4a82) endchannel -SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91) +SFX_Cry07_3_Ch5: dutycycle 10 unknownsfx0x20 3, 195, 131, 6 unknownsfx0x20 14, 180, 2, 6 @@ -14,9 +14,8 @@ SFX_1f_1b_Ch2: ; 7ca91 (1f:4a91) endchannel -SFX_1f_1b_Ch3: ; 7caa0 (1f:4aa0) +SFX_Cry07_3_Ch7: unknownnoise0x20 4, 211, 92 unknownnoise0x20 15, 230, 76 unknownnoise0x20 8, 177, 92 endchannel -; 0x7caaa
\ No newline at end of file diff --git a/audio/sfx/sfx_02_1c.asm b/audio/sfx/cry08_1.asm index d96c0eb8..91901faa 100644 --- a/audio/sfx/sfx_02_1c.asm +++ b/audio/sfx/cry08_1.asm @@ -1,4 +1,4 @@ -SFX_02_1c_Ch1: ; 8c25 (2:4c25) +SFX_Cry08_1_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_02_1c_Ch1: ; 8c25 (2:4c25) endchannel -SFX_02_1c_Ch2: ; 8c38 (2:4c38) +SFX_Cry08_1_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,9 +16,8 @@ SFX_02_1c_Ch2: ; 8c38 (2:4c38) endchannel -SFX_02_1c_Ch3: ; 8c4b (2:4c4b) +SFX_Cry08_1_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 endchannel -; 0x8c55
\ No newline at end of file diff --git a/audio/sfx/sfx_08_1c.asm b/audio/sfx/cry08_2.asm index ec6b03a7..45d12f38 100644 --- a/audio/sfx/sfx_08_1c.asm +++ b/audio/sfx/cry08_2.asm @@ -1,4 +1,4 @@ -SFX_08_1c_Ch1: ; 20ecd (8:4ecd) +SFX_Cry08_2_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_08_1c_Ch1: ; 20ecd (8:4ecd) endchannel -SFX_08_1c_Ch2: ; 20ee0 (8:4ee0) +SFX_Cry08_2_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,9 +16,8 @@ SFX_08_1c_Ch2: ; 20ee0 (8:4ee0) endchannel -SFX_08_1c_Ch3: ; 20ef3 (8:4ef3) +SFX_Cry08_2_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 endchannel -; 0x20efd
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_1c.asm b/audio/sfx/cry08_3.asm index 4e7ac177..8f1ec3fb 100644 --- a/audio/sfx/sfx_1f_1c.asm +++ b/audio/sfx/cry08_3.asm @@ -1,4 +1,4 @@ -SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a) +SFX_Cry08_3_Ch4: dutycycle 240 unknownsfx0x20 15, 246, 101, 5 unknownsfx0x20 10, 228, 124, 5 @@ -7,7 +7,7 @@ SFX_1f_1c_Ch1: ; 7cc9a (1f:4c9a) endchannel -SFX_1f_1c_Ch2: ; 7ccad (1f:4cad) +SFX_Cry08_3_Ch5: dutycycle 90 unknownsfx0x20 14, 214, 3, 5 unknownsfx0x20 9, 180, 27, 5 @@ -16,9 +16,8 @@ SFX_1f_1c_Ch2: ; 7ccad (1f:4cad) endchannel -SFX_1f_1c_Ch3: ; 7ccc0 (1f:4cc0) +SFX_Cry08_3_Ch7: unknownnoise0x20 12, 230, 76 unknownnoise0x20 11, 215, 92 unknownnoise0x20 15, 194, 76 endchannel -; 0x7ccca
\ No newline at end of file diff --git a/audio/sfx/sfx_02_1d.asm b/audio/sfx/cry09_1.asm index f5db0868..11b4ab55 100644 --- a/audio/sfx/sfx_02_1d.asm +++ b/audio/sfx/cry09_1.asm @@ -1,4 +1,4 @@ -SFX_02_1d_Ch1: ; 872f (2:472f) +SFX_Cry09_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_02_1d_Ch1: ; 872f (2:472f) endchannel -SFX_02_1d_Ch2: ; 874c (2:474c) +SFX_Cry09_1_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_02_1d_Ch2: ; 874c (2:474c) endchannel -SFX_02_1d_Ch3: ; 876d (2:476d) +SFX_Cry09_1_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 @@ -33,4 +33,3 @@ SFX_02_1d_Ch3: ; 876d (2:476d) unknownnoise0x20 6, 212, 61 unknownnoise0x20 8, 193, 59 endchannel -; 0x8786
\ No newline at end of file diff --git a/audio/sfx/sfx_08_1d.asm b/audio/sfx/cry09_2.asm index 7162b031..ac4b1f74 100644 --- a/audio/sfx/sfx_08_1d.asm +++ b/audio/sfx/cry09_2.asm @@ -1,4 +1,4 @@ -SFX_08_1d_Ch1: ; 209d7 (8:49d7) +SFX_Cry09_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_08_1d_Ch1: ; 209d7 (8:49d7) endchannel -SFX_08_1d_Ch2: ; 209f4 (8:49f4) +SFX_Cry09_2_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_08_1d_Ch2: ; 209f4 (8:49f4) endchannel -SFX_08_1d_Ch3: ; 20a15 (8:4a15) +SFX_Cry09_2_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 @@ -33,4 +33,3 @@ SFX_08_1d_Ch3: ; 20a15 (8:4a15) unknownnoise0x20 6, 212, 61 unknownnoise0x20 8, 193, 59 endchannel -; 0x20a2e
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_1d.asm b/audio/sfx/cry09_3.asm index 703b55d5..1d3856cc 100644 --- a/audio/sfx/sfx_1f_1d.asm +++ b/audio/sfx/cry09_3.asm @@ -1,4 +1,4 @@ -SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4) +SFX_Cry09_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 160, 7 unknownsfx0x20 6, 230, 163, 7 @@ -10,7 +10,7 @@ SFX_1f_1d_Ch1: ; 7c7a4 (1f:47a4) endchannel -SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1) +SFX_Cry09_3_Ch5: dutycycle 5 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 15, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_1f_1d_Ch2: ; 7c7c1 (1f:47c1) endchannel -SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2) +SFX_Cry09_3_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 15, 215, 60 @@ -33,4 +33,3 @@ SFX_1f_1d_Ch3: ; 7c7e2 (1f:47e2) unknownnoise0x20 6, 212, 61 unknownnoise0x20 8, 193, 59 endchannel -; 0x7c7fb
\ No newline at end of file diff --git a/audio/sfx/sfx_02_1e.asm b/audio/sfx/cry0a_1.asm index 524d67d7..051a5d73 100644 --- a/audio/sfx/sfx_02_1e.asm +++ b/audio/sfx/cry0a_1.asm @@ -1,4 +1,4 @@ -SFX_02_1e_Ch1: ; 8bca (2:4bca) +SFX_Cry0A_1_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_02_1e_Ch1: ; 8bca (2:4bca) endchannel -SFX_02_1e_Ch2: ; 8be9 (2:4be9) +SFX_Cry0A_1_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_02_1e_Ch2: ; 8be9 (2:4be9) endchannel -SFX_02_1e_Ch3: ; 8c0c (2:4c0c) +SFX_Cry0A_1_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 @@ -33,4 +33,3 @@ SFX_02_1e_Ch3: ; 8c0c (2:4c0c) unknownnoise0x20 3, 164, 44 unknownnoise0x20 8, 145, 60 endchannel -; 0x8c25
\ No newline at end of file diff --git a/audio/sfx/sfx_08_1e.asm b/audio/sfx/cry0a_2.asm index 13475f11..d7fdd264 100644 --- a/audio/sfx/sfx_08_1e.asm +++ b/audio/sfx/cry0a_2.asm @@ -1,4 +1,4 @@ -SFX_08_1e_Ch1: ; 20e72 (8:4e72) +SFX_Cry0A_2_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_08_1e_Ch1: ; 20e72 (8:4e72) endchannel -SFX_08_1e_Ch2: ; 20e91 (8:4e91) +SFX_Cry0A_2_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_08_1e_Ch2: ; 20e91 (8:4e91) endchannel -SFX_08_1e_Ch3: ; 20eb4 (8:4eb4) +SFX_Cry0A_2_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 @@ -33,4 +33,3 @@ SFX_08_1e_Ch3: ; 20eb4 (8:4eb4) unknownnoise0x20 3, 164, 44 unknownnoise0x20 8, 145, 60 endchannel -; 0x20ecd
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_1e.asm b/audio/sfx/cry0a_3.asm index 4733a534..e16287c4 100644 --- a/audio/sfx/sfx_1f_1e.asm +++ b/audio/sfx/cry0a_3.asm @@ -1,4 +1,4 @@ -SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f) +SFX_Cry0A_3_Ch4: dutycycle 240 unknownsfx0x20 8, 247, 224, 6 unknownsfx0x20 6, 230, 229, 6 @@ -10,7 +10,7 @@ SFX_1f_1e_Ch1: ; 7cc3f (1f:4c3f) endchannel -SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e) +SFX_Cry0A_3_Ch5: dutycycle 5 unknownsfx0x20 3, 8, 0, 0 unknownsfx0x20 8, 167, 161, 6 @@ -23,7 +23,7 @@ SFX_1f_1e_Ch2: ; 7cc5e (1f:4c5e) endchannel -SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81) +SFX_Cry0A_3_Ch7: unknownnoise0x20 2, 242, 60 unknownnoise0x20 8, 228, 62 unknownnoise0x20 8, 215, 60 @@ -33,4 +33,3 @@ SFX_1f_1e_Ch3: ; 7cc81 (1f:4c81) unknownnoise0x20 3, 164, 44 unknownnoise0x20 8, 145, 60 endchannel -; 0x7cc9a
\ No newline at end of file diff --git a/audio/sfx/sfx_02_1f.asm b/audio/sfx/cry0b_1.asm index 9506fb43..5ee9b81c 100644 --- a/audio/sfx/sfx_02_1f.asm +++ b/audio/sfx/cry0b_1.asm @@ -1,4 +1,4 @@ -SFX_02_1f_Ch1: ; 8a5b (2:4a5b) +SFX_Cry0B_1_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_02_1f_Ch1: ; 8a5b (2:4a5b) endchannel -SFX_02_1f_Ch2: ; 8a86 (2:4a86) +SFX_Cry0B_1_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_02_1f_Ch2: ; 8a86 (2:4a86) endchannel -SFX_02_1f_Ch3: ; 8aa5 (2:4aa5) +SFX_Cry0B_1_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 @@ -35,4 +35,3 @@ SFX_02_1f_Ch3: ; 8aa5 (2:4aa5) unknownnoise0x20 4, 193, 44 unknownnoise0x20 8, 161, 76 endchannel -; 0x8abe
\ No newline at end of file diff --git a/audio/sfx/sfx_08_1f.asm b/audio/sfx/cry0b_2.asm index a882c512..f762ea02 100644 --- a/audio/sfx/sfx_08_1f.asm +++ b/audio/sfx/cry0b_2.asm @@ -1,4 +1,4 @@ -SFX_08_1f_Ch1: ; 20d03 (8:4d03) +SFX_Cry0B_2_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_08_1f_Ch1: ; 20d03 (8:4d03) endchannel -SFX_08_1f_Ch2: ; 20d2e (8:4d2e) +SFX_Cry0B_2_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_08_1f_Ch2: ; 20d2e (8:4d2e) endchannel -SFX_08_1f_Ch3: ; 20d4d (8:4d4d) +SFX_Cry0B_2_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 @@ -35,4 +35,3 @@ SFX_08_1f_Ch3: ; 20d4d (8:4d4d) unknownnoise0x20 4, 193, 44 unknownnoise0x20 8, 161, 76 endchannel -; 0x20d66
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_1f.asm b/audio/sfx/cry0b_3.asm index 9188186b..22420974 100644 --- a/audio/sfx/sfx_1f_1f.asm +++ b/audio/sfx/cry0b_3.asm @@ -1,4 +1,4 @@ -SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0) +SFX_Cry0B_3_Ch4: dutycycle 204 unknownsfx0x20 4, 241, 0, 7 unknownsfx0x20 4, 225, 128, 7 @@ -13,7 +13,7 @@ SFX_1f_1f_Ch1: ; 7cad0 (1f:4ad0) endchannel -SFX_1f_1f_Ch2: ; 7cafb (1f:4afb) +SFX_Cry0B_3_Ch5: dutycycle 68 unknownsfx0x20 12, 8, 0, 0 unknownsfx0x20 4, 241, 1, 7 @@ -25,7 +25,7 @@ SFX_1f_1f_Ch2: ; 7cafb (1f:4afb) endchannel -SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a) +SFX_Cry0B_3_Ch7: unknownnoise0x20 15, 8, 0 unknownnoise0x20 4, 8, 0 unknownnoise0x20 4, 209, 76 @@ -35,4 +35,3 @@ SFX_1f_1f_Ch3: ; 7cb1a (1f:4b1a) unknownnoise0x20 4, 193, 44 unknownnoise0x20 8, 161, 76 endchannel -; 0x7cb33
\ No newline at end of file diff --git a/audio/sfx/sfx_02_20.asm b/audio/sfx/cry0c_1.asm index 00923339..dfbf0283 100644 --- a/audio/sfx/sfx_02_20.asm +++ b/audio/sfx/cry0c_1.asm @@ -1,4 +1,4 @@ -SFX_02_20_Ch1: ; 8abe (2:4abe) +SFX_Cry0C_1_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_02_20_Ch1: ; 8abe (2:4abe) endchannel -SFX_02_20_Ch2: ; 8ae5 (2:4ae5) +SFX_Cry0C_1_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,6 +25,5 @@ SFX_02_20_Ch2: ; 8ae5 (2:4ae5) unknownsfx0x20 8, 145, 225, 5 -SFX_02_20_Ch3: ; 8b0b (2:4b0b) +SFX_Cry0C_1_Ch7: endchannel -; 0x8b0c
\ No newline at end of file diff --git a/audio/sfx/sfx_08_20.asm b/audio/sfx/cry0c_2.asm index 94a54b0a..11e0d06a 100644 --- a/audio/sfx/sfx_08_20.asm +++ b/audio/sfx/cry0c_2.asm @@ -1,4 +1,4 @@ -SFX_08_20_Ch1: ; 20d66 (8:4d66) +SFX_Cry0C_2_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_08_20_Ch1: ; 20d66 (8:4d66) endchannel -SFX_08_20_Ch2: ; 20d8d (8:4d8d) +SFX_Cry0C_2_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,6 +25,5 @@ SFX_08_20_Ch2: ; 20d8d (8:4d8d) unknownsfx0x20 8, 145, 225, 5 -SFX_08_20_Ch3: ; 20db3 (8:4db3) +SFX_Cry0C_2_Ch7: endchannel -; 0x20db4
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_20.asm b/audio/sfx/cry0c_3.asm index 2d0b1fc6..6fc798f2 100644 --- a/audio/sfx/sfx_1f_20.asm +++ b/audio/sfx/cry0c_3.asm @@ -1,4 +1,4 @@ -SFX_1f_20_Ch1: ; 7cb33 (1f:4b33) +SFX_Cry0C_3_Ch4: dutycycle 204 unknownsfx0x20 8, 245, 0, 6 unknownsfx0x20 2, 210, 56, 6 @@ -12,7 +12,7 @@ SFX_1f_20_Ch1: ; 7cb33 (1f:4b33) endchannel -SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a) +SFX_Cry0C_3_Ch5: dutycycle 68 unknownsfx0x20 12, 195, 192, 5 unknownsfx0x20 3, 177, 249, 5 @@ -25,6 +25,5 @@ SFX_1f_20_Ch2: ; 7cb5a (1f:4b5a) unknownsfx0x20 8, 145, 225, 5 -SFX_1f_20_Ch3: ; 7cb80 (1f:4b80) +SFX_Cry0C_3_Ch7: endchannel -; 0x7cb81
\ No newline at end of file diff --git a/audio/sfx/sfx_02_21.asm b/audio/sfx/cry0d_1.asm index 60ecb431..2864fa01 100644 --- a/audio/sfx/sfx_02_21.asm +++ b/audio/sfx/cry0d_1.asm @@ -1,4 +1,4 @@ -SFX_02_21_Ch1: ; 8b2a (2:4b2a) +SFX_Cry0D_1_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_02_21_Ch1: ; 8b2a (2:4b2a) unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_02_21_Ch1 + loopchannel 2, SFX_Cry0D_1_Ch4 endchannel -SFX_02_21_Ch2: ; 8b49 (2:4b49) +SFX_Cry0D_1_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_02_21_Ch2: ; 8b49 (2:4b49) endchannel -SFX_02_21_Ch3: ; 8b78 (2:4b78) +SFX_Cry0D_1_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 @@ -38,4 +38,3 @@ SFX_02_21_Ch3: ; 8b78 (2:4b78) unknownnoise0x20 9, 194, 44 unknownnoise0x20 4, 161, 60 endchannel -; 0x8b97
\ No newline at end of file diff --git a/audio/sfx/sfx_08_21.asm b/audio/sfx/cry0d_2.asm index 4bfaac76..ef4a0eb6 100644 --- a/audio/sfx/sfx_08_21.asm +++ b/audio/sfx/cry0d_2.asm @@ -1,4 +1,4 @@ -SFX_08_21_Ch1: ; 20dd2 (8:4dd2) +SFX_Cry0D_2_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_08_21_Ch1: ; 20dd2 (8:4dd2) unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_08_21_Ch1 + loopchannel 2, SFX_Cry0D_2_Ch4 endchannel -SFX_08_21_Ch2: ; 20df1 (8:4df1) +SFX_Cry0D_2_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_08_21_Ch2: ; 20df1 (8:4df1) endchannel -SFX_08_21_Ch3: ; 20e20 (8:4e20) +SFX_Cry0D_2_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 @@ -38,4 +38,3 @@ SFX_08_21_Ch3: ; 20e20 (8:4e20) unknownnoise0x20 9, 194, 44 unknownnoise0x20 4, 161, 60 endchannel -; 0x20e3f
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_21.asm b/audio/sfx/cry0d_3.asm index 31c600b0..1fbc40b5 100644 --- a/audio/sfx/sfx_1f_21.asm +++ b/audio/sfx/cry0d_3.asm @@ -1,4 +1,4 @@ -SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f) +SFX_Cry0D_3_Ch4: dutycycle 136 unknownsfx0x20 5, 242, 80, 6 unknownsfx0x20 9, 209, 96, 6 @@ -6,11 +6,11 @@ SFX_1f_21_Ch1: ; 7cb9f (1f:4b9f) unknownsfx0x20 9, 193, 34, 6 unknownsfx0x20 5, 242, 16, 6 unknownsfx0x20 6, 209, 32, 6 - loopchannel 2, SFX_1f_21_Ch1 + loopchannel 2, SFX_Cry0D_3_Ch4 endchannel -SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe) +SFX_Cry0D_3_Ch5: dutycycle 64 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 5, 242, 81, 6 @@ -26,7 +26,7 @@ SFX_1f_21_Ch2: ; 7cbbe (1f:4bbe) endchannel -SFX_1f_21_Ch3: ; 7cbed (1f:4bed) +SFX_Cry0D_3_Ch7: unknownnoise0x20 6, 210, 28 unknownnoise0x20 9, 177, 44 unknownnoise0x20 8, 194, 44 @@ -38,4 +38,3 @@ SFX_1f_21_Ch3: ; 7cbed (1f:4bed) unknownnoise0x20 9, 194, 44 unknownnoise0x20 4, 161, 60 endchannel -; 0x7cc0c
\ No newline at end of file diff --git a/audio/sfx/sfx_02_22.asm b/audio/sfx/cry0e_1.asm index 3f7a2783..37cabb7c 100644 --- a/audio/sfx/sfx_02_22.asm +++ b/audio/sfx/cry0e_1.asm @@ -1,4 +1,4 @@ -SFX_02_22_Ch1: ; 89af (2:49af) +SFX_Cry0E_1_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_02_22_Ch1: ; 89af (2:49af) endchannel -SFX_02_22_Ch2: ; 89c2 (2:49c2) +SFX_Cry0E_1_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,9 +16,8 @@ SFX_02_22_Ch2: ; 89c2 (2:49c2) endchannel -SFX_02_22_Ch3: ; 89d5 (2:49d5) +SFX_Cry0E_1_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 endchannel -; 0x89df
\ No newline at end of file diff --git a/audio/sfx/sfx_08_22.asm b/audio/sfx/cry0e_2.asm index b922acb3..5f6f481f 100644 --- a/audio/sfx/sfx_08_22.asm +++ b/audio/sfx/cry0e_2.asm @@ -1,4 +1,4 @@ -SFX_08_22_Ch1: ; 20c57 (8:4c57) +SFX_Cry0E_2_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_08_22_Ch1: ; 20c57 (8:4c57) endchannel -SFX_08_22_Ch2: ; 20c6a (8:4c6a) +SFX_Cry0E_2_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,9 +16,8 @@ SFX_08_22_Ch2: ; 20c6a (8:4c6a) endchannel -SFX_08_22_Ch3: ; 20c7d (8:4c7d) +SFX_Cry0E_2_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 endchannel -; 0x20c87
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_22.asm b/audio/sfx/cry0e_3.asm index a239822f..13cf9405 100644 --- a/audio/sfx/sfx_1f_22.asm +++ b/audio/sfx/cry0e_3.asm @@ -1,4 +1,4 @@ -SFX_1f_22_Ch1: ; 7ca24 (1f:4a24) +SFX_Cry0E_3_Ch4: dutycycle 165 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 4, 242, 128, 7 @@ -7,7 +7,7 @@ SFX_1f_22_Ch1: ; 7ca24 (1f:4a24) endchannel -SFX_1f_22_Ch2: ; 7ca37 (1f:4a37) +SFX_Cry0E_3_Ch5: dutycycle 10 unknownsfx0x20 4, 177, 225, 6 unknownsfx0x20 3, 194, 225, 6 @@ -16,9 +16,8 @@ SFX_1f_22_Ch2: ; 7ca37 (1f:4a37) endchannel -SFX_1f_22_Ch3: ; 7ca4a (1f:4a4a) +SFX_Cry0E_3_Ch7: unknownnoise0x20 2, 97, 50 unknownnoise0x20 2, 97, 33 unknownnoise0x20 8, 97, 17 endchannel -; 0x7ca54
\ No newline at end of file diff --git a/audio/sfx/sfx_02_23.asm b/audio/sfx/cry0f_1.asm index c7e0a345..81abdc09 100644 --- a/audio/sfx/sfx_02_23.asm +++ b/audio/sfx/cry0f_1.asm @@ -1,4 +1,4 @@ -SFX_02_23_Ch1: ; 88f1 (2:48f1) +SFX_Cry0F_1_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_02_23_Ch1: ; 88f1 (2:48f1) endchannel -SFX_02_23_Ch2: ; 890c (2:490c) +SFX_Cry0F_1_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,11 +20,10 @@ SFX_02_23_Ch2: ; 890c (2:490c) endchannel -SFX_02_23_Ch3: ; 8927 (2:4927) +SFX_Cry0F_1_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 unknownnoise0x20 8, 183, 92 unknownnoise0x20 15, 194, 93 endchannel -; 0x8937
\ No newline at end of file diff --git a/audio/sfx/sfx_08_23.asm b/audio/sfx/cry0f_2.asm index 9a78abd2..112b9e8b 100644 --- a/audio/sfx/sfx_08_23.asm +++ b/audio/sfx/cry0f_2.asm @@ -1,4 +1,4 @@ -SFX_08_23_Ch1: ; 20b99 (8:4b99) +SFX_Cry0F_2_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_08_23_Ch1: ; 20b99 (8:4b99) endchannel -SFX_08_23_Ch2: ; 20bb4 (8:4bb4) +SFX_Cry0F_2_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,11 +20,10 @@ SFX_08_23_Ch2: ; 20bb4 (8:4bb4) endchannel -SFX_08_23_Ch3: ; 20bcf (8:4bcf) +SFX_Cry0F_2_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 unknownnoise0x20 8, 183, 92 unknownnoise0x20 15, 194, 93 endchannel -; 0x20bdf
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_23.asm b/audio/sfx/cry0f_3.asm index dd021169..08abd131 100644 --- a/audio/sfx/sfx_1f_23.asm +++ b/audio/sfx/cry0f_3.asm @@ -1,4 +1,4 @@ -SFX_1f_23_Ch1: ; 7c966 (1f:4966) +SFX_Cry0F_3_Ch4: dutycycle 241 unknownsfx0x20 4, 247, 192, 7 unknownsfx0x20 12, 230, 194, 7 @@ -9,7 +9,7 @@ SFX_1f_23_Ch1: ; 7c966 (1f:4966) endchannel -SFX_1f_23_Ch2: ; 7c981 (1f:4981) +SFX_Cry0F_3_Ch5: dutycycle 204 unknownsfx0x20 3, 199, 129, 7 unknownsfx0x20 12, 182, 128, 7 @@ -20,11 +20,10 @@ SFX_1f_23_Ch2: ; 7c981 (1f:4981) endchannel -SFX_1f_23_Ch3: ; 7c99c (1f:499c) +SFX_Cry0F_3_Ch7: unknownnoise0x20 3, 228, 60 unknownnoise0x20 12, 214, 44 unknownnoise0x20 4, 228, 60 unknownnoise0x20 8, 183, 92 unknownnoise0x20 15, 194, 93 endchannel -; 0x7c9ac
\ No newline at end of file diff --git a/audio/sfx/sfx_02_24.asm b/audio/sfx/cry10_1.asm index f092bae9..eef13d3d 100644 --- a/audio/sfx/sfx_02_24.asm +++ b/audio/sfx/cry10_1.asm @@ -1,4 +1,4 @@ -SFX_02_24_Ch1: ; 8937 (2:4937) +SFX_Cry10_1_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_02_24_Ch1: ; 8937 (2:4937) endchannel -SFX_02_24_Ch2: ; 895a (2:495a) +SFX_Cry10_1_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,9 +24,8 @@ SFX_02_24_Ch2: ; 895a (2:495a) endchannel -SFX_02_24_Ch3: ; 897d (2:497d) +SFX_Cry10_1_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 endchannel -; 0x8987
\ No newline at end of file diff --git a/audio/sfx/sfx_08_24.asm b/audio/sfx/cry10_2.asm index 2bdc4e9d..dd468979 100644 --- a/audio/sfx/sfx_08_24.asm +++ b/audio/sfx/cry10_2.asm @@ -1,4 +1,4 @@ -SFX_08_24_Ch1: ; 20bdf (8:4bdf) +SFX_Cry10_2_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_08_24_Ch1: ; 20bdf (8:4bdf) endchannel -SFX_08_24_Ch2: ; 20c02 (8:4c02) +SFX_Cry10_2_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,9 +24,8 @@ SFX_08_24_Ch2: ; 20c02 (8:4c02) endchannel -SFX_08_24_Ch3: ; 20c25 (8:4c25) +SFX_Cry10_2_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 endchannel -; 0x20c2f
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_24.asm b/audio/sfx/cry10_3.asm index 448541e6..e9a5200d 100644 --- a/audio/sfx/sfx_1f_24.asm +++ b/audio/sfx/cry10_3.asm @@ -1,4 +1,4 @@ -SFX_1f_24_Ch1: ; 7c9ac (1f:49ac) +SFX_Cry10_3_Ch4: dutycycle 201 unknownsfx0x20 8, 247, 128, 6 unknownsfx0x20 2, 247, 96, 6 @@ -11,7 +11,7 @@ SFX_1f_24_Ch1: ; 7c9ac (1f:49ac) endchannel -SFX_1f_24_Ch2: ; 7c9cf (1f:49cf) +SFX_Cry10_3_Ch5: dutycycle 121 unknownsfx0x20 10, 231, 130, 6 unknownsfx0x20 2, 231, 98, 6 @@ -24,9 +24,8 @@ SFX_1f_24_Ch2: ; 7c9cf (1f:49cf) endchannel -SFX_1f_24_Ch3: ; 7c9f2 (1f:49f2) +SFX_Cry10_3_Ch7: unknownnoise0x20 4, 116, 33 unknownnoise0x20 4, 116, 16 unknownnoise0x20 4, 113, 32 endchannel -; 0x7c9fc
\ No newline at end of file diff --git a/audio/sfx/sfx_02_25.asm b/audio/sfx/cry11_1.asm index 4025d4f7..f7c314ef 100644 --- a/audio/sfx/sfx_02_25.asm +++ b/audio/sfx/cry11_1.asm @@ -1,4 +1,4 @@ -SFX_02_25_Ch1: ; 8813 (2:4813) +SFX_Cry11_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_02_25_Ch1: ; 8813 (2:4813) endchannel -SFX_02_25_Ch2: ; 8832 (2:4832) +SFX_Cry11_1_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_02_25_Ch2: ; 8832 (2:4832) endchannel -SFX_02_25_Ch3: ; 8855 (2:4855) +SFX_Cry11_1_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 @@ -32,4 +32,3 @@ SFX_02_25_Ch3: ; 8855 (2:4855) unknownnoise0x20 12, 210, 61 unknownnoise0x20 8, 209, 44 endchannel -; 0x886b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_25.asm b/audio/sfx/cry11_2.asm index 84f8f816..0009a0ec 100644 --- a/audio/sfx/sfx_08_25.asm +++ b/audio/sfx/cry11_2.asm @@ -1,4 +1,4 @@ -SFX_08_25_Ch1: ; 20abb (8:4abb) +SFX_Cry11_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_08_25_Ch1: ; 20abb (8:4abb) endchannel -SFX_08_25_Ch2: ; 20ada (8:4ada) +SFX_Cry11_2_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_08_25_Ch2: ; 20ada (8:4ada) endchannel -SFX_08_25_Ch3: ; 20afd (8:4afd) +SFX_Cry11_2_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 @@ -32,4 +32,3 @@ SFX_08_25_Ch3: ; 20afd (8:4afd) unknownnoise0x20 12, 210, 61 unknownnoise0x20 8, 209, 44 endchannel -; 0x20b13
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_25.asm b/audio/sfx/cry11_3.asm index b0db2369..a8af19f6 100644 --- a/audio/sfx/sfx_1f_25.asm +++ b/audio/sfx/cry11_3.asm @@ -1,4 +1,4 @@ -SFX_1f_25_Ch1: ; 7c888 (1f:4888) +SFX_Cry11_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 160, 7 unknownsfx0x20 8, 230, 164, 7 @@ -10,7 +10,7 @@ SFX_1f_25_Ch1: ; 7c888 (1f:4888) endchannel -SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7) +SFX_Cry11_3_Ch5: dutycycle 10 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 6, 167, 65, 7 @@ -23,7 +23,7 @@ SFX_1f_25_Ch2: ; 7c8a7 (1f:48a7) endchannel -SFX_1f_25_Ch3: ; 7c8ca (1f:48ca) +SFX_Cry11_3_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 230, 58 unknownnoise0x20 4, 215, 58 @@ -32,4 +32,3 @@ SFX_1f_25_Ch3: ; 7c8ca (1f:48ca) unknownnoise0x20 12, 210, 61 unknownnoise0x20 8, 209, 44 endchannel -; 0x7c8e0
\ No newline at end of file diff --git a/audio/sfx/sfx_02_26.asm b/audio/sfx/cry12_1.asm index eae085f4..29d93eff 100644 --- a/audio/sfx/sfx_02_26.asm +++ b/audio/sfx/cry12_1.asm @@ -1,4 +1,4 @@ -SFX_02_26_Ch1: ; 8d2b (2:4d2b) +SFX_Cry12_1_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_02_26_Ch1: ; 8d2b (2:4d2b) endchannel -SFX_02_26_Ch2: ; 8d3e (2:4d3e) +SFX_Cry12_1_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,10 +16,9 @@ SFX_02_26_Ch2: ; 8d3e (2:4d3e) endchannel -SFX_02_26_Ch3: ; 8d51 (2:4d51) +SFX_Cry12_1_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 unknownnoise0x20 8, 209, 92 endchannel -; 0x8d5e
\ No newline at end of file diff --git a/audio/sfx/sfx_08_26.asm b/audio/sfx/cry12_2.asm index 90ae7cb9..90f373c0 100644 --- a/audio/sfx/sfx_08_26.asm +++ b/audio/sfx/cry12_2.asm @@ -1,4 +1,4 @@ -SFX_08_26_Ch1: ; 20fd3 (8:4fd3) +SFX_Cry12_2_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_08_26_Ch1: ; 20fd3 (8:4fd3) endchannel -SFX_08_26_Ch2: ; 20fe6 (8:4fe6) +SFX_Cry12_2_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,10 +16,9 @@ SFX_08_26_Ch2: ; 20fe6 (8:4fe6) endchannel -SFX_08_26_Ch3: ; 20ff9 (8:4ff9) +SFX_Cry12_2_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 unknownnoise0x20 8, 209, 92 endchannel -; 0x21006
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_26.asm b/audio/sfx/cry12_3.asm index f0b205d5..f2c012ae 100644 --- a/audio/sfx/sfx_1f_26.asm +++ b/audio/sfx/cry12_3.asm @@ -1,4 +1,4 @@ -SFX_1f_26_Ch1: ; 7cda0 (1f:4da0) +SFX_Cry12_3_Ch4: dutycycle 165 unknownsfx0x20 12, 242, 64, 4 unknownsfx0x20 15, 227, 160, 4 @@ -7,7 +7,7 @@ SFX_1f_26_Ch1: ; 7cda0 (1f:4da0) endchannel -SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3) +SFX_Cry12_3_Ch5: dutycycle 238 unknownsfx0x20 11, 210, 56, 4 unknownsfx0x20 14, 198, 152, 4 @@ -16,10 +16,9 @@ SFX_1f_26_Ch2: ; 7cdb3 (1f:4db3) endchannel -SFX_1f_26_Ch3: ; 7cdc6 (1f:4dc6) +SFX_Cry12_3_Ch7: unknownnoise0x20 10, 230, 108 unknownnoise0x20 15, 210, 92 unknownnoise0x20 3, 194, 108 unknownnoise0x20 8, 209, 92 endchannel -; 0x7cdd3
\ No newline at end of file diff --git a/audio/sfx/sfx_02_27.asm b/audio/sfx/cry13_1.asm index c019aab3..703db728 100644 --- a/audio/sfx/sfx_02_27.asm +++ b/audio/sfx/cry13_1.asm @@ -1,4 +1,4 @@ -SFX_02_27_Ch1: ; 8d5e (2:4d5e) +SFX_Cry13_1_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_02_27_Ch1: ; 8d5e (2:4d5e) endchannel -SFX_02_27_Ch2: ; 8d79 (2:4d79) +SFX_Cry13_1_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_02_27_Ch2: ; 8d79 (2:4d79) endchannel -SFX_02_27_Ch3: ; 8d94 (2:4d94) +SFX_Cry13_1_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 @@ -28,4 +28,3 @@ SFX_02_27_Ch3: ; 8d94 (2:4d94) unknownnoise0x20 8, 179, 76 unknownnoise0x20 8, 161, 92 endchannel -; 0x8da7
\ No newline at end of file diff --git a/audio/sfx/sfx_08_27.asm b/audio/sfx/cry13_2.asm index 6eb9474d..7d75853c 100644 --- a/audio/sfx/sfx_08_27.asm +++ b/audio/sfx/cry13_2.asm @@ -1,4 +1,4 @@ -SFX_08_27_Ch1: ; 21006 (8:5006) +SFX_Cry13_2_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_08_27_Ch1: ; 21006 (8:5006) endchannel -SFX_08_27_Ch2: ; 21021 (8:5021) +SFX_Cry13_2_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_08_27_Ch2: ; 21021 (8:5021) endchannel -SFX_08_27_Ch3: ; 2103c (8:503c) +SFX_Cry13_2_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 @@ -28,4 +28,3 @@ SFX_08_27_Ch3: ; 2103c (8:503c) unknownnoise0x20 8, 179, 76 unknownnoise0x20 8, 161, 92 endchannel -; 0x2104f
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_27.asm b/audio/sfx/cry13_3.asm index de7adafb..53296f1a 100644 --- a/audio/sfx/sfx_1f_27.asm +++ b/audio/sfx/cry13_3.asm @@ -1,4 +1,4 @@ -SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3) +SFX_Cry13_3_Ch4: dutycycle 51 unknownsfx0x20 15, 246, 192, 5 unknownsfx0x20 8, 227, 188, 5 @@ -9,7 +9,7 @@ SFX_1f_27_Ch1: ; 7cdd3 (1f:4dd3) endchannel -SFX_1f_27_Ch2: ; 7cdee (1f:4dee) +SFX_Cry13_3_Ch5: dutycycle 153 unknownsfx0x20 14, 198, 177, 4 unknownsfx0x20 7, 195, 173, 4 @@ -20,7 +20,7 @@ SFX_1f_27_Ch2: ; 7cdee (1f:4dee) endchannel -SFX_1f_27_Ch3: ; 7ce09 (1f:4e09) +SFX_Cry13_3_Ch7: unknownnoise0x20 10, 230, 92 unknownnoise0x20 10, 214, 108 unknownnoise0x20 4, 194, 76 @@ -28,4 +28,3 @@ SFX_1f_27_Ch3: ; 7ce09 (1f:4e09) unknownnoise0x20 8, 179, 76 unknownnoise0x20 8, 161, 92 endchannel -; 0x7ce1c
\ No newline at end of file diff --git a/audio/sfx/sfx_02_28.asm b/audio/sfx/cry14_1.asm index c183df6b..fa8964de 100644 --- a/audio/sfx/sfx_02_28.asm +++ b/audio/sfx/cry14_1.asm @@ -1,4 +1,4 @@ -SFX_02_28_Ch1: ; 8da7 (2:4da7) +SFX_Cry14_1_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_02_28_Ch1: ; 8da7 (2:4da7) endchannel -SFX_02_28_Ch2: ; 8db6 (2:4db6) +SFX_Cry14_1_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,9 +14,8 @@ SFX_02_28_Ch2: ; 8db6 (2:4db6) endchannel -SFX_02_28_Ch3: ; 8dc5 (2:4dc5) +SFX_Cry14_1_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 endchannel -; 0x8dcf
\ No newline at end of file diff --git a/audio/sfx/sfx_08_28.asm b/audio/sfx/cry14_2.asm index 2d6b2a3c..1f70dca8 100644 --- a/audio/sfx/sfx_08_28.asm +++ b/audio/sfx/cry14_2.asm @@ -1,4 +1,4 @@ -SFX_08_28_Ch1: ; 2104f (8:504f) +SFX_Cry14_2_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_08_28_Ch1: ; 2104f (8:504f) endchannel -SFX_08_28_Ch2: ; 2105e (8:505e) +SFX_Cry14_2_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,9 +14,8 @@ SFX_08_28_Ch2: ; 2105e (8:505e) endchannel -SFX_08_28_Ch3: ; 2106d (8:506d) +SFX_Cry14_2_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 endchannel -; 0x21077
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_28.asm b/audio/sfx/cry14_3.asm index c76c94a7..3bab2100 100644 --- a/audio/sfx/sfx_1f_28.asm +++ b/audio/sfx/cry14_3.asm @@ -1,4 +1,4 @@ -SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c) +SFX_Cry14_3_Ch4: dutycycle 240 unknownsfx0x20 8, 228, 144, 7 unknownsfx0x20 15, 245, 192, 7 @@ -6,7 +6,7 @@ SFX_1f_28_Ch1: ; 7ce1c (1f:4e1c) endchannel -SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b) +SFX_Cry14_3_Ch5: dutycycle 165 unknownsfx0x20 10, 196, 113, 7 unknownsfx0x20 15, 182, 162, 7 @@ -14,9 +14,8 @@ SFX_1f_28_Ch2: ; 7ce2b (1f:4e2b) endchannel -SFX_1f_28_Ch3: ; 7ce3a (1f:4e3a) +SFX_Cry14_3_Ch7: unknownnoise0x20 8, 228, 76 unknownnoise0x20 14, 196, 60 unknownnoise0x20 8, 209, 44 endchannel -; 0x7ce44
\ No newline at end of file diff --git a/audio/sfx/sfx_02_29.asm b/audio/sfx/cry15_1.asm index 872fa90a..0220ad4f 100644 --- a/audio/sfx/sfx_02_29.asm +++ b/audio/sfx/cry15_1.asm @@ -1,4 +1,4 @@ -SFX_02_29_Ch1: ; 8e35 (2:4e35) +SFX_Cry15_1_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_02_29_Ch1: ; 8e35 (2:4e35) endchannel -SFX_02_29_Ch2: ; 8e50 (2:4e50) +SFX_Cry15_1_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_02_29_Ch2: ; 8e50 (2:4e50) endchannel -SFX_02_29_Ch3: ; 8e6b (2:4e6b) +SFX_Cry15_1_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 @@ -28,4 +28,3 @@ SFX_02_29_Ch3: ; 8e6b (2:4e6b) unknownnoise0x20 3, 162, 92 unknownnoise0x20 8, 177, 108 endchannel -; 0x8e7e
\ No newline at end of file diff --git a/audio/sfx/sfx_08_29.asm b/audio/sfx/cry15_2.asm index 66842f0a..2ebd7ab0 100644 --- a/audio/sfx/sfx_08_29.asm +++ b/audio/sfx/cry15_2.asm @@ -1,4 +1,4 @@ -SFX_08_29_Ch1: ; 210dd (8:50dd) +SFX_Cry15_2_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_08_29_Ch1: ; 210dd (8:50dd) endchannel -SFX_08_29_Ch2: ; 210f8 (8:50f8) +SFX_Cry15_2_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_08_29_Ch2: ; 210f8 (8:50f8) endchannel -SFX_08_29_Ch3: ; 21113 (8:5113) +SFX_Cry15_2_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 @@ -28,4 +28,3 @@ SFX_08_29_Ch3: ; 21113 (8:5113) unknownnoise0x20 3, 162, 92 unknownnoise0x20 8, 177, 108 endchannel -; 0x21126
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_29.asm b/audio/sfx/cry15_3.asm index bc19ea3b..39ba7a74 100644 --- a/audio/sfx/sfx_1f_29.asm +++ b/audio/sfx/cry15_3.asm @@ -1,4 +1,4 @@ -SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa) +SFX_Cry15_3_Ch4: dutycycle 240 unknownsfx0x20 4, 243, 128, 7 unknownsfx0x20 15, 231, 0, 7 @@ -9,7 +9,7 @@ SFX_1f_29_Ch1: ; 7ceaa (1f:4eaa) endchannel -SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5) +SFX_Cry15_3_Ch5: dutycycle 90 unknownsfx0x20 6, 195, 1, 7 unknownsfx0x20 14, 183, 129, 6 @@ -20,7 +20,7 @@ SFX_1f_29_Ch2: ; 7cec5 (1f:4ec5) endchannel -SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0) +SFX_Cry15_3_Ch7: unknownnoise0x20 6, 227, 92 unknownnoise0x20 14, 214, 76 unknownnoise0x20 6, 198, 60 @@ -28,4 +28,3 @@ SFX_1f_29_Ch3: ; 7cee0 (1f:4ee0) unknownnoise0x20 3, 162, 92 unknownnoise0x20 8, 177, 108 endchannel -; 0x7cef3
\ No newline at end of file diff --git a/audio/sfx/sfx_02_2a.asm b/audio/sfx/cry16_1.asm index f5313860..34d6f6d9 100644 --- a/audio/sfx/sfx_02_2a.asm +++ b/audio/sfx/cry16_1.asm @@ -1,4 +1,4 @@ -SFX_02_2a_Ch1: ; 8cc8 (2:4cc8) +SFX_Cry16_1_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_02_2a_Ch1: ; 8cc8 (2:4cc8) endchannel -SFX_02_2a_Ch2: ; 8cd7 (2:4cd7) +SFX_Cry16_1_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,9 +14,8 @@ SFX_02_2a_Ch2: ; 8cd7 (2:4cd7) endchannel -SFX_02_2a_Ch3: ; 8ce6 (2:4ce6) +SFX_Cry16_1_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 endchannel -; 0x8cf0
\ No newline at end of file diff --git a/audio/sfx/sfx_08_2a.asm b/audio/sfx/cry16_2.asm index d3494708..8948cd29 100644 --- a/audio/sfx/sfx_08_2a.asm +++ b/audio/sfx/cry16_2.asm @@ -1,4 +1,4 @@ -SFX_08_2a_Ch1: ; 20f70 (8:4f70) +SFX_Cry16_2_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_08_2a_Ch1: ; 20f70 (8:4f70) endchannel -SFX_08_2a_Ch2: ; 20f7f (8:4f7f) +SFX_Cry16_2_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,9 +14,8 @@ SFX_08_2a_Ch2: ; 20f7f (8:4f7f) endchannel -SFX_08_2a_Ch3: ; 20f8e (8:4f8e) +SFX_Cry16_2_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 endchannel -; 0x20f98
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_2a.asm b/audio/sfx/cry16_3.asm index b91e4c2e..026ee67b 100644 --- a/audio/sfx/sfx_1f_2a.asm +++ b/audio/sfx/cry16_3.asm @@ -1,4 +1,4 @@ -SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d) +SFX_Cry16_3_Ch4: dutycycle 240 unknownsfx0x20 15, 215, 128, 7 unknownsfx0x20 4, 230, 160, 7 @@ -6,7 +6,7 @@ SFX_1f_2a_Ch1: ; 7cd3d (1f:4d3d) endchannel -SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c) +SFX_Cry16_3_Ch5: dutycycle 90 unknownsfx0x20 15, 199, 83, 7 unknownsfx0x20 5, 182, 114, 7 @@ -14,9 +14,8 @@ SFX_1f_2a_Ch2: ; 7cd4c (1f:4d4c) endchannel -SFX_1f_2a_Ch3: ; 7cd5b (1f:4d5b) +SFX_Cry16_3_Ch7: unknownnoise0x20 13, 246, 76 unknownnoise0x20 4, 230, 60 unknownnoise0x20 15, 242, 76 endchannel -; 0x7cd65
\ No newline at end of file diff --git a/audio/sfx/sfx_02_2b.asm b/audio/sfx/cry17_1.asm index c0792c94..97dec764 100644 --- a/audio/sfx/sfx_02_2b.asm +++ b/audio/sfx/cry17_1.asm @@ -1,4 +1,4 @@ -SFX_02_2b_Ch1: ; 8e7e (2:4e7e) +SFX_Cry17_1_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_02_2b_Ch1: ; 8e7e (2:4e7e) endchannel -SFX_02_2b_Ch2: ; 8e91 (2:4e91) +SFX_Cry17_1_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,10 +16,9 @@ SFX_02_2b_Ch2: ; 8e91 (2:4e91) endchannel -SFX_02_2b_Ch3: ; 8ea4 (2:4ea4) +SFX_Cry17_1_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 unknownnoise0x20 15, 226, 108 endchannel -; 0x8eb1
\ No newline at end of file diff --git a/audio/sfx/sfx_08_2b.asm b/audio/sfx/cry17_2.asm index 301c9712..a6ab03a2 100644 --- a/audio/sfx/sfx_08_2b.asm +++ b/audio/sfx/cry17_2.asm @@ -1,4 +1,4 @@ -SFX_08_2b_Ch1: ; 21126 (8:5126) +SFX_Cry17_2_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_08_2b_Ch1: ; 21126 (8:5126) endchannel -SFX_08_2b_Ch2: ; 21139 (8:5139) +SFX_Cry17_2_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,10 +16,9 @@ SFX_08_2b_Ch2: ; 21139 (8:5139) endchannel -SFX_08_2b_Ch3: ; 2114c (8:514c) +SFX_Cry17_2_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 unknownnoise0x20 15, 226, 108 endchannel -; 0x21159
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_2b.asm b/audio/sfx/cry17_3.asm index da51e7c9..53555206 100644 --- a/audio/sfx/sfx_1f_2b.asm +++ b/audio/sfx/cry17_3.asm @@ -1,4 +1,4 @@ -SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3) +SFX_Cry17_3_Ch4: dutycycle 15 unknownsfx0x20 15, 247, 0, 5 unknownsfx0x20 15, 231, 8, 5 @@ -7,7 +7,7 @@ SFX_1f_2b_Ch1: ; 7cef3 (1f:4ef3) endchannel -SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06) +SFX_Cry17_3_Ch5: dutycycle 68 unknownsfx0x20 14, 215, 129, 4 unknownsfx0x20 14, 199, 137, 4 @@ -16,10 +16,9 @@ SFX_1f_2b_Ch2: ; 7cf06 (1f:4f06) endchannel -SFX_1f_2b_Ch3: ; 7cf19 (1f:4f19) +SFX_Cry17_3_Ch7: unknownnoise0x20 14, 247, 124 unknownnoise0x20 12, 246, 108 unknownnoise0x20 9, 228, 124 unknownnoise0x20 15, 226, 108 endchannel -; 0x7cf26
\ No newline at end of file diff --git a/audio/sfx/sfx_02_2c.asm b/audio/sfx/cry18_1.asm index e923c9e1..8cb3283f 100644 --- a/audio/sfx/sfx_02_2c.asm +++ b/audio/sfx/cry18_1.asm @@ -1,4 +1,4 @@ -SFX_02_2c_Ch1: ; 8f8e (2:4f8e) +SFX_Cry18_1_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_02_2c_Ch1: ; 8f8e (2:4f8e) endchannel -SFX_02_2c_Ch2: ; 8fb1 (2:4fb1) +SFX_Cry18_1_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_02_2c_Ch2: ; 8fb1 (2:4fb1) endchannel -SFX_02_2c_Ch3: ; 8fd4 (2:4fd4) +SFX_Cry18_1_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 @@ -32,4 +32,3 @@ SFX_02_2c_Ch3: ; 8fd4 (2:4fd4) unknownnoise0x20 6, 180, 60 unknownnoise0x20 8, 193, 44 endchannel -; 0x8fe7
\ No newline at end of file diff --git a/audio/sfx/sfx_08_2c.asm b/audio/sfx/cry18_2.asm index d3844d4a..01dacd5f 100644 --- a/audio/sfx/sfx_08_2c.asm +++ b/audio/sfx/cry18_2.asm @@ -1,4 +1,4 @@ -SFX_08_2c_Ch1: ; 21236 (8:5236) +SFX_Cry18_2_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_08_2c_Ch1: ; 21236 (8:5236) endchannel -SFX_08_2c_Ch2: ; 21259 (8:5259) +SFX_Cry18_2_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_08_2c_Ch2: ; 21259 (8:5259) endchannel -SFX_08_2c_Ch3: ; 2127c (8:527c) +SFX_Cry18_2_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 @@ -32,4 +32,3 @@ SFX_08_2c_Ch3: ; 2127c (8:527c) unknownnoise0x20 6, 180, 60 unknownnoise0x20 8, 193, 44 endchannel -; 0x2128f
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_2c.asm b/audio/sfx/cry18_3.asm index a480b584..23d2d6a6 100644 --- a/audio/sfx/sfx_1f_2c.asm +++ b/audio/sfx/cry18_3.asm @@ -1,4 +1,4 @@ -SFX_1f_2c_Ch1: ; 7d003 (1f:5003) +SFX_Cry18_3_Ch4: dutycycle 80 unknownsfx0x20 10, 245, 128, 6 unknownsfx0x20 3, 226, 160, 6 @@ -11,7 +11,7 @@ SFX_1f_2c_Ch1: ; 7d003 (1f:5003) endchannel -SFX_1f_2c_Ch2: ; 7d026 (1f:5026) +SFX_Cry18_3_Ch5: dutycycle 15 unknownsfx0x20 9, 213, 49, 6 unknownsfx0x20 3, 210, 82, 6 @@ -24,7 +24,7 @@ SFX_1f_2c_Ch2: ; 7d026 (1f:5026) endchannel -SFX_1f_2c_Ch3: ; 7d049 (1f:5049) +SFX_Cry18_3_Ch7: unknownnoise0x20 6, 227, 76 unknownnoise0x20 4, 195, 60 unknownnoise0x20 5, 212, 60 @@ -32,4 +32,3 @@ SFX_1f_2c_Ch3: ; 7d049 (1f:5049) unknownnoise0x20 6, 180, 60 unknownnoise0x20 8, 193, 44 endchannel -; 0x7d05c
\ No newline at end of file diff --git a/audio/sfx/sfx_02_2d.asm b/audio/sfx/cry19_1.asm index 70e71eb1..2e6790e5 100644 --- a/audio/sfx/sfx_02_2d.asm +++ b/audio/sfx/cry19_1.asm @@ -1,4 +1,4 @@ -SFX_02_2d_Ch1: ; 8ca6 (2:4ca6) +SFX_Cry19_1_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_02_2d_Ch1: ; 8ca6 (2:4ca6) endchannel -SFX_02_2d_Ch2: ; 8cb5 (2:4cb5) +SFX_Cry19_1_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,6 +14,5 @@ SFX_02_2d_Ch2: ; 8cb5 (2:4cb5) unknownsfx0x20 15, 162, 1, 7 -SFX_02_2d_Ch3: ; 8cc7 (2:4cc7) +SFX_Cry19_1_Ch7: endchannel -; 0x8cc8
\ No newline at end of file diff --git a/audio/sfx/sfx_08_2d.asm b/audio/sfx/cry19_2.asm index 3e28d648..f412ec14 100644 --- a/audio/sfx/sfx_08_2d.asm +++ b/audio/sfx/cry19_2.asm @@ -1,4 +1,4 @@ -SFX_08_2d_Ch1: ; 20f4e (8:4f4e) +SFX_Cry19_2_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_08_2d_Ch1: ; 20f4e (8:4f4e) endchannel -SFX_08_2d_Ch2: ; 20f5d (8:4f5d) +SFX_Cry19_2_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,6 +14,5 @@ SFX_08_2d_Ch2: ; 20f5d (8:4f5d) unknownsfx0x20 15, 162, 1, 7 -SFX_08_2d_Ch3: ; 20f6f (8:4f6f) +SFX_Cry19_2_Ch7: endchannel -; 0x20f70
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_2d.asm b/audio/sfx/cry19_3.asm index f4c4ecd9..2baff05e 100644 --- a/audio/sfx/sfx_1f_2d.asm +++ b/audio/sfx/cry19_3.asm @@ -1,4 +1,4 @@ -SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b) +SFX_Cry19_3_Ch4: dutycycle 27 unknownsfx0x20 7, 210, 64, 7 unknownsfx0x20 15, 229, 96, 7 @@ -6,7 +6,7 @@ SFX_1f_2d_Ch1: ; 7cd1b (1f:4d1b) endchannel -SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a) +SFX_Cry19_3_Ch5: dutycycle 129 unknownsfx0x20 2, 194, 1, 7 unknownsfx0x20 4, 194, 8, 7 @@ -14,6 +14,5 @@ SFX_1f_2d_Ch2: ; 7cd2a (1f:4d2a) unknownsfx0x20 15, 162, 1, 7 -SFX_1f_2d_Ch3: ; 7cd3c (1f:4d3c) +SFX_Cry19_3_Ch7: endchannel -; 0x7cd3d
\ No newline at end of file diff --git a/audio/sfx/sfx_02_2e.asm b/audio/sfx/cry1a_1.asm index d95bfbe3..5d03596e 100644 --- a/audio/sfx/sfx_02_2e.asm +++ b/audio/sfx/cry1a_1.asm @@ -1,4 +1,4 @@ -SFX_02_2e_Ch1: ; 8eff (2:4eff) +SFX_Cry1A_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_02_2e_Ch1: ; 8eff (2:4eff) endchannel -SFX_02_2e_Ch2: ; 8f1a (2:4f1a) +SFX_Cry1A_1_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_02_2e_Ch2: ; 8f1a (2:4f1a) endchannel -SFX_02_2e_Ch3: ; 8f35 (2:4f35) +SFX_Cry1A_1_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 @@ -28,4 +28,3 @@ SFX_02_2e_Ch3: ; 8f35 (2:4f35) unknownnoise0x20 2, 226, 60 unknownnoise0x20 8, 209, 44 endchannel -; 0x8f48
\ No newline at end of file diff --git a/audio/sfx/sfx_08_2e.asm b/audio/sfx/cry1a_2.asm index fea62a2f..4dcf2a42 100644 --- a/audio/sfx/sfx_08_2e.asm +++ b/audio/sfx/cry1a_2.asm @@ -1,4 +1,4 @@ -SFX_08_2e_Ch1: ; 211a7 (8:51a7) +SFX_Cry1A_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_08_2e_Ch1: ; 211a7 (8:51a7) endchannel -SFX_08_2e_Ch2: ; 211c2 (8:51c2) +SFX_Cry1A_2_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_08_2e_Ch2: ; 211c2 (8:51c2) endchannel -SFX_08_2e_Ch3: ; 211dd (8:51dd) +SFX_Cry1A_2_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 @@ -28,4 +28,3 @@ SFX_08_2e_Ch3: ; 211dd (8:51dd) unknownnoise0x20 2, 226, 60 unknownnoise0x20 8, 209, 44 endchannel -; 0x211f0
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_2e.asm b/audio/sfx/cry1a_3.asm index 2c72b5a1..274ce438 100644 --- a/audio/sfx/sfx_1f_2e.asm +++ b/audio/sfx/cry1a_3.asm @@ -1,4 +1,4 @@ -SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74) +SFX_Cry1A_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 64, 7 unknownsfx0x20 12, 230, 68, 7 @@ -9,7 +9,7 @@ SFX_1f_2e_Ch1: ; 7cf74 (1f:4f74) endchannel -SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f) +SFX_Cry1A_3_Ch5: dutycycle 10 unknownsfx0x20 6, 199, 1, 7 unknownsfx0x20 11, 182, 2, 7 @@ -20,7 +20,7 @@ SFX_1f_2e_Ch2: ; 7cf8f (1f:4f8f) endchannel -SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa) +SFX_Cry1A_3_Ch7: unknownnoise0x20 3, 226, 60 unknownnoise0x20 8, 214, 76 unknownnoise0x20 5, 212, 60 @@ -28,4 +28,3 @@ SFX_1f_2e_Ch3: ; 7cfaa (1f:4faa) unknownnoise0x20 2, 226, 60 unknownnoise0x20 8, 209, 44 endchannel -; 0x7cfbd
\ No newline at end of file diff --git a/audio/sfx/sfx_02_2f.asm b/audio/sfx/cry1b_1.asm index 08ea2788..562239c7 100644 --- a/audio/sfx/sfx_02_2f.asm +++ b/audio/sfx/cry1b_1.asm @@ -1,4 +1,4 @@ -SFX_02_2f_Ch1: ; 8cf0 (2:4cf0) +SFX_Cry1B_1_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_02_2f_Ch1: ; 8cf0 (2:4cf0) endchannel -SFX_02_2f_Ch2: ; 8d07 (2:4d07) +SFX_Cry1B_1_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,10 +18,9 @@ SFX_02_2f_Ch2: ; 8d07 (2:4d07) endchannel -SFX_02_2f_Ch3: ; 8d1e (2:4d1e) +SFX_Cry1B_1_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 unknownnoise0x20 8, 145, 44 endchannel -; 0x8d2b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_2f.asm b/audio/sfx/cry1b_2.asm index fcfa40e0..45bb41a2 100644 --- a/audio/sfx/sfx_08_2f.asm +++ b/audio/sfx/cry1b_2.asm @@ -1,4 +1,4 @@ -SFX_08_2f_Ch1: ; 20f98 (8:4f98) +SFX_Cry1B_2_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_08_2f_Ch1: ; 20f98 (8:4f98) endchannel -SFX_08_2f_Ch2: ; 20faf (8:4faf) +SFX_Cry1B_2_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,10 +18,9 @@ SFX_08_2f_Ch2: ; 20faf (8:4faf) endchannel -SFX_08_2f_Ch3: ; 20fc6 (8:4fc6) +SFX_Cry1B_2_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 unknownnoise0x20 8, 145, 44 endchannel -; 0x20fd3
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_2f.asm b/audio/sfx/cry1b_3.asm index 9b0bf71b..e6e31b00 100644 --- a/audio/sfx/sfx_1f_2f.asm +++ b/audio/sfx/cry1b_3.asm @@ -1,4 +1,4 @@ -SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65) +SFX_Cry1B_3_Ch4: dutycycle 240 unknownsfx0x20 6, 247, 192, 6 unknownsfx0x20 15, 231, 0, 7 @@ -8,7 +8,7 @@ SFX_1f_2f_Ch1: ; 7cd65 (1f:4d65) endchannel -SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c) +SFX_Cry1B_3_Ch5: dutycycle 10 unknownsfx0x20 7, 230, 129, 6 unknownsfx0x20 14, 213, 193, 6 @@ -18,10 +18,9 @@ SFX_1f_2f_Ch2: ; 7cd7c (1f:4d7c) endchannel -SFX_1f_2f_Ch3: ; 7cd93 (1f:4d93) +SFX_Cry1B_3_Ch7: unknownnoise0x20 10, 166, 60 unknownnoise0x20 14, 148, 44 unknownnoise0x20 5, 163, 60 unknownnoise0x20 8, 145, 44 endchannel -; 0x7cda0
\ No newline at end of file diff --git a/audio/sfx/sfx_02_30.asm b/audio/sfx/cry1c_1.asm index 7131fc1a..332b7da8 100644 --- a/audio/sfx/sfx_02_30.asm +++ b/audio/sfx/cry1c_1.asm @@ -1,4 +1,4 @@ -SFX_02_30_Ch1: ; 8eb1 (2:4eb1) +SFX_Cry1C_1_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_02_30_Ch1: ; 8eb1 (2:4eb1) endchannel -SFX_02_30_Ch2: ; 8ed4 (2:4ed4) +SFX_Cry1C_1_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,11 +22,10 @@ SFX_02_30_Ch2: ; 8ed4 (2:4ed4) endchannel -SFX_02_30_Ch3: ; 8eef (2:4eef) +SFX_Cry1C_1_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 unknownnoise0x20 8, 196, 108 unknownnoise0x20 15, 179, 92 endchannel -; 0x8eff
\ No newline at end of file diff --git a/audio/sfx/sfx_08_30.asm b/audio/sfx/cry1c_2.asm index 600b72f2..aee95be5 100644 --- a/audio/sfx/sfx_08_30.asm +++ b/audio/sfx/cry1c_2.asm @@ -1,4 +1,4 @@ -SFX_08_30_Ch1: ; 21159 (8:5159) +SFX_Cry1C_2_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_08_30_Ch1: ; 21159 (8:5159) endchannel -SFX_08_30_Ch2: ; 2117c (8:517c) +SFX_Cry1C_2_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,11 +22,10 @@ SFX_08_30_Ch2: ; 2117c (8:517c) endchannel -SFX_08_30_Ch3: ; 21197 (8:5197) +SFX_Cry1C_2_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 unknownnoise0x20 8, 196, 108 unknownnoise0x20 15, 179, 92 endchannel -; 0x211a7
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_30.asm b/audio/sfx/cry1c_3.asm index b6833986..13e687f6 100644 --- a/audio/sfx/sfx_1f_30.asm +++ b/audio/sfx/cry1c_3.asm @@ -1,4 +1,4 @@ -SFX_1f_30_Ch1: ; 7cf26 (1f:4f26) +SFX_Cry1C_3_Ch4: dutycycle 245 unknownsfx0x20 7, 214, 225, 7 unknownsfx0x20 6, 198, 226, 7 @@ -11,7 +11,7 @@ SFX_1f_30_Ch1: ; 7cf26 (1f:4f26) endchannel -SFX_1f_30_Ch2: ; 7cf49 (1f:4f49) +SFX_Cry1C_3_Ch5: dutycycle 68 unknownsfx0x20 6, 195, 201, 7 unknownsfx0x20 6, 179, 199, 7 @@ -22,11 +22,10 @@ SFX_1f_30_Ch2: ; 7cf49 (1f:4f49) endchannel -SFX_1f_30_Ch3: ; 7cf64 (1f:4f64) +SFX_Cry1C_3_Ch7: unknownnoise0x20 13, 25, 124 unknownnoise0x20 13, 247, 140 unknownnoise0x20 12, 214, 124 unknownnoise0x20 8, 196, 108 unknownnoise0x20 15, 179, 92 endchannel -; 0x7cf74
\ No newline at end of file diff --git a/audio/sfx/sfx_02_31.asm b/audio/sfx/cry1d_1.asm index 79d09433..4e7b6308 100644 --- a/audio/sfx/sfx_02_31.asm +++ b/audio/sfx/cry1d_1.asm @@ -1,4 +1,4 @@ -SFX_02_31_Ch1: ; 8f48 (2:4f48) +SFX_Cry1D_1_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_02_31_Ch1: ; 8f48 (2:4f48) endchannel -SFX_02_31_Ch2: ; 8f63 (2:4f63) +SFX_Cry1D_1_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,11 +20,10 @@ SFX_02_31_Ch2: ; 8f63 (2:4f63) endchannel -SFX_02_31_Ch3: ; 8f7e (2:4f7e) +SFX_Cry1D_1_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 unknownnoise0x20 1, 178, 91 unknownnoise0x20 15, 194, 76 endchannel -; 0x8f8e
\ No newline at end of file diff --git a/audio/sfx/sfx_08_31.asm b/audio/sfx/cry1d_2.asm index d43791b0..9ee56bf8 100644 --- a/audio/sfx/sfx_08_31.asm +++ b/audio/sfx/cry1d_2.asm @@ -1,4 +1,4 @@ -SFX_08_31_Ch1: ; 211f0 (8:51f0) +SFX_Cry1D_2_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_08_31_Ch1: ; 211f0 (8:51f0) endchannel -SFX_08_31_Ch2: ; 2120b (8:520b) +SFX_Cry1D_2_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,11 +20,10 @@ SFX_08_31_Ch2: ; 2120b (8:520b) endchannel -SFX_08_31_Ch3: ; 21226 (8:5226) +SFX_Cry1D_2_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 unknownnoise0x20 1, 178, 91 unknownnoise0x20 15, 194, 76 endchannel -; 0x21236
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_31.asm b/audio/sfx/cry1d_3.asm index b67f3863..e2e5fae3 100644 --- a/audio/sfx/sfx_1f_31.asm +++ b/audio/sfx/cry1d_3.asm @@ -1,4 +1,4 @@ -SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd) +SFX_Cry1D_3_Ch4: dutycycle 244 unknownsfx0x20 15, 240, 5, 7 unknownsfx0x20 10, 224, 0, 7 @@ -9,7 +9,7 @@ SFX_1f_31_Ch1: ; 7cfbd (1f:4fbd) endchannel -SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8) +SFX_Cry1D_3_Ch5: dutycycle 34 unknownsfx0x20 15, 176, 195, 6 unknownsfx0x20 10, 160, 193, 6 @@ -20,11 +20,10 @@ SFX_1f_31_Ch2: ; 7cfd8 (1f:4fd8) endchannel -SFX_1f_31_Ch3: ; 7cff3 (1f:4ff3) +SFX_Cry1D_3_Ch7: unknownnoise0x20 6, 230, 76 unknownnoise0x20 15, 214, 60 unknownnoise0x20 10, 197, 74 unknownnoise0x20 1, 178, 91 unknownnoise0x20 15, 194, 76 endchannel -; 0x7d003
\ No newline at end of file diff --git a/audio/sfx/sfx_02_32.asm b/audio/sfx/cry1e_1.asm index f2fbf611..56d97001 100644 --- a/audio/sfx/sfx_02_32.asm +++ b/audio/sfx/cry1e_1.asm @@ -1,4 +1,4 @@ -SFX_02_32_Ch1: ; 8dcf (2:4dcf) +SFX_Cry1E_1_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_02_32_Ch1: ; 8dcf (2:4dcf) endchannel -SFX_02_32_Ch2: ; 8df2 (2:4df2) +SFX_Cry1E_1_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_02_32_Ch2: ; 8df2 (2:4df2) endchannel -SFX_02_32_Ch3: ; 8e19 (2:4e19) +SFX_Cry1E_1_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 @@ -36,4 +36,3 @@ SFX_02_32_Ch3: ; 8e19 (2:4e19) unknownnoise0x20 5, 146, 26 unknownnoise0x20 8, 129, 24 endchannel -; 0x8e35
\ No newline at end of file diff --git a/audio/sfx/sfx_08_32.asm b/audio/sfx/cry1e_2.asm index 886df035..7ed25afe 100644 --- a/audio/sfx/sfx_08_32.asm +++ b/audio/sfx/cry1e_2.asm @@ -1,4 +1,4 @@ -SFX_08_32_Ch1: ; 21077 (8:5077) +SFX_Cry1E_2_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_08_32_Ch1: ; 21077 (8:5077) endchannel -SFX_08_32_Ch2: ; 2109a (8:509a) +SFX_Cry1E_2_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_08_32_Ch2: ; 2109a (8:509a) endchannel -SFX_08_32_Ch3: ; 210c1 (8:50c1) +SFX_Cry1E_2_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 @@ -36,4 +36,3 @@ SFX_08_32_Ch3: ; 210c1 (8:50c1) unknownnoise0x20 5, 146, 26 unknownnoise0x20 8, 129, 24 endchannel -; 0x210dd
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_32.asm b/audio/sfx/cry1e_3.asm index 92bb6a6f..82dbdfcc 100644 --- a/audio/sfx/sfx_1f_32.asm +++ b/audio/sfx/cry1e_3.asm @@ -1,4 +1,4 @@ -SFX_1f_32_Ch1: ; 7ce44 (1f:4e44) +SFX_Cry1E_3_Ch4: dutycycle 240 unknownsfx0x20 6, 242, 0, 6 unknownsfx0x20 6, 226, 64, 6 @@ -11,7 +11,7 @@ SFX_1f_32_Ch1: ; 7ce44 (1f:4e44) endchannel -SFX_1f_32_Ch2: ; 7ce67 (1f:4e67) +SFX_Cry1E_3_Ch5: dutycycle 17 unknownsfx0x20 3, 8, 1, 0 unknownsfx0x20 6, 194, 193, 5 @@ -25,7 +25,7 @@ SFX_1f_32_Ch2: ; 7ce67 (1f:4e67) endchannel -SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e) +SFX_Cry1E_3_Ch7: unknownnoise0x20 6, 8, 1 unknownnoise0x20 5, 226, 92 unknownnoise0x20 5, 194, 76 @@ -36,4 +36,3 @@ SFX_1f_32_Ch3: ; 7ce8e (1f:4e8e) unknownnoise0x20 5, 146, 26 unknownnoise0x20 8, 129, 24 endchannel -; 0x7ceaa
\ No newline at end of file diff --git a/audio/sfx/sfx_02_33.asm b/audio/sfx/cry1f_1.asm index f4387a3a..a38bd975 100644 --- a/audio/sfx/sfx_02_33.asm +++ b/audio/sfx/cry1f_1.asm @@ -1,4 +1,4 @@ -SFX_02_33_Ch1: ; 8fe7 (2:4fe7) +SFX_Cry1F_1_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_02_33_Ch1: ; 8fe7 (2:4fe7) endchannel -SFX_02_33_Ch2: ; 8ffa (2:4ffa) +SFX_Cry1F_1_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,10 +16,9 @@ SFX_02_33_Ch2: ; 8ffa (2:4ffa) endchannel -SFX_02_33_Ch3: ; 900d (2:500d) +SFX_Cry1F_1_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 unknownnoise0x20 8, 177, 68 endchannel -; 0x901a
\ No newline at end of file diff --git a/audio/sfx/sfx_08_33.asm b/audio/sfx/cry1f_2.asm index 098dd501..3d261bb2 100644 --- a/audio/sfx/sfx_08_33.asm +++ b/audio/sfx/cry1f_2.asm @@ -1,4 +1,4 @@ -SFX_08_33_Ch1: ; 2128f (8:528f) +SFX_Cry1F_2_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_08_33_Ch1: ; 2128f (8:528f) endchannel -SFX_08_33_Ch2: ; 212a2 (8:52a2) +SFX_Cry1F_2_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,10 +16,9 @@ SFX_08_33_Ch2: ; 212a2 (8:52a2) endchannel -SFX_08_33_Ch3: ; 212b5 (8:52b5) +SFX_Cry1F_2_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 unknownnoise0x20 8, 177, 68 endchannel -; 0x212c2
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_33.asm b/audio/sfx/cry1f_3.asm index 607635c7..2bdfe24b 100644 --- a/audio/sfx/sfx_1f_33.asm +++ b/audio/sfx/cry1f_3.asm @@ -1,4 +1,4 @@ -SFX_1f_33_Ch1: ; 7d05c (1f:505c) +SFX_Cry1F_3_Ch4: dutycycle 165 unknownsfx0x20 3, 244, 65, 6 unknownsfx0x20 13, 214, 33, 7 @@ -7,7 +7,7 @@ SFX_1f_33_Ch1: ; 7d05c (1f:505c) endchannel -SFX_1f_33_Ch2: ; 7d06f (1f:506f) +SFX_Cry1F_3_Ch5: dutycycle 204 unknownsfx0x20 4, 244, 128, 5 unknownsfx0x20 14, 230, 224, 6 @@ -16,10 +16,9 @@ SFX_1f_33_Ch2: ; 7d06f (1f:506f) endchannel -SFX_1f_33_Ch3: ; 7d082 (1f:5082) +SFX_Cry1F_3_Ch7: unknownnoise0x20 5, 196, 70 unknownnoise0x20 13, 165, 68 unknownnoise0x20 8, 196, 69 unknownnoise0x20 8, 177, 68 endchannel -; 0x7d08f
\ No newline at end of file diff --git a/audio/sfx/sfx_02_34.asm b/audio/sfx/cry20_1.asm index 4c2fa4cc..14ec6942 100644 --- a/audio/sfx/sfx_02_34.asm +++ b/audio/sfx/cry20_1.asm @@ -1,4 +1,4 @@ -SFX_02_34_Ch1: ; 901a (2:501a) +SFX_Cry20_1_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_02_34_Ch1: ; 901a (2:501a) endchannel -SFX_02_34_Ch2: ; 902d (2:502d) +SFX_Cry20_1_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,10 +16,9 @@ SFX_02_34_Ch2: ; 902d (2:502d) endchannel -SFX_02_34_Ch3: ; 9040 (2:5040) +SFX_Cry20_1_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 unknownnoise0x20 8, 209, 102 endchannel -; 0x904d
\ No newline at end of file diff --git a/audio/sfx/sfx_08_34.asm b/audio/sfx/cry20_2.asm index f355ed72..bcbf27a6 100644 --- a/audio/sfx/sfx_08_34.asm +++ b/audio/sfx/cry20_2.asm @@ -1,4 +1,4 @@ -SFX_08_34_Ch1: ; 212c2 (8:52c2) +SFX_Cry20_2_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_08_34_Ch1: ; 212c2 (8:52c2) endchannel -SFX_08_34_Ch2: ; 212d5 (8:52d5) +SFX_Cry20_2_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,10 +16,9 @@ SFX_08_34_Ch2: ; 212d5 (8:52d5) endchannel -SFX_08_34_Ch3: ; 212e8 (8:52e8) +SFX_Cry20_2_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 unknownnoise0x20 8, 209, 102 endchannel -; 0x212f5
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_34.asm b/audio/sfx/cry20_3.asm index 59a5bd3a..12e42d7f 100644 --- a/audio/sfx/sfx_1f_34.asm +++ b/audio/sfx/cry20_3.asm @@ -1,4 +1,4 @@ -SFX_1f_34_Ch1: ; 7d08f (1f:508f) +SFX_Cry20_3_Ch4: dutycycle 240 unknownsfx0x20 13, 241, 17, 5 unknownsfx0x20 13, 225, 21, 5 @@ -7,7 +7,7 @@ SFX_1f_34_Ch1: ; 7d08f (1f:508f) endchannel -SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2) +SFX_Cry20_3_Ch5: dutycycle 21 unknownsfx0x20 12, 225, 12, 5 unknownsfx0x20 12, 209, 16, 5 @@ -16,10 +16,9 @@ SFX_1f_34_Ch2: ; 7d0a2 (1f:50a2) endchannel -SFX_1f_34_Ch3: ; 7d0b5 (1f:50b5) +SFX_Cry20_3_Ch7: unknownnoise0x20 14, 242, 101 unknownnoise0x20 13, 226, 85 unknownnoise0x20 14, 210, 86 unknownnoise0x20 8, 209, 102 endchannel -; 0x7d0c2
\ No newline at end of file diff --git a/audio/sfx/sfx_02_35.asm b/audio/sfx/cry21_1.asm index 33685f61..c08704d7 100644 --- a/audio/sfx/sfx_02_35.asm +++ b/audio/sfx/cry21_1.asm @@ -1,4 +1,4 @@ -SFX_02_35_Ch1: ; 904d (2:504d) +SFX_Cry21_1_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_02_35_Ch1: ; 904d (2:504d) endchannel -SFX_02_35_Ch2: ; 9070 (2:5070) +SFX_Cry21_1_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,6 +23,5 @@ SFX_02_35_Ch2: ; 9070 (2:5070) unknownsfx0x20 8, 193, 0, 5 -SFX_02_35_Ch3: ; 9092 (2:5092) +SFX_Cry21_1_Ch7: endchannel -; 0x9093
\ No newline at end of file diff --git a/audio/sfx/sfx_08_35.asm b/audio/sfx/cry21_2.asm index d55d627c..b8f68dbd 100644 --- a/audio/sfx/sfx_08_35.asm +++ b/audio/sfx/cry21_2.asm @@ -1,4 +1,4 @@ -SFX_08_35_Ch1: ; 212f5 (8:52f5) +SFX_Cry21_2_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_08_35_Ch1: ; 212f5 (8:52f5) endchannel -SFX_08_35_Ch2: ; 21318 (8:5318) +SFX_Cry21_2_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,6 +23,5 @@ SFX_08_35_Ch2: ; 21318 (8:5318) unknownsfx0x20 8, 193, 0, 5 -SFX_08_35_Ch3: ; 2133a (8:533a) +SFX_Cry21_2_Ch7: endchannel -; 0x2133b
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_35.asm b/audio/sfx/cry21_3.asm index 10d4c3a2..4a549af9 100644 --- a/audio/sfx/sfx_1f_35.asm +++ b/audio/sfx/cry21_3.asm @@ -1,4 +1,4 @@ -SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2) +SFX_Cry21_3_Ch4: dutycycle 27 unknownsfx0x20 3, 243, 100, 5 unknownsfx0x20 2, 226, 68, 5 @@ -11,7 +11,7 @@ SFX_1f_35_Ch1: ; 7d0c2 (1f:50c2) endchannel -SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5) +SFX_Cry21_3_Ch5: dutycycle 204 unknownsfx0x20 3, 211, 96, 5 unknownsfx0x20 2, 194, 64, 5 @@ -23,6 +23,5 @@ SFX_1f_35_Ch2: ; 7d0e5 (1f:50e5) unknownsfx0x20 8, 193, 0, 5 -SFX_1f_35_Ch3: ; 7d107 (1f:5107) +SFX_Cry21_3_Ch7: endchannel -; 0x7d108
\ No newline at end of file diff --git a/audio/sfx/sfx_02_36.asm b/audio/sfx/cry22_1.asm index e648e3dd..0da8dbd2 100644 --- a/audio/sfx/sfx_02_36.asm +++ b/audio/sfx/cry22_1.asm @@ -1,4 +1,4 @@ -SFX_02_36_Ch1: ; 9093 (2:5093) +SFX_Cry22_1_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_02_36_Ch1: ; 9093 (2:5093) endchannel -SFX_02_36_Ch2: ; 90a6 (2:50a6) +SFX_Cry22_1_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,10 +16,9 @@ SFX_02_36_Ch2: ; 90a6 (2:50a6) endchannel -SFX_02_36_Ch3: ; 90b9 (2:50b9) +SFX_Cry22_1_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 unknownnoise0x20 8, 145, 73 endchannel -; 0x90c6
\ No newline at end of file diff --git a/audio/sfx/sfx_08_36.asm b/audio/sfx/cry22_2.asm index f51a37a0..d7456dbc 100644 --- a/audio/sfx/sfx_08_36.asm +++ b/audio/sfx/cry22_2.asm @@ -1,4 +1,4 @@ -SFX_08_36_Ch1: ; 2133b (8:533b) +SFX_Cry22_2_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_08_36_Ch1: ; 2133b (8:533b) endchannel -SFX_08_36_Ch2: ; 2134e (8:534e) +SFX_Cry22_2_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,10 +16,9 @@ SFX_08_36_Ch2: ; 2134e (8:534e) endchannel -SFX_08_36_Ch3: ; 21361 (8:5361) +SFX_Cry22_2_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 unknownnoise0x20 8, 145, 73 endchannel -; 0x2136e
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_36.asm b/audio/sfx/cry22_3.asm index 376b5f3a..927c174c 100644 --- a/audio/sfx/sfx_1f_36.asm +++ b/audio/sfx/cry22_3.asm @@ -1,4 +1,4 @@ -SFX_1f_36_Ch1: ; 7d108 (1f:5108) +SFX_Cry22_3_Ch4: dutycycle 17 unknownsfx0x20 2, 61, 129, 3 unknownsfx0x20 7, 245, 1, 6 @@ -7,7 +7,7 @@ SFX_1f_36_Ch1: ; 7d108 (1f:5108) endchannel -SFX_1f_36_Ch2: ; 7d11b (1f:511b) +SFX_Cry22_3_Ch5: dutycycle 238 unknownsfx0x20 2, 62, 176, 5 unknownsfx0x20 7, 213, 93, 7 @@ -16,10 +16,9 @@ SFX_1f_36_Ch2: ; 7d11b (1f:511b) endchannel -SFX_1f_36_Ch3: ; 7d12e (1f:512e) +SFX_Cry22_3_Ch7: unknownnoise0x20 2, 146, 73 unknownnoise0x20 7, 181, 41 unknownnoise0x20 1, 162, 57 unknownnoise0x20 8, 145, 73 endchannel -; 0x7d13b
\ No newline at end of file diff --git a/audio/sfx/sfx_02_37.asm b/audio/sfx/cry23_1.asm index 0fc80e1a..cc0587d7 100644 --- a/audio/sfx/sfx_02_37.asm +++ b/audio/sfx/cry23_1.asm @@ -1,4 +1,4 @@ -SFX_02_37_Ch1: ; 8786 (2:4786) +SFX_Cry23_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_02_37_Ch1: ; 8786 (2:4786) endchannel -SFX_02_37_Ch2: ; 879d (2:479d) +SFX_Cry23_1_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,10 +17,9 @@ SFX_02_37_Ch2: ; 879d (2:479d) endchannel -SFX_02_37_Ch3: ; 87b0 (2:47b0) +SFX_Cry23_1_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 unknownnoise0x20 8, 193, 44 endchannel -; 0x87bd
\ No newline at end of file diff --git a/audio/sfx/sfx_08_37.asm b/audio/sfx/cry23_2.asm index 813c4504..5d130aa5 100644 --- a/audio/sfx/sfx_08_37.asm +++ b/audio/sfx/cry23_2.asm @@ -1,4 +1,4 @@ -SFX_08_37_Ch1: ; 20a2e (8:4a2e) +SFX_Cry23_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_08_37_Ch1: ; 20a2e (8:4a2e) endchannel -SFX_08_37_Ch2: ; 20a45 (8:4a45) +SFX_Cry23_2_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,10 +17,9 @@ SFX_08_37_Ch2: ; 20a45 (8:4a45) endchannel -SFX_08_37_Ch3: ; 20a58 (8:4a58) +SFX_Cry23_2_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 unknownnoise0x20 8, 193, 44 endchannel -; 0x20a65
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_37.asm b/audio/sfx/cry23_3.asm index 41698fd9..8ada0c63 100644 --- a/audio/sfx/sfx_1f_37.asm +++ b/audio/sfx/cry23_3.asm @@ -1,4 +1,4 @@ -SFX_1f_37_Ch1: ; 7c7fb (1f:47fb) +SFX_Cry23_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 192, 7 unknownsfx0x20 6, 228, 193, 7 @@ -8,7 +8,7 @@ SFX_1f_37_Ch1: ; 7c7fb (1f:47fb) endchannel -SFX_1f_37_Ch2: ; 7c812 (1f:4812) +SFX_Cry23_3_Ch5: dutycycle 95 unknownsfx0x20 15, 151, 129, 7 unknownsfx0x20 6, 132, 128, 7 @@ -17,10 +17,9 @@ SFX_1f_37_Ch2: ; 7c812 (1f:4812) endchannel -SFX_1f_37_Ch3: ; 7c825 (1f:4825) +SFX_Cry23_3_Ch7: unknownnoise0x20 3, 242, 60 unknownnoise0x20 13, 230, 44 unknownnoise0x20 15, 215, 60 unknownnoise0x20 8, 193, 44 endchannel -; 0x7c832
\ No newline at end of file diff --git a/audio/sfx/sfx_02_38.asm b/audio/sfx/cry24_1.asm index 2c982a3d..f79dc72c 100644 --- a/audio/sfx/sfx_02_38.asm +++ b/audio/sfx/cry24_1.asm @@ -1,4 +1,4 @@ -SFX_02_38_Ch1: ; 87bd (2:47bd) +SFX_Cry24_1_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_02_38_Ch1: ; 87bd (2:47bd) endchannel -SFX_02_38_Ch2: ; 87e0 (2:47e0) +SFX_Cry24_1_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,11 +24,10 @@ SFX_02_38_Ch2: ; 87e0 (2:47e0) endchannel -SFX_02_38_Ch3: ; 8803 (2:4803) +SFX_Cry24_1_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 unknownnoise0x20 12, 183, 76 unknownnoise0x20 15, 162, 92 endchannel -; 0x8813
\ No newline at end of file diff --git a/audio/sfx/sfx_08_38.asm b/audio/sfx/cry24_2.asm index b162539e..aede2b95 100644 --- a/audio/sfx/sfx_08_38.asm +++ b/audio/sfx/cry24_2.asm @@ -1,4 +1,4 @@ -SFX_08_38_Ch1: ; 20a65 (8:4a65) +SFX_Cry24_2_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_08_38_Ch1: ; 20a65 (8:4a65) endchannel -SFX_08_38_Ch2: ; 20a88 (8:4a88) +SFX_Cry24_2_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,11 +24,10 @@ SFX_08_38_Ch2: ; 20a88 (8:4a88) endchannel -SFX_08_38_Ch3: ; 20aab (8:4aab) +SFX_Cry24_2_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 unknownnoise0x20 12, 183, 76 unknownnoise0x20 15, 162, 92 endchannel -; 0x20abb
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_38.asm b/audio/sfx/cry24_3.asm index 885eee1f..cad3ada1 100644 --- a/audio/sfx/sfx_1f_38.asm +++ b/audio/sfx/cry24_3.asm @@ -1,4 +1,4 @@ -SFX_1f_38_Ch1: ; 7c832 (1f:4832) +SFX_Cry24_3_Ch4: dutycycle 240 unknownsfx0x20 15, 247, 128, 6 unknownsfx0x20 10, 230, 132, 6 @@ -11,7 +11,7 @@ SFX_1f_38_Ch1: ; 7c832 (1f:4832) endchannel -SFX_1f_38_Ch2: ; 7c855 (1f:4855) +SFX_Cry24_3_Ch5: dutycycle 5 unknownsfx0x20 15, 183, 65, 6 unknownsfx0x20 10, 150, 66, 6 @@ -24,11 +24,10 @@ SFX_1f_38_Ch2: ; 7c855 (1f:4855) endchannel -SFX_1f_38_Ch3: ; 7c878 (1f:4878) +SFX_Cry24_3_Ch7: unknownnoise0x20 15, 228, 60 unknownnoise0x20 10, 199, 76 unknownnoise0x20 10, 199, 60 unknownnoise0x20 12, 183, 76 unknownnoise0x20 15, 162, 92 endchannel -; 0x7c888
\ No newline at end of file diff --git a/audio/sfx/sfx_02_39.asm b/audio/sfx/cry25_1.asm index 5aa9b436..f3ae46ae 100644 --- a/audio/sfx/sfx_02_39.asm +++ b/audio/sfx/cry25_1.asm @@ -1,4 +1,4 @@ -SFX_02_39_Ch1: ; 886b (2:486b) +SFX_Cry25_1_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_02_39_Ch1: ; 886b (2:486b) endchannel -SFX_02_39_Ch2: ; 8882 (2:4882) +SFX_Cry25_1_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,10 +18,9 @@ SFX_02_39_Ch2: ; 8882 (2:4882) endchannel -SFX_02_39_Ch3: ; 8899 (2:4899) +SFX_Cry25_1_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 unknownnoise0x20 8, 145, 28 endchannel -; 0x88a6
\ No newline at end of file diff --git a/audio/sfx/sfx_08_39.asm b/audio/sfx/cry25_2.asm index ecce76f2..9b976b4e 100644 --- a/audio/sfx/sfx_08_39.asm +++ b/audio/sfx/cry25_2.asm @@ -1,4 +1,4 @@ -SFX_08_39_Ch1: ; 20b13 (8:4b13) +SFX_Cry25_2_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_08_39_Ch1: ; 20b13 (8:4b13) endchannel -SFX_08_39_Ch2: ; 20b2a (8:4b2a) +SFX_Cry25_2_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,10 +18,9 @@ SFX_08_39_Ch2: ; 20b2a (8:4b2a) endchannel -SFX_08_39_Ch3: ; 20b41 (8:4b41) +SFX_Cry25_2_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 unknownnoise0x20 8, 145, 28 endchannel -; 0x20b4e
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_39.asm b/audio/sfx/cry25_3.asm index d29da9aa..e76feb9e 100644 --- a/audio/sfx/sfx_1f_39.asm +++ b/audio/sfx/cry25_3.asm @@ -1,4 +1,4 @@ -SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0) +SFX_Cry25_3_Ch4: dutycycle 165 unknownsfx0x20 6, 244, 64, 7 unknownsfx0x20 15, 227, 48, 7 @@ -8,7 +8,7 @@ SFX_1f_39_Ch1: ; 7c8e0 (1f:48e0) endchannel -SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7) +SFX_Cry25_3_Ch5: dutycycle 119 unknownsfx0x20 6, 195, 18, 7 unknownsfx0x20 15, 179, 4, 7 @@ -18,10 +18,9 @@ SFX_1f_39_Ch2: ; 7c8f7 (1f:48f7) endchannel -SFX_1f_39_Ch3: ; 7c90e (1f:490e) +SFX_Cry25_3_Ch7: unknownnoise0x20 8, 214, 44 unknownnoise0x20 12, 198, 60 unknownnoise0x20 10, 182, 44 unknownnoise0x20 8, 145, 28 endchannel -; 0x7c91b
\ No newline at end of file diff --git a/audio/sfx/sfx_02_56.asm b/audio/sfx/cut_1.asm index 5dfab306..73510fd7 100644 --- a/audio/sfx/sfx_02_56.asm +++ b/audio/sfx/cut_1.asm @@ -1,8 +1,7 @@ -SFX_02_56_Ch1: ; 83e1 (2:43e1) +SFX_Cut_1_Ch7: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 unknownnoise0x20 8, 244, 85 unknownnoise0x20 8, 241, 68 endchannel -; 0x83f1
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_56.asm b/audio/sfx/cut_3.asm index 77624440..6e7d8951 100644 --- a/audio/sfx/sfx_1f_56.asm +++ b/audio/sfx/cut_3.asm @@ -1,8 +1,7 @@ -SFX_1f_56_Ch1: ; 7c3ca (1f:43ca) +SFX_Cut_3_Ch7: unknownnoise0x20 2, 247, 36 unknownnoise0x20 2, 247, 52 unknownnoise0x20 4, 247, 68 unknownnoise0x20 8, 244, 85 unknownnoise0x20 8, 241, 68 endchannel -; 0x7c3da
\ No newline at end of file diff --git a/audio/sfx/sfx_02_0c.asm b/audio/sfx/cymbal1_1.asm index 98c4ef19..35cae4df 100644 --- a/audio/sfx/sfx_02_0c.asm +++ b/audio/sfx/cymbal1_1.asm @@ -1,4 +1,3 @@ -SFX_02_0c_Ch1: ; 833b (2:433b) +SFX_Cymbal1_1_Ch7: unknownnoise0x20 0, 161, 16 endchannel -; 0x833f
\ No newline at end of file diff --git a/audio/sfx/sfx_08_0c.asm b/audio/sfx/cymbal1_2.asm index 8a87cf9a..bffe7690 100644 --- a/audio/sfx/sfx_08_0c.asm +++ b/audio/sfx/cymbal1_2.asm @@ -1,4 +1,3 @@ -SFX_08_0c_Ch1: ; 2033b (8:433b) +SFX_Cymbal1_2_Ch7: unknownnoise0x20 0, 161, 16 endchannel -; 0x2033f
\ No newline at end of file diff --git a/audio/sfx/cymbal1_3.asm b/audio/sfx/cymbal1_3.asm new file mode 100644 index 00000000..0f03f455 --- /dev/null +++ b/audio/sfx/cymbal1_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal1_3_Ch7: + unknownnoise0x20 0, 161, 16 + endchannel diff --git a/audio/sfx/sfx_02_0d.asm b/audio/sfx/cymbal2_1.asm index dfa8e738..ce19bb6b 100644 --- a/audio/sfx/sfx_02_0d.asm +++ b/audio/sfx/cymbal2_1.asm @@ -1,4 +1,3 @@ -SFX_02_0d_Ch1: ; 833f (2:433f) +SFX_Cymbal2_1_Ch7: unknownnoise0x20 0, 162, 17 endchannel -; 0x8343
\ No newline at end of file diff --git a/audio/sfx/sfx_08_0d.asm b/audio/sfx/cymbal2_2.asm index d5997986..f45dec5b 100644 --- a/audio/sfx/sfx_08_0d.asm +++ b/audio/sfx/cymbal2_2.asm @@ -1,4 +1,3 @@ -SFX_08_0d_Ch1: ; 2033f (8:433f) +SFX_Cymbal2_2_Ch7: unknownnoise0x20 0, 162, 17 endchannel -; 0x20343
\ No newline at end of file diff --git a/audio/sfx/cymbal2_3.asm b/audio/sfx/cymbal2_3.asm new file mode 100644 index 00000000..2d2ebf1c --- /dev/null +++ b/audio/sfx/cymbal2_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal2_3_Ch7: + unknownnoise0x20 0, 162, 17 + endchannel diff --git a/audio/sfx/sfx_02_0e.asm b/audio/sfx/cymbal3_1.asm index 52b0dd4d..98f3977d 100644 --- a/audio/sfx/sfx_02_0e.asm +++ b/audio/sfx/cymbal3_1.asm @@ -1,4 +1,3 @@ -SFX_02_0e_Ch1: ; 8343 (2:4343) +SFX_Cymbal3_1_Ch7: unknownnoise0x20 0, 162, 80 endchannel -; 0x8347
\ No newline at end of file diff --git a/audio/sfx/sfx_08_0e.asm b/audio/sfx/cymbal3_2.asm index f98ceb2e..2a2cb997 100644 --- a/audio/sfx/sfx_08_0e.asm +++ b/audio/sfx/cymbal3_2.asm @@ -1,4 +1,3 @@ -SFX_08_0e_Ch1: ; 20343 (8:4343) +SFX_Cymbal3_2_Ch7: unknownnoise0x20 0, 162, 80 endchannel -; 0x20347
\ No newline at end of file diff --git a/audio/sfx/cymbal3_3.asm b/audio/sfx/cymbal3_3.asm new file mode 100644 index 00000000..60b96278 --- /dev/null +++ b/audio/sfx/cymbal3_3.asm @@ -0,0 +1,3 @@ +SFX_Cymbal3_3_Ch7: + unknownnoise0x20 0, 162, 80 + endchannel diff --git a/audio/sfx/sfx_08_50.asm b/audio/sfx/damage.asm index 176da9c1..452fd5ed 100644 --- a/audio/sfx/sfx_08_50.asm +++ b/audio/sfx/damage.asm @@ -1,6 +1,5 @@ -SFX_08_50_Ch1: ; 204f4 (8:44f4) +SFX_Damage_Ch7: unknownnoise0x20 2, 244, 68 unknownnoise0x20 2, 244, 20 unknownnoise0x20 15, 241, 50 endchannel -; 0x204fe
\ No newline at end of file diff --git a/audio/sfx/sfx_02_51.asm b/audio/sfx/denied_1.asm index 956fb558..e7d5a8ca 100644 --- a/audio/sfx/sfx_02_51.asm +++ b/audio/sfx/denied_1.asm @@ -1,4 +1,4 @@ -SFX_02_51_Ch1: ; 861f (2:461f) +SFX_Denied_1_Ch4: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,11 +9,10 @@ SFX_02_51_Ch1: ; 861f (2:461f) endchannel -SFX_02_51_Ch2: ; 8636 (2:4636) +SFX_Denied_1_Ch5: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 15, 240, 1, 4 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x8649
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_51.asm b/audio/sfx/denied_3.asm index 4df2d1d8..cf3b2a20 100644 --- a/audio/sfx/sfx_1f_51.asm +++ b/audio/sfx/denied_3.asm @@ -1,4 +1,4 @@ -SFX_1f_51_Ch1: ; 7c5fc (1f:45fc) +SFX_Denied_3_Ch4: duty 3 unknownsfx0x10 90 unknownsfx0x20 4, 240, 0, 5 @@ -9,11 +9,10 @@ SFX_1f_51_Ch1: ; 7c5fc (1f:45fc) endchannel -SFX_1f_51_Ch2: ; 7c613 (1f:4613) +SFX_Denied_3_Ch5: duty 3 unknownsfx0x20 4, 240, 1, 4 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 15, 240, 1, 4 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x7c626
\ No newline at end of file diff --git a/audio/sfx/sfx_08_45.asm b/audio/sfx/dex_page_added.asm index 5b22cbcc..08180071 100644 --- a/audio/sfx/sfx_08_45.asm +++ b/audio/sfx/dex_page_added.asm @@ -1,4 +1,4 @@ -SFX_08_45_Ch1: ; 2047f (8:447f) +SFX_Dex_Page_Added_Ch4: duty 2 unknownsfx0x10 68 unknownsfx0x20 15, 240, 240, 4 @@ -8,9 +8,8 @@ SFX_08_45_Ch1: ; 2047f (8:447f) endchannel -SFX_08_45_Ch2: ; 20490 (8:4490) +SFX_Dex_Page_Added_Ch5: duty 2 unknownsfx0x20 15, 146, 0, 6 unknownsfx0x20 15, 146, 130, 7 endchannel -; 0x2049b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_5d.asm b/audio/sfx/doubleslap.asm index 2b54b1b9..4e71ac36 100644 --- a/audio/sfx/sfx_08_5d.asm +++ b/audio/sfx/doubleslap.asm @@ -1,5 +1,4 @@ -SFX_08_5d_Ch1: ; 2058c (8:458c) +SFX_Doubleslap_Ch7: unknownnoise0x20 8, 241, 50 unknownnoise0x20 8, 241, 51 endchannel -; 0x20593
\ No newline at end of file diff --git a/audio/sfx/sfx_02_47.asm b/audio/sfx/enter_pc_1.asm index afcd01eb..338c32ab 100644 --- a/audio/sfx/sfx_02_47.asm +++ b/audio/sfx/enter_pc_1.asm @@ -1,8 +1,7 @@ -SFX_02_47_Ch1: ; 853b (2:453b) +SFX_Enter_PC_1_Ch4: duty 2 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 6, 240, 0, 7 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x854e
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_47.asm b/audio/sfx/enter_pc_3.asm index f56c49b7..f34ed9d0 100644 --- a/audio/sfx/sfx_1f_47.asm +++ b/audio/sfx/enter_pc_3.asm @@ -1,8 +1,7 @@ -SFX_1f_47_Ch1: ; 7c518 (1f:4518) +SFX_Enter_PC_3_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 7 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 4, 240, 0, 7 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x7c52b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_48.asm b/audio/sfx/faint_fall.asm index ace8ada4..cd403485 100644 --- a/audio/sfx/sfx_08_48.asm +++ b/audio/sfx/faint_fall.asm @@ -1,7 +1,6 @@ -SFX_08_48_Ch1: ; 204ae (8:44ae) +SFX_Faint_Fall_Ch4: duty 1 unknownsfx0x10 175 unknownsfx0x20 15, 242, 128, 7 unknownsfx0x10 8 endchannel -; 0x204b9
\ No newline at end of file diff --git a/audio/sfx/sfx_08_43.asm b/audio/sfx/faint_thud.asm index 53b1676d..479efab3 100644 --- a/audio/sfx/sfx_08_43.asm +++ b/audio/sfx/faint_thud.asm @@ -1,12 +1,11 @@ -SFX_08_43_Ch1: ; 2044c (8:444c) +SFX_Faint_Thud_Ch4: unknownsfx0x20 15, 209, 0, 2 unknownsfx0x10 8 endchannel -SFX_08_43_Ch2: ; 20453 (8:4453) +SFX_Faint_Thud_Ch7: unknownnoise0x20 4, 245, 51 unknownnoise0x20 8, 244, 34 unknownnoise0x20 15, 242, 33 endchannel -; 0x2045d
\ No newline at end of file diff --git a/audio/sfx/sfx_02_50.asm b/audio/sfx/fly_1.asm index 023b255f..ededef48 100644 --- a/audio/sfx/sfx_02_50.asm +++ b/audio/sfx/fly_1.asm @@ -1,4 +1,4 @@ -SFX_02_50_Ch1: ; 85ee (2:45ee) +SFX_Fly_1_Ch7: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 @@ -16,4 +16,3 @@ SFX_02_50_Ch1: ; 85ee (2:45ee) unknownnoise0x20 2, 65, 18 unknownnoise0x20 2, 0, 0 endchannel -; 0x861f
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_50.asm b/audio/sfx/fly_3.asm index fba01b43..084c8b4c 100644 --- a/audio/sfx/sfx_1f_50.asm +++ b/audio/sfx/fly_3.asm @@ -1,4 +1,4 @@ -SFX_1f_50_Ch1: ; 7c5cb (1f:45cb) +SFX_Fly_3_Ch7: unknownnoise0x20 2, 241, 18 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 161, 18 @@ -16,4 +16,3 @@ SFX_1f_50_Ch1: ; 7c5cb (1f:45cb) unknownnoise0x20 2, 65, 18 unknownnoise0x20 2, 0, 0 endchannel -; 0x7c5fc
\ No newline at end of file diff --git a/audio/sfx/sfx_02_3a.asm b/audio/sfx/get_item1_1.asm index 1844b2ab..2cf5e8c9 100644 --- a/audio/sfx/sfx_02_3a.asm +++ b/audio/sfx/get_item1_1.asm @@ -1,4 +1,4 @@ -SFX_02_3a_Ch1: ; ad77 (2:6d77) +SFX_Get_Item1_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_02_3a_Ch1: ; ad77 (2:6d77) endchannel -SFX_02_3a_Ch2: ; ad8e (2:6d8e) +SFX_Get_Item1_1_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_02_3a_Ch2: ; ad8e (2:6d8e) endchannel -SFX_02_3a_Ch3: ; ad9e (2:6d9e) +SFX_Get_Item1_1_Ch6: executemusic notetype 4, 1, 0 octave 4 @@ -45,4 +45,3 @@ SFX_02_3a_Ch3: ; ad9e (2:6d9e) B_ 2 rest 2 endchannel -; 0xadae
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3a.asm b/audio/sfx/get_item1_3.asm index 1d92127e..6c4c01b5 100644 --- a/audio/sfx/sfx_1f_3a.asm +++ b/audio/sfx/get_item1_3.asm @@ -1,4 +1,4 @@ -SFX_1f_3a_Ch1: ; 7e850 (1f:6850) +SFX_Get_Item1_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -16,7 +16,7 @@ SFX_1f_3a_Ch1: ; 7e850 (1f:6850) endchannel -SFX_1f_3a_Ch2: ; 7e867 (1f:6867) +SFX_Get_Item1_3_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -30,7 +30,7 @@ SFX_1f_3a_Ch2: ; 7e867 (1f:6867) endchannel -SFX_1f_3a_Ch3: ; 7e877 (1f:6877) +SFX_Get_Item1_3_Ch6: executemusic notetype 4, 1, 0 octave 4 @@ -45,4 +45,3 @@ SFX_1f_3a_Ch3: ; 7e877 (1f:6877) B_ 2 rest 2 endchannel -; 0x7e887
\ No newline at end of file diff --git a/audio/sfx/sfx_02_3b.asm b/audio/sfx/get_item2_1.asm index 9c59d670..01e66269 100644 --- a/audio/sfx/sfx_02_3b.asm +++ b/audio/sfx/get_item2_1.asm @@ -1,4 +1,4 @@ -SFX_02_3b_Ch1: ; b316 (2:7316) +SFX_Get_Item2_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_02_3b_Ch1: ; b316 (2:7316) endchannel -SFX_02_3b_Ch2: ; b335 (2:7335) +SFX_Get_Item2_1_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_02_3b_Ch2: ; b335 (2:7335) endchannel -SFX_02_3b_Ch3: ; b34d (2:734d) +SFX_Get_Item2_1_Ch6: executemusic notetype 5, 1, 0 octave 5 @@ -67,4 +67,3 @@ SFX_02_3b_Ch3: ; b34d (2:734d) rest 1 A_ 8 endchannel -; 0xb362
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3b.asm b/audio/sfx/get_item2_2.asm index 910cf9dc..27c5864d 100644 --- a/audio/sfx/sfx_08_3b.asm +++ b/audio/sfx/get_item2_2.asm @@ -1,4 +1,4 @@ -SFX_08_3b_Ch1: ; 239c7 (8:79c7) +SFX_Get_Item2_2_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_08_3b_Ch1: ; 239c7 (8:79c7) endchannel -SFX_08_3b_Ch2: ; 239e6 (8:79e6) +SFX_Get_Item2_2_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_08_3b_Ch2: ; 239e6 (8:79e6) endchannel -SFX_08_3b_Ch3: ; 239fe (8:79fe) +SFX_Get_Item2_2_Ch6: executemusic notetype 5, 1, 0 octave 5 @@ -67,4 +67,3 @@ SFX_08_3b_Ch3: ; 239fe (8:79fe) rest 1 A_ 8 endchannel -; 0x23a13
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3b.asm b/audio/sfx/get_item2_3.asm index 3ce00c8a..42d74e8e 100644 --- a/audio/sfx/sfx_1f_3b.asm +++ b/audio/sfx/get_item2_3.asm @@ -1,4 +1,4 @@ -SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) +SFX_Get_Item2_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -25,7 +25,7 @@ SFX_1f_3b_Ch1: ; 7ee28 (1f:6e28) endchannel -SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) +SFX_Get_Item2_3_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -46,7 +46,7 @@ SFX_1f_3b_Ch2: ; 7ee47 (1f:6e47) endchannel -SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f) +SFX_Get_Item2_3_Ch6: executemusic notetype 5, 1, 0 octave 5 @@ -67,4 +67,3 @@ SFX_1f_3b_Ch3: ; 7ee5f (1f:6e5f) rest 1 A_ 8 endchannel -; 0x7ee74
\ No newline at end of file diff --git a/audio/sfx/sfx_02_42.asm b/audio/sfx/get_key_item_1.asm index 5dfcb574..b2ae3d57 100644 --- a/audio/sfx/sfx_02_42.asm +++ b/audio/sfx/get_key_item_1.asm @@ -1,4 +1,4 @@ -SFX_02_42_Ch1: ; b362 (2:7362) +SFX_Get_Key_Item_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_02_42_Ch1: ; b362 (2:7362) endchannel -SFX_02_42_Ch2: ; b381 (2:7381) +SFX_Get_Key_Item_1_Ch5: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_02_42_Ch2: ; b381 (2:7381) endchannel -SFX_02_42_Ch3: ; b39d (2:739d) +SFX_Get_Key_Item_1_Ch6: executemusic notetype 5, 1, 0 octave 4 @@ -57,4 +57,3 @@ SFX_02_42_Ch3: ; b39d (2:739d) F_ 4 D# 8 endchannel -; 0xb3a7
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_42.asm b/audio/sfx/get_key_item_3.asm index 6c8c388a..aebae361 100644 --- a/audio/sfx/sfx_1f_42.asm +++ b/audio/sfx/get_key_item_3.asm @@ -1,4 +1,4 @@ -SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) +SFX_Get_Key_Item_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -23,7 +23,7 @@ SFX_1f_42_Ch1: ; 7ee74 (1f:6e74) endchannel -SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) +SFX_Get_Key_Item_3_Ch5: executemusic vibrato 4, 2, 3 duty 2 @@ -47,7 +47,7 @@ SFX_1f_42_Ch2: ; 7ee93 (1f:6e93) endchannel -SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf) +SFX_Get_Key_Item_3_Ch6: executemusic notetype 5, 1, 0 octave 4 @@ -57,4 +57,3 @@ SFX_1f_42_Ch3: ; 7eeaf (1f:6eaf) F_ 4 D# 8 endchannel -; 0x7eeb9
\ No newline at end of file diff --git a/audio/sfx/sfx_02_57.asm b/audio/sfx/go_inside_1.asm index 1b7e4237..aa523774 100644 --- a/audio/sfx/sfx_02_57.asm +++ b/audio/sfx/go_inside_1.asm @@ -1,5 +1,4 @@ -SFX_02_57_Ch1: ; 83f1 (2:43f1) +SFX_Go_Inside_1_Ch7: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel -; 0x83f8
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_57.asm b/audio/sfx/go_inside_3.asm index 36880103..9939ba6d 100644 --- a/audio/sfx/sfx_1f_57.asm +++ b/audio/sfx/go_inside_3.asm @@ -1,5 +1,4 @@ -SFX_1f_57_Ch1: ; 7c3da (1f:43da) +SFX_Go_Inside_3_Ch7: unknownnoise0x20 9, 241, 68 unknownnoise0x20 8, 209, 67 endchannel -; 0x7c3e1
\ No newline at end of file diff --git a/audio/sfx/sfx_02_5c.asm b/audio/sfx/go_outside_1.asm index 34866769..c60bb592 100644 --- a/audio/sfx/sfx_02_5c.asm +++ b/audio/sfx/go_outside_1.asm @@ -1,8 +1,7 @@ -SFX_02_5c_Ch1: ; 8452 (2:4452) +SFX_Go_Outside_1_Ch7: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 unknownnoise0x20 12, 97, 35 unknownnoise0x20 6, 65, 84 endchannel -; 0x8462
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_5c.asm b/audio/sfx/go_outside_3.asm index 8ac03d9c..30b9884c 100644 --- a/audio/sfx/sfx_1f_5c.asm +++ b/audio/sfx/go_outside_3.asm @@ -1,8 +1,7 @@ -SFX_1f_5c_Ch1: ; 7c43b (1f:443b) +SFX_Go_Outside_3_Ch7: unknownnoise0x20 2, 241, 84 unknownnoise0x20 12, 113, 35 unknownnoise0x20 2, 177, 84 unknownnoise0x20 12, 97, 35 unknownnoise0x20 6, 65, 84 endchannel -; 0x7c44b
\ No newline at end of file diff --git a/audio/sfx/sfx_02_3e.asm b/audio/sfx/heal_ailment_1.asm index 18d49ff3..ca703c09 100644 --- a/audio/sfx/sfx_02_3e.asm +++ b/audio/sfx/heal_ailment_1.asm @@ -1,4 +1,4 @@ -SFX_02_3e_Ch1: ; 84d9 (2:44d9) +SFX_Heal_Ailment_1_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 @@ -7,4 +7,3 @@ SFX_02_3e_Ch1: ; 84d9 (2:44d9) unknownsfx0x20 15, 242, 0, 6 unknownsfx0x10 8 endchannel -; 0x84ee
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3e.asm b/audio/sfx/heal_ailment_2.asm index 3ac78576..b06abe62 100644 --- a/audio/sfx/sfx_08_3e.asm +++ b/audio/sfx/heal_ailment_2.asm @@ -1,4 +1,4 @@ -SFX_08_3e_Ch1: ; 203fd (8:43fd) +SFX_Heal_Ailment_2_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 @@ -7,4 +7,3 @@ SFX_08_3e_Ch1: ; 203fd (8:43fd) unknownsfx0x20 15, 242, 0, 6 unknownsfx0x10 8 endchannel -; 0x20412
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3e.asm b/audio/sfx/heal_ailment_3.asm index 411b544d..c13d74fd 100644 --- a/audio/sfx/sfx_1f_3e.asm +++ b/audio/sfx/heal_ailment_3.asm @@ -1,4 +1,4 @@ -SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2) +SFX_Heal_Ailment_3_Ch4: duty 2 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 @@ -7,4 +7,3 @@ SFX_1f_3e_Ch1: ; 7c4b2 (1f:44b2) unknownsfx0x20 15, 242, 0, 6 unknownsfx0x10 8 endchannel -; 0x7c4c7
\ No newline at end of file diff --git a/audio/sfx/sfx_02_3d.asm b/audio/sfx/heal_hp_1.asm index 206c0c35..75400957 100644 --- a/audio/sfx/sfx_02_3d.asm +++ b/audio/sfx/heal_hp_1.asm @@ -1,8 +1,7 @@ -SFX_02_3d_Ch1: ; 84b7 (2:44b7) +SFX_Heal_HP_1_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 unknownsfx0x20 15, 242, 80, 6 unknownsfx0x10 8 endchannel -; 0x84c6
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3d.asm b/audio/sfx/heal_hp_2.asm index c2d411af..182937cd 100644 --- a/audio/sfx/sfx_08_3d.asm +++ b/audio/sfx/heal_hp_2.asm @@ -1,8 +1,7 @@ -SFX_08_3d_Ch1: ; 203ee (8:43ee) +SFX_Heal_HP_2_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 unknownsfx0x20 15, 242, 80, 6 unknownsfx0x10 8 endchannel -; 0x203fd
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3d.asm b/audio/sfx/heal_hp_3.asm index f7acd76f..c238013a 100644 --- a/audio/sfx/sfx_1f_3d.asm +++ b/audio/sfx/heal_hp_3.asm @@ -1,8 +1,7 @@ -SFX_1f_3d_Ch1: ; 7c490 (1f:4490) +SFX_Heal_HP_3_Ch4: duty 2 unknownsfx0x10 23 unknownsfx0x20 15, 240, 240, 4 unknownsfx0x20 15, 242, 80, 6 unknownsfx0x10 8 endchannel -; 0x7c49f
\ No newline at end of file diff --git a/audio/sfx/sfx_02_4a.asm b/audio/sfx/healing_machine_1.asm index 278c927d..ebaee990 100644 --- a/audio/sfx/sfx_02_4a.asm +++ b/audio/sfx/healing_machine_1.asm @@ -1,4 +1,4 @@ -SFX_02_4a_Ch1: ; 8580 (2:4580) +SFX_Healing_Machine_1_Ch4: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 @@ -7,4 +7,3 @@ SFX_02_4a_Ch1: ; 8580 (2:4580) unknownsfx0x10 8 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x8595
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_4a.asm b/audio/sfx/healing_machine_3.asm index c0d8324b..ac11fee4 100644 --- a/audio/sfx/sfx_1f_4a.asm +++ b/audio/sfx/healing_machine_3.asm @@ -1,4 +1,4 @@ -SFX_1f_4a_Ch1: ; 7c55d (1f:455d) +SFX_Healing_Machine_3_Ch4: duty 2 unknownsfx0x10 44 unknownsfx0x20 4, 242, 0, 5 @@ -7,4 +7,3 @@ SFX_1f_4a_Ch1: ; 7c55d (1f:455d) unknownsfx0x10 8 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x7c572
\ No newline at end of file diff --git a/audio/sfx/sfx_08_5f.asm b/audio/sfx/horn_drill.asm index b8084264..12ca5da6 100644 --- a/audio/sfx/sfx_08_5f.asm +++ b/audio/sfx/horn_drill.asm @@ -1,7 +1,6 @@ -SFX_08_5f_Ch1: ; 205b1 (8:45b1) +SFX_Horn_Drill_Ch7: unknownnoise0x20 3, 146, 49 unknownnoise0x20 3, 178, 50 unknownnoise0x20 3, 194, 51 unknownnoise0x20 8, 241, 84 endchannel -; 0x205be
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_62.asm b/audio/sfx/intro_crash.asm index 71be0e5d..82c58356 100644 --- a/audio/sfx/sfx_1f_62.asm +++ b/audio/sfx/intro_crash.asm @@ -1,5 +1,4 @@ -SFX_1f_62_Ch1: ; 7c6de (1f:46de) +SFX_Intro_Crash_Ch7: unknownnoise0x20 2, 210, 50 unknownnoise0x20 15, 242, 67 endchannel -; 0x7c6e5
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_5f.asm b/audio/sfx/intro_hip.asm index 7ae72e98..0d450e21 100644 --- a/audio/sfx/sfx_1f_5f.asm +++ b/audio/sfx/intro_hip.asm @@ -1,7 +1,6 @@ -SFX_1f_5f_Ch1: ; 7c6be (1f:46be) +SFX_Intro_Hip_Ch4: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 64, 7 unknownsfx0x10 8 endchannel -; 0x7c6c9
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_60.asm b/audio/sfx/intro_hop.asm index 3f098eeb..1bd9faec 100644 --- a/audio/sfx/sfx_1f_60.asm +++ b/audio/sfx/intro_hop.asm @@ -1,7 +1,6 @@ -SFX_1f_60_Ch1: ; 7c6c9 (1f:46c9) +SFX_Intro_Hop_Ch4: duty 2 unknownsfx0x10 38 unknownsfx0x20 12, 194, 128, 6 unknownsfx0x10 8 endchannel -; 0x7c6d4
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_5e.asm b/audio/sfx/intro_lunge.asm index e6bbaa64..bb534a70 100644 --- a/audio/sfx/sfx_1f_5e.asm +++ b/audio/sfx/intro_lunge.asm @@ -1,4 +1,4 @@ -SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5) +SFX_Intro_Lunge_Ch7: unknownnoise0x20 6, 32, 16 unknownnoise0x20 6, 47, 64 unknownnoise0x20 6, 79, 65 @@ -8,4 +8,3 @@ SFX_1f_5e_Ch1: ; 7c6a5 (1f:46a5) unknownnoise0x20 15, 231, 67 unknownnoise0x20 15, 242, 67 endchannel -; 0x7c6be
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_61.asm b/audio/sfx/intro_raise.asm index 745ce3a4..060ef09a 100644 --- a/audio/sfx/sfx_1f_61.asm +++ b/audio/sfx/intro_raise.asm @@ -1,6 +1,5 @@ -SFX_1f_61_Ch1: ; 7c6d4 (1f:46d4) +SFX_Intro_Raise_Ch7: unknownnoise0x20 2, 111, 33 unknownnoise0x20 2, 175, 49 unknownnoise0x20 15, 242, 65 endchannel -; 0x7c6de
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_63.asm b/audio/sfx/intro_whoosh.asm index 88ce100d..e874e773 100644 --- a/audio/sfx/sfx_1f_63.asm +++ b/audio/sfx/intro_whoosh.asm @@ -1,8 +1,7 @@ -SFX_1f_63_Ch1: ; 7c6e5 (1f:46e5) +SFX_Intro_Whoosh_Ch7: unknownnoise0x20 4, 44, 32 unknownnoise0x20 3, 160, 32 unknownnoise0x20 3, 176, 33 unknownnoise0x20 3, 192, 34 unknownnoise0x20 15, 210, 36 endchannel -; 0x7c6f5
\ No newline at end of file diff --git a/audio/sfx/sfx_02_4e.asm b/audio/sfx/ledge_1.asm index b690ee55..26acaf1b 100644 --- a/audio/sfx/sfx_02_4e.asm +++ b/audio/sfx/ledge_1.asm @@ -1,7 +1,6 @@ -SFX_02_4e_Ch1: ; 85d6 (2:45d6) +SFX_Ledge_1_Ch4: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 unknownsfx0x10 8 endchannel -; 0x85e1
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_4e.asm b/audio/sfx/ledge_3.asm index 92f1a396..623e56ce 100644 --- a/audio/sfx/sfx_1f_4e.asm +++ b/audio/sfx/ledge_3.asm @@ -1,7 +1,6 @@ -SFX_1f_4e_Ch1: ; 7c5b3 (1f:45b3) +SFX_Ledge_3_Ch4: duty 2 unknownsfx0x10 149 unknownsfx0x20 15, 242, 0, 4 unknownsfx0x10 8 endchannel -; 0x7c5be
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3a.asm b/audio/sfx/level_up.asm index 24cb206c..5b3da83d 100644 --- a/audio/sfx/sfx_08_3a.asm +++ b/audio/sfx/level_up.asm @@ -1,4 +1,4 @@ -SFX_08_3a_Ch1: ; 2397d (8:797d) +SFX_Level_Up_Ch4: executemusic tempo 256 volume 7, 7 @@ -20,7 +20,7 @@ SFX_08_3a_Ch1: ; 2397d (8:797d) endchannel -SFX_08_3a_Ch2: ; 23998 (8:7998) +SFX_Level_Up_Ch5: executemusic vibrato 4, 2, 2 duty 2 @@ -40,7 +40,7 @@ SFX_08_3a_Ch2: ; 23998 (8:7998) endchannel -SFX_08_3a_Ch3: ; 239b0 (8:79b0) +SFX_Level_Up_Ch6: executemusic notetype 6, 1, 0 octave 5 @@ -61,4 +61,3 @@ SFX_08_3a_Ch3: ; 239b0 (8:79b0) rest 1 A_ 8 endchannel -; 0x239c7
\ No newline at end of file diff --git a/audio/sfx/sfx_02_0f.asm b/audio/sfx/muted_snare1_1.asm index 5a2404fc..4b205470 100644 --- a/audio/sfx/sfx_02_0f.asm +++ b/audio/sfx/muted_snare1_1.asm @@ -1,5 +1,4 @@ -SFX_02_0f_Ch1: ; 8347 (2:4347) +SFX_Muted_Snare1_1_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel -; 0x834e
\ No newline at end of file diff --git a/audio/sfx/sfx_08_0f.asm b/audio/sfx/muted_snare1_2.asm index 22452696..d530bd89 100644 --- a/audio/sfx/sfx_08_0f.asm +++ b/audio/sfx/muted_snare1_2.asm @@ -1,5 +1,4 @@ -SFX_08_0f_Ch1: ; 20347 (8:4347) +SFX_Muted_Snare1_2_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel -; 0x2034e
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_0f.asm b/audio/sfx/muted_snare1_3.asm index f8e11b6d..8b5c2c6d 100644 --- a/audio/sfx/sfx_1f_0f.asm +++ b/audio/sfx/muted_snare1_3.asm @@ -1,5 +1,4 @@ -SFX_1f_0f_Ch1: ; 7c347 (1f:4347) +SFX_Muted_Snare1_3_Ch7: unknownnoise0x20 0, 161, 24 unknownnoise0x20 0, 49, 51 endchannel -; 0x7c34e
\ No newline at end of file diff --git a/audio/sfx/sfx_02_11.asm b/audio/sfx/muted_snare2_1.asm index 3ab56c2b..4e15e386 100644 --- a/audio/sfx/sfx_02_11.asm +++ b/audio/sfx/muted_snare2_1.asm @@ -1,4 +1,3 @@ -SFX_02_11_Ch1: ; 8355 (2:4355) +SFX_Muted_Snare2_1_Ch7: unknownnoise0x20 0, 145, 34 endchannel -; 0x8359
\ No newline at end of file diff --git a/audio/sfx/sfx_08_11.asm b/audio/sfx/muted_snare2_2.asm index 7ac28d21..5107fb77 100644 --- a/audio/sfx/sfx_08_11.asm +++ b/audio/sfx/muted_snare2_2.asm @@ -1,4 +1,3 @@ -SFX_08_11_Ch1: ; 20355 (8:4355) +SFX_Muted_Snare2_2_Ch7: unknownnoise0x20 0, 145, 34 endchannel -; 0x20359
\ No newline at end of file diff --git a/audio/sfx/muted_snare2_3.asm b/audio/sfx/muted_snare2_3.asm new file mode 100644 index 00000000..043c870d --- /dev/null +++ b/audio/sfx/muted_snare2_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare2_3_Ch7: + unknownnoise0x20 0, 145, 34 + endchannel diff --git a/audio/sfx/sfx_02_12.asm b/audio/sfx/muted_snare3_1.asm index 608e341c..d0c689a4 100644 --- a/audio/sfx/sfx_02_12.asm +++ b/audio/sfx/muted_snare3_1.asm @@ -1,4 +1,3 @@ -SFX_02_12_Ch1: ; 8359 (2:4359) +SFX_Muted_Snare3_1_Ch7: unknownnoise0x20 0, 113, 34 endchannel -; 0x835d
\ No newline at end of file diff --git a/audio/sfx/sfx_08_12.asm b/audio/sfx/muted_snare3_2.asm index 3d5bebad..3e470ae6 100644 --- a/audio/sfx/sfx_08_12.asm +++ b/audio/sfx/muted_snare3_2.asm @@ -1,4 +1,3 @@ -SFX_08_12_Ch1: ; 20359 (8:4359) +SFX_Muted_Snare3_2_Ch7: unknownnoise0x20 0, 113, 34 endchannel -; 0x2035d
\ No newline at end of file diff --git a/audio/sfx/muted_snare3_3.asm b/audio/sfx/muted_snare3_3.asm new file mode 100644 index 00000000..c8749577 --- /dev/null +++ b/audio/sfx/muted_snare3_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare3_3_Ch7: + unknownnoise0x20 0, 113, 34 + endchannel diff --git a/audio/sfx/sfx_02_13.asm b/audio/sfx/muted_snare4_1.asm index 38b06431..ebe2ee1d 100644 --- a/audio/sfx/sfx_02_13.asm +++ b/audio/sfx/muted_snare4_1.asm @@ -1,4 +1,3 @@ -SFX_02_13_Ch1: ; 835d (2:435d) +SFX_Muted_Snare4_1_Ch7: unknownnoise0x20 0, 97, 34 endchannel -; 0x8361
\ No newline at end of file diff --git a/audio/sfx/muted_snare4_2.asm b/audio/sfx/muted_snare4_2.asm new file mode 100644 index 00000000..bdbe4d11 --- /dev/null +++ b/audio/sfx/muted_snare4_2.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare4_2_Ch7: + unknownnoise0x20 0, 97, 34 + endchannel diff --git a/audio/sfx/muted_snare4_3.asm b/audio/sfx/muted_snare4_3.asm new file mode 100644 index 00000000..59d72218 --- /dev/null +++ b/audio/sfx/muted_snare4_3.asm @@ -0,0 +1,3 @@ +SFX_Muted_Snare4_3_Ch7: + unknownnoise0x20 0, 97, 34 + endchannel diff --git a/audio/sfx/sfx_08_51.asm b/audio/sfx/not_very_effective.asm index 85cd06bb..3f74c515 100644 --- a/audio/sfx/sfx_08_51.asm +++ b/audio/sfx/not_very_effective.asm @@ -1,7 +1,6 @@ -SFX_08_51_Ch1: ; 204fe (8:44fe) +SFX_Not_Very_Effective_Ch7: unknownnoise0x20 4, 143, 85 unknownnoise0x20 2, 244, 68 unknownnoise0x20 8, 244, 34 unknownnoise0x20 15, 242, 33 endchannel -; 0x2050b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_47.asm b/audio/sfx/peck.asm index 87e76a17..cca7ecaa 100644 --- a/audio/sfx/sfx_08_47.asm +++ b/audio/sfx/peck.asm @@ -1,4 +1,3 @@ -SFX_08_47_Ch1: ; 204aa (8:44aa) +SFX_Peck_Ch7: unknownnoise0x20 2, 161, 18 endchannel -; 0x204ae
\ No newline at end of file diff --git a/audio/sfx/sfx_02_43.asm b/audio/sfx/poisoned_1.asm index c8f88914..73068b86 100644 --- a/audio/sfx/sfx_02_43.asm +++ b/audio/sfx/poisoned_1.asm @@ -1,9 +1,8 @@ -SFX_02_43_Ch1: ; 84c6 (2:44c6) +SFX_Poisoned_1_Ch4: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_02_43_Ch1 + loopchannel 4, SFX_Poisoned_1_Ch4 unknownsfx0x20 15, 243, 0, 6 unknownsfx0x10 8 endchannel -; 0x84d9
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_43.asm b/audio/sfx/poisoned_3.asm index 59b7339c..7dc973bc 100644 --- a/audio/sfx/sfx_1f_43.asm +++ b/audio/sfx/poisoned_3.asm @@ -1,9 +1,8 @@ -SFX_1f_43_Ch1: ; 7c49f (1f:449f) +SFX_Poisoned_3_Ch4: duty 0 unknownsfx0x10 20 unknownsfx0x20 4, 242, 0, 6 - loopchannel 4, SFX_1f_43_Ch1 + loopchannel 4, SFX_Poisoned_3_Ch4 unknownsfx0x20 15, 243, 0, 6 unknownsfx0x10 8 endchannel -; 0x7c4b2
\ No newline at end of file diff --git a/audio/sfx/sfx_02_41.asm b/audio/sfx/pokedex_rating_1.asm index de5be1c7..1e0f95f5 100644 --- a/audio/sfx/sfx_02_41.asm +++ b/audio/sfx/pokedex_rating_1.asm @@ -1,4 +1,4 @@ -SFX_02_41_Ch1: ; b2c8 (2:72c8) +SFX_Pokedex_Rating_1_Ch4: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_02_41_Ch1: ; b2c8 (2:72c8) endchannel -SFX_02_41_Ch2: ; b2e1 (2:72e1) +SFX_Pokedex_Rating_1_Ch5: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_02_41_Ch2: ; b2e1 (2:72e1) endchannel -SFX_02_41_Ch3: ; b2f7 (2:72f7) +SFX_Pokedex_Rating_1_Ch6: executemusic notetype 5, 1, 0 octave 5 @@ -75,4 +75,3 @@ SFX_02_41_Ch3: ; b2f7 (2:72f7) F_ 2 rest 2 endchannel -; 0xb316
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_41.asm b/audio/sfx/pokedex_rating_3.asm index 6f854c74..01ac0e1c 100644 --- a/audio/sfx/sfx_1f_41.asm +++ b/audio/sfx/pokedex_rating_3.asm @@ -1,4 +1,4 @@ -SFX_1f_41_Ch1: ; 7edda (1f:6dda) +SFX_Pokedex_Rating_3_Ch4: executemusic tempo 256 volume 7, 7 @@ -21,7 +21,7 @@ SFX_1f_41_Ch1: ; 7edda (1f:6dda) endchannel -SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) +SFX_Pokedex_Rating_3_Ch5: executemusic duty 2 notetype 5, 12, 2 @@ -44,7 +44,7 @@ SFX_1f_41_Ch2: ; 7edf3 (1f:6df3) endchannel -SFX_1f_41_Ch3: ; 7ee09 (1f:6e09) +SFX_Pokedex_Rating_3_Ch6: executemusic notetype 5, 1, 0 octave 5 @@ -75,4 +75,3 @@ SFX_1f_41_Ch3: ; 7ee09 (1f:6e09) F_ 2 rest 2 endchannel -; 0x7ee28
\ No newline at end of file diff --git a/audio/sfx/sfx_02_5e.asm b/audio/sfx/pokeflute.asm index ade4d200..272c114f 100644 --- a/audio/sfx/sfx_02_5e.asm +++ b/audio/sfx/pokeflute.asm @@ -1,4 +1,4 @@ -SFX_02_5e_Ch1: ; 83ca (2:43ca) +SFX_Pokeflute_Ch2: vibrato 16, 1, 4 notetype 12, 1, 0 octave 5 @@ -19,4 +19,3 @@ SFX_02_5e_Ch1: ; 83ca (2:43ca) G_ 8 rest 12 endchannel -; 0x83e1
\ No newline at end of file diff --git a/audio/sfx/sfx_08_pokeflute.asm b/audio/sfx/pokeflute_ch4_ch5.asm index 103e2d56..146488d8 100755 --- a/audio/sfx/sfx_08_pokeflute.asm +++ b/audio/sfx/pokeflute_ch4_ch5.asm @@ -1,8 +1,8 @@ -SFX_08_PokeFlute_Ch1: ; 22322 (8:6322) +SFX_08_PokeFlute_Ch4: tempo 256 -SFX_08_PokeFlute_Ch2: ; 22325 (8:6325) +SFX_08_PokeFlute_Ch5: executemusic notetype 8, 0, 0 rest 5 @@ -12,4 +12,3 @@ SFX_08_PokeFlute_Ch2: ; 22325 (8:6325) rest 5 rest 5 endchannel -; 0x2232f
\ No newline at end of file diff --git a/audio/sfx/sfx_08_pokeflute_ch3.asm b/audio/sfx/pokeflute_ch6.asm index cf3f32a7..4d4e5bae 100755 --- a/audio/sfx/sfx_08_pokeflute_ch3.asm +++ b/audio/sfx/pokeflute_ch6.asm @@ -1,4 +1,4 @@ -SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) +SFX_08_PokeFlute_Ch6: executemusic vibrato 16, 1, 4 notetype 8, 1, 0 @@ -11,4 +11,3 @@ SFX_08_PokeFlute_Ch3: ; 2049b (8:449b) octave 6 C_ 13 endchannel -; 0x204aa
\ No newline at end of file diff --git a/audio/sfx/sfx_08_4a.asm b/audio/sfx/pound.asm index 3ebc3281..fc6d292e 100644 --- a/audio/sfx/sfx_08_4a.asm +++ b/audio/sfx/pound.asm @@ -1,4 +1,3 @@ -SFX_08_4a_Ch1: ; 204c4 (8:44c4) +SFX_Pound_Ch7: unknownnoise0x20 2, 161, 34 endchannel -; 0x204c8
\ No newline at end of file diff --git a/audio/sfx/sfx_02_40.asm b/audio/sfx/press_ab_1.asm index a5789282..95edbf4a 100644 --- a/audio/sfx/sfx_02_40.asm +++ b/audio/sfx/press_ab_1.asm @@ -1,8 +1,7 @@ -SFX_02_40_Ch1: ; 8462 (2:4462) +SFX_Press_AB_1_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 12, 161, 208, 7 endchannel -; 0x8475
\ No newline at end of file diff --git a/audio/sfx/sfx_08_40.asm b/audio/sfx/press_ab_2.asm index 7603a54a..0d8faa46 100644 --- a/audio/sfx/sfx_08_40.asm +++ b/audio/sfx/press_ab_2.asm @@ -1,8 +1,7 @@ -SFX_08_40_Ch1: ; 203c3 (8:43c3) +SFX_Press_AB_2_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 12, 161, 208, 7 endchannel -; 0x203d6
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_40.asm b/audio/sfx/press_ab_3.asm index 216bd569..0f11fc34 100644 --- a/audio/sfx/sfx_1f_40.asm +++ b/audio/sfx/press_ab_3.asm @@ -1,8 +1,7 @@ -SFX_1f_40_Ch1: ; 7c44b (1f:444b) +SFX_Press_AB_3_Ch4: duty 2 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 0, 129, 208, 7 unknownsfx0x20 0, 145, 192, 7 unknownsfx0x20 12, 161, 208, 7 endchannel -; 0x7c45e
\ No newline at end of file diff --git a/audio/sfx/sfx_08_6d.asm b/audio/sfx/psybeam.asm index 6e94d9eb..12a1b6fc 100644 --- a/audio/sfx/sfx_08_6d.asm +++ b/audio/sfx/psybeam.asm @@ -1,26 +1,25 @@ -SFX_08_6d_Ch1: ; 20759 (8:4759) +SFX_Psybeam_Ch4: dutycycle 161 unknownsfx0x20 10, 241, 64, 6 unknownsfx0x20 10, 243, 128, 6 unknownsfx0x20 10, 242, 32, 6 - loopchannel 4, SFX_08_6d_Ch1 + loopchannel 4, SFX_Psybeam_Ch4 unknownsfx0x20 10, 241, 64, 6 endchannel -SFX_08_6d_Ch2: ; 20770 (8:4770) +SFX_Psybeam_Ch5: dutycycle 179 unknownsfx0x20 10, 243, 113, 5 unknownsfx0x20 7, 227, 49, 5 unknownsfx0x20 10, 241, 81, 5 - loopchannel 4, SFX_08_6d_Ch2 + loopchannel 4, SFX_Psybeam_Ch5 unknownsfx0x20 10, 241, 113, 5 endchannel -SFX_08_6d_Ch3: ; 20787 (8:4787) +SFX_Psybeam_Ch7: unknownnoise0x20 2, 209, 74 unknownnoise0x20 2, 210, 42 - loopchannel 21, SFX_08_6d_Ch3 + loopchannel 21, SFX_Psybeam_Ch7 endchannel -; 0x20792
\ No newline at end of file diff --git a/audio/sfx/sfx_08_70.asm b/audio/sfx/psychic_m.asm index 01c90d9a..2bbde2f1 100644 --- a/audio/sfx/sfx_08_70.asm +++ b/audio/sfx/psychic_m.asm @@ -1,4 +1,4 @@ -SFX_08_70_Ch1: ; 207fa (8:47fa) +SFX_Psychic_M_Ch4: duty 2 unknownsfx0x10 247 unknownsfx0x20 8, 196, 189, 7 @@ -11,7 +11,7 @@ SFX_08_70_Ch1: ; 207fa (8:47fa) endchannel -SFX_08_70_Ch2: ; 20819 (8:4819) +SFX_Psychic_M_Ch5: duty 2 unknownsfx0x20 8, 196, 112, 7 unknownsfx0x20 8, 196, 97, 7 @@ -22,7 +22,7 @@ SFX_08_70_Ch2: ; 20819 (8:4819) endchannel -SFX_08_70_Ch3: ; 20834 (8:4834) +SFX_Psychic_M_Ch7: unknownnoise0x20 15, 63, 20 unknownnoise0x20 15, 207, 19 unknownnoise0x20 15, 207, 18 @@ -30,4 +30,3 @@ SFX_08_70_Ch3: ; 20834 (8:4834) unknownnoise0x20 15, 207, 16 unknownnoise0x20 15, 194, 16 endchannel -; 0x20847
\ No newline at end of file diff --git a/audio/sfx/sfx_02_5a.asm b/audio/sfx/purchase_1.asm index a9bb7f69..1c9490a2 100644 --- a/audio/sfx/sfx_02_5a.asm +++ b/audio/sfx/purchase_1.asm @@ -1,14 +1,13 @@ -SFX_02_5a_Ch1: ; 842d (2:442d) +SFX_Purchase_1_Ch4: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_02_5a_Ch2: ; 8438 (2:4438) +SFX_Purchase_1_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 unknownsfx0x20 8, 162, 161, 7 endchannel -; 0x8447
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_5a.asm b/audio/sfx/purchase_3.asm index 8c050129..78929c27 100644 --- a/audio/sfx/sfx_1f_5a.asm +++ b/audio/sfx/purchase_3.asm @@ -1,14 +1,13 @@ -SFX_1f_5a_Ch1: ; 7c416 (1f:4416) +SFX_Purchase_3_Ch4: duty 2 unknownsfx0x20 4, 225, 0, 7 unknownsfx0x20 8, 242, 224, 7 endchannel -SFX_1f_5a_Ch2: ; 7c421 (1f:4421) +SFX_Purchase_3_Ch5: duty 2 unknownsfx0x20 1, 8, 0, 0 unknownsfx0x20 4, 145, 193, 6 unknownsfx0x20 8, 162, 161, 7 endchannel -; 0x7c430
\ No newline at end of file diff --git a/audio/sfx/sfx_02_53.asm b/audio/sfx/push_boulder_1.asm index 4b739723..86035278 100644 --- a/audio/sfx/sfx_02_53.asm +++ b/audio/sfx/push_boulder_1.asm @@ -1,4 +1,4 @@ -SFX_02_53_Ch1: ; 8654 (2:4654) +SFX_Push_Boulder_1_Ch7: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 @@ -8,4 +8,3 @@ SFX_02_53_Ch1: ; 8654 (2:4654) unknownnoise0x20 8, 244, 85 unknownnoise0x20 8, 241, 68 endchannel -; 0x866d
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_53.asm b/audio/sfx/push_boulder_3.asm index 86e7ce4a..ecaeb768 100644 --- a/audio/sfx/sfx_1f_53.asm +++ b/audio/sfx/push_boulder_3.asm @@ -1,4 +1,4 @@ -SFX_1f_53_Ch1: ; 7c631 (1f:4631) +SFX_Push_Boulder_3_Ch7: unknownnoise0x20 4, 162, 35 unknownnoise0x20 8, 241, 52 unknownnoise0x20 15, 0, 0 @@ -8,4 +8,3 @@ SFX_1f_53_Ch1: ; 7c631 (1f:4631) unknownnoise0x20 8, 244, 85 unknownnoise0x20 8, 241, 68 endchannel -; 0x7c64a
\ No newline at end of file diff --git a/audio/sfx/sfx_08_44.asm b/audio/sfx/run.asm index 59a587bb..81d01467 100644 --- a/audio/sfx/sfx_08_44.asm +++ b/audio/sfx/run.asm @@ -1,4 +1,4 @@ -SFX_08_44_Ch1: ; 2045d (8:445d) +SFX_Run_Ch7: unknownnoise0x20 2, 97, 35 unknownnoise0x20 2, 161, 51 unknownnoise0x20 2, 193, 51 @@ -11,4 +11,3 @@ SFX_08_44_Ch1: ; 2045d (8:445d) unknownnoise0x20 2, 49, 17 unknownnoise0x20 8, 65, 51 endchannel -; 0x2047f
\ No newline at end of file diff --git a/audio/sfx/sfx_02_5f.asm b/audio/sfx/safari_zone_pa.asm index 48c6539e..f898def0 100644 --- a/audio/sfx/sfx_02_5f.asm +++ b/audio/sfx/safari_zone_pa.asm @@ -1,4 +1,4 @@ -SFX_02_5f_Ch1: ; 86c8 (2:46c8) +SFX_Safari_Zone_PA_Ch4: duty 2 unknownsfx0x20 15, 243, 48, 7 unknownsfx0x20 8, 101, 48, 7 @@ -7,4 +7,3 @@ SFX_02_5f_Ch1: ; 86c8 (2:46c8) unknownsfx0x20 15, 68, 0, 7 unknownsfx0x20 15, 36, 0, 7 endchannel -; 0x86e3
\ No newline at end of file diff --git a/audio/sfx/sfx_02_5d.asm b/audio/sfx/save_1.asm index 2a05d5dd..afb1f13a 100644 --- a/audio/sfx/sfx_02_5d.asm +++ b/audio/sfx/save_1.asm @@ -1,4 +1,4 @@ -SFX_02_5d_Ch1: ; 8475 (2:4475) +SFX_Save_1_Ch4: duty 2 unknownsfx0x20 4, 244, 0, 7 unknownsfx0x20 2, 228, 0, 6 @@ -10,7 +10,7 @@ SFX_02_5d_Ch1: ; 8475 (2:4475) endchannel -SFX_02_5d_Ch2: ; 8494 (2:4494) +SFX_Save_1_Ch5: duty 2 unknownsfx0x20 4, 8, 0, 0 unknownsfx0x20 2, 212, 1, 7 @@ -21,4 +21,3 @@ SFX_02_5d_Ch2: ; 8494 (2:4494) unknownsfx0x20 2, 196, 161, 7 unknownsfx0x20 15, 210, 225, 7 endchannel -; 0x84b7
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_5d.asm b/audio/sfx/save_3.asm index f0606032..083e77c8 100644 --- a/audio/sfx/sfx_1f_5d.asm +++ b/audio/sfx/save_3.asm @@ -1,4 +1,4 @@ -SFX_1f_5d_Ch1: ; 7c45e (1f:445e) +SFX_Save_3_Ch4: duty 2 IF DEF(_RED) unknownsfx0x20 4, 244, 0, 7 @@ -16,7 +16,7 @@ ENDC endchannel -SFX_1f_5d_Ch2: ; 7c475 (1f:4475) +SFX_Save_3_Ch5: duty 2 IF DEF(_RED) unknownsfx0x20 4, 8, 0, 0 @@ -34,4 +34,3 @@ ELSE unknownsfx0x20 15, 210, 225, 7 ENDC endchannel -; 0x7c490 diff --git a/audio/sfx/sfx_08_06.asm b/audio/sfx/sfx_08_06.asm deleted file mode 100644 index 6e8c2b8c..00000000 --- a/audio/sfx/sfx_08_06.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_06_Ch1: ; 20320 (8:4320) - unknownnoise0x20 0, 81, 42 - endchannel -; 0x20324
\ No newline at end of file diff --git a/audio/sfx/sfx_08_13.asm b/audio/sfx/sfx_08_13.asm deleted file mode 100644 index e6712805..00000000 --- a/audio/sfx/sfx_08_13.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_08_13_Ch1: ; 2035d (8:435d) - unknownnoise0x20 0, 97, 34 - endchannel -; 0x20361
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_01.asm b/audio/sfx/sfx_1f_01.asm deleted file mode 100644 index e7a40492..00000000 --- a/audio/sfx/sfx_1f_01.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_01_Ch1: ; 7c2fd (1f:42fd) - unknownnoise0x20 0, 193, 51 - endchannel -; 0x7c301
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_02.asm b/audio/sfx/sfx_1f_02.asm deleted file mode 100644 index bb95fe0b..00000000 --- a/audio/sfx/sfx_1f_02.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_02_Ch1: ; 7c301 (1f:4301) - unknownnoise0x20 0, 177, 51 - endchannel -; 0x7c305
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_03.asm b/audio/sfx/sfx_1f_03.asm deleted file mode 100644 index 3d6fa66a..00000000 --- a/audio/sfx/sfx_1f_03.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_03_Ch1: ; 7c305 (1f:4305) - unknownnoise0x20 0, 161, 51 - endchannel -; 0x7c309
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_04.asm b/audio/sfx/sfx_1f_04.asm deleted file mode 100644 index 3d73e1a3..00000000 --- a/audio/sfx/sfx_1f_04.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_04_Ch1: ; 7c309 (1f:4309) - unknownnoise0x20 0, 129, 51 - endchannel -; 0x7c30d
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_06.asm b/audio/sfx/sfx_1f_06.asm deleted file mode 100644 index 1d6c85cf..00000000 --- a/audio/sfx/sfx_1f_06.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_06_Ch1: ; 7c320 (1f:4320) - unknownnoise0x20 0, 81, 42 - endchannel -; 0x7c324
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_08.asm b/audio/sfx/sfx_1f_08.asm deleted file mode 100644 index 8798fc9b..00000000 --- a/audio/sfx/sfx_1f_08.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_08_Ch1: ; 7c32b (1f:432b) - unknownnoise0x20 0, 129, 16 - endchannel -; 0x7c32f
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_09.asm b/audio/sfx/sfx_1f_09.asm deleted file mode 100644 index ef7a87bc..00000000 --- a/audio/sfx/sfx_1f_09.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_09_Ch1: ; 7c32f (1f:432f) - unknownnoise0x20 0, 130, 35 - endchannel -; 0x7c333
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_0a.asm b/audio/sfx/sfx_1f_0a.asm deleted file mode 100644 index 4b3ffa3e..00000000 --- a/audio/sfx/sfx_1f_0a.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_0a_Ch1: ; 7c333 (1f:4333) - unknownnoise0x20 0, 130, 37 - endchannel -; 0x7c337
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_0b.asm b/audio/sfx/sfx_1f_0b.asm deleted file mode 100644 index a7f558fd..00000000 --- a/audio/sfx/sfx_1f_0b.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_0b_Ch1: ; 7c337 (1f:4337) - unknownnoise0x20 0, 130, 38 - endchannel -; 0x7c33b
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_0c.asm b/audio/sfx/sfx_1f_0c.asm deleted file mode 100644 index 50d7d56f..00000000 --- a/audio/sfx/sfx_1f_0c.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_0c_Ch1: ; 7c33b (1f:433b) - unknownnoise0x20 0, 161, 16 - endchannel -; 0x7c33f
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_0d.asm b/audio/sfx/sfx_1f_0d.asm deleted file mode 100644 index b329482b..00000000 --- a/audio/sfx/sfx_1f_0d.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_0d_Ch1: ; 7c33f (1f:433f) - unknownnoise0x20 0, 162, 17 - endchannel -; 0x7c343
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_0e.asm b/audio/sfx/sfx_1f_0e.asm deleted file mode 100644 index 7b36809b..00000000 --- a/audio/sfx/sfx_1f_0e.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_0e_Ch1: ; 7c343 (1f:4343) - unknownnoise0x20 0, 162, 80 - endchannel -; 0x7c347
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_11.asm b/audio/sfx/sfx_1f_11.asm deleted file mode 100644 index 503396fb..00000000 --- a/audio/sfx/sfx_1f_11.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_11_Ch1: ; 7c355 (1f:4355) - unknownnoise0x20 0, 145, 34 - endchannel -; 0x7c359
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_12.asm b/audio/sfx/sfx_1f_12.asm deleted file mode 100644 index 344281f5..00000000 --- a/audio/sfx/sfx_1f_12.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_12_Ch1: ; 7c359 (1f:4359) - unknownnoise0x20 0, 113, 34 - endchannel -; 0x7c35d
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_13.asm b/audio/sfx/sfx_1f_13.asm deleted file mode 100644 index 2eab2643..00000000 --- a/audio/sfx/sfx_1f_13.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_1f_13_Ch1: ; 7c35d (1f:435d) - unknownnoise0x20 0, 97, 34 - endchannel -; 0x7c361
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_67.asm b/audio/sfx/shooting_star.asm index 4bd391a1..f9b03feb 100644 --- a/audio/sfx/sfx_1f_67.asm +++ b/audio/sfx/shooting_star.asm @@ -1,4 +1,4 @@ -SFX_1f_67_Ch1: ; 7c72d (1f:472d) +SFX_Shooting_Star_Ch4: dutycycle 228 unknownsfx0x10 47 unknownsfx0x20 4, 64, 224, 7 @@ -12,4 +12,3 @@ SFX_1f_67_Ch1: ; 7c72d (1f:472d) unknownsfx0x20 15, 18, 224, 7 unknownsfx0x10 8 endchannel -; 0x7c758
\ No newline at end of file diff --git a/audio/sfx/sfx_02_48.asm b/audio/sfx/shrink_1.asm index 0db1b90d..54731535 100644 --- a/audio/sfx/sfx_02_48.asm +++ b/audio/sfx/shrink_1.asm @@ -1,4 +1,4 @@ -SFX_02_48_Ch1: ; 854e (2:454e) +SFX_Shrink_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 @@ -8,4 +8,3 @@ SFX_02_48_Ch1: ; 854e (2:454e) unknownsfx0x20 15, 23, 0, 4 unknownsfx0x10 8 endchannel -; 0x8569
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_48.asm b/audio/sfx/shrink_3.asm index c46af22b..b03cbe55 100644 --- a/audio/sfx/sfx_1f_48.asm +++ b/audio/sfx/shrink_3.asm @@ -1,4 +1,4 @@ -SFX_1f_48_Ch1: ; 7c52b (1f:452b) +SFX_Shrink_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 6 @@ -8,4 +8,3 @@ SFX_1f_48_Ch1: ; 7c52b (1f:452b) unknownsfx0x20 15, 23, 0, 4 unknownsfx0x10 8 endchannel -; 0x7c546
\ No newline at end of file diff --git a/audio/sfx/sfx_08_77.asm b/audio/sfx/silph_scope.asm index 84def9b8..ee238262 100644 --- a/audio/sfx/sfx_08_77.asm +++ b/audio/sfx/silph_scope.asm @@ -1,4 +1,4 @@ -SFX_08_77_Ch1: ; 20412 (8:4412) +SFX_Silph_Scope_Ch4: duty 0 unknownsfx0x20 0, 210, 0, 7 unknownsfx0x20 0, 210, 64, 7 @@ -7,4 +7,3 @@ SFX_08_77_Ch1: ; 20412 (8:4412) unknownsfx0x20 10, 225, 224, 7 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x2042d
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_66.asm b/audio/sfx/slots_new_spin.asm index 1b581a91..ae1a6d90 100644 --- a/audio/sfx/sfx_1f_66.asm +++ b/audio/sfx/slots_new_spin.asm @@ -1,4 +1,4 @@ -SFX_1f_66_Ch1: ; 7c70f (1f:470f) +SFX_Slots_New_Spin_Ch4: duty 3 unknownsfx0x20 5, 225, 0, 7 unknownsfx0x20 2, 225, 128, 7 @@ -6,10 +6,9 @@ SFX_1f_66_Ch1: ; 7c70f (1f:470f) endchannel -SFX_1f_66_Ch2: ; 7c71e (1f:471e) +SFX_Slots_New_Spin_Ch5: duty 2 unknownsfx0x20 4, 193, 193, 6 unknownsfx0x20 2, 193, 65, 7 unknownsfx0x20 15, 209, 129, 7 endchannel -; 0x7c72d
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_65.asm b/audio/sfx/slots_reward.asm index b8708858..6923ac71 100644 --- a/audio/sfx/sfx_1f_65.asm +++ b/audio/sfx/slots_reward.asm @@ -1,6 +1,5 @@ -SFX_1f_65_Ch1: ; 7c704 (1f:4704) +SFX_Slots_Reward_Ch4: duty 2 unknownsfx0x20 2, 241, 0, 7 unknownsfx0x20 8, 129, 224, 7 endchannel -; 0x7c70f
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_64.asm b/audio/sfx/slots_stop_wheel.asm index 703343ad..85d73daf 100644 --- a/audio/sfx/sfx_1f_64.asm +++ b/audio/sfx/slots_stop_wheel.asm @@ -1,7 +1,6 @@ -SFX_1f_64_Ch1: ; 7c6f5 (1f:46f5) +SFX_Slots_Stop_Wheel_Ch4: duty 2 unknownsfx0x20 1, 242, 160, 6 unknownsfx0x20 1, 242, 224, 6 unknownsfx0x20 8, 241, 0, 7 endchannel -; 0x7c704
\ No newline at end of file diff --git a/audio/sfx/sfx_02_01.asm b/audio/sfx/snare1_1.asm index e92c35b8..aae0ef28 100644 --- a/audio/sfx/sfx_02_01.asm +++ b/audio/sfx/snare1_1.asm @@ -1,4 +1,3 @@ -SFX_02_01_Ch1: ; 82fd (2:42fd) +SFX_Snare1_1_Ch7: unknownnoise0x20 0, 193, 51 endchannel -; 0x8301
\ No newline at end of file diff --git a/audio/sfx/sfx_08_01.asm b/audio/sfx/snare1_2.asm index e5e03793..e5013081 100644 --- a/audio/sfx/sfx_08_01.asm +++ b/audio/sfx/snare1_2.asm @@ -1,4 +1,3 @@ -SFX_08_01_Ch1: ; 202fd (8:42fd) +SFX_Snare1_2_Ch7: unknownnoise0x20 0, 193, 51 endchannel -; 0x20301
\ No newline at end of file diff --git a/audio/sfx/snare1_3.asm b/audio/sfx/snare1_3.asm new file mode 100644 index 00000000..4ffffa7f --- /dev/null +++ b/audio/sfx/snare1_3.asm @@ -0,0 +1,3 @@ +SFX_Snare1_3_Ch7: + unknownnoise0x20 0, 193, 51 + endchannel diff --git a/audio/sfx/sfx_02_02.asm b/audio/sfx/snare2_1.asm index ca252725..286e397a 100644 --- a/audio/sfx/sfx_02_02.asm +++ b/audio/sfx/snare2_1.asm @@ -1,4 +1,3 @@ -SFX_02_02_Ch1: ; 8301 (2:4301) +SFX_Snare2_1_Ch7: unknownnoise0x20 0, 177, 51 endchannel -; 0x8305
\ No newline at end of file diff --git a/audio/sfx/sfx_08_02.asm b/audio/sfx/snare2_2.asm index d86123b5..a3718612 100644 --- a/audio/sfx/sfx_08_02.asm +++ b/audio/sfx/snare2_2.asm @@ -1,4 +1,3 @@ -SFX_08_02_Ch1: ; 20301 (8:4301) +SFX_Snare2_2_Ch7: unknownnoise0x20 0, 177, 51 endchannel -; 0x20305
\ No newline at end of file diff --git a/audio/sfx/snare2_3.asm b/audio/sfx/snare2_3.asm new file mode 100644 index 00000000..67f8c7fb --- /dev/null +++ b/audio/sfx/snare2_3.asm @@ -0,0 +1,3 @@ +SFX_Snare2_3_Ch7: + unknownnoise0x20 0, 177, 51 + endchannel diff --git a/audio/sfx/sfx_02_03.asm b/audio/sfx/snare3_1.asm index 4eb687a8..686b4561 100644 --- a/audio/sfx/sfx_02_03.asm +++ b/audio/sfx/snare3_1.asm @@ -1,4 +1,3 @@ -SFX_02_03_Ch1: ; 8305 (2:4305) +SFX_Snare3_1_Ch7: unknownnoise0x20 0, 161, 51 endchannel -; 0x8309
\ No newline at end of file diff --git a/audio/sfx/sfx_08_03.asm b/audio/sfx/snare3_2.asm index 9b29488f..f8236d40 100644 --- a/audio/sfx/sfx_08_03.asm +++ b/audio/sfx/snare3_2.asm @@ -1,4 +1,3 @@ -SFX_08_03_Ch1: ; 20305 (8:4305) +SFX_Snare3_2_Ch7: unknownnoise0x20 0, 161, 51 endchannel -; 0x20309
\ No newline at end of file diff --git a/audio/sfx/snare3_3.asm b/audio/sfx/snare3_3.asm new file mode 100644 index 00000000..3b52bac9 --- /dev/null +++ b/audio/sfx/snare3_3.asm @@ -0,0 +1,3 @@ +SFX_Snare3_3_Ch7: + unknownnoise0x20 0, 161, 51 + endchannel diff --git a/audio/sfx/sfx_02_04.asm b/audio/sfx/snare4_1.asm index 45caab6b..35d58dba 100644 --- a/audio/sfx/sfx_02_04.asm +++ b/audio/sfx/snare4_1.asm @@ -1,4 +1,3 @@ -SFX_02_04_Ch1: ; 8309 (2:4309) +SFX_Snare4_1_Ch7: unknownnoise0x20 0, 129, 51 endchannel -; 0x830d
\ No newline at end of file diff --git a/audio/sfx/sfx_08_04.asm b/audio/sfx/snare4_2.asm index 63c3b508..713f8996 100644 --- a/audio/sfx/sfx_08_04.asm +++ b/audio/sfx/snare4_2.asm @@ -1,4 +1,3 @@ -SFX_08_04_Ch1: ; 20309 (8:4309) +SFX_Snare4_2_Ch7: unknownnoise0x20 0, 129, 51 endchannel -; 0x2030d
\ No newline at end of file diff --git a/audio/sfx/snare4_3.asm b/audio/sfx/snare4_3.asm new file mode 100644 index 00000000..231193e1 --- /dev/null +++ b/audio/sfx/snare4_3.asm @@ -0,0 +1,3 @@ +SFX_Snare4_3_Ch7: + unknownnoise0x20 0, 129, 51 + endchannel diff --git a/audio/sfx/sfx_02_05.asm b/audio/sfx/snare5_1.asm index 156254e5..54106d58 100644 --- a/audio/sfx/sfx_02_05.asm +++ b/audio/sfx/snare5_1.asm @@ -1,4 +1,4 @@ -SFX_02_05_Ch1: ; 830d (2:430d) +SFX_Snare5_1_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 @@ -6,4 +6,3 @@ SFX_02_05_Ch1: ; 830d (2:430d) unknownnoise0x20 3, 130, 51 unknownnoise0x20 2, 129, 50 endchannel -; 0x8320
\ No newline at end of file diff --git a/audio/sfx/sfx_08_05.asm b/audio/sfx/snare5_2.asm index 6fcd5f68..f7f55eb5 100644 --- a/audio/sfx/sfx_08_05.asm +++ b/audio/sfx/snare5_2.asm @@ -1,4 +1,4 @@ -SFX_08_05_Ch1: ; 2030d (8:430d) +SFX_Snare5_2_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 @@ -6,4 +6,3 @@ SFX_08_05_Ch1: ; 2030d (8:430d) unknownnoise0x20 3, 130, 51 unknownnoise0x20 2, 129, 50 endchannel -; 0x20320
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_05.asm b/audio/sfx/snare5_3.asm index 3db77f2e..76dc3966 100644 --- a/audio/sfx/sfx_1f_05.asm +++ b/audio/sfx/snare5_3.asm @@ -1,4 +1,4 @@ -SFX_1f_05_Ch1: ; 7c30d (1f:430d) +SFX_Snare5_3_Ch7: unknownnoise0x20 7, 132, 55 unknownnoise0x20 6, 132, 54 unknownnoise0x20 5, 131, 53 @@ -6,4 +6,3 @@ SFX_1f_05_Ch1: ; 7c30d (1f:430d) unknownnoise0x20 3, 130, 51 unknownnoise0x20 2, 129, 50 endchannel -; 0x7c320
\ No newline at end of file diff --git a/audio/sfx/sfx_02_08.asm b/audio/sfx/snare6_1.asm index 4efce48f..97c0241d 100644 --- a/audio/sfx/sfx_02_08.asm +++ b/audio/sfx/snare6_1.asm @@ -1,4 +1,3 @@ -SFX_02_08_Ch1: ; 832b (2:432b) +SFX_Snare6_1_Ch7: unknownnoise0x20 0, 129, 16 endchannel -; 0x832f
\ No newline at end of file diff --git a/audio/sfx/sfx_08_08.asm b/audio/sfx/snare6_2.asm index 4d28817b..797d5518 100644 --- a/audio/sfx/sfx_08_08.asm +++ b/audio/sfx/snare6_2.asm @@ -1,4 +1,3 @@ -SFX_08_08_Ch1: ; 2032b (8:432b) +SFX_Snare6_2_Ch7: unknownnoise0x20 0, 129, 16 endchannel -; 0x2032f
\ No newline at end of file diff --git a/audio/sfx/snare6_3.asm b/audio/sfx/snare6_3.asm new file mode 100644 index 00000000..28fc695a --- /dev/null +++ b/audio/sfx/snare6_3.asm @@ -0,0 +1,3 @@ +SFX_Snare6_3_Ch7: + unknownnoise0x20 0, 129, 16 + endchannel diff --git a/audio/sfx/sfx_02_09.asm b/audio/sfx/snare7_1.asm index bb04efca..1b54eefa 100644 --- a/audio/sfx/sfx_02_09.asm +++ b/audio/sfx/snare7_1.asm @@ -1,4 +1,3 @@ -SFX_02_09_Ch1: ; 832f (2:432f) +SFX_Snare7_1_Ch7: unknownnoise0x20 0, 130, 35 endchannel -; 0x8333
\ No newline at end of file diff --git a/audio/sfx/sfx_08_09.asm b/audio/sfx/snare7_2.asm index 94eac4b0..e480f87f 100644 --- a/audio/sfx/sfx_08_09.asm +++ b/audio/sfx/snare7_2.asm @@ -1,4 +1,3 @@ -SFX_08_09_Ch1: ; 2032f (8:432f) +SFX_Snare7_2_Ch7: unknownnoise0x20 0, 130, 35 endchannel -; 0x20333
\ No newline at end of file diff --git a/audio/sfx/snare7_3.asm b/audio/sfx/snare7_3.asm new file mode 100644 index 00000000..b57dfc13 --- /dev/null +++ b/audio/sfx/snare7_3.asm @@ -0,0 +1,3 @@ +SFX_Snare7_3_Ch7: + unknownnoise0x20 0, 130, 35 + endchannel diff --git a/audio/sfx/sfx_02_0a.asm b/audio/sfx/snare8_1.asm index 128c9a74..1a0f74a3 100644 --- a/audio/sfx/sfx_02_0a.asm +++ b/audio/sfx/snare8_1.asm @@ -1,4 +1,3 @@ -SFX_02_0a_Ch1: ; 8333 (2:4333) +SFX_Snare8_1_Ch7: unknownnoise0x20 0, 130, 37 endchannel -; 0x8337
\ No newline at end of file diff --git a/audio/sfx/sfx_08_0a.asm b/audio/sfx/snare8_2.asm index c7a3a090..87619598 100644 --- a/audio/sfx/sfx_08_0a.asm +++ b/audio/sfx/snare8_2.asm @@ -1,4 +1,3 @@ -SFX_08_0a_Ch1: ; 20333 (8:4333) +SFX_Snare8_2_Ch7: unknownnoise0x20 0, 130, 37 endchannel -; 0x20337
\ No newline at end of file diff --git a/audio/sfx/snare8_3.asm b/audio/sfx/snare8_3.asm new file mode 100644 index 00000000..54076c8e --- /dev/null +++ b/audio/sfx/snare8_3.asm @@ -0,0 +1,3 @@ +SFX_Snare8_3_Ch7: + unknownnoise0x20 0, 130, 37 + endchannel diff --git a/audio/sfx/sfx_02_0b.asm b/audio/sfx/snare9_1.asm index de643bd6..6923bb09 100644 --- a/audio/sfx/sfx_02_0b.asm +++ b/audio/sfx/snare9_1.asm @@ -1,4 +1,3 @@ -SFX_02_0b_Ch1: ; 8337 (2:4337) +SFX_Snare9_1_Ch7: unknownnoise0x20 0, 130, 38 endchannel -; 0x833b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_0b.asm b/audio/sfx/snare9_2.asm index 8010f4c9..308ae7f6 100644 --- a/audio/sfx/sfx_08_0b.asm +++ b/audio/sfx/snare9_2.asm @@ -1,4 +1,3 @@ -SFX_08_0b_Ch1: ; 20337 (8:4337) +SFX_Snare9_2_Ch7: unknownnoise0x20 0, 130, 38 endchannel -; 0x2033b
\ No newline at end of file diff --git a/audio/sfx/snare9_3.asm b/audio/sfx/snare9_3.asm new file mode 100644 index 00000000..ffbdc454 --- /dev/null +++ b/audio/sfx/snare9_3.asm @@ -0,0 +1,3 @@ +SFX_Snare9_3_Ch7: + unknownnoise0x20 0, 130, 38 + endchannel diff --git a/audio/sfx/sfx_02_54.asm b/audio/sfx/ss_anne_horn_1.asm index 4f3343fb..38407f24 100644 --- a/audio/sfx/sfx_02_54.asm +++ b/audio/sfx/ss_anne_horn_1.asm @@ -1,4 +1,4 @@ -SFX_02_54_Ch1: ; 866d (2:466d) +SFX_SS_Anne_Horn_1_Ch4: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_02_54_Ch1: ; 866d (2:466d) endchannel -SFX_02_54_Ch2: ; 868c (2:468c) +SFX_SS_Anne_Horn_1_Ch5: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 @@ -20,4 +20,3 @@ SFX_02_54_Ch2: ; 868c (2:468c) unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 15, 242, 130, 4 endchannel -; 0x86ab
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_54.asm b/audio/sfx/ss_anne_horn_3.asm index acdc3da5..3162f664 100644 --- a/audio/sfx/sfx_1f_54.asm +++ b/audio/sfx/ss_anne_horn_3.asm @@ -1,4 +1,4 @@ -SFX_1f_54_Ch1: ; 7c64a (1f:464a) +SFX_SS_Anne_Horn_3_Ch4: duty 2 unknownsfx0x20 15, 240, 0, 5 unknownsfx0x20 4, 0, 0, 0 @@ -10,7 +10,7 @@ SFX_1f_54_Ch1: ; 7c64a (1f:464a) endchannel -SFX_1f_54_Ch2: ; 7c669 (1f:4669) +SFX_SS_Anne_Horn_3_Ch5: duty 3 unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 4, 0, 0, 0 @@ -20,4 +20,3 @@ SFX_1f_54_Ch2: ; 7c669 (1f:4669) unknownsfx0x20 15, 240, 130, 4 unknownsfx0x20 15, 242, 130, 4 endchannel -; 0x7c688
\ No newline at end of file diff --git a/audio/sfx/sfx_02_3f.asm b/audio/sfx/start_menu_1.asm index b7009e79..3a979b44 100644 --- a/audio/sfx/sfx_02_3f.asm +++ b/audio/sfx/start_menu_1.asm @@ -1,5 +1,4 @@ -SFX_02_3f_Ch1: ; 83c3 (2:43c3) +SFX_Start_Menu_1_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel -; 0x83ca
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3f.asm b/audio/sfx/start_menu_2.asm index a834f917..2706f555 100644 --- a/audio/sfx/sfx_08_3f.asm +++ b/audio/sfx/start_menu_2.asm @@ -1,5 +1,4 @@ -SFX_08_3f_Ch1: ; 203d6 (8:43d6) +SFX_Start_Menu_2_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel -; 0x203dd
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3f.asm b/audio/sfx/start_menu_3.asm index de7a44cf..4b16cea4 100644 --- a/audio/sfx/sfx_1f_3f.asm +++ b/audio/sfx/start_menu_3.asm @@ -1,5 +1,4 @@ -SFX_1f_3f_Ch1: ; 7c3c3 (1f:43c3) +SFX_Start_Menu_3_Ch7: unknownnoise0x20 1, 226, 51 unknownnoise0x20 8, 225, 34 endchannel -; 0x7c3ca
\ No newline at end of file diff --git a/audio/sfx/sfx_08_5a.asm b/audio/sfx/super_effective.asm index 6d9994ab..63ba35e8 100644 --- a/audio/sfx/sfx_08_5a.asm +++ b/audio/sfx/super_effective.asm @@ -1,5 +1,4 @@ -SFX_08_5a_Ch1: ; 20574 (8:4574) +SFX_Super_Effective_Ch7: unknownnoise0x20 4, 241, 52 unknownnoise0x20 15, 242, 100 endchannel -; 0x2057b
\ No newline at end of file diff --git a/audio/sfx/sfx_02_58.asm b/audio/sfx/swap_1.asm index b98ad41e..95a31fcd 100644 --- a/audio/sfx/sfx_02_58.asm +++ b/audio/sfx/swap_1.asm @@ -1,12 +1,11 @@ -SFX_02_58_Ch1: ; 83f8 (2:43f8) +SFX_Swap_1_Ch4: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_02_58_Ch2: ; 83ff (2:43ff) +SFX_Swap_1_Ch5: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 endchannel -; 0x840a
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_58.asm b/audio/sfx/swap_3.asm index ac61fe40..6ed97d7d 100644 --- a/audio/sfx/sfx_1f_58.asm +++ b/audio/sfx/swap_3.asm @@ -1,12 +1,11 @@ -SFX_1f_58_Ch1: ; 7c3e1 (1f:43e1) +SFX_Swap_3_Ch4: duty 2 unknownsfx0x20 8, 225, 64, 7 endchannel -SFX_1f_58_Ch2: ; 7c3e8 (1f:43e8) +SFX_Swap_3_Ch5: duty 2 unknownsfx0x20 2, 8, 0, 0 unknownsfx0x20 8, 177, 65, 7 endchannel -; 0x7c3f3
\ No newline at end of file diff --git a/audio/sfx/sfx_02_49.asm b/audio/sfx/switch_1.asm index b19c3fcc..ee15dc20 100644 --- a/audio/sfx/sfx_02_49.asm +++ b/audio/sfx/switch_1.asm @@ -1,4 +1,4 @@ -SFX_02_49_Ch1: ; 8569 (2:4569) +SFX_Switch_1_Ch4: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 @@ -6,4 +6,3 @@ SFX_02_49_Ch1: ; 8569 (2:4569) unknownsfx0x20 4, 241, 128, 7 unknownsfx0x20 4, 0, 0, 0 endchannel -; 0x8580
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_49.asm b/audio/sfx/switch_3.asm index 0f20dcd3..d98a7f29 100644 --- a/audio/sfx/sfx_1f_49.asm +++ b/audio/sfx/switch_3.asm @@ -1,4 +1,4 @@ -SFX_1f_49_Ch1: ; 7c546 (1f:4546) +SFX_Switch_3_Ch4: duty 2 unknownsfx0x20 4, 0, 0, 0 unknownsfx0x20 2, 241, 128, 6 @@ -6,4 +6,3 @@ SFX_1f_49_Ch1: ; 7c546 (1f:4546) unknownsfx0x20 4, 241, 128, 7 unknownsfx0x20 4, 0, 0, 0 endchannel -; 0x7c55d
\ No newline at end of file diff --git a/audio/sfx/sfx_02_4c.asm b/audio/sfx/teleport_enter1_1.asm index b9063058..60c87cab 100644 --- a/audio/sfx/sfx_02_4c.asm +++ b/audio/sfx/teleport_enter1_1.asm @@ -1,4 +1,4 @@ -SFX_02_4c_Ch1: ; 85b0 (2:45b0) +SFX_Teleport_Enter1_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 @@ -8,4 +8,3 @@ SFX_02_4c_Ch1: ; 85b0 (2:45b0) unknownsfx0x20 15, 23, 0, 5 unknownsfx0x10 8 endchannel -; 0x85cb
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_4c.asm b/audio/sfx/teleport_enter1_3.asm index 811d4bc7..d3dab8b4 100644 --- a/audio/sfx/sfx_1f_4c.asm +++ b/audio/sfx/teleport_enter1_3.asm @@ -1,4 +1,4 @@ -SFX_1f_4c_Ch1: ; 7c58d (1f:458d) +SFX_Teleport_Enter1_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 7 @@ -8,4 +8,3 @@ SFX_1f_4c_Ch1: ; 7c58d (1f:458d) unknownsfx0x20 15, 23, 0, 5 unknownsfx0x10 8 endchannel -; 0x7c5a8
\ No newline at end of file diff --git a/audio/sfx/sfx_02_4f.asm b/audio/sfx/teleport_enter2_1.asm index 32ebf8cc..53eb3335 100644 --- a/audio/sfx/sfx_02_4f.asm +++ b/audio/sfx/teleport_enter2_1.asm @@ -1,7 +1,6 @@ -SFX_02_4f_Ch1: ; 85e1 (2:45e1) +SFX_Teleport_Enter2_1_Ch7: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 unknownnoise0x20 1, 0, 0 endchannel -; 0x85ee
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_4f.asm b/audio/sfx/teleport_enter2_3.asm index aab678ab..8b7c7894 100644 --- a/audio/sfx/sfx_1f_4f.asm +++ b/audio/sfx/teleport_enter2_3.asm @@ -1,7 +1,6 @@ -SFX_1f_4f_Ch1: ; 7c5be (1f:45be) +SFX_Teleport_Enter2_3_Ch7: unknownnoise0x20 2, 241, 50 unknownnoise0x20 2, 0, 0 unknownnoise0x20 2, 241, 34 unknownnoise0x20 1, 0, 0 endchannel -; 0x7c5cb
\ No newline at end of file diff --git a/audio/sfx/sfx_02_4b.asm b/audio/sfx/teleport_exit1_1.asm index 923aa8e7..084c116f 100644 --- a/audio/sfx/sfx_02_4b.asm +++ b/audio/sfx/teleport_exit1_1.asm @@ -1,4 +1,4 @@ -SFX_02_4b_Ch1: ; 8595 (2:4595) +SFX_Teleport_Exit1_1_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 @@ -8,4 +8,3 @@ SFX_02_4b_Ch1: ; 8595 (2:4595) unknownsfx0x20 15, 23, 0, 7 unknownsfx0x10 8 endchannel -; 0x85b0
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_4b.asm b/audio/sfx/teleport_exit1_3.asm index c4d33187..b3a26af8 100644 --- a/audio/sfx/sfx_1f_4b.asm +++ b/audio/sfx/teleport_exit1_3.asm @@ -1,4 +1,4 @@ -SFX_1f_4b_Ch1: ; 7c572 (1f:4572) +SFX_Teleport_Exit1_3_Ch4: duty 1 unknownsfx0x10 23 unknownsfx0x20 15, 215, 0, 5 @@ -8,4 +8,3 @@ SFX_1f_4b_Ch1: ; 7c572 (1f:4572) unknownsfx0x20 15, 23, 0, 7 unknownsfx0x10 8 endchannel -; 0x7c58d
\ No newline at end of file diff --git a/audio/sfx/sfx_02_4d.asm b/audio/sfx/teleport_exit2_1.asm index 1d492dde..4b168bb9 100644 --- a/audio/sfx/sfx_02_4d.asm +++ b/audio/sfx/teleport_exit2_1.asm @@ -1,7 +1,6 @@ -SFX_02_4d_Ch1: ; 85cb (2:45cb) +SFX_Teleport_Exit2_1_Ch4: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 unknownsfx0x10 8 endchannel -; 0x85d6
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_4d.asm b/audio/sfx/teleport_exit2_3.asm index 8dcb0a8b..171e59d8 100644 --- a/audio/sfx/sfx_1f_4d.asm +++ b/audio/sfx/teleport_exit2_3.asm @@ -1,7 +1,6 @@ -SFX_1f_4d_Ch1: ; 7c5a8 (1f:45a8) +SFX_Teleport_Exit2_3_Ch4: duty 1 unknownsfx0x10 22 unknownsfx0x20 15, 210, 0, 5 unknownsfx0x10 8 endchannel -; 0x7c5b3
\ No newline at end of file diff --git a/audio/sfx/sfx_02_3c.asm b/audio/sfx/tink_1.asm index e695705e..c1f5f00c 100644 --- a/audio/sfx/sfx_02_3c.asm +++ b/audio/sfx/tink_1.asm @@ -1,4 +1,4 @@ -SFX_02_3c_Ch1: ; 840a (2:440a) +SFX_Tink_1_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -6,4 +6,3 @@ SFX_02_3c_Ch1: ; 840a (2:440a) unknownsfx0x20 8, 226, 0, 2 unknownsfx0x10 8 endchannel -; 0x841b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_3c.asm b/audio/sfx/tink_2.asm index e9ebca58..bab45323 100644 --- a/audio/sfx/sfx_08_3c.asm +++ b/audio/sfx/tink_2.asm @@ -1,4 +1,4 @@ -SFX_08_3c_Ch1: ; 203dd (8:43dd) +SFX_Tink_2_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -6,4 +6,3 @@ SFX_08_3c_Ch1: ; 203dd (8:43dd) unknownsfx0x20 8, 226, 0, 2 unknownsfx0x10 8 endchannel -; 0x203ee
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_3c.asm b/audio/sfx/tink_3.asm index fb476203..a9cf73ec 100644 --- a/audio/sfx/sfx_1f_3c.asm +++ b/audio/sfx/tink_3.asm @@ -1,4 +1,4 @@ -SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3) +SFX_Tink_3_Ch4: duty 2 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 2 @@ -6,4 +6,3 @@ SFX_1f_3c_Ch1: ; 7c3f3 (1f:43f3) unknownsfx0x20 8, 226, 0, 2 unknownsfx0x10 8 endchannel -; 0x7c404
\ No newline at end of file diff --git a/audio/sfx/sfx_02_44.asm b/audio/sfx/trade_machine_1.asm index 8ecfc89b..2f67936b 100644 --- a/audio/sfx/sfx_02_44.asm +++ b/audio/sfx/trade_machine_1.asm @@ -1,8 +1,7 @@ -SFX_02_44_Ch1: ; 84ee (2:44ee) +SFX_Trade_Machine_1_Ch4: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 unknownsfx0x20 15, 242, 80, 6 unknownsfx0x10 8 endchannel -; 0x84fd
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_44.asm b/audio/sfx/trade_machine_3.asm index bc2ff935..b590455e 100644 --- a/audio/sfx/sfx_1f_44.asm +++ b/audio/sfx/trade_machine_3.asm @@ -1,8 +1,7 @@ -SFX_1f_44_Ch1: ; 7c4c7 (1f:44c7) +SFX_Trade_Machine_3_Ch4: duty 2 unknownsfx0x10 21 unknownsfx0x20 15, 240, 240, 4 unknownsfx0x20 15, 242, 80, 6 unknownsfx0x10 8 endchannel -; 0x7c4d6
\ No newline at end of file diff --git a/audio/sfx/sfx_02_06.asm b/audio/sfx/triangle1_1.asm index 03f8d4aa..957dc63f 100644 --- a/audio/sfx/sfx_02_06.asm +++ b/audio/sfx/triangle1_1.asm @@ -1,4 +1,3 @@ -SFX_02_06_Ch1: ; 8320 (2:4320) +SFX_Triangle1_1_Ch7: unknownnoise0x20 0, 81, 42 endchannel -; 0x8324
\ No newline at end of file diff --git a/audio/sfx/triangle1_2.asm b/audio/sfx/triangle1_2.asm new file mode 100644 index 00000000..535448cd --- /dev/null +++ b/audio/sfx/triangle1_2.asm @@ -0,0 +1,3 @@ +SFX_Triangle1_2_Ch7: + unknownnoise0x20 0, 81, 42 + endchannel diff --git a/audio/sfx/triangle1_3.asm b/audio/sfx/triangle1_3.asm new file mode 100644 index 00000000..a13d00ea --- /dev/null +++ b/audio/sfx/triangle1_3.asm @@ -0,0 +1,3 @@ +SFX_Triangle1_3_Ch7: + unknownnoise0x20 0, 81, 42 + endchannel diff --git a/audio/sfx/sfx_02_07.asm b/audio/sfx/triangle2_1.asm index 02fd9e06..09ba8a67 100644 --- a/audio/sfx/sfx_02_07.asm +++ b/audio/sfx/triangle2_1.asm @@ -1,5 +1,4 @@ -SFX_02_07_Ch1: ; 8324 (2:4324) +SFX_Triangle2_1_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel -; 0x832b
\ No newline at end of file diff --git a/audio/sfx/sfx_08_07.asm b/audio/sfx/triangle2_2.asm index 5281cc7b..6512648a 100644 --- a/audio/sfx/sfx_08_07.asm +++ b/audio/sfx/triangle2_2.asm @@ -1,5 +1,4 @@ -SFX_08_07_Ch1: ; 20324 (8:4324) +SFX_Triangle2_2_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel -; 0x2032b
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_07.asm b/audio/sfx/triangle2_3.asm index 69982127..b0612aba 100644 --- a/audio/sfx/sfx_1f_07.asm +++ b/audio/sfx/triangle2_3.asm @@ -1,5 +1,4 @@ -SFX_1f_07_Ch1: ; 7c324 (1f:4324) +SFX_Triangle2_3_Ch7: unknownnoise0x20 1, 65, 43 unknownnoise0x20 0, 97, 42 endchannel -; 0x7c32b
\ No newline at end of file diff --git a/audio/sfx/sfx_02_10.asm b/audio/sfx/triangle3_1.asm index 057fd81b..9fd3952f 100644 --- a/audio/sfx/sfx_02_10.asm +++ b/audio/sfx/triangle3_1.asm @@ -1,5 +1,4 @@ -SFX_02_10_Ch1: ; 834e (2:434e) +SFX_Triangle3_1_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel -; 0x8355
\ No newline at end of file diff --git a/audio/sfx/sfx_08_10.asm b/audio/sfx/triangle3_2.asm index cc94f730..38b3198b 100644 --- a/audio/sfx/sfx_08_10.asm +++ b/audio/sfx/triangle3_2.asm @@ -1,5 +1,4 @@ -SFX_08_10_Ch1: ; 2034e (8:434e) +SFX_Triangle3_2_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel -; 0x20355
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_10.asm b/audio/sfx/triangle3_3.asm index 049d47a8..138c8fac 100644 --- a/audio/sfx/sfx_1f_10.asm +++ b/audio/sfx/triangle3_3.asm @@ -1,5 +1,4 @@ -SFX_1f_10_Ch1: ; 7c34e (1f:434e) +SFX_Triangle3_3_Ch7: unknownnoise0x20 2, 145, 40 unknownnoise0x20 0, 113, 24 endchannel -; 0x7c355
\ No newline at end of file diff --git a/audio/sfx/sfx_02_46.asm b/audio/sfx/turn_off_pc_1.asm index 64d4acce..6b2561fe 100644 --- a/audio/sfx/sfx_02_46.asm +++ b/audio/sfx/turn_off_pc_1.asm @@ -1,8 +1,7 @@ -SFX_02_46_Ch1: ; 8528 (2:4528) +SFX_Turn_Off_PC_1_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 unknownsfx0x20 4, 240, 0, 2 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x853b
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_46.asm b/audio/sfx/turn_off_pc_3.asm index 4e9026b7..cf6d95cd 100644 --- a/audio/sfx/sfx_1f_46.asm +++ b/audio/sfx/turn_off_pc_3.asm @@ -1,8 +1,7 @@ -SFX_1f_46_Ch1: ; 7c505 (1f:4505) +SFX_Turn_Off_PC_3_Ch4: duty 2 unknownsfx0x20 4, 240, 0, 6 unknownsfx0x20 4, 240, 0, 4 unknownsfx0x20 4, 240, 0, 2 unknownsfx0x20 1, 0, 0, 0 endchannel -; 0x7c518
\ No newline at end of file diff --git a/audio/sfx/sfx_02_45.asm b/audio/sfx/turn_on_pc_1.asm index d06160b0..dede7c3e 100644 --- a/audio/sfx/sfx_02_45.asm +++ b/audio/sfx/turn_on_pc_1.asm @@ -1,4 +1,4 @@ -SFX_02_45_Ch1: ; 84fd (2:44fd) +SFX_Turn_On_PC_1_Ch4: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 @@ -11,4 +11,3 @@ SFX_02_45_Ch1: ; 84fd (2:44fd) unknownsfx0x20 3, 161, 192, 7 unknownsfx0x20 8, 161, 0, 7 endchannel -; 0x8528
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_45.asm b/audio/sfx/turn_on_pc_3.asm index c2f734ad..1ed54d3c 100644 --- a/audio/sfx/sfx_1f_45.asm +++ b/audio/sfx/turn_on_pc_3.asm @@ -1,4 +1,4 @@ -SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6) +SFX_Turn_On_PC_3_Ch4: duty 2 unknownsfx0x20 15, 242, 192, 7 unknownsfx0x20 15, 0, 0, 0 @@ -12,4 +12,3 @@ SFX_1f_45_Ch1: ; 7c4d6 (1f:44d6) unknownsfx0x20 3, 129, 192, 7 unknownsfx0x20 3, 129, 0, 7 endchannel -; 0x7c505
\ No newline at end of file diff --git a/audio/sfx/sfx_08_unused2.asm b/audio/sfx/unused2_2.asm index 0bfe4dd3..36c10ba3 100755 --- a/audio/sfx/sfx_08_unused2.asm +++ b/audio/sfx/unused2_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused2_Ch1: ; 2232f (8:632f) +SFX_08_unused2_Ch4: executemusic tempo 256 volume 7, 7 @@ -17,7 +17,7 @@ SFX_08_unused2_Ch1: ; 2232f (8:632f) endchannel -SFX_08_unused2_Ch2: ; 22347 (8:6347) +SFX_08_unused2_Ch5: executemusic vibrato 8, 2, 7 duty 2 @@ -33,7 +33,7 @@ SFX_08_unused2_Ch2: ; 22347 (8:6347) endchannel -SFX_08_unused2_Ch3: ; 22359 (8:6359) +SFX_08_unused2_Ch6: executemusic notetype 6, 1, 0 octave 4 @@ -54,4 +54,3 @@ SFX_08_unused2_Ch3: ; 22359 (8:6359) B_ 4 rest 4 endchannel -; 0x22370
\ No newline at end of file diff --git a/audio/sfx/sfx_02_unused.asm b/audio/sfx/unused_1.asm index db3a8b26..21d54fb1 100644..100755 --- a/audio/sfx/sfx_02_unused.asm +++ b/audio/sfx/unused_1.asm @@ -1,4 +1,4 @@ -SFX_02_unused_Ch1: ; 86e3 (2:46e3) +SFX_02_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_02_unused_Ch1: ; 86e3 (2:46e3) endchannel -SFX_02_unused_Ch2: ; 86fe (2:46fe) +SFX_02_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_02_unused_Ch2: ; 86fe (2:46fe) endchannel -SFX_02_unused_Ch3: ; 8719 (2:4719) +SFX_02_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 @@ -29,4 +29,3 @@ SFX_02_unused_Ch3: ; 8719 (2:4719) unknownnoise0x20 12, 125, 76 unknownnoise0x20 15, 211, 76 endchannel -; 0x872f
\ No newline at end of file diff --git a/audio/sfx/sfx_08_unused.asm b/audio/sfx/unused_2.asm index 4ba4c212..20de851f 100755 --- a/audio/sfx/sfx_08_unused.asm +++ b/audio/sfx/unused_2.asm @@ -1,4 +1,4 @@ -SFX_08_unused_Ch1: ; 2098b (8:498b) +SFX_08_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_08_unused_Ch1: ; 2098b (8:498b) endchannel -SFX_08_unused_Ch2: ; 209a6 (8:49a6) +SFX_08_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_08_unused_Ch2: ; 209a6 (8:49a6) endchannel -SFX_08_unused_Ch3: ; 209c1 (8:49c1) +SFX_08_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 @@ -29,4 +29,3 @@ SFX_08_unused_Ch3: ; 209c1 (8:49c1) unknownnoise0x20 12, 125, 76 unknownnoise0x20 15, 211, 76 endchannel -; 0x209d7
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_unused.asm b/audio/sfx/unused_3.asm index 773c069e..d4a30539 100755 --- a/audio/sfx/sfx_1f_unused.asm +++ b/audio/sfx/unused_3.asm @@ -1,4 +1,4 @@ -SFX_1f_unused_Ch1: ; 7c758 (1f:4758) +SFX_1f_unused_Ch4: dutycycle 240 unknownsfx0x20 15, 224, 128, 7 unknownsfx0x20 15, 240, 132, 7 @@ -9,7 +9,7 @@ SFX_1f_unused_Ch1: ; 7c758 (1f:4758) endchannel -SFX_1f_unused_Ch2: ; 7c773 (1f:4773) +SFX_1f_unused_Ch5: dutycycle 5 unknownsfx0x20 15, 160, 65, 7 unknownsfx0x20 15, 176, 67, 7 @@ -20,7 +20,7 @@ SFX_1f_unused_Ch2: ; 7c773 (1f:4773) endchannel -SFX_1f_unused_Ch3: ; 7c78e (1f:478e) +SFX_1f_unused_Ch7: unknownnoise0x20 2, 242, 76 unknownnoise0x20 6, 224, 58 unknownnoise0x20 15, 208, 58 @@ -29,4 +29,3 @@ SFX_1f_unused_Ch3: ; 7c78e (1f:478e) unknownnoise0x20 12, 125, 76 unknownnoise0x20 15, 211, 76 endchannel -; 0x7c7a4
\ No newline at end of file diff --git a/audio/sfx/sfx_08_55.asm b/audio/sfx/vine_whip.asm index 93049b71..ad0bd40b 100644 --- a/audio/sfx/sfx_08_55.asm +++ b/audio/sfx/vine_whip.asm @@ -1,4 +1,4 @@ -SFX_08_55_Ch1: ; 20533 (8:4533) +SFX_Vine_Whip_Ch7: unknownnoise0x20 1, 194, 51 unknownnoise0x20 2, 242, 33 unknownnoise0x20 1, 226, 51 @@ -8,4 +8,3 @@ SFX_08_55_Ch1: ; 20533 (8:4533) unknownnoise0x20 12, 145, 16 unknownnoise0x20 8, 242, 65 endchannel -; 0x2054c
\ No newline at end of file diff --git a/audio/sfx/sfx_02_55.asm b/audio/sfx/withdraw_deposit_1.asm index ec138968..d7a2f54d 100644 --- a/audio/sfx/sfx_02_55.asm +++ b/audio/sfx/withdraw_deposit_1.asm @@ -1,4 +1,4 @@ -SFX_02_55_Ch1: ; 86ab (2:46ab) +SFX_Withdraw_Deposit_1_Ch4: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 @@ -10,4 +10,3 @@ SFX_02_55_Ch1: ; 86ab (2:46ab) unknownsfx0x20 15, 226, 0, 7 unknownsfx0x10 8 endchannel -; 0x86c8
\ No newline at end of file diff --git a/audio/sfx/sfx_1f_55.asm b/audio/sfx/withdraw_deposit_3.asm index 9a27c885..1fd1fe3e 100644 --- a/audio/sfx/sfx_1f_55.asm +++ b/audio/sfx/withdraw_deposit_3.asm @@ -1,4 +1,4 @@ -SFX_1f_55_Ch1: ; 7c688 (1f:4688) +SFX_Withdraw_Deposit_3_Ch4: duty 1 unknownsfx0x10 58 unknownsfx0x20 4, 242, 0, 5 @@ -10,4 +10,3 @@ SFX_1f_55_Ch1: ; 7c688 (1f:4688) unknownsfx0x20 15, 226, 0, 7 unknownsfx0x10 8 endchannel -; 0x7c6a5
\ No newline at end of file |