summaryrefslogtreecommitdiff
path: root/engine/items/items.asm
diff options
context:
space:
mode:
authorDaniel Harding <corrnondacqb@yahoo.com>2015-07-18 12:29:05 -0500
committerDaniel Harding <corrnondacqb@yahoo.com>2015-07-18 12:29:05 -0500
commit54c1893d579cdf6853c6a64953bae281a6075fe3 (patch)
tree11717604336caa83ddcdb1bd8b1c765d54cf708b /engine/items/items.asm
parenta002d01860a2c5a745e5837c4ff9f5d3c9e110fe (diff)
parentfc9af362ae65d24c66b39ea7759637cc9c1f9b0a (diff)
Merge pull request #104 from YamaArashi/master
fix variable naming
Diffstat (limited to 'engine/items/items.asm')
-rwxr-xr-xengine/items/items.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm
index b65e8f1e..7617ba6c 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -556,11 +556,11 @@ ItemUseSurfboard: ; d9b4 (3:59b4)
jp PrintText
.tryToStopSurfing
xor a
- ld [$ff8c],a
+ ld [hSpriteIndexOrTextID],a
ld d,16 ; talking range in pixels (normal range)
call IsSpriteInFrontOfPlayer2
res 7,[hl]
- ld a,[$ff8c]
+ ld a,[hSpriteIndexOrTextID]
and a ; is there a sprite in the way?
jr nz,.cannotStopSurfing
ld hl,TilePairCollisionsWater