diff options
| author | Revo <projectrevotpp@hotmail.com> | 2019-07-28 20:00:05 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-28 20:00:05 -0400 |
| commit | e8dda92d7b30268bf2716b0756952510850b0416 (patch) | |
| tree | 1324fb228da632487e982a18d174672e4daeb8c5 /include | |
| parent | bc09f81a9a6a8280480a08e0daf33541ba255fb4 (diff) | |
| parent | 6c9a6289921373944f3e1f0af711bdf12a5e0f89 (diff) | |
Merge pull request #748 from camthesaxman/match_atk49_moveend
match atk49_moveend
Diffstat (limited to 'include')
| -rw-r--r-- | include/battle.h | 4 | ||||
| -rw-r--r-- | include/constants/battle.h (renamed from include/constants/battle_constants.h) | 0 |
2 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; diff --git a/include/constants/battle_constants.h b/include/constants/battle.h index afa7fecf1..afa7fecf1 100644 --- a/include/constants/battle_constants.h +++ b/include/constants/battle.h |