summaryrefslogtreecommitdiff
path: root/home/overworld.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-30 23:22:39 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-30 23:22:39 -0400
commit70eac3a1f7a27d5b71b968708f423dbbff6b146c (patch)
treedecf2bb4024896f2f0ec487b48eab063ba214ca4 /home/overworld.asm
parentb506214f68b3b6cfc75e40373b29961af7cbd6f2 (diff)
Factor out data/tilesets/pair_collision_tile_ids.asm
Diffstat (limited to 'home/overworld.asm')
-rw-r--r--home/overworld.asm25
1 files changed, 1 insertions, 24 deletions
diff --git a/home/overworld.asm b/home/overworld.asm
index 741b8b7e..9d5e42ef 100644
--- a/home/overworld.asm
+++ b/home/overworld.asm
@@ -1345,30 +1345,7 @@ CheckForTilePairCollisions::
and a
ret
-; FORMAT: tileset number, tile 1, tile 2
-; terminated by 0xFF
-; these entries indicate that the player may not cross between tile 1 and tile 2
-; it's mainly used to simulate differences in elevation
-
-TilePairCollisionsLand::
- db CAVERN, $20, $05
- db CAVERN, $41, $05
- db FOREST, $30, $2E
- db CAVERN, $2A, $05
- db CAVERN, $05, $21
- db FOREST, $52, $2E
- db FOREST, $55, $2E
- db FOREST, $56, $2E
- db FOREST, $20, $2E
- db FOREST, $5E, $2E
- db FOREST, $5F, $2E
- db $FF
-
-TilePairCollisionsWater::
- db FOREST, $14, $2E
- db FOREST, $48, $2E
- db CAVERN, $14, $05
- db $FF
+INCLUDE "data/tilesets/pair_collision_tile_ids.asm"
; this builds a tile map from the tile block map based on the current X/Y coordinates of the player's character
LoadCurrentMapView::