Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify naming of SFX_GET_EGG_* pointers

Browse Source 
In game, one receives eggs from the Aide and the Day-care Man, not the
Day-care Lady. SFX `0x96` is used for both. Rename it to reflect it is
not unique to the Day-care.

SFX `0x95` is an alias of the same sound and appears to be unused.
Rename the pointer to clarify that.
This commit is contained in:
Ryan Tandy
2019-09-23 10:03:19 -07:00
parent abee217ce0
commit 3fc2ba41f7
5 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
audio/sfx.asm
View File

@@ -1060,15 +1060,13 @@ Sfx_3RdPlace_Ch7:
togglesfx
Sfx_GetEggFromDayCareLady:
Sfx_GetEggFromDayCareMan:
musicheader 4, 5, Sfx_GetEggFromDayCareLady_Ch5
musicheader 1, 6, Sfx_GetEggFromDayCareLady_Ch6
musicheader 1, 7, Sfx_GetEggFromDayCareLady_Ch7
musicheader 1, 8, Sfx_GetEggFromDayCareLady_Ch8
Sfx_GetEgg:
musicheader 4, 5, Sfx_GetEgg_Ch5
musicheader 1, 6, Sfx_GetEgg_Ch6
musicheader 1, 7, Sfx_GetEgg_Ch7
musicheader 1, 8, Sfx_GetEgg_Ch8
Sfx_GetEggFromDayCareLady_Ch5:
Sfx_GetEggFromDayCareMan_Ch5:
Sfx_GetEgg_Ch5:
togglesfx
tempo 120
volume $77
@@ -1100,8 +1098,7 @@ Sfx_GetEggFromDayCareMan_Ch5:
togglesfx
Sfx_GetEggFromDayCareLady_Ch6:
Sfx_GetEggFromDayCareMan_Ch6:
Sfx_GetEgg_Ch6:
togglesfx
vibrato $12, $34
dutycycle $3
@@ -1130,8 +1127,7 @@ Sfx_GetEggFromDayCareMan_Ch6:
togglesfx
Sfx_GetEggFromDayCareLady_Ch7:
Sfx_GetEggFromDayCareMan_Ch7:
Sfx_GetEgg_Ch7:
togglesfx
notetype $8, $25
note __, 2
@@ -1150,8 +1146,7 @@ Sfx_GetEggFromDayCareMan_Ch7:
togglesfx
Sfx_GetEggFromDayCareLady_Ch8:
Sfx_GetEggFromDayCareMan_Ch8:
Sfx_GetEgg_Ch8:
togglesfx
sfxtogglenoise $4
notetype $8