diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-08-28 16:16:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-28 16:16:00 -0400 |
| commit | c8307317344f0ca6d176882cf8b55d3bf82dc680 (patch) | |
| tree | 393b23af98581a7dec2e0731732a23ece4b23007 /data/battle_scripts_2.s | |
| parent | e9b734c1efd9ad8a079d9ca7c9ed65cff801be1c (diff) | |
| parent | 09cfed64b5a10a51ca246ce7a4f57b95cf4b4456 (diff) | |
Merge branch 'master' into doc-blender
Diffstat (limited to 'data/battle_scripts_2.s')
| -rw-r--r-- | data/battle_scripts_2.s | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index 316b4df25..caa6cddac 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -118,7 +118,7 @@ BattleScript_PlayerUsesItem:: BattleScript_OpponentUsesHealItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -135,7 +135,7 @@ BattleScript_OpponentUsesHealItem:: BattleScript_OpponentUsesStatusCureItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -149,7 +149,7 @@ BattleScript_OpponentUsesStatusCureItem:: BattleScript_OpponentUsesXItem:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -162,7 +162,7 @@ BattleScript_OpponentUsesXItem:: BattleScript_OpponentUsesGuardSpecs:: printstring STRINGID_EMPTYSTRING3 pause 0x30 - playse SE_KAIFUKU + playse SE_USE_ITEM printstring STRINGID_TRAINER1USEDITEM waitmessage 0x40 useitemonopponent @@ -173,7 +173,7 @@ BattleScript_OpponentUsesGuardSpecs:: finishaction BattleScript_RunByUsingItem:: - playse SE_NIGERU + playse SE_FLEE setbyte gBattleOutcome, B_OUTCOME_RAN finishturn |