foster/pokered
0
0
Fork 0
mirror of https://github.com/pret/pokered.git synced 2024-10-22 22:55:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Incorporate the suggested fixes

Browse source
This commit is contained in:
SatoMew 2021-05-01 20:42:12 +01:00
parent ed11bfeca1
commit e2a70c9c43
5 changed files with 16 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
audio.asm
View file

@ -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"

0
audio/music/unused_song.asm → audio/music/unusedsong.asm
View file

10
audio/sfx/unused_cry.asm → audio/sfx/unused_cry_1.asm
View file

@ -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

10
audio/sfx/unused_cry_copy.asm → audio/sfx/unused_cry_2.asm
View file

@ -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

10
audio/sfx/unused_cry_copy2.asm → audio/sfx/unused_cry_3.asm
View file

@ -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