diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-13 19:55:03 -0500 |
| commit | 4b36a9d2e1d6b6ac823fbb14e8f0ba750b0eecc2 (patch) | |
| tree | fcbbd0247503a200c4c1d8df690a676b49a09efd /tilesets | |
| parent | e3ee39f3344107f666099448401d28b04c983cd6 (diff) | |
| parent | a6656a986bf9dde51561cab090648e0117b173ad (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'tilesets')
77 files changed, 2756 insertions, 462 deletions
diff --git a/tilesets/aerodactyl_word_room_collision.asm b/tilesets/aerodactyl_word_room_collision.asm new file mode 100644 index 000000000..138f07143 --- /dev/null +++ b/tilesets/aerodactyl_word_room_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/aerodactyl_word_room_collision.bin b/tilesets/aerodactyl_word_room_collision.bin Binary files differdeleted file mode 100644 index a4da351d3..000000000 --- a/tilesets/aerodactyl_word_room_collision.bin +++ /dev/null diff --git a/tilesets/battle_tower_collision.asm b/tilesets/battle_tower_collision.asm new file mode 100644 index 000000000..908fee326 --- /dev/null +++ b/tilesets/battle_tower_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 09 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll FLOOR, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, WALL, FLOOR, WALL ; 17 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1b + tilecoll WALL, WALL, FLOOR, FLOOR ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f + tilecoll WALL, WALL, FLOOR, WALL ; 20 + tilecoll WALL, WALL, WALL, FLOOR ; 21 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, WALL, WALL ; 25 + tilecoll WALL, FLOOR, FLOOR, DOOR ; 26 + tilecoll WALL, WALL, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll WALL, PC, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll WALL, WALL, WALL, FLOOR ; 2b + tilecoll WALL, WALL, FLOOR, WALL ; 2c + tilecoll FLOOR, FLOOR, FLOOR, DOOR ; 2d + tilecoll FLOOR, FLOOR, DOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, WALL ; 37 + tilecoll WALL, WALL, WALL, FLOOR ; 38 + tilecoll WALL, WALL, FLOOR, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll WALL, WALL, WALL, FLOOR ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll WALL, WALL, FLOOR, WALL ; 3d + tilecoll WALL, WALL, FLOOR, WALL ; 3e + tilecoll WALL, WALL, WALL, FLOOR ; 3f + tilecoll WALL, WALL, FLOOR, WALL ; 40 diff --git a/tilesets/battle_tower_collision.bin b/tilesets/battle_tower_collision.bin Binary files differdeleted file mode 100644 index 5cb2b0eeb..000000000 --- a/tilesets/battle_tower_collision.bin +++ /dev/null diff --git a/tilesets/battle_tower_outside_collision.asm b/tilesets/battle_tower_outside_collision.asm new file mode 100644 index 000000000..3aaa60113 --- /dev/null +++ b/tilesets/battle_tower_outside_collision.asm @@ -0,0 +1,128 @@ + tilecoll 01, 01, 01, 01 ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d + tilecoll FLOOR, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, WALL ; 12 + tilecoll WALL, WALL, DOOR, DOOR ; 13 + tilecoll WALL, WALL, WALL, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll WALL, WALL, DOOR, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 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, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll WALL, FLOOR, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, FLOOR, WALL, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 32 + tilecoll WALL, HEADBUTT_TREE, WALL, HEADBUTT_TREE ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll WHIRLPOOL, FLOOR, WHIRLPOOL, FLOOR ; 35 + tilecoll WHIRLPOOL, FLOOR, FLOOR, FLOOR ; 36 + tilecoll 5B, FLOOR, FLOOR, FLOOR ; 37 + tilecoll 5B, 01, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 41 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 42 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 43 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 44 + tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 45 + tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 46 + tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 47 + tilecoll FLOOR, FLOOR, BRAKE_45, FLOOR ; 48 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 50 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 51 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 52 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 53 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 54 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 55 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 57 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 58 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 59 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 60 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 61 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 62 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 63 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 64 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 65 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 66 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 67 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 68 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 69 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 6f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 70 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 73 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 74 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 77 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 78 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 79 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 diff --git a/tilesets/battle_tower_outside_collision.bin b/tilesets/battle_tower_outside_collision.bin Binary files differdeleted file mode 100644 index 5ca0e3954..000000000 --- a/tilesets/battle_tower_outside_collision.bin +++ /dev/null diff --git a/tilesets/beta_word_room_collision.asm b/tilesets/beta_word_room_collision.asm new file mode 100644 index 000000000..138f07143 --- /dev/null +++ b/tilesets/beta_word_room_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/beta_word_room_collision.bin b/tilesets/beta_word_room_collision.bin Binary files differdeleted file mode 100644 index a4da351d3..000000000 --- a/tilesets/beta_word_room_collision.bin +++ /dev/null diff --git a/tilesets/cave_collision.asm b/tilesets/cave_collision.asm new file mode 100644 index 000000000..3d5e0ae05 --- /dev/null +++ b/tilesets/cave_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 + tilecoll WALL, FLOOR, WALL, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c + tilecoll WALL, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, FLOOR, WALL, WALL ; 0e + tilecoll FLOOR, WALL, WALL, WALL ; 0f + tilecoll WATER, WATER, WATER, WATER ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, WALL, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll FLOOR, WALL, FLOOR, WALL ; 1f + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20 + tilecoll WALL, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, WALL ; 22 + tilecoll FLOOR, WALL, WALL, WALL ; 23 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll WATER, WATER, WATER, WATER ; 26 + tilecoll WATER, WATER, WATER, WATER ; 27 + tilecoll WATER, WATER, WATER, WATER ; 28 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WATER, WATER, WATER, WATER ; 33 + tilecoll WATER, WATER, WATER, WATER ; 34 + tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, WALL, WALL, CAVE ; 38 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d + tilecoll WATER, WATER, WATER, WATER ; 3e + tilecoll WATER, WATER, WATER, WATER ; 3f + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40 diff --git a/tilesets/cave_collision.bin b/tilesets/cave_collision.bin Binary files differdeleted file mode 100644 index 701de1c0b..000000000 --- a/tilesets/cave_collision.bin +++ /dev/null diff --git a/tilesets/celadon_mansion_collision.asm b/tilesets/celadon_mansion_collision.asm new file mode 100644 index 000000000..5db409be7 --- /dev/null +++ b/tilesets/celadon_mansion_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, FLOOR, WALL ; 0b + tilecoll FLOOR, WALL, FLOOR, WALL ; 0c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d + tilecoll WALL, WALL, FLOOR, WALL ; 0e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0f + tilecoll WALL, WALL, BOOKSHELF, INCENSE_BURNER ; 10 + tilecoll WALL, WALL, WALL, WALL ; 11 + tilecoll WALL, WALL, BOOKSHELF, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 16 + tilecoll STAIRCASE, STAIRCASE, FLOOR, FLOOR ; 17 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, BOOKSHELF, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll FLOOR, FLOOR, WALL, WALL ; 1e + tilecoll FLOOR, FLOOR, WALL, WALL ; 1f + tilecoll FLOOR, FLOOR, WALL, WALL ; 20 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll RIGHT_WALL, LEFT_WALL, WALL, FLOOR ; 22 + tilecoll WALL, WALL, FLOOR, WALL ; 23 + tilecoll WALL, WALL, STAIRCASE, LEFT_WALL ; 24 + tilecoll WALL, WALL, WALL, STAIRCASE ; 25 + tilecoll WALL, WALL, LEFT_WALL, FLOOR ; 26 + tilecoll FLOOR, WALL, FLOOR, WALL ; 27 + tilecoll WALL, WALL, DOOR, WALL ; 28 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 29 + tilecoll FLOOR, FLOOR, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll RIGHT_WALL, LEFT_WALL, RIGHT_WALL, LEFT_WALL ; 2d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, WALL, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll WALL, WALL, FLOOR, WALL ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, FLOOR ; 34 + tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll FLOOR, WALL, WALL, WALL ; 36 + tilecoll WALL, WALL, FLOOR, WALL ; 37 + tilecoll WALL, FLOOR, WALL, WALL ; 38 + tilecoll WALL, WALL, FLOOR, WALL ; 39 + tilecoll WALL, FLOOR, WALL, FLOOR ; 3a + tilecoll FLOOR, WALL, FLOOR, WALL ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll WALL, FLOOR, WALL, WALL ; 3e + tilecoll FLOOR, WALL, WALL, WALL ; 3f + tilecoll FLOOR, FLOOR, WALL, WALL ; 40 diff --git a/tilesets/celadon_mansion_collision.bin b/tilesets/celadon_mansion_collision.bin Binary files differdeleted file mode 100644 index a07b03bce..000000000 --- a/tilesets/celadon_mansion_collision.bin +++ /dev/null diff --git a/tilesets/collision.asm b/tilesets/collision.asm deleted file mode 100755 index 0d031763d..000000000 --- a/tilesets/collision.asm +++ /dev/null @@ -1,262 +0,0 @@ -NONTALKABLE EQUS "db" -TALKABLE EQUS "db TALK +" - -TileCollisionTable:: ; 4ce1f -; entries correspond to collision ids - NONTALKABLE LANDTILE ; 00 - NONTALKABLE LANDTILE ; 01 - NONTALKABLE LANDTILE ; 02 - NONTALKABLE LANDTILE ; 03 - NONTALKABLE LANDTILE ; 04 - NONTALKABLE LANDTILE ; 05 - NONTALKABLE LANDTILE ; 06 - NONTALKABLE WALLTILE ; 07 - NONTALKABLE LANDTILE ; 08 - NONTALKABLE LANDTILE ; 09 - NONTALKABLE LANDTILE ; 0a - NONTALKABLE LANDTILE ; 0b - NONTALKABLE LANDTILE ; 0c - NONTALKABLE LANDTILE ; 0d - NONTALKABLE LANDTILE ; 0e - NONTALKABLE WALLTILE ; 0f - NONTALKABLE LANDTILE ; 10 - NONTALKABLE LANDTILE ; 11 - TALKABLE WALLTILE ; 12 - NONTALKABLE LANDTILE ; 13 - NONTALKABLE LANDTILE ; 14 - TALKABLE WALLTILE ; 15 - NONTALKABLE LANDTILE ; 16 - NONTALKABLE LANDTILE ; 17 - NONTALKABLE LANDTILE ; 18 - NONTALKABLE LANDTILE ; 19 - TALKABLE WALLTILE ; 1a - NONTALKABLE LANDTILE ; 1b - NONTALKABLE LANDTILE ; 1c - TALKABLE WALLTILE ; 1d - NONTALKABLE LANDTILE ; 1e - NONTALKABLE LANDTILE ; 1f - NONTALKABLE WATERTILE ; 20 - NONTALKABLE WATERTILE ; 21 - TALKABLE WATERTILE ; 22 - NONTALKABLE LANDTILE ; 23 - TALKABLE WATERTILE ; 24 - NONTALKABLE WATERTILE ; 25 - NONTALKABLE WATERTILE ; 26 - NONTALKABLE WALLTILE ; 27 - NONTALKABLE WATERTILE ; 28 - NONTALKABLE WATERTILE ; 29 - TALKABLE WATERTILE ; 2a - NONTALKABLE LANDTILE ; 2b - TALKABLE WATERTILE ; 2c - NONTALKABLE WATERTILE ; 2d - NONTALKABLE WATERTILE ; 2e - NONTALKABLE WALLTILE ; 2f - NONTALKABLE WATERTILE ; 30 - NONTALKABLE WATERTILE ; 31 - NONTALKABLE WATERTILE ; 32 - NONTALKABLE WATERTILE ; 33 - NONTALKABLE WATERTILE ; 34 - NONTALKABLE WATERTILE ; 35 - NONTALKABLE WATERTILE ; 36 - NONTALKABLE WATERTILE ; 37 - NONTALKABLE WATERTILE ; 38 - NONTALKABLE WATERTILE ; 39 - NONTALKABLE WATERTILE ; 3a - NONTALKABLE WATERTILE ; 3b - NONTALKABLE WATERTILE ; 3c - NONTALKABLE WATERTILE ; 3d - NONTALKABLE WATERTILE ; 3e - NONTALKABLE WATERTILE ; 3f - NONTALKABLE LANDTILE ; 40 - NONTALKABLE LANDTILE ; 41 - NONTALKABLE LANDTILE ; 42 - NONTALKABLE LANDTILE ; 43 - NONTALKABLE LANDTILE ; 44 - NONTALKABLE LANDTILE ; 45 - NONTALKABLE LANDTILE ; 46 - NONTALKABLE LANDTILE ; 47 - NONTALKABLE LANDTILE ; 48 - NONTALKABLE LANDTILE ; 49 - NONTALKABLE LANDTILE ; 4a - NONTALKABLE LANDTILE ; 4b - NONTALKABLE LANDTILE ; 4c - NONTALKABLE LANDTILE ; 4d - NONTALKABLE LANDTILE ; 4e - NONTALKABLE LANDTILE ; 4f - NONTALKABLE LANDTILE ; 50 - NONTALKABLE LANDTILE ; 51 - NONTALKABLE LANDTILE ; 52 - NONTALKABLE LANDTILE ; 53 - NONTALKABLE LANDTILE ; 54 - NONTALKABLE LANDTILE ; 55 - NONTALKABLE LANDTILE ; 56 - NONTALKABLE LANDTILE ; 57 - NONTALKABLE LANDTILE ; 58 - NONTALKABLE LANDTILE ; 59 - NONTALKABLE LANDTILE ; 5a - NONTALKABLE LANDTILE ; 5b - NONTALKABLE LANDTILE ; 5c - NONTALKABLE LANDTILE ; 5d - NONTALKABLE LANDTILE ; 5e - NONTALKABLE LANDTILE ; 5f - NONTALKABLE LANDTILE ; 60 - NONTALKABLE LANDTILE ; 61 - NONTALKABLE WALLTILE ; 62 - NONTALKABLE LANDTILE ; 63 - NONTALKABLE LANDTILE ; 64 - NONTALKABLE LANDTILE ; 65 - NONTALKABLE LANDTILE ; 66 - NONTALKABLE LANDTILE ; 67 - NONTALKABLE LANDTILE ; 68 - NONTALKABLE LANDTILE ; 69 - NONTALKABLE WALLTILE ; 6a - NONTALKABLE LANDTILE ; 6b - NONTALKABLE LANDTILE ; 6c - NONTALKABLE LANDTILE ; 6d - NONTALKABLE LANDTILE ; 6e - NONTALKABLE LANDTILE ; 6f - NONTALKABLE LANDTILE ; 70 - NONTALKABLE LANDTILE ; 71 - NONTALKABLE LANDTILE ; 72 - NONTALKABLE LANDTILE ; 73 - NONTALKABLE LANDTILE ; 74 - NONTALKABLE LANDTILE ; 75 - NONTALKABLE LANDTILE ; 76 - NONTALKABLE LANDTILE ; 77 - NONTALKABLE LANDTILE ; 78 - NONTALKABLE LANDTILE ; 79 - NONTALKABLE LANDTILE ; 7a - NONTALKABLE LANDTILE ; 7b - NONTALKABLE LANDTILE ; 7c - NONTALKABLE LANDTILE ; 7d - NONTALKABLE LANDTILE ; 7e - NONTALKABLE LANDTILE ; 7f - NONTALKABLE WALLTILE ; 80 - NONTALKABLE WALLTILE ; 81 - NONTALKABLE WALLTILE ; 82 - NONTALKABLE WALLTILE ; 83 - NONTALKABLE WALLTILE ; 84 - NONTALKABLE LANDTILE ; 85 - NONTALKABLE LANDTILE ; 86 - NONTALKABLE LANDTILE ; 87 - NONTALKABLE WALLTILE ; 88 - NONTALKABLE WALLTILE ; 89 - NONTALKABLE WALLTILE ; 8a - NONTALKABLE WALLTILE ; 8b - NONTALKABLE WALLTILE ; 8c - NONTALKABLE LANDTILE ; 8d - NONTALKABLE LANDTILE ; 8e - NONTALKABLE LANDTILE ; 8f - NONTALKABLE WALLTILE ; 90 - NONTALKABLE WALLTILE ; 91 - NONTALKABLE WALLTILE ; 92 - NONTALKABLE WALLTILE ; 93 - NONTALKABLE WALLTILE ; 94 - NONTALKABLE WALLTILE ; 95 - NONTALKABLE WALLTILE ; 96 - NONTALKABLE WALLTILE ; 97 - NONTALKABLE WALLTILE ; 98 - NONTALKABLE WALLTILE ; 99 - NONTALKABLE WALLTILE ; 9a - NONTALKABLE WALLTILE ; 9b - NONTALKABLE WALLTILE ; 9c - NONTALKABLE WALLTILE ; 9d - NONTALKABLE WALLTILE ; 9e - NONTALKABLE WALLTILE ; 9f - NONTALKABLE LANDTILE ; a0 - NONTALKABLE LANDTILE ; a1 - NONTALKABLE LANDTILE ; a2 - NONTALKABLE LANDTILE ; a3 - NONTALKABLE LANDTILE ; a4 - NONTALKABLE LANDTILE ; a5 - NONTALKABLE LANDTILE ; a6 - NONTALKABLE LANDTILE ; a7 - NONTALKABLE LANDTILE ; a8 - NONTALKABLE LANDTILE ; a9 - NONTALKABLE LANDTILE ; aa - NONTALKABLE LANDTILE ; ab - NONTALKABLE LANDTILE ; ac - NONTALKABLE LANDTILE ; ad - NONTALKABLE LANDTILE ; ae - NONTALKABLE LANDTILE ; af - NONTALKABLE LANDTILE ; b0 - NONTALKABLE LANDTILE ; b1 - NONTALKABLE LANDTILE ; b2 - NONTALKABLE LANDTILE ; b3 - NONTALKABLE LANDTILE ; b4 - NONTALKABLE LANDTILE ; b5 - NONTALKABLE LANDTILE ; b6 - NONTALKABLE LANDTILE ; b7 - NONTALKABLE LANDTILE ; b8 - NONTALKABLE LANDTILE ; b9 - NONTALKABLE LANDTILE ; ba - NONTALKABLE LANDTILE ; bb - NONTALKABLE LANDTILE ; bc - 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 ; c8 - NONTALKABLE WATERTILE ; c9 - NONTALKABLE WATERTILE ; ca - NONTALKABLE WATERTILE ; cb - NONTALKABLE WATERTILE ; cc - NONTALKABLE WATERTILE ; cd - NONTALKABLE WATERTILE ; ce - NONTALKABLE WATERTILE ; cf - NONTALKABLE LANDTILE ; d0 - NONTALKABLE LANDTILE ; d1 - NONTALKABLE LANDTILE ; d2 - NONTALKABLE LANDTILE ; d3 - NONTALKABLE LANDTILE ; d4 - NONTALKABLE LANDTILE ; d5 - NONTALKABLE LANDTILE ; d6 - NONTALKABLE LANDTILE ; d7 - NONTALKABLE LANDTILE ; d8 - NONTALKABLE LANDTILE ; d9 - NONTALKABLE LANDTILE ; da - NONTALKABLE LANDTILE ; db - NONTALKABLE LANDTILE ; dc - NONTALKABLE LANDTILE ; dd - NONTALKABLE LANDTILE ; de - NONTALKABLE LANDTILE ; df - NONTALKABLE LANDTILE ; e0 - NONTALKABLE LANDTILE ; e1 - NONTALKABLE LANDTILE ; e2 - NONTALKABLE LANDTILE ; e3 - NONTALKABLE LANDTILE ; e4 - NONTALKABLE LANDTILE ; e5 - NONTALKABLE LANDTILE ; e6 - NONTALKABLE LANDTILE ; e7 - NONTALKABLE LANDTILE ; e8 - NONTALKABLE LANDTILE ; e9 - NONTALKABLE LANDTILE ; ea - NONTALKABLE LANDTILE ; eb - NONTALKABLE LANDTILE ; ec - NONTALKABLE LANDTILE ; ed - NONTALKABLE LANDTILE ; ee - NONTALKABLE LANDTILE ; ef - NONTALKABLE LANDTILE ; f0 - NONTALKABLE LANDTILE ; f1 - NONTALKABLE LANDTILE ; f2 - NONTALKABLE LANDTILE ; f3 - NONTALKABLE LANDTILE ; f4 - NONTALKABLE LANDTILE ; f5 - NONTALKABLE LANDTILE ; f6 - NONTALKABLE LANDTILE ; f7 - NONTALKABLE LANDTILE ; f8 - NONTALKABLE LANDTILE ; f9 - NONTALKABLE LANDTILE ; fa - NONTALKABLE LANDTILE ; fb - NONTALKABLE LANDTILE ; fc - NONTALKABLE LANDTILE ; fd - NONTALKABLE LANDTILE ; fe - NONTALKABLE WALLTILE ; ff -; 4cf1f diff --git a/tilesets/data.asm b/tilesets/data.asm index 52f63cb89..7cd1b9072 100644 --- a/tilesets/data.asm +++ b/tilesets/data.asm @@ -14,7 +14,7 @@ INCBIN "tilesets/kanto_metatiles.bin" ; 0x18e06 TilesetKantoColl: ; 0x18e06 -INCBIN "tilesets/kanto_collision.bin" +INCLUDE "tilesets/kanto_collision.asm" ; 0x19006 Tileset0GFX: ; 0x19006 @@ -29,7 +29,7 @@ INCBIN "tilesets/johto_1_metatiles.bin" Tileset0Coll: ; 0x1a40e TilesetJohto1Coll: ; 0x1a40e -INCBIN "tilesets/johto_1_collision.bin" +INCLUDE "tilesets/johto_1_collision.asm" ; 0x1a60e TilesetIcePathGFX: ; 0x1a60e @@ -41,7 +41,7 @@ INCBIN "tilesets/ice_path_metatiles.bin" ; 0x1b33e TilesetIcePathColl: ; 0x1b33e -INCBIN "tilesets/ice_path_collision.bin" +INCLUDE "tilesets/ice_path_collision.asm" ; 0x1b43e TilesetPlayersHouse2FGFX: ; 0x1b43e @@ -53,7 +53,7 @@ INCBIN "tilesets/players_house_2f_metatiles.bin" ; 0x1bcfe TilesetPlayersHouse2FColl: ; 0x1bcfe -INCBIN "tilesets/players_house_2f_collision.bin" +INCLUDE "tilesets/players_house_2f_collision.asm" ; 0x1bdfe @@ -68,7 +68,7 @@ INCBIN "tilesets/pokecenter_metatiles.bin" ; 0x1cb3c TilesetPokecenterColl: ; 0x1cb3c -INCBIN "tilesets/pokecenter_collision.bin" +INCLUDE "tilesets/pokecenter_collision.asm" ; 0x1cc3c TilesetPortGFX: ; 0x1cc3c @@ -80,7 +80,7 @@ INCBIN "tilesets/port_metatiles.bin" ; 0x1d44c TilesetPortColl: ; 0x1d44c -INCBIN "tilesets/port_collision.bin" +INCLUDE "tilesets/port_collision.asm" ; 0x1d54c TilesetPlayersHouseGFX: ; 0x1d54c @@ -92,7 +92,7 @@ INCBIN "tilesets/players_house_metatiles.bin" ; 0x1dd2c TilesetPlayersHouseColl: ; 0x1dd2c -INCBIN "tilesets/players_house_collision.bin" +INCLUDE "tilesets/players_house_collision.asm" ; 0x1de2c TilesetCeladonMansionGFX: ; 0x1de2c @@ -104,7 +104,7 @@ INCBIN "tilesets/celadon_mansion_metatiles.bin" ; 0x1e98c TilesetCeladonMansionColl: ; 0x1e98c -INCBIN "tilesets/celadon_mansion_collision.bin" +INCLUDE "tilesets/celadon_mansion_collision.asm" ; 0x1ea8c TilesetCaveGFX: ; 0x1ea8c @@ -118,7 +118,7 @@ INCBIN "tilesets/cave_metatiles.bin" TilesetCaveColl: ; 0x1f21c TilesetWhirlIslandsColl: ; 0x1f21c -INCBIN "tilesets/cave_collision.bin" +INCLUDE "tilesets/cave_collision.asm" ; 0x1f31c @@ -133,7 +133,7 @@ INCBIN "tilesets/sprout_tower_metatiles.bin" ; 0x20ae1 TilesetSproutTowerColl: ; 0x20ae1 -INCBIN "tilesets/sprout_tower_collision.bin" +INCLUDE "tilesets/sprout_tower_collision.asm" ; 0x20be1 TilesetLabGFX: ; 0x20be1 @@ -145,7 +145,7 @@ INCBIN "tilesets/lab_metatiles.bin" ; 0x217e1 TilesetLabColl: ; 0x217e1 -INCBIN "tilesets/lab_collision.bin" +INCLUDE "tilesets/lab_collision.asm" ; 0x218e1 TilesetMartGFX: ; 0x218e1 @@ -157,7 +157,7 @@ INCBIN "tilesets/mart_metatiles.bin" ; 0x22431 TilesetMartColl: ; 0x22431 -INCBIN "tilesets/mart_collision.bin" +INCLUDE "tilesets/mart_collision.asm" ; 0x22531 TilesetGameCornerGFX: ; 0x22531 @@ -169,7 +169,7 @@ INCBIN "tilesets/game_corner_metatiles.bin" ; 0x22ef1 TilesetGameCornerColl: ; 0x22ef1 -INCBIN "tilesets/game_corner_collision.bin" +INCLUDE "tilesets/game_corner_collision.asm" ; 0x22ff1 TilesetTrainStationGFX: ; 0x22ff1 @@ -181,7 +181,7 @@ INCBIN "tilesets/train_station_metatiles.bin" ; 0x23791 TilesetTrainStationColl: ; 0x23791 -INCBIN "tilesets/train_station_collision.bin" +INCLUDE "tilesets/train_station_collision.asm" ; 0x23891 TilesetIlexForestMeta: ; 0x23891 @@ -200,7 +200,7 @@ INCBIN "tilesets/gym_1_metatiles.bin" ; 0x308e0 TilesetGym1Coll: ; 0x308e0 -INCBIN "tilesets/gym_1_collision.bin" +INCLUDE "tilesets/gym_1_collision.asm" ; 0x309e0 TilesetParkGFX: ; 0x309e0 @@ -212,7 +212,7 @@ INCBIN "tilesets/park_metatiles.bin" ; 0x31280 TilesetParkColl: ; 0x31280 -INCBIN "tilesets/park_collision.bin" +INCLUDE "tilesets/park_collision.asm" ; 0x31380 TilesetRadioTowerGFX: ; 0x31380 @@ -224,7 +224,7 @@ INCBIN "tilesets/radio_tower_metatiles.bin" ; 0x31ce0 TilesetRadioTowerColl: ; 0x31ce0 -INCBIN "tilesets/radio_tower_collision.bin" +INCLUDE "tilesets/radio_tower_collision.asm" ; 0x31de0 TilesetUndergroundGFX: ; 0x31de0 @@ -236,7 +236,7 @@ INCBIN "tilesets/underground_metatiles.bin" ; 0x325b0 TilesetUndergroundColl: ; 0x325b0 -INCBIN "tilesets/underground_collision.bin" +INCLUDE "tilesets/underground_collision.asm" ; 0x326b0 TilesetWhirlIslandsGFX: ; 0x326b0 @@ -248,7 +248,7 @@ INCBIN "tilesets/unused_whirl_islands_metatiles.bin" ; 0x331f0 UnusedTilesetWhirlIslandsColl: ; 0x331f0 -INCBIN "tilesets/unused_whirl_islands_collision.bin" +INCLUDE "tilesets/unused_whirl_islands_collision.asm" ; 0x333f0 @@ -263,7 +263,7 @@ INCBIN "tilesets/pokecom_center_metatiles.bin" ; 0xb4ca0 TilesetPokeComCenterColl: ; 0xb4ca0 -INCBIN "tilesets/pokecom_center_collision.bin" +INCLUDE "tilesets/pokecom_center_collision.asm" ; 0xb4da0 TilesetBattleTowerGFX: ; 0xb4da0 @@ -275,7 +275,7 @@ INCBIN "tilesets/battle_tower_metatiles.bin" ; 0xb54e0 TilesetBattleTowerColl: ; 0xb54e0 -INCBIN "tilesets/battle_tower_collision.bin" +INCLUDE "tilesets/battle_tower_collision.asm" ; 0xb55e0 TilesetGateGFX: ; 0xb55e0 @@ -287,7 +287,7 @@ INCBIN "tilesets/gate_metatiles.bin" ; 0xb5de0 TilesetGateColl: ; 0xb5de0 -INCBIN "tilesets/gate_collision.bin" +INCLUDE "tilesets/gate_collision.asm" ; 0xb5ee0 TilesetJohto2GFX: ; 0xb5ee0 @@ -300,7 +300,7 @@ INCBIN "tilesets/johto_2_metatiles.bin" ; 0xb72e8 TilesetJohto2Coll: ; 0xb72e8 -INCBIN "tilesets/johto_2_collision.bin" +INCLUDE "tilesets/johto_2_collision.asm" ; 0xb74e8 TilesetKurtsHouseGFX: ; 0xb74e8 @@ -312,7 +312,7 @@ INCBIN "tilesets/kurts_house_metatiles.bin" ; 0xb7da8 TilesetKurtsHouseColl: ; 0xb7da8 -INCBIN "tilesets/kurts_house_collision.bin" +INCLUDE "tilesets/kurts_house_collision.asm" ; 0xb7ea8 @@ -331,7 +331,7 @@ INCBIN "tilesets/olivine_gym_metatiles.bin" ; 0xdd050 TilesetOlivineGymColl: ; 0xdd050 -INCBIN "tilesets/olivine_gym_collision.bin" +INCLUDE "tilesets/olivine_gym_collision.asm" ; 0xdd150 TilesetHouse1GFX: ; 0xdd150 @@ -343,7 +343,7 @@ INCBIN "tilesets/house_1_metatiles.bin" ; 0xdda00 TilesetHouse1Coll: ; 0xdda00 -INCBIN "tilesets/house_1_collision.bin" +INCLUDE "tilesets/house_1_collision.asm" ; 0xddb00 TilesetLighthouseGFX: ; 0xddb00 @@ -355,11 +355,11 @@ INCBIN "tilesets/lighthouse_metatiles.bin" ; 0xde370 TilesetLighthouseColl: ; 0xde370 -INCBIN "tilesets/lighthouse_collision.bin" +INCLUDE "tilesets/lighthouse_collision.asm" ; 0xde470 TilesetIlexForestColl: ; 0xde470 -INCBIN "tilesets/ilex_forest_collision.bin" +INCLUDE "tilesets/ilex_forest_collision.asm" ; 0xde570 TilesetPowerPlantGFX: ; 0xde570 @@ -371,7 +371,7 @@ INCBIN "tilesets/power_plant_metatiles.bin" ; 0xded90 TilesetPowerPlantColl: ; 0xded90 -INCBIN "tilesets/power_plant_collision.bin" +INCLUDE "tilesets/power_plant_collision.asm" ; 0xdee90 TilesetBattleTowerOutsideMeta: ; 0xdee90 @@ -379,7 +379,7 @@ INCBIN "tilesets/battle_tower_outside_metatiles.bin" ; 0xdf690 TilesetBattleTowerOutsideColl: ; 0xdf690 -INCBIN "tilesets/battle_tower_outside_collision.bin" +INCLUDE "tilesets/battle_tower_outside_collision.asm" ; 0xdf890 TilesetBetaWordRoomMeta: ; 0xdf890 @@ -391,7 +391,7 @@ TilesetHoOhWordRoomColl: ; 0xdfc90 TilesetKabutoWordRoomColl: ; 0xdfc90 TilesetOmanyteWordRoomColl: ; 0xdfc90 TilesetAerodactylWordRoomColl: ; 0xdfc90 -INCBIN "tilesets/beta_word_room_collision.bin" +INCLUDE "tilesets/beta_word_room_collision.asm" ; 0xdfd90 @@ -411,7 +411,7 @@ INCBIN "tilesets/ruins_of_alph_metatiles.bin" ; 0x1dd5a9 TilesetRuinsOfAlphColl: ; 0x1dd5a9 -INCBIN "tilesets/ruins_of_alph_collision.bin" +INCLUDE "tilesets/ruins_of_alph_collision.asm" ; 0x1dd6a9 diff --git a/tilesets/game_corner_collision.asm b/tilesets/game_corner_collision.asm new file mode 100644 index 000000000..65b99cf54 --- /dev/null +++ b/tilesets/game_corner_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll COUNTER, COUNTER, COUNTER, COUNTER ; 08 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 09 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0a + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d + tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, COUNTER, COUNTER ; 11 + tilecoll WALL, WALL, COUNTER, COUNTER ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WALL, COUNTER, FLOOR ; 14 + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 17 + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 18 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 19 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 1c + tilecoll WALL, WALL, FLOOR, COUNTER ; 1d + tilecoll FLOOR, WALL, FLOOR, WALL ; 1e + tilecoll WALL, FLOOR, WALL, FLOOR ; 1f + tilecoll FLOOR, FLOOR, FLOOR, 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, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, FLOOR, WALL ; 2a + tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll WALL, WALL, FLOOR, WALL ; 2c + tilecoll FLOOR, FLOOR, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll WALL, WALL, WALL, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/game_corner_collision.bin b/tilesets/game_corner_collision.bin Binary files differdeleted file mode 100644 index 2bfcad418..000000000 --- a/tilesets/game_corner_collision.bin +++ /dev/null diff --git a/tilesets/gate_collision.asm b/tilesets/gate_collision.asm new file mode 100644 index 000000000..54cd95d34 --- /dev/null +++ b/tilesets/gate_collision.asm @@ -0,0 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll DOOR, DOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 09 + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 0a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 0c + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 0d + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 0e + tilecoll WALL, WALL, COUNTER, FLOOR ; 0f + tilecoll WALL, WALL, FLOOR, COUNTER ; 10 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 11 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 12 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, COUNTER ; 14 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 + tilecoll FLOOR, FLOOR, WALL, WALL ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 24 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 26 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 29 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 2a + tilecoll DOOR, WALL, FLOOR, FLOOR ; 2b + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2c + tilecoll WALL, WALL, FLOOR, PC ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll DOOR, WALL, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 31 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 32 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 33 + tilecoll COUNTER, FLOOR, FLOOR, WALL ; 34 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll FLOOR, WALL, FLOOR, WALL ; 3b + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 3c + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 3d + tilecoll WALL, WALL, FLOOR, FLOOR ; 3e + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 3f + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40 diff --git a/tilesets/gate_collision.bin b/tilesets/gate_collision.bin Binary files differdeleted file mode 100644 index 5876a3fbe..000000000 --- a/tilesets/gate_collision.bin +++ /dev/null diff --git a/tilesets/gym_1_collision.asm b/tilesets/gym_1_collision.asm new file mode 100644 index 000000000..cc0b705f3 --- /dev/null +++ b/tilesets/gym_1_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 04 + tilecoll WALL, WALL, WALL, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, WALL ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll WALL, FLOOR, WALL, FLOOR ; 09 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0c + tilecoll WALL, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, FLOOR, WALL, WALL ; 0e + tilecoll FLOOR, WALL, WALL, WALL ; 0f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, FLOOR, WALL, FLOOR ; 11 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll LADDER, LADDER, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, WALL, WALL ; 19 + tilecoll FLOOR, FLOOR, WALL, WALL ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll WALL, FLOOR, WALL, WALL ; 1c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1d + tilecoll WALL, FLOOR, WALL, FLOOR ; 1e + tilecoll FLOOR, WALL, FLOOR, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll WALL, WALL, FLOOR, FLOOR ; 22 + tilecoll WALL, WALL, FLOOR, FLOOR ; 23 + tilecoll WALL, WALL, FLOOR, FLOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 + tilecoll FLOOR, WALL, FLOOR, WALL ; 26 + tilecoll WALL, FLOOR, WALL, FLOOR ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 29 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll ICE, ICE, ICE, FLOOR ; 2f + tilecoll ICE, ICE, FLOOR, ICE ; 30 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, ICE, ICE, ICE ; 32 + tilecoll ICE, FLOOR, ICE, ICE ; 33 + tilecoll WALL, WALL, FLOOR, FLOOR ; 34 + tilecoll WALL, WALL, FLOOR, FLOOR ; 35 + tilecoll ICE, WALL, ICE, WALL ; 36 + tilecoll WALL, ICE, WALL, ICE ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll ICE, ICE, ICE, ICE ; 3a + tilecoll WALL, FLOOR, FLOOR, WALL ; 3b + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3c + tilecoll DOOR, DOOR, FLOOR, FLOOR ; 3d + tilecoll WALL, FLOOR, WALL, FLOOR ; 3e + tilecoll WALL, WALL, WALL, WALL ; 3f + tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/tilesets/gym_1_collision.bin b/tilesets/gym_1_collision.bin Binary files differdeleted file mode 100644 index fe8c334f0..000000000 --- a/tilesets/gym_1_collision.bin +++ /dev/null diff --git a/tilesets/ho_oh_word_room_collision.asm b/tilesets/ho_oh_word_room_collision.asm new file mode 100644 index 000000000..138f07143 --- /dev/null +++ b/tilesets/ho_oh_word_room_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/ho_oh_word_room_collision.bin b/tilesets/ho_oh_word_room_collision.bin Binary files differdeleted file mode 100644 index a4da351d3..000000000 --- a/tilesets/ho_oh_word_room_collision.bin +++ /dev/null diff --git a/tilesets/house_1_collision.asm b/tilesets/house_1_collision.asm new file mode 100644 index 000000000..ae5580782 --- /dev/null +++ b/tilesets/house_1_collision.asm @@ -0,0 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 02 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05 + tilecoll WALL, WINDOW, FLOOR, FLOOR ; 06 + tilecoll WALL, FLOOR, WALL, FLOOR ; 07 + tilecoll FLOOR, WALL, FLOOR, WALL ; 08 + tilecoll WALL, WINDOW, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, TOWN_MAP, FLOOR, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, PC, WALL ; 11 + tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 15 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, WARP_CARPET_LEFT, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b + tilecoll WARP_CARPET_LEFT, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, PC ; 1d + tilecoll WALL, WALL, FLOOR, RADIO ; 1e + tilecoll WALL, TOWN_MAP, TV, FLOOR ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll WALL, FLOOR, WALL, FLOOR ; 23 + tilecoll FLOOR, WALL, FLOOR, WALL ; 24 + tilecoll WALL, FLOOR, WALL, FLOOR ; 25 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 26 + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 27 + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll FLOOR, WALL, FLOOR, WALL ; 32 + tilecoll WALL, WINDOW, WALL, WALL ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/house_1_collision.bin b/tilesets/house_1_collision.bin Binary files differdeleted file mode 100644 index e11da7330..000000000 --- a/tilesets/house_1_collision.bin +++ /dev/null diff --git a/tilesets/ice_path_collision.asm b/tilesets/ice_path_collision.asm new file mode 100644 index 000000000..4fd9376ad --- /dev/null +++ b/tilesets/ice_path_collision.asm @@ -0,0 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 + tilecoll WALL, FLOOR, WALL, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll WALL, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, FLOOR, WALL, WALL ; 0e + tilecoll FLOOR, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, WALL ; 17 + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, PIT, FLOOR, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, WALL ; 1d + tilecoll FLOOR, FLOOR, WALL, WALL ; 1e + tilecoll FLOOR, WALL, WALL, WALL ; 1f + tilecoll ICE, ICE, ICE, ICE ; 20 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 24 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 25 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 26 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 27 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 28 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 29 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll WALL, ICE, ICE, ICE ; 2d + tilecoll ICE, ICE, WALL, ICE ; 2e + tilecoll ICE, WALL, ICE, ICE ; 2f + tilecoll ICE, ICE, ICE, WALL ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, WALL, WALL, FLOOR ; 33 + tilecoll WALL, WALL, FLOOR, FLOOR ; 34 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 38 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 39 + tilecoll WALL, FLOOR, WALL, FLOOR ; 3a + tilecoll FLOOR, WALL, FLOOR, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 3e + tilecoll FLOOR, FLOOR, WALL, WALL ; 3f + tilecoll ICE, ICE, ICE, LADDER ; 40 diff --git a/tilesets/ice_path_collision.bin b/tilesets/ice_path_collision.bin Binary files differdeleted file mode 100644 index a4498cbee..000000000 --- a/tilesets/ice_path_collision.bin +++ /dev/null diff --git a/tilesets/ilex_forest_collision.asm b/tilesets/ilex_forest_collision.asm new file mode 100644 index 000000000..70cc72ff1 --- /dev/null +++ b/tilesets/ilex_forest_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WATER, WATER, WATER, WATER ; 03 + tilecoll WATER, WATER, WATER, WATER ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 07 + tilecoll WATER, WATER, WATER, WATER ; 08 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 09 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 0a + tilecoll WATER, WATER, WATER, WATER ; 0b + tilecoll WATER, WATER, WATER, WATER ; 0c + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 0d + tilecoll WATER, WATER, WATER, WATER ; 0e + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 0f + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 10 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 11 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 12 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 13 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 15 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 18 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 19 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 1a + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 1c + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll WALL, WALL, WALL, DOOR ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, FLOOR, WALL, FLOOR ; 29 + tilecoll WALL, FLOOR, WALL, FLOOR ; 2a + tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll WALL, FLOOR, WALL, FLOOR ; 2c + tilecoll WALL, FLOOR, WALL, FLOOR ; 2d + tilecoll WALL, FLOOR, WALL, FLOOR ; 2e + tilecoll WALL, FLOOR, WALL, FLOOR ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 32 + tilecoll WALL, FLOOR, WALL, FLOOR ; 33 + tilecoll WALL, FLOOR, WALL, FLOOR ; 34 + tilecoll WALL, FLOOR, WALL, FLOOR ; 35 + tilecoll WALL, FLOOR, WALL, FLOOR ; 36 + tilecoll WALL, FLOOR, WALL, FLOOR ; 37 + tilecoll WALL, FLOOR, WALL, FLOOR ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll WALL, FLOOR, WALL, FLOOR ; 3a + tilecoll WALL, FLOOR, WALL, FLOOR ; 3b + tilecoll WALL, FLOOR, WALL, FLOOR ; 3c + tilecoll WALL, FLOOR, WALL, FLOOR ; 3d + tilecoll WALL, FLOOR, WALL, FLOOR ; 3e + tilecoll WALL, FLOOR, WALL, FLOOR ; 3f + tilecoll WALL, FLOOR, WALL, FLOOR ; 40 diff --git a/tilesets/ilex_forest_collision.bin b/tilesets/ilex_forest_collision.bin Binary files differdeleted file mode 100644 index 9f66b5fdd..000000000 --- a/tilesets/ilex_forest_collision.bin +++ /dev/null diff --git a/tilesets/johto_1_collision.asm b/tilesets/johto_1_collision.asm new file mode 100644 index 000000000..4d6d2c072 --- /dev/null +++ b/tilesets/johto_1_collision.asm @@ -0,0 +1,128 @@ + tilecoll 01, 01, 01, 01 ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll LADDER, LADDER, LADDER, LADDER ; 07 + tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 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, WALL ; 14 + tilecoll WALL, WALL, WALL, DOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll WALL, WALL, WALL, DOOR ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, DOOR, 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, DOOR, WALL ; 28 + tilecoll WALL, WALL, WALL, DOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2d + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, DOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll BUOY, BUOY, BUOY, WATER ; 31 + tilecoll BUOY, BUOY, WATER, WATER ; 32 + tilecoll BUOY, BUOY, WATER, BUOY ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll BUOY, WATER, BUOY, WATER ; 35 + tilecoll WATER, WATER, WATER, WATER ; 36 + tilecoll WATER, BUOY, WATER, BUOY ; 37 + tilecoll WALL, WALL, WALL, DOOR ; 38 + tilecoll BUOY, WATER, BUOY, BUOY ; 39 + tilecoll WATER, WATER, BUOY, BUOY ; 3a + tilecoll WATER, BUOY, BUOY, BUOY ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 40 + tilecoll WALL, WALL, WALL, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, FLOOR ; 42 + tilecoll WALL, WALL, FLOOR, WALL ; 43 + tilecoll WATER, WATER, WATER, WATER ; 44 + tilecoll WALL, FLOOR, WALL, FLOOR ; 45 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46 + tilecoll FLOOR, WALL, FLOOR, WALL ; 47 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48 + tilecoll WALL, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, FLOOR, WALL, WALL ; 4a + tilecoll FLOOR, WALL, WALL, WALL ; 4b + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WATER, WATER, WATER, WATER ; 55 + tilecoll WATER, WATER, WATER, WATER ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER, WATER, WATER, WATER ; 59 + tilecoll WATER, WATER, WATER, WATER ; 5a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b + tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5c + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5d + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5e + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5f + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 60 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 61 + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 62 + tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 63 + tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 64 + tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65 + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 66 + tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 67 + tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 68 + tilecoll WALL, FLOOR, WALL, FLOOR ; 69 + tilecoll FLOOR, WALL, FLOOR, WALL ; 6a + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c + tilecoll WALL, FLOOR, WALL, WALL ; 6d + tilecoll FLOOR, WALL, WALL, WALL ; 6e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 + tilecoll FLOOR, FLOOR, WALL, WALL ; 73 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 74 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 + tilecoll WALL, WALL, FLOOR, FLOOR ; 76 + tilecoll WATER, WATER, WATER, WATER ; 77 + tilecoll WALL, WALL, DOOR, WALL ; 78 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 79 + tilecoll WATER, WATER, WATER, WATER ; 7a + tilecoll WATER, WATER, WATER, WATER ; 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 + tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/tilesets/johto_1_collision.bin b/tilesets/johto_1_collision.bin Binary files differdeleted file mode 100644 index b3276e1cf..000000000 --- a/tilesets/johto_1_collision.bin +++ /dev/null diff --git a/tilesets/johto_2_collision.asm b/tilesets/johto_2_collision.asm new file mode 100644 index 000000000..40255d744 --- /dev/null +++ b/tilesets/johto_2_collision.asm @@ -0,0 +1,128 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0e + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 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, WALL ; 14 + tilecoll WALL, WALL, WALL, DOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll WALL, WALL, WALL, DOOR ; 17 + tilecoll WALL, WALL, DOOR, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, DOOR, 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, DOOR, WALL ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, DOOR ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 30 + tilecoll BUOY, BUOY, BUOY, WATER ; 31 + tilecoll BUOY, BUOY, WATER, WATER ; 32 + tilecoll BUOY, BUOY, WATER, BUOY ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll BUOY, WATER, BUOY, WATER ; 35 + tilecoll WATER, WATER, WATER, WATER ; 36 + tilecoll WATER, BUOY, WATER, BUOY ; 37 + tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 38 + tilecoll BUOY, WATER, BUOY, BUOY ; 39 + tilecoll WATER, WATER, BUOY, BUOY ; 3a + tilecoll WATER, BUOY, BUOY, BUOY ; 3b + tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 3c + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3d + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 3e + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3f + tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 40 + tilecoll WALL, WALL, WALL, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, FLOOR ; 42 + tilecoll WALL, WALL, FLOOR, WALL ; 43 + tilecoll WATER, WATER, WATER, WATER ; 44 + tilecoll WALL, FLOOR, WALL, FLOOR ; 45 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 46 + tilecoll FLOOR, WALL, FLOOR, WALL ; 47 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 48 + tilecoll WALL, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, FLOOR, WALL, WALL ; 4a + tilecoll FLOOR, WALL, WALL, WALL ; 4b + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WATER, WATER, WATER, WATER ; 55 + tilecoll WATER, WATER, WATER, WATER ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER, WATER, WATER, WATER ; 59 + tilecoll WATER, WATER, WATER, WATER ; 5a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b + tilecoll WALL, WALL, WALL, CAVE ; 5c + tilecoll WALL, FLOOR, WALL, FLOOR ; 5d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 5f + tilecoll WALL, WALL, WALL, WALL ; 60 + tilecoll WATER, WATER, WALL, WALL ; 61 + tilecoll WATER, WATER, WALL, WALL ; 62 + tilecoll WATER, WATER, WALL, WALL ; 63 + tilecoll WATER, WATER, WATER, WATER ; 64 + tilecoll FLOOR, WALL, FLOOR, WALL ; 65 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 66 + tilecoll WALL, FLOOR, WALL, FLOOR ; 67 + tilecoll WALL, WALL, WALL, WALL ; 68 + tilecoll WALL, FLOOR, WALL, FLOOR ; 69 + tilecoll FLOOR, WALL, FLOOR, WALL ; 6a + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c + tilecoll WALL, FLOOR, WALL, WALL ; 6d + tilecoll FLOOR, WALL, WALL, WALL ; 6e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 + tilecoll FLOOR, FLOOR, WALL, WALL ; 73 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 74 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 + tilecoll WALL, WALL, FLOOR, FLOOR ; 76 + tilecoll WATER, WATER, WATER, WATER ; 77 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 78 + tilecoll FLOOR, FLOOR, WALL, WALL ; 79 + tilecoll WATER, WATER, WATER, WATER ; 7a + tilecoll WATER, WATER, WATER, WATER ; 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 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 80 diff --git a/tilesets/johto_2_collision.bin b/tilesets/johto_2_collision.bin Binary files differdeleted file mode 100644 index 6e5addd6d..000000000 --- a/tilesets/johto_2_collision.bin +++ /dev/null diff --git a/tilesets/kabuto_word_room_collision.asm b/tilesets/kabuto_word_room_collision.asm new file mode 100644 index 000000000..138f07143 --- /dev/null +++ b/tilesets/kabuto_word_room_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/kabuto_word_room_collision.bin b/tilesets/kabuto_word_room_collision.bin Binary files differdeleted file mode 100644 index a4da351d3..000000000 --- a/tilesets/kabuto_word_room_collision.bin +++ /dev/null diff --git a/tilesets/kanto_collision.asm b/tilesets/kanto_collision.asm new file mode 100644 index 000000000..9b0f0c275 --- /dev/null +++ b/tilesets/kanto_collision.asm @@ -0,0 +1,128 @@ + tilecoll CUT_TREE, CUT_TREE, CUT_TREE, CUT_TREE ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, DOOR ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 05 + tilecoll LADDER, LADDER, LADDER, LADDER ; 06 + tilecoll FLOOR, FLOOR, CAVE, WALL ; 07 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 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, DOOR, WALL ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, WATER, WALL, WALL ; 15 + tilecoll WATER, WALL, WALL, WALL ; 16 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 17 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 18 + tilecoll WALL, WATER, WALL, WATER ; 19 + tilecoll WATER, WALL, WATER, WALL ; 1a + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, FLOOR, WALL, WALL ; 1d + tilecoll WATER, WATER, WATER, WATER ; 1e + tilecoll WATER, WATER, WATER, WATER ; 1f + tilecoll WATER, WATER, WATER, WATER ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll WALL, FLOOR, WALL, WALL ; 25 + tilecoll FLOOR, WALL, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, FLOOR, WALL, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, WALL ; 2a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll WATER, WATER, WATER, WATER ; 2e + tilecoll WATER, WATER, WATER, WATER ; 2f + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll WALL, CUT_TREE, WALL, FLOOR ; 33 + tilecoll WALL, WALL, FLOOR, CUT_TREE ; 34 + tilecoll CUT_TREE, FLOOR, WALL, WALL ; 35 + tilecoll FLOOR, CUT_TREE, WALL, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, WALL ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 + tilecoll FLOOR, FLOOR, WALL, WALL ; 39 + tilecoll FLOOR, FLOOR, WALL, WALL ; 3a + tilecoll WALL, WALL, DOOR, WALL ; 3b + tilecoll UP_WALL, WALL, FLOOR, WALL ; 3c + tilecoll WALL, WALL, WALL, DOOR ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e + tilecoll WALL, UP_WALL, WALL, FLOOR ; 3f + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 40 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 41 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 42 + tilecoll HOP_DOWN, WALL, WALL, WALL ; 43 + tilecoll WATER, WATER, WATER, WATER ; 44 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 45 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 46 + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 47 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 48 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 49 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 4b + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 4c + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4d + tilecoll FLOOR, WALL, FLOOR, WALL ; 4e + tilecoll WALL, FLOOR, WALL, FLOOR ; 4f + tilecoll FLOOR, WALL, WALL, WALL ; 50 + tilecoll WALL, FLOOR, WALL, WALL ; 51 + tilecoll WALL, WALL, FLOOR, FLOOR ; 52 + tilecoll FLOOR, FLOOR, WALL, WALL ; 53 + tilecoll WALL, WALL, WALL, DOOR ; 54 + tilecoll WALL, WALL, WALL, WALL ; 55 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 56 + tilecoll FLOOR, FLOOR, WALL, WALL ; 57 + tilecoll FLOOR, FLOOR, WALL, WALL ; 58 + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 59 + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 5a + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 5b + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 5c + tilecoll FLOOR, HOP_DOWN, FLOOR, WALL ; 5d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 5f + tilecoll FLOOR, WALL, FLOOR, WALL ; 60 + tilecoll FLOOR, WALL, CUT_TREE, WALL ; 61 + tilecoll FLOOR, FLOOR, WALL, WALL ; 62 + tilecoll WALL, WALL, WALL, FLOOR ; 63 + tilecoll WALL, WALL, FLOOR, WALL ; 64 + tilecoll WATER, WATER, WATER, WATER ; 65 + tilecoll WATER, WATER, WATER, WATER ; 66 + tilecoll WALL, WALL, WALL, WALL ; 67 + tilecoll WALL, WATER, WALL, WATER ; 68 + tilecoll WALL, WALL, WALL, WALL ; 69 + tilecoll WALL, WALL, WALL, WALL ; 6a + tilecoll WATER, WALL, WATER, WALL ; 6b + tilecoll WATER, WATER, WALL, WALL ; 6c + tilecoll WALL, WALL, FLOOR, FLOOR ; 6d + tilecoll WALL, FLOOR, WALL, FLOOR ; 6e + tilecoll FLOOR, WALL, FLOOR, WALL ; 6f + tilecoll FLOOR, FLOOR, WALL, WALL ; 70 + tilecoll FLOOR, WALL, CAVE, WALL ; 71 + tilecoll WALL, WALL, WALL, WALL ; 72 + tilecoll WALL, WALL, WALL, WALL ; 73 + tilecoll WALL, WALL, WALL, WALL ; 74 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 75 + tilecoll WALL, WALL, WALL, WALL ; 76 + tilecoll WALL, WALL, WALL, WALL ; 77 + tilecoll FLOOR, FLOOR, WALL, WALL ; 78 + tilecoll WATER, WATER, WATER, WATER ; 79 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7a + tilecoll WALL, WALL, WALL, WALL ; 7b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 7c + tilecoll WALL, WALL, WALL, DOOR ; 7d + tilecoll WALL, WALL, WALL, WALL ; 7e + tilecoll WALL, WALL, WALL, WALL ; 7f + tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/tilesets/kanto_collision.bin b/tilesets/kanto_collision.bin Binary files differdeleted file mode 100644 index f0038d731..000000000 --- a/tilesets/kanto_collision.bin +++ /dev/null diff --git a/tilesets/kurts_house_collision.asm b/tilesets/kurts_house_collision.asm new file mode 100644 index 000000000..95cb1c21d --- /dev/null +++ b/tilesets/kurts_house_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, RADIO, FLOOR ; 02 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll WALL, FLOOR, WALL, FLOOR ; 0c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 12 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 13 + tilecoll WALL, WALL, INCENSE_BURNER, BOOKSHELF ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 22 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 23 + tilecoll WALL, WALL, RADIO, FLOOR ; 24 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, WALL, WALL ; 27 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, HOP_DOWN, HOP_DOWN ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, FLOOR ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, FLOOR ; 34 + tilecoll WALL, WALL, WALL, FLOOR ; 35 + tilecoll WALL, WALL, FLOOR, FLOOR ; 36 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, WALL ; 38 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 39 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 3a + tilecoll 04, 03, 03, 03 ; 3b + tilecoll 03, 03, 03, 03 ; 3c + tilecoll 03, 03, 04, 04 ; 3d + tilecoll 04, 04, 04, 04 ; 3e + tilecoll 03, 03, 03, 03 ; 3f + tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 40 diff --git a/tilesets/kurts_house_collision.bin b/tilesets/kurts_house_collision.bin Binary files differdeleted file mode 100644 index 499a1d071..000000000 --- a/tilesets/kurts_house_collision.bin +++ /dev/null diff --git a/tilesets/lab_collision.asm b/tilesets/lab_collision.asm new file mode 100644 index 000000000..436c8e0a7 --- /dev/null +++ b/tilesets/lab_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, WALL, WALL ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll WALL, WALL, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 0f + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 15 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, FLOOR, WALL, FLOOR ; 1e + tilecoll FLOOR, WALL, FLOOR, WALL ; 1f + tilecoll FLOOR, FLOOR, WALL, WALL ; 20 + tilecoll WINDOW, WINDOW, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, WALL, WALL ; 22 + tilecoll WALL, WALL, WALL, WALL ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll WALL, WALL, FLOOR, FLOOR ; 2b + tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/lab_collision.bin b/tilesets/lab_collision.bin Binary files differdeleted file mode 100644 index 4396125f0..000000000 --- a/tilesets/lab_collision.bin +++ /dev/null diff --git a/tilesets/lighthouse_collision.asm b/tilesets/lighthouse_collision.asm new file mode 100644 index 000000000..05b6cd614 --- /dev/null +++ b/tilesets/lighthouse_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll WALL, WALL, WALL, WALL ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll FLOOR, FLOOR, WALL, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll 9C, FLOOR, COUNTER, FLOOR ; 11 + tilecoll WALL, WALL, WALL, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, WARP_CARPET_DOWN, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll 9C, FLOOR, COUNTER, FLOOR ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll WALL, WALL, WALL, STAIRCASE ; 1a + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 1b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, WALL ; 22 + tilecoll WALL, FLOOR, WALL, WALL ; 23 + tilecoll FLOOR, WALL, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, PIT, PIT ; 29 + tilecoll WALL, WALL, WINDOW, WINDOW ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll WALL, WALL, FLOOR, FLOOR ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2f + tilecoll WALL, WALL, WALL, BOOKSHELF ; 30 + tilecoll WALL, WALL, FLOOR, WALL ; 31 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WALL, FLOOR, WALL, FLOOR ; 34 + tilecoll WALL, WALL, PC, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 + tilecoll WALL, WALL, FLOOR, WALL ; 39 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll WALL, WALL, WINDOW, WALL ; 3e + tilecoll WALL, WALL, WALL, WALL ; 3f + tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/tilesets/lighthouse_collision.bin b/tilesets/lighthouse_collision.bin Binary files differdeleted file mode 100644 index f15ac266a..000000000 --- a/tilesets/lighthouse_collision.bin +++ /dev/null diff --git a/tilesets/mart_collision.asm b/tilesets/mart_collision.asm new file mode 100644 index 000000000..80076ac3f --- /dev/null +++ b/tilesets/mart_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, COUNTER ; 09 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, COUNTER, FLOOR ; 0b + tilecoll WALL, FLOOR, WALL, FLOOR ; 0c + tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 0d + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 0e + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 0f + tilecoll FLOOR, WALL, WALL, WALL ; 10 + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 11 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 12 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 13 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 14 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 15 + tilecoll WALL, WALL, MART_SHELF, MART_SHELF ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, COUNTER ; 18 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1a + tilecoll COUNTER, COUNTER, COUNTER, FLOOR ; 1b + tilecoll COUNTER, COUNTER, FLOOR, COUNTER ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 1f + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 20 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll WALL, WALL, WALL, WALL ; 22 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 23 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 26 + tilecoll WALL, WALL, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, COUNTER, MART_SHELF ; 28 + tilecoll FLOOR, MART_SHELF, FLOOR, MART_SHELF ; 29 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll COUNTER, COUNTER, FLOOR, MART_SHELF ; 2d + tilecoll FLOOR, MART_SHELF, COUNTER, COUNTER ; 2e + tilecoll COUNTER, FLOOR, COUNTER, COUNTER ; 2f + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WALL, FLOOR, WALL, WALL ; 34 + tilecoll FLOOR, FLOOR, WALL, WALL ; 35 + tilecoll FLOOR, WALL, WALL, WALL ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll FLOOR, WALL, FLOOR, WALL ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, STAIRCASE ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/tilesets/mart_collision.bin b/tilesets/mart_collision.bin Binary files differdeleted file mode 100644 index 0f8763b7b..000000000 --- a/tilesets/mart_collision.bin +++ /dev/null diff --git a/tilesets/ob.pal b/tilesets/ob.pal index bb7db6ab0..a6e20d7f0 100644 --- a/tilesets/ob.pal +++ b/tilesets/ob.pal @@ -1,171 +1,39 @@ -; morn + ; morn + RGB 28,31,16, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 28,31,16, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 28,31,16, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 28,31,16, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 28,31,16, 31,19,10, 30,10,06, 00,00,00 ; pink + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver + RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree + RGB 28,31,16, 24,18,07, 20,15,03, 07,07,07 ; rock -; red - RGB 28, 31, 16 - RGB 31, 19, 10 - RGB 31, 07, 01 - RGB 00, 00, 00 -; blue - RGB 28, 31, 16 - RGB 31, 19, 10 - RGB 10, 09, 31 - RGB 00, 00, 00 -; green - RGB 28, 31, 16 - RGB 31, 19, 10 - RGB 07, 23, 03 - RGB 00, 00, 00 -; brown - RGB 28, 31, 16 - RGB 31, 19, 10 - RGB 15, 10, 03 - RGB 00, 00, 00 -; pink - RGB 28, 31, 16 - RGB 31, 19, 10 - RGB 30, 10, 06 - RGB 00, 00, 00 -; silver - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 13, 13, 13 - RGB 00, 00, 00 -; tree - RGB 22, 31, 10 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 07, 07, 07 -; rock - RGB 28, 31, 16 - RGB 24, 18, 07 - RGB 20, 15, 03 - RGB 07, 07, 07 + ; day + RGB 27,31,27, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 27,31,27, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 27,31,27, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 27,31,27, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 27,31,27, 31,19,10, 30,10,06, 00,00,00 ; pink + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver + RGB 22,31,10, 12,25,01, 05,14,00, 07,07,07 ; tree + RGB 27,31,27, 24,18,07, 20,15,03, 07,07,07 ; rock -; day + ; nite + RGB 15,14,24, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 15,14,24, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 15,14,24, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 15,14,24, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 15,14,24, 31,19,10, 30,10,06, 00,00,00 ; pink + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver + RGB 15,14,24, 08,13,19, 00,11,13, 00,00,00 ; tree + RGB 15,14,24, 12,09,15, 08,04,05, 00,00,00 ; rock -; red - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 31, 07, 01 - RGB 00, 00, 00 -; blue - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 10, 09, 31 - RGB 00, 00, 00 -; green - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 07, 23, 03 - RGB 00, 00, 00 -; brown - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 15, 10, 03 - RGB 00, 00, 00 -; pink - RGB 27, 31, 27 - RGB 31, 19, 10 - RGB 30, 10, 06 - RGB 00, 00, 00 -; silver - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 13, 13, 13 - RGB 00, 00, 00 -; tree - RGB 22, 31, 10 - RGB 12, 25, 01 - RGB 05, 14, 00 - RGB 07, 07, 07 -; rock - RGB 27, 31, 27 - RGB 24, 18, 07 - RGB 20, 15, 03 - RGB 07, 07, 07 - -; nite - -; red - RGB 15, 14, 24 - RGB 31, 19, 10 - RGB 31, 07, 01 - RGB 00, 00, 00 -; blue - RGB 15, 14, 24 - RGB 31, 19, 10 - RGB 10, 09, 31 - RGB 00, 00, 00 -; green - RGB 15, 14, 24 - RGB 31, 19, 10 - RGB 07, 23, 03 - RGB 00, 00, 00 -; brown - RGB 15, 14, 24 - RGB 31, 19, 10 - RGB 15, 10, 03 - RGB 00, 00, 00 -; pink - RGB 15, 14, 24 - RGB 31, 19, 10 - RGB 30, 10, 06 - RGB 00, 00, 00 -; silver - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 13, 13, 13 - RGB 00, 00, 00 -; tree - RGB 15, 14, 24 - RGB 08, 13, 19 - RGB 00, 11, 13 - RGB 00, 00, 00 -; rock - RGB 15, 14, 24 - RGB 12, 09, 15 - RGB 08, 04, 05 - RGB 00, 00, 00 - -; dark - -; red - RGB 01, 01, 02 - RGB 31, 19, 10 - RGB 31, 07, 01 - RGB 00, 00, 00 -; blue - RGB 01, 01, 02 - RGB 31, 19, 10 - RGB 10, 09, 31 - RGB 00, 00, 00 -; green - RGB 01, 01, 02 - RGB 31, 19, 10 - RGB 07, 23, 03 - RGB 00, 00, 00 -; brown - RGB 01, 01, 02 - RGB 31, 19, 10 - RGB 15, 10, 03 - RGB 00, 00, 00 -; pink - RGB 01, 01, 02 - RGB 31, 19, 10 - RGB 30, 10, 06 - RGB 00, 00, 00 -; silver - RGB 31, 31, 31 - RGB 31, 31, 31 - RGB 13, 13, 13 - RGB 00, 00, 00 -; tree - RGB 01, 01, 02 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 -; rock - RGB 01, 01, 02 - RGB 00, 00, 00 - RGB 00, 00, 00 - RGB 00, 00, 00 + ; dark + RGB 01,01,02, 31,19,10, 31,07,01, 00,00,00 ; red + RGB 01,01,02, 31,19,10, 10,09,31, 00,00,00 ; blue + RGB 01,01,02, 31,19,10, 07,23,03, 00,00,00 ; green + RGB 01,01,02, 31,19,10, 15,10,03, 00,00,00 ; brown + RGB 01,01,02, 31,19,10, 30,10,06, 00,00,00 ; pink + RGB 31,31,31, 31,31,31, 13,13,13, 00,00,00 ; silver + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; tree + RGB 01,01,02, 00,00,00, 00,00,00, 00,00,00 ; rock diff --git a/tilesets/olivine_gym_collision.asm b/tilesets/olivine_gym_collision.asm new file mode 100644 index 000000000..351f76f61 --- /dev/null +++ b/tilesets/olivine_gym_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, FLOOR, WALL ; 02 + tilecoll WALL, WALL, WALL, FLOOR ; 03 + tilecoll FLOOR, FLOOR, WALL, WALL ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll WALL, WALL, COUNTER, FLOOR ; 06 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 07 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 08 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 09 + tilecoll WALL, FLOOR, FLOOR, WALL ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WALL, WALL, LADDER, LADDER ; 0c + tilecoll WALL, WALL, FLOOR, FLOOR ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, WALL ; 14 + tilecoll WALL, FLOOR, WALL, WALL ; 15 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, WALL, WALL ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 + tilecoll WALL, FLOOR, WALL, FLOOR ; 19 + tilecoll FLOOR, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll WALL, UP_WALL, WALL, FLOOR ; 1d + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 1e + tilecoll UP_WALL, WALL, FLOOR, WALL ; 1f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 + tilecoll WALL, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, WALL, WALL, WALL ; 23 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 24 + tilecoll WALL, FLOOR, WALL, FLOOR ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll FLOOR, WALL, FLOOR, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, WALL, FLOOR, WALL ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll WALL, WALL, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, WALL, WALL ; 35 + tilecoll WALL, FLOOR, WALL, FLOOR ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll FLOOR, WALL, WALL, WALL ; 38 + tilecoll WALL, FLOOR, WALL, FLOOR ; 39 + tilecoll FLOOR, WALL, FLOOR, WALL ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll WALL, FLOOR, WALL, WALL ; 3f + tilecoll FLOOR, WALL, WALL, WALL ; 40 diff --git a/tilesets/olivine_gym_collision.bin b/tilesets/olivine_gym_collision.bin Binary files differdeleted file mode 100644 index cf77d603e..000000000 --- a/tilesets/olivine_gym_collision.bin +++ /dev/null diff --git a/tilesets/omanyte_word_room_collision.asm b/tilesets/omanyte_word_room_collision.asm new file mode 100644 index 000000000..138f07143 --- /dev/null +++ b/tilesets/omanyte_word_room_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, WALL, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, FLOOR ; 17 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, WALL ; 1a + tilecoll WALL, FLOOR, WALL, FLOOR ; 1b + tilecoll FLOOR, WALL, FLOOR, WALL ; 1c + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 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 FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/omanyte_word_room_collision.bin b/tilesets/omanyte_word_room_collision.bin Binary files differdeleted file mode 100644 index a4da351d3..000000000 --- a/tilesets/omanyte_word_room_collision.bin +++ /dev/null diff --git a/tilesets/park_collision.asm b/tilesets/park_collision.asm new file mode 100644 index 000000000..c5965e0c9 --- /dev/null +++ b/tilesets/park_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, WALL, WALL ; 07 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll WALL, WALL, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0b + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0c + tilecoll WALL, WALL, WALL, WALL ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e + tilecoll WALL, WALL, FLOOR, FLOOR ; 0f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 10 + tilecoll WALL, WALL, WALL, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, FLOOR, WALL ; 13 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 14 + tilecoll WALL, FLOOR, WALL, FLOOR ; 15 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16 + tilecoll FLOOR, WALL, FLOOR, WALL ; 17 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 18 + tilecoll WALL, FLOOR, WALL, WALL ; 19 + tilecoll FLOOR, FLOOR, WALL, WALL ; 1a + tilecoll FLOOR, WALL, WALL, WALL ; 1b + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, WALL, WALL, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, WALL ; 1f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 20 + tilecoll WALL, FLOOR, WALL, FLOOR ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll WALL, FLOOR, WALL, WALL ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll FLOOR, WALL, WALL, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 34 + tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 36 + tilecoll WALL, WALL, WALL, WALL ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e + tilecoll WALL, WALL, WALL, WALL ; 3f + tilecoll LONG_GRASS, LONG_GRASS, LONG_GRASS, LONG_GRASS ; 40 diff --git a/tilesets/park_collision.bin b/tilesets/park_collision.bin Binary files differdeleted file mode 100644 index 29e6fa56d..000000000 --- a/tilesets/park_collision.bin +++ /dev/null diff --git a/tilesets/players_house_2f_collision.asm b/tilesets/players_house_2f_collision.asm new file mode 100644 index 000000000..464d80b83 --- /dev/null +++ b/tilesets/players_house_2f_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, TV, BOOKSHELF ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, WALL, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, WALL, FLOOR, FLOOR ; 0f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll WALL, WALL, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 17 + tilecoll WALL, WALL, FLOOR, FLOOR ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll WALL, FLOOR, WALL, FLOOR ; 1e + tilecoll WALL, FLOOR, WALL, FLOOR ; 1f + tilecoll TOWN_MAP, STAIRCASE, FLOOR, FLOOR ; 20 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 24 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 25 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 26 + tilecoll FF, FF, FF, FF ; 27 + tilecoll FF, FF, FF, FF ; 28 + tilecoll FF, FF, FF, FF ; 29 + tilecoll FF, FF, FF, FF ; 2a + tilecoll FF, FF, FF, FF ; 2b + tilecoll FF, FF, FF, FF ; 2c + tilecoll FF, FF, FF, FF ; 2d + tilecoll FF, FF, FF, FF ; 2e + tilecoll FF, FF, FF, FF ; 2f + tilecoll FF, FF, FF, FF ; 30 + tilecoll FF, FF, FF, FF ; 31 + tilecoll FF, FF, FF, FF ; 32 + tilecoll FF, FF, FF, FF ; 33 + tilecoll FF, FF, FF, FF ; 34 + tilecoll FF, FF, FF, FF ; 35 + tilecoll FF, FF, FF, FF ; 36 + tilecoll FF, FF, FF, FF ; 37 + tilecoll FF, FF, FF, FF ; 38 + tilecoll FF, FF, FF, FF ; 39 + tilecoll FF, FF, FF, FF ; 3a + tilecoll FF, FF, FF, FF ; 3b + tilecoll FF, FF, FF, FF ; 3c + tilecoll FF, FF, FF, FF ; 3d + tilecoll FF, FF, FF, FF ; 3e + tilecoll FF, FF, FF, FF ; 3f + tilecoll FF, FF, FF, FF ; 40 diff --git a/tilesets/players_house_2f_collision.bin b/tilesets/players_house_2f_collision.bin Binary files differdeleted file mode 100644 index 9ceb978ab..000000000 --- a/tilesets/players_house_2f_collision.bin +++ /dev/null diff --git a/tilesets/players_house_collision.asm b/tilesets/players_house_collision.asm new file mode 100644 index 000000000..ed6b70a29 --- /dev/null +++ b/tilesets/players_house_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WINDOW, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, TV ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, WALL ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 09 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 0a + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0b + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0d + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, PC, FLOOR ; 11 + tilecoll WALL, WALL, TV, WALL ; 12 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 13 + tilecoll FLOOR, TV, FLOOR, WALL ; 14 + tilecoll FLOOR, WALL, FLOOR, WALL ; 15 + tilecoll WALL, WALL, FLOOR, WALL ; 16 + tilecoll FLOOR, WALL, FLOOR, WALL ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, RADIO, PC ; 19 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, RADIO, FLOOR ; 1b + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, VIRTUAL_BOY, FLOOR ; 1f + tilecoll WALL, WALL, PC, RADIO ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll WALL, WALL, TV, BOOKSHELF ; 22 + tilecoll WALL, FLOOR, WALL, FLOOR ; 23 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 24 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 25 + tilecoll FLOOR, FLOOR, WALL, WALL ; 26 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 27 + tilecoll WALL, WALL, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 39 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/players_house_collision.bin b/tilesets/players_house_collision.bin Binary files differdeleted file mode 100644 index dc3a08bfb..000000000 --- a/tilesets/players_house_collision.bin +++ /dev/null diff --git a/tilesets/pokecenter_collision.asm b/tilesets/pokecenter_collision.asm new file mode 100644 index 000000000..5b776330e --- /dev/null +++ b/tilesets/pokecenter_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll WALL, WALL, WALL, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, WALL ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 06 + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 07 + tilecoll COUNTER, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, PC ; 09 + tilecoll WALL, WALL, FLOOR, WALL ; 0a + tilecoll WALL, DOOR, FLOOR, FLOOR ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d + tilecoll FLOOR, WALL, FLOOR, WALL ; 0e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, FLOOR, WALL ; 10 + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 11 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 12 + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 15 + tilecoll WALL, DOOR, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, FLOOR, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f + tilecoll WALL, WALL, FLOOR, FLOOR ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll WALL, WALL, FLOOR, PC ; 22 + tilecoll WALL, WALL, WALL, FLOOR ; 23 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 26 + tilecoll WALL, WALL, FLOOR, FLOOR ; 27 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, WALL ; 29 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 2a + tilecoll WALL, WALL, WALL, FLOOR ; 2b + tilecoll WALL, DOOR, FLOOR, FLOOR ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2f + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 30 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 31 + tilecoll WALL, WALL, FLOOR, WALL ; 32 + tilecoll PC, WALL, FLOOR, WALL ; 33 + tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 34 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 35 + tilecoll DOOR, WALL, FLOOR, WALL ; 36 + tilecoll DOOR, WALL, FLOOR, FLOOR ; 37 + tilecoll DOOR, WALL, FLOOR, WALL ; 38 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 39 + tilecoll WALL, WALL, FLOOR, WALL ; 3a + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3b + tilecoll WALL, WALL, FLOOR, WALL ; 3c + tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3d + tilecoll WARP_PANEL, FLOOR, FLOOR, FLOOR ; 3e + tilecoll WARP_PANEL, WARP_PANEL, FLOOR, FLOOR ; 3f + tilecoll FLOOR, WARP_PANEL, FLOOR, FLOOR ; 40 diff --git a/tilesets/pokecenter_collision.bin b/tilesets/pokecenter_collision.bin Binary files differdeleted file mode 100644 index 5e58e03c9..000000000 --- a/tilesets/pokecenter_collision.bin +++ /dev/null diff --git a/tilesets/pokecom_center_collision.asm b/tilesets/pokecom_center_collision.asm new file mode 100644 index 000000000..1ecef84de --- /dev/null +++ b/tilesets/pokecom_center_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, WALL, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll WALL, WALL, WALL, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, PC ; 08 + tilecoll WALL, WALL, WALL, FLOOR ; 09 + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0a + tilecoll WALL, COUNTER, FLOOR, FLOOR ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll WALL, WALL, FLOOR, WALL ; 0d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0e + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 0f + tilecoll WALL, WALL, FLOOR, WALL ; 10 + tilecoll WALL, WALL, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, WALL, FLOOR ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WALL, FLOOR, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll WALL, WALL, WALL, WALL ; 1f + tilecoll WALL, WALL, WALL, WALL ; 20 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 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, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2c + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 2d + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 2e + tilecoll WALL, WALL, FLOOR, FLOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, FLOOR, FLOOR ; 36 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, FLOOR ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll WALL, WALL, FLOOR, FLOOR ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll FLOOR, FLOOR, WALL, WALL ; 3e + tilecoll WALL, WALL, WALL, WALL ; 3f + tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/tilesets/pokecom_center_collision.bin b/tilesets/pokecom_center_collision.bin Binary files differdeleted file mode 100644 index 0dfed1d91..000000000 --- a/tilesets/pokecom_center_collision.bin +++ /dev/null diff --git a/tilesets/port_collision.asm b/tilesets/port_collision.asm new file mode 100644 index 000000000..fb37ee11e --- /dev/null +++ b/tilesets/port_collision.asm @@ -0,0 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll BUOY, WATER, BUOY, WATER ; 03 + tilecoll WATER, BUOY, WATER, BUOY ; 04 + tilecoll LADDER, LADDER, LADDER, LADDER ; 05 + tilecoll WALL, WALL, WALL, WATER ; 06 + tilecoll WALL, WALL, WATER, WATER ; 07 + tilecoll WALL, WALL, WATER, WALL ; 08 + tilecoll WATER, WATER, WATER, WATER ; 09 + tilecoll WALL, WATER, WALL, WATER ; 0a + tilecoll WATER, WATER, WATER, WATER ; 0b + tilecoll WATER, WALL, WATER, WALL ; 0c + tilecoll WATER, WATER, FLOOR, FLOOR ; 0d + tilecoll WALL, WATER, WALL, WALL ; 0e + tilecoll WATER, WATER, WALL, WALL ; 0f + tilecoll WATER, WALL, WALL, WALL ; 10 + tilecoll WATER, WATER, WATER, WATER ; 11 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 12 + tilecoll WATER, WATER, WATER, WATER ; 13 + tilecoll WATER, FLOOR, WATER, FLOOR ; 14 + tilecoll WATER, FLOOR, WATER, FLOOR ; 15 + tilecoll WATER, WATER, WATER, WATER ; 16 + tilecoll WATER, WATER, WATER, WATER ; 17 + tilecoll WATER, FLOOR, WALL, WARP_CARPET_DOWN ; 18 + tilecoll WATER, WATER, WALL, WALL ; 19 + tilecoll WATER, FLOOR, WALL, WALL ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b + tilecoll WALL, WATER, WALL, WALL ; 1c + tilecoll WATER_21, WATER_21, WALL, WALL ; 1d + tilecoll WATER_21, WATER_21, WALL, WALL ; 1e + tilecoll WATER_21, WATER_21, WALL, WALL ; 1f + tilecoll WALL, WALL, WALL, WATER ; 20 + tilecoll WALL, FLOOR, WATER, WARP_CARPET_DOWN ; 21 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 22 + tilecoll BUOY, BUOY, BUOY, WATER ; 23 + tilecoll BUOY, BUOY, WATER, BUOY ; 24 + tilecoll BUOY, BUOY, WATER, WATER ; 25 + tilecoll BUOY, BUOY, WATER, WATER ; 26 + tilecoll LADDER, LADDER, LADDER, LADDER ; 27 + tilecoll FLOOR, FLOOR, WATER, WATER ; 28 + tilecoll FLOOR, FLOOR, FLOOR, WATER ; 29 + tilecoll FLOOR, FLOOR, WATER, FLOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll WALL, WALL, FLOOR, FLOOR ; 2c + tilecoll FLOOR, WATER, FLOOR, FLOOR ; 2d + tilecoll WATER, FLOOR, FLOOR, FLOOR ; 2e + tilecoll FLOOR, WATER, FLOOR, WATER ; 2f + tilecoll WATER, FLOOR, WATER, FLOOR ; 30 + tilecoll FLOOR, FLOOR, WATER, WATER ; 31 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 32 + tilecoll WALL, FLOOR, WALL, FLOOR ; 33 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 34 + tilecoll FLOOR, WATER, FLOOR, WATER ; 35 + tilecoll WALL, WALL, FLOOR, LADDER ; 36 + tilecoll WATER, WATER, WATER, WATER ; 37 + tilecoll FLOOR, WATER, FLOOR, WATER ; 38 + tilecoll WATER, FLOOR, WATER, FLOOR ; 39 + tilecoll WATER, WATER, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3c + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40 diff --git a/tilesets/port_collision.bin b/tilesets/port_collision.bin Binary files differdeleted file mode 100644 index af2e7fd34..000000000 --- a/tilesets/port_collision.bin +++ /dev/null diff --git a/tilesets/power_plant_collision.asm b/tilesets/power_plant_collision.asm new file mode 100644 index 000000000..eb5cd8f33 --- /dev/null +++ b/tilesets/power_plant_collision.asm @@ -0,0 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll WALL, WALL, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, WALL, WALL ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 05 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, FLOOR ; 09 + tilecoll WALL, WALL, WALL, FLOOR ; 0a + tilecoll WALL, WALL, FLOOR, WALL ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d + tilecoll WALL, FLOOR, WALL, FLOOR ; 0e + tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, WALL, WALL ; 12 + tilecoll WALL, WALL, WALL, WALL ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, WALL, FLOOR, FLOOR ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WALL, WALL, FLOOR ; 1b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, COUNTER ; 1f + tilecoll WALL, WALL, FLOOR, FLOOR ; 20 + tilecoll FLOOR, FLOOR, WALL, WALL ; 21 + tilecoll WALL, WALL, WALL, FLOOR ; 22 + tilecoll WALL, FLOOR, WALL, FLOOR ; 23 + tilecoll WALL, FLOOR, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 25 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 26 + tilecoll FLOOR, FLOOR, WALL, WALL ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, FLOOR ; 29 + tilecoll WALL, WALL, FLOOR, FLOOR ; 2a + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2b + tilecoll WALL, FLOOR, WALL, FLOOR ; 2c + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, FLOOR, WALL, FLOOR ; 2f + tilecoll WALL, FLOOR, WALL, FLOOR ; 30 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 31 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 + tilecoll FLOOR, WALL, FLOOR, WALL ; 34 + tilecoll FLOOR, FLOOR, WALL, WALL ; 35 + tilecoll WALL, WALL, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll FLOOR, WALL, FLOOR, WALL ; 38 + tilecoll FLOOR, WALL, FLOOR, WALL ; 39 + tilecoll WALL, WALL, FLOOR, FLOOR ; 3a + tilecoll FLOOR, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, FLOOR, WALL ; 3c + tilecoll WALL, WALL, WALL, FLOOR ; 3d + tilecoll WALL, WALL, FLOOR, WALL ; 3e + tilecoll WALL, FLOOR, WALL, WALL ; 3f + tilecoll FLOOR, COUNTER, COUNTER, COUNTER ; 40 diff --git a/tilesets/power_plant_collision.bin b/tilesets/power_plant_collision.bin Binary files differdeleted file mode 100644 index ee03c4528..000000000 --- a/tilesets/power_plant_collision.bin +++ /dev/null diff --git a/tilesets/radio_tower_collision.asm b/tilesets/radio_tower_collision.asm new file mode 100644 index 000000000..1713eb438 --- /dev/null +++ b/tilesets/radio_tower_collision.asm @@ -0,0 +1,64 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, FLOOR ; 03 + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, WALL, COUNTER ; 06 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 07 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 08 + tilecoll COUNTER, COUNTER, FLOOR, FLOOR ; 09 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 0a + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 0d + tilecoll WALL, STAIRCASE, FLOOR, FLOOR ; 0e + tilecoll FLOOR, FLOOR, FLOOR, COUNTER ; 0f + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 10 + tilecoll FLOOR, COUNTER, FLOOR, FLOOR ; 11 + tilecoll WALL, WALL, FLOOR, FLOOR ; 12 + tilecoll WALL, WALL, PC, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 14 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 15 + tilecoll FLOOR, FLOOR, WALL, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll FLOOR, FLOOR, COUNTER, FLOOR ; 18 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, COUNTER ; 1a + tilecoll WALL, COUNTER, FLOOR, COUNTER ; 1b + tilecoll COUNTER, FLOOR, FLOOR, FLOOR ; 1c + tilecoll FLOOR, WALL, FLOOR, WALL ; 1d + tilecoll STAIRCASE, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, WALL, FLOOR, FLOOR ; 1f + tilecoll WALL, FLOOR, WALL, FLOOR ; 20 + tilecoll FLOOR, WALL, FLOOR, WALL ; 21 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 22 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll WALL, WALL, FLOOR, BOOKSHELF ; 25 + tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 26 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 27 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28 + tilecoll WALL, WALL, FLOOR, WALL ; 29 + tilecoll FLOOR, WALL, FLOOR, WALL ; 2a + tilecoll WALL, WALL, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2d + tilecoll FLOOR, COUNTER, FLOOR, COUNTER ; 2e + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll WALL, WALL, FLOOR, WALL ; 32 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33 + tilecoll WALL, WALL, WALL, FLOOR ; 34 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 35 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 36 + tilecoll WALL, WALL, FLOOR, FLOOR ; 37 + tilecoll FLOOR, WALL, FLOOR, WALL ; 38 + tilecoll FLOOR, FLOOR, COUNTER, COUNTER ; 39 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll WALL, FLOOR, WALL, FLOOR ; 3d + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 3e + tilecoll FLOOR, WALL, FLOOR, WALL ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/radio_tower_collision.bin b/tilesets/radio_tower_collision.bin Binary files differdeleted file mode 100644 index 0d77042b7..000000000 --- a/tilesets/radio_tower_collision.bin +++ /dev/null diff --git a/tilesets/ruins_of_alph_collision.asm b/tilesets/ruins_of_alph_collision.asm new file mode 100644 index 000000000..8c65340ab --- /dev/null +++ b/tilesets/ruins_of_alph_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, FLOOR ; 02 + tilecoll WALL, WALL, FLOOR, WALL ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, FLOOR ; 07 + tilecoll WALL, WALL, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, FLOOR, WALL ; 09 + tilecoll WALL, FLOOR, WALL, WALL ; 0a + tilecoll FLOOR, FLOOR, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, WALL, WALL ; 0c + tilecoll FLOOR, WALL, WALL, WALL ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll WALL, FLOOR, WALL, FLOOR ; 0f + tilecoll FLOOR, WALL, FLOOR, WALL ; 10 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 11 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 12 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 14 + tilecoll WALL, FLOOR, WALL, WALL ; 15 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 16 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 17 + tilecoll FLOOR, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, WALL, PIT ; 19 + tilecoll WALL, WALL, PIT, WALL ; 1a + tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, WALL, FLOOR, WALL ; 1d + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1e + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 1f + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 20 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 23 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 24 + tilecoll WALL, WALL, WALL, WALL ; 25 + tilecoll WALL, WALL, WALL, WALL ; 26 + tilecoll WALL, WALL, WALL, WALL ; 27 + tilecoll WALL, WALL, WALL, WALL ; 28 + tilecoll WALL, WALL, WALL, WALL ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 2c + tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, FLOOR, FLOOR ; 2f + tilecoll FLOOR, FLOOR, FLOOR, PIT ; 30 + tilecoll CAVE, WALL, FLOOR, FLOOR ; 31 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 32 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 33 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 34 + tilecoll WALL, WALL, WALL, PIT ; 35 + tilecoll WALL, WALL, PIT, WALL ; 36 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 37 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 38 + tilecoll FLOOR, FLOOR, GRASS_4A, FLOOR ; 39 + tilecoll FLOOR, FLOOR, GRASS_4B, FLOOR ; 3a + tilecoll FLOOR, FLOOR, CUT_28, FLOOR ; 3b + tilecoll FLOOR, FLOOR, WATER, FLOOR ; 3c + tilecoll 64, FLOOR, WATERFALL_UP, FLOOR ; 3d + tilecoll 65, FLOOR, WATERFALL, FLOOR ; 3e + tilecoll WATERFALL_UP, FLOOR, WARP_CARPET_DOWN, FLOOR ; 3f + tilecoll WATERFALL, FLOOR, DOOR, FLOOR ; 40 diff --git a/tilesets/ruins_of_alph_collision.bin b/tilesets/ruins_of_alph_collision.bin Binary files differdeleted file mode 100644 index 1eedacfe8..000000000 --- a/tilesets/ruins_of_alph_collision.bin +++ /dev/null diff --git a/tilesets/sprout_tower_collision.asm b/tilesets/sprout_tower_collision.asm new file mode 100644 index 000000000..9d02e9640 --- /dev/null +++ b/tilesets/sprout_tower_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 03 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 04 + tilecoll WALL, WALL, WALL, FLOOR ; 05 + tilecoll WALL, WALL, FLOOR, FLOOR ; 06 + tilecoll WALL, WALL, FLOOR, WALL ; 07 + tilecoll WALL, WALL, WALL, WALL ; 08 + tilecoll WALL, FLOOR, WALL, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll WALL, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, FLOOR, WALL, WALL ; 0e + tilecoll FLOOR, WALL, WALL, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll FLOOR, WALL, FLOOR, WALL ; 11 + tilecoll WALL, FLOOR, WALL, FLOOR ; 12 + tilecoll WALL, FLOOR, WALL, FLOOR ; 13 + tilecoll FLOOR, WALL, FLOOR, WALL ; 14 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 15 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 16 + tilecoll WALL, FLOOR, WALL, WALL ; 17 + tilecoll FLOOR, WALL, WALL, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 1e + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 1f + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 20 + tilecoll LADDER, FLOOR, FLOOR, FLOOR ; 21 + tilecoll WALL, WALL, WALL, FLOOR ; 22 + tilecoll WALL, WALL, FLOOR, WALL ; 23 + tilecoll WALL, WALL, WALL, WALL ; 24 + tilecoll FLOOR, FLOOR, WARP_PANEL, FLOOR ; 25 + tilecoll WALL, WALL, PIT, FLOOR ; 26 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 27 + tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 28 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 2a + tilecoll WALL, WALL, WALL, WALL ; 2b + tilecoll WALL, HOP_LEFT, WALL, WALL ; 2c + tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2d + tilecoll WALL, WALL, FLOOR, FLOOR ; 2e + tilecoll WALL, WALL, WALL, FLOOR ; 2f + tilecoll WALL, WALL, FLOOR, WALL ; 30 + tilecoll WALL, FLOOR, WALL, FLOOR ; 31 + tilecoll FLOOR, WALL, FLOOR, WALL ; 32 + tilecoll WALL, WALL, FLOOR, FLOOR ; 33 + tilecoll WALL, WALL, WALL, FLOOR ; 34 + tilecoll WALL, WALL, FLOOR, WALL ; 35 + tilecoll WALL, FLOOR, WALL, FLOOR ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll PIT, PIT, FLOOR, FLOOR ; 38 + tilecoll FLOOR, PIT, FLOOR, PIT ; 39 + tilecoll PIT, FLOOR, PIT, FLOOR ; 3a + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 3b + tilecoll WALL, WALL, FLOOR, FLOOR ; 3c + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 3d + tilecoll WALL, HOP_DOWN, WALL, WALL ; 3e + tilecoll HOP_DOWN, WALL, WALL, WALL ; 3f + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 40 diff --git a/tilesets/sprout_tower_collision.bin b/tilesets/sprout_tower_collision.bin Binary files differdeleted file mode 100644 index 878803fb8..000000000 --- a/tilesets/sprout_tower_collision.bin +++ /dev/null diff --git a/tilesets/train_station_collision.asm b/tilesets/train_station_collision.asm new file mode 100644 index 000000000..55b147237 --- /dev/null +++ b/tilesets/train_station_collision.asm @@ -0,0 +1,64 @@ + tilecoll FF, FF, FF, FF ; 01 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 02 + tilecoll UP_WALL, FLOOR, UP_WALL, FLOOR ; 03 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll FLOOR, FLOOR, WALL, WALL ; 07 + tilecoll WALL, FLOOR, WALL, FLOOR ; 08 + tilecoll WALL, FLOOR, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c + tilecoll WALL, FLOOR, WALL, FLOOR ; 0d + tilecoll WALL, WALL, WALL, WALL ; 0e + tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll WALL, WALL, WALL, WALL ; 10 + tilecoll WALL, WALL, WALL, WALL ; 11 + tilecoll WALL, WALL, DOOR, WALL ; 12 + tilecoll WALL, WALL, WALL, DOOR ; 13 + tilecoll WALL, WALL, WALL, WALL ; 14 + tilecoll WALL, WALL, WALL, WALL ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll WALL, WALL, WALL, WALL ; 17 + tilecoll WALL, WALL, WALL, WALL ; 18 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 19 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, WALL, WALL ; 1b + tilecoll WALL, WALL, WALL, WALL ; 1c + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d + tilecoll WALL, FLOOR, WALL, FLOOR ; 1e + tilecoll FLOOR, WALL, FLOOR, WALL ; 1f + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 20 + tilecoll WALL, WALL, WALL, WALL ; 21 + tilecoll WALL, FLOOR, WALL, FLOOR ; 22 + tilecoll FLOOR, WALL, FLOOR, WALL ; 23 + tilecoll WALL, WALL, FLOOR, FLOOR ; 24 + tilecoll WALL, WALL, FLOOR, FLOOR ; 25 + tilecoll WALL, WALL, FLOOR, FLOOR ; 26 + tilecoll WALL, FLOOR, WALL, FLOOR ; 27 + tilecoll FLOOR, WALL, FLOOR, WALL ; 28 + tilecoll WALL, WALL, WALL, FLOOR ; 29 + tilecoll WALL, WALL, FLOOR, WALL ; 2a + tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll FLOOR, WALL, FLOOR, WALL ; 2c + tilecoll FLOOR, WALL, FLOOR, WALL ; 2d + tilecoll FLOOR, WALL, FLOOR, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, FLOOR, FLOOR ; 30 + tilecoll WALL, WALL, FLOOR, FLOOR ; 31 + tilecoll WALL, FLOOR, WALL, FLOOR ; 32 + tilecoll FLOOR, WALL, FLOOR, WALL ; 33 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 34 + tilecoll WALL, FLOOR, WALL, FLOOR ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll WALL, WALL, WALL, FLOOR ; 37 + tilecoll WALL, WALL, FLOOR, FLOOR ; 38 + tilecoll WALL, WALL, FLOOR, WALL ; 39 + tilecoll WALL, FLOOR, WALL, WALL ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll FLOOR, WALL, WALL, WALL ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll WALL, WALL, WALL, WALL ; 3e + tilecoll WALL, WALL, WALL, WALL ; 3f + tilecoll WALL, WALL, WALL, WALL ; 40 diff --git a/tilesets/train_station_collision.bin b/tilesets/train_station_collision.bin Binary files differdeleted file mode 100644 index bd5c4c586..000000000 --- a/tilesets/train_station_collision.bin +++ /dev/null diff --git a/tilesets/underground_collision.asm b/tilesets/underground_collision.asm new file mode 100644 index 000000000..0c3120451 --- /dev/null +++ b/tilesets/underground_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 03 + tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 04 + tilecoll WALL, WALL, WALL, FLOOR ; 05 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 06 + tilecoll WALL, FLOOR, WALL, FLOOR ; 07 + tilecoll FLOOR, FLOOR, PIT, PIT ; 08 + tilecoll WALL, WALL, WALL, FLOOR ; 09 + tilecoll WALL, WALL, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, FLOOR, WALL ; 0b + tilecoll WALL, WALL, WALL, WALL ; 0c + tilecoll WALL, FLOOR, WALL, FLOOR ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, WALL, FLOOR, WALL ; 0f + tilecoll FLOOR, FLOOR, FLOOR, WARP_PANEL ; 10 + tilecoll WALL, FLOOR, WALL, WALL ; 11 + tilecoll FLOOR, FLOOR, WALL, WALL ; 12 + tilecoll FLOOR, WALL, WALL, WALL ; 13 + tilecoll WALL, WALL, FLOOR, FLOOR ; 14 + tilecoll FLOOR, FLOOR, WALL, WALL ; 15 + tilecoll FLOOR, FLOOR, WALL, WALL ; 16 + tilecoll WALL, FLOOR, WALL, WALL ; 17 + tilecoll FLOOR, WALL, WALL, WALL ; 18 + tilecoll FLOOR, WALL, FLOOR, WALL ; 19 + tilecoll WALL, FLOOR, WALL, FLOOR ; 1a + tilecoll FLOOR, WALL, FLOOR, WALL ; 1b + tilecoll WALL, FLOOR, WALL, FLOOR ; 1c + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1d + tilecoll WALL, WALL, FLOOR, FLOOR ; 1e + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 1f + tilecoll WALL, WALL, FLOOR, FLOOR ; 20 + tilecoll WALL, WALL, FLOOR, FLOOR ; 21 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 22 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 23 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 24 + tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 25 + tilecoll WALL, WARP_CARPET_UP, FLOOR, FLOOR ; 26 + tilecoll WARP_CARPET_UP, WALL, FLOOR, FLOOR ; 27 + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 28 + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 29 + tilecoll FLOOR, WALL, FLOOR, WALL ; 2a + tilecoll WALL, FLOOR, WALL, FLOOR ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll WALL, WALL, WALL, WALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll WALL, WALL, WALL, WALL ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WALL, WALL, WALL, WALL ; 33 + tilecoll WALL, WALL, WALL, WALL ; 34 + tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll WALL, WALL, WALL, WALL ; 36 + tilecoll WALL, FLOOR, WALL, FLOOR ; 37 + tilecoll FLOOR, WALL, FLOOR, WALL ; 38 + tilecoll WALL, WALL, WALL, WALL ; 39 + tilecoll WALL, WALL, WALL, WALL ; 3a + tilecoll WALL, WALL, WALL, WALL ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll WALL, WALL, WALL, WALL ; 3d + tilecoll WALL, WALL, BOOKSHELF, BOOKSHELF ; 3e + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 40 diff --git a/tilesets/underground_collision.bin b/tilesets/underground_collision.bin Binary files differdeleted file mode 100644 index eccd3e3df..000000000 --- a/tilesets/underground_collision.bin +++ /dev/null diff --git a/tilesets/unused_whirl_islands_collision.asm b/tilesets/unused_whirl_islands_collision.asm new file mode 100644 index 000000000..0022d3881 --- /dev/null +++ b/tilesets/unused_whirl_islands_collision.asm @@ -0,0 +1,128 @@ + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10, TALL_GRASS_10 ; 04 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05 + tilecoll WALL, WALL, WALL, WALL ; 06 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 07 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 08 + tilecoll WALL, WALL, WALL, WALL ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll WALL, WALL, WALL, WALL ; 0b + tilecoll WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0c + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 0d + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e + tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 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, WALL ; 14 + tilecoll WALL, WALL, WALL, DOOR ; 15 + tilecoll WALL, WALL, WALL, WALL ; 16 + tilecoll WALL, WALL, WALL, DOOR ; 17 + tilecoll WALL, WALL, TOWN_MAP, WALL ; 18 + tilecoll WALL, WALL, WALL, WALL ; 19 + tilecoll WALL, WALL, WALL, WALL ; 1a + tilecoll WALL, WALL, WALL, DOOR ; 1b + tilecoll WALL, WALL, TOWN_MAP, WALL ; 1c + tilecoll WALL, WALL, WALL, WALL ; 1d + tilecoll WALL, WALL, DOOR, 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, WALL ; 28 + tilecoll WALL, WALL, WALL, DOOR ; 29 + tilecoll WALL, WALL, WALL, WALL ; 2a + tilecoll WALL, WALL, WALL, DOOR ; 2b + tilecoll WALL, WALL, WALL, WALL ; 2c + tilecoll FLOOR, FLOOR, WALL, WALL ; 2d + tilecoll FLOOR, FLOOR, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, DOOR ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll BUOY, BUOY, BUOY, WATER_21 ; 31 + tilecoll BUOY, BUOY, WATER_21, WATER_21 ; 32 + tilecoll BUOY, BUOY, WATER_21, BUOY ; 33 + tilecoll FLOOR, FLOOR, WALL, WALL ; 34 + tilecoll BUOY, WATER_21, BUOY, WATER_21 ; 35 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 36 + tilecoll WATER_21, BUOY, WATER_21, BUOY ; 37 + tilecoll WALL, WALL, WALL, WALL ; 38 + tilecoll BUOY, WATER_21, BUOY, BUOY ; 39 + tilecoll WATER_21, WATER_21, BUOY, BUOY ; 3a + tilecoll WATER_21, BUOY, BUOY, BUOY ; 3b + tilecoll WALL, WALL, WALL, WALL ; 3c + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 3d + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 3e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 40 + tilecoll WALL, WALL, WALL, FLOOR ; 41 + tilecoll WALL, WALL, FLOOR, FLOOR ; 42 + tilecoll WALL, WALL, FLOOR, WALL ; 43 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 44 + tilecoll WALL, FLOOR, WALL, FLOOR ; 45 + tilecoll TOWN_MAP, FLOOR, FLOOR, FLOOR ; 46 + tilecoll FLOOR, WALL, FLOOR, WALL ; 47 + tilecoll FLOOR, FLOOR, FLOOR, TOWN_MAP ; 48 + tilecoll WALL, FLOOR, WALL, WALL ; 49 + tilecoll FLOOR, FLOOR, WALL, WALL ; 4a + tilecoll FLOOR, WALL, WALL, WALL ; 4b + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4c + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4d + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4e + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4f + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 50 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 51 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 52 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 53 + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 54 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 55 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 56 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 59 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 5a + tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 5b + tilecoll WALL, CUT_TREE, FLOOR, FLOOR ; 5c + tilecoll WALL, WALL, WALL, FLOOR ; 5d + tilecoll WALL, WALL, FLOOR, FLOOR ; 5e + tilecoll WALL, WALL, FLOOR, WALL ; 5f + tilecoll FLOOR, WALL, FLOOR, CUT_TREE ; 60 + tilecoll WALL, FLOOR, WALL, FLOOR ; 61 + tilecoll WALL, WALL, WALL, WALL ; 62 + tilecoll FLOOR, WALL, FLOOR, WALL ; 63 + tilecoll FLOOR, FLOOR, CUT_TREE, WALL ; 64 + tilecoll WALL, FLOOR, WALL, WALL ; 65 + tilecoll FLOOR, FLOOR, WALL, WALL ; 66 + tilecoll FLOOR, WALL, WALL, WALL ; 67 + tilecoll CUT_TREE, FLOOR, WALL, FLOOR ; 68 + tilecoll WALL, FLOOR, WALL, FLOOR ; 69 + tilecoll FLOOR, WALL, FLOOR, WALL ; 6a + tilecoll WALL, UP_WALL, WALL, FLOOR ; 6b + tilecoll UP_WALL, WALL, FLOOR, WALL ; 6c + tilecoll WALL, FLOOR, WALL, WALL ; 6d + tilecoll FLOOR, WALL, WALL, WALL ; 6e + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6f + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 70 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 71 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 72 + tilecoll FLOOR, FLOOR, WALL, WALL ; 73 + tilecoll FLOOR, FLOOR, DOOR, WALL ; 74 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 75 + tilecoll WALL, WALL, FLOOR, FLOOR ; 76 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 77 + tilecoll WALL, WALL, WALL, WALL ; 78 + tilecoll WALL, WALL, WALL, WALL ; 79 + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 7a + tilecoll WATER_21, WATER_21, WATER_21, WATER_21 ; 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 + tilecoll WALL, WALL, WALL, WALL ; 80 diff --git a/tilesets/unused_whirl_islands_collision.bin b/tilesets/unused_whirl_islands_collision.bin Binary files differdeleted file mode 100644 index 559aad109..000000000 --- a/tilesets/unused_whirl_islands_collision.bin +++ /dev/null diff --git a/tilesets/whirl_islands_collision.asm b/tilesets/whirl_islands_collision.asm new file mode 100644 index 000000000..3d5e0ae05 --- /dev/null +++ b/tilesets/whirl_islands_collision.asm @@ -0,0 +1,64 @@ + tilecoll WALL, WALL, WALL, WALL ; 01 + tilecoll WALL, WALL, WALL, WALL ; 02 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03 + tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 04 + tilecoll WALL, UP_WALL, WALL, FLOOR ; 05 + tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 06 + tilecoll UP_WALL, WALL, FLOOR, WALL ; 07 + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 08 + tilecoll WALL, FLOOR, WALL, FLOOR ; 09 + tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a + tilecoll FLOOR, WALL, FLOOR, WALL ; 0b + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 0c + tilecoll WALL, FLOOR, WALL, WALL ; 0d + tilecoll FLOOR, FLOOR, WALL, WALL ; 0e + tilecoll FLOOR, WALL, WALL, WALL ; 0f + tilecoll WATER, WATER, WATER, WATER ; 10 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 11 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 12 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 13 + tilecoll FLOOR, FLOOR, WALL, CAVE ; 14 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 15 + tilecoll UP_WALL, UP_WALL, FLOOR, LADDER ; 16 + tilecoll WALL, FLOOR, WALL, WARP_CARPET_DOWN ; 17 + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 18 + tilecoll WALL, WALL, WALL, FLOOR ; 19 + tilecoll WALL, WALL, FLOOR, FLOOR ; 1a + tilecoll WALL, WALL, FLOOR, WALL ; 1b + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 1c + tilecoll WALL, FLOOR, WALL, FLOOR ; 1d + tilecoll WALL, WALL, WALL, WALL ; 1e + tilecoll FLOOR, WALL, FLOOR, WALL ; 1f + tilecoll FLOOR, FLOOR, FLOOR, LADDER ; 20 + tilecoll WALL, FLOOR, WALL, WALL ; 21 + tilecoll FLOOR, FLOOR, WALL, WALL ; 22 + tilecoll FLOOR, WALL, WALL, WALL ; 23 + tilecoll UP_WALL, WALL, FLOOR, FLOOR ; 24 + tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 25 + tilecoll WATER, WATER, WATER, WATER ; 26 + tilecoll WATER, WATER, WATER, WATER ; 27 + tilecoll WATER, WATER, WATER, WATER ; 28 + tilecoll WALL, FLOOR, FLOOR, FLOOR ; 29 + tilecoll FLOOR, FLOOR, WALL, FLOOR ; 2a + tilecoll FLOOR, WALL, FLOOR, FLOOR ; 2b + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 2c + tilecoll WATERFALL, WATERFALL, WATERFALL, WATERFALL ; 2d + tilecoll WALL, WALL, WALL, WALL ; 2e + tilecoll WALL, WALL, WALL, WALL ; 2f + tilecoll WALL, WALL, WALL, WALL ; 30 + tilecoll FLOOR, FLOOR, FLOOR, WALL ; 31 + tilecoll WALL, WALL, WALL, WALL ; 32 + tilecoll WATER, WATER, WATER, WATER ; 33 + tilecoll WATER, WATER, WATER, WATER ; 34 + tilecoll WALL, WALL, WALL, WALL ; 35 + tilecoll FLOOR, WALL, FLOOR, WALL ; 36 + tilecoll FLOOR, WALL, FLOOR, WALL ; 37 + tilecoll WALL, WALL, WALL, CAVE ; 38 + tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 39 + tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 3a + tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3b + tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 3c + tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 3d + tilecoll WATER, WATER, WATER, WATER ; 3e + tilecoll WATER, WATER, WATER, WATER ; 3f + tilecoll FLOOR, FLOOR, PIT, FLOOR ; 40 diff --git a/tilesets/whirl_islands_collision.bin b/tilesets/whirl_islands_collision.bin Binary files differdeleted file mode 100644 index 701de1c0b..000000000 --- a/tilesets/whirl_islands_collision.bin +++ /dev/null |