Merge remote-tracking branch 'refs/remotes/pret/master'

1 files changed, 24 insertions, 24 deletions

diff --git a/asm/start_menu.s b/asm/start_menu.s
index 9e3a43e3e..059d23ef8 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -259,16 +259,16 @@ sub_809F654: @ 809F654
 	ldrb r0, [r4]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_02021CC4
+	ldr r0, =gStringVar1
 	ldr r1, =gUnknown_0203A04C
 	ldrb r1, [r1]
 	movs r2, 0x1
 	movs r3, 0x2
-	bl ConvertIntToDecimalString
-	ldr r5, =gUnknown_02021FC4
+	bl ConvertIntToDecimalStringN
+	ldr r5, =gStringVar4
 	ldr r1, =gUnknown_085EE6FF
 	adds r0, r5, 0
-	bl ExpandStringRefs
+	bl StringExpandPlaceholders
 	ldrb r0, [r4]
 	movs r1, 0x1
 	str r1, [sp]
@@ -294,7 +294,7 @@ sub_809F654: @ 809F654
 sub_809F6C8: @ 809F6C8
 	push {r4,r5,lr}
 	sub sp, 0xC
-	ldr r0, =gUnknown_03005D90
+	ldr r0, =gSaveBlock2Ptr
 	ldr r0, [r0]
 	ldr r1, =0x00000cb2
 	adds r0, r1
@@ -317,9 +317,9 @@ _0809F6F4:
 	ldrb r0, [r4]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_02021CC4
+	ldr r0, =gStringVar1
 	ldr r2, =gUnknown_08510510
-	ldr r1, =gUnknown_03005D90
+	ldr r1, =gSaveBlock2Ptr
 	ldr r1, [r1]
 	ldr r3, =0x00000cb2
 	adds r1, r3
@@ -327,11 +327,11 @@ _0809F6F4:
 	lsls r1, 2
 	adds r1, r2
 	ldr r1, [r1]
-	bl CopyString
-	ldr r5, =gUnknown_02021FC4
+	bl StringCopy
+	ldr r5, =gStringVar4
 	ldr r1, =gUnknown_085EE716
 	adds r0, r5, 0
-	bl ExpandStringRefs
+	bl StringExpandPlaceholders
 	ldrb r0, [r4]
 	movs r1, 0x1
 	str r1, [sp]
@@ -399,7 +399,7 @@ PrintStartMenuActions: @ 809F7C0
 	ldrb r2, [r0]
 	ldr r0, =gUnknown_08510540
 	mov r9, r0
-	ldr r1, =gUnknown_02021FC4
+	ldr r1, =gStringVar4
 	mov r10, r1
 _0809F7DA:
 	ldr r0, =gUnknown_02037610
@@ -436,7 +436,7 @@ _0809F828:
 	adds r0, r3, r1
 	ldr r1, [r0]
 	mov r0, r10
-	bl ExpandStringRefs
+	bl StringExpandPlaceholders
 	bl get_start_menu_window_id_maybe
 	lsls r0, 24
 	lsrs r0, 24
@@ -751,7 +751,7 @@ _0809FAB2:
 	thumb_func_start HandleStartMenuInput
 HandleStartMenuInput: @ 809FAC4
 	push {r4,lr}
-	ldr r4, =gUnknown_030022C0
+	ldr r4, =gMain
 	ldrh r1, [r4, 0x2E]
 	movs r0, 0x40
 	ands r0, r1
@@ -1035,7 +1035,7 @@ _0809FD38:
 	bl overworld_free_bg_tilemaps
 	ldr r0, =CB2_OptionsMenu
 	bl SetMainCallback2
-	ldr r1, =gUnknown_030022C0
+	ldr r1, =gMain
 	ldr r0, =sub_8086194
 	str r0, [r1, 0x8]
 	movs r0, 0x1
@@ -1317,9 +1317,9 @@ sub_809FF98: @ 809FF98
 	push {r4,lr}
 	adds r2, r0, 0
 	adds r4, r1, 0
-	ldr r0, =gUnknown_02021FC4
+	ldr r0, =gStringVar4
 	adds r1, r2, 0
-	bl ExpandStringRefs
+	bl StringExpandPlaceholders
 	movs r0, 0
 	movs r1, 0x1
 	bl sub_819786C
@@ -1407,7 +1407,7 @@ sub_80A003C: @ 80A003C
 	ldrb r0, [r1]
 	subs r2, r0, 0x1
 	strb r2, [r1]
-	ldr r0, =gUnknown_030022C0
+	ldr r0, =gMain
 	ldrh r1, [r0, 0x2C]
 	movs r0, 0x1
 	ands r0, r1
@@ -1436,7 +1436,7 @@ sub_80A0070: @ 80A0070
 	ldrb r0, [r1]
 	cmp r0, 0
 	bne _080A0094
-	ldr r0, =gUnknown_030022C0
+	ldr r0, =gMain
 	ldrh r1, [r0, 0x2C]
 	movs r0, 0x1
 	ands r0, r1
@@ -2092,7 +2092,7 @@ _080A05AC:
 	movs r2, 0x10
 	movs r3, 0
 	bl BeginNormalPaletteFade
-	ldr r0, =gUnknown_030030FC
+	ldr r0, =gLinkVSyncDisabled
 	ldrb r0, [r0]
 	cmp r0, 0
 	beq _080A0620
@@ -2109,7 +2109,7 @@ _080A061C:
 	movs r0, 0x5
 	b _080A06A6
 _080A0620:
-	ldr r0, =gUnknown_03002700
+	ldr r0, =gSoftResetDisabled
 	movs r1, 0x1
 	strb r1, [r0]
 	movs r0, 0x1
@@ -2128,7 +2128,7 @@ _080A063C:
 	bl sav2_gender2_inplace_and_xFE
 	movs r0, 0x3
 	strh r0, [r5]
-	ldr r1, =gUnknown_03002700
+	ldr r1, =gSoftResetDisabled
 	movs r0, 0
 	strb r0, [r1]
 	b _080A06A8
@@ -2145,7 +2145,7 @@ _080A065C:
 	b _080A06A6
 _080A0670:
 	bl FreeAllWindowBuffers
-	ldr r0, =gUnknown_030022C0
+	ldr r0, =gMain
 	ldr r0, [r0, 0x8]
 	bl SetMainCallback2
 	adds r0, r4, 0
@@ -2213,7 +2213,7 @@ _080A06EC:
 	ldrb r0, [r6]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03005D90
+	ldr r0, =gSaveBlock2Ptr
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x8]
 	movs r1, 0x4
@@ -2224,7 +2224,7 @@ _080A06EC:
 	mov r9, r0
 _080A0710:
 	movs r4, 0x1
-	ldr r5, =gUnknown_02021FC4
+	ldr r5, =gStringVar4
 	movs r0, 0x3
 	adds r1, r5, 0
 	movs r2, 0x6