diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-25 20:02:09 +0200 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-25 20:02:09 +0200 |
| commit | 447e65860ce1235272004fe4714bd4fb1b4ca676 (patch) | |
| tree | 68df75610e029d135bd4b7415cd616910ec31604 /include/contest_effect.h | |
| parent | edcf04b665a9fa13d086dd486c4fe7b1649a7bbf (diff) | |
| parent | 60dff848aace7226f903eb6759273c4b52ea1813 (diff) | |
Merge branch 'master' into decompile_battle_frontier_1
Diffstat (limited to 'include/contest_effect.h')
| -rw-r--r-- | include/contest_effect.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/contest_effect.h b/include/contest_effect.h index 3484ca5df..5f48e1b8b 100644 --- a/include/contest_effect.h +++ b/include/contest_effect.h @@ -17,6 +17,9 @@ struct ContestEffect }; extern const struct ContestMove gContestMoves[]; -extern struct ContestEffect gContestEffects[]; +extern const struct ContestEffect gContestEffects[]; +extern const u8 *const gContestEffectDescriptionPointers[]; + +bool8 AreMovesContestCombo(u16 lastMove, u16 nextMove); #endif //GUARD_CONTEST_EFFECT_H |