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;
     }