summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2018-12-29 11:12:50 -0600
committerMarcus Huderle <huderlem@gmail.com>2018-12-29 11:36:54 -0600
commitd0d870e193a394f52695d4d17b5737f35eadbd89 (patch)
tree475bf2c4e6519bc815899431e9036615ee81fcc9 /src
parent6e7bdb3ca4d3753c1d382d9470c505d3922b9299 (diff)
Cleanup formatting
Diffstat (limited to 'src')
-rw-r--r--src/field_player_avatar.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 8cb3ce912..7423216a4 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -723,7 +723,7 @@ static bool8 sub_808B1BC(s16 x, s16 y, u8 direction)
{
if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
&& MapGridGetZCoordAt(x, y) == 3
- && GetEventObjectIdByXYZ(x, y, 3) == 16)
+ && GetEventObjectIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT)
{
sub_808C750(direction);
return TRUE;
@@ -792,11 +792,8 @@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
MoveCoords(direction, &playerX, &playerY);
mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR));
-
- if (mewObjectId == 16)
- {
+ if (mewObjectId == EVENT_OBJECTS_COUNT)
return FALSE;
- }
object = &gEventObjects[mewObjectId];
mewPrevX = object->previousCoords.x;