diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-30 16:12:20 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-10-30 16:12:20 -0400 |
| commit | 542f02c18186892971cab3da4b49add4b0059ff1 (patch) | |
| tree | 5aef443cec417e67cfc2b8970cd599d8e3c5cc3d | |
| parent | 6063bd1dfb1f031161766a7d36831671b204e5d7 (diff) | |
Extract more RGB data to .pal files
| -rw-r--r-- | engine/gfx/cgb_layouts.asm | 20 | ||||
| -rw-r--r-- | engine/gfx/color.asm | 20 | ||||
| -rw-r--r-- | gfx/intro/magikarp_bg.pal | 4 | ||||
| -rw-r--r-- | gfx/intro/magikarp_ob.pal | 4 | ||||
| -rw-r--r-- | gfx/intro/shellder_lapras_bg.pal | 4 | ||||
| -rw-r--r-- | gfx/intro/shellder_lapras_ob.pal | 9 | ||||
| -rw-r--r-- | gfx/mystery_gift/mystery_gift.pal | 4 |
7 files changed, 35 insertions, 30 deletions
diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 56b7d372..2608f403 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -444,21 +444,10 @@ _CGB_GSIntro: ret .ShellderLaprasBGPalette: - RGB 19, 31, 19 - RGB 18, 23, 31 - RGB 11, 21, 28 - RGB 04, 16, 24 +INCLUDE "gfx/intro/shellder_lapras_bg.pal" .ShellderLaprasOBPals: - 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 +INCLUDE "gfx/intro/shellder_lapras_ob.pal" .JigglypuffPikachuScene: ld de, wBGPals1 @@ -875,7 +864,4 @@ _CGB_MysteryGift: ret .MysteryGiftPalette: - RGB 31, 31, 31 - RGB 09, 31, 31 - RGB 10, 12, 31 - RGB 00, 03, 19 +INCLUDE "gfx/mystery_gift/mystery_gift.pal" diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 18ae76a8..ea59575c 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -146,12 +146,12 @@ Intro_LoadMagikarpPalettes: ret z ; CGB only - ld hl, .BGPal + ld hl, .MagikarpBGPal ld de, wBGPals1 ld bc, 1 palettes call CopyBytes - ld hl, .OBPal + ld hl, .MagikarpOBPal ld de, wOBPals1 ld bc, 1 palettes call CopyBytes @@ -161,17 +161,11 @@ Intro_LoadMagikarpPalettes: ldh [hCGBPalUpdate], a ret -.BGPal: - RGB 31, 31, 31 - RGB 18, 23, 31 - RGB 15, 20, 31 - RGB 00, 00, 00 - -.OBPal: - RGB 31, 31, 31 - RGB 31, 31, 12 - RGB 08, 16, 28 - RGB 00, 00, 00 +.MagikarpBGPal: +INCLUDE "gfx/intro/magikarp_bg.pal" + +.MagikarpOBPal: +INCLUDE "gfx/intro/magikarp_ob.pal" Intro_LoadAllPal0: call CheckCGB diff --git a/gfx/intro/magikarp_bg.pal b/gfx/intro/magikarp_bg.pal new file mode 100644 index 00000000..9edb529e --- /dev/null +++ b/gfx/intro/magikarp_bg.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 18, 23, 31 + RGB 15, 20, 31 + RGB 00, 00, 00 diff --git a/gfx/intro/magikarp_ob.pal b/gfx/intro/magikarp_ob.pal new file mode 100644 index 00000000..08879379 --- /dev/null +++ b/gfx/intro/magikarp_ob.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 31, 31, 12 + RGB 08, 16, 28 + RGB 00, 00, 00 diff --git a/gfx/intro/shellder_lapras_bg.pal b/gfx/intro/shellder_lapras_bg.pal new file mode 100644 index 00000000..37400e50 --- /dev/null +++ b/gfx/intro/shellder_lapras_bg.pal @@ -0,0 +1,4 @@ + RGB 19, 31, 19 + RGB 18, 23, 31 + RGB 11, 21, 28 + RGB 04, 16, 24 diff --git a/gfx/intro/shellder_lapras_ob.pal b/gfx/intro/shellder_lapras_ob.pal new file mode 100644 index 00000000..c443ff72 --- /dev/null +++ b/gfx/intro/shellder_lapras_ob.pal @@ -0,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 diff --git a/gfx/mystery_gift/mystery_gift.pal b/gfx/mystery_gift/mystery_gift.pal new file mode 100644 index 00000000..529d71de --- /dev/null +++ b/gfx/mystery_gift/mystery_gift.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 09, 31, 31 + RGB 10, 12, 31 + RGB 00, 03, 19 |