diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-25 22:39:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-25 22:39:51 -0500 |
| commit | 725148443f0ed0f70af747259ef49643359e92a2 (patch) | |
| tree | 5f8ccf80489e0820934d40a732a5ce8d7f65e1e3 /audio/engine.asm | |
| parent | f44f306cfd4b438d0ba2f56b61be4b118ef3274b (diff) | |
| parent | 7453bd1aa8e55a1a9fcce7c69f62106f5e5f6e9c (diff) | |
Merge pull request #476 from Rangi42/master
Resolve some issues; rename some maps; move more tables into data/; warp_def → warp_event (ready to merge)
Diffstat (limited to 'audio/engine.asm')
| -rw-r--r-- | audio/engine.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/audio/engine.asm b/audio/engine.asm index 21a472fec..0bd7706a5 100644 --- a/audio/engine.asm +++ b/audio/engine.asm @@ -1320,7 +1320,7 @@ GetNoiseSample: ; e86c5 ; load ptr to sample header in wNoiseSampleAddress ; are we on the last channel? ld a, [wCurChannel] - and NUM_MUSIC_CHANS +- 1 + and NUM_MUSIC_CHANS + -1 cp CHAN4 ; ret if not ret nz @@ -2102,7 +2102,7 @@ Music_Volume: ; e89d2 ; e89e1 Music_TempoRelative: ; e89e1 -; set global tempo to current channel tempo +- param +; set global tempo to current channel tempo +/- param ; params: 1 signed call GetMusicByte ld e, a |