From 831a504de0610b87e347fdf551025a0731810004 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sun, 2 May 2021 00:11:19 +0100 Subject: Identify the unused cry that was carried over to GSC --- audio.asm | 8 ++++---- audio/sfx/unused_1.asm | 31 ------------------------------- audio/sfx/unused_2.asm | 31 ------------------------------- audio/sfx/unused_3.asm | 31 ------------------------------- audio/sfx/unused_4.asm | 31 ------------------------------- audio/sfx/unused_cry_1.asm | 32 ++++++++++++++++++++++++++++++++ audio/sfx/unused_cry_2.asm | 32 ++++++++++++++++++++++++++++++++ audio/sfx/unused_cry_3.asm | 32 ++++++++++++++++++++++++++++++++ audio/sfx/unused_cry_4.asm | 32 ++++++++++++++++++++++++++++++++ 9 files changed, 132 insertions(+), 128 deletions(-) delete mode 100644 audio/sfx/unused_1.asm delete mode 100644 audio/sfx/unused_2.asm delete mode 100644 audio/sfx/unused_3.asm delete mode 100644 audio/sfx/unused_4.asm create mode 100644 audio/sfx/unused_cry_1.asm create mode 100644 audio/sfx/unused_cry_2.asm create mode 100644 audio/sfx/unused_cry_3.asm create mode 100644 audio/sfx/unused_cry_4.asm diff --git a/audio.asm b/audio.asm index 507c7b7b..a3a32c12 100644 --- a/audio.asm +++ b/audio.asm @@ -83,7 +83,7 @@ INCLUDE "audio/sfx/push_boulder_1.asm" INCLUDE "audio/sfx/ss_anne_horn_1.asm" INCLUDE "audio/sfx/withdraw_deposit_1.asm" INCLUDE "audio/sfx/safari_zone_pa.asm" -INCLUDE "audio/sfx/unused_1.asm" +INCLUDE "audio/sfx/unused_cry_1.asm" INCLUDE "audio/sfx/cry09_1.asm" INCLUDE "audio/sfx/cry23_1.asm" INCLUDE "audio/sfx/cry24_1.asm" @@ -207,7 +207,7 @@ INCLUDE "audio/sfx/battle_33.asm" INCLUDE "audio/sfx/battle_34.asm" INCLUDE "audio/sfx/battle_35.asm" INCLUDE "audio/sfx/battle_36.asm" -INCLUDE "audio/sfx/unused_2.asm" +INCLUDE "audio/sfx/unused_cry_2.asm" INCLUDE "audio/sfx/cry09_2.asm" INCLUDE "audio/sfx/cry23_2.asm" INCLUDE "audio/sfx/cry24_2.asm" @@ -312,7 +312,7 @@ INCLUDE "audio/sfx/slots_stop_wheel.asm" INCLUDE "audio/sfx/slots_reward.asm" INCLUDE "audio/sfx/slots_new_spin.asm" INCLUDE "audio/sfx/shooting_star.asm" -INCLUDE "audio/sfx/unused_3.asm" +INCLUDE "audio/sfx/unused_cry_3.asm" INCLUDE "audio/sfx/cry09_3.asm" INCLUDE "audio/sfx/cry23_3.asm" INCLUDE "audio/sfx/cry24_3.asm" @@ -386,7 +386,7 @@ INCLUDE "audio/sfx/unknown_802cc.asm" INCLUDE "audio/sfx/surfing_land.asm" INCLUDE "audio/sfx/surfing_crash.asm" INCLUDE "audio/sfx/get_item2_4_2.asm" -INCLUDE "audio/sfx/unused_4.asm" +INCLUDE "audio/sfx/unused_cry_4.asm" INCLUDE "audio/sfx/cry09_4.asm" INCLUDE "audio/sfx/cry23_4.asm" INCLUDE "audio/sfx/cry24_4.asm" diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_1.asm deleted file mode 100644 index b7a8b4a0..00000000 --- a/audio/sfx/unused_1.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Unused_1_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_1_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_1_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/unused_2.asm b/audio/sfx/unused_2.asm deleted file mode 100644 index 7a050ea4..00000000 --- a/audio/sfx/unused_2.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Unused_2_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_2_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_2_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/unused_3.asm b/audio/sfx/unused_3.asm deleted file mode 100644 index a204fc10..00000000 --- a/audio/sfx/unused_3.asm +++ /dev/null @@ -1,31 +0,0 @@ -SFX_Unused_3_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_3_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_3_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/unused_4.asm b/audio/sfx/unused_4.asm deleted file mode 100644 index 8967157d..00000000 --- a/audio/sfx/unused_4.asm +++ /dev/null @@ -1,31 +0,0 @@ -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/audio/sfx/unused_cry_1.asm b/audio/sfx/unused_cry_1.asm new file mode 100644 index 00000000..342ca2ab --- /dev/null +++ b/audio/sfx/unused_cry_1.asm @@ -0,0 +1,32 @@ +; This corresponds to Cry_Unused_Ch5, Cry_Unused_Ch6, and Cry_Unused_Ch8 in pokegold and pokecrystal. +SFX_UnusedCry_1_Ch5: ; unreferenced + 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_UnusedCry_1_Ch6: ; unreferenced + 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_UnusedCry_1_Ch8: ; unreferenced + 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/unused_cry_2.asm b/audio/sfx/unused_cry_2.asm new file mode 100644 index 00000000..aa6218e1 --- /dev/null +++ b/audio/sfx/unused_cry_2.asm @@ -0,0 +1,32 @@ +; This corresponds to Cry_Unused_Ch5, Cry_Unused_Ch6, and Cry_Unused_Ch8 in pokegold and pokecrystal. +SFX_UnusedCry_2_Ch5: ; unreferenced + 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_UnusedCry_2_Ch6: ; unreferenced + 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_UnusedCry_2_Ch8: ; unreferenced + 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/unused_cry_3.asm b/audio/sfx/unused_cry_3.asm new file mode 100644 index 00000000..95721633 --- /dev/null +++ b/audio/sfx/unused_cry_3.asm @@ -0,0 +1,32 @@ +; This corresponds to Cry_Unused_Ch5, Cry_Unused_Ch6, and Cry_Unused_Ch8 in pokegold and pokecrystal. +SFX_UnusedCry_3_Ch5: ; unreferenced + 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_UnusedCry_3_Ch6: ; unreferenced + 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_UnusedCry_3_Ch8: ; unreferenced + 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/unused_cry_4.asm b/audio/sfx/unused_cry_4.asm new file mode 100644 index 00000000..72e534aa --- /dev/null +++ b/audio/sfx/unused_cry_4.asm @@ -0,0 +1,32 @@ +; This corresponds to Cry_Unused_Ch5, Cry_Unused_Ch6, and Cry_Unused_Ch8 in pokegold and pokecrystal. +SFX_UnusedCry_4_Ch5: ; unreferenced + 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_UnusedCry_4_Ch6: ; unreferenced + 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_UnusedCry_4_Ch8: ; unreferenced + 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 -- cgit v1.3.1-sl0p