Further synchronisation

28 files changed, 103 insertions, 102 deletions

diff --git a/include/overworld.h b/include/overworld.h
index 3b193b685..d6e6d1ae5 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -113,8 +113,7 @@ bool32 is_c1_link_related_active(void);
 // c1_overworld
 // OverworldBasic
 void CB2_OverworldBasic(void);
-void c2_overworld(void);
-// set_callback1
+// SetMainCallback1
 // sub_80543DC
 void CB2_NewGame(void);
 void CB2_WhiteOut(void);
@@ -122,9 +121,9 @@ void CB2_LoadMap(void);
 void CB2_LoadMap2(void);
 void sub_8054534(void);
 void sub_8054588(void);
-void c2_exit_to_overworld_2_switch(void);
-void c2_exit_to_overworld_2_local(void);
-void c2_exit_to_overworld_2_link(void);
+void CB2_ReturnToField(void);
+void CB2_ReturnToFieldLocal(void);
+void CB2_ReturnToFieldLink(void);
 // sub_805465C
 void c2_exit_to_overworld_1_sub_8080DEC(void);
 // sub_80546B8
diff --git a/include/rom6.h b/include/rom6.h
index 105eac19a..508817163 100644
--- a/include/rom6.h
+++ b/include/rom6.h
@@ -3,7 +3,7 @@
 
 extern struct MapPosition gPlayerFacingPosition;
 
-bool8 SetLastTalkedObjectInFrontOfPlayer(u8);
+bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId);
 u8 oei_task_add(void);
 void debug_sub_8120968(void);
 
diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c
index fc929eb4d..c0d89c70f 100644
--- a/src/battle/battle_setup.c
+++ b/src/battle/battle_setup.c
@@ -627,7 +627,7 @@ static void CB2_EndWildBattle(void)
     }
     else
     {
-        SetMainCallback2(c2_exit_to_overworld_2_switch);
+        SetMainCallback2(CB2_ReturnToField);
         gFieldCallback = sub_8080E44;
     }
 }
diff --git a/src/choose_party.c b/src/choose_party.c
index 8aef949cb..305f9cd63 100644
--- a/src/choose_party.c
+++ b/src/choose_party.c
@@ -942,7 +942,7 @@ static void sub_8123170(u8 taskId)
     if (!gPaletteFade.active)
     {
         gFieldCallback = sub_81231AC;
-        SetMainCallback2(c2_exit_to_overworld_2_switch);
+        SetMainCallback2(CB2_ReturnToField);
         DestroyTask(taskId);
     }
 }
diff --git a/src/contest.c b/src/contest.c
index 78e2da3c0..1040b643e 100644
--- a/src/contest.c
+++ b/src/contest.c
@@ -2056,7 +2056,7 @@ void sub_80ADFD8(u8 taskId)
     {
         DestroyTask(taskId);
         gFieldCallback = sub_80AE010;
-        SetMainCallback2(c2_exit_to_overworld_2_switch);
+        SetMainCallback2(CB2_ReturnToField);
     }
 }
 
diff --git a/src/daycare.c b/src/daycare.c
index 6dade2f20..1bc2d9ef1 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1071,5 +1071,5 @@ void ShowDaycareLevelMenu(void)
 void ChooseSendDaycareMon(void)
 {
     OpenPartyMenu(PARTY_MENU_TYPE_DAYCARE, 0);
-    gMain.savedCallback = c2_exit_to_overworld_2_switch;
+    gMain.savedCallback = CB2_ReturnToField;
 }
diff --git a/src/decoration.c b/src/decoration.c
index a4976932d..e5b427738 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -3176,7 +3176,7 @@ void c1_overworld_prev_quest(u8 taskId)
             sub_81016F4();
             FreeSpritePaletteByTag(0xbb8);
             gFieldCallback = &sub_8100364;
-            SetMainCallback2(c2_exit_to_overworld_2_switch);
+            SetMainCallback2(CB2_ReturnToField);
             DestroyTask(taskId);
             break;
     }
