diff options
| author | yenatch <yenatch@gmail.com> | 2015-10-13 19:23:12 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-10-13 19:23:12 -0400 |
| commit | d5f94e9ee5a2f5ec8fb26c29d74c02531fc79c5a (patch) | |
| tree | 003a0d9a296095020d110e3cdc6b2127a3e20e38 /engine/time.asm | |
| parent | 7176eff7aafda5378305a593c459d158ac27601f (diff) | |
| parent | d338a092c5a54d73e3e0a186569cc3b84e61c4ae (diff) | |
Merge pull request #320 from PikalaxALT/master
More labels, including fns responsible for partymon generation
Diffstat (limited to 'engine/time.asm')
| -rwxr-xr-x | engine/time.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/engine/time.asm b/engine/time.asm index d47c4fbaa..8b3f5d758 100755 --- a/engine/time.asm +++ b/engine/time.asm @@ -5,7 +5,7 @@ Function113d6: ; 113d6 Function113da: ; 113da xor a - ld [wdc2d], a + ld [wLuckyNumberDayBuffer], a ld [wdc3a], a ld [wdc1c], a ret @@ -242,28 +242,28 @@ Function11522: ; 11522 ; 1152b Function1152b: ; 1152b - call Function11534 - ld hl, wdc2d + call .GetDaysUntilNextFriday + ld hl, wLuckyNumberDayBuffer jp Function11415 ; 11534 -Function11534: ; 11534 +.GetDaysUntilNextFriday: ; 11534 call GetWeekday ld c, a - ld a, $5 + ld a, FRIDAY sub c - jr z, .asm_1153f - jr nc, .asm_11541 + jr z, .friday_saturday + jr nc, .earlier ; should've done "ret nc" -.asm_1153f - add $7 +.friday_saturday + add 7 -.asm_11541 +.earlier ret ; 11542 Function11542: ; 11542 - ld hl, wdc2d + ld hl, wLuckyNumberDayBuffer jp Function11420 ; 11548 |