dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ported documentation of battle_util.s

Browse Source
This commit is contained in:
jiangzhengwenjz
2019-07-30 12:10:40 +08:00
parent 1f986e6543
commit 035df4d7a4
12 changed files with 2910 additions and 2910 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/battle_ai_script_commands.c
+3 -3
View File
@@ -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;
src/pokemon.c
+2 -2
View File
@@ -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;
}
}