diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-12 13:55:07 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-03-12 13:55:07 -0500 |
commit | e6b1b97aa12ae683afbaa5b46cb27b8cdbe1448e (patch) | |
tree | 7263d3ba3860bda717808dd59766963b6591d444 /src/battle_main.c | |
parent | 6c297d19e85b08c09e43b69ef5cb138f4a9880eb (diff) |
Nonmatching resoltuion
- Fix fakematch in Cmd_get_used_held_item
- Remove `static` overrides in MODERN in four objects
Diffstat (limited to 'src/battle_main.c')
-rw-r--r-- | src/battle_main.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index a1bc6ae7b..2a39a17e1 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -68,9 +68,6 @@ extern const struct BgTemplate gBattleBgTemplates[]; extern const struct WindowTemplate *const gBattleWindowTemplates[]; // 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); |