The Big One.

Whoa, this one's been in the making for a while now. This one has been my attempt to fix as much as I could within a little over a month. Here's what I've got for you. - Fixed a bug in Silph Gauntlet where the trainers would not see you unless you spoke to them - Removed the unnecessary Gawarhed and Wugtrio static encounters. In what was once Gawarhed's place is a Rare Candy. - Implemented a working ferry system (huge thanks to Red++) that allows travelling to Faraway Island and Citrine City with the right tickets. Currently both maps use a copy of the SS Anne, which may be revised later. - Bittybat, Magnetite and Burgela have been removed to fix a Pokedex bug where entries wouldn't display correctly if the total number wasn't a multiple of 8. - Fixed a bug where fishing up a Wiglett and Wugtrio would play the trainer battle and Champion battle themes respectively - Restructured the Pokedex a little. Don't worry, Lickitung's still number 108! - All references to betamon in the disassembly have had their names updated to match the new Ogasawara ones - Removed Blastyke as a Game Corner prize, replacing it with Squeamata. - Garnet Cavern is now properly listed as a dungeon map - Fixed an issue where trying to leave Bill's House after entering the garden would put you back in the garden - Moved Silph Gauntlet's Beauty down 1 floor to make the number of trainers on each floor more consistent - Finished Gauntlet 6F except for the trainer text (PvK please help) - Gavillain's stats updated to match KEP 1.4 on the Showdown server. It's now a Dragon/Electric type with less Ice coverage. - Fixed Clefable's and Wigglytuff's starting movesets from an earlier commit - Fixed an ABSOLUTELY HORRIBLE, EGREGIOUSLY FRUSTRATING BUG that caused the Pokedex's seen counter to rarely update. This is what caused this commit to be delayed for so long. No joke. - New sprites, courtesy of Albatross, for Sylveon's back sprite, Alolan Marowak, Alolan Muk, Galarian Weezing and Magnezone! - Fixed a bug preventing the trade for Haunter from being accessed.
2026-04-08 19:40:40 +12:00 · 2023-09-19 23:34:25 +01:00 · 2023-09-19 23:34:25 +01:00 · 508a4e790e
commit 508a4e790e
parent 57186bb2a0
246 changed files with 2446 additions and 2384 deletions
--- a/data/wild/maps/BrunswickGrotto.asm
+++ b/data/wild/maps/BrunswickGrotto.asm
@ -7,7 +7,7 @@ BrunswickGrottoWildMons:
 	db 51, VENOMOTH
 	db 53, PARASECT
 	db 53, PARASECT
-	db 53, CACTUS
+	db 53, CACTORMUS
 	db 54, SCYTHER
 	db 54, PINSIR
 	db 55, PINSIR
--- a/data/wild/maps/BrunswickTrail.asm
+++ b/data/wild/maps/BrunswickTrail.asm
@ -8,21 +8,11 @@ BrunswickTrailMons:
 	db 52, DODRIO
 	db 52, RAPIDASH
 	db 55, TAUROS
-	db 55, SANDSLASH
+	db 55, CACTORMUS
 	db 56, TOEDSCRUEL
 	db 56, TOEDSCRUEL
-	db 55, CACTUS
+	db 55, CACTORMUS
 	end_grass_wildmons
 	
-	def_water_wildmons 10 ; encounter rate
-	db 52, WEIRDUCK 
-	db 54, WEIRDUCK
-	db 50, GOLDUCK
-	db 56, STARYU
-	db 50, STARYU
-	db 52, GOLDUCK ; The fastest swimmer in Kanto, as stated in the Pokedex book.
-	db 54, GOLDUCK 
-	db 50, SEADRA
-	db 56, SEADRA
-	db 50, RATICATE ; Raticate are said to be able to swim; fun Easter Egg; seen in the anime.
+	def_water_wildmons 0 ; encounter rate
 	end_water_wildmons
--- a/data/wild/maps/CelesteHill.asm
+++ b/data/wild/maps/CelesteHill.asm
@ -1,11 +1,11 @@
-CelesteHillWildMons:
+CelesteHillWildMons:	; unfinished
 	def_grass_wildmons 10 ; encounter rate
 	db 55, FARFETCHD
 	db 55, PIDGEOT
 	db 56, FARFETCHD
 	db 56, FEAROW
 	db 57, FEAROW
-	db 57, MADAAMU
+	db 57, LUXWAN
 	db 57, SIRFETCHD
 	db 57, DODRIO
 	db 56, GYARADOS
--- a/data/wild/maps/CitrineCity.asm
+++ b/data/wild/maps/CitrineCity.asm
@ -1,26 +1,6 @@
-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
+CitrineWildMons:	; encounters are being removed for now since I'm very unsure what to do with them...
+	def_grass_wildmons 0 ; encounter rate
 	end_grass_wildmons

-	def_water_wildmons 10 ; encounter rate
-	db 49, SEADRA
-	db 49, SEAKING
-	db 52, PENDRAKEN
-	db 50, SEADRA
-	db 50, SEAKING
-	db 53, KINGDRA
-	db 50, GOLDUCK
-	db 51, GOLDUCK
-	db 52, GYARADOS
-	db 53, GYARADOS
+	def_water_wildmons 0 ; encounter rate
 	end_water_wildmons
