resolve merge conflicts

asm/battle_frontier_2.s

@@ -12985,7 +12985,7 @@ _081A10F4:
 	adds r1, r0
 	adds r1, 0xBA
 	ldrh r0, [r1]
-	bl ItemId_GetItem
+	bl ItemId_GetName
 	adds r1, r0, 0
 	b _081A1174
 	.pool
@@ -14344,7 +14344,7 @@ sub_81A1C4C: @ 81A1C4C
 	adds r3, r0, 0
 	lsls r0, r5, 3
 	adds r5, r0, 0x1
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	ldrb r0, [r0]
 	lsls r3, 24
 	lsrs r3, 24
@@ -14370,7 +14370,7 @@ sub_81A1C90: @ 81A1C90
 	push {r4,lr}
 	sub sp, 0x34
 	adds r2, r0, 0
-	ldr r3, =gResultsWindowId
+	ldr r3, =gRecordsWindowId
 	movs r1, 0xAE
 	mov r0, sp
 	adds r0, 0x2F
@@ -14425,7 +14425,7 @@ sub_81A1CD8: @ 81A1CD8
 	lsls r0, 24
 	lsrs r0, 24
 	adds r7, r0, 0
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r10, r0
 	ldrb r0, [r0]
 	str r7, [sp]
@@ -14644,7 +14644,7 @@ sub_81A1EA8: @ 81A1EA8
 	sub sp, 0xC
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r4, =gResultsWindowId
+	ldr r4, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C74
 	bl AddWindow
 	strb r0, [r4]
@@ -14685,7 +14685,7 @@ _081A1F28:
 	ldr r0, =gStringVar4
 	movs r1, 0x2
 	bl sub_81A1C4C
-	ldr r6, =gResultsWindowId
+	ldr r6, =gRecordsWindowId
 	ldrb r0, [r6]
 	ldr r2, =gText_Lv502
 	movs r1, 0x31
@@ -14798,7 +14798,7 @@ sub_81A2008: @ 81A2008
 	lsrs r6, 24
 	lsls r5, 24
 	lsrs r5, 24
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r10, r0
 	ldrb r0, [r0]
 	str r5, [sp]
@@ -14932,7 +14932,7 @@ sub_81A2134: @ 81A2134
 	sub sp, 0xC
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r4, =gResultsWindowId
+	ldr r4, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C74
 	bl AddWindow
 	strb r0, [r4]
@@ -14957,7 +14957,7 @@ _081A2184:
 	ldr r0, =gStringVar4
 	movs r1, 0
 	bl sub_81A1C4C
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	ldr r2, =gText_Lv502
 	movs r6, 0x21
@@ -14969,7 +14969,7 @@ _081A2184:
 	movs r1, 0x1
 	movs r3, 0x8
 	bl PrintTextOnWindow
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	ldr r2, =gText_OpenLv
 	movs r1, 0x61
@@ -15052,10 +15052,10 @@ _081A2184:
 	mov r1, r8
 	movs r3, 0x40
 	bl sub_81A2008
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	bl PutWindowTilemap
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	movs r1, 0x3
 	bl CopyWindowToVram
@@ -15091,7 +15091,7 @@ sub_81A22B8: @ 81A22B8
 	lsls r0, 24
 	lsrs r0, 24
 	adds r7, r0, 0
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r10, r0
 	ldrb r0, [r0]
 	str r7, [sp]
@@ -15285,7 +15285,7 @@ sub_81A2460: @ 81A2460
 	sub sp, 0xC
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r4, =gResultsWindowId
+	ldr r4, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C74
 	bl AddWindow
 	strb r0, [r4]
@@ -15310,7 +15310,7 @@ _081A24B0:
 	ldr r0, =gStringVar4
 	movs r1, 0x2
 	bl sub_81A1C4C
-	ldr r6, =gResultsWindowId
+	ldr r6, =gRecordsWindowId
 	ldrb r0, [r6]
 	ldr r2, =gText_Lv502
 	movs r1, 0x31
@@ -15420,7 +15420,7 @@ sub_81A258C: @ 81A258C
 	lsrs r6, 24
 	lsls r5, 24
 	lsrs r5, 24
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r10, r0
 	ldrb r0, [r0]
 	str r5, [sp]
@@ -15533,7 +15533,7 @@ sub_81A2698: @ 81A2698
 	mov r5, r8
 	push {r5-r7}
 	sub sp, 0xC
-	ldr r6, =gResultsWindowId
+	ldr r6, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C74
 	bl AddWindow
 	strb r0, [r6]
@@ -15672,7 +15672,7 @@ sub_81A27E8: @ 81A27E8
 	lsls r0, 24
 	lsrs r0, 24
 	adds r7, r0, 0
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r10, r0
 	ldrb r0, [r0]
 	str r7, [sp]
@@ -15836,7 +15836,7 @@ _081A2956:
 sub_81A2968: @ 81A2968
 	push {r4-r6,lr}
 	sub sp, 0xC
-	ldr r5, =gResultsWindowId
+	ldr r5, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C74
 	bl AddWindow
 	strb r0, [r5]
@@ -15935,7 +15935,7 @@ sub_81A2A28: @ 81A2A28
 	lsls r0, 24
 	lsrs r0, 24
 	adds r6, r0, 0
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r10, r0
 	ldrb r0, [r0]
 	str r6, [sp]
@@ -16211,7 +16211,7 @@ sub_81A2C94: @ 81A2C94
 	sub sp, 0xC
 	lsls r0, 24
 	lsrs r7, r0, 24
-	ldr r4, =gResultsWindowId
+	ldr r4, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C74
 	bl AddWindow
 	strb r0, [r4]
@@ -16236,7 +16236,7 @@ _081A2CE0:
 	ldr r0, =gStringVar4
 	movs r1, 0
 	bl sub_81A1C4C
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r8, r0
 	ldrb r0, [r0]
 	ldr r2, =gText_Lv502
@@ -16340,7 +16340,7 @@ sub_81A2DB4: @ 81A2DB4
 	lsls r0, 24
 	lsrs r0, 24
 	adds r7, r0, 0
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r10, r0
 	ldrb r0, [r0]
 	str r7, [sp]
@@ -16506,7 +16506,7 @@ _081A2F26:
 sub_81A2F38: @ 81A2F38
 	push {r4-r6,lr}
 	sub sp, 0xC
-	ldr r5, =gResultsWindowId
+	ldr r5, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C74
 	bl AddWindow
 	strb r0, [r5]
@@ -16584,7 +16584,7 @@ sub_81A2FF8: @ 81A2FF8
 	mov r6, r8
 	push {r6,r7}
 	sub sp, 0xC
-	ldr r4, =gResultsWindowId
+	ldr r4, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C7C
 	bl AddWindow
 	strb r0, [r4]
@@ -16750,7 +16750,7 @@ _081A315C:
 	movs r2, 0x1
 	movs r3, 0x4
 	bl ConvertIntToDecimalStringN
-	ldr r6, =gResultsWindowId
+	ldr r6, =gRecordsWindowId
 	ldrb r0, [r6]
 	movs r1, 0x26
 	adds r3, r5, 0
@@ -19026,7 +19026,7 @@ sub_81A4594: @ 81A4594
 	sub sp, 0x2C
 	mov r8, r1
 	adds r6, r3, 0
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r5, [r1]
 	lsls r4, r0, 1
 	adds r4, r0
@@ -19062,7 +19062,7 @@ sub_81A4594: @ 81A4594
 	ldrb r2, [r6, 0xE]
 	add r0, sp, 0xC
 	bl TVShowConvertInternationalString
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	mov r3, r8
 	adds r3, 0x2
@@ -19102,7 +19102,7 @@ _081A4618:
 	adds r3, r0, 0
 	lsls r3, 24
 	lsrs r3, 24
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	str r7, [sp]
 	mov r1, r10
@@ -19136,7 +19136,7 @@ sub_81A4684: @ 81A4684
 	adds r7, r1, 0
 	mov r10, r2
 	adds r5, r3, 0
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	lsls r2, r6, 1
 	adds r2, r6
@@ -19176,7 +19176,7 @@ sub_81A4684: @ 81A4684
 	ldrb r2, [r5, 0x1A]
 	add r0, sp, 0xC
 	bl TVShowConvertInternationalString
-	ldr r1, =gResultsWindowId
+	ldr r1, =gRecordsWindowId
 	ldrb r0, [r1]
 	adds r3, r7, 0x2
 	lsls r3, 27
@@ -19211,7 +19211,7 @@ _081A4734:
 	adds r1, r4, 0
 	bl StringCopy
 _081A473C:
-	ldr r2, =gResultsWindowId
+	ldr r2, =gRecordsWindowId
 	mov r9, r2
 	ldrb r0, [r2]
 	adds r3, r7, 0x4
@@ -19532,7 +19532,7 @@ sub_81A4998: @ 81A4998
 	ldr r1, [r5]
 	adds r0, r6, 0
 	bl StringExpandPlaceholders
-	ldr r0, =gResultsWindowId
+	ldr r0, =gRecordsWindowId
 	mov r8, r0
 	ldrb r0, [r0]
 	movs r1, 0x1
@@ -19631,7 +19631,7 @@ _081A4A90:
 	thumb_func_start sub_81A4AA0
 sub_81A4AA0: @ 81A4AA0
 	push {r4,lr}
-	ldr r4, =gResultsWindowId
+	ldr r4, =gRecordsWindowId
 	ldr r0, =gUnknown_08611C84
 	bl AddWindow
 	strb r0, [r4]
@@ -19659,7 +19659,7 @@ sub_81A4AA0: @ 81A4AA0
 	thumb_func_start sub_81A4AE8
 sub_81A4AE8: @ 81A4AE8
 	push {r4,lr}
-	ldr r4, =gResultsWindowId
+	ldr r4, =gRecordsWindowId
 	ldrb r0, [r4]
 	movs r1, 0x11
 	bl FillWindowPixelBuffer
@@ -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

asm/cable_club.s

@@ -960,7 +960,7 @@ task_map_chg_seq_0807EC34: @ 80B2B94
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
-	ldr r1, =gUnknown_02039B58
+	ldr r1, =gTrainerCards
 	ldrh r0, [r5]
 	cmp r0, 0x1
 	bne _080B2C10
@@ -1044,7 +1044,7 @@ sub_80B2C30: @ 80B2C30
 _080B2C5C:
 	movs r0, 0x64
 	muls r0, r4
-	ldr r1, =gUnknown_02039B58
+	ldr r1, =gTrainerCards
 	adds r0, r1
 	lsls r1, r4, 8
 	ldr r2, =gBlockRecvBuffer
@@ -2157,8 +2157,8 @@ sub_80B360C: @ 80B360C
 	ands r0, r1
 	str r0, [r2]
 	bl Overworld_ResetMapMusic
-	bl copy_player_party_from_sav1
+	bl LoadPlayerParty
-	bl copy_bags_and_unk_data_to_save_blocks
+	bl SavePlayerBag
 	bl sub_813BF10
 	ldr r0, =gSpecialVar_0x8004
 	ldrh r0, [r0]
@@ -2171,7 +2171,7 @@ sub_80B360C: @ 80B360C
 	ldrb r0, [r0]
 	movs r5, 0x1
 	eors r0, r5
-	bl sub_813C2A0
+	bl UpdatePlayerLinkBattleRecords
 	ldr r0, =gWirelessCommType
 	ldrb r0, [r0]
 	cmp r0, 0
@@ -2251,8 +2251,8 @@ sub_80B36EC: @ 80B36EC
 	cmp r0, 0x9
 	bne _080B370E
 _080B3706:
-	bl copy_player_party_from_sav1
+	bl LoadPlayerParty
-	bl copy_bags_and_unk_data_to_save_blocks
+	bl SavePlayerBag
 _080B370E:
 	movs r0, 0x7F
 	bl copy_saved_warp2_bank_and_enter_x_to_warp1

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

asm/mauville_old_man.s

@@ -90,7 +90,7 @@ sub_8120128: @ 8120128
 	thumb_func_start sub_8120154
 sub_8120154: @ 8120154
 	push {lr}
-	bl sub_81339F8
+	bl TraderSetup
 	pop {r0}
 	bx r0
 	thumb_func_end sub_8120154

asm/party_menu.s

@@ -15368,7 +15368,7 @@ sub_81B83F0: @ 81B83F0
 	lsls r0, r1, 24
 	lsrs r0, 24
 	movs r1, 0x1
-	bl sub_80D6E48
+	bl RemovePCItem
 	b _081B8418
 	.pool
 _081B8410:

asm/pokemon_storage_system.s

@@ -14810,7 +14810,7 @@ _080CF020:
 	beq _080CF0AC
 	ldr r3, =0x00000d65
 	adds r4, r3
-	bl ItemId_GetItem
+	bl ItemId_GetName
 	adds r1, r0, 0
 	adds r0, r4, 0
 	movs r2, 0
@@ -19057,7 +19057,7 @@ sub_80D12B8: @ 80D12B8
 	ldr r1, =0x00002234
 	adds r0, r1
 	ldrh r0, [r0]
-	bl ItemId_GetItem
+	bl ItemId_GetName
 	pop {r1}
 	bx r1
 	.pool

asm/pokemon_summary_screen.s

@@ -4686,7 +4686,7 @@ sub_81C6648: @ 81C6648
 	.pool
 _081C667C:
 	ldrh r0, [r5]
-	bl itemid_is_unique
+	bl ItemId_GetImportance
 	lsls r0, 24
 	cmp r0, 0
 	bne _081C66A0
@@ -4799,7 +4799,7 @@ sub_81C674C: @ 81C674C
 	.pool
 _081C677C:
 	ldrh r0, [r5]
-	bl itemid_is_unique
+	bl ItemId_GetImportance
 	lsls r0, 24
 	cmp r0, 0
 	bne _081C6790

asm/pokenav.s

@@ -28718,8 +28718,8 @@ nullsub_2: @ 81D5C88
 	bx lr
 	thumb_func_end nullsub_2
 
-	thumb_func_start sub_81D5C8C
+	thumb_func_start PrintOnTrainerHillRecordsWindow
-sub_81D5C8C: @ 81D5C8C
+PrintOnTrainerHillRecordsWindow: @ 81D5C8C
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -28857,7 +28857,7 @@ _081D5CD6:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_81D5C8C
+	thumb_func_end PrintOnTrainerHillRecordsWindow
 
 	thumb_func_start free_203F458
 free_203F458: @ 81D5DF0

asm/rom_8011DC0.s

@@ -3181,7 +3181,7 @@ _08014138:
 	adds r3, r1, r0
 	movs r0, 0x64
 	muls r0, r4
-	ldr r1, =gUnknown_02039B58
+	ldr r1, =gTrainerCards
 	adds r0, r1
 	ldrb r2, [r5]
 	adds r1, r3, 0
@@ -3278,8 +3278,8 @@ sub_8014210: @ 8014210
 	lsls r6, 16
 	lsrs r6, 16
 	bl HealPlayerParty
-	bl copy_player_party_to_sav1
+	bl SavePlayerParty
-	bl copy_bags_and_unk_data_from_save_blocks
+	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 SavePlayerParty
-	bl copy_bags_and_unk_data_from_save_blocks
+	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 SavePlayerParty
-	bl copy_bags_and_unk_data_from_save_blocks
+	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 SavePlayerParty
-	bl copy_bags_and_unk_data_from_save_blocks
+	bl LoadPlayerBag
 	ldr r0, =gBlockSendBuffer
 	movs r1, 0x1
 	bl sub_80143E4
@@ -10615,7 +10615,7 @@ sub_8018220: @ 8018220
 	lsrs r0, 24
 	movs r1, 0x64
 	muls r1, r0
-	ldr r0, =gUnknown_02039B58
+	ldr r0, =gTrainerCards
 	adds r1, r0
 	mov r8, r1
 	bl UnkTextUtil_Reset

asm/shop.s

@@ -790,7 +790,7 @@ BuyMenuPrintPriceInList: @ 80E0114
 	ldr r5, =gStringVar1
 	lsls r0, r1, 16
 	lsrs r0, 16
-	bl itemid_get_market_price
+	bl ItemId_GetPrice
 	adds r4, r0, 0
 	movs r0, 0x1
 	bl GetPriceReduction
@@ -2017,7 +2017,7 @@ _080E0B32:
 	bne _080E0B80
 	lsls r0, r5, 16
 	lsrs r0, 16
-	bl itemid_get_market_price
+	bl ItemId_GetPrice
 	adds r4, r0, 0
 	movs r0, 0x1
 	bl GetPriceReduction
@@ -2259,7 +2259,7 @@ Task_BuyHowManyDialogueHandleInput: @ 80E0D88
 	cmp r0, 0x1
 	bne _080E0DF0
 	ldrh r0, [r5, 0xA]
-	bl itemid_get_market_price
+	bl ItemId_GetPrice
 	adds r4, r0, 0
 	movs r0, 0x1
 	bl GetPriceReduction

asm/trader.s