@@ -4139,7 +4139,7 @@ void sub_81015E0(u8 taskId)
         case 1:
             sub_81016F4();
             gFieldCallback = sub_8101678;
-            SetMainCallback2(c2_exit_to_overworld_2_switch);
+            SetMainCallback2(CB2_ReturnToField);
             DestroyTask(taskId);
             break;
     }
diff --git a/src/egg_hatch.c b/src/egg_hatch.c
index 6dc55ef28..876034d2a 100644
--- a/src/egg_hatch.c
+++ b/src/egg_hatch.c
@@ -473,7 +473,7 @@ static void CB2_EggHatch_0(void)
 static void EggHatchSetMonNickname(void)
 {
     SetMonData(&gPlayerParty[gSpecialVar_0x8004], MON_DATA_NICKNAME, gStringVar3);
-    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    SetMainCallback2(CB2_ReturnToField);
 }
 
 static void Task_EggHatchPlayBGM(u8 taskID)
@@ -576,7 +576,7 @@ static void CB2_EggHatch_1(void)
         break;
     case 11:
         if (!gPaletteFade.active)
-            SetMainCallback2(c2_exit_to_overworld_2_switch);
+            SetMainCallback2(CB2_ReturnToField);
         break;
     }
     RunTasks();
diff --git a/src/field_effect.c b/src/field_effect.c
index bc2704a4a..fc3d6f8ad 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1076,7 +1076,7 @@ void c3_080843F8(u8);
 
 void sub_80865BC(void)
 {
-    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    SetMainCallback2(CB2_ReturnToField);
     gFieldCallback = mapldr_080842E8;
 }
 
diff --git a/src/field_specials.c b/src/field_specials.c
index f9ae911c8..0e8fe06d9 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -73,7 +73,7 @@ void ScrSpecial_ShowDiploma(void)
 
 void ScrSpecial_ViewWallClock(void)
 {
-    gMain.savedCallback = c2_exit_to_overworld_2_switch;
+    gMain.savedCallback = CB2_ReturnToField;
     SetMainCallback2(CB2_ViewWallClock);
     ScriptContext2_Enable();
 }
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index 14c4ea018..0a8c252e0 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -1,4 +1,3 @@
-
 #include "global.h"
 #include "field_camera.h"
 #include "field_effect.h"
@@ -27,7 +26,18 @@ extern u8 gLastFieldPokeMenuOpened;
 
 extern const u8 DoCutFieldEffectScript[];
 
-const struct OamData gOamData_CutGrass =
+// this file's functions
+static void FieldCallback_CutTree(void);
+static void FieldCallback_CutGrass(void);
+static void StartCutTreeFieldEffect(void);
+static void StartCutGrassFieldEffect(void);
+static void SetCutGrassMetatile(s16, s16);
+static void SetCutGrassMetatiles(s16, s16);
+static void CutGrassSpriteCallback1(struct Sprite *);
+static void CutGrassSpriteCallback2(struct Sprite *);
+static void CutGrassSpriteCallbackEnd(struct Sprite *);
+
+static const struct OamData gOamData_CutGrass =
 {
     .y = 0,
     .affineMode = 0,
@@ -44,15 +54,15 @@ const struct OamData gOamData_CutGrass =
     .affineParam = 0,
 };
 
