diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-07-23 15:48:11 -0400 |
| commit | 0352a72d2ef5f820d6e8c4ad1806f5a8128b6d2f (patch) | |
| tree | 1cda7283e7e7ac4678a14843a30d2519a37d3b34 /include/battle_2.h | |
| parent | e3993e2b34282933f149b85a4cfe7f45e051b504 (diff) | |
| parent | e4acfdf20b7d56b83cee6f4e49b257a2ecb92a95 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered
Diffstat (limited to 'include/battle_2.h')
| -rw-r--r-- | include/battle_2.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/battle_2.h b/include/battle_2.h index 1f7a2304d..02050afd9 100644 --- a/include/battle_2.h +++ b/include/battle_2.h @@ -2,6 +2,7 @@ #define GUARD_BATTLE_2_H #include "global.h" +#include "sprite.h" void CB2_InitBattle(void); void BattleMainCB2(void); @@ -44,6 +45,7 @@ void RunBattleScriptCommands_PopCallbacksStack(void); void RunBattleScriptCommands(void); bool8 TryRunFromBattle(u8 bank); void sub_800FD9C(void); +void sub_80120C4(struct Sprite *); extern const u8 gStatusConditionString_PoisonJpn[8]; extern const u8 gStatusConditionString_SleepJpn[8]; |