Merge branch 'master' of github.com:pret/pokeemerald

This commit is contained in:
Diegoisawesome
2018-08-15 16:22:54 -07:00
12 changed files with 3887 additions and 5451 deletions

View File

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