From d48392e677f3b77b34d4b125b90a74be86b19a2d Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sun, 26 Nov 2017 18:07:00 +0100 Subject: change battle variables names --- data/battle_scripts_1.s | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data') diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 5e7488108..2a3d8674a 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -628,7 +628,7 @@ BattleScript_EffectMultiHit:: BattleScript_82D8DFD:: jumpifhasnohp ATTACKER, BattleScript_82D8E93 jumpifhasnohp TARGET, BattleScript_82D8E74 - jumpifhalfword EQUAL, gOriginallyUsedMove, MOVE_SLEEP_TALK, BattleScript_82D8E1F + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_82D8E1F jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_82D8E74 BattleScript_82D8E1F:: movevaluescleanup @@ -1281,7 +1281,7 @@ BattleScript_EffectSnore:: ppreduce goto BattleScript_ButItFailed BattleScript_SnoreIsAsleep:: - jumpifhalfword EQUAL, gOriginallyUsedMove, MOVE_SLEEP_TALK, BattleScript_DoSnore + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoSnore printstring STRINGID_PKMNFASTASLEEP waitmessage 0x40 statusanimation ATTACKER @@ -1411,7 +1411,7 @@ BattleScript_EffectTripleKick:: BattleScript_TripleKickLoop:: jumpifhasnohp ATTACKER, BattleScript_TripleKickEnd jumpifhasnohp TARGET, BattleScript_TripleKickNoMoreHits - jumpifhalfword EQUAL, gOriginallyUsedMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack + jumpifhalfword EQUAL, gChosenMove, MOVE_SLEEP_TALK, BattleScript_DoTripleKickAttack jumpifstatus ATTACKER, STATUS_SLEEP, BattleScript_TripleKickNoMoreHits BattleScript_DoTripleKickAttack:: accuracycheck BattleScript_TripleKickNoMoreHits, ACC_CURR_MOVE -- cgit v1.2.3