summaryrefslogtreecommitdiff
path: root/engine/cgb_layouts.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2017-12-25 12:41:31 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2017-12-25 12:41:31 -0500
commitda2b01a36c6855230ec36c42bd49e7cf2ca2d348 (patch)
treeb52ed372cd6d367e89eb546d9fa2600b810344e1 /engine/cgb_layouts.asm
parentec8c9688ce970b9c3b63a5b287a99542f0bc9984 (diff)
Clean up color/palette code
Diffstat (limited to 'engine/cgb_layouts.asm')
-rw-r--r--engine/cgb_layouts.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm
index 05834d35f..93e2c4434 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -145,7 +145,7 @@ _CGB_FinishBattleScreenLayout: ; 8e23
ld bc, 6 * SCREEN_WIDTH
ld a, PAL_BATTLE_BG_TEXT
call ByteFill
- ld hl, Palettes_979c
+ ld hl, BattleObjectPals
ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY
ld bc, 6 palettes
ld a, BANK(UnknOBPals)
@@ -621,8 +621,8 @@ _CGB_Evolution: ; 91e4
ld a, [PlayerHPPal]
call GetPlayerOrMonPalettePointer
call LoadPalette_White_Col1_Col2_Black
- ld hl, Palettes_979c
- ld de, UnknOBPals palette 2
+ ld hl, BattleObjectPals
+ ld de, UnknOBPals palette PAL_BATTLE_OB_GRAY
ld bc, 6 palettes
ld a, BANK(UnknOBPals)
call FarCopyWRAM