diff --git a/public/audio/cry/25-gigantamax.m4a b/public/audio/cry/25-gigantamax.m4a
index ea4becab5..2cf38814b 100644
Binary files a/public/audio/cry/25-gigantamax.m4a and b/public/audio/cry/25-gigantamax.m4a differ
diff --git a/public/audio/cry/25.m4a b/public/audio/cry/25.m4a
index ea4becab5..2cf38814b 100644
Binary files a/public/audio/cry/25.m4a and b/public/audio/cry/25.m4a differ
diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index fdd50661b..f462f50e1 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -975,6 +975,9 @@ export default class BattleScene extends SceneBase {
 			case Species.DEERLING:
 			case Species.SAWSBUCK:
 			case Species.VIVILLON:
+			case Species.FLABEBE:
+			case Species.FLOETTE:
+			case Species.FLORGES:
 			case Species.ORICORIO:
 			case Species.SQUAWKABILLY:
 			case Species.TATSUGIRI:
diff --git a/src/data/pokemon-level-moves.ts b/src/data/pokemon-level-moves.ts
index fe7f9a0a7..e205febcd 100644
--- a/src/data/pokemon-level-moves.ts
+++ b/src/data/pokemon-level-moves.ts
@@ -10919,8 +10919,8 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   ],
   [Species.CHESPIN]: [
     [ 1, Moves.TACKLE ],
-    [ 1, Moves.VINE_WHIP ],
     [ 1, Moves.GROWL ],
+    [ 1, Moves.VINE_WHIP ],
     [ 8, Moves.ROLLOUT ],
     [ 11, Moves.BITE ],
     [ 15, Moves.LEECH_SEED ],
@@ -10934,8 +10934,8 @@ export const pokemonSpeciesLevelMoves: PokemonSpeciesLevelMoves = {
   ],
   [Species.QUILLADIN]: [
     [ 1, Moves.TACKLE ],
-    [ 1, Moves.VINE_WHIP ],
     [ 1, Moves.GROWL ],
+    [ 1, Moves.VINE_WHIP ],
     [ 8, Moves.ROLLOUT ],
     [ 11, Moves.BITE ],
     [ 15, Moves.LEECH_SEED ],
diff --git a/src/data/pokemon-species.ts b/src/data/pokemon-species.ts
index 409c32b68..3cf586057 100644
--- a/src/data/pokemon-species.ts
+++ b/src/data/pokemon-species.ts
@@ -3058,7 +3058,7 @@ export const speciesStarters = {
   [Species.FUECOCO]: 3,
   [Species.QUAXLY]: 3,
   [Species.LECHONK]: 2,
-  [Species.TAROUNTULA]: 2,
+  [Species.TAROUNTULA]: 1,
   [Species.NYMBLE]: 3,
   [Species.PAWMI]: 3,
   [Species.TANDEMAUS]: 4,
diff --git a/src/data/trainer-config.ts b/src/data/trainer-config.ts
index 10e88acc5..044bd4ec8 100644
--- a/src/data/trainer-config.ts
+++ b/src/data/trainer-config.ts
@@ -697,9 +697,9 @@ export const trainerConfigs: TrainerConfigs = {
   [TrainerType.GIOVANNI]: new TrainerConfig(++t).initForGymLeader([ Species.SANDILE, Species.MURKROW, Species.NIDORAN_M, Species.NIDORAN_F ], Type.DARK).setBattleBgm('battle_kanto_gym'),
   [TrainerType.FALKNER]: new TrainerConfig(++t).initForGymLeader([ Species.PIDGEY, Species.HOOTHOOT, Species.DODUO ], Type.FLYING).setBattleBgm('battle_johto_gym'),
   [TrainerType.BUGSY]: new TrainerConfig(++t).initForGymLeader([ Species.SCYTHER, Species.HERACROSS, Species.SHUCKLE, Species.PINSIR ], Type.BUG).setBattleBgm('battle_johto_gym'),
-  [TrainerType.WHITNEY]: new TrainerConfig(++t).initForGymLeader([ Species.CLEFAIRY, Species.MILTANK ], Type.NORMAL).setBattleBgm('battle_johto_gym'),
+  [TrainerType.WHITNEY]: new TrainerConfig(++t).initForGymLeader([ Species.GIRAFARIG, Species.MILTANK ], Type.NORMAL).setBattleBgm('battle_johto_gym'),
   [TrainerType.MORTY]: new TrainerConfig(++t).initForGymLeader([ Species.GASTLY, Species.MISDREAVUS, Species.SABLEYE ], Type.GHOST).setBattleBgm('battle_johto_gym'),
-  [TrainerType.CHUCK]: new TrainerConfig(++t).initForGymLeader([ Species.POLIWRATH, ], Type.FIGHTING).setBattleBgm('battle_johto_gym'),
+  [TrainerType.CHUCK]: new TrainerConfig(++t).initForGymLeader([ Species.POLIWRATH, Species.MANKEY ], Type.FIGHTING).setBattleBgm('battle_johto_gym'),
   [TrainerType.JASMINE]: new TrainerConfig(++t).initForGymLeader([ Species.MAGNEMITE, Species.STEELIX ], Type.STEEL).setBattleBgm('battle_johto_gym'),
   [TrainerType.PRYCE]: new TrainerConfig(++t).initForGymLeader([ Species.SEEL, Species.SWINUB ], Type.ICE).setBattleBgm('battle_johto_gym'),
   [TrainerType.CLAIR]: new TrainerConfig(++t).initForGymLeader([ Species.DRATINI, Species.HORSEA, Species.GYARADOS ], Type.DRAGON).setBattleBgm('battle_johto_gym'),