diff options
| author | Bryan Bishop <kanzure@gmail.com> | 2014-07-19 14:25:28 -0500 |
|---|---|---|
| committer | Bryan Bishop <kanzure@gmail.com> | 2014-07-19 14:25:28 -0500 |
| commit | bb5ae04ca5654b8c22585bcc094ee05d1ab5e055 (patch) | |
| tree | fc6a371f6f37fb8efe888025f0745eb2109fd909 /audio/engine.asm | |
| parent | 1ba907e3539f51c70c95eed6189c14cea259b71a (diff) | |
| parent | 4757e299be8c7c6981b75b1159bf5e3d28ee544e (diff) | |
Merge pull request #259 from yenatch/cries
Shorten cry defs now that cry parameters are all words.
Diffstat (limited to 'audio/engine.asm')
| -rw-r--r-- | audio/engine.asm | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 499adcadb..734d45f15 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -5,7 +5,6 @@ ; Notable functions: ; FadeMusic ; PlayStereoSFX -; PlayCry _SoundRestart:: ; e8000 ; restart sound operation @@ -828,7 +827,7 @@ Functione8466: ; e8466 add hl, bc bit 4, [hl] jr z, .vibrato - ld hl, $0027 + ld hl, Channel1CryPitch - Channel1 add hl, bc ld e, [hl] inc hl @@ -1758,7 +1757,7 @@ MusicE6: ; e88e4 ld hl, Channel1Flags2 - Channel1 add hl, bc set 4, [hl] - ld hl, $0028 + ld hl, Channel1CryPitch + 1 - Channel1 add hl, bc call GetMusicByte ld [hld], a @@ -2364,10 +2363,9 @@ _PlayMusic:: ; e8b30 ret ; e8b79 -PlayCry:: ; e8b79 +_PlayCryHeader:: ; e8b79 ; Play cry de using parameters: ; CryPitch -; CryEcho ; CryLength call MusicOff @@ -2416,7 +2414,7 @@ PlayCry:: ; e8b79 add hl, bc ld a, [CryPitch] ld [hli], a - ld a, [CryEcho] + ld a, [CryPitch + 1] ld [hl], a ; No tempo for channel 4 |