diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2018-12-09 17:44:09 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 17:44:09 -0500 |
| commit | e025ab9db0b85cadb42e9b72ac408a58f8133672 (patch) | |
| tree | ff74fb06f4d6715bec8a711e31f41057d4625bb3 /audio/engine.asm | |
| parent | cbf4c663611d4b7d07f3fc8d43f0be756ccc19ed (diff) | |
| parent | fd1fa78ffe78c9101c0ae5a1ca299d4282462ecd (diff) | |
Merge pull request #578 from mid-kid/master
Fixes in the animation subsystem.
Diffstat (limited to 'audio/engine.asm')
| -rw-r--r-- | audio/engine.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 02235dd82..551f1e0aa 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -1105,7 +1105,7 @@ ReadNoiseSample: ld a, [de] inc de - cp $ff + cp endchannel_cmd jr z, .quit and $f @@ -1136,9 +1136,9 @@ ReadNoiseSample: ParseMusic: ; parses until a note is read or the song is ended call GetMusicByte ; store next byte in a - cp $ff ; is the song over? + cp endchannel_cmd jr z, .endchannel - cp $d0 ; is it a note? + cp first_music_cmd jr c, .readnote ; then it's a command .readcommand @@ -1350,7 +1350,7 @@ ParseMusicCommand: ; reload command ld a, [wCurMusicByte] ; get command # - sub $d0 ; first command + sub first_music_cmd ld e, a ld d, 0 ; seek command pointer @@ -1613,7 +1613,7 @@ Music_JumpIf: ld [hl], d ret -MusicEE +MusicEE: ; conditional jump ; checks a byte in ram corresponding to the current channel ; doesn't seem to be set by any commands |