diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:10 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-05-29 17:53:10 -0500 |
| commit | aa8299821dca148ecfd5d6bfb77641043e01da5c (patch) | |
| tree | 8bd3bc7b35180d63fa4cef46988e34148cb6d5e9 /src/trainer_see.c | |
| parent | b921b268c1962eb139a73608437c1c7501ca5ae6 (diff) | |
More event object movement cleanup
Diffstat (limited to 'src/trainer_see.c')
| -rw-r--r-- | src/trainer_see.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/trainer_see.c b/src/trainer_see.c index 65c281ca1..4c51670cb 100644 --- a/src/trainer_see.c +++ b/src/trainer_see.c @@ -165,7 +165,7 @@ static bool8 CheckPathBetweenTrainerAndPlayer(struct MapObject *trainerObj, u8 a for (i = 0; i <= approachDistance - 1; i++, MoveCoords(direction, &x, &y)) { - collision = sub_8060024(trainerObj, x, y, direction); + collision = GetCollisionFlagsAtCoords(trainerObj, x, y, direction); if (collision != 0 && (collision & COLLISION_MASK)) return FALSE; } @@ -314,8 +314,8 @@ static bool8 sub_8084478(u8 taskId, struct Task *task, struct MapObject *trainer return FALSE; SetTrainerMovementType(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - sub_805C774(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); - sub_805C754(trainerObj); + OverrideMovementTypeForMapObject(trainerObj, GetTrainerFacingDirectionMovementType(trainerObj->facingDirection)); + OverrideTemplateCoordsForMapObject(trainerObj); playerObj = &gMapObjects[gPlayerAvatar.mapObjectId]; if (FieldObjectIsMovementOverridden(playerObj) && !FieldObjectClearHeldMovementIfFinished(playerObj)) @@ -431,7 +431,7 @@ void sub_80846E4(u8 taskId) if (task->data[0] == 3 && !FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH)) { SetTrainerMovementType(mapObj, GetTrainerFacingDirectionMovementType(mapObj->facingDirection)); - sub_805C774(mapObj, GetTrainerFacingDirectionMovementType(mapObj->facingDirection)); + OverrideMovementTypeForMapObject(mapObj, GetTrainerFacingDirectionMovementType(mapObj->facingDirection)); DestroyTask(taskId); } else |