diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-10-09 13:32:26 -0500 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-10-09 13:32:26 -0500 |
| commit | 41db0259759c8e4c3c31c5cf09daed9f85ab5b63 (patch) | |
| tree | ab77e37580ab0eb0ee18c28f749d8c8da15dbcf7 /src/battle_ai_script_commands.c | |
| parent | ae06c13e99162cebd3617f5aafb135bdd8b3f237 (diff) | |
| parent | 96c5966ff3676eb1b3463808b83b42e13e1591fd (diff) | |
Merge remote-tracking branch 'pret/master' into baserom_extraction
Diffstat (limited to 'src/battle_ai_script_commands.c')
| -rw-r--r-- | src/battle_ai_script_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index dae43f13c..92126e40c 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -73,7 +73,7 @@ extern const struct BaseStats gBaseStats[]; extern const u32 gBitTable[]; extern u8 * const gBattleAI_ScriptsTable[]; -extern u8 b_first_side(u8, u8, u8); +extern u8 GetWhoStrikesFirst(u8, u8, u8); extern void AI_CalcDmg(u8, u8); extern u8 CheckMoveLimitations(); @@ -1756,7 +1756,7 @@ static void BattleAICmd_if_arg_not_equal(void) static void BattleAICmd_if_would_go_first(void) { - if (b_first_side(sBank_AI, gBankTarget, 1) == gAIScriptPtr[1]) + if (GetWhoStrikesFirst(sBank_AI, gBankTarget, 1) == gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; @@ -1764,7 +1764,7 @@ static void BattleAICmd_if_would_go_first(void) static void BattleAICmd_if_would_not_go_first(void) { - if (b_first_side(sBank_AI, gBankTarget, 1) != gAIScriptPtr[1]) + if (GetWhoStrikesFirst(sBank_AI, gBankTarget, 1) != gAIScriptPtr[1]) gAIScriptPtr = AIScriptReadPtr(gAIScriptPtr + 2); else gAIScriptPtr += 6; |