decompile main

1 files changed, 67 insertions, 67 deletions

diff --git a/asm/load_save.s b/asm/load_save.s
index 751e41739..bb98ca619 100644
--- a/asm/load_save.s
+++ b/asm/load_save.s
@@ -37,7 +37,7 @@ ClearSav2: @ 804C010
 	mov r1, sp
 	movs r0, 0
 	strh r0, [r1]
-	ldr r1, _0804C02C @ =gUnknown_2024588
+	ldr r1, _0804C02C @ =gSaveBlock2
 	ldr r2, _0804C030 @ =0x010007d2
 	mov r0, sp
 	bl CpuSet
@@ -45,7 +45,7 @@ ClearSav2: @ 804C010
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C02C: .4byte gUnknown_2024588
+_0804C02C: .4byte gSaveBlock2
 _0804C030: .4byte 0x010007d2
 	thumb_func_end ClearSav2
 
@@ -56,7 +56,7 @@ ClearSav1: @ 804C034
 	mov r1, sp
 	movs r0, 0
 	strh r0, [r1]
-	ldr r1, _0804C050 @ =gUnknown_202552C
+	ldr r1, _0804C050 @ =gSaveBlock1
 	ldr r2, _0804C054 @ =0x01001ef4
 	mov r0, sp
 	bl CpuSet
@@ -64,27 +64,27 @@ ClearSav1: @ 804C034
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C050: .4byte gUnknown_202552C
+_0804C050: .4byte gSaveBlock1
 _0804C054: .4byte 0x01001ef4
 	thumb_func_end ClearSav1
 
 	thumb_func_start SetSaveBlocksPointers
 SetSaveBlocksPointers: @ 804C058
 	push {r4,r5,lr}
-	ldr r4, _0804C08C @ =gUnknown_3005008
+	ldr r4, _0804C08C @ =gSaveBlock1Ptr
 	ldr r5, [r4]
 	bl Random
 	movs r1, 0x7C
 	ands r1, r0
-	ldr r2, _0804C090 @ =gUnknown_300500C
-	ldr r0, _0804C094 @ =gUnknown_2024588
+	ldr r2, _0804C090 @ =gSaveBlock2Ptr
+	ldr r0, _0804C094 @ =gSaveBlock2
 	adds r0, r1, r0
 	str r0, [r2]
-	ldr r0, _0804C098 @ =gUnknown_202552C
+	ldr r0, _0804C098 @ =gSaveBlock1
 	adds r0, r1, r0
 	str r0, [r4]
 	ldr r2, _0804C09C @ =gUnknown_3005010
-	ldr r0, _0804C0A0 @ =gUnknown_2029314
+	ldr r0, _0804C0A0 @ =gPokemonStorage
 	adds r1, r0
 	str r1, [r2]
 	bl sub_8099E44
@@ -94,12 +94,12 @@ SetSaveBlocksPointers: @ 804C058
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C08C: .4byte gUnknown_3005008
-_0804C090: .4byte gUnknown_300500C
-_0804C094: .4byte gUnknown_2024588
-_0804C098: .4byte gUnknown_202552C
+_0804C08C: .4byte gSaveBlock1Ptr
+_0804C090: .4byte gSaveBlock2Ptr
+_0804C094: .4byte gSaveBlock2
+_0804C098: .4byte gSaveBlock1
 _0804C09C: .4byte gUnknown_3005010
-_0804C0A0: .4byte gUnknown_2029314
+_0804C0A0: .4byte gPokemonStorage
 	thumb_func_end SetSaveBlocksPointers
 
 	thumb_func_start sub_804C0A4
@@ -110,7 +110,7 @@ sub_804C0A4: @ 804C0A4
 	mov r5, r8
 	push {r5-r7}
 	sub sp, 0x8
-	ldr r4, _0804C160 @ =gUnknown_30030F0
+	ldr r4, _0804C160 @ =gMain
 	ldr r0, [r4, 0xC]
 	str r0, [sp]
 	ldr r1, [r4, 0x10]
@@ -120,14 +120,14 @@ sub_804C0A4: @ 804C0A4
 	str r0, [r4, 0x10]
 	str r0, [r4, 0x20]
 	ldr r5, _0804C164 @ =gHeap
-	ldr r0, _0804C168 @ =gUnknown_300500C
+	ldr r0, _0804C168 @ =gSaveBlock2Ptr
 	ldr r1, [r0]
 	ldr r0, _0804C16C @ =0x00000f24
 	mov r9, r0
 	adds r0, r5, 0
 	mov r2, r9
 	bl memcpy
