summaryrefslogtreecommitdiff
path: root/scripts/seafoamislands2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/seafoamislands2.asm')
-rwxr-xr-xscripts/seafoamislands2.asm28
1 files changed, 13 insertions, 15 deletions
diff --git a/scripts/seafoamislands2.asm b/scripts/seafoamislands2.asm
index a20bf497..b14c16d8 100755
--- a/scripts/seafoamislands2.asm
+++ b/scripts/seafoamislands2.asm
@@ -7,34 +7,32 @@ SeafoamIslands2Script: ; 46315 (11:6315)
ld hl, Seafoam2HolesCoords
call CheckBoulderCoords
ret nc
- ld hl, $d87f
- ld a, [$cd3d]
+ ld hl, wd87f
+ ld a, [wWhichTrade]
cp $1
jr nz, .asm_46340 ; 0x46330 $e
set 0, [hl]
ld a, $d9
- ld [$d079], a
+ ld [wd079], a
ld a, $db
- ld [$d07a], a
+ ld [wd07a], a
jr .asm_4634c ; 0x4633e $c
.asm_46340
set 1, [hl]
ld a, $da
- ld [$d079], a
+ ld [wd079], a
ld a, $dc
- ld [$d07a], a
+ ld [wd07a], a
.asm_4634c
- 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_46362
ld a, $a0
- ld [$d71d], a
+ ld [wd71d], a
ld hl, Seafoam2HolesCoords
jp Func_46981