aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/seafoamislands3.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 /scripts/seafoamislands3.asm
parentDon't hardcode wram sections (except for alignment). (diff)
downloadpokeyellow-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 'scripts/seafoamislands3.asm')
-rwxr-xr-xscripts/seafoamislands3.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm
index a6e00936..46f9a74e 100755
--- a/scripts/seafoamislands3.asm
+++ b/scripts/seafoamislands3.asm
@@ -7,34 +7,34 @@ SeafoamIslands3Script: ; 46451 (11:6451)
ld hl, Seafoam3HolesCoords
call CheckBoulderCoords
ret nc
- ld hl, $d880
- ld a, [$cd3d]
+ ld hl, wd880
+ ld a, [wWhichTrade]
cp $1
jr nz, .asm_4647c ; 0x4646c $e
set 0, [hl]
ld a, $db
- ld [$d079], a
+ ld [wd079], a
ld a, $df
- ld [$d07a], a
+ ld [wd07a], a
jr .asm_46488 ; 0x4647a $c
.asm_4647c
set 1, [hl]
ld a, $dc
- ld [$d079], a
+ ld [wd079], a
ld a, $e0
- ld [$d07a], a
+ ld [wd07a], a
.asm_46488
- ld a, [$d079]
- ld [$cc4d], a
+ ld a, [wd079]
+ ld [wcc4d], a
ld a, $11
call Predef
- ld a, [$d07a]
- ld [$cc4d], a
+ ld a, [wd07a]
+ ld [wcc4d], a
ld a, $15
jp Predef
.asm_4649e
ld a, $a1
- ld [$d71d], a
+ ld [wd71d], a
ld hl, Seafoam3HolesCoords
jp Func_46981