aboutsummaryrefslogtreecommitdiffstats
path: root/home/play_time.asm
diff options
context:
space:
mode:
authordannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
committerdannye <33dannye@gmail.com>2020-11-04 00:06:44 -0600
commit5647ca687b92954dcf37a6ea6bfbc9a341c32de4 (patch)
treedde1937a1bfdb3a835f4155e1c2eb8f1aaf86f63 /home/play_time.asm
parentMerge pull request #55 from Deokishisu/patch-1 (diff)
downloadpokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.gz
pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.tar.xz
pokeyellow-5647ca687b92954dcf37a6ea6bfbc9a341c32de4.zip
Sync with pokered
Diffstat (limited to 'home/play_time.asm')
-rw-r--r--home/play_time.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/home/play_time.asm b/home/play_time.asm
index 47b2a690..d6c95fbd 100644
--- a/home/play_time.asm
+++ b/home/play_time.asm
@@ -1,10 +1,10 @@
-TrackPlayTime:
+TrackPlayTime::
call CountDownIgnoreInputBitReset
ld hl, wd47a
bit 0, [hl]
jr nz, .maxIGT
- ld a,[wd732]
- bit 0,a
+ ld a, [wd732]
+ bit 0, a
ret z
ld a, [wPlayTimeMaxed]
and a
@@ -66,6 +66,6 @@ CountDownIgnoreInputBitReset:
ld [wd730], a
ret z
xor a
- ld [hJoyPressed], a
- ld [hJoyHeld], a
+ ldh [hJoyPressed], a
+ ldh [hJoyHeld], a
ret