--- a/data/wild/maps/DiglettsCave.asm
+++ b/data/wild/maps/DiglettsCave.asm
@ -2,10 +2,10 @@ DiglettsCaveWildMons:
 	def_grass_wildmons 15 ; encounter rate, lowered a tad to match other routes - PvK
 	db 18, DIGLETT
 	db 19, DIGLETT
-	db 17, ONIX
+	db 20, ONIX
 	db 20, DIGLETT
+	db 17, DIGLETT
 	db 16, DIGLETT
-	db 15, DIGLETT
 	db 21, DIGLETT
 	db 22, DIGLETT
 	db 29, DUGTRIO
--- a/data/wild/maps/FarawayIslandInside.asm
+++ b/data/wild/maps/FarawayIslandInside.asm
@ -1,4 +1,4 @@
-FarawayIslandInsideMons:
+FarawayIslandInsideMons:	; DEFINITELY needs reworking
 	def_grass_wildmons 10 ; encounter rate
 	db 30, EEVEE
 	db 30, MANKEY
@ -12,15 +12,5 @@ FarawayIslandInsideMons:
 	db 30, EEVEE
 	end_grass_wildmons
 	
-	def_water_wildmons 10 ; encounter rate
-	db 30, MAGIKARP
-	db 30, MAGIKARP
-	db 30, MAGIKARP
-	db 30, MAGIKARP
-	db 30, MAGIKARP
-	db 30, MAGIKARP
-	db 30, MAGIKARP
-	db 30, MAGIKARP
-	db 30, MAGIKARP
-	db 30, MAGIKARP
+	def_water_wildmons 0 ; encounter rate
 	end_water_wildmons
--- a/data/wild/maps/GarnetCavern1F.asm
+++ b/data/wild/maps/GarnetCavern1F.asm
@ -1,27 +1,17 @@
-; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Flying-type Pokemon.
+; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Psychic-type Pokemon.
 GarnetCavern1FWildMons:
-	def_grass_wildmons 5 ; encounter rate
-	db 62, RHYDON
-	db 62, GRAVELER
-	db 63, CROBAT
-	db 61, DODRIO
-	db 60, VENOMOTH
-	db 65, MADAAMU
-	db 64, FEAROW
-	db 65, GUARDIA
-	db 63, TRAMPEL
-	db 66, CROCKY
+	def_grass_wildmons 10 ; encounter rate
+	db 52, RHYDON
+	db 52, GRAVELER
+	db 53, CROBAT
+	db 51, HYPNO
+	db 50, VENOMOTH
+	db 55, SLOWBRO
+	db 54, SLOWBRO
+	db 55, GUARDIA
+	db 54, GAVILLAIN
+	db 55, GAVILLAIN
 	end_grass_wildmons

-	def_water_wildmons 5 ; encounter rate
-	db 62, BAWLIGUA
-	db 62, TENTACRUEL
-	db 63, BAWLIGUA
-	db 61, TENTACRUEL
-	db 63, SLOWBRO
-	db 63, KINGLER
-	db 64, LAPRAS ; reference to the ice cavern on the sevii islands
-	db 64, GYARADOS
-	db 65, JAGG
-	db 66, CRYITHAN
+	def_water_wildmons 0 ; encounter rate
 	end_water_wildmons
--- a/data/wild/maps/GarnetCavern2F.asm
+++ b/data/wild/maps/GarnetCavern2F.asm
@ -1,27 +1,17 @@
-; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Flying-type Pokemon.
+; currently unfinished
 GarnetCavern2FWildMons:
-	def_grass_wildmons 5 ; encounter rate
-	db 62, RHYDON
-	db 62, GRAVELER
-	db 63, CROBAT
-	db 61, DODRIO
-	db 60, VENOMOTH
-	db 65, MADAAMU
-	db 64, FEAROW
-	db 65, GUARDIA
-	db 63, TRAMPEL
-	db 66, CROCKY
+	def_grass_wildmons 10 ; encounter rate
+	db 52, RHYDON
+	db 52, GRAVELER
+	db 53, CROBAT
+	db 51, HYPNO
+	db 50, VENOMOTH
+	db 55, SLOWBRO
+	db 54, SLOWBRO
+	db 55, GUARDIA
+	db 54, GAVILLAIN
+	db 55, GAVILLAIN
 	end_grass_wildmons

-	def_water_wildmons 5 ; encounter rate
-	db 60, BAWLIGUA
-	db 60, TENTACRUEL
-	db 60, BAWLIGUA
-	db 60, TENTACRUEL
-	db 60, SLOWBRO
-	db 60, KINGLER
-	db 60, LAPRAS ; reference to the ice cavern on the sevii islands
-	db 60, GYARADOS
-	db 60, JAGG
-	db 60, CRYITHAN
+	def_water_wildmons 0 ; encounter rate
 	end_water_wildmons
