diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 17:15:20 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-03 17:15:20 -0500 |
| commit | b35eb72290b964b98844afbe741bb7ede34b9ef3 (patch) | |
| tree | 2cf2652bc9c3e69ae5f7b2a2632c02a12498615f /engine/timeofdaypals.asm | |
| parent | 7547ad839cf1c8141b931d08ef16a894e7db68c9 (diff) | |
| parent | 32ade4ac9bf113d630d904aab51f2c49c91bf8c2 (diff) | |
Merge pull request #480 from luckytyphlosion/master
[Ready to merge] Prefix wram labels with w.
Diffstat (limited to 'engine/timeofdaypals.asm')
| -rw-r--r-- | engine/timeofdaypals.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/timeofdaypals.asm b/engine/timeofdaypals.asm index 6dfa5657a..781c2e91a 100644 --- a/engine/timeofdaypals.asm +++ b/engine/timeofdaypals.asm @@ -4,10 +4,10 @@ DummyPredef36: UpdateTimeOfDayPal:: ; 8c001 call UpdateTime - ld a, [TimeOfDay] - ld [CurTimeOfDay], a + ld a, [wTimeOfDay] + ld [wCurTimeOfDay], a call GetTimePalette - ld [TimeOfDayPal], a + ld [wTimeOfDayPal], a ret ; 8c011 @@ -21,25 +21,25 @@ _TimeOfDayPals:: ; 8c011 jr nz, .dontchange ; do we need to bother updating? - ld a, [TimeOfDay] - ld hl, CurTimeOfDay + ld a, [wTimeOfDay] + ld hl, wCurTimeOfDay cp [hl] jr z, .dontchange ; if so, the time of day has changed - ld a, [TimeOfDay] - ld [CurTimeOfDay], a + ld a, [wTimeOfDay] + ld [wCurTimeOfDay], a ; get palette id call GetTimePalette ; same palette as before? - ld hl, TimeOfDayPal + ld hl, wTimeOfDayPal cp [hl] jr z, .dontchange ; update palette id - ld [TimeOfDayPal], a + ld [wTimeOfDayPal], a ; save bg palette 7 ld hl, wBGPals1 palette PAL_BG_TEXT @@ -240,7 +240,7 @@ ReplaceTimeOfDayPals: ; 8c0e5 ; 8c117 GetTimePalette: ; 8c117 - ld a, [TimeOfDay] + ld a, [wTimeOfDay] ld e, a ld d, 0 ld hl, .TimePalettes @@ -336,7 +336,7 @@ GetTimePalFade: ; 8c17c ; else: dmg ; index - ld a, [TimeOfDayPal] + ld a, [wTimeOfDayPal] and %11 ; get fade table |