diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-30 12:10:40 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-07-31 07:58:09 +0800 |
| commit | 035df4d7a4a2782cf7bc3789f56471a03ffbfca0 (patch) | |
| tree | 6ea7b0b47fe99c7c1d6ef25afa8ba3b9668b9eb9 /src | |
| parent | 1f986e65435c10f3d62b3777beb8acf712dcbbf2 (diff) | |
ported documentation of battle_util.s
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_ai_script_commands.c | 6 | ||||
| -rw-r--r-- | src/pokemon.c | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_ai_script_commands.c b/src/battle_ai_script_commands.c index 86e7d3143..1c281e853 100644 --- a/src/battle_ai_script_commands.c +++ b/src/battle_ai_script_commands.c @@ -252,7 +252,7 @@ static const u16 sDiscouragedPowerfulMoveEffects[] = extern u8 gBattlerAttacker; extern const u32 gBitTable[]; // util.h extern u32 gStatuses3[]; // battle_2.h -extern u16 gSideAffecting[2]; +extern u16 gSideStatuses[2]; extern const struct BattleMove gBattleMoves[]; extern u16 gDynamicBasePower; extern u8 gMoveResultFlags; @@ -720,7 +720,7 @@ static void BattleAICmd_if_status4(void) arg1 = GetBattlerPosition(index) & 1; arg2 = T1_READ_32(gAIScriptPtr + 2); - if ((gSideAffecting[arg1] & arg2) != 0) + if ((gSideStatuses[arg1] & arg2) != 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; @@ -739,7 +739,7 @@ static void BattleAICmd_if_not_status4(void) arg1 = GetBattlerPosition(index) & 1; arg2 = T1_READ_32(gAIScriptPtr + 2); - if ((gSideAffecting[arg1] & arg2) == 0) + if ((gSideStatuses[arg1] & arg2) == 0) gAIScriptPtr = T1_READ_PTR(gAIScriptPtr + 6); else gAIScriptPtr += 10; diff --git a/src/pokemon.c b/src/pokemon.c index ffe407daf..d75650d91 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4170,7 +4170,7 @@ bool8 PokemonUseItemEffects(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 mo r5 = gActiveBattler; gActiveBattler = sp34; BtlController_EmitGetMonData(0, 0, 0); - MarkBufferBankForExecution(gActiveBattler); + MarkBattlerForControllerExec(gActiveBattler); gActiveBattler = r5; } } @@ -4709,7 +4709,7 @@ bool8 PokemonUseItemEffects2(struct Pokemon *pkmn, u16 item, u8 partyIndex, u8 m r5 = gActiveBattler; gActiveBattler = sp34; BtlController_EmitGetMonData(0, 0, 0); - MarkBufferBankForExecution(gActiveBattler); + MarkBattlerForControllerExec(gActiveBattler); gActiveBattler = r5; } } |