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

Cleanup formatting

Browse Source
This commit is contained in:
Marcus Huderle
2018-12-29 11:12:50 -06:00
parent 6e7bdb3ca4
commit d0d870e193
4 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_player_avatar.c
+2 -5
View File
@@ -723,7 +723,7 @@ static bool8 sub_808B1BC(s16 x, s16 y, u8 direction)
{ {
if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING) if ((gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_SURFING)
&& MapGridGetZCoordAt(x, y) == 3 && MapGridGetZCoordAt(x, y) == 3
&& GetEventObjectIdByXYZ(x, y, 3) == 16) && GetEventObjectIdByXYZ(x, y, 3) == EVENT_OBJECTS_COUNT)
{ {
sub_808C750(direction); sub_808C750(direction);
return TRUE; return TRUE;
@@ -792,11 +792,8 @@ bool8 IsPlayerCollidingWithFarawayIslandMew(u8 direction)
MoveCoords(direction, &playerX, &playerY); MoveCoords(direction, &playerX, &playerY);
mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR)); mewObjectId = GetEventObjectIdByLocalIdAndMap(1, MAP_NUM(FARAWAY_ISLAND_INTERIOR), MAP_GROUP(FARAWAY_ISLAND_INTERIOR));
if (mewObjectId == EVENT_OBJECTS_COUNT)
if (mewObjectId == 16)
{
return FALSE; return FALSE;
}
object = &gEventObjects[mewObjectId]; object = &gEventObjects[mewObjectId];
mewPrevX = object->previousCoords.x; mewPrevX = object->previousCoords.x;