ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 11:44:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix wind power, electromorphosis stomping on gbattlerattacker

Browse Source
This commit is contained in:
ghoulslash 2023-02-02 21:59:40 -05:00
parent c5c0e91215
commit f060d0185f
2 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
data/battle_scripts_1.s
View File

@ -2951,12 +2951,9 @@ BattleScript_TryTailwindAbilitiesLoop_WindRider:
BattleScript_TryTailwindAbilitiesLoop_WindPower: BattleScript_TryTailwindAbilitiesLoop_WindPower:
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
copybyte sSAVED_BATTLER, gBattlerAttacker setcharge BS_TARGET
copybyte gBattlerAttacker, gBattlerTarget
setcharge
printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
copybyte gBattlerAttacker, sSAVED_BATTLER
goto BattleScript_TryTailwindAbilitiesLoop_Increment goto BattleScript_TryTailwindAbilitiesLoop_Increment
BattleScript_EffectMircleEye: BattleScript_EffectMircleEye:
@ -5675,7 +5672,7 @@ BattleScript_EffectCharge::
attackcanceler attackcanceler
attackstring attackstring
ppreduce ppreduce
setcharge setcharge BS_ATTACKER
attackanimation attackanimation
waitanimation waitanimation
.if B_CHARGE_SPDEF_RAISE >= GEN_5 .if B_CHARGE_SPDEF_RAISE >= GEN_5
@ -6738,27 +6735,6 @@ BattleScript_TailwindEnds::
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
end2 end2
BattleScript_WindPowerActivatesEnd2::
setbyte gBattlerAttacker, 0
BattleScript_WindPowerLoop:
printstring STRINGID_EMPTYSTRING3
jumpifability BS_ATTACKER, ABILITY_WIND_POWER, BattleScript_WindPowerLoop_Cont
goto BattleScript_WindPowerIncrement
BattleScript_WindPowerLoop_Cont:
jumpifstatus3 BS_ATTACKER, STATUS3_CHARGED_UP, BattleScript_WindPowerIncrement
goto BattleScript_WindPower_Activate
BattleScript_WindPower_Activate:
call BattleScript_AbilityPopUp
setcharge
printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER
waitmessage B_WAIT_TIME_LONG
BattleScript_WindPowerIncrement:
addbyte gBattlerAttacker, 1
jumpifbytenotequal gBattlerAttacker, gBattlersCount, BattleScript_WindPowerLoop
BattleScript_WindPowerEnd:
destroyabilitypopup
end2
BattleScript_TrickRoomEnds:: BattleScript_TrickRoomEnds::
printstring STRINGID_TRICKROOMENDS printstring STRINGID_TRICKROOMENDS
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
@ -7233,11 +7209,8 @@ BattleScript_AngerShellRet:
return return
BattleScript_WindPowerActivates:: BattleScript_WindPowerActivates::
.if B_CHECK_IF_CHARGED_UP == TRUE
jumpifstatus3 BS_ATTACKER, STATUS3_CHARGED_UP, BattleScript_WindPowerActivates_Ret
.endif
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
setcharge setcharge BS_TARGET
printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER printstring STRINGID_BEINGHITCHARGEDPKMNWITHPOWER
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
BattleScript_WindPowerActivates_Ret: BattleScript_WindPowerActivates_Ret:

9
src/battle_script_commands.c
View File

@ -13198,10 +13198,11 @@ static void Cmd_setforcedtarget(void)
static void Cmd_setcharge(void) static void Cmd_setcharge(void)
{ {
gStatuses3[gBattlerAttacker] |= STATUS3_CHARGED_UP; u8 battler = GetBattlerForBattleScript(gBattlescriptCurrInstr[1]);
gDisableStructs[gBattlerAttacker].chargeTimer = 2; gStatuses3[battler] |= STATUS3_CHARGED_UP;
gDisableStructs[gBattlerAttacker].chargeTimerStartValue = 2; gDisableStructs[battler].chargeTimer = 2;
gBattlescriptCurrInstr++; gDisableStructs[battler].chargeTimerStartValue = 2;
gBattlescriptCurrInstr += 2;
} }
// Nature Power // Nature Power