diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-07-28 15:56:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-28 15:56:58 -0400 |
| commit | 96b904bf808805daa3de09080e10cc92e24c1f8e (patch) | |
| tree | 2e89440e8ccce4ad7b530f31ce061c8f6c53b4d3 | |
| parent | 70617d56e4ef0ef1432e0cc7fb3214a63d773578 (diff) | |
| parent | 93be3a08ce53fd3364fdb055e86269aa32e7fc4f (diff) | |
Merge pull request #1115 from PokeCodec/Matching
Match InitObjectEventStateFromTemplate
| -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 76331c2b1..af3482969 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1220,7 +1220,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; @@ -1233,13 +1232,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; //redundant, but needed to match 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) |