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

Separate more palettes into gfx/**/*.pal files

Browse Source
This commit is contained in:
Remy Oukaour 2018-01-12 14:41:42 -05:00
parent 960783cdf4
commit 31caeeba3c
11 changed files with 98 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
engine/cgb_layouts.asm
View File

@ -258,30 +258,11 @@ _CGB_StatsScreenHPPals: ; 8edb
; 8f52 ; 8f52
StatsScreenPagePals: ; 8f52 StatsScreenPagePals: ; 8f52
; pink INCLUDE "gfx/stats/pages.pal"
RGB 31, 31, 31
RGB 31, 19, 31
RGB 31, 15, 31
RGB 00, 00, 00
; green
RGB 31, 31, 31
RGB 21, 31, 14
RGB 17, 31, 00
RGB 00, 00, 00
; blue
RGB 31, 31, 31
RGB 17, 31, 31
RGB 17, 31, 31
RGB 00, 00, 00
; 8f6a ; 8f6a
StatsScreenPals: ; 8f6a StatsScreenPals: ; 8f6a
; pink INCLUDE "gfx/stats/stats.pal"
RGB 31, 19, 31
; green
RGB 21, 31, 14
; blue
RGB 17, 31, 31
; 8f70 ; 8f70
_CGB_Pokedex: ; 8f70 _CGB_Pokedex: ; 8f70
@ -319,16 +300,11 @@ _CGB_Pokedex: ; 8f70
; 8fba ; 8fba
.PokedexQuestionMarkPalette: ; 8fba .PokedexQuestionMarkPalette: ; 8fba
RGB 11, 23, 00 INCLUDE "gfx/pokedex/question_mark.pal"
RGB 07, 17, 00 ; 8fc2
RGB 06, 16, 03
RGB 05, 12, 01
.PokedexCursorPalette: ; 8fc2 .PokedexCursorPalette: ; 8fc2
RGB 00, 00, 00 INCLUDE "gfx/pokedex/cursor.pal"
RGB 11, 23, 00
RGB 07, 17, 00
RGB 00, 00, 00
; 8fca ; 8fca
_CGB_BillsPC: ; 8fca _CGB_BillsPC: ; 8fca
@ -385,10 +361,7 @@ _CGB_BillsPC: ; 8fca
; 9036 ; 9036
.BillsPCOrangePalette: ; 9036 .BillsPCOrangePalette: ; 9036
RGB 31, 15, 00 INCLUDE "gfx/pc/orange.pal"
RGB 23, 12, 00
RGB 15, 07, 00
RGB 00, 00, 00
; 903e ; 903e
_CGB_PokedexUnownMode: ; 903e _CGB_PokedexUnownMode: ; 903e
@ -970,10 +943,7 @@ _CGB_GamefreakLogo: ; 94fa
; 9521 ; 9521
.Palette: ; 9521 .Palette: ; 9521
RGB 31, 31, 31 INCLUDE "gfx/splash/logo.pal"
RGB 13, 11, 00
RGB 23, 12, 28
RGB 00, 00, 00
; 9529 ; 9529
_CGB_PlayerOrMonFrontpicPals: ; 9529 _CGB_PlayerOrMonFrontpicPals: ; 9529
@ -1059,13 +1029,5 @@ _CGB_MysteryGift: ; 9591
; 95e0 ; 95e0
.Palettes: ; 95e0 .Palettes: ; 95e0
RGB 31, 31, 31 INCLUDE "gfx/mystery_gift/mystery_gift.pal"
RGB 16, 31, 14
RGB 05, 14, 21
RGB 05, 13, 10
RGB 31, 31, 31
RGB 11, 21, 25
RGB 05, 14, 21
RGB 00, 03, 19
; 95f0 ; 95f0

2
engine/crystal_colors.asm
View File

@ -130,7 +130,7 @@ INCLUDE "gfx/font/bg_text.pal"
; 49420 ; 49420
Function49420:: ; 49420 (12:5420) Function49420:: ; 49420 (12:5420)
ld hl, MansionPalette4 ld hl, MansionPalette1 + 8 palettes
ld de, wBGPals1 palette PAL_BG_ROOF ld de, wBGPals1 palette PAL_BG_ROOF
ld bc, 1 palettes ld bc, 1 palettes
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)

57
engine/tileset_palettes.asm
View File

