ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-07 18:13:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Replace tabs with spaces

Browse Source
This commit is contained in:
BuffelSaft 2021-09-23 16:55:05 +12:00
parent 530998c4b7
commit f49a486a8c
2 changed files with 47 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/battle_script_commands.c
View File

@ -1729,8 +1729,8 @@ static void Cmd_accuracycheck(void)
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
} }
else if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1 else if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1
|| (gSpecialStatuses[gBattlerAttacker].multiHitOn && (gBattleMoves[move].effect != EFFECT_TRIPLE_KICK || (gSpecialStatuses[gBattlerAttacker].multiHitOn && (gBattleMoves[move].effect != EFFECT_TRIPLE_KICK
|| GetBattlerAbility(gBattlerAttacker) == ABILITY_SKILL_LINK))) || GetBattlerAbility(gBattlerAttacker) == ABILITY_SKILL_LINK)))
{ {
// No acc checks for second hit of Parental Bond or multi hit moves, except Triple Kick/Triple Axel // No acc checks for second hit of Parental Bond or multi hit moves, except Triple Kick/Triple Axel
gBattlescriptCurrInstr += 7; gBattlescriptCurrInstr += 7;
@ -2078,8 +2078,8 @@ static void Cmd_attackanimation(void)
{ {
if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1) // No animation on second hit if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1) // No animation on second hit
{ {
gBattlescriptCurrInstr++; gBattlescriptCurrInstr++;
return; return;
} }
if ((gBattleMoves[gCurrentMove].target & MOVE_TARGET_BOTH if ((gBattleMoves[gCurrentMove].target & MOVE_TARGET_BOTH
@ -5162,9 +5162,9 @@ static void Cmd_moveend(void)
gBattleScripting.multihitString[4]++; gBattleScripting.multihitString[4]++;
if (--gMultiHitCounter == 0) if (--gMultiHitCounter == 0)
{ {
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings; gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
effect = 1; effect = 1;
} }
else else
{ {
@ -5176,7 +5176,7 @@ static void Cmd_moveend(void)
if (gBattleMons[gBattlerAttacker].hp if (gBattleMons[gBattlerAttacker].hp
&& gBattleMons[gBattlerTarget].hp && gBattleMons[gBattlerTarget].hp
&& (gChosenMove == MOVE_SLEEP_TALK || !(gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP)) && (gChosenMove == MOVE_SLEEP_TALK || !(gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP))
&& !(gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE)) && !(gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE))
{ {
if (gSpecialStatuses[gBattlerAttacker].parentalBondOn) if (gSpecialStatuses[gBattlerAttacker].parentalBondOn)
gSpecialStatuses[gBattlerAttacker].parentalBondOn--; gSpecialStatuses[gBattlerAttacker].parentalBondOn--;
@ -5187,14 +5187,14 @@ static void Cmd_moveend(void)
gSpecialStatuses[gBattlerAttacker].multiHitOn = TRUE; gSpecialStatuses[gBattlerAttacker].multiHitOn = TRUE;
MoveValuesCleanUp(); MoveValuesCleanUp();
BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]); BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
gBattlescriptCurrInstr = BattleScript_FlushMessageBox; gBattlescriptCurrInstr = BattleScript_FlushMessageBox;
return; return;
} }
else else
{ {
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings; gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
effect = 1; effect = 1;
} }
} }
} }
@ -13124,24 +13124,24 @@ static bool32 CriticalCapture(u32 odds)
bool8 IsMoveAffectedByParentalBond(u16 move, u8 battlerId) bool8 IsMoveAffectedByParentalBond(u16 move, u8 battlerId)
{ {
if (gBattleMoves[move].split != SPLIT_STATUS && !(sForbiddenMoves[move] & FORBIDDEN_PARENTAL_BOND)) if (gBattleMoves[move].split != SPLIT_STATUS && !(sForbiddenMoves[move] & FORBIDDEN_PARENTAL_BOND))
{ {
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{ {
switch (gBattleMoves[move].target) switch (gBattleMoves[move].target)
{ {
case MOVE_TARGET_BOTH: case MOVE_TARGET_BOTH:
if (CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) >= 2) // Check for single target if (CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) >= 2) // Check for single target
return FALSE; return FALSE;
break; break;
case MOVE_TARGET_FOES_AND_ALLY: case MOVE_TARGET_FOES_AND_ALLY:
if (CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) >= 2) // Count mons on both sides; ignore attacker if (CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) >= 2) // Count mons on both sides; ignore attacker
return FALSE; return FALSE;
break; break;
} }
} }
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
} }

36
src/battle_util.c
View File

@ -3500,7 +3500,7 @@ u8 AtkCanceller_UnableToUseMove(void)
else if (IsTwoStrikesMove(gCurrentMove)) else if (IsTwoStrikesMove(gCurrentMove))
{ {
gMultiHitCounter = 2; gMultiHitCounter = 2;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0) PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
if (gCurrentMove == MOVE_DRAGON_DARTS) if (gCurrentMove == MOVE_DRAGON_DARTS)
{ {
// TODO // TODO
@ -3509,7 +3509,7 @@ u8 AtkCanceller_UnableToUseMove(void)
else if (gBattleMoves[gCurrentMove].effect == EFFECT_TRIPLE_KICK || gCurrentMove == MOVE_SURGING_STRIKES) else if (gBattleMoves[gCurrentMove].effect == EFFECT_TRIPLE_KICK || gCurrentMove == MOVE_SURGING_STRIKES)
{ {
gMultiHitCounter = 3; gMultiHitCounter = 3;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0) PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
} }
#if B_BEAT_UP_DMG >= GEN_5 #if B_BEAT_UP_DMG >= GEN_5
else if (gBattleMoves[gCurrentMove].effect == EFFECT_BEAT_UP) else if (gBattleMoves[gCurrentMove].effect == EFFECT_BEAT_UP)
@ -3523,16 +3523,16 @@ u8 AtkCanceller_UnableToUseMove(void)
party = gEnemyParty; party = gEnemyParty;
for (i = 0; i < PARTY_SIZE; i++) for (i = 0; i < PARTY_SIZE; i++)
{ {
if (GetMonData(&party[i], MON_DATA_HP) if (GetMonData(&party[i], MON_DATA_HP)
&& GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE && GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE
&& !GetMonData(&party[i], MON_DATA_IS_EGG) && !GetMonData(&party[i], MON_DATA_IS_EGG)
&& !GetMonData(&party[i], MON_DATA_STATUS)) && !GetMonData(&party[i], MON_DATA_STATUS))
gMultiHitCounter++; gMultiHitCounter++;
} }
gBattleCommunication[0] = 0; // For later gBattleCommunication[0] = 0; // For later
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0) PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
} }
#endif #endif
gBattleStruct->atkCancellerTracker++; gBattleStruct->atkCancellerTracker++;
@ -8309,13 +8309,13 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move
} }
// Parental Bond Second Strike // Parental Bond Second Strike
if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1) if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1)
{ {
if (B_PARENTAL_BOND_DAMAGE < GEN_7) if (B_PARENTAL_BOND_DAMAGE < GEN_7)
MulModifier(&finalModifier, UQ_4_12(0.5)); MulModifier(&finalModifier, UQ_4_12(0.5));
else else
MulModifier(&finalModifier, UQ_4_12(0.25)); MulModifier(&finalModifier, UQ_4_12(0.25));
} }
// attacker's abilities // attacker's abilities
switch (abilityAtk) switch (abilityAtk)