diff options
| author | PokeCodec <doremylover456@gmail.com> | 2020-07-28 14:38:38 -0400 |
|---|---|---|
| committer | PokeCodec <doremylover456@gmail.com> | 2020-07-28 15:23:14 -0400 |
| commit | 044d968513f28566fab1db3ceff1b52162b8387a (patch) | |
| tree | 44970a72b683c279411fd039a6f7ecaf562f4384 /src | |
| parent | 7b6607d9e38702f41fda057cc13148b8f0bbcc0a (diff) | |
Match
Diffstat (limited to 'src')
| -rw-r--r-- | src/event_object_movement.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 76331c2b1..4b275a970 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1205,8 +1205,7 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, { struct ObjectEvent *objectEvent; u8 objectEventId; - s16 x; - s16 y; + s16 x, y; if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId)) return OBJECT_EVENTS_COUNT; @@ -1220,7 +1219,6 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, objectEvent->movementType = template->movementType; objectEvent->localId = template->localId; objectEvent->mapNum = mapNum; - objectEvent++; objectEvent--; objectEvent->mapGroup = mapGroup; objectEvent->initialCoords.x = x; objectEvent->initialCoords.y = y; @@ -1237,9 +1235,6 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection); SetObjectEventDynamicGraphicsId(objectEvent); -#ifndef NONMATCHING - asm("":::"r5", "r6"); -#endif if (gRangedMovementTypes[objectEvent->movementType]) { if (objectEvent->range.as_nybbles.x == 0) |