Citrine time!

Added map data for Citrine City, including wild spawns, as well as a fly location. Also fixed an issue where Bill's Garden couldn't spawn wild Pokemon. Citrine is also green for some reason.

data/wild/maps/BillsGarden.asm

@@ -5,27 +5,27 @@
 ; Legendary Birds were also in the mythos but there's no space and it sounds terrible.
 BillsGardenWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 46, EEVEE ; People are here for Eevee so just give them the ~40% chance...
-	db 46, EEVEE
-	db 46, CHARMANDER
-	db 49, BULBASAUR
-	db 49, HITMONTOP
-	db 52, HITMONCHAN
-	db 49, HITMONLEE
-	db 52, ELECTRODE_H
-	db 53, ARCANINE_H
-	db 53, DECILLA
+	db 50, EEVEE ; People are here for Eevee so just give them the ~40% chance...
+	db 50, EEVEE
+	db 50, CHARMANDER
+	db 50, BULBASAUR
+	db 50, HITMONTOP
+	db 50, HITMONCHAN
+	db 50, HITMONLEE
+	db 50, ELECTRODE_H
+	db 50, ARCANINE_H
+	db 50, DECILLA
 	end_grass_wildmons
 
 	def_water_wildmons 10 ; encounter rate
-	db 40, SQUIRTLE
-	db 40, SQUIRTLE
-	db 40, SQUIRTLE
-	db 40, KABUTO
-	db 40, OMANYTE
-	db 40, AERODACTYL ; In games like DPP, you can encounter fliers on Water. Most notably, Zubat. No space on land so this is the best we got.
-	db 40, WARTORTLE
-	db 40, WARTORTLE
-	db 40, BLASTOISE
-	db 40, TOTARTLE
+	db 50, BLASTYKE
+	db 50, SQUIRTLE
+	db 50, SQUIRTLE
+	db 50, KABUTO
+	db 50, OMANYTE
+	db 50, AERODACTYL ; In games like DPP, you can encounter fliers on Water. Most notably, Zubat. No space on land so this is the best we got.
+	db 50, WARTORTLE
+	db 50, WARTORTLE
+	db 50, BLASTOISE
+	db 50, TOTARTLE
 	end_water_wildmons

data/wild/maps/CitrineCity.asm

@@ -0,0 +1,16 @@
+CitrineWildMons:
+	def_grass_wildmons 10 ; encounter rate
+	db 50, CACTUS
+	db 50, PIDGEOT
+	db 51, DODRIO
+	db 51, CACTUS
+	db 51, PIDGEOT
+	db 52, CACTUS
+	db 52, KINGLER
+	db 53, KINGLER
+	db 53, EXEGGUTOR
+	db 55, EXEGGUTOR
+	end_grass_wildmons
+
+	def_water_wildmons 0 ; encounter rate
+	end_water_wildmons

data/wild/maps/SilphGauntlet1F.asm

@@ -1,15 +1,15 @@
 Gauntlet1FWildMons:
 	def_grass_wildmons 8 ; encounter rate
-	db 55, BUTTERFREE
-	db 55, BEEDRILL
-	db 56, VENOMOTH
-	db 56, PARASECT
-	db 56, BEEDRILL
-	db 57, VENOMOTH
-	db 57, TANGROWTH
-	db 58, GOROCHU
-	db 58, TANGROWTH
-	db 60, VENUSAUR
+	db 50, BUTTERFREE
+	db 50, BEEDRILL
+	db 51, VENOMOTH
+	db 51, PARASECT
+	db 51, BEEDRILL
+	db 52, VENOMOTH
+	db 52, TANGROWTH
+	db 53, GOROCHU
+	db 53, TANGROWTH
+	db 55, VENUSAUR
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SilphGauntlet2F.asm

@@ -1,15 +1,15 @@
 Gauntlet2FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 57, GOLEM
-	db 57, SANDSLASH
-	db 58, MACHAMP
-	db 58, CROBAT
-	db 58, SANDSLASH
-	db 59, MACHAMP
-	db 59, STEELIX
-	db 60, CLEFABLE
-	db 60, STEELIX
-	db 62, CHARIZARD
+	db 52, GOLEM
+	db 52, SANDSLASH
+	db 53, MACHAMP
+	db 53, CROBAT
+	db 53, SANDSLASH
+	db 54, MACHAMP
+	db 54, STEELIX
+	db 55, CLEFABLE
+	db 55, STEELIX
+	db 57, CHARIZARD
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SilphGauntlet3F.asm

@@ -1,15 +1,15 @@
 Gauntlet3FWildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 59, TENTACRUEL
-	db 59, JABETTA
-	db 60, KINGLER
-	db 60, PENDRAKEN
-	db 60, JABETTA
-	db 61, KINGLER
-	db 61, GOLDUCK
-	db 62, GYARADOS
-	db 62, GOLDUCK
-	db 64, TOTARTLE
+	db 54, TENTACRUEL
+	db 54, JABETTA
+	db 55, KINGLER
+	db 55, PENDRAKEN
+	db 55, JABETTA
+	db 56, KINGLER
+	db 56, GOLDUCK
+	db 57, GYARADOS
+	db 57, GOLDUCK
+	db 59, TOTARTLE
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SilphGauntlet4F.asm

@@ -1,15 +1,15 @@
 Gauntlet4FWildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 61, GENGAR
-	db 61, GUARDIA
-	db 62, NINETALES
-	db 62, BARUNDA
-	db 62, GUARDIA
-	db 63, NINETALES
-	db 63, HYPNO
-	db 64, ALAKAZAM
-	db 64, HYPNO
-	db 66, ALAKAZAM
+	db 56, GENGAR
+	db 56, GUARDIA
+	db 57, NINETALES
+	db 57, BARUNDA
+	db 57, GUARDIA
+	db 58, NINETALES
+	db 58, HYPNO
+	db 59, ALAKAZAM
+	db 59, HYPNO
+	db 61, ALAKAZAM
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SilphGauntlet5F.asm

@@ -1,15 +1,15 @@
 Gauntlet5FWildMons:
 	def_grass_wildmons 30 ; encounter rate
-	db 63, DODRIO
-	db 63, RHYDON
-	db 64, EXEGGUTOR
-	db 64, SCYTHER
-	db 64, PINSIR
-	db 65, KANGASKHAN
-	db 65, TAUROS
-	db 66, TRAMPEL
-	db 66, CHANSEY
-	db 68, DRAGONITE
+	db 58, DODRIO
+	db 58, RHYDON
+	db 59, EXEGGUTOR
+	db 59, SCYTHER
+	db 59, PINSIR
+	db 60, KANGASKHAN
+	db 60, TAUROS
+	db 61, TRAMPEL
+	db 61, CHANSEY
+	db 63, DRAGONITE
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate

data/wild/maps/SilphGauntlet6F.asm

@@ -1,15 +1,15 @@
 Gauntlet6FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 65, MUK
-	db 65, WEEZING
-	db 66, ANIMON
-	db 66, PORYGON
-	db 66, WEEZING
-	db 67, ANIMON
-	db 67, MAGNEZONE
-	db 68, AERODACTYL
-	db 68, MAGNEZONE
-	db 70, GYAOON
+	db 60, MUK
+	db 60, WEEZING
+	db 61, ANIMON
+	db 61, PORYGON
+	db 61, WEEZING
+	db 62, ANIMON
+	db 62, MAGNEZONE
+	db 63, AERODACTYL
+	db 63, MAGNEZONE
+	db 65, GYAOON
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate