dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Make contest effect table easier to edit in the future

Browse Source
This commit is contained in:
DizzyEggg
2018-08-14 23:50:58 +02:00
parent c72b55a5c4
commit 0c7063c5ba
2 changed files with 2836 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/contest_effect.c
+4 -5
View File
@@ -67,12 +67,11 @@ bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove)
nextMoveComboMoves[3] = gContestMoves[nextMove].comboMoves[3]; nextMoveComboMoves[3] = gContestMoves[nextMove].comboMoves[3];
if (lastMoveComboStarterId == 0) if (lastMoveComboStarterId == 0)
return 0; return FALSE;
else if (lastMoveComboStarterId == nextMoveComboMoves[0] || lastMoveComboStarterId == nextMoveComboMoves[1] || lastMoveComboStarterId == nextMoveComboMoves[2] || lastMoveComboStarterId == nextMoveComboMoves[3])
if (lastMoveComboStarterId == nextMoveComboMoves[0] || lastMoveComboStarterId == nextMoveComboMoves[1] || lastMoveComboStarterId == nextMoveComboMoves[2] || lastMoveComboStarterId == nextMoveComboMoves[3])
return gComboStarterLookupTable[lastMoveComboStarterId]; return gComboStarterLookupTable[lastMoveComboStarterId];
else
return 0; return FALSE;
} }
// A highly appealing move. // A highly appealing move.
src/data/contest_moves.h
+2832 -355
View File
File diff suppressed because it is too large Load Diff