summaryrefslogtreecommitdiff
path: root/engine/time.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2018-01-22 15:59:24 -0500
committerRangi <remy.oukaour+rangi42@gmail.com>2018-01-22 15:59:24 -0500
commitefe6981a0db99aa2deeb7fbea5a51c9e40dd4138 (patch)
treedd2156fc491fe2e354f02ec6931c4373f573b4e5 /engine/time.asm
parent3a7f518de4bbced15cbf5bb877a988055de7d063 (diff)
Add daily+weekly bit flags (close issue #429)
Diffstat (limited to 'engine/time.asm')
-rwxr-xr-xengine/time.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/engine/time.asm b/engine/time.asm
index 29c811810..9d1a249c5 100755
--- a/engine/time.asm
+++ b/engine/time.asm
@@ -102,10 +102,10 @@ CheckDailyResetTimer:: ; 11452
ret nc
xor a
ld hl, wDailyFlags
- ld [hli], a
- ld [hli], a
- ld [hli], a
- ld [hl], a
+ ld [hli], a ; wDailyFlags
+ ld [hli], a ; wWeeklyFlags
+ ld [hli], a ; wSwarmFlags
+ ld [hl], a ; wSwarmFlags + 1
ld hl, wDailyRematchFlags
rept 4
ld [hli], a
@@ -227,14 +227,14 @@ CheckUnusedTwoDayTimer: ; 1150c
; unused
ld hl, wDailyFlags
- set 2, [hl]
+ set DAILYFLAGS_FISH_SWARM_F, [hl]
ret
; 11522
; unused
and a
ld hl, wDailyFlags
- bit 2, [hl]
+ bit DAILYFLAGS_FISH_SWARM_F, [hl]
ret nz
scf
ret