aboutsummaryrefslogtreecommitdiffstats
path: root/engine/items
diff options
context:
space:
mode:
authordannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
committerdannye <corrnondacqb@yahoo.com>2016-07-18 01:32:24 -0500
commit7c01509b6b69b4dc33f5d739589d50f26ffd65b0 (patch)
tree89b4000a56c9e3d942666639c83416100f360f88 /engine/items
parentClean up text commands (diff)
parentUse pattern variables in the makefile. (diff)
downloadpokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.tar.gz
pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.tar.xz
pokeyellow-7c01509b6b69b4dc33f5d739589d50f26ffd65b0.zip
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/items')
-rwxr-xr-xengine/items/items.asm2
1 files changed, 1 insertions, 1 deletions
diff --git a/engine/items/items.asm b/engine/items/items.asm
index d3255c0d..42d05981 100755
--- a/engine/items/items.asm
+++ b/engine/items/items.asm
@@ -697,7 +697,7 @@ ItemUseSurfboard:
ld hl,TilePairCollisionsWater
call CheckForTilePairCollisions
jr c,.cannotStopSurfing
- ld hl,wTileSetCollisionPtr ; pointer to list of passable tiles
+ ld hl,wTilesetCollisionPtr ; pointer to list of passable tiles
ld a,[hli]
ld h,[hl]
ld l,a ; hl now points to passable tiles