From 2f19d364ab7283d07f459bd28215bc1398731a65 Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Sat, 6 Jul 2024 17:01:06 +0100 Subject: [PATCH] Minor wild data changes distributes qatu, stritcheel (making it correspond with remoraid), disturban, and ribbito; previously added by misty also hi from paris --- data/wild/fish.asm | 8 ++--- data/wild/johto_grass.asm | 64 +++++++++++++++++++-------------------- data/wild/johto_water.asm | 6 ++-- 3 files changed, 39 insertions(+), 39 deletions(-) diff --git a/data/wild/fish.asm b/data/wild/fish.asm index b44bc4d..87221bf 100644 --- a/data/wild/fish.asm +++ b/data/wild/fish.asm @@ -221,8 +221,8 @@ TimeFishGroups: dbwbw 40, DRATINI, 40, DRATINI ; 9 dbwbw 20, QWILFISH, 20, QWILFISH ; 10 dbwbw 40, QWILFISH, 40, QWILFISH ; 11 - dbwbw 20, REMORAID, 20, REMORAID ; 12 - dbwbw 40, REMORAID, 40, REMORAID ; 13 + dbwbw 20, REMORAID, 20, STRICHEEL ; 12 + dbwbw 40, OCTILLERY, 40, LURREEL ; 13 dbwbw 20, GYARADOS, 20, GYARADOS ; 14 dbwbw 40, GYARADOS, 40, GYARADOS ; 15 dbwbw 10, DRATINI, 10, DRATINI ; 16 @@ -231,6 +231,6 @@ TimeFishGroups: dbwbw 40, SEADRA, 40, LURREEL ; 19 dbwbw 20, QWILFISH, 20, QWILFISH ; 20 dbwbw 40, QWILFISH, 40, QWILFISH ; 21 - dbwbw 20, REMORAID, 20, REMORAID ; 21 - dbwbw 40, REMORAID, 40, REMORAID ; 21 + dbwbw 20, REMORAID, 20, STRICHEEL ; 21 + dbwbw 40, OCTILLERY, 40, LURREEL ; 21 \ No newline at end of file diff --git a/data/wild/johto_grass.asm b/data/wild/johto_grass.asm index fb514d3..fd2b35e 100644 --- a/data/wild/johto_grass.asm +++ b/data/wild/johto_grass.asm @@ -62,17 +62,17 @@ JohtoGrassWildMons: db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE ; day dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE @@ -90,17 +90,17 @@ JohtoGrassWildMons: db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE ; day dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE @@ -118,17 +118,17 @@ JohtoGrassWildMons: db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE ; day dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE @@ -146,17 +146,17 @@ JohtoGrassWildMons: db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE ; day dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE @@ -174,17 +174,17 @@ JohtoGrassWildMons: db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE ; day dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE @@ -202,17 +202,17 @@ JohtoGrassWildMons: db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE ; day dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE @@ -230,17 +230,17 @@ JohtoGrassWildMons: db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE ; day dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE @@ -258,17 +258,17 @@ JohtoGrassWildMons: db 2 percent, 2 percent, 2 percent ; encounter rates: morn/day/nite ; morn dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE ; day dbw 40, GROWLITHE - dbw 41, NATU ; QATU + dbw 41, QATU dbw 42, GROWLITHE - dbw 42, NATU ; QATU + dbw 42, QATU dbw 43, SNEASEL dbw 44, PERSIAN dbw 44, ARCANINE diff --git a/data/wild/johto_water.asm b/data/wild/johto_water.asm index 135da5f..79b5254 100644 --- a/data/wild/johto_water.asm +++ b/data/wild/johto_water.asm @@ -40,7 +40,7 @@ JohtoWaterWildMons: def_water_wildmons SLOWPOKE_WELL_B2F db 2 percent ; encounter rate dbw 15, SLOWPOKE - dbw 20, SLOWPOKE ; DISTURBAN + dbw 20, DISTURBAN dbw 20, SLOWBRO end_water_wildmons @@ -130,14 +130,14 @@ JohtoWaterWildMons: def_water_wildmons ROUTE_30 db 2 percent ; encounter rate - dbw 20, POLIWAG ; RIBBITO? + dbw 20, RIBBITO dbw 15, POLIWAG dbw 20, POLIWHIRL end_water_wildmons def_water_wildmons ROUTE_31 db 2 percent ; encounter rate - dbw 20, POLIWAG ; RIBBITO? + dbw 20, RIBBITO dbw 15, POLIWAG dbw 20, POLIWHIRL end_water_wildmons