diff options
| author | Daniel Harding <33dannye@gmail.com> | 2020-05-16 21:42:24 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-16 21:42:24 -0500 |
| commit | 8a924f1f783572ff395f617f99546b4c949c8b04 (patch) | |
| tree | 1b6c7de331cb983256651b11b8adf413a3a434f1 /constants/collision_constants.asm | |
| parent | 88d7e9a34a8b610b358cec1ccc6660634ca9ce80 (diff) | |
| parent | ed94962edf1668aba3f60938e8a5ba8040e2a59c (diff) | |
Merge pull request #30 from entrpntr/spring-cleaning
Spring Cleaning
Diffstat (limited to 'constants/collision_constants.asm')
| -rwxr-xr-x | constants/collision_constants.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/constants/collision_constants.asm b/constants/collision_constants.asm index f9724da6..5626cb09 100755 --- a/constants/collision_constants.asm +++ b/constants/collision_constants.asm @@ -1,8 +1,8 @@ ; collision permissions (see data/collision_permissions.asm) -LANDTILE EQU $00 -WATERTILE EQU $01 -WALLTILE EQU $0f -TALK EQU $10 +LAND_TILE EQU $00 +WATER_TILE EQU $01 +WALL_TILE EQU $0f +TALK EQU $10 ; collision data types (see data/tilesets/*_collision.asm) ; TileCollisionTable indexes (see data/collision_permissions.asm) @@ -20,7 +20,7 @@ COLL_TALL_GRASS EQU $18 COLL_CUT_TREE_1A EQU $1a ; unused COLL_LONG_GRASS_1C EQU $1c ; unused COLL_HEADBUTT_TREE_1D EQU $1d ; unused -COLL_WATER_21 EQU $21 ; ??? +COLL_WATER_21 EQU $21 ; unused COLL_ICE EQU $23 COLL_WHIRLPOOL EQU $24 COLL_BUOY EQU $27 |