diff options
author | paul <nintendo6496@googlemail.com> | 2018-10-17 21:10:51 +0200 |
---|---|---|
committer | paul <nintendo6496@googlemail.com> | 2018-10-17 21:10:51 +0200 |
commit | e396bcdb7229645f4a4893b8e3c1d364a0e7930c (patch) | |
tree | 14959dcb316454411ec791a39ec45a34f49e1ed0 /asm/party_menu.s | |
parent | 771cc93d932058d4ba079a33c04c0380f339c6a7 (diff) | |
parent | d05339979e39580b162e618087136bb220a4f20d (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'asm/party_menu.s')
-rw-r--r-- | asm/party_menu.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/party_menu.s b/asm/party_menu.s index 5ba1481ea..5a3801724 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -4877,7 +4877,7 @@ _08120FAC: .4byte sub_8120FB0 sub_8120FB0: @ 8120FB0 push {lr} bl FreeRestoreBattleData - bl sub_804C230 + bl LoadPlayerParty bl sub_815AC20 ldr r0, _08120FC8 @ =sub_815ABFC bl SetMainCallback2 |