From 70eac3a1f7a27d5b71b968708f423dbbff6b146c Mon Sep 17 00:00:00 2001 From: Rangi Date: Sun, 30 Aug 2020 23:22:39 -0400 Subject: Factor out data/tilesets/pair_collision_tile_ids.asm --- home/overworld.asm | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'home') 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:: -- cgit v1.3.1-sl0p