diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2020-10-19 06:19:21 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2020-10-19 06:19:21 -0400 |
| commit | f0efd11aa9fd0f715b61c81cca268ef3013f522f (patch) | |
| tree | 67a408c14407c95308bd18385e2d7fb6d29b458d /src | |
| parent | 56c3eefd9f1b1dca3cfd9738a620f60932d3c665 (diff) | |
re-match InitObjectEventStateFromTemplate
Diffstat (limited to 'src')
| -rw-r--r-- | src/event_object_movement.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 29a9f6d0a..cbd0db6f3 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1223,7 +1223,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; @@ -1236,13 +1235,11 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, objectEvent->range.as_nybbles.x = template->movementRangeX; objectEvent->range.as_nybbles.y = template->movementRangeY; objectEvent->trainerType = template->trainerType; + objectEvent->mapNum = mapNum; objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId; 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) |