More miscellaneous fixes (see #709)

2020-04-17 10:52:59 -04:00
parent 93ed0ed19c
commit 22615cecc5
11 changed files with 60 additions and 45 deletions
--- 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