@@ -1,558 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81339F8
-sub_81339F8: @ 81339F8
-	push {r4-r6,lr}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00002e28
-	adds r5, r1, r0
-	movs r2, 0
-	movs r0, 0x2
-	strb r0, [r5]
-	ldr r0, =0x00002e59
-	adds r1, r0
-	strb r2, [r1]
-	movs r4, 0
-	ldr r6, =gUnknown_085B09E4
-_08133A12:
-	movs r0, 0xB
-	muls r0, r4
-	adds r0, 0x5
-	adds r0, r5, r0
-	lsls r1, r4, 2
-	adds r1, r6
-	ldr r1, [r1]
-	bl StringCopy
-	adds r1, r5, 0x1
-	adds r1, r4
-	ldr r0, =gUnknown_085B09F4
-	adds r0, r4, r0
-	ldrb r0, [r0]
-	strb r0, [r1]
-	adds r0, r5, 0
-	adds r0, 0x32
-	adds r0, r4
-	movs r1, 0x2
-	strb r1, [r0]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x3
-	bls _08133A12
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81339F8
-
-	thumb_func_start sub_8133A60
-sub_8133A60: @ 8133A60
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00002e59
-	adds r0, r1
-	movs r1, 0
-	strb r1, [r0]
-	bx lr
-	.pool
-	thumb_func_end sub_8133A60
-
-	thumb_func_start sub_8133A78
-sub_8133A78: @ 8133A78
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x14
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, =gTasks + 0x8
-	adds r7, r1, r0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r4, [r0]
-	ldr r0, =0x00002e28
-	adds r0, r4
-	mov r9, r0
-	ldr r0, =gUnknown_085B09F8
-	ldr r1, [r0, 0x4]
-	ldr r0, [r0]
-	str r0, [sp, 0xC]
-	str r1, [sp, 0x10]
-	ldr r1, =gText_Exit
-	movs r0, 0x1
-	movs r2, 0
-	bl GetStringWidth
-	adds r6, r0, 0
-	ldr r1, =gText_FiveMarks
-	movs r0, 0x1
-	movs r2, 0
-	bl GetStringWidth
-	mov r8, r0
-	movs r5, 0
-	ldr r0, =0x00002e29
-	adds r4, r0
-_08133AC2:
-	mov r0, r9
-	adds r0, 0x1
-	adds r1, r0, r5
-	ldrb r0, [r1]
-	cmp r0, 0x78
-	bls _08133AF0
-	mov r0, r8
-	b _08133B00
-	.pool
-_08133AF0:
-	ldrb r1, [r1]
-	lsls r1, 5
-	ldr r0, =gDecorations + 1
-	adds r1, r0
-	movs r0, 0x1
-	movs r2, 0
-	bl GetStringWidth
-_08133B00:
-	cmp r0, r6
-	ble _08133B06
-	adds r6, r0, 0
-_08133B06:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x3
-	bls _08133AC2
-	adds r0, r6, 0
-	bl convert_pixel_width_to_tile_width
-	lsls r0, 24
-	ldr r2, =0x00ffffff
-	ldr r1, [sp, 0xC]
-	ands r1, r2
-	orrs r1, r0
-	str r1, [sp, 0xC]
-	add r0, sp, 0xC
-	bl AddWindow
-	strh r0, [r7, 0x6]
-	lsls r0, 24
-	lsrs r0, 24
-	movs r2, 0x85
-	lsls r2, 2
-	movs r1, 0
-	movs r3, 0xE
-	bl SetWindowBorderStyle
-	movs r5, 0
-_08133B3C:
-	adds r1, r4, r5
-	ldrb r0, [r1]
-	cmp r0, 0x78
-	bls _08133B70
-	ldrb r0, [r7, 0x6]
-	lsls r1, r5, 4
-	adds r1, 0x1
-	lsls r1, 24
-	lsrs r1, 24
-	str r1, [sp]
-	movs r1, 0xFF
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	movs r1, 0x1
-	ldr r2, =gText_FiveMarks
-	movs r3, 0x8
-	bl PrintTextOnWindow
-	b _08133B94
-	.pool
-_08133B70:
-	ldrb r0, [r7, 0x6]
-	ldrb r2, [r1]
-	lsls r2, 5
-	ldr r1, =gDecorations + 1
-	adds r2, r1
-	lsls r1, r5, 4
-	adds r1, 0x1
-	lsls r1, 24
-	lsrs r1, 24
-	str r1, [sp]
-	movs r1, 0xFF
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x8
-	bl PrintTextOnWindow
-_08133B94:
-	adds r0, r5, 0x1
-	lsls r0, 24
-	lsrs r5, r0, 24
-	cmp r5, 0x3
-	bls _08133B3C
-	ldrb r0, [r7, 0x6]
-	ldr r2, =gText_Exit
-	lsls r1, r5, 4
-	adds r1, 0x1
-	lsls r1, 24
-	lsrs r1, 24
-	str r1, [sp]
-	movs r1, 0xFF
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	movs r1, 0x1
-	movs r3, 0x8
-	bl PrintTextOnWindow
-	ldrb r0, [r7, 0x6]
-	movs r1, 0x5
-	movs r2, 0
-	bl InitMenuInUpperLeftCornerPlaySoundWhenAPressed
-	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
-	add sp, 0x14
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133A78
-
-	thumb_func_start sub_8133BE4
-sub_8133BE4: @ 8133BE4
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	lsls r1, 24
-	lsrs r2, r1, 24
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r4, r0, r1
-	cmp r2, 0x78
-	bls _08133C14
-	ldr r1, =gSpecialVar_0x8004
-	ldr r2, =0x0000ffff
-	adds r0, r2, 0
-	strh r0, [r1]
-	b _08133C18
-	.pool
-_08133C14:
-	ldr r0, =gSpecialVar_0x8004
-	strh r2, [r0]
-_08133C18:
-	ldrb r0, [r4, 0x6]
-	movs r1, 0
-	bl sub_8198070
-	ldrb r0, [r4, 0x6]
-	bl ClearWindowTilemap
-	ldrb r0, [r4, 0x6]
-	bl RemoveWindow
-	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
-	adds r0, r5, 0
-	bl DestroyTask
-	bl EnableBothScriptContexts
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133BE4
-
-	thumb_func_start sub_8133C48
-sub_8133C48: @ 8133C48
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00002e28
-	adds r6, r0, r1
-	bl ProcessMenuInput
-	lsls r0, 24
-	lsrs r4, r0, 24
-	asrs r1, r0, 24
-	movs r0, 0x1
-	negs r0, r0
-	cmp r1, r0
-	beq _08133C80
-	cmp r1, r0
-	bgt _08133C7C
-	subs r0, 0x1
-	cmp r1, r0
-	beq _08133CCA
-	b _08133C90
-	.pool
-_08133C7C:
-	cmp r1, 0x4
-	bne _08133C90
-_08133C80:
-	movs r0, 0x5
-	bl PlaySE
-	adds r0, r7, 0
-	movs r1, 0
-	bl sub_8133BE4
-	b _08133CCA
-_08133C90:
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, =gSpecialVar_0x8005
-	lsls r4, 24
-	asrs r4, 24
-	strh r4, [r0]
-	ldr r5, =gStringVar1
-	movs r0, 0xB
-	adds r1, r4, 0
-	muls r1, r0
-	adds r1, 0x5
-	adds r1, r6, r1
-	adds r0, r5, 0
-	bl StringCopy
-	adds r0, r6, 0
-	adds r0, 0x32
-	adds r0, r4
-	ldrb r1, [r0]
-	adds r0, r5, 0
-	bl ConvertInternationalString
-	adds r0, r6, 0x1
-	adds r0, r4
-	ldrb r1, [r0]
-	adds r0, r7, 0
-	bl sub_8133BE4
-_08133CCA:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133C48
-
-	thumb_func_start sub_8133CD8
-sub_8133CD8: @ 8133CD8
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =gSpecialVar_Result
-	ldr r2, =0x00002e59
-	adds r0, r2
-	ldrb r0, [r0]
-	strh r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end sub_8133CD8
-
-	thumb_func_start sub_8133CF4
-sub_8133CF4: @ 8133CF4
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, =gSpecialVar_Result
-_08133CFA:
-	adds r0, r4, 0
-	bl CountDecorationCategoryN
-	lsls r0, 24
-	cmp r0, 0
-	beq _08133D10
-	movs r0, 0
-	strh r0, [r5]
-	b _08133D20
-	.pool
-_08133D10:
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _08133CFA
-	ldr r1, =gSpecialVar_Result
-	movs r0, 0x1
-	strh r0, [r1]
-_08133D20:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133CF4
-
-	thumb_func_start sub_8133D2C
-sub_8133D2C: @ 8133D2C
-	push {r4-r6,lr}
-	ldr r6, =gSpecialVar_Result
-	movs r0, 0
-	strh r0, [r6]
-	ldr r4, =gDecorations
-	ldr r5, =gSpecialVar_0x8004
-	ldrh r0, [r5]
-	lsls r0, 5
-	adds r2, r0, r4
-	ldr r0, =gSpecialVar_0x8006
-	ldrh r0, [r0]
-	lsls r0, 5
-	adds r0, r4
-	ldrb r1, [r2, 0x13]
-	ldrb r0, [r0, 0x13]
-	cmp r1, r0
-	beq _08133D72
-	adds r0, r1, 0
-	bl GetFirstEmptyDecorSlot
-	lsls r0, 24
-	asrs r0, 24
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	bne _08133D72
-	ldr r0, =gStringVar2
-	ldrh r1, [r5]
-	lsls r1, 5
-	adds r1, r4
-	ldrb r1, [r1, 0x13]
-	bl sub_8127250
-	movs r0, 0x1
-	strh r0, [r6]
-_08133D72:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133D2C
-
-	thumb_func_start sub_8133D8C
-sub_8133D8C: @ 8133D8C
-	push {lr}
-	ldr r0, =sub_8127208
-	movs r1, 0
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133D8C
-
-	thumb_func_start sub_8133DA0
-sub_8133DA0: @ 8133DA0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	bl IsSelectedDecorInThePC
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08133DFC
-	ldr r5, =gSpecialVar_0x8006
-	ldr r0, =gCurDecorationIndex
-	ldrb r1, [r0]
-	ldr r0, =gCurDecorInventoryItems
-	ldr r0, [r0]
-	adds r0, r1
-	ldrb r0, [r0]
-	strh r0, [r5]
-	ldr r0, =gStringVar3
-	ldr r1, =gSpecialVar_0x8004
-	ldrh r1, [r1]
-	lsls r1, 5
-	ldr r4, =gDecorations + 1
-	adds r1, r4
-	bl StringCopy
-	ldr r0, =gStringVar2
-	ldrh r1, [r5]
-	lsls r1, 5
-	adds r1, r4
-	bl StringCopy
-	b _08133E04
-	.pool
-_08133DFC:
-	ldr r1, =gSpecialVar_0x8006
-	ldr r2, =0x0000ffff
-	adds r0, r2, 0
-	strh r0, [r1]
-_08133E04:
-	adds r0, r6, 0
-	bl DestroyTask
-	bl EnableBothScriptContexts
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133DA0
-
-	thumb_func_start sub_8133E1C
-sub_8133E1C: @ 8133E1C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gSpecialVar_0x8006
-	movs r1, 0
-	strh r1, [r2]
-	bl DestroyTask
-	bl EnableBothScriptContexts
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133E1C
-
-	thumb_func_start sub_8133E38
-sub_8133E38: @ 8133E38
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	ldr r0, =gSaveBlock1Ptr
-	ldr r6, [r0]
-	ldr r0, =0x00002e28
-	adds r5, r6, r0
-	ldr r1, =gSpecialVar_0x8006
-	mov r8, r1
-	ldrb r0, [r1]
-	bl DecorationRemove
-	ldr r0, =gSpecialVar_0x8004
-	ldrb r0, [r0]
-	bl DecorationAdd
-	ldr r4, =gSpecialVar_0x8005
-	ldrh r1, [r4]
-	movs r0, 0xB
-	muls r0, r1
-	adds r0, 0x5
-	adds r5, r0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r1, [r0]
-	adds r0, r5, 0
-	bl StringCopy
-	ldr r2, =0x00002e29
-	adds r0, r6, r2
-	ldrh r1, [r4]
-	adds r0, r1
-	mov r2, r8
-	ldrh r1, [r2]
-	strb r1, [r0]
-	ldr r1, =0x00002e5a
-	adds r0, r6, r1
-	ldrh r4, [r4]
-	adds r0, r4
-	movs r1, 0x2
-	strb r1, [r0]
-	ldr r2, =0x00002e59
-	adds r6, r2
-	movs r0, 0x1
-	strb r0, [r6]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133E38
-
-	thumb_func_start sub_8133EC0
-sub_8133EC0: @ 8133EC0
-	push {lr}
-	ldr r0, =sub_8133C48
-	movs r1, 0
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_8133A78
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8133EC0
-
-	.align 2, 0 @ Don't pad with nop.

asm/trainer_card.s

@@ -3894,7 +3894,7 @@ _080C48F6:
 sub_80C4904: @ 80C4904
 	lsls r0, 24
 	lsrs r0, 24
-	ldr r2, =gUnknown_02039B58
+	ldr r2, =gTrainerCards
 	movs r1, 0x64
 	muls r0, r1
 	adds r0, r2
@@ -4578,7 +4578,7 @@ sub_80C4E74: @ 80C4E74
 	ldr r0, [r5]
 	ldr r1, =0x00000534
 	adds r0, r1
-	ldr r2, =gUnknown_02039B58
+	ldr r2, =gTrainerCards
 	movs r1, 0x64
 	muls r1, r4
 	adds r1, r2

common_syms/load_save.txt

@@ -0,0 +1,4 @@
+gFlashMemoryPresent
+gSaveBlock1Ptr
+gSaveBlock2Ptr
+gPokemonStoragePtr

common_syms/random.txt

@@ -0,0 +1,2 @@
+gRngValue
+gRng2Value

data/battle_records.s

@@ -1,37 +0,0 @@
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_085B3484:: @ 85B3484
-	.incbin "graphics/unknown/unknown_5B3484.4bpp"
-
-	.align 2
-gUnknown_085B3544:: @ 85B3544
-	.incbin "graphics/unknown/unknown_5B3484.gbapal"
-
-	.align 2
-gUnknown_085B3564:: @ 85B3564
-	.incbin "graphics/unknown/unknown_5B3564.bin"
-
-	.align 2
-gUnknown_085B3D64:: @ 85B3D64
-	.4byte 0x000001f0, 0x000031e7
-
-	.align 2
-gUnknown_085B3D6C:: @ 85B3D6C
-	window_template 0x00, 0x02, 0x01, 0x1a, 0x12, 0x0f, 0x0014
-	null_window_template
-
-	.align 2
-gUnknown_085B3D7C:: @ 85B3D7C
-	window_template 0x00, 0x02, 0x01, 0x1a, 0x11, 0x0f, 0x0001
-
-gUnknown_085B3D84:: @ 85B3D84
-	.string "-------$"
-
-gUnknown_085B3D8C:: @ 85B3D8C
-	.string "----$"
-

data/scripts/cable_club.inc

@@ -450,8 +450,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
 
 OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
 	special HealPlayerParty
-	special copy_player_party_to_sav1
+	special SavePlayerParty
-	special copy_bags_and_unk_data_from_save_blocks
+	special LoadPlayerBag
 	copyvar VAR_0x4087, VAR_0x8004
 	messageautoscroll OldaleTown_PokemonCenter_2F_Text_278197
 	waitmessage
@@ -787,9 +787,9 @@ MossdeepCity_GameCorner_1F_Movement_277360: @ 8277360
 gUnknown_08277365:: @ 8277365
 	lockall
 	setvar VAR_0x8004, 0
-	special sub_813C4BC
+	special ShowLinkBattleRecords
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc

@@ -136,8 +136,8 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
 	waitmovement 0
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257CE9, 4
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780

data/scripts/maps/BattleFrontier_BattleArenaLobby.inc

@@ -89,7 +89,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255D2B:: @ 8255D2B
 BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
 	setvar VAR_0x8004, 8
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	special HealPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
@@ -134,7 +134,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255DF4:: @ 8255DF4
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, 3
 	setvar VAR_0x40CE, 0
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox BattleFrontier_BattleArenaLobby_Text_256166, 4
 
 BattleFrontier_BattleArenaLobby_EventScript_255E0B:: @ 8255E0B
@@ -196,7 +196,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call BattleFrontier_BattleArenaLobby_EventScript_27134F
@@ -205,7 +205,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1
 
 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -248,7 +248,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255FE1:: @ 8255FE1
 	goto BattleFrontier_BattleArenaLobby_EventScript_255FFB
 
 BattleFrontier_BattleArenaLobby_EventScript_255FF8:: @ 8255FF8
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 BattleFrontier_BattleArenaLobby_EventScript_255FFB:: @ 8255FFB
 	msgbox BattleFrontier_BattleArenaLobby_Text_25621F, 4
@@ -348,7 +348,7 @@ BattleFrontier_BattleArenaLobby_EventScript_256092:: @ 8256092
 	setvar VAR_0x8005, 3
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/BattleFrontier_BattleDomeLobby.inc

@@ -76,7 +76,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	msgbox BattleFrontier_BattleDomeLobby_Text_241520, 9
 	message BattleFrontier_BattleDomeLobby_Text_24A5D6
 	waitmessage
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -94,7 +94,7 @@ BattleFrontier_BattleDomeLobby_EventScript_2498C9:: @ 82498C9
 	setvar VAR_0x8005, 1
 	setvar VAR_0x8006, 1
 	special sub_818E9AC
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	special HealPlayerParty
 	goto BattleFrontier_BattleDomeLobby_EventScript_249991
 
@@ -103,7 +103,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
 	msgbox BattleFrontier_BattleDomeLobby_Text_24A5BF, 4
 	message BattleFrontier_BattleDomeLobby_Text_24A5D6
 	waitmessage
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -117,7 +117,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249940:: @ 8249940
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 1
 	special sub_818E9AC
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	special HealPlayerParty
 
 BattleFrontier_BattleDomeLobby_EventScript_249991:: @ 8249991
@@ -181,7 +181,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249A47:: @ 8249A47
 	end
 
 BattleFrontier_BattleDomeLobby_EventScript_249A59:: @ 8249A59
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	compare VAR_0x40CE, 0
 	call_if 1, BattleFrontier_BattleDomeLobby_EventScript_249CFD
 	compare VAR_0x40CE, 1
@@ -245,7 +245,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call BattleFrontier_BattleDomeLobby_EventScript_27134F
@@ -256,7 +256,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249B60:: @ 8249B60
 	special sub_818E9AC
 
 BattleFrontier_BattleDomeLobby_EventScript_249BC2:: @ 8249BC2
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -299,7 +299,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249C4A:: @ 8249C4A
 	goto BattleFrontier_BattleDomeLobby_EventScript_249C64
 
 BattleFrontier_BattleDomeLobby_EventScript_249C61:: @ 8249C61
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 BattleFrontier_BattleDomeLobby_EventScript_249C64:: @ 8249C64
 	msgbox BattleFrontier_BattleDomeLobby_Text_249F74, 4
@@ -415,7 +415,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D52:: @ 8249D52
 	setvar VAR_0x8006, 0
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 
@@ -426,7 +426,7 @@ BattleFrontier_BattleDomeLobby_EventScript_249D6B:: @ 8249D6B
 	setvar VAR_0x8006, 1
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/BattleFrontier_BattleDomePreBattleRoom.inc

@@ -243,7 +243,7 @@ BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5BE:: @ 824B5BE
 BattleFrontier_BattleDomePreBattleRoom_EventScript_24B5C7:: @ 824B5C7
 	setvar VAR_0x4000, 1
 	msgbox BattleFrontier_BattleDomePreBattleRoom_Text_24B760, 4
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780

data/scripts/maps/BattleFrontier_BattleFactoryLobby.inc

@@ -74,7 +74,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2584C6:: @ 82584C6
 	waitmessage
 	setvar VAR_0x8004, 8
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
 	special sub_81A5E74
@@ -89,7 +89,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258506:: @ 8258506
 	waitmessage
 	setvar VAR_0x8004, 8
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 2
 	setvar VAR_0x8006, 0
@@ -154,7 +154,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2585DD:: @ 82585DD
 	end
 
 BattleFrontier_BattleFactoryLobby_EventScript_2585ED:: @ 82585ED
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	compare VAR_0x40CE, 0
 	call_if 1, BattleFrontier_BattleFactoryLobby_EventScript_2587B1
 	compare VAR_0x40CE, 1
@@ -215,7 +215,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2586B9:: @ 82586B9
 	setvar VAR_0x8006, 0
 
 BattleFrontier_BattleFactoryLobby_EventScript_25871A:: @ 825871A
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258CB1, 4
 	closemessage
 	compare VAR_0x40CE, 0
@@ -253,7 +253,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_258783:: @ 8258783
 	goto BattleFrontier_BattleFactoryLobby_EventScript_25879D
 
 BattleFrontier_BattleFactoryLobby_EventScript_25879A:: @ 825879A
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 BattleFrontier_BattleFactoryLobby_EventScript_25879D:: @ 825879D
 	msgbox BattleFrontier_BattleFactoryLobby_Text_258BC5, 4
@@ -305,7 +305,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587E1:: @ 82587E1
 	setvar VAR_0x8006, 0
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 
@@ -316,7 +316,7 @@ BattleFrontier_BattleFactoryLobby_EventScript_2587FA:: @ 82587FA
 	setvar VAR_0x8006, 1
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/BattleFrontier_BattleFactoryPreBattleRoom.inc

@@ -236,7 +236,7 @@ BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E47:: @ 8259E47
 	end
 
 BattleFrontier_BattleFactoryPreBattleRoom_EventScript_259E69:: @ 8259E69
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 10
 	setvar VAR_0x8005, 0
 	special sub_81A5E74

data/scripts/maps/BattleFrontier_BattlePalaceBattleRoom.inc

@@ -93,8 +93,8 @@ BattleFrontier_BattlePalaceBattleRoom_EventScript_24F911:: @ 824F911
 	applymovement 3, BattleFrontier_BattlePalaceBattleRoom_Movement_24FEAC
 	waitmovement 0
 	msgbox BattleFrontier_BattlePalaceBattleRoom_Text_24FF00, 4
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780

data/scripts/maps/BattleFrontier_BattlePalaceLobby.inc

@@ -89,7 +89,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D873:: @ 824D873
 BattleFrontier_BattlePalaceLobby_EventScript_24D8A1:: @ 824D8A1
 	setvar VAR_0x8004, 8
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	special HealPlayerParty
 	setvar VAR_0x8004, 7
 	setvar VAR_0x8005, 0
@@ -152,7 +152,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24D968:: @ 824D968
 	special sub_8195960
 	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattlePalaceLobby_EventScript_24D817
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	compare VAR_0x40CE, 0
 	call_if 1, BattleFrontier_BattlePalaceLobby_EventScript_24DB9E
 	compare VAR_0x40CE, 1
@@ -220,7 +220,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call BattleFrontier_BattlePalaceLobby_EventScript_27134F
@@ -229,7 +229,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DA87:: @ 824DA87
 	goto_eq BattleFrontier_BattlePalaceLobby_EventScript_24DB7A
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DAF3:: @ 824DAF3
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -272,7 +272,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DB7A:: @ 824DB7A
 	goto BattleFrontier_BattlePalaceLobby_EventScript_24DB94
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB91:: @ 824DB91
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 BattleFrontier_BattlePalaceLobby_EventScript_24DB94:: @ 824DB94
 	msgbox BattleFrontier_BattlePalaceLobby_Text_24E0D8, 4
@@ -366,7 +366,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC50:: @ 824DC50
 	setvar VAR_0x8006, 0
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 
@@ -377,7 +377,7 @@ BattleFrontier_BattlePalaceLobby_EventScript_24DC69:: @ 824DC69
 	setvar VAR_0x8006, 1
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/BattleFrontier_BattlePikeLobby.inc

@@ -76,7 +76,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B78D:: @ 825B78D
 	setvar VAR_0x8005, 3
 	copyvar VAR_0x8006, VAR_RESULT
 	special sub_81A703C
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	special HealPlayerParty
 	setvar VAR_0x8004, 27
 	special sub_81A703C
@@ -107,7 +107,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B806:: @ 825B806
 	setvar VAR_0x8005, 4
 	setvar VAR_0x8006, 0
 	special sub_81A703C
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	special HealPlayerParty
 	setvar VAR_0x8004, 27
 	special sub_81A703C
@@ -127,7 +127,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B868:: @ 825B868
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, 5
 	setvar VAR_0x40CE, 0
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox BattleFrontier_BattlePikeLobby_Text_25BB52, 4
 
 BattleFrontier_BattlePikeLobby_EventScript_25B87F:: @ 825B87F
