diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-07-22 13:12:23 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-07-22 13:12:23 -0400 |
| commit | 30793ff41bd0c289dc58fad13bb6251923296836 (patch) | |
| tree | 945ba8f5039c0914d7c94490d2b6146f9a9a441d /src/battle_main.c | |
| parent | aeeff84462973b267e62031a945603d96afed716 (diff) | |
Fix COMMON sym references under modern gcc
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index 721aa7f9f..66140133c 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -113,11 +113,14 @@ extern u16 gUnknown_02024DE8; extern u8 gActionSelectionCursor[]; extern u8 gMoveSelectionCursor[]; extern u8 gUnknown_02038470[]; -extern MainCallback gPreBattleCallback1; +MainCallback gPreBattleCallback1; +u8 gUnknown_03004344; +u8 gUnknown_03004348; extern void (*gBattleMainFunc)(void); -extern u8 gLeveledUpInBattle; -extern void (*gBattlerControllerFuncs[])(void); -extern u8 gHealthboxSpriteIds[]; +u8 gLeveledUpInBattle; +void (*gBattlerControllerFuncs[MAX_BATTLERS_COUNT])(void); +u8 gHealthboxSpriteIds[MAX_BATTLERS_COUNT]; +u8 gUnknown_0300434C[MAX_BATTLERS_COUNT]; extern u16 gBattleTypeFlags; extern u8 gReservedSpritePaletteCount; extern u16 gTrainerBattleOpponent; @@ -163,6 +166,7 @@ extern u8 gNumSafariBalls; extern u8 gUnknown_081FA70C[][3]; extern u8 gUnknown_081FA71B[]; extern u8 gUnknown_081FA71F[]; +struct BattleResults gBattleResults; void BattleMainCB1(void); static void BattlePrepIntroSlide(void); |