From 163f3e0c3f56831b5255b31045798ac950098faa Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Thu, 11 Jan 2018 22:16:17 -0500 Subject: Local UI tiles don't belong in charmap Separate 1bpp font tiles from gfx/mobile/phone_tiles.png --- engine/timeset.asm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'engine/timeset.asm') diff --git a/engine/timeset.asm b/engine/timeset.asm index f05e31ab5..b97103ed1 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -1,3 +1,6 @@ +TIMESET_UP_ARROW EQUS "\"♂\"" ; $ef +TIMESET_DOWN_ARROW EQUS "\"♀\"" ; $f5 + InitClock: ; 90672 (24:4672) ; Ask the player to set the time. ld a, [hInMenu] @@ -410,11 +413,11 @@ Special_SetDayOfWeek: ; 90913 ld a, $1 ld [hInMenu], a ld de, TimeSetUpArrowGFX - ld hl, vTiles1 tile $6f + ld hl, vTiles0 tile TIMESET_UP_ARROW lb bc, BANK(TimeSetUpArrowGFX), 1 call Request1bpp ld de, TimeSetDownArrowGFX - ld hl, vTiles1 tile $75 + ld hl, vTiles0 tile TIMESET_DOWN_ARROW lb bc, BANK(TimeSetDownArrowGFX), 1 call Request1bpp xor a @@ -431,9 +434,9 @@ Special_SetDayOfWeek: ; 90913 ld c, 9 call TextBox hlcoord 14, 3 - ld [hl], "♂" ; gets overwritten with special up arrow + ld [hl], TIMESET_UP_ARROW hlcoord 14, 6 - ld [hl], "♀" ; gets overwritten with special down arrow + ld [hl], TIMESET_DOWN_ARROW hlcoord 10, 5 call .PlaceWeekdayString call ApplyTilemap -- cgit v1.2.3 From a8eb44b6e3b2e376491c68efe4a67e8f1badb0e8 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Sun, 21 Jan 2018 13:58:16 -0500 Subject: Separate new_game graphics --- engine/timeset.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engine/timeset.asm') diff --git a/engine/timeset.asm b/engine/timeset.asm index b97103ed1..67aa9973e 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -400,11 +400,11 @@ OakText_ResponseToSetTime: ; 0x908b8 ; 0x908fb TimeSetBackgroundGFX: ; 908fb -INCBIN "gfx/timeset/background.1bpp" +INCBIN "gfx/new_game/timeset_bg.1bpp" TimeSetUpArrowGFX: ; 90903 -INCBIN "gfx/timeset/up_arrow.1bpp" +INCBIN "gfx/new_game/up_arrow.1bpp" TimeSetDownArrowGFX: ; 9090b -INCBIN "gfx/timeset/down_arrow.1bpp" +INCBIN "gfx/new_game/down_arrow.1bpp" ; 90913 Special_SetDayOfWeek: ; 90913 -- cgit v1.2.3