@@ -192,7 +192,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call BattleFrontier_BattlePikeLobby_EventScript_27134F
@@ -201,7 +201,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25B95C:: @ 825B95C
 	special sub_81A703C
 	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattlePikeLobby_EventScript_25BA5C
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -242,7 +242,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA5C:: @ 825BA5C
 	goto BattleFrontier_BattlePikeLobby_EventScript_25BA76
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA73:: @ 825BA73
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 BattleFrontier_BattlePikeLobby_EventScript_25BA76:: @ 825BA76
 	msgbox BattleFrontier_BattlePikeLobby_Text_25BE02, 4
@@ -257,7 +257,7 @@ BattleFrontier_BattlePikeLobby_EventScript_25BA80:: @ 825BA80
 	setvar VAR_0x8005, 5
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/BattleFrontier_BattlePikeThreePathRoom.inc

@@ -45,7 +45,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C8A4:: @ 825C8A4
 	setvar VAR_0x8006, 0
 	special sub_81A1780
 	setvar VAR_0x4000, 255
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -136,7 +136,7 @@ BattleFrontier_BattlePikeThreePathRoom_EventScript_25C9FD:: @ 825C9FD
 	special sub_81A1780
 	message BattleFrontier_BattlePikeThreePathRoom_Text_25CE08
 	waitmessage
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 8
 	setvar VAR_0x8005, 2
 	special sub_81A703C

data/scripts/maps/BattleFrontier_BattlePyramidEmptySquare.inc

@@ -99,7 +99,7 @@ BattleFrontier_BattlePyramidEmptySquare_EventScript_252B8D:: @ 8252B8D
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 1
 	special sub_81A8E7C
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0

data/scripts/maps/BattleFrontier_BattlePyramidLobby.inc

@@ -67,7 +67,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 	clearflag FLAG_SPECIAL_FLAG_0x4004
 	setvar VAR_0x8004, 8
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 14
 	special sub_81A8E7C
 	special HealPlayerParty
@@ -97,7 +97,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2507DA:: @ 82507DA
 BattleFrontier_BattlePyramidLobby_EventScript_250852:: @ 8250852
 	setvar VAR_0x8004, 8
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 14
 	special sub_81A8E7C
 	special HealPlayerParty
@@ -131,7 +131,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2508B1:: @ 82508B1
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, 6
 	setvar VAR_0x40CE, 0
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox BattleFrontier_BattlePyramidLobby_Text_250F31, 4
 
 BattleFrontier_BattlePyramidLobby_EventScript_2508C8:: @ 82508C8
@@ -197,7 +197,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	special sub_81A8E7C
 	setvar VAR_0x8004, 9
 	special sub_81A8E7C
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call BattleFrontier_BattlePyramidLobby_EventScript_27134F
@@ -206,7 +206,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_2509A5:: @ 82509A5
 	goto_eq BattleFrontier_BattlePyramidLobby_EventScript_250AAA
 
 BattleFrontier_BattlePyramidLobby_EventScript_250A21:: @ 8250A21
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -249,7 +249,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250AAA:: @ 8250AAA
 	goto BattleFrontier_BattlePyramidLobby_EventScript_250AC4
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AC1:: @ 8250AC1
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 BattleFrontier_BattlePyramidLobby_EventScript_250AC4:: @ 8250AC4
 	msgbox BattleFrontier_BattlePyramidLobby_Text_250FE5, 4
@@ -428,7 +428,7 @@ BattleFrontier_BattlePyramidLobby_EventScript_250D42:: @ 8250D42
 	setvar VAR_0x8005, 6
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/BattleFrontier_BattlePyramidTop.inc

@@ -72,7 +72,7 @@ BattleFrontier_BattlePyramidTop_EventScript_255193:: @ 8255193
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 1
 	special sub_81A8E7C
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 0

data/scripts/maps/BattleFrontier_BattleTowerBattleRoom2.inc

@@ -153,7 +153,7 @@ BattleFrontier_BattleTowerBattleRoom2_EventScript_249118:: @ 8249118
 	delay 48
 
 BattleFrontier_BattleTowerBattleRoom2_EventScript_249121:: @ 8249121
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 2
 	special sub_81A1780

data/scripts/maps/BattleFrontier_BattleTowerLobby.inc

@@ -152,7 +152,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E84D:: @ 823E84D
 	waitmessage
 	setvar VAR_0x8004, 8
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	special HealPlayerParty
 	setvar VAR_0x8004, 6
 	setvar VAR_0x8005, 0
@@ -240,7 +240,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E936:: @ 823E936
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, 0
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_240537, 4
 
 BattleFrontier_BattleTowerLobby_EventScript_23E948:: @ 823E948
@@ -299,7 +299,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA2A:: @ 823EA2A
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call BattleFrontier_BattleTowerLobby_EventScript_27134F
@@ -320,7 +320,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EA9F:: @ 823EA9F
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, 0
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_2407E2, 4
 
 BattleFrontier_BattleTowerLobby_EventScript_23EAB1:: @ 823EAB1
@@ -379,7 +379,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EB93:: @ 823EB93
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call BattleFrontier_BattleTowerLobby_EventScript_27134F
@@ -401,7 +401,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, 0
 	clearflag FLAG_0x152
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, 4
 
 BattleFrontier_BattleTowerLobby_EventScript_23EC1D:: @ 823EC1D
@@ -460,7 +460,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ECFF:: @ 823ECFF
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call BattleFrontier_BattleTowerLobby_EventScript_27134F
@@ -481,7 +481,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23ED74:: @ 823ED74
 	lock
 	faceplayer
 	setvar VAR_FRONTIER_FACILITY, 0
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox BattleFrontier_BattleTowerLobby_Text_240E15, 4
 
 BattleFrontier_BattleTowerLobby_EventScript_23ED86:: @ 823ED86
@@ -540,7 +540,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EE68:: @ 823EE68
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	setvar VAR_0x8004, 6
@@ -636,7 +636,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFC7:: @ 823EFC7
 	setvar VAR_0x8006, 0
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 
@@ -647,7 +647,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFE0:: @ 823EFE0
 	setvar VAR_0x8006, 1
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 
@@ -658,7 +658,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EFF9:: @ 823EFF9
 	setvar VAR_0x8006, 2
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 
@@ -669,7 +669,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F012:: @ 823F012
 	setvar VAR_0x8006, 3
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 
@@ -722,7 +722,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0D0:: @ 823F0D0
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0E3:: @ 823F0E3
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0E6:: @ 823F0E6
 	special CloseLink
@@ -733,7 +733,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F0F1:: @ 823F0F1
 	end
 
 BattleFrontier_BattleTowerLobby_EventScript_23F0F3:: @ 823F0F3
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	call BattleFrontier_BattleTowerLobby_EventScript_23F272
 	special sub_81A1780

data/scripts/maps/BattleFrontier_RankingHall.inc

@@ -66,7 +66,7 @@ BattleFrontier_RankingHall_EventScript_25E522:: @ 825E522
 	waitbuttonpress
 	special sub_81A4AE8
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/FallarborTown_BattleTentBattleRoom.inc

@@ -72,7 +72,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_20097E:: @ 820097E
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
@@ -103,8 +103,8 @@ FallarborTown_BattleTentBattleRoom_EventScript_2009B3:: @ 82009B3
 	applymovement 1, FallarborTown_BattleTentBattleRoom_Movement_200B94
 	waitmovement 0
 	msgbox FallarborTown_BattleTentBattleRoom_Text_257CE9, 4
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -157,7 +157,7 @@ FallarborTown_BattleTentBattleRoom_EventScript_200AF3:: @ 8200AF3
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	warp FALLARBOR_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 	setvar VAR_0x8004, 1

data/scripts/maps/FallarborTown_BattleTentLobby.inc

@@ -134,7 +134,7 @@ FallarborTown_BattleTentLobby_EventScript_200001:: @ 8200001
 	special sub_81B9B80
 	compare VAR_RESULT, 0
 	goto_if 5, FallarborTown_BattleTentLobby_EventScript_1FFF84
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox FallarborTown_BattleTentLobby_Text_2C47EB, 4
 
 FallarborTown_BattleTentLobby_EventScript_200021:: @ 8200021
@@ -188,7 +188,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call FallarborTown_BattleTentLobby_EventScript_27134F
@@ -197,7 +197,7 @@ FallarborTown_BattleTentLobby_EventScript_2000E2:: @ 82000E2
 	goto_eq FallarborTown_BattleTentLobby_EventScript_2001AB
 
 FallarborTown_BattleTentLobby_EventScript_20013C:: @ 820013C
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -234,7 +234,7 @@ FallarborTown_BattleTentLobby_EventScript_2001AB:: @ 82001AB
 	goto FallarborTown_BattleTentLobby_EventScript_2001C5
 
 FallarborTown_BattleTentLobby_EventScript_2001C2:: @ 82001C2
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 FallarborTown_BattleTentLobby_EventScript_2001C5:: @ 82001C5
 	msgbox FallarborTown_BattleTentLobby_Text_2C487F, 4

data/scripts/maps/LilycoveCity_ContestLobby.inc

@@ -554,7 +554,7 @@ LilycoveCity_ContestLobby_EventScript_21A77A:: @ 821A77A
 	lockall
 	special ShowBerryBlenderRecordWindow
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 
@@ -564,7 +564,7 @@ LilycoveCity_ContestLobby_EventScript_21A784:: @ 821A784
 	setvar VAR_0x8005, 7
 	special sub_81A1780
 	waitbuttonpress
-	special sub_813C5A0
+	special RemoveRecordsWindow
 	releaseall
 	end
 

data/scripts/maps/MauvilleCity_BikeShop.inc

@@ -58,7 +58,7 @@ MauvilleCity_BikeShop_EventScript_20EC6D:: @ 820EC6D
 
 MauvilleCity_BikeShop_EventScript_20EC87:: @ 820EC87
 	msgbox MauvilleCity_BikeShop_Text_20F1BD, 4
-	special sub_80D6EDC
+	special SwapRegisteredBike
 	release
 	end
 

data/scripts/maps/MossdeepCity_SpaceCenter_2F.inc

@@ -250,13 +250,13 @@ MossdeepCity_SpaceCenter_2F_EventScript_223FDA:: @ 8223FDA
 MossdeepCity_SpaceCenter_2F_EventScript_22400C:: @ 822400C
 	applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_2F_Movement_2725AA
 	waitmovement 0
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	fadescreen 1
 	special sub_80F9438
 	waitstate
 	compare VAR_RESULT, 0
 	goto_if 5, MossdeepCity_SpaceCenter_2F_EventScript_224032
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	goto MossdeepCity_SpaceCenter_2F_EventScript_223FDA
 
 MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
@@ -270,7 +270,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224032:: @ 8224032
 	waitstate
 	setvar VAR_0x8004, 6
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	switch VAR_RESULT
 	case 1, MossdeepCity_SpaceCenter_2F_EventScript_224071
 	fadescreen 1

data/scripts/maps/PetalburgCity.inc

@@ -30,7 +30,7 @@ PetalburgCity_MapScript2_1DC31C: @ 81DC31C
 
 PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 	lockall
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	special PutZigzagoonInPlayerParty
 	applymovement 2, PetalburgCity_Movement_1DC451
 	applymovement 255, PetalburgCity_Movement_1DC430
@@ -47,7 +47,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 	setvar VAR_0x4057, 3
 	fadedefaultbgm
 	clearflag FLAG_SPECIAL_FLAG_0x4001
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x4085, 1
 	warp PETALBURG_CITY_GYM, 255, 4, 108
 	waitstate

data/scripts/maps/SlateportCity_BattleTentBattleRoom.inc

@@ -67,7 +67,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A1B:: @ 8209A1B
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
@@ -93,7 +93,7 @@ SlateportCity_BattleTentCorridor_EventScript_209A7B:: @ 8209A7B
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	warp SLATEPORT_CITY_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 @ forced stop

data/scripts/maps/SlateportCity_BattleTentCorridor.inc

@@ -140,7 +140,7 @@ SlateportCity_BattleTentCorridor_EventScript_209022:: @ 8209022
 	end
 
 SlateportCity_BattleTentCorridor_EventScript_209044:: @ 8209044
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 10
 	setvar VAR_0x8005, 0
 	special sub_81A5E74

data/scripts/maps/SlateportCity_BattleTentLobby.inc

@@ -122,7 +122,7 @@ SlateportCity_BattleTentLobby_EventScript_2088AA:: @ 82088AA
 	special sub_81B9D08
 	compare VAR_RESULT, 0
 	goto_if 5, SlateportCity_BattleTentLobby_EventScript_2087E9
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox SlateportCity_BattleTentLobby_Text_2C5810, 4
 
 SlateportCity_BattleTentLobby_EventScript_2088CA:: @ 82088CA
@@ -228,7 +228,7 @@ SlateportCity_BattleTentLobby_EventScript_208A14:: @ 8208A14
 	goto SlateportCity_BattleTentLobby_EventScript_208A2E
 
 SlateportCity_BattleTentLobby_EventScript_208A2B:: @ 8208A2B
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 SlateportCity_BattleTentLobby_EventScript_208A2E:: @ 8208A2E
 	msgbox SlateportCity_BattleTentLobby_Text_2C5AA5, 4

data/scripts/maps/SootopolisCity_MysteryEventsHouse_1F.inc

@@ -45,7 +45,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_2279B7:: @ 82279B7
 	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A0D
 	compare VAR_0x40C0, 3
 	call_if 1, SootopolisCity_MysteryEventsHouse_1F_EventScript_227A16
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x40C0, 0
 	releaseall
 	end
@@ -90,7 +90,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A4E:: @ 8227A4E
 	end
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	special sub_8139238
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227BFC, 5
 	compare VAR_RESULT, 0
@@ -101,11 +101,11 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227CEB, 5
 	compare VAR_RESULT, 0
 	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	call SootopolisCity_MysteryEventsHouse_1F_EventScript_27134F
 	compare VAR_RESULT, 0
 	goto_eq SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	special sub_80F94E8
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227D21, 4
 	closemessage
@@ -121,7 +121,7 @@ SootopolisCity_MysteryEventsHouse_1F_EventScript_227A58:: @ 8227A58
 	end
 
 SootopolisCity_MysteryEventsHouse_1F_EventScript_227AE2:: @ 8227AE2
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	msgbox SootopolisCity_MysteryEventsHouse_1F_Text_227C44, 4
 	release
 	end

data/scripts/maps/SootopolisCity_MysteryEventsHouse_B1F.inc

@@ -32,7 +32,7 @@ SootopolisCity_MysteryEventsHouse_B1F_EventScript_227E68:: @ 8227E68
 	special HealPlayerParty
 	applymovement 255, SootopolisCity_MysteryEventsHouse_B1F_Movement_227EF9
 	waitmovement 0
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	setvar VAR_0x4001, 1
 	warp SOOTOPOLIS_CITY_MYSTERY_EVENTS_HOUSE_1F, 255, 3, 1
 	waitstate

data/scripts/maps/TrainerHill_Entrance.inc

@@ -236,7 +236,7 @@ TrainerHill_Entrance_Movement_268385: @ 8268385
 TrainerHill_Entrance_EventScript_268388:: @ 8268388
 	lockall
 	fadescreen 1
-	special sub_813C904
+	special ShowTrainerHillRecords
 	waitstate
 	releaseall
 	end

data/scripts/maps/VerdanturfTown_BattleTentBattleRoom.inc

@@ -59,7 +59,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023AA:: @ 82023AA
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 4
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 
@@ -81,8 +81,8 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_2023C8:: @ 82023C8
 	applymovement 1, VerdanturfTown_BattleTentBattleRoom_Movement_2725A6
 	waitmovement 0
 	msgbox VerdanturfTown_BattleTentBattleRoom_Text_24FF00, 4
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -132,7 +132,7 @@ VerdanturfTown_BattleTentBattleRoom_EventScript_202501:: @ 8202501
 	setvar VAR_0x8005, 0
 	setvar VAR_0x8006, 3
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	warp VERDANTURF_TOWN_BATTLE_TENT_LOBBY, 255, 6, 6
 	waitstate
 

data/scripts/maps/VerdanturfTown_BattleTentLobby.inc

@@ -135,7 +135,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201873:: @ 8201873
 	special sub_81B99B4
 	compare VAR_RESULT, 0
 	goto_if 5, VerdanturfTown_BattleTentLobby_EventScript_2017EE
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C50C3, 4
 
 VerdanturfTown_BattleTentLobby_EventScript_201893:: @ 8201893
@@ -189,7 +189,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 	setvar VAR_0x8005, 3
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 	closemessage
 	delay 2
 	call VerdanturfTown_BattleTentLobby_EventScript_27134F
@@ -198,7 +198,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201954:: @ 8201954
 	goto_eq VerdanturfTown_BattleTentLobby_EventScript_201A1D
 
 VerdanturfTown_BattleTentLobby_EventScript_2019AE:: @ 82019AE
-	special copy_player_party_to_sav1
+	special SavePlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 3
 	special sub_81A1780
@@ -235,7 +235,7 @@ VerdanturfTown_BattleTentLobby_EventScript_201A1D:: @ 8201A1D
 	goto VerdanturfTown_BattleTentLobby_EventScript_201A37
 
 VerdanturfTown_BattleTentLobby_EventScript_201A34:: @ 8201A34
-	special copy_player_party_from_sav1
+	special LoadPlayerParty
 
 VerdanturfTown_BattleTentLobby_EventScript_201A37:: @ 8201A37
 	msgbox VerdanturfTown_BattleTentLobby_Text_2C539A, 4

data/scripts/mauville_man.inc

@@ -157,7 +157,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E4D4:: @ 828E4D4
 	msgbox MauvilleCity_PokemonCenter_1F_Text_28E1B1, 5
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E503
-	special sub_8133CD8
+	special ScrSpecial_GetTraderTradedFlag
 	compare VAR_RESULT, 1
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E50D
 	message MauvilleCity_PokemonCenter_1F_Text_28E23F
@@ -176,7 +176,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E50D:: @ 828E50D
 	end
 
 MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
-	special sub_8133EC0
+	special ScrSpecial_TraderMenuGetDecoration
 	waitstate
 	compare VAR_0x8004, 0
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E558
@@ -185,7 +185,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E517:: @ 828E517
 	msgbox MauvilleCity_PokemonCenter_1F_Text_28E2A9, 5
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E56E
-	special sub_8133CF4
+	special ScrSpecial_DoesPlayerHaveNoDecorations
 	compare VAR_RESULT, 1
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E57A
 	goto MauvilleCity_PokemonCenter_1F_EventScript_28E584
@@ -215,19 +215,19 @@ MauvilleCity_PokemonCenter_1F_EventScript_28E57A:: @ 828E57A
 
 MauvilleCity_PokemonCenter_1F_EventScript_28E584:: @ 828E584
 	msgbox MauvilleCity_PokemonCenter_1F_Text_28E323, 4
-	special sub_8133D8C
+	special ScrSpecial_TraderMenuGiveDecoration
 	waitstate
 	compare VAR_0x8006, 0
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5D4
 	compare VAR_0x8006, 65535
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5DE
-	special sub_8133D2C
+	special ScrSpecial_IsDecorationFull
 	compare VAR_RESULT, 1
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E5EC
 	msgbox MauvilleCity_PokemonCenter_1F_Text_28E3C4, 5
 	compare VAR_RESULT, 0
 	goto_eq MauvilleCity_PokemonCenter_1F_EventScript_28E584
-	special sub_8133E38
+	special ScrSpecial_TraderDoDecorationTrade
 	msgbox MauvilleCity_PokemonCenter_1F_Text_28E424, 4
 	release
 	end

data/specials.inc

@@ -48,8 +48,8 @@ gSpecials:: @ 81DBA64
 	def_special sub_80B2FD8
 	def_special GetLinkPartnerNames
 	def_special SpawnLinkPartnerFieldObject
-	def_special copy_player_party_to_sav1
+	def_special SavePlayerParty
-	def_special copy_player_party_from_sav1
+	def_special LoadPlayerParty
 	def_special sub_80F9438
 	def_special sp02A_crash_sound
 	def_special FieldObjectInteractionGetBerryTreeData
@@ -124,12 +124,12 @@ gSpecials:: @ 81DBA64
 	def_special sub_81213D8
 	def_special sub_8121450
 	def_special sub_8121424
-	def_special sub_8133EC0
+	def_special ScrSpecial_TraderMenuGetDecoration
-	def_special sub_8133CD8
+	def_special ScrSpecial_GetTraderTradedFlag
-	def_special sub_8133CF4
+	def_special ScrSpecial_DoesPlayerHaveNoDecorations
-	def_special sub_8133D2C
+	def_special ScrSpecial_IsDecorationFull
-	def_special sub_8133D8C
+	def_special ScrSpecial_TraderMenuGiveDecoration
-	def_special sub_8133E38
+	def_special ScrSpecial_TraderDoDecorationTrade
 	def_special GetSeedotSizeRecordInfo
 	def_special CompareSeedotSize
 	def_special GetLotadSizeRecordInfo
