summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-03-25 13:26:22 -0400
committerhuderlem <huderlem@gmail.com>2021-03-27 17:27:20 -0500
commit7a5c6d4d869b314ce748fe2ccff493c468fa0a91 (patch)
tree0f6b4b4ab794da91b7a2565dc33e5981c886776b /data
parent0f869fb26630cd7ec65a1873d76d144bdfaf11d4 (diff)
Standardize Friendship/Happiness
Diffstat (limited to 'data')
-rw-r--r--data/battle_scripts_1.s2
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::