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 /src/battle_script_commands.c | |
| parent | 79a8eb481f08a035d2b357b5f9c9a57cb54e99da (diff) | |
| parent | c40fb9288cf02f2cba1b72c7377d6272a0eef6f2 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc
Diffstat (limited to 'src/battle_script_commands.c')
| -rw-r--r-- | src/battle_script_commands.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 43c554e88..96c849cbc 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -258,7 +258,7 @@ static void Cmd_trysetperishsong(void); static void Cmd_rolloutdamagecalculation(void); static void Cmd_jumpifconfusedandstatmaxed(void); static void Cmd_furycuttercalc(void); -static void Cmd_happinesstodamagecalculation(void); +static void Cmd_friendshiptodamagecalculation(void); static void Cmd_presentdamagecalculation(void); static void Cmd_setsafeguard(void); static void Cmd_magnitudedamagecalculation(void); @@ -510,7 +510,7 @@ void (* const gBattleScriptingCommandsTable[])(void) = Cmd_rolloutdamagecalculation, //0xB3 Cmd_jumpifconfusedandstatmaxed, //0xB4 Cmd_furycuttercalc, //0xB5 - Cmd_happinesstodamagecalculation, //0xB6 + Cmd_friendshiptodamagecalculation, //0xB6 Cmd_presentdamagecalculation, //0xB7 Cmd_setsafeguard, //0xB8 Cmd_magnitudedamagecalculation, //0xB9 @@ -8471,7 +8471,7 @@ static void Cmd_furycuttercalc(void) } } -static void Cmd_happinesstodamagecalculation(void) +static void Cmd_friendshiptodamagecalculation(void) { if (gBattleMoves[gCurrentMove].effect == EFFECT_RETURN) gDynamicBasePower = 10 * (gBattleMons[gBattlerAttacker].friendship) / 25; |