Use better constants/comments in DST near-midnight checks.

This commit is contained in:
IIMarckus 2014-06-17 04:53:58 -06:00
parent dfe221b9d1
commit 1fbe471b74

View File

@ -28051,7 +28051,7 @@ Function16290: ; 16290
jr .asm_162a4 jr .asm_162a4
.asm_1629f .asm_1629f
call Function16439 call DSTChecks
ld a, $7 ld a, $7
.asm_162a4 .asm_162a4
@ -28261,20 +28261,22 @@ Function16433: ; 16433
ret ret
; 16439 ; 16439
Function16439: ; 16439 DSTChecks: ; 16439
; check the time; avoid changing DST if doing so would change the current day
ld a, [$d4c2] ld a, [$d4c2]
bit 7, a bit 7, a
ld a, [hHours] ld a, [hHours]
jr z, .asm_16447 jr z, .asm_16447
and a and a ; within one hour of 00:00?
jr z, .asm_1644b jr z, .LostBooklet
jr .asm_16468 jr .next
.asm_16447 .asm_16447
cp $17 cp 23 ; within one hour of 23:00?
jr nz, .asm_16468 jr nz, .next
; fallthrough
.asm_1644b .LostBooklet
call Function164ea call Function164ea
bccoord 1, 14 bccoord 1, 14
ld hl, UnknownText_0x164f4 ld hl, UnknownText_0x164f4
@ -28283,11 +28285,11 @@ Function16439: ; 16439
ret c ret c
call Function164ea call Function164ea
bccoord 1, 14 bccoord 1, 14
ld hl, UnknownText_0x164f9 ld hl, LostInstructionBookletText
call Function13e5 call Function13e5
ret ret
.asm_16468 .next
call Function164ea call Function164ea
bccoord 1, 14 bccoord 1, 14
ld a, [$d4c2] ld a, [$d4c2]
@ -28367,8 +28369,9 @@ UnknownText_0x164f4: ; 0x164f4
db "@" db "@"
; 0x164f9 ; 0x164f9
UnknownText_0x164f9: ; 0x164f9 LostInstructionBookletText: ; 0x164f9
; I lost the in- struction booklet for the #GEAR. Come back again in a while. ; I lost the instruction booklet for the POKéGEAR.
; Come back again in a while.
text_jump UnknownText_0x1c60d1 text_jump UnknownText_0x1c60d1
db "@" db "@"
; 0x164fe ; 0x164fe