SGB Morning Palette Infrastructure

Does not include proper morning palettes yet, but will be easy to set up.
This commit is contained in:
Zeta_Null 2024-10-29 19:22:02 -04:00
parent 2eec67d7fd
commit d5d8fe40d7
3 changed files with 72 additions and 13 deletions

View file

@ -45,3 +45,49 @@ MapGroupRoofSGBPalInds:
db PREDEFPAL_BLUE_FOREST db PREDEFPAL_BLUE_FOREST
db PREDEFPAL_WHITE_CITY db PREDEFPAL_WHITE_CITY
assert_table_length NUM_MAP_GROUPS + 1 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

View file

@ -613,19 +613,20 @@ _CGB_MapPals:
call .LoadHLColorIntoDE call .LoadHLColorIntoDE
jr .bg_done jr .bg_done
.bg_morn_day .bg_morn_day
ld a, [wTimeOfDayPal] ; Lot of commented out code for spaceworld-style mornings.
cp MORN_F ; ld a, [wTimeOfDayPal]
jr nz, .bg_day ; cp MORN_F
call .LoadHLColorIntoDE ; jr nz, .bg_day
inc hl ; call .LoadHLColorIntoDE
inc hl ; inc hl
call .LoadHLColorIntoDE ; inc hl
dec hl ; call .LoadHLColorIntoDE
dec hl ; dec hl
call .LoadHLColorIntoDE ; dec hl
call .LoadHLColorIntoDE ; call .LoadHLColorIntoDE
jr .bg_done ; call .LoadHLColorIntoDE
.bg_day ; jr .bg_done
;.bg_day
call LoadHLPaletteIntoDE call LoadHLPaletteIntoDE
jr .bg_done jr .bg_done

View file

@ -541,6 +541,18 @@ endr
jr z, .gate jr z, .gate
;cp FOREST ;cp FOREST
;jr z, .route ;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 a, [wMapGroup]
ld e, a ld e, a
ld d, 0 ld d, 0