--- a/data/wild/maps/GarnetCavernB1F.asm
+++ b/data/wild/maps/GarnetCavernB1F.asm
@ -1,27 +1,17 @@
-; Garnet Cavern will contain a mix of Rock, Ground, Steel, and Flying-type Pokemon.
+; currently unfinished
 GarnetCavernB1FWildMons:
 	def_grass_wildmons 5 ; encounter rate
-	db 62, RHYDON
-	db 62, GRAVELER
-	db 63, CROBAT
-	db 61, DODRIO
-	db 60, VENOMOTH
-	db 65, MADAAMU
-	db 64, FEAROW
-	db 65, GUARDIA
-	db 63, TRAMPEL
-	db 66, CROCKY
+	db 52, RHYDON
+	db 52, GRAVELER
+	db 53, CROBAT
+	db 51, HYPNO
+	db 50, VENOMOTH
+	db 55, SLOWBRO
+	db 54, SLOWBRO
+	db 55, GUARDIA
+	db 54, GAVILLAIN
+	db 55, GAVILLAIN
 	end_grass_wildmons

-	def_water_wildmons 5 ; encounter rate
-	db 60, BAWLIGUA
-	db 60, TENTACRUEL
-	db 60, BAWLIGUA
-	db 60, TENTACRUEL
-	db 60, SLOWBRO
-	db 60, KINGLER
-	db 60, LAPRAS ; reference to the ice cavern on the sevii islands
-	db 60, GYARADOS
-	db 60, JAGG
-	db 60, CRYITHAN
+	def_water_wildmons 0 ; encounter rate
 	end_water_wildmons
--- a/data/wild/maps/MtMoon1F.asm
+++ b/data/wild/maps/MtMoon1F.asm
@ -1,14 +1,14 @@
 MtMoon1FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db  8, BITTYBAT
-	db  7, BITTYBAT
-	db  9, BITTYBAT
+	db  8, ZUBAT
+	db  7, ZUBAT
+	db  9, ZUBAT
 	db  8, GEODUDE
-	db  6, BITTYBAT
+	db  6, ZUBAT
 	db  9, SANDSHREW
 	db  9, GEODUDE
 	db  8, PARAS
-	db 10, BITTYBAT
+	db 10, ZUBAT
 	db  8, CLEFAIRY
 	end_grass_wildmons

--- a/data/wild/maps/MtMoonB1F.asm
+++ b/data/wild/maps/MtMoonB1F.asm
@ -1,12 +1,12 @@
 MtMoonB1FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db  8, BITTYBAT
-	db  9, BITTYBAT
+	db  8, ZUBAT
+	db  9, ZUBAT
 	db  7, GEODUDE
 	db  8, GEODUDE
 	db  9, GEODUDE
 	db  9, PARAS
-	db 10, BITTYBAT
+	db 10, ZUBAT
 	db  9, SANDSHREW
 	db  9, CLEFAIRY
 	db 10, SANDSHREW
--- a/data/wild/maps/MtMoonB2F.asm
+++ b/data/wild/maps/MtMoonB2F.asm
@ -1,8 +1,8 @@
 MtMoonB2FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db  9, BITTYBAT
+	db  9, ZUBAT
 	db  9, GEODUDE
-	db 10, BITTYBAT
+	db 10, ZUBAT
 	db 10, GEODUDE
 	db 11, ZUBAT
 	db 10, PARAS
--- a/data/wild/maps/MtMoonCrater.asm
+++ b/data/wild/maps/MtMoonCrater.asm
@ -5,11 +5,11 @@ MtMoonCraterMons:
 	db 53, RAICHU
 	db 52, VENOMOTH
 	db 52, DUGTRIO
-	db 55, ESPEON
-	db 55, UMBREON
+	db 55, RAICHU
+	db 55, CHANSEY
 	db 50, SANDY_SHOCKS
 	db 50, SCREAM_TAIL
-	db 56, CHANSEY ; I don't like this but I also don't like the Paradox Pokemon not both being 4%. Sue me.
+	db 50, SCREAM_TAIL
 	end_grass_wildmons
 	
 	def_water_wildmons 10 ; encounter rate
@ -21,6 +21,6 @@ MtMoonCraterMons:
 	db 52, CROAKOZUNA
 	db 54, CROAKOZUNA
 	db 50, WUGTRIO
-	db 56, WUGTRIO
-	db 50, VAPOREON
+	db 51, WUGTRIO
+	db 52, WUGTRIO
 	end_water_wildmons
--- a/data/wild/maps/PokemonTower2F.asm
+++ b/data/wild/maps/PokemonTower2F.asm
@ -2,14 +2,14 @@ PokemonTower2FWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 20, GASTLY
 	db 21, GASTLY
-	db 18, MIKON
-	db 15, MIKON
+	db 18, VULPIII
+	db 15, VULPIII
 	db 20, VULPIX
 	db 24, VULPIX
 	db 22, CUBONE
 	db 20, CUBONE
 	db 25, HAUNTER
