Merge pull request #828 from PikalaxALT/battle_struct_macros

Battle struct macros

1 files changed, 3 insertions, 3 deletions

diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c
index 956cc2f6e..0d1a4c351 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;
 
@@ -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;
 }