ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Syntax corrections

Browse Source
This commit is contained in:
LOuroboros 2021-11-03 17:48:04 -03:00
parent 69b42de0d9
commit f0d7c75ec8
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/battle_scripts_1.s
View File

@ -1925,7 +1925,7 @@ BattleScript_MimicryLoop_NextBattler:
addbyte gBattlerTarget, 0x1
jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_MimicryLoopIter
restoretarget
end
goto BattleScript_MoveEnd
BattleScript_EffectTopsyTurvy:
attackcanceler

8
src/battle_util.c
View File

@ -2319,8 +2319,10 @@ u8 DoFieldEndTurnEffects(void)
{
gFieldStatuses &= ~(STATUS_FIELD_ELECTRIC_TERRAIN | STATUS_FIELD_TERRAIN_PERMANENT);
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{
if (GetBattlerAbility(i) == ABILITY_MIMICRY)
RestoreBattlerOriginalTypes(i);
}
BattleScriptExecute(BattleScript_ElectricTerrainEnds);
effect++;
}
@ -2332,8 +2334,10 @@ u8 DoFieldEndTurnEffects(void)
{
gFieldStatuses &= ~(STATUS_FIELD_MISTY_TERRAIN);
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{
if (GetBattlerAbility(i) == ABILITY_MIMICRY)
RestoreBattlerOriginalTypes(i);
}
BattleScriptExecute(BattleScript_MistyTerrainEnds);
effect++;
}
@ -2347,8 +2351,10 @@ u8 DoFieldEndTurnEffects(void)
{
gFieldStatuses &= ~(STATUS_FIELD_GRASSY_TERRAIN);
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{
if (GetBattlerAbility(i) == ABILITY_MIMICRY)
RestoreBattlerOriginalTypes(i);
}
}
BattleScriptExecute(BattleScript_GrassyTerrainHeals);
effect++;
@ -2361,8 +2367,10 @@ u8 DoFieldEndTurnEffects(void)
{
gFieldStatuses &= ~(STATUS_FIELD_PSYCHIC_TERRAIN);
for (i = 0; i < MAX_BATTLERS_COUNT; i++)
{
if (GetBattlerAbility(i) == ABILITY_MIMICRY)
RestoreBattlerOriginalTypes(i);
}
BattleScriptExecute(BattleScript_PsychicTerrainEnds);
effect++;
}