mirror of
https://github.com/pret/pokeemerald.git
synced 2026-09-10 12:06:53 -05:00
Merge pull request #2078 from LOuroboros/patch-3
BattleScript_EffectFlinchWithStatus -> BattleScript_EffectFlinchStatus
This commit is contained in:
@@ -308,7 +308,7 @@ gBattleScriptsForMoveEffects::
|
||||
.4byte BattleScript_EffectCloseCombat @ EFFECT_CLOSE_COMBAT
|
||||
.4byte BattleScript_EffectLastResort @ EFFECT_LAST_RESORT
|
||||
.4byte BattleScript_EffectRecoil33WithStatus @ EFFECT_RECOIL_33_STATUS
|
||||
.4byte BattleScript_EffectFlinchWithStatus @ EFFECT_FLINCH_STATUS
|
||||
.4byte BattleScript_EffectFlinchStatus @ EFFECT_FLINCH_STATUS
|
||||
.4byte BattleScript_EffectRecoil50 @ EFFECT_RECOIL_50
|
||||
.4byte BattleScript_EffectShellSmash @ EFFECT_SHELL_SMASH
|
||||
.4byte BattleScript_EffectShiftGear @ EFFECT_SHIFT_GEAR
|
||||
@@ -3301,7 +3301,7 @@ BattleScript_EffectFlinchHit::
|
||||
setmoveeffect MOVE_EFFECT_FLINCH
|
||||
goto BattleScript_EffectHit
|
||||
|
||||
BattleScript_EffectFlinchWithStatus:
|
||||
BattleScript_EffectFlinchStatus:
|
||||
setmoveeffect MOVE_EFFECT_FLINCH
|
||||
attackcanceler
|
||||
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE
|
||||
|
||||
Reference in New Issue
Block a user