@ -119,53 +119,7 @@ INCLUDE "gfx/tilesets/radio_tower.pal"
; 4967d ; 4967d
MansionPalette1: ; 4967d MansionPalette1: ; 4967d
RGB 30, 28, 26 INCLUDE "gfx/tilesets/celadon_mansion_1.pal"
RGB 19, 19, 19
RGB 13, 13, 13
RGB 07, 07, 07
RGB 30, 28, 26
RGB 31, 19, 24
RGB 30, 10, 06
RGB 07, 07, 07
RGB 18, 24, 09
RGB 15, 20, 01
RGB 09, 13, 00
RGB 07, 07, 07
RGB 30, 28, 26
RGB 15, 16, 31
RGB 09, 09, 31
RGB 07, 07, 07
RGB 30, 28, 26
RGB 31, 31, 07
RGB 31, 16, 01
RGB 07, 07, 07
RGB 26, 24, 17
RGB 21, 17, 07
RGB 16, 13, 03
RGB 07, 07, 07
MansionPalette3: ; 496ad
RGB 30, 28, 26
RGB 17, 19, 31
RGB 14, 16, 31
RGB 07, 07, 07
RGB 31, 31, 16
RGB 31, 31, 16
RGB 14, 09, 00
RGB 00, 00, 00
; 496bd
MansionPalette4: ; 496bd
RGB 05, 05, 16
RGB 08, 19, 28
RGB 00, 00, 00
RGB 31, 31, 31
; 496c5 ; 496c5
LoadMansionPalette: ; 496c5 LoadMansionPalette: ; 496c5
@ -181,20 +135,17 @@ LoadMansionPalette: ; 496c5
call FarCopyWRAM call FarCopyWRAM
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
ld de, wBGPals1 palette PAL_BG_WATER ld de, wBGPals1 palette PAL_BG_WATER
ld hl, MansionPalette3 ld hl, MansionPalette1 + 6 palettes
ld bc, 1 palettes ld bc, 1 palettes
call FarCopyWRAM call FarCopyWRAM
ld a, BANK(wBGPals1) ld a, BANK(wBGPals1)
ld de, wBGPals1 palette PAL_BG_ROOF ld de, wBGPals1 palette PAL_BG_ROOF
ld hl, MansionPalette4 ld hl, MansionPalette1 + 8 palettes
ld bc, 1 palettes ld bc, 1 palettes
call FarCopyWRAM call FarCopyWRAM
ret ret
; 496fe ; 496fe
MansionPalette2: ; 496fe MansionPalette2: ; 496fe
RGB 25, 24, 23 INCLUDE "gfx/tilesets/celadon_mansion_2.pal"
RGB 20, 19, 19
RGB 14, 16, 31
RGB 07, 07, 07
; 49706 ; 49706

4
gfx/pc/orange.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 31, 15, 00
RGB 23, 12, 00
RGB 15, 07, 00
RGB 00, 00, 00

4
gfx/pokedex/cursor.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 00, 00, 00
RGB 11, 23, 00
RGB 07, 17, 00
RGB 00, 00, 00

4
gfx/pokedex/question_mark.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 11, 23, 00
RGB 07, 17, 00
RGB 06, 16, 03
RGB 05, 12, 01

4
gfx/splash/logo.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 31, 31, 31
RGB 13, 11, 00
RGB 23, 12, 28
RGB 00, 00, 00

15
gfx/stats/pages.pal Normal file
View File

@ -0,0 +1,15 @@
; pink
RGB 31, 31, 31
RGB 31, 19, 31
RGB 31, 15, 31
RGB 00, 00, 00
; green
RGB 31, 31, 31
RGB 21, 31, 14
RGB 17, 31, 00
RGB 00, 00, 00
; blue
RGB 31, 31, 31
RGB 17, 31, 31
RGB 17, 31, 31
RGB 00, 00, 00

6
gfx/stats/stats.pal Normal file
View File

@ -0,0 +1,6 @@
; pink
RGB 31, 19, 31
; green
RGB 21, 31, 14
; blue
RGB 17, 31, 31

44
gfx/tilesets/celadon_mansion_1.pal Normal file
View File

@ -0,0 +1,44 @@
RGB 30, 28, 26
RGB 19, 19, 19
RGB 13, 13, 13
RGB 07, 07, 07
RGB 30, 28, 26
RGB 31, 19, 24
RGB 30, 10, 06
RGB 07, 07, 07
RGB 18, 24, 09
RGB 15, 20, 01
RGB 09, 13, 00
RGB 07, 07, 07
RGB 30, 28, 26
RGB 15, 16, 31
RGB 09, 09, 31
RGB 07, 07, 07
RGB 30, 28, 26
RGB 31, 31, 07
RGB 31, 16, 01
RGB 07, 07, 07
RGB 26, 24, 17
RGB 21, 17, 07
RGB 16, 13, 03
RGB 07, 07, 07
RGB 30, 28, 26
RGB 17, 19, 31
RGB 14, 16, 31
RGB 07, 07, 07
RGB 31, 31, 16
RGB 31, 31, 16
RGB 14, 09, 00
RGB 00, 00, 00
RGB 05, 05, 16
RGB 08, 19, 28
RGB 00, 00, 00
RGB 31, 31, 31

4
gfx/tilesets/celadon_mansion_2.pal Normal file
View File

@ -0,0 +1,4 @@
RGB 25, 24, 23
RGB 20, 19, 19
RGB 14, 16, 31
RGB 07, 07, 07