diff options
author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-04 01:54:51 +0800 |
---|---|---|
committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-06-04 01:54:51 +0800 |
commit | 67542ec22d57256b9613e9aeabb28440c66bfeb2 (patch) | |
tree | a235a96472d7ac3b018a32162ab68450a983aea4 /asm/battle_interface.s | |
parent | 94091f15894ff2a0a9b2e838aba84ebdc211703c (diff) | |
parent | 5bcafd74ec9978e260dc8dc53e57a89964a8c5cc (diff) |
fix for merge
Diffstat (limited to 'asm/battle_interface.s')
-rw-r--r-- | asm/battle_interface.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/battle_interface.s b/asm/battle_interface.s index 8e109b6d6..393eb4ee6 100644 --- a/asm/battle_interface.s +++ b/asm/battle_interface.s @@ -5559,7 +5559,7 @@ AddTextPrinterAndCreateWindowOnHealthbox: @ 804A648 movs r1, 0 adds r2, r6, 0 mov r3, r8 - bl AddTextPrinterParametrized2 + bl AddTextPrinterParameterized4 mov r0, r10 str r4, [r0] adds r0, r5, 0 |