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/item_menu.s | |
parent | 0ba52688584d8a35ec9c617b035c9dea71e2689f (diff) | |
parent | d05339979e39580b162e618087136bb220a4f20d (diff) |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/item_menu.s')
-rw-r--r-- | asm/item_menu.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/asm/item_menu.s b/asm/item_menu.s index 6c508193f..1c42a3a3f 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -6629,7 +6629,7 @@ _0810B396: cmp r0, 0x1 bne _0810B3B8 bl FreeRestoreBattleData - bl sub_804C230 + bl LoadPlayerParty b _0810B4B6 .align 2, 0 _0810B3B0: .4byte gTasks+0x8 @@ -6791,7 +6791,7 @@ sub_810B4BC: @ 810B4BC cmp r0, 0x1 bne _0810B50C bl FreeRestoreBattleData - bl sub_804C230 + bl LoadPlayerParty b _0810B5C6 .align 2, 0 _0810B504: .4byte gTasks+0x8 |