ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 20:24:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handled some edge cases

Browse Source 
Gastro Acid, Worry Seed, Simple Beam, Core Enforcer and Transform
This commit is contained in:
LOuroboros 2021-10-07 00:56:13 -03:00
parent 7548e74013
commit 359da5313e
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
data/battle_scripts_1.s
View File

@ -645,6 +645,9 @@ BattleScript_MoveEffectCoreEnforcer::
setgastroacid BattleScript_CoreEnforcerRet setgastroacid BattleScript_CoreEnforcerRet
printstring STRINGID_PKMNSABILITYSUPPRESSED printstring STRINGID_PKMNSABILITYSUPPRESSED
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
BattleScript_CoreEnforcerRet: BattleScript_CoreEnforcerRet:
return return
@ -1744,6 +1747,9 @@ BattleScript_EffectSimpleBeam:
waitanimation waitanimation
printstring STRINGID_PKMNACQUIREDSIMPLE printstring STRINGID_PKMNACQUIREDSIMPLE
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectSuckerPunch: BattleScript_EffectSuckerPunch:
@ -1832,6 +1838,9 @@ BattleScript_EffectWorrySeed:
waitanimation waitanimation
printstring STRINGID_PKMNACQUIREDABILITY printstring STRINGID_PKMNACQUIREDABILITY
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectPowerSplit: BattleScript_EffectPowerSplit:
@ -1960,6 +1969,9 @@ BattleScript_EffectGastroAcid:
waitanimation waitanimation
printstring STRINGID_PKMNSABILITYSUPPRESSED printstring STRINGID_PKMNSABILITYSUPPRESSED
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
goto BattleScript_MoveEnd goto BattleScript_MoveEnd
BattleScript_EffectToxicSpikes: BattleScript_EffectToxicSpikes:
@ -3095,6 +3107,9 @@ BattleScript_EffectTransform::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
transformdataexecution transformdataexecution
attackanimation attackanimation
waitanimation waitanimation

3
src/battle_script_commands.c
View File

@ -8790,7 +8790,8 @@ static void Cmd_various(void)
if (((GetBattlerAbility(i) == ABILITY_DESOLATE_LAND && gBattleWeather & WEATHER_SUN_PRIMAL) if (((GetBattlerAbility(i) == ABILITY_DESOLATE_LAND && gBattleWeather & WEATHER_SUN_PRIMAL)
|| (GetBattlerAbility(i) == ABILITY_PRIMORDIAL_SEA && gBattleWeather & WEATHER_RAIN_PRIMAL) || (GetBattlerAbility(i) == ABILITY_PRIMORDIAL_SEA && gBattleWeather & WEATHER_RAIN_PRIMAL)
|| (GetBattlerAbility(i) == ABILITY_DELTA_STREAM && gBattleWeather & WEATHER_STRONG_WINDS)) || (GetBattlerAbility(i) == ABILITY_DELTA_STREAM && gBattleWeather & WEATHER_STRONG_WINDS))
&& IsBattlerAlive(i)) && IsBattlerAlive(i)
&& !(gStatuses3[i] & STATUS3_GASTRO_ACID))
shouldNotClear = TRUE; shouldNotClear = TRUE;
} }
if (gBattleWeather & WEATHER_SUN_PRIMAL && !shouldNotClear) if (gBattleWeather & WEATHER_SUN_PRIMAL && !shouldNotClear)