From 20a09c2b92d255880592911ff0df29b6a46e9aef Mon Sep 17 00:00:00 2001
From: Madmadness65 <blaze.the.fireman@gmail.com>
Date: Sun, 12 May 2024 11:33:27 -0500
Subject: [PATCH] Remove species form encounter code for Scatterbug line and
 Calyrex

The Vivillon forms can all be encountered properly now, and Calyrex's forms have since been removed from the wild encounter pool, requiring a form change item to obtain.
---
 src/battle-scene.ts |  2 ++
 src/field/arena.ts  | 11 -----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 3f07bf8599a..b986baaa980 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -987,6 +987,8 @@ export default class BattleScene extends SceneBase {
 			case Species.SAWSBUCK:
 			case Species.FROAKIE:
 			case Species.FROGADIER:
+			case Species.SCATTERBUG:
+			case Species.SPEWPA:
 			case Species.VIVILLON:
 			case Species.FLABEBE:
 			case Species.FLOETTE:
diff --git a/src/field/arena.ts b/src/field/arena.ts
index 46b16eed8d3..52822aef4c6 100644
--- a/src/field/arena.ts
+++ b/src/field/arena.ts
@@ -179,10 +179,6 @@ export class Arena {
             return 5;
         }
         break;
-      case Species.SCATTERBUG:
-      case Species.SPEWPA:
-      case Species.VIVILLON:
-        return 0;
       case Species.LYCANROC:
         const timeOfDay = this.getTimeOfDay();
         switch (timeOfDay) {
@@ -194,13 +190,6 @@ export class Arena {
           case TimeOfDay.NIGHT:
             return 1;
         }
-      case Species.CALYREX:
-        switch (this.biomeType) {
-          case Biome.SNOWY_FOREST:
-            return 1;
-          case Biome.GRAVEYARD:
-            return 2;
-        }
         break;
     }