Merge branch 'master' into cable_car

1 files changed, 19 insertions, 19 deletions

diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c
index ff8e8504c..cd7d3a2e2 100644
--- a/src/field/field_control_avatar.c
+++ b/src/field/field_control_avatar.c
@@ -10,18 +10,18 @@
 #include "field_poison.h"
 #include "field_specials.h"
 #include "fieldmap.h"
-#include "flags.h"
+#include "constants/flags.h"
 #include "item_menu.h"
 #include "metatile_behavior.h"
 #include "overworld.h"
 #include "safari_zone.h"
 #include "script.h"
 #include "secret_base.h"
-#include "songs.h"
+#include "constants/songs.h"
 #include "sound.h"
 #include "start_menu.h"
 #include "trainer_see.h"
-#include "vars.h"
+#include "constants/vars.h"
 #include "wild_encounter.h"
 
 struct Coords32
@@ -30,8 +30,8 @@ struct Coords32
     s32 y;
 };
 
-extern u16 gScriptLastTalked;
-extern u16 gScriptFacing;
+extern u16 gSpecialVar_LastTalked;
+extern u16 gSpecialVar_Facing;
 extern struct LinkPlayerMapObject gLinkPlayerMapObjects[];
 extern u16 gSpecialVar_0x8004;
 extern u16 gSpecialVar_0x8005;
@@ -124,8 +124,8 @@ void FieldClearPlayerInput(struct FieldInput *input)
 
 void FieldGetPlayerInput(struct FieldInput *input, u16 newKeys, u16 heldKeys)
 {
-    u8 r6 = gPlayerAvatar.running1;
-    u8 r9 = gPlayerAvatar.running2;
+    u8 r6 = gPlayerAvatar.tileTransitionState;
+    u8 r9 = gPlayerAvatar.runningState;
     bool8 forcedMove = MetatileBehavior_IsMoveTile(cur_mapdata_block_role_at_player_pos(r9));
 
     if ((r6 == 2 && forcedMove == FALSE) || r6 == 0)
@@ -295,8 +295,8 @@ u8 *sub_80682A8(struct MapPosition *position, u8 unused, u8 c)
             return NULL;
     }
     gSelectedMapObject = r3;
-    gScriptLastTalked = gMapObjects[r3].localId;
-    gScriptFacing = c;
+    gSpecialVar_LastTalked = gMapObjects[r3].localId;
+    gSpecialVar_Facing = c;
     return GetFieldObjectScriptPointerByFieldObjectId(r3);
 }
 
@@ -316,10 +316,10 @@ static u8 *sub_8068364(struct MapPosition *position, u8 b, u8 c)
     }
     //_080683E8
     gSelectedMapObject = r3;
-    gScriptLastTalked = gMapObjects[r3].localId;
-    gScriptFacing = c;
+    gSpecialVar_LastTalked = gMapObjects[r3].localId;
+    gSpecialVar_Facing = c;
     script = GetFieldObjectScriptPointerByFieldObjectId(r3);
-    script = GetRamScript(gScriptLastTalked, script);
+    script = GetRamScript(gSpecialVar_LastTalked, script);
     return script;
 }
 
@@ -423,11 +423,11 @@ static u8 *sub_8068500(struct MapPosition *position, u8 b, u8 c)
 
 static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2)
 {
-    if (FlagGet(BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
+    if (FlagGet(FLAG_BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE)
         return UseSurfScript;
     if (MetatileBehavior_IsWaterfall(b) == TRUE)
     {
-        if (FlagGet(BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE)
+        if (FlagGet(FLAG_BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE)
             return S_UseWaterfall;
         else
             return S_CannotUseWaterfall;
@@ -437,7 +437,7 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2)
 
 static bool32 sub_8068770(void)
 {
-    if (FlagGet(BADGE07_GET) && sub_8068F18() == 2)
+    if (FlagGet(FLAG_BADGE07_GET) && sub_8068F18() == 2)
     {
         ScriptContext1_SetupScript(UseDiveScript);
         return TRUE;
@@ -447,7 +447,7 @@ static bool32 sub_8068770(void)
 
 static bool32 sub_80687A4(void)
 {
-    if (FlagGet(BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1)
+    if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1)
     {
         ScriptContext1_SetupScript(S_UseDiveUnderwater);
         return TRUE;
@@ -500,9 +500,9 @@ bool8 sub_8068894(void)
         ScriptContext1_SetupScript(gUnknown_081A14B8);
         return TRUE;
     }
-    if (sub_80422A0())
+    if (ShouldEggHatch())
     {
-        IncrementGameStat(13);
+        IncrementGameStat(GAME_STAT_HATCHED_EGGS);
         ScriptContext1_SetupScript(S_EggHatch);
         return TRUE;
     }
@@ -856,7 +856,7 @@ u8 sub_8068F18(void)
     return 0;
 }
 
-u8 *GetFieldObjectScriptPointerForComparison(void)
+u8 *GetFieldObjectScriptPointerPlayerFacing(void)
 {
     u8 r4;
     struct MapPosition position;