-	db 25, BARUNDA
+	db 25, BALUMBA
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/PokemonTower3F.asm
+++ b/data/wild/maps/PokemonTower3F.asm
@ -3,8 +3,8 @@ PokemonTower3FWildMons:
 	db 20, GASTLY
 	db 21, GASTLY
 	db 22, GASTLY
-	db 15, MIKON
-	db 16, MIKON
+	db 15, VULPIII
+	db 16, VULPIII
 	db 18, VULPIX
 	db 24, VULPIX
 	db 20, CUBONE
--- a/data/wild/maps/PokemonTower4F.asm
+++ b/data/wild/maps/PokemonTower4F.asm
@ -3,8 +3,8 @@ PokemonTower4FWildMons:
 	db 20, GASTLY
 	db 21, GASTLY
 	db 22, GASTLY
-	db 15, MIKON
-	db 16, MIKON
+	db 15, VULPIII
+	db 16, VULPIII
 	db 23, VULPIX
 	db 25, HAUNTER
 	db 20, CUBONE
--- a/data/wild/maps/PokemonTower5F.asm
+++ b/data/wild/maps/PokemonTower5F.asm
@ -2,8 +2,8 @@ PokemonTower5FWildMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 20, GASTLY
 	db 21, GASTLY
-	db 15, MIKON
-	db 16, MIKON
+	db 15, VULPIII
+	db 16, VULPIII
 	db 23, VULPIX
 	db 24, VULPIX
 	db 25, HAUNTER
--- a/data/wild/maps/PokemonTower6F.asm
+++ b/data/wild/maps/PokemonTower6F.asm
@ -9,7 +9,7 @@ PokemonTower6FWildMons:
 	db 26, HAUNTER
 	db 22, CUBONE
 	db 27, HAUNTER
-	db 28, BARUNDA
+	db 28, BALUMBA
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/PokemonTower7F.asm
+++ b/data/wild/maps/PokemonTower7F.asm
@ -8,7 +8,7 @@ PokemonTower7FWildMons:
 	db 28, HAUNTER
 	db 22, CUBONE
 	db 24, CUBONE
-	db 28, BARUNDA
+	db 28, BALUMBA
 	db 30, GENGAR
 	end_grass_wildmons

--- a/data/wild/maps/PowerPlant.asm
+++ b/data/wild/maps/PowerPlant.asm
@ -1,15 +1,15 @@
 PowerPlantWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 35, MAGNEMITE
-	db 35, VOLTORB
-	db 35, GAOTORA
-	db 36, VOLTORB
-	db 36, GAOTORA
-	db 36, PIKACHU
-	db 37, MAGNETITE
-	db 36, ELECTABUZZ
-	db 38, ELECTABUZZ
-	db 40, RAICHU
+	db 32, MAGNEMITE
+	db 32, VOLTORB
+	db 32, GAOTORA
+	db 33, VOLTORB
+	db 33, GAOTORA
+	db 33, PIKACHU
+	db 34, MAGNETON
+	db 33, ELECTABUZZ
+	db 35, ELECTABUZZ
+	db 36, RAICHU
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/RockTunnel1F.asm
+++ b/data/wild/maps/RockTunnel1F.asm
@ -5,11 +5,11 @@ RockTunnel1FWildMons:
 	db 17, GEODUDE
 	db 15, MACHOP
 	db 16, GEODUDE
-	db 18, CHARMANDER
-	db 15, BITTYBAT
+	db 18, SLOWPOKE
+	db 17, SLOWPOKE
 	db 17, MACHOP
 	db 13, ONIX
-	db 15, DITTO
+	db 15, GAVILLAIN
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/RockTunnelB1F.asm
+++ b/data/wild/maps/RockTunnelB1F.asm
@ -4,12 +4,12 @@ RockTunnelB1FWildMons:
 	db 17, ZUBAT
 	db 17, RIBBITO
 	db 15, MACHOP
-	db 16, SLOWPOKE
-	db 18, BITTYBAT
+	db 16, RIBBITO
+	db 18, ZUBAT
 	db 17, MACHOP
-	db 17, PSYDUCK
-	db 13, CROCKY
-	db 18, CROCKY
+	db 17, ONIX
+	db 13, GAVILLAIN
+	db 18, GAVILLAIN
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route1.asm
+++ b/data/wild/maps/Route1.asm
@ -4,8 +4,8 @@ Route1WildMons:
 	db  2, RATTATA
 	db  3, RATTATA
 	db  3, PIDGEY
-	db  2, KONYA
-	db  3, KONYA
+	db  2, COINPUR
+	db  3, COINPUR
 	db  3, PIDGEY
 	db  4, RATTATA
 	db  4, PIDGEY
--- a/data/wild/maps/Route10.asm
+++ b/data/wild/maps/Route10.asm
@ -1,15 +1,15 @@
 Route10WildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 16, MAGNEMITE
-	db 16, KOTORA
+	db 16, RATTATA
 	db 14, VOLTORB
-	db 11, EKANS
+	db 13, EKANS
 	db 13, SPEAROW
