ref: bb8fdd7f42dc633e4c72f8199bbcb5c6b750cba3
parent: 6a31663c960a5c1da9dbbf12d49e0252860b96d0
parent: b155e59ffa627cb735abeae927fd88c5e06ec67e
author: Daniel Harding <33dannye@gmail.com>
date: Sat May 1 12:07:16 EDT 2021
Merge pull request #321 from SatoMew/master Identify the unused cry that was carried over to GSC
--- a/audio.asm
+++ b/audio.asm
@@ -80,7 +80,7 @@
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_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_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"
--- a/audio/sfx/unused_1.asm
+++ /dev/null
@@ -1,31 +1,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
--- a/audio/sfx/unused_2.asm
+++ /dev/null
@@ -1,31 +1,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
--- a/audio/sfx/unused_3.asm
+++ /dev/null
@@ -1,31 +1,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
--- /dev/null
+++ b/audio/sfx/unused_cry_1.asm
@@ -1,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
--- /dev/null
+++ b/audio/sfx/unused_cry_2.asm
@@ -1,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
--- /dev/null
+++ b/audio/sfx/unused_cry_3.asm
@@ -1,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