diff options
| author | mid-kid <esteve.varela@gmail.com> | 2020-04-17 18:25:59 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-17 18:25:59 +0000 |
| commit | 19aee926af86c1351ca85ca45da26f5d6f3cd8d6 (patch) | |
| tree | 82d2d640096a0cb3fc2dddec35fb9ac5a2addfef /engine/overworld | |
| parent | 93ed0ed19ce615f99a36062cd2133e8ee2e75cc1 (diff) | |
| parent | 164e1b89afc1773a14598c377c8c8d0bfa01a1a1 (diff) | |
Merge pull request #712 from Rangi42/master
Miscellaneous fixes
Diffstat (limited to 'engine/overworld')
| -rw-r--r-- | engine/overworld/map_setup.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/map_setup.asm b/engine/overworld/map_setup.asm index 1c84f049a..300f911b1 100644 --- a/engine/overworld/map_setup.asm +++ b/engine/overworld/map_setup.asm @@ -226,9 +226,9 @@ ApplyMapPalettes: ret FadeMapMusicAndPalettes: - ld e, 0 + ld e, LOW(MUSIC_NONE) ld a, [wMusicFadeID] - ld d, 0 + ld d, HIGH(MUSIC_NONE) ld a, [wMusicFadeID + 1] ld a, $4 ld [wMusicFade], a |