summaryrefslogtreecommitdiff
path: root/src/contest_effect.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-08-14 23:50:58 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-08-14 23:50:58 +0200
commit0c7063c5bae47d7152c9563751381b5eee384e4a (patch)
tree518ee4261a9064dfb4556d3dad81e4a13053450d /src/contest_effect.c
parentc72b55a5c4793a75480ba641634d155c806f1cd3 (diff)
Make contest effect table easier to edit in the future
Diffstat (limited to 'src/contest_effect.c')
-rw-r--r--src/contest_effect.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/contest_effect.c b/src/contest_effect.c
index 34b9b5807..d54fb769e 100644
--- a/src/contest_effect.c
+++ b/src/contest_effect.c
@@ -67,12 +67,11 @@ bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove)
nextMoveComboMoves[3] = gContestMoves[nextMove].comboMoves[3];
if (lastMoveComboStarterId == 0)
- return 0;
-
- if (lastMoveComboStarterId == nextMoveComboMoves[0] || lastMoveComboStarterId == nextMoveComboMoves[1] || lastMoveComboStarterId == nextMoveComboMoves[2] || lastMoveComboStarterId == nextMoveComboMoves[3])
+ return FALSE;
+ else if (lastMoveComboStarterId == nextMoveComboMoves[0] || lastMoveComboStarterId == nextMoveComboMoves[1] || lastMoveComboStarterId == nextMoveComboMoves[2] || lastMoveComboStarterId == nextMoveComboMoves[3])
return gComboStarterLookupTable[lastMoveComboStarterId];
-
- return 0;
+ else
+ return FALSE;
}
// A highly appealing move.