diff options
| author | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2020-01-06 22:07:33 -0600 |
| commit | e7be25948dfeef257697a7aa30706339f6ba014b (patch) | |
| tree | 973d0ad95361a1dfd1c371be59a300be19532e47 /audio/sfx.asm | |
| parent | 99d16d616d5f70754dd6aa567e478e587a733d8c (diff) | |
| parent | 94ebdab6d350fd6ebfd43c5a84710ed14dade8ca (diff) | |
Merge branch 'master' into audio-macros
Diffstat (limited to 'audio/sfx.asm')
| -rw-r--r-- | audio/sfx.asm | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/audio/sfx.asm b/audio/sfx.asm index 248336d19..32a336126 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -1174,16 +1174,14 @@ Sfx_3rdPlace_Ch7: toggle_sfx -Sfx_GetEggFromDayCareMan: -Sfx_GetEggFromDayCareLady: +Sfx_GetEgg: channel_count 4 - channel 5, Sfx_GetEggFromDayCareLady_Ch5 - channel 6, Sfx_GetEggFromDayCareLady_Ch6 - channel 7, Sfx_GetEggFromDayCareLady_Ch7 - channel 8, Sfx_GetEggFromDayCareLady_Ch8 + channel 5, Sfx_GetEgg_Ch5 + channel 6, Sfx_GetEgg_Ch6 + channel 7, Sfx_GetEgg_Ch7 + channel 8, Sfx_GetEgg_Ch8 -Sfx_GetEggFromDayCareMan_Ch5: -Sfx_GetEggFromDayCareLady_Ch5: +Sfx_GetEgg_Ch5: toggle_sfx tempo 120 volume 7, 7 @@ -1215,8 +1213,7 @@ Sfx_GetEggFromDayCareLady_Ch5: toggle_sfx -Sfx_GetEggFromDayCareMan_Ch6: -Sfx_GetEggFromDayCareLady_Ch6: +Sfx_GetEgg_Ch6: toggle_sfx vibrato 18, 3, 4 duty_cycle 3 @@ -1245,8 +1242,7 @@ Sfx_GetEggFromDayCareLady_Ch6: toggle_sfx -Sfx_GetEggFromDayCareMan_Ch7: -Sfx_GetEggFromDayCareLady_Ch7: +Sfx_GetEgg_Ch7: toggle_sfx note_type 8, 2, 5 rest 2 @@ -1265,8 +1261,7 @@ Sfx_GetEggFromDayCareLady_Ch7: toggle_sfx -Sfx_GetEggFromDayCareMan_Ch8: -Sfx_GetEggFromDayCareLady_Ch8: +Sfx_GetEgg_Ch8: toggle_sfx sfx_toggle_noise 4 drum_speed 8 |