Can only use box link if the map allows escape

kittenchilly · Sep 13, 2023 · be5b46b · be5b46b
1 parent 4dbb601
commit be5b46b
Showing 1 changed file with 12 additions and 9 deletions.
diff --git a/src/item_use.c b/src/item_use.c
@@ -56,7 +56,7 @@ static u8 GetDirectionToHiddenItem(s16, s16);
 static void PlayerFaceHiddenItem(u8);
 static void CheckForHiddenItemsInMapConnection(u8);
 static void Task_OpenRegisteredPokeblockCase(u8);
-static void Task_WaitFadeAccessPokemonBoxLink(u8);
+static void Task_AccessPokemonBoxLink(u8);
 static void ItemUseOnFieldCB_Bike(u8);
 static void ItemUseOnFieldCB_Rod(u8);
 static void ItemUseOnFieldCB_Itemfinder(u8);
@@ -681,17 +681,20 @@ static void Task_OpenRegisteredPokeblockCase(u8 taskId)
 
 void ItemUseOutOfBattle_PokemonBoxLink(u8 taskId)
 {
-    sItemUseOnFieldCB = Task_WaitFadeAccessPokemonBoxLink;
-    SetUpItemUseOnFieldCallback(taskId);
+    if (CanUseDigOrEscapeRopeOnCurMap)
+    {
+        sItemUseOnFieldCB = Task_AccessPokemonBoxLink;
+        SetUpItemUseOnFieldCallback(taskId);
+    }
+    else
+        DisplayDadsAdviceCannotUseItemMessage(taskId, gTasks[taskId].tUsingRegisteredKeyItem);
+
 }
 
-static void Task_WaitFadeAccessPokemonBoxLink(u8 taskId)
+static void Task_AccessPokemonBoxLink(u8 taskId)
 {
-    if (!gPaletteFade.active)
-    {
-        ScriptContext_SetupScript(EventScript_AccessPokemonBoxLink);
-        DestroyTask(taskId);
-    }
+    ScriptContext_SetupScript(EventScript_AccessPokemonBoxLink);
+    DestroyTask(taskId);
 }
 
 void ItemUseOutOfBattle_CoinCase(u8 taskId)