summaryrefslogtreecommitdiff
path: root/src/faraway_island.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/faraway_island.c')
-rwxr-xr-xsrc/faraway_island.c23
1 files changed, 14 insertions, 9 deletions
diff --git a/src/faraway_island.c b/src/faraway_island.c
index 6bfa066c2..e3d8444c9 100755
--- a/src/faraway_island.c
+++ b/src/faraway_island.c
@@ -181,36 +181,40 @@ u32 GetMewMoveDirection(void)
{
if (ShouldMewMoveEast(mew, 1))
return GetRandomMewDirectionCandidate(2);
- if (ShouldMewMoveWest(mew, 1))
+ else if (ShouldMewMoveWest(mew, 1))
return GetRandomMewDirectionCandidate(2);
- return DIR_NORTH;
+ else
+ return DIR_NORTH;
}
if (ShouldMewMoveSouth(mew, 0))
{
if (ShouldMewMoveEast(mew, 1))
return GetRandomMewDirectionCandidate(2);
- if (ShouldMewMoveWest(mew, 1))
+ else if (ShouldMewMoveWest(mew, 1))
return GetRandomMewDirectionCandidate(2);
- return DIR_SOUTH;
+ else
+ return DIR_SOUTH;
}
if (ShouldMewMoveEast(mew, 0))
{
if (ShouldMewMoveNorth(mew, 1))
return GetRandomMewDirectionCandidate(2);
- if (ShouldMewMoveSouth(mew, 1))
+ else if (ShouldMewMoveSouth(mew, 1))
return GetRandomMewDirectionCandidate(2);
- return DIR_EAST;
+ else
+ return DIR_EAST;
}
if (ShouldMewMoveWest(mew, 0))
{
if (ShouldMewMoveNorth(mew, 1))
return GetRandomMewDirectionCandidate(2);
- if (ShouldMewMoveSouth(mew, 1))
+ else if (ShouldMewMoveSouth(mew, 1))
return GetRandomMewDirectionCandidate(2);
- return DIR_WEST;
+ else
+ return DIR_WEST;
}
// If this point is reached, Mew cannot move without getting closer to the player
@@ -311,7 +315,8 @@ static u8 GetValidMewMoveDirection(u8 ignoredDir)
if (count > 1)
return sMewDirectionCandidates[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % count];
- return sMewDirectionCandidates[0];
+ else
+ return sMewDirectionCandidates[0];
}
void UpdateFarawayIslandStepCounter(void)