diff options
| author | PokeCodec <doremylover456@gmail.com> | 2020-07-28 15:31:08 -0400 |
|---|---|---|
| committer | PokeCodec <doremylover456@gmail.com> | 2020-07-28 15:31:08 -0400 |
| commit | 93be3a08ce53fd3364fdb055e86269aa32e7fc4f (patch) | |
| tree | 2e89440e8ccce4ad7b530f31ce061c8f6c53b4d3 /src | |
| parent | 3b43fc12fc3a4ed8ce697e3ef169d3903fa19b70 (diff) | |
Match
Diffstat (limited to 'src')
| -rw-r--r-- | src/event_object_movement.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 4b275a970..af3482969 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -1205,7 +1205,8 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template, { struct ObjectEvent *objectEvent; u8 objectEventId; - s16 x, y; + s16 x; + s16 y; if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId)) return OBJECT_EVENTS_COUNT; @@ -1231,6 +1232,7 @@ 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); |