diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-16 11:27:10 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-12-16 11:27:10 -0500 |
| commit | 190a2cba61c498eb258dc5743ba613168f15f677 (patch) | |
| tree | 090781e56a9f32c0582bd56d167cc0d69a8d88f5 /src/battle_util2.c | |
| parent | b1c6f80e10ca18d18ca11091449a9969e2b9aa05 (diff) | |
| parent | 224fdbf026cfb0ff88aac519875a39fb038e4bb1 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'src/battle_util2.c')
| -rw-r--r-- | src/battle_util2.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/battle_util2.c b/src/battle_util2.c index e119c85d7..538c1c641 100644 --- a/src/battle_util2.c +++ b/src/battle_util2.c @@ -4,21 +4,17 @@ #include "malloc.h" #include "pokemon.h" #include "event_data.h" -#include "abilities.h" -#include "rng.h" +#include "constants/abilities.h" +#include "random.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); |