ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-06 09:33:22 +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;
}
else if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1
|| (gSpecialStatuses[gBattlerAttacker].multiHitOn && (gBattleMoves[move].effect != EFFECT_TRIPLE_KICK
|| GetBattlerAbility(gBattlerAttacker) == ABILITY_SKILL_LINK)))
|| (gSpecialStatuses[gBattlerAttacker].multiHitOn && (gBattleMoves[move].effect != EFFECT_TRIPLE_KICK
|| GetBattlerAbility(gBattlerAttacker) == ABILITY_SKILL_LINK)))
{
// No acc checks for second hit of Parental Bond or multi hit moves, except Triple Kick/Triple Axel
gBattlescriptCurrInstr += 7;
@ -2078,8 +2078,8 @@ static void Cmd_attackanimation(void)
{
if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1) // No animation on second hit
{
gBattlescriptCurrInstr++;
return;
gBattlescriptCurrInstr++;
return;
}
if ((gBattleMoves[gCurrentMove].target & MOVE_TARGET_BOTH
@ -5162,9 +5162,9 @@ static void Cmd_moveend(void)
gBattleScripting.multihitString[4]++;
if (--gMultiHitCounter == 0)
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
effect = 1;
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
effect = 1;
}
else
{
@ -5176,7 +5176,7 @@ static void Cmd_moveend(void)
if (gBattleMons[gBattlerAttacker].hp
&& gBattleMons[gBattlerTarget].hp
&& (gChosenMove == MOVE_SLEEP_TALK || !(gBattleMons[gBattlerAttacker].status1 & STATUS1_SLEEP))
&& !(gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE))
&& !(gBattleMons[gBattlerAttacker].status1 & STATUS1_FREEZE))
{
if (gSpecialStatuses[gBattlerAttacker].parentalBondOn)
gSpecialStatuses[gBattlerAttacker].parentalBondOn--;
@ -5187,14 +5187,14 @@ static void Cmd_moveend(void)
gSpecialStatuses[gBattlerAttacker].multiHitOn = TRUE;
MoveValuesCleanUp();
BattleScriptPush(gBattleScriptsForMoveEffects[gBattleMoves[gCurrentMove].effect]);
gBattlescriptCurrInstr = BattleScript_FlushMessageBox;
return;
gBattlescriptCurrInstr = BattleScript_FlushMessageBox;
return;
}
else
{
BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
effect = 1;
gBattlescriptCurrInstr = BattleScript_MultiHitPrintStrings;
effect = 1;
}
}
}
@ -13124,24 +13124,24 @@ static bool32 CriticalCapture(u32 odds)
bool8 IsMoveAffectedByParentalBond(u16 move, u8 battlerId)
{
if (gBattleMoves[move].split != SPLIT_STATUS && !(sForbiddenMoves[move] & FORBIDDEN_PARENTAL_BOND))
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
switch (gBattleMoves[move].target)
{
if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE)
{
switch (gBattleMoves[move].target)
{
case MOVE_TARGET_BOTH:
if (CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) >= 2) // Check for single target
return FALSE;
break;
case MOVE_TARGET_FOES_AND_ALLY:
if (CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) >= 2) // Count mons on both sides; ignore attacker
return FALSE;
break;
}
}
case MOVE_TARGET_BOTH:
if (CountAliveMonsInBattle(BATTLE_ALIVE_DEF_SIDE) >= 2) // Check for single target
return FALSE;
break;
case MOVE_TARGET_FOES_AND_ALLY:
if (CountAliveMonsInBattle(BATTLE_ALIVE_EXCEPT_ACTIVE) >= 2) // Count mons on both sides; ignore attacker
return FALSE;
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))
{
gMultiHitCounter = 2;
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
if (gCurrentMove == MOVE_DRAGON_DARTS)
{
// TODO
@ -3509,7 +3509,7 @@ u8 AtkCanceller_UnableToUseMove(void)
else if (gBattleMoves[gCurrentMove].effect == EFFECT_TRIPLE_KICK || gCurrentMove == MOVE_SURGING_STRIKES)
{
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
else if (gBattleMoves[gCurrentMove].effect == EFFECT_BEAT_UP)
@ -3523,16 +3523,16 @@ u8 AtkCanceller_UnableToUseMove(void)
party = gEnemyParty;
for (i = 0; i < PARTY_SIZE; i++)
{
if (GetMonData(&party[i], MON_DATA_HP)
&& GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE
&& !GetMonData(&party[i], MON_DATA_IS_EGG)
&& !GetMonData(&party[i], MON_DATA_STATUS))
gMultiHitCounter++;
}
{
if (GetMonData(&party[i], MON_DATA_HP)
&& GetMonData(&party[i], MON_DATA_SPECIES) != SPECIES_NONE
&& !GetMonData(&party[i], MON_DATA_IS_EGG)
&& !GetMonData(&party[i], MON_DATA_STATUS))
gMultiHitCounter++;
}
gBattleCommunication[0] = 0; // For later
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
gBattleCommunication[0] = 0; // For later
PREPARE_BYTE_NUMBER_BUFFER(gBattleScripting.multihitString, 1, 0)
}
#endif
gBattleStruct->atkCancellerTracker++;
@ -8309,13 +8309,13 @@ static u32 CalcFinalDmg(u32 dmg, u16 move, u8 battlerAtk, u8 battlerDef, u8 move
}
// Parental Bond Second Strike
if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1)
{
if (B_PARENTAL_BOND_DAMAGE < GEN_7)
MulModifier(&finalModifier, UQ_4_12(0.5));
else
MulModifier(&finalModifier, UQ_4_12(0.25));
}
if (gSpecialStatuses[gBattlerAttacker].parentalBondOn == 1)
{
if (B_PARENTAL_BOND_DAMAGE < GEN_7)
MulModifier(&finalModifier, UQ_4_12(0.5));
else
MulModifier(&finalModifier, UQ_4_12(0.25));
}
// attacker's abilities
switch (abilityAtk)