diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 00:09:14 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-02 00:09:14 -0400 |
| commit | 75262c1920a0611f89e95837efb4f5e327760a8b (patch) | |
| tree | 9982e4fcd275f8a1ea3c851c3dbf297d9e1c1307 /src/battle_util.c | |
| parent | 6e5dcf19f76b1839537848cf0fd91c7ddb27898c (diff) | |
| parent | c71f6baa8cb713a567520279ff18dca0c4ed0915 (diff) | |
Merge branch 'master' into bard_music
Diffstat (limited to 'src/battle_util.c')
| -rw-r--r-- | src/battle_util.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_util.c b/src/battle_util.c index 0a0badb33..468b2c46d 100644 --- a/src/battle_util.c +++ b/src/battle_util.c @@ -1729,7 +1729,7 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2) if (GetBankSide(bank) == SIDE_PLAYER) { party = gPlayerParty; - r7 = sub_806D864(bank); + r7 = GetBankMultiplayerId(bank); r6 = sub_806D82C(r7); } else @@ -1748,7 +1748,7 @@ bool8 sub_80423F4(u8 bank, u8 r1, u8 r2) } else { - r7 = sub_806D864(bank); + r7 = GetBankMultiplayerId(bank); if (GetBankSide(bank) == SIDE_PLAYER) party = gPlayerParty; else |