-	ldr r1, _0804C170 @ =gUnknown_3005008
+	ldr r1, _0804C170 @ =gSaveBlock1Ptr
 	mov r10, r1
 	ldr r1, [r1]
 	ldr r7, _0804C174 @ =0x00003d68
@@ -142,7 +142,7 @@ sub_804C0A4: @ 804C0A4
 	mov r2, r8
 	bl memcpy
 	bl SetSaveBlocksPointers
-	ldr r1, _0804C168 @ =gUnknown_300500C
+	ldr r1, _0804C168 @ =gSaveBlock2Ptr
 	ldr r0, [r1]
 	adds r1, r5, 0
 	mov r2, r9
@@ -173,7 +173,7 @@ sub_804C0A4: @ 804C0A4
 	adds r4, r0
 	adds r0, r4, 0
 	bl sub_804C5A4
-	ldr r1, _0804C168 @ =gUnknown_300500C
+	ldr r1, _0804C168 @ =gSaveBlock2Ptr
 	ldr r0, [r1]
 	movs r1, 0xF2
 	lsls r1, 4
@@ -188,11 +188,11 @@ sub_804C0A4: @ 804C0A4
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C160: .4byte gUnknown_30030F0
+_0804C160: .4byte gMain
 _0804C164: .4byte gHeap
-_0804C168: .4byte gUnknown_300500C
+_0804C168: .4byte gSaveBlock2Ptr
 _0804C16C: .4byte 0x00000f24
-_0804C170: .4byte gUnknown_3005008
+_0804C170: .4byte gSaveBlock1Ptr
 _0804C174: .4byte 0x00003d68
 _0804C178: .4byte gHeap + 0xf24
 _0804C17C: .4byte gUnknown_3005010
@@ -202,19 +202,19 @@ _0804C184: .4byte gHeap + 0x4c8c
 
 	thumb_func_start sav2_x1_query_bit1
 sav2_x1_query_bit1: @ 804C188
-	ldr r0, _0804C194 @ =gUnknown_300500C
+	ldr r0, _0804C194 @ =gSaveBlock2Ptr
 	ldr r0, [r0]
 	ldrb r1, [r0, 0x9]
 	movs r0, 0x1
 	ands r0, r1
 	bx lr
 	.align 2, 0
-_0804C194: .4byte gUnknown_300500C
+_0804C194: .4byte gSaveBlock2Ptr
 	thumb_func_end sav2_x1_query_bit1
 
 	thumb_func_start sav2_x9_clear_bit1
 sav2_x9_clear_bit1: @ 804C198
-	ldr r0, _0804C1A8 @ =gUnknown_300500C
+	ldr r0, _0804C1A8 @ =gSaveBlock2Ptr
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x9]
 	movs r0, 0xFE
@@ -222,12 +222,12 @@ sav2_x9_clear_bit1: @ 804C198
 	strb r0, [r2, 0x9]
 	bx lr
 	.align 2, 0
-_0804C1A8: .4byte gUnknown_300500C
+_0804C1A8: .4byte gSaveBlock2Ptr
 	thumb_func_end sav2_x9_clear_bit1
 
 	thumb_func_start sub_804C1AC
 sub_804C1AC: @ 804C1AC
-	ldr r0, _0804C1BC @ =gUnknown_300500C
+	ldr r0, _0804C1BC @ =gSaveBlock2Ptr
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x9]
 	movs r0, 0x1
@@ -235,7 +235,7 @@ sub_804C1AC: @ 804C1AC
 	strb r0, [r2, 0x9]
 	bx lr
 	.align 2, 0
-_0804C1BC: .4byte gUnknown_300500C
+_0804C1BC: .4byte gSaveBlock2Ptr
 	thumb_func_end sub_804C1AC
 
 	thumb_func_start sub_804C1C0
@@ -243,7 +243,7 @@ sub_804C1C0: @ 804C1C0
 	push {lr}
 	movs r0, 0
 	bl sub_8055778
-	ldr r0, _0804C1D8 @ =gUnknown_300500C
+	ldr r0, _0804C1D8 @ =gSaveBlock2Ptr
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x9]
 	movs r0, 0x1
@@ -252,12 +252,12 @@ sub_804C1C0: @ 804C1C0
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C1D8: .4byte gUnknown_300500C
+_0804C1D8: .4byte gSaveBlock2Ptr
 	thumb_func_end sub_804C1C0
 
 	thumb_func_start sav2_gender2_inplace_and_xFE
 sav2_gender2_inplace_and_xFE: @ 804C1DC
