diff options
| author | Thomas Winwood <twwinwood@gmail.com> | 2018-07-21 02:06:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-21 02:06:31 +0100 |
| commit | 23ef2f50a7b94c23b50e9e690a7482ac349c9ef3 (patch) | |
| tree | 63c20c67efbdf8334c6e273f78065b83135e3886 /data/collision_permissions.asm | |
| parent | 17a4d0540acc00e3f5ad260009115eb36e72b7d2 (diff) | |
| parent | 2d73d040d16a7836f935a7a6cb2a311aed2ca5a2 (diff) | |
Merge branch 'master' into the-diffening
Diffstat (limited to 'data/collision_permissions.asm')
| -rw-r--r-- | data/collision_permissions.asm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm index 867bacbb0..2307ec98a 100644 --- a/data/collision_permissions.asm +++ b/data/collision_permissions.asm @@ -1,7 +1,7 @@ NONTALKABLE EQUS "db" TALKABLE EQUS "db TALK +" -TileCollisionTable:: ; 4ce1f +TileCollisionTable:: ; entries correspond to COLL_* constants NONTALKABLE LANDTILE ; COLL_FLOOR NONTALKABLE LANDTILE ; COLL_01 @@ -259,4 +259,3 @@ TileCollisionTable:: ; 4ce1f NONTALKABLE LANDTILE ; fd NONTALKABLE LANDTILE ; fe NONTALKABLE WALLTILE ; COLL_FF -; 4cf1f |