ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-18 01:14:19 +01:00
Code Issues 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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/contest_effect.c
View File

@ -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.

3187
src/data/contest_moves.h
View File

File diff suppressed because it is too large Load Diff