From 1f4973d9b4fbb39b01bf2e60564991c19dad2f1e Mon Sep 17 00:00:00 2001
From: Maide <34639600+Kelebek1@users.noreply.github.com>
Date: Thu, 2 Sep 2021 16:27:26 +0100
Subject: En_Kgy (#244)

* En_Kgy

* NBS

* PR

* PR

* PR
---
 src/code/code_8012EC80.c | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'src/code')

diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c
index feec42940..084e91872 100644
--- a/src/code/code_8012EC80.c
+++ b/src/code/code_8012EC80.c
@@ -177,19 +177,18 @@ u16 gScenesPerRegion[11][27] = {
 
 s32 func_8012EC80(GlobalContext* globalCtx) {
     if (gSaveContext.buttonStatus[0] == BTN_DISABLED) {
-        return 0xFF;
-    } else if (gSaveContext.unk_1015 == 0xFF) {
-        return 0xFF;
-    } else if (gSaveContext.equips.buttonItems[((gSaveContext.playerForm == 4) ? 0 : gSaveContext.playerForm)][0] ==
-               0xFF) {
+        return ITEM_NONE;
+    } else if (gSaveContext.unk_1015 == ITEM_NONE) {
+        return ITEM_NONE;
+    } else if (CUR_FORM_EQUIP(EQUIP_SLOT_B) == ITEM_NONE) {
         if (globalCtx->interfaceCtx.unk_21C != 0) {
             if (globalCtx->interfaceCtx.unk_21E != 0) {
                 return globalCtx->interfaceCtx.unk_21E;
             }
         }
-        return 0xFF;
+        return ITEM_NONE;
     } else {
-        return gSaveContext.equips.buttonItems[((gSaveContext.playerForm == 4) ? 0 : gSaveContext.playerForm)][0];
+        return CUR_FORM_EQUIP(EQUIP_SLOT_B);
     }
 }
 
-- 
cgit v1.2.3