summaryrefslogtreecommitdiff
path: root/src/field/map_obj_lock.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-12-23 13:39:13 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2017-12-23 13:39:13 -0500
commit73c16c109cdb996fa59f5aa63e9f030c21cbe54f (patch)
treeb0b4b7eefc77441d711105cf036b273f22ce2ec2 /src/field/map_obj_lock.c
parent56bf99fd9106b3cc8fac45cc051cbeeec40e34aa (diff)
parentaa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff)
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/field/map_obj_lock.c')
-rw-r--r--src/field/map_obj_lock.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field/map_obj_lock.c b/src/field/map_obj_lock.c
index 91feaf177..954fcb446 100644
--- a/src/field/map_obj_lock.c
+++ b/src/field/map_obj_lock.c
@@ -6,7 +6,7 @@
#include "script_movement.h"
#include "task.h"
-extern u16 gScriptFacing;
+extern u16 gSpecialVar_Facing;
bool8 walkrun_is_standing_still(void)
{
@@ -109,7 +109,7 @@ void unref_sub_8064E5C(void)
void sub_8064EAC(void)
{
- FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gScriptFacing);
+ FieldObjectFaceOppositeDirection(&gMapObjects[gSelectedMapObject], gSpecialVar_Facing);
}
void sub_8064ED4(void)