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/items/key_items.asm

@@ -91,6 +91,7 @@ KeyItemFlags:
 	dbit TRUE  ; CITRINE_PASS
 	dbit TRUE  ; OLD_SEA_MAP
 	dbit FALSE ; UP_GRADE
+	dbit FALSE ; METAL_COAT
 	dbit TRUE  ; FLOOR_B2F
 	dbit TRUE  ; FLOOR_B1F
 	dbit TRUE  ; FLOOR_1F

data/items/names.asm

@@ -91,6 +91,7 @@ ItemNames::
 	li "CITRINE PASS"
 	li "OLD SEA MAP"
 	li "UP-GRADE"
+	li "METAL COAT"
 	assert_list_length NUM_ITEMS
 	li "B2F"
 	li "B1F"

data/items/prices.asm

@@ -91,6 +91,7 @@ ItemPrices::
 	bcd3 0     ; CITRINE_PASS
 	bcd3 0	   ; OLD_SEA_MAP
 	bcd3 3000  ; UP_GRADE
+	bcd3 3000  ; METAL_COAT
 	assert_table_length NUM_ITEMS
 	bcd3 0     ; FLOOR_B2F
 	bcd3 0     ; FLOOR_B1F

data/items/use_party.asm

@@ -43,4 +43,6 @@ UsableItems_PartyMenu:
 	db POISON_STONE
 	db BLK_AUGURITE
 	db DUBIOUS_DISC
+	db UP_GRADE
+	db METAL_COAT
 	db -1 ; end

data/maps/headers/CitrineCity.asm

@@ -1,2 +1,2 @@
-	map_header CitrineCity, CITRINE_CITY, OVERWORLD, 0
+	map_header CitrineCity, CITRINE_CITY, CITRINE, 0
 	end_map_header

data/pokemon/evos_moves.asm

@@ -558,8 +558,9 @@ GastlyEvosMoves:
 
 ScytherEvosMoves:
 ; Evolutions
-	db EV_LEVEL, 41, SCIZOR
 	db EV_ITEM, BLK_AUGURITE, 1, KLEAVOR
+	db EV_ITEM, METAL_COAT, 1, SCIZOR
+	db EV_LEVEL, 41, SCIZOR
 	db 0
 ; Learnset
 	db 17, LEER
@@ -599,6 +600,7 @@ BlastoiseEvosMoves:
 
 PinsirEvosMoves:
 ; Evolutions
+	db EV_ITEM, METAL_COAT, 1, PURAKKUSU
 	db EV_LEVEL, 42, PURAKKUSU
 	db 0
 ; Learnset
@@ -657,6 +659,7 @@ GrowlitheEvosMoves:
 
 OnixEvosMoves:
 ; Evolutions	
+	db EV_ITEM, METAL_COAT, 1, STEELIX
 	db EV_LEVEL, 38, STEELIX
 	db 0
 ; Learnset
@@ -1176,7 +1179,7 @@ ZapdosEvosMoves:
 
 DittoEvosMoves:
 ; Evolutions
-	db EV_TRADE, 1, ANIMON
+	db EV_ITEM, METAL_COAT, 1, ANIMON
 	db 0
 ; Learnset
 	db 0
@@ -2225,7 +2228,8 @@ RaticateEvosMoves:
 NidorinoEvosMoves:
 ; Evolutions
 	db EV_ITEM, MOON_STONE, 1, NIDOREIGN
-	db EV_ITEM, POISON_STONE, 1, NIDOKING
+	;db EV_ITEM, POISON_STONE, 1, NIDOKING
+	db EV_LEVEL, 36, NIDOKING
 	db 0
 ; Learnset
 	db 8, HORN_ATTACK
@@ -2239,7 +2243,8 @@ NidorinoEvosMoves:
 NidorinaEvosMoves:
 ; Evolutions
 	db EV_ITEM, MOON_STONE, 1, NIDOREIGN
-	db EV_ITEM, POISON_STONE, 1, NIDOQUEEN
+	;db EV_ITEM, POISON_STONE, 1, NIDOQUEEN
+	db EV_LEVEL, 36, NIDOQUEEN
 	db 0
 ; Learnset
 	db 8, SCRATCH
@@ -3106,7 +3111,7 @@ SandslashAEvosMoves:
 	db 45, BLIZZARD
 	db 0
 	
-NinetalesAEvosMoves: ; vulpix-alola learnset
+NinetalesAEvosMoves: ; vulpix-alola learnset, same principle for others
 ; Evolutions
 	db 0
 ; Learnset
@@ -3214,7 +3219,7 @@ ExeggutorAEvosMoves:
 ; Evolutions
 	db 0
 ; Learnset
-	db 25, REFLECT ; this would normally be removed, but because this'll be traded, we're using this
+	db 25, REFLECT ; the moves would normally be removed, but because this'll be traded, we're using this
 	db 28, LEECH_SEED
 	db 32, STUN_SPORE
 	db 37, POISONPOWDER

data/text/item_descriptions.asm

@@ -43,6 +43,7 @@ _ProtectorDescription::
 _BlkAuguriteDescription::
 _DubiousDiscDescription::
 _UpGradeDescription::
+_MetalCoatDescription::
 	text "Evolves certain"
 	next "kinds of #MON."
 	prompt

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