more labels (#165)

* more labels and match sub_810745C

* formatting

* move BattleStruct to battle.h and combine both loose structs

* oops

* more labels for rom4.c

19 files changed, 46 insertions, 46 deletions

diff --git a/asm/battle_records.s b/asm/battle_records.s
index b58a6506c..60d7b9b2b 100644
--- a/asm/battle_records.s
+++ b/asm/battle_records.s
@@ -47,13 +47,13 @@ _0810FFAE:
 	bge _0810FFAE
 	movs r0, 0x17
 	movs r1, 0
-	bl sav12_xor_set
+	bl SetGameStat
 	movs r0, 0x18
 	movs r1, 0
-	bl sav12_xor_set
+	bl SetGameStat
 	movs r0, 0x19
 	movs r1, 0
-	bl sav12_xor_set
+	bl SetGameStat
 	pop {r4,r5}
 	pop {r0}
 	bx r0
@@ -264,12 +264,12 @@ _0811013A:
 	movs r4, 0x19
 _0811013C:
 	adds r0, r4, 0
-	bl sub_8053108
+	bl GetGameStat
 	ldr r1, _08110154 @ =0x0000270e
 	cmp r0, r1
 	bhi _0811014E
 	adds r0, r4, 0
-	bl sav12_xor_increment
+	bl IncrementGameStat
 _0811014E:
 	pop {r4}
 	pop {r0}
@@ -488,7 +488,7 @@ PrintLinkBattleWinsLossesDraws: @ 81102E8
 	push {r4,lr}
 	ldr r4, _08110338 @ =gStringVar1
 	movs r0, 0x17
-	bl sub_8053108
+	bl GetGameStat
 	adds r1, r0, 0
 	adds r0, r4, 0
 	movs r2, 0x1
@@ -496,7 +496,7 @@ PrintLinkBattleWinsLossesDraws: @ 81102E8
 	bl ConvertIntToDecimalStringN_DigitWidth6
 	ldr r4, _0811033C @ =gStringVar2
 	movs r0, 0x18
-	bl sub_8053108
+	bl GetGameStat
 	adds r1, r0, 0
 	adds r0, r4, 0
 	movs r2, 0x1
@@ -504,7 +504,7 @@ PrintLinkBattleWinsLossesDraws: @ 81102E8
 	bl ConvertIntToDecimalStringN_DigitWidth6
 	ldr r4, _08110340 @ =gStringVar3
 	movs r0, 0x19
-	bl sub_8053108
+	bl GetGameStat
 	adds r1, r0, 0
 	adds r0, r4, 0
 	movs r2, 0x1
diff --git a/asm/berry_blender.s b/asm/berry_blender.s
index def318c24..666882c04 100644
--- a/asm/berry_blender.s
+++ b/asm/berry_blender.s
@@ -4998,13 +4998,13 @@ _08050AEA:
 	cmp r0, 0
 	bne _08050B00
 	movs r0, 0x22
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	b _08050C82
 	.align 2, 0
 _08050AFC: .4byte gUnknown_03004834
 _08050B00:
 	movs r0, 0x21
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	b _08050C82
 _08050B08:
 	ldr r0, _08050B2C @ =gUnknown_03004854
diff --git a/asm/evolution_scene.s b/asm/evolution_scene.s
index 64144d656..6ecd355c3 100644
--- a/asm/evolution_scene.s
+++ b/asm/evolution_scene.s
@@ -1747,7 +1747,7 @@ _081127BE:
 	movs r1, 0x3
 	bl sub_8090D90
 	movs r0, 0xE
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	b _08112FD0
 	.align 2, 0
 _08112834: .4byte gPaletteFade
@@ -3055,7 +3055,7 @@ _08113316:
 	movs r1, 0x3
 	bl sub_8090D90
 	movs r0, 0xE
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	b _08113B3A
 	.align 2, 0
 _08113390: .4byte gPaletteFade
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s
index 7f7c35ce1..e2fd1b54f 100644
--- a/asm/field_control_avatar.s
+++ b/asm/field_control_avatar.s
@@ -222,7 +222,7 @@ _08068076:
 	cmp r0, 0
 	beq _08068098
 	movs r0, 0x5
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	mov r0, sp
 	adds r1, r4, 0
 	adds r2, r6, 0
@@ -1271,7 +1271,7 @@ _080688B4:
 	cmp r0, 0
 	beq _080688CC
 	movs r0, 0xD
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	ldr r0, _080688C8 @ =Event_EggHatch
 	b _080688E8
 	.align 2, 0
diff --git a/asm/fldeff_cut.s b/asm/fldeff_cut.s
index 0033c77cd..a56ad32fa 100644
--- a/asm/fldeff_cut.s
+++ b/asm/fldeff_cut.s
@@ -148,7 +148,7 @@ FldEff_UseCutOnGrass: @ 80A2604
 	strh r0, [r1, 0x18]
 	strh r2, [r1, 0x1A]
 	movs r0, 0x12
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	movs r0, 0
 	pop {r1}
 	bx r1
@@ -190,7 +190,7 @@ FldEff_UseCutOnTree: @ 80A2654
 	strh r0, [r1, 0x18]
 	strh r2, [r1, 0x1A]
 	movs r0, 0x12
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	movs r0, 0
 	pop {r1}
 	bx r1
diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s
index 76846e9c3..c1e93c8b3 100644
--- a/asm/hall_of_fame.s
+++ b/asm/hall_of_fame.s
@@ -1562,7 +1562,7 @@ _08142A98:
 _08142AA0:
 	strh r1, [r0, 0x8]
 	movs r0, 0xA
-	bl sub_8053108
+	bl GetGameStat
 	ldr r2, _08142AF0 @ =gTasks
 	adds r1, r6, r5
 	lsls r1, 3
diff --git a/asm/mauville_old_man.s b/asm/mauville_old_man.s
index 7dfaa890e..3af0f2b11 100644
--- a/asm/mauville_old_man.s
+++ b/asm/mauville_old_man.s
@@ -1369,7 +1369,7 @@ sub_80F8438: @ 80F8438
 	bne _080F8444
 	movs r0, 0
 _080F8444:
-	bl sub_8053108
+	bl GetGameStat
 	pop {r1}
 	bx r1
 	thumb_func_end sub_80F8438
diff --git a/asm/pokenav.s b/asm/pokenav.s
index ba1079dec..d86790b71 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -9571,7 +9571,7 @@ _080F088C:
 	bne _080F08C6
 _080F089A:
 	movs r0, 0x9
-	bl sub_8053108
+	bl GetGameStat
 	adds r1, r0, 0
 	ldr r0, _080F08E0 @ =0x0001869f
 	cmp r1, r0
diff --git a/asm/rom6.s b/asm/rom6.s
index d28085ae2..16899bf2e 100644
--- a/asm/rom6.s
+++ b/asm/rom6.s
@@ -342,7 +342,7 @@ FldEff_RockSmash: @ 810B55C
 	strh r0, [r1, 0x18]
 	strh r2, [r1, 0x1A]
 	movs r0, 0x13
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	movs r0, 0
 	pop {r1}
 	bx r1
diff --git a/asm/rom_800D42C.s b/asm/rom_800D42C.s
index fb917fd7e..47be2eaf0 100644
--- a/asm/rom_800D42C.s
+++ b/asm/rom_800D42C.s
@@ -44618,7 +44618,7 @@ atk60_cmd60: @ 8024298
 	ldr r0, _080242C4 @ =gUnknown_02024C10
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x1]
-	bl sav12_xor_increment
+	bl IncrementGameStat
 _080242B2:
 	ldr r1, _080242C4 @ =gUnknown_02024C10
 	ldr r0, [r1]
diff --git a/asm/rom_810CBB4.s b/asm/rom_810CBB4.s
index 9289078b3..a29775d72 100644
--- a/asm/rom_810CBB4.s
+++ b/asm/rom_810CBB4.s
@@ -776,7 +776,7 @@ _0810D1A8:
 	bl FlagSet
 _0810D1B4:
 	movs r0, 0x1
-	bl sub_8053108
+	bl GetGameStat
 	cmp r0, 0
 	bne _0810D1D4
 	ldr r2, _0810D1EC @ =gSaveBlock2
@@ -788,7 +788,7 @@ _0810D1B4:
 	ldrb r0, [r2, 0x11]
 	orrs r1, r0
 	movs r0, 0x1
-	bl sav12_xor_set
+	bl SetGameStat
 _0810D1D4:
 	bl SetSecretBase2Field_9
 	ldr r0, _0810D1EC @ =gSaveBlock2
@@ -843,7 +843,7 @@ _0810D23A:
 	cmp r6, 0x1
 	bne _0810D250
 	movs r0, 0x2A
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	ldr r0, _0810D264 @ =0x0000083b
 	bl FlagSet
 _0810D250:
@@ -863,13 +863,13 @@ _0810D268: .4byte sub_8141F90
 	thumb_func_start sp0C8_whiteout_maybe
 sp0C8_whiteout_maybe: @ 810D26C
 	push {lr}
-	ldr r0, _0810D27C @ =c2_whiteout
+	ldr r0, _0810D27C @ =CB2_WhiteOut
 	bl SetMainCallback2
 	movs r0, 0
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0810D27C: .4byte c2_whiteout
+_0810D27C: .4byte CB2_WhiteOut
 	thumb_func_end sp0C8_whiteout_maybe
 
 	thumb_func_start sub_810D280
@@ -5215,7 +5215,7 @@ _0810F400: .4byte 0x00004026
 sub_810F404: @ 810F404
 	push {lr}
 	movs r0, 0x20
-	bl sub_8053108
+	bl GetGameStat
 	lsls r0, 16
 	lsrs r0, 16
 	pop {r1}
@@ -5395,7 +5395,7 @@ GivLeadMonEffortRibbon: @ 810F54C
 	push {lr}
 	sub sp, 0x4
 	movs r0, 0x2A
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	ldr r0, _0810F580 @ =0x0000083b
 	bl FlagSet
 	movs r1, 0x1
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index 28a8de060..a169258ae 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -21803,7 +21803,7 @@ _08135820:
 	adds r0, r5, r2
 	ldrh r1, [r0]
 	movs r0, 0x20
-	bl sav12_xor_set
+	bl SetGameStat
 	b _0813589A
 	.align 2, 0
 _08135830: .4byte 0x00000572
@@ -21985,7 +21985,7 @@ _081359A0:
 	adds r0, r3, r1
 	ldrh r1, [r0]
 	movs r0, 0x20
-	bl sav12_xor_set
+	bl SetGameStat
 	b _08135A0A
 	.align 2, 0
 _081359B0: .4byte 0x00000572
@@ -22093,7 +22093,7 @@ _08135A66:
 	adds r5, r0, 0
 	movs r0, 0x20
 	adds r1, r5, 0
-	bl sav12_xor_set
+	bl SetGameStat
 	ldr r1, _08135A90 @ =0x0000270f
 	cmp r5, r1
 	bhi _08135AA4
@@ -22107,7 +22107,7 @@ _08135A94:
 	ldrh r5, [r1]
 	movs r0, 0x20
 	adds r1, r5, 0
-	bl sav12_xor_set
+	bl SetGameStat
 	ldr r1, _08135AAC @ =0x0000270f
 	cmp r5, r1
 	bls _08135AB4
@@ -22179,7 +22179,7 @@ _08135B0E:
 	adds r0, 0xC
 	ldr r4, _08135B88 @ =gSaveBlock2 + 0xA
 	adds r1, r4, 0
-	bl sub_8052D10
+	bl copy_word_to_mem
 	adds r0, r5, 0x4
 	subs r4, 0xA
 	adds r1, r4, 0
@@ -22651,7 +22651,7 @@ _08135EBA:
 	cmp r0, 0
 	beq _08135EC8
 	movs r0, 0x2A
-	bl sav12_xor_increment
+	bl IncrementGameStat
 _08135EC8:
 	pop {r3}
 	mov r8, r3
@@ -22708,7 +22708,7 @@ _08135F2A:
 	adds r0, 0xC
 	ldr r4, _08135FAC @ =gSaveBlock2 + 0xA
 	adds r1, r4, 0
-	bl sub_8052D10
+	bl copy_word_to_mem
 	adds r0, r7, 0x4
 	subs r4, 0xA
 	adds r1, r4, 0
diff --git a/asm/roulette.s b/asm/roulette.s
index 01ff3ac8f..0704caf7f 100644
--- a/asm/roulette.s
+++ b/asm/roulette.s
@@ -2555,7 +2555,7 @@ sub_811659C: @ 811659C
 	cmp r0, 0
 	beq _08116624
 	movs r0, 0x1D
-	bl sub_8053108
+	bl GetGameStat
 	ldrh r1, [r4, 0x1E]
 	adds r1, 0x1
 	strh r1, [r4, 0x1E]