-	ldr r0, _0804C1EC @ =gUnknown_300500C
+	ldr r0, _0804C1EC @ =gSaveBlock2Ptr
 	ldr r2, [r0]
 	ldrb r1, [r2, 0x9]
 	movs r0, 0xFE
@@ -265,13 +265,13 @@ sav2_gender2_inplace_and_xFE: @ 804C1DC
 	strb r0, [r2, 0x9]
 	bx lr
 	.align 2, 0
-_0804C1EC: .4byte gUnknown_300500C
+_0804C1EC: .4byte gSaveBlock2Ptr
 	thumb_func_end sav2_gender2_inplace_and_xFE
 
 	thumb_func_start copy_player_party_to_sav1
 copy_player_party_to_sav1: @ 804C1F0
 	push {r4,lr}
-	ldr r0, _0804C224 @ =gUnknown_3005008
+	ldr r0, _0804C224 @ =gSaveBlock1Ptr
 	ldr r0, [r0]
 	ldr r1, _0804C228 @ =gUnknown_2024029
 	ldrb r1, [r1]
@@ -279,7 +279,7 @@ copy_player_party_to_sav1: @ 804C1F0
 	strb r1, [r0]
 	movs r4, 0
 _0804C200:
-	ldr r0, _0804C224 @ =gUnknown_3005008
+	ldr r0, _0804C224 @ =gSaveBlock1Ptr
 	ldr r0, [r0]
 	movs r1, 0x64
 	muls r1, r4
@@ -296,7 +296,7 @@ _0804C200:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C224: .4byte gUnknown_3005008
+_0804C224: .4byte gSaveBlock1Ptr
 _0804C228: .4byte gUnknown_2024029
 _0804C22C: .4byte gUnknown_2024284
 	thumb_func_end copy_player_party_to_sav1
@@ -305,7 +305,7 @@ _0804C22C: .4byte gUnknown_2024284
 sub_804C230: @ 804C230
 	push {r4,r5,lr}
 	ldr r1, _0804C264 @ =gUnknown_2024029
-	ldr r0, _0804C268 @ =gUnknown_3005008
+	ldr r0, _0804C268 @ =gSaveBlock1Ptr
 	ldr r0, [r0]
 	adds r0, 0x34
 	ldrb r0, [r0]
@@ -317,7 +317,7 @@ _0804C242:
 	adds r2, r4, 0
 	muls r2, r0
 	adds r0, r2, r5
-	ldr r1, _0804C268 @ =gUnknown_3005008
+	ldr r1, _0804C268 @ =gSaveBlock1Ptr
 	ldr r1, [r1]
 	adds r1, r2
 	adds r1, 0x38
@@ -331,7 +331,7 @@ _0804C242:
 	bx r0
 	.align 2, 0
 _0804C264: .4byte gUnknown_2024029
-_0804C268: .4byte gUnknown_3005008
+_0804C268: .4byte gSaveBlock1Ptr
 _0804C26C: .4byte gUnknown_2024284
 	thumb_func_end sub_804C230
 
@@ -340,7 +340,7 @@ save_serialize_npcs: @ 804C270
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r0, _0804C2B0 @ =gUnknown_3005008
+	ldr r0, _0804C2B0 @ =gSaveBlock1Ptr
 	mov r12, r0
 	movs r5, 0xD4
 	lsls r5, 3
@@ -371,7 +371,7 @@ _0804C286:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C2B0: .4byte gUnknown_3005008
+_0804C2B0: .4byte gSaveBlock1Ptr
 _0804C2B4: .4byte gUnknown_2036E38
 	thumb_func_end save_serialize_npcs
 
@@ -380,7 +380,7 @@ sub_804C2B8: @ 804C2B8
 	push {r4-r7,lr}
 	mov r7, r8
 	push {r7}
-	ldr r0, _0804C2F8 @ =gUnknown_3005008
+	ldr r0, _0804C2F8 @ =gSaveBlock1Ptr
 	mov r12, r0
 	movs r5, 0xD4
 	lsls r5, 3
@@ -411,7 +411,7 @@ _0804C2CE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C2F8: .4byte gUnknown_3005008
+_0804C2F8: .4byte gSaveBlock1Ptr
 _0804C2FC: .4byte gUnknown_2036E38
 	thumb_func_end sub_804C2B8
 
@@ -443,9 +443,9 @@ copy_bags_and_unk_data_from_save_blocks: @ 804C320
 	movs r2, 0
 	ldr r0, _0804C424 @ =gUnknown_2031C8C
 	mov r12, r0
