diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-08-15 16:22:54 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-08-15 16:22:54 -0700 |
| commit | 13dc7a4170bcb44d10c80099b704103915c4d49d (patch) | |
| tree | c9511c79c597830fdae81ea30ad26a432f5998d8 /include/contest_effect.h | |
| parent | e7da51438286bceaa085aad524065cbfe645faf0 (diff) | |
| parent | f65da613cf04772d55cfcdaca8266479ea2c662b (diff) | |
Merge branch 'master' of github.com:pret/pokeemerald
Diffstat (limited to 'include/contest_effect.h')
| -rw-r--r-- | include/contest_effect.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/contest_effect.h b/include/contest_effect.h index c8f5e389a..5f48e1b8b 100644 --- a/include/contest_effect.h +++ b/include/contest_effect.h @@ -17,7 +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 |