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

Merge pull request #1703 from AsparagusEduardo/fix_ConfuseBerries

Browse Source 
Fixed confuse berries affecting the wrong battler.
This commit is contained in:
ghoulslash 2021-10-10 20:21:03 -04:00 committed by GitHub
commit 6212a3c431
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
data/battle_scripts_1.s
View File

@ -8215,22 +8215,22 @@ BattleScript_HangedOnMsgRet:
return return
BattleScript_BerryConfuseHealEnd2:: BattleScript_BerryConfuseHealEnd2::
jumpifability BS_ATTACKER, ABILITY_RIPEN, BattleScript_BerryConfuseHealEnd2_AbilityPopup jumpifability BS_SCRIPTING, ABILITY_RIPEN, BattleScript_BerryConfuseHealEnd2_AbilityPopup
goto BattleScript_BerryConfuseHealEnd2_Anim goto BattleScript_BerryConfuseHealEnd2_Anim
BattleScript_BerryConfuseHealEnd2_AbilityPopup: BattleScript_BerryConfuseHealEnd2_AbilityPopup:
call BattleScript_AbilityPopUp call BattleScript_AbilityPopUp
BattleScript_BerryConfuseHealEnd2_Anim: BattleScript_BerryConfuseHealEnd2_Anim:
playanimation BS_ATTACKER, B_ANIM_HELD_ITEM_EFFECT, NULL playanimation BS_SCRIPTING, B_ANIM_HELD_ITEM_EFFECT, NULL
printstring STRINGID_PKMNSITEMRESTOREDHEALTH printstring STRINGID_PKMNSITEMRESTOREDHEALTH
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE orword gHitMarker, HITMARKER_IGNORE_SUBSTITUTE
healthbarupdate BS_ATTACKER healthbarupdate BS_SCRIPTING
datahpupdate BS_ATTACKER datahpupdate BS_SCRIPTING
printstring STRINGID_FORXCOMMAYZ printstring STRINGID_FORXCOMMAYZ
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER
seteffectprimary seteffectprimary
removeitem BS_ATTACKER removeitem BS_SCRIPTING
end2 end2
BattleScript_BerryConfuseHealRet:: BattleScript_BerryConfuseHealRet::
@ -8247,9 +8247,9 @@ BattleScript_BerryConfuseHealRet_Anim:
datahpupdate BS_SCRIPTING datahpupdate BS_SCRIPTING
printstring STRINGID_FORXCOMMAYZ printstring STRINGID_FORXCOMMAYZ
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_AFFECTS_USER setmoveeffect MOVE_EFFECT_CONFUSION | MOVE_EFFECT_CERTAIN
seteffectprimary seteffectprimary
removeitem BS_SCRIPTING removeitem BS_TARGET
return return
BattleScript_BerryStatRaiseEnd2:: BattleScript_BerryStatRaiseEnd2::

2
src/battle_util.c
View File

@ -5672,7 +5672,7 @@ static u8 HealConfuseBerry(u32 battlerId, u32 itemId, u8 flavorId, bool32 end2)
gBattleMoveDamage *= 2; gBattleMoveDamage *= 2;
gBattlerAbility = battlerId; gBattlerAbility = battlerId;
} }
gBattleScripting.battler = battlerId;
if (end2) if (end2)
{ {
if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, flavorId) < 0) if (GetFlavorRelationByPersonality(gBattleMons[battlerId].personality, flavorId) < 0)