@@ -141,7 +141,7 @@ gSpecials:: @ 81DBA64
 	def_special TrendyPhraseIsOld
 	def_special sub_811EF6C
 	def_special GetDewfordHallPaintingNameIndex
-	def_special sub_80D6EDC
+	def_special SwapRegisteredBike
 	def_special CalculatePlayerPartyCount
 	def_special CountPartyNonEggMons
 	def_special CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
@@ -207,7 +207,7 @@ gSpecials:: @ 81DBA64
 	def_special ScriptHatchMon
 	def_special EggHatch
 	def_special sub_8071614
-	def_special sub_813C4BC
+	def_special ShowLinkBattleRecords
 	def_special IsEnoughForCostInVar0x8005
 	def_special SubtractMoneyFromVar0x8005
 	def_special sub_80F972C
@@ -341,7 +341,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_81B98DC
 	def_special nullsub_54
 	def_special sub_80E9B70
-	def_special copy_bags_and_unk_data_from_save_blocks
+	def_special LoadPlayerBag
 	def_special sub_80B05B4
 	def_special sub_8139754
 	def_special sub_813970C
@@ -526,12 +526,12 @@ gSpecials:: @ 81DBA64
 	def_special sub_8139ED0
 	def_special sub_813B968
 	def_special sub_80F8B94
-	def_special sub_813C904
+	def_special ShowTrainerHillRecords
 	def_special sub_80B4808
 	def_special sub_813B9A0
 	def_special sub_81B9918
 	def_special sub_80722E0
 	def_special sub_80B45D0
-	def_special sub_813C5A0
+	def_special RemoveRecordsWindow
 	def_special sub_8139C10
 	def_special sub_80B3BC4

data/trader.s

@@ -1,22 +0,0 @@
-
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_085B09E4:: @ 85B09E4
-	.4byte gText_Tristan
-	.4byte gText_Philip
-	.4byte gText_Dennis
-	.4byte gText_Roberto
-
-	.align 2
-gUnknown_085B09F4:: @ 85B09F4
-	.byte 0x5b, 0x6b, 0x25, 0x15
-
-	.align 2
-gUnknown_085B09F8:: @ 85B09F8
-	.4byte 0x0a010100, 0x00010f0a
-
-

include/battle_records.h

@@ -0,0 +1,12 @@
+#ifndef GUARD_BATTLE_RECORDS_H
+#define GUARD_BATTLE_RECORDS_H
+
+extern u8 gRecordsWindowId;
+
+void ClearPlayerLinkBattleRecords(void);
+void UpdatePlayerLinkBattleRecords(s32 battlerId);
+void ShowLinkBattleRecords(void);
+void RemoveRecordsWindow(void);
+void ShowTrainerHillRecords(void);
+
+#endif // GUARD_BATTLE_RECORDS_H

include/bg.h

@@ -68,7 +68,7 @@ void UnsetBgTilemapBuffer(u8 bg);
 void* GetBgTilemapBuffer(u8 bg);
 void CopyToBgTilemapBuffer(u8 bg, const void *src, u16 mode, u16 destOffset);
 void CopyBgTilemapBufferToVram(u8 bg);
-void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height);
+void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height);
 void CopyToBgTilemapBufferRect_ChangePalette(u8 bg, void *src, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette);
 void CopyRectToBgTilemapBufferRect(u8 bg, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight, u8 destX, u8 destY, u8 rectWidth, u8 rectHeight, u8 palette1, u16 tileOffset, u16 palette2);
 void FillBgTilemapBufferRect_Palette0(u8 bg, u16 tileNum, u8 x, u8 y, u8 width, u8 height);

include/constants/decorations.h

@@ -122,5 +122,6 @@
 #define DECOR_REGIROCK_DOLL    118
 #define DECOR_REGICE_DOLL      119
 #define DECOR_REGISTEEL_DOLL   120
+#define NUM_DECORATIONS DECOR_REGISTEEL_DOLL
 
 #endif  // GUARD_CONSTANTS_DECORATIONS_H

include/constants/items.h

@@ -1,12 +1,6 @@
 #ifndef GUARD_CONSTANTS_ITEMS_H
 #define GUARD_CONSTANTS_ITEMS_H
 
-#define POCKET_ITEMS		1
-#define POCKET_POKE_BALLS	2
-#define POCKET_TM_HM		3
-#define POCKET_BERRIES		4
-#define POCKET_KEY_ITEMS	5
-
 #define ITEM_NONE 0
 
 // Balls
@@ -23,7 +17,7 @@
 #define ITEM_LUXURY_BALL 11
 #define ITEM_PREMIER_BALL 12
 
-// Medicine
+// Pokemon Items
 #define ITEM_POTION 13
 #define ITEM_ANTIDOTE 14
 #define ITEM_BURN_HEAL 15
@@ -57,15 +51,12 @@
 #define ITEM_WHITE_FLUTE 43
 #define ITEM_BERRY_JUICE 44
 #define ITEM_SACRED_ASH 45
-
-// Collectibles
 #define ITEM_SHOAL_SALT 46
 #define ITEM_SHOAL_SHELL 47
 #define ITEM_RED_SHARD 48
 #define ITEM_BLUE_SHARD 49
 #define ITEM_YELLOW_SHARD 50
 #define ITEM_GREEN_SHARD 51
-
 #define ITEM_034 52
 #define ITEM_035 53
 #define ITEM_036 54
@@ -77,8 +68,6 @@
 #define ITEM_03C 60
 #define ITEM_03D 61
 #define ITEM_03E 62
-
-// Vitamins
 #define ITEM_HP_UP 63
 #define ITEM_PROTEIN 64
 #define ITEM_IRON 65
@@ -88,10 +77,7 @@
 #define ITEM_PP_UP 69
 #define ITEM_ZINC 70
 #define ITEM_PP_MAX 71
-
 #define ITEM_048 72
-
-// Battle items
 #define ITEM_GUARD_SPEC 73
 #define ITEM_DIRE_HIT 74
 #define ITEM_X_ATTACK 75
@@ -101,36 +87,29 @@
 #define ITEM_X_SPECIAL 79
 #define ITEM_POKE_DOLL 80
 #define ITEM_FLUFFY_TAIL 81
-
 #define ITEM_052 82
-
-// Field items
 #define ITEM_SUPER_REPEL 83
 #define ITEM_MAX_REPEL 84
 #define ITEM_ESCAPE_ROPE 85
 #define ITEM_REPEL 86
-
 #define ITEM_057 87
 #define ITEM_058 88
 #define ITEM_059 89
 #define ITEM_05A 90
 #define ITEM_05B 91
 #define ITEM_05C 92
-
-//Evolution stones
 #define ITEM_SUN_STONE 93
 #define ITEM_MOON_STONE 94
 #define ITEM_FIRE_STONE 95
 #define ITEM_THUNDER_STONE 96
 #define ITEM_WATER_STONE 97
 #define ITEM_LEAF_STONE 98
-
 #define ITEM_063 99
 #define ITEM_064 100
 #define ITEM_065 101
 #define ITEM_066 102
 
-//Valuable items
+// Unusable
 #define ITEM_TINY_MUSHROOM 103
 #define ITEM_BIG_MUSHROOM 104
 #define ITEM_069 105
@@ -140,7 +119,6 @@
 #define ITEM_STAR_PIECE 109
 #define ITEM_NUGGET 110
 #define ITEM_HEART_SCALE 111
-
 #define ITEM_070 112
 #define ITEM_071 113
 #define ITEM_072 114
@@ -151,7 +129,7 @@
 #define ITEM_077 119
 #define ITEM_078 120
 
-// Mail
+// Mails
 #define ITEM_ORANGE_MAIL 121
 #define ITEM_HARBOR_MAIL 122
 #define ITEM_GLITTER_MAIL 123
@@ -165,7 +143,7 @@
 #define ITEM_FAB_MAIL 131
 #define ITEM_RETRO_MAIL 132
 
-//Berries
+// Berries
 #define ITEM_CHERI_BERRY 133
 #define ITEM_CHESTO_BERRY 134
 #define ITEM_PECHA_BERRY 135
@@ -209,12 +187,11 @@
 #define ITEM_LANSAT_BERRY 173
 #define ITEM_STARF_BERRY 174
 #define ITEM_ENIGMA_BERRY 175
-
 #define ITEM_0B0 176
 #define ITEM_0B1 177
 #define ITEM_0B2 178
 
-// Hold items
+// Battle Held items
 #define ITEM_BRIGHT_POWDER 179
 #define ITEM_WHITE_HERB 180
 #define ITEM_MACHO_BRACE 181
@@ -262,7 +239,6 @@
 #define ITEM_METAL_POWDER 223
 #define ITEM_THICK_CLUB 224
 #define ITEM_STICK 225
-
 #define ITEM_0E2 226
 #define ITEM_0E3 227
 #define ITEM_0E4 228
@@ -292,6 +268,7 @@
 #define ITEM_0FC 252
 #define ITEM_0FD 253
 
+// Contest held items
 #define ITEM_RED_SCARF 254
 #define ITEM_BLUE_SCARF 255
 #define ITEM_PINK_SCARF 256
@@ -449,10 +426,11 @@
 #define ITEM_HM07_WATERFALL ITEM_HM07
 #define ITEM_HM08_DIVE ITEM_HM08
 
+// Unknown
 #define ITEM_15B 347
 #define ITEM_15C 348
 
-// FireRed/LeafGreen key items
+// FireRed/LeafGreen
 #define ITEM_OAKS_PARCEL 349
 #define ITEM_POKE_FLUTE 350
 #define ITEM_SECRET_KEY 351
@@ -480,7 +458,7 @@
 #define ITEM_RUBY 373
 #define ITEM_SAPPHIRE 374
 
-// Emerald-specific key items
+// Emerald
 #define ITEM_MAGMA_EMBLEM 375
 #define ITEM_OLD_SEA_MAP 376
 

include/decoration.h

@@ -70,5 +70,8 @@ void sub_8126968(void);
 void sub_8126AD8(u8 taskId);
 void sub_8127D38(u16 mapX, u16 mapY, u16 decor);
 void sub_8126B2C(u8 taskId);
+void sub_8127208(u8 taskId);
+void sub_8127250(u8 *dest, u8 decorCat);
+bool8 IsSelectedDecorInThePC(void);
 
 #endif //GUARD_DECORATION_H

include/global.h

@@ -43,9 +43,6 @@
 
 #define PARTY_SIZE 6
 
-#define POKEMON_NAME_LENGTH 10
-#define OT_NAME_LENGTH 7
-
 #define min(a, b) ((a) < (b) ? (a) : (b))
 #define max(a, b) ((a) >= (b) ? (a) : (b))
 
@@ -97,6 +94,31 @@ enum LanguageId
 #define GAME_VERSION (VERSION_EMERALD)
 #define GAME_LANGUAGE (LANGUAGE_ENGLISH)
 
+// capacities of various saveblock objects
+#define DAYCARE_MON_COUNT   2
+#define POKEBLOCKS_COUNT    40
+#define MAP_OBJECTS_COUNT   16
+#define BERRY_TREES_COUNT   128
+#define FLAGS_COUNT         300
+#define VARS_COUNT          256
+#define MAIL_COUNT          16
+#define SECRET_BASES_COUNT  20
+#define PC_ITEMS_COUNT      50
+#define BAG_ITEMS_COUNT     30
+#define BAG_KEYITEMS_COUNT  30
+#define BAG_POKEBALLS_COUNT 16
+#define BAG_TMHM_COUNT      64
+#define BAG_BERRIES_COUNT   46
+
+#define PYRAMID_BAG_ITEMS_COUNT 10
+
+// string lengths
+#define ITEM_NAME_LENGTH    14
+#define POKEMON_NAME_LENGTH 10
+#define OT_NAME_LENGTH      7
+#define PLAYER_NAME_LENGTH  8
+#define MAIL_WORDS_COUNT    9
+
 enum
 {
     MALE,
@@ -129,15 +151,6 @@ enum
     OPTIONS_BATTLE_STYLE_SET
 };
 
-enum
-{
-    BAG_ITEMS = 1,
-    BAG_POKEBALLS,
-    BAG_TMsHMs,
-    BAG_BERRIES,
-    BAG_KEYITEMS
-};
-
 struct Coords16
 {
     s16 x;
@@ -209,11 +222,11 @@ struct BerryPickingResults // possibly used in the game itself? Size may be wron
     u8 field_F;
 };
 
+// two arrays for lvl50 and open level
 struct PyramidBag
 {
-    u16 items_Lvl50[10];
+    u16 itemId[2][PYRAMID_BAG_ITEMS_COUNT];
-    u16 items_OpenLvl[10];
+    u8 quantity[2][PYRAMID_BAG_ITEMS_COUNT];
-    u8 quantity[10];
 };
 
 struct BerryCrush
@@ -223,8 +236,6 @@ struct BerryCrush
     u32 unk;
 };
 
-#define PLAYER_NAME_LENGTH  8
-
 struct UnknownSaveBlock2Struct
 {
     u8 field_0;
@@ -303,7 +314,7 @@ struct SaveBlock2
     /*0xE1A*/ u16 battlePyramidFloor; // possibly?
     /*0xE1C*/ u8 field_E1C[16];
     /*0xE2C*/ struct PyramidBag pyramidBag;
-    /*0x???*/ u8 field_notSure[13];
+    /*0x???*/ u8 field_unkown[6];
     /*0xE6E*/ u16 battleTentWinStreak;
     /*0xE70*/ u8 field_E70[72];
     /*0xEB8*/ u16 frontierBattlePoints;
@@ -417,8 +428,6 @@ struct EasyChatPair
     u16 words[2];
 }; /*size = 0x8*/
 
-#define MAIL_WORDS_COUNT 9
-
 struct MailStruct
 {
     /*0x00*/ u16 words[MAIL_WORDS_COUNT];
@@ -452,10 +461,11 @@ struct UnkMauvilleOldManStruct2
 
 struct MauvilleOldManTrader
 {
-    u8 unk0;
+    /* 0x2E28 */ u8 id;
-    u8 unk1[4];
+    /* 0x2E29 */ u8 unk1[4];
-    u8 unk5[4][11];
+    /* 0x2E2D */ u8 unk5[4][11];
-    u8 unk31;
+    /* 0x2E59 */ bool8 alreadyTraded;
+    /* 0x2E5A */ u8 language[4];
 };
 
 typedef union OldMan
@@ -480,6 +490,8 @@ struct RecordMixing_UnknownStruct
     u16 unk74[0x2];
 };
 
+#define LINK_B_RECORDS_COUNT 5
+
 struct LinkBattleRecord
 {
     u8 name[8];
@@ -489,6 +501,12 @@ struct LinkBattleRecord
     u16 draws;
 };
 
+struct LinkBattleRecords
+{
+    struct LinkBattleRecord entries[LINK_B_RECORDS_COUNT];
+    u8 languages[LINK_B_RECORDS_COUNT];
+};
+
 struct RecordMixingGiftData
 {
     u8 unk0;
@@ -530,8 +548,6 @@ struct DaycareMon
     u32 steps;
 };
 
-#define DAYCARE_MON_COUNT   2
-
 struct DayCare
 {
     struct DaycareMon mons[DAYCARE_MON_COUNT];
@@ -552,13 +568,6 @@ struct RecordMixingDayCareMail
     bool16 holdsItem[DAYCARE_MON_COUNT];
 };
 
-#define POKEBLOCKS_COUNT    40
-#define MAP_OBJECTS_COUNT   16
-#define BERRY_TREES_COUNT   128
-#define FLAGS_COUNT         300
-#define VARS_COUNT          256
-#define MAIL_COUNT          16
-
 enum
 {
     LILYCOVE_LADY_QUIZ,
@@ -645,16 +654,16 @@ struct SaveBlock1
     /*0x32*/ u16 mapDataId;
     /*0x34*/ u16 mapView[0x100];
     /*0x234*/ u8 playerPartyCount;
-    /*0x238*/ struct Pokemon playerParty[6];
+    /*0x238*/ struct Pokemon playerParty[PARTY_SIZE];
     /*0x490*/ u32 money;
     /*0x494*/ u16 coins;
     /*0x496*/ u16 registeredItem; // registered for use with SELECT button
-    /*0x498*/ struct ItemSlot pcItems[50];
+    /*0x498*/ struct ItemSlot pcItems[PC_ITEMS_COUNT];
-    /*0x560*/ struct ItemSlot bagPocket_Items[30];
+    /*0x560*/ struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT];
-    /*0x5D8*/ struct ItemSlot bagPocket_KeyItems[30];
+    /*0x5D8*/ struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT];
-    /*0x650*/ struct ItemSlot bagPocket_PokeBalls[16];
+    /*0x650*/ struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT];
-    /*0x690*/ struct ItemSlot bagPocket_TMHM[64];
+    /*0x690*/ struct ItemSlot bagPocket_TMHM[BAG_TMHM_COUNT];
-    /*0x790*/ struct ItemSlot bagPocket_Berries[46];
+    /*0x790*/ struct ItemSlot bagPocket_Berries[BAG_BERRIES_COUNT];
     /*0x848*/ struct Pokeblock pokeblocks[POKEBLOCKS_COUNT];
     /*0x988*/ u8 seen1[52];
     /*0x9BC*/ u16 berryBlenderRecords[3];
@@ -667,7 +676,7 @@ struct SaveBlock1
     /*0x139C*/ u16 vars[VARS_COUNT];
     /*0x159C*/ u32 gameStats[NUM_GAME_STATS];
     /*0x169C*/ struct BerryTree berryTrees[BERRY_TREES_COUNT];
-    /*0x1A9C*/ struct SecretBaseRecord secretBases[20];
+    /*0x1A9C*/ struct SecretBaseRecord secretBases[SECRET_BASES_COUNT];
     /*0x271C*/ u8 playerRoomDecor[12];
     /*0x2728*/ u8 playerRoomDecorPos[12];
     /*0x2734*/ u8 decorDesk[10];
@@ -703,9 +712,7 @@ struct SaveBlock1
     /*0x2e64*/ struct EasyChatPair easyChatPairs[5]; //Dewford trend [0] and some other stuff
     /*0x2e90*/ struct ContestWinner contestWinners[13]; // 0 - 5 used in contest hall, 6 - 7 unused?, 8 - 12 museum
     /*0x3030*/ struct DayCare daycare;
-    /*0x3150*/ struct LinkBattleRecord linkBattleRecords[5];
+    /*0x3150*/ struct LinkBattleRecords linkBattleRecords;
-    /*0x31A0*/ u8 unk_31A0;
-    /*0x31A1*/ u8 filler_31A1[7];
     /*0x31A8*/ u8 giftRibbons[52];
     /*0x31DC*/ struct Roamer roamer;
     /*0x31F8*/ struct EnigmaBerry enigmaBerry;

include/item.h

@@ -1,11 +1,32 @@
-#ifndef ITEM_H
+#ifndef GUARD_ITEM_H
-#define ITEM_H
+#define GUARD_ITEM_H
+
+// These constants are used in gItems
+enum
+{
+    POCKET_NONE,
+    POCKET_ITEMS,
+    POCKET_POKE_BALLS,
+    POCKET_TM_HM,
+    POCKET_BERRIES,
+    POCKET_KEY_ITEMS,
+};
+
+enum
+{
+    ITEMS_POCKET,
+    BALLS_POCKET,
+    TMHM_POCKET,
+    BERRIES_POCKET,
+    KEYITEMS_POCKET,
+    POCKETS_COUNT
+};
 
 typedef void (*ItemUseFunc)(u8);
 
 struct Item
 {
-    u8 name[14];
+    u8 name[ITEM_NAME_LENGTH];
     u16 itemId;
     u16 price;
     u8 holdEffect;
@@ -29,28 +50,41 @@ struct BagPocket
 
 extern struct BagPocket gBagPockets[];
 
-void GetBerryCountString(u8* dst, const u8* berryName, u32 quantity);
+void ApplyNewEncryptionKeyToBagItems(u32 newKey);
-void CopyItemName(u16 itemId, u8 *string);
+void ApplyNewEncryptionKeyToBagItems_(u32 newKey);
-void CopyItemNameHandlePlural(u16 itemId, u8 *string, u32 quantity);
+void SetBagItemsPointers(void);
+void CopyItemName(u16 itemId, u8 *dst);
+void CopyItemNameHandlePlural(u16 itemId, u8 *dst, u32 quantity);
+void GetBerryCountString(u8 *dst, const u8 *berryName, u32 quantity);
 bool8 IsBagPocketNonEmpty(u8 pocket);
 bool8 CheckBagHasItem(u16 itemId, u16 count);
+bool8 HasAtLeastOneBerry(void);
 bool8 CheckBagHasSpace(u16 itemId, u16 count);
 bool8 AddBagItem(u16 itemId, u16 count);
 bool8 RemoveBagItem(u16 itemId, u16 count);
 u8 GetPocketByItemId(u16 itemId);
-void ClearItemSlots(struct ItemSlot *itemSlots, u8 b);
+void ClearItemSlots(struct ItemSlot *itemSlots, u8 itemCount);
 u8 CountUsedPCItemSlots(void);
 bool8 CheckPCHasItem(u16 itemId, u16 count);
 bool8 AddPCItem(u16 itemId, u16 count);
 void RemovePCItem(u8 index, u16 count);
+void CompactPCItems(void);
 void SwapRegisteredBike(void);
-const struct Item *ItemId_GetItem(u16 itemId);
+u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 pocketPos);
+u16 BagGetQuantityByPocketPosition(u8 pocketId, u16 pocketPos);
+void CompactItemsInBagPocket(struct BagPocket *bagPocket);
+void SortBerriesOrTMHMs(struct BagPocket *bagPocket);
+void MoveItemSlotInList(struct ItemSlot* itemSlots_, u32 from, u32 to_);
+void ClearBag(void);
+u16 CountTotalItemQuantityInBag(u16 itemId);
+bool8 AddPyramidBagItem(u16 itemId, u16 count);
+bool8 RemovePyramidBagItem(u16 itemId, u16 count);
+const u8 *ItemId_GetName(u16 itemId);
 u16 ItemId_GetId(u16 itemId);
 u16 ItemId_GetPrice(u16 itemId);
 u8 ItemId_GetHoldEffect(u16 itemId);
 u8 ItemId_GetHoldEffectParam(u16 itemId);
 const u8 *ItemId_GetDescription(u16 itemId);
