summaryrefslogtreecommitdiff
path: root/src/battle_main.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2019-07-20 12:11:46 -0400
committerGitHub <noreply@github.com>2019-07-20 12:11:46 -0400
commit4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (patch)
treeec2e9ec5f3e4a6d8523e80ab58e6c9c296fbc05c /src/battle_main.c
parent3f762629e830c0cad66c4efeea5b918bdf4cce20 (diff)
parent6edacdee36d31b2df69559f28a33b8d9e958bf5e (diff)
Merge pull request #732 from PikalaxALT/modern_gcc
Modernize code for compatibility with later releases of GCC
Diffstat (limited to 'src/battle_main.c')
-rw-r--r--src/battle_main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/battle_main.c b/src/battle_main.c
index b4c4bdf5c..61b6a5a12 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -72,6 +72,9 @@ extern const u8 *const gBattlescriptsForUsingItem[];
extern const u8 *const gBattlescriptsForSafariActions[];
// this file's functions
+#if !defined(NONMATCHING) && MODERN
+#define static
+#endif
static void CB2_InitBattleInternal(void);
static void CB2_PreInitMultiBattle(void);
static void CB2_PreInitIngamePlayerPartnerBattle(void);