diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-01-03 16:45:53 -0700 |
| commit | 4df728666e55b47480467fbea86f48dadcb81c97 (patch) | |
| tree | 6a8413c90ec9d68c54389e1a54f6de9f12bb686c /include/contest.h | |
| parent | 9b2ebe671fe77298d0b1adcb5d87cbb2bd01cd3e (diff) | |
| parent | 397f32f29dbcd8fb6ad47afe5ba1ee354ca2b5c7 (diff) | |
Merge branch 'master' into slot_machine
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); |