diff options
author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
---|---|---|
committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/contest_ai.c | |
parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) |
fixing merge conflicts
Diffstat (limited to 'src/contest_ai.c')
-rw-r--r-- | src/contest_ai.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/contest_ai.c b/src/contest_ai.c index 3324ddf87..1342ea102 100644 --- a/src/contest_ai.c +++ b/src/contest_ai.c @@ -4,8 +4,6 @@ #include "contest_ai.h" #include "contest_effect.h" -extern u16 gContestMonConditions[]; - extern const u8 *gAIScriptPtr; extern const u8 *gContestAIs[]; |