From 9a56f080db2405010240ff0273328973ec3c78b5 Mon Sep 17 00:00:00 2001
From: innerthunder <168692175+innerthunder@users.noreply.github.com>
Date: Sat, 26 Oct 2024 19:34:48 -0700
Subject: [PATCH] [Hotfix] Fix status damage triggering before berry usage
 (#4732)

* Fix status damage triggering before berry usage

* Bump version number

* Revert "Bump version number"

This reverts commit 64b194f5a7c7507b4253c96ed5b9cc028bc80ab6.

* Bump version number for real this time
---
 package-lock.json              | 4 ++--
 package.json                   | 2 +-
 src/phases/turn-start-phase.ts | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index be946306471..bbe52272f92 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "pokemon-rogue-battle",
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "pokemon-rogue-battle",
-			"version": "1.1.0",
+			"version": "1.1.1",
 			"hasInstallScript": true,
 			"dependencies": {
 				"@material/material-color-utilities": "^0.2.7",
diff --git a/package.json b/package.json
index a31296d1644..4666ffb7587 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"name": "pokemon-rogue-battle",
 	"private": true,
-	"version": "1.1.0",
+	"version": "1.1.1",
 	"type": "module",
 	"scripts": {
 		"start": "vite",
diff --git a/src/phases/turn-start-phase.ts b/src/phases/turn-start-phase.ts
index 497d449912f..dc3ee3f660a 100644
--- a/src/phases/turn-start-phase.ts
+++ b/src/phases/turn-start-phase.ts
@@ -205,11 +205,11 @@ export class TurnStartPhase extends FieldPhase {
     }
 
     this.scene.pushPhase(new WeatherEffectPhase(this.scene));
+    this.scene.pushPhase(new BerryPhase(this.scene));
 
     /** Add a new phase to check who should be taking status damage */
     this.scene.pushPhase(new CheckStatusEffectPhase(this.scene, moveOrder));
 
-    this.scene.pushPhase(new BerryPhase(this.scene));
     this.scene.pushPhase(new TurnEndPhase(this.scene));
 
     /**