ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-06 11:40:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

format fixes

Browse Source
This commit is contained in:
ghoulslash 2021-09-16 17:10:41 -04:00
parent 801ba039d6
commit 806be64935
2 changed files with 9 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_script_commands.c
View File

@ -4913,7 +4913,7 @@ static void Cmd_moveend(void)
else else
gBattleScripting.moveendState++; gBattleScripting.moveendState++;
break; break;
case MOVEEND_KINGSROCK: // King's rock and shell bell case MOVEEND_KINGSROCK: // King's rock
// These effects will occur at each hit in a multi-strike move // These effects will occur at each hit in a multi-strike move
if (ItemBattleEffects(ITEMEFFECT_KINGSROCK, 0, FALSE)) if (ItemBattleEffects(ITEMEFFECT_KINGSROCK, 0, FALSE))
effect = TRUE; effect = TRUE;
@ -9500,7 +9500,6 @@ static void Cmd_forcerandomswitch(void)
} }
} }
// Swapping pokemon happens in: // Swapping pokemon happens in:
// trainer battles // trainer battles
// wild double battles when an opposing pokemon uses it against one of the two alive player mons // wild double battles when an opposing pokemon uses it against one of the two alive player mons
@ -9516,7 +9515,6 @@ static void Cmd_forcerandomswitch(void)
|| redCardForcedSwitch || redCardForcedSwitch
) )
{ {
if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER) if (GetBattlerSide(gBattlerTarget) == B_SIDE_PLAYER)
party = gPlayerParty; party = gPlayerParty;
else else

25
src/battle_util.c
View File

@ -5491,7 +5491,6 @@ static u8 RandomStatRaiseBerry(u32 battlerId, u32 itemId, bool32 end2)
PREPARE_STAT_BUFFER(gBattleTextBuff1, i + 1); PREPARE_STAT_BUFFER(gBattleTextBuff1, i + 1);
stringId = (GetBattlerAbility(battlerId) == ABILITY_CONTRARY) ? STRINGID_STATFELL : STRINGID_STATROSE; stringId = (GetBattlerAbility(battlerId) == ABILITY_CONTRARY) ? STRINGID_STATFELL : STRINGID_STATROSE;
gBattleTextBuff2[0] = B_BUFF_PLACEHOLDER_BEGIN; gBattleTextBuff2[0] = B_BUFF_PLACEHOLDER_BEGIN;
gBattleTextBuff2[1] = B_BUFF_STRING; gBattleTextBuff2[1] = B_BUFF_STRING;
gBattleTextBuff2[2] = STRINGID_STATSHARPLY; gBattleTextBuff2[2] = STRINGID_STATSHARPLY;
@ -5500,9 +5499,7 @@ static u8 RandomStatRaiseBerry(u32 battlerId, u32 itemId, bool32 end2)
gBattleTextBuff2[5] = stringId; gBattleTextBuff2[5] = stringId;
gBattleTextBuff2[6] = stringId >> 8; gBattleTextBuff2[6] = stringId >> 8;
gBattleTextBuff2[7] = EOS; gBattleTextBuff2[7] = EOS;
gEffectBattler = battlerId; gEffectBattler = battlerId;
if (GetBattlerAbility(battlerId) == ABILITY_RIPEN) if (GetBattlerAbility(battlerId) == ABILITY_RIPEN)
SET_STATCHANGER(i + 1, 4, FALSE); SET_STATCHANGER(i + 1, 4, FALSE);
else else
@ -5510,7 +5507,6 @@ static u8 RandomStatRaiseBerry(u32 battlerId, u32 itemId, bool32 end2)
gBattleScripting.animArg1 = 0x21 + i + 6; gBattleScripting.animArg1 = 0x21 + i + 6;
gBattleScripting.animArg2 = 0; gBattleScripting.animArg2 = 0;
if (end2) if (end2)
{ {
BattleScriptExecute(BattleScript_BerryStatRaiseEnd2); BattleScriptExecute(BattleScript_BerryStatRaiseEnd2);
@ -5520,6 +5516,7 @@ static u8 RandomStatRaiseBerry(u32 battlerId, u32 itemId, bool32 end2)
BattleScriptPushCursor(); BattleScriptPushCursor();
gBattlescriptCurrInstr = BattleScript_BerryStatRaiseRet; gBattlescriptCurrInstr = BattleScript_BerryStatRaiseRet;
} }
return ITEM_STATS_CHANGE; return ITEM_STATS_CHANGE;
} }
return 0; return 0;
@ -8997,28 +8994,20 @@ void BufferStatChange(u8 battlerId, u8 statId, u8 stringId)
if (stringId == STRINGID_STATFELL) if (stringId == STRINGID_STATFELL)
{ {
if (hasContrary) if (hasContrary)
{ PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE)
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE);
}
else else
{ PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATFELL)
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATFELL);
}
} }
else if (stringId == STRINGID_STATROSE) else if (stringId == STRINGID_STATROSE)
{ {
if (hasContrary) if (hasContrary)
{ PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATFELL)
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATFELL); else
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE)
} }
else else
{ {
PREPARE_STRING_BUFFER(gBattleTextBuff2, STRINGID_STATROSE); PREPARE_STRING_BUFFER(gBattleTextBuff2, stringId)
}
}
else
{
PREPARE_STRING_BUFFER(gBattleTextBuff2, stringId);
} }
} }