diff options
| author | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
|---|---|---|
| committer | paul <nintendo6496@googlemail.com> | 2018-11-24 19:57:36 +0100 |
| commit | 4744a7d96ec21fc9480165061990ba98a774a469 (patch) | |
| tree | 0c24d7e392d5cc4302e6ed6381b2a2dc047a2b3a /include/battle.h | |
| parent | 284bbf91af43b0c9928865894cbc1d3001e57c16 (diff) | |
| parent | fecda40501d39c633435fe2777ebc93d92233ca1 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index ee707f78b..c86bc9232 100644 --- a/include/battle.h +++ b/include/battle.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_H #define GUARD_BATTLE_H +#include "global.h" + // should they be included here or included individually by every file? #include "constants/battle.h" #include "battle_util.h" @@ -602,7 +604,11 @@ struct BattleStruct u8 hpScale; u8 synchronizeMoveEffect; u8 field_B3; - void (*savedCallback)(void); + u8 field_B4; + u8 field_B5; + u8 field_B6; + u8 field_B7; + // void (*savedCallback)(void); u16 usedHeldItems[BATTLE_BANKS_COUNT]; u8 chosenItem[4]; // why is this an u8? u8 AI_itemType[2]; @@ -977,4 +983,6 @@ extern u8 gBattlersCount; extern u16 gBattlerPartyIndexes[MAX_BATTLERS_COUNT]; extern s32 gBattleMoveDamage; +extern u8 gUnknown_2023E8A; + #endif // GUARD_BATTLE_H |