diff options
| author | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-15 01:24:44 +0100 |
|---|---|---|
| committer | Marco Willems (M17.1) <progreon@gmail.com> | 2018-01-15 01:24:44 +0100 |
| commit | 6d2302637dbc7dfd597c7f95de780b1a21079f15 (patch) | |
| tree | b1e67e0043114a0ecad9dfb1a59d636cbc16083d /src/contest.c | |
| parent | 8602ff770030d84d2d18cccd961c07f195dc0a17 (diff) | |
| parent | 20de25004946139a601cd2965afc2e9645a56b96 (diff) | |
Merge remote-tracking branch 'upstream/master' into various_data
Diffstat (limited to 'src/contest.c')
| -rw-r--r-- | src/contest.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/contest.c b/src/contest.c index 875fe4502..df4bb361d 100644 --- a/src/contest.c +++ b/src/contest.c @@ -31,13 +31,12 @@ #include "tv.h" #include "scanline_effect.h" #include "util.h" +#include "contest_ai.h" extern u8 AreMovesContestCombo(u16, u16); // I don't think this is a bool extern void sub_80C8A38(u8); extern void sub_80C8AD0(u8); extern void sub_80C8C80(u8); -extern void sub_81288F4(); -extern u8 sub_8128944(void); extern struct MusicPlayerInfo gMPlay_SE1; extern u16 gSpecialVar_ContestCategory; @@ -391,7 +390,7 @@ void ClearContestVars(void) } memset(&shared192D0, 0, sizeof(shared192D0)); - memset(shared192E4, 0, 0x44 * sizeof(*shared192E4)); + memset(eContestAI, 0, sizeof(struct ContestAIInfo)); memset(&shared19328, 0, sizeof(shared19328)); memset(shared19338, 0, 4 * sizeof(*shared19338)); if (!(gIsLinkContest & 1)) @@ -2629,8 +2628,8 @@ u16 GetChosenMove(u8 a) { u8 moveChoice; - sub_81288F4(a); - moveChoice = sub_8128944(); + ContestAI_ResetAI(a); + moveChoice = ContestAI_GetActionToUse(); return gContestMons[a].moves[moveChoice]; } } |