diff options
| -rwxr-xr-x | constants/scgb_constants.asm | 4 | ||||
| -rw-r--r-- | engine/cgb_layouts.asm | 4 | ||||
| -rw-r--r-- | engine/color.asm | 2 | ||||
| -rw-r--r-- | engine/sgb_layouts.asm | 2 | ||||
| -rw-r--r-- | gfx/sgb/pal_packets.asm | 8 | ||||
| -rw-r--r-- | gfx/sgb/predef.pal | 4 |
6 files changed, 12 insertions, 12 deletions
diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index 4f68fdfd2..27ea7ca4d 100755 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -96,9 +96,9 @@ SCGB_RAM EQU -1 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 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 diff --git a/gfx/sgb/pal_packets.asm b/gfx/sgb/pal_packets.asm index ec97bca3d..7028d24ae 100644 --- a/gfx/sgb/pal_packets.asm +++ b/gfx/sgb/pal_packets.asm @@ -41,14 +41,14 @@ UnreferencedPalPacket_9bf6: 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 @@ PalPacket_Pokegear: 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 diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index 1f18f9efe..f0e6f3693 100644 --- 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 |