Cloyir/pokeemmo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix naming style of function

Browse Source
This commit is contained in:
ExpoSeed 2020-07-27 21:22:16 -05:00
parent 71dc5edf2e
commit b401e2eb86
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_util.h
View File

@ -52,7 +52,7 @@ 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 OpponentSwitchInResetSentPokesToOpponent(u8 battlerId); void OpponentSwitchInResetSentPokesToOpponentValue(u8 battlerId);
void UpdateSentPokesToOpponentValue(u8 battlerId); void UpdateSentPokesToOpponentValue(u8 battlerId);
void BattleScriptPush(const u8* bsPtr); void BattleScriptPush(const u8* bsPtr);
void BattleScriptPushCursor(void); void BattleScriptPushCursor(void);

6
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 OpponentSwitchInResetSentPokesToOpponent(u8 battler) void OpponentSwitchInResetSentPokesToOpponentValue(u8 battler)
{ {
s32 i = 0; s32 i = 0;
u32 bits = 0; u32 bits = 0;
@ -283,7 +283,7 @@ void UpdateSentPokesToOpponentValue(u8 battler)
{ {
if (GetBattlerSide(battler) == B_SIDE_OPPONENT) if (GetBattlerSide(battler) == B_SIDE_OPPONENT)
{ {
OpponentSwitchInResetSentPokesToOpponent(battler); OpponentSwitchInResetSentPokesToOpponentValue(battler);
} }
else else
{ {
@ -1250,7 +1250,7 @@ bool8 HandleFaintedMonActions(void)
gBattleStruct->faintedActionsState = 3; gBattleStruct->faintedActionsState = 3;
break; break;
case 2: case 2:
OpponentSwitchInResetSentPokesToOpponent(gBattlerFainted); OpponentSwitchInResetSentPokesToOpponentValue(gBattlerFainted);
if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount) if (++gBattleStruct->faintedActionsBattlerId == gBattlersCount)
gBattleStruct->faintedActionsState = 3; gBattleStruct->faintedActionsState = 3;
else else