summaryrefslogtreecommitdiff
path: root/audio/sfx.asm
diff options
context:
space:
mode:
authorRyan Tandy <ryan@nardis.ca>2019-09-23 10:14:38 -0700
committerRyan Tandy <ryan@nardis.ca>2019-09-23 10:14:38 -0700
commit0af8f48d5908d1a49c2701abbb02b4a4e34a8563 (patch)
treebcfd917e29608f03933c3aa168a3cc48600b482b /audio/sfx.asm
parent111722c5e46588d34805b68e6eb59cfb05e099f2 (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/sfx.asm')
-rw-r--r--audio/sfx.asm23
1 files changed, 9 insertions, 14 deletions
diff --git a/audio/sfx.asm b/audio/sfx.asm
index e1cfff37..4bffdacb 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