diff --git a/data/trainers/rival_parties.asm b/data/trainers/rival_parties.asm
index f66b12e8..90595dcf 100644
--- a/data/trainers/rival_parties.asm
+++ b/data/trainers/rival_parties.asm
@@ -14,34 +14,34 @@ Green1Data:
 	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, WARTORTLE, 0
 	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, IVYSAUR, 0
 	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, CHARMELEON, 0
-	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, EEVEE, 0
-	db $FF, 18, PIDGEOTTO, 15, ABRA, 15, RATTATA, 17, PIKACHU, 0 ; raichu/umbreon before misty is evil
+	db $FF, 18, SPEAROW, 15, RATTATA, 15, SANDSHREW, 17, EEVEE, 0
+	db $FF, 18, SPEAROW, 15, RATTATA, 15, SANDSHREW, 17, PIKACHU, 0 ; raichu/umbreon before misty is evil
 
 Green2Data:
 ; SS Anne 2F
 	db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, WARTORTLE, 0
 	db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, IVYSAUR, 0
 	db $FF, 19, PIDGEOTTO, 16, RATICATE, 18, KADABRA, 20, CHARMELEON, 0
-	db $FF, 19, SPEAROW, 16, SANDSHREW, 18, RATTATA, 20, UMBREON, 0
-	db $FF, 19, SPEAROW, 16, SANDSHREW, 18, RATTATA, 20, RAICHU, 0
+	db $FF, 19, SPEAROW, 16, RATTATA, 18, SANDSHREW, 20, UMBREON, 0
+	db $FF, 19, SPEAROW, 16, RATTATA, 18, SANDSHREW, 20, RAICHU, 0
 ; Pokémon Tower 2F
 	db $FF, 25, PIDGEOTTO, 23, GROWLITHE, 22, EXEGGCUTE, 20, KADABRA, 25, WARTORTLE, 0
 	db $FF, 25, PIDGEOTTO, 23, GYARADOS, 22, GROWLITHE, 20, KADABRA, 25, IVYSAUR, 0
 	db $FF, 25, PIDGEOTTO, 23, EXEGGCUTE, 22, GYARADOS, 20, KADABRA, 25, CHARMELEON, 0
-	db $FF, 25, FEAROW, 23, VULPIX, 22, MAGNETITE, 20, SANDSHREW, 25, EEVEE, 0
-	db $FF, 25, FEAROW, 23, SHELLDER, 22, VULPIX, 20, SANDSHREW, 25, RAICHU, 0
+	db $FF, 25, FEAROW, 23, SANDSHREW, 22, VULPIX, 20, MAGNETITE, 25, EEVEE, 0
+	db $FF, 25, FEAROW, 23, SANDSHREW, 22, SHELLDER, 20, MAGNETITE, 25, RAICHU, 0
 ; Silph Co. 7F
 	db $FF, 37, PIDGEOT, 38, GROWLITHE, 35, EXEGGCUTE, 35, ALAKAZAM, 40, TOTARTLE, 0
 	db $FF, 37, PIDGEOT, 38, GYARADOS, 35, GROWLITHE, 35, ALAKAZAM, 40, VENUSAUR, 0
 	db $FF, 37, PIDGEOT, 38, EXEGGCUTE, 35, GYARADOS, 35, ALAKAZAM, 40, CHARIZARD, 0
-	db $FF, 38, SANDSLASH, 35, MAGNETON, 37, NINETALES, 35, KADABRA, 40, UMBREON, 0
-	db $FF, 38, SANDSLASH, 35, CLOYSTER, 37, NINETALES, 35, KADABRA, 40, GOROCHU, 0
+	db $FF, 38, SANDSLASH, 35, KADABRA, 37, NINETALES, 35, MAGNETON, 40, UMBREON, 0
+	db $FF, 38, SANDSLASH, 35, KADABRA, 37, CLOYSTER, 35, NINETALES, 40, GOROCHU, 0
 ; Route 22
 	db $FF, 47, MADAAMU, 45, RHYDON, 45, GROWLITHE, 47, EXEGGCUTE, 50, ALAKAZAM, 53, TOTARTLE, 0
 	db $FF, 47, MADAAMU, 45, RHYDON, 45, GYARADOS, 47, GROWLITHE, 50, ALAKAZAM, 53, VENUSAUR, 0
 	db $FF, 47, MADAAMU, 45, RHYDON, 45, EXEGGCUTE, 47, GYARADOS, 50, ALAKAZAM, 53, CHARIZARD, 0
