diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-10-22 16:02:01 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-10-22 15:54:11 -0500 |
| commit | a4d6ce417d11f7601c037f246cbcdc2f680d87ee (patch) | |
| tree | 83063cfe4a098edc1c78b63b608f182d856bee8f | |
| parent | fa4940ee44b08b22486e6278dede88f079861ddd (diff) | |
Fix resetintimidatetracebits typo
| -rw-r--r-- | asm/macros/battle_script.inc | 2 | ||||
| -rw-r--r-- | data/battle_scripts_1.s | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 997af51cc..c605099e1 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -1267,7 +1267,7 @@ various \battler, 4 .endm - .macro resetintrimidatetracebits battler:req + .macro resetintimidatetracebits battler:req various \battler, VARIOUS_RESET_INTIMIDATE_TRACE_BITS .endm diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 244a3ac05..027db364c 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -2875,7 +2875,7 @@ BattleScript_FaintedMonTryChooseAnother:: switchhandleorder BS_ATTACKER, 0x2 jumpifbyte CMP_EQUAL, gBattleCommunication, 0x6, BattleScript_FaintedMonChooseAnother atknameinbuff1 - resetintrimidatetracebits BS_ATTACKER + resetintimidatetracebits BS_ATTACKER hpthresholds2 BS_ATTACKER printstring STRINGID_RETURNMON switchoutabilities BS_ATTACKER |