through sub_8056918

8 files changed, 26 insertions, 21 deletions

diff --git a/include/field_camera.h b/include/field_camera.h
index 9c23bb774..fa9ac0d72 100644
--- a/include/field_camera.h
+++ b/include/field_camera.h
@@ -32,5 +32,6 @@ void UpdateCameraPanning(void);
 void InstallCameraPanAheadCallback(void);
 void DrawDoorMetatileAt(int x, int y, const u16 *data);
 void move_tilemap_camera_to_upper_left_corner(void);
+void CameraUpdate(void);
 
 #endif //GUARD_FIELD_CAMERA_H
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index 240353f5e..b57ef14b0 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void sub_807DF7C(void);
+void FieldCB_RushInjuredPokemonToCenter(void);
 void DoWarp(void);
 void DoDiveWarp(void);
 void DoDoorWarp(void);
@@ -11,9 +11,9 @@ void DoDoorWarp(void);
 void DoFallWarp(void);
 void DoTeleportWarp(void);
 void sub_807E500(void);
-void FieldCB_UnionRoomWarp(void);
+void FieldCB_DefaultWarpExit(void);
 void WarpFadeOutScreen(void);
-void FieldCallback_ReturnToEventScript2(void);
+void FieldCB_ContinueScriptHandleMusic(void);
 void FadeInFromBlack(void);
 void FadeTransition_FadeInOnReturnToStartMenu(void);
 void WarpFadeInScreen(void);
@@ -28,5 +28,11 @@ void DoLavaridgeGymB1FWarp(void);
 void DoLavaridgeGym1FWarp(void);
 void DoTeleportWarp(void);
 void DoUnionRoomWarp(void);
+void FieldCB_ReturnToFieldWirelessLink(void);
+void FieldCB_ReturnToFieldCableLink(void);
+bool8 FieldCB_ReturnToFieldOpenStartMenu(void);
+void FieldCB_ContinueScript(void);
+void FieldCB_ContinueScriptHandleMusic(void);
+void FieldCB_WarpExitFadeFromBlack(void);
 
 #endif // GUARD_FIELD_FADETRANSITION_H
diff --git a/include/field_screen_effect.h b/include/field_screen_effect.h
index a15d99120..ca9242945 100644
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -9,7 +9,7 @@ void sub_80B0244(void);
 void sub_807E3EC(void);
 void DoOutwardBarnDoorWipe(void);
 void Task_BarnDoorWipe(u8 taskId);
-void sub_807F5F0(void);
+void FieldCB_RushInjuredPokemonToCenter(void);
 
 extern const s32 gMaxFlashLevel;
 
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 0d45a6d68..33f562d40 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -205,10 +205,10 @@ struct MapHeader
 #define MAP_ALLOW_BIKE         (1 << 0)
 #define MAP_ALLOW_ESCAPE_ROPE  (1 << 1)
 #define MAP_ALLOW_RUN          (1 << 2)
-#define MAP_SHOW_MAP_NAME      (1 << 3)
-#define UNUSED_MAP_FLAGS       (1 << 4 | 1 << 5 | 1 << 6 | 1 << 7)
+#define MAP_SHOW_MAP_NAME      (1 << 2)
+#define UNUSED_MAP_FLAGS       (1 << 3 | 1 << 4 | 1 << 5 | 1 << 6 | 1 << 7)
 
