diff options
| author | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
|---|---|---|
| committer | garak <garakmon@gmail.com> | 2018-10-19 16:05:14 -0400 |
| commit | 38fcc46abb36df72512f4b532d1379dab1c13af6 (patch) | |
| tree | df44258d7b5a65d2a75a146c7c01b6c683b023f9 /data/battle_scripts_1.s | |
| parent | 901f3ff55715ec6bdeda5c711e7e73b4c38ab55a (diff) | |
| parent | 95d8815721321f08714b97c59a97de3a59f1e0c7 (diff) | |
Merge remote-tracking branch 'upstream/master' into pan-constants
Diffstat (limited to 'data/battle_scripts_1.s')
| -rw-r--r-- | data/battle_scripts_1.s | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index a01066be1..d8f681686 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -6,6 +6,7 @@ #include "constants/abilities.h" #include "constants/moves.h" #include "constants/songs.h" +#include "constants/game_stat.h" .include "asm/macros.inc" .include "asm/macros/battle_script.inc" .include "constants/constants.inc" @@ -922,7 +923,7 @@ BattleScript_EffectFocusEnergy:: BattleScript_EffectRecoil:: setmoveeffect MOVE_EFFECT_RECOIL_25 | MOVE_EFFECT_AFFECTS_USER | MOVE_EFFECT_CERTAIN jumpifnotmove MOVE_STRUGGLE, BattleScript_EffectHit - incrementgamestat 0x1B + incrementgamestat GAME_STAT_USED_STRUGGLE goto BattleScript_EffectHit BattleScript_EffectConfuse:: @@ -1200,7 +1201,7 @@ BattleScript_EffectSplash:: ppreduce attackanimation waitanimation - incrementgamestat 0x1A + incrementgamestat GAME_STAT_USED_SPLASH printstring STRINGID_BUTNOTHINGHAPPENED waitmessage 0x40 goto BattleScript_MoveEnd @@ -3741,7 +3742,7 @@ BattleScript_SAtkDown2End:: BattleScript_FocusPunchSetUp:: printstring STRINGID_EMPTYSTRING3 waitmessage 0x1 - playanimation BS_ATTACKER, B_ANIM_x14, NULL + playanimation BS_ATTACKER, B_ANIM_FOCUS_PUNCH_SETUP, NULL printstring STRINGID_PKMNTIGHTENINGFOCUS waitmessage 0x40 end2 |