Slight postgame encounter balancing

2025-09-16 18:30:50 +12:00 · 2024-01-07 12:42:00 +00:00 · 2024-01-07 12:42:00 +00:00 · 6bd93e635c
parent c0727f3044
commit 6bd93e635c
21 changed files with 160 additions and 187 deletions
--- a/data/maps/objects/BrunswickTrail.asm
+++ b/data/maps/objects/BrunswickTrail.asm
@ -9,7 +9,7 @@ BrunswickTrail_Object:
 	bg_event 55,  8, 10 ; sign

 	def_object_events
-	object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTORMUS, 60 | OW_POKEMON ; person
+	object_event 23, 11, SPRITE_FAKE_TREE, STAY, NONE, 1, CACTORMUS, 50 | OW_POKEMON ; person
 	object_event 45, 19, SPRITE_COOLTRAINER_M, STAY, UP, 2, OPP_BIRD_KEEPER, 12 ; person
 	object_event 19, 14, SPRITE_BEAUTY, STAY, DOWN, 3, OPP_BEAUTY, 16 ; person
 	object_event 25, 21, SPRITE_FISHER, STAY, DOWN, 4, OPP_FISHER, 13 ; person
--- a/data/wild/grass_water.asm
+++ b/data/wild/grass_water.asm
@ -114,7 +114,7 @@ WildDataPointers:
 	dw VictoryRoad1FWildMons
 	dw BrunswickGrottoWildMons
 	dw Gauntlet5FWildMons
-	dw Gauntlet6FWildMons
+	dw NothingWildMons
 	dw NothingWildMons
 	dw NothingWildMons
 	dw NothingWildMons
@ -335,7 +335,6 @@ INCLUDE "data/wild/maps/SilphGauntlet2F.asm"
 INCLUDE "data/wild/maps/SilphGauntlet3F.asm"
 INCLUDE "data/wild/maps/SilphGauntlet4F.asm"
 INCLUDE "data/wild/maps/SilphGauntlet5F.asm"
-INCLUDE "data/wild/maps/SilphGauntlet6F.asm"
 INCLUDE "data/wild/maps/FarawayIslandInside.asm"
 INCLUDE "data/wild/maps/MtMoonCrater.asm"
 INCLUDE "data/wild/maps/UnderwaterTunnel.asm"
--- a/data/wild/maps/BrunswickGrotto.asm
+++ b/data/wild/maps/BrunswickGrotto.asm
@ -1,16 +1,16 @@
 ; Another way to obtain Virdian Forest bugs, which are hard to bring up to speed post-game.
 BrunswickGrottoWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 51, BEEDRILL
-	db 52, BUTTERFREE
-	db 52, CARAPTHOR
-	db 51, MINISTARE
-	db 53, PARASECT
-	db 53, PARASECT
-	db 53, GORILLAIMO
-	db 54, SCYTHER
-	db 54, PINSIR
-	db 55, PINSIR
+	db 45, BEEDRILL
+	db 45, BUTTERFREE
+	db 47, CARAPTHOR
+	db 45, SQUEAMATA
+	db 46, PARASECT
+	db 47, PARASECT
+	db 50, SCYTHER
+	db 50, PINSIR
+	db 48, GORILLAIMO
+	db 50, MINISTARE
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/BrunswickTrail.asm
+++ b/data/wild/maps/BrunswickTrail.asm
@ -2,16 +2,16 @@
 ; Some of these are Pokemon featured in the Big P Pokemon Race from the anime.
 BrunswickTrailMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 49, TOEDSCOOL
+	db 45, TOEDSCOOL
 	db 47, DODRIO
-	db 53, TOEDSCOOL
-	db 52, DODRIO
-	db 52, RAPIDASH
-	db 55, TAUROS
-	db 55, CACTORMUS
-	db 56, TOEDSCRUEL
-	db 56, TOEDSCRUEL
-	db 55, CACTORMUS
+	db 45, TOEDSCOOL
+	db 48, DODRIO
+	db 48, RAPIDASH
+	db 50, CACTORMUS
+	db 47, TOEDSCRUEL
+	db 48, TOEDSCRUEL
+	db 49, TAUROS
+	db 50, TAUROS
 	end_grass_wildmons
 	
 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/CelesteHill.asm
+++ b/data/wild/maps/CelesteHill.asm
@ -1,15 +1,15 @@
 CelesteHillWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 55, FARFETCHD
