summaryrefslogtreecommitdiff
path: root/engine/predefs7.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2014-05-26 14:04:56 -0700
committeryenatch <yenatch@gmail.com>2014-05-26 22:04:39 -0700
commit40c17c906b2b3f65b3b04b1933b90238a7ac5566 (patch)
tree6de26c959808d5a792b692f2300c33557c1dbfab /engine/predefs7.asm
parent52ba96f5f4ec53450a0ff6257ea1040d09b7e537 (diff)
Remove most static wram addresses. Use labels instead.
For unknown addresses, use "w<address>". Label overleads are still an issue.
Diffstat (limited to 'engine/predefs7.asm')
-rwxr-xr-xengine/predefs7.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/engine/predefs7.asm b/engine/predefs7.asm
index a52a71cc..469fe0c4 100755
--- a/engine/predefs7.asm
+++ b/engine/predefs7.asm
@@ -1,28 +1,28 @@
Func_1c9c6: ; 1c9c6 (7:49c6)
ld hl, WhichFloorText
call PrintText
- ld hl, $cf7b
+ ld hl, wStringBuffer2 + 11
ld a, l
- ld [$cf8b], a
+ ld [wcf8b], a
ld a, h
- ld [$cf8c], a
- ld a, [wListScrollOffset] ; $cc36
+ ld [wcf8c], a
+ ld a, [wListScrollOffset] ; wcc36
push af
xor a
- ld [wCurrentMenuItem], a ; $cc26
- ld [wListScrollOffset], a ; $cc36
- ld [$cf93], a
+ ld [wCurrentMenuItem], a ; wCurrentMenuItem
+ ld [wListScrollOffset], a ; wcc36
+ ld [wcf93], a
ld a, $4
- ld [wListMenuID], a ; $cf94
+ ld [wListMenuID], a ; wListMenuID
call DisplayListMenuID
pop bc
ld a, b
- ld [wListScrollOffset], a ; $cc36
+ ld [wListScrollOffset], a ; wcc36
ret c
- ld hl, $d126
+ ld hl, wd126
set 7, [hl]
- ld hl, $cc5b
- ld a, [wWhichPokemon] ; $cf92
+ ld hl, wcc5b
+ ld a, [wWhichPokemon] ; wWhichPokemon
add a
ld d, $0
ld e, a
@@ -31,7 +31,7 @@ Func_1c9c6: ; 1c9c6 (7:49c6)
ld b, a
ld a, [hl]
ld c, a
- ld hl, $d3af
+ ld hl, wd3af
call Func_1ca0d
Func_1ca0d: ; 1ca0d (7:4a0d)