diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-12-05 12:05:06 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-12-05 12:05:06 -0600 |
| commit | fd75493bc6f4a3c91158d8158edbb4cf964d08bc (patch) | |
| tree | e7bd995f2647be3ae049d643814fa0377be2366d /src/battle_util2.c | |
| parent | 7597433af6bb89986cf7c69617923cabcbec17c1 (diff) | |
| parent | 790df7159ec26194a71ed57216de27358999a061 (diff) | |
Merge pull request #129 from DizzyEggg/dumb_naming
Name some battle labels
Diffstat (limited to 'src/battle_util2.c')
| -rw-r--r-- | src/battle_util2.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c index e119c85d7..4854bb5bb 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -6,19 +6,15 @@ #include "event_data.h" #include "abilities.h" #include "rng.h" +#include "battle_scripts.h" extern struct BattlePokemon gBattleMons[BATTLE_BANKS_COUNT]; extern u16 gBattlePartyID[BATTLE_BANKS_COUNT]; extern u8 gUnknown_0203CF00[]; -extern const u8* gBattlescriptCurrInstr; +extern const u8 *gBattlescriptCurrInstr; extern u8 gBattleCommunication[]; extern u8 gActiveBank; -extern const u8 BattleScript_MoveUsedWokeUp[]; -extern const u8 BattleScript_MoveUsedIsFrozen[]; -extern const u8 BattleScript_MoveUsedUnfroze[]; -extern const u8 BattleScript_MoveUsedIsAsleep[]; - extern void sub_81D55D0(void); extern void sub_81D5694(void); extern u8 pokemon_order_func(u8); |