diff options
| author | YamaArashi <shadow962@live.com> | 2016-06-12 11:51:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-12 11:51:59 -0700 |
| commit | bfaabd08be0a790dff961276d76af3e1af4e6e24 (patch) | |
| tree | 60742e693805fd75031079e8d3b8a87847452d1e /engine/overworld/movement.asm | |
| parent | 2b2c6fefd311101c87845c8c498746dc74bd725f (diff) | |
| parent | 3ab3f4273b1288883a43b64cae4191dfa6d2313e (diff) | |
Merge pull request #135 from YamaArashi/master
sync tileset WRAM labels
Diffstat (limited to 'engine/overworld/movement.asm')
| -rw-r--r-- | engine/overworld/movement.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/overworld/movement.asm b/engine/overworld/movement.asm index 9302b6e3..6d05859e 100644 --- a/engine/overworld/movement.asm +++ b/engine/overworld/movement.asm @@ -589,9 +589,9 @@ CanWalkOntoTile: and a ret .notScripted - ld a, [wTileSetCollisionPtr] + ld a, [wTilesetCollisionPtr] ld l, a - ld a, [wTileSetCollisionPtr+1] + ld a, [wTilesetCollisionPtr+1] ld h, a .tilePassableLoop ld a, [hli] |