-bool32 ItemId_CopyDescription(u8 *a, u32 itemId, u32 c);
 u8 ItemId_GetImportance(u16 itemId);
 u8 ItemId_GetUnknownValue(u16 itemId);
 u8 ItemId_GetPocket(u16 itemId);
@@ -59,14 +93,5 @@ ItemUseFunc ItemId_GetFieldFunc(u16 itemId);
 u8 ItemId_GetBattleUsage(u16 itemId);
 ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
 u8 ItemId_GetSecondaryId(u16 itemId);
-u16 itemid_get_market_price(u16 itemId);
-u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 pocketPos);
-void sub_80D6FB4(struct BagPocket*);
-void sub_80D6F64(struct BagPocket*);
-void sub_80D702C(struct ItemSlot*, s16, u16);
-u8 sub_80D6CE4();
-bool8 itemid_is_unique(u16 itemId);
-void sub_80D6E48(u8, u16);
-void sub_80D6E84(void);
 
-#endif // ITEM_H
+#endif // GUARD_ITEM_H

include/item_menu.h

@@ -55,7 +55,7 @@ void sub_81AAC14(void);
 void sub_81AAC50(void);
 void sub_81AAC70(void);
 void bag_menu_mail_related(void);
-
 void CB2_BagMenuFromStartMenu(void);
+u8 sub_81ABB2C(u8 pocketId);
 
 #endif //GUARD_item_menu_H

include/load_save.h

@@ -1,27 +1,35 @@
 #ifndef GUARD_LOAD_SAVE_H
 #define GUARD_LOAD_SAVE_H
 
-extern bool32 gFlashMemoryPresent;
+extern struct SaveBlock1 gSaveblock1;
 extern struct SaveBlock2 gSaveblock2;
 extern struct PokemonStorage gPokemonStorage;
 
+extern bool32 gFlashMemoryPresent;
+extern struct SaveBlock1 *gSaveBlock1Ptr;
+extern struct SaveBlock2 *gSaveBlock2Ptr;
+extern struct PokemonStorage *gPokemonStoragePtr;
+
+void CheckForFlashMemory(void);
 void ClearSav2(void);
 void ClearSav1(void);
-void CheckForFlashMemory(void);
+void SetSaveBlocksPointers(u16 offset);
 void MoveSaveBlocks_ResetHeap(void);
-bool32 GetSecretBase2Field_9(void);
+u32 GetSecretBase2Field_9(void);
 void ClearSecretBase2Field_9(void);
-void SetSecretBase2Field_9(void);
+void sub_8076D48(void);
-void SetSecretBase2Field_9_AndHideBG(void);
+void sub_8076D5C(void);
-void ClearSecretBase2Field_9_2(void);
+void sav2_gender2_inplace_and_xFE(void);
 void SavePlayerParty(void);
 void LoadPlayerParty(void);
+void SaveMapObjects(void);
+void LoadMapObjects(void);
 void SaveSerializedGame(void);
 void LoadSerializedGame(void);
 void LoadPlayerBag(void);
 void SavePlayerBag(void);
-void SetSaveBlocksPointers(u16);
+void ApplyNewEncryptionKeyToHword(u16 *hWord, u32 newKey);
-void sub_8076D5C(void);
+void ApplyNewEncryptionKeyToWord(u32 *word, u32 newKey);
-void sav2_gender2_inplace_and_xFE(void);
+void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
 
 #endif // GUARD_LOAD_SAVE_H

include/palette.h

@@ -1,8 +1,6 @@
 #ifndef GUARD_PALETTE_H
 #define GUARD_PALETTE_H
 
-#include "global.h"
-
 #define gPaletteFade_selectedPalettes (gPaletteFade.multipurpose1) // normal and fast fade
 #define gPaletteFade_blendCnt         (gPaletteFade.multipurpose1) // hardware fade
 #define gPaletteFade_delay            (gPaletteFade.multipurpose2) // normal and hardware fade

include/script_menu.h

@@ -9,5 +9,6 @@ bool8 ScriptMenu_YesNo(u8 var1, u8 var2);
 bool8 ScriptMenu_MultichoiceGrid(u8 left, u8 top, u8 multichoiceId, u8 a4, u8 columnCount);
 bool8 ScriptMenu_ShowPokemonPic(u16 var1, u8 var2, u8 var3);
 bool8 (*ScriptMenu_GetPicboxWaitFunc(void))(void);
+s32 convert_pixel_width_to_tile_width(s32 pixelWidth);
 
 #endif //GUARD_SCRIPT_MENU_H

include/secret_base.h

@@ -10,5 +10,6 @@ void sub_80E9578(void);
 void sub_80E980C(void);
 u8 *GetSecretBaseMapName(u8 *dest);
 const u8 *GetSecretBaseTrainerLoseText(void);
+bool8 CurrentMapIsSecretBase(void);
 
 #endif //GUARD_SECRET_BASE_H

include/strings.h

@@ -74,6 +74,10 @@ extern const u8 gText_DecorationWillBeDiscarded[];
 extern const u8 gText_CantThrowAwayInUse[];
 extern const u8 gText_DecorationThrownAway[];
 
+extern const u8 gText_PokeBalls[];
+extern const u8 gText_Berries[];
+extern const u8 gText_Berry[];
+
 extern const u8 gText_Desk[];
 extern const u8 gText_Chair[];
 extern const u8 gText_Plant[];
@@ -336,7 +340,7 @@ extern const u8 gText_Var1DotVar2[];
 extern const u8 gText_ThreeMarks[];
 extern const u8 gText_FirmSlash[];
 
-//item menu screen text
+// item menu screen text
 extern const u8 gText_CloseBag[];
 extern const u8 gText_ClearTo11Var1Clear5Var2[];
 extern const u8 gText_UnkF908Var1Clear7Var2[];
@@ -362,11 +366,11 @@ extern const u8 gText_DepositedVar2Var1s[];
 extern const u8 gText_NoRoomForItems[];
 extern const u8 gText_ThreeDashes[];
 
-//party menu text
+// party menu text
 extern const u8 gText_PkmnHPRestoredByVar2[];
 extern const u8 gText_CantBeUsedOnPkmn[];
 
-//birch dex rating text
+// birch dex rating text
 extern const u8 gBirchDexRatingText_LessThan10[];
 extern const u8 gBirchDexRatingText_LessThan20[];
 extern const u8 gBirchDexRatingText_LessThan30[];
@@ -389,7 +393,7 @@ extern const u8 gBirchDexRatingText_LessThan190[];
 extern const u8 gBirchDexRatingText_LessThan200[];
 extern const u8 gBirchDexRatingText_DexCompleted[];
 
-//player pc text
+// player pc text
 extern const u8 gText_WhatWouldYouLike[];
 extern const u8 gText_NoMailHere[];
 
@@ -429,5 +433,14 @@ extern const u8 gText_TooImportantToToss[];
 extern const u8 gText_ConfirmTossItems[];
 extern const u8 gText_MoveVar1Where[];
 
+extern const u8 gText_Tristan[];
+extern const u8 gText_Philip[];
+extern const u8 gText_Dennis[];
+extern const u8 gText_Roberto[];
+extern const u8 gText_FiveMarks[];
+
+extern const u8 gText_TotalRecordWLD[];
+extern const u8 gText_PlayersBattleResults[];
+extern const u8 gText_WinLoseDraw[];
 
 #endif //GUARD_STRINGS_H

include/trainer_card.h

@@ -0,0 +1,35 @@
+#ifndef GUARD_TRAINER_CARD_H
+#define GUARD_TRAINER_CARD_H
+
+struct TrainerCard
+{
+    /*0x00*/ u8 gender;
+    /*0x01*/ u8 stars;
+    /*0x02*/ bool8 hasPokedex;
+    /*0x03*/ bool8 var_3;
+    /*0x04*/ bool8 var_4;
+    /*0x05*/ u8 var_5;
+    /*0x06*/ u16 firstHallOfFameA;
+    /*0x08*/ u16 firstHallOfFameB;
+    /*0x0A*/ u16 firstHallOfFameC;
+    /*0x0C*/ u16 pokedexSeen;
+    /*0x0E*/ u16 trainerId;
+    /*0x10*/ u16 playTimeHours;
+    /*0x12*/ u16 playTimeMinutes;
+    /*0x14*/ u16 linkBattleWins;
+    /*0x16*/ u16 linkBattleLosses;
+    /*0x18*/ u16 battleTowerWins;
+    /*0x1A*/ u16 battleTowerLosses;
+    /*0x1C*/ u16 contestsWithFriends;
+    /*0x1E*/ u16 pokeblocksWithFriends;
+    /*0x20*/ u16 pokemonTrades;
+    /*0x22*/ u16 var_22;
+    /*0x24*/ u32 money;
+    /*0x28*/ u16 var_28[4];
+    /*0x30*/ u8 playerName[8];
+    /*0x38*/ u8 emeraldAddedUnknownFields[0x64-0x38];
+};
+
+extern struct TrainerCard gTrainerCards[4];
+
+#endif // GUARD_TRAINER_CARD_H

ld_script.txt

