From 17be6c96fea9f5b7682bbfcb611a2fe21da409a7 Mon Sep 17 00:00:00 2001 From: dannye <33dannye@gmail.com> Date: Mon, 25 May 2020 18:50:23 -0500 Subject: Update Audio 4 sfx names --- audio.asm | 90 ++++++++++---------- audio/headers/sfxheaders1.asm | 2 +- audio/headers/sfxheaders2.asm | 2 +- audio/headers/sfxheaders3.asm | 2 +- audio/headers/sfxheaders4.asm | 178 +++++++++++++++++++-------------------- audio/sfx/battle_27.asm | 8 +- audio/sfx/battle_36.asm | 6 +- audio/sfx/cry00_4.asm | 21 +++++ audio/sfx/cry01_4.asm | 24 ++++++ audio/sfx/cry02_4.asm | 17 ++++ audio/sfx/cry03_4.asm | 30 +++++++ audio/sfx/cry04_4.asm | 32 +++++++ audio/sfx/cry05_4.asm | 19 +++++ audio/sfx/cry06_4.asm | 22 +++++ audio/sfx/cry07_4.asm | 21 +++++ audio/sfx/cry08_4.asm | 23 +++++ audio/sfx/cry09_4.asm | 35 ++++++++ audio/sfx/cry0a_4.asm | 35 ++++++++ audio/sfx/cry0b_4.asm | 37 ++++++++ audio/sfx/cry0c_4.asm | 29 +++++++ audio/sfx/cry0d_4.asm | 40 +++++++++ audio/sfx/cry0e_4.asm | 23 +++++ audio/sfx/cry0f_4.asm | 29 +++++++ audio/sfx/cry10_4.asm | 31 +++++++ audio/sfx/cry11_4.asm | 34 ++++++++ audio/sfx/cry12_4.asm | 24 ++++++ audio/sfx/cry13_4.asm | 30 +++++++ audio/sfx/cry14_4.asm | 21 +++++ audio/sfx/cry15_4.asm | 30 +++++++ audio/sfx/cry16_4.asm | 21 +++++ audio/sfx/cry17_4.asm | 24 ++++++ audio/sfx/cry18_4.asm | 34 ++++++++ audio/sfx/cry19_4.asm | 18 ++++ audio/sfx/cry1a_4.asm | 30 +++++++ audio/sfx/cry1b_4.asm | 26 ++++++ audio/sfx/cry1c_4.asm | 31 +++++++ audio/sfx/cry1d_4.asm | 29 +++++++ audio/sfx/cry1e_4.asm | 38 +++++++++ audio/sfx/cry1f_4.asm | 24 ++++++ audio/sfx/cry20_4.asm | 24 ++++++ audio/sfx/cry21_4.asm | 27 ++++++ audio/sfx/cry22_4.asm | 24 ++++++ audio/sfx/cry23_4.asm | 25 ++++++ audio/sfx/cry24_4.asm | 33 ++++++++ audio/sfx/cry25_4.asm | 26 ++++++ audio/sfx/get_item1_4_2.asm | 47 +++++++++++ audio/sfx/heal_ailment_4.asm | 9 ++ audio/sfx/heal_hp_4.asm | 7 ++ audio/sfx/press_ab_4.asm | 7 ++ audio/sfx/start_menu_4.asm | 4 + audio/sfx/surfing_add_points.asm | 7 -- audio/sfx/surfing_crash.asm | 6 +- audio/sfx/surfing_land.asm | 6 +- audio/sfx/unknown_80263.asm | 4 - audio/sfx/unknown_8026a.asm | 9 -- audio/sfx/unknown_8027f.asm | 7 -- audio/sfx/unknown_802cc.asm | 0 audio/sfx/unknown_80337.asm | 31 ------- audio/sfx/unknown_80383.asm | 35 -------- audio/sfx/unknown_803da.asm | 25 ------ audio/sfx/unknown_80411.asm | 33 -------- audio/sfx/unknown_80467.asm | 34 -------- audio/sfx/unknown_804bf.asm | 26 ------ audio/sfx/unknown_804fa.asm | 30 ------- audio/sfx/unknown_80545.asm | 29 ------- audio/sfx/unknown_8058b.asm | 31 ------- audio/sfx/unknown_805db.asm | 21 ----- audio/sfx/unknown_80603.asm | 23 ----- audio/sfx/unknown_80633.asm | 22 ----- audio/sfx/unknown_80661.asm | 21 ----- audio/sfx/unknown_80689.asm | 19 ----- audio/sfx/unknown_806af.asm | 37 -------- audio/sfx/unknown_80712.asm | 29 ------- audio/sfx/unknown_80760.asm | 17 ---- audio/sfx/unknown_8077e.asm | 40 --------- audio/sfx/unknown_807eb.asm | 24 ------ audio/sfx/unknown_8081e.asm | 35 -------- audio/sfx/unknown_80879.asm | 23 ----- audio/sfx/unknown_808a9.asm | 32 ------- audio/sfx/unknown_808fa.asm | 18 ---- audio/sfx/unknown_8091c.asm | 21 ----- audio/sfx/unknown_80944.asm | 26 ------ audio/sfx/unknown_8097f.asm | 24 ------ audio/sfx/unknown_809b2.asm | 30 ------- audio/sfx/unknown_809fb.asm | 21 ----- audio/sfx/unknown_80a23.asm | 38 --------- audio/sfx/unknown_80a89.asm | 30 ------- audio/sfx/unknown_80ad2.asm | 24 ------ audio/sfx/unknown_80b05.asm | 31 ------- audio/sfx/unknown_80b53.asm | 30 ------- audio/sfx/unknown_80b9c.asm | 29 ------- audio/sfx/unknown_80be2.asm | 34 -------- audio/sfx/unknown_80c3b.asm | 24 ------ audio/sfx/unknown_80c6e.asm | 24 ------ audio/sfx/unknown_80ca1.asm | 27 ------ audio/sfx/unknown_80ce7.asm | 24 ------ audio/sfx/unknown_80e91.asm | 47 ----------- audio/sfx/unused_4.asm | 31 +++++++ constants/music_constants.asm | 11 ++- engine/surfing_minigame.asm | 8 +- 100 files changed, 1305 insertions(+), 1306 deletions(-) create mode 100644 audio/sfx/cry00_4.asm create mode 100644 audio/sfx/cry01_4.asm create mode 100644 audio/sfx/cry02_4.asm create mode 100644 audio/sfx/cry03_4.asm create mode 100644 audio/sfx/cry04_4.asm create mode 100644 audio/sfx/cry05_4.asm create mode 100644 audio/sfx/cry06_4.asm create mode 100644 audio/sfx/cry07_4.asm create mode 100644 audio/sfx/cry08_4.asm create mode 100644 audio/sfx/cry09_4.asm create mode 100644 audio/sfx/cry0a_4.asm create mode 100644 audio/sfx/cry0b_4.asm create mode 100644 audio/sfx/cry0c_4.asm create mode 100644 audio/sfx/cry0d_4.asm create mode 100644 audio/sfx/cry0e_4.asm create mode 100644 audio/sfx/cry0f_4.asm create mode 100644 audio/sfx/cry10_4.asm create mode 100644 audio/sfx/cry11_4.asm create mode 100644 audio/sfx/cry12_4.asm create mode 100644 audio/sfx/cry13_4.asm create mode 100644 audio/sfx/cry14_4.asm create mode 100644 audio/sfx/cry15_4.asm create mode 100644 audio/sfx/cry16_4.asm create mode 100644 audio/sfx/cry17_4.asm create mode 100644 audio/sfx/cry18_4.asm create mode 100644 audio/sfx/cry19_4.asm create mode 100644 audio/sfx/cry1a_4.asm create mode 100644 audio/sfx/cry1b_4.asm create mode 100644 audio/sfx/cry1c_4.asm create mode 100644 audio/sfx/cry1d_4.asm create mode 100644 audio/sfx/cry1e_4.asm create mode 100644 audio/sfx/cry1f_4.asm create mode 100644 audio/sfx/cry20_4.asm create mode 100644 audio/sfx/cry21_4.asm create mode 100644 audio/sfx/cry22_4.asm create mode 100644 audio/sfx/cry23_4.asm create mode 100644 audio/sfx/cry24_4.asm create mode 100644 audio/sfx/cry25_4.asm create mode 100644 audio/sfx/get_item1_4_2.asm create mode 100644 audio/sfx/heal_ailment_4.asm create mode 100644 audio/sfx/heal_hp_4.asm create mode 100644 audio/sfx/press_ab_4.asm create mode 100644 audio/sfx/start_menu_4.asm delete mode 100644 audio/sfx/surfing_add_points.asm delete mode 100755 audio/sfx/unknown_80263.asm delete mode 100644 audio/sfx/unknown_8026a.asm delete mode 100644 audio/sfx/unknown_8027f.asm mode change 100755 => 100644 audio/sfx/unknown_802cc.asm delete mode 100644 audio/sfx/unknown_80337.asm delete mode 100644 audio/sfx/unknown_80383.asm delete mode 100644 audio/sfx/unknown_803da.asm delete mode 100644 audio/sfx/unknown_80411.asm delete mode 100644 audio/sfx/unknown_80467.asm delete mode 100644 audio/sfx/unknown_804bf.asm delete mode 100644 audio/sfx/unknown_804fa.asm delete mode 100644 audio/sfx/unknown_80545.asm delete mode 100644 audio/sfx/unknown_8058b.asm delete mode 100644 audio/sfx/unknown_805db.asm delete mode 100644 audio/sfx/unknown_80603.asm delete mode 100644 audio/sfx/unknown_80633.asm delete mode 100644 audio/sfx/unknown_80661.asm delete mode 100644 audio/sfx/unknown_80689.asm delete mode 100644 audio/sfx/unknown_806af.asm delete mode 100644 audio/sfx/unknown_80712.asm delete mode 100644 audio/sfx/unknown_80760.asm delete mode 100644 audio/sfx/unknown_8077e.asm delete mode 100644 audio/sfx/unknown_807eb.asm delete mode 100644 audio/sfx/unknown_8081e.asm delete mode 100644 audio/sfx/unknown_80879.asm delete mode 100644 audio/sfx/unknown_808a9.asm delete mode 100644 audio/sfx/unknown_808fa.asm delete mode 100644 audio/sfx/unknown_8091c.asm delete mode 100644 audio/sfx/unknown_80944.asm delete mode 100644 audio/sfx/unknown_8097f.asm delete mode 100644 audio/sfx/unknown_809b2.asm delete mode 100644 audio/sfx/unknown_809fb.asm delete mode 100644 audio/sfx/unknown_80a23.asm delete mode 100644 audio/sfx/unknown_80a89.asm delete mode 100644 audio/sfx/unknown_80ad2.asm delete mode 100644 audio/sfx/unknown_80b05.asm delete mode 100644 audio/sfx/unknown_80b53.asm delete mode 100644 audio/sfx/unknown_80b9c.asm delete mode 100644 audio/sfx/unknown_80be2.asm delete mode 100644 audio/sfx/unknown_80c3b.asm delete mode 100644 audio/sfx/unknown_80c6e.asm delete mode 100644 audio/sfx/unknown_80ca1.asm delete mode 100644 audio/sfx/unknown_80ce7.asm delete mode 100644 audio/sfx/unknown_80e91.asm create mode 100644 audio/sfx/unused_4.asm diff --git a/audio.asm b/audio.asm index 9e1a6046..cff600d2 100644 --- a/audio.asm +++ b/audio.asm @@ -381,59 +381,59 @@ INCLUDE "audio/sfx/noise_instrument17_4.asm" INCLUDE "audio/sfx/noise_instrument18_4.asm" INCLUDE "audio/sfx/noise_instrument19_4.asm" -INCLUDE "audio/sfx/surfing_add_points.asm" -INCLUDE "audio/sfx/unknown_80263.asm" -INCLUDE "audio/sfx/unknown_8026a.asm" -INCLUDE "audio/sfx/unknown_8027f.asm" +INCLUDE "audio/sfx/press_ab_4.asm" +INCLUDE "audio/sfx/start_menu_4.asm" +INCLUDE "audio/sfx/heal_ailment_4.asm" +INCLUDE "audio/sfx/heal_hp_4.asm" INCLUDE "audio/sfx/tink_4.asm" INCLUDE "audio/sfx/surfing_jump.asm" INCLUDE "audio/sfx/surfing_flip.asm" INCLUDE "audio/sfx/unknown_802cc.asm" -INCLUDE "audio/sfx/surfing_crash.asm" INCLUDE "audio/sfx/surfing_land.asm" +INCLUDE "audio/sfx/surfing_crash.asm" INCLUDE "audio/sfx/get_item2_4_2.asm" -INCLUDE "audio/sfx/unknown_80337.asm" -INCLUDE "audio/sfx/unknown_80383.asm" -INCLUDE "audio/sfx/unknown_803da.asm" -INCLUDE "audio/sfx/unknown_80411.asm" -INCLUDE "audio/sfx/unknown_80467.asm" -INCLUDE "audio/sfx/unknown_804bf.asm" -INCLUDE "audio/sfx/unknown_804fa.asm" -INCLUDE "audio/sfx/unknown_80545.asm" -INCLUDE "audio/sfx/unknown_8058b.asm" -INCLUDE "audio/sfx/unknown_805db.asm" -INCLUDE "audio/sfx/unknown_80603.asm" -INCLUDE "audio/sfx/unknown_80633.asm" -INCLUDE "audio/sfx/unknown_80661.asm" -INCLUDE "audio/sfx/unknown_80689.asm" -INCLUDE "audio/sfx/unknown_806af.asm" -INCLUDE "audio/sfx/unknown_80712.asm" -INCLUDE "audio/sfx/unknown_80760.asm" -INCLUDE "audio/sfx/unknown_8077e.asm" -INCLUDE "audio/sfx/unknown_807eb.asm" -INCLUDE "audio/sfx/unknown_8081e.asm" -INCLUDE "audio/sfx/unknown_80879.asm" -INCLUDE "audio/sfx/unknown_808a9.asm" -INCLUDE "audio/sfx/unknown_808fa.asm" -INCLUDE "audio/sfx/unknown_8091c.asm" -INCLUDE "audio/sfx/unknown_80944.asm" -INCLUDE "audio/sfx/unknown_8097f.asm" -INCLUDE "audio/sfx/unknown_809b2.asm" -INCLUDE "audio/sfx/unknown_809fb.asm" -INCLUDE "audio/sfx/unknown_80a23.asm" -INCLUDE "audio/sfx/unknown_80a89.asm" -INCLUDE "audio/sfx/unknown_80ad2.asm" -INCLUDE "audio/sfx/unknown_80b05.asm" -INCLUDE "audio/sfx/unknown_80b53.asm" -INCLUDE "audio/sfx/unknown_80b9c.asm" -INCLUDE "audio/sfx/unknown_80be2.asm" -INCLUDE "audio/sfx/unknown_80c3b.asm" -INCLUDE "audio/sfx/unknown_80c6e.asm" -INCLUDE "audio/sfx/unknown_80ca1.asm" -INCLUDE "audio/sfx/unknown_80ce7.asm" +INCLUDE "audio/sfx/unused_4.asm" +INCLUDE "audio/sfx/cry09_4.asm" +INCLUDE "audio/sfx/cry23_4.asm" +INCLUDE "audio/sfx/cry24_4.asm" +INCLUDE "audio/sfx/cry11_4.asm" +INCLUDE "audio/sfx/cry25_4.asm" +INCLUDE "audio/sfx/cry03_4.asm" +INCLUDE "audio/sfx/cry0f_4.asm" +INCLUDE "audio/sfx/cry10_4.asm" +INCLUDE "audio/sfx/cry00_4.asm" +INCLUDE "audio/sfx/cry0e_4.asm" +INCLUDE "audio/sfx/cry06_4.asm" +INCLUDE "audio/sfx/cry07_4.asm" +INCLUDE "audio/sfx/cry05_4.asm" +INCLUDE "audio/sfx/cry0b_4.asm" +INCLUDE "audio/sfx/cry0c_4.asm" +INCLUDE "audio/sfx/cry02_4.asm" +INCLUDE "audio/sfx/cry0d_4.asm" +INCLUDE "audio/sfx/cry01_4.asm" +INCLUDE "audio/sfx/cry0a_4.asm" +INCLUDE "audio/sfx/cry08_4.asm" +INCLUDE "audio/sfx/cry04_4.asm" +INCLUDE "audio/sfx/cry19_4.asm" +INCLUDE "audio/sfx/cry16_4.asm" +INCLUDE "audio/sfx/cry1b_4.asm" +INCLUDE "audio/sfx/cry12_4.asm" +INCLUDE "audio/sfx/cry13_4.asm" +INCLUDE "audio/sfx/cry14_4.asm" +INCLUDE "audio/sfx/cry1e_4.asm" +INCLUDE "audio/sfx/cry15_4.asm" +INCLUDE "audio/sfx/cry17_4.asm" +INCLUDE "audio/sfx/cry1c_4.asm" +INCLUDE "audio/sfx/cry1a_4.asm" +INCLUDE "audio/sfx/cry1d_4.asm" +INCLUDE "audio/sfx/cry18_4.asm" +INCLUDE "audio/sfx/cry1f_4.asm" +INCLUDE "audio/sfx/cry20_4.asm" +INCLUDE "audio/sfx/cry21_4.asm" +INCLUDE "audio/sfx/cry22_4.asm" INCLUDE "audio/music/printer.asm" INCLUDE "audio/sfx/get_item1_4.asm" -INCLUDE "audio/sfx/unknown_80e91.asm" +INCLUDE "audio/sfx/get_item1_4_2.asm" INCLUDE "audio/sfx/get_item2_4.asm" diff --git a/audio/headers/sfxheaders1.asm b/audio/headers/sfxheaders1.asm index de0d3b89..2d5eca4a 100644 --- a/audio/headers/sfxheaders1.asm +++ b/audio/headers/sfxheaders1.asm @@ -1,5 +1,5 @@ SFX_Headers_1:: - dbw -1, -1 ; padding + db $ff, $ff, $ff ; padding SFX_Noise_Instrument01_1:: audio_header SFX_Noise_Instrument01_1, Ch8 diff --git a/audio/headers/sfxheaders2.asm b/audio/headers/sfxheaders2.asm index eb8eb4c1..912d137e 100644 --- a/audio/headers/sfxheaders2.asm +++ b/audio/headers/sfxheaders2.asm @@ -1,5 +1,5 @@ SFX_Headers_2:: - dbw -1, -1 ; padding + db $ff, $ff, $ff ; padding SFX_Noise_Instrument01_2:: audio_header SFX_Noise_Instrument01_2, Ch8 diff --git a/audio/headers/sfxheaders3.asm b/audio/headers/sfxheaders3.asm index d1e0a127..2732767f 100644 --- a/audio/headers/sfxheaders3.asm +++ b/audio/headers/sfxheaders3.asm @@ -1,5 +1,5 @@ SFX_Headers_3:: - dbw -1, -1 ; padding + db $ff, $ff, $ff ; padding SFX_Noise_Instrument01_3:: audio_header SFX_Noise_Instrument01_3, Ch8 diff --git a/audio/headers/sfxheaders4.asm b/audio/headers/sfxheaders4.asm index c7f7e9d6..d371d3f8 100644 --- a/audio/headers/sfxheaders4.asm +++ b/audio/headers/sfxheaders4.asm @@ -1,5 +1,5 @@ SFX_Headers_4:: - dbw -1, -1 ; padding + db $ff, $ff, $ff ; padding SFX_Noise_Instrument01_4:: audio_header SFX_Noise_Instrument01_4, Ch8 @@ -58,119 +58,119 @@ SFX_Noise_Instrument18_4:: SFX_Noise_Instrument19_4:: audio_header SFX_Noise_Instrument19_4, Ch8 -SFX_Unknown_805db:: - audio_header SFX_Unknown_805db, Ch5, Ch6, Ch8 +SFX_Cry00_4:: + audio_header SFX_Cry00_4, Ch5, Ch6, Ch8 -SFX_Unknown_807eb:: - audio_header SFX_Unknown_807eb, Ch5, Ch6, Ch8 +SFX_Cry01_4:: + audio_header SFX_Cry01_4, Ch5, Ch6, Ch8 -SFX_Unknown_80760:: - audio_header SFX_Unknown_80760, Ch5, Ch6, Ch8 +SFX_Cry02_4:: + audio_header SFX_Cry02_4, Ch5, Ch6, Ch8 -SFX_Unknown_804fa:: - audio_header SFX_Unknown_804fa, Ch5, Ch6, Ch8 +SFX_Cry03_4:: + audio_header SFX_Cry03_4, Ch5, Ch6, Ch8 -SFX_Unknown_808a9:: - audio_header SFX_Unknown_808a9, Ch5, Ch6, Ch8 +SFX_Cry04_4:: + audio_header SFX_Cry04_4, Ch5, Ch6, Ch8 -SFX_Unknown_80689:: - audio_header SFX_Unknown_80689, Ch5, Ch6, Ch8 +SFX_Cry05_4:: + audio_header SFX_Cry05_4, Ch5, Ch6, Ch8 -SFX_Unknown_80633:: - audio_header SFX_Unknown_80633, Ch5, Ch6, Ch8 +SFX_Cry06_4:: + audio_header SFX_Cry06_4, Ch5, Ch6, Ch8 -SFX_Unknown_80661:: - audio_header SFX_Unknown_80661, Ch5, Ch6, Ch8 +SFX_Cry07_4:: + audio_header SFX_Cry07_4, Ch5, Ch6, Ch8 -SFX_Unknown_80879:: - audio_header SFX_Unknown_80879, Ch5, Ch6, Ch8 +SFX_Cry08_4:: + audio_header SFX_Cry08_4, Ch5, Ch6, Ch8 -SFX_Unknown_80383:: - audio_header SFX_Unknown_80383, Ch5, Ch6, Ch8 +SFX_Cry09_4:: + audio_header SFX_Cry09_4, Ch5, Ch6, Ch8 -SFX_Unknown_8081e:: - audio_header SFX_Unknown_8081e, Ch5, Ch6, Ch8 +SFX_Cry0A_4:: + audio_header SFX_Cry0A_4, Ch5, Ch6, Ch8 -SFX_Unknown_806af:: - audio_header SFX_Unknown_806af, Ch5, Ch6, Ch8 +SFX_Cry0B_4:: + audio_header SFX_Cry0B_4, Ch5, Ch6, Ch8 -SFX_Unknown_80712:: - audio_header SFX_Unknown_80712, Ch5, Ch6, Ch8 +SFX_Cry0C_4:: + audio_header SFX_Cry0C_4, Ch5, Ch6, Ch8 -SFX_Unknown_8077e:: - audio_header SFX_Unknown_8077e, Ch5, Ch6, Ch8 +SFX_Cry0D_4:: + audio_header SFX_Cry0D_4, Ch5, Ch6, Ch8 -SFX_Unknown_80603:: - audio_header SFX_Unknown_80603, Ch5, Ch6, Ch8 +SFX_Cry0E_4:: + audio_header SFX_Cry0E_4, Ch5, Ch6, Ch8 -SFX_Unknown_80545:: - audio_header SFX_Unknown_80545, Ch5, Ch6, Ch8 +SFX_Cry0F_4:: + audio_header SFX_Cry0F_4, Ch5, Ch6, Ch8 -SFX_Unknown_8058b:: - audio_header SFX_Unknown_8058b, Ch5, Ch6, Ch8 +SFX_Cry10_4:: + audio_header SFX_Cry10_4, Ch5, Ch6, Ch8 -SFX_Unknown_80467:: - audio_header SFX_Unknown_80467, Ch5, Ch6, Ch8 +SFX_Cry11_4:: + audio_header SFX_Cry11_4, Ch5, Ch6, Ch8 -SFX_Unknown_8097f:: - audio_header SFX_Unknown_8097f, Ch5, Ch6, Ch8 +SFX_Cry12_4:: + audio_header SFX_Cry12_4, Ch5, Ch6, Ch8 -SFX_Unknown_809b2:: - audio_header SFX_Unknown_809b2, Ch5, Ch6, Ch8 +SFX_Cry13_4:: + audio_header SFX_Cry13_4, Ch5, Ch6, Ch8 -SFX_Unknown_809fb:: - audio_header SFX_Unknown_809fb, Ch5, Ch6, Ch8 +SFX_Cry14_4:: + audio_header SFX_Cry14_4, Ch5, Ch6, Ch8 -SFX_Unknown_80a89:: - audio_header SFX_Unknown_80a89, Ch5, Ch6, Ch8 +SFX_Cry15_4:: + audio_header SFX_Cry15_4, Ch5, Ch6, Ch8 -SFX_Unknown_8091c:: - audio_header SFX_Unknown_8091c, Ch5, Ch6, Ch8 +SFX_Cry16_4:: + audio_header SFX_Cry16_4, Ch5, Ch6, Ch8 -SFX_Unknown_80ad2:: - audio_header SFX_Unknown_80ad2, Ch5, Ch6, Ch8 +SFX_Cry17_4:: + audio_header SFX_Cry17_4, Ch5, Ch6, Ch8 -SFX_Unknown_80be2:: - audio_header SFX_Unknown_80be2, Ch5, Ch6, Ch8 +SFX_Cry18_4:: + audio_header SFX_Cry18_4, Ch5, Ch6, Ch8 -SFX_Unknown_808fa:: - audio_header SFX_Unknown_808fa, Ch5, Ch6, Ch8 +SFX_Cry19_4:: + audio_header SFX_Cry19_4, Ch5, Ch6, Ch8 -SFX_Unknown_80b53:: - audio_header SFX_Unknown_80b53, Ch5, Ch6, Ch8 +SFX_Cry1A_4:: + audio_header SFX_Cry1A_4, Ch5, Ch6, Ch8 -SFX_Unknown_80944:: - audio_header SFX_Unknown_80944, Ch5, Ch6, Ch8 +SFX_Cry1B_4:: + audio_header SFX_Cry1B_4, Ch5, Ch6, Ch8 -SFX_Unknown_80b05:: - audio_header SFX_Unknown_80b05, Ch5, Ch6, Ch8 +SFX_Cry1C_4:: + audio_header SFX_Cry1C_4, Ch5, Ch6, Ch8 -SFX_Unknown_80b9c:: - audio_header SFX_Unknown_80b9c, Ch5, Ch6, Ch8 +SFX_Cry1D_4:: + audio_header SFX_Cry1D_4, Ch5, Ch6, Ch8 -SFX_Unknown_80a23:: - audio_header SFX_Unknown_80a23, Ch5, Ch6, Ch8 +SFX_Cry1E_4:: + audio_header SFX_Cry1E_4, Ch5, Ch6, Ch8 -SFX_Unknown_80c3b:: - audio_header SFX_Unknown_80c3b, Ch5, Ch6, Ch8 +SFX_Cry1F_4:: + audio_header SFX_Cry1F_4, Ch5, Ch6, Ch8 -SFX_Unknown_80c6e:: - audio_header SFX_Unknown_80c6e, Ch5, Ch6, Ch8 +SFX_Cry20_4:: + audio_header SFX_Cry20_4, Ch5, Ch6, Ch8 -SFX_Unknown_80ca1:: - audio_header SFX_Unknown_80ca1, Ch5, Ch6, Ch8 +SFX_Cry21_4:: + audio_header SFX_Cry21_4, Ch5, Ch6, Ch8 -SFX_Unknown_80ce7:: - audio_header SFX_Unknown_80ce7, Ch5, Ch6, Ch8 +SFX_Cry22_4:: + audio_header SFX_Cry22_4, Ch5, Ch6, Ch8 -SFX_Unknown_803da:: - audio_header SFX_Unknown_803da, Ch5, Ch6, Ch8 +SFX_Cry23_4:: + audio_header SFX_Cry23_4, Ch5, Ch6, Ch8 -SFX_Unknown_80411:: - audio_header SFX_Unknown_80411, Ch5, Ch6, Ch8 +SFX_Cry24_4:: + audio_header SFX_Cry24_4, Ch5, Ch6, Ch8 -SFX_Unknown_804bf:: - audio_header SFX_Unknown_804bf, Ch5, Ch6, Ch8 +SFX_Cry25_4:: + audio_header SFX_Cry25_4, Ch5, Ch6, Ch8 SFX_Get_Item1_4:: audio_header SFX_Get_Item1_4, Ch5, Ch6, Ch7 @@ -181,17 +181,17 @@ SFX_Get_Item2_4:: SFX_Tink_4:: audio_header SFX_Tink_4, Ch5 -SFX_Unknown_8027f:: - audio_header SFX_Unknown_8027f, Ch5 +SFX_Heal_HP_4:: + audio_header SFX_Heal_HP_4, Ch5 -SFX_Unknown_8026a:: - audio_header SFX_Unknown_8026a, Ch5 +SFX_Heal_Ailment_4:: + audio_header SFX_Heal_Ailment_4, Ch5 -SFX_Unknown_80263:: - audio_header SFX_Unknown_80263, Ch8 +SFX_Start_Menu_4:: + audio_header SFX_Start_Menu_4, Ch8 -SFX_Surfing_Add_Points:: - audio_header SFX_Surfing_Add_Points, Ch5 +SFX_Press_AB_4:: + audio_header SFX_Press_AB_4, Ch5 SFX_Surfing_Jump:: audio_header SFX_Surfing_Jump, Ch8 @@ -199,14 +199,14 @@ SFX_Surfing_Jump:: SFX_Surfing_Flip:: audio_header SFX_Surfing_Flip, Ch5 -SFX_Surfing_Land:: - audio_header SFX_Surfing_Land, Ch8 +SFX_Surfing_Crash:: + audio_header SFX_Surfing_Crash, Ch8 SFX_Unknown_802cc:: audio_header SFX_Unknown_802cc, Ch5 -SFX_Surfing_Crash:: - audio_header SFX_Surfing_Crash, Ch8 +SFX_Surfing_Land:: + audio_header SFX_Surfing_Land, Ch8 SFX_Get_Item2_4_2:: audio_header SFX_Get_Item2_4_2, Ch5, Ch6, Ch7 diff --git a/audio/sfx/battle_27.asm b/audio/sfx/battle_27.asm index 1b505811..33f273fa 100644 --- a/audio/sfx/battle_27.asm +++ b/audio/sfx/battle_27.asm @@ -2,9 +2,9 @@ SFX_Battle_27_Ch5: duty_cycle 2 square_note 15, 3, -7, 1984 -SFX_Battle_27_branch_2062a: +SFX_Battle_27_branch_205da: square_note 15, 13, -7, 1984 - sound_loop 4, SFX_Battle_27_branch_2062a + sound_loop 4, SFX_Battle_27_branch_205da square_note 15, 13, 1, 1984 sound_ret @@ -13,9 +13,9 @@ SFX_Battle_27_Ch6: duty_cycle_pattern 2, 3, 0, 3 square_note 15, 2, -7, 1992 -SFX_Battle_27_branch_2063d: +SFX_Battle_27_branch_205ed: square_note 15, 12, -7, 1991 - sound_loop 4, SFX_Battle_27_branch_2063d + sound_loop 4, SFX_Battle_27_branch_205ed square_note 15, 12, 1, 1992 sound_ret diff --git a/audio/sfx/battle_36.asm b/audio/sfx/battle_36.asm index 773bf753..ea4d351f 100644 --- a/audio/sfx/battle_36.asm +++ b/audio/sfx/battle_36.asm @@ -12,10 +12,10 @@ SFX_Battle_36_Ch5: square_note 2, 15, 1, 1792 square_note 2, 15, 1, 2000 -SFX_Battle_36_branch_20930: +SFX_Battle_36_branch_208e0: square_note 2, 15, 1, 1792 square_note 2, 15, 1, 2016 - sound_loop 12, SFX_Battle_36_branch_20930 + sound_loop 12, SFX_Battle_36_branch_208e0 square_note 15, 15, 1, 1792 sound_ret @@ -35,7 +35,7 @@ SFX_Battle_36_Ch6: square_note 2, 15, 1, 2001 square_note 2, 15, 1, 1793 square_note 2, 15, 1, 2017 - sound_loop 12, SFX_Battle_36_branch_20930 + sound_loop 12, SFX_Battle_36_branch_208e0 square_note 15, 15, 1, 1793 sound_ret diff --git a/audio/sfx/cry00_4.asm b/audio/sfx/cry00_4.asm new file mode 100644 index 00000000..87bf036e --- /dev/null +++ b/audio/sfx/cry00_4.asm @@ -0,0 +1,21 @@ +SFX_Cry00_4_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 4, 15, 3, 1816 + square_note 15, 14, 5, 1944 + square_note 8, 9, 1, 1880 + sound_ret + + +SFX_Cry00_4_Ch6: + duty_cycle_pattern 2, 2, 0, 0 + square_note 5, 11, 3, 1800 + square_note 15, 12, 5, 1928 + square_note 8, 7, 1, 1864 + sound_ret + + +SFX_Cry00_4_Ch8: + noise_note 3, 10, 1, 28 + noise_note 14, 9, 4, 44 + noise_note 8, 8, 1, 28 + sound_ret diff --git a/audio/sfx/cry01_4.asm b/audio/sfx/cry01_4.asm new file mode 100644 index 00000000..98824d06 --- /dev/null +++ b/audio/sfx/cry01_4.asm @@ -0,0 +1,24 @@ +SFX_Cry01_4_Ch5: + duty_cycle_pattern 2, 2, 0, 0 + square_note 4, 15, 3, 1536 + square_note 8, 13, 5, 1888 + square_note 3, 14, 2, 1824 + square_note 8, 13, 1, 1808 + sound_ret + + +SFX_Cry01_4_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 5, 11, 3, 1777 + square_note 7, 12, 5, 1874 + square_note 3, 10, 2, 1809 + square_note 8, 11, 1, 1537 + sound_ret + + +SFX_Cry01_4_Ch8: + noise_note 3, 10, 2, 60 + noise_note 12, 9, 4, 44 + noise_note 3, 8, 2, 28 + noise_note 8, 7, 1, 44 + sound_ret diff --git a/audio/sfx/cry02_4.asm b/audio/sfx/cry02_4.asm new file mode 100644 index 00000000..aed17087 --- /dev/null +++ b/audio/sfx/cry02_4.asm @@ -0,0 +1,17 @@ +SFX_Cry02_4_Ch5: + duty_cycle 0 + square_note 8, 15, 5, 1152 + square_note 2, 14, 1, 1504 + square_note 8, 13, 1, 1500 + sound_ret + + +SFX_Cry02_4_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 7, 9, 5, 1089 + square_note 2, 8, 1, 1313 + square_note 8, 6, 1, 1306 + + +SFX_Cry02_4_Ch8: + sound_ret diff --git a/audio/sfx/cry03_4.asm b/audio/sfx/cry03_4.asm new file mode 100644 index 00000000..b4de22ce --- /dev/null +++ b/audio/sfx/cry03_4.asm @@ -0,0 +1,30 @@ +SFX_Cry03_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1544 + square_note 6, 14, 6, 1536 + square_note 6, 13, 7, 1520 + square_note 6, 12, 4, 1504 + square_note 5, 13, 3, 1472 + square_note 4, 13, 3, 1440 + square_note 8, 14, 1, 1408 + sound_ret + + +SFX_Cry03_4_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 12, 7, 1284 + square_note 6, 10, 6, 1282 + square_note 6, 9, 7, 1265 + square_note 4, 11, 4, 1249 + square_note 5, 10, 3, 1218 + square_note 4, 11, 3, 1187 + square_note 8, 12, 1, 1154 + sound_ret + + +SFX_Cry03_4_Ch8: + noise_note 12, 14, 4, 76 + noise_note 10, 12, 7, 92 + noise_note 12, 11, 6, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry04_4.asm b/audio/sfx/cry04_4.asm new file mode 100644 index 00000000..408ab37a --- /dev/null +++ b/audio/sfx/cry04_4.asm @@ -0,0 +1,32 @@ +SFX_Cry04_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 7, 1696 + square_note 8, 14, 6, 1700 + square_note 4, 13, 6, 1696 + square_note 12, 13, 3, 1568 + square_note 8, 12, 3, 1572 + square_note 4, 12, 2, 1568 + square_note 8, 11, 1, 1552 + sound_ret + + +SFX_Cry04_4_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 4, 14, 7, 1537 + square_note 8, 13, 6, 1539 + square_note 4, 12, 6, 1537 + square_note 12, 12, 3, 1409 + square_note 8, 11, 3, 1411 + square_note 4, 11, 2, 1410 + square_note 8, 10, 1, 1393 + sound_ret + + +SFX_Cry04_4_Ch8: + noise_note 7, 13, 6, 92 + noise_note 8, 14, 6, 76 + noise_note 4, 13, 4, 92 + noise_note 4, 13, 4, 76 + noise_note 7, 12, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry05_4.asm b/audio/sfx/cry05_4.asm new file mode 100644 index 00000000..cce656b1 --- /dev/null +++ b/audio/sfx/cry05_4.asm @@ -0,0 +1,19 @@ +SFX_Cry05_4_Ch5: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 14, 2, 1280 + square_note 6, 14, 3, 1408 + square_note 6, 13, 3, 1392 + square_note 8, 10, 1, 1376 + sound_ret + + +SFX_Cry05_4_Ch6: + duty_cycle_pattern 3, 3, 1, 1 + square_note 6, 14, 2, 1154 + square_note 6, 13, 3, 1281 + square_note 6, 11, 2, 1250 + square_note 8, 8, 1, 1217 + + +SFX_Cry05_4_Ch8: + sound_ret diff --git a/audio/sfx/cry06_4.asm b/audio/sfx/cry06_4.asm new file mode 100644 index 00000000..2fbbb161 --- /dev/null +++ b/audio/sfx/cry06_4.asm @@ -0,0 +1,22 @@ +SFX_Cry06_4_Ch5: + duty_cycle_pattern 3, 3, 2, 2 + square_note 6, 8, 3, 583 + square_note 15, 6, 2, 550 + square_note 4, 5, 2, 581 + square_note 9, 6, 3, 518 + square_note 15, 8, 2, 549 + square_note 15, 4, 2, 519 + + +SFX_Cry06_4_Ch6: + sound_ret + + +SFX_Cry06_4_Ch8: + noise_note 8, 13, 4, 140 + noise_note 4, 14, 2, 156 + noise_note 15, 12, 6, 140 + noise_note 8, 14, 4, 172 + noise_note 15, 13, 7, 156 + noise_note 15, 15, 2, 172 + sound_ret diff --git a/audio/sfx/cry07_4.asm b/audio/sfx/cry07_4.asm new file mode 100644 index 00000000..7e44544f --- /dev/null +++ b/audio/sfx/cry07_4.asm @@ -0,0 +1,21 @@ +SFX_Cry07_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1760 + square_note 15, 14, 4, 1600 + square_note 8, 12, 1, 1568 + sound_ret + + +SFX_Cry07_4_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 3, 12, 3, 1667 + square_note 14, 11, 4, 1538 + square_note 8, 10, 1, 1537 + sound_ret + + +SFX_Cry07_4_Ch8: + noise_note 4, 13, 3, 92 + noise_note 15, 14, 6, 76 + noise_note 8, 11, 1, 92 + sound_ret diff --git a/audio/sfx/cry08_4.asm b/audio/sfx/cry08_4.asm new file mode 100644 index 00000000..67dcb820 --- /dev/null +++ b/audio/sfx/cry08_4.asm @@ -0,0 +1,23 @@ +SFX_Cry08_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 6, 1381 + square_note 10, 14, 4, 1404 + square_note 3, 12, 2, 1372 + square_note 15, 11, 2, 1340 + sound_ret + + +SFX_Cry08_4_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 14, 13, 6, 1283 + square_note 9, 11, 4, 1307 + square_note 4, 9, 2, 1274 + square_note 15, 10, 2, 1243 + sound_ret + + +SFX_Cry08_4_Ch8: + noise_note 12, 14, 6, 76 + noise_note 11, 13, 7, 92 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry09_4.asm b/audio/sfx/cry09_4.asm new file mode 100644 index 00000000..7dec80d3 --- /dev/null +++ b/audio/sfx/cry09_4.asm @@ -0,0 +1,35 @@ +SFX_Cry09_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1952 + square_note 6, 14, 6, 1955 + square_note 10, 15, 4, 1952 + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 15, 6, 2008 + square_note 4, 14, 3, 2007 + square_note 15, 15, 2, 2008 + sound_ret + + +SFX_Cry09_4_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 2, 0, 8, 0 + square_note 15, 10, 7, 1697 + square_note 6, 8, 6, 1698 + square_note 10, 7, 4, 1697 + duty_cycle_pattern 1, 1, 3, 3 + square_note 10, 7, 6, 1750 + square_note 4, 8, 3, 1753 + square_note 15, 10, 2, 1751 + sound_ret + + +SFX_Cry09_4_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 15, 13, 7, 60 + noise_note 6, 12, 5, 59 + noise_note 6, 14, 4, 61 + noise_note 8, 11, 6, 60 + noise_note 6, 13, 4, 61 + noise_note 8, 12, 1, 59 + sound_ret diff --git a/audio/sfx/cry0a_4.asm b/audio/sfx/cry0a_4.asm new file mode 100644 index 00000000..c3cf315b --- /dev/null +++ b/audio/sfx/cry0a_4.asm @@ -0,0 +1,35 @@ +SFX_Cry0A_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 15, 7, 1760 + square_note 6, 14, 6, 1765 + square_note 3, 15, 4, 1760 + square_note 3, 15, 6, 1744 + square_note 3, 14, 3, 1728 + square_note 4, 15, 2, 1712 + square_note 15, 10, 2, 1736 + sound_ret + + +SFX_Cry0A_4_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 3, 0, 8, 0 + square_note 8, 10, 7, 1697 + square_note 6, 8, 6, 1699 + square_note 3, 7, 4, 1697 + square_note 3, 7, 6, 1681 + square_note 3, 8, 3, 1666 + square_note 4, 10, 2, 1649 + square_note 15, 7, 2, 1673 + sound_ret + + +SFX_Cry0A_4_Ch8: + noise_note 2, 15, 2, 60 + noise_note 8, 14, 4, 62 + noise_note 8, 13, 7, 60 + noise_note 5, 12, 5, 59 + noise_note 3, 13, 4, 44 + noise_note 2, 11, 6, 60 + noise_note 3, 10, 4, 44 + noise_note 8, 9, 1, 60 + sound_ret diff --git a/audio/sfx/cry0b_4.asm b/audio/sfx/cry0b_4.asm new file mode 100644 index 00000000..610e2831 --- /dev/null +++ b/audio/sfx/cry0b_4.asm @@ -0,0 +1,37 @@ +SFX_Cry0B_4_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 1, 1792 + square_note 4, 14, 1, 1920 + square_note 4, 13, 1, 1856 + square_note 4, 14, 1, 1856 + square_note 4, 15, 1, 1920 + square_note 4, 13, 1, 1792 + square_note 4, 15, 1, 1793 + square_note 4, 13, 1, 1922 + square_note 4, 12, 1, 1858 + square_note 8, 11, 1, 1857 + sound_ret + + +SFX_Cry0B_4_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 0, 8, 0 + square_note 4, 15, 1, 1793 + square_note 4, 14, 1, 1922 + square_note 4, 13, 1, 1857 + square_note 4, 14, 1, 1857 + square_note 4, 15, 1, 1922 + square_note 8, 13, 1, 1793 + sound_ret + + +SFX_Cry0B_4_Ch8: + noise_note 15, 0, 8, 0 + noise_note 4, 0, 8, 0 + noise_note 4, 13, 1, 76 + noise_note 4, 11, 1, 44 + noise_note 4, 13, 1, 60 + noise_note 4, 11, 1, 60 + noise_note 4, 12, 1, 44 + noise_note 8, 10, 1, 76 + sound_ret diff --git a/audio/sfx/cry0c_4.asm b/audio/sfx/cry0c_4.asm new file mode 100644 index 00000000..cc8766a1 --- /dev/null +++ b/audio/sfx/cry0c_4.asm @@ -0,0 +1,29 @@ +SFX_Cry0C_4_Ch5: + duty_cycle_pattern 3, 0, 3, 0 + square_note 8, 15, 5, 1536 + square_note 2, 13, 2, 1592 + square_note 2, 12, 2, 1584 + square_note 2, 12, 2, 1576 + square_note 2, 11, 2, 1568 + square_note 2, 11, 2, 1552 + square_note 2, 10, 2, 1560 + square_note 2, 11, 2, 1552 + square_note 8, 12, 1, 1568 + sound_ret + + +SFX_Cry0C_4_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 12, 12, 3, 1472 + square_note 3, 11, 1, 1529 + square_note 2, 10, 1, 1521 + square_note 2, 10, 1, 1513 + square_note 2, 9, 1, 1505 + square_note 2, 9, 1, 1497 + square_note 2, 8, 1, 1489 + square_note 2, 9, 1, 1497 + square_note 8, 9, 1, 1505 + + +SFX_Cry0C_4_Ch8: + sound_ret diff --git a/audio/sfx/cry0d_4.asm b/audio/sfx/cry0d_4.asm new file mode 100644 index 00000000..2119f0a9 --- /dev/null +++ b/audio/sfx/cry0d_4.asm @@ -0,0 +1,40 @@ +SFX_Cry0D_4_Ch5: + duty_cycle_pattern 2, 0, 2, 0 + square_note 5, 15, 2, 1616 + square_note 9, 13, 1, 1632 + square_note 5, 14, 2, 1554 + square_note 9, 12, 1, 1570 + square_note 5, 15, 2, 1552 + square_note 6, 13, 1, 1568 + sound_loop 2, SFX_Cry0D_4_Ch5 + sound_ret + + +SFX_Cry0D_4_Ch6: + duty_cycle_pattern 1, 0, 0, 0 + square_note 4, 0, 8, 0 + square_note 5, 15, 2, 1617 + square_note 9, 13, 1, 1633 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 12, 13, 1, 1569 + square_note 5, 14, 2, 1556 + square_note 8, 12, 1, 1572 + square_note 5, 15, 2, 1553 + square_note 4, 13, 1, 1569 + sound_ret + + +SFX_Cry0D_4_Ch8: + noise_note 6, 13, 2, 28 + noise_note 9, 11, 1, 44 + noise_note 8, 12, 2, 44 + noise_note 9, 11, 1, 60 + noise_note 6, 12, 2, 44 + noise_note 9, 10, 2, 60 + noise_note 7, 12, 2, 44 + noise_note 5, 10, 1, 60 + noise_note 9, 12, 2, 44 + noise_note 4, 10, 1, 60 + sound_ret diff --git a/audio/sfx/cry0e_4.asm b/audio/sfx/cry0e_4.asm new file mode 100644 index 00000000..0c18e996 --- /dev/null +++ b/audio/sfx/cry0e_4.asm @@ -0,0 +1,23 @@ +SFX_Cry0E_4_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 4, 14, 1, 1792 + square_note 4, 15, 2, 1920 + square_note 2, 9, 2, 1856 + square_note 8, 14, 1, 1536 + sound_ret + + +SFX_Cry0E_4_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 11, 1, 1761 + square_note 3, 12, 2, 1761 + square_note 3, 6, 2, 1665 + square_note 8, 11, 1, 1505 + sound_ret + + +SFX_Cry0E_4_Ch8: + noise_note 2, 6, 1, 50 + noise_note 2, 6, 1, 33 + noise_note 8, 6, 1, 17 + sound_ret diff --git a/audio/sfx/cry0f_4.asm b/audio/sfx/cry0f_4.asm new file mode 100644 index 00000000..6debdb09 --- /dev/null +++ b/audio/sfx/cry0f_4.asm @@ -0,0 +1,29 @@ +SFX_Cry0F_4_Ch5: + duty_cycle_pattern 3, 3, 0, 1 + square_note 4, 15, 7, 1984 + square_note 12, 14, 6, 1986 + square_note 6, 11, 5, 1664 + square_note 4, 12, 4, 1648 + square_note 4, 11, 5, 1632 + square_note 8, 12, 1, 1600 + sound_ret + + +SFX_Cry0F_4_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 12, 7, 1921 + square_note 12, 11, 6, 1920 + square_note 6, 10, 5, 1601 + square_note 4, 12, 4, 1586 + square_note 6, 11, 5, 1569 + square_note 8, 10, 1, 1538 + sound_ret + + +SFX_Cry0F_4_Ch8: + noise_note 3, 14, 4, 60 + noise_note 12, 13, 6, 44 + noise_note 4, 14, 4, 60 + noise_note 8, 11, 7, 92 + noise_note 15, 12, 2, 93 + sound_ret diff --git a/audio/sfx/cry10_4.asm b/audio/sfx/cry10_4.asm new file mode 100644 index 00000000..39c374bc --- /dev/null +++ b/audio/sfx/cry10_4.asm @@ -0,0 +1,31 @@ +SFX_Cry10_4_Ch5: + duty_cycle_pattern 3, 0, 2, 1 + square_note 8, 15, 7, 1664 + square_note 2, 15, 7, 1632 + square_note 1, 14, 7, 1600 + square_note 1, 14, 7, 1568 + square_note 15, 13, 1, 1536 + square_note 4, 12, 7, 1856 + square_note 4, 10, 7, 1840 + square_note 15, 9, 1, 1824 + sound_ret + + +SFX_Cry10_4_Ch6: + duty_cycle_pattern 1, 3, 2, 1 + square_note 10, 14, 7, 1666 + square_note 2, 14, 7, 1634 + square_note 1, 13, 7, 1602 + square_note 1, 13, 7, 1570 + square_note 15, 12, 1, 1538 + square_note 4, 11, 7, 1858 + square_note 2, 9, 7, 1842 + square_note 15, 8, 1, 1826 + sound_ret + + +SFX_Cry10_4_Ch8: + noise_note 4, 7, 4, 33 + noise_note 4, 7, 4, 16 + noise_note 4, 7, 1, 32 + sound_ret diff --git a/audio/sfx/cry11_4.asm b/audio/sfx/cry11_4.asm new file mode 100644 index 00000000..8e75ec6a --- /dev/null +++ b/audio/sfx/cry11_4.asm @@ -0,0 +1,34 @@ +SFX_Cry11_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1952 + square_note 8, 14, 6, 1956 + square_note 4, 13, 6, 1952 + square_note 15, 13, 3, 1824 + square_note 8, 12, 3, 1827 + square_note 2, 12, 2, 1832 + square_note 8, 11, 1, 1840 + sound_ret + + +SFX_Cry11_4_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 4, 0, 8, 0 + square_note 6, 10, 7, 1857 + square_note 8, 8, 6, 1859 + square_note 4, 7, 6, 1857 + square_note 13, 8, 3, 1730 + square_note 7, 7, 3, 1729 + square_note 3, 8, 2, 1740 + square_note 8, 7, 1, 1752 + sound_ret + + +SFX_Cry11_4_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 6, 58 + noise_note 4, 13, 7, 58 + noise_note 6, 13, 6, 44 + noise_note 8, 14, 5, 60 + noise_note 12, 13, 2, 61 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry12_4.asm b/audio/sfx/cry12_4.asm new file mode 100644 index 00000000..0c98bdee --- /dev/null +++ b/audio/sfx/cry12_4.asm @@ -0,0 +1,24 @@ +SFX_Cry12_4_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 12, 15, 2, 1088 + square_note 15, 14, 3, 1184 + square_note 4, 13, 2, 1168 + square_note 8, 13, 1, 1152 + sound_ret + + +SFX_Cry12_4_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 11, 13, 2, 1080 + square_note 14, 12, 6, 1176 + square_note 3, 11, 2, 1160 + square_note 8, 11, 1, 1144 + sound_ret + + +SFX_Cry12_4_Ch8: + noise_note 10, 14, 6, 108 + noise_note 15, 13, 2, 92 + noise_note 3, 12, 2, 108 + noise_note 8, 13, 1, 92 + sound_ret diff --git a/audio/sfx/cry13_4.asm b/audio/sfx/cry13_4.asm new file mode 100644 index 00000000..649e1a73 --- /dev/null +++ b/audio/sfx/cry13_4.asm @@ -0,0 +1,30 @@ +SFX_Cry13_4_Ch5: + duty_cycle_pattern 0, 3, 0, 3 + square_note 15, 15, 6, 1472 + square_note 8, 14, 3, 1468 + square_note 6, 13, 2, 1488 + square_note 6, 11, 2, 1504 + square_note 6, 12, 2, 1520 + square_note 8, 11, 1, 1536 + sound_ret + + +SFX_Cry13_4_Ch6: + duty_cycle_pattern 2, 1, 2, 1 + square_note 14, 12, 6, 1201 + square_note 7, 12, 3, 1197 + square_note 5, 11, 2, 1217 + square_note 8, 9, 2, 1233 + square_note 6, 10, 2, 1249 + square_note 8, 9, 1, 1265 + sound_ret + + +SFX_Cry13_4_Ch8: + noise_note 10, 14, 6, 92 + noise_note 10, 13, 6, 108 + noise_note 4, 12, 2, 76 + noise_note 6, 13, 3, 92 + noise_note 8, 11, 3, 76 + noise_note 8, 10, 1, 92 + sound_ret diff --git a/audio/sfx/cry14_4.asm b/audio/sfx/cry14_4.asm new file mode 100644 index 00000000..b3dc1b2d --- /dev/null +++ b/audio/sfx/cry14_4.asm @@ -0,0 +1,21 @@ +SFX_Cry14_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 8, 14, 4, 1936 + square_note 15, 15, 5, 1984 + square_note 8, 13, 1, 2008 + sound_ret + + +SFX_Cry14_4_Ch6: + duty_cycle_pattern 2, 2, 1, 1 + square_note 10, 12, 4, 1905 + square_note 15, 11, 6, 1954 + square_note 8, 10, 1, 1975 + sound_ret + + +SFX_Cry14_4_Ch8: + noise_note 8, 14, 4, 76 + noise_note 14, 12, 4, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry15_4.asm b/audio/sfx/cry15_4.asm new file mode 100644 index 00000000..7764d751 --- /dev/null +++ b/audio/sfx/cry15_4.asm @@ -0,0 +1,30 @@ +SFX_Cry15_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 4, 15, 3, 1920 + square_note 15, 14, 7, 1792 + square_note 8, 13, 3, 1808 + square_note 4, 12, 2, 1792 + square_note 4, 13, 2, 1776 + square_note 8, 12, 1, 1760 + sound_ret + + +SFX_Cry15_4_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 6, 12, 3, 1793 + square_note 14, 11, 7, 1665 + square_note 7, 11, 3, 1682 + square_note 3, 10, 2, 1665 + square_note 4, 11, 2, 1650 + square_note 8, 10, 1, 1633 + sound_ret + + +SFX_Cry15_4_Ch8: + noise_note 6, 14, 3, 92 + noise_note 14, 13, 6, 76 + noise_note 6, 12, 6, 60 + noise_note 3, 11, 3, 76 + noise_note 3, 10, 2, 92 + noise_note 8, 11, 1, 108 + sound_ret diff --git a/audio/sfx/cry16_4.asm b/audio/sfx/cry16_4.asm new file mode 100644 index 00000000..35ddd284 --- /dev/null +++ b/audio/sfx/cry16_4.asm @@ -0,0 +1,21 @@ +SFX_Cry16_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 13, 7, 1920 + square_note 4, 14, 6, 1952 + square_note 15, 13, 2, 1856 + sound_ret + + +SFX_Cry16_4_Ch6: + duty_cycle_pattern 1, 1, 2, 2 + square_note 15, 12, 7, 1875 + square_note 5, 11, 6, 1906 + square_note 15, 12, 2, 1809 + sound_ret + + +SFX_Cry16_4_Ch8: + noise_note 13, 15, 6, 76 + noise_note 4, 14, 6, 60 + noise_note 15, 15, 2, 76 + sound_ret diff --git a/audio/sfx/cry17_4.asm b/audio/sfx/cry17_4.asm new file mode 100644 index 00000000..a5c8de8e --- /dev/null +++ b/audio/sfx/cry17_4.asm @@ -0,0 +1,24 @@ +SFX_Cry17_4_Ch5: + duty_cycle_pattern 0, 0, 3, 3 + square_note 15, 15, 7, 1280 + square_note 15, 14, 7, 1288 + square_note 8, 11, 4, 1152 + square_note 15, 10, 2, 1120 + sound_ret + + +SFX_Cry17_4_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 14, 13, 7, 1153 + square_note 14, 12, 7, 1161 + square_note 10, 11, 4, 1025 + square_note 15, 12, 2, 993 + sound_ret + + +SFX_Cry17_4_Ch8: + noise_note 14, 15, 7, 124 + noise_note 12, 15, 6, 108 + noise_note 9, 14, 4, 124 + noise_note 15, 14, 2, 108 + sound_ret diff --git a/audio/sfx/cry18_4.asm b/audio/sfx/cry18_4.asm new file mode 100644 index 00000000..2909234a --- /dev/null +++ b/audio/sfx/cry18_4.asm @@ -0,0 +1,34 @@ +SFX_Cry18_4_Ch5: + duty_cycle_pattern 1, 1, 0, 0 + square_note 10, 15, 5, 1664 + square_note 3, 14, 2, 1696 + square_note 3, 15, 2, 1728 + square_note 3, 14, 2, 1760 + square_note 3, 13, 2, 1792 + square_note 3, 12, 2, 1760 + square_note 3, 13, 2, 1728 + square_note 8, 12, 1, 1696 + sound_ret + + +SFX_Cry18_4_Ch6: + duty_cycle_pattern 0, 0, 3, 3 + square_note 9, 13, 5, 1585 + square_note 3, 13, 2, 1618 + square_note 3, 14, 2, 1649 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1714 + square_note 3, 11, 2, 1681 + square_note 3, 12, 2, 1649 + square_note 8, 11, 1, 1617 + sound_ret + + +SFX_Cry18_4_Ch8: + noise_note 6, 14, 3, 76 + noise_note 4, 12, 3, 60 + noise_note 5, 13, 4, 60 + noise_note 4, 12, 4, 44 + noise_note 6, 11, 4, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry19_4.asm b/audio/sfx/cry19_4.asm new file mode 100644 index 00000000..0deaf3e3 --- /dev/null +++ b/audio/sfx/cry19_4.asm @@ -0,0 +1,18 @@ +SFX_Cry19_4_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 7, 13, 2, 1856 + square_note 15, 14, 5, 1888 + square_note 15, 12, 1, 1840 + sound_ret + + +SFX_Cry19_4_Ch6: + duty_cycle_pattern 2, 0, 0, 1 + square_note 2, 12, 2, 1793 + square_note 4, 12, 2, 1800 + square_note 15, 13, 7, 1857 + square_note 15, 10, 2, 1793 + + +SFX_Cry19_4_Ch8: + sound_ret diff --git a/audio/sfx/cry1a_4.asm b/audio/sfx/cry1a_4.asm new file mode 100644 index 00000000..1a1856e7 --- /dev/null +++ b/audio/sfx/cry1a_4.asm @@ -0,0 +1,30 @@ +SFX_Cry1A_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1856 + square_note 12, 14, 6, 1860 + square_note 6, 13, 5, 1872 + square_note 4, 12, 3, 1888 + square_note 3, 12, 3, 1920 + square_note 8, 13, 1, 1952 + sound_ret + + +SFX_Cry1A_4_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 6, 12, 7, 1793 + square_note 11, 11, 6, 1794 + square_note 6, 10, 5, 1809 + square_note 4, 9, 3, 1825 + square_note 3, 10, 3, 1857 + square_note 8, 9, 1, 1890 + sound_ret + + +SFX_Cry1A_4_Ch8: + noise_note 3, 14, 2, 60 + noise_note 8, 13, 6, 76 + noise_note 5, 13, 4, 60 + noise_note 12, 12, 7, 76 + noise_note 2, 14, 2, 60 + noise_note 8, 13, 1, 44 + sound_ret diff --git a/audio/sfx/cry1b_4.asm b/audio/sfx/cry1b_4.asm new file mode 100644 index 00000000..f0a57d88 --- /dev/null +++ b/audio/sfx/cry1b_4.asm @@ -0,0 +1,26 @@ +SFX_Cry1B_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 7, 1728 + square_note 15, 14, 7, 1792 + square_note 4, 15, 4, 1776 + square_note 4, 14, 4, 1760 + square_note 8, 13, 1, 1744 + sound_ret + + +SFX_Cry1B_4_Ch6: + duty_cycle_pattern 0, 0, 2, 2 + square_note 7, 14, 6, 1665 + square_note 14, 13, 5, 1729 + square_note 4, 12, 4, 1713 + square_note 4, 13, 4, 1697 + square_note 8, 12, 1, 1681 + sound_ret + + +SFX_Cry1B_4_Ch8: + noise_note 10, 10, 6, 60 + noise_note 14, 9, 4, 44 + noise_note 5, 10, 3, 60 + noise_note 8, 9, 1, 44 + sound_ret diff --git a/audio/sfx/cry1c_4.asm b/audio/sfx/cry1c_4.asm new file mode 100644 index 00000000..2df760db --- /dev/null +++ b/audio/sfx/cry1c_4.asm @@ -0,0 +1,31 @@ +SFX_Cry1C_4_Ch5: + duty_cycle_pattern 3, 3, 1, 1 + square_note 7, 13, 6, 2017 + square_note 6, 12, 6, 2018 + square_note 9, 13, 6, 2017 + square_note 7, 12, 6, 2016 + square_note 5, 11, 6, 2018 + square_note 7, 12, 6, 2017 + square_note 6, 11, 6, 2016 + square_note 8, 10, 1, 2015 + sound_ret + + +SFX_Cry1C_4_Ch6: + duty_cycle_pattern 1, 0, 1, 0 + square_note 6, 12, 3, 1993 + square_note 6, 11, 3, 1991 + square_note 10, 12, 4, 1987 + square_note 8, 11, 4, 1991 + square_note 6, 12, 3, 1993 + square_note 15, 10, 2, 1989 + sound_ret + + +SFX_Cry1C_4_Ch8: + noise_note 13, 1, -1, 124 + noise_note 13, 15, 7, 140 + noise_note 12, 13, 6, 124 + noise_note 8, 12, 4, 108 + noise_note 15, 11, 3, 92 + sound_ret diff --git a/audio/sfx/cry1d_4.asm b/audio/sfx/cry1d_4.asm new file mode 100644 index 00000000..52f4f474 --- /dev/null +++ b/audio/sfx/cry1d_4.asm @@ -0,0 +1,29 @@ +SFX_Cry1D_4_Ch5: + duty_cycle_pattern 3, 3, 1, 0 + square_note 15, 15, 0, 1797 + square_note 10, 14, 0, 1792 + square_note 6, 11, 4, 1808 + square_note 4, 13, 3, 1792 + square_note 6, 11, 2, 1568 + square_note 8, 10, 1, 1572 + sound_ret + + +SFX_Cry1D_4_Ch6: + duty_cycle_pattern 0, 2, 0, 2 + square_note 15, 11, 0, 1731 + square_note 10, 10, 0, 1729 + square_note 6, 8, 4, 1746 + square_note 4, 9, 3, 1729 + square_note 6, 8, 2, 1505 + square_note 8, 6, 1, 1512 + sound_ret + + +SFX_Cry1D_4_Ch8: + noise_note 6, 14, 6, 76 + noise_note 15, 13, 6, 60 + noise_note 10, 12, 5, 74 + noise_note 1, 11, 2, 91 + noise_note 15, 12, 2, 76 + sound_ret diff --git a/audio/sfx/cry1e_4.asm b/audio/sfx/cry1e_4.asm new file mode 100644 index 00000000..70bbc648 --- /dev/null +++ b/audio/sfx/cry1e_4.asm @@ -0,0 +1,38 @@ +SFX_Cry1E_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 6, 15, 2, 1536 + square_note 6, 14, 2, 1600 + square_note 6, 13, 2, 1664 + square_note 6, 14, 2, 1728 + square_note 6, 13, 2, 1792 + square_note 6, 12, 2, 1856 + square_note 6, 11, 2, 1920 + square_note 8, 10, 1, 1984 + sound_ret + + +SFX_Cry1E_4_Ch6: + duty_cycle_pattern 0, 1, 0, 1 + square_note 3, 0, 8, 1 + square_note 6, 12, 2, 1473 + square_note 6, 11, 2, 1538 + square_note 6, 10, 2, 1601 + square_note 6, 11, 2, 1666 + square_note 6, 10, 2, 1730 + square_note 6, 9, 2, 1793 + square_note 6, 10, 2, 1858 + square_note 8, 8, 1, 1921 + sound_ret + + +SFX_Cry1E_4_Ch8: + noise_note 6, 0, 8, 1 + noise_note 5, 14, 2, 92 + noise_note 5, 12, 2, 76 + noise_note 5, 13, 2, 60 + noise_note 5, 11, 2, 44 + noise_note 5, 12, 2, 28 + noise_note 5, 10, 2, 27 + noise_note 5, 9, 2, 26 + noise_note 8, 8, 1, 24 + sound_ret diff --git a/audio/sfx/cry1f_4.asm b/audio/sfx/cry1f_4.asm new file mode 100644 index 00000000..b0c843f2 --- /dev/null +++ b/audio/sfx/cry1f_4.asm @@ -0,0 +1,24 @@ +SFX_Cry1F_4_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 3, 15, 4, 1601 + square_note 13, 13, 6, 1825 + square_note 8, 15, 4, 1817 + square_note 8, 12, 1, 1818 + sound_ret + + +SFX_Cry1F_4_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 4, 15, 4, 1408 + square_note 14, 14, 6, 1760 + square_note 8, 13, 5, 1752 + square_note 8, 13, 1, 1756 + sound_ret + + +SFX_Cry1F_4_Ch8: + noise_note 5, 12, 4, 70 + noise_note 13, 10, 5, 68 + noise_note 8, 12, 4, 69 + noise_note 8, 11, 1, 68 + sound_ret diff --git a/audio/sfx/cry20_4.asm b/audio/sfx/cry20_4.asm new file mode 100644 index 00000000..858fe171 --- /dev/null +++ b/audio/sfx/cry20_4.asm @@ -0,0 +1,24 @@ +SFX_Cry20_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 13, 15, 1, 1297 + square_note 13, 14, 1, 1301 + square_note 13, 14, 1, 1297 + square_note 8, 13, 1, 1297 + sound_ret + + +SFX_Cry20_4_Ch6: + duty_cycle_pattern 0, 1, 1, 1 + square_note 12, 14, 1, 1292 + square_note 12, 13, 1, 1296 + square_note 14, 12, 1, 1292 + square_note 8, 12, 1, 1290 + sound_ret + + +SFX_Cry20_4_Ch8: + noise_note 14, 15, 2, 101 + noise_note 13, 14, 2, 85 + noise_note 14, 13, 2, 86 + noise_note 8, 13, 1, 102 + sound_ret diff --git a/audio/sfx/cry21_4.asm b/audio/sfx/cry21_4.asm new file mode 100644 index 00000000..bc720c10 --- /dev/null +++ b/audio/sfx/cry21_4.asm @@ -0,0 +1,27 @@ +SFX_Cry21_4_Ch5: + duty_cycle_pattern 0, 1, 2, 3 + square_note 3, 15, 3, 1380 + square_note 2, 14, 2, 1348 + square_note 5, 13, 1, 1314 + square_note 2, 11, 2, 1156 + square_note 8, 13, 1, 1186 + square_note 3, 15, 3, 1316 + square_note 4, 14, 4, 1252 + square_note 8, 13, 1, 1282 + sound_ret + + +SFX_Cry21_4_Ch6: + duty_cycle_pattern 3, 0, 3, 0 + square_note 3, 13, 3, 1376 + square_note 2, 12, 2, 1344 + square_note 5, 12, 1, 1312 + square_note 2, 9, 2, 1152 + square_note 8, 12, 1, 1184 + square_note 3, 13, 3, 1312 + square_note 3, 12, 4, 1248 + square_note 8, 12, 1, 1280 + + +SFX_Cry21_4_Ch8: + sound_ret diff --git a/audio/sfx/cry22_4.asm b/audio/sfx/cry22_4.asm new file mode 100644 index 00000000..e27f0770 --- /dev/null +++ b/audio/sfx/cry22_4.asm @@ -0,0 +1,24 @@ +SFX_Cry22_4_Ch5: + duty_cycle_pattern 0, 1, 0, 1 + square_note 2, 3, -5, 897 + square_note 7, 15, 5, 1537 + square_note 1, 12, 2, 1153 + square_note 8, 9, 1, 897 + sound_ret + + +SFX_Cry22_4_Ch6: + duty_cycle_pattern 3, 2, 3, 2 + square_note 2, 3, -6, 1456 + square_note 7, 13, 5, 1885 + square_note 1, 11, 2, 1712 + square_note 8, 6, 1, 1456 + sound_ret + + +SFX_Cry22_4_Ch8: + noise_note 2, 9, 2, 73 + noise_note 7, 11, 5, 41 + noise_note 1, 10, 2, 57 + noise_note 8, 9, 1, 73 + sound_ret diff --git a/audio/sfx/cry23_4.asm b/audio/sfx/cry23_4.asm new file mode 100644 index 00000000..7e087dd2 --- /dev/null +++ b/audio/sfx/cry23_4.asm @@ -0,0 +1,25 @@ +SFX_Cry23_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1984 + square_note 6, 14, 4, 1985 + square_note 10, 15, 6, 1984 + square_note 4, 13, 3, 1986 + square_note 8, 12, 1, 1984 + sound_ret + + +SFX_Cry23_4_Ch6: + duty_cycle_pattern 1, 1, 3, 3 + square_note 15, 9, 7, 1921 + square_note 6, 8, 4, 1920 + square_note 10, 9, 6, 1921 + square_note 15, 8, 3, 1921 + sound_ret + + +SFX_Cry23_4_Ch8: + noise_note 3, 15, 2, 60 + noise_note 13, 14, 6, 44 + noise_note 15, 13, 7, 60 + noise_note 8, 12, 1, 44 + sound_ret diff --git a/audio/sfx/cry24_4.asm b/audio/sfx/cry24_4.asm new file mode 100644 index 00000000..e08d59f4 --- /dev/null +++ b/audio/sfx/cry24_4.asm @@ -0,0 +1,33 @@ +SFX_Cry24_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 15, 7, 1664 + square_note 10, 14, 6, 1668 + square_note 15, 13, 7, 1680 + square_note 8, 13, 5, 1680 + square_note 6, 12, 4, 1672 + square_note 5, 13, 3, 1648 + square_note 4, 13, 3, 1632 + square_note 8, 12, 1, 1600 + sound_ret + + +SFX_Cry24_4_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 11, 7, 1601 + square_note 10, 9, 6, 1602 + square_note 15, 10, 7, 1617 + square_note 8, 10, 5, 1617 + square_note 6, 9, 4, 1607 + square_note 5, 10, 3, 1585 + square_note 4, 9, 3, 1570 + square_note 8, 7, 1, 1537 + sound_ret + + +SFX_Cry24_4_Ch8: + noise_note 15, 14, 4, 60 + noise_note 10, 12, 7, 76 + noise_note 10, 12, 7, 60 + noise_note 12, 11, 7, 76 + noise_note 15, 10, 2, 92 + sound_ret diff --git a/audio/sfx/cry25_4.asm b/audio/sfx/cry25_4.asm new file mode 100644 index 00000000..02af0c0a --- /dev/null +++ b/audio/sfx/cry25_4.asm @@ -0,0 +1,26 @@ +SFX_Cry25_4_Ch5: + duty_cycle_pattern 2, 2, 1, 1 + square_note 6, 15, 4, 1856 + square_note 15, 14, 3, 1840 + square_note 4, 15, 4, 1856 + square_note 5, 11, 3, 1864 + square_note 8, 13, 1, 1872 + sound_ret + + +SFX_Cry25_4_Ch6: + duty_cycle_pattern 1, 3, 1, 3 + square_note 6, 12, 3, 1810 + square_note 15, 11, 3, 1796 + square_note 3, 12, 3, 1810 + square_note 4, 12, 3, 1825 + square_note 8, 11, 1, 1842 + sound_ret + + +SFX_Cry25_4_Ch8: + noise_note 8, 13, 6, 44 + noise_note 12, 12, 6, 60 + noise_note 10, 11, 6, 44 + noise_note 8, 9, 1, 28 + sound_ret diff --git a/audio/sfx/get_item1_4_2.asm b/audio/sfx/get_item1_4_2.asm new file mode 100644 index 00000000..f2889b62 --- /dev/null +++ b/audio/sfx/get_item1_4_2.asm @@ -0,0 +1,47 @@ +SFX_Get_Item1_4_2_Ch5: + execute_music + tempo 256 + volume 7, 7 + vibrato 6, 2, 6 + duty_cycle 2 + toggle_perfect_pitch + note_type 4, 11, 1 + octave 3 + note G#, 2 + note G#, 2 + note G#, 2 + note_type 12, 11, 3 + octave 4 + note E_, 4 + sound_ret + + +SFX_Get_Item1_4_2_Ch6: + execute_music + vibrato 8, 2, 7 + duty_cycle 2 + note_type 4, 12, 1 + octave 4 + note E_, 2 + note E_, 2 + note E_, 2 + note_type 12, 12, 3 + note B_, 4 + sound_ret + + +SFX_Get_Item1_4_2_Ch8: + execute_music + note_type 4, 1, 0 + octave 4 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note B_, 1 + rest 1 + note_type 12, 1, 0 + octave 4 + note B_, 2 + rest 2 + sound_ret diff --git a/audio/sfx/heal_ailment_4.asm b/audio/sfx/heal_ailment_4.asm new file mode 100644 index 00000000..4320c06b --- /dev/null +++ b/audio/sfx/heal_ailment_4.asm @@ -0,0 +1,9 @@ +SFX_Heal_Ailment_4_Ch5: + duty_cycle 2 + pitch_sweep 1, 4 + square_note 4, 15, 2, 1536 + square_note 4, 15, 2, 1536 + pitch_sweep 1, 7 + square_note 15, 15, 2, 1536 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/heal_hp_4.asm b/audio/sfx/heal_hp_4.asm new file mode 100644 index 00000000..95dbadb0 --- /dev/null +++ b/audio/sfx/heal_hp_4.asm @@ -0,0 +1,7 @@ +SFX_Heal_HP_4_Ch5: + duty_cycle 2 + pitch_sweep 1, 7 + square_note 15, 15, 0, 1264 + square_note 15, 15, 2, 1616 + pitch_sweep 0, 8 + sound_ret diff --git a/audio/sfx/press_ab_4.asm b/audio/sfx/press_ab_4.asm new file mode 100644 index 00000000..aecfe952 --- /dev/null +++ b/audio/sfx/press_ab_4.asm @@ -0,0 +1,7 @@ +SFX_Press_AB_4_Ch5: + duty_cycle 2 + square_note 0, 9, 1, 1984 + square_note 0, 8, 1, 2000 + square_note 0, 9, 1, 1984 + square_note 12, 10, 1, 2000 + sound_ret diff --git a/audio/sfx/start_menu_4.asm b/audio/sfx/start_menu_4.asm new file mode 100644 index 00000000..9debc1c8 --- /dev/null +++ b/audio/sfx/start_menu_4.asm @@ -0,0 +1,4 @@ +SFX_Start_Menu_4_Ch8: + noise_note 1, 14, 2, 51 + noise_note 8, 14, 1, 34 + sound_ret diff --git a/audio/sfx/surfing_add_points.asm b/audio/sfx/surfing_add_points.asm deleted file mode 100644 index 3eeed285..00000000 --- a/audio/sfx/surfing_add_points.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Surfing_Add_Points_Ch5: - duty_cycle 2 - square_note 0, 9, 1, 1984 - square_note 0, 8, 1, 2000 - square_note 0, 9, 1, 1984 - square_note 12, 10, 1, 2000 - sound_ret diff --git a/audio/sfx/surfing_crash.asm b/audio/sfx/surfing_crash.asm index e1af7f6a..26e5b0f7 100644 --- a/audio/sfx/surfing_crash.asm +++ b/audio/sfx/surfing_crash.asm @@ -1,5 +1,5 @@ SFX_Surfing_Crash_Ch8: - noise_note 2, 15, 1, 50 - noise_note 2, 0, 0, 0 - noise_note 4, 14, 6, 33 + noise_note 3, 15, 3, 102 + noise_note 3, 3, 3, 83 + noise_note 7, 15, 5, 81 sound_ret diff --git a/audio/sfx/surfing_land.asm b/audio/sfx/surfing_land.asm index 41ece761..8cc4ffa1 100644 --- a/audio/sfx/surfing_land.asm +++ b/audio/sfx/surfing_land.asm @@ -1,5 +1,5 @@ SFX_Surfing_Land_Ch8: - noise_note 3, 15, 3, 102 - noise_note 3, 3, 3, 83 - noise_note 7, 15, 5, 81 + noise_note 2, 15, 1, 50 + noise_note 2, 0, 0, 0 + noise_note 4, 14, 6, 33 sound_ret diff --git a/audio/sfx/unknown_80263.asm b/audio/sfx/unknown_80263.asm deleted file mode 100755 index e1be6dd5..00000000 --- a/audio/sfx/unknown_80263.asm +++ /dev/null @@ -1,4 +0,0 @@ -SFX_Unknown_80263_Ch8: - noise_note 1, 14, 2, 51 - noise_note 8, 14, 1, 34 - sound_ret diff --git a/audio/sfx/unknown_8026a.asm b/audio/sfx/unknown_8026a.asm deleted file mode 100644 index c9ee20c4..00000000 --- a/audio/sfx/unknown_8026a.asm +++ /dev/null @@ -1,9 +0,0 @@ -SFX_Unknown_8026a_Ch5: - duty_cycle 2 - pitch_sweep 1, 4 - square_note 4, 15, 2, 1536 - square_note 4, 15, 2, 1536 - pitch_sweep 1, 7 - square_note 15, 15, 2, 1536 - pitch_sweep 0, 8 - sound_ret diff --git a/audio/sfx/unknown_8027f.asm b/audio/sfx/unknown_8027f.asm deleted file mode 100644 index 5fbb4618..00000000 --- a/audio/sfx/unknown_8027f.asm +++ /dev/null @@ -1,7 +0,0 @@ -SFX_Unknown_8027f_Ch5: - duty_cycle 2 - pitch_sweep 1, 7 - square_note 15, 15, 0, 1264 - square_note 15, 15, 2, 1616 - pitch_sweep 0, 8 - sound_ret diff --git a/audio/sfx/unknown_802cc.asm b/audio/sfx/unknown_802cc.asm old mode 100755 new mode 100644 diff --git a/audio/sfx/unknown_80337.asm b/audio/sfx/unknown_80337.asm deleted file mode 100644 index 047dfaf4..00000000 --- a/audio/sfx/unknown_80337.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Unknown_80337_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 15, 14, 0, 1920 - square_note 15, 15, 0, 1924 - square_note 15, 12, 3, 1504 - square_note 15, 12, 4, 1536 - square_note 10, 6, -4, 1920 - square_note 8, 7, 1, 1924 - sound_ret - - -SFX_Unknown_80337_Ch6: - duty_cycle_pattern 0, 0, 1, 1 - square_note 15, 10, 0, 1857 - square_note 15, 11, 0, 1859 - square_note 15, 9, 3, 1457 - square_note 15, 9, 4, 1473 - square_note 10, 4, -4, 1857 - square_note 8, 3, 1, 1862 - sound_ret - - -SFX_Unknown_80337_Ch8: - noise_note 2, 15, 2, 76 - noise_note 6, 14, 0, 58 - noise_note 15, 13, 0, 58 - noise_note 8, 13, 0, 44 - noise_note 6, 14, 6, 76 - noise_note 12, 7, -5, 76 - noise_note 15, 13, 3, 76 - sound_ret diff --git a/audio/sfx/unknown_80383.asm b/audio/sfx/unknown_80383.asm deleted file mode 100644 index a99c601b..00000000 --- a/audio/sfx/unknown_80383.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_Unknown_80383_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 15, 15, 7, 1952 - square_note 6, 14, 6, 1955 - square_note 10, 15, 4, 1952 - duty_cycle_pattern 2, 2, 1, 1 - square_note 10, 15, 6, 2008 - square_note 4, 14, 3, 2007 - square_note 15, 15, 2, 2008 - sound_ret - - -SFX_Unknown_80383_Ch6: - duty_cycle_pattern 0, 0, 1, 1 - square_note 2, 0, 8, 0 - square_note 15, 10, 7, 1697 - square_note 6, 8, 6, 1698 - square_note 10, 7, 4, 1697 - duty_cycle_pattern 1, 1, 3, 3 - square_note 10, 7, 6, 1750 - square_note 4, 8, 3, 1753 - square_note 15, 10, 2, 1751 - sound_ret - - -SFX_Unknown_80383_Ch8: - noise_note 2, 15, 2, 60 - noise_note 8, 14, 4, 62 - noise_note 15, 13, 7, 60 - noise_note 6, 12, 5, 59 - noise_note 6, 14, 4, 61 - noise_note 8, 11, 6, 60 - noise_note 6, 13, 4, 61 - noise_note 8, 12, 1, 59 - sound_ret diff --git a/audio/sfx/unknown_803da.asm b/audio/sfx/unknown_803da.asm deleted file mode 100644 index 40fba1ca..00000000 --- a/audio/sfx/unknown_803da.asm +++ /dev/null @@ -1,25 +0,0 @@ -SFX_Unknown_803da_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 15, 15, 7, 1984 - square_note 6, 14, 4, 1985 - square_note 10, 15, 6, 1984 - square_note 4, 13, 3, 1986 - square_note 8, 12, 1, 1984 - sound_ret - - -SFX_Unknown_803da_Ch6: - duty_cycle_pattern 1, 1, 3, 3 - square_note 15, 9, 7, 1921 - square_note 6, 8, 4, 1920 - square_note 10, 9, 6, 1921 - square_note 15, 8, 3, 1921 - sound_ret - - -SFX_Unknown_803da_Ch8: - noise_note 3, 15, 2, 60 - noise_note 13, 14, 6, 44 - noise_note 15, 13, 7, 60 - noise_note 8, 12, 1, 44 - sound_ret diff --git a/audio/sfx/unknown_80411.asm b/audio/sfx/unknown_80411.asm deleted file mode 100644 index a6ba154b..00000000 --- a/audio/sfx/unknown_80411.asm +++ /dev/null @@ -1,33 +0,0 @@ -SFX_Unknown_80411_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 15, 15, 7, 1664 - square_note 10, 14, 6, 1668 - square_note 15, 13, 7, 1680 - square_note 8, 13, 5, 1680 - square_note 6, 12, 4, 1672 - square_note 5, 13, 3, 1648 - square_note 4, 13, 3, 1632 - square_note 8, 12, 1, 1600 - sound_ret - - -SFX_Unknown_80411_Ch6: - duty_cycle_pattern 0, 0, 1, 1 - square_note 15, 11, 7, 1601 - square_note 10, 9, 6, 1602 - square_note 15, 10, 7, 1617 - square_note 8, 10, 5, 1617 - square_note 6, 9, 4, 1607 - square_note 5, 10, 3, 1585 - square_note 4, 9, 3, 1570 - square_note 8, 7, 1, 1537 - sound_ret - - -SFX_Unknown_80411_Ch8: - noise_note 15, 14, 4, 60 - noise_note 10, 12, 7, 76 - noise_note 10, 12, 7, 60 - noise_note 12, 11, 7, 76 - noise_note 15, 10, 2, 92 - sound_ret diff --git a/audio/sfx/unknown_80467.asm b/audio/sfx/unknown_80467.asm deleted file mode 100644 index 07fe1ca8..00000000 --- a/audio/sfx/unknown_80467.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_Unknown_80467_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 6, 15, 7, 1952 - square_note 8, 14, 6, 1956 - square_note 4, 13, 6, 1952 - square_note 15, 13, 3, 1824 - square_note 8, 12, 3, 1827 - square_note 2, 12, 2, 1832 - square_note 8, 11, 1, 1840 - sound_ret - - -SFX_Unknown_80467_Ch6: - duty_cycle_pattern 0, 0, 2, 2 - square_note 4, 0, 8, 0 - square_note 6, 10, 7, 1857 - square_note 8, 8, 6, 1859 - square_note 4, 7, 6, 1857 - square_note 13, 8, 3, 1730 - square_note 7, 7, 3, 1729 - square_note 3, 8, 2, 1740 - square_note 8, 7, 1, 1752 - sound_ret - - -SFX_Unknown_80467_Ch8: - noise_note 2, 15, 2, 76 - noise_note 6, 14, 6, 58 - noise_note 4, 13, 7, 58 - noise_note 6, 13, 6, 44 - noise_note 8, 14, 5, 60 - noise_note 12, 13, 2, 61 - noise_note 8, 13, 1, 44 - sound_ret diff --git a/audio/sfx/unknown_804bf.asm b/audio/sfx/unknown_804bf.asm deleted file mode 100644 index a4e5c616..00000000 --- a/audio/sfx/unknown_804bf.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_Unknown_804bf_Ch5: - duty_cycle_pattern 2, 2, 1, 1 - square_note 6, 15, 4, 1856 - square_note 15, 14, 3, 1840 - square_note 4, 15, 4, 1856 - square_note 5, 11, 3, 1864 - square_note 8, 13, 1, 1872 - sound_ret - - -SFX_Unknown_804bf_Ch6: - duty_cycle_pattern 1, 3, 1, 3 - square_note 6, 12, 3, 1810 - square_note 15, 11, 3, 1796 - square_note 3, 12, 3, 1810 - square_note 4, 12, 3, 1825 - square_note 8, 11, 1, 1842 - sound_ret - - -SFX_Unknown_804bf_Ch8: - noise_note 8, 13, 6, 44 - noise_note 12, 12, 6, 60 - noise_note 10, 11, 6, 44 - noise_note 8, 9, 1, 28 - sound_ret diff --git a/audio/sfx/unknown_804fa.asm b/audio/sfx/unknown_804fa.asm deleted file mode 100644 index 0660ffd5..00000000 --- a/audio/sfx/unknown_804fa.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Unknown_804fa_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 4, 15, 7, 1544 - square_note 6, 14, 6, 1536 - square_note 6, 13, 7, 1520 - square_note 6, 12, 4, 1504 - square_note 5, 13, 3, 1472 - square_note 4, 13, 3, 1440 - square_note 8, 14, 1, 1408 - sound_ret - - -SFX_Unknown_804fa_Ch6: - duty_cycle_pattern 0, 0, 2, 2 - square_note 4, 12, 7, 1284 - square_note 6, 10, 6, 1282 - square_note 6, 9, 7, 1265 - square_note 4, 11, 4, 1249 - square_note 5, 10, 3, 1218 - square_note 4, 11, 3, 1187 - square_note 8, 12, 1, 1154 - sound_ret - - -SFX_Unknown_804fa_Ch8: - noise_note 12, 14, 4, 76 - noise_note 10, 12, 7, 92 - noise_note 12, 11, 6, 76 - noise_note 15, 10, 2, 92 - sound_ret diff --git a/audio/sfx/unknown_80545.asm b/audio/sfx/unknown_80545.asm deleted file mode 100644 index ab819869..00000000 --- a/audio/sfx/unknown_80545.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Unknown_80545_Ch5: - duty_cycle_pattern 3, 3, 0, 1 - square_note 4, 15, 7, 1984 - square_note 12, 14, 6, 1986 - square_note 6, 11, 5, 1664 - square_note 4, 12, 4, 1648 - square_note 4, 11, 5, 1632 - square_note 8, 12, 1, 1600 - sound_ret - - -SFX_Unknown_80545_Ch6: - duty_cycle_pattern 3, 0, 3, 0 - square_note 3, 12, 7, 1921 - square_note 12, 11, 6, 1920 - square_note 6, 10, 5, 1601 - square_note 4, 12, 4, 1586 - square_note 6, 11, 5, 1569 - square_note 8, 10, 1, 1538 - sound_ret - - -SFX_Unknown_80545_Ch8: - noise_note 3, 14, 4, 60 - noise_note 12, 13, 6, 44 - noise_note 4, 14, 4, 60 - noise_note 8, 11, 7, 92 - noise_note 15, 12, 2, 93 - sound_ret diff --git a/audio/sfx/unknown_8058b.asm b/audio/sfx/unknown_8058b.asm deleted file mode 100644 index b3082714..00000000 --- a/audio/sfx/unknown_8058b.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Unknown_8058b_Ch5: - duty_cycle_pattern 3, 0, 2, 1 - square_note 8, 15, 7, 1664 - square_note 2, 15, 7, 1632 - square_note 1, 14, 7, 1600 - square_note 1, 14, 7, 1568 - square_note 15, 13, 1, 1536 - square_note 4, 12, 7, 1856 - square_note 4, 10, 7, 1840 - square_note 15, 9, 1, 1824 - sound_ret - - -SFX_Unknown_8058b_Ch6: - duty_cycle_pattern 1, 3, 2, 1 - square_note 10, 14, 7, 1666 - square_note 2, 14, 7, 1634 - square_note 1, 13, 7, 1602 - square_note 1, 13, 7, 1570 - square_note 15, 12, 1, 1538 - square_note 4, 11, 7, 1858 - square_note 2, 9, 7, 1842 - square_note 15, 8, 1, 1826 - sound_ret - - -SFX_Unknown_8058b_Ch8: - noise_note 4, 7, 4, 33 - noise_note 4, 7, 4, 16 - noise_note 4, 7, 1, 32 - sound_ret diff --git a/audio/sfx/unknown_805db.asm b/audio/sfx/unknown_805db.asm deleted file mode 100644 index 7bb82004..00000000 --- a/audio/sfx/unknown_805db.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Unknown_805db_Ch5: - duty_cycle_pattern 3, 3, 1, 1 - square_note 4, 15, 3, 1816 - square_note 15, 14, 5, 1944 - square_note 8, 9, 1, 1880 - sound_ret - - -SFX_Unknown_805db_Ch6: - duty_cycle_pattern 2, 2, 0, 0 - square_note 5, 11, 3, 1800 - square_note 15, 12, 5, 1928 - square_note 8, 7, 1, 1864 - sound_ret - - -SFX_Unknown_805db_Ch8: - noise_note 3, 10, 1, 28 - noise_note 14, 9, 4, 44 - noise_note 8, 8, 1, 28 - sound_ret diff --git a/audio/sfx/unknown_80603.asm b/audio/sfx/unknown_80603.asm deleted file mode 100644 index c673990c..00000000 --- a/audio/sfx/unknown_80603.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_Unknown_80603_Ch5: - duty_cycle_pattern 2, 2, 1, 1 - square_note 4, 14, 1, 1792 - square_note 4, 15, 2, 1920 - square_note 2, 9, 2, 1856 - square_note 8, 14, 1, 1536 - sound_ret - - -SFX_Unknown_80603_Ch6: - duty_cycle_pattern 0, 0, 2, 2 - square_note 4, 11, 1, 1761 - square_note 3, 12, 2, 1761 - square_note 3, 6, 2, 1665 - square_note 8, 11, 1, 1505 - sound_ret - - -SFX_Unknown_80603_Ch8: - noise_note 2, 6, 1, 50 - noise_note 2, 6, 1, 33 - noise_note 8, 6, 1, 17 - sound_ret diff --git a/audio/sfx/unknown_80633.asm b/audio/sfx/unknown_80633.asm deleted file mode 100644 index c2b421e1..00000000 --- a/audio/sfx/unknown_80633.asm +++ /dev/null @@ -1,22 +0,0 @@ -SFX_Unknown_80633_Ch5: - duty_cycle_pattern 3, 3, 2, 2 - square_note 6, 8, 3, 583 - square_note 15, 6, 2, 550 - square_note 4, 5, 2, 581 - square_note 9, 6, 3, 518 - square_note 15, 8, 2, 549 - square_note 15, 4, 2, 519 - - -SFX_Unknown_80633_Ch6: - sound_ret - - -SFX_Unknown_80633_Ch8: - noise_note 8, 13, 4, 140 - noise_note 4, 14, 2, 156 - noise_note 15, 12, 6, 140 - noise_note 8, 14, 4, 172 - noise_note 15, 13, 7, 156 - noise_note 15, 15, 2, 172 - sound_ret diff --git a/audio/sfx/unknown_80661.asm b/audio/sfx/unknown_80661.asm deleted file mode 100644 index e45a2b1f..00000000 --- a/audio/sfx/unknown_80661.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Unknown_80661_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 4, 15, 3, 1760 - square_note 15, 14, 4, 1600 - square_note 8, 12, 1, 1568 - sound_ret - - -SFX_Unknown_80661_Ch6: - duty_cycle_pattern 0, 0, 2, 2 - square_note 3, 12, 3, 1667 - square_note 14, 11, 4, 1538 - square_note 8, 10, 1, 1537 - sound_ret - - -SFX_Unknown_80661_Ch8: - noise_note 4, 13, 3, 92 - noise_note 15, 14, 6, 76 - noise_note 8, 11, 1, 92 - sound_ret diff --git a/audio/sfx/unknown_80689.asm b/audio/sfx/unknown_80689.asm deleted file mode 100644 index 50e3d7dc..00000000 --- a/audio/sfx/unknown_80689.asm +++ /dev/null @@ -1,19 +0,0 @@ -SFX_Unknown_80689_Ch5: - duty_cycle_pattern 0, 0, 2, 2 - square_note 6, 14, 2, 1280 - square_note 6, 14, 3, 1408 - square_note 6, 13, 3, 1392 - square_note 8, 10, 1, 1376 - sound_ret - - -SFX_Unknown_80689_Ch6: - duty_cycle_pattern 3, 3, 1, 1 - square_note 6, 14, 2, 1154 - square_note 6, 13, 3, 1281 - square_note 6, 11, 2, 1250 - square_note 8, 8, 1, 1217 - - -SFX_Unknown_80689_Ch8: - sound_ret diff --git a/audio/sfx/unknown_806af.asm b/audio/sfx/unknown_806af.asm deleted file mode 100644 index 611b655a..00000000 --- a/audio/sfx/unknown_806af.asm +++ /dev/null @@ -1,37 +0,0 @@ -SFX_Unknown_806af_Ch5: - duty_cycle_pattern 3, 0, 3, 0 - square_note 4, 15, 1, 1792 - square_note 4, 14, 1, 1920 - square_note 4, 13, 1, 1856 - square_note 4, 14, 1, 1856 - square_note 4, 15, 1, 1920 - square_note 4, 13, 1, 1792 - square_note 4, 15, 1, 1793 - square_note 4, 13, 1, 1922 - square_note 4, 12, 1, 1858 - square_note 8, 11, 1, 1857 - sound_ret - - -SFX_Unknown_806af_Ch6: - duty_cycle_pattern 1, 0, 1, 0 - square_note 12, 0, 8, 0 - square_note 4, 15, 1, 1793 - square_note 4, 14, 1, 1922 - square_note 4, 13, 1, 1857 - square_note 4, 14, 1, 1857 - square_note 4, 15, 1, 1922 - square_note 8, 13, 1, 1793 - sound_ret - - -SFX_Unknown_806af_Ch8: - noise_note 15, 0, 8, 0 - noise_note 4, 0, 8, 0 - noise_note 4, 13, 1, 76 - noise_note 4, 11, 1, 44 - noise_note 4, 13, 1, 60 - noise_note 4, 11, 1, 60 - noise_note 4, 12, 1, 44 - noise_note 8, 10, 1, 76 - sound_ret diff --git a/audio/sfx/unknown_80712.asm b/audio/sfx/unknown_80712.asm deleted file mode 100644 index 48d00508..00000000 --- a/audio/sfx/unknown_80712.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Unknown_80712_Ch5: - duty_cycle_pattern 3, 0, 3, 0 - square_note 8, 15, 5, 1536 - square_note 2, 13, 2, 1592 - square_note 2, 12, 2, 1584 - square_note 2, 12, 2, 1576 - square_note 2, 11, 2, 1568 - square_note 2, 11, 2, 1552 - square_note 2, 10, 2, 1560 - square_note 2, 11, 2, 1552 - square_note 8, 12, 1, 1568 - sound_ret - - -SFX_Unknown_80712_Ch6: - duty_cycle_pattern 1, 0, 1, 0 - square_note 12, 12, 3, 1472 - square_note 3, 11, 1, 1529 - square_note 2, 10, 1, 1521 - square_note 2, 10, 1, 1513 - square_note 2, 9, 1, 1505 - square_note 2, 9, 1, 1497 - square_note 2, 8, 1, 1489 - square_note 2, 9, 1, 1497 - square_note 8, 9, 1, 1505 - - -SFX_Unknown_80712_Ch8: - sound_ret diff --git a/audio/sfx/unknown_80760.asm b/audio/sfx/unknown_80760.asm deleted file mode 100644 index 4fd9eba2..00000000 --- a/audio/sfx/unknown_80760.asm +++ /dev/null @@ -1,17 +0,0 @@ -SFX_Unknown_80760_Ch5: - duty_cycle 0 - square_note 8, 15, 5, 1152 - square_note 2, 14, 1, 1504 - square_note 8, 13, 1, 1500 - sound_ret - - -SFX_Unknown_80760_Ch6: - duty_cycle_pattern 2, 2, 1, 1 - square_note 7, 9, 5, 1089 - square_note 2, 8, 1, 1313 - square_note 8, 6, 1, 1306 - - -SFX_Unknown_80760_Ch8: - sound_ret diff --git a/audio/sfx/unknown_8077e.asm b/audio/sfx/unknown_8077e.asm deleted file mode 100644 index c0ea51ad..00000000 --- a/audio/sfx/unknown_8077e.asm +++ /dev/null @@ -1,40 +0,0 @@ -SFX_Unknown_8077e_Ch5: - duty_cycle_pattern 2, 0, 2, 0 - square_note 5, 15, 2, 1616 - square_note 9, 13, 1, 1632 - square_note 5, 14, 2, 1554 - square_note 9, 12, 1, 1570 - square_note 5, 15, 2, 1552 - square_note 6, 13, 1, 1568 - sound_loop 2, SFX_Unknown_8077e_Ch5 - sound_ret - - -SFX_Unknown_8077e_Ch6: - duty_cycle_pattern 1, 0, 0, 0 - square_note 4, 0, 8, 0 - square_note 5, 15, 2, 1617 - square_note 9, 13, 1, 1633 - square_note 5, 14, 2, 1556 - square_note 8, 12, 1, 1572 - square_note 5, 15, 2, 1553 - square_note 12, 13, 1, 1569 - square_note 5, 14, 2, 1556 - square_note 8, 12, 1, 1572 - square_note 5, 15, 2, 1553 - square_note 4, 13, 1, 1569 - sound_ret - - -SFX_Unknown_8077e_Ch8: - noise_note 6, 13, 2, 28 - noise_note 9, 11, 1, 44 - noise_note 8, 12, 2, 44 - noise_note 9, 11, 1, 60 - noise_note 6, 12, 2, 44 - noise_note 9, 10, 2, 60 - noise_note 7, 12, 2, 44 - noise_note 5, 10, 1, 60 - noise_note 9, 12, 2, 44 - noise_note 4, 10, 1, 60 - sound_ret diff --git a/audio/sfx/unknown_807eb.asm b/audio/sfx/unknown_807eb.asm deleted file mode 100644 index c98628a0..00000000 --- a/audio/sfx/unknown_807eb.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Unknown_807eb_Ch5: - duty_cycle_pattern 2, 2, 0, 0 - square_note 4, 15, 3, 1536 - square_note 8, 13, 5, 1888 - square_note 3, 14, 2, 1824 - square_note 8, 13, 1, 1808 - sound_ret - - -SFX_Unknown_807eb_Ch6: - duty_cycle_pattern 1, 1, 2, 2 - square_note 5, 11, 3, 1777 - square_note 7, 12, 5, 1874 - square_note 3, 10, 2, 1809 - square_note 8, 11, 1, 1537 - sound_ret - - -SFX_Unknown_807eb_Ch8: - noise_note 3, 10, 2, 60 - noise_note 12, 9, 4, 44 - noise_note 3, 8, 2, 28 - noise_note 8, 7, 1, 44 - sound_ret diff --git a/audio/sfx/unknown_8081e.asm b/audio/sfx/unknown_8081e.asm deleted file mode 100644 index ca5e8aa1..00000000 --- a/audio/sfx/unknown_8081e.asm +++ /dev/null @@ -1,35 +0,0 @@ -SFX_Unknown_8081e_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 8, 15, 7, 1760 - square_note 6, 14, 6, 1765 - square_note 3, 15, 4, 1760 - square_note 3, 15, 6, 1744 - square_note 3, 14, 3, 1728 - square_note 4, 15, 2, 1712 - square_note 15, 10, 2, 1736 - sound_ret - - -SFX_Unknown_8081e_Ch6: - duty_cycle_pattern 0, 0, 1, 1 - square_note 3, 0, 8, 0 - square_note 8, 10, 7, 1697 - square_note 6, 8, 6, 1699 - square_note 3, 7, 4, 1697 - square_note 3, 7, 6, 1681 - square_note 3, 8, 3, 1666 - square_note 4, 10, 2, 1649 - square_note 15, 7, 2, 1673 - sound_ret - - -SFX_Unknown_8081e_Ch8: - noise_note 2, 15, 2, 60 - noise_note 8, 14, 4, 62 - noise_note 8, 13, 7, 60 - noise_note 5, 12, 5, 59 - noise_note 3, 13, 4, 44 - noise_note 2, 11, 6, 60 - noise_note 3, 10, 4, 44 - noise_note 8, 9, 1, 60 - sound_ret diff --git a/audio/sfx/unknown_80879.asm b/audio/sfx/unknown_80879.asm deleted file mode 100644 index bbb4043e..00000000 --- a/audio/sfx/unknown_80879.asm +++ /dev/null @@ -1,23 +0,0 @@ -SFX_Unknown_80879_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 15, 15, 6, 1381 - square_note 10, 14, 4, 1404 - square_note 3, 12, 2, 1372 - square_note 15, 11, 2, 1340 - sound_ret - - -SFX_Unknown_80879_Ch6: - duty_cycle_pattern 1, 1, 2, 2 - square_note 14, 13, 6, 1283 - square_note 9, 11, 4, 1307 - square_note 4, 9, 2, 1274 - square_note 15, 10, 2, 1243 - sound_ret - - -SFX_Unknown_80879_Ch8: - noise_note 12, 14, 6, 76 - noise_note 11, 13, 7, 92 - noise_note 15, 12, 2, 76 - sound_ret diff --git a/audio/sfx/unknown_808a9.asm b/audio/sfx/unknown_808a9.asm deleted file mode 100644 index b27eeada..00000000 --- a/audio/sfx/unknown_808a9.asm +++ /dev/null @@ -1,32 +0,0 @@ -SFX_Unknown_808a9_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 4, 15, 7, 1696 - square_note 8, 14, 6, 1700 - square_note 4, 13, 6, 1696 - square_note 12, 13, 3, 1568 - square_note 8, 12, 3, 1572 - square_note 4, 12, 2, 1568 - square_note 8, 11, 1, 1552 - sound_ret - - -SFX_Unknown_808a9_Ch6: - duty_cycle_pattern 1, 1, 2, 2 - square_note 4, 14, 7, 1537 - square_note 8, 13, 6, 1539 - square_note 4, 12, 6, 1537 - square_note 12, 12, 3, 1409 - square_note 8, 11, 3, 1411 - square_note 4, 11, 2, 1410 - square_note 8, 10, 1, 1393 - sound_ret - - -SFX_Unknown_808a9_Ch8: - noise_note 7, 13, 6, 92 - noise_note 8, 14, 6, 76 - noise_note 4, 13, 4, 92 - noise_note 4, 13, 4, 76 - noise_note 7, 12, 3, 76 - noise_note 8, 10, 1, 92 - sound_ret diff --git a/audio/sfx/unknown_808fa.asm b/audio/sfx/unknown_808fa.asm deleted file mode 100644 index 37d49937..00000000 --- a/audio/sfx/unknown_808fa.asm +++ /dev/null @@ -1,18 +0,0 @@ -SFX_Unknown_808fa_Ch5: - duty_cycle_pattern 0, 1, 2, 3 - square_note 7, 13, 2, 1856 - square_note 15, 14, 5, 1888 - square_note 15, 12, 1, 1840 - sound_ret - - -SFX_Unknown_808fa_Ch6: - duty_cycle_pattern 2, 0, 0, 1 - square_note 2, 12, 2, 1793 - square_note 4, 12, 2, 1800 - square_note 15, 13, 7, 1857 - square_note 15, 10, 2, 1793 - - -SFX_Unknown_808fa_Ch8: - sound_ret diff --git a/audio/sfx/unknown_8091c.asm b/audio/sfx/unknown_8091c.asm deleted file mode 100644 index 0d160799..00000000 --- a/audio/sfx/unknown_8091c.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Unknown_8091c_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 15, 13, 7, 1920 - square_note 4, 14, 6, 1952 - square_note 15, 13, 2, 1856 - sound_ret - - -SFX_Unknown_8091c_Ch6: - duty_cycle_pattern 1, 1, 2, 2 - square_note 15, 12, 7, 1875 - square_note 5, 11, 6, 1906 - square_note 15, 12, 2, 1809 - sound_ret - - -SFX_Unknown_8091c_Ch8: - noise_note 13, 15, 6, 76 - noise_note 4, 14, 6, 60 - noise_note 15, 15, 2, 76 - sound_ret diff --git a/audio/sfx/unknown_80944.asm b/audio/sfx/unknown_80944.asm deleted file mode 100644 index adfc42b2..00000000 --- a/audio/sfx/unknown_80944.asm +++ /dev/null @@ -1,26 +0,0 @@ -SFX_Unknown_80944_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 6, 15, 7, 1728 - square_note 15, 14, 7, 1792 - square_note 4, 15, 4, 1776 - square_note 4, 14, 4, 1760 - square_note 8, 13, 1, 1744 - sound_ret - - -SFX_Unknown_80944_Ch6: - duty_cycle_pattern 0, 0, 2, 2 - square_note 7, 14, 6, 1665 - square_note 14, 13, 5, 1729 - square_note 4, 12, 4, 1713 - square_note 4, 13, 4, 1697 - square_note 8, 12, 1, 1681 - sound_ret - - -SFX_Unknown_80944_Ch8: - noise_note 10, 10, 6, 60 - noise_note 14, 9, 4, 44 - noise_note 5, 10, 3, 60 - noise_note 8, 9, 1, 44 - sound_ret diff --git a/audio/sfx/unknown_8097f.asm b/audio/sfx/unknown_8097f.asm deleted file mode 100644 index 259b6b34..00000000 --- a/audio/sfx/unknown_8097f.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Unknown_8097f_Ch5: - duty_cycle_pattern 2, 2, 1, 1 - square_note 12, 15, 2, 1088 - square_note 15, 14, 3, 1184 - square_note 4, 13, 2, 1168 - square_note 8, 13, 1, 1152 - sound_ret - - -SFX_Unknown_8097f_Ch6: - duty_cycle_pattern 3, 2, 3, 2 - square_note 11, 13, 2, 1080 - square_note 14, 12, 6, 1176 - square_note 3, 11, 2, 1160 - square_note 8, 11, 1, 1144 - sound_ret - - -SFX_Unknown_8097f_Ch8: - noise_note 10, 14, 6, 108 - noise_note 15, 13, 2, 92 - noise_note 3, 12, 2, 108 - noise_note 8, 13, 1, 92 - sound_ret diff --git a/audio/sfx/unknown_809b2.asm b/audio/sfx/unknown_809b2.asm deleted file mode 100644 index 08946ec9..00000000 --- a/audio/sfx/unknown_809b2.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Unknown_809b2_Ch5: - duty_cycle_pattern 0, 3, 0, 3 - square_note 15, 15, 6, 1472 - square_note 8, 14, 3, 1468 - square_note 6, 13, 2, 1488 - square_note 6, 11, 2, 1504 - square_note 6, 12, 2, 1520 - square_note 8, 11, 1, 1536 - sound_ret - - -SFX_Unknown_809b2_Ch6: - duty_cycle_pattern 2, 1, 2, 1 - square_note 14, 12, 6, 1201 - square_note 7, 12, 3, 1197 - square_note 5, 11, 2, 1217 - square_note 8, 9, 2, 1233 - square_note 6, 10, 2, 1249 - square_note 8, 9, 1, 1265 - sound_ret - - -SFX_Unknown_809b2_Ch8: - noise_note 10, 14, 6, 92 - noise_note 10, 13, 6, 108 - noise_note 4, 12, 2, 76 - noise_note 6, 13, 3, 92 - noise_note 8, 11, 3, 76 - noise_note 8, 10, 1, 92 - sound_ret diff --git a/audio/sfx/unknown_809fb.asm b/audio/sfx/unknown_809fb.asm deleted file mode 100644 index 68edf2c9..00000000 --- a/audio/sfx/unknown_809fb.asm +++ /dev/null @@ -1,21 +0,0 @@ -SFX_Unknown_809fb_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 8, 14, 4, 1936 - square_note 15, 15, 5, 1984 - square_note 8, 13, 1, 2008 - sound_ret - - -SFX_Unknown_809fb_Ch6: - duty_cycle_pattern 2, 2, 1, 1 - square_note 10, 12, 4, 1905 - square_note 15, 11, 6, 1954 - square_note 8, 10, 1, 1975 - sound_ret - - -SFX_Unknown_809fb_Ch8: - noise_note 8, 14, 4, 76 - noise_note 14, 12, 4, 60 - noise_note 8, 13, 1, 44 - sound_ret diff --git a/audio/sfx/unknown_80a23.asm b/audio/sfx/unknown_80a23.asm deleted file mode 100644 index 447ad7f3..00000000 --- a/audio/sfx/unknown_80a23.asm +++ /dev/null @@ -1,38 +0,0 @@ -SFX_Unknown_80a23_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 6, 15, 2, 1536 - square_note 6, 14, 2, 1600 - square_note 6, 13, 2, 1664 - square_note 6, 14, 2, 1728 - square_note 6, 13, 2, 1792 - square_note 6, 12, 2, 1856 - square_note 6, 11, 2, 1920 - square_note 8, 10, 1, 1984 - sound_ret - - -SFX_Unknown_80a23_Ch6: - duty_cycle_pattern 0, 1, 0, 1 - square_note 3, 0, 8, 1 - square_note 6, 12, 2, 1473 - square_note 6, 11, 2, 1538 - square_note 6, 10, 2, 1601 - square_note 6, 11, 2, 1666 - square_note 6, 10, 2, 1730 - square_note 6, 9, 2, 1793 - square_note 6, 10, 2, 1858 - square_note 8, 8, 1, 1921 - sound_ret - - -SFX_Unknown_80a23_Ch8: - noise_note 6, 0, 8, 1 - noise_note 5, 14, 2, 92 - noise_note 5, 12, 2, 76 - noise_note 5, 13, 2, 60 - noise_note 5, 11, 2, 44 - noise_note 5, 12, 2, 28 - noise_note 5, 10, 2, 27 - noise_note 5, 9, 2, 26 - noise_note 8, 8, 1, 24 - sound_ret diff --git a/audio/sfx/unknown_80a89.asm b/audio/sfx/unknown_80a89.asm deleted file mode 100644 index 21a1d998..00000000 --- a/audio/sfx/unknown_80a89.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Unknown_80a89_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 4, 15, 3, 1920 - square_note 15, 14, 7, 1792 - square_note 8, 13, 3, 1808 - square_note 4, 12, 2, 1792 - square_note 4, 13, 2, 1776 - square_note 8, 12, 1, 1760 - sound_ret - - -SFX_Unknown_80a89_Ch6: - duty_cycle_pattern 1, 1, 2, 2 - square_note 6, 12, 3, 1793 - square_note 14, 11, 7, 1665 - square_note 7, 11, 3, 1682 - square_note 3, 10, 2, 1665 - square_note 4, 11, 2, 1650 - square_note 8, 10, 1, 1633 - sound_ret - - -SFX_Unknown_80a89_Ch8: - noise_note 6, 14, 3, 92 - noise_note 14, 13, 6, 76 - noise_note 6, 12, 6, 60 - noise_note 3, 11, 3, 76 - noise_note 3, 10, 2, 92 - noise_note 8, 11, 1, 108 - sound_ret diff --git a/audio/sfx/unknown_80ad2.asm b/audio/sfx/unknown_80ad2.asm deleted file mode 100644 index ab114678..00000000 --- a/audio/sfx/unknown_80ad2.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Unknown_80ad2_Ch5: - duty_cycle_pattern 0, 0, 3, 3 - square_note 15, 15, 7, 1280 - square_note 15, 14, 7, 1288 - square_note 8, 11, 4, 1152 - square_note 15, 10, 2, 1120 - sound_ret - - -SFX_Unknown_80ad2_Ch6: - duty_cycle_pattern 1, 0, 1, 0 - square_note 14, 13, 7, 1153 - square_note 14, 12, 7, 1161 - square_note 10, 11, 4, 1025 - square_note 15, 12, 2, 993 - sound_ret - - -SFX_Unknown_80ad2_Ch8: - noise_note 14, 15, 7, 124 - noise_note 12, 15, 6, 108 - noise_note 9, 14, 4, 124 - noise_note 15, 14, 2, 108 - sound_ret diff --git a/audio/sfx/unknown_80b05.asm b/audio/sfx/unknown_80b05.asm deleted file mode 100644 index e92fb103..00000000 --- a/audio/sfx/unknown_80b05.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Unknown_80b05_Ch5: - duty_cycle_pattern 3, 3, 1, 1 - square_note 7, 13, 6, 2017 - square_note 6, 12, 6, 2018 - square_note 9, 13, 6, 2017 - square_note 7, 12, 6, 2016 - square_note 5, 11, 6, 2018 - square_note 7, 12, 6, 2017 - square_note 6, 11, 6, 2016 - square_note 8, 10, 1, 2015 - sound_ret - - -SFX_Unknown_80b05_Ch6: - duty_cycle_pattern 1, 0, 1, 0 - square_note 6, 12, 3, 1993 - square_note 6, 11, 3, 1991 - square_note 10, 12, 4, 1987 - square_note 8, 11, 4, 1991 - square_note 6, 12, 3, 1993 - square_note 15, 10, 2, 1989 - sound_ret - - -SFX_Unknown_80b05_Ch8: - noise_note 13, 1, -1, 124 - noise_note 13, 15, 7, 140 - noise_note 12, 13, 6, 124 - noise_note 8, 12, 4, 108 - noise_note 15, 11, 3, 92 - sound_ret diff --git a/audio/sfx/unknown_80b53.asm b/audio/sfx/unknown_80b53.asm deleted file mode 100644 index 7645d225..00000000 --- a/audio/sfx/unknown_80b53.asm +++ /dev/null @@ -1,30 +0,0 @@ -SFX_Unknown_80b53_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 6, 15, 7, 1856 - square_note 12, 14, 6, 1860 - square_note 6, 13, 5, 1872 - square_note 4, 12, 3, 1888 - square_note 3, 12, 3, 1920 - square_note 8, 13, 1, 1952 - sound_ret - - -SFX_Unknown_80b53_Ch6: - duty_cycle_pattern 0, 0, 2, 2 - square_note 6, 12, 7, 1793 - square_note 11, 11, 6, 1794 - square_note 6, 10, 5, 1809 - square_note 4, 9, 3, 1825 - square_note 3, 10, 3, 1857 - square_note 8, 9, 1, 1890 - sound_ret - - -SFX_Unknown_80b53_Ch8: - noise_note 3, 14, 2, 60 - noise_note 8, 13, 6, 76 - noise_note 5, 13, 4, 60 - noise_note 12, 12, 7, 76 - noise_note 2, 14, 2, 60 - noise_note 8, 13, 1, 44 - sound_ret diff --git a/audio/sfx/unknown_80b9c.asm b/audio/sfx/unknown_80b9c.asm deleted file mode 100644 index 9e6bf047..00000000 --- a/audio/sfx/unknown_80b9c.asm +++ /dev/null @@ -1,29 +0,0 @@ -SFX_Unknown_80b9c_Ch5: - duty_cycle_pattern 3, 3, 1, 0 - square_note 15, 15, 0, 1797 - square_note 10, 14, 0, 1792 - square_note 6, 11, 4, 1808 - square_note 4, 13, 3, 1792 - square_note 6, 11, 2, 1568 - square_note 8, 10, 1, 1572 - sound_ret - - -SFX_Unknown_80b9c_Ch6: - duty_cycle_pattern 0, 2, 0, 2 - square_note 15, 11, 0, 1731 - square_note 10, 10, 0, 1729 - square_note 6, 8, 4, 1746 - square_note 4, 9, 3, 1729 - square_note 6, 8, 2, 1505 - square_note 8, 6, 1, 1512 - sound_ret - - -SFX_Unknown_80b9c_Ch8: - noise_note 6, 14, 6, 76 - noise_note 15, 13, 6, 60 - noise_note 10, 12, 5, 74 - noise_note 1, 11, 2, 91 - noise_note 15, 12, 2, 76 - sound_ret diff --git a/audio/sfx/unknown_80be2.asm b/audio/sfx/unknown_80be2.asm deleted file mode 100644 index 2efda306..00000000 --- a/audio/sfx/unknown_80be2.asm +++ /dev/null @@ -1,34 +0,0 @@ -SFX_Unknown_80be2_Ch5: - duty_cycle_pattern 1, 1, 0, 0 - square_note 10, 15, 5, 1664 - square_note 3, 14, 2, 1696 - square_note 3, 15, 2, 1728 - square_note 3, 14, 2, 1760 - square_note 3, 13, 2, 1792 - square_note 3, 12, 2, 1760 - square_note 3, 13, 2, 1728 - square_note 8, 12, 1, 1696 - sound_ret - - -SFX_Unknown_80be2_Ch6: - duty_cycle_pattern 0, 0, 3, 3 - square_note 9, 13, 5, 1585 - square_note 3, 13, 2, 1618 - square_note 3, 14, 2, 1649 - square_note 3, 11, 2, 1681 - square_note 3, 12, 2, 1714 - square_note 3, 11, 2, 1681 - square_note 3, 12, 2, 1649 - square_note 8, 11, 1, 1617 - sound_ret - - -SFX_Unknown_80be2_Ch8: - noise_note 6, 14, 3, 76 - noise_note 4, 12, 3, 60 - noise_note 5, 13, 4, 60 - noise_note 4, 12, 4, 44 - noise_note 6, 11, 4, 60 - noise_note 8, 12, 1, 44 - sound_ret diff --git a/audio/sfx/unknown_80c3b.asm b/audio/sfx/unknown_80c3b.asm deleted file mode 100644 index 9eadefb9..00000000 --- a/audio/sfx/unknown_80c3b.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Unknown_80c3b_Ch5: - duty_cycle_pattern 2, 2, 1, 1 - square_note 3, 15, 4, 1601 - square_note 13, 13, 6, 1825 - square_note 8, 15, 4, 1817 - square_note 8, 12, 1, 1818 - sound_ret - - -SFX_Unknown_80c3b_Ch6: - duty_cycle_pattern 3, 0, 3, 0 - square_note 4, 15, 4, 1408 - square_note 14, 14, 6, 1760 - square_note 8, 13, 5, 1752 - square_note 8, 13, 1, 1756 - sound_ret - - -SFX_Unknown_80c3b_Ch8: - noise_note 5, 12, 4, 70 - noise_note 13, 10, 5, 68 - noise_note 8, 12, 4, 69 - noise_note 8, 11, 1, 68 - sound_ret diff --git a/audio/sfx/unknown_80c6e.asm b/audio/sfx/unknown_80c6e.asm deleted file mode 100644 index 360ad173..00000000 --- a/audio/sfx/unknown_80c6e.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Unknown_80c6e_Ch5: - duty_cycle_pattern 3, 3, 0, 0 - square_note 13, 15, 1, 1297 - square_note 13, 14, 1, 1301 - square_note 13, 14, 1, 1297 - square_note 8, 13, 1, 1297 - sound_ret - - -SFX_Unknown_80c6e_Ch6: - duty_cycle_pattern 0, 1, 1, 1 - square_note 12, 14, 1, 1292 - square_note 12, 13, 1, 1296 - square_note 14, 12, 1, 1292 - square_note 8, 12, 1, 1290 - sound_ret - - -SFX_Unknown_80c6e_Ch8: - noise_note 14, 15, 2, 101 - noise_note 13, 14, 2, 85 - noise_note 14, 13, 2, 86 - noise_note 8, 13, 1, 102 - sound_ret diff --git a/audio/sfx/unknown_80ca1.asm b/audio/sfx/unknown_80ca1.asm deleted file mode 100644 index d42abd93..00000000 --- a/audio/sfx/unknown_80ca1.asm +++ /dev/null @@ -1,27 +0,0 @@ -SFX_Unknown_80ca1_Ch5: - duty_cycle_pattern 0, 1, 2, 3 - square_note 3, 15, 3, 1380 - square_note 2, 14, 2, 1348 - square_note 5, 13, 1, 1314 - square_note 2, 11, 2, 1156 - square_note 8, 13, 1, 1186 - square_note 3, 15, 3, 1316 - square_note 4, 14, 4, 1252 - square_note 8, 13, 1, 1282 - sound_ret - - -SFX_Unknown_80ca1_Ch6: - duty_cycle_pattern 3, 0, 3, 0 - square_note 3, 13, 3, 1376 - square_note 2, 12, 2, 1344 - square_note 5, 12, 1, 1312 - square_note 2, 9, 2, 1152 - square_note 8, 12, 1, 1184 - square_note 3, 13, 3, 1312 - square_note 3, 12, 4, 1248 - square_note 8, 12, 1, 1280 - - -SFX_Unknown_80ca1_Ch8: - sound_ret diff --git a/audio/sfx/unknown_80ce7.asm b/audio/sfx/unknown_80ce7.asm deleted file mode 100644 index 9c7706c2..00000000 --- a/audio/sfx/unknown_80ce7.asm +++ /dev/null @@ -1,24 +0,0 @@ -SFX_Unknown_80ce7_Ch5: - duty_cycle_pattern 0, 1, 0, 1 - square_note 2, 3, -5, 897 - square_note 7, 15, 5, 1537 - square_note 1, 12, 2, 1153 - square_note 8, 9, 1, 897 - sound_ret - - -SFX_Unknown_80ce7_Ch6: - duty_cycle_pattern 3, 2, 3, 2 - square_note 2, 3, -6, 1456 - square_note 7, 13, 5, 1885 - square_note 1, 11, 2, 1712 - square_note 8, 6, 1, 1456 - sound_ret - - -SFX_Unknown_80ce7_Ch8: - noise_note 2, 9, 2, 73 - noise_note 7, 11, 5, 41 - noise_note 1, 10, 2, 57 - noise_note 8, 9, 1, 73 - sound_ret diff --git a/audio/sfx/unknown_80e91.asm b/audio/sfx/unknown_80e91.asm deleted file mode 100644 index 8db0a395..00000000 --- a/audio/sfx/unknown_80e91.asm +++ /dev/null @@ -1,47 +0,0 @@ -SFX_Unknown_80e91_Ch5: - execute_music - tempo 256 - volume 7, 7 - vibrato 6, 2, 6 - duty_cycle 2 - toggle_perfect_pitch - note_type 4, 11, 1 - octave 3 - note G#, 2 - note G#, 2 - note G#, 2 - note_type 12, 11, 3 - octave 4 - note E_, 4 - sound_ret - - -SFX_Unknown_80e91_Ch6: - execute_music - vibrato 8, 2, 7 - duty_cycle 2 - note_type 4, 12, 1 - octave 4 - note E_, 2 - note E_, 2 - note E_, 2 - note_type 12, 12, 3 - note B_, 4 - sound_ret - - -SFX_Unknown_80e91_Ch8: - execute_music - note_type 4, 1, 0 - octave 4 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - note B_, 1 - rest 1 - note_type 12, 1, 0 - octave 4 - note B_, 2 - rest 2 - sound_ret diff --git a/audio/sfx/unused_4.asm b/audio/sfx/unused_4.asm new file mode 100644 index 00000000..8967157d --- /dev/null +++ b/audio/sfx/unused_4.asm @@ -0,0 +1,31 @@ +SFX_Unused_4_Ch5: + duty_cycle_pattern 3, 3, 0, 0 + square_note 15, 14, 0, 1920 + square_note 15, 15, 0, 1924 + square_note 15, 12, 3, 1504 + square_note 15, 12, 4, 1536 + square_note 10, 6, -4, 1920 + square_note 8, 7, 1, 1924 + sound_ret + + +SFX_Unused_4_Ch6: + duty_cycle_pattern 0, 0, 1, 1 + square_note 15, 10, 0, 1857 + square_note 15, 11, 0, 1859 + square_note 15, 9, 3, 1457 + square_note 15, 9, 4, 1473 + square_note 10, 4, -4, 1857 + square_note 8, 3, 1, 1862 + sound_ret + + +SFX_Unused_4_Ch8: + noise_note 2, 15, 2, 76 + noise_note 6, 14, 0, 58 + noise_note 15, 13, 0, 58 + noise_note 8, 13, 0, 44 + noise_note 6, 14, 6, 76 + noise_note 12, 7, -5, 76 + noise_note 15, 13, 3, 76 + sound_ret diff --git a/constants/music_constants.asm b/constants/music_constants.asm index bf37dea9..117ed2e3 100644 --- a/constants/music_constants.asm +++ b/constants/music_constants.asm @@ -167,18 +167,18 @@ ENDM music_const SFX_CRY_23, SFX_Cry23_1 music_const SFX_CRY_24, SFX_Cry24_1 music_const SFX_CRY_25, SFX_Cry25_1 - music_const SFX_GET_ITEM_2, SFX_Get_Item2_1 - ; AUDIO_1 AUDIO_2 AUDIO_3 + music_const SFX_GET_ITEM_2, SFX_Get_Item2_1 music_const SFX_TINK, SFX_Tink_1 music_const SFX_HEAL_HP, SFX_Heal_HP_1 music_const SFX_HEAL_AILMENT, SFX_Heal_Ailment_1 music_const SFX_START_MENU, SFX_Start_Menu_1 music_const SFX_PRESS_AB, SFX_Press_AB_1 - ; AUDIO_1 AUDIO_3 + ; AUDIO_1 AUDIO_3 AUDIO_4 music_const SFX_GET_ITEM_1, SFX_Get_Item1_1 + ; AUDIO_1 AUDIO_3 music_const SFX_POKEDEX_RATING, SFX_Pokedex_Rating_1 music_const SFX_GET_KEY_ITEM, SFX_Get_Key_Item_1 music_const SFX_POISONED, SFX_Poisoned_1 @@ -285,10 +285,9 @@ ENDM music_const SFX_SHOOTING_STAR, SFX_Shooting_Star ; AUDIO_4 - music_const SFX_SURFING_ADD_POINTS, SFX_Surfing_Add_Points music_const SFX_SURFING_JUMP, SFX_Surfing_Jump music_const SFX_SURFING_FLIP, SFX_Surfing_Flip - music_const SFX_SURFING_LAND, SFX_Surfing_Land - music_const SFX_UNKNOWN_801BC_4, SFX_801bc_4 music_const SFX_SURFING_CRASH, SFX_Surfing_Crash + music_const SFX_UNKNOWN_802CC_4, SFX_802cc_4 + music_const SFX_SURFING_LAND, SFX_Surfing_Land music_const SFX_GET_ITEM2_4_2, SFX_Get_Item2_4_2 diff --git a/engine/surfing_minigame.asm b/engine/surfing_minigame.asm index 81e5296d..b89d22dc 100755 --- a/engine/surfing_minigame.asm +++ b/engine/surfing_minigame.asm @@ -752,7 +752,7 @@ SurfingMinigame_ScoreCurrentWave: call SetCurrentAnimatedObjectCallbackAndResetFrameStateRegisters xor a ld [wChannelSoundIDs + Ch8], a - ld a, SFX_SURFING_LAND + ld a, SFX_SURFING_CRASH call PlaySound ret @@ -1011,7 +1011,7 @@ SurfingMinigame_TileInteraction: .action_3 xor a ld [wChannelSoundIDs + Ch8], a - ld a, SFX_SURFING_CRASH + ld a, SFX_SURFING_LAND call PlaySound and a ret @@ -1559,7 +1559,7 @@ SurfingMinigame_AddRemainingHPToTotal: pop bc dec c jr nz, .loop - ld a, SFX_SURFING_ADD_POINTS + ld a, SFX_PRESS_AB call PlaySound and a ret @@ -1621,7 +1621,7 @@ SurfingMinigame_AddRadnessToTotal: pop bc dec c jr nz, .loop - ld a, SFX_SURFING_ADD_POINTS + ld a, SFX_PRESS_AB call PlaySound and a ret -- cgit v1.2.3