-	db 55, NIDORINO
-	db 56, FARFETCHD
-	db 56, NIDORINA
-	db 57, NIDORINA
-	db 57, LUXWAN
-	db 57, BUU
-	db 57, WIGGLYTUFF
-	db 56, BALUMBA
-	db 59, DRAGONAIR
+	db 47, FARFETCHD
+	db 47, NIDORINO
+	db 48, FARFETCHD
+	db 47, NIDORINA
+	db 47, NIDORINA
+	db 49, LUXWAN
+	db 49, BUU
+	db 49, WIGGLYTUFF
+	db 48, BALUMBA
+	db 50, DRAGONAIR
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/CelesteHillCave.asm
+++ b/data/wild/maps/CelesteHillCave.asm
@ -1,15 +1,15 @@
 CelesteHillCaveWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 51, GRAVELER
-	db 52, BUU
-	db 52, GRAVELER
-	db 51, BUU
-	db 53, CROBAT
-	db 53, JYNX
-	db 53, STEELIX
-	db 54, NIDOREIGN
-	db 54, CLEFABLE
-	db 55, CLEFABLE
+	db 47, GRAVELER
+	db 48, BUU
+	db 47, GRAVELER
+	db 49, BUU
+	db 49, CROBAT
+	db 49, JYNX
+	db 49, STEELIX
+	db 50, NIDOREIGN
+	db 50, CLEFABLE
+	db 50, CLEFABLE
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/CeruleanCave1F.asm
+++ b/data/wild/maps/CeruleanCave1F.asm
@ -1,15 +1,15 @@
 CeruleanCave1FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 46, GOLBAT
-	db 46, HYPNO
-	db 46, MAGNETON
-	db 49, DODRIO
-	db 49, VENOMOTH
-	db 52, ARBOK
-	db 49, KADABRA
-	db 52, PARASECT
-	db 53, RAICHU
-	db 53, CLEFAIRY
+	db 60, GRAVELER
+	db 60, GOLBAT
+	db 61, ELECTRODE
+	db 61, DODRIO
+	db 61, VENOMOTH
+	db 60, GRAVELER
+	db 62, KADABRA
+	db 62, MAGNETON
+	db 60, DITTO
+	db 63, CLEFAIRY
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/CeruleanCave2F.asm
+++ b/data/wild/maps/CeruleanCave2F.asm
@ -1,15 +1,15 @@
 CeruleanCave2FWildMons:
 	def_grass_wildmons 15 ; encounter rate
-	db 51, DODRIO
-	db 51, VENOMOTH
-	db 51, WEEPINBELL
-	db 52, RHYDON
-	db 52, MAROWAK
-	db 52, ELECTRODE
-	db 56, CHANSEY
-	db 54, WIGGLYTUFF
-	db 55, LICKITUNG
-	db 60, RATICATE
+	db 61, CROBAT
+	db 61, GLOOM
+	db 62, RAPIDASH
+	db 61, WEEPINBELL
+	db 61, WEEPINBELL
+	db 63, STEELIX
+	db 63, WIGGLYTUFF
+	db 65, DITTO
+	db 63, LICKITUNG
+	db 64, SNORLAX
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/CeruleanCaveB1F.asm
+++ b/data/wild/maps/CeruleanCaveB1F.asm
@ -1,15 +1,15 @@
 CeruleanCaveB1FWildMons:
 	def_grass_wildmons 25 ; encounter rate
-	db 55, RHYDON
-	db 55, MAROWAK
-	db 55, ELECTRODE
-	db 64, CHANSEY
-	db 64, PARASECT
+	db 62, GRAVELER
+	db 62, CROBAT
+	db 63, CLEFAIRY
+	db 64, LICKITUNG
+	db 64, KADABRA
 	db 64, RAICHU
-	db 57, SANDSLASH
-	db 65, GLOOM
-	db 63, RAPIDASH
-	db 67, DITTO
+	db 64, CHANSEY
+	db 65, DITTO
+	db 65, SNORLAX
+	db 70, DITTO
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/GarnetCavern1F.asm
+++ b/data/wild/maps/GarnetCavern1F.asm
@ -1,15 +1,15 @@
 GarnetCavern1FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 52, MR_MIME
-	db 52, GRAVELER
-	db 53, MAGNETON
-	db 51, HYPNO
-	db 50, CROAKOZUNA
-	db 55, SLOWBRO
-	db 54, SLOWBRO
-	db 55, HAUNTER
-	db 54, GAVILLAIN
-	db 55, GAVILLAIN
+	db 47, MR_MIME
+	db 47, GRAVELER
+	db 48, MAGNETON
+	db 48, HYPNO
+	db 47, CROAKOZUNA
+	db 49, SLOWBRO
+	db 48, SLOWBRO
+	db 49, HAUNTER
+	db 49, GAVILLAIN
+	db 50, GAVILLAIN
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/GarnetCavern2F.asm
+++ b/data/wild/maps/GarnetCavern2F.asm
@ -1,15 +1,15 @@
 GarnetCavern2FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 52, MR_MIME
