Merge branch 'master' into slot_machine

1 files changed, 39 insertions, 39 deletions

diff --git a/asm/start_menu.s b/asm/start_menu.s
index 3fc08e41a..f7ea9a712 100644
--- a/asm/start_menu.s
+++ b/asm/start_menu.s
@@ -11,7 +11,7 @@ sub_806ED54: @ 806ED54
 	ldr r0, _0806ED6C @ =gUnknown_20370F5
 	movs r1, 0
 	strb r1, [r0]
-	bl is_c1_link_related_active
+	bl IsUpdateLinkStateCBActive
 	cmp r0, 0x1
 	bne _0806ED70
 	bl sub_806EE34
@@ -160,7 +160,7 @@ sub_806EE7C: @ 806EE7C
 	movs r1, 0
 	bl DrawStdWindowFrame
 	ldr r0, _0806EEFC @ =gStringVar1
-	ldr r1, _0806EF00 @ =gUnknown_2039996
+	ldr r1, _0806EF00 @ =gSafariZoneStepCounter
 	ldrh r1, [r1]
 	movs r2, 0x1
 	movs r3, 0x3
@@ -172,7 +172,7 @@ sub_806EE7C: @ 806EE7C
 	movs r3, 0x3
 	bl ConvertIntToDecimalStringN
 	ldr r0, _0806EF08 @ =gStringVar3
-	ldr r1, _0806EF0C @ =gUnknown_2039994
+	ldr r1, _0806EF0C @ =gNumSafariBalls
 	ldrb r1, [r1]
 	movs r2, 0x1
 	movs r3, 0x2
@@ -203,10 +203,10 @@ sub_806EE7C: @ 806EE7C
 _0806EEF4: .4byte gUnknown_2037101
 _0806EEF8: .4byte gUnknown_83A738C
 _0806EEFC: .4byte gStringVar1
-_0806EF00: .4byte gUnknown_2039996
+_0806EF00: .4byte gSafariZoneStepCounter
 _0806EF04: .4byte gStringVar2
 _0806EF08: .4byte gStringVar3
-_0806EF0C: .4byte gUnknown_2039994
+_0806EF0C: .4byte gNumSafariBalls
 _0806EF10: .4byte gStringVar4
 _0806EF14: .4byte gUnknown_84162A9
 	thumb_func_end sub_806EE7C
@@ -220,7 +220,7 @@ sub_806EF18: @ 806EF18
 	ldr r4, _0806EF40 @ =gUnknown_2037101
 	ldrb r0, [r4]
 	movs r1, 0
-	bl sub_810F4D8
+	bl ClearStdWindowAndFrameToTransparent
 	ldrb r0, [r4]
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -438,9 +438,9 @@ _0806F0C4:
 	movs r1, 0x2
 	movs r2, 0
 	movs r3, 0
-	bl ProgramAndPlaceMenuCursorOnWindow
+	bl Menu_InitCursor
 	strb r0, [r4]
-	bl sub_80BF708
+	bl MenuHelpers_LinkSomething
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806F118
@@ -634,7 +634,7 @@ _0806F254: .4byte gUnknown_20370F0
 	thumb_func_start ShowStartMenu
 ShowStartMenu: @ 806F258
 	push {lr}
-	bl is_c1_link_related_active
+	bl IsUpdateLinkStateCBActive
 	cmp r0, 0
 	bne _0806F26E
 	bl player_bitmagic
@@ -663,10 +663,10 @@ sub_806F280: @ 806F280
 	bl PlaySE
 	movs r0, 0x1
 	negs r0, r0
-	bl MoveMenuCursor
+	bl Menu_MoveCursor
 	ldr r4, _0806F360 @ =gUnknown_20370F4
 	strb r0, [r4]
-	bl sub_80BF708
+	bl MenuHelpers_LinkSomething
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806F2D2
@@ -698,10 +698,10 @@ _0806F2D2:
 	movs r0, 0x5
 	bl PlaySE
 	movs r0, 0x1
-	bl MoveMenuCursor
+	bl Menu_MoveCursor
 	ldr r4, _0806F360 @ =gUnknown_20370F4
 	strb r0, [r4]
-	bl sub_80BF708
+	bl MenuHelpers_LinkSomething
 	lsls r0, 24
 	cmp r0, 0
 	bne _0806F320
@@ -911,14 +911,14 @@ _0806F498:
 	bl PlayRainStoppingSoundEffect
 	bl sub_806EF18
 	bl CleanupOverworldWindowsAndTilemaps