@@ -137,7 +137,6 @@ SECTIONS {
         src/item_menu_icons.o(.text);
         asm/battle_anim_80D51AC.o(.text);
         src/item.o(.text);
-        asm/item.o(.text);
         asm/contest.o(.text);
         asm/shop.o(.text);
         src/berry.o(.text);
@@ -173,7 +172,7 @@ SECTIONS {
         asm/slot_machine.o(.text);
         asm/contest_painting.o(.text);
         src/battle_ai_script_commands.o(.text);
-        asm/trader.o(.text);
+        src/trader.o(.text);
         src/starter_choose.o(.text);
         src/wallclock.o(.text);
         src/rom6.o(.text);
@@ -184,7 +183,7 @@ SECTIONS {
         src/birch_pc.o(.text);
         src/hof_pc.o(.text);
         asm/field_specials.o(.text);
-        asm/battle_records.o(.text);
+        src/battle_records.o(.text);
         asm/pokedex_area_screen.o(.text);
         src/evolution_scene.o(.text);
         asm/roulette.o(.text);
@@ -465,14 +464,14 @@ SECTIONS {
         data/slot_machine.o(.rodata);
         data/contest_painting.o(.rodata);
         src/battle_ai_script_commands.o(.rodata);
-        data/trader.o(.rodata);
+        src/trader.o(.rodata);
         data/starter_choose.o(.rodata);
         src/wallclock.o(.rodata);
         src/pokeblock.o(.rodata);
         src/fldeff_flash.o(.rodata);
         src/time_events.o(.rodata);
         data/field_specials.o(.rodata);
-        data/battle_records.o(.rodata);
+        src/battle_records.o(.rodata);
         data/pokedex_area_screen.o(.rodata);
         src/evolution_scene.o(.rodata);
         data/roulette.o(.rodata);

src/battle_records.c

@@ -0,0 +1,510 @@
+#include "global.h"
+#include "battle_records.h"
+#include "bg.h"
+#include "window.h"
+#include "link.h"
+#include "battle.h"
+#include "overworld.h"
+#include "text.h"
+#include "text_window.h"
+#include "strings.h"
+#include "string_util.h"
+#include "trainer_card.h"
+#include "menu.h"
+#include "menu_helpers.h"
+#include "palette.h"
+#include "main.h"
+#include "scanline_effect.h"
+#include "international_string_util.h"
+#include "sound.h"
+#include "constants/songs.h"
+#include "malloc.h"
+#include "gpu_regs.h"
+#include "constants/game_stat.h"
+
+extern void PrintOnTrainerHillRecordsWindow(void); // pokenav.s
+
+// this file's functions
+static void Task_CloseTrainerHillRecordsOnButton(u8 taskId);
+static void Task_BeginPaletteFade(u8 taskId);
+static void Task_ExitTrainerHillRecords(u8 taskId);
+static void RemoveTrainerHillRecordsWindow(u8 windowId);
+static void CB2_ShowTrainerHillRecords(void);
+
+// EWRAM variables
+EWRAM_DATA u8 gRecordsWindowId = 0;
+EWRAM_DATA static u8 *sTilemapBuffer = NULL;
+
+// const rom data
+static const u32 sTrainerHillWindowTileset[] = INCBIN_U32("graphics/unknown/unknown_5B3484.4bpp");
+static const u16 sTrainerHillWindowPalette[] = INCBIN_U16("graphics/unknown/unknown_5B3484.gbapal");
+static const u32 sTrainerHillWindowTilemap[] = INCBIN_U32("graphics/unknown/unknown_5B3564.bin");
+
+static const struct BgTemplate sTrainerHillRecordsBgTemplates[] =
+{
+    {
+        .bg = 0,
+        .charBaseIndex = 0,
+        .mapBaseIndex = 31,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 0,
+        .baseTile = 0
+    },
+    {
+        .bg = 3,
+        .charBaseIndex = 1,
+        .mapBaseIndex = 30,
+        .screenSize = 0,
+        .paletteMode = 0,
+        .priority = 3,
+        .baseTile = 0
+    }
+};
+
+static const struct WindowTemplate sTrainerHillRecordsWindowTemplates[] =
+{
+    {0x0, 0x2, 0x1, 0x1A, 0x12, 0xF, 0x14},
+    DUMMY_WIN_TEMPLATE
+};
+
+static const struct WindowTemplate sLinkBattleRecordsWindow = {0x0, 0x2, 0x1, 0x1A, 0x11, 0xF, 0x1};
+
+static const u8 sText_DashesNoPlayer[] = _("-------");
+static const u8 sText_DashesNoScore[] = _("----");
+
+// code
+static void ClearLinkBattleRecord(struct LinkBattleRecord *record)
+{
+    CpuFill16(0, record, sizeof(struct LinkBattleRecord));
+    record->name[0] = EOS;
+    record->trainerId = 0;
+    record->wins = 0;
+    record->losses = 0;
+    record->draws = 0;
+}
+
+static void ClearLinkBattleRecords(struct LinkBattleRecord *records)
+{
+    s32 i;
+    for (i = 0; i < LINK_B_RECORDS_COUNT; i++)
+    {
+        ClearLinkBattleRecord(records + i);
+    }
+    SetGameStat(GAME_STAT_LINK_BATTLE_WINS, 0);
+    SetGameStat(GAME_STAT_LINK_BATTLE_LOSSES, 0);
+    SetGameStat(GAME_STAT_LINK_BATTLE_DRAWS, 0);
+}
+
+static s32 GetLinkBattleRecordTotalBattles(struct LinkBattleRecord *record)
+{
+    return record->wins + record->losses + record->draws;
+}
+
+static s32 FindLinkBattleRecord(struct LinkBattleRecord *records, const u8 *name, u16 trainerId)
+{
+    s32 i;
+
+    for (i = 0; i < LINK_B_RECORDS_COUNT; i++)
+    {
+        if (!StringCompareN(records[i].name, name, OT_NAME_LENGTH) && records[i].trainerId == trainerId)
+            return i;
+    }
+
+    return LINK_B_RECORDS_COUNT;
+}
+
+static void SortLinkBattleRecords(struct LinkBattleRecords *records)
+{
+    s32 i, j;
+
+    for (i = LINK_B_RECORDS_COUNT - 1; i > 0; i--)
+    {
+        for (j = i - 1; j >= 0; j--)
+        {
+            s32 totalBattlesI = GetLinkBattleRecordTotalBattles(&records->entries[i]);
+            s32 totalBattlesJ = GetLinkBattleRecordTotalBattles(&records->entries[j]);
+
+            if (totalBattlesI > totalBattlesJ)
+            {
+                struct LinkBattleRecord temp1;
+                u8 temp2;
+
+                temp1 = records->entries[i];
+                records->entries[i] = records->entries[j];
+                records->entries[j] = temp1;
+
+                temp2 = records->languages[i];
+                records->languages[i] = records->languages[j];
+                records->languages[j] = temp2;
+            }
+        }
+    }
+}
+
+static void UpdateLinkBattleRecord(struct LinkBattleRecord *record, s32 battleOutcome)
+{
+    switch (battleOutcome)
+    {
+    case B_OUTCOME_WON:
+        record->wins++;
+        if (record->wins > 9999)
+            record->wins = 9999;
+        break;
+    case B_OUTCOME_LOST:
+        record->losses++;
+        if (record->losses > 9999)
+            record->losses = 9999;
+        break;
+    case B_OUTCOME_DREW:
+        record->draws++;
+        if (record->draws > 9999)
+            record->draws = 9999;
+        break;
+    }
+}
+
+static void UpdateLinkBattleGameStats(s32 battleOutcome)
+{
+    u8 stat;
+
+    switch (battleOutcome)
+    {
+    case B_OUTCOME_WON:
+        stat = GAME_STAT_LINK_BATTLE_WINS;
+        break;
+    case B_OUTCOME_LOST:
+        stat = GAME_STAT_LINK_BATTLE_LOSSES;
+        break;
+    case B_OUTCOME_DREW:
+        stat = GAME_STAT_LINK_BATTLE_DRAWS;
+        break;
+    default:
+        return;
+    }
+
+    if (GetGameStat(stat) < 9999)
+        IncrementGameStat(stat);
+}
+
+static void UpdateLinkBattleRecords(struct LinkBattleRecords *records, const u8 *name, u16 trainerId, s32 battleOutcome, u8 battlerId)
+{
+    s32 index;
+
+    UpdateLinkBattleGameStats(battleOutcome);
+    SortLinkBattleRecords(records);
+    index = FindLinkBattleRecord(records->entries, name, trainerId);
+    if (index == LINK_B_RECORDS_COUNT)
+    {
+        index = LINK_B_RECORDS_COUNT - 1;
+        ClearLinkBattleRecord(&records->entries[index]);
+        StringCopyN(records->entries[index].name, name, OT_NAME_LENGTH);
+        records->entries[index].trainerId = trainerId;
+        records->languages[index] = gLinkPlayers[battlerId].language;
+    }
+    UpdateLinkBattleRecord(&records->entries[index], battleOutcome);
+    SortLinkBattleRecords(records);
+}
+
+void ClearPlayerLinkBattleRecords(void)
+{
+    ClearLinkBattleRecords(gSaveBlock1Ptr->linkBattleRecords.entries);
+}
+
+static void IncTrainerCardWins(s32 battlerId)
+{
+    u16 *wins = &gTrainerCards[battlerId].linkBattleWins;
+    (*wins)++;
+    if (*wins > 9999)
+        *wins = 9999;
+}
+
+static void IncTrainerCardLosses(s32 battlerId)
+{
+    u16 *losses = &gTrainerCards[battlerId].linkBattleLosses;
+    (*losses)++;
+    if (*losses > 9999)
+        *losses = 9999;
+}
+
+static void UpdateTrainerCardWinsLosses(s32 battlerId)
+{
+    switch (gBattleOutcome)
+    {
+    case B_OUTCOME_WON:
+        IncTrainerCardWins(BATTLE_OPPOSITE(battlerId));
+        IncTrainerCardLosses(battlerId);
+        break;
+    case B_OUTCOME_LOST:
+        IncTrainerCardLosses(BATTLE_OPPOSITE(battlerId));
+        IncTrainerCardWins(battlerId);
+        break;
+    }
+}
+
+void UpdatePlayerLinkBattleRecords(s32 battlerId)
+{
+    if (InUnionRoom() != TRUE)
+    {
+        UpdateTrainerCardWinsLosses(battlerId);
+        UpdateLinkBattleRecords(
+            &gSaveBlock1Ptr->linkBattleRecords,
+            gTrainerCards[battlerId].playerName,
+            gTrainerCards[battlerId].trainerId,
+            gBattleOutcome,
+            battlerId);
+    }
+}
+
+static void PrintLinkBattleWinsLossesDraws(struct LinkBattleRecord *records)
+{
+    s32 x;
+
+    ConvertIntToDecimalStringN(gStringVar1, GetGameStat(GAME_STAT_LINK_BATTLE_WINS), STR_CONV_MODE_LEFT_ALIGN, 4);
+    ConvertIntToDecimalStringN(gStringVar2, GetGameStat(GAME_STAT_LINK_BATTLE_LOSSES), STR_CONV_MODE_LEFT_ALIGN, 4);
+    ConvertIntToDecimalStringN(gStringVar3, GetGameStat(GAME_STAT_LINK_BATTLE_DRAWS), STR_CONV_MODE_LEFT_ALIGN, 4);
+    StringExpandPlaceholders(gStringVar4, gText_TotalRecordWLD);
+
+    x = GetStringCenterAlignXOffset(1, gStringVar4, 0xD0);
+    PrintTextOnWindow(gRecordsWindowId, 1, gStringVar4, x, 0x11, 0, NULL);
+}
+
+static void PrintLinkBattleRecord(struct LinkBattleRecord *record, u8 y, s32 language)
+{
+    if (record->wins == 0 && record->losses == 0 && record->draws == 0)
+    {
+        // empty slot
+        PrintTextOnWindow(gRecordsWindowId, 1, sText_DashesNoPlayer,   8, (y * 8) + 1, 0, NULL);
+        PrintTextOnWindow(gRecordsWindowId, 1, sText_DashesNoScore,  80, (y * 8) + 1, 0, NULL);
+        PrintTextOnWindow(gRecordsWindowId, 1, sText_DashesNoScore, 128, (y * 8) + 1, 0, NULL);
+        PrintTextOnWindow(gRecordsWindowId, 1, sText_DashesNoScore, 176, (y * 8) + 1, 0, NULL);
+    }
+    else
+    {
+        StringFillWithTerminator(gStringVar1, 8);
+        StringCopyN(gStringVar1, record->name, 7);
+        ConvertInternationalString(gStringVar1, language);
+
+        PrintTextOnWindow(gRecordsWindowId, 1, gStringVar1, 8, (y * 8) + 1, 0, NULL);
+
+        ConvertIntToDecimalStringN(gStringVar1, record->wins, STR_CONV_MODE_RIGHT_ALIGN, 4);
+        PrintTextOnWindow(gRecordsWindowId, 1, gStringVar1,  80, (y * 8) + 1, 0, NULL);
+
+        ConvertIntToDecimalStringN(gStringVar1, record->losses, STR_CONV_MODE_RIGHT_ALIGN, 4);
+        PrintTextOnWindow(gRecordsWindowId, 1, gStringVar1, 128, (y * 8) + 1, 0, NULL);
+
+        ConvertIntToDecimalStringN(gStringVar1, record->draws, STR_CONV_MODE_RIGHT_ALIGN, 4);
+        PrintTextOnWindow(gRecordsWindowId, 1, gStringVar1, 176, (y * 8) + 1, 0, NULL);
+    }
+}
+
+void ShowLinkBattleRecords(void)
+{
+    s32 i, x;
+
+    gRecordsWindowId = AddWindow(&sLinkBattleRecordsWindow);
+    NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, FALSE);
+    FillWindowPixelBuffer(gRecordsWindowId, 0x11);
+    StringExpandPlaceholders(gStringVar4, gText_PlayersBattleResults);
+
+    x = GetStringCenterAlignXOffset(1, gStringVar4, 208);
+    PrintTextOnWindow(gRecordsWindowId, 1, gStringVar4, x, 1, 0, NULL);
+    PrintLinkBattleWinsLossesDraws(gSaveBlock1Ptr->linkBattleRecords.entries);
+
+    StringExpandPlaceholders(gStringVar4, gText_WinLoseDraw);
+    PrintTextOnWindow(gRecordsWindowId, 1, gStringVar4, 0, 41, 0, NULL);
+
+    for (i = 0; i < LINK_B_RECORDS_COUNT; i++)
+    {
+        PrintLinkBattleRecord(&gSaveBlock1Ptr->linkBattleRecords.entries[i], 7 + (i * 2), gSaveBlock1Ptr->linkBattleRecords.languages[i]);
+    }
+
+    PutWindowTilemap(gRecordsWindowId);
+    CopyWindowToVram(gRecordsWindowId, 3);
+}
+
+void RemoveRecordsWindow(void)
+{
+    sub_819746C(gRecordsWindowId, FALSE);
+    RemoveWindow(gRecordsWindowId);
+}
+
+static void Task_TrainerHillWaitForPaletteFade(u8 taskId)
+{
+    if (!gPaletteFade.active)
+        gTasks[taskId].func = Task_CloseTrainerHillRecordsOnButton;
+}
+
+static void Task_CloseTrainerHillRecordsOnButton(u8 taskId)
+{
+    struct Task *task = &gTasks[taskId];
+
+    if (gMain.newKeys & A_BUTTON || gMain.newKeys & B_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        task->func = Task_BeginPaletteFade;
+    }
+}
+
+static void Task_BeginPaletteFade(u8 taskId)
+{
+    BeginNormalPaletteFade(-1, 0, 0, 0x10, 0);
+    gTasks[taskId].func = Task_ExitTrainerHillRecords;
+}
+
+static void Task_ExitTrainerHillRecords(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        SetMainCallback2(CB2_ReturnToFieldContinueScript);
+        Free(sTilemapBuffer);
+        RemoveTrainerHillRecordsWindow(0);
+        FreeAllWindowBuffers();
+        DestroyTask(taskId);
+    }
+}
+
+static void RemoveTrainerHillRecordsWindow(u8 windowId)
+{
+    FillWindowPixelBuffer(windowId, 0);
+    ClearWindowTilemap(windowId);
+    CopyWindowToVram(windowId, 2);
+    RemoveWindow(windowId);
+}
+
+static void ClearVramOamPlttRegs(void)
+{
+    DmaClearLarge16(3, (void*)(VRAM), VRAM_SIZE, 0x1000);
+    DmaClear32(3, OAM, OAM_SIZE);
+    DmaClear16(3, PLTT, PLTT_SIZE);
+
+    SetGpuReg(REG_OFFSET_DISPCNT, 0);
+    SetGpuReg(REG_OFFSET_BG0CNT, 0);
+    SetGpuReg(REG_OFFSET_BG0HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG0VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG1CNT, 0);
+    SetGpuReg(REG_OFFSET_BG1HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG1VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG2CNT, 0);
+    SetGpuReg(REG_OFFSET_BG2HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG2VOFS, 0);
+    SetGpuReg(REG_OFFSET_BG3CNT, 0);
+    SetGpuReg(REG_OFFSET_BG3HOFS, 0);
+    SetGpuReg(REG_OFFSET_BG3VOFS, 0);
+    SetGpuReg(REG_OFFSET_WIN0H, 0);
+    SetGpuReg(REG_OFFSET_WIN0V, 0);
+    SetGpuReg(REG_OFFSET_WININ, 0);
+    SetGpuReg(REG_OFFSET_WINOUT, 0);
+    SetGpuReg(REG_OFFSET_BLDCNT, 0);
+    SetGpuReg(REG_OFFSET_BLDALPHA, 0);
+    SetGpuReg(REG_OFFSET_BLDY, 0);
+}
+
+static void ClearTasksAndGraphicalStructs(void)
+{
+    ScanlineEffect_Stop();
+    ResetTasks();
+    ResetSpriteData();
+    ResetPaletteFade();
+    FreeAllSpritePalettes();
+}
+
+static void ResetBgCoordinates(void)
+{
+    ChangeBgX(0, 0, 0);
+    ChangeBgY(0, 0, 0);
+    ChangeBgX(1, 0, 0);
+    ChangeBgY(1, 0, 0);
+    ChangeBgX(2, 0, 0);
+    ChangeBgY(2, 0, 0);
+    ChangeBgX(3, 0, 0);
+    ChangeBgY(3, 0, 0);
+}
+
+static void SetDispcntReg(void)
+{
+    SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_BG0_ON | DISPCNT_BG3_ON | DISPCNT_OBJ_1D_MAP);
+}
+
+static void LoadTrainerHillRecordsWindowGfx(u8 bgId)
+{
+    LoadBgTiles(bgId, sTrainerHillWindowTileset, sizeof(sTrainerHillWindowTileset), 0);
+    CopyToBgTilemapBufferRect(bgId, sTrainerHillWindowTilemap, 0, 0, 0x20, 0x20);
+    LoadPalette(sTrainerHillWindowPalette, 0, 0x20);
+}
+
+static void VblankCB_TrainerHillRecords(void)
+{
+    LoadOam();
+    ProcessSpriteCopyRequests();
+    TransferPlttBuffer();
+}
+
+static void MainCB2_TrainerHillRecords(void)
+{
+    RunTasks();
+    AnimateSprites();
+    BuildOamBuffer();
+    UpdatePaletteFade();
+}
+
+void ShowTrainerHillRecords(void)
+{
+    SetVBlankCallback(NULL);
+    SetMainCallback2(CB2_ShowTrainerHillRecords);
+}
+
+static void CB2_ShowTrainerHillRecords(void)
+{
+    switch (gMain.state)
+    {
+    case 0:
+        SetVBlankCallback(NULL);
+        ClearVramOamPlttRegs();
+        gMain.state++;
+        break;
+    case 1:
+        ClearTasksAndGraphicalStructs();
+        gMain.state++;
+        break;
+    case 2:
+        sTilemapBuffer = AllocZeroed(0x800);
+        ResetBgsAndClearDma3BusyFlags(0);
+        InitBgsFromTemplates(0, sTrainerHillRecordsBgTemplates, ARRAY_COUNT(sTrainerHillRecordsBgTemplates));
+        SetBgTilemapBuffer(3, sTilemapBuffer);
+        ResetBgCoordinates();
+        gMain.state++;
+        break;
+    case 3:
+        LoadTrainerHillRecordsWindowGfx(3);
+        LoadPalette(stdpal_get(0), 0xF0, 0x20);
+        gMain.state++;
+        break;
+    case 4:
+        if (IsDma3ManagerBusyWithBgCopy() != TRUE)
+        {
+            ShowBg(0);
+            ShowBg(3);
+            CopyBgTilemapBufferToVram(3);
+            gMain.state++;
+        }
+        break;
+    case 5:
+        InitWindows(sTrainerHillRecordsWindowTemplates);
+        DeactivateAllTextPrinters();
+        gMain.state++;
+        break;
+    case 6:
+        BeginNormalPaletteFade(-1, 0, 0x10, 0, 0);
+        gMain.state++;
+        break;
+    case 7:
+        SetDispcntReg();
+        SetVBlankCallback(VblankCB_TrainerHillRecords);
+        PrintOnTrainerHillRecordsWindow();
+        CreateTask(Task_TrainerHillWaitForPaletteFade, 8);
+        SetMainCallback2(MainCB2_TrainerHillRecords);
+        gMain.state = 0;
+        break;
+    }
+}

src/berry.c

@@ -1218,7 +1218,7 @@ void FieldObjectInteractionRemoveBerryTree(void)
 
 u8 PlayerHasBerries(void)
 {
-    return IsBagPocketNonEmpty(BAG_BERRIES);
+    return IsBagPocketNonEmpty(POCKET_BERRIES);
 }
 
 void ResetBerryTreeSparkleFlags(void)

src/berry_blender.c

@@ -30,6 +30,7 @@
 #include "trig.h"
 #include "tv.h"
 #include "item_menu.h"
+#include "battle_records.h"
 
 #define BLENDER_SCORE_BEST      0
 #define BLENDER_SCORE_GOOD      1
@@ -131,7 +132,6 @@ extern struct MusicPlayerInfo gMPlayInfo_SE2;
 extern struct MusicPlayerInfo gMPlayInfo_BGM;
 extern u8 gInGameOpponentsNo;
 extern u8 gUnknown_020322D5;
-extern u8 gResultsWindowId;
 
 // graphics
 extern const u8 gBerryBlenderArrowTiles[];
@@ -2472,7 +2472,7 @@ static void CB2_HandleBlenderEndGame(void)
         sub_8081F94(&gSendCmd[0]);
         if (sBerryBlenderData->yesNoAnswer == 0)
         {
-            if (IsBagPocketNonEmpty(BAG_BERRIES) == FALSE) // no berries
+            if (IsBagPocketNonEmpty(POCKET_BERRIES) == FALSE) // no berries
             {
                 sBerryBlenderData->playAgainState = CANT_PLAY_NO_BERRIES;
                 gSendCmd[1] = 0x9999;
@@ -3485,13 +3485,13 @@ void ShowBerryBlenderRecordWindow(void)
     u8 text[32];
 
     winTemplate = sBlenderRecordWindowTemplate;
-    gResultsWindowId = AddWindow(&winTemplate);
+    gRecordsWindowId = AddWindow(&winTemplate);
-    NewMenuHelpers_DrawStdWindowFrame(gResultsWindowId, 0);
+    NewMenuHelpers_DrawStdWindowFrame(gRecordsWindowId, 0);
-    FillWindowPixelBuffer(gResultsWindowId, 0x11);
+    FillWindowPixelBuffer(gRecordsWindowId, 0x11);
 
     xPos = GetStringCenterAlignXOffset(1, gText_BlenderMaxSpeedRecord, 0x90);
-    PrintTextOnWindow(gResultsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL);
+    PrintTextOnWindow(gRecordsWindowId, 1, gText_BlenderMaxSpeedRecord, xPos, 1, 0, NULL);
-    PrintTextOnWindow(gResultsWindowId, 1, gText_234Players, 4, 0x29, 0, NULL);
+    PrintTextOnWindow(gRecordsWindowId, 1, gText_234Players, 4, 0x29, 0, NULL);
 
     for (i = 0, yPos = 0x29; i < BLENDER_SCORES_NO; i++)
     {
@@ -3506,11 +3506,11 @@ void ShowBerryBlenderRecordWindow(void)
         txtPtr = StringAppend(txtPtr, sText_RPM);
 
         xPos = GetStringRightAlignXOffset(1, text, 0x8C);
-        PrintTextOnWindow(gResultsWindowId, 1, text, xPos, yPos + (i * 16), 0, NULL);
+        PrintTextOnWindow(gRecordsWindowId, 1, text, xPos, yPos + (i * 16), 0, NULL);
     }
 
-    PutWindowTilemap(gResultsWindowId);
+    PutWindowTilemap(gRecordsWindowId);
-    CopyWindowToVram(gResultsWindowId, 3);
+    CopyWindowToVram(gRecordsWindowId, 3);
 }
 
 static void sub_8083F3C(u8 taskId)

src/berry_tag_screen.c

@@ -517,7 +517,7 @@ static void TryChangeDisplayedBerry(u8 taskId, s8 toMove)
     s16 *data = gTasks[taskId].data;
     s16 currPocketPosition = gUnknown_0203CE58.scrollPosition[3] + gUnknown_0203CE58.cursorPosition[3];
     u32 newPocketPosition = currPocketPosition + toMove;
-    if (newPocketPosition < 46 && BagGetItemIdByPocketPosition(BAG_BERRIES, newPocketPosition) != 0)
+    if (newPocketPosition < 46 && BagGetItemIdByPocketPosition(POCKET_BERRIES, newPocketPosition) != 0)
     {
         if (toMove < 0)
             data[1] = 2;
@@ -537,7 +537,7 @@ static void HandleBagCursorPositionChange(s8 toMove)
     u16 *cursorPos = &gUnknown_0203CE58.cursorPosition[3];
     if (toMove > 0)
     {
-        if (*cursorPos < 4 || BagGetItemIdByPocketPosition(BAG_BERRIES, *scrollPos + 8) == 0)
+        if (*cursorPos < 4 || BagGetItemIdByPocketPosition(POCKET_BERRIES, *scrollPos + 8) == 0)
             *cursorPos += toMove;
         else
             *scrollPos += toMove;
@@ -550,7 +550,7 @@ static void HandleBagCursorPositionChange(s8 toMove)
             *scrollPos += toMove;
     }
 
-    sBerryTag->berryId = ItemIdToBerryType(BagGetItemIdByPocketPosition(BAG_BERRIES, *scrollPos + *cursorPos));
+    sBerryTag->berryId = ItemIdToBerryType(BagGetItemIdByPocketPosition(POCKET_BERRIES, *scrollPos + *cursorPos));
 }
 
 static void Task_DisplayAnotherBerry(u8 taskId)

src/bg.c

@@ -965,9 +965,9 @@ void CopyBgTilemapBufferToVram(u8 bg)
     }
 }
 
-void CopyToBgTilemapBufferRect(u8 bg, void* src, u8 destX, u8 destY, u8 width, u8 height)
+void CopyToBgTilemapBufferRect(u8 bg, const void* src, u8 destX, u8 destY, u8 width, u8 height)
 {
-    void* srcCopy;
+    const void* srcCopy;
     u16 destX16;
     u16 destY16;
     u16 mode;

src/item_menu.c

@@ -72,7 +72,7 @@ void AddBagItemIconSprite(u16, u8);
 void bag_menu_print_description_box_text(int);
 void bag_menu_print_cursor(u8, u8);
 void bag_menu_print(u8, u8, const u8*, u8, u8, u8, u8, u8, u8);
-bool8 itemid_is_unique(u16);
+bool8 ItemId_GetImportance(u16);
 u16 BagGetQuantityByPocketPosition(u8, u16);
 void sub_81AB89C(void);
 void task_close_bag_menu_2(u8);
@@ -687,7 +687,7 @@ void sub_81AB520(u8 rboxId, int item_index_in_pocket, u8 a)
             offset = GetStringRightAlignXOffset(7, gStringVar4, 0x77);
             bag_menu_print(rboxId, 7, gStringVar4, offset, a, 0, 0, -1, 0);
         }
-        else if (gUnknown_0203CE58.pocket != 4 && (unique = itemid_is_unique(itemId)) == FALSE)
+        else if (gUnknown_0203CE58.pocket != 4 && (unique = ItemId_GetImportance(itemId)) == FALSE)
         {
             ConvertIntToDecimalStringN(gStringVar1, itemQuantity, 1, 2);
             StringExpandPlaceholders(gStringVar4, gText_xVar1);
@@ -804,10 +804,10 @@ void sub_81AB9A8(u8 pocketId)
     {
         case 2:
         case 3:
-            sub_80D6FB4(pocket);
+            SortBerriesOrTMHMs(pocket);
             break;
         default:
-            sub_80D6F64(pocket);
+            CompactItemsInBagPocket(pocket);
             break;
     }
     gUnknown_0203CE54->unk829[pocketId] = 0;
@@ -847,9 +847,9 @@ void sub_81ABAE0(void)
         sub_8122298(&gUnknown_0203CE58.scrollPosition[i], &gUnknown_0203CE58.cursorPosition[i], gUnknown_0203CE54->unk82E[i], gUnknown_0203CE54->unk829[i], 8);
 }
 
-u8 sub_81ABB2C(u8 a)
+u8 sub_81ABB2C(u8 pocketId)
 {
-    return gUnknown_0203CE58.scrollPosition[a] + gUnknown_0203CE58.cursorPosition[a];
+    return gUnknown_0203CE58.scrollPosition[pocketId] + gUnknown_0203CE58.cursorPosition[pocketId];
 }
 
 void DisplayItemMessage(u8 taskId, u8 fontId, const u8 *str, void ( *callback)(u8 taskId))
