1 files changed, 15 insertions, 15 deletions

diff --git a/src/item_use.c b/src/item_use.c
index 1fdd925ac..d036da6d3 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -1,6 +1,7 @@
 #include "global.h"
 #include "item_use.h"
 #include "battle.h"
+#include "main.h"
 #include "berry.h"
 #include "bike.h"
 #include "coins.h"
@@ -45,7 +46,7 @@ extern void ItemUseOutOfBattle_EvolutionStone(u8 b);
 extern void bag_menu_mail_related(void);
 extern void OpenPokeblockCase(u8 a, void(*b)(void));
 extern void overworld_free_bg_tilemaps(void);
-extern bool32 sav1_map_is_biking_allowed(void);
+extern bool32 Overworld_IsBikingAllowed(void);
 extern bool8 IsPlayerFacingSurfableFishableWater(void);
 extern bool8 sub_81221AC(void);
 extern u8 gText_ItemFinderNothing[];
@@ -85,9 +86,8 @@ extern void sub_81C59BC(void);
 extern void sub_81AB9A8(u8);
 extern void sub_81ABA88(u8);
 extern void sub_80B7CC8(void);
-extern void flagmods_08054D70(void);
+extern void Overworld_ResetStateAfterDigEscRope(void);
 extern u8* sub_806CF78(u16);
-extern bool8 ExecuteTableBasedItemEffect_(struct Pokemon*, u16, u8, u8);
 extern void sub_81B89F0(void);
 extern u8 GetItemEffectType(u16);
 extern struct MapConnection *sub_8088A8C(s16, s16);
@@ -114,13 +114,13 @@ void sub_80FE024(u8 taskId);
 void sub_80FE124(u8 taskId);
 void sub_80FE164(u8 taskId);
 
-void DisplayItemMessage(u8 taskId, u8 a, u8* str, void(*callback)(u8 taskId));
+void DisplayItemMessage(u8 taskId, u8 a, const u8* str, void(*callback)(u8 taskId));
 void DisplayItemMessageInBattlePyramid(u8 taskId, u8* str, void(*callback)(u8 taskId));
 void DisplayItemMessageOnField(u8 taskId, u8* str, void(*callback)(u8 taskId));
 void sub_81C6714(u8 taskId);
 void CleanUpAfterFailingToUseRegisteredKeyItemOnField(u8 taskId);
 void StartFishing(u8 a);
-bool8 ItemfinderCheckForHiddenItems(struct MapEvents *, u8);
+bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *, u8);
 u8 sub_80FD9B0(s16 a, s16 b);
 void sub_80FDA24(u8 a);
 void sub_80FD8E0(u8 taskId, s16 x, s16 y);
@@ -166,7 +166,7 @@ void MapPostLoadHook_UseItem(void)
 
 void Task_CallItemUseOnFieldCallback(u8 taskId)
 {
-    if (sub_80ABDFC() == 1)
+    if (IsWeatherNotFadingIn() == 1)
         gUnknown_0203A0F4(taskId);
 }
 
@@ -237,7 +237,7 @@ void ItemUseOutOfBattle_Bike(u8 taskId)
         DisplayCannotDismountBikeMessage(taskId, data[3]);
     else
     {
-        if (sav1_map_is_biking_allowed() == TRUE && IsBikingDisallowedByPlayer() == 0)
+        if (Overworld_IsBikingAllowed() == TRUE && IsBikingDisallowedByPlayer() == 0)
         {
             gUnknown_0203A0F4 = ItemUseOnFieldCB_Bike;
             SetUpItemUseOnFieldCallback(taskId);
@@ -364,7 +364,7 @@ void sub_80FD5CC(u8 taskId)
     DestroyTask(taskId);
 }
 
-bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
+bool8 ItemfinderCheckForHiddenItems(const struct MapEvents *events, u8 taskId)
 {
     int distanceX, distanceY;
     s16 x, y, i, newDistanceX, newDistanceY;
@@ -391,7 +391,7 @@ bool8 ItemfinderCheckForHiddenItems(struct MapEvents *events, u8 taskId)
         return FALSE;
 }
 
-bool8 sub_80FD6D4(struct MapEvents *events, s16 x, s16 y)
+bool8 sub_80FD6D4(const struct MapEvents *events, s16 x, s16 y)
 {
     u8 bgEventCount = events->bgEventCount;
     struct BgEvent *bgEvent = events->bgEvents;
@@ -638,7 +638,7 @@ void sub_80FDC00(u8 taskId)
     if (!gPaletteFade.active)
     {
         overworld_free_bg_tilemaps();
-        OpenPokeblockCase(0, c2_exit_to_overworld_2_switch);
+        OpenPokeblockCase(0, CB2_ReturnToField);
         DestroyTask(taskId);
     }
 }
@@ -679,7 +679,7 @@ void sub_80FDD10(u8 taskId)
     {
         gUnknown_0203A0F4 = sub_80FDD74;
         gFieldCallback = MapPostLoadHook_UseItem;
-        *gUnknown_0203CE54 = c2_exit_to_overworld_2_switch;
+        *gUnknown_0203CE54 = CB2_ReturnToField;
         unknown_ItemMenu_Confirm(taskId);
     }
     else
@@ -905,13 +905,13 @@ void task08_080A1C44(u8 taskId)
 
 void re_escape_rope(u8 taskId)
 {
-    flagmods_08054D70();
+    Overworld_ResetStateAfterDigEscRope();
     sub_80FE058();
     gTasks[taskId].data[0] = 0;
     DisplayItemMessageOnField(taskId, gStringVar4, task08_080A1C44);
 }
 
-bool8 sub_80FE314(void)
+bool8 CanUseEscapeRopeOnCurrMap(void)
 {
     if (gMapHeader.flags & 2)
         return TRUE;
@@ -921,7 +921,7 @@ bool8 sub_80FE314(void)
 
 void ItemUseOutOfBattle_EscapeRope(u8 taskId)
 {
-    if (sub_80FE314() == TRUE)
+    if (CanUseEscapeRopeOnCurrMap() == TRUE)
     {
         gUnknown_0203A0F4 = re_escape_rope;
         SetUpItemUseOnFieldCallback(taskId);
@@ -984,7 +984,7 @@ void ItemUseInBattle_StatIncrease(u8 taskId)
 {
     u16 partyId = gBattlerPartyIndexes[gBattlerInMenuId];
 
-    if (ExecuteTableBasedItemEffect_(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE)
+    if (ExecuteTableBasedItemEffect(&gPlayerParty[partyId], gSpecialVar_ItemId, partyId, 0) != FALSE)
     {
         if (!InBattlePyramid())
             DisplayItemMessage(taskId, 1, gText_WontHaveEffect, bag_menu_inits_lists_menu);