diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-03-03 14:27:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-03 14:27:39 -0500 |
| commit | e96330e66a6017f558d83004a15906edf70b2da9 (patch) | |
| tree | eb94f2465355e1ea7988e7d6bc77baf0140e3dbb /data | |
| parent | e671636bba211b30a15b86bf748989b6e61dcf0a (diff) | |
| parent | 79dc22c769a5a84b561884508e2643747cf9ec08 (diff) | |
Merge pull request #608 from Rangi42/master
Identify more collision-related constants and data
Diffstat (limited to 'data')
| -rw-r--r-- | data/collision_permissions.asm | 24 | ||||
| -rw-r--r-- | data/maps/scenes.asm | 2 |
2 files changed, 13 insertions, 13 deletions
diff --git a/data/collision_permissions.asm b/data/collision_permissions.asm index 2307ec98a..82ebb770a 100644 --- a/data/collision_permissions.asm +++ b/data/collision_permissions.asm @@ -183,10 +183,10 @@ TileCollisionTable:: NONTALKABLE LANDTILE ; COLL_LEFT_WALL NONTALKABLE LANDTILE ; COLL_UP_WALL NONTALKABLE LANDTILE ; COLL_DOWN_WALL - NONTALKABLE LANDTILE ; b4 - NONTALKABLE LANDTILE ; b5 - NONTALKABLE LANDTILE ; b6 - NONTALKABLE LANDTILE ; b7 + NONTALKABLE LANDTILE ; COLL_DOWN_RIGHT_WALL + NONTALKABLE LANDTILE ; COLL_DOWN_LEFT_WALL + NONTALKABLE LANDTILE ; COLL_UP_RIGHT_WALL + NONTALKABLE LANDTILE ; COLL_UP_LEFT_WALL NONTALKABLE LANDTILE ; b8 NONTALKABLE LANDTILE ; b9 NONTALKABLE LANDTILE ; ba @@ -195,14 +195,14 @@ TileCollisionTable:: NONTALKABLE LANDTILE ; bd NONTALKABLE LANDTILE ; be NONTALKABLE LANDTILE ; bf - NONTALKABLE WATERTILE ; c0 - NONTALKABLE WATERTILE ; c1 - NONTALKABLE WATERTILE ; c2 - NONTALKABLE WATERTILE ; c3 - NONTALKABLE WATERTILE ; c4 - NONTALKABLE WATERTILE ; c5 - NONTALKABLE WATERTILE ; c6 - NONTALKABLE WATERTILE ; c7 + NONTALKABLE WATERTILE ; COLL_RIGHT_BUOY + NONTALKABLE WATERTILE ; COLL_LEFT_BUOY + NONTALKABLE WATERTILE ; COLL_UP_BUOY + NONTALKABLE WATERTILE ; COLL_DOWN_BUOY + NONTALKABLE WATERTILE ; COLL_DOWN_RIGHT_BUOY + NONTALKABLE WATERTILE ; COLL_DOWN_LEFT_BUOY + NONTALKABLE WATERTILE ; COLL_UP_RIGHT_BUOY + NONTALKABLE WATERTILE ; COLL_UP_LEFT_BUOY NONTALKABLE WATERTILE ; c8 NONTALKABLE WATERTILE ; c9 NONTALKABLE WATERTILE ; ca diff --git a/data/maps/scenes.asm b/data/maps/scenes.asm index 9c820f9a6..0c8f6b750 100644 --- a/data/maps/scenes.asm +++ b/data/maps/scenes.asm @@ -84,4 +84,4 @@ MapScenes:: scene_var MOUNT_MOON_SQUARE, wMountMoonSquareSceneID scene_var MOBILE_TRADE_ROOM, wMobileTradeRoomSceneID scene_var MOBILE_BATTLE_ROOM, wMobileBattleRoomSceneID - db -1 + db -1 ; end |