diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-27 23:40:52 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-28 14:57:16 +0800 |
| commit | 2bd15329e07a23d3515dc1c9c9e5d8f75d3be429 (patch) | |
| tree | 328cff8ee72211ef3566d2fcdb88d1fbc7c95387 /src/battle_ai_script_commands.c | |
| parent | b2343076db0cefc087f3941b6941dcba7b1e3364 (diff) | |
minor fixes
and remove unnecessary NONMATCHING
Diffstat (limited to 'src/battle_ai_script_commands.c')
| -rw-r--r-- | src/battle_ai_script_commands.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 55d135a4e..c57825b4f 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -21,8 +21,8 @@ #define AI_ACTION_UNK7 0x0040 #define AI_ACTION_UNK8 0x0080 -#define AI_THINKING_STRUCT ((struct AI_ThinkingStruct *)(gBattleResources->ai)) -#define BATTLE_HISTORY ((struct BattleHistory *)(gBattleResources->battleHistory)) +#define AI_THINKING_STRUCT (gBattleResources->ai) +#define BATTLE_HISTORY (gBattleResources->battleHistory) // AI states enum @@ -1808,14 +1808,8 @@ static void BattleAICmd_get_used_held_item(void) battlerId = gBattlerAttacker; 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 * 2]; gAIScriptPtr += 2; } |