Incorporate the suggested fixes

5 files changed, 16 insertions, 22 deletions

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
index a2291a2a..a2291a2a 100644
--- a/audio/music/unused_song.asm
+++ b/audio/music/unusedsong.asm
diff --git a/audio/sfx/unused_cry.asm b/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
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
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