From 04cebed982761a1e21ed94ae81d0222cf31819ec Mon Sep 17 00:00:00 2001 From: Pawkkie <61265402+Pawkkie@users.noreply.github.com> Date: Fri, 9 May 2025 06:32:22 -0400 Subject: [PATCH] Fix AI function table to match new u64 flags (#6796) --- src/battle_ai_main.c | 66 ++++++++++++++++++++++++++++++++------------ 1 file changed, 49 insertions(+), 17 deletions(-) diff --git a/src/battle_ai_main.c b/src/battle_ai_main.c index e506dbc742..20820cbcc6 100644 --- a/src/battle_ai_main.c +++ b/src/battle_ai_main.c @@ -74,26 +74,58 @@ static s32 (*const sBattleAiFuncTable[])(u32, u32, u32, s32) = [9] = AI_PowerfulStatus, // AI_FLAG_POWERFUL_STATUS [10] = NULL, // AI_FLAG_NEGATE_UNAWARE [11] = NULL, // AI_FLAG_WILL_SUICIDE - [12] = NULL, // Unused - [13] = NULL, // Unused - [14] = NULL, // Unused - [15] = NULL, // Unused - [16] = NULL, // Unused - [17] = NULL, // Unused - [18] = NULL, // Unused - [19] = NULL, // Unused - [20] = NULL, // Unused - [21] = NULL, // Unused - [22] = NULL, // Unused + [12] = NULL, // AI_FLAG_PREFER_STATUS_MOVES + [13] = NULL, // AI_FLAG_STALL + [14] = NULL, // AI_FLAG_SMART_SWITCHING + [15] = NULL, // AI_FLAG_ACE_POKEMON + [16] = NULL, // AI_FLAG_OMNISCIENT + [17] = NULL, // AI_FLAG_SMART_MON_CHOICES + [18] = NULL, // AI_FLAG_CONSERVATIVE + [19] = NULL, // AI_FLAG_SEQUENCE_SWITCHING + [20] = NULL, // AI_FLAG_DOUBLE_ACE_POKEMON + [21] = NULL, // AI_FLAG_WEIGH_ABILITY_PREDICTION + [22] = NULL, // AI_FLAG_PREFER_HIGHEST_DAMAGE_MOVE [23] = AI_PredictSwitch, // AI_FLAG_PREDICT_SWITCH - [24] = NULL, // Unused + [24] = NULL, // AI_FLAG_PREDICT_INCOMING_MON [25] = AI_CheckPpStall, // AI_FLAG_PP_STALL_PREVENTION - [26] = NULL, // Unused + [26] = NULL, // AI_FLAG_PREDICT_MOVE [27] = NULL, // Unused - [28] = AI_DynamicFunc, // AI_FLAG_DYNAMIC_FUNC - [29] = AI_Roaming, // AI_FLAG_ROAMING - [30] = AI_Safari, // AI_FLAG_SAFARI - [31] = AI_FirstBattle, // AI_FLAG_FIRST_BATTLE + [28] = NULL, // Unused + [29] = NULL, // Unused + [30] = NULL, // Unused + [31] = NULL, // Unused + [32] = NULL, // Unused + [33] = NULL, // Unused + [34] = NULL, // Unused + [35] = NULL, // Unused + [36] = NULL, // Unused + [37] = NULL, // Unused + [38] = NULL, // Unused + [39] = NULL, // Unused + [40] = NULL, // Unused + [41] = NULL, // Unused + [42] = NULL, // Unused + [43] = NULL, // Unused + [44] = NULL, // Unused + [45] = NULL, // Unused + [46] = NULL, // Unused + [47] = NULL, // Unused + [48] = NULL, // Unused + [49] = NULL, // Unused + [50] = NULL, // Unused + [51] = NULL, // Unused + [52] = NULL, // Unused + [53] = NULL, // Unused + [54] = NULL, // Unused + [55] = NULL, // Unused + [56] = NULL, // Unused + [57] = NULL, // Unused + [58] = NULL, // Unused + [59] = NULL, // Unused + [60] = AI_DynamicFunc, // AI_FLAG_DYNAMIC_FUNC + [61] = AI_Roaming, // AI_FLAG_ROAMING + [62] = AI_Safari, // AI_FLAG_SAFARI + [63] = AI_FirstBattle, // AI_FLAG_FIRST_BATTLE }; // Functions