From 06d1820ed96cd20877d07787a96154a1ea26ce5b Mon Sep 17 00:00:00 2001
From: Matthew Kroeger <mattk932009@gmail.com>
Date: Tue, 9 Jul 2024 18:53:46 -0500
Subject: [PATCH] removed hasRolled from battlescene and handled in UI

---
 src/battle-scene.ts                  | 1 -
 src/ui/modifier-select-ui-handler.ts | 4 +++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 1cb5d489590..26928e1182b 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -126,7 +126,6 @@ export default class BattleScene extends SceneBase {
   public seVolume: number = 1;
   public gameSpeed: integer = 1;
   public damageNumbersMode: integer = 0;
-  public hasRerolled: boolean = false;
   public reroll: boolean = false;
   public rerollTarget: integer = 1;
   public showMovesetFlyout: boolean = true;
diff --git a/src/ui/modifier-select-ui-handler.ts b/src/ui/modifier-select-ui-handler.ts
index 53f1cc7512d..d5e16082b93 100644
--- a/src/ui/modifier-select-ui-handler.ts
+++ b/src/ui/modifier-select-ui-handler.ts
@@ -250,7 +250,9 @@ export default class ModifierSelectUiHandler extends AwaitableUiHandler {
       });
 
       this.setCursor(0);
-      if (this.scene.hasRerolled) {
+      const phase = this.scene.getCurrentPhase() as any;
+      const rerollCount = phase.hasOwnProperty("rerollCount") ? phase.rerollCount : 0;
+      if (rerollCount) {
         this.setRowCursor(this.scene.rerollTarget);
       } else {
         this.setRowCursor(1);