diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_frontier_2.s | 4 | ||||
| -rw-r--r-- | asm/cable_club.s | 8 | ||||
| -rw-r--r-- | asm/field_screen.s | 2 | ||||
| -rw-r--r-- | asm/rom_8011DC0.s | 16 |
4 files changed, 15 insertions, 15 deletions
diff --git a/asm/battle_frontier_2.s b/asm/battle_frontier_2.s index 84228bc2d..71f105df8 100644 --- a/asm/battle_frontier_2.s +++ b/asm/battle_frontier_2.s @@ -19841,7 +19841,7 @@ _081A4C4E: ble _081A4C4E ldr r4, =gPlayerPartyCount ldrb r5, [r4] - bl copy_player_party_from_sav1 + bl LoadPlayerParty bl sub_8076D5C movs r0, 0x1 bl TrySavingData @@ -29770,7 +29770,7 @@ sub_81A9E90: @ 81A9E90 ldr r0, =0x0000400e movs r1, 0 bl VarSet - bl copy_player_party_from_sav1 + bl LoadPlayerParty _081A9EB8: pop {r0} bx r0 diff --git a/asm/cable_club.s b/asm/cable_club.s index e6fbd1886..16264b9da 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -2157,8 +2157,8 @@ sub_80B360C: @ 80B360C ands r0, r1 str r0, [r2] bl Overworld_ResetMapMusic - bl copy_player_party_from_sav1 - bl copy_bags_and_unk_data_to_save_blocks + bl LoadPlayerParty + bl SavePlayerBag bl sub_813BF10 ldr r0, =gSpecialVar_0x8004 ldrh r0, [r0] @@ -2251,8 +2251,8 @@ sub_80B36EC: @ 80B36EC cmp r0, 0x9 bne _080B370E _080B3706: - bl copy_player_party_from_sav1 - bl copy_bags_and_unk_data_to_save_blocks + bl LoadPlayerParty + bl SavePlayerBag _080B370E: movs r0, 0x7F bl copy_saved_warp2_bank_and_enter_x_to_warp1 diff --git a/asm/field_screen.s b/asm/field_screen.s index 2a539d111..e3d48f882 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -8861,7 +8861,7 @@ sub_80AF87C: @ 80AF87C movs r0, 0x1 bl sub_8085540 bl ScriptContext2_Enable - bl save_serialize_npcs + bl SaveMapObjects bl music_something bl sub_80AF0B4 movs r0, 0x2D diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index 3a7f41d0b..21a9cca33 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -3278,8 +3278,8 @@ sub_8014210: @ 8014210 lsls r6, 16 lsrs r6, 16 bl HealPlayerParty - bl copy_player_party_to_sav1 - bl copy_bags_and_unk_data_from_save_blocks + bl SavePlayerParty + bl LoadPlayerBag ldr r5, =gLinkPlayers ldr r0, =0x00002211 str r0, [r5, 0x14] @@ -3646,8 +3646,8 @@ _080145F4: movs r1, 0x1 bl sub_80143E4 bl HealPlayerParty - 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, 0x19 @@ -3659,8 +3659,8 @@ _080145F4: _08014620: bl overworld_free_bg_tilemaps bl HealPlayerParty - bl copy_player_party_to_sav1 - bl copy_bags_and_unk_data_from_save_blocks + bl SavePlayerParty + bl LoadPlayerBag ldr r0, =gBlockSendBuffer movs r1, 0x1 bl sub_80143E4 @@ -3675,8 +3675,8 @@ _08014620: _0801464C: bl overworld_free_bg_tilemaps bl HealPlayerParty - bl copy_player_party_to_sav1 - bl copy_bags_and_unk_data_from_save_blocks + bl SavePlayerParty + bl LoadPlayerBag ldr r0, =gBlockSendBuffer movs r1, 0x1 bl sub_80143E4 |