From 5568895b043dc37e95be0e99787541d78a7c6fee Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 3 Aug 2019 23:59:41 +0800 Subject: ported battle_ai_switch_items from pokeem --- include/battle.h | 5 ++--- include/battle_2.h | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'include') diff --git a/include/battle.h b/include/battle.h index cf975c6a5..e8731ddfb 100644 --- a/include/battle.h +++ b/include/battle.h @@ -175,9 +175,6 @@ struct TrainerMonNoItemDefaultMoves u16 species; }; -u8 AbilityBattleEffects(u8 caseID, u8 bank, u8 ability, u8 special, u16 moveArg); -u8 GetBattlerSide(u8 bank); - struct TrainerMonItemDefaultMoves { u16 iv; @@ -985,5 +982,7 @@ extern u8 gChosenMovePos; extern u8 gUnknown_3004FFC[MAX_BATTLERS_COUNT]; extern u8 gBattlerStatusSummaryTaskId[MAX_BATTLERS_COUNT]; extern u16 gDynamicBasePower; +extern u16 gLastLandedMoves[MAX_BATTLERS_COUNT]; +extern u8 gLastHitBy[MAX_BATTLERS_COUNT]; #endif // GUARD_BATTLE_H diff --git a/include/battle_2.h b/include/battle_2.h index e3caeee3d..19f59fc75 100644 --- a/include/battle_2.h +++ b/include/battle_2.h @@ -59,4 +59,6 @@ extern const u8 gStatusConditionString_LoveJpn[8]; extern const u8 * const gStatusConditionStringsTable[7][2]; +extern const u8 gTypeEffectiveness[336]; + #endif // GUARD_BATTLE_2_H -- cgit v1.2.3