pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Extract more RGB data to .pal files

Browse Source
This commit is contained in:
Rangi 2020-10-30 16:12:25 -04:00
parent fe1a58deea
commit 9b0002161b
14 changed files with 61 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
engine/gfx/cgb_layouts.asm
View File

@ -464,21 +464,10 @@ _CGB_GSIntro:
ret ret
.ShellderLaprasBGPalette: .ShellderLaprasBGPalette:
RGB 19, 31, 19 INCLUDE "gfx/intro/gs_shellder_lapras_bg.pal"
RGB 18, 23, 31
RGB 11, 21, 28
RGB 04, 16, 24
.ShellderLaprasOBPals: .ShellderLaprasOBPals:
RGB 29, 29, 29 INCLUDE "gfx/intro/gs_shellder_lapras_ob.pal"
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
.JigglypuffPikachuScene: .JigglypuffPikachuScene:
ld de, wBGPals1 ld de, wBGPals1
@ -991,7 +980,4 @@ GS_CGB_MysteryGift: ; unreferenced
ret ret
.MysteryGiftPalette: .MysteryGiftPalette:
RGB 31, 31, 31 INCLUDE "gfx/mystery_gift/gs_mystery_gift.pal"
RGB 09, 31, 31
RGB 10, 12, 31
RGB 00, 03, 19

18
engine/gfx/color.asm
View File

@ -138,13 +138,13 @@ Intro_LoadMagikarpPalettes: ; unreferenced
ret z ret z
; CGB only ; CGB only
ld hl, .BGPal ld hl, .MagikarpBGPal
ld de, wBGPals1 ld de, wBGPals1
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
call FarCopyWRAM call FarCopyWRAM
ld hl, .OBPal ld hl, .MagikarpOBPal
ld de, wOBPals1 ld de, wOBPals1
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(wOBPals1) ld a, BANK(wOBPals1)
@ -155,17 +155,11 @@ Intro_LoadMagikarpPalettes: ; unreferenced
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
ret ret
.BGPal: .MagikarpBGPal:
RGB 31, 31, 31 INCLUDE "gfx/intro/gs_magikarp_bg.pal"
RGB 18, 23, 31
RGB 15, 20, 31
RGB 00, 00, 00
.OBPal: .MagikarpOBPal:
RGB 31, 31, 31 INCLUDE "gfx/intro/gs_magikarp_ob.pal"
RGB 31, 31, 12
RGB 08, 16, 28
RGB 00, 00, 00
Intro_LoadAllPal0: ; unreferenced Intro_LoadAllPal0: ; unreferenced
call CheckCGB call CheckCGB

15
engine/gfx/crystal_layouts.asm
View File

@ -163,10 +163,7 @@ _CrystalCGB_MobileLayout1:
ret ret
.TextPalette: .TextPalette:
RGB 31, 31, 31 INCLUDE "gfx/mystery_gift/mobile_text.pal"
RGB 26, 31, 00
RGB 20, 16, 03
RGB 00, 00, 00
Function49480: Function49480:
hlcoord 0, 0, wAttrmap hlcoord 0, 0, wAttrmap
@ -211,16 +208,10 @@ _CrystalCGB_NameCard:
ret ret
.BGPalette: .BGPalette:
RGB 31, 31, 31 INCLUDE "gfx/mystery_gift/name_card_bg.pal"
RGB 23, 16, 07
RGB 23, 07, 07
RGB 03, 07, 20
.OBPalette: .OBPalette:
RGB 00, 00, 00 INCLUDE "gfx/mystery_gift/name_card_ob.pal"
RGB 07, 05, 31
RGB 14, 18, 31
RGB 31, 31, 31
Function49742: Function49742:
ld hl, .MobileBorderPalettes ld hl, .MobileBorderPalettes

14
engine/movie/intro.asm
View File

@ -1386,17 +1386,11 @@ Intro_Scene20_AppearUnown:
ldh [hCGBPalUpdate], a ldh [hCGBPalUpdate], a
ret ret
.pal1 .pal1:
RGB 24, 12, 09 INCLUDE "gfx/intro/unown_1.pal"
RGB 31, 31, 31
RGB 12, 00, 31
RGB 00, 00, 00
.pal2 .pal2:
RGB 24, 12, 09 INCLUDE "gfx/intro/unown_2.pal"
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31
Intro_FadeUnownWordPals: Intro_FadeUnownWordPals:
add a add a

4
gfx/intro/gs_magikarp_bg.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 18, 23, 31
RGB 15, 20, 31
RGB 00, 00, 00

4
gfx/intro/gs_magikarp_ob.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 31, 31, 12
RGB 08, 16, 28
RGB 00, 00, 00

4
gfx/intro/gs_shellder_lapras_bg.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 19, 31, 19
RGB 18, 23, 31
RGB 11, 21, 28
RGB 04, 16, 24

9
gfx/intro/gs_shellder_lapras_ob.pal Normal file
View File

@ -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

4
gfx/intro/unown_1.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 24, 12, 09
RGB 31, 31, 31
RGB 12, 00, 31
RGB 00, 00, 00

4
gfx/intro/unown_2.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 24, 12, 09
RGB 31, 31, 31
RGB 31, 31, 31
RGB 31, 31, 31

4
gfx/mystery_gift/gs_mystery_gift.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 09, 31, 31
RGB 10, 12, 31
RGB 00, 03, 19

4
gfx/mystery_gift/mobile_text.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 26, 31, 00
RGB 20, 16, 03
RGB 00, 00, 00

4
gfx/mystery_gift/name_card_bg.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 23, 16, 07
RGB 23, 07, 07
RGB 03, 07, 20

4
gfx/mystery_gift/name_card_ob.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 00, 00, 00
RGB 07, 05, 31
RGB 14, 18, 31
RGB 31, 31, 31