ref: 9b0002161be17ff7369a987a3de3c8776992d3a7
parent: fe1a58deea9b815d60ccab60cdfff19ab0a0110b
author: Rangi <[email protected]>
date: Fri Oct 30 12:12:25 EDT 2020
Extract more RGB data to .pal files
--- a/engine/gfx/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
@@ -464,22 +464,11 @@
ret
.ShellderLaprasBGPalette:
- RGB 19, 31, 19
- RGB 18, 23, 31
- RGB 11, 21, 28
- RGB 04, 16, 24
+INCLUDE "gfx/intro/gs_shellder_lapras_bg.pal"
.ShellderLaprasOBPals:
- RGB 29, 29, 29
- RGB 20, 19, 20
- RGB 19, 06, 04
- RGB 03, 04, 06
+INCLUDE "gfx/intro/gs_shellder_lapras_ob.pal"
- RGB 31, 31, 31
- RGB 31, 31, 31
- RGB 31, 00, 00
- RGB 03, 04, 06
-
.JigglypuffPikachuScene:
ld de, wBGPals1
ld a, PREDEFPAL_GS_INTRO_JIGGLYPUFF_PIKACHU_BG
@@ -991,7 +980,4 @@
ret
.MysteryGiftPalette:
- RGB 31, 31, 31
- RGB 09, 31, 31
- RGB 10, 12, 31
- RGB 00, 03, 19
+INCLUDE "gfx/mystery_gift/gs_mystery_gift.pal"
--- a/engine/gfx/color.asm
+++ b/engine/gfx/color.asm
@@ -138,13 +138,13 @@
ret z
; CGB only
- ld hl, .BGPal
+ ld hl, .MagikarpBGPal
ld de, wBGPals1
ld bc, 1 palettes
ld a, BANK(wBGPals1)
call FarCopyWRAM
- ld hl, .OBPal
+ ld hl, .MagikarpOBPal
ld de, wOBPals1
ld bc, 1 palettes
ld a, BANK(wOBPals1)
@@ -155,17 +155,11 @@
ldh [hCGBPalUpdate], a
ret
-.BGPal:
- RGB 31, 31, 31
- RGB 18, 23, 31
- RGB 15, 20, 31
- RGB 00, 00, 00
+.MagikarpBGPal:
+INCLUDE "gfx/intro/gs_magikarp_bg.pal"
-.OBPal:
- RGB 31, 31, 31
- RGB 31, 31, 12
- RGB 08, 16, 28
- RGB 00, 00, 00
+.MagikarpOBPal:
+INCLUDE "gfx/intro/gs_magikarp_ob.pal"
Intro_LoadAllPal0: ; unreferenced
call CheckCGB
--- a/engine/gfx/crystal_layouts.asm
+++ b/engine/gfx/crystal_layouts.asm
@@ -163,10 +163,7 @@
ret
.TextPalette:
- RGB 31, 31, 31
- RGB 26, 31, 00
- RGB 20, 16, 03
- RGB 00, 00, 00
+INCLUDE "gfx/mystery_gift/mobile_text.pal"
Function49480:
hlcoord 0, 0, wAttrmap
@@ -211,16 +208,10 @@
ret
.BGPalette:
- RGB 31, 31, 31
- RGB 23, 16, 07
- RGB 23, 07, 07
- RGB 03, 07, 20
+INCLUDE "gfx/mystery_gift/name_card_bg.pal"
.OBPalette:
- RGB 00, 00, 00
- RGB 07, 05, 31
- RGB 14, 18, 31
- RGB 31, 31, 31
+INCLUDE "gfx/mystery_gift/name_card_ob.pal"
Function49742:
ld hl, .MobileBorderPalettes
--- a/engine/movie/intro.asm
+++ b/engine/movie/intro.asm
@@ -1386,17 +1386,11 @@
ldh [hCGBPalUpdate], a
ret
-.pal1
- RGB 24, 12, 09
- RGB 31, 31, 31
- RGB 12, 00, 31
- RGB 00, 00, 00
+.pal1:
+INCLUDE "gfx/intro/unown_1.pal"
-.pal2
- RGB 24, 12, 09
- RGB 31, 31, 31
- RGB 31, 31, 31
- RGB 31, 31, 31
+.pal2:
+INCLUDE "gfx/intro/unown_2.pal"
Intro_FadeUnownWordPals:
add a
--- /dev/null
+++ b/gfx/intro/gs_magikarp_bg.pal
@@ -1,0 +1,4 @@
+ RGB 31, 31, 31
+ RGB 18, 23, 31
+ RGB 15, 20, 31
+ RGB 00, 00, 00
--- /dev/null
+++ b/gfx/intro/gs_magikarp_ob.pal
@@ -1,0 +1,4 @@
+ RGB 31, 31, 31
+ RGB 31, 31, 12
+ RGB 08, 16, 28
+ RGB 00, 00, 00
--- /dev/null
+++ b/gfx/intro/gs_shellder_lapras_bg.pal
@@ -1,0 +1,4 @@
+ RGB 19, 31, 19
+ RGB 18, 23, 31
+ RGB 11, 21, 28
+ RGB 04, 16, 24
--- /dev/null
+++ b/gfx/intro/gs_shellder_lapras_ob.pal
@@ -1,0 +1,9 @@
+ RGB 29, 29, 29
+ RGB 20, 19, 20
+ RGB 19, 06, 04
+ RGB 03, 04, 06
+
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 00, 00
+ RGB 03, 04, 06
--- /dev/null
+++ b/gfx/intro/unown_1.pal
@@ -1,0 +1,4 @@
+ RGB 24, 12, 09
+ RGB 31, 31, 31
+ RGB 12, 00, 31
+ RGB 00, 00, 00
--- /dev/null
+++ b/gfx/intro/unown_2.pal
@@ -1,0 +1,4 @@
+ RGB 24, 12, 09
+ RGB 31, 31, 31
+ RGB 31, 31, 31
+ RGB 31, 31, 31
--- /dev/null
+++ b/gfx/mystery_gift/gs_mystery_gift.pal
@@ -1,0 +1,4 @@
+ RGB 31, 31, 31
+ RGB 09, 31, 31
+ RGB 10, 12, 31
+ RGB 00, 03, 19
--- /dev/null
+++ b/gfx/mystery_gift/mobile_text.pal
@@ -1,0 +1,4 @@
+ RGB 31, 31, 31
+ RGB 26, 31, 00
+ RGB 20, 16, 03
+ RGB 00, 00, 00
--- /dev/null
+++ b/gfx/mystery_gift/name_card_bg.pal
@@ -1,0 +1,4 @@
+ RGB 31, 31, 31
+ RGB 23, 16, 07
+ RGB 23, 07, 07
+ RGB 03, 07, 20
--- /dev/null
+++ b/gfx/mystery_gift/name_card_ob.pal
@@ -1,0 +1,4 @@
+ RGB 00, 00, 00
+ RGB 07, 05, 31
+ RGB 14, 18, 31
+ RGB 31, 31, 31