summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-18 15:06:43 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-18 15:06:43 -0500
commit3bf8325edddb03753fa63f0dfb39cedcd1d2faca (patch)
tree918d4326a82233668c0c06d208d9178880b5cc8c /engine
parent69ace7f48d441a0af3360a991ace8f70379e48dc (diff)
More accurate constant/label names
Diffstat (limited to 'engine')
-rw-r--r--engine/cgb_layouts.asm4
-rw-r--r--engine/color.asm2
-rw-r--r--engine/sgb_layouts.asm2
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm
index 96289a4c7..84fb6c9de 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -444,7 +444,7 @@ _CGB06: ; 90f8
call CopyFourPalettes
call WipeAttrMap
ld de, wOBPals1
- ld a, PREDEFPAL_GS_INTRO_CHARIZARD_BG
+ ld a, PREDEFPAL_PACK
call GetPredefPal
call LoadHLPaletteIntoDE
hlcoord 0, 6, AttrMap
@@ -524,7 +524,7 @@ _CGB_GSIntro: ; 9122
ld hl, PalPacket_Pack + 1
call CopyFourPalettes
ld de, wOBPals1
- ld a, PREDEFPAL_GS_INTRO_CHARIZARD_OB
+ ld a, PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
call GetPredefPal
call LoadHLPaletteIntoDE
call WipeAttrMap
diff --git a/engine/color.asm b/engine/color.asm
index d8814bf3a..d0dd0c3c8 100644
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -202,7 +202,7 @@ Unreferenced_Function8b67:
.cgb
ld de, wOBPals1
- ld a, PREDEFPAL_GS_INTRO_CHARIZARD_BG
+ ld a, PREDEFPAL_PACK
call GetPredefPal
jp LoadHLPaletteIntoDE
diff --git a/engine/sgb_layouts.asm b/engine/sgb_layouts.asm
index bc9f35c27..5f2b8e12e 100644
--- a/engine/sgb_layouts.asm
+++ b/engine/sgb_layouts.asm
@@ -329,7 +329,7 @@ endr
.BlkPacketTable_GSIntro: ; 8878
dw BlkPacket_9a86, PalPacket_GSIntroShellderLapras
dw BlkPacket_GSIntroJigglypuffPikachu, PalPacket_GSIntroJigglypuffPikachu
- dw BlkPacket_9a86, PalPacket_GSIntroCharizard
+ dw BlkPacket_9a86, PalPacket_GSIntroStartersTransition
; 8884
.SGB_GSTitleScreen: ; 8884