-	ldr r0, _0806F4B0 @ =UseFameCheckerFromMenu
+	ldr r0, _0806F4B0 @ =ReturnToBagFromKeyItem
 	bl SetMainCallback2
 	movs r0, 0x1
 _0806F4AC:
 	pop {r1}
 	bx r1
 	.align 2, 0
-_0806F4B0: .4byte UseFameCheckerFromMenu
+_0806F4B0: .4byte ReturnToBagFromKeyItem
 	thumb_func_end sub_806F480
 
 	thumb_func_start sub_806F4B4
@@ -1009,7 +1009,7 @@ sub_806F554: @ 806F554
 	bl sub_806EF18
 	bl sub_80F7998
 	bl sub_806FEA0
-	bl sub_80A0F3C
+	bl SafariZoneRetirePrompt
 	movs r0, 0x1
 	pop {r1}
 	bx r1
@@ -1080,7 +1080,7 @@ sub_806F5C8: @ 806F5C8
 _0806F5E4:
 	movs r0, 0
 	movs r1, 0
-	bl sub_810F260
+	bl ClearDialogWindowAndFrameToTransparent
 	bl sub_806F14C
 	bl sub_812B248
 	ldr r1, _0806F5FC @ =gUnknown_20370F0
@@ -1093,7 +1093,7 @@ _0806F600: .4byte sub_806F280
 _0806F604:
 	movs r0, 0
 	movs r1, 0x1
-	bl sub_810F260
+	bl ClearDialogWindowAndFrameToTransparent
 	bl sub_80696C0
 	bl ScriptContext2_Disable
 	bl sub_812B248
@@ -1127,7 +1127,7 @@ _0806F644: .4byte gUnknown_3000FA9
 	thumb_func_start sub_806F648
 sub_806F648: @ 806F648
 	push {lr}
-	bl sub_80F6CBC
+	bl RunTextPrinters_CheckPrinter0Active
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0x1
@@ -1179,7 +1179,7 @@ sub_806F69C: @ 806F69C
 	movs r1, 0x1
 	bl sub_80F7768
 	movs r0, 0x1
-	bl sub_80F6E08
+	bl AddTextPrinterForMessage
 	ldr r1, _0806F6CC @ =gUnknown_3000FA9
 	movs r0, 0x1
 	strb r0, [r1]
@@ -1329,7 +1329,7 @@ sub_806F7A8: @ 806F7A8
 	lsrs r0, 24
 	movs r1, 0
 	bl ClearStdWindowAndFrame
-	bl remove_start_menu_window_maybe
+	bl RemoveStartMenuWindow
 	movs r0, 0
 	bl sub_8112EDC
 	bl sub_806FCF4
@@ -1347,7 +1347,7 @@ _0806F7D8: .4byte sub_806F7DC
 	thumb_func_start sub_806F7DC
 sub_806F7DC: @ 806F7DC
 	push {lr}
-	bl sub_80F7858
+	bl DisplayYesNoMenuDefaultYes
 	ldr r1, _0806F7F0 @ =gUnknown_3000FA4
 	ldr r0, _0806F7F4 @ =sub_806F7F8
 	str r0, [r1]
@@ -1451,7 +1451,7 @@ _0806F8A0: .4byte sub_806F8A4
 	thumb_func_start sub_806F8A4
 sub_806F8A4: @ 806F8A4
 	push {lr}
-	bl sub_80F7858
+	bl DisplayYesNoMenuDefaultYes
 	ldr r1, _0806F8B8 @ =gUnknown_3000FA4
 	ldr r0, _0806F8BC @ =sub_806F8DC
 	str r0, [r1]
@@ -1466,7 +1466,7 @@ _0806F8BC: .4byte sub_806F8DC
 	thumb_func_start sub_806F8C0
 sub_806F8C0: @ 806F8C0
 	push {lr}
-	bl sub_80F7880
+	bl DisplayYesNoMenuDefaultNo
 	ldr r1, _0806F8D4 @ =gUnknown_3000FA4
 	ldr r0, _0806F8D8 @ =sub_806F8DC
 	str r0, [r1]
@@ -1596,7 +1596,7 @@ _0806F9B4: .4byte sub_806FA04
 	thumb_func_start sub_806F9B8
 sub_806F9B8: @ 806F9B8
 	push {lr}
-	bl sub_80F6CBC
+	bl RunTextPrinters_CheckPrinter0Active
 	lsls r0, 16
 	cmp r0, 0
 	bne _0806F9D0
@@ -1638,7 +1638,7 @@ _0806FA00:
 	thumb_func_start sub_806FA04
 sub_806FA04: @ 806FA04
 	push {lr}