@@ -2566,7 +2566,7 @@ sub_811659C: @ 811659C
 	movs r0, 0x1E
 	ldrsh r1, [r4, r0]
 	movs r0, 0x1D
-	bl sav12_xor_set
+	bl SetGameStat
 _081165E4:
 	ldr r1, _081165F8 @ =sub_811677C
 	ldr r2, _081165FC @ =0x0000ffff
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 72c467e70..139375998 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -2058,7 +2058,7 @@ _080BC460: .4byte 0x00001a16
 SecretBasePC_PackUp: @ 80BC464
 	push {lr}
 	movs r0, 0x14
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	bl sub_80BC440
 	pop {r0}
 	bx r0
@@ -2149,7 +2149,7 @@ sub_80BC50C: @ 80BC50C
 	push {r4,r5,lr}
 	bl sub_80BC474
 	movs r0, 0x14
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	ldr r4, _080BC530 @ =gSaveBlock1
 	ldr r0, _080BC534 @ =0x00001a16
 	adds r4, r0
diff --git a/asm/shop.s b/asm/shop.s
index 94ee3c867..d59f9584e 100644
--- a/asm/shop.s
+++ b/asm/shop.s
@@ -1820,7 +1820,7 @@ sub_80B3B80: @ 80B3B80
 	lsls r4, 24
 	lsrs r4, 24
 	movs r0, 0x26
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	ldr r5, _080B3BC0 @ =gSaveBlock1 + 0x490
 	ldr r0, _080B3BC4 @ =gUnknown_020386A0
 	ldr r1, [r0]
diff --git a/asm/slot_machine.s b/asm/slot_machine.s
index ee176211f..1c374b3ea 100644
--- a/asm/slot_machine.s
+++ b/asm/slot_machine.s
@@ -1254,7 +1254,7 @@ sub_81021FC: @ 81021FC
 	cmp r0, 0
 	beq _08102220
 	movs r0, 0x1C
-	bl sav12_xor_increment
+	bl IncrementGameStat
 _08102220:
 	ldrh r1, [r4, 0x8]
 	movs r0, 0x4
diff --git a/asm/trade.s b/asm/trade.s
index 340d95606..d1fe82d6c 100644
--- a/asm/trade.s
+++ b/asm/trade.s
@@ -11767,7 +11767,7 @@ _0804DF50: .4byte gSystemText_Saving
 _0804DF54:
 	bl SetSecretBase2Field_9_AndHideBG
 	movs r0, 0x15
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	bl sub_8125D80
 	ldr r1, _0804DF74 @ =gMain
 	ldr r2, _0804DF78 @ =0x0000043c
diff --git a/asm/tv.s b/asm/tv.s
index 6126631dd..fd5fdeeac 100644
--- a/asm/tv.s
+++ b/asm/tv.s
@@ -638,7 +638,7 @@ sub_80BDC14: @ 80BDC14
 	adds r4, r1
 	strb r0, [r4]
 	movs r0, 0x6
-	bl sav12_xor_increment
+	bl IncrementGameStat
 	pop {r4-r6}
 	pop {r0}
 	bx r0
@@ -1136,7 +1136,7 @@ sub_80BE028: @ 80BE028
 	movs r1, 0x18
 	bl sub_80BF55C
 	movs r0, 0x5
-	bl sub_8053108
+	bl GetGameStat
 	strh r0, [r4, 0x6]
 	movs r0, 0x19
 	strb r0, [r4]
@@ -1921,7 +1921,7 @@ sub_80BEA88: @ 80BEA88
 	ldrh r0, [r5, 0x2]
 	strh r0, [r4, 0x2]
 	movs r0, 0x5
-	bl sub_8053108
+	bl GetGameStat
 	ldrh r1, [r5, 0x6]
 	subs r0, r1
 	strh r0, [r4, 0x6]
diff --git a/asm/weather.s b/asm/weather.s
index 7ede8e818..01190c75e 100644
--- a/asm/weather.s
+++ b/asm/weather.s
@@ -7570,7 +7570,7 @@ UpdateRainCounter: @ 8080854
 	bne _0808086E
 _08080868:
 	movs r0, 0x28
-	bl sav12_xor_increment
+	bl IncrementGameStat
 _0808086E:
 	pop {r0}
 	bx r0