diff options
| author | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
|---|---|---|
| committer | camthesaxman <cameronghall@cox.net> | 2017-07-06 19:28:57 -0500 |
| commit | 4aa1b44315ee26fa60015a99ccd51f900e5597fd (patch) | |
| tree | fdcac19f28b2e4febd96a895e72fce122b9e3b15 /src/battle_anim_8137220.c | |
| parent | ad7a7222a538380b446f9aecde44c5222ff3b68a (diff) | |
| parent | e39f55f55080108ced3ff5cb16b2181d7fec9d92 (diff) | |
fix merge conflicts
Diffstat (limited to 'src/battle_anim_8137220.c')
| -rw-r--r-- | src/battle_anim_8137220.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_anim_8137220.c b/src/battle_anim_8137220.c index 42d6cb8da..bb181d5fb 100644 --- a/src/battle_anim_8137220.c +++ b/src/battle_anim_8137220.c @@ -12,6 +12,7 @@ #include "songs.h" #include "sound.h" #include "sprite.h" +#include "item_use.h" #include "string_util.h" #include "task.h" #include "text.h" @@ -33,7 +34,6 @@ extern u8 gBattleBufferA[][0x200]; extern u8 gObjectBankIDs[]; extern MainCallback gPreBattleCallback1; extern bool8 gDoingBattleAnim; -extern u16 gScriptItemId; extern u16 gBattlePartyID[]; extern u8 gHealthboxIDs[]; extern u16 gBattleTypeFlags; |