@@ -1179,7 +1179,7 @@ void sub_81AC498(u8 taskId)
         sub_81AC590(taskId);
     else
     {
-        sub_80D702C(gBagPockets[gUnknown_0203CE58.pocket].itemSlots, data[1], realPos);
+        MoveItemSlotInList(gBagPockets[gUnknown_0203CE58.pocket].itemSlots, data[1], realPos);
         gUnknown_0203CE54->unk81A = -1;
         DestroyListMenuTask(data[0], scrollPos, cursorPos);
         if (data[1] < realPos)
@@ -1231,7 +1231,7 @@ void sub_81AC644(u8 unused)
             gUnknown_0203CE54->unk828 = 4;
             break;
         case 8:
-            if (!itemid_is_unique(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
+            if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
             {
                 gUnknown_0203CE54->unk820 = gUnknown_0861404B;
                 gUnknown_0203CE54->unk828 = 2;
@@ -1243,7 +1243,7 @@ void sub_81AC644(u8 unused)
             }
             break;
         case 6:
-            if (!itemid_is_unique(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
+            if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
             {
                 gUnknown_0203CE54->unk820 = gUnknown_0861404D;
                 gUnknown_0203CE54->unk828 = 2;
@@ -1255,7 +1255,7 @@ void sub_81AC644(u8 unused)
             }
             break;
         case 7:
-            if (!itemid_is_unique(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
+            if (!ItemId_GetImportance(gSpecialVar_ItemId) && gSpecialVar_ItemId != ITEM_ENIGMA_BERRY)
             {
                 gUnknown_0203CE54->unk820 = gUnknown_0861404F;
                 gUnknown_0203CE54->unk828 = 2;
@@ -1605,7 +1605,7 @@ void ItemMenu_Give(u8 taskId)
     {
         DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350);
     }
-    else if (!itemid_is_unique(gSpecialVar_ItemId))
+    else if (!ItemId_GetImportance(gSpecialVar_ItemId))
     {
         if (CalculatePlayerPartyCount() == 0)
             bag_menu_print_there_is_no_pokemon(taskId);
@@ -1686,7 +1686,7 @@ void item_menu_type_2(u8 taskId)
         StringExpandPlaceholders(gStringVar4, gText_Var1CantBeHeldHere);
         DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD350);
     }
-    else if (gUnknown_0203CE58.pocket != 4 && !itemid_is_unique(gSpecialVar_ItemId))
+    else if (gUnknown_0203CE58.pocket != 4 && !ItemId_GetImportance(gSpecialVar_ItemId))
     {
         unknown_ItemMenu_Confirm(taskId);
     }
@@ -1700,7 +1700,7 @@ void item_menu_type_b(u8 taskId)
 {
     if (ItemIsMail(gSpecialVar_ItemId) == TRUE)
         DisplayItemMessage(taskId, 1, gText_CantWriteMail, sub_81AD350);
-    else if (gUnknown_0203CE58.pocket != 4 && !itemid_is_unique(gSpecialVar_ItemId))
+    else if (gUnknown_0203CE58.pocket != 4 && !ItemId_GetImportance(gSpecialVar_ItemId))
         gTasks[taskId].func = unknown_ItemMenu_Confirm;
     else
         bag_menu_print_cant_be_held_msg(taskId);
@@ -1738,7 +1738,7 @@ void display_sell_item_ask_str(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    if (itemid_get_market_price(gSpecialVar_ItemId) == 0)
+    if (ItemId_GetPrice(gSpecialVar_ItemId) == 0)
     {
         CopyItemName(gSpecialVar_ItemId, gStringVar2);
         StringExpandPlaceholders(gStringVar4, gText_CantBuyKeyItem);
@@ -1765,7 +1765,7 @@ void sub_81AD680(u8 taskId)
 {
     s16* data = gTasks[taskId].data;
 
-    ConvertIntToDecimalStringN(gStringVar1, (itemid_get_market_price(gSpecialVar_ItemId) / 2) * data[8], 0, 6);
+    ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8], 0, 6);
     StringExpandPlaceholders(gStringVar4, gText_ICanPayVar1);
     DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD6E4);
 }
@@ -1790,7 +1790,7 @@ void sub_81AD730(u8 taskId)
     s16* data = gTasks[taskId].data;
     u8 windowId = bag_menu_add_window(8);
 
-    sub_81ABCC0(windowId, 1, (itemid_get_market_price(gSpecialVar_ItemId) / 2) * data[8]);
+    sub_81ABCC0(windowId, 1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]);
     bag_menu_AddMoney_window();
     gTasks[taskId].func = sub_81AD794;
 }
@@ -1801,7 +1801,7 @@ void sub_81AD794(u8 taskId)
 
     if (AdjustQuantityAccordingToDPadInput(&data[8], data[2]) == TRUE)
     {
-        sub_81ABCC0(gUnknown_0203CE54->unk818, data[8], (itemid_get_market_price(gSpecialVar_ItemId) / 2) * data[8]);
+        sub_81ABCC0(gUnknown_0203CE54->unk818, data[8], (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]);
     }
     else if (gMain.newKeys & A_BUTTON)
     {
@@ -1825,7 +1825,7 @@ void sub_81AD84C(u8 taskId)
     s16* data = gTasks[taskId].data;
 
     CopyItemName(gSpecialVar_ItemId, gStringVar2);
-    ConvertIntToDecimalStringN(gStringVar1, (itemid_get_market_price(gSpecialVar_ItemId) / 2) * data[8], 0, 6);
+    ConvertIntToDecimalStringN(gStringVar1, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8], 0, 6);
     StringExpandPlaceholders(gStringVar4, gText_TurnedOverVar1ForVar2);
     DisplayItemMessage(taskId, 1, gStringVar4, sub_81AD8C8);
 }
@@ -1838,7 +1838,7 @@ void sub_81AD8C8(u8 taskId)
 
     PlaySE(SE_REGI);
     RemoveBagItem(gSpecialVar_ItemId, data[8]);
-    AddMoney(&gSaveBlock1Ptr->money, (itemid_get_market_price(gSpecialVar_ItemId) / 2) * data[8]);
+    AddMoney(&gSaveBlock1Ptr->money, (ItemId_GetPrice(gSpecialVar_ItemId) / 2) * data[8]);
     DestroyListMenuTask(data[0], scrollPos, cursorPos);
     sub_81AB9A8(gUnknown_0203CE58.pocket);
     sub_81ABA88(gUnknown_0203CE58.pocket);
@@ -1908,7 +1908,7 @@ void sub_81ADB14(u8 taskId)
     s16* data = gTasks[taskId].data;
 
     FillWindowPixelBuffer(1, 0);
-    if (itemid_is_unique(gSpecialVar_ItemId))
+    if (ItemId_GetImportance(gSpecialVar_ItemId))
     {
         bag_menu_print(1, 1, gText_CantStoreImportantItems, 3, 1, 0, 0, 0, 0);
         gTasks[taskId].func = sub_81ADC0C;

src/lilycove_lady.c

@@ -392,7 +392,7 @@ bool8 sub_818DC60(void)
 
 static void sub_818DCAC(u8 *dest, u16 itemId)
 {
-    StringCopy(dest, ItemId_GetItem(itemId)->name);
+    StringCopy(dest, ItemId_GetName(itemId));
 }
 
 void sub_818DCC8(void)
@@ -671,7 +671,7 @@ static u8 sub_818E258(const u8 *str)
 
 void sub_818E274(void)
 {
-    StringCopy(gStringVar1, ItemId_GetItem(gUnknown_0203CD68->itemId)->name);
+    StringCopy(gStringVar1, ItemId_GetName(gUnknown_0203CD68->itemId));
 }
 
 bool8 sub_818E298(void)

src/load_save.c

@@ -4,33 +4,30 @@
 #include "main.h"
 #include "pokemon.h"
 #include "random.h"
+#include "malloc.h"
+#include "item.h"
 
 extern void* gUnknown_0203CF5C;
 
 extern bool16 IdentifyFlash(void);
-extern void SetBagItemsPointers(void);
 extern void SetDecorationInventoriesPointers(void);
 extern void ApplyNewEncryptionKeyToGameStats(u32 key);
-extern void ApplyNewEncryptionKeyToBagItems(u32 newKey);
-extern void ApplyNewEncryptionKeyToBagItems_(u32 key);
 extern void ApplyNewEncryptionKeyToBerryPowder(u32 key);
 extern void sub_8084FAC(int unused);
 
-// this is probably wrong or misleading due to it being used in ResetHeap...
-extern void InitHeap(void *pointer, u32 size);
-
 #define SAVEBLOCK_MOVE_RANGE    128
 
 struct LoadedSaveData
 {
- /*0x0000*/ struct ItemSlot items[30];
+ /*0x0000*/ struct ItemSlot items[BAG_ITEMS_COUNT];
- /*0x0078*/ struct ItemSlot keyItems[30];
+ /*0x0078*/ struct ItemSlot keyItems[BAG_KEYITEMS_COUNT];
- /*0x00F0*/ struct ItemSlot pokeBalls[16];
+ /*0x00F0*/ struct ItemSlot pokeBalls[BAG_POKEBALLS_COUNT];
- /*0x0130*/ struct ItemSlot TMsHMs[64];
+ /*0x0130*/ struct ItemSlot TMsHMs[BAG_TMHM_COUNT];
- /*0x0230*/ struct ItemSlot berries[46];
+ /*0x0230*/ struct ItemSlot berries[BAG_BERRIES_COUNT];
  /*0x02E8*/ struct MailStruct mail[MAIL_COUNT];
 };
 
+// EWRAM DATA
 EWRAM_DATA struct SaveBlock2 gSaveblock2 = {0};
 EWRAM_DATA u8 gSaveblock2_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
 
@@ -43,8 +40,13 @@ EWRAM_DATA u8 gSaveblock3_DMA[SAVEBLOCK_MOVE_RANGE] = {0};
 EWRAM_DATA struct LoadedSaveData gLoadedSaveData = {0};
 EWRAM_DATA u32 gLastEncryptionKey = {0};
 
-void ApplyNewEncryptionKeyToAllEncryptedData(u32 encryptionKey);
+// IWRAM common
+IWRAM_DATA bool32 gFlashMemoryPresent;
+IWRAM_DATA struct SaveBlock1 *gSaveBlock1Ptr;
+IWRAM_DATA struct SaveBlock2 *gSaveBlock2Ptr;
+IWRAM_DATA struct PokemonStorage *gPokemonStoragePtr;
 
+// code
 void CheckForFlashMemory(void)
 {
     if (!IdentifyFlash())
@@ -53,7 +55,9 @@ void CheckForFlashMemory(void)
         InitFlashTimer();
     }
     else
+    {
         gFlashMemoryPresent = FALSE;
+    }
 }
 
 void ClearSav2(void)
@@ -80,8 +84,6 @@ void SetSaveBlocksPointers(u16 offset)
     SetDecorationInventoriesPointers();
 }
 
-extern u8 gHeap[];
-
 void MoveSaveBlocks_ResetHeap(void)
 {
     void *vblankCB, *hblankCB;
@@ -132,7 +134,6 @@ void MoveSaveBlocks_ResetHeap(void)
     gSaveBlock2Ptr->encryptionKey = encryptionKey;
 }
 
-
 u32 GetSecretBase2Field_9(void)
 {
     return gSaveBlock2Ptr->specialSaveWarp & 1;
@@ -159,112 +160,112 @@ void sav2_gender2_inplace_and_xFE(void)
     gSaveBlock2Ptr->specialSaveWarp &= ~1;
 }
 
-void copy_player_party_to_sav1(void) // SavePlayerParty
+void SavePlayerParty(void)
 {
     int i;
 
     gSaveBlock1Ptr->playerPartyCount = gPlayerPartyCount;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         gSaveBlock1Ptr->playerParty[i] = gPlayerParty[i];
 }
 
-void copy_player_party_from_sav1(void) // LoadPlayerParty
+void LoadPlayerParty(void)
 {
     int i;
 
     gPlayerPartyCount = gSaveBlock1Ptr->playerPartyCount;
 
-    for (i = 0; i < 6; i++)
+    for (i = 0; i < PARTY_SIZE; i++)
         gPlayerParty[i] = gSaveBlock1Ptr->playerParty[i];
 }
 
-void save_serialize_npcs(void) // SaveMapObjects
+void SaveMapObjects(void)
 {
     int i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
         gSaveBlock1Ptr->mapObjects[i] = gMapObjects[i];
 }
 
-void save_deserialize_npcs(void) // LoadMapObjects
+void LoadMapObjects(void)
 {
     int i;
 
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAP_OBJECTS_COUNT; i++)
         gMapObjects[i] = gSaveBlock1Ptr->mapObjects[i];
 }
 
 void SaveSerializedGame(void)
 {
-    copy_player_party_to_sav1();
+    SavePlayerParty();
-    save_serialize_npcs();
+    SaveMapObjects();
 }
 
 void LoadSerializedGame(void)
 {
-    copy_player_party_from_sav1();
+    LoadPlayerParty();
-    save_deserialize_npcs();
+    LoadMapObjects();
 }
 
-void copy_bags_and_unk_data_from_save_blocks(void)
+void LoadPlayerBag(void)
 {
     int i;
 
     // load player items.
-    for (i = 0; i < 30; i++)
+    for (i = 0; i < BAG_ITEMS_COUNT; i++)
         gLoadedSaveData.items[i] = gSaveBlock1Ptr->bagPocket_Items[i];
 
     // load player key items.
-    for (i = 0; i < 30; i++)
+    for (i = 0; i < BAG_KEYITEMS_COUNT; i++)
         gLoadedSaveData.keyItems[i] = gSaveBlock1Ptr->bagPocket_KeyItems[i];
 
     // load player pokeballs.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < BAG_POKEBALLS_COUNT; i++)
         gLoadedSaveData.pokeBalls[i] = gSaveBlock1Ptr->bagPocket_PokeBalls[i];
 
     // load player TMs and HMs.
-    for (i = 0; i < 64; i++)
+    for (i = 0; i < BAG_TMHM_COUNT; i++)
         gLoadedSaveData.TMsHMs[i] = gSaveBlock1Ptr->bagPocket_TMHM[i];
 
     // load player berries.
-    for (i = 0; i < 46; i++)
+    for (i = 0; i < BAG_BERRIES_COUNT; i++)
         gLoadedSaveData.berries[i] = gSaveBlock1Ptr->bagPocket_Berries[i];
 
     // load mail.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAIL_COUNT; i++)
         gLoadedSaveData.mail[i] = gSaveBlock1Ptr->mail[i];
 
     gLastEncryptionKey = gSaveBlock2Ptr->encryptionKey;
 }
 
-void copy_bags_and_unk_data_to_save_blocks(void)
+void SavePlayerBag(void)
 {
     int i;
     u32 encryptionKeyBackup;
 
     // save player items.
-    for (i = 0; i < 30; i++)
+    for (i = 0; i < BAG_ITEMS_COUNT; i++)
         gSaveBlock1Ptr->bagPocket_Items[i] = gLoadedSaveData.items[i];
 
     // save player key items.
-    for (i = 0; i < 30; i++)
+    for (i = 0; i < BAG_KEYITEMS_COUNT; i++)
         gSaveBlock1Ptr->bagPocket_KeyItems[i] = gLoadedSaveData.keyItems[i];
 
     // save player pokeballs.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < BAG_POKEBALLS_COUNT; i++)
         gSaveBlock1Ptr->bagPocket_PokeBalls[i] = gLoadedSaveData.pokeBalls[i];
 
     // save player TMs and HMs.
-    for (i = 0; i < 64; i++)
+    for (i = 0; i < BAG_TMHM_COUNT; i++)
         gSaveBlock1Ptr->bagPocket_TMHM[i] = gLoadedSaveData.TMsHMs[i];
 
     // save player berries.
-    for (i = 0; i < 46; i++)
+    for (i = 0; i < BAG_BERRIES_COUNT; i++)
         gSaveBlock1Ptr->bagPocket_Berries[i] = gLoadedSaveData.berries[i];
 
     // save mail.
-    for (i = 0; i < 16; i++)
+    for (i = 0; i < MAIL_COUNT; i++)
         gSaveBlock1Ptr->mail[i] = gLoadedSaveData.mail[i];
 
     encryptionKeyBackup = gSaveBlock2Ptr->encryptionKey;

src/new_game.c

@@ -20,8 +20,10 @@
 #include "tv.h"
 #include "coins.h"
 #include "text.h"
+#include "overworld.h"
+#include "mail.h"
+#include "battle_records.h"
 
-extern u8 gPlayerPartyCount;
 extern u8 gDifferentSaveFile;
 extern u16 gSaveFileStatus;
 extern u8 gUnknown_030060B0;
@@ -29,19 +31,15 @@ extern u8 gUnknown_030060B0;
 // TODO: replace those declarations with file headers
 extern u16 GetGeneratedTrainerIdLower(void);
 extern void ClearContestWinnerPicsInContestHall(void);
-extern void Overworld_SetWarpDestination(s8 mapBank, s8 mapNo, s8 warpNo, s8 xPos, s8 yPos);
 extern void warp_in(void);
 extern void sub_80BB358(void);
 extern void ResetBagScrollPositions(void);
 extern void ResetPokedex(void);
 extern void sub_8084400(void);
-extern void ClearMailData(void);
 extern void ResetGabbyAndTy(void);
 extern void ResetSecretBases(void);
 extern void ResetLinkContestBoolean(void);
-extern void ResetGameStats(void);
 extern void sub_8052DA8(void);
-extern void InitLinkBattleRecords(void);
 extern void ResetPokemonStorageSystem(void);
 extern void ClearBag(void);
 extern void NewGameInitPCItems(void);
@@ -58,7 +56,7 @@ extern void ResetContestLinkResults(void);
 extern void ResetPokeJumpResults(void);
 extern void SetBerryPowder(u32* powder, u32 newValue);
 
-extern u8 EventScript_2715DE[];
+extern const u8 EventScript_2715DE[];
 
 void WriteUnalignedWord(u32 var, u8 *dataPtr)
 {
@@ -178,7 +176,7 @@ void NewGameInitData(void)
     ResetLinkContestBoolean();
     ResetGameStats();
     ClearAllContestWinnerPics();
-    InitLinkBattleRecords();
+    ClearPlayerLinkBattleRecords();
     InitSeedotSizeRecord();
     InitLotadSizeRecord();
     gPlayerPartyCount = 0;

src/player_pc.c

@@ -444,7 +444,7 @@ static void ItemStorage_Withdraw(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    NUM_ITEMS = sub_80D6CE4();
+    NUM_ITEMS = CountUsedPCItemSlots();
     if (NUM_ITEMS != 0)
         ItemStorage_WithdrawToss_Helper(taskId, FALSE);
     else
@@ -459,7 +459,7 @@ static void ItemStorage_Toss(u8 taskId)
 {
     s16 *data = gTasks[taskId].data;
 
-    NUM_ITEMS = sub_80D6CE4();
+    NUM_ITEMS = CountUsedPCItemSlots();
     if (NUM_ITEMS != 0)
         ItemStorage_WithdrawToss_Helper(taskId, TRUE);
     else
@@ -967,7 +967,7 @@ static void sub_816C0C8(void)
 
 static void sub_816C110(void)
 {
-    sub_80D6E84();
+    CompactPCItems();
     sub_812220C(gSaveBlock1Ptr->pcItems, 50, &(playerPCItemPageInfo.pageItems), &(playerPCItemPageInfo.count), 0x8);
 }
 
@@ -1180,7 +1180,7 @@ static void ItemStorage_DoItemSwap(u8 taskId, bool8 a)
         {
             if(c != b - 1)
             {
-                sub_80D702C(gSaveBlock1Ptr->pcItems, c, b);
+                MoveItemSlotInList(gSaveBlock1Ptr->pcItems, c, b);
                 ItemStorage_RefreshListMenu();
             }
         }
@@ -1301,7 +1301,7 @@ static void ItemStorage_DoItemToss(u8 taskId)
 
     data = gTasks[taskId].data;
     b = (playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove);
-    if(!itemid_is_unique(gSaveBlock1Ptr->pcItems[b].itemId))
+    if(!ItemId_GetImportance(gSaveBlock1Ptr->pcItems[b].itemId))
     {
         CopyItemName(gSaveBlock1Ptr->pcItems[b].itemId, gStringVar1);
         ConvertIntToDecimalStringN(gStringVar2, data[2], STR_CONV_MODE_LEFT_ALIGN, 3);
@@ -1335,7 +1335,7 @@ static void ItemStorage_HandleRemoveItem(u8 taskId)
     data = gTasks[taskId].data;
     if(gMain.newKeys & (A_BUTTON | B_BUTTON))
     {
-        sub_80D6E48((playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove), data[2]);
+        RemovePCItem((playerPCItemPageInfo.cursorPos + playerPCItemPageInfo.itemsAbove), data[2]);
         DestroyListMenuTask(data[5], &(playerPCItemPageInfo.itemsAbove), &(playerPCItemPageInfo.cursorPos));
         sub_816C110();
         sub_816C140();

src/pokeblock.c

@@ -589,7 +589,7 @@ static void PutPokeblockInfoText(void)
 {
     u8 i;
 
-    const u8 *itemName = ItemId_GetItem(ITEM_POKEBLOCK_CASE)->name;
+    const u8 *itemName = ItemId_GetName(ITEM_POKEBLOCK_CASE);
     PrintOnPokeblockWindow(0, itemName, GetStringCenterAlignXOffset(1, itemName, 0x48));
 
     PrintOnPokeblockWindow(2, gText_Spicy, 0);

src/pokemon_summary_screen.c

@@ -3173,11 +3173,11 @@ void sub_81C3554(u8 taskId)
 
 void sub_81C35E4()
 {
-    u8 *text;
+    const u8 *text;
     int offset;
     if (gUnknown_0203CF1C->summary.item == ITEM_ENIGMA_BERRY && sub_81B1250() == 1 && (gUnknown_0203CF1C->unk40BE == 1 || gUnknown_0203CF1C->unk40BE == 4 || gUnknown_0203CF1C->unk40BE == 5))
     {
-        text = (u8*)ItemId_GetItem(ITEM_ENIGMA_BERRY);
+        text = ItemId_GetName(ITEM_ENIGMA_BERRY);
     }
     else if (gUnknown_0203CF1C->summary.item == ITEM_NONE)
         text = gText_None;

src/random.c

@@ -7,6 +7,10 @@
 EWRAM_DATA static u8 sUnknown = 0;
 EWRAM_DATA static u32 sRandCount = 0;
 
+// IWRAM common
+IWRAM_DATA u32 gRngValue;
+IWRAM_DATA u32 gRng2Value;
+
 u16 Random(void)
 {
     gRngValue = 1103515245 * gRngValue + 24691;

src/save.c

@@ -4,17 +4,15 @@
 #include "constants/game_stat.h"
 #include "task.h"
 #include "decompress.h"
+#include "load_save.h"
+#include "overworld.h"
 
 // for the chunk declarations
-extern struct SaveBlock2 gSaveblock2;
-extern struct SaveBlock1 gSaveblock1;
-extern struct PokemonStorage gPokemonStorage;
 
 extern struct SaveSectionLocation gRamSaveSectionLocations[0xE];
-extern u8 gDecompressionBuffer[];
-extern u32 gFlashMemoryPresent;
 extern u16 gUnknown_03006294;
 extern bool8 gSoftResetDisabled;
+extern u32 gUnknown_0203CF5C;
 
 // Divide save blocks into individual chunks to be written to flash sectors
 
@@ -24,13 +22,13 @@ extern bool8 gSoftResetDisabled;
 
 /*
  * Sector Layout:
- * 
+ *
  * Sectors 0 - 13:      Save Slot 1
  * Sectors 14 - 27:     Save Slot 2
  * Sectors 28 - 29:     Hall of Fame
  * Sector 30:           e-Reader/Mystery Gift Stuff (note: e-Reader is deprecated in Emerald US)
  * Sector 31:           Recorded Battle
- * 
+ *
  * There are two save slots for saving the player's game data. We alternate between
  * them each time the game is saved, so that if the current save slot is corrupt,
  * we can load the previous one. We also rotate the sectors in each save slot
@@ -41,7 +39,7 @@ extern bool8 gSoftResetDisabled;
 
 // (u8 *)structure was removed from the first statement of the macro in Emerald.
 // This is because malloc is used to allocate addresses so storing the raw
-// addresses should not be done in the offsets information. 
+// addresses should not be done in the offsets information.
 #define SAVEBLOCK_CHUNK(structure, chunkNum)                                \
 {                                                                           \
     chunkNum * SECTOR_DATA_SIZE,                                            \
@@ -69,8 +67,10 @@ const struct SaveSectionOffsets gSaveSectionOffsets[] =
 };
 
 extern void DoSaveFailedScreen(u8); // save_failed_screen
-extern void LoadSerializedGame(void); // load_save
 extern bool32 ProgramFlashSectorAndVerify(u8 sector, u8 *data);
+extern void save_serialize_map(void);
+extern void sub_800ADF8(void);
+extern bool8 sub_800A520(void);
 
 // iwram common
 u16 gLastWrittenSector;
@@ -656,11 +656,6 @@ void UpdateSaveAddresses(void)
     }
 }
 
-extern u32 GetGameStat(u8 index); // rom4
-extern void IncrementGameStat(u8 index); // rom4
-extern void SaveSerializedGame(void); // load_save
-extern u32 gUnknown_0203CF5C;
-
 u8 HandleSavingData(u8 saveType)
 {
     u8 i;
@@ -836,7 +831,7 @@ u16 sub_815355C(void)
     struct SaveSection* savSection;
 
     savSection = gFastSaveSection = &gSaveDataBuffer;
-    if (gFlashMemoryPresent != 1)
+    if (gFlashMemoryPresent != TRUE)
         return 0;
     UpdateSaveAddresses();
     GetSaveValidStatus(gRamSaveSectionLocations);
@@ -897,12 +892,6 @@ u32 sub_8153634(u8 sector, u8* src)
     return 1;
 }
 
-extern void save_serialize_map(void);
-extern void sub_8076D5C(void);
-extern void sav2_gender2_inplace_and_xFE(void);
-extern void sub_800ADF8(void);
-extern bool8 sub_800A520(void);
-
 void sub_8153688(u8 taskId)
 {
     s16* taskData = gTasks[taskId].data;

src/trader.c

@@ -0,0 +1,209 @@
+#include "global.h"
+#include "constants/decorations.h"
+#include "constants/mauville_man.h"
+#include "decoration.h"
+#include "decoration_inventory.h"
+#include "event_data.h"
+#include "main.h"
+#include "menu.h"
+#include "menu_helpers.h"
+#include "script.h"
+#include "constants/songs.h"
+#include "sound.h"
+#include "string_util.h"
+#include "strings.h"
+#include "task.h"
+#include "script_menu.h"
+
+static const u8 * const gUnknown_085B09E4[] =
+{
+    gText_Tristan,
+    gText_Philip,
+    gText_Dennis,
+    gText_Roberto,
+};
+
+static const u8 gTraderDecorations[] =
+{
+    DECOR_DUSKULL_DOLL,
+    DECOR_BALL_CUSHION,
+    DECOR_TIRE,
+    DECOR_PRETTY_FLOWERS,
+};
+
+void TraderSetup(void)
+{
+    u8 i;
+    struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
+
+    trader->id = MAUVILLE_MAN_TRADER;
+    trader->alreadyTraded = FALSE;
+
+    for (i = 0; i < 4; i++)
+    {
+        StringCopy(trader->unk5[i], gUnknown_085B09E4[i]);
+        trader->unk1[i] = gTraderDecorations[i];
+        trader->language[i] = GAME_LANGUAGE;
+    }
+}
+
+void sub_8133A60(void)
+{
+    struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
+    trader->alreadyTraded = FALSE;
+}
+
+void CreateAvailableDecorationsMenu(u8 taskId)
+{
+    u8 i;
+    s16 * data = gTasks[taskId].data;
+    struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
+    struct WindowTemplate windowTemplate = {0, 1, 1, 10, 10, 15, 1};
+    s32 windowWidth = GetStringWidth(1, gText_Exit, 0);
+    s32 fiveMarksWidth = GetStringWidth(1, gText_FiveMarks, 0);
+    for (i = 0; i < 4; i++)
+    {
+        s32 curWidth;
+        if (trader->unk1[i] > NUM_DECORATIONS)
+            curWidth = fiveMarksWidth;
+        else
+            curWidth = GetStringWidth(1, gDecorations[trader->unk1[i]].name, 0);
+        if (curWidth > windowWidth)
+            windowWidth = curWidth;
+    }
+    windowTemplate.width = convert_pixel_width_to_tile_width(windowWidth);
+    data[3] = AddWindow(&windowTemplate);
+    SetWindowBorderStyle(data[3], FALSE, 0x214, 14);
+    for (i = 0; i < 4; i++)
+    {
+        if (trader->unk1[i] > NUM_DECORATIONS)
+            PrintTextOnWindow(data[3], 1, gText_FiveMarks, 8, 16 * i + 1, 255, NULL);
+        else
+            PrintTextOnWindow(data[3], 1, gDecorations[trader->unk1[i]].name, 8, 16 * i + 1, 255, NULL);
+    }
+    PrintTextOnWindow(data[3], 1, gText_Exit, 8, 16 * i + 1, 255, NULL);
+    InitMenuInUpperLeftCornerPlaySoundWhenAPressed(data[3], 5, 0);
+    schedule_bg_copy_tilemap_to_vram(0);
+}
+
+void sub_8133BE4(u8 taskId, u8 decorationId)
+{
+    s16 * data = gTasks[taskId].data;
+    if (decorationId > NUM_DECORATIONS)
+    {
+        gSpecialVar_0x8004 = 0xFFFF;
+    }
+    else
+    {
+        gSpecialVar_0x8004 = decorationId;
+    }
+
+    sub_8198070(data[3], FALSE);
+    ClearWindowTilemap(data[3]);
+    RemoveWindow(data[3]);
+    schedule_bg_copy_tilemap_to_vram(0);
+    DestroyTask(taskId);
+    EnableBothScriptContexts();
+}
+
+void Task_HandleGetDecorationMenuInput(u8 taskId)
+{
+    struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
+    s8 input = ProcessMenuInput();
+
+    switch (input)
+    {
+        case -2:
+            break;
+        case -1:
+        case 4:
+            PlaySE(SE_SELECT);
+            sub_8133BE4(taskId, 0);
+            break;
+        default:
+            PlaySE(SE_SELECT);
+            gSpecialVar_0x8005 = input;
+            StringCopy(gStringVar1, trader->unk5[input]);
+            ConvertInternationalString(gStringVar1, trader->language[input]);
+            sub_8133BE4(taskId, trader->unk1[input]);
+            break;
+    }
+}
+
+void ScrSpecial_GetTraderTradedFlag(void)
+{
+    struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
+    gSpecialVar_Result = trader->alreadyTraded;
+}
+
+void ScrSpecial_DoesPlayerHaveNoDecorations(void)
+{
+    u8 i;
+
+    for (i = 0; i < 8; i++)
+    {
+        if (CountDecorationCategoryN(i))
+        {
+            gSpecialVar_Result = FALSE;
+            return;
+        }
+    }
+    gSpecialVar_Result = TRUE;
+}
+
+void ScrSpecial_IsDecorationFull(void)
+{
+    gSpecialVar_Result = FALSE;
+    if (gDecorations[gSpecialVar_0x8004].category != gDecorations[gSpecialVar_0x8006].category
+        && GetFirstEmptyDecorSlot(gDecorations[gSpecialVar_0x8004].category) == -1)
+    {
+        sub_8127250(gStringVar2, gDecorations[gSpecialVar_0x8004].category);
+        gSpecialVar_Result = TRUE;
+    }
+}
+
+void ScrSpecial_TraderMenuGiveDecoration(void)
+{
+    CreateTask(sub_8127208, 0);
+}
+
+void sub_8133DA0(u8 taskId)
+{
+    if (IsSelectedDecorInThePC() == TRUE)
+    {
+        gSpecialVar_0x8006 = gCurDecorInventoryItems[gCurDecorationIndex];
+        StringCopy(gStringVar3, gDecorations[gSpecialVar_0x8004].name);
+        StringCopy(gStringVar2, gDecorations[gSpecialVar_0x8006].name);
+    }
+    else
+    {
+        gSpecialVar_0x8006 = 0xFFFF;
+    }
+    DestroyTask(taskId);
+    EnableBothScriptContexts();
+}
+
+void sub_8133E1C(u8 taskId)
+{
+    gSpecialVar_0x8006 = 0;
+    DestroyTask(taskId);
+    EnableBothScriptContexts();
+}
+
+void ScrSpecial_TraderDoDecorationTrade(void)
+{
+    struct MauvilleOldManTrader *trader = &gSaveBlock1Ptr->oldMan.trader;
+
+    DecorationRemove(gSpecialVar_0x8006);
+    DecorationAdd(gSpecialVar_0x8004);
+    StringCopy(trader->unk5[gSpecialVar_0x8005], gSaveBlock2Ptr->playerName);
+    trader->unk1[gSpecialVar_0x8005] = gSpecialVar_0x8006;
+    trader->language[gSpecialVar_0x8005] = GAME_LANGUAGE;
+    trader->alreadyTraded = TRUE;
+}
+
+void ScrSpecial_TraderMenuGetDecoration(void)
+{
+    u8 taskId = CreateTask(Task_HandleGetDecorationMenuInput, 0);
+    CreateAvailableDecorationsMenu(taskId);
+}

src/tv.c

@@ -1380,13 +1380,13 @@ void PutFanClubSpecialOnTheAir(void)
     StringCopy(show->fanClubSpecial.idolName, name);
     tv_store_id_2x(show);
     show->fanClubSpecial.language = gGameLanguage;
-    if (show->fanClubSpecial.language == LANGUAGE_JAPANESE || gSaveBlock1Ptr->unk_31A0 == LANGUAGE_JAPANESE)
+    if (show->fanClubSpecial.language == LANGUAGE_JAPANESE || gSaveBlock1Ptr->linkBattleRecords.languages[0] == LANGUAGE_JAPANESE)
     {
         show->fanClubSpecial.idolNameLanguage = LANGUAGE_JAPANESE;
     }
     else
     {
-        show->fanClubSpecial.idolNameLanguage = gSaveBlock1Ptr->unk_31A0;
+        show->fanClubSpecial.idolNameLanguage = gSaveBlock1Ptr->linkBattleRecords.languages[0];
     }
 }
 
@@ -2465,7 +2465,7 @@ bool8 sub_80EE7C0(void)
     {
         return TRUE;
     }
-    if (gSaveBlock1Ptr->linkBattleRecords[0].name[0] == EOS)
+    if (gSaveBlock1Ptr->linkBattleRecords.entries[0].name[0] == EOS)
     {
         return TRUE;
     }
@@ -2945,7 +2945,7 @@ static void sub_80EF40C(u8 varIdx, TVShow *show)
     {
         if (show->smartshopperShow.itemIds[i] != ITEM_NONE)
         {
-            price += itemid_get_market_price(show->smartshopperShow.itemIds[i]) * show->smartshopperShow.itemAmounts[i];
+            price += ItemId_GetPrice(show->smartshopperShow.itemIds[i]) * show->smartshopperShow.itemAmounts[i];
         }
     }
     if (show->smartshopperShow.priceReduced == TRUE)
@@ -5120,7 +5120,7 @@ static void DoTVShowTodaysSmartShopper(void)
             break;
         case 1:
             TVShowConvertInternationalString(gStringVar1, show->smartshopperShow.playerName, show->smartshopperShow.language);
-            StringCopy(gStringVar2, ItemId_GetItem(show->smartshopperShow.itemIds[0])->name);
+            StringCopy(gStringVar2, ItemId_GetName(show->smartshopperShow.itemIds[0]));
             TV_PrintIntToStringVar(2, show->smartshopperShow.itemAmounts[0]);
             sTVShowState += 1 + (Random() % 4);
             break;
@@ -5148,7 +5148,7 @@ static void DoTVShowTodaysSmartShopper(void)
             }
             break;
         case 6:
-            StringCopy(gStringVar2, ItemId_GetItem(show->smartshopperShow.itemIds[1])->name);
+            StringCopy(gStringVar2, ItemId_GetName(show->smartshopperShow.itemIds[1]));
             TV_PrintIntToStringVar(2, show->smartshopperShow.itemAmounts[1]);
             if (show->smartshopperShow.itemIds[2] != ITEM_NONE)
             {
@@ -5164,7 +5164,7 @@ static void DoTVShowTodaysSmartShopper(void)
             }
             break;
         case 7:
-            StringCopy(gStringVar2, ItemId_GetItem(show->smartshopperShow.itemIds[2])->name);
+            StringCopy(gStringVar2, ItemId_GetName(show->smartshopperShow.itemIds[2]));
             TV_PrintIntToStringVar(2, show->smartshopperShow.itemAmounts[2]);
             if (show->smartshopperShow.priceReduced == TRUE)
             {
@@ -5201,7 +5201,7 @@ static void DoTVShowTodaysSmartShopper(void)
             break;
         case 11:
             TVShowConvertInternationalString(gStringVar1, show->smartshopperShow.playerName, show->smartshopperShow.language);
-            StringCopy(gStringVar2, ItemId_GetItem(show->smartshopperShow.itemIds[0])->name);
+            StringCopy(gStringVar2, ItemId_GetName(show->smartshopperShow.itemIds[0]));
             if (show->smartshopperShow.priceReduced == TRUE)
             {
                 sTVShowState = 8;
@@ -5344,7 +5344,7 @@ static void DoTVShowPokemonTodaySuccessfulCapture(void)
             sTVShowState = 2;
             break;
         case 2:
-            StringCopy(gStringVar2, ItemId_GetItem(show->pokemonToday.ball)->name);
+            StringCopy(gStringVar2, ItemId_GetName(show->pokemonToday.ball));
             TV_PrintIntToStringVar(2, show->pokemonToday.nBallsUsed);
             if (show->pokemonToday.nBallsUsed < 4)
             {
@@ -6457,7 +6457,7 @@ static void DoTVShowHoennTreasureInvestigators(void)
     switch (state)
     {
         case 0:
-            StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
+            StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item));
             if (show->treasureInvestigators.location == MAPSEC_DYNAMIC)
             {
                 switch (show->treasureInvestigators.mapDataId)
@@ -6476,13 +6476,13 @@ static void DoTVShowHoennTreasureInvestigators(void)
             }
             break;
         case 1:
-            StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
+            StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item));
             TVShowConvertInternationalString(gStringVar2, show->treasureInvestigators.playerName, show->treasureInvestigators.language);
             GetMapName(gStringVar3, show->treasureInvestigators.location, 0);
             TVShowDone();
             break;
         case 2:
-            StringCopy(gStringVar1, ItemId_GetItem(show->treasureInvestigators.item)->name);
+            StringCopy(gStringVar1, ItemId_GetName(show->treasureInvestigators.item));
             TVShowConvertInternationalString(gStringVar2, show->treasureInvestigators.playerName, show->treasureInvestigators.language);
             TVShowDone();
             break;
@@ -6598,7 +6598,7 @@ static void DoTVShowBreakingNewsTV(void)
             break;
         case 3:
             TV_PrintIntToStringVar(0, show->breakingNews.balls);
-            StringCopy(gStringVar2, ItemId_GetItem(show->breakingNews.caughtMonBall)->name);
+            StringCopy(gStringVar2, ItemId_GetName(show->breakingNews.caughtMonBall));
             sTVShowState = 4;
             break;
         case 4:
@@ -6788,7 +6788,7 @@ static void DoTVShowPokemonLotteryWinnerFlashReport(void)
     {
         StringCopy(gStringVar2, gText_Third);
     }
-    StringCopy(gStringVar3, ItemId_GetItem(show->lottoWinner.item)->name);
+    StringCopy(gStringVar3, ItemId_GetName(show->lottoWinner.item));
     TVShowDone();
     ShowFieldMessage(sTVPokemonLotteryWinnerFlashReportTextGroup[state]);
 }
@@ -7530,7 +7530,7 @@ static void DoTVShowSecretBaseSecrets(void)
             sTVShowState = show->secretBaseSecrets.savedState;
             break;
         case 19:
-            StringCopy(gStringVar2, ItemId_GetItem(show->secretBaseSecrets.item)->name);
+            StringCopy(gStringVar2, ItemId_GetName(show->secretBaseSecrets.item));
             sTVShowState = show->secretBaseSecrets.savedState;
             break;
         case 20:

sym_common.txt

@@ -8,24 +8,8 @@
 	.include "link_rfu.o"
     .include "rtc.o"
     .include "battle_main.o"
-
+    .include "random.o"
-gRngValue: @ 3005D80
+    .include "load_save.o"
-	.space 0x4
-
-gRng2Value: @ 3005D84
-	.space 0x4
-
-gFlashMemoryPresent: @ 3005D88
-	.space 0x4
-
-gSaveBlock1Ptr: @ 3005D8C
-	.space 0x4
-
-gSaveBlock2Ptr: @ 3005D90
-	.space 0x4
-
-gPokemonStoragePtr: @ 3005D94
-	.space 0x4
 
 gInGameOpponentsNo: @ 3005D98
 	.space 0x4

sym_ewram.txt

@@ -318,7 +318,7 @@ gUnknown_02039B52: @ 2039B52
 gUnknown_02039B54: @ 2039B54
 	.space 0x4
 
-gUnknown_02039B58: @ 2039B58
+gTrainerCards: @ 2039B58
 	.space 0x14
 
 gUnknown_02039B6C: @ 2039B6C
@@ -414,10 +414,7 @@ gUnknown_02039DD0: @ 2039DD0
 	.space 0x4
 
 	.include "src/map_name_popup.o"
-	.space 0x3
+	.include "src/item.o"
-
-gBagPockets: @ 2039DD8
-	.space 0x28
 
 gUnknown_02039E00: @ 2039E00
 	.space 0x100
@@ -713,11 +710,7 @@ gUnknown_0203AB6F: @ 203AB6F
 gUnknown_0203AB70: @ 203AB70
 	.space 0x4
 
-gResultsWindowId: @ 203AB74
+    .include "src/battle_records.o"
-	.space 0x4
-
-gUnknown_0203AB78: @ 203AB78
-	.space 0x4
 
 gUnknown_0203AB7C: @ 203AB7C
 	.space 0x4