-const union AnimCmd gSpriteAnim_CutGrass[] =
+static const union AnimCmd sSpriteAnim_CutGrass[] =
 {
     ANIMCMD_FRAME(0, 30),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd *const gSpriteAnimTable_CutGrass[] =
+static const union AnimCmd *const sSpriteAnimTable_CutGrass[] =
 {
-    gSpriteAnim_CutGrass,
+    sSpriteAnim_CutGrass,
 };
 
 const struct SpriteFrameImage gSpriteImageTable_CutGrass[] =
@@ -62,23 +72,12 @@ const struct SpriteFrameImage gSpriteImageTable_CutGrass[] =
 
 const struct SpritePalette gFieldEffectObjectPaletteInfo6 = {gFieldEffectObjectPalette6, 0x1000};
 
-static void FieldCallback_CutTree(void);
-static void FieldCallback_CutGrass(void);
-static void StartCutTreeFieldEffect(void);
-static void StartCutGrassFieldEffect(void);
-static void SetCutGrassMetatile(s16, s16);
-static void SetCutGrassMetatiles(s16, s16);
-static void CutGrassSpriteCallback1(struct Sprite *);
-static void CutGrassSpriteCallback2(struct Sprite *);
-static void CutGrassSpriteCallbackEnd(struct Sprite *);
-
-
-static const struct SpriteTemplate gSpriteTemplate_CutGrass =
+static const struct SpriteTemplate sSpriteTemplate_CutGrass =
 {
     .tileTag = 0xFFFF,
     .paletteTag = 0x1000,
     .oam = &gOamData_CutGrass,
-    .anims = gSpriteAnimTable_CutGrass,
+    .anims = sSpriteAnimTable_CutGrass,
     .images = gSpriteImageTable_CutGrass,
     .affineAnims = gDummySpriteAffineAnimTable,
     .callback = CutGrassSpriteCallback1,
@@ -92,7 +91,7 @@ void Debug_SetUpFieldMove_Cut(void)
     u8 i, j;
     u8 metatileBehavior;
 
-    if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
+    if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
     {
         gLastFieldPokeMenuOpened = 0;
         FieldCallback_CutTree();
@@ -131,7 +130,7 @@ bool8 SetUpFieldMove_Cut(void)
     u8 i, j;
     u8 tileBehavior;
 
-    if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
+    if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_CUTTABLE_TREE) == TRUE)
     {
         // Standing in front of cuttable tree.
         gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
@@ -147,7 +146,7 @@ bool8 SetUpFieldMove_Cut(void)
             for (j = 0; j < 3; j++)
             {
                 x = j - 1 + gPlayerFacingPosition.x;
-                if(MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height)
+                if (MapGridGetZCoordAt(x, y) == gPlayerFacingPosition.height)
                 {
                     tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
                     if(MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE
@@ -209,9 +208,11 @@ bool8 FldEff_CutGrass(void)
 {
     s16 x, y;
     u8 tileBehavior;
-    u8 i, j;
+    u8 i = 0, j;
 
-    for (i = 0, PlaySE(SE_W015), PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y); i < 3; i++)
+    PlaySE(SE_W015);
+    PlayerGetDestCoords(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
+    for (i = 0; i < 3; i++)
     {
         y = i - 1 + gPlayerFacingPosition.y;
         for (j = 0; j < 3; j++)
@@ -235,7 +236,7 @@ bool8 FldEff_CutGrass(void)
     // populate sprite ID array
     for (i = 0; i < 8; i++)
     {
-        eCutGrassSpriteArray[i] = CreateSprite((struct SpriteTemplate *)&gSpriteTemplate_CutGrass,
+        eCutGrassSpriteArray[i] = CreateSprite(&sSpriteTemplate_CutGrass,
         gSprites[gPlayerAvatar.spriteId].oam.x + 8, gSprites[gPlayerAvatar.spriteId].oam.y + 20, 0);
         gSprites[eCutGrassSpriteArray[i]].data[2] = 32 * i;
     }
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 0b66ed0d2..e10e18cc1 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -31,7 +31,7 @@ void debug_sub_8130318(void)
         gSpecialVar_Result = 0;
         sub_811AA38();
     }
-    else if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
+    else if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) == TRUE)
     {
         gLastFieldPokeMenuOpened = 0;
         gSpecialVar_Result = 0;
@@ -54,7 +54,7 @@ bool8 SetUpFieldMove_Strength(void)
     }
     else
     {
-        if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) != TRUE)
+        if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_PUSHABLE_BOULDER) != TRUE)
             return 0;
         gSpecialVar_Result = gLastFieldPokeMenuOpened;
         gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
diff --git a/src/hof_pc.c b/src/hof_pc.c
index b9407bace..ba64b5f4f 100644
--- a/src/hof_pc.c
+++ b/src/hof_pc.c
@@ -20,7 +20,7 @@ void AccessHallOfFamePC(void)
 
 void ReturnFromHallOfFamePC(void)
 {
-    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    SetMainCallback2(CB2_ReturnToField);
     gFieldCallback = ReshowPCMenuAfterHallOfFamePC;
 }
 
diff --git a/src/item_menu.c b/src/item_menu.c
index 95a84b1fb..14cf7331f 100644
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -2791,8 +2791,8 @@ void ItemMenu_LoadSellMenu(void)
 static void OnBagClose_Shop(u8 taskId)
 {
     gFieldCallback = Shop_FadeReturnToMartMenu;
-    gTasks[taskId].data[8] = (u32)c2_exit_to_overworld_2_switch >> 16;
-    gTasks[taskId].data[9] = (u32)c2_exit_to_overworld_2_switch;
+    gTasks[taskId].data[8] = (u32)CB2_ReturnToField >> 16;
+    gTasks[taskId].data[9] = (u32)CB2_ReturnToField;
     sub_80A5AE4(taskId);
 }
 
@@ -3036,8 +3036,8 @@ void sub_80A6A30(void)
 static void OnBagClose_PC(u8 taskId)
 {
     gFieldCallback = ItemStorage_ReturnToMenuAfterDeposit;
-    gTasks[taskId].data[8] = (u32)c2_exit_to_overworld_2_switch >> 16;
-    gTasks[taskId].data[9] = (u32)c2_exit_to_overworld_2_switch;
+    gTasks[taskId].data[8] = (u32)CB2_ReturnToField >> 16;
+    gTasks[taskId].data[9] = (u32)CB2_ReturnToField;
     sub_80A5AE4(taskId);
 }
 
diff --git a/src/item_use.c b/src/item_use.c
index 1f33144b2..d927b5937 100644
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -73,7 +73,7 @@ static const u8 *const sSSTidalBetaStrings[] =
 static const MainCallback gExitToOverworldFuncList[] =
 {
     sub_808B020,
-    c2_exit_to_overworld_2_switch,
+    CB2_ReturnToField,
     sub_810B96C,
 };
 
@@ -793,8 +793,8 @@ void ItemUseOutOfBattle_Berry(u8 taskId)
     {
         gFieldItemUseCallback = ItemUseOnFieldCB_Berry;
         gFieldCallback = ExecuteItemUseFromBlackPalette;
-        gTasks[taskId].data[8] = (u32)c2_exit_to_overworld_2_switch >> 16;
-        gTasks[taskId].data[9] = (u32)c2_exit_to_overworld_2_switch;
+        gTasks[taskId].data[8] = (u32)CB2_ReturnToField >> 16;
+        gTasks[taskId].data[9] = (u32)CB2_ReturnToField;
         gTasks[taskId].func = HandleItemMenuPaletteFade;
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 0, 0x10, RGB(0, 0, 0));
     }
diff --git a/src/mail.c b/src/mail.c
index 9833b1c2d..8b4647532 100644
--- a/src/mail.c
+++ b/src/mail.c
@@ -829,7 +829,7 @@ void debug_sub_810CDF0(void)
     gMain.watchedKeysPressed = 0;
     gMain.watchedKeysMask = 0;
     gFieldCallback = mapldr_default;
-    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    SetMainCallback2(CB2_ReturnToField);
 }
 
 void debug_sub_810CE1C(u8 taskId)
