diff --git a/engine/cgb_layouts.asm b/engine/cgb_layouts.asm index 97477367d..74b1f04bb 100644 --- a/engine/cgb_layouts.asm +++ b/engine/cgb_layouts.asm @@ -258,30 +258,11 @@ _CGB_StatsScreenHPPals: ; 8edb ; 8f52 StatsScreenPagePals: ; 8f52 -; 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 +INCLUDE "gfx/stats/pages.pal" ; 8f6a StatsScreenPals: ; 8f6a -; pink - RGB 31, 19, 31 -; green - RGB 21, 31, 14 -; blue - RGB 17, 31, 31 +INCLUDE "gfx/stats/stats.pal" ; 8f70 _CGB_Pokedex: ; 8f70 @@ -319,16 +300,11 @@ _CGB_Pokedex: ; 8f70 ; 8fba .PokedexQuestionMarkPalette: ; 8fba - RGB 11, 23, 00 - RGB 07, 17, 00 - RGB 06, 16, 03 - RGB 05, 12, 01 +INCLUDE "gfx/pokedex/question_mark.pal" +; 8fc2 .PokedexCursorPalette: ; 8fc2 - RGB 00, 00, 00 - RGB 11, 23, 00 - RGB 07, 17, 00 - RGB 00, 00, 00 +INCLUDE "gfx/pokedex/cursor.pal" ; 8fca _CGB_BillsPC: ; 8fca @@ -385,10 +361,7 @@ _CGB_BillsPC: ; 8fca ; 9036 .BillsPCOrangePalette: ; 9036 - RGB 31, 15, 00 - RGB 23, 12, 00 - RGB 15, 07, 00 - RGB 00, 00, 00 +INCLUDE "gfx/pc/orange.pal" ; 903e _CGB_PokedexUnownMode: ; 903e @@ -970,10 +943,7 @@ _CGB_GamefreakLogo: ; 94fa ; 9521 .Palette: ; 9521 - RGB 31, 31, 31 - RGB 13, 11, 00 - RGB 23, 12, 28 - RGB 00, 00, 00 +INCLUDE "gfx/splash/logo.pal" ; 9529 _CGB_PlayerOrMonFrontpicPals: ; 9529 @@ -1059,13 +1029,5 @@ _CGB_MysteryGift: ; 9591 ; 95e0 .Palettes: ; 95e0 - RGB 31, 31, 31 - 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 +INCLUDE "gfx/mystery_gift/mystery_gift.pal" ; 95f0 diff --git a/engine/crystal_colors.asm b/engine/crystal_colors.asm index f877c8e0a..c8f0b17cc 100755 --- a/engine/crystal_colors.asm +++ b/engine/crystal_colors.asm @@ -130,7 +130,7 @@ INCLUDE "gfx/font/bg_text.pal" ; 49420 Function49420:: ; 49420 (12:5420) - ld hl, MansionPalette4 + ld hl, MansionPalette1 + 8 palettes ld de, wBGPals1 palette PAL_BG_ROOF ld bc, 1 palettes ld a, BANK(wBGPals1) diff --git a/engine/tileset_palettes.asm b/engine/tileset_palettes.asm index 458d8e440..9aba2f20e 100644 --- a/engine/tileset_palettes.asm +++ b/engine/tileset_palettes.asm @@ -119,53 +119,7 @@ INCLUDE "gfx/tilesets/radio_tower.pal" ; 4967d MansionPalette1: ; 4967d - 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 - -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 +INCLUDE "gfx/tilesets/celadon_mansion_1.pal" ; 496c5 LoadMansionPalette: ; 496c5 @@ -181,20 +135,17 @@ LoadMansionPalette: ; 496c5 call FarCopyWRAM ld a, BANK(wBGPals1) ld de, wBGPals1 palette PAL_BG_WATER - ld hl, MansionPalette3 + ld hl, MansionPalette1 + 6 palettes ld bc, 1 palettes call FarCopyWRAM ld a, BANK(wBGPals1) ld de, wBGPals1 palette PAL_BG_ROOF - ld hl, MansionPalette4 + ld hl, MansionPalette1 + 8 palettes ld bc, 1 palettes call FarCopyWRAM ret ; 496fe MansionPalette2: ; 496fe - RGB 25, 24, 23 - RGB 20, 19, 19 - RGB 14, 16, 31 - RGB 07, 07, 07 +INCLUDE "gfx/tilesets/celadon_mansion_2.pal" ; 49706 diff --git a/gfx/pc/orange.pal b/gfx/pc/orange.pal new file mode 100644 index 000000000..299c6b221 --- /dev/null +++ b/gfx/pc/orange.pal @@ -0,0 +1,4 @@ + RGB 31, 15, 00 + RGB 23, 12, 00 + RGB 15, 07, 00 + RGB 00, 00, 00 diff --git a/gfx/pokedex/cursor.pal b/gfx/pokedex/cursor.pal new file mode 100644 index 000000000..5b202a1bf --- /dev/null +++ b/gfx/pokedex/cursor.pal @@ -0,0 +1,4 @@ + RGB 00, 00, 00 + RGB 11, 23, 00 + RGB 07, 17, 00 + RGB 00, 00, 00 diff --git a/gfx/pokedex/question_mark.pal b/gfx/pokedex/question_mark.pal new file mode 100644 index 000000000..76519ba22 --- /dev/null +++ b/gfx/pokedex/question_mark.pal @@ -0,0 +1,4 @@ + RGB 11, 23, 00 + RGB 07, 17, 00 + RGB 06, 16, 03 + RGB 05, 12, 01 diff --git a/gfx/splash/logo.pal b/gfx/splash/logo.pal new file mode 100644 index 000000000..b1712efc1 --- /dev/null +++ b/gfx/splash/logo.pal @@ -0,0 +1,4 @@ + RGB 31, 31, 31 + RGB 13, 11, 00 + RGB 23, 12, 28 + RGB 00, 00, 00 diff --git a/gfx/stats/pages.pal b/gfx/stats/pages.pal new file mode 100644 index 000000000..837e10cb0 --- /dev/null +++ b/gfx/stats/pages.pal @@ -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 diff --git a/gfx/stats/stats.pal b/gfx/stats/stats.pal new file mode 100644 index 000000000..5b12e02b9 --- /dev/null +++ b/gfx/stats/stats.pal @@ -0,0 +1,6 @@ +; pink + RGB 31, 19, 31 +; green + RGB 21, 31, 14 +; blue + RGB 17, 31, 31 diff --git a/gfx/tilesets/celadon_mansion_1.pal b/gfx/tilesets/celadon_mansion_1.pal new file mode 100644 index 000000000..1ed1de75f --- /dev/null +++ b/gfx/tilesets/celadon_mansion_1.pal @@ -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 diff --git a/gfx/tilesets/celadon_mansion_2.pal b/gfx/tilesets/celadon_mansion_2.pal new file mode 100644 index 000000000..ad5c5e4db --- /dev/null +++ b/gfx/tilesets/celadon_mansion_2.pal @@ -0,0 +1,4 @@ + RGB 25, 24, 23 + RGB 20, 19, 19 + RGB 14, 16, 31 + RGB 07, 07, 07