-	ldr r1, _0804C428 @ =gUnknown_300500C
+	ldr r1, _0804C428 @ =gSaveBlock2Ptr
 	mov r10, r1
-	ldr r5, _0804C42C @ =gUnknown_3005008
+	ldr r5, _0804C42C @ =gSaveBlock1Ptr
 	movs r3, 0xC4
 	lsls r3, 2
 	ldr r4, _0804C430 @ =gUnknown_2031764
@@ -461,7 +461,7 @@ _0804C33C:
 	ble _0804C33C
 	movs r2, 0
 	ldr r0, _0804C430 @ =gUnknown_2031764
-	ldr r5, _0804C42C @ =gUnknown_3005008
+	ldr r5, _0804C42C @ =gSaveBlock1Ptr
 	movs r3, 0xEE
 	lsls r3, 2
 	adds r4, r0, 0
@@ -478,7 +478,7 @@ _0804C35C:
 	ble _0804C35C
 	movs r2, 0
 	ldr r0, _0804C430 @ =gUnknown_2031764
-	ldr r5, _0804C42C @ =gUnknown_3005008
+	ldr r5, _0804C42C @ =gSaveBlock1Ptr
 	movs r6, 0x90
 	lsls r6, 1
 	adds r4, r0, r6
@@ -496,7 +496,7 @@ _0804C37E:
 	ble _0804C37E
 	movs r2, 0
 	ldr r0, _0804C430 @ =gUnknown_2031764
-	ldr r5, _0804C42C @ =gUnknown_3005008
+	ldr r5, _0804C42C @ =gSaveBlock1Ptr
 	movs r7, 0xAA
 	lsls r7, 1
 	adds r4, r0, r7
@@ -513,7 +513,7 @@ _0804C39E:
 	ble _0804C39E
 	movs r2, 0
 	ldr r0, _0804C430 @ =gUnknown_2031764
-	ldr r5, _0804C42C @ =gUnknown_3005008
+	ldr r5, _0804C42C @ =gSaveBlock1Ptr
 	movs r1, 0x8F
 	lsls r1, 2
 	adds r4, r0, r1
@@ -529,7 +529,7 @@ _0804C3BE:
 	cmp r2, 0x2A
 	ble _0804C3BE
 	ldr r0, _0804C430 @ =gUnknown_2031764
-	ldr r5, _0804C42C @ =gUnknown_3005008
+	ldr r5, _0804C42C @ =gSaveBlock1Ptr
 	mov r8, r5
 	movs r6, 0xBA
 	lsls r6, 2
@@ -572,8 +572,8 @@ _0804C3E4:
 	bx r0
 	.align 2, 0
 _0804C424: .4byte gUnknown_2031C8C
-_0804C428: .4byte gUnknown_300500C
-_0804C42C: .4byte gUnknown_3005008
+_0804C428: .4byte gSaveBlock2Ptr
+_0804C42C: .4byte gSaveBlock1Ptr
 _0804C430: .4byte gUnknown_2031764
 _0804C434: .4byte 0x00000464
 _0804C438: .4byte 0x0000054c
@@ -588,11 +588,11 @@ sub_804C440: @ 804C440
 	mov r5, r8
 	push {r5-r7}
 	movs r2, 0
-	ldr r0, _0804C550 @ =gUnknown_300500C
+	ldr r0, _0804C550 @ =gSaveBlock2Ptr
 	mov r8, r0
 	ldr r1, _0804C554 @ =gUnknown_2031C8C
 	mov r12, r1
-	ldr r5, _0804C558 @ =gUnknown_3005008
+	ldr r5, _0804C558 @ =gSaveBlock1Ptr
 	movs r3, 0xC4
 	lsls r3, 2
 	ldr r4, _0804C55C @ =gUnknown_2031764
@@ -607,7 +607,7 @@ _0804C45C:
 	cmp r2, 0x29
 	ble _0804C45C
 	movs r2, 0
-	ldr r5, _0804C558 @ =gUnknown_3005008
+	ldr r5, _0804C558 @ =gSaveBlock1Ptr
 	movs r4, 0xEE
 	lsls r4, 2
 	ldr r0, _0804C55C @ =gUnknown_2031764
@@ -624,7 +624,7 @@ _0804C47C:
 	cmp r2, 0x1D
 	ble _0804C47C
 	movs r2, 0
