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/link_rfu_3.s | |
| parent | 0ba52688584d8a35ec9c617b035c9dea71e2689f (diff) | |
| parent | d05339979e39580b162e618087136bb220a4f20d (diff) | |
Merge branch 'master' into quest_log
Diffstat (limited to 'asm/link_rfu_3.s')
| -rw-r--r-- | asm/link_rfu_3.s | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index d3c5d5917..ec3e2e5a4 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -3273,8 +3273,8 @@ sub_81173C0: @ 81173C0 lsls r6, 16 lsrs r6, 16 bl sp000_heal_pokemon - bl copy_player_party_to_sav1 - bl copy_bags_and_unk_data_from_save_blocks + bl SavePlayerParty + bl LoadPlayerBag ldr r5, _0811742C @ =gLinkPlayers ldr r0, _08117430 @ =0x00002211 str r0, [r5, 0x14] @@ -3661,8 +3661,8 @@ _081177A0: movs r1, 0x1 bl sub_8117594 bl sp000_heal_pokemon - bl copy_player_party_to_sav1 - bl copy_bags_and_unk_data_from_save_blocks + bl SavePlayerParty + bl LoadPlayerBag movs r0, 0x1 str r0, [sp] movs r0, 0 @@ -3674,8 +3674,8 @@ _081177C4: .4byte gUnknown_2022618 _081177C8: bl sub_80563F0 bl sp000_heal_pokemon - bl copy_player_party_to_sav1 - bl copy_bags_and_unk_data_from_save_blocks + bl SavePlayerParty + bl LoadPlayerBag ldr r0, _081177EC @ =gUnknown_2022618 movs r1, 0x1 bl sub_8117594 @@ -3690,8 +3690,8 @@ _081177EC: .4byte gUnknown_2022618 _081177F0: bl sub_80563F0 bl sp000_heal_pokemon - bl copy_player_party_to_sav1 - bl copy_bags_and_unk_data_from_save_blocks + bl SavePlayerParty + bl LoadPlayerBag ldr r0, _08117814 @ =gUnknown_2022618 movs r1, 0x1 bl sub_8117594 |