summaryrefslogtreecommitdiff
path: root/src/faraway_island.c
diff options
context:
space:
mode:
authoraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-09-13 04:22:50 -0300
committeraaaaaa123456789 <aaaaaa123456789@acidch.at>2020-09-13 06:30:55 -0300
commit7dc95a0103af08c95c9093b6efa6c77af77a2538 (patch)
tree663537916626ab264bbdef4ea3606415457c36a3 /src/faraway_island.c
parent58a2b62bae1406d2c768698ed13efcd6a5ffbeec (diff)
Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.
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)