summaryrefslogtreecommitdiff
path: root/data/tilesets/johto_collision.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/tilesets/johto_collision.asm')
-rw-r--r--data/tilesets/johto_collision.asm202
1 files changed, 101 insertions, 101 deletions
diff --git a/data/tilesets/johto_collision.asm b/data/tilesets/johto_collision.asm
index 4d6d2c072..8da65db43 100644
--- a/data/tilesets/johto_collision.asm
+++ b/data/tilesets/johto_collision.asm
@@ -1,33 +1,34 @@
- tilecoll 01, 01, 01, 01 ; 01
+ tilecoll 01, 01, 01, 01 ; 00
+ 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 LADDER, LADDER, LADDER, LADDER ; 07
- tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 08
+ tilecoll TALL_GRASS, TALL_GRASS, TALL_GRASS, TALL_GRASS ; 03
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 04
+ tilecoll WALL, WALL, WALL, WALL ; 05
+ tilecoll LADDER, LADDER, LADDER, LADDER ; 06
+ tilecoll WHIRLPOOL, BUOY, WATER, BUOY ; 07
+ tilecoll WALL, WALL, WALL, WALL ; 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 WARP_CARPET_LEFT, FLOOR, WARP_CARPET_LEFT, FLOOR ; 0b
+ tilecoll FLOOR, FLOOR, WALL, WARP_CARPET_DOWN ; 0c
+ tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WALL ; 0d
+ tilecoll FLOOR, WARP_CARPET_RIGHT, FLOOR, WARP_CARPET_RIGHT ; 0e
+ tilecoll WALL, WALL, WALL, WALL ; 0f
tilecoll WALL, WALL, WALL, WALL ; 10
tilecoll WALL, WALL, WALL, WALL ; 11
tilecoll WALL, WALL, WALL, WALL ; 12
tilecoll WALL, WALL, WALL, WALL ; 13
- tilecoll WALL, WALL, WALL, WALL ; 14
- tilecoll WALL, WALL, WALL, DOOR ; 15
- tilecoll WALL, WALL, WALL, WALL ; 16
- tilecoll WALL, WALL, WALL, DOOR ; 17
+ tilecoll WALL, WALL, WALL, DOOR ; 14
+ tilecoll WALL, WALL, WALL, WALL ; 15
+ tilecoll WALL, WALL, WALL, DOOR ; 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, WALL, DOOR ; 1b
+ tilecoll WALL, WALL, WALL, DOOR ; 1a
+ tilecoll WALL, WALL, WALL, WALL ; 1b
tilecoll WALL, WALL, WALL, WALL ; 1c
- tilecoll WALL, WALL, WALL, WALL ; 1d
- tilecoll WALL, WALL, DOOR, WALL ; 1e
+ tilecoll WALL, WALL, DOOR, WALL ; 1d
+ tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll WALL, WALL, WALL, WALL ; 20
tilecoll WALL, WALL, WALL, WALL ; 21
@@ -36,93 +37,92 @@
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 WALL, WALL, DOOR, WALL ; 27
+ tilecoll WALL, WALL, WALL, DOOR ; 28
+ tilecoll WALL, WALL, WALL, WALL ; 29
+ tilecoll HEADBUTT_TREE, HEADBUTT_TREE, WALL, WALL ; 2a
+ tilecoll WALL, WALL, WALL, WALL ; 2b
+ tilecoll HEADBUTT_TREE, HEADBUTT_TREE, 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 WALL, WALL, WALL, DOOR ; 2e
+ tilecoll WALL, WALL, WALL, WALL ; 2f
+ tilecoll BUOY, BUOY, BUOY, WATER ; 30
+ tilecoll BUOY, BUOY, WATER, WATER ; 31
+ tilecoll BUOY, BUOY, WATER, BUOY ; 32
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 33
+ tilecoll BUOY, WATER, BUOY, WATER ; 34
+ tilecoll WATER, WATER, WATER, WATER ; 35
+ tilecoll WATER, BUOY, WATER, BUOY ; 36
+ tilecoll WALL, WALL, WALL, DOOR ; 37
+ tilecoll BUOY, WATER, BUOY, BUOY ; 38
+ tilecoll WATER, WATER, BUOY, BUOY ; 39
+ tilecoll WATER, BUOY, BUOY, BUOY ; 3a
+ tilecoll WALL, WALL, WALL, WALL ; 3b
+ tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 3c
+ tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 3d
+ tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 3e
+ tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 3f
+ tilecoll WALL, WALL, WALL, FLOOR ; 40
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 41
+ tilecoll WALL, WALL, FLOOR, WALL ; 42
+ tilecoll WATER, WATER, WATER, WATER ; 43
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 44
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 45
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 46
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 47
+ tilecoll WALL, FLOOR, WALL, WALL ; 48
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 49
+ tilecoll FLOOR, WALL, WALL, WALL ; 4a
+ tilecoll HOP_DOWN, FLOOR, WALL, FLOOR ; 4b
+ tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4c
+ tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4d
+ tilecoll WALL, HOP_LEFT, WALL, HOP_LEFT ; 4e
+ tilecoll HOP_RIGHT, WALL, HOP_RIGHT, WALL ; 4f
+ tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 50
+ tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 51
+ tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; 52
+ tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 53
+ tilecoll WATER, WATER, WATER, WATER ; 54
tilecoll WATER, WATER, WATER, WATER ; 55
- tilecoll WATER, WATER, WATER, WATER ; 56
+ tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 56
tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 57
- tilecoll HOP_DOWN, HOP_DOWN, WALL, WALL ; 58
+ tilecoll WATER, WATER, WATER, WATER ; 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 HOP_DOWN, FLOOR, WALL, FLOOR ; 5a
+ tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 5b
+ tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, FLOOR ; 5c
+ tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, FLOOR ; 5d
+ tilecoll HEADBUTT_TREE, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 5e
+ tilecoll FLOOR, HEADBUTT_TREE, FLOOR, CUT_TREE ; 5f
+ tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 60
+ tilecoll HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 61
+ tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 62
+ tilecoll FLOOR, FLOOR, CUT_TREE, HEADBUTT_TREE ; 63
+ tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 64
+ tilecoll FLOOR, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 65
+ tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 66
+ tilecoll CUT_TREE, FLOOR, HEADBUTT_TREE, FLOOR ; 67
+ tilecoll WALL, FLOOR, WALL, FLOOR ; 68
+ tilecoll FLOOR, WALL, FLOOR, WALL ; 69
+ tilecoll WALL, UP_WALL, WALL, FLOOR ; 6a
+ tilecoll UP_WALL, WALL, FLOOR, WALL ; 6b
+ tilecoll WALL, FLOOR, WALL, WALL ; 6c
+ tilecoll FLOOR, WALL, WALL, WALL ; 6d
+ tilecoll FLOOR, FLOOR, WALL, FLOOR ; 6e
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 6f
+ tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 70
+ tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 71
+ tilecoll FLOOR, FLOOR, WALL, WALL ; 72
+ tilecoll FLOOR, FLOOR, CAVE, WALL ; 73
+ tilecoll WALL, FLOOR, FLOOR, FLOOR ; 74
+ tilecoll WALL, WALL, FLOOR, FLOOR ; 75
+ tilecoll WATER, WATER, WATER, WATER ; 76
+ tilecoll WALL, WALL, DOOR, WALL ; 77
+ tilecoll FLOOR, FLOOR, FLOOR, WALL ; 78
+ tilecoll WATER, WATER, WATER, WATER ; 79
tilecoll WATER, WATER, WATER, WATER ; 7a
- tilecoll WATER, WATER, WATER, WATER ; 7b
+ tilecoll WALL, WALL, WALL, WALL ; 7b
tilecoll WALL, WALL, WALL, WALL ; 7c
tilecoll WALL, WALL, WALL, WALL ; 7d
tilecoll WALL, WALL, WALL, WALL ; 7e
tilecoll WALL, WALL, WALL, WALL ; 7f
- tilecoll WALL, WALL, WALL, WALL ; 80