From e5fa3f9a11fb6936709cd0c36e945bd6e018cb37 Mon Sep 17 00:00:00 2001 From: xCrystal Date: Mon, 1 Jan 2018 21:05:00 +0100 Subject: [PATCH] Fix missing palred/palgreen/palblue constants --- constants/credits_constants.asm | 2 +- mobile/mobile_42.asm | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index 94f259e26..fba7583c0 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -1,4 +1,4 @@ -; CreditsStrings indexes (see data/credits_text.asm) +; CreditsStrings indexes (see data/credits_strings.asm) const_def const SATOSHI_TAJIRI const JUNICHI_MASUDA diff --git a/mobile/mobile_42.asm b/mobile/mobile_42.asm index 53adb8fe0..4e956229c 100644 --- a/mobile/mobile_42.asm +++ b/mobile/mobile_42.asm @@ -1484,7 +1484,7 @@ Function108b45: ; 108b45 push af ld a, $5 ld [rSVBK], a - ld de, (31 << 10) + (31 << 5) + 31 ; $7fff + ld de, palred 31 + palgreen 31 + palblue 31 ld hl, wBGPals1 ld a, e ld [hli], a @@ -1500,7 +1500,7 @@ Function108b5a: ; 108b5a push af ld a, $5 ld [rSVBK], a - ld de, (15 << 10) + (31 << 5) + 18 ; $3ff2 + ld de, palred 18 + palgreen 31 + palblue 15 ld hl, wBGPals2 + 4 palettes ld c, $10 .loop @@ -1525,11 +1525,11 @@ Function108b78: ; 108b78 ld a, c and $2 jr z, .Orange - ld de, (31 << 10) + (31 << 5) + 31 ; $7fff + ld de, palred 31 + palgreen 31 + palblue 31 jr .load_pal .Orange: - ld de, ( 1 << 10) + (15 << 5) + 31 ; $05ff + ld de, palred 31 + palgreen 15 + palblue 1 .load_pal ld a, e ld [hli], a