-	db 52, GRAVELER
-	db 53, MAGNETON
-	db 51, HYPNO
-	db 50, CROAKOZUNA
-	db 55, SLOWBRO
-	db 54, SLOWBRO
-	db 55, HAUNTER
-	db 54, GAVILLAIN
-	db 55, GAVILLAIN
+	db 47, MR_MIME
+	db 47, GRAVELER
+	db 48, MAGNETON
+	db 48, HYPNO
+	db 47, CROAKOZUNA
+	db 49, SLOWBRO
+	db 48, SLOWBRO
+	db 49, HAUNTER
+	db 49, GAVILLAIN
+	db 50, GAVILLAIN
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/GarnetCavernB1F.asm
+++ b/data/wild/maps/GarnetCavernB1F.asm
@ -1,15 +1,15 @@
 GarnetCavernB1FWildMons:
 	def_grass_wildmons 5 ; encounter rate
-	db 52, MR_MIME
-	db 52, GRAVELER
-	db 53, MAGNETON
-	db 51, HYPNO
-	db 50, CROAKOZUNA
-	db 55, SLOWBRO
-	db 54, SLOWBRO
-	db 55, HAUNTER
-	db 54, GAVILLAIN
-	db 55, GAVILLAIN
+	db 47, MR_MIME
+	db 47, GRAVELER
+	db 48, MAGNETON
+	db 48, HYPNO
+	db 47, CROAKOZUNA
+	db 49, SLOWBRO
+	db 48, SLOWBRO
+	db 49, HAUNTER
+	db 49, GAVILLAIN
+	db 50, GAVILLAIN
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/MtMoonCrater.asm
+++ b/data/wild/maps/MtMoonCrater.asm
@ -1,26 +1,16 @@
 MtMoonCraterMons:
 	def_grass_wildmons 10 ; encounter rate
 	db 49, DUGTRIO
-	db 47, VENOMOTH
-	db 53, RAICHU
-	db 52, VENOMOTH
-	db 52, DUGTRIO
-	db 55, RAICHU
-	db 55, CHANSEY
+	db 49, VENOMOTH
+	db 49, RAICHU
+	db 50, VENOMOTH
+	db 50, DUGTRIO
+	db 50, RAICHU
+	db 50, CHANSEY
 	db 50, SANDY_SHOCKS
 	db 50, SCREAM_TAIL
 	db 50, SCREAM_TAIL
 	end_grass_wildmons
 	
-	def_water_wildmons 10 ; encounter rate
-	db 52, GOLDUCK
-	db 54, GOLDUCK
-	db 50, GOLDUCK
-	db 52, JABETTA
-	db 50, JABETTA
-	db 52, CROAKOZUNA
-	db 54, CROAKOZUNA
-	db 50, WUGTRIO
-	db 51, WUGTRIO
-	db 52, WUGTRIO
+	def_water_wildmons 0 ; encounter rate
 	end_water_wildmons
--- a/data/wild/maps/PokemonTower5F.asm
+++ b/data/wild/maps/PokemonTower5F.asm
@ -9,7 +9,7 @@ PokemonTower5FWildMons:
 	db 25, HAUNTER
 	db 20, CUBONE
 	db 22, CUBONE
-	db 24, VULPIX
+	db 25, BALUMBA
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/PokemonTower6F.asm
+++ b/data/wild/maps/PokemonTower6F.asm
@ -2,12 +2,12 @@ PokemonTower6FWildMons:
 	def_grass_wildmons 15 ; encounter rate
 	db 21, GASTLY
 	db 22, GASTLY
-	db 23, GASTLY
+	db 22, CUBONE
 	db 20, VULPIX
 	db 23, VULPIX
 	db 24, CUBONE
 	db 26, HAUNTER
-	db 22, CUBONE
+	db 18, VULPIII
 	db 27, HAUNTER
 	db 28, BALUMBA
 	end_grass_wildmons
--- a/data/wild/maps/SilphGauntlet1F.asm
+++ b/data/wild/maps/SilphGauntlet1F.asm
@ -1,15 +1,15 @@
 Gauntlet1FWildMons:
 	def_grass_wildmons 8 ; encounter rate
