dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Match

Browse Source
This commit is contained in:
PokeCodec
2020-07-28 14:38:38 -04:00
parent 7b6607d9e3
commit 044d968513
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/event_object_movement.c
+1 -6
View File
@@ -1205,8 +1205,7 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
{ {
struct ObjectEvent *objectEvent; struct ObjectEvent *objectEvent;
u8 objectEventId; u8 objectEventId;
s16 x; s16 x, y;
s16 y;
if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId)) if (GetAvailableObjectEventId(template->localId, mapNum, mapGroup, &objectEventId))
return OBJECT_EVENTS_COUNT; return OBJECT_EVENTS_COUNT;
@@ -1220,7 +1219,6 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
objectEvent->movementType = template->movementType; objectEvent->movementType = template->movementType;
objectEvent->localId = template->localId; objectEvent->localId = template->localId;
objectEvent->mapNum = mapNum; objectEvent->mapNum = mapNum;
objectEvent++; objectEvent--;
objectEvent->mapGroup = mapGroup; objectEvent->mapGroup = mapGroup;
objectEvent->initialCoords.x = x; objectEvent->initialCoords.x = x;
objectEvent->initialCoords.y = y; objectEvent->initialCoords.y = y;
@@ -1237,9 +1235,6 @@ static u8 InitObjectEventStateFromTemplate(struct ObjectEventTemplate *template,
objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType]; objectEvent->previousMovementDirection = gInitialMovementTypeFacingDirections[template->movementType];
SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection); SetObjectEventDirection(objectEvent, objectEvent->previousMovementDirection);
SetObjectEventDynamicGraphicsId(objectEvent); SetObjectEventDynamicGraphicsId(objectEvent);
#ifndef NONMATCHING
asm("":::"r5", "r6");
#endif
if (gRangedMovementTypes[objectEvent->movementType]) if (gRangedMovementTypes[objectEvent->movementType])
{ {
if (objectEvent->range.as_nybbles.x == 0) if (objectEvent->range.as_nybbles.x == 0)