From 54905a9be9760f6e4ba530eda44bc2782fd64ae9 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Tue, 29 Oct 2024 21:55:29 -0400 Subject: [PATCH] SGB Morning Palettes actual palettes are somewhat unfinished but the general idea is being applied now. Untouched palettes (aside from whatever color was used for the water) are marked with a # next to them, though the palettes are all tentative. --- constants/scgb_constants.asm | 41 ++++ data/maps/sgb_roof_pal_inds.asm | 82 ++++---- engine/gfx/cgb_layouts.asm | 20 +- engine/gfx/color.asm | 324 ++++++++++++++++---------------- engine/gfx/sgb_layouts.asm | 49 +++++ gfx/sgb/predef.pal | 42 +++++ 6 files changed, 345 insertions(+), 213 deletions(-) diff --git a/constants/scgb_constants.asm b/constants/scgb_constants.asm index f8a1bab..03bfe92 100644 --- a/constants/scgb_constants.asm +++ b/constants/scgb_constants.asm @@ -141,6 +141,47 @@ DEF SCGB_DEFAULT EQU $ff const PREDEFPAL_GAMEFREAK_LOGO_BG const PREDEFPAL_ROUTES_NIHON const PREDEFPAL_GATES_NIHON + const PREDEFPAL_ROUTES_MORN + const PREDEFPAL_PALLET_MORN + const PREDEFPAL_VIRIDIAN_MORN + const PREDEFPAL_PEWTER_MORN + const PREDEFPAL_CERULEAN_MORN + const PREDEFPAL_LAVENDER_MORN + const PREDEFPAL_VERMILION_MORN + const PREDEFPAL_CELADON_MORN + const PREDEFPAL_FUCHSIA_MORN + const PREDEFPAL_CINNABAR_MORN + const PREDEFPAL_SAFFRON_MORN + const PREDEFPAL_INDIGO_MORN + const PREDEFPAL_NEW_BARK_MORN + const PREDEFPAL_CHERRYGROVE_MORN + const PREDEFPAL_VIOLET_MORN + const PREDEFPAL_AZALEA_MORN + const PREDEFPAL_GOLDENROD_MORN + const PREDEFPAL_ECRUTEAK_MORN + const PREDEFPAL_OLIVINE_MORN + const PREDEFPAL_CIANWOOD_MORN + const PREDEFPAL_MAHOGANY_MORN + const PREDEFPAL_BLACKTHORN_MORN + const PREDEFPAL_LAKE_OF_RAGE_MORN + const PREDEFPAL_SILVER_CAVE_MORN + const PREDEFPAL_DUNGEONS_MORN + const PREDEFPAL_CITRINE_MORN + const PREDEFPAL_ONE_ISLAND_MORN + const PREDEFPAL_TWO_ISLAND_MORN + const PREDEFPAL_THREE_ISLAND_MORN + const PREDEFPAL_FOUR_ISLAND_MORN + const PREDEFPAL_FIVE_ISLAND_MORN + const PREDEFPAL_SIX_ISLAND_MORN + const PREDEFPAL_SEVEN_ISLAND_MORN + const PREDEFPAL_SILENT_HILLS_MORN + const PREDEFPAL_OLD_CITY_MORN + const PREDEFPAL_SAVOY_CITY_MORN + const PREDEFPAL_CORAL_CITY_MORN + const PREDEFPAL_BLUE_FOREST_MORN + const PREDEFPAL_WHITE_CITY_MORN + const PREDEFPAL_ROUTES_NIHON_MORN + const PREDEFPAL_GATES_NIHON_MORN DEF NUM_PREDEF_PALS EQU const_value ; SGB system command codes diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index 0fbba84..c06ce73 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -49,45 +49,45 @@ MapGroupRoofSGBPalInds: MapGroupRoofSGBPalIndsMorn: ; entries correspond to map groups, this time morning palettes. NEW FEATURE YIPPEE table_width 1, MapGroupRoofSGBPalIndsMorn - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_ROUTES - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_OLIVINE - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_MAHOGANY - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_DUNGEONS - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_ECRUTEAK - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_BLACKTHORN - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_CINNABAR - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_CERULEAN - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_AZALEA - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_LAKE_OF_RAGE - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_VIOLET - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_GOLDENROD - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_VERMILION - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_PALLET - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_PEWTER - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_VERMILION - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_INDIGO - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_FUCHSIA - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_LAVENDER - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_SILVER_CAVE - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_FUCHSIA - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_CELADON - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_CIANWOOD - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_VIRIDIAN - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_NEW_BARK - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_SAFFRON - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_CHERRYGROVE - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_CITRINE - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_ONE_ISLAND - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_TWO_ISLAND - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_THREE_ISLAND - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_FOUR_ISLAND - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_FIVE_ISLAND - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_SIX_ISLAND - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_SEVEN_ISLAND - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_SILENT_HILLS - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_OLD_CITY - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_SAVOY_CITY - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_CORAL_CITY - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_BLUE_FOREST - db PREDEFPAL_GATES_NIHON ;PREDEFPAL_WHITE_CITY + db PREDEFPAL_ROUTES_MORN + db PREDEFPAL_OLIVINE_MORN + db PREDEFPAL_MAHOGANY_MORN + db PREDEFPAL_DUNGEONS_MORN + db PREDEFPAL_ECRUTEAK_MORN + db PREDEFPAL_BLACKTHORN_MORN + db PREDEFPAL_CINNABAR_MORN + db PREDEFPAL_CERULEAN_MORN + db PREDEFPAL_AZALEA_MORN + db PREDEFPAL_LAKE_OF_RAGE_MORN + db PREDEFPAL_VIOLET_MORN + db PREDEFPAL_GOLDENROD_MORN + db PREDEFPAL_VERMILION_MORN + db PREDEFPAL_PALLET_MORN + db PREDEFPAL_PEWTER_MORN + db PREDEFPAL_VERMILION_MORN + db PREDEFPAL_INDIGO_MORN + db PREDEFPAL_FUCHSIA_MORN + db PREDEFPAL_LAVENDER_MORN + db PREDEFPAL_SILVER_CAVE_MORN + db PREDEFPAL_FUCHSIA_MORN + db PREDEFPAL_CELADON_MORN + db PREDEFPAL_CIANWOOD_MORN + db PREDEFPAL_VIRIDIAN_MORN + db PREDEFPAL_NEW_BARK_MORN + db PREDEFPAL_SAFFRON_MORN + db PREDEFPAL_CHERRYGROVE_MORN + db PREDEFPAL_CITRINE_MORN + db PREDEFPAL_ONE_ISLAND_MORN + db PREDEFPAL_TWO_ISLAND_MORN + db PREDEFPAL_THREE_ISLAND_MORN + db PREDEFPAL_FOUR_ISLAND_MORN + db PREDEFPAL_FIVE_ISLAND_MORN + db PREDEFPAL_SIX_ISLAND_MORN + db PREDEFPAL_SEVEN_ISLAND_MORN + db PREDEFPAL_SILENT_HILLS_MORN + db PREDEFPAL_OLD_CITY_MORN + db PREDEFPAL_SAVOY_CITY_MORN + db PREDEFPAL_CORAL_CITY_MORN + db PREDEFPAL_BLUE_FOREST_MORN + db PREDEFPAL_WHITE_CITY_MORN assert_table_length NUM_MAP_GROUPS + 1 \ No newline at end of file diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 5105daa..ba1534f 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -1128,16 +1128,16 @@ _CGB_MysteryGift: .MysteryGiftPalettes: INCLUDE "gfx/mystery_gift/mystery_gift.pal" -GS_CGB_MysteryGift: ; unreferenced - ld hl, .MysteryGiftPalette - ld de, wBGPals1 - ld bc, 1 palettes - ld a, BANK(wBGPals1) - call FarCopyWRAM - call ApplyPals - call WipeAttrmap - call ApplyAttrmap - ret +;GS_CGB_MysteryGift: ; unreferenced +; ld hl, .MysteryGiftPalette +; ld de, wBGPals1 +; ld bc, 1 palettes +; ld a, BANK(wBGPals1) +; call FarCopyWRAM +; call ApplyPals +; call WipeAttrmap +; call ApplyAttrmap +; ret .MysteryGiftPalette: INCLUDE "gfx/mystery_gift/gs_mystery_gift.pal" diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 5af4d13..de51331 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -76,28 +76,28 @@ Unused_CheckShininess: and a ret -SGB_ApplyCreditsPals: ; unreferenced - push de - push bc - ld hl, PalPacket_Pal01 - ld de, wSGBPals - ld bc, PALPACKET_LENGTH - call CopyBytes - pop bc - pop de - ld a, c - ld [wSGBPals + 3], a - ld a, b - ld [wSGBPals + 4], a - ld a, e - ld [wSGBPals + 5], a - ld a, d - ld [wSGBPals + 6], a - ld hl, wSGBPals - call PushSGBPals - ld hl, BlkPacket_AllPal0 - call PushSGBPals - ret +;SGB_ApplyCreditsPals: ; unreferenced +; push de +; push bc +; ld hl, PalPacket_Pal01 +; ld de, wSGBPals +; ld bc, PALPACKET_LENGTH +; call CopyBytes +; pop bc +; pop de +; ld a, c +; ld [wSGBPals + 3], a +; ld a, b +; ld [wSGBPals + 4], a +; ld a, e +; ld [wSGBPals + 5], a +; ld a, d +; ld [wSGBPals + 6], a +; ld hl, wSGBPals +; call PushSGBPals +; ld hl, BlkPacket_AllPal0 +; call PushSGBPals +; ret InitPartyMenuPalettes: ld hl, PalPacket_PartyMenu + 1 @@ -133,104 +133,104 @@ SGB_ApplyPartyMenuHPPals: ld [hl], e ret -Intro_LoadMagikarpPalettes: ; unreferenced - call CheckCGB - ret z +;Intro_LoadMagikarpPalettes: ; unreferenced +; call CheckCGB +; ret z +; +;; CGB only +; ld hl, .MagikarpBGPal +; ld de, wBGPals1 +; ld bc, 1 palettes +; ld a, BANK(wBGPals1) +; call FarCopyWRAM +; +; ld hl, .MagikarpOBPal +; ld de, wOBPals1 +; ld bc, 1 palettes +; ld a, BANK(wOBPals1) +; call FarCopyWRAM +; +; call ApplyPals +; ld a, TRUE +; ldh [hCGBPalUpdate], a +; ret +; +;.MagikarpBGPal: +;INCLUDE "gfx/intro/gs_magikarp_bg.pal" +; +;.MagikarpOBPal: +;INCLUDE "gfx/intro/gs_magikarp_ob.pal" -; CGB only - ld hl, .MagikarpBGPal - ld de, wBGPals1 - ld bc, 1 palettes - ld a, BANK(wBGPals1) - call FarCopyWRAM - - ld hl, .MagikarpOBPal - ld de, wOBPals1 - ld bc, 1 palettes - ld a, BANK(wOBPals1) - call FarCopyWRAM - - call ApplyPals - ld a, TRUE - ldh [hCGBPalUpdate], a - ret - -.MagikarpBGPal: -INCLUDE "gfx/intro/gs_magikarp_bg.pal" - -.MagikarpOBPal: -INCLUDE "gfx/intro/gs_magikarp_ob.pal" - -Intro_LoadAllPal0: ; unreferenced - call CheckCGB - ret nz - ldh a, [hSGB] - and a - ret z - ld hl, BlkPacket_AllPal0 - jp PushSGBPals - -Intro_LoadBetaIntroVenusaurPalettes: ; unreferenced - call CheckCGB - jr nz, .cgb - ldh a, [hSGB] - and a - ret z - ld hl, PalPacket_BetaIntroVenusaur - jp PushSGBPals - -.cgb - ld de, wOBPals1 - ld a, PREDEFPAL_BETA_INTRO_VENUSAUR - call GetPredefPal - jp LoadHLPaletteIntoDE - -Intro_LoadPackPalettes: ; unreferenced - call CheckCGB - jr nz, .cgb - ldh a, [hSGB] - and a - ret z - ld hl, PalPacket_Pack - jp PushSGBPals - -.cgb - ld de, wOBPals1 - ld a, PREDEFPAL_PACK - call GetPredefPal - jp LoadHLPaletteIntoDE - -GSIntro_LoadMonPalette: ; unreferenced - call CheckCGB - jr nz, .cgb - ldh a, [hSGB] - and a - ret z - ld a, c - push af - ld hl, PalPacket_Pal01 - ld de, wSGBPals - ld bc, PALPACKET_LENGTH - call CopyBytes - pop af - call GetMonPalettePointer - ld a, [hli] - ld [wSGBPals + 3], a - ld a, [hli] - ld [wSGBPals + 4], a - ld a, [hli] - ld [wSGBPals + 5], a - ld a, [hl] - ld [wSGBPals + 6], a - ld hl, wSGBPals - jp PushSGBPals - -.cgb - ld de, wOBPals1 - ld a, c - call GetMonPalettePointer - call LoadPalette_White_Col1_Col2_Black - ret +;Intro_LoadAllPal0: ; unreferenced +; call CheckCGB +; ret nz +; ldh a, [hSGB] +; and a +; ret z +; ld hl, BlkPacket_AllPal0 +; jp PushSGBPals +; +;Intro_LoadBetaIntroVenusaurPalettes: ; unreferenced +; call CheckCGB +; jr nz, .cgb +; ldh a, [hSGB] +; and a +; ret z +; ld hl, PalPacket_BetaIntroVenusaur +; jp PushSGBPals +; +;.cgb +; ld de, wOBPals1 +; ld a, PREDEFPAL_BETA_INTRO_VENUSAUR +; call GetPredefPal +; jp LoadHLPaletteIntoDE +; +;Intro_LoadPackPalettes: ; unreferenced +; call CheckCGB +; jr nz, .cgb +; ldh a, [hSGB] +; and a +; ret z +; ld hl, PalPacket_Pack +; jp PushSGBPals +; +;.cgb +; ld de, wOBPals1 +; ld a, PREDEFPAL_PACK +; call GetPredefPal +; jp LoadHLPaletteIntoDE +; +;GSIntro_LoadMonPalette: ; unreferenced +; call CheckCGB +; jr nz, .cgb +; ldh a, [hSGB] +; and a +; ret z +; ld a, c +; push af +; ld hl, PalPacket_Pal01 +; ld de, wSGBPals +; ld bc, PALPACKET_LENGTH +; call CopyBytes +; pop af +; call GetMonPalettePointer +; ld a, [hli] +; ld [wSGBPals + 3], a +; ld a, [hli] +; ld [wSGBPals + 4], a +; ld a, [hli] +; ld [wSGBPals + 5], a +; ld a, [hl] +; ld [wSGBPals + 6], a +; ld hl, wSGBPals +; jp PushSGBPals +; +;.cgb +; ld de, wOBPals1 +; ld a, c +; call GetMonPalettePointer +; call LoadPalette_White_Col1_Col2_Black +; ret LoadTrainerClassPaletteAsNthBGPal: ld a, [wTrainerClass] @@ -719,51 +719,51 @@ GetMonPalettePointer: call _GetMonPalettePointer ret -CGBCopyBattleObjectPals: ; unreferenced -; dummied out - ret - call CheckCGB - ret z - ld hl, BattleObjectPals - ld a, (1 << rOBPI_AUTO_INCREMENT) | $10 - ldh [rOBPI], a - ld c, 6 palettes -.loop - ld a, [hli] - ldh [rOBPD], a - dec c - jr nz, .loop - ld hl, BattleObjectPals - ld de, wOBPals1 palette 2 - ld bc, 2 palettes - ld a, BANK(wOBPals1) - call FarCopyWRAM - ret +;CGBCopyBattleObjectPals: ; unreferenced +;; dummied out +; ret +; call CheckCGB +; ret z +; ld hl, BattleObjectPals +; ld a, (1 << rOBPI_AUTO_INCREMENT) | $10 +; ldh [rOBPI], a +; ld c, 6 palettes +;.loop +; ld a, [hli] +; ldh [rOBPD], a +; dec c +; jr nz, .loop +; ld hl, BattleObjectPals +; ld de, wOBPals1 palette 2 +; ld bc, 2 palettes +; ld a, BANK(wOBPals1) +; call FarCopyWRAM +; ret BattleObjectPals: INCLUDE "gfx/battle_anims/battle_anims.pal" -CGBCopyTwoPredefObjectPals: ; unreferenced - call CheckCGB - ret z - ld a, (1 << rOBPI_AUTO_INCREMENT) | $10 - ldh [rOBPI], a - ld a, PREDEFPAL_TRADE_TUBE - call GetPredefPal - call .PushPalette - ld a, PREDEFPAL_RB_GREENMON - call GetPredefPal - call .PushPalette - ret - -.PushPalette: - ld c, 1 palettes -.loop - ld a, [hli] - ldh [rOBPD], a - dec c - jr nz, .loop - ret +;CGBCopyTwoPredefObjectPals: ; unreferenced +; call CheckCGB +; ret z +; ld a, (1 << rOBPI_AUTO_INCREMENT) | $10 +; ldh [rOBPI], a +; ld a, PREDEFPAL_TRADE_TUBE +; call GetPredefPal +; call .PushPalette +; ld a, PREDEFPAL_RB_GREENMON +; call GetPredefPal +; call .PushPalette +; ret +; +;.PushPalette: +; ld c, 1 palettes +;.loop +; ld a, [hli] +; ldh [rOBPD], a +; dec c +; jr nz, .loop +; ret _GetMonPalettePointer: call GetPokemonIndexFromID @@ -1322,8 +1322,8 @@ INCLUDE "gfx/diploma/diploma.pal" PartyMenuOBPals: INCLUDE "gfx/stats/party_menu_ob.pal" -UnusedBattleObjectPals: ; unreferenced -INCLUDE "gfx/battle_anims/unused_battle_anims.pal" +;UnusedBattleObjectPals: ; unreferenced +;INCLUDE "gfx/battle_anims/unused_battle_anims.pal" UnusedGSTitleBGPals: INCLUDE "gfx/title/unused_gs_bg.pal" diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index cab502d..0af7cff 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -562,6 +562,23 @@ endr ret .route + ld a, [wTimeOfDayPal] + cp MORN_F + jr nz, .dayroute + ld a, [wMapGroup] + ld b, a + ld a, [wMapNumber] + ld c, a + call GetWorldMapLocation + cp NIHON_LANDMARK + ld a, PREDEFPAL_ROUTES_MORN + jr nc, .routenihonmorn + ret +.routenihonmorn + ld a, PREDEFPAL_ROUTES_NIHON_MORN + ret + +.dayroute ld a, [wMapGroup] ld b, a ld a, [wMapNumber] @@ -577,14 +594,46 @@ endr ret .cave + ld a, [wTimeOfDayPal] + cp MORN_F + jr nz, .daycave + ld a, PREDEFPAL_DUNGEONS_MORN + ret + +.daycave ld a, PREDEFPAL_DUNGEONS ret .env5 + ld a, [wTimeOfDayPal] + cp MORN_F + jr nz, .dayship + ld a, PREDEFPAL_VERMILION_MORN + ret + +.dayship ld a, PREDEFPAL_VERMILION ret .gate + ld a, [wTimeOfDayPal] + cp MORN_F + jr nz, .daygate + ld a, [wMapGroup] + ld b, a + ld a, [wMapNumber] + ld c, a + call GetWorldMapLocation + cp NIHON_LANDMARK + ld a, PREDEFPAL_PEWTER_MORN + jr nc, .gatenihonmorn + ret + +.gatenihonmorn + ld a, PREDEFPAL_GATES_NIHON_MORN + ret + +.daygate ld a, [wMapGroup] ld b, a ld a, [wMapNumber] diff --git a/gfx/sgb/predef.pal b/gfx/sgb/predef.pal index d73f5d8..6595688 100644 --- a/gfx/sgb/predef.pal +++ b/gfx/sgb/predef.pal @@ -93,3 +93,45 @@ RGB 00,00,00, 08,11,11, 21,21,21, 31,31,31 ; PREDEFPAL_GAMEFREAK_LOGO_BG RGB 31,31,31, 23,21,16, 15,20,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON RGB 31,31,31, 18,18,18, 15,20,20, 00,00,00 ; PREDEFPAL_GATES_NIHON + RGB 31,31,31, 17,23,17, 13,13,24, 00,00,00 ; PREDEFPAL_ROUTES_MORN + RGB 31,31,31, 27,28,31, 12,12,25, 00,00,00 ; PREDEFPAL_PALLET_MORN # + RGB 31,31,31, 24,28,19, 12,12,25, 00,00,00 ; PREDEFPAL_VIRIDIAN_MORN # + RGB 31,31,31, 21,21,21, 12,12,25, 00,00,00 ; PREDEFPAL_PEWTER_MORN + RGB 31,31,31, 18,20,31, 12,12,25, 00,00,00 ; PREDEFPAL_CERULEAN_MORN + RGB 31,31,31, 24,21,27, 12,12,25, 00,00,00 ; PREDEFPAL_LAVENDER_MORN # + RGB 31,31,31, 31,24,16, 12,12,25, 00,00,00 ; PREDEFPAL_VERMILION_MORN # + RGB 31,31,31, 25,30,26, 12,12,25, 00,00,00 ; PREDEFPAL_CELADON_MORN # + RGB 31,31,31, 31,25,31, 12,12,25, 00,00,00 ; PREDEFPAL_FUCHSIA_MORN # + RGB 31,31,31, 31,20,19, 12,12,25, 00,00,00 ; PREDEFPAL_CINNABAR_MORN # + RGB 31,31,31, 31,26,19, 12,12,25, 00,00,00 ; PREDEFPAL_SAFFRON_MORN # + RGB 31,31,31, 27,28,27, 12,12,25, 00,00,00 ; PREDEFPAL_INDIGO_MORN # + RGB 31,31,31, 16,27,20, 12,12,25, 00,00,00 ; PREDEFPAL_NEW_BARK_MORN + RGB 31,31,31, 29,24,29, 12,12,25, 00,00,00 ; PREDEFPAL_CHERRYGROVE_MORN # + RGB 31,31,31, 26,23,29, 12,12,25, 00,00,00 ; PREDEFPAL_VIOLET_MORN # + RGB 31,31,31, 25,23,20, 12,12,25, 00,00,00 ; PREDEFPAL_AZALEA_MORN # + RGB 31,31,31, 29,26,18, 12,12,25, 00,00,00 ; PREDEFPAL_GOLDENROD_MORN # + RGB 31,31,31, 31,21,18, 12,12,25, 00,00,00 ; PREDEFPAL_ECRUTEAK_MORN # + RGB 31,31,31, 26,25,31, 12,12,25, 00,00,00 ; PREDEFPAL_OLIVINE_MORN # + RGB 31,31,31, 22,21,31, 12,12,25, 00,00,00 ; PREDEFPAL_CIANWOOD_MORN # + RGB 31,31,31, 22,25,21, 12,12,25, 00,00,00 ; PREDEFPAL_MAHOGANY_MORN # + RGB 31,31,31, 21,21,22, 12,12,25, 00,00,00 ; PREDEFPAL_BLACKTHORN_MORN # + RGB 31,31,31, 31,17,16, 12,12,25, 00,00,00 ; PREDEFPAL_LAKE_OF_RAGE_MORN + RGB 31,31,31, 26,26,26, 12,12,25, 00,00,00 ; PREDEFPAL_SILVER_CAVE_MORN # + RGB 31,31,31, 19,14,11, 12,15,20, 00,00,00 ; PREDEFPAL_DUNGEONS_MORN + RGB 31,31,31, 29,26,18, 12,12,25, 00,00,00 ; PREDEFPAL_CITRINE_MORN (temp) # + RGB 31,31,31, 30,20,21, 12,12,25, 00,00,00 ; PREDEFPAL_ONE_ISLAND_MORN # + RGB 31,31,31, 30,23,17, 12,12,25, 00,00,00 ; PREDEFPAL_TWO_ISLAND_MORN # + RGB 31,31,31, 29,28,15, 12,12,25, 00,00,00 ; PREDEFPAL_THREE_ISLAND_MORN # + RGB 31,31,31, 18,31,16, 12,12,25, 00,00,00 ; PREDEFPAL_FOUR_ISLAND_MORN # + RGB 31,31,31, 17,29,31, 12,12,25, 00,00,00 ; PREDEFPAL_FIVE_ISLAND_MORN # + RGB 31,31,31, 24,23,31, 12,12,25, 00,00,00 ; PREDEFPAL_SIX_ISLAND_MORN # + RGB 31,31,31, 29,21,31, 12,12,25, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND_MORN # + RGB 31,31,31, 12,23,23, 12,15,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS_MORN + RGB 31,31,31, 19,14,11, 12,15,20, 00,00,00 ; PREDEFPAL_OLD_CITY_MORN + RGB 31,31,31, 17,17,25, 12,15,20, 00,00,00 ; PREDEFPAL_SAVOY_CITY_MORN + RGB 31,31,31, 29,15,20, 12,15,20, 00,00,00 ; PREDEFPAL_CORAL_CITY_MORN + RGB 31,31,31, 18,14,31, 12,15,20, 00,00,00 ; PREDEFPAL_BLUE_FOREST_MORN # + RGB 31,31,31, 27,26,25, 12,15,20, 00,00,00 ; PREDEFPAL_WHITE_CITY_MORN + RGB 31,31,31, 21,21,16, 12,15,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON_MORN + RGB 31,31,31, 16,16,16, 12,15,20, 00,00,00 ; PREDEFPAL_GATES_NIHON_MORN + \ No newline at end of file