-	db 15, NIDORINO
-	db 17, NIDORINA
-	db 20, MACHOP
-	db 13, SANDSHREW
-	db 17, SANDSHREW
+	db 14, KOTORA
+	db 15, NIDORAN_M
+	db 17, EKANS
+	db 14, SPEAROW
+	db 19, NIDORINO
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route12.asm
+++ b/data/wild/maps/Route12.asm
@ -2,14 +2,14 @@ Route12WildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 24, BELLSPROUT
 	db 25, PIDGEOTTO
-	db 23, BLASTYKE
-	db 24, ODDISH
-	db 22, BARUNDA
-	db 26, BARUNDA
+	db 23, ODDISH
+	db 24, VENONAT
+	db 24, BALUMBA
+	db 25, BALUMBA
 	db 26, GLOOM
-	db 27, FARFETCHD
+	db 27, PIDGEOTTO
+	db 27, WEEPINBELL
 	db 28, WEEPINBELL
-	db 30, WEEPINBELL
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route13.asm
+++ b/data/wild/maps/Route13.asm
@ -1,15 +1,15 @@
 Route13WildMons:
 	def_grass_wildmons 20 ; encounter rate
 	db 24, ODDISH
-	db 25, FARFETCHD
-	db 27, PIDGEOTTO
+	db 25, PIDGEOTTO
+	db 23, BELLSPROUT
 	db 24, VENONAT
-	db 22, DITTO
-	db 26, KRABBY
-	db 26, BELLSPROUT
-	db 25, DITTO
+	db 24, VENONAT
+	db 24, KOTORA
+	db 26, WEEPINBELL
+	db 27, BALUMBA
+	db 27, GLOOM
 	db 28, GLOOM
-	db 30, GLOOM
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route14.asm
+++ b/data/wild/maps/Route14.asm
@ -1,15 +1,15 @@
 Route14WildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 26, ODDISH
-	db 28, PIDGEOTTO
+	db 24, ODDISH
+	db 26, VENONAT
+	db 25, PIDGEOTTO
 	db 25, DITTO
-	db 26, TANGELA
-	db 24, BELLSPROUT
-	db 28, VENOMOTH
-	db 28, GLOOM
-	db 32, WEEPINBELL
-	db 30, PIDGEOTTO
-	db 32, SCYTHER
+	db 22, ODDISH
+	db 28, BELLSPROUT
+	db 26, RAMOOSE
+	db 30, VENOMOTH
+	db 28, GAOTORA
+	db 30, GAOTORA
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route15.asm
+++ b/data/wild/maps/Route15.asm
@ -1,15 +1,15 @@
 Route15WildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 24, ODDISH
-	db 26, DITTO
-	db 23, PIDGEOTTO
+	db 24, BELLSPROUT
 	db 26, VENONAT
-	db 22, ODDISH
-	db 28, DEER
-	db 26, BELLSPROUT
+	db 25, SPEAROW
+	db 25, DITTO
+	db 22, BELLSPROUT
+	db 28, ODDISH
+	db 26, RAMOOSE
 	db 30, VENOMOTH
 	db 28, GAOTORA
-	db 30, GAOTORA
+	db 30, FEAROW
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route16.asm
+++ b/data/wild/maps/Route16.asm
@ -2,12 +2,12 @@ Route16WildMons:
 	def_grass_wildmons 25 ; encounter rate
 	db 20, SPEAROW
 	db 22, FEAROW
-	db 18, GRIMER
-	db 20, DODUO
 	db 20, GRIMER
+	db 20, DODUO
+	db 20, KOFFING
 	db 18, DODUO
-	db 22, DODUO
-	db 22, RATICATE
+	db 22, KOFFING
+	db 22, RAMOOSE
 	db 23, RATICATE
 	db 25, RATICATE
 	end_grass_wildmons
--- a/data/wild/maps/Route17.asm
+++ b/data/wild/maps/Route17.asm
@ -1,14 +1,14 @@
 Route17WildMons:
 	def_grass_wildmons 25 ; encounter rate
 	db 25, FEAROW
-	db 27, RATICATE
+	db 27, KOFFING
 	db 25, RATICATE
-	db 24, PUCHIKOON
-	db 27, RATICATE
+	db 24, KOLTA
+	db 27, GRIMER
 	db 26, DODUO
 	db 28, DODUO
-	db 29, PUCHIKOON
-	db 25, PONYTA
+	db 29, PONYTA
+	db 28, PONYTA
 	db 27, DODRIO
 	end_grass_wildmons

--- a/data/wild/maps/Route2.asm
+++ b/data/wild/maps/Route2.asm
@ -4,12 +4,12 @@ Route2WildMons:
 	db  3, PIDGEY
 	db  4, PIDGEY
 	db  3, WEEDLE
-	db  3, KONYA
+	db  3, COINPUR
 	db  3, CATERPIE
 	db  4, WEEDLE
 	db  4, CATERPIE
-	db  4, KONYA
-	db  5, KONYA
+	db  4, COINPUR
+	db  5, COINPUR
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route21.asm
+++ b/data/wild/maps/Route21.asm
@ -1,10 +1,10 @@
 Route21WildMons:
 	def_grass_wildmons 25 ; encounter rate
