diff options
author | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
---|---|---|
committer | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
commit | 98128cd4d8457948e7136a16e08bacff0bc3529d (patch) | |
tree | 171c67509afba62571266bd6bebbfdb829d2a876 /tilesets/collision.asm | |
parent | 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff) | |
parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'tilesets/collision.asm')
-rwxr-xr-x | tilesets/collision.asm | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/tilesets/collision.asm b/tilesets/collision.asm index 29b61feed..84397cb5d 100755 --- a/tilesets/collision.asm +++ b/tilesets/collision.asm @@ -1,9 +1,3 @@ - -; 00 land -; 01 water -; 0f wall -; 11 talkable water -; 1f talkable wall NONTALKABLE EQUS "db" TALKABLE EQUS "db TALK +" NONTALKABLE LANDTILE ; 00 |