Lavender Crypt/Haunted House tileset + other tileset improvements

- Lavender Crypt/Haunted house tileset added with custom palette
- Sideways cave added to one of the Nihon tilesets for the sake of quiet cave
- Citrine tiles added to kanto tileset. I forget if I was totally finished with it but it's probably fine

data/tilesets/lavendercrypt_collision.asm

@@ -1,34 +1,34 @@
 	tilecoll WALL, WALL, WALL, WALL ; 00
 	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 WALL, WALL, WALL, WALL ; 05
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 06
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 02
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 03
+	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 04
+	tilecoll WALL, FLOOR, FLOOR, FLOOR ; 05
+	tilecoll WALL, WALL, WALL, WALL ; 06
 	tilecoll WALL, WALL, FLOOR, WALL ; 07
 	tilecoll WALL, WALL, WALL, WALL ; 08
 	tilecoll WALL, WALL, WALL, WALL ; 09
-	tilecoll WALL, WALL, WALL, FLOOR ; 0a
-	tilecoll WALL, WALL, WALL, WALL ; 0b
+	tilecoll WALL, WALL, WALL, DOOR ; 0a
+	tilecoll WALL, WALL, WALL, FLOOR ; 0b
 	tilecoll WALL, WALL, WALL, WALL ; 0c
 	tilecoll WALL, WALL, WALL, WALL ; 0d
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0e
-	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0f
-	tilecoll WALL, WALL, WALL, WALL ; 10
-	tilecoll WALL, WALL, WALL, LADDER ; 11
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 0f
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 10
+	tilecoll WALL, WALL, DOOR, DOOR ; 11
 	tilecoll FLOOR, WALL, LADDER, WALL ; 12
-	tilecoll FLOOR, FLOOR, FLOOR, WALL ; 13
-	tilecoll WALL, WALL, WALL, WALL ; 14
-	tilecoll WALL, FLOOR, WALL, LADDER ; 15
+	tilecoll WALL, WALL, FLOOR, FLOOR ; 13
+	tilecoll WALL, WALL, WALL, FLOOR ; 14
+	tilecoll WALL, WALL, FLOOR, WALL ; 15
 	tilecoll FLOOR, WALL, LADDER, WALL ; 16
-	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 17
-	tilecoll WALL, WALL, WALL, FLOOR ; 18
-	tilecoll WALL, WALL, FLOOR, FLOOR ; 19
+	tilecoll WALL, WALL, WALL, WALL ; 17
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 18
+	tilecoll WALL, WALL, WALL, FLOOR ; 19
 	tilecoll FLOOR, FLOOR, WALL, FLOOR ; 1a
 	tilecoll WALL, FLOOR, LADDER, FLOOR ; 1b
-	tilecoll WALL, FLOOR, WALL, WALL ; 1c
-	tilecoll FLOOR, FLOOR, WALL, WALL ; 1d
-	tilecoll FLOOR, WALL, WALL, WALL ; 1e
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1c
+	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 1d
+	tilecoll FLOOR, FLOOR, WALL, WALL ; 1e
 	tilecoll FLOOR, WALL, FLOOR, FLOOR ; 1f
 	tilecoll FLOOR, WALL, FLOOR, WALL ; 20
 	tilecoll FLOOR, FLOOR, LADDER, FLOOR ; 21
@@ -46,7 +46,7 @@
 	tilecoll FLOOR, FLOOR, WALL, WALL ; 2d
 	tilecoll WALL, WALL, WALL, WALL ; 2e
 	tilecoll WALL, WALL, WALL, WALL ; 2f
-	tilecoll WALL, LADDER, WALL, WALL ; 30
+	tilecoll WALL, WALL, WALL, WALL ; 30
 	tilecoll WALL, LADDER, WALL, WALL ; 31
 	tilecoll LADDER, FLOOR, LADDER, FLOOR ; 32
 	tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 33

data/tilesets/nihon01_collision.asm

@@ -126,3 +126,5 @@
 	tilecoll WALL, WALL, WALL, WALL ; 7d
 	tilecoll WALL, DOOR, FLOOR, FLOOR ; 7e
 	tilecoll WALL, WALL, FLOOR, FLOOR ; 7f
+	tilecoll FLOOR, WALL, FLOOR, WALL ; 80
+	tilecoll WALL, WALL, WALL, WALL ; 81

engine/tilesets/tileset_palettes.asm

@@ -14,6 +14,8 @@ LoadSpecialMapPalette:
 	jr z, .mansion_mobile
 	cp TILESET_NIHON_SNOWY
 	jr z, .snowy
+	cp TILESET_LAVENDER_CRYPT
+	jr z, .crypt
 	jr .do_nothing
 
 .pokecom_2f
@@ -54,6 +56,11 @@ LoadSpecialMapPalette:
 	call LoadSnowyPalette
 	scf
 	ret
+
+.crypt
+	call LoadCryptPalette
+	scf
+	ret
 	
 .do_nothing
 	and a
@@ -174,3 +181,13 @@ LoadSnowyPalette:
 	ret
 
 INCLUDE "gfx/tilesets/snowy.pal"
+
+LoadCryptPalette:
+	ld a, BANK(wBGPals1)
+	ld de, wBGPals1
+	ld hl, CryptPalette
+	ld bc, 8 palettes
+	jp FarCopyWRAM
+
+CryptPalette:
+INCLUDE "gfx/tilesets/lavendercrypt.pal"

gfx/tilesets/lavendercrypt.pal

@@ -0,0 +1,40 @@
+; gray
+	RGB 18, 17, 24
+	RGB 12, 12, 18
+	RGB 07, 07, 12
+	RGB 00, 00, 00
+; red
+	RGB 18, 17, 24
+	RGB 14, 07, 17
+	RGB 10, 03, 10
+	RGB 00, 00, 00
+; green
+	RGB 10, 18, 15
+	RGB 09, 13, 08
+	RGB 06, 09, 04
+	RGB 00, 00, 00
+; water (blue)
+	RGB 13, 12, 31
+	RGB 10, 10, 27
+	RGB 08, 08, 23
+	RGB 00, 00, 00
+; yellow
+	RGB 30, 30, 11
+	RGB 17, 12, 17
+	RGB 10, 03, 10
+	RGB 00, 00, 00
+; brown
+	RGB 18, 17, 24
+	RGB 17, 12, 17
+	RGB 11, 06, 08
+	RGB 00, 00, 00
+; roof (purple)
+	RGB 20, 14, 26
+	RGB 14, 09, 19
+	RGB 08, 04, 12
+	RGB 00, 00, 00
+; text
+	RGB 31, 31, 16
+	RGB 31, 31, 16
+	RGB 14, 09, 00
+	RGB 00, 00, 00

maps/LavenderCrypt.asm

@@ -9,7 +9,7 @@ LavenderCrypt_MapEvents:
 	db 0, 0 ; filler
 
 	def_warp_events
-	warp_event  8, 17, SOUL_HOUSE, 3
+	warp_event  2, 17, SOUL_HOUSE, 3
 
 	def_coord_events
 

maps/Route49.ablk

@@ -1 +1 @@
-)))($eeeeee$))(&$$$$$$`*,%&.$dee'%*&#$$-$'''%VV\]]"`]]]]]]]]]]]]$
+)))($eeeeee$))(&$$$$$$`*,%&.$dee'%*€#$$-$'''%VV\]]"`]]]]]]]]]]]]$