-	ldr r5, _0804C558 @ =gUnknown_3005008
+	ldr r5, _0804C558 @ =gSaveBlock1Ptr
 	movs r4, 0x86
 	lsls r4, 3
 	ldr r0, _0804C55C @ =gUnknown_2031764
@@ -642,7 +642,7 @@ _0804C49E:
 	cmp r2, 0xC
 	ble _0804C49E
 	movs r2, 0
-	ldr r5, _0804C558 @ =gUnknown_3005008
+	ldr r5, _0804C558 @ =gSaveBlock1Ptr
 	ldr r4, _0804C560 @ =0x00000464
 	ldr r0, _0804C55C @ =gUnknown_2031764
 	movs r7, 0xAA
@@ -659,7 +659,7 @@ _0804C4BE:
 	cmp r2, 0x39
 	ble _0804C4BE
 	movs r2, 0
-	ldr r5, _0804C558 @ =gUnknown_3005008
+	ldr r5, _0804C558 @ =gSaveBlock1Ptr
 	ldr r4, _0804C564 @ =0x0000054c
 	ldr r0, _0804C55C @ =gUnknown_2031764
 	movs r1, 0x8F
@@ -675,7 +675,7 @@ _0804C4DE:
 	adds r2, 0x1
 	cmp r2, 0x2A
 	ble _0804C4DE
-	ldr r2, _0804C558 @ =gUnknown_3005008
+	ldr r2, _0804C558 @ =gSaveBlock1Ptr
 	mov r9, r2
 	ldr r5, _0804C568 @ =0x00002cd0
 	mov r10, r5
@@ -724,9 +724,9 @@ _0804C4FE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C550: .4byte gUnknown_300500C
+_0804C550: .4byte gSaveBlock2Ptr
 _0804C554: .4byte gUnknown_2031C8C
-_0804C558: .4byte gUnknown_3005008
+_0804C558: .4byte gSaveBlock1Ptr
 _0804C55C: .4byte gUnknown_2031764
 _0804C560: .4byte 0x00000464
 _0804C564: .4byte 0x0000054c
@@ -735,7 +735,7 @@ _0804C568: .4byte 0x00002cd0
 
 	thumb_func_start sub_804C56C
 sub_804C56C: @ 804C56C
-	ldr r2, _0804C584 @ =gUnknown_300500C
+	ldr r2, _0804C584 @ =gSaveBlock2Ptr
 	ldr r2, [r2]
 	movs r3, 0xF2
 	lsls r3, 4
@@ -747,12 +747,12 @@ sub_804C56C: @ 804C56C
 	strh r2, [r0]
 	bx lr
 	.align 2, 0
-_0804C584: .4byte gUnknown_300500C
+_0804C584: .4byte gSaveBlock2Ptr
 	thumb_func_end sub_804C56C
 
 	thumb_func_start sub_804C588
 sub_804C588: @ 804C588
-	ldr r2, _0804C5A0 @ =gUnknown_300500C
+	ldr r2, _0804C5A0 @ =gSaveBlock2Ptr
 	ldr r3, [r2]
 	movs r2, 0xF2
 	lsls r2, 4
@@ -764,14 +764,14 @@ sub_804C588: @ 804C588
 	str r2, [r0]
 	bx lr
 	.align 2, 0
-_0804C5A0: .4byte gUnknown_300500C
+_0804C5A0: .4byte gSaveBlock2Ptr
 	thumb_func_end sub_804C588
 
 	thumb_func_start sub_804C5A4
 sub_804C5A4: @ 804C5A4
 	push {r4-r7,lr}
 	adds r5, r0, 0
-	ldr r7, _0804C5F8 @ =gUnknown_3005008
+	ldr r7, _0804C5F8 @ =gSaveBlock1Ptr
 	ldr r6, _0804C5FC @ =0x00003d38
 	movs r4, 0x3
 _0804C5AE:
@@ -790,7 +790,7 @@ _0804C5AE:
 	bl ApplyNewEncryptionKeyToBagItems_
 	adds r0, r5, 0
 	bl sub_815EE6C
-	ldr r4, _0804C5F8 @ =gUnknown_3005008
+	ldr r4, _0804C5F8 @ =gSaveBlock1Ptr
 	ldr r0, [r4]
 	movs r1, 0xA4
 	lsls r1, 2
@@ -807,7 +807,7 @@ _0804C5AE:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_0804C5F8: .4byte gUnknown_3005008
+_0804C5F8: .4byte gSaveBlock1Ptr
 _0804C5FC: .4byte 0x00003d38
 	thumb_func_end sub_804C5A4