summaryrefslogtreecommitdiff
path: root/engine/play_time.asm
diff options
context:
space:
mode:
Diffstat (limited to 'engine/play_time.asm')
-rwxr-xr-xengine/play_time.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/engine/play_time.asm b/engine/play_time.asm
index 6eb8bc17..db7d6f67 100755
--- a/engine/play_time.asm
+++ b/engine/play_time.asm
@@ -1,43 +1,43 @@
Func_18dee: ; 18dee (6:4dee)
call Func_18e36
- ld a, [$d732]
+ ld a, [wd732]
bit 0, a
ret z
- ld a, [W_PLAYTIMEMINUTES] ; $da42
+ ld a, [W_PLAYTIMEMINUTES] ; wda42
and a
ret nz
- ld a, [W_PLAYTIMEFRAMES] ; $da45
+ ld a, [W_PLAYTIMEFRAMES] ; wda45
inc a
- ld [W_PLAYTIMEFRAMES], a ; $da45
+ ld [W_PLAYTIMEFRAMES], a ; wda45
cp 60
ret nz
xor a
- ld [W_PLAYTIMEFRAMES], a ; $da45
- ld a, [W_PLAYTIMESECONDS] ; $da44
+ ld [W_PLAYTIMEFRAMES], a ; wda45
+ ld a, [W_PLAYTIMESECONDS] ; wda44
inc a
- ld [W_PLAYTIMESECONDS], a ; $da44
+ ld [W_PLAYTIMESECONDS], a ; wda44
cp 60
ret nz
xor a
- ld [W_PLAYTIMESECONDS], a ; $da44
- ld a, [$da43]
+ ld [W_PLAYTIMESECONDS], a ; wda44
+ ld a, [W_PLAYTIMEMINUTES + 1]
inc a
- ld [$da43], a
+ ld [W_PLAYTIMEMINUTES + 1], a
cp 60
ret nz
xor a
- ld [$da43], a
- ld a, [$da41]
+ ld [W_PLAYTIMEMINUTES + 1], a
+ ld a, [W_PLAYTIMEHOURS + 1]
inc a
- ld [$da41], a
+ ld [W_PLAYTIMEHOURS + 1], a
cp $ff
ret nz
ld a, $ff
- ld [W_PLAYTIMEMINUTES], a ; $da42
+ ld [W_PLAYTIMEMINUTES], a ; wda42
ret
Func_18e36: ; 18e36 (6:4e36)
- ld a, [$d13a]
+ ld a, [wd13a]
and a
jr nz, .asm_18e40
ld a, $ff
@@ -45,17 +45,17 @@ Func_18e36: ; 18e36 (6:4e36)
.asm_18e40
dec a
.asm_18e41
- ld [$d13a], a
+ ld [wd13a], a
and a
ret nz
- ld a, [$d730]
+ ld a, [wd730]
res 1, a
res 2, a
bit 5, a
res 5, a
- ld [$d730], a
+ ld [wd730], a
ret z
xor a
- ld [H_NEWLYPRESSEDBUTTONS], a
- ld [H_CURRENTPRESSEDBUTTONS], a
+ ld [hJoyPressed], a
+ ld [hJoyHeld], a
ret