diff options
| author | yenatch <yenatch@gmail.com> | 2014-05-26 14:04:56 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2014-05-26 22:04:39 -0700 |
| commit | 40c17c906b2b3f65b3b04b1933b90238a7ac5566 (patch) | |
| tree | 6de26c959808d5a792b692f2300c33557c1dbfab /engine/play_time.asm | |
| parent | Don't hardcode wram sections (except for alignment). (diff) | |
| download | pokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.tar.gz pokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.tar.xz pokeyellow-40c17c906b2b3f65b3b04b1933b90238a7ac5566.zip | |
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".
Label overleads are still an issue.
Diffstat (limited to 'engine/play_time.asm')
| -rwxr-xr-x | engine/play_time.asm | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/engine/play_time.asm b/engine/play_time.asm index 4178e5bf..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,15 +45,15 @@ 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 [hJoyPressed], a |