diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:39:13 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-23 13:39:13 -0500 |
| commit | 73c16c109cdb996fa59f5aa63e9f030c21cbe54f (patch) | |
| tree | b0b4b7eefc77441d711105cf036b273f22ce2ec2 /src/pokemon/learn_move.c | |
| parent | 56bf99fd9106b3cc8fac45cc051cbeeec40e34aa (diff) | |
| parent | aa13f45ebb79aed62171fbfe654d8b542fc9aa6c (diff) | |
Merge branch 'master' into slot_machine
Diffstat (limited to 'src/pokemon/learn_move.c')
| -rw-r--r-- | src/pokemon/learn_move.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/pokemon/learn_move.c b/src/pokemon/learn_move.c index 8aa10254c..5eee45b23 100644 --- a/src/pokemon/learn_move.c +++ b/src/pokemon/learn_move.c @@ -1,4 +1,5 @@ #include "global.h" +#include "contest.h" #include "data2.h" #include "field_fadetransition.h" #include "main.h" @@ -24,8 +25,6 @@ extern u16 gSpecialVar_0x8004; extern u16 gSpecialVar_0x8005; extern u8 gTileBuffer[]; -extern const struct ContestMove gContestMoves[]; -extern const struct ContestEffect gContestEffects[]; extern const struct WindowConfig gWindowConfig_81E6CE4; extern const struct WindowConfig gWindowConfig_81E7240; extern const u8 *const gContestEffectStrings[]; |