diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-20 23:12:51 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-20 23:12:51 -0500 |
| commit | 82cb741d8b2b2d88c1e23d2d5ccf5443892538fa (patch) | |
| tree | c05b6424006d1d46a3d38c0205c1dfce986c6fdc /src/field_control_avatar.c | |
| parent | ec3e86f1d2f78bb9fece0956e246862cea3c07b9 (diff) | |
Standardize EVENT_OBJECT to OBJECT_EVENT
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index 2326ec101..6973eb487 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -268,7 +268,7 @@ const u8 *GetInteractedLinkPlayerScript(struct MapPosition *position, u8 metatil else objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) return NULL; for (i = 0; i < 4; i++) @@ -289,14 +289,14 @@ static const u8 *GetInteractedObjectEventScript(struct MapPosition *position, u8 const u8 *script; objectEventId = GetObjectEventIdByXYZ(position->x, position->y, position->height); - if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) { if (MetatileBehavior_IsCounter(metatileBehavior) != TRUE) return NULL; // Look for an object event on the other side of the counter. objectEventId = GetObjectEventIdByXYZ(position->x + gDirectionToVectors[direction].x, position->y + gDirectionToVectors[direction].y, position->height); - if (objectEventId == EVENT_OBJECTS_COUNT || gObjectEvents[objectEventId].localId == EVENT_OBJ_ID_PLAYER) + if (objectEventId == OBJECT_EVENTS_COUNT || gObjectEvents[objectEventId].localId == OBJ_EVENT_ID_PLAYER) return NULL; } |