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

Forgot to clear the primal weathers in some places

Browse Source
This commit is contained in:
LOuroboros 2021-10-07 00:41:33 -03:00
parent 2b32581c14
commit 7548e74013
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
data/battle_scripts_1.s
View File

@ -737,6 +737,9 @@ BattleScript_EffectPartingShotSwitch:
getswitchedmondata BS_ATTACKER getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE switchinanim BS_ATTACKER, TRUE
waitstate waitstate
@ -1789,6 +1792,9 @@ BattleScript_EffectHealingWish:
getswitchedmondata BS_ATTACKER getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE switchinanim BS_ATTACKER, TRUE
waitstate waitstate
@ -2148,6 +2154,9 @@ BattleScript_EffectHitEscape:
getswitchedmondata BS_ATTACKER getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE switchinanim BS_ATTACKER, TRUE
waitstate waitstate
@ -4026,6 +4035,9 @@ BattleScript_EffectBatonPass::
getswitchedmondata BS_ATTACKER getswitchedmondata BS_ATTACKER
switchindataupdate BS_ATTACKER switchindataupdate BS_ATTACKER
hpthresholds BS_ATTACKER hpthresholds BS_ATTACKER
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
printstring STRINGID_SWITCHINMON printstring STRINGID_SWITCHINMON
switchinanim BS_ATTACKER, TRUE switchinanim BS_ATTACKER, TRUE
waitstate waitstate
@ -5862,6 +5874,9 @@ BattleScript_RoarSuccessSwitch::
call BattleScript_RoarSuccessRet call BattleScript_RoarSuccessRet
getswitchedmondata BS_TARGET getswitchedmondata BS_TARGET
switchindataupdate BS_TARGET switchindataupdate BS_TARGET
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
switchinanim BS_TARGET, FALSE switchinanim BS_TARGET, FALSE
waitstate waitstate
printstring STRINGID_PKMNWASDRAGGEDOUT printstring STRINGID_PKMNWASDRAGGEDOUT
@ -8535,6 +8550,9 @@ BattleScript_EjectButtonActivates::
getswitchedmondata BS_SCRIPTING getswitchedmondata BS_SCRIPTING
switchindataupdate BS_SCRIPTING switchindataupdate BS_SCRIPTING
hpthresholds BS_SCRIPTING hpthresholds BS_SCRIPTING
trytoclearprimalweather
printstring STRINGID_EMPTYSTRING3
waitmessage 1
printstring 0x3 printstring 0x3
switchinanim BS_SCRIPTING 0x1 switchinanim BS_SCRIPTING 0x1
waitstate waitstate

2
src/battle_script_commands.c
View File

@ -8775,7 +8775,7 @@ static void Cmd_various(void)
} }
gFieldStatuses &= ~STATUS_FIELD_TERRAIN_ANY; // remove the terrain gFieldStatuses &= ~STATUS_FIELD_TERRAIN_ANY; // remove the terrain
break; break;
case VARIOUS_JUMP_IF_PRANKSTER_BLOCKED: case VARIOUS_JUMP_IF_PRANKSTER_BLOCKED:
if (BlocksPrankster(gCurrentMove, gBattlerAttacker, gActiveBattler)) if (BlocksPrankster(gCurrentMove, gBattlerAttacker, gActiveBattler))
gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3); gBattlescriptCurrInstr = T1_READ_PTR(gBattlescriptCurrInstr + 3);
else else