diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-11 19:04:28 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-08-11 19:04:28 +0200 |
commit | 537ebd36ac47fc627c401882c9d79b094ff29a2d (patch) | |
tree | dcb9cce46d89bac051073178623d397f6f31aa59 /src/pokemon_summary_screen.c | |
parent | 85ebd76cd03e1ee84f182585060b3a79b8653e85 (diff) | |
parent | 6ae395a6366ceefffe8f492911a4e517bdbbc7b2 (diff) |
Merge contests with master
Diffstat (limited to 'src/pokemon_summary_screen.c')
-rw-r--r-- | src/pokemon_summary_screen.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 32d2bde4f..2db027d5c 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -29,6 +29,7 @@ #include "daycare.h" #include "data2.h" #include "contest.h" +#include "contest_effect.h" extern struct UnkSummaryStruct* gUnknown_0203CF1C; extern struct BgTemplate gUnknown_0861CBB4; @@ -41,7 +42,6 @@ extern struct UnkStruct_61CC04 gUnknown_0861CC10; extern struct UnkStruct_61CC04 gUnknown_0861CBEC; extern struct UnkStruct_61CC04 gUnknown_0861CBF8; extern u16 gSummaryScreenWindow_Tilemap[]; -extern struct ContestMove gContestMoves[]; extern struct ContestEffect gContestEffects[]; extern struct WindowTemplate gUnknown_0861CC24; extern u8 gUnknown_0861CD2C[][3]; |