diff --git a/src/move_tutor_menu.c b/src/move_tutor_menu.c
index 0ecc82a72..666eec0da 100644
--- a/src/move_tutor_menu.c
+++ b/src/move_tutor_menu.c
@@ -556,7 +556,7 @@ static void MoveTutorMain(void)
         break;
     case 15:
         if (!gPaletteFade.active)
-            SetMainCallback2(c2_exit_to_overworld_2_switch);
+            SetMainCallback2(CB2_ReturnToField);
         break;
     case 28:
         BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB(0, 0, 0));
diff --git a/src/overworld.c b/src/overworld.c
index 65f262f33..7b4f5190f 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -103,6 +103,7 @@ extern void (*gFieldCallback)(void);
 u8 gUnknown_03004860;
 u8 gFieldLinkPlayerCount;
 
+static void CB2_Overworld(void);
 static u8 GetAdjustedInitialTransitionFlags(struct InitialPlayerAvatarState*, u16, u8);
 static u8 GetAdjustedInitialDirection(struct InitialPlayerAvatarState*, u8, u16, u8);
 static bool32 sub_805483C(u8*);
@@ -1191,7 +1192,7 @@ bool32 is_c1_link_related_active(void)
         return FALSE;
 }
 
-void c1_overworld_normal(u16 newKeys, u16 heldKeys)
+static void DoCB1_Overworld(u16 newKeys, u16 heldKeys)
 {
     struct FieldInput fieldInput;
 
@@ -1212,13 +1213,13 @@ void c1_overworld_normal(u16 newKeys, u16 heldKeys)
     }
 }
 
-void c1_overworld(void)
+static void CB1_Overworld(void)
 {
-    if (gMain.callback2 == c2_overworld)
-        c1_overworld_normal(gMain.newKeys, gMain.heldKeys);
+    if (gMain.callback2 == CB2_Overworld)
+        DoCB1_Overworld(gMain.newKeys, gMain.heldKeys);
 }
 
-void OverworldBasic(void)
+static void OverworldBasic(void)
 {
     ScriptContext2_RunScript();
     RunTasks();
@@ -1236,7 +1237,7 @@ void CB2_OverworldBasic(void)
     OverworldBasic();
 }
 
-void c2_overworld(void)
+static void CB2_Overworld(void)
 {
     int fading = (gPaletteFade.active != 0);
     if (fading)
@@ -1246,7 +1247,7 @@ void c2_overworld(void)
         SetFieldVBlankCallback();
 }
 
-void set_callback1(MainCallback cb)
+void SetMainCallback1(MainCallback cb)
 {
     gMain.callback1 = cb;
 }
@@ -1278,8 +1279,8 @@ void CB2_NewGame(void)
     gFieldCallback = ExecuteTruckSequence;
     do_load_map_stuff_loop(&gMain.state);
     SetFieldVBlankCallback();
-    set_callback1(c1_overworld);
-    SetMainCallback2(c2_overworld);
+    SetMainCallback1(CB1_Overworld);
+    SetMainCallback2(CB2_Overworld);
 }
 
 #if DEBUG
@@ -1301,8 +1302,8 @@ void debug_sub_8058C00(void)
 
     do_load_map_stuff_loop(&gMain.state);
     SetFieldVBlankCallback();
-    set_callback1(c1_overworld);
-    SetMainCallback2(c2_overworld);
+    SetMainCallback1(CB1_Overworld);
+    SetMainCallback2(CB2_Overworld);
 }
 
 #endif
@@ -1324,8 +1325,8 @@ void CB2_WhiteOut(void)
         val = 0;
         do_load_map_stuff_loop(&val);
         SetFieldVBlankCallback();
-        set_callback1(c1_overworld);
-        SetMainCallback2(c2_overworld);
+        SetMainCallback1(CB1_Overworld);
+        SetMainCallback2(CB2_Overworld);
     }
 }
 
@@ -1334,7 +1335,7 @@ void CB2_LoadMap(void)
     FieldClearVBlankHBlankCallbacks();
     ScriptContext1_Init();
     ScriptContext2_Disable();
-    set_callback1(NULL);
+    SetMainCallback1(NULL);
     SetMainCallback2(sub_810CC80);
     gMain.savedCallback = CB2_LoadMap2;
 }
@@ -1343,8 +1344,8 @@ void CB2_LoadMap2(void)
 {
     do_load_map_stuff_loop(&gMain.state);
     SetFieldVBlankCallback();
-    set_callback1(c1_overworld);
-    SetMainCallback2(c2_overworld);
+    SetMainCallback1(CB1_Overworld);
+    SetMainCallback2(CB2_Overworld);
 }
 
 void sub_8054534(void)
@@ -1354,13 +1355,13 @@ void sub_8054534(void)
         FieldClearVBlankHBlankCallbacks();
         ScriptContext1_Init();
         ScriptContext2_Disable();
-        set_callback1(NULL);
+        SetMainCallback1(NULL);
     }
     if (sub_805493C(&gMain.state, 1))
     {
         SetFieldVBlankCallback();
-        set_callback1(c1_overworld);
-        SetMainCallback2(c2_overworld);
+        SetMainCallback1(CB1_Overworld);
+        SetMainCallback2(CB2_Overworld);
     }
 }
 
@@ -1376,38 +1377,38 @@ static void c2_80567AC(void)
     if (sub_805483C(&gMain.state))
     {
         SetFieldVBlankCallback();
-        set_callback1(sub_8055354);
+        SetMainCallback1(sub_8055354);
         sub_80543DC(sub_8055390);
-        SetMainCallback2(c2_overworld);
+        SetMainCallback2(CB2_Overworld);
     }
 }
 
-void c2_exit_to_overworld_2_switch(void)
+void CB2_ReturnToField(void)
 {
     if (is_c1_link_related_active() == TRUE)
     {
-        SetMainCallback2(c2_exit_to_overworld_2_link);
+        SetMainCallback2(CB2_ReturnToFieldLink);
     }
     else
     {
         FieldClearVBlankHBlankCallbacks();
-        SetMainCallback2(c2_exit_to_overworld_2_local);
+        SetMainCallback2(CB2_ReturnToFieldLocal);
     }
 }
 
-void c2_exit_to_overworld_2_local(void)
+void CB2_ReturnToFieldLocal(void)
 {
     if (sub_8054A4C(&gMain.state))
     {
         SetFieldVBlankCallback();
-        SetMainCallback2(c2_overworld);
+        SetMainCallback2(CB2_Overworld);
     }
 }
 
-void c2_exit_to_overworld_2_link(void)
+void CB2_ReturnToFieldLink(void)
 {
     if (!sub_8055870() && sub_8054A9C(&gMain.state))
-        SetMainCallback2(c2_overworld);
+        SetMainCallback2(CB2_Overworld);
 }
 
 void sub_805465C(void)
@@ -1415,40 +1416,40 @@ void sub_805465C(void)
     FieldClearVBlankHBlankCallbacks();
     StopMapMusic();
     sub_8054F70();
-    set_callback1(sub_8055354);
+    SetMainCallback1(sub_8055354);
     sub_80543DC(sub_8055390);
     gFieldCallback = sub_8080A3C;
     ScriptContext1_Init();
     ScriptContext2_Disable();
-    c2_exit_to_overworld_2_switch();
+    CB2_ReturnToField();
 }
 
 void c2_exit_to_overworld_1_sub_8080DEC(void)
 {
     FieldClearVBlankHBlankCallbacks();
     gFieldCallback = sub_8080DEC;
-    c2_exit_to_overworld_2_switch();
+    CB2_ReturnToField();
 }
 
 void sub_80546B8(void)
 {
     FieldClearVBlankHBlankCallbacks();
     gFieldCallback = sub_80809B0;
-    c2_exit_to_overworld_2_switch();
+    CB2_ReturnToField();
 }
 
 void c2_exit_to_overworld_1_continue_scripts_restart_music(void)
 {
     FieldClearVBlankHBlankCallbacks();
     gFieldCallback = sub_8080990;
-    c2_exit_to_overworld_2_switch();
+    CB2_ReturnToField();
 }
 
 void sub_80546F0(void)
 {
     FieldClearVBlankHBlankCallbacks();
     gFieldCallback = sub_8080B60;
-    c2_exit_to_overworld_2_switch();
+    CB2_ReturnToField();
 }
 
 void sub_805470C(void)
