diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-05 11:47:24 -0400 |
|---|---|---|
| committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-05 11:47:24 -0400 |
| commit | a7a64ecba052566b1ae5b530cc6f28ccab191af1 (patch) | |
| tree | bb5000becf00cc8b1bdd210a95b285e5596b05cb /src/faraway_island.c | |
| parent | 16ecbc6446f4e8d308e71aa5e649c69acb8a6b3e (diff) | |
Fixup ModifyStatByNature
Diffstat (limited to 'src/faraway_island.c')
| -rwxr-xr-x | src/faraway_island.c | 23 |
1 files changed, 9 insertions, 14 deletions
diff --git a/src/faraway_island.c b/src/faraway_island.c index e3d8444c9..6bfa066c2 100755 --- a/src/faraway_island.c +++ b/src/faraway_island.c @@ -181,40 +181,36 @@ u32 GetMewMoveDirection(void) { if (ShouldMewMoveEast(mew, 1)) return GetRandomMewDirectionCandidate(2); - else if (ShouldMewMoveWest(mew, 1)) + if (ShouldMewMoveWest(mew, 1)) return GetRandomMewDirectionCandidate(2); - else - return DIR_NORTH; + return DIR_NORTH; } if (ShouldMewMoveSouth(mew, 0)) { if (ShouldMewMoveEast(mew, 1)) return GetRandomMewDirectionCandidate(2); - else if (ShouldMewMoveWest(mew, 1)) + if (ShouldMewMoveWest(mew, 1)) return GetRandomMewDirectionCandidate(2); - else - return DIR_SOUTH; + return DIR_SOUTH; } if (ShouldMewMoveEast(mew, 0)) { if (ShouldMewMoveNorth(mew, 1)) return GetRandomMewDirectionCandidate(2); - else if (ShouldMewMoveSouth(mew, 1)) + if (ShouldMewMoveSouth(mew, 1)) return GetRandomMewDirectionCandidate(2); - else - return DIR_EAST; + return DIR_EAST; } if (ShouldMewMoveWest(mew, 0)) { if (ShouldMewMoveNorth(mew, 1)) return GetRandomMewDirectionCandidate(2); - else if (ShouldMewMoveSouth(mew, 1)) + if (ShouldMewMoveSouth(mew, 1)) return GetRandomMewDirectionCandidate(2); - else - return DIR_WEST; + return DIR_WEST; } // If this point is reached, Mew cannot move without getting closer to the player @@ -315,8 +311,7 @@ static u8 GetValidMewMoveDirection(u8 ignoredDir) if (count > 1) return sMewDirectionCandidates[VarGet(VAR_FARAWAY_ISLAND_STEP_COUNTER) % count]; - else - return sMewDirectionCandidates[0]; + return sMewDirectionCandidates[0]; } void UpdateFarawayIslandStepCounter(void) |