-	db 21, RATICATE
-	db 23, PIDGEOTTO
-	db 30, BARUNDA
-	db 30, MR_MIME
-	db 29, MR_MIME
+	db 27, RATICATE
+	db 28, PIDGEOTTO
+	db 30, BALUMBA
+	db 28, GLOOM
+	db 28, WEEPINBELL
 	db 29, TOEDSCOOL
 	db 29, TOEDSCOOL
 	db 28, TANGELA
@ -18,7 +18,7 @@ Route21WildMons:
 	db 35, BLOTTLE
 	db 35, BLOTTLE
 	db 30, TENTACOOL
-	db 35, BARUNDA
+	db 35, BALUMBA
 	db 30, TENTACOOL
 	db 35, TENTACRUEL
 	db 35, PENDRAKEN
--- a/data/wild/maps/Route23.asm
+++ b/data/wild/maps/Route23.asm
@ -3,13 +3,13 @@ Route23WildMons:
 	db 41, ARBOK
 	db 40, SANDSLASH
 	db 38, FEAROW
-	db 38, RHYDON
+	db 38, ARBOK
 	db 38, EXEGGCUTE
 	db 40, PRIMEAPE
-	db 41, EXEGGCUTE
-	db 43, EXEGGCUTE
-	db 41, CHANSEY
-	db 38, TAUROS
+	db 37, EXEGGCUTE
+	db 38, EXEGGCUTE
+	db 40, FEAROW
+	db 41, SANDSLASH
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route4.asm
+++ b/data/wild/maps/Route4.asm
@ -6,8 +6,8 @@ Route4WildMons:
 	db 12, RATTATA
 	db 10, EKANS
 	db 11, EKANS
-	db 11, MIKON
-	db 12, MIKON
+	db 11, VULPIII
+	db 12, VULPIII
 	db  8, JIGGLYPUFF
 	db 10, JIGGLYPUFF
 	end_grass_wildmons
--- a/data/wild/maps/Route5.asm
+++ b/data/wild/maps/Route5.asm
@ -1,15 +1,15 @@
 Route5WildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 13, ODDISH
-	db 13, KOTORA
-	db 15, MONJA
+	db 13, EKANS
+	db 15, EKANS
 	db 10, MANKEY
 	db 12, JIGGLYPUFF
 	db 15, BELLSPROUT
 	db 16, BELLSPROUT
-	db 16, PIDGEOTTO
+	db 15, PIDGEY
 	db 14, JIGGLYPUFF
-	db 16, MEOWTH
+	db 16, PIDGEOTTO
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route7.asm
+++ b/data/wild/maps/Route7.asm
@ -1,15 +1,15 @@
 Route7WildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 22, PIDGEY
-	db 19, ODDISH
-	db 17, PIDGEOTTO
-	db 22, BELLSPROUT
-	db 19, MANKEY
-	db 18, MEOWTH
-	db 18, GROWLITHE
-	db 20, JIGGLYPUFF
+	db 19, PIDGEOTTO
+	db 19, MEOWTH
+	db 20, MEOWTH
+	db 20, PIDGEOTTO
+	db 19, SANDSHREW
+	db 18, KOLTA
+	db 18, SANDSHREW
+	db 19, KOLTA
 	db 19, VULPIX
-	db 20, ABRA
+	db 20, VULPIX
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route8.asm
+++ b/data/wild/maps/Route8.asm
@ -2,14 +2,14 @@ Route8WildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 20, PIDGEOTTO
 	db 18, MANKEY
-	db 17, EKANS
+	db 17, RATTATA
 	db 16, GROWLITHE
-	db 18, BULBASAUR
+	db 18, KOLTA
 	db 20, SANDSHREW
-	db 19, RATICATE
+	db 19, GROWLITHE
 	db 17, VULPIX
 	db 18, VULPIX
-	db 15, KADABRA
+	db 18, KADABRA
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/Route9.asm
+++ b/data/wild/maps/Route9.asm
@ -2,14 +2,14 @@ Route9WildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 16, RATTATA
 	db 16, SPEAROW
-	db 14, SANDSHREW
-	db 11, EKANS
-	db 13, CUBONE
-	db 15, CACTUS
-	db 17, NIDORINA
-	db 17, NIDORINO
-	db 17, RATICATE
-	db 20, FEAROW
+	db 14, EKANS
+	db 13, EKANS
+	db 15, RATTATA
+	db 15, MAGNEMITE
+	db 15, NIDORAN_F
+	db 17, SANDSHREW
+	db 17, SANDSHREW
+	db 19, NIDORINA
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SafariZoneCenter.asm
+++ b/data/wild/maps/SafariZoneCenter.asm
@ -4,11 +4,11 @@ SafariZoneCenterWildMons:
 	db 25, RHYHORN
 	db 22, VENONAT
 	db 24, TANGELA
-	db 31, MAROWAK
+	db 24, CUBONE
 	db 25, SLOWPOKE
