From f81b042843284e2cc92630b282f934c6ad93ba43 Mon Sep 17 00:00:00 2001
From: Adam Bird <Archez@users.noreply.github.com>
Date: Wed, 3 May 2023 21:45:41 -0400
Subject: [PATCH] Tweak: Reset trade item cycling when pausing or changing
 pages (#2808)

* reset trade select when unpausing

* move trade select reset to kaleido init and handle when changing pages
---
 soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c     | 5 +++++
 soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h    | 2 ++
 .../overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c    | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
index 89bc1c6ac..aae19180e 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_item.c
@@ -922,3 +922,8 @@ void KaleidoScope_UpdateItemEquip(PlayState* play) {
         }
     }
 }
+
+void KaleidoScope_ResetTradeSelect() {
+    gSelectingMask = false;
+    gSelectingAdultTrade = false;
+}
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
index af42f7f73..ad53fdd3a 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope.h
@@ -37,4 +37,6 @@ void PauseMapMark_Draw(PlayState* play);
 
 void KaleidoScope_UpdateCursorSize(PauseContext* pauseCtx);
 
+void KaleidoScope_ResetTradeSelect();
+
 #endif
diff --git a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
index dfd7fae49..48ec05600 100644
--- a/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
+++ b/soh/src/overlays/misc/ovl_kaleido_scope/z_kaleido_scope_PAL.c
@@ -940,6 +940,8 @@ void KaleidoScope_SwitchPage(PauseContext* pauseCtx, u8 pt) {
 
     gSaveContext.unk_13EA = 0;
     Interface_ChangeAlpha(50);
+
+    KaleidoScope_ResetTradeSelect();
 }
 
 void KaleidoScope_HandlePageToggles(PauseContext* pauseCtx, Input* input) {
@@ -3587,6 +3589,8 @@ void KaleidoScope_Update(PlayState* play)
                 }
             }
 
+            KaleidoScope_ResetTradeSelect();
+
             pauseCtx->state = 4;
             break;