diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2021-03-29 18:36:18 -0400 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2021-03-29 18:36:18 -0400 |
| commit | 102582a3dff87769379acca9d50fe29f6f41d337 (patch) | |
| tree | f4b2b95ab5817efe5fda675741a6dfb9c40d1275 /data | |
| parent | 79a8eb481f08a035d2b357b5f9c9a57cb54e99da (diff) | |
| parent | c40fb9288cf02f2cba1b72c7377d6272a0eef6f2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc
Diffstat (limited to 'data')
| -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:: |