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

minor edits to consumeberry calls

Browse Source
This commit is contained in:
ghoulslash 2022-05-13 16:29:37 -04:00
parent cdd37ad1bb
commit b09dad68d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
data/battle_scripts_1.s
View File

@ -1056,11 +1056,11 @@ BattleScript_EffectStuffCheeks::
attackanimation attackanimation
waitanimation waitanimation
BattleScript_StuffCheeksEatBerry: BattleScript_StuffCheeksEatBerry:
setbyte sBERRY_OVERRIDE, TRUE setbyte sBERRY_OVERRIDE, 1
orword gHitMarker, HITMARKER_NO_ANIMATIONS orword gHitMarker, HITMARKER_NO_ANIMATIONS
consumeberry BS_ATTACKER, TRUE consumeberry BS_ATTACKER, TRUE
bicword gHitMarker, HITMARKER_NO_ANIMATIONS bicword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, FALSE setbyte sBERRY_OVERRIDE, 0
removeitem BS_ATTACKER removeitem BS_ATTACKER
setstatchanger STAT_DEF, 2, FALSE setstatchanger STAT_DEF, 2, FALSE
statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StuffCheeksEnd statbuffchange MOVE_EFFECT_AFFECTS_USER | STAT_BUFF_ALLOW_PTR, BattleScript_StuffCheeksEnd
@ -1350,10 +1350,10 @@ BattleScript_MoveEffectBugBite::
printstring STRINGID_BUGBITE printstring STRINGID_BUGBITE
waitmessage B_WAIT_TIME_LONG waitmessage B_WAIT_TIME_LONG
orword gHitMarker, HITMARKER_NO_ANIMATIONS orword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, TRUE @ override the requirements for eating berries setbyte sBERRY_OVERRIDE, 1 @ override the requirements for eating berries
consumeberry BS_ATTACKER, FALSE consumeberry BS_ATTACKER, FALSE
bicword gHitMarker, HITMARKER_NO_ANIMATIONS bicword gHitMarker, HITMARKER_NO_ANIMATIONS
setbyte sBERRY_OVERRIDE, FALSE setbyte sBERRY_OVERRIDE, 0
return return
BattleScript_EffectCoreEnforcer: BattleScript_EffectCoreEnforcer: