7 files changed, 18 insertions, 24 deletions
diff --git a/include/event_obj_lock.h b/include/event_obj_lock.h
index e95bc9131..538edc579 100644
--- a/include/event_obj_lock.h
+++ b/include/event_obj_lock.h
@@ -8,7 +8,7 @@ void ScriptFreezeEventObjects(void);
 void sub_8064D38(u8 taskId);
 bool8 sub_8064DB4(void);
 void LockSelectedEventObject(void);
-void sub_8064E2C(void);
+void ScriptUnfreezeEventObjects(void);
 void unref_sub_8064E5C(void);
 void sub_8064EAC(void);
 void sub_8064ED4(void);
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index b79eebd83..599d1da0c 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -4,12 +4,12 @@
 struct FieldInput
 {
     u8 pressedAButton:1;
-    u8 input_field_0_1:1;
+    u8 checkStandardWildEncounter:1;
     u8 pressedStartButton:1;
     u8 pressedSelectButton:1;
     u8 input_field_0_4:1;
     u8 input_field_0_5:1;
-    u8 input_field_0_6:1;
+    u8 tookStep:1;
     u8 pressedBButton:1;
     u8 input_field_1_0:1;
     u8 input_field_1_1:1;
@@ -23,19 +23,15 @@ struct FieldInput
     u8 input_field_3;
 };
 
-void FieldClearPlayerInput(struct FieldInput *pStruct);
-void FieldGetPlayerInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys);
-int sub_8068024(struct FieldInput *pStruct);
-u8 *sub_80682A8(struct MapPosition *, u8, u8);
-void overworld_poison_timer_set(void);
-void prev_quest_postbuffer_cursor_backup_reset(void);
-u8 *sub_8068E24(struct MapPosition *);
+void ClearPlayerFieldInput(struct FieldInput *pStruct);
+void GetPlayerFieldInput(struct FieldInput *pStruct, u16 keys, u16 heldKeys);
+int ProcessPlayerFieldInput(struct FieldInput *pStruct);
+u8 *GetInteractedLinkPlayerScript(struct MapPosition *, u8, u8);
+void ClearPoisonStepCounter(void);
+void RestartWildEncounterImmunitySteps(void);
+u8 *GetCoordEventScriptAtMapPosition(struct MapPosition *);
 u8 *GetEventObjectScriptPointerPlayerFacing(void);
-bool8 mapheader_trigger_activate_at__run_now(struct MapPosition *);
-bool8 sub_8068870(u16 a);
-bool8 sub_8068894(void);
-bool8 sub_8068A64(struct MapPosition *, u16);
-u8 sub_8068F18(void);
-bool8 dive_warp(struct MapPosition *position, u16 b);
+u8 TrySetDiveWarp(void);
+bool8 dive_warp(struct MapPosition*, u16);
 
 #endif
diff --git a/include/field_fadetransition.h b/include/field_fadetransition.h
index 64e922651..5265983a4 100644
--- a/include/field_fadetransition.h
+++ b/include/field_fadetransition.h
@@ -18,7 +18,6 @@ void sub_8080E28(void);
 void sub_8080E44(void);
 bool32 sub_8080E70(void);
 void sub_8080E88(void);
-void sub_8080E88();
 void sp13E_warp_to_last_warp(void);
 void sub_8080EF0(void);
 void sp13F_fall_to_last_warp(void);
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index f200c0061..dc8558146 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -110,7 +110,7 @@ struct BgEvent
 {
     /*0x00*/u16 x;
     /*0x02*/u16 y;
-    /*0x04*/u8 unk4;
+    /*0x04*/u8 elevation;
     /*0x05*/u8 kind;
     /*0x08*/union { // carried over from diego's FR/LG work, seems to be the same struct
         // in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union.
diff --git a/include/item_menu.h b/include/item_menu.h
index 726d36789..715d9131a 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -30,7 +30,7 @@ void sub_80A5D04(void);
 void ItemMenu_LoadSellMenu(void);
 void sub_80A68CC();
 void sub_80A6A30(void);
-bool32 sub_80A6D1C(void);
+bool32 UseRegisteredKeyItem(void);
 void sub_80A6DCC(void);
 void sub_80A7094(u8);
 u8 CreateBerrySprite(u8, s16, s16);
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index f4250f07b..78a311208 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -80,8 +80,8 @@ bool8 MetatileBehavior_IsLandWildEncounter(u8);
 bool8 MetatileBehavior_IsWaterWildEncounter(u8);
 bool8 sub_80574C4(u8);
 bool8 sub_80574D8(u8);
-bool8 sub_80574EC(u8);
-bool8 sub_805750C(u8);
+bool8 MetatileBehavior_IsDiveable(u8);
+bool8 MetatileBehavior_IsNotSurfacable(u8);
 bool8 MetatileBehavior_IsShallowFlowingWater(u8);
 bool8 MetatileBehavior_IsThinIce(u8);
 bool8 MetatileBehavior_IsCrackedIce(u8);
diff --git a/include/overworld.h b/include/overworld.h
index fa54b0906..de817e8e0 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -72,9 +72,8 @@ void sub_8053720(s16, s16);
 void sub_80537CC(u8);
 void gpu_sync_bg_hide();
 // GetMapConnection
-// sub_8053850
-bool8 sub_80538B0(u16 x, u16 y);
-bool8 sub_80538D0(u16 x, u16 y);
+bool8 SetDiveWarpEmerge(u16 x, u16 y);
+bool8 SetDiveWarpDive(u16 x, u16 y);
 void sub_80538F0(u8 mapGroup, u8 mapNum);
 // sub_8053994
 void player_avatar_init_params_reset(void);