diff options
author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-30 01:55:51 -0400 |
---|---|---|
committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2017-09-30 01:55:51 -0400 |
commit | 044e8cc93b46fccb2e4e5ed5accf4c55917a3f7f (patch) | |
tree | 3628ac48decbc59229a6a92ac1270f5bbed4a4bb /src/field/field_player_avatar.c | |
parent | 0cac170dfd3bfa9c2386b0b230655ace9dea7f11 (diff) | |
parent | f74d4742f597a423b7a8685d72c06597c8c78db7 (diff) |
merge
Diffstat (limited to 'src/field/field_player_avatar.c')
-rw-r--r-- | src/field/field_player_avatar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index c8099a73d..e7947b704 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -1224,8 +1224,8 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c) { FieldObjectClearAnimIfSpecialAnimFinished(b); FieldObjectClearAnimIfSpecialAnimFinished(c); - FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId(task->data[2])); - FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId(task->data[2])); + FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId((u8)task->data[2])); + FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId((u8)task->data[2])); gFieldEffectArguments[0] = c->coords2.x; gFieldEffectArguments[1] = c->coords2.y; gFieldEffectArguments[2] = c->elevation; @@ -1385,7 +1385,7 @@ static void taskFF_0805D1D4(u8 taskId) return; } sub_8127ED0(playerMapObj->mapobj_unk_1A, 2); - FieldObjectSetSpecialAnim(playerMapObj, sub_80608D0(gTasks[taskId].data[0])); + FieldObjectSetSpecialAnim(playerMapObj, sub_80608D0((u8)gTasks[taskId].data[0])); gTasks[taskId].func = sub_805A2D0; } |