diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 10:53:16 -0700 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-10-17 10:53:16 -0700 |
| commit | 46e006b94cf7a2e59652a083cdd01f0d5dc9a26f (patch) | |
| tree | d2d5315a6c8512aeda5ca5d435c3ef2a7d80688b /asm/party_menu.s | |
| parent | 0ba52688584d8a35ec9c617b035c9dea71e2689f (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (diff) | |
Merge branch 'master' into quest_log
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 50c485ad5..6152d9d54 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 |