From 045331d139f04169df59f4550fd2f5fadac14a58 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Tue, 30 Jul 2019 02:54:50 +0800 Subject: ported battle_controllers from pokeem --- include/battle_ai_script_commands.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include/battle_ai_script_commands.h') diff --git a/include/battle_ai_script_commands.h b/include/battle_ai_script_commands.h index 3786d4a8c..12df776be 100644 --- a/include/battle_ai_script_commands.h +++ b/include/battle_ai_script_commands.h @@ -3,9 +3,7 @@ #include "global.h" -extern u8 sBattler_AI; - -void BattleAI_HandleItemUseBeforeAISetup(u8 defaultScoreMoves); +void BattleAI_HandleItemUseBeforeAISetup(void); void BattleAI_SetupAIData(u8 defaultScoreMoves); u8 BattleAI_ChooseMoveOrAction(void); void ClearBankMoveHistory(u8 bank); -- cgit v1.2.3 From 6a063cf74ad8168e9080c1f3be20e5dfe3c3187c Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 3 Aug 2019 06:55:42 +0800 Subject: ported battle_controller_opponent from pokeem and corrected lots of stuff --- include/battle_ai_script_commands.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include/battle_ai_script_commands.h') diff --git a/include/battle_ai_script_commands.h b/include/battle_ai_script_commands.h index 12df776be..aa51838e5 100644 --- a/include/battle_ai_script_commands.h +++ b/include/battle_ai_script_commands.h @@ -3,13 +3,19 @@ #include "global.h" +// return values for BattleAI_ChooseMoveOrAction +// 0 - 3 are move idx +#define AI_CHOICE_FLEE 4 +#define AI_CHOICE_WATCH 5 + void BattleAI_HandleItemUseBeforeAISetup(void); -void BattleAI_SetupAIData(u8 defaultScoreMoves); +void BattleAI_SetupAIData(void); u8 BattleAI_ChooseMoveOrAction(void); void ClearBankMoveHistory(u8 bank); void RecordAbilityBattle(u8 bank, u8 abilityId); void ClearBankAbilityHistory(u8 bank); void RecordItemEffectBattle(u8 bank, u8 itemEffect); void ClearBankItemEffectHistory(u8 bank); +u8 BattleAI_GetAIActionToUse(void); #endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H -- cgit v1.2.3 From 8fed9a5f205cec0d86149a908d64f73316cbb1f4 Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Sat, 3 Aug 2019 07:44:51 +0800 Subject: quick review on battle_ai_script_commands --- include/battle_ai_script_commands.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/battle_ai_script_commands.h') diff --git a/include/battle_ai_script_commands.h b/include/battle_ai_script_commands.h index aa51838e5..94cbcce15 100644 --- a/include/battle_ai_script_commands.h +++ b/include/battle_ai_script_commands.h @@ -16,6 +16,6 @@ void RecordAbilityBattle(u8 bank, u8 abilityId); void ClearBankAbilityHistory(u8 bank); void RecordItemEffectBattle(u8 bank, u8 itemEffect); void ClearBankItemEffectHistory(u8 bank); -u8 BattleAI_GetAIActionToUse(void); +u8 BattleAI_ChooseMoveOrAction(void); #endif // GUARD_BATTLE_AI_SCRIPT_COMMANDS_H -- cgit v1.2.3