From e6b1b97aa12ae683afbaa5b46cb27b8cdbe1448e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 12 Mar 2021 13:55:07 -0500 Subject: Nonmatching resoltuion - Fix fakematch in Cmd_get_used_held_item - Remove `static` overrides in MODERN in four objects --- src/battle_ai_script_commands.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/battle_ai_script_commands.c') diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 8dc939919..9fdd4d0c3 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -2089,12 +2089,7 @@ static void Cmd_get_used_held_item(void) else battlerId = gBattlerTarget; - // This is likely a leftover from Ruby's code and its ugly ewram access. - #ifdef NONMATCHING - AI_THINKING_STRUCT->funcResult = gBattleStruct->usedHeldItems[battlerId]; - #else - AI_THINKING_STRUCT->funcResult = *(u8*)((u8*)(gBattleStruct) + offsetof(struct BattleStruct, usedHeldItems) + (battlerId * 2)); - #endif // NONMATCHING + AI_THINKING_STRUCT->funcResult = *(u8 *)&gBattleStruct->usedHeldItems[battlerId]; gAIScriptPtr += 2; } -- cgit v1.2.3