From 7929bdf80b174f31c512970b2fa64652f222a09b Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 29 Jun 2021 21:13:37 -0400 Subject: Merge several EWRAM definitions into gBattleStruct --- src/battle_ai_script_commands.c | 4 ++-- 1 file changed, 2 insertions(+), 2 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 956cc2f6e..9f0cc406d 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -957,8 +957,8 @@ static void BattleAICmd_is_most_powerful_move(void) && sDiscouragedPowerfulMoveEffects[i] == 0xFFFF) { gDynamicBasePower = 0; - eDynamicMoveType = 0; - eDmgMultiplier = 1; + gBattleStruct->dynamicMoveType = 0; + gBattleStruct->dmgMultiplier = 1; gMoveResultFlags = 0; gCritMultiplier = 1; -- cgit v1.2.3 From fe2897c8a49579e6aac147d5d365b7fa6c6cdb72 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 29 Jun 2021 21:31:19 -0400 Subject: Define BSTRUCT_OFF for gBattleStruct macro hacks --- src/battle_ai_script_commands.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (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 9f0cc406d..0d1a4c351 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -1758,7 +1758,7 @@ static void BattleAICmd_get_used_item(void) else index = gBattlerTarget; - AI_THINKING_STRUCT->funcResult = AI_ARRAY_160CC(index); + AI_THINKING_STRUCT->funcResult = gSharedMem[offsetof(struct BattleStruct, usedHeldItems) + 2 * index]; gAIScriptPtr += 2; } -- cgit v1.2.3