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

Merge pull request #2078 from LOuroboros/patch-3

Browse Source 
BattleScript_EffectFlinchWithStatus -> BattleScript_EffectFlinchStatus
This commit is contained in:
Eduardo Quezada D'Ottone 2022-03-20 18:57:35 -03:00 committed by GitHub
commit c4e5d93dc5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/battle_scripts_1.s
View File

@ -308,7 +308,7 @@ gBattleScriptsForMoveEffects::
.4byte BattleScript_EffectCloseCombat @ EFFECT_CLOSE_COMBAT .4byte BattleScript_EffectCloseCombat @ EFFECT_CLOSE_COMBAT
.4byte BattleScript_EffectLastResort @ EFFECT_LAST_RESORT .4byte BattleScript_EffectLastResort @ EFFECT_LAST_RESORT
.4byte BattleScript_EffectRecoil33WithStatus @ EFFECT_RECOIL_33_STATUS .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_EffectRecoil50 @ EFFECT_RECOIL_50
.4byte BattleScript_EffectShellSmash @ EFFECT_SHELL_SMASH .4byte BattleScript_EffectShellSmash @ EFFECT_SHELL_SMASH
.4byte BattleScript_EffectShiftGear @ EFFECT_SHIFT_GEAR .4byte BattleScript_EffectShiftGear @ EFFECT_SHIFT_GEAR
@ -3301,7 +3301,7 @@ BattleScript_EffectFlinchHit::
setmoveeffect MOVE_EFFECT_FLINCH setmoveeffect MOVE_EFFECT_FLINCH
goto BattleScript_EffectHit goto BattleScript_EffectHit
BattleScript_EffectFlinchWithStatus: BattleScript_EffectFlinchStatus:
setmoveeffect MOVE_EFFECT_FLINCH setmoveeffect MOVE_EFFECT_FLINCH
attackcanceler attackcanceler
accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE