From ed11bfeca134277d6202857ef583e56c481aed1c Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sat, 1 May 2021 15:44:43 +0100 Subject: [PATCH 1/3] Identify the unused cry that was carried over to GSC --- audio.asm | 8 ++++---- audio/music/{unusedsong.asm => unused_song.asm} | 0 audio/sfx/{unused_1.asm => unused_cry.asm} | 11 ++++++----- audio/sfx/{unused_2.asm => unused_cry_copy.asm} | 11 ++++++----- audio/sfx/{unused_3.asm => unused_cry_copy2.asm} | 11 ++++++----- 5 files changed, 22 insertions(+), 19 deletions(-) rename audio/music/{unusedsong.asm => unused_song.asm} (100%) rename audio/sfx/{unused_1.asm => unused_cry.asm} (67%) rename audio/sfx/{unused_2.asm => unused_cry_copy.asm} (66%) rename audio/sfx/{unused_3.asm => unused_cry_copy2.asm} (66%) diff --git a/audio.asm b/audio.asm index df065576..de27e25c 100644 --- a/audio.asm +++ b/audio.asm @@ -80,7 +80,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.asm" INCLUDE "audio/sfx/cry09_1.asm" INCLUDE "audio/sfx/cry23_1.asm" INCLUDE "audio/sfx/cry24_1.asm" @@ -206,7 +206,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_copy.asm" INCLUDE "audio/sfx/cry09_2.asm" INCLUDE "audio/sfx/cry23_2.asm" INCLUDE "audio/sfx/cry24_2.asm" @@ -314,7 +314,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_copy2.asm" INCLUDE "audio/sfx/cry09_3.asm" INCLUDE "audio/sfx/cry23_3.asm" INCLUDE "audio/sfx/cry24_3.asm" @@ -388,7 +388,7 @@ INCLUDE "audio/music/routes3.asm" INCLUDE "audio/music/routes4.asm" INCLUDE "audio/music/indigoplateau.asm" INCLUDE "audio/music/pallettown.asm" -INCLUDE "audio/music/unusedsong.asm" +INCLUDE "audio/music/unused_song.asm" INCLUDE "audio/music/cities1.asm" INCLUDE "audio/sfx/get_item1_1.asm" INCLUDE "audio/music/museumguy.asm" diff --git a/audio/music/unusedsong.asm b/audio/music/unused_song.asm similarity index 100% rename from audio/music/unusedsong.asm rename to audio/music/unused_song.asm diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_cry.asm similarity index 67% rename from audio/sfx/unused_1.asm rename to audio/sfx/unused_cry.asm index b7a8b4a0..e2046976 100644 --- a/audio/sfx/unused_1.asm +++ b/audio/sfx/unused_cry.asm @@ -1,4 +1,5 @@ -SFX_Unused_1_Ch5: +; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal. +SFX_UnusedCry_Ch5: ; unreferenced duty_cycle_pattern 3, 3, 0, 0 square_note 15, 14, 0, 1920 square_note 15, 15, 0, 1924 @@ -8,8 +9,8 @@ SFX_Unused_1_Ch5: square_note 8, 7, 1, 1924 sound_ret - -SFX_Unused_1_Ch6: +; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal. +SFX_UnusedCry_Ch6: ; unreferenced duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 @@ -19,8 +20,8 @@ SFX_Unused_1_Ch6: square_note 8, 3, 1, 1862 sound_ret - -SFX_Unused_1_Ch8: +; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal. +SFX_UnusedCry_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58 noise_note 15, 13, 0, 58 diff --git a/audio/sfx/unused_2.asm b/audio/sfx/unused_cry_copy.asm similarity index 66% rename from audio/sfx/unused_2.asm rename to audio/sfx/unused_cry_copy.asm index 7a050ea4..01efa326 100644 --- a/audio/sfx/unused_2.asm +++ b/audio/sfx/unused_cry_copy.asm @@ -1,4 +1,5 @@ -SFX_Unused_2_Ch5: +; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal. +SFX_UnusedCryCopy_Ch5: ; unreferenced duty_cycle_pattern 3, 3, 0, 0 square_note 15, 14, 0, 1920 square_note 15, 15, 0, 1924 @@ -8,8 +9,8 @@ SFX_Unused_2_Ch5: square_note 8, 7, 1, 1924 sound_ret - -SFX_Unused_2_Ch6: +; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal. +SFX_UnusedCryCopy_Ch6: ; unreferenced duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 @@ -19,8 +20,8 @@ SFX_Unused_2_Ch6: square_note 8, 3, 1, 1862 sound_ret - -SFX_Unused_2_Ch8: +; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal. +SFX_UnusedCryCopy_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58 noise_note 15, 13, 0, 58 diff --git a/audio/sfx/unused_3.asm b/audio/sfx/unused_cry_copy2.asm similarity index 66% rename from audio/sfx/unused_3.asm rename to audio/sfx/unused_cry_copy2.asm index a204fc10..955740de 100644 --- a/audio/sfx/unused_3.asm +++ b/audio/sfx/unused_cry_copy2.asm @@ -1,4 +1,5 @@ -SFX_Unused_3_Ch5: +; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal. +SFX_UnusedCryCopy2_Ch5: ; unreferenced duty_cycle_pattern 3, 3, 0, 0 square_note 15, 14, 0, 1920 square_note 15, 15, 0, 1924 @@ -8,8 +9,8 @@ SFX_Unused_3_Ch5: square_note 8, 7, 1, 1924 sound_ret - -SFX_Unused_3_Ch6: +; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal. +SFX_UnusedCryCopy2_Ch6: ; unreferenced duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 @@ -19,8 +20,8 @@ SFX_Unused_3_Ch6: square_note 8, 3, 1, 1862 sound_ret - -SFX_Unused_3_Ch8: +; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal. +SFX_UnusedCryCopy2_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58 noise_note 15, 13, 0, 58 From e2a70c9c43e1f219d57efdfacbfd8237cd10ca74 Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sat, 1 May 2021 20:42:12 +0100 Subject: [PATCH 2/3] Incorporate the suggested fixes --- audio.asm | 8 ++++---- audio/music/{unused_song.asm => unusedsong.asm} | 0 audio/sfx/{unused_cry.asm => unused_cry_1.asm} | 10 ++++------ audio/sfx/{unused_cry_copy.asm => unused_cry_2.asm} | 10 ++++------ audio/sfx/{unused_cry_copy2.asm => unused_cry_3.asm} | 10 ++++------ 5 files changed, 16 insertions(+), 22 deletions(-) rename audio/music/{unused_song.asm => unusedsong.asm} (100%) rename audio/sfx/{unused_cry.asm => unused_cry_1.asm} (67%) rename audio/sfx/{unused_cry_copy.asm => unused_cry_2.asm} (66%) rename audio/sfx/{unused_cry_copy2.asm => unused_cry_3.asm} (66%) diff --git a/audio.asm b/audio.asm index de27e25c..35b0d872 100644 --- a/audio.asm +++ b/audio.asm @@ -80,7 +80,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_cry.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" @@ -206,7 +206,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_cry_copy.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" @@ -314,7 +314,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_cry_copy2.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" @@ -388,7 +388,7 @@ INCLUDE "audio/music/routes3.asm" INCLUDE "audio/music/routes4.asm" INCLUDE "audio/music/indigoplateau.asm" INCLUDE "audio/music/pallettown.asm" -INCLUDE "audio/music/unused_song.asm" +INCLUDE "audio/music/unusedsong.asm" INCLUDE "audio/music/cities1.asm" INCLUDE "audio/sfx/get_item1_1.asm" INCLUDE "audio/music/museumguy.asm" diff --git a/audio/music/unused_song.asm b/audio/music/unusedsong.asm similarity index 100% rename from audio/music/unused_song.asm rename to audio/music/unusedsong.asm diff --git a/audio/sfx/unused_cry.asm b/audio/sfx/unused_cry_1.asm similarity index 67% rename from audio/sfx/unused_cry.asm rename to audio/sfx/unused_cry_1.asm index e2046976..0ff7c79a 100644 --- a/audio/sfx/unused_cry.asm +++ b/audio/sfx/unused_cry_1.asm @@ -1,5 +1,5 @@ -; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal. -SFX_UnusedCry_Ch5: ; unreferenced +; 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 @@ -9,8 +9,7 @@ SFX_UnusedCry_Ch5: ; unreferenced square_note 8, 7, 1, 1924 sound_ret -; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal. -SFX_UnusedCry_Ch6: ; unreferenced +SFX_UnusedCry_1_Ch6: ; unreferenced duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 @@ -20,8 +19,7 @@ SFX_UnusedCry_Ch6: ; unreferenced square_note 8, 3, 1, 1862 sound_ret -; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal. -SFX_UnusedCry_Ch8: ; unreferenced +SFX_UnusedCry_1_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58 noise_note 15, 13, 0, 58 diff --git a/audio/sfx/unused_cry_copy.asm b/audio/sfx/unused_cry_2.asm similarity index 66% rename from audio/sfx/unused_cry_copy.asm rename to audio/sfx/unused_cry_2.asm index 01efa326..4924e560 100644 --- a/audio/sfx/unused_cry_copy.asm +++ b/audio/sfx/unused_cry_2.asm @@ -1,5 +1,5 @@ -; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal. -SFX_UnusedCryCopy_Ch5: ; unreferenced +; 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 @@ -9,8 +9,7 @@ SFX_UnusedCryCopy_Ch5: ; unreferenced square_note 8, 7, 1, 1924 sound_ret -; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal. -SFX_UnusedCryCopy_Ch6: ; unreferenced +SFX_UnusedCry_2_Ch6: ; unreferenced duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 @@ -20,8 +19,7 @@ SFX_UnusedCryCopy_Ch6: ; unreferenced square_note 8, 3, 1, 1862 sound_ret -; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal. -SFX_UnusedCryCopy_Ch8: ; unreferenced +SFX_UnusedCry_2_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58 noise_note 15, 13, 0, 58 diff --git a/audio/sfx/unused_cry_copy2.asm b/audio/sfx/unused_cry_3.asm similarity index 66% rename from audio/sfx/unused_cry_copy2.asm rename to audio/sfx/unused_cry_3.asm index 955740de..6f3e2737 100644 --- a/audio/sfx/unused_cry_copy2.asm +++ b/audio/sfx/unused_cry_3.asm @@ -1,5 +1,5 @@ -; This corresponds to Cry_Unused_Ch5 in pokegold and pokecrystal. -SFX_UnusedCryCopy2_Ch5: ; unreferenced +; 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 @@ -9,8 +9,7 @@ SFX_UnusedCryCopy2_Ch5: ; unreferenced square_note 8, 7, 1, 1924 sound_ret -; This corresponds to Cry_Unused_Ch6 in pokegold and pokecrystal. -SFX_UnusedCryCopy2_Ch6: ; unreferenced +SFX_UnusedCry_3_Ch6: ; unreferenced duty_cycle_pattern 0, 0, 1, 1 square_note 15, 10, 0, 1857 square_note 15, 11, 0, 1859 @@ -20,8 +19,7 @@ SFX_UnusedCryCopy2_Ch6: ; unreferenced square_note 8, 3, 1, 1862 sound_ret -; This corresponds to Cry_Unused_Ch8 in pokegold and pokecrystal. -SFX_UnusedCryCopy2_Ch8: ; unreferenced +SFX_UnusedCry_3_Ch8: ; unreferenced noise_note 2, 15, 2, 76 noise_note 6, 14, 0, 58 noise_note 15, 13, 0, 58 From b155e59ffa627cb735abeae927fd88c5e06ec67e Mon Sep 17 00:00:00 2001 From: SatoMew Date: Sat, 1 May 2021 21:54:19 +0100 Subject: [PATCH 3/3] Restore extra line breaks --- audio/sfx/unused_cry_1.asm | 2 ++ audio/sfx/unused_cry_2.asm | 2 ++ audio/sfx/unused_cry_3.asm | 2 ++ 3 files changed, 6 insertions(+) diff --git a/audio/sfx/unused_cry_1.asm b/audio/sfx/unused_cry_1.asm index 0ff7c79a..342ca2ab 100644 --- a/audio/sfx/unused_cry_1.asm +++ b/audio/sfx/unused_cry_1.asm @@ -9,6 +9,7 @@ SFX_UnusedCry_1_Ch5: ; unreferenced 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 @@ -19,6 +20,7 @@ SFX_UnusedCry_1_Ch6: ; unreferenced 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 diff --git a/audio/sfx/unused_cry_2.asm b/audio/sfx/unused_cry_2.asm index 4924e560..aa6218e1 100644 --- a/audio/sfx/unused_cry_2.asm +++ b/audio/sfx/unused_cry_2.asm @@ -9,6 +9,7 @@ SFX_UnusedCry_2_Ch5: ; unreferenced 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 @@ -19,6 +20,7 @@ SFX_UnusedCry_2_Ch6: ; unreferenced 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 diff --git a/audio/sfx/unused_cry_3.asm b/audio/sfx/unused_cry_3.asm index 6f3e2737..95721633 100644 --- a/audio/sfx/unused_cry_3.asm +++ b/audio/sfx/unused_cry_3.asm @@ -9,6 +9,7 @@ SFX_UnusedCry_3_Ch5: ; unreferenced 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 @@ -19,6 +20,7 @@ SFX_UnusedCry_3_Ch6: ; unreferenced 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