diff options
| author | IIMarckus <iimarckus@gmail.com> | 2014-06-17 04:53:58 -0600 |
|---|---|---|
| committer | IIMarckus <iimarckus@gmail.com> | 2014-06-17 04:53:58 -0600 |
| commit | 1fbe471b74908be6e89777857bf7407ef427225b (patch) | |
| tree | c689d2bebde56e27e3ae3370f455fdd25a9bc5b1 | |
| parent | dfe221b9d15bd8ff90253d52796d86e5dfd4c222 (diff) | |
Use better constants/comments in DST near-midnight checks.
| -rw-r--r-- | main.asm | 27 |
1 files changed, 15 insertions, 12 deletions
@@ -28051,7 +28051,7 @@ Function16290: ; 16290 jr .asm_162a4 .asm_1629f - call Function16439 + call DSTChecks ld a, $7 .asm_162a4 @@ -28261,20 +28261,22 @@ Function16433: ; 16433 ret ; 16439 -Function16439: ; 16439 +DSTChecks: ; 16439 +; check the time; avoid changing DST if doing so would change the current day ld a, [$d4c2] bit 7, a ld a, [hHours] jr z, .asm_16447 - and a - jr z, .asm_1644b - jr .asm_16468 + and a ; within one hour of 00:00? + jr z, .LostBooklet + jr .next .asm_16447 - cp $17 - jr nz, .asm_16468 + cp 23 ; within one hour of 23:00? + jr nz, .next + ; fallthrough -.asm_1644b +.LostBooklet call Function164ea bccoord 1, 14 ld hl, UnknownText_0x164f4 @@ -28283,11 +28285,11 @@ Function16439: ; 16439 ret c call Function164ea bccoord 1, 14 - ld hl, UnknownText_0x164f9 + ld hl, LostInstructionBookletText call Function13e5 ret -.asm_16468 +.next call Function164ea bccoord 1, 14 ld a, [$d4c2] @@ -28367,8 +28369,9 @@ UnknownText_0x164f4: ; 0x164f4 db "@" ; 0x164f9 -UnknownText_0x164f9: ; 0x164f9 - ; I lost the in- struction booklet for the #GEAR. Come back again in a while. +LostInstructionBookletText: ; 0x164f9 + ; I lost the instruction booklet for the POKéGEAR. + ; Come back again in a while. text_jump UnknownText_0x1c60d1 db "@" ; 0x164fe |