-#define SHOW_MAP_NAME_ENABLED  ((gMapHeader.flags & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME)
+#define SHOW_MAP_NAME_ENABLED  ((gMapHeader.escapeRope & (MAP_SHOW_MAP_NAME | UNUSED_MAP_FLAGS)) == MAP_SHOW_MAP_NAME)
 
 struct ObjectEvent
 {
diff --git a/include/map_name_popup.h b/include/map_name_popup.h
index a7c1234c6..3058489f7 100644
--- a/include/map_name_popup.h
+++ b/include/map_name_popup.h
@@ -3,7 +3,7 @@
 
 #include "global.h"
 
-void CreateMapNamePopupIfNotAlreadyRunning(bool32 palIntoFadedBuffer);
+void ShowMapNamePopup(bool32 palIntoFadedBuffer);
 void DismissMapNamePopup(void);
 
 #endif //GUARD_MAP_NAME_POPUP_H
diff --git a/include/overworld.h b/include/overworld.h
index b0311c51c..d8f72de27 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -78,10 +78,6 @@ void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void SetEscapeWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
 void Overworld_SetHealLocationWarp(u8);
-void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
-void sub_8084E2C(s8, s8, s8, s8, s8);
-void sub_8084E80(s8, s8, s8, s8, s8);
-void sub_8084EBC(s16, s16);
 void SetWarpDestinationToEscapeWarp(void);
 void SetWarpDestinationToLastHealLocation(void);
 u8 IsMapTypeOutdoors(u8 mapType);
@@ -102,14 +98,10 @@ bool32 IsUpdateLinkStateCBActive(void);
 void ClearLinkPlayerObjectEvents(void);
 const struct MapHeader *const Overworld_GetMapHeaderByGroupAndId(u16, u16);
 void ObjectEventMoveDestCoords(struct ObjectEvent *, u32, s16 *, s16 *);
-void sub_8086230(void);
 void CB2_ReturnToField(void);
-bool32 sub_8087598(void);
 void CB2_ReturnToFieldContinueScriptPlayMapMusic(void);
 void WarpIntoMap(void);
 u8 GetMapTypeByGroupAndId(s8 mapGroup, s8 mapNum);
-void sub_8086194(void);
-void sub_8084CCC(u8 spawn);
 void SetWarpDestinationToMapWarp(s8 mapGroup, s8 mapNum, s8 warpNum);
 void c2_load_new_map(void);
 void SetWarpDestinationToDynamicWarp(u8 unused);
@@ -142,7 +134,7 @@ extern bool8 (* gFieldCallback2)(void);
 
 void SetLastHealLocationWarp(u8 healLocaionId);
 void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum);
-void CB2_Overworld(void);
+void sub_80568FC(void);
 void CB2_OverworldBasic(void);
 void CB2_NewGame(void);
 bool8 IsMapTypeOutdoors(u8 mapType);
@@ -171,7 +163,7 @@ bool32 sub_8058318(void);
 
 void CB2_ReturnToFieldWithOpenMenu(void);
 void CB2_WhiteOut(void);
-void c2_8056854(void);
+void CB2_ReturnToFieldFromMultiplayer(void);
 void ApplyNewEncryptionKeyToGameStats(u32 newKey);
 void SetContinueGameWarpToDynamicWarp(int);
 
@@ -192,7 +184,7 @@ void sub_8057F70(void);
 void sub_8057F48(void);
 void SetMainCallback1(MainCallback cb);
 void CB1_Overworld(void);
-void sub_80568C4(void);
+void CB2_ReturnToFieldContinueScript(void);
 u8 GetLastUsedWarpMapSectionId(void);
 void StoreInitialPlayerAvatarState(void);
 void UpdateEscapeWarp(s16 x, s16 y);
diff --git a/include/quest_log.h b/include/quest_log.h
index a353cf709..3a751e51d 100644
--- a/include/quest_log.h
+++ b/include/quest_log.h
@@ -9,6 +9,7 @@
 extern u8 gQuestLogState;
 extern u8 gUnknown_3005E88;
 extern const u16 gUnknown_84566A8[];
+extern struct FieldInput gUnknown_3005E90;
 
 void sub_8112720(u8);
 void SetQuestLogEvent(u16, const u16 *);
@@ -51,5 +52,10 @@ void sub_8111708(void);
 void sub_81127F8(struct FieldInput * a0);
 void sub_8112B3C(void);
 void RunQuestLogCB(void);
+void sub_8111C68(void);
+bool8 sub_8111CD0(void);
+void sub_8115798(void);
+bool8 sub_8113748(void);
+void sub_81119C8(void);
 
 #endif //GUARD_QUEST_LOG_H
diff --git a/include/strings.h b/include/strings.h
index 37d856a86..eb6a47ce7 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1037,8 +1037,8 @@ extern const u8 gText_RegionMap_AreaDesc_PatternBush[];
 extern const u8 gText_RegionMap_AreaDesc_DottedHole[];
 
 // field_screen_effect
-extern const u8 gUnknown_841B554[];
-extern const u8 gUnknown_841B5B6[];
+extern const u8 gText_PlayerScurriedToCenter[];
+extern const u8 gText_PlayerScurriedBackHome[];
 
 // save_failed_screen
 extern const u8 gText_SaveFailedScreen_CheckingBackupMemory[];