From c6ed3641225ed276ed8bb038b406348948ca6ffa Mon Sep 17 00:00:00 2001 From: xCrystal Date: Thu, 25 Jan 2024 18:06:01 +0100 Subject: [PATCH] Level selection menu: GFX for ToD symbols (#12) --- engine/gfx/cgb_layouts.asm | 11 +++++++++- engine/gfx/color.asm | 5 ++++- engine/menus/level_selection_menu.asm | 7 ++++++ .../time_of_day_symbols.pal | 20 ++++++++++++++++++ .../time_of_day_symbols.png | Bin 0 -> 390 bytes 5 files changed, 41 insertions(+), 2 deletions(-) create mode 100755 gfx/level_selection_menu/time_of_day_symbols.pal create mode 100755 gfx/level_selection_menu/time_of_day_symbols.png diff --git a/engine/gfx/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm index 835beccfa..0c798f4a1 100644 --- a/engine/gfx/cgb_layouts.asm +++ b/engine/gfx/cgb_layouts.asm @@ -583,10 +583,19 @@ _CGB_LevelSelectionMenu: ld a, BANK(wOBPals1) call FarCopyWRAM ; load stage trophy pals (pal2 to pal5) - ld hl, LevelSelectionMenuStageTrophyPals + ld hl, LevelSelectionMenuStageTrophiesPals ld bc, 4 palettes ld a, BANK(wOBPals1) call FarCopyWRAM +; load daytime-based ToD symbol pals (pal 6) + ld a, [wTimeOfDay] + maskbits NUM_DAYTIMES + ld bc, 1 palettes + ld hl, LevelSelectionMenuTimeOfDaySymbolsPals + call AddNTimes + ld bc, 1 palettes + ld a, BANK(wOBPals1) + call FarCopyWRAM ; load daytime and gender-based background pals ld a, [wPlayerGender] diff --git a/engine/gfx/color.asm b/engine/gfx/color.asm index 3aa9c101a..2de46e31b 100644 --- a/engine/gfx/color.asm +++ b/engine/gfx/color.asm @@ -880,7 +880,10 @@ LevelSelectionMenuFemalePals: INCLUDE "gfx/level_selection_menu/background_female.pal" assert_table_length NUM_DAYTIMES -LevelSelectionMenuStageTrophyPals: +LevelSelectionMenuStageTrophiesPals: INCLUDE "gfx/level_selection_menu/stage_trophies.pal" +LevelSelectionMenuTimeOfDaySymbolsPals: +INCLUDE "gfx/level_selection_menu/time_of_day_symbols.pal" + INCLUDE "engine/gfx/rgb_fade.asm" diff --git a/engine/menus/level_selection_menu.asm b/engine/menus/level_selection_menu.asm index 17b8092cb..e902c3d11 100755 --- a/engine/menus/level_selection_menu.asm +++ b/engine/menus/level_selection_menu.asm @@ -174,6 +174,10 @@ LevelSelectionMenu_LoadGFX: ; ld de, vTiles0 + (24 + NUM_DIRECTIONS) tiles ld bc, NUM_LEVEL_STAGES * 2 tiles call FarCopyBytes + ld hl, LevelSelectionMenuTimeOfDaySymbolsGFX +; ld de, vTiles0 + (24 + NUM_DIRECTIONS + NUM_LEVEL_STAGES * 2) tiles + ld bc, NUM_DAYTIMES * 4 tiles + call FarCopyBytes ret LevelSelectionMenu_InitTilemap: @@ -1044,3 +1048,6 @@ INCBIN "gfx/level_selection_menu/directional_arrows.2bpp" LevelSelectionMenuStageTrophiesGFX: INCBIN "gfx/level_selection_menu/stage_trophies.2bpp" + +LevelSelectionMenuTimeOfDaySymbolsGFX: +INCBIN "gfx/level_selection_menu/time_of_day_symbols.2bpp" diff --git a/gfx/level_selection_menu/time_of_day_symbols.pal b/gfx/level_selection_menu/time_of_day_symbols.pal new file mode 100755 index 000000000..c2c7c1b16 --- /dev/null +++ b/gfx/level_selection_menu/time_of_day_symbols.pal @@ -0,0 +1,20 @@ +; MORN + RGB 31, 31, 31 + RGB 31, 27, 22 + RGB 31, 24, 16 + RGB 00, 00, 00 +; DAY + RGB 31, 31, 31 + RGB 31, 31, 00 + RGB 31, 23, 00 + RGB 00, 00, 00 +; NITE + RGB 31, 31, 31 + RGB 13, 10, 25 + RGB 04, 03, 12 + RGB 00, 00, 00 +; EVE + RGB 31, 31, 31 + RGB 31, 18, 12 + RGB 28, 13, 06 + RGB 00, 00, 00 diff --git a/gfx/level_selection_menu/time_of_day_symbols.png b/gfx/level_selection_menu/time_of_day_symbols.png new file mode 100755 index 0000000000000000000000000000000000000000..09585ca415d8ff803d8a047173142ecd36e675b0 GIT binary patch literal 390 zcmV;10eSw3P)E0-$i|#j^&SehG&s&+d^p$MGq~<3@zQ2fKh{VysBr=hgjFu2iW)B zKTAye;|LheER^1$Zo#B=L)8QHxyfEp8=I2zv0%9VaR+cF-M~;Yu#>AWUB**H%K+8>5pqM*N$X;9cZa{|=%A^t=T6d7Ck+US-DLCjbqjFU1;F zucG+-1mK*Fo;B8}`VzgnMe)ym3)Hqz>ta&$C9U1yJ(C>u|Cvj$1}22S;PyG%6 z(AQQFw04ov;~ymeV(a7&0xaTjjH)+Gn