Citrine geography rework, Metal Coat

Lots of things here. Citrine now has its own tileset featuring content from the prototype asset leak. This includes new grass, signs, and so on. Lots of tinkering had to be done to make it look good, but it does! Collision and everything is done, but grass needs to animate properly. I'm committing as-is because making the grass animate is actually very difficult.

Also added the Metal Coat and fixed the issues with prior evolution methods - evo items first, level-up second. It is currently unobtainable.

data/tilesets/collision_tile_ids.asm

@@ -71,4 +71,7 @@ Plateau_Coll::
 
 PreGym_Coll::
 	coll_tiles $0B, $0E, $1E, $1F
-	;coll_tiles $01, $06, $12, $13, $17, $19, $0A, $1A, $3E, $3F, $0F, $1D, $1C, $0C, $0D, $2A, $2B, $3A, $3B
+
+Citrine_Coll::
+	coll_tiles $2C, $31, $3F, $55, $0E, $2F, $23, $20, $10, $03, $1C, $1B, $0B, $0C, $21
+

data/tilesets/tileset_headers.asm

@@ -2,13 +2,14 @@ MACRO tileset
 	db BANK(\1_GFX)
 	dw \1_Block, \1_GFX, \1_Coll
 	db \2, \3, \4 ; counter tiles
-	db \5         ; grass tile
+	db \5,         ; grass tile
 	db \6         ; animations (TILEANIM_* value)
 ENDM
 
 Tilesets:
 	table_width 12, Tilesets
 	; name, 3 counter tiles, grass tile, animations
+	; FIXME: Needs to have a new column for a second grass tile for Citrine to work properly. Missing tile is $3F.
 	tileset Overworld,    -1, -1, -1, $52, TILEANIM_WATER_FLOWER
 	tileset RedsHouse1,   -1, -1, -1,  -1, TILEANIM_NONE
 	tileset Mart,        $18,$19,$1E,  -1, TILEANIM_NONE
@@ -34,4 +35,5 @@ Tilesets:
 	tileset Facility,    $12, -1, -1,  -1, TILEANIM_WATER
 	tileset Plateau,      -1, -1, -1, $45, TILEANIM_WATER
 	tileset PreGym,		 $3A, $3B, -1,  -1, TILEANIM_NONE
+	tileset Citrine,	 -1,  -1,  -1, $0E, TILEANIM_WATER_FLOWER
 	assert_table_length NUM_TILESETS

data/tilesets/warp_tile_ids.asm

@@ -25,6 +25,7 @@ WarpTileIDPointers:
 	dw .FacilityWarpTileIDs
 	dw .PlateauWarpTileIDs
 	dw .PreGymWarpTileIDs
+	dw .CitrineWarpTileIDs
 	assert_table_length NUM_TILESETS
 
 MACRO warp_tiles
@@ -90,10 +91,13 @@ ENDM
 .PlateauWarpTileIDs:
 	db $1B, $3B
 	; fallthrough
-.ShipPortWarpTileIDs:
-.ClubWarpTileIDs:
 
 .PreGymWarpTileIDs:
 	warp_tiles $23
-	
+
+.CitrineWarpTileIDs:
+	warp_tiles $1B, $1C
+
+.ShipPortWarpTileIDs:
+.ClubWarpTileIDs:
 	warp_tiles ; end