diff options
| author | yenatch <yenatch@gmail.com> | 2016-08-11 15:55:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-11 15:55:32 -0400 |
| commit | 700321a7fb2d6c852ffc91cc0b8867526cb76813 (patch) | |
| tree | 1a81b2ef5a4d7a2e5a9433e990ea178f5083acbf /engine/time.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | 050a0162b89c645c4a2a3ed311c4da791fb3de6c (diff) | |
Merge pull request #342 from PikalaxALT/master
More label interpretations
Diffstat (limited to 'engine/time.asm')
| -rwxr-xr-x | engine/time.asm | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/engine/time.asm b/engine/time.asm index 255346c0a..2112ec35c 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -102,9 +102,9 @@ CheckDailyResetTimer:: ; 11452 ret nc xor a ld hl, DailyFlags -rept 3 ld [hli], a -endr + ld [hli], a + ld [hli], a ld [hl], a ld hl, wDailyRematchFlags rept 4 @@ -374,17 +374,16 @@ CalcHoursDaysSince: ; 115d2 ; 115d6 CalcMinsHoursDaysSince: ; 115d6 -rept 2 inc hl -endr + inc hl xor a jr _CalcMinsHoursDaysSince ; 115db CalcSecsMinsHoursDaysSince: ; 115db -rept 3 inc hl -endr + inc hl + inc hl ld a, [hSeconds] ld c, a sub [hl] |