ref: 3bf8325edddb03753fa63f0dfb39cedcd1d2faca
parent: 69ace7f48d441a0af3360a991ace8f70379e48dc
author: Remy Oukaour <remy.oukaour@gmail.com>
date: Thu Jan 18 10:06:43 EST 2018
More accurate constant/label names
--- a/constants/scgb_constants.asm
+++ b/constants/scgb_constants.asm
@@ -96,9 +96,9 @@
const PREDEFPAL_37
const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
const PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
- const PREDEFPAL_GS_INTRO_CHARIZARD_OB
+ const PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
const PREDEFPAL_3B
- const PREDEFPAL_GS_INTRO_CHARIZARD_BG
+ const PREDEFPAL_PACK ; GS_INTRO_CHARIZARD
const PREDEFPAL_SLOT_MACHINE_0
const PREDEFPAL_SLOT_MACHINE_1
const PREDEFPAL_SLOT_MACHINE_2
--- a/engine/cgb_layouts.asm
+++ b/engine/cgb_layouts.asm
@@ -444,7 +444,7 @@
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 @@
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
--- a/engine/color.asm
+++ b/engine/color.asm
@@ -202,7 +202,7 @@
.cgb
ld de, wOBPals1
- ld a, PREDEFPAL_GS_INTRO_CHARIZARD_BG
+ ld a, PREDEFPAL_PACK
call GetPredefPal
jp LoadHLPaletteIntoDE
--- a/engine/sgb_layouts.asm
+++ b/engine/sgb_layouts.asm
@@ -329,7 +329,7 @@
.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
--- a/gfx/sgb/pal_packets.asm
+++ b/gfx/sgb/pal_packets.asm
@@ -41,14 +41,14 @@
PalPacket_GSIntroJigglypuffPikachu:
sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_BG, GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00
-PalPacket_GSIntroCharizard:
- sgb_pal_set GS_INTRO_CHARIZARD_OB, 00, 00, 00
+PalPacket_GSIntroStartersTransition:
+ sgb_pal_set GS_INTRO_STARTERS_TRANSITION, 00, 00, 00
PalPacket_Function8b4d:
sgb_pal_set 3B, 00, 00, 00
PalPacket_Pack:
- sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00
+ sgb_pal_set PACK, 00, 00, 00
PalPacket_SCGB_0F:
sgb_pal_set GS_INTRO_JIGGLYPUFF_PIKACHU_OB, 00, 00, 00
@@ -63,7 +63,7 @@
sgb_pal_set POKEGEAR, 00, 00, 00
UnreferencedPalPacket_9c86:
- sgb_pal_set GS_INTRO_CHARIZARD_BG, 00, 00, 00
+ sgb_pal_set PACK, 00, 00, 00
PalPacket_SlotMachine:
sgb_pal_set SLOT_MACHINE_0, SLOT_MACHINE_1, SLOT_MACHINE_2, SLOT_MACHINE_3
--- a/gfx/sgb/predef.pal
+++ b/gfx/sgb/predef.pal
@@ -56,9 +56,9 @@
RGB 31,31,31, 15,28,26, 23,24,24, 00,00,00 ; PREDEFPAL_37
RGB 31,31,24, 07,27,19, 26,20,10, 19,12,08 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
RGB 31,31,31, 31,28,14, 31,13,31, 00,00,00 ; PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_OB
- RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_OB
+ RGB 31,31,31, 16,18,21, 10,12,18, 00,00,00 ; PREDEFPAL_GS_INTRO_STARTERS_TRANSITION
RGB 31,31,31, 23,21,16, 12,12,10, 00,00,00 ; PREDEFPAL_3B
- RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD_BG (PACK)
+ RGB 31,31,31, 31,14,00, 07,11,15, 00,00,00 ; PREDEFPAL_GS_INTRO_CHARIZARD (PACK)
RGB 31,31,31, 26,21,22, 26,10,06, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_0
RGB 31,31,31, 30,27,04, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_1
RGB 31,31,31, 31,13,25, 24,20,11, 00,00,00 ; PREDEFPAL_SLOT_MACHINE_2