Merge pull request #321 from SatoMew/master

Identify the unused cry that was carried over to GSC

4 files changed, 15 insertions, 12 deletions

diff --git a/audio.asm b/audio.asm
index df065576..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_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"
@@ -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_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_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"
diff --git a/audio/sfx/unused_1.asm b/audio/sfx/unused_cry_1.asm
index b7a8b4a0..342ca2ab 100644
--- a/audio/sfx/unused_1.asm
+++ b/audio/sfx/unused_cry_1.asm
@@ -1,4 +1,5 @@
-SFX_Unused_1_Ch5:
+; 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,7 +10,7 @@ SFX_Unused_1_Ch5:
 	sound_ret
 
 
-SFX_Unused_1_Ch6:
+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,7 +21,7 @@ SFX_Unused_1_Ch6:
 	sound_ret
 
 
-SFX_Unused_1_Ch8:
+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_2.asm b/audio/sfx/unused_cry_2.asm
index 7a050ea4..aa6218e1 100644
--- a/audio/sfx/unused_2.asm
+++ b/audio/sfx/unused_cry_2.asm
@@ -1,4 +1,5 @@
-SFX_Unused_2_Ch5:
+; 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,7 +10,7 @@ SFX_Unused_2_Ch5:
 	sound_ret
 
 
-SFX_Unused_2_Ch6:
+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,7 +21,7 @@ SFX_Unused_2_Ch6:
 	sound_ret
 
 
-SFX_Unused_2_Ch8:
+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_3.asm b/audio/sfx/unused_cry_3.asm
index a204fc10..95721633 100644
--- a/audio/sfx/unused_3.asm
+++ b/audio/sfx/unused_cry_3.asm
@@ -1,4 +1,5 @@
-SFX_Unused_3_Ch5:
+; 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,7 +10,7 @@ SFX_Unused_3_Ch5:
 	sound_ret
 
 
-SFX_Unused_3_Ch6:
+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,7 +21,7 @@ SFX_Unused_3_Ch6:
 	sound_ret
 
 
-SFX_Unused_3_Ch8:
+SFX_UnusedCry_3_Ch8: ; unreferenced
 	noise_note 2, 15, 2, 76
 	noise_note 6, 14, 0, 58
 	noise_note 15, 13, 0, 58