diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-29 09:46:02 -0400 |
| commit | 78535eea89e8b71f37e188289793e3e18c9bb985 (patch) | |
| tree | c3d7ec29b849e810cc6bc90827f9053a4f486b64 /include/battle.h | |
| parent | f4e6816db9622dfa93466138ed075075009295b8 (diff) | |
| parent | 3f477dae36c99bcb03a38be251dbef2f7e344ebc (diff) | |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'include/battle.h')
| -rw-r--r-- | include/battle.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/battle.h b/include/battle.h index a799f8360..78b9d13de 100644 --- a/include/battle.h +++ b/include/battle.h @@ -2,7 +2,7 @@ #define GUARD_BATTLE_H #include "sprite.h" -#include "constants/battle_constants.h" +#include "constants/battle.h" #include "battle_setup.h" #define GET_BATTLER_POSITION(bank)((gBattlerPositions[bank])) @@ -762,6 +762,8 @@ extern u16 gBattle_WIN0V; extern u16 gBattle_WIN1H; extern u16 gBattle_WIN1V; +extern u8 gLastHitBy[MAX_BATTLERS_COUNT]; + extern u8 gDisplayedStringBattle[]; extern u16 gBattleTypeFlags; |