diff options
| author | yenatch <yenatch@gmail.com> | 2017-12-12 00:08:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-12 00:08:54 -0500 |
| commit | f6942b9a136b2ee3b25159ebc4d54509a42c5266 (patch) | |
| tree | 0c0bedcd311ab83262e31cf6d9d4c37257143acc /tilesets/collision.asm | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
| parent | 79873a1bfc0e40067c45dc74fbbebf547d177978 (diff) | |
Merge pull request #411 from roukaour/master
Clean up more labels, constants, and file names
Diffstat (limited to 'tilesets/collision.asm')
| -rwxr-xr-x | tilesets/collision.asm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tilesets/collision.asm b/tilesets/collision.asm index 84397cb5d..0d031763d 100755 --- a/tilesets/collision.asm +++ b/tilesets/collision.asm @@ -1,5 +1,8 @@ NONTALKABLE EQUS "db" -TALKABLE EQUS "db TALK +" +TALKABLE EQUS "db TALK +" + +TileCollisionTable:: ; 4ce1f +; entries correspond to collision ids NONTALKABLE LANDTILE ; 00 NONTALKABLE LANDTILE ; 01 NONTALKABLE LANDTILE ; 02 @@ -256,3 +259,4 @@ TALKABLE EQUS "db TALK +" NONTALKABLE LANDTILE ; fd NONTALKABLE LANDTILE ; fe NONTALKABLE WALLTILE ; ff +; 4cf1f |