From 0c7063c5bae47d7152c9563751381b5eee384e4a Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Tue, 14 Aug 2018 23:50:58 +0200 Subject: Make contest effect table easier to edit in the future --- src/contest_effect.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/contest_effect.c') 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. -- cgit v1.2.3