From d5d8fe40d735f4a1fdbcf43a719946dc30b6fca2 Mon Sep 17 00:00:00 2001 From: Zeta_Null Date: Tue, 29 Oct 2024 19:22:02 -0400 Subject: [PATCH] SGB Morning Palette Infrastructure Does not include proper morning palettes yet, but will be easy to set up. --- data/maps/sgb_roof_pal_inds.asm | 46 +++++++++++++++++++++++++++++++++ engine/gfx/cgb_layouts.asm | 27 +++++++++---------- engine/gfx/sgb_layouts.asm | 12 +++++++++ 3 files changed, 72 insertions(+), 13 deletions(-) diff --git a/data/maps/sgb_roof_pal_inds.asm b/data/maps/sgb_roof_pal_inds.asm index 2afdaa4..0fbba84 100644 --- a/data/maps/sgb_roof_pal_inds.asm +++ b/data/maps/sgb_roof_pal_inds.asm @@ -45,3 +45,49 @@ MapGroupRoofSGBPalInds: db PREDEFPAL_BLUE_FOREST db PREDEFPAL_WHITE_CITY assert_table_length NUM_MAP_GROUPS + 1 + +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 + 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 9ed9f15..5105daa 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -613,19 +613,20 @@ _CGB_MapPals: call .LoadHLColorIntoDE jr .bg_done .bg_morn_day - ld a, [wTimeOfDayPal] - cp MORN_F - jr nz, .bg_day - call .LoadHLColorIntoDE - inc hl - inc hl - call .LoadHLColorIntoDE - dec hl - dec hl - call .LoadHLColorIntoDE - call .LoadHLColorIntoDE - jr .bg_done -.bg_day +; Lot of commented out code for spaceworld-style mornings. +; ld a, [wTimeOfDayPal] +; cp MORN_F +; jr nz, .bg_day +; call .LoadHLColorIntoDE +; inc hl +; inc hl +; call .LoadHLColorIntoDE +; dec hl +; dec hl +; call .LoadHLColorIntoDE +; call .LoadHLColorIntoDE +; jr .bg_done +;.bg_day call LoadHLPaletteIntoDE jr .bg_done diff --git a/engine/gfx/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm index fa9be24..cab502d 100644 --- a/engine/gfx/sgb_layouts.asm +++ b/engine/gfx/sgb_layouts.asm @@ -541,6 +541,18 @@ endr jr z, .gate ;cp FOREST ;jr z, .route + ld a, [wTimeOfDayPal] + cp MORN_F + jr nz, .only_day + ld a, [wMapGroup] + ld e, a + ld d, 0 + ld hl, MapGroupRoofSGBPalIndsMorn + add hl, de + ld a, [hl] + ret + +.only_day ld a, [wMapGroup] ld e, a ld d, 0