-	db 50, BUTTERFREE
-	db 50, BEEDRILL
-	db 51, VENOMOTH
-	db 51, TANGELA
-	db 51, BEEDRILL
-	db 52, VENOMOTH
-	db 52, CARAPTHOR
-	db 53, TANGELA
-	db 53, CARAPTHOR
-	db 55, GOROTORA
+	db 45, BUTTERFREE
+	db 45, BEEDRILL
+	db 46, VENOMOTH
+	db 47, PIDGEOT
+	db 46, BEEDRILL
+	db 46, BUTTERFREE
+	db 47, CARAPTHOR
+	db 48, PIDGEOT
+	db 48, CARAPTHOR
+	db 50, GOROTORA
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet2F.asm
+++ b/data/wild/maps/SilphGauntlet2F.asm
@ -1,15 +1,15 @@
 Gauntlet2FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 51, GRAVELER
-	db 51, SANDSLASH
-	db 52, MACHOKE
-	db 52, PARASECT
-	db 52, SANDSLASH
-	db 53, MACHOKE
-	db 53, CROBAT
-	db 54, CLEFABLE
-	db 54, CROBAT
-	db 56, KLEAVOR
+	db 46, GRAVELER
+	db 46, SANDSLASH
+	db 47, MACHOKE
+	db 47, PARASECT
+	db 47, GRAVELER
+	db 48, MACHOKE
+	db 48, CROBAT
+	db 49, CLEFABLE
+	db 49, CROBAT
+	db 51, KLEAVOR
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet3F.asm
+++ b/data/wild/maps/SilphGauntlet3F.asm
@ -1,15 +1,15 @@
 Gauntlet3FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 52, POLIWHIRL
-	db 52, JABETTA
-	db 53, KINGLER
-	db 53, SLOWBRO
-	db 53, JABETTA
-	db 54, KINGLER
-	db 54, GOLDUCK
-	db 55, BLASTOISE
-	db 55, GOLDUCK
-	db 57, LAPRAS
+	db 47, POLIWHIRL
+	db 47, JABETTA
+	db 48, KINGLER
+	db 48, SLOWBRO
+	db 48, POLIWHIRL
+	db 49, KINGLER
+	db 49, CROAKOZUNA
+	db 50, BLASTOISE
+	db 50, CROAKOZUNA
+	db 52, LAPRAS
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet4F.asm
+++ b/data/wild/maps/SilphGauntlet4F.asm
@ -1,15 +1,15 @@
 Gauntlet4FWildMons:
 	def_grass_wildmons 10 ; encounter rate
-	db 53, HAUNTER
-	db 53, GUARDIA
-	db 54, NINETALES
-	db 54, BALUMBA
-	db 54, GUARDIA
-	db 55, NINETALES
-	db 55, HYPNO
-	db 56, KADABRA
-	db 56, HYPNO
-	db 58, ANNIHILAPE
+	db 48, HAUNTER
+	db 48, MAROWAK
+	db 49, NINETALES
+	db 49, BALUMBA
+	db 49, HAUNTER
+	db 50, NINETALES
+	db 50, HYPNO
+	db 51, KADABRA
+	db 51, HYPNO
+	db 53, GENGAR
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet5F.asm
+++ b/data/wild/maps/SilphGauntlet5F.asm
@ -1,15 +1,15 @@
 Gauntlet5FWildMons:
 	def_grass_wildmons 20 ; encounter rate
-	db 54, DODRIO
-	db 54, RHYDON
-	db 55, EXEGGUTOR
-	db 55, SCYTHER
-	db 55, PINSIR
-	db 56, TAUROS
-	db 56, KANGASKHAN
-	db 57, TRAMPEL
-	db 57, CHANSEY
-	db 59, DRAGONITE
+	db 49, DODRIO
+	db 49, RHYDON
+	db 49, EXEGGUTOR
+	db 50, SCYTHER
+	db 50, PINSIR
+	db 51, TAUROS
+	db 51, GORILLAIMO
+	db 52, KANGASKHAN
+	db 52, TRAMPEL
+	db 54, CHANSEY
 	end_grass_wildmons

 	def_water_wildmons 0 ; encounter rate
--- a/data/wild/maps/SilphGauntlet6F.asm
+++ b/data/wild/maps/SilphGauntlet6F.asm
@ -1,16 +0,0 @@
-Gauntlet6FWildMons:	; the pokemon on this floor represent the 9 gym leaders (including Yujirou!)
-	def_grass_wildmons 10 ; encounter rate
-	db 55, STEELIX
-	db 55, STARMIE
-	db 56, ELECTABUZZ
-	db 56, BELLOSSOM
-	db 56, WEEZING
-	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
-	end_water_wildmons