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 /asm/macros | |
parent | 79a8eb481f08a035d2b357b5f9c9a57cb54e99da (diff) | |
parent | c40fb9288cf02f2cba1b72c7377d6272a0eef6f2 (diff) |
Merge branch 'master' of https://github.com/pret/pokeemerald into fr_doc
Diffstat (limited to 'asm/macros')
-rw-r--r-- | asm/macros/battle_script.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/macros/battle_script.inc b/asm/macros/battle_script.inc index 8f3d9faa5..f3664a1c4 100644 --- a/asm/macros/battle_script.inc +++ b/asm/macros/battle_script.inc @@ -941,7 +941,7 @@ .byte 0xb5 .endm - .macro happinesstodamagecalculation + .macro friendshiptodamagecalculation .byte 0xb6 .endm |