diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-29 20:56:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-29 20:56:15 -0400 |
| commit | 50e9666e1637b15bd57fd7ee88180e50d2eb5e8c (patch) | |
| tree | b1543b6d79695862cb60d686548dd1a996b69e8c /data/battle_scripts_1.s | |
| parent | dea07dc8656c8fb32f5b389b9f4f9a30fe26e555 (diff) | |
| parent | e8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff) | |
Merge branch 'master' into doc-introcred
Diffstat (limited to 'data/battle_scripts_1.s')
| -rw-r--r-- | data/battle_scripts_1.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s index 6e0476182..ad9576a62 100644 --- a/data/battle_scripts_1.s +++ b/data/battle_scripts_1.s @@ -1678,7 +1678,7 @@ BattleScript_EffectReturn:: BattleScript_EffectFrustration:: attackcanceler accuracycheck BattleScript_PrintMoveMissed, ACC_CURR_MOVE - happinesstodamagecalculation + friendshiptodamagecalculation goto BattleScript_HitFromAtkString BattleScript_EffectPresent:: |