From 9212d3642a33956d4eb3f48150f39ed07fff6e49 Mon Sep 17 00:00:00 2001
From: Flashfyre <flashfireex@gmail.com>
Date: Tue, 4 Jul 2023 16:16:50 -0400
Subject: [PATCH] Move weather effects to the end of the turn

---
 src/battle-phases.ts | 6 +++---
 src/data/biome.ts    | 7 +++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/battle-phases.ts b/src/battle-phases.ts
index 2028a46780b..e007682beed 100644
--- a/src/battle-phases.ts
+++ b/src/battle-phases.ts
@@ -928,9 +928,6 @@ export class TurnStartPhase extends FieldPhase {
   start() {
     super.start();
 
-    if (this.scene.arena.weather)
-      this.scene.unshiftPhase(new WeatherEffectPhase(this.scene, this.scene.arena.weather));
-
     const field = this.scene.getField();
     const order = this.getOrder();
 
@@ -994,6 +991,9 @@ export class TurnStartPhase extends FieldPhase {
       }
     }
 
+    if (this.scene.arena.weather)
+      this.scene.pushPhase(new WeatherEffectPhase(this.scene, this.scene.arena.weather));
+
     for (let o of order) {
       if (field[o].status && field[o].status.isPostTurn())
         this.scene.pushPhase(new PostTurnStatusEffectPhase(this.scene, o));
diff --git a/src/data/biome.ts b/src/data/biome.ts
index 59dd2c53194..0500df1951a 100644
--- a/src/data/biome.ts
+++ b/src/data/biome.ts
@@ -249,12 +249,11 @@ export const biomePools: BiomePools = {
       { 1: [ Species.RATTATA ], 20: [ Species.RATICATE ] },
       Species.GRIMER,
       { 1: [ Species.KOFFING ], 35: [ Species.WEEZING ] },
-      { 1: [ Species.STUNKY ], 34: [ Species.SKUNTANK ] },
       { 1: [ Species.PATRAT ], 20: [ Species.WATCHOG ] },
       { 1: [ Species.LILLIPUP ], 16: [ Species.HERDIER ], 32: [ Species.STOUTLAND ] },
       { 1: [ Species.TRUBBISH ], 36: [ Species.GARBODOR ] }
     ],
-    [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.BURMY ], 20: [ Species.WORMADAM ] } ],
+    [BiomePoolTier.UNCOMMON]: [ { 1: [ Species.BURMY ], 20: [ Species.WORMADAM ] }, { 1: [ Species.STUNKY ], 34: [ Species.SKUNTANK ] } ],
     [BiomePoolTier.RARE]: [],
     [BiomePoolTier.SUPER_RARE]: [ Species.EEVEE, Species.SMEARGLE ],
     [BiomePoolTier.ULTRA_RARE]: [ Species.DITTO, Species.CASTFORM ],
@@ -2808,11 +2807,11 @@ export const biomePools: BiomePools = {
       ]
     ],
     [ Species.STUNKY, Type.POISON, Type.DARK, [
-        [ Biome.CITY, BiomePoolTier.COMMON ]
+        [ Biome.CITY, BiomePoolTier.UNCOMMON ]
       ]
     ],
     [ Species.SKUNTANK, Type.POISON, Type.DARK, [
-        [ Biome.CITY, BiomePoolTier.COMMON ],
+        [ Biome.CITY, BiomePoolTier.UNCOMMON ],
         [ Biome.CITY, BiomePoolTier.BOSS ]
       ]
     ],