From 791689c3000317722fd67ae6a6a09be5460df1f5 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sat, 25 Nov 2023 12:48:48 +0000
Subject: [PATCH] Voltorb/Electrode in Silph/Rocket parties
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This gives various Rockets and Scientists Voltorb and Electrode, Pokemon that were discovered in Silph Co., to add a bit more immersion.

Naturally, Chief will use it too, which comes with the benefit of reducing Magnezone's insane prevalence in late-game parties.

Ruby Dex Entry:
> Voltorb was first sighted at a company that manufactures Poké Balls. The link between that sighting and the fact that this Pokémon looks very similar to a Poké Ball remains a mystery.
---
 data/trainers/parties.asm | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index d6b25de0..09ec3394 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -478,7 +478,7 @@ RockerData:
 ; Psychic, Poison, and a little bit of Voltorb.
 JugglerData:
 ; Silph Co. 5F
-	db 29, KADABRA, MR_MIME, 0
+	db 29, ELECTRODE, KADABRA, MR_MIME, 0
 ; Victory Road 2F
 	db 41, DROWZEE, HYPNO, ESPEON, KADABRA, 0
 ; Fuchsia Gym
@@ -541,7 +541,7 @@ BirdKeeperData:
 ; Uses Silph products and Steel-types
 ChiefData:
 ; Silph Gauntlet 7F
-	db $FF, 71, MAGNEZONE, 70, LAPRAS, 71, TRICULES, 70, GENGAR, 73, PORYGONZ, 75, OMEGADGE, 0
+	db $FF, 71, ELECTRODE, 70, LAPRAS, 71, TRICULES, 70, GENGAR, 73, PORYGONZ, 75, OMEGADGE, 0
 ; Lapras and Gengar are used here since Lapras is given by a Silph worker, and Gengar represents the Silph Scope.
 
 ; Poison- and Electric-type Pokemon
@@ -556,11 +556,11 @@ ScientistData:
 ; Mansion 1F
 	db 36, VOLTORB, ELECTRODE, KOFFING, 0
 ; Silph Co. 5F
-	db 26, MAGNEMITE, KOFFING, WEEZING, MAGNETITE, 0
+	db 26, MAGNEMITE, VOLTORB, WEEZING, MAGNETITE, 0
 ; Silph Co. 6F (unused)
 	db 25, VOLTORB, KOFFING, MAGNETITE, MAGNEMITE, KOFFING, 0
 ; Silph Co. 7F
-	db 29, PORYGON, 0 ; stolen technology!!!
+	db 29, ELECTRODE, PORYGON, 0 ; stolen technology!!!
 ; Cinnabar Volcano
 	db 37, GAVILLAIN, WEEZING, 0
 ; Silph Co. 9F
@@ -572,6 +572,7 @@ ScientistData:
 ; Mansion B1F
 	db 34, MAGNETITE, ELECTRODE, 0
 
+; Gave the Rockets more Sandshrew, Cubone, and Voltorb, Pokemon shown to be used quite a bit in various media.
 RocketData:
 ; Mt. Moon B2F
 	db 13, RATTATA, ZUBAT, 0
@@ -590,7 +591,7 @@ RocketData:
 	db 21, RATICATE, RATICATE, 0
 	db 20, GRIMER, KOFFING, KOFFING, 0
 	db 19, RATTATA, RATICATE, RATICATE, RATTATA, 0
-	db 22, GRIMER, KOFFING, 0
+	db 22, VOLTORB, KOFFING, 0
 ; Rocket Hideout B2F
 	db 17, ZUBAT, KOFFING, GRIMER, CUBONE, RATICATE, 0
 ; Rocket Hideout B3F
@@ -602,7 +603,7 @@ RocketData:
 	db 21, KOFFING, ZUBAT, 0
 ; Pokémon Tower 7F
 	db 25, ZUBAT, GRIMER, GOLBAT, 0
-	db 26, KOFFING, DROWZEE, 0
+	db 26, VOLTORB, KOFFING, DROWZEE, 0
 	db 23, ZUBAT, RATTATA, RATICATE, ZUBAT, 0
 ; Silph Gauntlet 4F (Lavender Tower)
 	db 65, PERSIAN, ARBOK, RATICATE, CROBAT, HYPNO, GUARDIA, 0
@@ -610,7 +611,7 @@ RocketData:
 	db 29, CUBONE, ZUBAT, 0
 	db 25, GOLBAT, ZUBAT, ZUBAT, RATICATE, ZUBAT, 0
 ; Silph Co. 3F
-	db 28, RATICATE, HYPNO, RATICATE, 0
+	db 28, ELECTRODE, HYPNO, RATICATE, 0
 ; Silph Co. 4F - cut
 	db 29, MACHOP, DROWZEE, 0
 	db 28, EKANS, ZUBAT, CUBONE, 0
@@ -622,7 +623,7 @@ RocketData:
 	db 28, ZUBAT, ZUBAT, GOLBAT, 0
 ; Silph Co. 7F
 	db 26, RATICATE, ARBOK, KOFFING, GOLBAT, 0
-	db 29, CUBONE, MACHOKE, 0
+	db 29, CUBONE, MACHOKE, ELECTRODE, 0
 	db 29, SANDSHREW, SANDSLASH, 0
 ; Silph Co. 8F - cut
 	db 26, RATICATE, ZUBAT, GOLBAT, RATTATA, 0
@@ -634,7 +635,7 @@ RocketData:
 	db 33, MACHOKE, 0
 ; Silph Co. 11F
 	db 25, RATTATA, ZUBAT, EKANS, RATICATE, 0
-	db 32, CUBONE, DROWZEE, MAROWAK, 0
+	db 32, ELECTRODE, DROWZEE, MAROWAK, 0
 
 ; Very varied, nothing to say
 CooltrainerMData: