diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-10 01:47:10 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-10 01:47:10 -0500 |
| commit | 94c7def4883fbdbcd3987a067443a2069b8bb610 (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /engine/timeset.asm | |
| parent | 89b9292db0898f8ad2b6ea8513a3190762eb58c8 (diff) | |
| parent | d554b997c590825f030bd1be71989653b16a2ae0 (diff) | |
Merge pull request #409 from roukaour/master
Document constants with comments, actual names, and more thorough usage
Diffstat (limited to 'engine/timeset.asm')
| -rwxr-xr-x | engine/timeset.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engine/timeset.asm b/engine/timeset.asm index d560ae817..ca5d9b85a 100755 --- a/engine/timeset.asm +++ b/engine/timeset.asm @@ -10,9 +10,9 @@ InitClock: ; 90672 (24:4672) ld a, $10 ld [MusicFade], a ld a, MUSIC_NONE % $100 - ld [MusicFadeIDLo], a + ld [MusicFadeID], a ld a, MUSIC_NONE / $100 - ld [MusicFadeIDHi], a + ld [MusicFadeID + 1], a ld c, 8 call DelayFrames call RotateFourPalettesLeft @@ -23,17 +23,17 @@ InitClock: ; 90672 (24:4672) xor a ld [hBGMapMode], a call LoadStandardFont - ld de, GFX_908fb + ld de, TimeSetBackgroundGFX ld hl, VTiles2 tile $00 - lb bc, BANK(GFX_908fb), 1 + lb bc, BANK(TimeSetBackgroundGFX), 1 call Request1bpp - ld de, GFX_90903 + ld de, TimeSetUpArrowGFX ld hl, VTiles2 tile $01 - lb bc, BANK(GFX_90903), 1 + lb bc, BANK(TimeSetUpArrowGFX), 1 call Request1bpp - ld de, GFX_9090b + ld de, TimeSetDownArrowGFX ld hl, VTiles2 tile $02 - lb bc, BANK(GFX_9090b), 1 + lb bc, BANK(TimeSetDownArrowGFX), 1 call Request1bpp call .ClearScreen call WaitBGMap @@ -396,12 +396,12 @@ OakText_ResponseToSetTime: ; 0x908b8 db "@" ; 0x908fb -GFX_908fb: ; 908fb -INCBIN "gfx/unknown/0908fb.1bpp" -GFX_90903: ; 90903 -INCBIN "gfx/unknown/090903.1bpp" -GFX_9090b: ; 9090b -INCBIN "gfx/unknown/09090b.1bpp" +TimeSetBackgroundGFX: ; 908fb +INCBIN "gfx/timeset/background.1bpp" +TimeSetUpArrowGFX: ; 90903 +INCBIN "gfx/timeset/up_arrow.1bpp" +TimeSetDownArrowGFX: ; 9090b +INCBIN "gfx/timeset/down_arrow.1bpp" ; 90913 Special_SetDayOfWeek: ; 90913 @@ -409,13 +409,13 @@ Special_SetDayOfWeek: ; 90913 push af ld a, $1 ld [hInMenu], a - ld de, GFX_90903 + ld de, TimeSetUpArrowGFX ld hl, VTiles1 tile $6f - lb bc, BANK(GFX_90903), 1 + lb bc, BANK(TimeSetUpArrowGFX), 1 call Request1bpp - ld de, GFX_9090b + ld de, TimeSetDownArrowGFX ld hl, VTiles1 tile $75 - lb bc, BANK(GFX_9090b), 1 + lb bc, BANK(TimeSetDownArrowGFX), 1 call Request1bpp xor a ld [wTempDayOfWeek], a |