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 /scripts/lab4.asm | |
| parent | 52ba96f5f4ec53450a0ff6257ea1040d09b7e537 (diff) | |
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>".
Label overleads are still an issue.
Diffstat (limited to 'scripts/lab4.asm')
| -rwxr-xr-x | scripts/lab4.asm | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/lab4.asm b/scripts/lab4.asm index 7bd071ea..a98e8e34 100755 --- a/scripts/lab4.asm +++ b/scripts/lab4.asm @@ -7,8 +7,8 @@ Lab4TextPointers: ; 75d34 (1d:5d34) Lab4Script_75d38: ; 75d38 (1d:5d38) xor a - ld [$cd37], a - ld de, $cc5b + ld [wcd37], a + ld de, wcc5b ld hl, FossilsList .asm_75d42 ld a, [hli] @@ -16,7 +16,7 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) jr z, .asm_75d64 push hl push de - ld [$d11e], a + ld [wd11e], a ld b, a ld a, $1c call Predef ; indirect jump to Func_f8a5 (f8a5 (3:78a5)) @@ -25,11 +25,11 @@ Lab4Script_75d38: ; 75d38 (1d:5d38) ld a, b and a jr z, .asm_75d42 - ld a, [$d11e] + ld a, [wd11e] ld [de], a inc de push hl - ld hl, $cd37 + ld hl, wcd37 inc [hl] pop hl jr .asm_75d42 @@ -46,13 +46,13 @@ FossilsList: ; 75d68 (1d:5d68) Lab4Text1: ; 75d6c (1d:5d6c) db $8 - ld a, [$d7a3] + ld a, [wd7a3] bit 0, a jr nz, .asm_75d96 ; 0x75d72 $22 ld hl, Lab4Text_75dc6 call PrintText call Lab4Script_75d38 - ld a, [$cd37] + ld a, [wcd37] and a jr z, .asm_75d8d ; 0x75d81 $a callba GiveFossilToCinnabarLab @@ -72,14 +72,14 @@ Lab4Text1: ; 75d6c (1d:5d6c) call LoadFossilItemAndMonNameBank1D ld hl, Lab4Text_75dd5 call PrintText - ld hl, $d7a3 + ld hl, wd7a3 set 2, [hl] ld a, [W_FOSSILMON] ld b, a ld c, $1e call GivePokemon jr nc, .asm_75d93 ; 0x75db9 $d8 - ld hl, $d7a3 + ld hl, wd7a3 res 0, [hl] res 1, [hl] res 2, [hl] |