diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-12 00:50:55 -0500 |
| commit | 096afdcdaca0714612f3670a3c4a670f312c1c3f (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /audio/sfx.asm | |
| parent | 98128cd4d8457948e7136a16e08bacff0bc3529d (diff) | |
| parent | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'audio/sfx.asm')
| -rw-r--r-- | audio/sfx.asm | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/audio/sfx.asm b/audio/sfx.asm index 0a13717e2..7347bc84f 100644 --- a/audio/sfx.asm +++ b/audio/sfx.asm @@ -1211,16 +1211,16 @@ Sfx_3RdPlace_Ch7: ; f0e56 togglesfx -Sfx_GetEggFromDaycareLady: ; f0e66 -Sfx_GetEggFromDaycareMan: ; f0e66 - 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_GetEggFromDayCareLady: ; f0e66 +Sfx_GetEggFromDayCareMan: ; f0e66 + musicheader 4, 5, Sfx_GetEggFromDayCareLady_Ch5 + musicheader 1, 6, Sfx_GetEggFromDayCareLady_Ch6 + musicheader 1, 7, Sfx_GetEggFromDayCareLady_Ch7 + musicheader 1, 8, Sfx_GetEggFromDayCareLady_Ch8 ; f0e72 -Sfx_GetEggFromDaycareLady_Ch5: ; f0e72 -Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 +Sfx_GetEggFromDayCareLady_Ch5: ; f0e72 +Sfx_GetEggFromDayCareMan_Ch5: ; f0e72 togglesfx tempo 120 volume $77 @@ -1253,8 +1253,8 @@ Sfx_GetEggFromDaycareMan_Ch5: ; f0e72 togglesfx -Sfx_GetEggFromDaycareLady_Ch6: ; f0e9b -Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b +Sfx_GetEggFromDayCareLady_Ch6: ; f0e9b +Sfx_GetEggFromDayCareMan_Ch6: ; f0e9b togglesfx vibrato $12, $34 dutycycle $3 @@ -1284,8 +1284,8 @@ Sfx_GetEggFromDaycareMan_Ch6: ; f0e9b togglesfx -Sfx_GetEggFromDaycareLady_Ch7: ; f0ebe -Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe +Sfx_GetEggFromDayCareLady_Ch7: ; f0ebe +Sfx_GetEggFromDayCareMan_Ch7: ; f0ebe togglesfx notetype $8, $25 note __, 2 @@ -1305,8 +1305,8 @@ Sfx_GetEggFromDaycareMan_Ch7: ; f0ebe togglesfx -Sfx_GetEggFromDaycareLady_Ch8: ; f0ed0 -Sfx_GetEggFromDaycareMan_Ch8: ; f0ed0 +Sfx_GetEggFromDayCareLady_Ch8: ; f0ed0 +Sfx_GetEggFromDayCareMan_Ch8: ; f0ed0 togglesfx sfxtogglenoise $4 notetype $8 |