7 files changed, 43 insertions, 4 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h
index 0bc96eb35..ccac1da3b 100644
--- a/include/constants/flags.h
+++ b/include/constants/flags.h
@@ -1360,7 +1360,7 @@
 #define FLAG_SYS_RIBBON_GET (SYS_FLAGS + 0x3B)
 #define FLAG_SYS_SAW_HELP_SYSTEM_INTRO (SYS_FLAGS + 0x3C)
 #define FLAG_0x83D (SYS_FLAGS + 0x3D)
-#define FLAG_PALLET_TOWN_LADY_MOVED_FROM_SIGN (SYS_FLAGS + 0x3E)
+#define FLAG_OPENED_START_MENU (SYS_FLAGS + 0x3E)
 #define FLAG_0x83F (SYS_FLAGS + 0x3F)
 #define FLAG_SYS_NATIONAL_DEX (SYS_FLAGS + 0x40)
 #define FLAG_SYS_PC_STORAGE_DISABLED (SYS_FLAGS + 0x41)
diff --git a/include/event_scripts.h b/include/event_scripts.h
index c211e3a34..9b1f65fef 100644
--- a/include/event_scripts.h
+++ b/include/event_scripts.h
@@ -1212,4 +1212,8 @@ extern const u8 CableClub_Text_PleaseWaitBCancel[];
 // fldeff_flash
 extern const u8 EventScript_FldEffFlash[];
 
+// field_control_avatar
+extern const u8 gUnknown_81A7ADB[];
+extern const u8 PalletTown_PlayersHouse_2F_EventScript_PC[];
+
 #endif //GUARD_EVENT_SCRIPTS_H
diff --git a/include/field_control_avatar.h b/include/field_control_avatar.h
index 4311a2b29..587586746 100644
--- a/include/field_control_avatar.h
+++ b/include/field_control_avatar.h
@@ -3,7 +3,25 @@
 
 #include "global.h"
 
-extern u32 gUnknown_3005078;
+struct FieldInput
+{
+    bool8 pressedAButton:1;
+    bool8 checkStandardWildEncounter:1;
+    bool8 pressedStartButton:1;
+    bool8 pressedSelectButton:1;
+    bool8 heldDirection:1;
+    bool8 heldDirection2:1;
+    bool8 tookStep:1;
+    bool8 pressedBButton:1;
+    bool8 pressedRButton:1;
+    bool8 input_field_1_0:1;
+    bool8 input_field_1_1:1;
+    bool8 input_field_1_2:1;
+    bool8 input_field_1_3:1;
+    u8 dpadDirection;
+};
+
+extern struct FieldInput gUnknown_3005078;
 
 void RestartWildEncounterImmunitySteps(void);
 void ClearPoisonStepCounter(void);
diff --git a/include/field_specials.h b/include/field_specials.h
index b3291bf54..9c44c35bc 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -28,5 +28,8 @@ u8 GetUnlockedSeviiAreas(void);
 u32 GetPlayerTrainerId(void);
 bool8 CutMoveRuinValleyCheck(void);
 void CutMoveOpenDottedHoleDoor(void);
+void RunMassageCooldownStepCounter(void);
+void IncrementResortGorgeousStepCounter(void);
+void IncrementBirthIslandRockStepCount(void);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index e1998afdf..2d7dc104e 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -318,6 +318,14 @@ enum
     COLLISION_HORIZONTAL_RAIL,
 };
 
+// player running states
+enum
+{
+    NOT_MOVING,
+    TURN_DIRECTION, // not the same as turning! turns your avatar without moving. also known as a turn frame in some circles
+    MOVING,
+};
+
 // player tile transition states
 enum
 {
diff --git a/include/item_menu.h b/include/item_menu.h
index 27bd73e72..fe593ff02 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -41,5 +41,6 @@ void InitOldManBag(void);
 void Pocket_CalculateNItemsAndMaxShowed(u8 pocketId);
 void PocketCalculateInitialCursorPosAndItemsAbove(u8 pocketId);
 void GoToBagMenu(u8 menuType, u8 pocket, MainCallback callback);
+bool8 UseRegisteredKeyItemOnField(void);
 
 #endif //GUARD_ITEM_MENU_H
diff --git a/include/script.h b/include/script.h
index 2fb732396..38da71774 100644
--- a/include/script.h
+++ b/include/script.h
@@ -53,12 +53,12 @@ void mapheader_run_script_with_tag_x3(void);
 void mapheader_run_script_with_tag_x5(void);
 void mapheader_run_script_with_tag_x7(void);
 void mapheader_run_script_with_tag_x6(void);
-bool8 mapheader_run_first_tag2_script_list_match(void);
+bool8 TryRunOnFrameMapScript(void);
 void mapheader_run_first_tag4_script_list_match(void);
 u32 CalculateRamScriptChecksum(void);
 void ClearRamScript(void);
 bool8 InitRamScript(u8 *script, u16 scriptSize, u8 mapGroup, u8 mapNum, u8 objectId);
-u8 *GetRamScript(u8 objectId, u8 *script);
+const u8 *GetRamScript(u8 objectId, const u8 *script);
 bool32 sub_80991F8(void);
 u8 *sub_8099244(void);
 void sub_80992A0(u8 *script, u16 scriptSize);
@@ -73,7 +73,12 @@ void sub_8069970(void);
 void sub_8069A20(void);
 void sub_8069A2C(void);
 bool8 IsMsgSignPost(void);
+bool8 sub_806997C(void);
+u8 sub_80699B0(void);
+void sub_8069A54(void);
+bool8 sub_8069A04(void);
 
 extern const u8 *gRAMScriptPtr;
+extern u8 gUnknown_20370A0;
 
 #endif // GUARD_SCRIPT_H