diff options
| author | Tetrable <atiftetra@gmail.com> | 2018-08-26 17:33:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-26 17:33:39 +0100 |
| commit | d8f6da035015393339ea6391d293e5ff88558844 (patch) | |
| tree | 7abec1fe7ed598e04de425ca4f49020759d5ee9d /include/contest_effect.h | |
| parent | 8896b54e8f45528fc6c21cd55cdace2ad03b2796 (diff) | |
| parent | 60dff848aace7226f903eb6759273c4b52ea1813 (diff) | |
Merge pull request #1 from pret/master
Merge pokeemerald
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 |