summaryrefslogtreecommitdiff
path: root/scripts/Route8Gate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Route8Gate.asm')
-rwxr-xr-xscripts/Route8Gate.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/scripts/Route8Gate.asm b/scripts/Route8Gate.asm
index 49f605a2..55443931 100755
--- a/scripts/Route8Gate.asm
+++ b/scripts/Route8Gate.asm
@@ -16,7 +16,7 @@ Route8GateScript_1e1d7:
ld a, $1
ld [wSimulatedJoypadStatesIndex], a
xor a
- ld [wSpriteStateData2 + $06], a
+ ld [wSpritePlayerStateData2MovementByte1], a
ld [wOverrideSimulatedJoypadStatesMask], a
ret
@@ -30,13 +30,13 @@ Route8GateScript0:
ld a, PLAYER_DIR_UP
ld [wPlayerMovingDirection], a
xor a
- ld [hJoyHeld], a
- callba RemoveGuardDrink
- ld a, [$ffdb]
+ ldh [hJoyHeld], a
+ farcall RemoveGuardDrink
+ ldh a, [hItemToRemoveID]
and a
jr nz, .asm_1e220
ld a, $2
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
call DisplayTextID
call Route8GateScript_1e1d7
ld a, $1
@@ -46,13 +46,13 @@ Route8GateScript0:
ld hl, wd728
set 6, [hl]
ld a, $3
- ld [hSpriteIndexOrTextID], a
+ ldh [hSpriteIndexOrTextID], a
jp DisplayTextID
CoordsData_1e22c:
- db 3,2
- db 4,2
- db $ff
+ dbmapcoord 2, 3
+ dbmapcoord 2, 4
+ db -1 ; end
Route8GateScript1:
ld a, [wSimulatedJoypadStatesIndex]