-	db 31, LICKITUNG
+	db 21, LICKITUNG
+	db 23, RAMOOSE
 	db 23, CHANSEY
-	db 23, DEER
 	db 23, TRAMPEL
 	end_grass_wildmons

--- a/data/wild/maps/SafariZoneEast.asm
+++ b/data/wild/maps/SafariZoneEast.asm
@ -4,12 +4,12 @@ SafariZoneEastWildMons:
 	db 26, DODUO
 	db 22, TANGELA
 	db 25, RHYHORN
-	db 33, LICKITUNG
+	db 23, LICKITUNG
 	db 23, EXEGGCUTE
-	db 24, KANGASKHAN
+	db 24, TAUROS
 	db 25, PINSIR
+	db 24, KANGASKHAN
 	db  7, CHANSEY
-	db 28, DEER
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SafariZoneNorth.asm
+++ b/data/wild/maps/SafariZoneNorth.asm
@ -6,10 +6,10 @@ SafariZoneNorthWildMons:
 	db 25, TANGELA
 	db 30, VENOMOTH
 	db 27, EXEGGCUTE
-	db 30, DODRIO
-	db 32, KANGASKHAN
-	db 26, CHANSEY
-	db 28, TAUROS
+	db 28, DODRIO
+	db 27, TAUROS
+	db 26, TRAMPEL
+	db 28, KANGASKHAN
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SafariZoneWest.asm
+++ b/data/wild/maps/SafariZoneWest.asm
@ -7,9 +7,9 @@ SafariZoneWestWildMons:
 	db 33, VENOMOTH
 	db 26, EXEGGCUTE
 	db 25, MAROWAK
-	db 31, SCYTHER
+	db 25, SCYTHER
 	db 26, TAUROS
-	db 28, PINSIR
+	db 25, CHANSEY
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet1F.asm
+++ b/data/wild/maps/SilphGauntlet1F.asm
@ -7,9 +7,9 @@ Gauntlet1FWildMons:
 	db 51, BEEDRILL
 	db 52, VENOMOTH
 	db 52, CARAPTHOR
-	db 53, RAICHU
+	db 53, TANGELA
 	db 53, CARAPTHOR
-	db 55, VENUSAUR
+	db 55, GOROTORA
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet2F.asm
+++ b/data/wild/maps/SilphGauntlet2F.asm
@ -3,13 +3,13 @@ Gauntlet2FWildMons:
 	db 51, GRAVELER
 	db 51, SANDSLASH
 	db 52, MACHOKE
-	db 52, CROBAT
+	db 52, PARASECT
 	db 52, SANDSLASH
 	db 53, MACHOKE
-	db 53, STEELIX
+	db 53, CROBAT
 	db 54, CLEFABLE
-	db 54, STEELIX
-	db 56, CHARIZARD
+	db 54, CROBAT
+	db 56, KLEAVOR
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet3F.asm
+++ b/data/wild/maps/SilphGauntlet3F.asm
@ -9,7 +9,7 @@ Gauntlet3FWildMons:
 	db 54, GOLDUCK
 	db 55, BLASTOISE
 	db 55, GOLDUCK
-	db 57, TOTARTLE
+	db 57, LAPRAS
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet4F.asm
+++ b/data/wild/maps/SilphGauntlet4F.asm
@ -3,7 +3,7 @@ Gauntlet4FWildMons:
 	db 53, HAUNTER
 	db 53, GUARDIA
 	db 54, NINETALES
-	db 54, BARUNDA
+	db 54, BALUMBA
 	db 54, GUARDIA
 	db 55, NINETALES
 	db 55, HYPNO
--- a/data/wild/maps/SilphGauntlet5F.asm
+++ b/data/wild/maps/SilphGauntlet5F.asm
@ -5,8 +5,8 @@ Gauntlet5FWildMons:
 	db 55, EXEGGUTOR
 	db 55, SCYTHER
 	db 55, PINSIR
-	db 56, KANGASKHAN
 	db 56, TAUROS
+	db 56, KANGASKHAN
 	db 57, TRAMPEL
 	db 57, CHANSEY
 	db 59, DRAGONITE
--- a/data/wild/maps/SilphGauntlet6F.asm
+++ b/data/wild/maps/SilphGauntlet6F.asm
@ -1,15 +1,15 @@
-Gauntlet6FWildMons:
+Gauntlet6FWildMons:	; the pokemon on this floor represent the 9 gym leaders (including Yujirou!)
 	def_grass_wildmons 10 ; encounter rate
-	db 55, MUK
-	db 55, WEEZING
-	db 56, ANIMON
-	db 56, ELECTRODE
+	db 55, STEELIX
+	db 55, STARMIE
+	db 56, ELECTABUZZ
+	db 56, BELLOSSOM
 	db 56, WEEZING
