summaryrefslogtreecommitdiff
path: root/scripts/seafoamislands3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/seafoamislands3.asm')
-rwxr-xr-xscripts/seafoamislands3.asm28
1 files changed, 13 insertions, 15 deletions
diff --git a/scripts/seafoamislands3.asm b/scripts/seafoamislands3.asm
index a6e00936..aa7b3615 100755
--- a/scripts/seafoamislands3.asm
+++ b/scripts/seafoamislands3.asm
@@ -7,34 +7,32 @@ 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, $11
- call Predef
- ld a, [$d07a]
- ld [$cc4d], a
- ld a, $15
- jp Predef
+ ld a, [wd079]
+ ld [wcc4d], a
+ predef HideObject
+ ld a, [wd07a]
+ ld [wcc4d], a
+ predef_jump ShowObject
.asm_4649e
ld a, $a1
- ld [$d71d], a
+ ld [wd71d], a
ld hl, Seafoam3HolesCoords
jp Func_46981