@@ -1486,8 +1487,8 @@ void CB2_ContinueSavedGame(void)
     else
     {
         gFieldCallback = sub_805470C;
-        set_callback1(c1_overworld);
-        c2_exit_to_overworld_2_switch();
+        SetMainCallback1(CB1_Overworld);
+        CB2_ReturnToField();
     }
 }
 
diff --git a/src/player_pc.c b/src/player_pc.c
index ce3dda3c7..f7c2379cd 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -1224,7 +1224,7 @@ static void Mailbox_DoRedrawMailboxMenuAfterReturn(void)
 static void Mailbox_ReturnToFieldFromReadMail(void)
 {
     gFieldCallback = Mailbox_DoRedrawMailboxMenuAfterReturn;
-    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    SetMainCallback2(CB2_ReturnToField);
 }
 
 static const u8 gHighlightedMoveToBagFormatText[] = _("{COLOR RED}{STR_VAR_1}");
@@ -1314,7 +1314,7 @@ static void Mailbox_UpdateMailListAfterDeposit(void)
 void Mailbox_ReturnToMailListAfterDeposit(void)
 {
     gFieldCallback = Mailbox_UpdateMailListAfterDeposit;
-    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    SetMainCallback2(CB2_ReturnToField);
 }
 
 // you always have at least 1 POKeMON and you cannot receive mail before you leave Littleroot: therefore this function cannot be reached normally.
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 03939556c..6e3f5d9e1 100644
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -124,9 +124,9 @@ const s8 gPokeblockFlavorCompatibilityTable[] =
 void (*const gUnknown_083F7EA8[])(void) =
 {
     sub_80A5B40,
-    c2_exit_to_overworld_2_switch,
+    CB2_ReturnToField,
     sub_802E424,
-    c2_exit_to_overworld_2_switch
+    CB2_ReturnToField
 };
 
 const u8 *const gPokeblockNames[] =
diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c
index 23020383d..8f22586a2 100644
--- a/src/pokemon_menu.c
+++ b/src/pokemon_menu.c
@@ -772,7 +772,7 @@ static void sub_808AB34(u8 taskID)
     if (!gPaletteFade.active)
     {
         if (!IS_FLY(gTasks[taskID].tFieldMoveId) || ShouldDoBrailleFlyEffect())
-            SetMainCallback2(c2_exit_to_overworld_2_switch);
+            SetMainCallback2(CB2_ReturnToField);
         else
             SetMainCallback2(CB2_InitFlyRegionMap);
         DestroyTask(taskID);
diff --git a/src/pokemon_storage_system.c b/src/pokemon_storage_system.c
index 971d7daf7..c1143495d 100644
--- a/src/pokemon_storage_system.c
+++ b/src/pokemon_storage_system.c
@@ -377,7 +377,7 @@ void sub_80961A8(void)
 {
     gUnknown_02038474 = gPokemonStorageSystemPtr->unk_0005;
     gFieldCallback = FieldCB_ReturnToOverworld;
-    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    SetMainCallback2(CB2_ReturnToField);
 }
 
 void ResetPokemonStorageSystem(void)
diff --git a/src/rom6.c b/src/rom6.c
index ea529aaa9..f28216529 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -34,7 +34,7 @@ static void sub_810B58C(void);
 static void sub_810B5D8(void);
 static void sub_810B634(void);
 
-bool8 SetLastTalkedObjectInFrontOfPlayer(u8 graphicsId)
+bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
 {
     u8 eventObjId;
 
@@ -123,7 +123,7 @@ static void sub_810B4CC(u8 taskId)
 #if DEBUG
 void debug_sub_8120968(void)
 {
-    if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
+    if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
     {
         gLastFieldPokeMenuOpened = 0;
         sub_810B53C();
@@ -137,7 +137,7 @@ void debug_sub_8120968(void)
 
 bool8 SetUpFieldMove_RockSmash(void)
 {
-    if (SetLastTalkedObjectInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
+    if (CheckObjectGraphicsInFrontOfPlayer(EVENT_OBJ_GFX_BREAKABLE_ROCK) == TRUE)
     {
         gFieldCallback = FieldCallback_PrepareFadeInFromMenu;
         gPostMenuFieldCallback = sub_810B53C;
diff --git a/src/roulette.c b/src/roulette.c
index c8804a543..288de36fd 100644
--- a/src/roulette.c
+++ b/src/roulette.c
@@ -1219,7 +1219,7 @@ void sub_8116B40(u8 taskId) // end roulette ?
         REG_BLDALPHA = 0x0;
         REG_BLDY = 0x0;
         gFieldCallback = &sub_8080990;
-        SetMainCallback2(&c2_exit_to_overworld_2_switch);
+        SetMainCallback2(&CB2_ReturnToField);
         DestroyTask(taskId);
 #if DEBUG
         unk_203955C[0] = 0;
diff --git a/src/safari_zone.c b/src/safari_zone.c
index 9272da902..7aa05c7dc 100644
--- a/src/safari_zone.c
+++ b/src/safari_zone.c
@@ -97,7 +97,7 @@ void sub_80C824C(void)
 {
     if (gNumSafariBalls != 0)
     {
-        SetMainCallback2(c2_exit_to_overworld_2_switch);
+        SetMainCallback2(CB2_ReturnToField);
     }
     else if (gBattleOutcome == 8)
     {
diff --git a/src/script_pokemon_util_80F99CC.c b/src/script_pokemon_util_80F99CC.c
index 87ef2517b..e7bf74a7f 100644
--- a/src/script_pokemon_util_80F99CC.c
+++ b/src/script_pokemon_util_80F99CC.c
@@ -274,7 +274,7 @@ void HandleMoveTutorPartyMenu(u8 var)
 
 void SelectMove(void)
 {
-    ShowSelectMovePokemonSummaryScreen(&gPlayerParty[0], gSpecialVar_0x8004, gPlayerPartyCount - 1, c2_exit_to_overworld_2_switch, 0);
+    ShowSelectMovePokemonSummaryScreen(&gPlayerParty[0], gSpecialVar_0x8004, gPlayerPartyCount - 1, CB2_ReturnToField, 0);
     UNK_2018000_STRUCT.unk8 = 3;
     gFieldCallback = sub_8080990;
 }
diff --git a/src/shop.c b/src/shop.c
index 8a5da1117..e2b796a75 100644
--- a/src/shop.c
+++ b/src/shop.c
@@ -1178,7 +1178,7 @@ static void Task_ExitBuyMenuDoFade(u8 taskId)
     {
         CloseMoneyWindow(0, 0);
         BuyMenuFreeMemory();
-        SetMainCallback2(c2_exit_to_overworld_2_switch);
+        SetMainCallback2(CB2_ReturnToField);
         DestroyTask(taskId);
     }
 }
diff --git a/src/trade.c b/src/trade.c
index d20f4efec..bd298b58e 100644
--- a/src/trade.c
+++ b/src/trade.c
@@ -4885,7 +4885,7 @@ static bool8 sub_804C29C(void)
             if (!gPaletteFade.active)
             {
                 PlayBGM(gUnknown_03004828->unk_0124);
-                SetMainCallback2(c2_exit_to_overworld_2_switch);
+                SetMainCallback2(CB2_ReturnToField);
                 sub_804D8E4();
             }
             break;