atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1114 from ExpoSeed/doc

Browse source 
Document some battle_util.c
This commit is contained in:
GriffinR 2020-07-28 00:56:02 -04:00 committed by GitHub
commit e8568b79ef
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/battle_util.h
View file

@ -52,8 +52,8 @@ void CancelMultiTurnMoves(u8 battlerId);
bool8 WasUnableToUseMove(u8 battlerId); bool8 WasUnableToUseMove(u8 battlerId);
void PrepareStringBattle(u16 stringId, u8 battlerId); void PrepareStringBattle(u16 stringId, u8 battlerId);
void ResetSentPokesToOpponentValue(void); void ResetSentPokesToOpponentValue(void);
void sub_803F9EC(u8 battlerId); void OpponentSwitchInResetSentPokesToOpponentValue(u8 battlerId);
void sub_803FA70(u8 battlerId); void UpdateSentPokesToOpponentValue(u8 battlerId);
void BattleScriptPush(const u8* bsPtr); void BattleScriptPush(const u8* bsPtr);
void BattleScriptPushCursor(void); void BattleScriptPushCursor(void);
void BattleScriptPop(void); void BattleScriptPop(void);

2
src/battle_script_commands.c
View file

@ -5471,7 +5471,7 @@ static void Cmd_switchineffects(void)
s32 i; s32 i;
gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]); gActiveBattler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
sub_803FA70(gActiveBattler); UpdateSentPokesToOpponentValue(gActiveBattler);
gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler)); gHitMarker &= ~(HITMARKER_FAINTED(gActiveBattler));
gSpecialStatuses[gActiveBattler].flag40 = 0; gSpecialStatuses[gActiveBattler].flag40 = 0;

8
src/battle_util.c
View file

@ -259,7 +259,7 @@ void ResetSentPokesToOpponentValue(void)
gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits; gSentPokesToOpponent[(i & BIT_FLANK) >> 1] = bits;
} }
void sub_803F9EC(u8 battler) void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler)
{ {
s32 i = 0; s32 i = 0;
u32 bits = 0; u32 bits = 0;
@ -279,11 +279,11 @@ void sub_803F9EC(u8 battler)
} }
} }
void sub_803FA70(u8 battler) void UpdateSentPokesToOpponentValue(u8 battler)
{ {
if (GetBattlerSide(battler) == B_SIDE_OPPONENT) if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
{ {
sub_803F9EC(battler); OpponentSwitchInResetSentPokesToOpponentValue(battler);
} }
else else
{ {
@ -1250,7 +1250,7 @@ bool8 HandleFaintedMonActions(void)
gBattleStruct->faintedActionsState = 3; gBattleStruct->faintedActionsState = 3;
break; break;
case 2: case 2:
sub_803F9EC(gBattlerFainted); OpponentSwitchInResetSentPokesToOpponentValue(gBattlerFainted);
if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount) if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
gBattleStruct->faintedActionsState = 3; gBattleStruct->faintedActionsState = 3;
else else

2
src/pokemon.c
View file

@ -4628,7 +4628,7 @@ void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex)
gBattleMons[battlerId].statStages[i] = 6; gBattleMons[battlerId].statStages[i] = 6;
gBattleMons[battlerId].status2 = 0; gBattleMons[battlerId].status2 = 0;
sub_803FA70(battlerId); UpdateSentPokesToOpponentValue(battlerId);
ClearTemporarySpeciesSpriteData(battlerId, FALSE); ClearTemporarySpeciesSpriteData(battlerId, FALSE);
} }