diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 19:43:30 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-11-09 20:30:56 -0600 |
| commit | 09e431077af3c6fe672ad8a775b58d955596b81d (patch) | |
| tree | 88d2eceb1071df85b4f73b1742885127755579c6 /src/battle_util.c | |
| parent | 2d3044aaa645bbad85e8e60dfe23f7f0224383ca (diff) | |
| parent | af197ccd3bd62fab813154dc4311e65f9992a676 (diff) | |
Merge remote-tracking branch 'pret/master' into dump_maps
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 537bb2793..15c11dbb2 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 |