Merge branch 'master' of https://github.com/ZetaNull/jep-hack

data/tilesets/bluelab_collision.asm

@@ -0,0 +1,17 @@
+	tilecoll WALL, WALL, WALL, WALL ; 00
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
+	tilecoll FLOOR, FLOOR, FLOOR, WARP_CARPET_DOWN ; 02
+	tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, FLOOR ; 03
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 04
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 06
+	tilecoll WALL, FLOOR, WALL, FLOOR ; 07
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 08
+	tilecoll WALL, WALL, WALL, WALL ; 09
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0a
+	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll DOOR, WALL, FLOOR, FLOOR ; 0c
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
+	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 10

data/tilesets/bluelab_metatiles.bin

@@ -0,0 +1,2 @@
+))))))))))))))))















































		8989	





89



	





89#""$3224**











 !01"$
+24
















::::::::"""$2224***





#"

32

*

data/tilesets/cave_collision.asm

@@ -72,12 +72,12 @@
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 47
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 48
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 49
-	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4a
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 4a
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4b
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 4c
 	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4d
 	tilecoll UP_WALL, UP_WALL, FLOOR, FLOOR ; 4e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 4f
+	tilecoll FLOOR, SWITCH, FLOOR, FLOOR ; 4f
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 50
 	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 51
 	tilecoll WALL, FLOOR, FLOOR, LADDER ; 52
@@ -85,3 +85,6 @@
 	tilecoll WATER, WATER, WATER, WATER ; 54
 	tilecoll WATER, WALL, WATER, WALL ; 55
 	tilecoll WATER, WALL, WALL, WALL ; 56
+	tilecoll WALL, WALL, WALL, FLOOR ; 57
+	tilecoll FLOOR, WALL, FLOOR, WARP_CARPET_DOWN ; 58
+	tilecoll FLOOR, SWITCH, FLOOR, FLOOR ; 59

data/tilesets/nihon01_collision.asm

@@ -127,4 +127,17 @@
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 7f
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 80
-	tilecoll WALL, WALL, WALL, WALL ; 81
+	tilecoll WALL, WALL, DOOR, WALL ; 81
+	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 82
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 83
+	tilecoll FLOOR, HEADBUTT_TREE, HEADBUTT_TREE, HEADBUTT_TREE ; 84
+	tilecoll HEADBUTT_TREE, FLOOR, HEADBUTT_TREE, HEADBUTT_TREE ; 85
+	tilecoll FLOOR, FLOOR, FLOOR, HEADBUTT_TREE ; 86
+	tilecoll FLOOR, FLOOR, HEADBUTT_TREE, FLOOR ; 87
+	tilecoll HEADBUTT_TREE, FLOOR, FLOOR, FLOOR ; 88
+	tilecoll FLOOR, HEADBUTT_TREE, FLOOR, FLOOR ; 89
+	tilecoll WATER, WATER, WATER, WATER ; 8a
+	tilecoll WALL, WALL, WALL, DOOR ; 8b
+	tilecoll WALL, WALL, WALL, WALL ; 8c
+	tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 8e