Merge pull request #321 from SatoMew/master

Identify the unused cry that was carried over to GSC
This commit is contained in:
Daniel Harding 2021-05-01 16:07:16 -05:00 committed by GitHub
commit bb8fdd7f42
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 12 deletions

View file

@ -80,7 +80,7 @@ INCLUDE "audio/sfx/push_boulder_1.asm"
INCLUDE "audio/sfx/ss_anne_horn_1.asm" INCLUDE "audio/sfx/ss_anne_horn_1.asm"
INCLUDE "audio/sfx/withdraw_deposit_1.asm" INCLUDE "audio/sfx/withdraw_deposit_1.asm"
INCLUDE "audio/sfx/safari_zone_pa.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/cry09_1.asm"
INCLUDE "audio/sfx/cry23_1.asm" INCLUDE "audio/sfx/cry23_1.asm"
INCLUDE "audio/sfx/cry24_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_34.asm"
INCLUDE "audio/sfx/battle_35.asm" INCLUDE "audio/sfx/battle_35.asm"
INCLUDE "audio/sfx/battle_36.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/cry09_2.asm"
INCLUDE "audio/sfx/cry23_2.asm" INCLUDE "audio/sfx/cry23_2.asm"
INCLUDE "audio/sfx/cry24_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_reward.asm"
INCLUDE "audio/sfx/slots_new_spin.asm" INCLUDE "audio/sfx/slots_new_spin.asm"
INCLUDE "audio/sfx/shooting_star.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/cry09_3.asm"
INCLUDE "audio/sfx/cry23_3.asm" INCLUDE "audio/sfx/cry23_3.asm"
INCLUDE "audio/sfx/cry24_3.asm" INCLUDE "audio/sfx/cry24_3.asm"

View file

@ -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 duty_cycle_pattern 3, 3, 0, 0
square_note 15, 14, 0, 1920 square_note 15, 14, 0, 1920
square_note 15, 15, 0, 1924 square_note 15, 15, 0, 1924
@ -9,7 +10,7 @@ SFX_Unused_1_Ch5:
sound_ret sound_ret
SFX_Unused_1_Ch6: SFX_UnusedCry_1_Ch6: ; unreferenced
duty_cycle_pattern 0, 0, 1, 1 duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857 square_note 15, 10, 0, 1857
square_note 15, 11, 0, 1859 square_note 15, 11, 0, 1859
@ -20,7 +21,7 @@ SFX_Unused_1_Ch6:
sound_ret sound_ret
SFX_Unused_1_Ch8: SFX_UnusedCry_1_Ch8: ; unreferenced
noise_note 2, 15, 2, 76 noise_note 2, 15, 2, 76
noise_note 6, 14, 0, 58 noise_note 6, 14, 0, 58
noise_note 15, 13, 0, 58 noise_note 15, 13, 0, 58

View file

@ -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 duty_cycle_pattern 3, 3, 0, 0
square_note 15, 14, 0, 1920 square_note 15, 14, 0, 1920
square_note 15, 15, 0, 1924 square_note 15, 15, 0, 1924
@ -9,7 +10,7 @@ SFX_Unused_2_Ch5:
sound_ret sound_ret
SFX_Unused_2_Ch6: SFX_UnusedCry_2_Ch6: ; unreferenced
duty_cycle_pattern 0, 0, 1, 1 duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857 square_note 15, 10, 0, 1857
square_note 15, 11, 0, 1859 square_note 15, 11, 0, 1859
@ -20,7 +21,7 @@ SFX_Unused_2_Ch6:
sound_ret sound_ret
SFX_Unused_2_Ch8: SFX_UnusedCry_2_Ch8: ; unreferenced
noise_note 2, 15, 2, 76 noise_note 2, 15, 2, 76
noise_note 6, 14, 0, 58 noise_note 6, 14, 0, 58
noise_note 15, 13, 0, 58 noise_note 15, 13, 0, 58

View file

@ -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 duty_cycle_pattern 3, 3, 0, 0
square_note 15, 14, 0, 1920 square_note 15, 14, 0, 1920
square_note 15, 15, 0, 1924 square_note 15, 15, 0, 1924
@ -9,7 +10,7 @@ SFX_Unused_3_Ch5:
sound_ret sound_ret
SFX_Unused_3_Ch6: SFX_UnusedCry_3_Ch6: ; unreferenced
duty_cycle_pattern 0, 0, 1, 1 duty_cycle_pattern 0, 0, 1, 1
square_note 15, 10, 0, 1857 square_note 15, 10, 0, 1857
square_note 15, 11, 0, 1859 square_note 15, 11, 0, 1859
@ -20,7 +21,7 @@ SFX_Unused_3_Ch6:
sound_ret sound_ret
SFX_Unused_3_Ch8: SFX_UnusedCry_3_Ch8: ; unreferenced
noise_note 2, 15, 2, 76 noise_note 2, 15, 2, 76
noise_note 6, 14, 0, 58 noise_note 6, 14, 0, 58
noise_note 15, 13, 0, 58 noise_note 15, 13, 0, 58