diff options
| author | Ryan Tandy <ryan@nardis.ca> | 2019-09-23 10:03:19 -0700 |
|---|---|---|
| committer | Ryan Tandy <ryan@nardis.ca> | 2019-09-23 10:03:19 -0700 |
| commit | 3fc2ba41f7bc7fcf1e51f821b4e07525e0e4a873 (patch) | |
| tree | d5c4d0bf478b869b37a0978c8fd5bcfe8491e292 /audio | |
| parent | abee217ce0e29331f1ac691fd1d4edeacf2295f9 (diff) | |
Clarify naming of SFX_GET_EGG_* pointers
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.
Diffstat (limited to 'audio')
| -rw-r--r-- | audio/sfx.asm | 23 | ||||
| -rw-r--r-- | audio/sfx_pointers.asm | 4 |
2 files changed, 11 insertions, 16 deletions
diff --git a/audio/sfx.asm b/audio/sfx.asm index 9da38234f..4c4f5de88 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -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 diff --git a/audio/sfx_pointers.asm b/audio/sfx_pointers.asm index cf1138ffc..af21cf271 100644 --- a/audio/sfx_pointers.asm +++ b/audio/sfx_pointers.asm @@ -149,8 +149,8 @@ SFX: dba Sfx_Fanfare2 dba Sfx_RegisterPhoneNumber dba Sfx_3RdPlace - dba Sfx_GetEggFromDayCareMan - dba Sfx_GetEggFromDayCareLady + dba Sfx_GetEgg + dba Sfx_GetEgg dba Sfx_MoveDeleted dba Sfx_2ndPlace dba Sfx_1stPlace |