summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYamaArashi <shadow962@live.com>2016-09-05 19:41:05 -0700
committerYamaArashi <shadow962@live.com>2016-09-05 19:41:05 -0700
commit079989e1bb3333381d3e90246550d20a2f46caa9 (patch)
treeb879369a784c6eeabeed4c9101f6ac25d8eee03c
parent80b3dc30e6784c40791997dc6284c5069caeb27c (diff)
rename menu functions
Diffstat
-rw-r--r--asm/rom4.s26
-rw-r--r--asm/rom5.s1862
-rw-r--r--asm/rom_8040EB4.s154
-rw-r--r--asm/rom_8065394.s150
-rw-r--r--ewram_syms.txt14
-rw-r--r--src/link.c8
-rw-r--r--src/main_menu.c142
-rw-r--r--src/menu.c274
8 files changed, 1315 insertions, 1315 deletions
diff --git a/asm/rom4.s b/asm/rom4.s
index ab570d7e6..9e9992273 100644
--- a/asm/rom4.s
+++ b/asm/rom4.s
@@ -3664,7 +3664,7 @@ _080548C4:
ldr r0, _080548DC
bl SetUpWindowConfig
ldr r0, _080548E0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
b _08054928
.align 2, 0
_080548DC: .4byte gWindowConfig_81E6C3C
@@ -3772,7 +3772,7 @@ _080549B4:
ldr r0, _080549CC
bl SetUpWindowConfig
ldr r0, _080549D0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
b _08054A38
.align 2, 0
_080549CC: .4byte gWindowConfig_81E6C3C
@@ -3934,7 +3934,7 @@ _08054B0C:
ldr r0, _08054B24
bl SetUpWindowConfig
ldr r0, _08054B28
- bl sub_8071C4C
+ bl InitMenuWindowConfig
b _08054B70
.align 2, 0
_08054B24: .4byte gWindowConfig_81E6C3C
@@ -4079,7 +4079,7 @@ sub_8054C2C: @ 8054C2C
ldr r0, _08054C4C
bl SetUpWindowConfig
ldr r0, _08054C50
- bl sub_8071C4C
+ bl InitMenuWindowConfig
bl mapdata_load_assets_to_gpu_and_full_redraw
pop {r0}
bx r0
@@ -16815,7 +16815,7 @@ _0805A488:
fish3: @ 805A490
push {r4,lr}
adds r4, r0, 0
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldrh r0, [r4, 0x8]
adds r0, 0x1
movs r1, 0
@@ -16916,7 +16916,7 @@ _0805A54E:
lsrs r1, 24
mov r0, sp
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldrh r0, [r4, 0xC]
adds r0, 0x1
strh r0, [r4, 0xC]
@@ -16985,7 +16985,7 @@ sub_805A5CC: @ 805A5CC
ldr r0, _0805A5F0
movs r1, 0x4
movs r2, 0x11
- bl Print
+ bl MenuPrint
ldrh r0, [r4, 0x8]
adds r0, 0x1
movs r1, 0
@@ -17108,7 +17108,7 @@ sub_805A6B4: @ 805A6B4
bl sub_805A954
ldr r0, _0805A6D8
bl sub_8072044
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldrh r0, [r4, 0x8]
adds r0, 0x1
movs r1, 0
@@ -17137,7 +17137,7 @@ sub_805A6DC: @ 805A6DC
ldrsh r6, [r5, r0]
cmp r6, 0
bne _0805A780
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _0805A778
@@ -17186,7 +17186,7 @@ _0805A746:
lsls r0, 2
adds r0, r2
strh r6, [r0, 0x26]
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldrh r0, [r5, 0xA]
adds r0, 0x1
strh r0, [r5, 0xA]
@@ -17304,7 +17304,7 @@ fishD: @ 805A858
push {r4,lr}
adds r4, r0, 0
bl sub_805A954
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldrh r0, [r4, 0x8]
adds r0, 0x1
strh r0, [r4, 0x8]
@@ -17396,7 +17396,7 @@ _0805A910: .4byte 0x030048a0
thumb_func_start fishF
fishF: @ 805A914
push {lr}
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _0805A946
@@ -17405,7 +17405,7 @@ fishF: @ 805A914
strb r0, [r1, 0x6]
bl script_env_2_disable
bl sub_806451C
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
bl sub_80BE97C
ldr r0, _0805A950
diff --git a/asm/rom5.s b/asm/rom5.s
index 555a3a829..1ccf5a81e 100644
--- a/asm/rom5.s
+++ b/asm/rom5.s
@@ -13667,7 +13667,7 @@ _08081790:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldrb r0, [r7, 0x2]
bl sub_808161C
movs r1, 0x4
@@ -13760,7 +13760,7 @@ _08081852:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0808189C
bl LoadFontDefaultPalette
ldr r1, _080818A0
@@ -16513,12 +16513,12 @@ sub_8082D18: @ 8082D18
movs r1, 0xA
movs r2, 0x1C
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08082D48
movs r1, 0x13
movs r2, 0xB
movs r3, 0x48
- bl Free
+ bl sub_8072BD8
pop {r0}
bx r0
.align 2, 0
@@ -16533,7 +16533,7 @@ sub_8082D4C: @ 8082D4C
movs r1, 0xA
movs r2, 0x1C
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_8082D4C
@@ -18194,7 +18194,7 @@ _08083A62:
_08083A68:
bl sub_8055588
bl textbox_close
- bl sub_8071EF4
+ bl MenuZeroFillScreen
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -18625,16 +18625,16 @@ sub_8083D70: @ 8083D70
ldr r1, _08083DF0
mov r0, sp
bl StringAppend
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0xE
movs r2, 0x1E
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _08083DF4
ldr r0, _08083DF8
str r0, [r1]
@@ -18851,17 +18851,17 @@ _08083F66:
unref_sub_8083F6C: @ 8083F6C
push {lr}
sub sp, 0x8
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0
movs r2, 0xA
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _08083FB0
movs r0, 0x1
movs r1, 0x1
movs r2, 0x9
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0x9
@@ -27840,7 +27840,7 @@ sub_8088380: @ 8088380
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
movs r0, 0x26
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -28196,7 +28196,7 @@ sub_808862C: @ 808862C
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
movs r0, 0x26
ldrsh r1, [r5, r0]
lsls r0, r1, 4
@@ -30995,7 +30995,7 @@ sub_8089BDC: @ 8089BDC
adds r0, r5, 0
adds r1, r6, 0
adds r2, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r5, 0x1
lsls r5, 24
lsrs r5, 24
@@ -31007,7 +31007,7 @@ sub_8089BDC: @ 8089BDC
adds r1, r6, 0
mov r2, r8
ldr r3, [sp, 0x1C]
- bl sub_80728E4
+ bl PrintMenuItemsReordered
add sp, 0x4
pop {r3}
mov r8, r3
@@ -31483,7 +31483,7 @@ sub_808A004: @ 808A004
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
.align 2, 0
@@ -31636,7 +31636,7 @@ sub_808A140: @ 808A140
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0808A178
lsls r0, r4, 2
adds r0, r4
@@ -31776,7 +31776,7 @@ _0808A278:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
bl sub_806D538
@@ -32281,7 +32281,7 @@ sub_808A688: @ 808A688
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
ldr r1, _0808A6B4
adds r0, r4, 0
@@ -32304,7 +32304,7 @@ sub_808A6B8: @ 808A6B8
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
ldr r1, _0808A6E4
adds r0, r4, 0
@@ -32330,7 +32330,7 @@ sub_808A6E8: @ 808A6E8
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0808A72C
ldr r2, _0808A730
movs r0, 0
@@ -32565,7 +32565,7 @@ sub_808A8D4: @ 808A8D4
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
bl sub_806D538
@@ -32614,7 +32614,7 @@ sub_808A938: @ 808A938
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
ldr r0, _0808A978
ldrb r0, [r0]
@@ -32663,7 +32663,7 @@ sub_808A984: @ 808A984
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldrh r0, [r4, 0x16]
subs r0, 0xB
lsls r0, 16
@@ -32695,7 +32695,7 @@ _0808A9DC:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
ldr r0, _0808AA24
movs r1, 0x1
@@ -32760,7 +32760,7 @@ _0808AA90:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r1, 0x16
ldrsh r0, [r4, r1]
cmp r0, 0x4
@@ -32827,7 +32827,7 @@ _0808AB12:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_808A918
_0808AB24:
@@ -32954,7 +32954,7 @@ _0808AC0E:
movs r1, 0x11
movs r2, 0x1C
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_808A918
_0808AC20:
@@ -34384,12 +34384,12 @@ _0808B77C: .4byte 0x03001770
_0808B780: .4byte 0x0000043c
_0808B784:
ldr r0, _0808B78C
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _0808B95C
.align 2, 0
_0808B78C: .4byte gWindowConfig_81E71B4
_0808B790:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _0808B79A
b _0808B9B2
@@ -34526,44 +34526,44 @@ _0808B874:
movs r1, 0
movs r2, 0x1B
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x2
movs r1, 0x4
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0808B978
movs r1, 0x4
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r0, _0808B97C
movs r1, 0x4
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, _0808B980
movs r1, 0x4
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldr r0, _0808B984
movs r1, 0x4
movs r2, 0x9
- bl Print
+ bl MenuPrint
ldr r0, _0808B988
movs r1, 0x4
movs r2, 0xB
- bl Print
+ bl MenuPrint
ldr r0, _0808B98C
movs r1, 0x4
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0808B990
movs r1, 0x4
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _0808B994
movs r1, 0x4
movs r2, 0x11
- bl Print
+ bl MenuPrint
ldrb r0, [r4, 0xA]
bl sub_808BCF8
ldrb r0, [r4, 0xC]
@@ -35285,7 +35285,7 @@ _0808BE98:
movs r4, 0
_0808BE9A:
adds r0, r4, 0
- bl sub_8071E00
+ bl MenuLoadTextWindowGraphics_OverrideFrameType
_0808BEA0:
ldr r0, _0808BEB8
ldrh r1, [r0, 0x2E]
@@ -35305,7 +35305,7 @@ _0808BEBC:
movs r4, 0x13
_0808BEBE:
adds r0, r4, 0
- bl sub_8071E00
+ bl MenuLoadTextWindowGraphics_OverrideFrameType
_0808BEC4:
adds r0, r4, 0
pop {r4}
@@ -35400,11 +35400,11 @@ _0808BF64:
mov r0, r8
movs r1, 0xF
movs r2, 0xF
- bl Print
+ bl MenuPrint
mov r0, sp
movs r1, 0x12
movs r2, 0xF
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r3}
mov r8, r3
@@ -35897,7 +35897,7 @@ _0808C344:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldrb r0, [r5]
adds r0, 0x1
strb r0, [r5]
@@ -37952,7 +37952,7 @@ _0808D4D8:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r0, _0808D4FC
ldr r1, _0808D500
bl LZ77UnCompVram
@@ -39261,7 +39261,7 @@ _0808DEEE:
lsrs r1, 24
mov r0, sp
mov r2, r9
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r3-r5}
mov r8, r3
@@ -41870,7 +41870,7 @@ _0808F3F4:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r1, _0808F410
ldr r3, _0808F414
adds r1, r3
@@ -41918,15 +41918,15 @@ _0808F45A:
ldr r0, _0808F4FC
movs r1, 0xB
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, _0808F500
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldr r0, _0808F504
movs r1, 0x10
movs r2, 0x9
- bl Print
+ bl MenuPrint
ldr r2, [r5]
ldrb r1, [r2, 0x2]
movs r0, 0x2
@@ -41972,7 +41972,7 @@ _0808F45A:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
movs r1, 0xFF
lsls r1, 2
movs r0, 0xE
@@ -41988,7 +41988,7 @@ _0808F50C:
ldr r0, _0808F524
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0808F528
movs r1, 0x31
movs r2, 0x1E
@@ -42779,7 +42779,7 @@ _0808FB9C:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
bl ResetPaletteFade
ldr r1, _0808FBBC
ldr r0, _0808FBC0
@@ -42793,7 +42793,7 @@ _0808FBC4:
ldr r0, _0808FBE8
movs r1, 0xA
movs r2, 0x4
- bl Print
+ bl MenuPrint
ldr r0, _0808FBEC
ldr r0, [r0]
ldrh r0, [r0]
@@ -43446,7 +43446,7 @@ _08090174:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
add r1, sp, 0x4
movs r0, 0xFF
strb r0, [r1]
@@ -43460,7 +43460,7 @@ _08090174:
movs r1, 0x3
movs r2, 0xF
movs r3, 0xC0
- bl Free
+ bl sub_8072BD8
ldr r1, _080901B8
ldr r2, _080901BC
adds r1, r2
@@ -44290,7 +44290,7 @@ _0809085C:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r2, _08090890
add r1, sp, 0x4
movs r0, 0
@@ -44318,7 +44318,7 @@ _080908A0:
movs r1, 0x2
movs r2, 0
movs r3, 0xD0
- bl Free
+ bl sub_8072BD8
bl sub_806912C
cmp r0, 0
bne _080908CC
@@ -44345,15 +44345,15 @@ _080908D6:
ldr r0, _0809094C
movs r1, 0xB
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, _08090950
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldr r0, _08090954
movs r1, 0x10
movs r2, 0x9
- bl Print
+ bl MenuPrint
lsls r4, r6, 3
adds r4, r6
lsls r4, 2
@@ -44376,7 +44376,7 @@ _080908D6:
ldr r0, [r4]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
movs r1, 0xFF
lsls r1, 2
movs r0, 0xE
@@ -44565,7 +44565,7 @@ _08090AA4:
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _08090B04
lsls r0, r4, 3
adds r0, r4
@@ -44575,7 +44575,7 @@ _08090AA4:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r1, _08090B08
ldrh r0, [r1]
adds r0, 0x1
@@ -44787,7 +44787,7 @@ sub_8090C68: @ 8090C68
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08090CDC
ldr r0, [r4]
ldrh r1, [r0]
@@ -44799,7 +44799,7 @@ sub_8090C68: @ 8090C68
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, [r5]
ldr r1, _08090CD8
adds r0, r1
@@ -44827,7 +44827,7 @@ _08090CE4:
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08090D30
ldr r0, [r4]
ldrh r1, [r0]
@@ -44839,7 +44839,7 @@ _08090CE4:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, [r5]
ldr r1, _08090D34
adds r0, r1
@@ -45466,7 +45466,7 @@ sub_8091154: @ 8091154
mov r0, sp
adds r1, r6, 0
mov r2, r8
- bl Print
+ bl MenuPrint
add sp, 0x4
pop {r3}
mov r8, r3
@@ -45550,7 +45550,7 @@ _0809124C:
mov r0, sp
adds r1, r6, 0
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r4, 0
add sp, 0xC
pop {r4-r6}
@@ -45634,7 +45634,7 @@ _080912E6:
mov r0, sp
mov r1, r8
adds r2, r7, 0
- bl Print
+ bl MenuPrint
adds r0, r4, 0
add sp, 0x28
pop {r3}
@@ -45815,7 +45815,7 @@ _08091402:
mov r0, sp
adds r1, r7, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r4-r7}
pop {r0}
@@ -45943,7 +45943,7 @@ _080914F8:
mov r0, sp
mov r1, r9
mov r2, r8
- bl Print
+ bl MenuPrint
add sp, 0x10
pop {r3,r4}
mov r8, r3
@@ -46171,7 +46171,7 @@ _0809166A:
mov r0, sp
mov r1, r10
ldr r2, [sp, 0x10]
- bl Print
+ bl MenuPrint
add sp, 0x14
pop {r3-r5}
mov r8, r3
@@ -47235,7 +47235,7 @@ _08091F50:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r0, _08091FAC
bl LoadCompressedObjectPic
ldr r0, _08091FB0
@@ -48117,7 +48117,7 @@ sub_8092644: @ 8092644
movs r1, 0x1
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1
bl sub_8092C8C
b _080926E0
@@ -48137,7 +48137,7 @@ _080926B4:
movs r1, 0x1
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1
bl sub_8092C8C
ldrh r0, [r6, 0x24]
@@ -48996,7 +48996,7 @@ sub_8092D78: @ 8092D78
movs r1, 0x1
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r5, 0
ldrh r4, [r7]
b _08092DE8
@@ -49012,7 +49012,7 @@ _08092DC4:
lsls r2, 24
lsrs r2, 24
movs r1, 0x12
- bl Print
+ bl MenuPrint
adds r0, r5, 0x1
lsls r0, 16
lsrs r5, r0, 16
@@ -49554,7 +49554,7 @@ _080931DC:
adds r0, 0x1
strb r0, [r1]
_080931EC:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
beq _08093232
b _0809320A
@@ -50322,7 +50322,7 @@ sub_80937BC: @ 80937BC
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
pop {r4}
pop {r0}
bx r0
@@ -50598,7 +50598,7 @@ sub_80939A4: @ 80939A4
movs r1, 0
bl CreateTask
ldr r0, _080939BC
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
pop {r0}
bx r0
.align 2, 0
@@ -50653,7 +50653,7 @@ _08093A04:
mov r0, sp
movs r1, 0xA
movs r2, 0xC
- bl Print
+ bl MenuPrint
add sp, 0x20
pop {r0}
bx r0
@@ -51155,7 +51155,7 @@ _08093DC4:
thumb_func_start sub_8093DC8
sub_8093DC8: @ 8093DC8
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_80940E4
bl sub_8093F14
bl sub_8093F80
@@ -51169,7 +51169,7 @@ sub_8093DC8: @ 8093DC8
thumb_func_start sub_8093DEC
sub_8093DEC: @ 8093DEC
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_80940E4
bl sub_8093F48
bl sub_8094188
@@ -51616,7 +51616,7 @@ _0809413C: .4byte 0x06004800
sub_8094140: @ 8094140
push {r4,r5,lr}
ldr r0, _0809417C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r4, _08094180
ldr r5, _08094184
adds r0, r4, 0
@@ -51628,7 +51628,7 @@ sub_8094140: @ 8094140
adds r0, r4, 0
movs r1, 0x7
movs r2, 0x5
- bl Print
+ bl MenuPrint
bl sub_80941D8
bl sub_8094200
bl sub_8094218
@@ -51646,7 +51646,7 @@ _08094184: .4byte 0x02000094
sub_8094188: @ 8094188
push {lr}
ldr r0, _080941D0
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
bl sub_80942F8
bl sub_8094334
bl sub_80943C4
@@ -51655,7 +51655,7 @@ sub_8094188: @ 8094188
bl sub_80944E8
bl sub_8094538
ldr r0, _080941D4
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
bl sub_8094354
bl sub_80943E4
bl sub_8094448
@@ -51683,7 +51683,7 @@ sub_80941D8: @ 80941D8
mov r0, sp
movs r1, 0x14
movs r2, 0x2
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r0}
bx r0
@@ -51729,7 +51729,7 @@ _08094230:
mov r0, sp
movs r1, 0x10
movs r2, 0xA
- bl PrintCoinsString
+ bl sub_8072B4C
_0809424A:
add sp, 0x10
pop {r0}
@@ -51796,7 +51796,7 @@ sub_809429C: @ 809429C
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xE
- bl Print
+ bl MenuPrint
adds r1, r6, 0
adds r1, 0x40
adds r0, r4, 0
@@ -51809,7 +51809,7 @@ sub_809429C: @ 809429C
adds r0, r4, 0
movs r1, 0x2
movs r2, 0x10
- bl Print
+ bl MenuPrint
_080942EA:
pop {r4-r6}
pop {r0}
@@ -51836,7 +51836,7 @@ sub_80942F8: @ 80942F8
adds r0, r4, 0
movs r1, 0x1C
movs r2, 0x2
- bl PrintCoinsString
+ bl sub_8072B4C
pop {r4,r5}
pop {r0}
bx r0
@@ -51856,7 +51856,7 @@ sub_8094334: @ 8094334
ldr r0, _08094350
movs r1, 0x3
movs r2, 0x5
- bl Print
+ bl MenuPrint
_08094348:
pop {r0}
bx r0
@@ -51906,7 +51906,7 @@ sub_8094354: @ 8094354
ldr r0, _080943BC
movs r1, 0x1C
movs r2, 0x5
- bl PrintCoinsString
+ bl sub_8072B4C
_080943B0:
pop {r4,r5}
pop {r0}
@@ -51927,7 +51927,7 @@ sub_80943C4: @ 80943C4
ldr r0, _080943E0
movs r1, 0x3
movs r2, 0x7
- bl Print
+ bl MenuPrint
_080943D8:
pop {r0}
bx r0
@@ -51952,7 +51952,7 @@ sub_80943E4: @ 80943E4
mov r0, sp
movs r1, 0x16
movs r2, 0x7
- bl PrintCoinsString
+ bl sub_8072B4C
adds r0, r4, 0
adds r0, 0x7A
ldrh r1, [r0]
@@ -51961,7 +51961,7 @@ sub_80943E4: @ 80943E4
mov r0, sp
movs r1, 0x1C
movs r2, 0x7
- bl PrintCoinsString
+ bl sub_8072B4C
_0809441C:
add sp, 0x10
pop {r4}
@@ -51981,7 +51981,7 @@ sub_8094428: @ 8094428
ldr r0, _08094444
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
_0809443C:
pop {r0}
bx r0
@@ -52041,7 +52041,7 @@ sub_8094498: @ 8094498
ldr r0, _080944B4
movs r1, 0x3
movs r2, 0xD
- bl Print
+ bl MenuPrint
_080944AC:
pop {r0}
bx r0
@@ -52068,7 +52068,7 @@ sub_80944B8: @ 80944B8
mov r0, sp
movs r1, 0x1C
movs r2, 0xD
- bl PrintCoinsString
+ bl sub_8072B4C
_080944DE:
add sp, 0x8
pop {r0}
@@ -52087,7 +52087,7 @@ sub_80944E8: @ 80944E8
ldr r0, _08094504
movs r1, 0x3
movs r2, 0xB
- bl Print
+ bl MenuPrint
_080944FC:
pop {r0}
bx r0
@@ -52114,7 +52114,7 @@ sub_8094508: @ 8094508
mov r0, sp
movs r1, 0x1C
movs r2, 0xB
- bl PrintCoinsString
+ bl sub_8072B4C
_0809452E:
add sp, 0x8
pop {r0}
@@ -52133,7 +52133,7 @@ sub_8094538: @ 8094538
ldr r0, _08094554
movs r1, 0x3
movs r2, 0x9
- bl Print
+ bl MenuPrint
_0809454C:
pop {r0}
bx r0
@@ -52160,7 +52160,7 @@ sub_8094558: @ 8094558
mov r0, sp
movs r1, 0x1C
movs r2, 0x9
- bl PrintCoinsString
+ bl sub_8072B4C
_0809457E:
add sp, 0x8
pop {r0}
@@ -52188,7 +52188,7 @@ _0809459E:
lsls r2, 24
lsrs r2, 24
adds r0, r4, 0
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -52228,7 +52228,7 @@ _080945D8:
adds r3, 0xB
lsls r3, 24
lsrs r3, 24
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
lsls r0, r5, 16
movs r1, 0x80
lsls r1, 9
@@ -52283,7 +52283,7 @@ _0809465C:
adds r3, 0x9
lsls r3, 24
lsrs r3, 24
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
lsls r0, r5, 16
movs r1, 0x80
lsls r1, 9
@@ -52358,7 +52358,7 @@ _080946E8:
adds r3, 0xB
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
b _08094730
.align 2, 0
_08094710: .4byte 0x00000801
@@ -52375,7 +52375,7 @@ _08094714:
adds r3, 0x9
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
_08094730:
pop {r3}
mov r8, r3
@@ -52403,14 +52403,14 @@ sub_8094740: @ 8094740
lsls r5, 24
lsrs r5, 24
adds r2, r5, 0
- bl Print
+ bl MenuPrint
ldr r0, _08094774
adds r4, 0xC
lsls r4, 24
lsrs r4, 24
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
pop {r4,r5}
pop {r0}
bx r0
@@ -52440,7 +52440,7 @@ sub_8094778: @ 8094778
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl Print
+ bl MenuPrint
add sp, 0x20
pop {r4,r5}
pop {r0}
@@ -52463,7 +52463,7 @@ sub_80947B0: @ 80947B0
lsls r5, 24
lsrs r5, 24
adds r2, r5, 0
- bl Print
+ bl MenuPrint
bl GetBadgeCount
adds r1, r0, 0
lsls r1, 24
@@ -52476,7 +52476,7 @@ sub_80947B0: @ 80947B0
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -52499,7 +52499,7 @@ sub_80947F8: @ 80947F8
lsls r5, 24
lsrs r5, 24
adds r2, r5, 0
- bl Print
+ bl MenuPrint
bl GetPokedexSeenCount
adds r1, r0, 0
lsls r1, 16
@@ -52514,7 +52514,7 @@ sub_80947F8: @ 80947F8
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -52537,7 +52537,7 @@ sub_8094844: @ 8094844
lsls r5, 24
lsrs r5, 24
adds r2, r5, 0
- bl Print
+ bl MenuPrint
ldr r0, _0809488C
ldrh r1, [r0, 0xE]
ldrb r2, [r0, 0x10]
@@ -52550,7 +52550,7 @@ sub_8094844: @ 8094844
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
add sp, 0x10
pop {r4,r5}
pop {r0}
@@ -55398,7 +55398,7 @@ sub_8095EA0: @ 8095EA0
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
pop {r0}
bx r0
thumb_func_end sub_8095EA0
@@ -55437,7 +55437,7 @@ _08095EE0:
_08095EF4:
ldrb r0, [r4, 0xA]
bl sub_8096168
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldr r1, _08095F18
movs r2, 0xA
ldrsh r0, [r4, r2]
@@ -55447,7 +55447,7 @@ _08095EF4:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
b _08095F28
.align 2, 0
_08095F18: .4byte gUnknown_083B600C
@@ -55535,7 +55535,7 @@ _08095FA2:
ldr r0, [r1]
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
b _080960F4
.align 2, 0
_08095FC0: .4byte 0x03001770
@@ -55546,7 +55546,7 @@ _08095FC8:
movs r1, 0
movs r2, 0xD
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl script_env_2_disable
bl script_env_2_enable_and_set_ctx_running
adds r0, r5, 0
@@ -55582,7 +55582,7 @@ _08096008:
_08096022:
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x3
strh r0, [r4, 0x8]
b _080960F4
@@ -55664,7 +55664,7 @@ _080960C2:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x2
strh r0, [r4, 0x8]
b _080960F4
@@ -55751,12 +55751,12 @@ sub_8096168: @ 8096168
movs r1, 0
movs r2, 0xD
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080961A4
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintStringArray
+ bl PrintMenuItems
str r4, [sp]
movs r0, 0xC
str r0, [sp, 0x4]
@@ -56712,8 +56712,8 @@ _080968E8:
_080968F0: .4byte gWindowConfig_81E6D00
_080968F4:
ldr r0, _08096900
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
b _0809697A
.align 2, 0
_08096900: .4byte gWindowConfig_81E6D00
@@ -56851,8 +56851,8 @@ _08096A34:
_08096A3C: .4byte gWindowConfig_81E6D00
_08096A40:
ldr r0, _08096A4C
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
b _08096AD8
.align 2, 0
_08096A4C: .4byte gWindowConfig_81E6D00
@@ -59799,27 +59799,27 @@ _08098302:
movs r1, 0xB
movs r2, 0x9
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0809834C
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x10
- bl Print
+ bl MenuPrint
adds r0, r4, 0
subs r0, 0x6B
movs r1, 0x1
movs r2, 0xB
- bl Print
+ bl MenuPrint
adds r0, r4, 0
subs r0, 0x46
movs r1, 0
movs r2, 0xD
- bl Print
+ bl MenuPrint
subs r4, 0x21
adds r0, r4, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -60510,7 +60510,7 @@ sub_8098898: @ 8098898
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r1, _080988C4
lsls r0, r5, 3
adds r0, r1
@@ -60682,7 +60682,7 @@ _08098A18:
adds r0, r3, 0
movs r1, 0xB
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r4-r6}
pop {r0}
bx r0
@@ -60701,7 +60701,7 @@ sub_8098A38: @ 8098A38
movs r0, 0x17
movs r1, 0xA
movs r2, 0
- bl sub_8072974
+ bl DisplayYesNoMenu
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
@@ -60719,12 +60719,12 @@ sub_8098A5C: @ 8098A5C
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x17
movs r1, 0xA
movs r2, 0x1D
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_8098A5C
@@ -69531,7 +69531,7 @@ sub_809CE84: @ 809CE84
ldrb r1, [r6]
movs r2, 0x1D
movs r3, 0xF
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrb r0, [r5]
adds r0, 0x1
lsls r0, 24
@@ -69546,7 +69546,7 @@ sub_809CE84: @ 809CE84
lsls r3, 5
adds r4, r3
adds r3, r4, 0
- bl PrintStringArray
+ bl PrintMenuItems
ldrb r1, [r5]
adds r1, 0x1
lsls r1, 24
@@ -69641,7 +69641,7 @@ _0809CF8E:
ldrb r1, [r1]
movs r2, 0x1D
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
_0809CFB2:
cmp r5, 0
blt _0809CFC4
@@ -71212,7 +71212,7 @@ _0809DB94:
_0809DB9C: .4byte gWindowConfig_81E6E6C
_0809DBA0:
ldr r0, _0809DBB0
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
ldr r1, _0809DBB4
ldr r2, _0809DBB8
adds r1, r2
@@ -71222,7 +71222,7 @@ _0809DBB0: .4byte gWindowConfig_81E6E6C
_0809DBB4: .4byte 0x03001770
_0809DBB8: .4byte 0x0000043c
_0809DBBC:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _0809DBC6
b _0809DE38
@@ -72094,7 +72094,7 @@ _0809E308:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0809E314:
movs r1, 0x1
negs r1, r1
@@ -72139,7 +72139,7 @@ _0809E360:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0809E36C:
adds r0, r4, 0
movs r1, 0x1
@@ -73079,12 +73079,12 @@ _0809EAEE:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xB
movs r1, 0xF
movs r2, 0x1C
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
adds r1, r6, 0
adds r1, 0x7F
movs r0, 0x6
@@ -74890,7 +74890,7 @@ _0809F8E8:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0809F8F4:
ldr r1, _0809F910
lsls r0, r5, 2
@@ -74943,7 +74943,7 @@ _0809F954:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0809F960:
ldr r1, _0809F98C
lsls r0, r5, 2
@@ -75026,11 +75026,11 @@ sub_809F9D0: @ 809F9D0
movs r1, 0xF
movs r2, 0x1C
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0809FA28
movs r1, 0xB
movs r2, 0xF
- bl Print
+ bl MenuPrint
subs r6, 0x8
adds r4, r6
ldr r0, _0809FA2C
@@ -75146,17 +75146,17 @@ sub_809FAC8: @ 809FAC8
movs r1, 0x2
movs r2, 0x4
movs r3, 0x3
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x3
movs r1, 0x10
movs r2, 0x9
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xC
movs r2, 0xB
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0809FB20
adds r0, r5, 0
adds r1, r4, 0
@@ -75231,7 +75231,7 @@ _0809FB96:
movs r1, 0x2
movs r2, 0x4
movs r3, 0x3
- bl Reset
+ bl MenuZeroFillWindowRect
_0809FBA2:
ldr r1, _0809FBE0
adds r0, r1, 0
@@ -75252,7 +75252,7 @@ _0809FBA2:
ldr r0, _0809FBE0
movs r1, 0x1
movs r2, 0xC
- bl Print
+ bl MenuPrint
adds r0, r5, 0
bl sub_80A0958
_0809FBD6:
@@ -75281,7 +75281,7 @@ _0809FBE8:
movs r1, 0x4
movs r2, 0x1D
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r4}
pop {r0}
bx r0
@@ -75293,7 +75293,7 @@ sub_809FC0C: @ 809FC0C
ldr r0, _0809FC30
movs r1, 0xB
movs r2, 0x6
- bl Print
+ bl MenuPrint
movs r0, 0
movs r1, 0x16
movs r2, 0x4
@@ -75327,7 +75327,7 @@ _0809FC3C:
movs r1, 0x9
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
movs r1, 0x2D
bl PokemonGetField
@@ -75356,7 +75356,7 @@ _0809FC3C:
ldr r0, _0809FCD0
movs r1, 0xB
movs r2, 0x4
- bl Print
+ bl MenuPrint
movs r0, 0x1
str r0, [sp]
adds r0, r4, 0
@@ -75398,7 +75398,7 @@ _0809FCEC:
_0809FCF2:
movs r1, 0xB
movs r2, 0x9
- bl Print
+ bl MenuPrint
b _0809FD0A
.align 2, 0
_0809FCFC: .4byte gUnknown_0840F8BB
@@ -75406,7 +75406,7 @@ _0809FD00:
ldr r0, _0809FD18
movs r1, 0xB
movs r2, 0x9
- bl Print
+ bl MenuPrint
_0809FD0A:
adds r0, r6, 0
movs r1, 0xB
@@ -75470,7 +75470,7 @@ _0809FD74:
ldr r0, _0809FE58
movs r1, 0xB
movs r2, 0x4
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0x1
bl PokemonGetField
@@ -75543,7 +75543,7 @@ _0809FDF8:
ldr r0, [r4]
movs r1, 0xB
movs r2, 0xB
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0xB
movs r2, 0xE
@@ -75581,22 +75581,22 @@ sub_809FE80: @ 809FE80
movs r1, 0x4
movs r2, 0x12
movs r3, 0x5
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x19
movs r1, 0x4
movs r2, 0x1E
movs r3, 0x5
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xB
movs r1, 0x9
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xB
movs r1, 0xE
movs r2, 0x1C
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_809FE80
@@ -75618,7 +75618,7 @@ sub_809FEB8: @ 809FEB8
ldr r0, _0809FF48
movs r1, 0x15
movs r2, 0x10
- bl Print
+ bl MenuPrint
ldr r0, _0809FF4C
movs r4, 0x2A
str r4, [sp]
@@ -75707,7 +75707,7 @@ _0809FF6A:
adds r0, r4, 0
movs r1, 0x1D
movs r2, 0xE
- bl PrintCoinsString
+ bl sub_8072B4C
adds r0, r5, 0
movs r1, 0x17
movs r2, 0x10
@@ -75722,7 +75722,7 @@ _0809FF6A:
movs r1, 0x10
movs r2, 0x9
movs r3, 0x32
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x3C
bl PokemonGetField
@@ -75733,7 +75733,7 @@ _0809FF6A:
movs r1, 0x10
movs r2, 0xB
movs r3, 0x32
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x3E
bl PokemonGetField
@@ -75744,7 +75744,7 @@ _0809FF6A:
movs r1, 0x1B
movs r2, 0x7
movs r3, 0x12
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x3F
bl PokemonGetField
@@ -75755,7 +75755,7 @@ _0809FF6A:
movs r1, 0x1B
movs r2, 0x9
movs r3, 0x12
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x3D
bl PokemonGetField
@@ -75766,7 +75766,7 @@ _0809FF6A:
movs r1, 0x1B
movs r2, 0xB
movs r3, 0x12
- bl Free
+ bl sub_8072BD8
adds r0, r5, 0
movs r1, 0x39
bl PokemonGetField
@@ -75818,32 +75818,32 @@ sub_80A00A4: @ 80A00A4
movs r1, 0x4
movs r2, 0x13
movs r3, 0x5
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x10
movs r1, 0x7
movs r2, 0x15
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x11
movs r1, 0x9
movs r2, 0x15
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1B
movs r1, 0x7
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x16
movs r1, 0xE
movs r2, 0x1C
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x17
movs r1, 0x10
movs r2, 0x1C
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_80A00A4
@@ -75937,7 +75937,7 @@ _080A0168:
ldr r0, _080A01B4
movs r1, 0x1A
adds r2, r4, 0
- bl Print
+ bl MenuPrint
b _080A0276
.align 2, 0
_080A01B0: .4byte gUnknown_0840E680
@@ -76028,7 +76028,7 @@ _080A020C:
ldr r0, _080A0298
movs r1, 0x19
adds r2, r5, 0
- bl Print
+ bl MenuPrint
_080A0276:
adds r0, r7, 0x1
lsls r0, 24
@@ -76156,7 +76156,7 @@ _080A033E:
ldr r0, _080A0388
movs r1, 0x19
movs r2, 0xC
- bl Print
+ bl MenuPrint
_080A037E:
pop {r4,r5}
pop {r0}
@@ -76181,7 +76181,7 @@ _080A0394:
lsrs r3, 24
movs r0, 0xF
movs r2, 0x1C
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -76261,7 +76261,7 @@ sub_80A0428: @ 80A0428
movs r1, 0xF
movs r2, 0x1C
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A0454
ldrb r0, [r0, 0xB]
cmp r0, 0x2
@@ -76298,7 +76298,7 @@ sub_80A046C: @ 80A046C
ldr r0, [r1]
movs r1, 0xB
movs r2, 0xF
- bl Print
+ bl MenuPrint
_080A048A:
pop {r0}
bx r0
@@ -76325,7 +76325,7 @@ sub_80A0498: @ 80A0498
ldr r0, [r0]
movs r1, 0xB
movs r2, 0xF
- bl Print
+ bl MenuPrint
_080A04BC:
pop {r0}
bx r0
@@ -76360,7 +76360,7 @@ sub_80A04CC: @ 80A04CC
ldr r0, _080A050C
movs r1, 0x7
movs r2, 0xF
- bl Print
+ bl MenuPrint
b _080A052A
.align 2, 0
_080A0504: .4byte 0x0000ffff
@@ -76376,7 +76376,7 @@ _080A0514:
ldr r0, _080A0550
movs r1, 0x7
movs r2, 0xF
- bl Print
+ bl MenuPrint
_080A052A:
ldr r0, _080A0554
adds r1, r5, r4
@@ -76393,7 +76393,7 @@ _080A052A:
ldr r0, _080A0550
movs r1, 0x7
movs r2, 0x11
- bl Print
+ bl MenuPrint
b _080A0572
.align 2, 0
_080A0550: .4byte 0x020231cc
@@ -76408,7 +76408,7 @@ _080A055C:
ldr r0, _080A0578
movs r1, 0x7
movs r2, 0x11
- bl Print
+ bl MenuPrint
_080A0572:
pop {r4,r5}
pop {r0}
@@ -76667,7 +76667,7 @@ _080A0768:
_080A076E:
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
b _080A0786
.align 2, 0
_080A0778: .4byte gUnknown_0842D1C3
@@ -76675,7 +76675,7 @@ _080A077C:
ldr r0, _080A0794
mov r1, r9
mov r2, r8
- bl Print
+ bl MenuPrint
_080A0786:
pop {r3,r4}
mov r8, r3
@@ -76872,7 +76872,7 @@ _080A0934:
ldr r0, _080A0954
mov r1, r9
mov r2, r8
- bl Print
+ bl MenuPrint
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -76933,12 +76933,12 @@ sub_80A0958: @ 80A0958
adds r0, r5, 0
movs r1, 0
movs r2, 0xE
- bl Print
+ bl MenuPrint
movs r0, 0x3
movs r1, 0x10
movs r2, 0x9
movs r3, 0x11
- bl Reset
+ bl MenuZeroFillWindowRect
mov r0, r8
movs r1, 0x38
bl PokemonGetField
@@ -76966,7 +76966,7 @@ sub_80A0958: @ 80A0958
adds r0, r5, 0
movs r1, 0x3
movs r2, 0x10
- bl Print
+ bl MenuPrint
mov r0, r8
movs r1, 0x7
movs r2, 0x10
@@ -77013,7 +77013,7 @@ sub_80A0A2C: @ 80A0A2C
adds r0, r5, 0
adds r1, r4, 0
adds r2, r5, 0
- bl Reset
+ bl MenuZeroFillWindowRect
b _080A0A84
_080A0A6E:
ldr r0, _080A0A74
@@ -77188,7 +77188,7 @@ _080A0BD8:
ldr r0, _080A0BF0
movs r1, 0x15
movs r2, 0x4
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -77256,7 +77256,7 @@ _080A0C68:
ldr r0, _080A0C7C
adds r1, r7, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
pop {r4-r7}
pop {r0}
bx r0
@@ -77348,7 +77348,7 @@ _080A0D14:
lsrs r1, 24
adds r0, r4, 0
ldr r2, [sp]
- bl PrintCoinsString
+ bl sub_8072B4C
ldr r0, _080A0D58
mov r9, r0
movs r2, 0
@@ -77467,7 +77467,7 @@ sub_80A0DD0: @ 80A0DD0
ldr r0, _080A0E3C
movs r1, 0
movs r2, 0
- bl Print
+ bl MenuPrint
adds r4, 0x7F
ldrb r0, [r4]
cmp r0, 0
@@ -77490,7 +77490,7 @@ _080A0E48:
movs r1, 0
movs r2, 0x18
movs r3, 0x1
- bl Reset
+ bl MenuZeroFillWindowRect
_080A0E54:
ldr r2, _080A0E98
adds r0, r2, 0
@@ -77518,7 +77518,7 @@ _080A0E54:
ldr r0, _080A0E98
movs r1, 0x19
movs r2, 0
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -78066,7 +78066,7 @@ sub_80A12D0: @ 80A12D0
movs r1, 0x12
movs r2, 0x5
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1D
bl sub_80A18E4
ldr r0, _080A1310
@@ -78208,7 +78208,7 @@ _080A13F4:
movs r1, 0x13
movs r2, 0x9
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080A1400:
movs r1, 0
ldrsh r0, [r7, r1]
@@ -78227,7 +78227,7 @@ _080A1410:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
adds r4, 0x10
adds r0, r4, 0
bl sub_80A0958
@@ -78291,7 +78291,7 @@ sub_80A1488: @ 80A1488
movs r1, 0xE
movs r2, 0x9
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080A14A6:
ldr r5, _080A14E0
adds r0, r5, 0
@@ -78438,7 +78438,7 @@ _080A15C0:
movs r1, 0x13
movs r2, 0x9
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080A15CC:
movs r1, 0
ldrsh r0, [r7, r1]
@@ -78457,7 +78457,7 @@ _080A15DC:
movs r1, 0xE
movs r2, 0x9
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
adds r4, 0x10
adds r0, r4, 0
bl sub_80A0958
@@ -78521,7 +78521,7 @@ sub_80A1654: @ 80A1654
movs r1, 0xE
movs r2, 0x9
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080A1672:
ldr r5, _080A16AC
adds r0, r5, 0
@@ -79739,7 +79739,7 @@ sub_80A1F48: @ 80A1F48
adds r1, r5, 0
adds r2, r6, 0
ldr r3, [sp]
- bl Free
+ bl sub_8072BD8
add sp, 0x4
pop {r3,r4}
mov r8, r3
@@ -79825,7 +79825,7 @@ sub_80A1FF8: @ 80A1FF8
mov r0, r8
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -82047,12 +82047,12 @@ HideMapNamePopUpWindow: @ 80A30A4
lsls r0, 24
cmp r0, 0
beq _080A30D0
- bl GetMapNamePopUpWindowId
+ bl MenuLoadTextWindowGraphics
movs r0, 0
movs r1, 0
movs r2, 0xD
movs r3, 0x3
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A30D8
movs r0, 0
strh r0, [r1]
@@ -82073,7 +82073,7 @@ sub_80A30E0: @ 80A30E0
push {lr}
sub sp, 0x14
movs r0, 0
- bl sub_8071E00
+ bl MenuLoadTextWindowGraphics_OverrideFrameType
ldr r0, _080A3114
ldrb r1, [r0, 0x14]
mov r0, sp
@@ -82083,12 +82083,12 @@ sub_80A30E0: @ 80A30E0
movs r1, 0
movs r2, 0xD
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x1
movs r2, 0x1
movs r3, 0x60
- bl Free
+ bl sub_8072BD8
add sp, 0x14
pop {r0}
bx r0
@@ -82247,7 +82247,7 @@ _080A3270:
_080A3278: .4byte gWindowConfig_81E6DFC
_080A327C:
ldr r0, _080A328C
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
ldr r1, _080A3290
ldr r0, _080A3294
adds r1, r0
@@ -82257,7 +82257,7 @@ _080A328C: .4byte gWindowConfig_81E6DFC
_080A3290: .4byte 0x03001770
_080A3294: .4byte 0x0000043c
_080A3298:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _080A32A2
b _080A34A8
@@ -84221,7 +84221,7 @@ sub_80A418C: @ 80A418C
mov r0, r8
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
pop {r3,r4}
mov r8, r3
mov r9, r4
@@ -84390,7 +84390,7 @@ sub_80A42B0: @ 80A42B0
adds r0, r4, 0
movs r1, 0xE
adds r2, r5, 0
- bl Print
+ bl MenuPrint
lsls r0, r5, 6
ldr r1, _080A435C
adds r0, r1
@@ -84420,7 +84420,7 @@ _080A4332:
movs r0, 0xE
movs r2, 0x1D
movs r3, 0xD
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
b _080A4370
.align 2, 0
_080A4344: .4byte 0x02038540
@@ -84437,7 +84437,7 @@ _080A4360:
movs r0, 0xE
movs r2, 0x1D
movs r3, 0x11
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
_080A4370:
movs r0, 0x1
b _080A4376
@@ -84522,7 +84522,7 @@ _080A43A4:
ldr r0, _080A4448
movs r1, 0xE
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r7, 0x1
lsls r0, 24
lsrs r7, r0, 24
@@ -84612,7 +84612,7 @@ _080A4470:
ldr r0, _080A44F0
movs r1, 0xE
adds r2, r5, 0
- bl Print
+ bl MenuPrint
ldr r0, _080A44F8
ldrb r0, [r0]
cmp r0, 0
@@ -84850,7 +84850,7 @@ _080A46AE:
ldr r0, _080A46F8
movs r1, 0xE
ldr r2, [sp, 0x10]
- bl Print
+ bl MenuPrint
mov r0, r8
adds r0, 0x1
lsls r0, 24
@@ -84969,7 +84969,7 @@ _080A4730:
ldr r0, _080A47E4
movs r1, 0xE
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -85218,7 +85218,7 @@ _080A4988:
movs r0, 0
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
_080A49A4:
add sp, 0x4
pop {r4,r5}
@@ -85252,7 +85252,7 @@ sub_80A49AC: @ 80A49AC
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A49F0
movs r1, 0x4
movs r2, 0x68
@@ -85286,7 +85286,7 @@ _080A4A18:
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
_080A4A28:
lsls r1, r5, 16
asrs r1, 16
@@ -85366,7 +85366,7 @@ sub_80A4A98: @ 80A4A98
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
_080A4AB0:
mov r0, sp
adds r1, r5, 0
@@ -85544,7 +85544,7 @@ _080A4C00:
movs r1, 0x7
movs r2, 0xD
movs r3, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
str r4, [sp]
adds r0, r5, 0
movs r1, 0x1
@@ -85607,7 +85607,7 @@ _080A4C76:
lsls r2, 1
adds r2, 0x8
adds r0, r3, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -85659,7 +85659,7 @@ _080A4CF8:
movs r1, 0x5
movs r2, 0xD
movs r3, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x6
str r0, [sp]
adds r0, r5, 0
@@ -85702,7 +85702,7 @@ _080A4D1E:
lsrs r2, 24
adds r0, r5, 0
adds r1, r4, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -85753,7 +85753,7 @@ sub_80A4DA4: @ 80A4DA4
movs r1, 0x5
movs r2, 0xD
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A7590
add sp, 0x4
pop {r4}
@@ -85807,7 +85807,7 @@ sub_80A4DD8: @ 80A4DD8
lsls r3, 24
lsrs r3, 24
adds r0, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080A4E88
adds r4, 0x1
lsls r4, 24
@@ -87056,7 +87056,7 @@ _080A582C:
movs r0, 0x6
adds r1, r5, 0
movs r2, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0
adds r1, r5, 0
bl sub_80A7834
@@ -87558,12 +87558,12 @@ sub_80A5C48: @ 80A5C48
movs r1, 0x7
movs r2, 0xD
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A5C94
lsls r0, r4, 2
adds r0, r4
@@ -87591,7 +87591,7 @@ sub_80A5C9C: @ 80A5C9C
movs r1, 0xD
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
bl sub_8064E2C
@@ -87709,7 +87709,7 @@ sub_80A5D78: @ 80A5D78
movs r0, 0x7
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
add sp, 0x4
pop {r0}
bx r0
@@ -87766,7 +87766,7 @@ sub_80A5DF8: @ 80A5DF8
movs r1, 0x6
movs r2, 0xB
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x4
bl sub_80A7528
pop {r0}
@@ -88051,7 +88051,7 @@ sub_80A6024: @ 80A6024
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A6074
lsls r0, r4, 2
adds r0, r4
@@ -88538,7 +88538,7 @@ sub_80A6444: @ 80A6444
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A6484
lsls r0, r4, 2
adds r0, r4
@@ -88580,7 +88580,7 @@ sub_80A648C: @ 80A648C
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x1
strh r0, [r4, 0xA]
strh r0, [r4, 0xC]
@@ -88711,7 +88711,7 @@ sub_80A65AC: @ 80A65AC
movs r1, 0x6
movs r2, 0xD
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A6600
movs r1, 0x6
str r1, [sp]
@@ -88758,7 +88758,7 @@ sub_80A6618: @ 80A6618
movs r1, 0x6
movs r2, 0xD
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A664C
movs r1, 0x6
str r1, [sp]
@@ -88810,7 +88810,7 @@ Task_BuyHowManyDialogueHandleInput: @ 80A6670
movs r1, 0xB
movs r2, 0xC
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A66AC
ldrh r0, [r0]
ldr r2, _080A66B0
@@ -88837,7 +88837,7 @@ _080A66B4:
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080A6728
movs r1, 0x3
str r1, [sp]
@@ -88946,12 +88946,12 @@ BuyMenuPrintItemQuantityAndPrice: @ 80A6798
movs r1, 0x4
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080A67EC
lsls r0, r4, 2
adds r0, r4
@@ -89345,7 +89345,7 @@ sub_80A6A84: @ 80A6A84
movs r1, 0x6
movs r2, 0xB
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x7
bl sub_80A7528
adds r0, r5, 0
@@ -89747,7 +89747,7 @@ sub_80A6DF0: @ 80A6DF0
movs r0, 0x7
movs r2, 0xD
movs r3, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r2, 0xA
subs r2, r6
lsls r2, 24
@@ -89772,7 +89772,7 @@ sub_80A6DF0: @ 80A6DF0
ldr r0, [r0]
movs r1, 0x8
movs r2, 0xA
- bl Print
+ bl MenuPrint
b _080A6E80
.align 2, 0
_080A6E4C: .4byte 0x02038564
@@ -89788,7 +89788,7 @@ _080A6E58:
ldr r0, [r0]
movs r1, 0x8
movs r2, 0x8
- bl Print
+ bl MenuPrint
ldr r0, [r4]
ldrb r0, [r0, 0x1]
lsls r0, 3
@@ -89796,7 +89796,7 @@ _080A6E58:
ldr r0, [r0]
movs r1, 0x8
movs r2, 0xA
- bl Print
+ bl MenuPrint
_080A6E80:
movs r2, 0xA
subs r2, r6
@@ -90685,7 +90685,7 @@ sub_80A7590: @ 80A7590
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A756C
pop {r0}
bx r0
@@ -90849,7 +90849,7 @@ sub_80A76A0: @ 80A76A0
movs r1, 0x2
movs r2, 0x1D
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A7678
pop {r0}
bx r0
@@ -90994,7 +90994,7 @@ sub_80A7768: @ 80A7768
lsls r2, 24
lsrs r2, 24
movs r1, 0x7
- bl Print
+ bl MenuPrint
b _080A77FC
.align 2, 0
_080A77A8: .4byte 0x02038550
@@ -91036,7 +91036,7 @@ _080A77DC:
lsls r2, 1
adds r2, 0x8
adds r0, r3, 0
- bl Print
+ bl MenuPrint
_080A77FC:
ldr r1, _080A7824
ldrb r0, [r4, 0x1]
@@ -95839,17 +95839,17 @@ _080A9B24: .4byte gItems
unref_sub_80A9B28: @ 80A9B28
push {lr}
sub sp, 0x8
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0
movs r2, 0x11
movs r3, 0x12
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080A9B6C
movs r0, 0x1
movs r1, 0x1
movs r2, 0x7
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0x10
@@ -114446,14 +114446,14 @@ CreateShopMenu: @ 80B2D54
movs r1, 0
movs r2, 0xA
movs r3, 0x7
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080B2D94
ldr r0, _080B2D98
str r0, [sp]
movs r0, 0x1
movs r1, 0x1
movs r2, 0x3
- bl sub_80728E4
+ bl PrintMenuItemsReordered
b _080B2DBC
.align 2, 0
_080B2D90: .4byte 0x03000708
@@ -114466,14 +114466,14 @@ _080B2D9C:
movs r1, 0
movs r2, 0xA
movs r3, 0x5
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080B2DEC
ldr r0, _080B2DF0
str r0, [sp]
movs r0, 0x1
movs r1, 0x1
movs r2, 0x2
- bl sub_80728E4
+ bl PrintMenuItemsReordered
_080B2DBC:
ldr r0, _080B2DF4
ldrb r3, [r0, 0xA]
@@ -114701,7 +114701,7 @@ HandleShopMenuQuit: @ 80B2F64
movs r1, 0
movs r2, 0xB
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80BE3BC
bl script_env_2_disable
adds r0, r4, 0
@@ -114959,7 +114959,7 @@ BuyMenuDrawGraphics: @ 80B3108
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
bl BuyMenuDrawMapGraphics
ldr r0, _080B322C
strb r6, [r0, 0x9]
@@ -114968,7 +114968,7 @@ BuyMenuDrawGraphics: @ 80B3108
movs r1, 0
movs r2, 0x20
movs r3, 0x20
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B3230
movs r1, 0x92
lsls r1, 3
@@ -115836,7 +115836,7 @@ sub_80B37F8: @ 80B37F8
ldr r0, _080B3890
movs r1, 0x1
movs r2, 0xB
- bl Print
+ bl MenuPrint
ldr r0, _080B3894
movs r1, 0x2
str r1, [sp]
@@ -116083,11 +116083,11 @@ _080B3A2E:
movs r0, 0xE
adds r1, r4, 0
movs r2, 0x1C
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r0, _080B3A6C
movs r1, 0xE
adds r2, r4, 0
- bl Print
+ bl MenuPrint
_080B3A60:
pop {r4-r6}
pop {r0}
@@ -116299,7 +116299,7 @@ sub_80B3BF4: @ 80B3BF4
movs r1, 0x8
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B3C7C
movs r1, 0x4
str r1, [sp]
@@ -116442,7 +116442,7 @@ sub_80B3D38: @ 80B3D38
movs r0, 0x7
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _080B3D70
movs r1, 0x4
str r1, [sp]
@@ -116481,7 +116481,7 @@ sub_80B3D7C: @ 80B3D7C
movs r1, 0x8
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B3DC4
movs r1, 0x4
str r1, [sp]
@@ -116560,7 +116560,7 @@ _080B3DEE:
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B3EB8
movs r1, 0x2
str r1, [sp]
@@ -116652,7 +116652,7 @@ sub_80B3EFC: @ 80B3EFC
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
bl sub_80B37F8
ldr r6, _080B3F7C
@@ -117014,7 +117014,7 @@ _080B41CE:
movs r1, 0xC
movs r2, 0xD
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldrb r0, [r6, 0xC]
cmp r0, 0
bne _080B428C
@@ -117189,12 +117189,12 @@ sub_80B4378: @ 80B4378
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xA
movs r2, 0xD
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080B43E4
movs r1, 0x2
str r1, [sp]
@@ -119119,7 +119119,7 @@ _080B51B8:
mov r0, r9
adds r2, r7, 0
adds r3, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r6, r9
adds r6, 0x1
lsls r6, 24
@@ -119132,7 +119132,7 @@ _080B51B8:
adds r1, r5, 0
mov r2, r8
mov r3, r10
- bl PrintStringArray
+ bl PrintMenuItems
ldr r0, [sp, 0x10]
str r0, [sp]
mov r1, r9
@@ -119304,7 +119304,7 @@ _080B532C:
ldrb r1, [r3, 0xA]
ldrb r2, [r3, 0xC]
ldrb r3, [r3, 0xE]
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -119424,7 +119424,7 @@ _080B5408:
mov r0, r8
adds r2, r6, 0
adds r3, r7, 0
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
mov r1, r8
@@ -119475,7 +119475,7 @@ yes_no_box: @ 80B546C
adds r0, r5, 0
adds r1, r4, 0
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
adds r0, r6, 0
movs r1, 0x50
bl CreateTask
@@ -119586,7 +119586,7 @@ _080B5542:
adds r3, r1, 0x5
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -119782,7 +119782,7 @@ _080B56D2:
ldrb r1, [r3, 0xA]
ldrb r2, [r3, 0xC]
ldrb r3, [r3, 0xE]
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -119855,15 +119855,15 @@ _080B5762:
movs r0, 0
movs r1, 0
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080B579C
movs r1, 0x1
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, _080B57A0
movs r1, 0x1
movs r2, 0x7
- bl Print
+ bl MenuPrint
b _080B57C0
.align 2, 0
_080B5798: .4byte 0x00000804
@@ -119877,11 +119877,11 @@ _080B57A4:
movs r0, 0
movs r1, 0
movs r3, 0x7
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080B57DC
movs r1, 0x1
movs r2, 0x5
- bl Print
+ bl MenuPrint
_080B57C0:
adds r6, r4, 0
ldr r0, _080B57E0
@@ -119892,7 +119892,7 @@ _080B57C0:
ldr r0, _080B57E4
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
b _080B57F2
.align 2, 0
_080B57DC: .4byte gUnknown_08410782
@@ -119902,12 +119902,12 @@ _080B57E8:
ldr r0, _080B5830
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
_080B57F2:
ldr r0, _080B5834
movs r1, 0x1
movs r2, 0x3
- bl Print
+ bl MenuPrint
movs r4, 0
str r4, [sp]
adds r0, r5, 0x1
@@ -119940,11 +119940,11 @@ _080B5834: .4byte gUnknown_0841076D
thumb_func_start sub_80B5838
sub_80B5838: @ 80B5838
push {lr}
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldr r0, _080B584C
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -120005,7 +120005,7 @@ _080B58A0:
adds r3, 0xA
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl DestroyTask
_080B58BE:
@@ -120040,7 +120040,7 @@ sub_80B58C4: @ 80B58C4
lsrs r3, 24
adds r0, r6, 0
adds r1, r5, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0x50
bl CreateTask
@@ -120657,7 +120657,7 @@ sub_80B5DC8: @ 80B5DC8
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
pop {r4}
pop {r0}
bx r0
@@ -120971,7 +120971,7 @@ _080B6048: .4byte 0x02000000
thumb_func_start sub_80B604C
sub_80B604C: @ 80B604C
push {lr}
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _080B6060
@@ -123847,8 +123847,8 @@ sub_80B74FC: @ 80B74FC
adds r0, r4, 0
bl StringExpandPlaceholders
ldr r0, _080B7538
- bl sub_8071E2C
- bl sub_8071FFC
+ bl BasicInitMenuWindowConfig
+ bl MenuDisplayMessageBox
adds r0, r4, 0
bl sub_8072044
pop {r4}
@@ -124208,7 +124208,7 @@ sub_80B7794: @ 80B7794
adds r0, r1
adds r0, r6
ldr r0, [r0]
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r5, _080B77F4
ldrb r0, [r4, 0xE]
lsls r0, 3
@@ -124223,7 +124223,7 @@ sub_80B7794: @ 80B7794
adds r6, 0x8
adds r1, r6
ldr r0, [r1]
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldrb r0, [r4, 0xE]
lsls r0, 3
adds r5, 0x4
@@ -124254,7 +124254,7 @@ sub_80B77F8: @ 80B77F8
adds r2, 0x8
adds r1, r2
ldr r0, [r1]
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r1, _080B7834
ldrb r0, [r4, 0xE]
lsls r0, 3
@@ -124321,7 +124321,7 @@ _080B786C:
lsls r2, r5, 24
lsrs r2, 24
movs r1, 0x3
- bl Print
+ bl MenuPrint
adds r4, 0x1
lsls r4, 16
lsls r0, r5, 16
@@ -124344,7 +124344,7 @@ _080B78A4: .4byte gUnknown_083CE3A8
sub_80B78A8: @ 80B78A8
push {r4,lr}
ldr r0, _080B78E4
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r1, _080B78E8
ldr r4, _080B78EC
ldrb r0, [r4, 0x1]
@@ -124363,7 +124363,7 @@ sub_80B78A8: @ 80B78A8
ldr r0, [r0, 0x8]
movs r1, 0x9
movs r2, 0x2
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -124427,7 +124427,7 @@ _080B7948:
mov r0, sp
movs r1, 0x14
movs r2, 0x4
- bl Print
+ bl MenuPrint
_080B7952:
add sp, 0x4
pop {r0}
@@ -124457,12 +124457,12 @@ sub_80B7960: @ 80B7960
adds r1, r4, 0
bl StringCopy
ldr r0, _080B79A4
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080B799C
subs r4, 0x11
ldrb r1, [r4, 0x2]
movs r2, 0x4
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -124639,7 +124639,7 @@ sub_80B7A94: @ 80B7A94
mov r0, sp
adds r1, r6, 0
adds r2, r7, 0
- bl Print
+ bl MenuPrint
b _080B7AE4
_080B7ACE:
adds r1, r6, 0x1
@@ -124681,7 +124681,7 @@ sub_80B7AEC: @ 80B7AEC
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl PrintCoinsString
+ bl sub_8072B4C
movs r0, 0xFC
strb r0, [r6]
movs r0, 0x14
@@ -124833,7 +124833,7 @@ sub_80B7C14: @ 80B7C14
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, r8
adds r1, r6, 0
adds r2, r5, 0
@@ -124899,7 +124899,7 @@ RemoveMoneyLabelObject: @ 80B7C98
lsrs r3, 24
adds r0, r4, 0
adds r1, r5, 0
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r4,r5}
pop {r0}
bx r0
@@ -128208,7 +128208,7 @@ _080B9570:
ldr r0, _080B95A8
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
strh r5, [r4, 0x10]
b _080B95E6
.align 2, 0
@@ -128237,7 +128237,7 @@ _080B95C0:
cmp r0, 0
bne _080B95E6
bl sub_8055588
- bl sub_8071EF4
+ bl MenuZeroFillScreen
adds r0, r5, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -128306,11 +128306,11 @@ _080B963C:
_080B964C: .4byte 0x0000012d
_080B9650:
bl sub_80B9A78
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldr r0, _080B9674
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0xE1
lsls r0, 3
strh r0, [r5, 0x18]
@@ -129741,7 +129741,7 @@ unref_sub_80BA0EC: @ 80BA0EC
ldr r0, _080BA220
bl SetUpWindowConfig
ldr r0, _080BA224
- bl sub_8071C4C
+ bl InitMenuWindowConfig
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -129883,45 +129883,45 @@ sub_80BA258: @ 80BA258
movs r1, 0
movs r2, 0x1B
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x2
movs r1, 0x5
movs r2, 0x1B
movs r3, 0xA
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x2
movs r1, 0xC
movs r2, 0x1B
movs r3, 0x11
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x4
movs r2, 0x1
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0xE
movs r2, 0x1
- bl Print
+ bl MenuPrint
adds r0, r7, 0
movs r1, 0x4
movs r2, 0x6
- bl Print
+ bl MenuPrint
adds r0, r4, 0
movs r1, 0xE
movs r2, 0x6
- bl Print
+ bl MenuPrint
mov r0, r8
movs r1, 0x4
movs r2, 0xD
- bl Print
+ bl MenuPrint
adds r0, r4, 0
movs r1, 0xE
movs r2, 0xD
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0xE
movs r2, 0x12
- bl Print
+ bl MenuPrint
ldr r1, _080BA370
mov r2, r9
lsls r0, r2, 2
@@ -130491,7 +130491,7 @@ _080BA76C:
lsls r2, r7, 24
lsrs r2, 24
mov r0, sp
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r4-r7}
pop {r0}
@@ -130546,7 +130546,7 @@ _080BA7EC:
lsrs r1, r2, 24
lsrs r2, r5, 24
mov r0, sp
- bl Print
+ bl MenuPrint
add sp, 0xC
pop {r4-r6}
pop {r0}
@@ -130654,63 +130654,63 @@ sub_80BA800: @ 80BA800
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x13
movs r2, 0x4
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xB4]
movs r1, 0x13
movs r2, 0x2
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xB8]
movs r1, 0x2
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xBC]
movs r1, 0x2
movs r2, 0x3
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xC0]
movs r1, 0x2
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xC4]
movs r1, 0x2
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldr r0, [sp, 0xC8]
movs r1, 0x2
movs r2, 0x9
- bl Print
+ bl MenuPrint
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xB
- bl Print
+ bl MenuPrint
adds r0, r7, 0
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
mov r0, r10
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
mov r0, r9
movs r1, 0x2
movs r2, 0x11
- bl Print
+ bl MenuPrint
mov r0, r8
movs r1, 0x13
movs r2, 0x10
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0x13
movs r2, 0xE
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0x13
movs r2, 0xC
- bl Print
+ bl MenuPrint
ldr r1, _080BAA20
movs r0, 0xF0
strh r0, [r1]
@@ -130822,7 +130822,7 @@ sub_80BAA48: @ 80BAA48
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080BAAA0
lsls r0, r4, 2
adds r0, r4
@@ -131289,7 +131289,7 @@ sub_80BAE10: @ 80BAE10
adds r4, r6
ldrb r2, [r4]
mov r0, r8
- bl Print
+ bl MenuPrint
lsls r5, 1
adds r0, r5, r6
ldrb r1, [r0]
@@ -131297,7 +131297,7 @@ sub_80BAE10: @ 80BAE10
adds r5, r6
ldrb r2, [r5]
mov r0, sp
- bl Print
+ bl MenuPrint
add sp, 0x8
pop {r3}
mov r8, r3
@@ -131441,7 +131441,7 @@ _080BAF62:
ldr r4, [sp, 0x28]
lsrs r2, r4, 24
mov r0, r9
- bl Print
+ bl MenuPrint
add sp, 0x2C
pop {r3-r5}
mov r8, r3
@@ -131485,19 +131485,19 @@ sub_80BAF84: @ 80BAF84
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, sp
movs r1, 0x3
movs r2, 0x2
- bl Print
+ bl MenuPrint
adds r0, r6, 0
movs r1, 0x3
movs r2, 0x4
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0x3
movs r2, 0x8
- bl Print
+ bl MenuPrint
ldr r1, _080BB028
movs r0, 0xF0
strh r0, [r1]
@@ -131614,7 +131614,7 @@ _080BB0A2:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080BB0FC
lsls r0, r5, 2
adds r0, r5
@@ -131783,7 +131783,7 @@ _080BB228:
_080BB22A:
movs r1, 0x7
movs r2, 0x4
- bl Print
+ bl MenuPrint
b _080BB240
_080BB234:
adds r0, r1, 0
@@ -131814,7 +131814,7 @@ sub_80BB25C: @ 80BB25C
ldr r0, _080BB374
bl SetUpWindowConfig
ldr r0, _080BB378
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r1, _080BB37C
movs r0, 0x1
strh r0, [r1]
@@ -131899,7 +131899,7 @@ _080BB306:
movs r1, 0x10
movs r2, 0x5
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
bl sub_80BB494
movs r0, 0x1
negs r0, r0
@@ -132044,7 +132044,7 @@ _080BB42E:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080BB48C
lsls r0, r5, 2
adds r0, r5
@@ -134405,7 +134405,7 @@ _080BC65E:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl sub_80BC7D8
ldr r1, _080BC68C
@@ -134506,11 +134506,11 @@ _080BC70E:
movs r0, 0x12
adds r1, r4, 0
movs r2, 0x1C
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
adds r0, r7, 0
movs r1, 0x12
adds r2, r4, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -134535,11 +134535,11 @@ _080BC75A:
movs r0, 0x12
adds r1, r4, 0
movs r2, 0x1C
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r0, _080BC7A4
movs r1, 0x12
adds r2, r4, 0
- bl Print
+ bl MenuPrint
movs r0, 0x1
bl SetBgTilemapBuffer
cmp r6, 0x7
@@ -134552,7 +134552,7 @@ _080BC75A:
movs r0, 0x12
movs r2, 0x1C
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
b _080BC7B2
.align 2, 0
_080BC7A0: .4byte 0x020231cc
@@ -134600,7 +134600,7 @@ sub_80BC7D8: @ 80BC7D8
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrb r3, [r4, 0x6]
adds r3, 0x1
lsls r3, 24
@@ -134723,7 +134723,7 @@ _080BC8C2:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl sub_80BCC54
b _080BC940
@@ -134753,7 +134753,7 @@ _080BC91C:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
bl sub_80BCC54
_080BC940:
@@ -134812,12 +134812,12 @@ sub_80BC980: @ 80BC980
movs r1, 0
movs r2, 0xC
movs r3, 0x5
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080BC9D8
movs r0, 0x2
movs r1, 0x1
movs r2, 0x2
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0xA
@@ -134938,7 +134938,7 @@ sub_80BCA84: @ 80BCA84
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080BCADC
ldrb r1, [r4, 0x8]
bl sub_80BC190
@@ -134971,7 +134971,7 @@ sub_80BCAEC: @ 80BCAEC
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _080BCB0C
adds r0, r4, 0
bl sub_80F914C
@@ -134997,7 +134997,7 @@ sub_80BCB10: @ 80BCB10
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _080BCB84
movs r0, 0x8
ldrsh r1, [r4, r0]
@@ -135057,7 +135057,7 @@ sub_80BCB90: @ 80BCB90
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080BCBB8
ldr r2, _080BCBBC
adds r0, r4, 0
@@ -135081,7 +135081,7 @@ sub_80BCBC0: @ 80BCBC0
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80BC7D8
ldr r1, _080BCBF0
@@ -135126,7 +135126,7 @@ sub_80BCBF8: @ 80BCBF8
movs r1, 0
movs r2, 0xC
movs r3, 0x5
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
bl sub_80F98DC
movs r0, 0x1
@@ -151802,7 +151802,7 @@ sub_80C5050: @ 80C5050
movs r1, 0x3
movs r2, 0x13
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r2, _080C5140
ldr r0, _080C5144
ldrh r1, [r0]
@@ -152001,7 +152001,7 @@ _080C5204:
adds r3, 0xA
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl DestroyTask
_080C5222:
@@ -160095,7 +160095,7 @@ sub_80C9098: @ 80C9098
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _080C90D0
adds r0, r6, 0
adds r1, r5, 0
@@ -160675,7 +160675,7 @@ sub_80C9520: @ 80C9520
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8064E2C
bl script_env_2_disable
adds r0, r4, 0
@@ -161530,7 +161530,7 @@ ItemUseOutOfBattle_CoinCase: @ 80C9B38
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _080C9B9C
adds r0, r5, 0
adds r1, r4, 0
@@ -161615,7 +161615,7 @@ unref_sub_80C9BF8: @ 80C9BF8
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _080C9C40
ldr r0, _080C9C44
ldrh r0, [r0]
@@ -161939,7 +161939,7 @@ ItemUseOutOfBattle_TMHM: @ 80C9E90
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080C9EBC
ldrh r1, [r0]
movs r0, 0xA9
@@ -162055,7 +162055,7 @@ sub_80C9F80: @ 80C9F80
movs r0, 0x7
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _080C9FB8
movs r1, 0x4
str r1, [sp]
@@ -162412,7 +162412,7 @@ _080CA26C:
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080CA28C
ldr r2, _080CA290
adds r0, r4, 0
@@ -162507,7 +162507,7 @@ ItemUseInBattle_StatIncrease: @ 80CA310
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x64
muls r0, r4
ldr r1, _080CA364
@@ -162662,7 +162662,7 @@ unref_sub_80CA448: @ 80CA448
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _080CA494
ldrh r1, [r4]
movs r0, 0
@@ -162718,7 +162718,7 @@ ItemUseInBattle_Escape: @ 80CA4C8
movs r1, 0xD
movs r2, 0xD
movs r3, 0x14
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080CA4F8
ldrh r1, [r0]
movs r0, 0x8
@@ -220554,10 +220554,10 @@ _080E6380:
_080E6388: .4byte gWindowConfig_81E6DA8
_080E638C:
ldr r0, _080E63A0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r0, _080E63A4
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
b _080E6402
.align 2, 0
_080E63A0: .4byte gWindowConfig_81E6D54
@@ -221646,12 +221646,12 @@ _080E6BFA:
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0x1
bl MoveMenuCursor
b _080E6C3E
_080E6C12:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -221737,7 +221737,7 @@ _080E6CA6:
movs r0, 0x17
movs r1, 0x8
movs r2, 0
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0x1
bl MoveMenuCursor
ldrb r0, [r4, 0x8]
@@ -221767,7 +221767,7 @@ _080E6CE8:
.align 2, 0
_080E6CF0: .4byte 0x02001000
_080E6CF4:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -221781,7 +221781,7 @@ _080E6D06:
movs r0, 0x17
movs r1, 0x8
movs r2, 0
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0x1
bl MoveMenuCursor
_080E6D1C:
@@ -221790,7 +221790,7 @@ _080E6D1C:
strh r0, [r4, 0x24]
b _080E6D72
_080E6D24:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -221930,12 +221930,12 @@ _080E6E20:
movs r0, 0x17
movs r1, 0x8
movs r2, 0
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0
bl MoveMenuCursor
b _080E6F3C
_080E6E3C:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r6, r0, 24
cmp r6, 0
@@ -224530,7 +224530,7 @@ sub_80E81FC: @ 80E81FC
movs r1, 0
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_80E81FC
@@ -226572,14 +226572,14 @@ sub_80E91D4: @ 80E91D4
lsrs r0, 24
adds r4, r0, 0
ldr r0, _080E91FC
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
cmp r4, 0xA
bne _080E9200
movs r0, 0x3
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xA
bl sub_80E9198
b _080E935C
@@ -226595,7 +226595,7 @@ _080E9200:
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
_080E9218:
adds r0, r4, 0
bl sub_80E9198
@@ -226825,7 +226825,7 @@ _080E93F8:
movs r4, 0
_080E93FA:
ldr r0, _080E943C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080E9440
ldr r2, [r0]
ldr r0, _080E9444
@@ -226851,7 +226851,7 @@ _080E93FA:
adds r0, r5, 0
movs r1, 0
movs r2, 0
- bl Print
+ bl MenuPrint
b _080E9476
.align 2, 0
_080E943C: .4byte gWindowConfig_81E6D8C
@@ -226872,14 +226872,14 @@ _080E9450:
adds r0, r5, 0
movs r1, 0
movs r2, 0
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0x1C
movs r2, 0
- bl Print
+ bl MenuPrint
_080E9476:
ldr r0, _080E9488
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
pop {r4,r5}
pop {r0}
bx r0
@@ -227028,7 +227028,7 @@ _080E95A0: .4byte gUnknown_08E94AD0
sub_80E95A4: @ 80E95A4
push {lr}
ldr r0, _080E95C0
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080E95C4
ldr r0, [r0]
ldrb r0, [r0, 0x9]
@@ -227080,7 +227080,7 @@ _080E960A:
bl sub_80E9620
_080E9612:
ldr r0, _080E961C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
pop {r0}
bx r0
.align 2, 0
@@ -227160,7 +227160,7 @@ _080E969C:
lsls r2, r7, 24
lsrs r2, 24
adds r0, r4, 0
- bl Print
+ bl MenuPrint
mov r1, r9
lsls r0, r1, 1
add r0, r8
@@ -227202,7 +227202,7 @@ _080E96E4:
lsls r2, r7, 24
lsrs r2, 24
ldr r0, _080E9740
- bl Print
+ bl MenuPrint
_080E970A:
ldr r1, [sp, 0x1C]
lsls r0, r1, 16
@@ -227237,7 +227237,7 @@ _080E9740: .4byte gUnknown_083DBEA8
sub_80E9744: @ 80E9744
push {lr}
ldr r0, _080E9760
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080E9764
ldr r0, [r0]
ldrb r0, [r0, 0x9]
@@ -227289,7 +227289,7 @@ _080E97AA:
bl sub_80E97C0
_080E97B2:
ldr r0, _080E97BC
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
pop {r0}
bx r0
.align 2, 0
@@ -227402,7 +227402,7 @@ _080E985E:
lsrs r1, r3, 24
mov r3, r9
lsrs r2, r3, 24
- bl Print
+ bl MenuPrint
mov r1, r10
lsls r0, r1, 16
lsrs r5, r0, 16
@@ -227434,7 +227434,7 @@ _080E98C0: .4byte 0x0000ffff
sub_80E98C4: @ 80E98C4
push {lr}
ldr r0, _080E98E0
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080E98E4
ldr r0, [r0]
ldrb r0, [r0, 0x9]
@@ -227484,9 +227484,9 @@ _080E991E:
lsrs r3, 24
movs r0, 0x2
movs r2, 0x1B
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r0, _080E993C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
_080E9936:
pop {r0}
bx r0
@@ -227507,7 +227507,7 @@ sub_80E9940: @ 80E9940
adds r3, 0x1
movs r0, 0x2
movs r2, 0x1F
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
adds r0, r6, 0
adds r1, r5, 0
bl sub_80E9A7C
@@ -227525,7 +227525,7 @@ sub_80E9940: @ 80E9940
sub_80E9974: @ 80E9974
push {r4-r6,lr}
ldr r0, _080E99C4
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080E99C8
ldr r2, [r0]
adds r0, r2, 0
@@ -227652,7 +227652,7 @@ sub_80E9A60: @ 80E9A60
lsrs r1, 24
lsrs r3, 16
adds r2, r3, 0
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
thumb_func_end sub_80E9A60
@@ -227710,7 +227710,7 @@ _080E9AD0: .4byte gUnknown_083DB694
sub_80E9AD4: @ 80E9AD4
push {r4,lr}
ldr r0, _080E9AF4
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
movs r4, 0
_080E9ADE:
adds r0, r4, 0
@@ -227791,7 +227791,7 @@ _080E9B58:
cmp r0, 0x7
bne _080E9B94
ldr r0, _080E9B90
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
b _080E9B9A
.align 2, 0
_080E9B7C: .4byte gUnknown_083DB694
@@ -227802,7 +227802,7 @@ _080E9B8C: .4byte 0x00009a2a
_080E9B90: .4byte gWindowConfig_81E6D70
_080E9B94:
ldr r0, _080E9BE0
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
_080E9B9A:
ldr r2, _080E9BE4
ldr r4, [r2]
@@ -227844,7 +227844,7 @@ _080E9BEC: .4byte 0x00009e14
_080E9BF0: .4byte 0x000099a6
_080E9BF4:
ldr r0, _080E9C64
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
movs r6, 0
ldr r1, _080E9C68
adds r0, r5, r1
@@ -227917,7 +227917,7 @@ sub_80E9C74: @ 80E9C74
adds r3, 0x1
movs r0, 0
movs r2, 0x1D
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
pop {r0}
bx r0
thumb_func_end sub_80E9C74
@@ -228050,7 +228050,7 @@ _080E9D78: .4byte 0x0000ffff
sub_80E9D7C: @ 80E9D7C
push {r4-r7,lr}
ldr r0, _080E9DAC
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080E9DB0
ldr r2, [r0]
movs r0, 0xE0
@@ -238752,12 +238752,12 @@ _080EF2EA:
_080EF2F4: .4byte gWindowConfig_81E7224
_080EF2F8:
ldr r0, _080EF300
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _080EF40C
.align 2, 0
_080EF300: .4byte gWindowConfig_81E7224
_080EF304:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
beq _080EF30E
b _080EF40C
@@ -238937,7 +238937,7 @@ _080EF464:
adds r0, r4, 0
movs r1, 0x3
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -239506,17 +239506,17 @@ _080EF8D2:
_080EF8DC: .4byte gWindowConfig_81E7224
_080EF8E0:
ldr r0, _080EF8E8
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _080EF9DC
.align 2, 0
_080EF8E8: .4byte gWindowConfig_81E7224
_080EF8EC:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _080EF9DC
b _080EF9EA
_080EF8F6:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080EF9DC
_080EF8FC:
ldr r0, _080EF914
@@ -239568,7 +239568,7 @@ _080EF960:
movs r1, 0x3
movs r2, 0x1D
movs r3, 0x11
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
bl sub_80EF9F8
b _080EF9DC
_080EF972:
@@ -239768,12 +239768,12 @@ _080EFAC0:
adds r1, r4, 0
movs r2, 0xF
movs r3, 0xF
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r0, 0x1A
adds r1, r4, 0
movs r2, 0x1C
movs r3, 0xF
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r0, _080EFB48
ldr r3, [r6]
movs r1, 0
@@ -239822,7 +239822,7 @@ _080EFB6A:
movs r0, 0xE
movs r2, 0x1C
movs r3, 0xF
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
_080EFB82:
ldr r0, _080EFB98
ldr r0, [r0]
@@ -240396,19 +240396,19 @@ _080EFFE8:
_080EFFF0: .4byte gWindowConfig_81E7080
_080EFFF4:
ldr r0, _080EFFFC
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _080F0154
.align 2, 0
_080EFFFC: .4byte gWindowConfig_81E7080
_080F0000:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
beq _080F000A
b _080F0154
_080F000A:
b _080F0162
_080F000C:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080F0154
_080F0012:
bl sub_80F1614
@@ -240642,7 +240642,7 @@ sub_80F01E0: @ 80F01E0
adds r0, r5, r0
movs r1, 0xD
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r1, _080F0250
adds r0, r5, r1
ldrb r0, [r0]
@@ -240656,7 +240656,7 @@ sub_80F01E0: @ 80F01E0
adds r0, r5, r0
movs r1, 0xD
movs r2, 0x3
- bl Print
+ bl MenuPrint
ldr r0, _080F0258
adds r4, r5, r0
ldr r1, _080F025C
@@ -240675,7 +240675,7 @@ sub_80F01E0: @ 80F01E0
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x6
- bl Print
+ bl MenuPrint
_080F0242:
pop {r4,r5}
pop {r0}
@@ -240797,19 +240797,19 @@ _080F0344:
_080F034C: .4byte gWindowConfig_81E70D4
_080F0350:
ldr r0, _080F0358
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _080F0618
.align 2, 0
_080F0358: .4byte gWindowConfig_81E70D4
_080F035C:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
beq _080F0366
b _080F0618
_080F0366:
b _080F0626
_080F0368:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080F0618
_080F036E:
ldr r0, _080F0378
@@ -241354,14 +241354,14 @@ _080F07E0:
bl sub_80F445C
_080F07F4:
ldr r0, _080F0814
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080F0818
ldr r0, [r0]
ldr r1, _080F0810
adds r0, r1
movs r1, 0x1
movs r2, 0x6
- bl Print
+ bl MenuPrint
_080F080A:
pop {r0}
bx r0
@@ -241377,7 +241377,7 @@ sub_80F081C: @ 80F081C
lsls r0, 24
lsrs r5, r0, 24
ldr r0, _080F0838
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
cmp r5, 0x4
bhi _080F08C6
lsls r0, r5, 2
@@ -241399,7 +241399,7 @@ _080F0854:
ldr r0, _080F08CC
movs r1, 0xA
movs r2, 0x9
- bl PrintCoinsString
+ bl sub_8072B4C
cmp r5, 0
bne _080F08C6
_080F0862:
@@ -241419,14 +241419,14 @@ _080F0862:
adds r0, r4, 0
movs r1, 0xA
movs r2, 0xB
- bl PrintCoinsString
+ bl sub_8072B4C
cmp r5, 0
bne _080F08C6
_080F088C:
ldr r0, _080F08DC
movs r1, 0xA
movs r2, 0xD
- bl PrintCoinsString
+ bl sub_8072B4C
cmp r5, 0
bne _080F08C6
_080F089A:
@@ -241449,7 +241449,7 @@ _080F08AA:
adds r0, r4, 0
movs r1, 0xA
movs r2, 0xF
- bl PrintCoinsString
+ bl sub_8072B4C
_080F08C6:
pop {r4,r5}
pop {r0}
@@ -241467,12 +241467,12 @@ _080F08E0: .4byte 0x0001869f
sub_80F08E4: @ 80F08E4
push {lr}
ldr r0, _080F08FC
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
movs r0, 0
movs r1, 0x9
movs r2, 0xB
movs r3, 0x10
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
.align 2, 0
@@ -241500,7 +241500,7 @@ sub_80F0900: @ 80F0900
movs r1, 0x1
movs r2, 0x1F
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
_080F092A:
ldrh r0, [r5]
lsrs r2, r4, 16
@@ -241652,12 +241652,12 @@ _080F0A40:
adds r1, r3, 0
bl sub_80F4428
ldr r0, _080F0A70
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
lsls r2, r5, 24
lsrs r2, 24
adds r0, r4, 0
movs r1, 0xD
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -241686,7 +241686,7 @@ sub_80F0A74: @ 80F0A74
movs r0, 0x1F
ands r7, r0
ldr r0, _080F0AE4
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
lsls r2, r7, 3
adds r0, r4, 0
movs r1, 0x61
@@ -241813,12 +241813,12 @@ _080F0B60:
cmp r2, r0
beq _080F0BAA
ldr r0, _080F0BC8
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
adds r1, r4, 0
adds r3, r1, 0x1
movs r0, 0xC
movs r2, 0x1F
- bl Reset
+ bl MenuZeroFillWindowRect
_080F0BAA:
ldrh r0, [r6]
cmp r0, 0
@@ -241836,7 +241836,7 @@ _080F0BC4: .4byte 0x0000876c
_080F0BC8: .4byte gWindowConfig_81E70D4
_080F0BCC:
ldr r0, _080F0C10
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r1, _080F0C14
adds r0, r5, r1
ldrh r0, [r0]
@@ -241850,7 +241850,7 @@ _080F0BE2:
movs r0, 0xC
adds r1, r4, 0
movs r2, 0x1F
- bl Reset
+ bl MenuZeroFillWindowRect
adds r4, 0x2
movs r0, 0x1F
ands r4, r0
@@ -241929,7 +241929,7 @@ _080F0C64:
movs r0, 0
strh r0, [r1]
ldr r0, _080F0CC4
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080F0CC8
adds r1, r4, r0
ldrh r0, [r5]
@@ -242067,7 +242067,7 @@ _080F0D8C:
movs r0, 0
strh r0, [r1]
ldr r0, _080F0DBC
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _080F0DC0
adds r1, r4, r0
ldrh r3, [r5]
@@ -242266,12 +242266,12 @@ _080F0F10:
movs r0, 0x1F
ands r4, r0
ldr r0, _080F0F60
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
adds r3, r4, 0x1
movs r0, 0xC
adds r1, r4, 0
movs r2, 0x1F
- bl Reset
+ bl MenuZeroFillWindowRect
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
@@ -242385,7 +242385,7 @@ sub_80F0FFC: @ 80F0FFC
movs r2, 0
bl sub_80FBFB4
ldr r0, _080F1054
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
adds r0, r5, 0
bl sub_80F19DC
ldr r0, _080F1058
@@ -242398,7 +242398,7 @@ sub_80F0FFC: @ 80F0FFC
adds r0, r4, 0
movs r1, 0
movs r2, 0x5
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -242488,19 +242488,19 @@ _080F1104:
_080F110C: .4byte gWindowConfig_81E70B8
_080F1110:
ldr r0, _080F1118
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _080F1218
.align 2, 0
_080F1118: .4byte gWindowConfig_81E70B8
_080F111C:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
beq _080F1126
b _080F1218
_080F1126:
b _080F1226
_080F1128:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080F1218
_080F112E:
bl sub_80F1614
@@ -242885,7 +242885,7 @@ sub_80F1438: @ 80F1438
adds r0, r4, r1
movs r1, 0xD
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r0, _080F1478
adds r5, r4, r0
ldr r1, _080F147C
@@ -242899,7 +242899,7 @@ sub_80F1438: @ 80F1438
adds r0, r5, 0
movs r1, 0x1
movs r2, 0x5
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -242917,7 +242917,7 @@ sub_80F1480: @ 80F1480
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x10
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_80F1480
@@ -243038,11 +243038,11 @@ _080F158A:
adds r0, r6, 0
movs r1, 0xC
movs r2, 0xD
- bl Print
+ bl MenuPrint
adds r0, r7, 0
movs r1, 0xC
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4-r7}
pop {r0}
bx r0
@@ -243057,7 +243057,7 @@ sub_80F15A8: @ 80F15A8
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x10
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080F1600
ldr r4, [r0]
ldr r0, _080F1604
@@ -243088,7 +243088,7 @@ sub_80F15A8: @ 80F15A8
adds r0, r5, 0
movs r1, 0xC
movs r2, 0xD
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -243626,7 +243626,7 @@ _080F1A46:
movs r0, 0xE
movs r2, 0x1C
movs r3, 0xF
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r0, 0
strb r0, [r5]
_080F1A60:
@@ -256323,7 +256323,7 @@ sub_80F7C54: @ 80F7C54
ldr r0, _080F7C6C
ldrb r0, [r0]
bl sub_80F7F80
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
bl sub_80655F0
pop {r0}
bx r0
@@ -257799,7 +257799,7 @@ sub_80F8758: @ 80F8758
movs r0, 0
movs r1, 0
movs r2, 0x19
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r4, 0
ldr r1, _080F87BC
ldrb r0, [r1, 0x4]
@@ -257812,7 +257812,7 @@ _080F8784:
bl sub_80F8478
lsrs r2, r5, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
movs r1, 0x80
lsls r1, 18
adds r5, r1
@@ -257831,7 +257831,7 @@ _080F87A4:
adds r2, r1
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
pop {r4-r6}
pop {r0}
bx r0
@@ -257912,7 +257912,7 @@ _080F8848:
movs r1, 0
movs r2, 0x19
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -258266,19 +258266,19 @@ _080F8B10:
_080F8B18: .4byte gWindowConfig_81E6DFC
_080F8B1C:
ldr r0, _080F8B24
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _080F8D30
.align 2, 0
_080F8B24: .4byte gWindowConfig_81E6DFC
_080F8B28:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
beq _080F8B32
b _080F8D30
_080F8B32:
b _080F8D3C
_080F8B34:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
b _080F8D30
_080F8B3A:
mov r0, sp
@@ -258734,7 +258734,7 @@ _080F8E9E:
lsls r2, 24
lsrs r2, 24
adds r0, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x2
lsls r0, 24
lsrs r6, r0, 24
@@ -258753,7 +258753,7 @@ _080F8EF6:
ldrb r1, [r1]
ldr r2, [r0, 0x34]
ldrb r2, [r2, 0x1]
- bl Print
+ bl MenuPrint
pop {r3}
mov r8, r3
pop {r4-r7}
@@ -258934,7 +258934,7 @@ sav2_get_text_speed: @ 80F9058
adds r5, r0, 0
lsls r1, 16
lsrs r4, r1, 16
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
cmp r4, 0
beq _080F907C
ldr r0, _080F908C
@@ -258961,7 +258961,7 @@ sub_80F9090: @ 80F9090
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -259013,7 +259013,7 @@ Task_CallYesOrNoCallback: @ 80F90F4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -259123,7 +259123,7 @@ _080F91D4:
ldr r0, _080F91E8
adds r1, r7, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -259173,7 +259173,7 @@ _080F9238:
adds r0, r6, 0
adds r1, r7, 0
adds r2, r5, 0
- bl Print
+ bl MenuPrint
_080F9242:
pop {r3}
mov r8, r3
@@ -265343,8 +265343,8 @@ _080FC104:
_080FC10C: .4byte gWindowConfig_81E7224
_080FC110:
ldr r0, _080FC11C
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
b _080FC1E6
.align 2, 0
_080FC11C: .4byte gWindowConfig_81E7224
@@ -265519,12 +265519,12 @@ _080FC268:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
adds r0, 0x8
movs r1, 0x11
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldrb r0, [r5, 0x1F]
ldr r1, [r4]
lsls r0, 2
@@ -265532,7 +265532,7 @@ _080FC268:
ldr r0, [r0]
movs r1, 0x1D
movs r2, 0x11
- bl PrintCoinsString
+ bl sub_8072B4C
b _080FC310
.align 2, 0
_080FC2AC: .4byte 0x02000000
@@ -265551,16 +265551,16 @@ _080FC2BE:
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080FC2E8
movs r1, 0x11
movs r2, 0x11
- bl Print
+ bl MenuPrint
movs r0, 0x10
movs r1, 0xE
movs r2, 0x1D
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
b _080FC310
.align 2, 0
_080FC2E8: .4byte 0x02000008
@@ -265569,17 +265569,17 @@ _080FC2EC:
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r1, _080FC318
adds r0, r4, r1
movs r1, 0x11
movs r2, 0x11
- bl Print
+ bl MenuPrint
movs r0, 0x10
movs r1, 0xE
movs r2, 0x1D
movs r3, 0xF
- bl Reset
+ bl MenuZeroFillWindowRect
_080FC310:
pop {r4,r5}
pop {r0}
@@ -269652,12 +269652,12 @@ sub_80FE1DC: @ 80FE1DC
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _080FE218
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintStringArray
+ bl PrintMenuItems
ldr r0, _080FE21C
ldrb r0, [r0]
str r0, [sp]
@@ -269870,7 +269870,7 @@ sub_80FE394: @ 80FE394
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r1, _080FE3BC
ldr r0, _080FE3C0
ldrb r0, [r0]
@@ -269879,7 +269879,7 @@ sub_80FE394: @ 80FE394
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -269897,12 +269897,12 @@ gpu_pal_decompress_alloc_tag_and_upload: @ 80FE3C4
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x2
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r0, 0x6
bl FreeSpritePaletteByTag
ldr r0, _080FE404
@@ -270045,7 +270045,7 @@ sub_80FE470: @ 80FE470
ldr r0, _080FE51C
mov r1, r8
mov r2, r9
- bl Print
+ bl MenuPrint
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -270069,7 +270069,7 @@ sub_80FE528: @ 80FE528
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r5, 0
ldr r1, _080FE574
lsls r0, r4, 2
@@ -270119,7 +270119,7 @@ _080FE58E:
ldr r0, _080FE5A8
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r4,r5}
pop {r0}
bx r0
@@ -270139,7 +270139,7 @@ sub_80FE5AC: @ 80FE5AC
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80FE528
ldr r0, _080FE5F8
@@ -270269,7 +270269,7 @@ _080FE6DC:
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080FE6FC
ldr r2, _080FE700
adds r0, r5, 0
@@ -270335,7 +270335,7 @@ sub_80FE758: @ 80FE758
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _080FE794
lsls r0, r4, 2
adds r0, r4
@@ -270346,7 +270346,7 @@ sub_80FE758: @ 80FE758
cmp r0, 0x2
beq _080FE79C
bl sub_80FE1DC
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
bl sub_80FE394
ldr r0, _080FE798
str r0, [r5]
@@ -270413,7 +270413,7 @@ sub_80FE7EC: @ 80FE7EC
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80FEC94
ldr r0, _080FE858
@@ -270423,7 +270423,7 @@ sub_80FE7EC: @ 80FE7EC
movs r1, 0xC
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r4, _080FE85C
ldr r0, _080FE860
ldrb r0, [r0]
@@ -270540,7 +270540,7 @@ _080FE8EE:
movs r1, 0xC
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
_080FE90E:
ldrb r0, [r4]
ldrb r6, [r6]
@@ -270558,7 +270558,7 @@ _080FE92C:
movs r1, 0xC
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_080FE938:
pop {r3-r5}
mov r8, r3
@@ -270984,7 +270984,7 @@ sub_80FEC94: @ 80FEC94
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0
bl sub_80FEABC
@@ -271003,7 +271003,7 @@ sub_80FECB8: @ 80FECB8
movs r1, 0
movs r2, 0x1D
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0x10
movs r2, 0x1
@@ -271052,12 +271052,12 @@ sub_80FED1C: @ 80FED1C
movs r1, 0
movs r2, 0x1D
movs r3, 0x3
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0xF
movs r1, 0xC
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_80FED1C
@@ -271379,7 +271379,7 @@ sub_80FEF74: @ 80FEF74
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
.align 2, 0
@@ -271475,7 +271475,7 @@ sub_80FF034: @ 80FF034
movs r1, 0
movs r2, 0xE
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80FE5AC
pop {r4}
@@ -273560,7 +273560,7 @@ sub_81000A0: @ 81000A0
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _081000C0
adds r0, r4, 0
bl sub_80F914C
@@ -273580,7 +273580,7 @@ sub_81000C4: @ 81000C4
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_8100174
ldr r2, _0810010C
@@ -273773,7 +273773,7 @@ sub_8100248: @ 8100248
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _08100268
adds r0, r4, 0
bl sub_80F914C
@@ -273794,7 +273794,7 @@ sub_810026C: @ 810026C
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_810028C
pop {r4}
@@ -274316,7 +274316,7 @@ sub_810065C: @ 810065C
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08100698
ldr r0, _0810069C
ldrb r1, [r0]
@@ -275205,7 +275205,7 @@ _08100CC4:
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x2
strh r0, [r5, 0xC]
b _08100D24
@@ -275298,7 +275298,7 @@ SetUpPuttingAwayDecorationPlayerAvatar: @ 8100D84
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r3, _08100DD8
ldr r2, _08100DDC
ldr r4, _08100DE0
@@ -275468,7 +275468,7 @@ sub_8100EEC: @ 8100EEC
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _08100F70
ldr r3, _08100F74
ldrb r1, [r3]
@@ -276268,7 +276268,7 @@ sub_8101518: @ 8101518
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _08101538
adds r0, r4, 0
bl sub_80F914C
@@ -276314,7 +276314,7 @@ sub_810156C: @ 810156C
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _0810158C
adds r0, r4, 0
bl sub_80F914C
@@ -276335,7 +276335,7 @@ sub_8101590: @ 8101590
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_81015B0
pop {r4}
@@ -276451,7 +276451,7 @@ _08101674: .4byte sub_80FE2EC
sub_8101678: @ 8101678
push {lr}
bl pal_fill_black
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
bl sub_80FE220
ldr r0, _08101694
movs r1, 0x8
@@ -276669,7 +276669,7 @@ sub_8101824: @ 8101824
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _08101844
adds r0, r4, 0
bl sub_80F914C
@@ -276690,7 +276690,7 @@ sub_8101848: @ 8101848
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xE
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r6, _08101890
ldrb r1, [r6]
ldr r5, _08101894
@@ -277217,7 +277217,7 @@ sub_8101C84: @ 8101C84
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
pop {r4}
pop {r0}
bx r0
@@ -277576,11 +277576,11 @@ _08101F28: .4byte 0x03001770
sub_8101F2C: @ 8101F2C
push {r4,lr}
adds r4, r0, 0
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -277611,7 +277611,7 @@ sub_8101F60: @ 8101F60
ands r0, r1
cmp r0, 0
beq _08101F78
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _08101F84
movs r0, 0x5
strb r0, [r1]
@@ -278116,7 +278116,7 @@ sub_8102318: @ 8102318
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
bl sub_814AB84
ldr r1, _08102340
movs r0, 0x16
@@ -278132,12 +278132,12 @@ _08102340: .4byte 0x02000000
thumb_func_start sub_8102344
sub_8102344: @ 8102344
push {lr}
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
bne _0810237C
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
bl sub_8103D8C
movs r0, 0x1
@@ -278162,7 +278162,7 @@ _0810237C:
cmp r1, r0
bne _08102392
_08102388:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _08102398
movs r0, 0x5
strb r0, [r1]
@@ -278199,7 +278199,7 @@ sub_81023B8: @ 81023B8
ands r0, r1
cmp r0, 0
beq _081023D0
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _081023DC
movs r0, 0x5
strb r0, [r1]
@@ -278237,7 +278237,7 @@ sub_81023FC: @ 81023FC
ands r0, r1
cmp r0, 0
beq _08102414
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _08102420
movs r0, 0x1B
strb r0, [r1]
@@ -283620,7 +283620,7 @@ sub_8104B80: @ 8104B80
bl sub_8104DA4
bl sub_81065DC
ldr r0, _08104BC0
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _08104BC4
movs r1, 0xA
movs r2, 0x20
@@ -283680,9 +283680,9 @@ sub_8104BFC: @ 8104BFC
push {r4,lr}
sub sp, 0x4
adds r4, r0, 0
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r0, _08104C3C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
bl sub_81064B8
ldrb r0, [r4, 0xA]
bl sub_8104CAC
@@ -287528,7 +287528,7 @@ sub_81068FC: @ 81068FC
push {r4,lr}
ldr r4, _08106914
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
adds r0, r4, 0
bl SetUpWindowConfig
pop {r4}
@@ -294142,7 +294142,7 @@ _08109A72:
movs r0, 0
movs r1, 0x1
movs r2, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r4, 0
mov r1, r9
lsls r1, 2
@@ -294161,7 +294161,7 @@ _08109A98:
lsrs r2, 24
ldr r0, _08109ABC
movs r1, 0x1
- bl Print
+ bl MenuPrint
b _08109AD8
.align 2, 0
_08109AB8: .4byte 0x020284c8
@@ -294177,7 +294177,7 @@ _08109AC0:
adds r2, r1
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
_08109AD8:
adds r0, r5, 0x1
lsls r0, 24
@@ -294195,7 +294195,7 @@ _08109ADE:
adds r2, r1
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
movs r0, 0
str r0, [sp]
movs r0, 0xB
@@ -294250,7 +294250,7 @@ _08109B58:
movs r1, 0x1
movs r2, 0xC
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl DestroyTask
bl script_env_2_enable_and_set_ctx_running
@@ -294469,7 +294469,7 @@ sub_8109D04: @ 8109D04
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
bl SetBgTilemapBuffer
movs r0, 0x1
@@ -294541,7 +294541,7 @@ sub_8109DAC: @ 8109DAC
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _08109DDC
movs r0, 0
strh r0, [r1]
@@ -294734,7 +294734,7 @@ sub_8109E80: @ 8109E80
ldr r0, _0810A0CC
bl SetUpWindowConfig
ldr r0, _0810A0D0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
movs r0, 0x1
negs r0, r0
mov r1, r9
@@ -294945,11 +294945,11 @@ sub_810A134: @ 810A134
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0810A170
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _0810A174
str r0, [r4]
pop {r4}
@@ -294993,7 +294993,7 @@ sub_810A178: @ 810A178
adds r3, r1, 0x3
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810A224
movs r1, 0
strh r1, [r0]
@@ -295151,15 +295151,15 @@ sub_810A2D8: @ 810A2D8
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0810A328
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _0810A32C
str r0, [r4]
pop {r4}
@@ -295176,7 +295176,7 @@ sub_810A330: @ 810A330
push {r4-r6,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -295216,7 +295216,7 @@ _0810A37C:
movs r1, 0x7
movs r2, 0x1B
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810A3E8
lsls r5, r4, 2
adds r5, r4
@@ -295324,7 +295324,7 @@ sub_810A42C: @ 810A42C
adds r3, r1, 0x3
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810A56C
movs r1, 0
strh r1, [r0]
@@ -295404,7 +295404,7 @@ _0810A4D8:
mov r0, sp
adds r1, r4, 0
adds r2, r5, 0
- bl Print
+ bl MenuPrint
mov r0, sp
movs r1, 0
movs r2, 0xF
@@ -295424,7 +295424,7 @@ _0810A4D8:
lsrs r2, 24
mov r0, sp
adds r1, r4, 0
- bl Print
+ bl MenuPrint
lsls r0, r4, 3
adds r0, 0x4
lsls r0, 24
@@ -295811,7 +295811,7 @@ _0810A816:
ldr r0, _0810A85C
bl SetUpWindowConfig
ldr r0, _0810A860
- bl sub_8071C4C
+ bl InitMenuWindowConfig
add sp, 0x8
pop {r3}
mov r8, r3
@@ -296321,21 +296321,21 @@ sub_810AC60: @ 810AC60
movs r1, 0x10
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0810ACC4
movs r1, 0x3
movs r2, 0x11
- bl Print
+ bl MenuPrint
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _0810ACC8
movs r0, 0x18
movs r1, 0x9
movs r2, 0x2
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0x1
str r0, [sp]
movs r0, 0x5
@@ -296368,7 +296368,7 @@ c3_80BF560: @ 810ACD4
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -296405,12 +296405,12 @@ _0810AD18:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x2
movs r1, 0x10
movs r2, 0x1B
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810AD50
lsls r1, r4, 2
adds r1, r4
@@ -297811,12 +297811,12 @@ _0810B7D4: .4byte 0x03001770
_0810B7D8: .4byte 0x0000043c
_0810B7DC:
ldr r0, _0810B7E4
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _0810B91C
.align 2, 0
_0810B7E4: .4byte gWindowConfig_81E6E34
_0810B7E8:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _0810B7F2
b _0810B960
@@ -297830,12 +297830,12 @@ _0810B7FC: .4byte 0x03001770
_0810B800: .4byte 0x0000043c
_0810B804:
ldr r0, _0810B80C
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _0810B91C
.align 2, 0
_0810B80C: .4byte gWindowConfig_81E6E50
_0810B810:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _0810B81A
b _0810B960
@@ -298206,13 +298206,13 @@ _0810BB08: .4byte sub_810B96C
sub_810BB0C: @ 810BB0C
push {lr}
ldr r0, _0810BB28
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _0810BB2C
bl itemid_get_item
movs r1, 0x2
movs r2, 0x1
movs r3, 0x48
- bl Free
+ bl sub_8072BD8
pop {r0}
bx r0
.align 2, 0
@@ -298224,27 +298224,27 @@ _0810BB2C: .4byte 0x00000111
sub_810BB30: @ 810BB30
push {lr}
ldr r0, _0810BB70
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _0810BB74
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0810BB78
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _0810BB7C
movs r1, 0x2
movs r2, 0x11
- bl Print
+ bl MenuPrint
ldr r0, _0810BB80
movs r1, 0x8
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0810BB84
movs r1, 0x8
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -298267,7 +298267,7 @@ sub_810BB88: @ 810BB88
lsrs r0, 24
mov r8, r0
ldr r0, _0810BBF4
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
mov r6, r8
adds r0, r6, 0
adds r0, 0x8
@@ -298295,7 +298295,7 @@ _0810BBB0:
orrs r2, r7
mov r0, r9
movs r1, 0xF
- bl Print
+ bl MenuPrint
mov r0, r8
adds r0, 0x8
cmp r6, r0
@@ -298306,7 +298306,7 @@ _0810BBB0:
movs r0, 0xF
movs r2, 0x1D
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
b _0810BC6C
.align 2, 0
_0810BBF4: .4byte gWindowConfig_81E6E34
@@ -298353,7 +298353,7 @@ _0810BC08:
orrs r2, r7
mov r0, r9
movs r1, 0xF
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -298683,7 +298683,7 @@ _0810BECC:
cmp r6, 0x4
bls _0810BE30
ldr r0, _0810BF10
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _0810BF14
ldrb r2, [r0]
ldrb r1, [r0, 0x1]
@@ -298706,7 +298706,7 @@ _0810BECC:
adds r0, r4, 0
movs r1, 0xB
movs r2, 0x11
- bl Print
+ bl MenuPrint
b _0810BF2C
.align 2, 0
_0810BF10: .4byte gWindowConfig_81E6E34
@@ -298718,7 +298718,7 @@ _0810BF20:
movs r1, 0x11
movs r2, 0xC
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
_0810BF2C:
pop {r3}
mov r8, r3
@@ -299276,12 +299276,12 @@ _0810C37C:
movs r0, 0x1
bl sub_80F98A4
ldr r0, _0810C3EC
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
adds r1, r4, 0x4
movs r0, 0x7
movs r2, 0xD
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r4, 0x5
ldr r5, _0810C3F0
ldrb r2, [r5]
@@ -299291,7 +299291,7 @@ _0810C37C:
str r0, [sp]
movs r0, 0x8
adds r1, r4, 0
- bl sub_80728E4
+ bl PrintMenuItemsReordered
ldrb r3, [r5]
movs r0, 0
str r0, [sp]
@@ -299484,13 +299484,13 @@ sub_810C540: @ 810C540
lsls r5, 24
lsrs r5, 24
ldr r0, _0810C5A0
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
bl sub_8072DEC
movs r0, 0x7
movs r1, 0x4
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0810C5A4
ldr r4, _0810C5A8
ldr r3, _0810C5AC
@@ -299564,7 +299564,7 @@ sub_810C5EC: @ 810C5EC
movs r0, 0x7
movs r1, 0x6
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _0810C60C
adds r0, r4, 0
bl sub_80F914C
@@ -299585,7 +299585,7 @@ sub_810C610: @ 810C610
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0810C658
ldrb r0, [r1, 0x1]
ldrb r1, [r1]
@@ -299639,17 +299639,17 @@ sub_810C668: @ 810C668
bl sub_80F979C
_0810C698:
ldr r0, _0810C6D0
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
movs r0, 0x7
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0810C6D4
lsls r0, r4, 2
adds r0, r4
@@ -299699,7 +299699,7 @@ sub_810C704: @ 810C704
lsls r4, 24
lsrs r4, 24
ldr r0, _0810C738
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
ldr r0, _0810C73C
ldrb r0, [r0, 0x1]
bl sub_810BC84
@@ -299738,7 +299738,7 @@ sub_810C748: @ 810C748
movs r1, 0x4
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _0810C780
lsls r0, r4, 2
adds r0, r4
@@ -304083,7 +304083,7 @@ sub_810E874: @ 810E874
movs r1, 0
movs r2, 0x8
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r4, 0
str r4, [sp]
movs r0, 0x7
@@ -304111,7 +304111,7 @@ _0810E8C0:
movs r0, 0
movs r1, 0
movs r2, 0x8
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrb r3, [r4]
movs r0, 0
str r0, [sp]
@@ -304141,7 +304141,7 @@ _0810E8F6:
lsls r2, 24
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -304174,12 +304174,12 @@ sub_810E944: @ 810E944
movs r1, 0
movs r2, 0x1D
movs r3, 0x5
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0810E978
movs r1, 0x15
movs r2, 0x1
movs r3, 0x40
- bl Free
+ bl sub_8072BD8
ldr r1, _0810E97C
ldr r0, _0810E980
ldrh r0, [r0]
@@ -304189,7 +304189,7 @@ sub_810E944: @ 810E944
movs r1, 0x15
movs r2, 0x3
movs r3, 0x40
- bl Free
+ bl sub_8072BD8
pop {r0}
bx r0
.align 2, 0
@@ -304219,7 +304219,7 @@ sub_810E984: @ 810E984
lsrs r4, r0, 24
movs r0, 0x1
negs r0, r0
- bl MoveMenuCursorNoWrapAround
+ bl MoveMenuCursorNoWrap
adds r0, r4, 0
movs r1, 0x40
bl sub_810EAC8
@@ -304241,7 +304241,7 @@ _0810E9B8:
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x1
- bl MoveMenuCursorNoWrapAround
+ bl MoveMenuCursorNoWrap
adds r0, r4, 0
movs r1, 0x80
bl sub_810EAC8
@@ -304283,7 +304283,7 @@ _0810E9E8:
movs r1, 0
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
bl sub_810EC9C
b _0810EABC
@@ -304308,7 +304308,7 @@ _0810EA5C:
movs r3, 0x1
bl FieldObjectTurnByLocalIdAndMap
bl sub_810EEDC
- bl sub_8071EF4
+ bl MenuZeroFillScreen
adds r0, r6, 0
bl DestroyTask
b _0810EABC
@@ -304330,7 +304330,7 @@ _0810EA94:
movs r1, 0
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r6, 0
bl sub_810EC9C
_0810EABC:
@@ -304396,7 +304396,7 @@ _0810EB1C:
movs r1, 0x1
movs r2, 0x7
movs r3, 0xA
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r5, 0
ldr r2, _0810EB88
lsls r1, r4, 2
@@ -304418,7 +304418,7 @@ _0810EB44:
lsls r2, 24
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -305100,7 +305100,7 @@ sub_810F090: @ 810F090
movs r1, 0
movs r2, 0xA
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r4, 0
str r4, [sp]
movs r0, 0x9
@@ -305125,7 +305125,7 @@ _0810F0CA:
lsls r2, 24
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -305172,7 +305172,7 @@ sub_810F118: @ 810F118
lsrs r4, r0, 24
movs r0, 0x1
negs r0, r0
- bl MoveMenuCursorNoWrapAround
+ bl MoveMenuCursorNoWrap
adds r0, r4, 0
movs r1, 0x40
bl sub_810F1F4
@@ -305194,7 +305194,7 @@ _0810F14A:
lsls r0, 24
lsrs r4, r0, 24
movs r0, 0x1
- bl MoveMenuCursorNoWrapAround
+ bl MoveMenuCursorNoWrap
adds r0, r4, 0
movs r1, 0x80
bl sub_810F1F4
@@ -305217,7 +305217,7 @@ _0810F17A:
movs r1, 0
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl sub_810EC9C
_0810F1AE:
@@ -305237,7 +305237,7 @@ _0810F1AE:
movs r1, 0
movs r2, 0x1D
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r5, 0
bl sub_810EC9C
_0810F1DE:
@@ -305303,7 +305303,7 @@ _0810F244:
movs r1, 0x1
movs r2, 0x9
movs r3, 0xA
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
movs r5, 0
ldr r7, _0810F28C
_0810F25C:
@@ -305315,7 +305315,7 @@ _0810F25C:
lsls r2, 24
lsrs r2, 24
movs r1, 0x1
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 24
lsrs r4, r0, 24
@@ -307557,7 +307557,7 @@ sub_81102E8: @ 81102E8
ldr r0, _08110344
movs r1, 0x3
movs r2, 0x3
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -307603,22 +307603,22 @@ sub_8110348: @ 8110348
mov r0, sp
movs r1, 0x3
adds r2, r6, 0
- bl Print
+ bl MenuPrint
ldr r1, _081103BC
adds r0, r4, 0
bl StringCopy
mov r0, sp
movs r1, 0xB
adds r2, r6, 0
- bl Print
+ bl MenuPrint
mov r0, sp
movs r1, 0x11
adds r2, r6, 0
- bl Print
+ bl MenuPrint
mov r0, sp
movs r1, 0x17
adds r2, r6, 0
- bl Print
+ bl MenuPrint
b _0811042E
.align 2, 0
_081103B8: .4byte gUnknown_0842CA3C
@@ -307635,7 +307635,7 @@ _081103C0:
adds r0, r4, 0
movs r1, 0x3
adds r2, r6, 0
- bl Print
+ bl MenuPrint
movs r0, 0xFC
strb r0, [r4]
movs r0, 0x14
@@ -307651,7 +307651,7 @@ _081103C0:
adds r0, r4, 0
movs r1, 0xB
adds r2, r6, 0
- bl Print
+ bl MenuPrint
ldrh r1, [r7, 0xC]
adds r0, r5, 0
movs r2, 0x1
@@ -307660,7 +307660,7 @@ _081103C0:
adds r0, r4, 0
movs r1, 0x11
adds r2, r6, 0
- bl Print
+ bl MenuPrint
ldrh r1, [r7, 0xE]
adds r0, r5, 0
movs r2, 0x1
@@ -307669,7 +307669,7 @@ _081103C0:
adds r0, r4, 0
movs r1, 0x17
adds r2, r6, 0
- bl Print
+ bl MenuPrint
_0811042E:
add sp, 0x10
pop {r4-r7}
@@ -307686,18 +307686,18 @@ sub_811043C: @ 811043C
movs r1, 0
movs r2, 0x1C
movs r3, 0x12
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08110488
movs r1, 0
movs r2, 0x1
movs r3, 0xF0
- bl Free
+ bl sub_8072BD8
ldr r0, _0811048C
bl sub_81102E8
ldr r0, _08110490
movs r1, 0xC
movs r2, 0x6
- bl Print
+ bl MenuPrint
movs r4, 0
_08110468:
lsls r0, r4, 4
@@ -307774,7 +307774,7 @@ sub_81104E8: @ 81104E8
adds r6, r3, 0
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
ldr r0, _0811052C
cmp r4, r0
bls _0811050A
@@ -307790,7 +307790,7 @@ _0811050A:
lsls r1, 24
lsrs r1, 24
adds r2, r6, 0
- bl Print
+ bl MenuPrint
pop {r4-r6}
pop {r0}
bx r0
@@ -307898,20 +307898,20 @@ sub_81105E4: @ 81105E4
movs r1, 0x1
movs r2, 0x1B
movs r3, 0x11
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08110658
movs r1, 0x3
movs r2, 0x2
movs r3, 0xC8
- bl Free
+ bl sub_8072BD8
ldr r0, _0811065C
movs r1, 0x5
movs r2, 0x6
- bl Print
+ bl MenuPrint
ldr r0, _08110660
movs r1, 0x5
movs r2, 0xC
- bl Print
+ bl MenuPrint
movs r4, 0x5
_08110614:
lsls r1, r4, 24
@@ -311088,7 +311088,7 @@ _08111F88:
ldr r0, [r4]
adds r0, 0x4
bl LoadTextWindowGraphics
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl ResetPaletteFade
ldr r1, _08111FCC
ldr r0, _08111FD0
@@ -317414,7 +317414,7 @@ _08115460:
ldr r0, _08115480
bl SetUpWindowConfig
ldr r0, _08115484
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r0, _08115488
movs r2, 0xE0
lsls r2, 1
@@ -317484,11 +317484,11 @@ _081154FC:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08115558
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _0811555C
movs r2, 0x3C
negs r2, r2
@@ -317732,18 +317732,18 @@ sub_8115734: @ 8115734
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08115770
bl sub_814AAF8
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08115774
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _08115778
adds r0, r4, 0
bl sub_80F914C
@@ -317766,7 +317766,7 @@ sub_811577C: @ 811577C
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _081157A4
lsls r0, r4, 2
adds r0, r4
@@ -319646,7 +319646,7 @@ sub_8116638: @ 8116638
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08116680
b _0811669A
.align 2, 0
@@ -319661,12 +319661,12 @@ _08116684:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081166A4
_0811669A:
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
b _081166C4
.align 2, 0
_081166A4: .4byte gUnknown_081C4199
@@ -319677,11 +319677,11 @@ _081166A8:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081166DC
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
_081166C4:
ldr r1, _081166E0
lsls r0, r4, 2
@@ -319806,11 +319806,11 @@ sub_811677C: @ 811677C
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldrb r1, [r6, 0x19]
movs r2, 0xC
ldrsh r0, [r4, r2]
@@ -319997,11 +319997,11 @@ _081168E4:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08116968
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _0811696C
b _08116992
.align 2, 0
@@ -320022,11 +320022,11 @@ _08116970:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081169A4
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _081169A8
_08116992:
ldr r2, _081169AC
@@ -320050,11 +320050,11 @@ _081169BC:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081169EC
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _081169F0
adds r0, r6, 0
movs r2, 0x3C
@@ -320129,11 +320129,11 @@ _08116A2A:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08116A94
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _08116A98
ldr r2, _08116A9C
adds r0, r5, 0
@@ -321491,7 +321491,7 @@ sub_81174F8: @ 81174F8
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08117520
bl sub_814AAF8
ldr r1, _08117524
@@ -321542,8 +321542,8 @@ sub_811755C: @ 811755C
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
- bl sub_8071EF4
+ bl MenuZeroFillWindowRect
+ bl MenuZeroFillScreen
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -321585,7 +321585,7 @@ sub_81175C0: @ 81175C0
adds r4, r0, 0
lsls r4, 24
lsrs r4, 24
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl script_env_2_disable
adds r0, r4, 0
bl DestroyTask
@@ -321622,7 +321622,7 @@ _08117608:
ldr r1, _0811762C
movs r0, 0x1
strh r0, [r1]
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl script_env_2_disable
adds r0, r4, 0
bl DestroyTask
@@ -321664,11 +321664,11 @@ sub_8117630: @ 8117630
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _081176A0
lsls r0, r4, 2
adds r0, r4
@@ -321719,11 +321719,11 @@ sub_81176A8: @ 81176A8
movs r1, 0
movs r2, 0x9
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x9
movs r2, 0x1
- bl PrintCoinsString
+ bl sub_8072B4C
ldr r2, _08117768
ldr r1, _0811776C
mov r8, r1
@@ -321759,11 +321759,11 @@ sub_81176A8: @ 81176A8
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08117770
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _08117774
ldr r2, _08117778
adds r0, r7, 0
@@ -321789,11 +321789,11 @@ _0811777C:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _081177B4
lsls r0, r7, 2
adds r0, r7
@@ -321815,11 +321815,11 @@ _081177BC:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _081177F8
str r0, [r6]
movs r0, 0
@@ -327870,7 +327870,7 @@ sub_811A72C: @ 811A72C
adds r0, r6, 0
adds r1, r5, 0
adds r2, r4, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
mov r0, r8
adds r1, r6, 0
adds r2, r5, 0
@@ -327899,7 +327899,7 @@ sub_811A770: @ 811A770
lsls r4, 18
adds r3, r4
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r4}
pop {r0}
bx r0
@@ -327968,7 +327968,7 @@ _0811A7EA:
ldr r0, _0811A828
adds r1, r6, 0
adds r2, r7, 0
- bl Print
+ bl MenuPrint
add sp, 0x10
pop {r4-r7}
pop {r0}
@@ -343976,7 +343976,7 @@ _081226DC:
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
bl sub_806D5A4
ldr r0, _0812271C
@@ -344023,7 +344023,7 @@ _0812274A:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
adds r0, r4, 0
bl sub_8122838
@@ -344121,7 +344121,7 @@ sub_81227FC: @ 81227FC
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
movs r0, 0
movs r1, 0
@@ -345240,7 +345240,7 @@ sub_81230F4: @ 81230F4
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
movs r0, 0xF
movs r1, 0
@@ -362027,11 +362027,11 @@ sub_812AF10: @ 812AF10
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0812AF2C
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -377577,14 +377577,14 @@ sub_81326D8: @ 81326D8
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
ldr r4, _08132790
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
ldr r0, _08132794
strh r5, [r0]
strh r5, [r0]
@@ -377646,14 +377646,14 @@ sub_81327A4: @ 81327A4
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
ldr r4, _0813285C
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
movs r1, 0x80
lsls r1, 19
movs r2, 0x9A
@@ -377766,7 +377766,7 @@ sub_81328E8: @ 81328E8
adds r0, r4, 0
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
pop {r4}
pop {r0}
bx r0
@@ -377947,7 +377947,7 @@ _08132AA4:
bl sub_813362C
b _08132FD6
_08132AAA:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132AB6
@@ -377956,7 +377956,7 @@ _08132AB6:
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08132ACC
ldr r1, [r0]
ldrb r0, [r1]
@@ -377965,7 +377965,7 @@ _08132AB6:
.align 2, 0
_08132ACC: .4byte 0x030007b0
_08132AD0:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -378042,7 +378042,7 @@ _08132B6C:
.align 2, 0
_08132B70: .4byte 0x030007b0
_08132B74:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132B80
@@ -378051,7 +378051,7 @@ _08132B80:
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08132B94
ldr r1, [r0]
ldrb r0, [r1]
@@ -378060,7 +378060,7 @@ _08132B80:
.align 2, 0
_08132B94: .4byte 0x030007b0
_08132B98:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r4, r0, 24
cmp r4, 0
@@ -378115,7 +378115,7 @@ _08132BF0:
_08132C00: .4byte gUnknown_0842CCF8
_08132C04: .4byte 0x030007b0
_08132C08:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132C14
@@ -378124,7 +378124,7 @@ _08132C14:
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _08132C28
ldr r1, [r0]
movs r0, 0x12
@@ -378132,7 +378132,7 @@ _08132C14:
.align 2, 0
_08132C28: .4byte 0x030007b0
_08132C2C:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -378175,7 +378175,7 @@ _08132C74:
_08132C84: .4byte gUnknown_0842CD65
_08132C88: .4byte 0x030007b0
_08132C8C:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132C98
@@ -378188,12 +378188,12 @@ _08132C98:
movs r0, 0x15
movs r1, 0x7
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
b _08132FD6
.align 2, 0
_08132CAC: .4byte 0x030007b0
_08132CB0:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -378240,7 +378240,7 @@ _08132D00:
.align 2, 0
_08132D08: .4byte 0x030007b0
_08132D0C:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132D18
@@ -378269,7 +378269,7 @@ _08132D38:
.align 2, 0
_08132D3C: .4byte 0x030007b0
_08132D40:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132D4C
@@ -378325,7 +378325,7 @@ _08132DAC: .4byte 0x000002c5
_08132DB0: .4byte 0x03004350
_08132DB4: .4byte sub_81327A4
_08132DB8:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08132DC4
@@ -378515,7 +378515,7 @@ _08132F4C: .4byte 0x020232cc
_08132F50: .4byte gUnknown_0842CD77
_08132F54: .4byte 0x0202e8cc
_08132F58:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08132FD6
@@ -378533,7 +378533,7 @@ _08132F78: .4byte gUnknown_0842CDA3
_08132F7C: .4byte 0x030007b0
_08132F80: .4byte 0x0000016f
_08132F84:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08132FD6
@@ -378589,7 +378589,7 @@ _08132FE8: .4byte 0x030007b0
sub_8132FEC: @ 8132FEC
push {r4-r6,lr}
ldr r0, _08133024
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
movs r5, 0
ldr r4, _08133028
adds r6, r4, 0
@@ -378603,13 +378603,13 @@ _08132FFA:
adds r3, r2
ldrb r2, [r3]
ldrb r3, [r4, 0x3]
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r4, 0x4
adds r5, 0x1
cmp r5, 0x3
bls _08132FFA
ldr r0, _0813302C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
pop {r4-r6}
pop {r0}
bx r0
@@ -378682,7 +378682,7 @@ _08133096:
ldrb r1, [r4, 0x4]
ldrb r2, [r4, 0x5]
adds r0, r5, 0
- bl Print
+ bl MenuPrint
adds r4, 0x8
ldr r0, [r4]
cmp r0, 0
@@ -378837,7 +378837,7 @@ _081331BA:
ldr r0, _08133240
adds r1, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
cmp r6, 0
beq _081331F8
adds r1, r4, 0x2
@@ -378850,7 +378850,7 @@ _081331BA:
lsls r3, 24
lsrs r3, 24
adds r0, r5, 0
- bl Reset
+ bl MenuZeroFillWindowRect
_081331F8:
movs r0, 0x8
add r10, r0
@@ -379518,7 +379518,7 @@ _081336E8:
adds r0, r4, 0
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
b _08133796
.align 2, 0
_08133738: .4byte 0x030007b0
@@ -379533,7 +379533,7 @@ _08133748:
adds r0, r4, 0
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
ldr r1, [r5]
movs r0, 0xC
strb r0, [r1]
@@ -379559,7 +379559,7 @@ _0813376C:
adds r0, r4, 0
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
_08133796:
ldr r0, _081337D4
ldr r4, [r0]
@@ -379755,7 +379755,7 @@ _08133916:
ldr r0, _0813393C
movs r1, 0xB
movs r2, 0x1
- bl Print
+ bl MenuPrint
movs r0, 0
bl sub_813360C
pop {r3-r5}
@@ -379846,7 +379846,7 @@ _081339D8:
ldrb r1, [r4]
ldrb r2, [r4, 0x1]
mov r0, sp
- bl Print
+ bl MenuPrint
b _08133AE2
_081339E4:
ldrb r2, [r4]
@@ -379855,7 +379855,7 @@ _081339E4:
lsls r3, 24
lsrs r3, 24
adds r0, r2, 0
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08133A34
ldr r1, _08133A38
lsls r0, r5, 3
@@ -379917,7 +379917,7 @@ _08133A64:
lsls r3, 24
lsrs r3, 24
adds r0, r2, 0
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r2, _08133AB4
ldr r1, _08133AB8
lsls r0, r5, 3
@@ -380106,7 +380106,7 @@ _08133BA4:
movs r0, 0xB
movs r2, 0x1C
movs r3, 0xC
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
b _08133C92
.align 2, 0
_08133BF8: .4byte gUnknown_08402E39
@@ -380122,14 +380122,14 @@ _08133C04:
lsls r3, 24
lsrs r3, 24
adds r0, r2, 0
- bl Reset
+ bl MenuZeroFillWindowRect
ldrb r2, [r4, 0x12]
ldrb r1, [r4, 0x13]
adds r3, r1, 0x1
lsls r3, 24
lsrs r3, 24
adds r0, r2, 0
- bl Reset
+ bl MenuZeroFillWindowRect
movs r4, 0
ldr r5, _08133C58
adds r3, r6, 0
@@ -380165,7 +380165,7 @@ _08133C5C:
adds r3, r1, 0x1
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
ldrb r0, [r4, 0x9]
ldrb r1, [r4, 0xA]
adds r2, r0, 0x3
@@ -380174,13 +380174,13 @@ _08133C5C:
adds r3, r1, 0x1
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
_08133C86:
movs r0, 0xB
movs r1, 0x9
movs r2, 0x1C
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
_08133C92:
add sp, 0x8
pop {r3}
@@ -380199,7 +380199,7 @@ sub_8133CA4: @ 8133CA4
movs r1, 0x7
movs r2, 0x1B
movs r3, 0xC
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _08133CC8
ldr r0, [r0]
movs r1, 0xB1
@@ -380434,7 +380434,7 @@ sub_8133E74: @ 8133E74
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x3
movs r1, 0
bl sub_806D538
@@ -380507,7 +380507,7 @@ sub_8133EF8: @ 8133EF8
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
bl sub_806D538
@@ -385214,12 +385214,12 @@ _08136366:
_08136370: .4byte gWindowConfig_81E7080
_08136374:
ldr r0, _0813637C
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _08136524
.align 2, 0
_0813637C: .4byte gWindowConfig_81E7080
_08136380:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _0813638A
b _0813657A
@@ -386244,21 +386244,21 @@ sub_8136BB8: @ 8136BB8
ldr r1, _08136C38
bl StringAppend
ldr r0, _08136C3C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
movs r0, 0
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, [r4]
adds r0, 0x10
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
movs r0, 0x17
movs r1, 0xA
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
movs r0, 0
bl MoveMenuCursor
pop {r4}
@@ -386285,9 +386285,9 @@ sub_8136C40: @ 8136C40
lsrs r0, 24
cmp r0, 0x2
bhi _08136C60
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r0, _08136C68
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
_08136C60:
adds r0, r4, 0
pop {r4}
@@ -386301,12 +386301,12 @@ _08136C68: .4byte gWindowConfig_81E7080
sub_8136C6C: @ 8136C6C
push {lr}
ldr r0, _08136C8C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
movs r0, 0
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _08136C90
ldr r0, [r3]
adds r0, 0x53
@@ -386429,16 +386429,16 @@ _08136D5A:
sub_8136D60: @ 8136D60
push {lr}
ldr r0, _08136D84
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
movs r0, 0
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08136D88
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -386449,9 +386449,9 @@ _08136D88: .4byte gUnknown_084115E1
thumb_func_start sub_8136D8C
sub_8136D8C: @ 8136D8C
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r0, _08136D9C
- bl sub_8071E2C
+ bl BasicInitMenuWindowConfig
pop {r0}
bx r0
.align 2, 0
@@ -386466,11 +386466,11 @@ sub_8136DA0: @ 8136DA0
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -392300,7 +392300,7 @@ sub_8139CF4: @ 8139CF4
movs r0, 0
movs r1, 0
movs r2, 0xA
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrb r2, [r5]
ldr r3, _08139D54
ldr r0, _08139D58
@@ -392308,7 +392308,7 @@ sub_8139CF4: @ 8139CF4
str r0, [sp]
movs r0, 0x1
movs r1, 0x1
- bl sub_80728E4
+ bl PrintMenuItemsReordered
ldrb r3, [r5]
movs r0, 0
str r0, [sp]
@@ -392474,7 +392474,7 @@ sub_8139E6C: @ 8139E6C
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_813AF3C
ldr r1, _08139E9C
movs r2, 0
@@ -392526,7 +392526,7 @@ sub_8139ED8: @ 8139ED8
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_80FE28C
pop {r4}
@@ -392547,7 +392547,7 @@ sub_8139EF8: @ 8139EF8
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _08139F28
ldrb r0, [r0, 0x8]
cmp r0, 0
@@ -392570,7 +392570,7 @@ _08139F3C:
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl script_env_2_enable_and_set_ctx_running
_08139F4C:
adds r0, r4, 0
@@ -392591,17 +392591,17 @@ sub_8139F58: @ 8139F58
movs r1, 0
movs r2, 0xA
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
movs r2, 0xB
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _08139FAC
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintStringArray
+ bl PrintMenuItems
str r4, [sp]
movs r0, 0xA
str r0, [sp, 0x4]
@@ -392632,11 +392632,11 @@ sub_8139FB4: @ 8139FB4
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -392794,7 +392794,7 @@ _0813A0F4: .4byte sub_8139FD4
thumb_func_start sub_813A0F8
sub_813A0F8: @ 813A0F8
push {lr}
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
movs r0, 0x1
bl sub_8139F58
ldr r0, _0813A114
@@ -392822,7 +392822,7 @@ sub_813A118: @ 813A118
movs r1, 0
movs r2, 0xB
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A96E4
lsls r0, 24
lsrs r0, 24
@@ -392833,7 +392833,7 @@ sub_813A118: @ 813A118
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
strh r0, [r4, 0xC]
strh r0, [r4]
@@ -392882,7 +392882,7 @@ sub_813A198: @ 813A198
movs r1, 0
movs r2, 0xB
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_80A96E4
lsls r0, 24
lsrs r0, 24
@@ -392893,7 +392893,7 @@ sub_813A198: @ 813A198
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x2
strh r0, [r4, 0xC]
movs r0, 0
@@ -392939,7 +392939,7 @@ sub_813A21C: @ 813A21C
movs r1, 0
movs r2, 0xB
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_8139E24
pop {r4}
@@ -393240,8 +393240,8 @@ sub_813A468: @ 813A468
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
- bl sub_8071FFC
+ bl MenuZeroFillWindowRect
+ bl MenuDisplayMessageBox
ldr r0, _0813A4AC
lsls r4, r5, 2
adds r4, r5
@@ -393331,7 +393331,7 @@ _0813A542:
movs r1, 0x8
movs r2, 0xD
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldrh r0, [r4, 0x6]
movs r1, 0x3
str r1, [sp]
@@ -393484,7 +393484,7 @@ _0813A668:
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
movs r2, 0xC
ldrsh r0, [r4, r2]
cmp r0, 0
@@ -393507,7 +393507,7 @@ _0813A69C:
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
bl sub_80F98DC
movs r0, 0x1
@@ -393653,7 +393653,7 @@ sub_813A794: @ 813A794
movs r0, 0x7
movs r1, 0x6
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _0813A810
adds r0, r6, 0
bl sub_80F914C
@@ -393696,7 +393696,7 @@ sub_813A83C: @ 813A83C
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0813A86C
bl sub_813AD58
ldr r1, _0813A870
@@ -393730,7 +393730,7 @@ sub_813A878: @ 813A878
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
ldrb r3, [r5, 0x8]
ldrb r0, [r5]
str r0, [sp]
@@ -393907,7 +393907,7 @@ sub_813A9EC: @ 813A9EC
movs r1, 0x6
movs r2, 0xD
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
bl sub_80F98DC
movs r0, 0x1
@@ -394028,7 +394028,7 @@ sub_813AAC4: @ 813AAC4
ldr r0, _0813AAF8
movs r1, 0x1A
adds r2, r7, 0
- bl Print
+ bl MenuPrint
b _0813AB06
.align 2, 0
_0813AAF4: .4byte 0x020231cc
@@ -394037,7 +394037,7 @@ _0813AAFC:
ldr r0, _0813AB0C
movs r1, 0x1A
adds r2, r7, 0
- bl Print
+ bl MenuPrint
_0813AB06:
pop {r4-r7}
pop {r0}
@@ -394054,7 +394054,7 @@ sub_813AB10: @ 813AB10
lsrs r2, 24
ldr r0, _0813AB24
movs r1, 0x19
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -394075,7 +394075,7 @@ sub_813AB28: @ 813AB28
ldr r0, _0813AB4C
movs r1, 0x10
adds r2, r5, 0
- bl Print
+ bl MenuPrint
b _0813AB5A
.align 2, 0
_0813AB48: .4byte 0x020231cc
@@ -394084,7 +394084,7 @@ _0813AB50:
ldr r0, _0813AB60
movs r1, 0x10
adds r2, r5, 0
- bl Print
+ bl MenuPrint
_0813AB5A:
pop {r4,r5}
pop {r0}
@@ -394290,7 +394290,7 @@ _0813ACCE:
movs r0, 0x10
movs r2, 0x1C
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
_0813ACEA:
movs r2, 0x2
ldrsh r0, [r6, r2]
@@ -394511,17 +394511,17 @@ sub_813AE6C: @ 813AE6C
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0
movs r1, 0xC
movs r2, 0xE
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0
movs r1, 0
movs r2, 0xB
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0813AEFC
movs r1, 0x93
lsls r1, 3
@@ -394534,7 +394534,7 @@ sub_813AE6C: @ 813AE6C
ldr r0, [r4]
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
adds r0, r6, 0
bl sub_813ABE8
ldrb r3, [r5, 0x8]
@@ -394734,7 +394734,7 @@ _0813B036:
movs r0, 0x15
adds r1, r5, 0
movs r2, 0x1C
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldrb r0, [r6, 0x3]
cmp r4, r0
beq _0813B0C4
@@ -394750,7 +394750,7 @@ _0813B036:
mov r0, r8
movs r1, 0x15
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -394771,7 +394771,7 @@ _0813B08A:
movs r0, 0x15
movs r2, 0x1C
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
_0813B0A4:
ldrb r0, [r5, 0x2]
cmp r0, 0
@@ -394789,7 +394789,7 @@ _0813B0C4:
ldr r0, _0813B0D0
movs r1, 0x15
adds r2, r5, 0
- bl Print
+ bl MenuPrint
b _0813B08A
.align 2, 0
_0813B0D0: .4byte gUnknown_0840E645
@@ -394835,21 +394835,21 @@ sub_813B108: @ 813B108
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0
movs r2, 0x8
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0813B16C
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
movs r0, 0x14
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
bl sub_813B01C
ldr r0, _0813B170
@@ -395019,7 +395019,7 @@ sub_813B294: @ 813B294
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0813B2E8
ldr r1, _0813B2EC
ldrb r0, [r1]
@@ -395066,7 +395066,7 @@ sub_813B300: @ 813B300
movs r1, 0
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_8139E24
pop {r4}
@@ -395107,12 +395107,12 @@ sub_813B348: @ 813B348
movs r1, 0
movs r2, 0xC
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _0813B394
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0xB
@@ -395336,7 +395336,7 @@ sub_813B510: @ 813B510
ldr r0, _0813B548
movs r1, 0x1
movs r2, 0x3
- bl Print
+ bl MenuPrint
ldr r1, _0813B54C
ldr r2, _0813B550
adds r0, r4, 0
@@ -395362,7 +395362,7 @@ sub_813B554: @ 813B554
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _0813B574
adds r0, r4, 0
bl sub_80F914C
@@ -395392,7 +395392,7 @@ sub_813B578: @ 813B578
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldrh r0, [r6, 0x20]
movs r1, 0x1
bl sub_80A9424
@@ -395454,7 +395454,7 @@ sub_813B610: @ 813B610
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_813B758
pop {r4}
@@ -395605,7 +395605,7 @@ sub_813B734: @ 813B734
movs r1, 0
movs r2, 0xC
movs r3, 0x9
- bl Reset
+ bl MenuZeroFillWindowRect
adds r0, r4, 0
bl sub_813B758
pop {r4}
@@ -402751,8 +402751,8 @@ sub_813EEE4: @ 813EEE4
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
ldr r1, _0813EFA0
movs r2, 0xF8
lsls r2, 5
@@ -402762,17 +402762,17 @@ sub_813EEE4: @ 813EEE4
movs r1, 0
movs r2, 0x1D
movs r3, 0x3
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0813EFA4
movs r1, 0x16
movs r2, 0x1
movs r3, 0x38
- bl Free
+ bl sub_8072BD8
movs r0, 0x10
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
bl sub_813F0C8
ldr r0, _0813EFA8
bl SetMainCallback2
@@ -402937,7 +402937,7 @@ sub_813F0C8: @ 813F0C8
movs r1, 0x11
movs r2, 0x1C
movs r3, 0x12
- bl sub_8071EBC
+ bl MenuFillWindowRectWithBlankTile
ldr r1, _0813F0F0
ldrb r0, [r1, 0x1E]
cmp r0, 0
@@ -402946,7 +402946,7 @@ sub_813F0C8: @ 813F0C8
adds r0, 0x8
movs r1, 0x11
movs r2, 0x11
- bl Print
+ bl MenuPrint
_0813F0EA:
pop {r0}
bx r0
@@ -409186,11 +409186,11 @@ _08142228:
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08142268
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, _0814226C
mov r0, r10
add r0, r8
@@ -409284,7 +409284,7 @@ sub_81422E8: @ 81422E8
adds r0, r5, 0
bl SetUpWindowConfig
adds r0, r5, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r1, _08142318
lsls r0, r4, 2
adds r0, r4
@@ -409393,7 +409393,7 @@ _0814235E:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
adds r4, r5
ldr r0, _08142400
str r0, [r4]
@@ -409646,7 +409646,7 @@ _081425C0:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xF
bl sub_8143068
@@ -409760,7 +409760,7 @@ _08142698:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r1, _081426F0
mov r2, r9
adds r0, r2, r6
@@ -409839,7 +409839,7 @@ sub_8142738: @ 8142738
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r0, _08142788
ldrb r0, [r0, 0x8]
movs r1, 0x78
@@ -409909,7 +409909,7 @@ _081427DC:
movs r1, 0x2
movs r2, 0xF
movs r3, 0x9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x1
movs r1, 0x2
bl sub_8143300
@@ -409917,11 +409917,11 @@ _081427DC:
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08142810
movs r1, 0x4
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r0, _08142814
str r0, [r4]
_0814280A:
@@ -410267,7 +410267,7 @@ _08142AB8:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r1, _08142AF0
adds r0, r6, r5
lsls r0, 3
@@ -410486,7 +410486,7 @@ _08142C3C:
ldr r0, _08142CB8
movs r1, 0
movs r2, 0
- bl Print
+ bl MenuPrint
ldr r0, _08142CC4
str r0, [r4]
add sp, 0x10
@@ -410904,11 +410904,11 @@ sub_8142FEC: @ 8142FEC
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08143020
movs r1, 0x3
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
ldr r1, _08143024
lsls r0, r4, 2
adds r0, r4
@@ -410930,7 +410930,7 @@ sub_814302C: @ 814302C
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08143056
@@ -410968,7 +410968,7 @@ sub_8143068: @ 8143068
lsrs r2, 24
movs r1, 0
movs r3, 0xF0
- bl Free
+ bl sub_8072BD8
pop {r0}
bx r0
.align 2, 0
@@ -411034,7 +411034,7 @@ _081430EA:
lsls r2, r4, 24
lsrs r2, 24
adds r0, r5, 0
- bl Print
+ bl MenuPrint
adds r7, r5, 0
movs r3, 0
mov r1, r9
@@ -411090,7 +411090,7 @@ _0814313A:
ldr r3, [sp]
lsls r2, r3, 24
lsrs r2, 24
- bl Print
+ bl MenuPrint
ldr r6, [sp, 0x8]
lsls r1, r6, 24
lsrs r1, 24
@@ -411100,7 +411100,7 @@ _0814313A:
lsrs r3, 24
movs r0, 0
movs r2, 0x1D
- bl Reset
+ bl MenuZeroFillWindowRect
b _081432E4
.align 2, 0
_08143188: .4byte 0x020231cc
@@ -411218,7 +411218,7 @@ _0814324A:
lsls r2, r3, 24
lsrs r2, 24
adds r0, r5, 0
- bl Print
+ bl MenuPrint
mov r6, r9
ldrb r0, [r6, 0x9]
lsrs r6, r0, 1
@@ -411253,7 +411253,7 @@ _0814324A:
lsrs r4, 24
adds r0, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
mov r0, r9
ldrh r6, [r0]
ldr r1, _081432FC
@@ -411269,7 +411269,7 @@ _0814324A:
lsrs r1, 24
adds r0, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
_081432E4:
add sp, 0x14
pop {r3-r5}
@@ -411308,7 +411308,7 @@ sub_8143300: @ 8143300
lsrs r4, 24
adds r1, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
ldr r0, _081433D0
mov r10, r0
movs r1, 0xE
@@ -411319,14 +411319,14 @@ sub_8143300: @ 8143300
mov r8, r2
mov r1, r8
adds r2, r4, 0
- bl PrintCoinsString
+ bl sub_8072B4C
ldr r0, _081433D4
adds r4, r6, 0x3
lsls r4, 24
lsrs r4, 24
adds r1, r5, 0
adds r2, r4, 0
- bl Print
+ bl MenuPrint
mov r0, r10
ldrb r1, [r0, 0xA]
ldrb r0, [r0, 0xB]
@@ -411341,14 +411341,14 @@ sub_8143300: @ 8143300
mov r0, r9
mov r1, r8
adds r2, r4, 0
- bl PrintCoinsString
+ bl sub_8072B4C
ldr r0, _081433DC
adds r6, 0x5
lsls r6, 24
lsrs r6, 24
adds r1, r5, 0
adds r2, r6, 0
- bl Print
+ bl MenuPrint
mov r0, r10
ldrh r1, [r0, 0xE]
mov r0, r9
@@ -411372,7 +411372,7 @@ sub_8143300: @ 8143300
mov r0, r9
mov r1, r8
adds r2, r6, 0
- bl PrintCoinsString
+ bl sub_8072B4C
pop {r3-r5}
mov r8, r3
mov r9, r4
@@ -411604,7 +411604,7 @@ sub_8143570: @ 8143570
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
pop {r4}
pop {r0}
bx r0
@@ -412192,7 +412192,7 @@ _08143A0E:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r0, _08143AFC
movs r1, 0x80
movs r2, 0x40
@@ -413241,7 +413241,7 @@ _081442B0:
lsrs r2, 24
movs r1, 0
movs r3, 0xF0
- bl Free
+ bl sub_8072BD8
adds r0, r4, 0x1
lsls r0, 16
lsrs r4, r0, 16
@@ -413402,7 +413402,7 @@ _081443F8:
movs r1, 0x9
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _08144424
lsls r1, r5, 2
adds r1, r5
@@ -416724,7 +416724,7 @@ sub_8145D88: @ 8145D88
ldr r0, _08145ED4
bl SetUpWindowConfig
ldr r0, _08145ED8
- bl sub_8071C4C
+ bl InitMenuWindowConfig
bl pokedex_diploma_something
movs r0, 0x1
negs r0, r0
@@ -416925,7 +416925,7 @@ _08145FF4:
ldr r0, _08146010
movs r1, 0x6
movs r2, 0x2
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -417043,12 +417043,12 @@ _08146108: .4byte 0x03001770
_0814610C: .4byte 0x0000043c
_08146110:
ldr r0, _08146118
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _0814620C
.align 2, 0
_08146118: .4byte gWindowConfig_81E6E18
_0814611C:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _08146126
b _08146250
@@ -417537,19 +417537,19 @@ sub_81464E4: @ 81464E4
adds r0, r7, 0
movs r1, 0xC
movs r2, 0x4
- bl Print
+ bl MenuPrint
adds r0, r5, 0
movs r1, 0xE
movs r2, 0x4
- bl Print
+ bl MenuPrint
ldr r0, [r5, 0xC]
movs r1, 0x4
movs r2, 0xE
- bl Print
+ bl MenuPrint
ldr r0, [r5, 0x10]
movs r1, 0x4
movs r2, 0x10
- bl Print
+ bl MenuPrint
ldrh r1, [r5, 0x8]
lsls r0, r1, 5
subs r0, r1
@@ -417578,7 +417578,7 @@ _0814654E:
ldr r0, _081465A4
movs r1, 0xB
movs r2, 0x7
- bl Print
+ bl MenuPrint
ldrh r0, [r5, 0x8]
cmp r0, 0
beq _081465B0
@@ -417595,7 +417595,7 @@ _0814654E:
ldr r0, _081465AC
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
b _081465BA
.align 2, 0
_0814659C: .4byte 0x0203855e
@@ -417607,12 +417607,12 @@ _081465B0:
ldr r0, _081465E0
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
_081465BA:
ldr r0, _081465E4
movs r1, 0xB
movs r2, 0x9
- bl Print
+ bl MenuPrint
ldrb r0, [r5, 0x7]
cmp r0, 0
beq _081465EC
@@ -417624,7 +417624,7 @@ _081465BA:
ldr r0, [r1]
movs r1, 0x10
movs r2, 0x9
- bl Print
+ bl MenuPrint
b _081465F6
.align 2, 0
_081465E0: .4byte gUnknown_0840E674
@@ -417634,7 +417634,7 @@ _081465EC:
ldr r0, _081465FC
movs r1, 0x10
movs r2, 0x9
- bl Print
+ bl MenuPrint
_081465F6:
pop {r4-r7}
pop {r0}
@@ -418016,7 +418016,7 @@ sub_81468BC: @ 81468BC
movs r1, 0x4
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_81464E4
ldr r4, _081468F8
ldrb r0, [r4]
@@ -418081,8 +418081,8 @@ CB2_InitMysteryEventMenu: @ 8146930
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
- bl sub_8071EF4
+ bl InitMenuWindowConfig
+ bl MenuZeroFillScreen
movs r1, 0x80
lsls r1, 19
movs r2, 0xA0
@@ -418193,7 +418193,7 @@ _08146A54:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -418222,7 +418222,7 @@ _08146A90: .4byte gUnknown_0842C4C0
_08146A94: .4byte 0x03001770
_08146A98: .4byte 0x0000043c
_08146A9C:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08146AA8
@@ -418277,7 +418277,7 @@ _08146B0C: .4byte gUnknown_0842C4E9
_08146B10: .4byte 0x03001770
_08146B14: .4byte 0x0000043c
_08146B18:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08146B24
@@ -418303,11 +418303,11 @@ _08146B26:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08146B68
movs r1, 0x7
movs r2, 0x6
- bl Print
+ bl MenuPrint
ldr r2, _08146B6C
adds r1, r4, r2
b _08146D82
@@ -418351,7 +418351,7 @@ _08146BA4:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _08146BDC
adds r0, r4, 0
movs r1, 0x1
@@ -418383,7 +418383,7 @@ _08146C00:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
_08146C10:
ldr r4, _08146C2C
adds r0, r4, 0
@@ -418424,7 +418424,7 @@ _08146C54:
_08146C5C: .4byte 0x03001770
_08146C60: .4byte 0x0000043c
_08146C64:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08146C70
@@ -418507,8 +418507,8 @@ _08146D18:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl Reset
- bl sub_8072080
+ bl MenuZeroFillWindowRect
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08146DA4
@@ -418584,7 +418584,7 @@ _08146DA4:
movs r1, 0x5
movs r2, 0x17
movs r3, 0x8
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _08146E04
adds r0, r4, 0
movs r1, 0x1
@@ -418749,21 +418749,21 @@ _08146E6C:
ldr r0, _08146FF4
bl SetUpWindowConfig
ldr r0, _08146FF8
- bl sub_8071C4C
+ bl InitMenuWindowConfig
movs r0, 0xD
movs r1, 0x8
movs r2, 0x10
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x1
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08146FFC
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
movs r0, 0x1
negs r0, r0
str r4, [sp]
@@ -418878,11 +418878,11 @@ _0814705C:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081470D0
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _081470D4
ldrb r0, [r0]
bl sub_8125C3C
@@ -418892,7 +418892,7 @@ _0814705C:
ldr r0, _081470D8
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
_08147096:
adds r0, r4, 0x1
lsls r0, 24
@@ -418909,11 +418909,11 @@ _081470A6:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081470DC
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _081470E0
bl SetMainCallback2
b _0814713E
@@ -418930,7 +418930,7 @@ _081470E4:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08147104
ldr r0, [r0]
cmp r0, 0
@@ -418938,7 +418938,7 @@ _081470E4:
ldr r0, _08147108
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
b _0814713E
.align 2, 0
_08147104: .4byte 0x03005ebc
@@ -418948,11 +418948,11 @@ _0814710C:
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0814712C
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _08147130
bl SetMainCallback2
b _08147144
@@ -418963,7 +418963,7 @@ _08147134:
ldr r0, _0814714C
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
_0814713E:
ldr r0, _08147150
bl SetMainCallback2
@@ -418992,11 +418992,11 @@ sub_8147154: @ 8147154
movs r1, 0xC
movs r2, 0x1C
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08147198
movs r1, 0x2
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, _0814719C
bl SetVBlankCallback
ldr r0, _081471A0
@@ -419687,7 +419687,7 @@ _081476FE:
bl sub_8147774
cmp r0, 0
beq _08147716
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0x5
bl audio_play
movs r0, 0x2
@@ -419700,7 +419700,7 @@ _08147716:
lsls r0, 16
cmp r0, 0
bne _0814776A
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0x3
strh r0, [r4]
movs r0, 0x1E
@@ -419991,12 +419991,12 @@ _08147978: .4byte 0x03001770
_0814797C: .4byte 0x0000043c
_08147980:
ldr r0, _08147988
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _08147A44
.align 2, 0
_08147988: .4byte gWindowConfig_81E6E50
_0814798C:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
bne _08147996
b _08147AD0
@@ -420065,7 +420065,7 @@ _08147A20:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r1, _08147A34
ldr r2, _08147A38
adds r1, r2
@@ -420547,7 +420547,7 @@ sub_8147E10: @ 8147E10
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
lsrs r0, 24
cmp r0, 0x1
@@ -420635,7 +420635,7 @@ _08147ED8:
ldr r0, _08147EF8
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
ldr r1, _08147F00
lsls r0, r7, 2
adds r0, r7
@@ -421761,21 +421761,21 @@ sub_8148830: @ 8148830
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _081488AC
movs r1, 0x3
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x2
movs r1, 0x1
movs r2, 0x8
movs r3, 0x6
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _081488B0
movs r0, 0x3
movs r1, 0x2
movs r2, 0x2
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0x1
str r0, [sp]
movs r0, 0x5
@@ -421809,7 +421809,7 @@ sub_81488BC: @ 81488BC
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -422004,7 +422004,7 @@ _08148A2C:
ldr r0, _08148AE0
bl SetUpWindowConfig
ldr r0, _08148AE4
- bl sub_8071C4C
+ bl InitMenuWindowConfig
movs r0, 0x1
negs r0, r0
ldr r1, _08148AE8
@@ -425310,17 +425310,17 @@ sub_814A404: @ 814A404
unref_sub_814A414: @ 814A414
push {lr}
sub sp, 0x8
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0
movs r2, 0x10
movs r3, 0x12
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r3, _0814A458
movs r0, 0x2
movs r1, 0x1
movs r2, 0x8
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0xF
diff --git a/asm/rom_8040EB4.s b/asm/rom_8040EB4.s
index 146010ab7..dbd6f24ec 100644
--- a/asm/rom_8040EB4.s
+++ b/asm/rom_8040EB4.s
@@ -3355,7 +3355,7 @@ _0804279C:
movs r1, 0x6
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
bl script_env_2_enable_and_set_ctx_running
b _08042816
.align 2, 0
@@ -3380,7 +3380,7 @@ _080427E8:
movs r1, 0x6
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
bl script_env_2_enable_and_set_ctx_running
_08042816:
pop {r4,r5}
@@ -3399,7 +3399,7 @@ sub_8042824: @ 8042824
movs r1, 0x6
movs r2, 0x1D
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r4, _08042880
adds r0, r4, 0
add r1, sp, 0x8
@@ -3407,7 +3407,7 @@ sub_8042824: @ 8042824
add r0, sp, 0x8
movs r1, 0x10
movs r2, 0x7
- bl Print
+ bl MenuPrint
adds r0, r4, 0
add r1, sp, 0x8
bl sub_80426B0
@@ -4524,14 +4524,14 @@ _080431B8:
movs r1, 0x8
movs r2, 0x1B
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0x16
movs r1, 0x8
movs r2, 0x4
- bl sub_807292C
+ bl InitYesNoMenu
b _08043298
_080431DA:
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
lsrs r2, r0, 24
asrs r0, 24
@@ -14455,7 +14455,7 @@ _08047F48:
ldr r0, _08048024
bl SetVBlankCallback
ldr r0, _08048028
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r4, _0804802C
adds r0, r4, 0
bl SetUpWindowConfig
@@ -14472,7 +14472,7 @@ _08047F48:
ldr r0, [r5]
adds r0, 0x4
bl LoadTextWindowGraphics
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_809D51C
ldr r0, [r5]
adds r0, 0x75
@@ -15150,7 +15150,7 @@ _0804857C:
ldr r0, _0804863C
bl SetVBlankCallback
ldr r0, _08048640
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r4, _08048644
adds r0, r4, 0
bl SetUpWindowConfig
@@ -15167,7 +15167,7 @@ _0804857C:
ldr r0, [r5]
adds r0, 0x4
bl LoadTextWindowGraphics
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_809D51C
ldr r0, [r5]
adds r0, 0x75
@@ -17307,7 +17307,7 @@ _080496F4:
movs r0, 0x13
movs r1, 0xF
movs r2, 0x2
- bl PrintStringArray
+ bl PrintMenuItems
movs r0, 0
str r0, [sp]
movs r0, 0x9
@@ -17354,7 +17354,7 @@ _0804977A:
movs r0, 0x18
movs r1, 0xE
movs r2, 0x4
- bl sub_807292C
+ bl InitYesNoMenu
ldr r0, [r4]
adds r0, 0x7B
movs r1, 0x4
@@ -18058,7 +18058,7 @@ DisplayMessageAndContinueTask: @ 8049CF0
movs r0, 0x18
movs r1, 0xE
movs r2, 0x4
- bl sub_807292C
+ bl InitYesNoMenu
ldr r0, [r4]
adds r0, 0xB4
movs r1, 0
@@ -19686,7 +19686,7 @@ _0804A9DE:
thumb_func_start sub_804A9F4
sub_804A9F4: @ 804A9F4
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
pop {r0}
bx r0
thumb_func_end sub_804A9F4
@@ -19694,7 +19694,7 @@ sub_804A9F4: @ 804A9F4
thumb_func_start sub_804AA00
sub_804AA00: @ 804AA00
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
pop {r0}
bx r0
thumb_func_end sub_804AA00
@@ -21092,7 +21092,7 @@ _0804B47C:
ldr r0, [r6]
adds r0, 0x4
bl LoadTextWindowGraphics
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _0804B580
ldr r4, _0804B584
adds r0, r4, 0
@@ -21494,7 +21494,7 @@ _0804B7F4:
ldr r0, [r5]
adds r0, 0x4
bl LoadTextWindowGraphics
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r1, _0804B904
ldr r2, _0804B908
adds r0, r2, 0
@@ -22320,7 +22320,7 @@ _0804BF4C:
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl Reset
+ bl MenuZeroFillWindowRect
b _0804C0CA
.align 2, 0
_0804BF78: .4byte 0x03004828
@@ -26668,7 +26668,7 @@ _0804E5AC:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r3, _0804E610
ldr r2, [r3]
ldrb r0, [r2]
@@ -26774,11 +26774,11 @@ _0804E6A8:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0804E6CC
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
_0804E6BE:
ldr r0, _0804E6D0
ldr r1, [r0]
@@ -26790,7 +26790,7 @@ _0804E6BE:
_0804E6CC: .4byte gUnknown_0842D307
_0804E6D0: .4byte 0x03004854
_0804E6D4:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _0804E71A
@@ -27327,7 +27327,7 @@ _0804EBBC:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r1, _0804EC68
ldr r2, _0804EC6C
adds r0, r2, 0
@@ -27482,11 +27482,11 @@ _0804ED14:
movs r1, 0xD
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0804ED40
movs r1, 0x1
movs r2, 0xE
- bl Print
+ bl MenuPrint
ldr r2, _0804ED44
ldr r1, [r2]
movs r3, 0
@@ -27566,7 +27566,7 @@ _0804EDB8:
bgt _0804EDCE
b _0804F0CE
_0804EDCE:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl GetBlockRecievedStatus
adds r4, r0, 0
bl sub_8008198
@@ -27911,16 +27911,16 @@ _0804F084:
movs r1, 0xD
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0804F09C
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
b _0804F0AA
.align 2, 0
_0804F09C: .4byte gUnknown_0842D2D9
_0804F0A0:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _0804F0CE
@@ -27976,7 +27976,7 @@ sub_804F0F4: @ 804F0F4
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r1, _0804F160
ldr r2, _0804F164
adds r0, r2, 0
@@ -31066,7 +31066,7 @@ sub_80508FC: @ 80508FC
movs r1, 0x8
movs r2, 0x1C
movs r3, 0xD
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r1, _08050948
ldr r3, _0805094C
movs r0, 0x20
@@ -31077,7 +31077,7 @@ sub_80508FC: @ 80508FC
ldr r0, _08050950
movs r1, 0x18
movs r2, 0x9
- bl Print
+ bl MenuPrint
ldr r0, [r4]
adds r0, 0xAA
ldrb r0, [r0]
@@ -31307,17 +31307,17 @@ _08050B08:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08050B30
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
b _08050CB6
.align 2, 0
_08050B2C: .4byte 0x03004854
_08050B30: .4byte gUnknown_0842D3B5
_08050B34:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08050B40
@@ -31481,7 +31481,7 @@ _08050C78:
ldr r0, _08050C90
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
_08050C82:
ldr r0, _08050C94
ldr r1, [r0]
@@ -31496,7 +31496,7 @@ _08050C88:
_08050C90: .4byte gUnknown_0842D3A5
_08050C94: .4byte 0x03004854
_08050C98:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08050CB6
@@ -31779,7 +31779,7 @@ _08050ED8:
movs r1, 0x8
movs r2, 0x1C
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _08050F0C
ldr r0, [r5]
adds r0, 0x7A
@@ -31808,7 +31808,7 @@ _08050F18:
movs r1, 0x8
movs r2, 0x1C
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _08050F60
ldr r0, [r5]
adds r0, 0x7A
@@ -31827,14 +31827,14 @@ _08050F4C:
adds r0, r4, 0
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
b _080510C4
.align 2, 0
_08050F60: .4byte 0x020234cc
_08050F64: .4byte 0x03002978
_08050F68: .4byte gUnknown_0842D434
_08050F6C:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _08050F78
@@ -31873,11 +31873,11 @@ _08050FAA:
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08050FCC
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
bl sub_80084A4
ldr r0, _08050FD0
ldr r1, [r0]
@@ -32089,7 +32089,7 @@ _0805116E:
movs r1, 0x8
movs r2, 0x1C
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0805118C
b _080511AC
.align 2, 0
@@ -32105,17 +32105,17 @@ _08051190:
movs r1, 0x8
movs r2, 0x1C
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _080511B8
_080511AC:
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
b _0805121E
.align 2, 0
_080511B8: .4byte gUnknown_0842D3DC
_080511BC:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _0805121E
@@ -32845,7 +32845,7 @@ _08051730:
movs r1, 0x4
movs r2, 0xA
movs r3, 0xC
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r2, 0
ldr r6, _080517C4
_0805175C:
@@ -32867,17 +32867,17 @@ _0805175C:
adds r2, r1
lsrs r2, 24
movs r1, 0x5
- bl Print
+ bl MenuPrint
_08051784:
movs r0, 0
movs r1, 0xD
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _080517CC
movs r1, 0x1
movs r2, 0xF
- bl Print
+ bl MenuPrint
adds r2, r4, 0
cmp r2, 0x2
ble _0805175C
@@ -32908,7 +32908,7 @@ _080517D4:
ldr r0, _08051814
movs r1, 0x3
movs r2, 0xA
- bl Print
+ bl MenuPrint
_080517E6:
ldrh r0, [r4, 0x8]
adds r0, 0x1
@@ -33637,12 +33637,12 @@ _08051D20:
movs r1, 0x2
movs r2, 0x19
movs r3, 0x11
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08051F14
movs r1, 0x5
movs r2, 0x3
movs r3, 0xA0
- bl Free
+ bl sub_8072BD8
movs r6, 0
ldr r1, _08051F18
ldr r0, [r1]
@@ -33730,7 +33730,7 @@ _08051D56:
lsls r2, 24
lsrs r2, 24
movs r1, 0x5
- bl Print
+ bl MenuPrint
lsls r5, 16
lsrs r6, r5, 16
mov r1, r8
@@ -33791,7 +33791,7 @@ _08051E04:
adds r0, 0xAB
movs r1, 0x5
movs r2, 0xD
- bl Print
+ bl MenuPrint
ldr r0, [r6]
movs r2, 0x96
lsls r2, 1
@@ -33849,7 +33849,7 @@ _08051E04:
adds r0, 0xAB
movs r1, 0x5
movs r2, 0xF
- bl Print
+ bl MenuPrint
ldr r1, [r6]
movs r0, 0x98
lsls r0, 1
@@ -33882,12 +33882,12 @@ _08051F44:
.align 2, 0
_08051F54: .4byte 0x03001770
_08051F58:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r6, 0
add r5, sp, 0x28
ldr r0, _08051FEC
@@ -33936,7 +33936,7 @@ _08051F86:
adds r0, 0xAB
movs r1, 0x1
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
ldr r0, _08051FF4
ldrh r0, [r0]
movs r1, 0x1
@@ -33954,7 +33954,7 @@ _08051FEC: .4byte 0x03004854
_08051FF0: .4byte sub_8052BD0
_08051FF4: .4byte 0x0203855e
_08051FF8:
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _0805200A
@@ -34315,12 +34315,12 @@ _080522B6:
movs r1, 0x2
movs r2, 0x19
movs r3, 0x11
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0805236C
movs r1, 0x5
movs r2, 0x3
movs r3, 0xA0
- bl Free
+ bl sub_8072BD8
ldr r6, _08052370
adds r0, r6, 0
movs r1, 0x8C
@@ -34485,7 +34485,7 @@ _08052380:
lsls r2, 24
lsrs r2, 24
movs r1, 0x5
- bl Print
+ bl MenuPrint
lsls r6, 16
lsrs r6, 16
mov r8, r6
@@ -34568,7 +34568,7 @@ unref_sub_80524BC: @ 80524BC
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r0, _08052524
ldrh r0, [r0, 0x20]
bl SeedRng
@@ -34616,7 +34616,7 @@ sub_8052530: @ 8052530
mov r0, sp
movs r1, 0x2
movs r2, 0
- bl Print
+ bl MenuPrint
ldr r4, _080525CC
movs r1, 0x1A
ldrsh r0, [r4, r1]
@@ -34632,7 +34632,7 @@ sub_8052530: @ 8052530
mov r0, sp
movs r1, 0x6
movs r2, 0
- bl Print
+ bl MenuPrint
movs r6, 0
mov r2, sp
adds r2, 0x3
@@ -34705,7 +34705,7 @@ _080525F8:
mov r0, sp
movs r1, 0x2
adds r2, r5, 0
- bl Print
+ bl MenuPrint
mov r4, r8
adds r4, 0x1
adds r4, r6, r4
@@ -34799,7 +34799,7 @@ _080525F8:
mov r0, sp
movs r1, 0x7
adds r2, r5, 0
- bl Print
+ bl MenuPrint
adds r0, r6, 0x1
lsls r0, 24
lsrs r6, r0, 24
@@ -34822,7 +34822,7 @@ _080526EC:
mov r0, sp
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
mov r3, r8
ldrb r1, [r3, 0x11]
mov r0, sp
@@ -34884,7 +34884,7 @@ _080526EC:
mov r0, sp
movs r1, 0x7
movs r2, 0x11
- bl Print
+ bl MenuPrint
_080527A4:
add sp, 0x98
pop {r3-r5}
@@ -35044,7 +35044,7 @@ _080528E8:
mov r0, sp
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
add sp, 0x58
pop {r3,r4}
mov r8, r3
@@ -35335,15 +35335,15 @@ ShowBerryBlenderRecordWindow: @ 8052B14
movs r1, 0x3
movs r2, 0x17
movs r3, 0x10
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08052BBC
movs r1, 0x8
movs r2, 0x4
- bl Print
+ bl MenuPrint
ldr r0, _08052BC0
movs r1, 0x8
movs r2, 0x9
- bl Print
+ bl MenuPrint
movs r0, 0
mov r8, r0
ldr r0, _08052BC4
@@ -35384,7 +35384,7 @@ _08052B50:
lsrs r2, r7, 24
mov r0, sp
movs r1, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x80
lsls r0, 18
adds r7, r0
diff --git a/asm/rom_8065394.s b/asm/rom_8065394.s
index 2b2f1b83c..46dc9d146 100644
--- a/asm/rom_8065394.s
+++ b/asm/rom_8065394.s
@@ -4127,7 +4127,7 @@ sub_80671B4: @ 80671B4
adds r4, 0x1
str r4, [r0, 0x8]
adds r0, r5, 0
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -4195,7 +4195,7 @@ sub_8067230: @ 8067230
adds r4, 0x1
str r4, [r0, 0x8]
adds r0, r5, 0
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
pop {r4,r5}
pop {r1}
@@ -4324,11 +4324,11 @@ sub_806730C: @ 806730C
adds r1, r6, 0
mov r2, r8
mov r3, r9
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r4, 0
mov r1, r10
adds r2, r7, 0
- bl Print
+ bl MenuPrint
movs r0, 0
pop {r3-r5}
mov r8, r3
@@ -11234,7 +11234,7 @@ sub_806A738: @ 806A738
movs r1, 0x8
movs r2, 0x19
movs r3, 0xB
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_806A738
@@ -11338,7 +11338,7 @@ sub_806A74C: @ 806A74C
ldr r0, _0806A83C
mov r1, r10
ldr r2, [sp]
- bl Print
+ bl MenuPrint
add sp, 0x4
pop {r3-r5}
mov r8, r3
@@ -11379,11 +11379,11 @@ sub_806A850: @ 806A850
movs r1, 0x8
movs r2, 0x19
movs r3, 0xB
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0806A8A8
movs r1, 0x14
movs r2, 0x9
- bl Print
+ bl MenuPrint
str r4, [sp]
str r5, [sp, 0x4]
movs r0, 0x4
@@ -11759,7 +11759,7 @@ _0806AB16:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
movs r1, 0x80
lsls r1, 19
movs r2, 0x88
@@ -11812,11 +11812,11 @@ sub_806ABC8: @ 806ABC8
sub_806ABDC: @ 806ABDC
push {r4,lr}
adds r4, r0, 0
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
adds r0, r4, 0
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
pop {r4}
pop {r0}
bx r0
@@ -11843,16 +11843,16 @@ sub_806ABF4: @ 806ABF4
.align 2, 0
_0806AC14: .4byte 0x03004b28
_0806AC18:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0
movs r2, 0x14
movs r3, 0xA
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _0806AC98
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
ldr r0, _0806AC9C
ldrh r2, [r0]
ldrb r3, [r0, 0x2]
@@ -11866,7 +11866,7 @@ _0806AC18:
ldr r0, _0806ACA0
movs r1, 0x1
movs r2, 0x5
- bl Print
+ bl MenuPrint
ldr r1, _0806ACA4
adds r0, r1, 0
adds r0, 0xA0
@@ -12019,7 +12019,7 @@ _0806AD80:
bne _0806AD96
b _0806AEC4
_0806AD96:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
ldr r0, _0806ADC8
bl sub_806ABDC
ldr r2, _0806ADCC
@@ -12756,12 +12756,12 @@ _0806B3B8: .4byte 0x03001770
_0806B3BC: .4byte 0x0000043c
_0806B3C0:
ldr r0, _0806B3C8
- bl sub_8071C58
+ bl MultistepInitMenuWindowConfigBegin
b _0806B426
.align 2, 0
_0806B3C8: .4byte gWindowConfig_81E6CC8
_0806B3CC:
- bl sub_8071C94
+ bl MultistepInitMenuWindowConfigContinue
cmp r0, 0
beq _0806B450
ldr r1, _0806B3DC
@@ -17145,14 +17145,14 @@ _0806D570:
movs r2, 0x16
_0806D576:
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
b _0806D58A
_0806D57E:
movs r0, 0
movs r1, 0x10
movs r2, 0x12
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
_0806D58A:
ldr r0, _0806D5A0
lsls r1, r4, 2
@@ -17160,7 +17160,7 @@ _0806D58A:
ldr r0, [r1]
movs r1, 0x1
movs r2, 0x11
- bl Print
+ bl MenuPrint
_0806D59A:
pop {r4}
pop {r0}
@@ -17176,7 +17176,7 @@ sub_806D5A4: @ 806D5A4
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_806D5A4
@@ -19579,7 +19579,7 @@ sub_806E7D0: @ 806E7D0
adds r3, 0x1
lsls r3, 24
lsrs r3, 24
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_8072DEC
add sp, 0x4
pop {r4-r6}
@@ -19616,11 +19616,11 @@ sub_806E834: @ 806E834
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
adds r0, r5, 0
movs r1, 0x4
movs r2, 0xF
- bl AddTextPrinterWithCallbackForMessage
+ bl MenuPrintMessage
ldr r0, _0806E87C
movs r1, 0x1
bl CreateTask
@@ -19647,7 +19647,7 @@ sub_806E884: @ 806E884
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _0806E8C0
@@ -19667,7 +19667,7 @@ sub_806E884: @ 806E884
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
_0806E8BA:
adds r0, r5, 0
bl DestroyTask
@@ -19926,7 +19926,7 @@ sub_806EACC: @ 806EACC
push {r4-r6,lr}
lsls r0, 24
lsrs r6, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -19935,7 +19935,7 @@ sub_806EACC: @ 806EACC
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0806EB30
ldr r0, [r4]
movs r1, 0xC
@@ -20012,7 +20012,7 @@ _0806EB8E:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
_0806EB9A:
ldr r0, _0806EBB0
lsls r1, r6, 2
@@ -20042,7 +20042,7 @@ sub_806EBB8: @ 806EBB8
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _0806EBE8
lsls r1, r4, 2
adds r1, r4
@@ -20342,7 +20342,7 @@ sub_806EE5C: @ 806EE5C
push {r4,r5,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -20395,13 +20395,13 @@ _0806EECA:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0
movs r1, 0xE
movs r2, 0x1D
movs r3, 0x13
_0806EEDE:
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0806EEF8
lsls r1, r4, 2
adds r1, r4
@@ -20430,7 +20430,7 @@ sub_806EF00: @ 806EF00
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _0806EF30
lsls r1, r4, 2
adds r1, r4
@@ -20453,7 +20453,7 @@ sub_806EF38: @ 806EF38
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -20462,7 +20462,7 @@ sub_806EF38: @ 806EF38
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0806EF70
ldr r0, [r0]
bl sub_80A2E78
@@ -20513,7 +20513,7 @@ _0806EFB6:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0806EFE0
movs r1, 0x1
bl sub_806E834
@@ -20546,7 +20546,7 @@ sub_806EFEC: @ 806EFEC
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _0806F01C
lsls r1, r4, 2
adds r1, r4
@@ -20968,7 +20968,7 @@ sub_806F358: @ 806F358
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _0806F388
lsls r1, r4, 2
adds r1, r4
@@ -20992,7 +20992,7 @@ sub_806F390: @ 806F390
lsls r0, 24
lsrs r4, r0, 24
adds r5, r4, 0
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -21001,7 +21001,7 @@ sub_806F390: @ 806F390
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0806F3C8
movs r1, 0x1
bl sub_806E834
@@ -21292,7 +21292,7 @@ sub_806F614: @ 806F614
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _0806F660
ldr r1, _0806F664
ldrh r2, [r1, 0x8]
@@ -21340,7 +21340,7 @@ sub_806F67C: @ 806F67C
movs r0, 0x17
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r0, _0806F6AC
lsls r1, r4, 2
adds r1, r4
@@ -21364,7 +21364,7 @@ sub_806F6B4: @ 806F6B4
lsls r0, 24
lsrs r5, r0, 24
adds r6, r5, 0
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -21373,7 +21373,7 @@ sub_806F6B4: @ 806F6B4
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0806F710
ldr r0, [r4]
ldr r1, _0806F714
@@ -21427,7 +21427,7 @@ _0806F74A:
movs r1, 0x8
movs r2, 0x1D
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r4, _0806F798
ldr r0, [r4]
ldr r1, _0806F79C
@@ -22622,7 +22622,7 @@ _08070134:
movs r1, 0xE
movs r2, 0x1A
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
movs r0, 0x1
bl audio_play
ldr r0, [r4]
@@ -22825,7 +22825,7 @@ sub_80702E4: @ 80702E4
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r5, 0
movs r0, 0x64
adds r7, r4, 0
@@ -22851,7 +22851,7 @@ _0807030C:
adds r2, r1
lsrs r2, 24
movs r1, 0x14
- bl Print
+ bl MenuPrint
cmp r4, 0
beq _08070340
adds r0, r6, 0x1
@@ -23047,7 +23047,7 @@ ether_effect_related_2: @ 80704B0
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
bl sub_806D5A4
bl GetMenuCursorPos
ldr r2, _080704EC
@@ -23077,7 +23077,7 @@ sub_80704F0: @ 80704F0
movs r1, 0xA
movs r2, 0x1D
movs r3, 0x13
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r0, _08070528
ldr r1, _0807052C
adds r0, r1
@@ -23464,7 +23464,7 @@ sub_8070848: @ 8070848
movs r1, 0
movs r2, 0x1D
movs r3, 0x7
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r7, 0
ldr r0, _080708E4
mov r10, r0
@@ -23782,7 +23782,7 @@ _08070AF4:
movs r1, 0
movs r2, 0x1D
movs r3, 0x7
- bl Reset
+ bl MenuZeroFillWindowRect
ldr r7, _08070B28
ldr r0, [r7]
movs r1, 0x1
@@ -24515,11 +24515,11 @@ sub_80710DC: @ 80710DC
movs r1, 0
movs r2, 0xA
movs r3, 0x5
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
ldr r0, _08071110
movs r1, 0x1
movs r2, 0x1
- bl Print
+ bl MenuPrint
pop {r0}
bx r0
.align 2, 0
@@ -24552,7 +24552,7 @@ _0807112E:
ldr r0, [r0]
lsrs r2, r5, 24
movs r1, 0x17
- bl Print
+ bl MenuPrint
movs r0, 0x80
lsls r0, 18
adds r5, r0
@@ -24621,7 +24621,7 @@ _080711BA:
movs r0, 0x16
movs r1, 0
movs r2, 0x1D
- bl DrawDefaultWindow
+ bl MenuDrawTextWindow
movs r0, 0
strh r0, [r5]
b _080711F6
@@ -24725,7 +24725,7 @@ sub_8071284: @ 8071284
push {r4,r5,lr}
adds r5, r0, 0
ldr r0, _080712AC
- bl sub_8071C4C
+ bl InitMenuWindowConfig
ldr r4, _080712B0
adds r0, r4, 0
movs r1, 0x50
@@ -25167,7 +25167,7 @@ sub_80715C0: @ 80715C0
beq _080715F4
b _08071604
_080715DC:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_8071230
ldr r1, _080715EC
ldr r0, _080715F0
@@ -25177,7 +25177,7 @@ _080715DC:
_080715EC: .4byte 0x03004ae8
_080715F0: .4byte sub_8071338
_080715F4:
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_8064E2C
bl script_env_2_disable
movs r0, 0x1
@@ -25214,7 +25214,7 @@ sub_8071630: @ 8071630
ldrb r0, [r0]
cmp r0, 0
beq _0807164C
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
bne _0807164C
@@ -25261,7 +25261,7 @@ sub_8071684: @ 8071684
adds r0, r4, 0
adds r1, r2, 0
bl StringExpandPlaceholders
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
adds r0, r4, 0
bl sub_8072044
ldr r1, _080716B4
@@ -25334,7 +25334,7 @@ sub_8071710: @ 8071710
movs r1, 0x8
movs r2, 0x1A
movs r3, 0xD
- bl Reset
+ bl MenuZeroFillWindowRect
pop {r0}
bx r0
thumb_func_end sub_8071710
@@ -25411,7 +25411,7 @@ _0807178E:
thumb_func_start sub_8071794
sub_8071794: @ 8071794
push {lr}
- bl sub_8071EF4
+ bl MenuZeroFillScreen
movs r0, 0
movs r1, 0
bl sub_80945C0
@@ -25432,7 +25432,7 @@ sub_80717B8: @ 80717B8
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _080717D0
ldr r0, _080717D4
str r0, [r1]
@@ -25447,7 +25447,7 @@ _080717D4: .4byte sub_80717D8
thumb_func_start sub_80717D8
sub_80717D8: @ 80717D8
push {lr}
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -25535,7 +25535,7 @@ sub_807187C: @ 807187C
movs r0, 0x14
movs r1, 0x8
movs r2, 0x1
- bl sub_8072974
+ bl DisplayYesNoMenu
ldr r1, _08071894
ldr r0, _08071898
str r0, [r1]
@@ -25550,7 +25550,7 @@ _08071898: .4byte sub_807189C
thumb_func_start sub_807189C
sub_807189C: @ 807189C
push {lr}
- bl FillWindowPixelBuffer
+ bl ProcessMenuInputNoWrap_
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -25652,7 +25652,7 @@ _0807195C: .4byte sub_80719AC
thumb_func_start sub_8071960
sub_8071960: @ 8071960
push {lr}
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _08071978
@@ -25694,7 +25694,7 @@ _080719A8:
thumb_func_start sub_80719AC
sub_80719AC: @ 80719AC
push {lr}
- bl sub_8072080
+ bl MenuUpdateWindowText
lsls r0, 24
cmp r0, 0
beq _080719C4
@@ -25829,7 +25829,7 @@ _08071AB6:
adds r0, r4, 0
bl SetUpWindowConfig
adds r0, r4, 0
- bl sub_8071C4C
+ bl InitMenuWindowConfig
movs r1, 0x80
lsls r1, 19
movs r2, 0x80
@@ -25948,11 +25948,11 @@ _08071BA0:
.4byte _08071BEE
.4byte _08071C06
_08071BB4:
- bl sub_8071FFC
+ bl MenuDisplayMessageBox
ldr r0, _08071BD0
movs r1, 0x2
movs r2, 0xF
- bl Print
+ bl MenuPrint
movs r0, 0x1
negs r0, r0
movs r1, 0
@@ -26007,7 +26007,7 @@ sub_8071C20: @ 8071C20
push {lr}
movs r0, 0x5
bl audio_play
- bl sub_8071EF4
+ bl MenuZeroFillScreen
bl sub_8064E2C
bl script_env_2_disable
bl sub_8072DEC
diff --git a/ewram_syms.txt b/ewram_syms.txt
index 277a7a173..41e6eb578 100644
--- a/ewram_syms.txt
+++ b/ewram_syms.txt
@@ -7,13 +7,13 @@ gUnknown_02024E8C = 0x2024E8C;
gSaveBlock2 = 0x2024EA4;
-stru_202E908 = 0x202E908;
-dword_202E9C8 = 0x202E9C8;
-byte_202E9CC = 0x202E9CC;
-word_202E9CE = 0x202E9CE;
-word_202E9D0 = 0x202E9D0;
-word_202E9D2 = 0x202E9D2;
-word_202E9D4 = 0x202E9D4;
+gMenuWindow = 0x202E908;
+gMenuWindowPtr = 0x202E9C8;
+gMenuMultistepInitState = 0x202E9CC;
+gMenuTextTileOffset = 0x202E9CE;
+gMenuTextWindowTileOffset = 0x202E9D0;
+gMenuTextWindowContentTileOffset = 0x202E9D2;
+gMenuMessageBoxContentTileOffset = 0x202E9D4;
gPlttBufferUnfaded = 0x202EAC8;
gPlttBufferFaded = 0x202EEC8;
diff --git a/src/link.c b/src/link.c
index a5d848b83..0fa1f4673 100644
--- a/src/link.c
+++ b/src/link.c
@@ -27,7 +27,7 @@ struct LinkTestBGInfo
u32 dummy_C;
};
-extern void sub_8071C4C(const struct WindowConfig *);
+extern void InitMenuWindowConfig(const struct WindowConfig *);
extern void sub_80516C4(u8, u16);
extern u8 unk_2000000[];
@@ -237,7 +237,7 @@ static void LinkTestScreen(void)
ResetTasks();
SetVBlankCallback(VBlankCB_LinkTest);
SetUpWindowConfig(&gWindowConfig_81E6CE4);
- sub_8071C4C(&gWindowConfig_81E6CE4);
+ InitMenuWindowConfig(&gWindowConfig_81E6CE4);
ResetBlockSend();
gLinkType = 0x1111;
OpenLink();
@@ -1224,8 +1224,8 @@ void CB2_LinkError(void)
ResetTasks();
SetVBlankCallback(VBlankCB_LinkTest);
SetUpWindowConfig(&gWindowConfig_81E7198);
- sub_8071C4C(&gWindowConfig_81E7198);
- sub_8071EF4();
+ InitMenuWindowConfig(&gWindowConfig_81E7198);
+ MenuZeroFillScreen();
REG_BLDALPHA = 0;
REG_BG0VOFS = 0;
REG_BG0HOFS = 0;
diff --git a/src/main_menu.c b/src/main_menu.c
index 830894c7b..246cf72a3 100644
--- a/src/main_menu.c
+++ b/src/main_menu.c
@@ -8,8 +8,8 @@
#include "palette.h"
#include "string_util.h"
-extern u8 sub_8072080(void);
-extern void Print(u8 *, u8, u8);
+extern u8 MenuUpdateWindowText(void);
+extern void MenuPrint(u8 *, u8, u8);
extern void CB2_ContinueSavedGame(void);
extern void CB2_InitMysteryEventMenu(void);
extern void CB2_InitOptionMenu(void);
@@ -21,21 +21,21 @@ extern u8 *sub_8072C14(u8 *, s32, u8, u8);
extern u8 sub_80729D8(u8 *, u8, u16, u8);
extern u8 GetBadgeCount(void);
extern void Task_Birch1(u8);
-void AddTextPrinterWithCallbackForMessage(const u8 *string, u8 a, u8 b);
+void MenuPrintMessage(const u8 *string, u8 a, u8 b);
u8 sub_8072CF4(u8 a);
void sub_8072DEC(void);
u8 sub_8075374(void);
-void sub_807206C(u32);
+void MenuSetText(u32);
void cry_related(u16, u8);
void audio_play(u8 a);
-void Reset(u8 a, u8 b, u8 c, u8 d);
+void MenuZeroFillWindowRect(u8 a, u8 b, u8 c, u8 d);
u8 GetMenuCursorPos(void);
void DoNamingScreen(u8 r0, struct SaveBlock2 *r1, u16 r2, u16 r3, u8 s0, MainCallback s4);
-void sub_8072974(u8 r0, u8 r1, u32 r2);
-s8 FillWindowPixelBuffer(void);
+void DisplayYesNoMenu(u8 r0, u8 r1, u32 r2);
+s8 ProcessMenuInputNoWrap_(void);
void c2_load_new_map_2(void);
void LZ77UnCompVram(const void *src, void *dest);
-void sub_8071C4C(const struct WindowConfig *);
+void InitMenuWindowConfig(const struct WindowConfig *);
void CB2_MainMenu(void);
void VBlankCB_MainMenu(void);
void DecompressPicFromTable_2(const struct SpriteSheet *, u8, u8, void *, void *, u32);
@@ -43,7 +43,7 @@ void LoadCompressedObjectPalette(const struct SpritePalette *);
void gpu_pal_obj_decompress_and_apply(u16, u8);
u8 AddNewGameBirchObject(u8, u8, u8);
u8 sub_80859BC(u8, u16, u16, u8, void *);
-void DrawDefaultWindow(u8 a, u8 b, u8 c, u8 d);
+void MenuDrawTextWindow(u8 a, u8 b, u8 c, u8 d);
extern struct PaletteFadeControl gPaletteFade;
extern u8 gSaveFileDeletedMessage[];
@@ -139,7 +139,7 @@ u32 InitMainMenu(u8 a1)
ResetSpriteData();
FreeAllSpritePalettes();
SetUpWindowConfig(&gWindowConfig_81E6C3C);
- sub_8071C4C(&gWindowConfig_81E6CE4);
+ InitMenuWindowConfig(&gWindowConfig_81E6CE4);
if (a1)
BeginNormalPaletteFade(-1, 0, 0x10, 0, 0x0000); // fade to black
@@ -197,16 +197,16 @@ void Task_CheckSave(u8 taskId)
gTasks[taskId].func = Task_CheckRtc;
break;
case 2:
- DrawDefaultWindow(2, 14, 27, 19);
- AddTextPrinterWithCallbackForMessage(gSaveFileDeletedMessage, 3, 15);
+ MenuDrawTextWindow(2, 14, 27, 19);
+ MenuPrintMessage(gSaveFileDeletedMessage, 3, 15);
REG_WIN0H = WIN_RANGE(17, 223);
REG_WIN0V = WIN_RANGE(113, 159);
gTasks[taskId].data[0] = 0;
gTasks[taskId].func = Task_WaitForSaveErrorAck;
break;
case 255:
- DrawDefaultWindow(2, 14, 27, 19);
- AddTextPrinterWithCallbackForMessage(gSaveFileCorruptMessage, 3, 15);
+ MenuDrawTextWindow(2, 14, 27, 19);
+ MenuPrintMessage(gSaveFileCorruptMessage, 3, 15);
REG_WIN0H = WIN_RANGE(17, 223);
REG_WIN0V = WIN_RANGE(113, 159);
gTasks[taskId].data[0] = 1;
@@ -223,8 +223,8 @@ void Task_CheckSave(u8 taskId)
gTasks[taskId].func = Task_CheckRtc;
break;
case 4:
- DrawDefaultWindow(2, 14, 27, 19);
- AddTextPrinterWithCallbackForMessage(gBoardNotInstalledMessage, 3, 15);
+ MenuDrawTextWindow(2, 14, 27, 19);
+ MenuPrintMessage(gBoardNotInstalledMessage, 3, 15);
REG_WIN0H = WIN_RANGE(17, 223);
REG_WIN0V = WIN_RANGE(113, 159);
gTasks[taskId].data[0] = 0;
@@ -235,11 +235,11 @@ void Task_CheckSave(u8 taskId)
void Task_WaitForSaveErrorAck(u8 taskId)
{
- if (sub_8072080())
+ if (MenuUpdateWindowText())
{
if (gMain.newKeys & A_BUTTON)
{
- Reset(2, 14, 27, 19);
+ MenuZeroFillWindowRect(2, 14, 27, 19);
gTasks[taskId].func = Task_CheckRtc;
}
}
@@ -263,8 +263,8 @@ void Task_CheckRtc(u8 taskId)
}
else
{
- DrawDefaultWindow(2, 14, 27, 19);
- AddTextPrinterWithCallbackForMessage(gBatteryDryMessage, 3, 15);
+ MenuDrawTextWindow(2, 14, 27, 19);
+ MenuPrintMessage(gBatteryDryMessage, 3, 15);
REG_WIN0H = WIN_RANGE(17, 223);
REG_WIN0V = WIN_RANGE(113, 159);
gTasks[taskId].func = Task_WaitForRtcErrorAck;
@@ -274,11 +274,11 @@ void Task_CheckRtc(u8 taskId)
void Task_WaitForRtcErrorAck(u8 taskId)
{
- if (sub_8072080())
+ if (MenuUpdateWindowText())
{
if ( gMain.newKeys & 1 )
{
- Reset(2, 14, 27, 19);
+ MenuZeroFillWindowRect(2, 14, 27, 19);
gTasks[taskId].func = Task_DrawMainMenu;
}
}
@@ -316,28 +316,28 @@ void Task_DrawMainMenu(u8 taskId)
{
case 0:
default:
- DrawDefaultWindow(1, 0, 28, 3);
+ MenuDrawTextWindow(1, 0, 28, 3);
PrintMainMenuItem(gMainMenuString_NewGame, 2, 1);
- DrawDefaultWindow(1, 4, 28, 7);
+ MenuDrawTextWindow(1, 4, 28, 7);
PrintMainMenuItem(gMainMenuString_Option, 2, 5);
break;
case 1:
- DrawDefaultWindow(1, 0, 28, 7);
+ MenuDrawTextWindow(1, 0, 28, 7);
PrintMainMenuItem(gMainMenuString_Continue, 2, 1);
- DrawDefaultWindow(1, 8, 28, 11);
+ MenuDrawTextWindow(1, 8, 28, 11);
PrintMainMenuItem(gMainMenuString_NewGame, 2, 9);
- DrawDefaultWindow(1, 12, 28, 15);
+ MenuDrawTextWindow(1, 12, 28, 15);
PrintMainMenuItem(gMainMenuString_Option, 2, 13);
PrintSaveFileInfo();
break;
case 2:
- DrawDefaultWindow(1, 0, 28, 7);
+ MenuDrawTextWindow(1, 0, 28, 7);
PrintMainMenuItem(gMainMenuString_Continue, 2, 1);
- DrawDefaultWindow(1, 8, 28, 11);
+ MenuDrawTextWindow(1, 8, 28, 11);
PrintMainMenuItem(gMainMenuString_NewGame, 2, 9);
- DrawDefaultWindow(1, 12, 28, 15);
+ MenuDrawTextWindow(1, 12, 28, 15);
PrintMainMenuItem(gMainMenuString_MysteryEvents, 2, 13);
- DrawDefaultWindow(1, 16, 28, 19);
+ MenuDrawTextWindow(1, 16, 28, 19);
PrintMainMenuItem(gMainMenuString_Option, 2, 0x11);
PrintSaveFileInfo();
break;
@@ -582,7 +582,7 @@ void PrintMainMenuItem(u8 *text, u8 left, u8 top)
buffer[29] = EOS;
- Print(buffer, left, top);
+ MenuPrint(buffer, left, top);
}
void PrintSaveFileInfo(void)
@@ -595,8 +595,8 @@ void PrintSaveFileInfo(void)
void PrintPlayerName(void)
{
- Print(gMainMenuString_Player, 2, 3);
- Print(gSaveBlock2.playerName, 9, 3);
+ MenuPrint(gMainMenuString_Player, 2, 3);
+ MenuPrint(gSaveBlock2.playerName, 9, 3);
}
void PrintPlayTime(void)
@@ -604,26 +604,26 @@ void PrintPlayTime(void)
u8 playTime[16];
u8 alignedPlayTime[32];
- Print(gMainMenuString_Time, 16, 3);
+ MenuPrint(gMainMenuString_Time, 16, 3);
FormatPlayTime(playTime, gSaveBlock2.playTimeHours, gSaveBlock2.playTimeMinutes, 1);
sub_8072C74(alignedPlayTime, playTime, 48, 1);
- Print(alignedPlayTime, 22, 3);
+ MenuPrint(alignedPlayTime, 22, 3);
}
void PrintPokedexCount(void)
{
u8 buffer[16];
- Print(gMainMenuString_Pokedex, 2, 5);
+ MenuPrint(gMainMenuString_Pokedex, 2, 5);
sub_8072C14(buffer, GetPokedexSeenCount(), 18, 0);
- Print(buffer, 9, 5);
+ MenuPrint(buffer, 9, 5);
}
void PrintBadgeCount(void)
{
u8 buffer[16];
- Print(gMainMenuString_Badges, 16, 5);
+ MenuPrint(gMainMenuString_Badges, 16, 5);
ConvertIntToDecimalString(buffer, GetBadgeCount());
sub_80729D8(buffer, 205, 40, 1);
}
@@ -721,7 +721,7 @@ void set_default_player_name(u8 a);
void Task_Birch1(u8 taskId)
{
SetUpWindowConfig(&gWindowConfig_81E6C3C);
- sub_8071C4C(&gWindowConfig_81E6CE4);
+ InitMenuWindowConfig(&gWindowConfig_81E6CE4);
REG_WIN0H = 0;
REG_WIN0V = 0;
REG_WININ = 0;
@@ -791,8 +791,8 @@ void task_new_game_prof_birch_speech_3(u8 taskId)
}
else
{
- DrawDefaultWindow(0x2, 0xD, 0x1B, 0x12);
- AddTextPrinterWithCallbackForMessage(gUnknown_081C6D78, 0x3, 0xE);
+ MenuDrawTextWindow(0x2, 0xD, 0x1B, 0x12);
+ MenuPrintMessage(gUnknown_081C6D78, 0x3, 0xE);
task->func = task_new_game_prof_birch_speech_4;
}
}
@@ -805,7 +805,7 @@ void task_new_game_prof_birch_speech_4(u8 taskId)
struct Task *tasks = gTasks;
struct Task *task = &tasks[taskId];
task->func = task_new_game_prof_birch_speech_5;
- AddTextPrinterWithCallbackForMessage(gUnknown_081C6DF8, 0x3, 0xE);
+ MenuPrintMessage(gUnknown_081C6DF8, 0x3, 0xE);
}
}
@@ -844,7 +844,7 @@ void task_new_game_prof_birch_speech_7(u8 taskId)
if(task->data[7] > 0x5F)
{
- sub_807206C((u32)&gUnknown_0840DFF7);
+ MenuSetText((u32)&gUnknown_0840DFF7);
task->func = task_new_game_prof_birch_speech_8;
}
}
@@ -865,7 +865,7 @@ void task_new_game_prof_birch_speech_8(u8 taskId)
{
if(sub_8072CF4(0x18))
{
- AddTextPrinterWithCallbackForMessage(gUnknown_081C6E1A, 0x3, 0xE);
+ MenuPrintMessage(gUnknown_081C6E1A, 0x3, 0xE);
gTasks[taskId].func = task_new_game_prof_birch_speech_9;
}
}
@@ -874,8 +874,8 @@ void task_new_game_prof_birch_speech_9(u8 taskId)
{
if(sub_8072CF4(0x18))
{
- DrawDefaultWindow(0x2, 0xD, 0x1B, 0x12);
- AddTextPrinterWithCallbackForMessage(gUnknown_081C6FCB, 0x3, 0xE);
+ MenuDrawTextWindow(0x2, 0xD, 0x1B, 0x12);
+ MenuPrintMessage(gUnknown_081C6FCB, 0x3, 0xE);
gTasks[taskId].func = task_new_game_prof_birch_speech_10;
}
}
@@ -962,8 +962,8 @@ void task_new_game_prof_birch_speech_13(u8 taskId)
void task_new_game_prof_birch_speech_14(u8 taskId)
{
- DrawDefaultWindow(2, 0xD, 0x1B, 0x12);
- AddTextPrinterWithCallbackForMessage(gUnknown_081C6FD8, 3, 14);
+ MenuDrawTextWindow(2, 0xD, 0x1B, 0x12);
+ MenuPrintMessage(gUnknown_081C6FD8, 3, 14);
gTasks[taskId].func = task_new_game_prof_birch_speech_15;
}
@@ -986,14 +986,14 @@ void task_new_game_prof_birch_speech_16(u8 taskId)
sub_8072DEC();
audio_play(5);
gSaveBlock2.playerGender = MALE;
- Reset(2, 4, 8, 9);
+ MenuZeroFillWindowRect(2, 4, 8, 9);
gTasks[taskId].func = sub_800A974;
break;
case FEMALE:
sub_8072DEC();
audio_play(5);
gSaveBlock2.playerGender = FEMALE;
- Reset(2, 4, 8, 9);
+ MenuZeroFillWindowRect(2, 4, 8, 9);
gTasks[taskId].func = sub_800A974;
break;
}
@@ -1060,8 +1060,8 @@ void task_new_game_prof_birch_speech_18(u8 taskId)
void sub_800A974(u8 taskId)
{
- DrawDefaultWindow(2, 13, 27, 18);
- AddTextPrinterWithCallbackForMessage(gUnknown_081C6FFA, 3, 14);
+ MenuDrawTextWindow(2, 13, 27, 18);
+ MenuPrintMessage(gUnknown_081C6FFA, 3, 14);
gTasks[taskId].func = Task_800A9B4;
}
@@ -1086,7 +1086,7 @@ void sub_800A9EC(u8 taskId)
case 4:
sub_8072DEC();
audio_play(5);
- Reset(2, 1, 22, 12);
+ MenuZeroFillWindowRect(2, 1, 22, 12);
set_default_player_name(n);
gTasks[taskId].func = task_new_game_prof_birch_speech_part2_1;
break;
@@ -1098,7 +1098,7 @@ void sub_800A9EC(u8 taskId)
case -1:
sub_8072DEC();
audio_play(5);
- Reset(2, 1, 22, 12);
+ MenuZeroFillWindowRect(2, 1, 22, 12);
gTasks[taskId].func = task_new_game_prof_birch_speech_14;
break;
}
@@ -1115,9 +1115,9 @@ void sub_800AAAC(u8 taskId)
void task_new_game_prof_birch_speech_part2_1(u8 taskId)
{
- DrawDefaultWindow(2, 13, 27, 18);
+ MenuDrawTextWindow(2, 13, 27, 18);
StringExpandPlaceholders(gStringVar4, gUnknown_081C7017);
- AddTextPrinterWithCallbackForMessage(gStringVar4, 3, 14);
+ MenuPrintMessage(gStringVar4, 3, 14);
gTasks[taskId].func = sub_800AB38;
}
@@ -1125,18 +1125,18 @@ void sub_800AB38(u8 taskId)
{
if(sub_8072CF4(0x18))
{
- sub_8072974(2, 1, 1);
+ DisplayYesNoMenu(2, 1, 1);
gTasks[taskId].func = task_new_game_prof_birch_speech_part2_4;
}
}
void task_new_game_prof_birch_speech_part2_4(u8 taskId)
{
- switch (FillWindowPixelBuffer())
+ switch (ProcessMenuInputNoWrap_())
{
case 0:
audio_play(5);
- Reset(2, 1, 8, 7);
+ MenuZeroFillWindowRect(2, 1, 8, 7);
gSprites[gTasks[taskId].data[2]].oam.objMode = ST_OAM_OBJ_BLEND;
sub_800B458(taskId, 2);
sub_800B614(taskId, 1);
@@ -1145,7 +1145,7 @@ void task_new_game_prof_birch_speech_part2_4(u8 taskId)
case -1:
case 1:
audio_play(5);
- Reset(2, 1, 8, 7);
+ MenuZeroFillWindowRect(2, 1, 8, 7);
gTasks[taskId].func = task_new_game_prof_birch_speech_14;
break;
}
@@ -1190,9 +1190,9 @@ void task_new_game_prof_birch_speech_part2_6(u8 taskId)
sub_800B534(taskId, 2);
sub_800B6C0(taskId, 1);
- DrawDefaultWindow(2, 13, 27, 18);
+ MenuDrawTextWindow(2, 13, 27, 18);
StringExpandPlaceholders(gStringVar4, gUnknown_081C7025);
- AddTextPrinterWithCallbackForMessage(gStringVar4, 3, 14);
+ MenuPrintMessage(gStringVar4, 3, 14);
gTasks[taskId].func = task_new_game_prof_birch_speech_part2_7;
}
}
@@ -1258,8 +1258,8 @@ void task_new_game_prof_birch_speech_part2_8(u8 taskId)
sub_800B534(taskId, 2);
sub_800B6C0(taskId, 1);
- DrawDefaultWindow(2, 13, 27, 18);
- AddTextPrinterWithCallbackForMessage(gUnknown_081C7074, 3, 14);
+ MenuDrawTextWindow(2, 13, 27, 18);
+ MenuPrintMessage(gUnknown_081C7074, 3, 14);
gTasks[taskId].func = task_new_game_prof_birch_speech_part2_9;
}
}
@@ -1363,7 +1363,7 @@ void new_game_prof_birch_speech_part2_start()
AddBirchSpeechObjects(taskId);
SetUpWindowConfig(&gWindowConfig_81E6C3C);
- sub_8071C4C(&gWindowConfig_81E6CE4);
+ InitMenuWindowConfig(&gWindowConfig_81E6CE4);
if (gSaveBlock2.playerGender != MALE)
{
@@ -1612,10 +1612,10 @@ void sub_800B6C0(u8 a1, u8 a2)
void CreateGenderMenu(u8 left, u8 top)
{
u8 menuLeft, menuTop;
- DrawDefaultWindow(left, top, left + 6, top + 5);
+ MenuDrawTextWindow(left, top, left + 6, top + 5);
menuLeft = left + 1;
menuTop = top + 1;
- PrintStringArray(menuLeft, menuTop, 2, gUnknown_081E79B0);
+ PrintMenuItems(menuLeft, menuTop, 2, gUnknown_081E79B0);
InitMenu(0, menuLeft, menuTop, 2, 0, 5);
}
@@ -1626,15 +1626,15 @@ s8 GenderMenuProcessInput(void)
void CreateNameMenu(u8 left, u8 top)
{
- DrawDefaultWindow(left, top, left + 10, top + 11);
+ MenuDrawTextWindow(left, top, left + 10, top + 11);
if (gSaveBlock2.playerGender == MALE)
{
- PrintStringArray((u8)(left + 1), (u8)(top + 1), 5, gUnknown_081E79C0);
+ PrintMenuItems((u8)(left + 1), (u8)(top + 1), 5, gUnknown_081E79C0);
}
else
{
- PrintStringArray((u8)(left + 1), (u8)(top + 1), 5, gUnknown_081E79E8);
+ PrintMenuItems((u8)(left + 1), (u8)(top + 1), 5, gUnknown_081E79E8);
}
InitMenu(0, (u8)(left + 1), (u8)(top + 1), 5, 0, 9);
diff --git a/src/menu.c b/src/menu.c
index 0e9c34c69..6533b59cf 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -17,33 +17,33 @@ struct Menu
u8 columnXCoords[8];
};
-void sub_8071C4C(struct WindowConfig *);
-void sub_8071C58(struct WindowConfig *);
-void sub_8071C64(struct WindowConfig *, u16);
-bool32 sub_8071C94(void);
-void sub_8071D48(struct WindowConfig *, u16);
+void InitMenuWindowConfig(struct WindowConfig *);
+void MultistepInitMenuWindowConfigBegin(struct WindowConfig *);
+void MultistepInitMenuWindowConfigInternal(struct WindowConfig *, u16);
+bool32 MultistepInitMenuWindowConfigContinue(void);
+void InitMenuWindowConfigInternal(struct WindowConfig *, u16);
void unref_sub_8071DA4(struct WindowConfig *, u16);
-void sub_8071E00(u8);
-void GetMapNamePopUpWindowId(void);
-void sub_8071E2C(struct WindowConfig *);
-void Print(u8 *, u8, u8);
-void Reset(u8, u8, u8, u8);
-void sub_8071EBC(u8, u8, u8, u8);
-void sub_8071EF4(void);
-void DrawDefaultWindow(u8, u8, u8, u8);
+void MenuLoadTextWindowGraphics_OverrideFrameType(u8);
+void MenuLoadTextWindowGraphics(void);
+void BasicInitMenuWindowConfig(struct WindowConfig *);
+void MenuPrint(u8 *, u8, u8);
+void MenuZeroFillWindowRect(u8, u8, u8, u8);
+void MenuFillWindowRectWithBlankTile(u8, u8, u8, u8);
+void MenuZeroFillScreen(void);
+void MenuDrawTextWindow(u8, u8, u8, u8);
void sub_8071F40(u8 *);
void sub_8071F60(u8, u8, u8, u8);
u16 unref_sub_8071F98(u8, u8);
void unref_sub_8071FBC(u16, u8, u8, u8, u8);
-void sub_8071FFC(void);
-void AddTextPrinterWithCallbackForMessage(u8 *, u8, u8);
+void MenuDisplayMessageBox(void);
+void MenuPrintMessage(u8 *, u8, u8);
void sub_8072044(u8 *);
-void sub_807206C(u8 *);
-u8 sub_8072080(void);
+void MenuSetText(u8 *);
+u8 MenuUpdateWindowText(void);
u8 unref_sub_8072098(void);
void sub_80720B0(void);
u8 MoveMenuCursor(s8);
-u8 MoveMenuCursorNoWrapAround(s8);
+u8 MoveMenuCursorNoWrap(s8);
u8 GetMenuCursorPos(void);
s8 ProcessMenuInput(void);
s8 ProcessMenuInputNoWrap(void);
@@ -56,18 +56,18 @@ void sub_8072620(u8, u8, u8, u8*[][2], u8);
void sub_807274C(u8, u8, u8, u8, u8*[][2], u8, u32);
s8 sub_80727CC(void);
u8 sub_807288C(u8);
-void PrintStringArray(u8, u8, u8, u8*[][2]);
-void sub_80728E4(u8, u8, u8, u8*[][2], u8*);
-void sub_807292C(u8, u8, u8);
-void sub_8072974(u8, u8, u32);
-s8 FillWindowPixelBuffer(void);
+void PrintMenuItems(u8, u8, u8, u8*[][2]);
+void PrintMenuItemsReordered(u8, u8, u8, u8*[][2], u8*);
+void InitYesNoMenu(u8, u8, u8);
+void DisplayYesNoMenu(u8, u8, u32);
+s8 ProcessMenuInputNoWrap_(void);
u8 sub_80729D8(u8 *, u8, u16, u8);
u8 sub_8072A18(u8 *, u8, u16, u8, u32);
u8 unref_sub_8072A5C(u8 *, u8 *, u8, u16, u8, u32);
int sub_8072AB0(u8 *, u8, u16, u8, u8, u32);
-void PrintCoinsString(u8 *, u8, u8);
+void sub_8072B4C(u8 *, u8, u8);
void sub_8072B80(u8 *, u8, u8, u8 *);
-void Free(u8 *, u8, u8, u16);
+void sub_8072BD8(u8 *, u8, u8, u16);
u8 *sub_8072C14(u8 *, s32, u8, u8);
u8 *sub_8072C44(u8 *, s32, u8, u8);
u8 *sub_8072C74(u8 *, u8 *, u8, u8);
@@ -92,56 +92,56 @@ extern void sub_814A7FC(void);
static struct Menu gMenu;
-extern struct Window stru_202E908;
-extern struct Window *dword_202E9C8;
-extern u8 byte_202E9CC;
-extern u16 word_202E9CE;
-extern u16 word_202E9D0;
-extern u16 word_202E9D2;
-extern u16 word_202E9D4;
+extern struct Window gMenuWindow;
+extern struct Window *gMenuWindowPtr;
+extern u8 gMenuMultistepInitState;
+extern u16 gMenuTextTileOffset;
+extern u16 gMenuTextWindowTileOffset;
+extern u16 gMenuTextWindowContentTileOffset;
+extern u16 gMenuMessageBoxContentTileOffset;
extern const u8 *gUnknown_08376D74[][2];
-void sub_8071C4C(struct WindowConfig *a1)
+void InitMenuWindowConfig(struct WindowConfig *winConfig)
{
- sub_8071D48(a1, 1);
+ InitMenuWindowConfigInternal(winConfig, 1);
}
-void sub_8071C58(struct WindowConfig *a1)
+void MultistepInitMenuWindowConfigBegin(struct WindowConfig *winConfig)
{
- sub_8071C64(a1, 1);
+ MultistepInitMenuWindowConfigInternal(winConfig, 1);
}
-void sub_8071C64(struct WindowConfig *a1, u16 a2)
+void MultistepInitMenuWindowConfigInternal(struct WindowConfig *winConfig, u16 tileOffset)
{
- byte_202E9CC = 0;
- word_202E9CE = a2;
- dword_202E9C8 = &stru_202E908;
- InitWindowFromConfig(&stru_202E908, a1);
+ gMenuMultistepInitState = 0;
+ gMenuTextTileOffset = tileOffset;
+ gMenuWindowPtr = &gMenuWindow;
+ InitWindowFromConfig(&gMenuWindow, winConfig);
}
-bool32 sub_8071C94(void)
+bool32 MultistepInitMenuWindowConfigContinue(void)
{
- switch (byte_202E9CC)
+ switch (gMenuMultistepInitState)
{
case 0:
- byte_202E9CC++;
+ gMenuMultistepInitState++;
return 0;
case 1:
- word_202E9D0 = MultistepInitWindowTileData(dword_202E9C8, word_202E9CE);
+ gMenuTextWindowTileOffset = MultistepInitWindowTileData(gMenuWindowPtr, gMenuTextTileOffset);
goto next;
case 2:
if (!MultistepLoadFont())
goto fail;
goto next;
case 3:
- word_202E9D2 = SetTextWindowBaseTileNum(word_202E9D0);
+ gMenuTextWindowContentTileOffset = SetTextWindowBaseTileNum(gMenuTextWindowTileOffset);
next:
- byte_202E9CC++;
+ gMenuMultistepInitState++;
return 0;
case 4:
- LoadTextWindowGraphics(dword_202E9C8);
- word_202E9D4 = SetMessageBoxBaseTileNum(word_202E9D2);
+ LoadTextWindowGraphics(gMenuWindowPtr);
+ gMenuMessageBoxContentTileOffset = SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset);
return 1;
default:
fail:
@@ -149,123 +149,123 @@ bool32 sub_8071C94(void)
}
}
-void sub_8071D48(struct WindowConfig *a1, u16 a2)
+void InitMenuWindowConfigInternal(struct WindowConfig *winConfig, u16 tileOffset)
{
- dword_202E9C8 = &stru_202E908;
- InitWindowFromConfig(&stru_202E908, a1);
- word_202E9CE = a2;
- word_202E9D0 = InitWindowTileData(dword_202E9C8, word_202E9CE);
- word_202E9D2 = SetTextWindowBaseTileNum(word_202E9D0);
- LoadTextWindowGraphics(dword_202E9C8);
- word_202E9D4 = SetMessageBoxBaseTileNum(word_202E9D2);
+ gMenuWindowPtr = &gMenuWindow;
+ InitWindowFromConfig(&gMenuWindow, winConfig);
+ gMenuTextTileOffset = tileOffset;
+ gMenuTextWindowTileOffset = InitWindowTileData(gMenuWindowPtr, gMenuTextTileOffset);
+ gMenuTextWindowContentTileOffset = SetTextWindowBaseTileNum(gMenuTextWindowTileOffset);
+ LoadTextWindowGraphics(gMenuWindowPtr);
+ gMenuMessageBoxContentTileOffset = SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset);
}
-void unref_sub_8071DA4(struct WindowConfig *a1, u16 a2)
+void unref_sub_8071DA4(struct WindowConfig *winConfig, u16 tileOffset)
{
- dword_202E9C8 = &stru_202E908;
- InitWindowFromConfig(&stru_202E908, a1);
- word_202E9D0 = a2;
- word_202E9D2 = SetTextWindowBaseTileNum(word_202E9D0);
- LoadTextWindowGraphics(dword_202E9C8);
- word_202E9CE = SetMessageBoxBaseTileNum(word_202E9D2);
- word_202E9D4 = InitWindowTileData(dword_202E9C8, word_202E9CE);
+ gMenuWindowPtr = &gMenuWindow;
+ InitWindowFromConfig(&gMenuWindow, winConfig);
+ gMenuTextWindowTileOffset = tileOffset;
+ gMenuTextWindowContentTileOffset = SetTextWindowBaseTileNum(gMenuTextWindowTileOffset);
+ LoadTextWindowGraphics(gMenuWindowPtr);
+ gMenuTextTileOffset = SetMessageBoxBaseTileNum(gMenuTextWindowContentTileOffset);
+ gMenuMessageBoxContentTileOffset = InitWindowTileData(gMenuWindowPtr, gMenuTextTileOffset);
}
-void sub_8071E00(u8 a1)
+void MenuLoadTextWindowGraphics_OverrideFrameType(u8 frameType)
{
- LoadTextWindowGraphics_OverrideFrameType(dword_202E9C8, a1);
+ LoadTextWindowGraphics_OverrideFrameType(gMenuWindowPtr, frameType);
}
-void GetMapNamePopUpWindowId(void)
+void MenuLoadTextWindowGraphics(void)
{
- LoadTextWindowGraphics(dword_202E9C8);
+ LoadTextWindowGraphics(gMenuWindowPtr);
}
-void sub_8071E2C(struct WindowConfig *a1)
+void BasicInitMenuWindowConfig(struct WindowConfig *winConfig)
{
- InitWindowFromConfig(dword_202E9C8, a1);
- dword_202E9C8->tileDataStartOffset = word_202E9CE;
+ InitWindowFromConfig(gMenuWindowPtr, winConfig);
+ gMenuWindowPtr->tileDataStartOffset = gMenuTextTileOffset;
}
-void Print(u8 *str, u8 left, u8 top)
+void MenuPrint(u8 *str, u8 left, u8 top)
{
- sub_8003460(dword_202E9C8, str, word_202E9CE, left, top);
+ sub_8003460(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
}
-void Reset(u8 a1, u8 a2, u8 a3, u8 a4)
+void MenuZeroFillWindowRect(u8 a1, u8 a2, u8 a3, u8 a4)
{
- ZeroFillWindowRect(dword_202E9C8, a1, a2, a3, a4);
+ ZeroFillWindowRect(gMenuWindowPtr, a1, a2, a3, a4);
}
-void sub_8071EBC(u8 left, u8 top, u8 right, u8 bottom)
+void MenuFillWindowRectWithBlankTile(u8 left, u8 top, u8 right, u8 bottom)
{
- FillWindowRectWithBlankTile(dword_202E9C8, left, top, right, bottom);
+ FillWindowRectWithBlankTile(gMenuWindowPtr, left, top, right, bottom);
}
-void sub_8071EF4(void)
+void MenuZeroFillScreen(void)
{
- Reset(0, 0, 29, 19);
+ MenuZeroFillWindowRect(0, 0, 29, 19);
}
-void DrawDefaultWindow(u8 left, u8 top, u8 right, u8 bottom)
+void MenuDrawTextWindow(u8 left, u8 top, u8 right, u8 bottom)
{
- DrawTextWindow(dword_202E9C8, left, top, right, bottom);
+ DrawTextWindow(gMenuWindowPtr, left, top, right, bottom);
}
void sub_8071F40(u8 *str)
{
- DrawDefaultWindow(2, 14, 28, 19);
- Print(str, 3, 15);
+ MenuDrawTextWindow(2, 14, 28, 19);
+ MenuPrint(str, 3, 15);
}
void sub_8071F60(u8 a1, u8 a2, u8 a3, u8 a4)
{
- sub_8003490(dword_202E9C8, a1, word_202E9CE, a2, a3);
+ sub_8003490(gMenuWindowPtr, a1, gMenuTextTileOffset, a2, a3);
}
u16 unref_sub_8071F98(u8 x, u8 y)
{
- return GetWindowTilemapEntry(dword_202E9C8, x, y);
+ return GetWindowTilemapEntry(gMenuWindowPtr, x, y);
}
void unref_sub_8071FBC(u16 a1, u8 a2, u8 a3, u8 a4, u8 a5)
{
- DrawWindowRect(dword_202E9C8, a1, a2, a3, a4, a5);
+ DrawWindowRect(gMenuWindowPtr, a1, a2, a3, a4, a5);
}
-void sub_8071FFC(void)
+void MenuDisplayMessageBox(void)
{
- DisplayMessageBox(dword_202E9C8);
+ DisplayMessageBox(gMenuWindowPtr);
}
-void AddTextPrinterWithCallbackForMessage(u8 *str, u8 a2, u8 a3)
+void MenuPrintMessage(u8 *str, u8 left, u8 top)
{
- sub_8002EB0(dword_202E9C8, str, word_202E9CE, a2, a3);
+ sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
}
void sub_8072044(u8 *str)
{
- sub_8002EB0(dword_202E9C8, str, word_202E9CE, 2, 15);
+ sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15);
}
-void sub_807206C(u8 *str)
+void MenuSetText(u8 *str)
{
- sub_8002E90(dword_202E9C8, str);
+ sub_8002E90(gMenuWindowPtr, str);
}
-u8 sub_8072080(void)
+u8 MenuUpdateWindowText(void)
{
- return sub_80035AC(dword_202E9C8);
+ return sub_80035AC(gMenuWindowPtr);
}
u8 unref_sub_8072098(void)
{
- return sub_8003418(dword_202E9C8);
+ return sub_8003418(gMenuWindowPtr);
}
void sub_80720B0(void)
{
- ClearWindowTextLines(dword_202E9C8);
+ ClearWindowTextLines(gMenuWindowPtr);
}
u8 MoveMenuCursor(s8 delta)
@@ -283,7 +283,7 @@ u8 MoveMenuCursor(s8 delta)
return gMenu.cursorPos;
}
-u8 MoveMenuCursorNoWrapAround(s8 delta)
+u8 MoveMenuCursorNoWrap(s8 delta)
{
s32 newPos = gMenu.cursorPos + delta;
@@ -357,18 +357,18 @@ s8 ProcessMenuInputNoWrap(void)
if (gMain.newKeys & DPAD_UP)
{
- if (cursorPos != MoveMenuCursorNoWrapAround(-1))
+ if (cursorPos != MoveMenuCursorNoWrap(-1))
audio_play(SE_SELECT);
return -2;
}
else if (gMain.newKeys & DPAD_DOWN)
{
- if (cursorPos != MoveMenuCursorNoWrapAround(1))
+ if (cursorPos != MoveMenuCursorNoWrap(1))
audio_play(SE_SELECT);
return -2;
}
- MoveMenuCursorNoWrapAround(0);
+ MoveMenuCursorNoWrap(0);
return -2;
}
@@ -501,7 +501,7 @@ u8 sub_80724F4(u8 left, u8 top, u8 menuItemCount, u8 *menuItems[][2], u8 columnC
totalWidth = (gMenu.columnXCoords[columnCount] + 1);
right = left + totalWidth;
- DrawDefaultWindow(left, top, right, bottom);
+ MenuDrawTextWindow(left, top, right, bottom);
}
return maxWidth;
@@ -656,7 +656,7 @@ _080725EA:\n\
lsl r2, #24\n\
lsr r2, #24\n\
ldr r1, [sp, #0x4]\n\
- bl DrawDefaultWindow\n\
+ bl MenuDrawTextWindow\n\
add r0, r7, #0\n\
add sp, #0xC\n\
pop {r3-r5}\n\
@@ -699,7 +699,7 @@ void sub_8072620(u8 left, u8 top, u8 menuItemCount, u8 *menuItems[][2], u8 colum
u8 row = 0;
u8 j;
for (j = 0; i + j < menuItemCount; j += columnCount, row++)
- Print(menuItems[i + j][0], left + gMenu.columnXCoords[i % columnCount], top + 2 * row);
+ MenuPrint(menuItems[i + j][0], left + gMenu.columnXCoords[i % columnCount], top + 2 * row);
}
}
@@ -761,53 +761,53 @@ u8 sub_807288C(u8 column)
return gMenu.columnXCoords[column];
}
-void PrintStringArray(u8 left, u8 top, u8 menuItemCount, u8 *menuItems[][2])
+void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, u8 *menuItems[][2])
{
u8 i;
for (i = 0; i < menuItemCount; i++)
- Print(menuItems[i][0], left, top + 2 * i);
+ MenuPrint(menuItems[i][0], left, top + 2 * i);
}
-void sub_80728E4(u8 left, u8 top, u8 menuItemCount, u8 *menuItems[][2], u8 *order)
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, u8 *menuItems[][2], u8 *order)
{
u8 i;
for (i = 0; i < menuItemCount; i++)
- Print(menuItems[order[i]][0], left, top + 2 * i);
+ MenuPrint(menuItems[order[i]][0], left, top + 2 * i);
}
-void sub_807292C(u8 left, u8 top, u8 a3)
+void InitYesNoMenu(u8 left, u8 top, u8 a3)
{
- PrintStringArray(left + 1, top + 1, 2, (void *)gUnknown_08376D74);
+ PrintMenuItems(left + 1, top + 1, 2, (void *)gUnknown_08376D74);
InitMenu(0, left + 1, top + 1, 2, 0, a3);
}
-void sub_8072974(u8 left, u8 top, u32 a3)
+void DisplayYesNoMenu(u8 left, u8 top, u32 a3)
{
- DrawDefaultWindow(left, top, left + 6, top + 5);
- sub_807292C(left, top, 5);
+ MenuDrawTextWindow(left, top, left + 6, top + 5);
+ InitYesNoMenu(left, top, 5);
gMenu.menu_field_7 = a3 ? -1 : 0;
}
-s8 FillWindowPixelBuffer(void)
+s8 ProcessMenuInputNoWrap_(void)
{
return ProcessMenuInputNoWrap();
}
-u8 sub_80729D8(u8 *a1, u8 a2, u16 a3, u8 a4)
+u8 sub_80729D8(u8 *text, u8 left, u16 top, u8 a4)
{
- return sub_8004D04(dword_202E9C8, a1, word_202E9CE, a2, a3, a4);
+ return sub_8004D04(gMenuWindowPtr, text, gMenuTextTileOffset, left, top, a4);
}
-u8 sub_8072A18(u8 *a1, u8 a2, u16 a3, u8 a4, u32 a5)
+u8 sub_8072A18(u8 *text, u8 left, u16 top, u8 width, u32 a5)
{
- return sub_8004FD0(dword_202E9C8, 0, a1, word_202E9CE, a2, a3, a4, a5);
+ return sub_8004FD0(gMenuWindowPtr, 0, text, gMenuTextTileOffset, left, top, width, a5);
}
-u8 unref_sub_8072A5C(u8 *a1, u8 *a2, u8 a3, u16 a4, u8 a5, u32 a6)
+u8 unref_sub_8072A5C(u8 *dest, u8 *src, u8 left, u16 top, u8 width, u32 a6)
{
- return sub_8004FD0(dword_202E9C8, a1, a2, word_202E9CE, a3, a4, a5, a6);
+ return sub_8004FD0(gMenuWindowPtr, dest, src, gMenuTextTileOffset, left, top, width, a6);
}
__attribute__((naked))
@@ -876,7 +876,7 @@ int sub_8072AB0(u8 *str, u8 left, u16 top, u8 width, u8 height, u32 a6)
lsl r3, #24\n\
lsr r3, #24\n\
mov r0, r12\n\
- bl sub_8071EBC\n\
+ bl MenuFillWindowRectWithBlankTile\n\
_08072B34:\n\
add sp, #0x10\n\
pop {r3,r4}\n\
@@ -890,62 +890,62 @@ _08072B44: .4byte 0x0202e9c8\n\
_08072B48: .4byte 0x0202e9ce\n");
}
-void PrintCoinsString(u8 *str, u8 left, u8 top)
+void sub_8072B4C(u8 *str, u8 left, u8 top)
{
- sub_8004D38(dword_202E9C8, str, word_202E9CE, left, top);
+ sub_8004D38(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
}
void sub_8072B80(u8 *a1, u8 a2, u8 a3, u8 *a4)
{
u8 buffer[64];
- u8 width = GetStringWidth(dword_202E9C8, a4);
- AlignString(dword_202E9C8, buffer, a1, width, 1);
- sub_8003460(dword_202E9C8, buffer, word_202E9CE, a2, a3);
+ u8 width = GetStringWidth(gMenuWindowPtr, a4);
+ AlignString(gMenuWindowPtr, buffer, a1, width, 1);
+ sub_8003460(gMenuWindowPtr, buffer, gMenuTextTileOffset, a2, a3);
}
-void Free(u8 *a1, u8 a2, u8 a3, u16 a4)
+void sub_8072BD8(u8 *a1, u8 a2, u8 a3, u16 a4)
{
- sub_8004DB0(dword_202E9C8, a1, word_202E9CE, a2, a3, a4);
+ sub_8004DB0(gMenuWindowPtr, a1, gMenuTextTileOffset, a2, a3, a4);
}
u8 *sub_8072C14(u8 *a1, s32 a2, u8 a3, u8 a4)
{
- return AlignInt1(dword_202E9C8, a1, a2, a3, a4);
+ return AlignInt1(gMenuWindowPtr, a1, a2, a3, a4);
}
u8 *sub_8072C44(u8 *a1, s32 a2, u8 a3, u8 a4)
{
- return AlignInt2(dword_202E9C8, a1, a2, a3, a4);
+ return AlignInt2(gMenuWindowPtr, a1, a2, a3, a4);
}
u8 *sub_8072C74(u8 *a1, u8 *a2, u8 a3, u8 a4)
{
- return AlignString(dword_202E9C8, a1, a2, a3, a4);
+ return AlignString(gMenuWindowPtr, a1, a2, a3, a4);
}
u8 sub_8072CA4(u8 *str)
{
- return GetStringWidth(dword_202E9C8, str);
+ return GetStringWidth(gMenuWindowPtr, str);
}
u8 sub_8072CBC()
{
- return sub_8004E24(dword_202E9C8);
+ return sub_8004E24(gMenuWindowPtr);
}
void sub_8072CD4(u8 *a1, u8 *a2, u8 *a3)
{
- sub_8004E28(dword_202E9C8, a1, a2, a3);
+ sub_8004E28(gMenuWindowPtr, a1, a2, a3);
}
u32 sub_8072CF4(u8 a1)
{
- return sub_80037C8(dword_202E9C8, a1);
+ return sub_80037C8(gMenuWindowPtr, a1);
}
struct Window *unref_sub_8072D0C(void)
{
- return dword_202E9C8;
+ return gMenuWindowPtr;
}
void sub_8072D18(u8 a1, u8 a2)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 22:29:04 +0000