-	db 57, ANIMON
-	db 57, MAGNEZONE
-	db 58, PORYGON
-	db 58, MAGNEZONE
-	db 60, OMEGA
+	db 57, MR_MIME
+	db 57, MAGMAR
+	db 58, NIDOKING
+	db 60, LICKILICKY
+	db 60, LICKILICKY
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/VictoryRoad1F.asm
+++ b/data/wild/maps/VictoryRoad1F.asm
@ -6,9 +6,9 @@ VictoryRoad1FWildMons:
 	db 36, SANDSLASH
 	db 39, SANDSLASH
 	db 42, GOLBAT
-	db 41, CROCKY
+	db 41, GAVILLAIN
 	db 41, RHYDON
-	db 42, GUARDIA
+	db 42, MAROWAK
 	db 43, HITMONTOP ; LGPE Rare Spawn
 	end_grass_wildmons

--- a/data/wild/maps/VictoryRoad2F.asm
+++ b/data/wild/maps/VictoryRoad2F.asm
@ -6,9 +6,9 @@ VictoryRoad2FWildMons:
 	db 36, SANDSLASH
 	db 39, SANDSLASH
 	db 42, MACHOKE
-	db 41, CROCKY
+	db 41, GAVILLAIN
 	db 40, RHYDON
-	db 40, GUARDIA
+	db 40, MAROWAK
 	db 43, HITMONLEE ; LGPE Rare Spawn
 	end_grass_wildmons

--- a/data/wild/maps/VictoryRoad3F.asm
+++ b/data/wild/maps/VictoryRoad3F.asm
@ -6,9 +6,9 @@ VictoryRoad3FWildMons:
 	db 42, SANDSLASH
 	db 40, VENOMOTH
 	db 45, SANDSLASH
-	db 43, CROCKY
+	db 43, GAVILLAIN
 	db 45, RHYDON ; LGPE encounters
-	db 45, GUARDIA
+	db 45, MAROWAK
 	db 45, HITMONCHAN ; LGPE Rare Spawn
 	end_grass_wildmons

--- a/data/wild/super_rod.asm
+++ b/data/wild/super_rod.asm
@ -59,16 +59,15 @@ SuperRodData:
 	db 4
 	db 5, MAGIKARP
 	db 7, MAGIKARP
-	db 5, GYOPIN
-	db 7, GYOPIN
+	db 5, ORFRY
+	db 7, ORFRY

 .Group2:	; Route 4, Cerulean, Route 24, Route 6
-	db 5
+	db 4
 	db 12, MAGIKARP
 	db 12, POLIWAG
-	db 12, GYOPIN
+	db 12, ORFRY
 	db 12, PSYDUCK
-	db 12, CHEEP

 .Group3:	; Route 11, Route 25, Vermilion
 	db 5
@ -84,50 +83,47 @@ SuperRodData:
 	db 20, PSYDUCK
 	db 20, TENTACOOL
 	db 20, BLOTTLE
-	db 20, MAGIKARP
+	db 20, KRABBY

 .Group5:	; Route 13, Route 17, Route 18, Fuchsia
-	db 7
+	db 6
 	db 25, HORSEA
 	db 25, POLIWHIRL
 	db 25, KRABBY
-	db 20, SKIMPER
 	db 25, CHEEP
 	db 25, BLOTTLE
 	db 25, GOLDEEN

 .Group6:	; Safari Zone
-	db 7
+	db 6
 	db 15, DRATINI
 	db 20, SLOWPOKE
 	db 25, KRABBY
 	db 25, WEIRDUCK
 	db 25, POLIWHIRL
 	db 30, DRAGONAIR
-	db 20, SKIMPER

 .Group7:	; Bill's Garden
 	db 6
 	db 50, SQUIRTLE
-	db 50, WARTORTLE
-	db 50, TOTARTLE
+	db 50, SQUIRTLE
+	db 50, DRATINI
 	db 50, DRATINI
 	db 50, DRAGONAIR
 	db 55, DRAGONITE

 .Group8:	; Sea Routes, Route 23, Seafoam Islands, Underwater Tunnel
-	db 7
+	db 6
 	db 30, STARYU
 	db 30, HORSEA
 	db 30, SHELLDER
-	db 30, PENDRAKEN
-	db 30, JAGG
+	db 30, SHARPOON
 	db 30, BLASTYKE
 	db 30, GOLDEEN

 .Group9:	; Citrine, Brunswick, Garnet
-	db 10
-	db 50, JAGG
+	db 8
+	db 50, SHARPOON
 	db 50, SEAKING
 	db 50, KINGLER
 	db 50, SEADRA
@ -135,21 +131,17 @@ SuperRodData:
 	db 50, GYARADOS
 	db 50, JABETTA
 	db 50, CROAKOZUNA
-	db 50, BLASTOISE
-	db 50, LAPRAS

 .Group10:	; Cerulean Cave
-	db 10
+	db 8
 	db 50, SLOWBRO
 	db 50, SEAKING
 	db 50, KINGLER
-	db 50, WUGTRIO
 	db 50, SHELLDER
 	db 50, GYARADOS
 	db 50, JABETTA
 	db 50, CROAKOZUNA
 	db 50, GOLDUCK
-	db 100, MAGIKARP 

 .Group11:	; Celadon
 	db 7