diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 16:58:54 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-03 16:58:54 -0500 |
| commit | 2879fe7fe05166f16b21223c2d4d24f5855c2788 (patch) | |
| tree | 3e5525a118c249ab2419a61d7a61b4cb1985462b /data | |
| parent | 63e700af6c735dc40f8ddb2b46cad9c0c43ad6b3 (diff) | |
| parent | 1e7f4a80c77832d952688206bd7c98e11dba25ba (diff) | |
Merge branch 'master' into summary-screen-macros
Diffstat (limited to 'data')
| -rw-r--r-- | data/battle_scripts_1.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 8ddf56ef8..0159a3f73 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2538,7 +2538,7 @@ BattleScript_EffectImprison:: attackcanceler attackstring ppreduce - tryimprision BattleScript_ButItFailed + tryimprison BattleScript_ButItFailed attackanimation waitanimation printstring STRINGID_PKMNSEALEDOPPONENTMOVE @@ -3684,11 +3684,11 @@ BattleScript_MoveUsedIsImprisoned:: waitmessage 0x40 goto BattleScript_MoveEnd -BattleScript_SelectingImprisionedMove:: +BattleScript_SelectingImprisonedMove:: printselectionstring STRINGID_PKMNCANTUSEMOVESEALED endselectionscript -BattleScript_SelectingImprisionedMoveInPalace:: +BattleScript_SelectingImprisonedMoveInPalace:: printstring STRINGID_PKMNCANTUSEMOVESEALED goto BattleScript_SelectingUnusableMoveInPalace |