mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-11-16 19:47:35 +01:00
Match
This commit is contained in:
parent
3b43fc12fc
commit
93be3a08ce
@ -1205,7 +1205,8 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
|
|||||||
{
|
{
|
||||||
struct ObjectEvent *objectEvent;
|
struct ObjectEvent *objectEvent;
|
||||||
u8 objectEventId;
|
u8 objectEventId;
|
||||||
s16 x, y;
|
s16 x;
|
||||||
|
s16 y;
|
||||||
|
|
||||||
if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId))
|
if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId))
|
||||||
return OBJECT_EVENTS_COUNT;
|
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.x = template->movementRangeX;
|
||||||
objectEvent->range.as_nybbles.y = template->movementRangeY;
|
objectEvent->range.as_nybbles.y = template->movementRangeY;
|
||||||
objectEvent->trainerType = template->trainerType;
|
objectEvent->trainerType = template->trainerType;
|
||||||
|
objectEvent->mapNum = mapNum; //redundant, but needed to match
|
||||||
objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId;
|
objectEvent->trainerRange_berryTreeId = template->trainerRange_berryTreeId;
|
||||||
objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
|
objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
|
||||||
SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection);
|
SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection);
|
||||||
|
Loading…
Reference in New Issue
Block a user