From 8fd91dcb90a17e5a184af0ba26642e31b82fa4a6 Mon Sep 17 00:00:00 2001 From: Martha Schilling Date: Sun, 7 Jan 2024 14:12:28 +0000 Subject: [PATCH] More wild data changes Already added to the spreadsheet. Did you know that Seafoam Islands' water didn't give wild encounters until Yellow? --- data/wild/maps/Route21.asm | 10 +++++----- data/wild/maps/SeafoamIslands1F.asm | 2 +- data/wild/maps/SeafoamIslandsB1F.asm | 4 ++-- data/wild/maps/SeafoamIslandsB2F.asm | 8 ++++---- data/wild/maps/SeafoamIslandsB3F.asm | 20 +++++++++++++++----- data/wild/maps/SeafoamIslandsB4F.asm | 18 ++++++++++++++---- data/wild/maps/VictoryRoad1F.asm | 18 +++++++++--------- data/wild/maps/VictoryRoad2F.asm | 18 +++++++++--------- data/wild/maps/VictoryRoad3F.asm | 20 ++++++++++---------- 9 files changed, 69 insertions(+), 49 deletions(-) diff --git a/data/wild/maps/Route21.asm b/data/wild/maps/Route21.asm index 1e1eeee1..58d3c050 100644 --- a/data/wild/maps/Route21.asm +++ b/data/wild/maps/Route21.asm @@ -13,14 +13,14 @@ Route21WildMons: end_grass_wildmons def_water_wildmons 5 ; encounter rate - db 30, TENTACOOL + db 25, TENTACOOL db 30, TENTACOOL db 35, BLOTTLE db 35, BLOTTLE - db 30, TENTACOOL - db 35, BALUMBA - db 30, TENTACOOL + db 30, CHEEP + db 30, CHEEP + db 30, TENTACRUEL db 35, TENTACRUEL db 35, PENDRAKEN - db 40, PENDRAKEN + db 35, SHARPOON end_water_wildmons diff --git a/data/wild/maps/SeafoamIslands1F.asm b/data/wild/maps/SeafoamIslands1F.asm index f20c5811..13859738 100644 --- a/data/wild/maps/SeafoamIslands1F.asm +++ b/data/wild/maps/SeafoamIslands1F.asm @@ -2,7 +2,7 @@ SeafoamIslands1FWildMons: def_grass_wildmons 15 ; encounter rate db 35, SEEL db 35, GOLBAT - db 35, HORSEA + db 35, WEIRDUCK db 35, KRABBY db 36, WEIRDUCK db 33, SEEL diff --git a/data/wild/maps/SeafoamIslandsB1F.asm b/data/wild/maps/SeafoamIslandsB1F.asm index b1753b56..8007fe02 100644 --- a/data/wild/maps/SeafoamIslandsB1F.asm +++ b/data/wild/maps/SeafoamIslandsB1F.asm @@ -1,13 +1,13 @@ SeafoamIslandsB1FWildMons: def_grass_wildmons 10 ; encounter rate - db 35, SHELLDER + db 35, WEIRDUCK db 35, BLASTYKE db 36, SEEL db 36, BLASTYKE db 34, SLOWPOKE db 35, SEEL db 35, SLOWPOKE - db 35, SEADRA + db 37, GOLDUCK db 38, JYNX db 39, SLOWBRO end_grass_wildmons diff --git a/data/wild/maps/SeafoamIslandsB2F.asm b/data/wild/maps/SeafoamIslandsB2F.asm index 1523ae27..aeb55551 100644 --- a/data/wild/maps/SeafoamIslandsB2F.asm +++ b/data/wild/maps/SeafoamIslandsB2F.asm @@ -5,11 +5,11 @@ SeafoamIslandsB2FWildMons: db 36, SEEL db 36, SLOWPOKE db 34, WEIRDUCK - db 35, STARYU - db 35, WEIRDUCK + db 35, KRABBY + db 35, BLASTYKE db 38, JYNX - db 36, KRABBY - db 39, GOLDUCK + db 36, BLASTYKE + db 39, BUU end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/SeafoamIslandsB3F.asm b/data/wild/maps/SeafoamIslandsB3F.asm index 9b75e01b..02948ff2 100644 --- a/data/wild/maps/SeafoamIslandsB3F.asm +++ b/data/wild/maps/SeafoamIslandsB3F.asm @@ -2,15 +2,25 @@ SeafoamIslandsB3FWildMons: def_grass_wildmons 10 ; encounter rate db 36, BLASTYKE db 36, SEEL - db 37, BLASTYKE + db 35, SLOWPOKE db 37, SEEL db 35, KRABBY - db 36, STARYU + db 36, WEIRDUCK db 36, KINGLER db 38, JYNX - db 39, JYNX - db 39, BLASTOISE + db 39, BUU + db 39, BUU end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 5 ; encounter rate + db 30, TENTACOOL + db 30, TENTACOOL + db 35, SHELLDER + db 35, STARYU + db 35, TENTACOOL + db 35, HORSEA + db 35, STARYU + db 35, HORSEA + db 35, SHARPOON + db 40, LAPRAS end_water_wildmons diff --git a/data/wild/maps/SeafoamIslandsB4F.asm b/data/wild/maps/SeafoamIslandsB4F.asm index 8b19a29d..d00cb3a5 100644 --- a/data/wild/maps/SeafoamIslandsB4F.asm +++ b/data/wild/maps/SeafoamIslandsB4F.asm @@ -1,9 +1,9 @@ SeafoamIslandsB4FWildMons: def_grass_wildmons 10 ; encounter rate db 35, WEIRDUCK - db 35, STARYU - db 35, SHELLDER - db 36, SEADRA + db 35, SEEL + db 35, BLASTYKE + db 36, SEEL db 36, DEWGONG db 36, GOLDUCK db 37, BLASTYKE @@ -12,5 +12,15 @@ SeafoamIslandsB4FWildMons: db 40, BLASTOISE end_grass_wildmons - def_water_wildmons 0 ; encounter rate + def_water_wildmons 5 ; encounter rate + db 30, TENTACOOL + db 30, TENTACOOL + db 35, SHELLDER + db 35, STARYU + db 35, TENTACOOL + db 35, HORSEA + db 35, STARYU + db 35, HORSEA + db 35, SHARPOON + db 40, LAPRAS end_water_wildmons diff --git a/data/wild/maps/VictoryRoad1F.asm b/data/wild/maps/VictoryRoad1F.asm index 74132360..7cae24bb 100644 --- a/data/wild/maps/VictoryRoad1F.asm +++ b/data/wild/maps/VictoryRoad1F.asm @@ -1,15 +1,15 @@ VictoryRoad1FWildMons: def_grass_wildmons 15 ; encounter rate - db 34, MACHOKE - db 36, STEELIX - db 32, GOLBAT - db 36, SANDSLASH + db 39, MACHOKE + db 38, ONIX + db 39, GOLBAT + db 38, GRAVELER db 39, SANDSLASH - db 42, GOLBAT - db 41, GAVILLAIN - db 41, RHYDON - db 42, MAROWAK - db 43, HITMONTOP ; LGPE Rare Spawn + db 40, GOLBAT + db 40, GAVILLAIN + db 40, RHYHORN + db 40, MAROWAK + db 42, HITMONTOP ; LGPE Rare Spawn end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/VictoryRoad2F.asm b/data/wild/maps/VictoryRoad2F.asm index 01409287..7a82bc54 100644 --- a/data/wild/maps/VictoryRoad2F.asm +++ b/data/wild/maps/VictoryRoad2F.asm @@ -1,15 +1,15 @@ VictoryRoad2FWildMons: def_grass_wildmons 10 ; encounter rate - db 32, MACHOKE - db 34, STEELIX - db 36, GOLBAT - db 36, SANDSLASH + db 39, MACHOKE + db 38, ONIX + db 39, GOLBAT + db 38, GRAVELER db 39, SANDSLASH - db 42, MACHOKE - db 41, GAVILLAIN - db 40, RHYDON - db 40, MAROWAK - db 43, HITMONLEE ; LGPE Rare Spawn + db 40, GOLBAT + db 40, GAVILLAIN + db 40, RHYHORN + db 40, VENOMOTH + db 42, HITMONLEE ; LGPE Rare Spawn end_grass_wildmons def_water_wildmons 0 ; encounter rate diff --git a/data/wild/maps/VictoryRoad3F.asm b/data/wild/maps/VictoryRoad3F.asm index 3ff5cab9..943940bb 100644 --- a/data/wild/maps/VictoryRoad3F.asm +++ b/data/wild/maps/VictoryRoad3F.asm @@ -1,15 +1,15 @@ VictoryRoad3FWildMons: def_grass_wildmons 15 ; encounter rate - db 34, MACHOKE - db 36, STEELIX - db 32, GOLBAT - db 42, SANDSLASH - db 40, VENOMOTH - db 45, SANDSLASH - db 43, GAVILLAIN - db 45, RHYDON ; LGPE encounters - db 45, MAROWAK - db 45, HITMONCHAN ; LGPE Rare Spawn + db 39, MACHOKE + db 38, ONIX + db 39, GOLBAT + db 38, GRAVELER + db 39, RHYHORN + db 40, GOLBAT + db 40, GAVILLAIN + db 40, SANDSLASH + db 40, PARASECT + db 42, HITMONCHAN ; LGPE Rare Spawn end_grass_wildmons def_water_wildmons 0 ; encounter rate