summaryrefslogtreecommitdiff
path: root/src/scrcmd.c
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-06-13 17:51:26 -0500
committerMarcus Huderle <huderlem@gmail.com>2018-06-13 17:51:26 -0500
commit4d13e3394ad44eaa5dab972e73985dd1820069ea (patch)
tree05141d2c6307990b3013bc330e80d8e163492181 /src/scrcmd.c
parentaa9a45c16fbaee2fffc94e4741e0a1f203b244bc (diff)
Bring all movement function names up-to-date with pokeruby
Diffstat (limited to 'src/scrcmd.c')
-rw-r--r--src/scrcmd.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/scrcmd.c b/src/scrcmd.c
index e3edb5abf..4e3fceb10 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1157,7 +1157,7 @@ bool8 ScrCmd_faceplayer(struct ScriptContext *ctx)
if (gEventObjects[gSelectedEventObject].active)
{
EventObjectFaceOppositeDirection(&gEventObjects[gSelectedEventObject],
- player_get_direction_lower_nybble());
+ GetPlayerFacingDirection());
}
return FALSE;
}
@@ -1244,7 +1244,7 @@ bool8 ScrCmd_releaseall(struct ScriptContext *ctx)
HideFieldMessageBox();
objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
- EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]);
+ EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
sub_80D338C();
UnfreezeEventObjects();
return FALSE;
@@ -1256,9 +1256,9 @@ bool8 ScrCmd_release(struct ScriptContext *ctx)
HideFieldMessageBox();
if (gEventObjects[gSelectedEventObject].active)
- EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[gSelectedEventObject]);
+ EventObjectClearHeldMovementIfFinished(&gEventObjects[gSelectedEventObject]);
objectId = GetEventObjectIdByLocalIdAndMap(0xFF, 0, 0);
- EventObjectClearAnimIfSpecialAnimFinished(&gEventObjects[objectId]);
+ EventObjectClearHeldMovementIfFinished(&gEventObjects[objectId]);
sub_80D338C();
UnfreezeEventObjects();
return FALSE;
@@ -2238,7 +2238,7 @@ bool8 ScrCmd_warpD1(struct ScriptContext *ctx)
u16 y = VarGet(ScriptReadHalfword(ctx));
Overworld_SetWarpDestination(mapGroup, mapNum, warpId, x, y);
- sub_808D074(player_get_direction_lower_nybble());
+ sub_808D074(GetPlayerFacingDirection());
sub_80B0244();
player_avatar_init_params_reset();
return TRUE;