dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'pret/master' into dump_maps

Browse Source
This commit is contained in:
Diegoisawesome
2017-11-09 19:43:30 -06:00
parent 2d3044aaa6 af197ccd3b
commit 09e431077a
147 changed files with 37165 additions and 72938 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/battle_util.c
View File

@@ -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