-	bl sub_80F6CBC
+	bl RunTextPrinters_CheckPrinter0Active
 	lsls r0, 16
 	cmp r0, 0
 	bne _0806FA1C
@@ -1781,7 +1781,7 @@ _0806FB12:
 	movs r0, 0
 	movs r1, 0x8
 	movs r2, 0xF0
-	bl sub_814FF2C
+	bl TextWindow_SetStdFrame0_WithPal
 	b _0806FB64
 	.align 2, 0
 _0806FB34: .4byte gUnknown_83A73B8
@@ -1908,7 +1908,7 @@ _0806FC14:
 	movs r0, 0
 	movs r1, 0x2
 	movs r3, 0xFF
-	bl AddTextPrinterParametrized
+	bl AddTextPrinterParameterized2
 	movs r0, 0
 	movs r1, 0x8
 	movs r2, 0xF
@@ -2014,12 +2014,12 @@ sub_806FCF4: @ 806FCF4
 	ldr r4, _0806FE5C @ =0x0000021d
 	adds r1, r4, 0
 	movs r2, 0xD0
-	bl sub_814FF2C
+	bl TextWindow_SetStdFrame0_WithPal
 	ldrb r0, [r5]
 	movs r1, 0
 	adds r2, r4, 0
 	movs r3, 0xD
-	bl SetWindowBorderStyle
+	bl DrawStdFrameWithCustomTileAndPalette
 	ldr r4, _0806FE60 @ =gStringVar4
 	movs r0, 0x3
 	adds r1, r4, 0
@@ -2043,7 +2043,7 @@ sub_806FCF4: @ 806FCF4
 	str r4, [sp, 0x8]
 	movs r1, 0x2
 	movs r3, 0
-	bl box_print
+	bl AddTextPrinterParameterized3
 	movs r0, 0x2
 	adds r1, r4, 0
 	adds r2, r6, 0
@@ -2058,7 +2058,7 @@ sub_806FCF4: @ 806FCF4
 	movs r1, 0
 	movs r2, 0x2
 	movs r3, 0xE
-	bl box_print
+	bl AddTextPrinterParameterized3
 	movs r0, 0
 	adds r1, r4, 0
 	movs r2, 0x2
@@ -2077,7 +2077,7 @@ sub_806FCF4: @ 806FCF4
 	movs r1, 0
 	movs r2, 0x2
 	movs r3, 0x1C
-	bl box_print
+	bl AddTextPrinterParameterized3
 	movs r0, 0x4
 	adds r1, r4, 0
 	movs r2, 0x2
@@ -2091,7 +2091,7 @@ sub_806FCF4: @ 806FCF4
 	movs r1, 0
 	movs r2, 0x3C
 	movs r3, 0x1C
-	bl box_print
+	bl AddTextPrinterParameterized3
 	movs r7, 0x2A
 	ldr r0, _0806FE78 @ =0x00000829
 	bl FlagGet
@@ -2108,7 +2108,7 @@ sub_806FCF4: @ 806FCF4
 	movs r1, 0
 	movs r2, 0x2
 	movs r3, 0x2A
-	bl box_print
+	bl AddTextPrinterParameterized3
 	movs r0, 0x1
 	adds r1, r4, 0
 	movs r2, 0x2
@@ -2121,7 +2121,7 @@ sub_806FCF4: @ 806FCF4
 	movs r1, 0
 	movs r2, 0x3C
 	movs r3, 0x2A
-	bl box_print
+	bl AddTextPrinterParameterized3
 	movs r7, 0x38
 _0806FE0A:
 	ldrb r0, [r5]
@@ -2133,7 +2133,7 @@ _0806FE0A:
 	movs r1, 0
 	movs r2, 0x2
 	adds r3, r7, 0
-	bl box_print
+	bl AddTextPrinterParameterized3
 	movs r0, 0x2
 	adds r1, r4, 0
 	movs r2, 0x2
@@ -2146,7 +2146,7 @@ _0806FE0A:
 	movs r1, 0
 	movs r2, 0x3C
 	adds r3, r7, 0
-	bl box_print
+	bl AddTextPrinterParameterized3
 	ldrb r0, [r5]
 	movs r1, 0x2
 	bl CopyWindowToVram
@@ -2198,7 +2198,7 @@ sub_806FEA0: @ 806FEA0
 	lsrs r0, 24
 	movs r1, 0x1
 	bl ClearStdWindowAndFrame
-	bl remove_start_menu_window_maybe
+	bl RemoveStartMenuWindow
 	bl sub_80696C0
 	bl ScriptContext2_Disable
 	pop {r0}