From 382442c4c8754262c77acb50930df31c63a62355 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 12 Feb 2018 15:01:43 +0100
Subject: start decompiling overworld.s

---
 src/item_use.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/item_use.c')

diff --git a/src/item_use.c b/src/item_use.c
index bcd453660..99dce9cbd 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -85,7 +85,7 @@ 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 void sub_81B89F0(void);
 extern u8 GetItemEffectType(u16);
@@ -904,7 +904,7 @@ 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);
-- 
cgit v1.2.3


From f22be4d0105304147ca982a91c239b9e3a7d31aa Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Mon, 12 Feb 2018 18:26:26 +0100
Subject: more overworld work

---
 src/item_use.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/item_use.c')

diff --git a/src/item_use.c b/src/item_use.c
index 99dce9cbd..bc70c5884 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -45,7 +45,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[];
@@ -236,7 +236,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);
-- 
cgit v1.2.3


From 94b47c0686d3f4c5da962011797cc89a2efdd88c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Wed, 14 Feb 2018 00:58:22 +0100
Subject: decompile overworld

---
 src/item_use.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/item_use.c')

diff --git a/src/item_use.c b/src/item_use.c
index bc70c5884..b9d84ad95 100755
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -637,7 +637,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);
     }
 }
@@ -678,7 +678,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
-- 
cgit v1.2.3