From a73ced3b692f100a347bf1785d670ff410ad3657 Mon Sep 17 00:00:00 2001 From: Rangi Date: Tue, 25 Feb 2020 19:18:24 -0500 Subject: unused_dark_cave -> unused_johto (goes with the beta Johto town+city maps) --- data/tilesets/unused_dark_cave_collision.asm | 128 --------------------------- data/tilesets/unused_dark_cave_metatiles.bin | Bin 2048 -> 0 bytes data/tilesets/unused_johto_collision.asm | 128 +++++++++++++++++++++++++++ data/tilesets/unused_johto_metatiles.bin | Bin 0 -> 2048 bytes 4 files changed, 128 insertions(+), 128 deletions(-) delete mode 100644 data/tilesets/unused_dark_cave_collision.asm delete mode 100644 data/tilesets/unused_dark_cave_metatiles.bin create mode 100644 data/tilesets/unused_johto_collision.asm create mode 100644 data/tilesets/unused_johto_metatiles.bin (limited to 'data') diff --git a/data/tilesets/unused_dark_cave_collision.asm b/data/tilesets/unused_dark_cave_collision.asm deleted file mode 100644 index 8bbc11f2a..000000000 --- a/data/tilesets/unused_dark_cave_collision.asm +++ /dev/null @@ -1,128 +0,0 @@ - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 - tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 03 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 - tilecoll WALL, WALL, WALL, WALL ; 05 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 - tilecoll WALL, WALL, WALL, WALL ; 08 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 - tilecoll WALL, WALL, WALL, WALL ; 0a - tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d - tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e - tilecoll WALL, WALL, WALL, WALL ; 0f - tilecoll WALL, WALL, WALL, WALL ; 10 - tilecoll WALL, WALL, WALL, WALL ; 11 - tilecoll WALL, WALL, WALL, WALL ; 12 - tilecoll WALL, WALL, WALL, WALL ; 13 - tilecoll WALL, WALL, WALL, DOOR ; 14 - tilecoll WALL, WALL, WALL, WALL ; 15 - tilecoll WALL, WALL, WALL, DOOR ; 16 - tilecoll WALL, WALL, TOWN_MAP, WALL ; 17 - tilecoll WALL, WALL, WALL, WALL ; 18 - tilecoll WALL, WALL, WALL, WALL ; 19 - tilecoll WALL, WALL, WALL, DOOR ; 1a - tilecoll WALL, WALL, TOWN_MAP, WALL ; 1b - tilecoll WALL, WALL, WALL, WALL ; 1c - tilecoll WALL, WALL, DOOR, WALL ; 1d - tilecoll WALL, WALL, WALL, WALL ; 1e - tilecoll WALL, WALL, WALL, WALL ; 1f - tilecoll WALL, WALL, WALL, WALL ; 20 - tilecoll WALL, WALL, WALL, WALL ; 21 - tilecoll WALL, WALL, WALL, WALL ; 22 - tilecoll WALL, WALL, WALL, WALL ; 23 - tilecoll WALL, WALL, WALL, WALL ; 24 - tilecoll WALL, WALL, WALL, WALL ; 25 - tilecoll WALL, WALL, WALL, WALL ; 26 - tilecoll WALL, WALL, WALL, WALL ; 27 - tilecoll WALL, WALL, WALL, DOOR ; 28 - tilecoll WALL, WALL, WALL, WALL ; 29 - tilecoll WALL, WALL, WALL, DOOR ; 2a - tilecoll WALL, WALL, WALL, WALL ; 2b - tilecoll FLOOR, FLOOR, WALL, WALL ; 2c - tilecoll FLOOR, FLOOR, WALL, WALL ; 2d - tilecoll WALL, WALL, WALL, DOOR ; 2e - tilecoll WALL, WALL, WALL, WALL ; 2f - tilecoll BUOY, BUOY, BUOY, WATER_21 ; 30 - tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 31 - tilecoll BUOY, BUOY, WATER_21, BUOY ; 32 - tilecoll FLOOR, FLOOR, WALL, WALL ; 33 - tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 34 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 35 - tilecoll WATER_21, BUOY, WATER_21, BUOY ; 36 - tilecoll WALL, WALL, WALL, WALL ; 37 - tilecoll BUOY, WATER_21, BUOY, BUOY ; 38 - tilecoll WATER_21, WATER_21, BUOY, BUOY ; 39 - tilecoll WATER_21, BUOY, BUOY, BUOY ; 3a - tilecoll WALL, WALL, WALL, WALL ; 3b - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c - tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3d - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f - tilecoll WALL, WALL, WALL, FLOOR ; 40 - tilecoll WALL, WALL, FLOOR, FLOOR ; 41 - tilecoll WALL, WALL, FLOOR, WALL ; 42 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43 - tilecoll WALL, FLOOR, WALL, FLOOR ; 44 - tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 45 - tilecoll FLOOR, WALL, FLOOR, WALL ; 46 - tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 47 - tilecoll WALL, FLOOR, WALL, WALL ; 48 - tilecoll FLOOR, FLOOR, WALL, WALL ; 49 - tilecoll FLOOR, WALL, WALL, WALL ; 4a - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d - tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e - tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 - tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 - tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 54 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 - tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 58 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59 - tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a - tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5b - tilecoll WALL, WALL, WALL, FLOOR ; 5c - tilecoll WALL, WALL, FLOOR, FLOOR ; 5d - tilecoll WALL, WALL, FLOOR, WALL ; 5e - tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 5f - tilecoll WALL, FLOOR, WALL, FLOOR ; 60 - tilecoll WALL, WALL, WALL, WALL ; 61 - tilecoll FLOOR, WALL, FLOOR, WALL ; 62 - tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 63 - tilecoll WALL, FLOOR, WALL, WALL ; 64 - tilecoll FLOOR, FLOOR, WALL, WALL ; 65 - tilecoll FLOOR, WALL, WALL, WALL ; 66 - tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 67 - tilecoll WALL, FLOOR, WALL, FLOOR ; 68 - tilecoll FLOOR, WALL, FLOOR, WALL ; 69 - tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a - tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b - tilecoll WALL, FLOOR, WALL, WALL ; 6c - tilecoll FLOOR, WALL, WALL, WALL ; 6d - tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e - tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f - tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 - tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 - tilecoll FLOOR, FLOOR, WALL, WALL ; 72 - tilecoll FLOOR, FLOOR, DOOR, WALL ; 73 - tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 - tilecoll WALL, WALL, FLOOR, FLOOR ; 75 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 76 - tilecoll WALL, WALL, WALL, WALL ; 77 - tilecoll WALL, WALL, WALL, WALL ; 78 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 79 - tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a - tilecoll WALL, WALL, WALL, WALL ; 7b - tilecoll WALL, WALL, WALL, WALL ; 7c - tilecoll WALL, WALL, WALL, WALL ; 7d - tilecoll WALL, WALL, WALL, WALL ; 7e - tilecoll WALL, WALL, WALL, WALL ; 7f diff --git a/data/tilesets/unused_dark_cave_metatiles.bin b/data/tilesets/unused_dark_cave_metatiles.bin deleted file mode 100644 index b70f1a0e6..000000000 Binary files a/data/tilesets/unused_dark_cave_metatiles.bin and /dev/null differ diff --git a/data/tilesets/unused_johto_collision.asm b/data/tilesets/unused_johto_collision.asm new file mode 100644 index 000000000..8bbc11f2a --- /dev/null +++ b/data/tilesets/unused_johto_collision.asm @@ -0,0 +1,128 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 00 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, WALL, WALL ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WALL, WALL, DOOR ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, DOOR ; 16 + tilecoll WALL, WALL, TOWN_MAP, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, DOOR ; 1a + tilecoll WALL, WALL, TOWN_MAP, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, DOOR, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll WALL, WALL, WALL, DOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, DOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WALL ; 2c + tilecoll FLOOR, FLOOR, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll BUOY, BUOY, BUOY, WATER_21 ; 30 + tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 31 + tilecoll BUOY, BUOY, WATER_21, BUOY ; 32 + tilecoll FLOOR, FLOOR, WALL, WALL ; 33 + tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 34 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 35 + tilecoll WATER_21, BUOY, WATER_21, BUOY ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll BUOY, WATER_21, BUOY, BUOY ; 38 + tilecoll WATER_21, WATER_21, BUOY, BUOY ; 39 + tilecoll WATER_21, BUOY, BUOY, BUOY ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f + tilecoll WALL, WALL, WALL, FLOOR ; 40 + tilecoll WALL, WALL, FLOOR, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, WALL ; 42 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 43 + tilecoll WALL, FLOOR, WALL, FLOOR ; 44 + tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, WALL, FLOOR, WALL ; 46 + tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 47 + tilecoll WALL, FLOOR, WALL, WALL ; 48 + tilecoll FLOOR, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, WALL, WALL, WALL ; 4a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 54 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 58 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59 + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5a + tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5b + tilecoll WALL, WALL, WALL, FLOOR ; 5c + tilecoll WALL, WALL, FLOOR, FLOOR ; 5d + tilecoll WALL, WALL, FLOOR, WALL ; 5e + tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 5f + tilecoll WALL, FLOOR, WALL, FLOOR ; 60 + tilecoll WALL, WALL, WALL, WALL ; 61 + tilecoll FLOOR, WALL, FLOOR, WALL ; 62 + tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 63 + tilecoll WALL, FLOOR, WALL, WALL ; 64 + tilecoll FLOOR, FLOOR, WALL, WALL ; 65 + tilecoll FLOOR, WALL, WALL, WALL ; 66 + tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 67 + tilecoll WALL, FLOOR, WALL, FLOOR ; 68 + tilecoll FLOOR, WALL, FLOOR, WALL ; 69 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b + tilecoll WALL, FLOOR, WALL, WALL ; 6c + tilecoll FLOOR, WALL, WALL, WALL ; 6d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, WALL, WALL ; 72 + tilecoll FLOOR, FLOOR, DOOR, WALL ; 73 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74 + tilecoll WALL, WALL, FLOOR, FLOOR ; 75 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 76 + tilecoll WALL, WALL, WALL, WALL ; 77 + tilecoll WALL, WALL, WALL, WALL ; 78 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 79 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a + tilecoll WALL, WALL, WALL, WALL ; 7b + tilecoll WALL, WALL, WALL, WALL ; 7c + tilecoll WALL, WALL, WALL, WALL ; 7d + tilecoll WALL, WALL, WALL, WALL ; 7e + tilecoll WALL, WALL, WALL, WALL ; 7f diff --git a/data/tilesets/unused_johto_metatiles.bin b/data/tilesets/unused_johto_metatiles.bin new file mode 100644 index 000000000..b70f1a0e6 Binary files /dev/null and b/data/tilesets/unused_johto_metatiles.bin differ -- cgit v1.2.3