-	db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, MAGNEZONE, 47, NINETALES, 50, ALAKAZAM, 53, UMBREON, 0
-	db $FF, 47, SANDSLASH, 45, EXEGGCUTE, 45, CLOYSTER, 47, NINETALES, 50, ALAKAZAM, 53, GOROCHU, 0
+	db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, MAGNEZONE, 50, NINETALES, 53, UMBREON, 0
+	db $FF, 47, SANDSLASH, 45, ALAKAZAM, 45, EXEGGCUTE, 47, NINETALES, 50, CLOYSTER, 53, GOROCHU, 0
 
 Green3Data:
 	db $FF, 61, MADAAMU, 59, ALAKAZAM, 61, RHYPERIOR, 61, ARCANINE, 63, EXEGGUTOR, 65, TOTARTLE, 0
diff --git a/data/wild/maps/Route25.asm b/data/wild/maps/Route25.asm
index a7c9c391..e9112c7e 100644
--- a/data/wild/maps/Route25.asm
+++ b/data/wild/maps/Route25.asm
@@ -4,11 +4,11 @@ Route25WildMons:
 	db 13, ODDISH
 	db 13, PIDGEY
 	db 12, ODDISH
-	db 13, PARAS
+	db 13, VENONAT
 	db 12, ABRA
 	db 14, BELLSPROUT
 	db 10, ABRA
-	db 10, SKIMPER
+	db 10, VENONAT
 	db 15, PIDGEOTTO
 	end_grass_wildmons
 
diff --git a/scripts/CeruleanCity.asm b/scripts/CeruleanCity.asm
index 4a0933f5..5e9ddcdc 100644
--- a/scripts/CeruleanCity.asm
+++ b/scripts/CeruleanCity.asm
@@ -145,25 +145,25 @@ CeruleanCityScript1:
 	ld a, [wRivalStarter]
 	cp STARTER2
 	jr nz, .NotSquirtle
-	ld a, $11
+	ld a, $0B
 	jr .done
 .NotSquirtle
 	cp STARTER3
 	jr nz, .Charmander
-	ld a, $12
+	ld a, $0C
 	jr .done
 .Charmander
 	cp STARTER1 ; changes start here
-	ld a, $13
+	ld a, $0D
 	jr nz, .Pikachu
 	jr .done
 .Pikachu ;
 	cp STARTER4 
 	jr nz, .Eevee
-	ld a, $14
+	ld a, $0F
 	jr .done
 .Eevee
-	ld a, $15
+	ld a, $0E
 	jr .done
 .done
 	ld [wTrainerNo], a
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index 3efcd119..ecfeec2b 100644
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -170,10 +170,10 @@ PokemonTower2Text1:
 .Pikachu ;
 	cp STARTER4 
 	jr nz, .Eevee
-	ld a, $9
+	ld a, $0A
 	jr .done
 .Eevee
-	ld a, $10
+	ld a, $9
 	jr .done
 .done
 	ld [wTrainerNo], a
diff --git a/scripts/SilphCo7F.asm b/scripts/SilphCo7F.asm
index eaeaef0d..c6f97639 100644
--- a/scripts/SilphCo7F.asm
+++ b/scripts/SilphCo7F.asm
@@ -188,25 +188,25 @@ SilphCo7Script3:
 	ld a, [wRivalStarter]
 	cp STARTER2
 	jr nz, .NotSquirtle
-	ld a, $11
+	ld a, $0B
 	jr .asm_51cc0
 .NotSquirtle
 	cp STARTER3
 	jr nz, .Charmander
-	ld a, $12
+	ld a, $0C
 	jr .asm_51cc0
 .Charmander
 	cp STARTER1 ; changes start here
-	ld a, $13
+	ld a, $0D
 	jr nz, .Pikachu
 	jr .asm_51cc0
 .Pikachu ;
 	cp STARTER4 
 	jr nz, .Eevee
-	ld a, $15
+	ld a, $0F
 	jr .asm_51cc0
 .Eevee
-	ld a, $14
+	ld a, $0E
 	jr .asm_51cc0
 .asm_51cc0
 	ld [wTrainerNo], a