From 48d0c0e6339e419a167a7f43565c02998dfcf03e Mon Sep 17 00:00:00 2001
From: cawtds <dennis.stamm@gmx.de>
Date: Tue, 4 Jun 2024 19:01:51 +0200
Subject: [PATCH] realign mint function with pokeemerald

---
 src/party_menu.c | 29 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/party_menu.c b/src/party_menu.c
index 210b9c8d5..330817f58 100644
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -4793,7 +4793,7 @@ void ItemUseCB_AbilityPatch(u8 taskId, TaskFunc task)
 #define tNewNature  data[3]
 #define tOldFunc    4
 
-void ItemUseCB_MintStep(u8 taskId, TaskFunc func)
+void ItemUseCB_ApplyMint(u8 taskId, TaskFunc func)
 {
     static const u8 doneText[] = _("{STR_VAR_1}'s stats may have changed due\nto the effects of the {STR_VAR_2}!{PAUSE_UNTIL_PRESS}");
     s16 *data = gTasks[taskId].data;
@@ -4833,6 +4833,16 @@ void Task_Mint(u8 taskId)
     switch(tState)
     {
         case 0:
+        // Can't use.
+            if (tOldNature == tNewNature)
+            {
+                gPartyMenuUseExitCallback = FALSE;
+                PlaySE(SE_SELECT);
+                DisplayPartyMenuMessage(gText_WontHaveEffect, 1);
+                ScheduleBgCopyTilemapToVram(2);
+                gTasks[taskId].func = Task_ClosePartyMenuAfterText;
+                return;
+            }
             gPartyMenuUseExitCallback = TRUE;
             GetMonNickname(&gPlayerParty[tMonId], gStringVar1);
             StringExpandPlaceholders(gStringVar4, askText);
@@ -4869,7 +4879,7 @@ void Task_Mint(u8 taskId)
             break;
         case 3:
             Task_DoUseItemAnim(taskId);
-            gItemUseCB = ItemUseCB_MintStep;
+            gItemUseCB = ItemUseCB_ApplyMint;
             break;
     }
 }
@@ -4882,19 +4892,8 @@ void ItemUseCB_Mint(u8 taskId, TaskFunc task)
     tMonId = gPartyMenu.slotId;
     tOldNature = GetMonData(&gPlayerParty[tMonId], MON_DATA_HIDDEN_NATURE);
     tNewNature = ItemId_GetSecondaryId(gSpecialVar_ItemId);
-    if (tOldNature == tNewNature)
-    {
-        gPartyMenuUseExitCallback = FALSE;
-        PlaySE(SE_SELECT);
-        DisplayPartyMenuMessage(gText_WontHaveEffect, TRUE);
-        ScheduleBgCopyTilemapToVram(2);
-        gTasks[taskId].func = Task_ClosePartyMenuAfterText;
-    }
-    else
-    {
-        SetWordTaskArg(taskId, tOldFunc, (uintptr_t)(gTasks[taskId].func));
-        gTasks[taskId].func = Task_Mint;
-    }
+    SetWordTaskArg(taskId, tOldFunc, (uintptr_t)(gTasks[taskId].func));
+    gTasks[taskId].func = Task_Mint;
 }
 
 #undef tState