diff options
| author | mid-kid <esteve.varela@gmail.com> | 2018-08-06 19:43:54 +0200 |
|---|---|---|
| committer | mid-kid <esteve.varela@gmail.com> | 2018-08-07 09:46:21 +0200 |
| commit | f98a95b8ee2bb14f8fdb675e37c9876b8163b509 (patch) | |
| tree | c077e770b10a044e9ba061151d9a793c66af79b2 /engine/overworld/time.asm | |
| parent | 23cdf06e5ec6e217dcd91a1414dfa7801d453044 (diff) | |
wWeeklyFlags -> wDailyFlags2
These are by far not always checked each week, and as such shouldn't be
called that.
Since they're almost always used through the `bit` instruction, it's
very inconvenient to just make wDailyFlags a `dw` instead.
Diffstat (limited to 'engine/overworld/time.asm')
| -rw-r--r-- | engine/overworld/time.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/engine/overworld/time.asm b/engine/overworld/time.asm index abb12d87d..74bd1b6d9 100644 --- a/engine/overworld/time.asm +++ b/engine/overworld/time.asm @@ -91,9 +91,9 @@ CheckDailyResetTimer:: call CheckDayDependentEventHL ret nc xor a - ld hl, wDailyFlags - ld [hli], a ; wDailyFlags - ld [hli], a ; wWeeklyFlags + ld hl, wDailyFlags1 + ld [hli], a ; wDailyFlags1 + ld [hli], a ; wDailyFlags2 ld [hli], a ; wSwarmFlags ld [hl], a ; wSwarmFlags + 1 ld hl, wDailyRematchFlags @@ -207,14 +207,14 @@ CheckUnusedTwoDayTimer: ret ; unused - ld hl, wDailyFlags - set DAILYFLAGS_FISH_SWARM_F, [hl] + ld hl, wDailyFlags1 + set DAILYFLAGS1_FISH_SWARM_F, [hl] ret ; unused and a - ld hl, wDailyFlags - bit DAILYFLAGS_FISH_SWARM_F, [hl] + ld hl, wDailyFlags1 + bit DAILYFLAGS1_FISH_SWARM_F, [hl] ret nz scf ret |