diff options
| author | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2018-01-02 11:16:06 -0600 |
| commit | 0f5b0005676cd3db623eb557f86cf92b1e020827 (patch) | |
| tree | 257857a4bed89a1d9410a9945efd63a76ea16582 /include/contest.h | |
| parent | 28e98d9df7db41f9dcc813ad4e0b37c568833aee (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into decompile_easy_chat
Diffstat (limited to 'include/contest.h')
| -rw-r--r-- | include/contest.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/contest.h b/include/contest.h index ae2767aef..10392c00e 100644 --- a/include/contest.h +++ b/include/contest.h @@ -73,14 +73,14 @@ extern const struct ContestEffect gContestEffects[]; extern const u8 *const gContestEffectStrings[]; void ResetLinkContestBoolean(void); -void sub_80AB2AC(void); +void LoadContestBgAfterMoveAnim(void); void CB2_StartContest(void); void Contest_CreatePlayerMon(u8); void Contest_InitAllPokemon(u8, u8); u8 sub_80AE47C(struct Pokemon *party); u16 sub_80AE770(u8, u8); void sub_80AE82C(u8); -u8 sub_80AEB1C(u16); +u8 IsSpeciesNotUnown(u16); void sub_80AF668(void); void sub_80B0F28(u8); bool8 Contest_SaveWinner(u8); |