diff --git a/data/wild/maps/BrunswickGrotto.asm b/data/wild/maps/BrunswickGrotto.asm
index 92233d41..fd2de2a1 100644
--- a/data/wild/maps/BrunswickGrotto.asm
+++ b/data/wild/maps/BrunswickGrotto.asm
@@ -4,7 +4,7 @@ BrunswickGrottoWildMons:
 	db 51, BEEDRILL
 	db 52, BUTTERFREE
 	db 52, CARAPTHOR
-	db 51, VENOMOTH
+	db 51, MINISTARE
 	db 53, PARASECT
 	db 53, PARASECT
 	db 53, GORILLAIMO
@@ -14,4 +14,4 @@ BrunswickGrottoWildMons:
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate
-	end_water_wildmons
\ No newline at end of file
+	end_water_wildmons
diff --git a/data/wild/maps/CelesteHill.asm b/data/wild/maps/CelesteHill.asm
index 05622838..112ce57c 100644
--- a/data/wild/maps/CelesteHill.asm
+++ b/data/wild/maps/CelesteHill.asm
@@ -1,15 +1,15 @@
-CelesteHillWildMons:	; unfinished
+CelesteHillWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 55, FARFETCHD
-	db 55, PIDGEOT
+	db 55, NIDORINO
 	db 56, FARFETCHD
-	db 56, FEAROW
-	db 57, FEAROW
+	db 56, NIDORINA
+	db 57, NIDORINA
 	db 57, LUXWAN
-	db 57, SIRFETCHD
-	db 57, DODRIO
-	db 56, GYARADOS
-	db 59, DRAGONITE
+	db 57, BUU
+	db 57, WIGGLYTUFF
+	db 56, BALUMBA
+	db 59, DRAGONAIR
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate
diff --git a/data/wild/maps/CelesteHillCave.asm b/data/wild/maps/CelesteHillCave.asm
index b2165ee3..df6abbd0 100644
--- a/data/wild/maps/CelesteHillCave.asm
+++ b/data/wild/maps/CelesteHillCave.asm
@@ -1,18 +1,16 @@
-; Pretty generic cave, only it contains the Ground-type tradables.
-; Vague reference to the iconic wild Steelix.
 CelesteHillCaveWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 51, GRAVELER
-	db 52, MAROWAK
+	db 52, BUU
 	db 52, GRAVELER
-	db 51, MAROWAK
+	db 51, BUU
 	db 53, CROBAT
-	db 53, RHYDON
+	db 53, JYNX
 	db 53, STEELIX
-	db 54, GOLEM
-	db 54, RHYPERIOR
-	db 55, RHYPERIOR
+	db 54, NIDOREIGN
+	db 54, CLEFABLE
+	db 55, CLEFABLE
 	end_grass_wildmons
 
 	def_water_wildmons 0 ; encounter rate
-	end_water_wildmons
\ No newline at end of file
+	end_water_wildmons
diff --git a/data/wild/maps/GarnetCavern1F.asm b/data/wild/maps/GarnetCavern1F.asm
index 8cde7809..613851e6 100644
--- a/data/wild/maps/GarnetCavern1F.asm
+++ b/data/wild/maps/GarnetCavern1F.asm
@@ -1,14 +1,13 @@
-; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Psychic-type Pokemon.
 GarnetCavern1FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 52, RHYDON
+	db 52, MR_MIME
 	db 52, GRAVELER
-	db 53, CROBAT
+	db 53, MAGNETON
 	db 51, HYPNO
-	db 50, VENOMOTH
+	db 50, CROAKOZUNA
 	db 55, SLOWBRO
 	db 54, SLOWBRO
-	db 55, GUARDIA
+	db 55, HAUNTER
 	db 54, GAVILLAIN
 	db 55, GAVILLAIN
 	end_grass_wildmons
diff --git a/data/wild/maps/GarnetCavern2F.asm b/data/wild/maps/GarnetCavern2F.asm
index ef694f1b..45d23619 100644
--- a/data/wild/maps/GarnetCavern2F.asm
+++ b/data/wild/maps/GarnetCavern2F.asm
@@ -1,14 +1,13 @@
-; currently unfinished
 GarnetCavern2FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 52, RHYDON
+	db 52, MR_MIME
 	db 52, GRAVELER
-	db 53, CROBAT
+	db 53, MAGNETON
 	db 51, HYPNO
-	db 50, VENOMOTH
+	db 50, CROAKOZUNA
 	db 55, SLOWBRO
 	db 54, SLOWBRO
-	db 55, GUARDIA
+	db 55, HAUNTER
 	db 54, GAVILLAIN
 	db 55, GAVILLAIN
 	end_grass_wildmons
diff --git a/data/wild/maps/GarnetCavernB1F.asm b/data/wild/maps/GarnetCavernB1F.asm
index ae75d80a..991470b9 100644
--- a/data/wild/maps/GarnetCavernB1F.asm
+++ b/data/wild/maps/GarnetCavernB1F.asm
@@ -1,14 +1,13 @@
-; currently unfinished
 GarnetCavernB1FWildMons:
 	def_grass_wildmons 5 ; encounter rate
-	db 52, RHYDON
+	db 52, MR_MIME
 	db 52, GRAVELER
-	db 53, CROBAT
+	db 53, MAGNETON
 	db 51, HYPNO
-	db 50, VENOMOTH
+	db 50, CROAKOZUNA
 	db 55, SLOWBRO
 	db 54, SLOWBRO
-	db 55, GUARDIA
+	db 55, HAUNTER
 	db 54, GAVILLAIN
 	db 55, GAVILLAIN
 	end_grass_wildmons