summaryrefslogtreecommitdiff
path: root/engine/time.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/time.asm')
-rwxr-xr-xengine/time.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/engine/time.asm b/engine/time.asm
index 9013fd79f..0f83447cc 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
@@ -125,12 +125,12 @@ endr
dec [hl]
jr nz, .DontRestartKenjiBreakCountdown
.RestartKenjiBreakCountdown:
- call Special_SampleKenjiBreakCountdown
+ call SampleKenjiBreakCountdown
.DontRestartKenjiBreakCountdown:
jr RestartDailyResetTimer
; 11485
-Special_SampleKenjiBreakCountdown: ; 11485
+SampleKenjiBreakCountdown: ; 11485
; Generate a random number between 3 and 6
call Random
and %11
@@ -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
@@ -261,7 +261,7 @@ RestartLuckyNumberCountdown: ; 1152b
ret
; 11542
-CheckLuckyNumberShowFlag: ; 11542
+_CheckLuckyNumberShowFlag: ; 11542
ld hl, wLuckyNumberDayBuffer
jp CheckDayDependentEventHL
; 11548