thru DisplayYesNoMenuDefaultNo()

1 files changed, 1 insertions, 309 deletions

diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s
index b93de1d12..9f698cb52 100644
--- a/asm/new_menu_helpers.s
+++ b/asm/new_menu_helpers.s
@@ -4,314 +4,6 @@
 	.syntax unified
 
 	.text
-/*
-	thumb_func_start WindowFunc_ClearStdWindowAndFrame
-WindowFunc_ClearStdWindowAndFrame: @ 80F7684
-	push {r4,r5,lr}
-	sub sp, 0xC
-	adds r4, r1, 0
-	adds r5, r2, 0
-	ldr r1, [sp, 0x18]
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, 24
-	lsls r5, 24
-	lsls r3, 24
-	lsls r1, 24
-	movs r2, 0xFF
-	lsls r2, 24
-	adds r4, r2
-	lsrs r4, 24
-	adds r5, r2
-	lsrs r5, 24
-	movs r2, 0x80
-	lsls r2, 18
-	adds r3, r2
-	lsrs r3, 24
-	str r3, [sp]
-	adds r1, r2
-	lsrs r1, 24
-	str r1, [sp, 0x4]
-	movs r1, 0xE
-	str r1, [sp, 0x8]
-	movs r1, 0
-	adds r2, r4, 0
-	adds r3, r5, 0
-	bl FillBgTilemapBufferRect
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end WindowFunc_ClearStdWindowAndFrame
-
-	thumb_func_start WindowFunc_ClearDialogWindowAndFrame
-WindowFunc_ClearDialogWindowAndFrame: @ 80F76CC
-	push {r4,r5,lr}
-	sub sp, 0xC
-	adds r4, r1, 0
-	adds r5, r2, 0
-	ldr r1, [sp, 0x18]
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, 24
-	lsls r5, 24
-	lsls r3, 24
-	lsls r1, 24
-	movs r2, 0xFE
-	lsls r2, 24
-	adds r4, r2
-	lsrs r4, 24
-	movs r2, 0xFF
-	lsls r2, 24
-	adds r5, r2
-	lsrs r5, 24
-	movs r2, 0x80
-	lsls r2, 19
-	adds r3, r2
-	lsrs r3, 24
-	str r3, [sp]
-	movs r2, 0x80
-	lsls r2, 18
-	adds r1, r2
-	lsrs r1, 24
-	str r1, [sp, 0x4]
-	movs r1, 0xE
-	str r1, [sp, 0x8]
-	movs r1, 0
-	adds r2, r4, 0
-	adds r3, r5, 0
-	bl FillBgTilemapBufferRect
-	add sp, 0xC
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end WindowFunc_ClearDialogWindowAndFrame
-*/
-	thumb_func_start sub_80F771C
-sub_80F771C: @ 80F771C
-	push {r4,lr}
-	sub sp, 0xC
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0x20
-	str r0, [sp]
-	str r0, [sp, 0x4]
-	movs r0, 0x11
-	str r0, [sp, 0x8]
-	movs r0, 0
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0
-	bl FillBgTilemapBufferRect
-	cmp r4, 0x1
-	bne _080F7746
-	movs r0, 0
-	bl CopyBgTilemapBufferToVram
-_080F7746:
-	add sp, 0xC
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F771C
-
-	thumb_func_start sub_80F7750
-sub_80F7750: @ 80F7750
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	movs r2, 0x85
-	lsls r2, 2
-	movs r3, 0xE
-	bl SetWindowBorderStyle
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F7750
-
-	thumb_func_start sub_80F7768
-sub_80F7768: @ 80F7768
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r1, 24
-	lsrs r5, r1, 24
-	ldr r0, _080F7790 @ =gUnknown_203ADFA
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _080F7798
-	ldr r2, _080F7794 @ =gTextFlags
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-	movs r1, 0x80
-	lsls r1, 2
-	movs r0, 0
-	bl TextWindow_LoadTilesStdFrame1
-	b _080F77A4
-	.align 2, 0
-_080F7790: .4byte gUnknown_203ADFA
-_080F7794: .4byte gTextFlags
-_080F7798:
-	movs r1, 0x80
-	lsls r1, 2
-	adds r0, r4, 0
-	movs r2, 0xF0
-	bl TextWindow_LoadResourcesStdFrame0
-_080F77A4:
-	movs r2, 0x80
-	lsls r2, 2
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r3, 0xF
-	bl DrawDialogFrameWithCustomTileAndPalette
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80F7768
-
-	thumb_func_start sub_80F77B8
-sub_80F77B8: @ 80F77B8
-	push {lr}
-	ldr r0, _080F77C8 @ =gTMCaseMainWindowPalette
-	movs r1, 0xE0
-	movs r2, 0x14
-	bl LoadPalette
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F77C8: .4byte gTMCaseMainWindowPalette
-	thumb_func_end sub_80F77B8
-
-	thumb_func_start Menu_LoadStdPalAt
-Menu_LoadStdPalAt: @ 80F77CC
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	ldr r0, _080F77E0 @ =gTMCaseMainWindowPalette
-	movs r2, 0x14
-	bl LoadPalette
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F77E0: .4byte gTMCaseMainWindowPalette
-	thumb_func_end Menu_LoadStdPalAt
-
-	thumb_func_start sub_80F77E4
-sub_80F77E4: @ 80F77E4
-	ldr r0, _080F77E8 @ =gTMCaseMainWindowPalette
-	bx lr
-	.align 2, 0
-_080F77E8: .4byte gTMCaseMainWindowPalette
-	thumb_func_end sub_80F77E4
-
-	thumb_func_start sub_80F77EC
-sub_80F77EC: @ 80F77EC
-	push {lr}
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0xF
-	bls _080F77F8
-	movs r1, 0
-_080F77F8:
-	ldr r0, _080F7804 @ =gTMCaseMainWindowPalette
-	lsls r1, 1
-	adds r1, r0
-	ldrh r0, [r1]
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080F7804: .4byte gTMCaseMainWindowPalette
-	thumb_func_end sub_80F77EC
-
-	thumb_func_start DisplayItemMessageOnField
-DisplayItemMessageOnField: @ 80F7808
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x10
-	adds r5, r0, 0
-	adds r4, r1, 0
-	adds r6, r2, 0
-	mov r8, r3
-	lsls r5, 24
-	lsrs r5, 24
-	lsls r4, 24
-	lsrs r4, 24
-	bl sub_80F6E9C
-	bl GetTextSpeedSetting
-	lsls r0, 24
-	lsrs r0, 24
-	movs r2, 0x80
-	lsls r2, 2
-	str r4, [sp]
-	str r0, [sp, 0x4]
-	str r6, [sp, 0x8]
-	mov r0, r8
-	str r0, [sp, 0xC]
-	adds r0, r5, 0
-	movs r1, 0
-	movs r3, 0xF
-	bl DisplayMessageAndContinueTask
-	movs r0, 0
-	movs r1, 0x3
-	bl CopyWindowToVram
-	add sp, 0x10
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end DisplayItemMessageOnField
-
-	thumb_func_start sub_80F7858
-sub_80F7858: @ 80F7858
-	push {lr}
-	sub sp, 0xC
-	ldr r0, _080F787C @ =gUnknown_841F43C
-	movs r1, 0x85
-	lsls r1, 2
-	str r1, [sp]
-	movs r1, 0xE
-	str r1, [sp, 0x4]
-	movs r1, 0
-	str r1, [sp, 0x8]
-	movs r1, 0x2
-	movs r2, 0
-	movs r3, 0x2
-	bl CreateYesNoMenu
-	add sp, 0xC
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F787C: .4byte gUnknown_841F43C
-	thumb_func_end sub_80F7858
-
-	thumb_func_start sub_80F7880
-sub_80F7880: @ 80F7880
-	push {lr}
-	sub sp, 0xC
-	ldr r0, _080F78A4 @ =gUnknown_841F43C
-	movs r1, 0x85
-	lsls r1, 2
-	str r1, [sp]
-	movs r1, 0xE
-	str r1, [sp, 0x4]
-	movs r1, 0x1
-	str r1, [sp, 0x8]
-	movs r1, 0x2
-	movs r2, 0
-	movs r3, 0x2
-	bl CreateYesNoMenu
-	add sp, 0xC
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080F78A4: .4byte gUnknown_841F43C
-	thumb_func_end sub_80F7880
 
 	thumb_func_start GetTextSpeedSetting
 GetTextSpeedSetting: @ 80F78A8
@@ -463,7 +155,7 @@ sub_80F7998: @ 80F7998
 	thumb_func_start sub_80F79A4
 sub_80F79A4: @ 80F79A4
 	push {lr}
-	bl sub_80F77B8
+	bl Menu_LoadStdPal
 	movs r1, 0x80
 	lsls r1, 2
 	movs r0, 0