diff options
| author | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
|---|---|---|
| committer | Remy Oukaour <remy.oukaour@gmail.com> | 2017-12-28 20:56:21 -0500 |
| commit | 4c35f3ac8506e5f326658bbab91c257584f7b716 (patch) | |
| tree | 980025fbbc41e001e260a65ed7c035dd6073e864 /engine/timeset.asm | |
| parent | bb005694b31b6a8cbaeefa8751ea72117e904e02 (diff) | |
| parent | 82a05a1752b476caab8951fe03f539dcc1a63669 (diff) | |
Merge branch 'master' of https://github.com/pret/pokecrystal
# Conflicts:
# macros/scripts/maps.asm
Diffstat (limited to 'engine/timeset.asm')
| -rwxr-xr-x | engine/timeset.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/timeset.asm b/engine/timeset.asm index e68f5930a..f05e31ab5 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -24,15 +24,15 @@ InitClock: ; 90672 (24:4672) ld [hBGMapMode], a call LoadStandardFont ld de, TimeSetBackgroundGFX - ld hl, VTiles2 tile $00 + ld hl, vTiles2 tile $00 lb bc, BANK(TimeSetBackgroundGFX), 1 call Request1bpp ld de, TimeSetUpArrowGFX - ld hl, VTiles2 tile $01 + ld hl, vTiles2 tile $01 lb bc, BANK(TimeSetUpArrowGFX), 1 call Request1bpp ld de, TimeSetDownArrowGFX - ld hl, VTiles2 tile $02 + ld hl, vTiles2 tile $02 lb bc, BANK(TimeSetDownArrowGFX), 1 call Request1bpp call .ClearScreen @@ -410,11 +410,11 @@ Special_SetDayOfWeek: ; 90913 ld a, $1 ld [hInMenu], a ld de, TimeSetUpArrowGFX - ld hl, VTiles1 tile $6f + ld hl, vTiles1 tile $6f lb bc, BANK(TimeSetUpArrowGFX), 1 call Request1bpp ld de, TimeSetDownArrowGFX - ld hl, VTiles1 tile $75 + ld hl, vTiles1 tile $75 lb bc, BANK(TimeSetDownArrowGFX), 1 call Request1bpp xor a |