summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_1.s20
-rw-r--r--asm/contest_link_80C2020.s20
-rw-r--r--asm/pokemon_storage_system.s104
-rw-r--r--asm/pokenav.s102
4 files changed, 123 insertions, 123 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s
index f0a883ec4..da604c6b6 100644
--- a/asm/battle_1.s
+++ b/asm/battle_1.s
@@ -448,16 +448,16 @@ _0800D748: .4byte 0x0000bf40
sub_800D74C: @ 800D74C
push {r4,lr}
movs r0, 0x12
- bl SetTextWindowBaseTileNum
+ bl TextWindow_SetBaseTileNum
ldr r4, _0800D79C @ =gUnknown_03004210
adds r0, r4, 0
movs r1, 0x1
- bl LoadTextWindowGraphics_OverridePalSlot
+ bl TextWindow_LoadStdFrameGraphicsOverridePal
movs r0, 0x22
- bl SetTextWindowBaseTileNum
+ bl TextWindow_SetBaseTileNum
adds r0, r4, 0
movs r1, 0x1
- bl LoadTextWindowGraphics_OverridePalSlot
+ bl TextWindow_LoadStdFrameGraphicsOverridePal
ldr r3, _0800D7A0 @ =gPlttBufferUnfaded
adds r0, r3, 0
adds r0, 0xB8
@@ -1055,9 +1055,9 @@ _0800DE88:
str r0, [sp, 0x4]
adds r0, r1, 0
adds r1, r7, 0
- bl sub_8002E4C
+ bl Text_InitWindow8002E4C
ldr r0, [sp, 0xC]
- bl sub_8002F44
+ bl Text_PrintWindow8002F44
ldr r2, _0800DEDC @ =gUnknown_081F9680 + 0x8
adds r4, r2
ldr r2, [r4]
@@ -1111,9 +1111,9 @@ _0800DF04:
movs r5, 0x1
str r5, [sp, 0x4]
adds r0, r4, 0
- bl sub_8002E4C
+ bl Text_InitWindow8002E4C
adds r0, r4, 0
- bl sub_8002F44
+ bl Text_PrintWindow8002F44
mov r0, r8
ldr r2, [r0, 0x38]
mov r0, r9
@@ -1134,9 +1134,9 @@ _0800DF04:
str r0, [sp]
str r5, [sp, 0x4]
adds r0, r4, 0
- bl sub_8002E4C
+ bl Text_InitWindow8002E4C
adds r0, r4, 0
- bl sub_8002F44
+ bl Text_PrintWindow8002F44
mov r5, r8
ldr r2, [r5, 0x44]
mov r0, r9
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 608daba87..71788c918 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -12,12 +12,12 @@ sub_80C2020: @ 80C2020
lsls r5, 19
movs r0, 0x40
strh r0, [r5]
- ldr r4, _080C20F0 @ =gWindowConfig_81E6FA0
+ ldr r4, _080C20F0 @ =gWindowTemplate_81E6FA0
adds r0, r4, 0
- bl SetUpWindowConfig
+ bl Text_LoadWindowTemplate
ldr r0, _080C20F4 @ =gMenuWindow
adds r1, r4, 0
- bl InitWindowFromConfig
+ bl Text_InitWindowWithTemplate
ldr r1, _080C20F8 @ =REG_BG0CNT
movs r2, 0xF8
lsls r2, 6
@@ -110,7 +110,7 @@ sub_80C2020: @ 80C2020
pop {r0}
bx r0
.align 2, 0
-_080C20F0: .4byte gWindowConfig_81E6FA0
+_080C20F0: .4byte gWindowTemplate_81E6FA0
_080C20F4: .4byte gMenuWindow
_080C20F8: .4byte REG_BG0CNT
_080C20FC: .4byte 0x00001803
@@ -188,7 +188,7 @@ _080C2162:
lsls r2, 2
movs r1, 0
bl LoadCompressedPalette
- ldr r0, _080C2234 @ =gWindowConfig_81E6FA0
+ ldr r0, _080C2234 @ =gWindowTemplate_81E6FA0
bl LoadFontDefaultPalette
movs r6, 0
_080C21C0:
@@ -242,7 +242,7 @@ _080C2224: .4byte 0x0600e000
_080C2228: .4byte gUnknown_08D1A250
_080C222C: .4byte 0x0600f000
_080C2230: .4byte gUnknown_08D1A618
-_080C2234: .4byte gWindowConfig_81E6FA0
+_080C2234: .4byte gWindowTemplate_81E6FA0
_080C2238: .4byte 0x000060b2
_080C223C: .4byte 0x000060a4
_080C2240:
@@ -357,7 +357,7 @@ _080C230A:
lsrs r3, 24
str r3, [sp]
movs r3, 0x7
- bl sub_8003460
+ bl Text_InitWindowAndPrintText
add sp, 0x4
pop {r4-r7}
pop {r0}
@@ -2170,7 +2170,7 @@ sub_80C3158: @ 80C3158
lsls r0, 22
lsrs r0, 22
strh r0, [r4, 0x6]
- ldr r1, _080C32C4 @ =gWindowConfig_81E7278
+ ldr r1, _080C32C4 @ =gWindowTemplate_81E7278
mov r8, r1
ldr r7, _080C32C8 @ =0x06010000
ldr r2, _080C32CC @ =0x040000d4
@@ -2194,7 +2194,7 @@ _080C31CE:
bge _080C31CE
mov r0, r8
mov r1, r9
- bl GetStringWidthGivenWindowConfig
+ bl Text_GetStringWidthFromWindowTemplate
lsls r0, 24
lsrs r5, r0, 24
ldr r2, _080C32D4 @ =gDisplayedStringBattle
@@ -2296,7 +2296,7 @@ _080C32B2:
b _080C3322
.align 2, 0
_080C32C0: .4byte gSprites
-_080C32C4: .4byte gWindowConfig_81E7278
+_080C32C4: .4byte gWindowTemplate_81E7278
_080C32C8: .4byte 0x06010000
_080C32CC: .4byte 0x040000d4
_080C32D0: .4byte 0x85000100
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 69c6d9e4f..d878821cb 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -539,7 +539,7 @@ StorageSystemClearMessageWindow: @ 8095EA0
movs r1, 0xF
movs r2, 0x1B
movs r3, 0x12
- bl MenuFillWindowRectWithBlankTile
+ bl Menu_BlankWindowRect
pop {r0}
bx r0
thumb_func_end StorageSystemClearMessageWindow
@@ -578,7 +578,7 @@ _08095EE0:
_08095EF4:
ldrb r0, [r4, 0xA]
bl StorageSystemCreatePrimaryMenu
- bl MenuDisplayMessageBox
+ bl Menu_DisplayDialogueFrame
ldr r1, _08095F18 @ =gUnknown_083B600C
movs r2, 0xA
ldrsh r0, [r4, r2]
@@ -588,7 +588,7 @@ _08095EF4:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xF
- bl MenuPrint
+ bl Menu_PrintText
b _08095F28
.align 2, 0
_08095F18: .4byte gUnknown_083B600C
@@ -604,7 +604,7 @@ _08095F28:
strh r0, [r4, 0x8]
b _080960F4
_08095F30:
- bl ProcessMenuInput
+ bl Menu_ProcessInput
lsls r0, 24
asrs r0, 24
strh r0, [r4, 0xC]
@@ -676,18 +676,18 @@ _08095FA2:
ldr r0, [r1]
movs r1, 0x2
movs r2, 0xF
- bl MenuPrint
+ bl Menu_PrintText
b _080960F4
.align 2, 0
_08095FC0: .4byte gMain
_08095FC4: .4byte gUnknown_083B600C
_08095FC8:
- bl HandleDestroyMenuCursors
+ bl Menu_DestroyCursor
movs r0, 0
movs r1, 0
movs r2, 0xD
movs r3, 0x9
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
bl ScriptContext2_Disable
bl EnableBothScriptContexts
adds r0, r5, 0
@@ -723,7 +723,7 @@ _08096008:
_08096022:
movs r1, 0x2
movs r2, 0xF
- bl MenuPrint
+ bl Menu_PrintText
movs r0, 0x3
strh r0, [r4, 0x8]
b _080960F4
@@ -760,8 +760,8 @@ _08096042:
_0809606A:
movs r0, 0x1
negs r0, r0
- bl MoveMenuCursor
- bl GetMenuCursorPos
+ bl Menu_MoveCursor
+ bl Menu_GetCursorPos
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xA]
@@ -788,8 +788,8 @@ _08096090:
strh r2, [r4, 0xA]
_080960A8:
movs r0, 0x1
- bl MoveMenuCursor
- bl GetMenuCursorPos
+ bl Menu_MoveCursor
+ bl Menu_GetCursorPos
lsls r0, 24
lsrs r0, 24
strh r0, [r4, 0xA]
@@ -805,7 +805,7 @@ _080960C2:
ldr r0, [r0]
movs r1, 0x2
movs r2, 0xF
- bl MenuPrint
+ bl Menu_PrintText
movs r0, 0x2
strh r0, [r4, 0x8]
b _080960F4
@@ -892,12 +892,12 @@ StorageSystemCreatePrimaryMenu: @ 8096168
movs r1, 0
movs r2, 0xD
movs r3, 0x9
- bl MenuDrawTextWindow
+ bl Menu_DrawStdWindowFrame
ldr r3, _080961A4 @ =gUnknown_083B600C
movs r0, 0x1
movs r1, 0x1
movs r2, 0x4
- bl PrintMenuItems
+ bl Menu_PrintItems
str r4, [sp]
movs r0, 0xC
str r0, [sp, 0x4]
@@ -1640,10 +1640,10 @@ sub_80966F4: @ 80966F4
ldr r0, _08096778 @ =0x81000200
str r0, [r4, 0x8]
ldr r0, [r4, 0x8]
- ldr r0, _0809677C @ =gWindowConfig_81E6D38
+ ldr r0, _0809677C @ =gWindowTemplate_81E6D38
adds r1, r5, 0
mov r2, r8
- bl sub_8004E3C
+ bl Text_InitWindow8004E3C
str r5, [r4]
str r6, [r4, 0x4]
ldr r0, _08096780 @ =0x80000200
@@ -1662,7 +1662,7 @@ _0809676C: .4byte gUnknown_083B6DB8
_08096770: .4byte 0x00001111
_08096774: .4byte 0x040000d4
_08096778: .4byte 0x81000200
-_0809677C: .4byte gWindowConfig_81E6D38
+_0809677C: .4byte gWindowTemplate_81E6D38
_08096780: .4byte 0x80000200
thumb_func_end sub_80966F4
@@ -1846,18 +1846,18 @@ _080968D4:
bl sub_8096804
b _0809697A
_080968E8:
- ldr r0, _080968F0 @ =gWindowConfig_81E6D00
- bl SetUpWindowConfig
+ ldr r0, _080968F0 @ =gWindowTemplate_81E6D00
+ bl Text_LoadWindowTemplate
b _0809697A
.align 2, 0
-_080968F0: .4byte gWindowConfig_81E6D00
+_080968F0: .4byte gWindowTemplate_81E6D00
_080968F4:
- ldr r0, _08096900 @ =gWindowConfig_81E6D00
+ ldr r0, _08096900 @ =gWindowTemplate_81E6D00
bl InitMenuWindow
- bl MenuZeroFillScreen
+ bl Menu_EraseScreen
b _0809697A
.align 2, 0
-_08096900: .4byte gWindowConfig_81E6D00
+_08096900: .4byte gWindowTemplate_81E6D00
_08096904:
bl sub_80967DC
bl sub_8096848
@@ -1985,18 +1985,18 @@ _08096A28: .4byte gSharedMem
_08096A2C: .4byte gUnknown_0203847D
_08096A30: .4byte gUnknown_0203847F
_08096A34:
- ldr r0, _08096A3C @ =gWindowConfig_81E6D00
- bl SetUpWindowConfig
+ ldr r0, _08096A3C @ =gWindowTemplate_81E6D00
+ bl Text_LoadWindowTemplate
b _08096AD8
.align 2, 0
-_08096A3C: .4byte gWindowConfig_81E6D00
+_08096A3C: .4byte gWindowTemplate_81E6D00
_08096A40:
- ldr r0, _08096A4C @ =gWindowConfig_81E6D00
+ ldr r0, _08096A4C @ =gWindowTemplate_81E6D00
bl InitMenuWindow
- bl MenuZeroFillScreen
+ bl Menu_EraseScreen
b _08096AD8
.align 2, 0
-_08096A4C: .4byte gWindowConfig_81E6D00
+_08096A4C: .4byte gWindowTemplate_81E6D00
_08096A50:
bl sub_80967DC
b _08096AD8
@@ -3370,7 +3370,7 @@ _080975EC:
adds r0, 0x1
strb r0, [r1, 0x4]
_08097600:
- bl ProcessMenuInputNoWrap
+ bl Menu_ProcessInputNoWrap
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4113,7 +4113,7 @@ _08097C18:
.align 2, 0
_08097C28: .4byte gMain
_08097C2C:
- bl ProcessMenuInputNoWrap
+ bl Menu_ProcessInputNoWrap
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4247,7 +4247,7 @@ _08097D38:
.align 2, 0
_08097D48: .4byte gMain
_08097D4C:
- bl ProcessMenuInputNoWrap
+ bl Menu_ProcessInputNoWrap
lsls r0, 24
asrs r1, r0, 24
cmp r1, 0
@@ -4940,27 +4940,27 @@ _08098302:
movs r1, 0xB
movs r2, 0x9
movs r3, 0x11
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
ldr r4, _0809834C @ =gSharedMem + 0x127A
adds r0, r4, 0
movs r1, 0x1
movs r2, 0x10
- bl MenuPrint
+ bl Menu_PrintText
adds r0, r4, 0
subs r0, 0x6B
movs r1, 0x1
movs r2, 0xB
- bl MenuPrint
+ bl Menu_PrintText
adds r0, r4, 0
subs r0, 0x46
movs r1, 0
movs r2, 0xD
- bl MenuPrint
+ bl Menu_PrintText
subs r4, 0x21
adds r0, r4, 0
movs r1, 0x1
movs r2, 0xF
- bl MenuPrint
+ bl Menu_PrintText
pop {r4}
pop {r0}
bx r0
@@ -5657,7 +5657,7 @@ sub_8098A38: @ 8098A38
lsls r4, 24
asrs r4, 24
adds r0, r4, 0
- bl MoveMenuCursor
+ bl Menu_MoveCursor
pop {r4}
pop {r0}
bx r0
@@ -5666,17 +5666,17 @@ sub_8098A38: @ 8098A38
thumb_func_start sub_8098A5C
sub_8098A5C: @ 8098A5C
push {lr}
- bl HandleDestroyMenuCursors
+ bl Menu_DestroyCursor
movs r0, 0xA
movs r1, 0x10
movs r2, 0x1D
movs r3, 0x13
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
movs r0, 0x17
movs r1, 0xA
movs r2, 0x1D
movs r3, 0xF
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
pop {r0}
bx r0
thumb_func_end sub_8098A5C
@@ -8745,10 +8745,10 @@ sub_809A1BC: @ 809A1BC
ldr r0, _0809A230 @ =0x81000100
str r0, [r4, 0x8]
ldr r0, [r4, 0x8]
- ldr r0, _0809A234 @ =gWindowConfig_81E6D38
+ ldr r0, _0809A234 @ =gWindowTemplate_81E6D38
adds r1, r5, 0
str r3, [sp, 0x4]
- bl sub_8004E3C
+ bl Text_InitWindow8004E3C
str r5, [r4]
ldr r3, [sp, 0x4]
str r3, [r4, 0x4]
@@ -8785,7 +8785,7 @@ sub_809A1BC: @ 809A1BC
_0809A228: .4byte gUnknown_083B6DB8
_0809A22C: .4byte 0x040000d4
_0809A230: .4byte 0x81000100
-_0809A234: .4byte gWindowConfig_81E6D38
+_0809A234: .4byte gWindowTemplate_81E6D38
_0809A238: .4byte 0x80000040
thumb_func_end sub_809A1BC
@@ -14483,7 +14483,7 @@ sub_809CE84: @ 809CE84
ldrb r1, [r6]
movs r2, 0x1D
movs r3, 0xF
- bl MenuDrawTextWindow
+ bl Menu_DrawStdWindowFrame
ldrb r0, [r5]
adds r0, 0x1
lsls r0, 24
@@ -14498,7 +14498,7 @@ sub_809CE84: @ 809CE84
lsls r3, 5
adds r4, r3
adds r3, r4, 0
- bl PrintMenuItems
+ bl Menu_PrintItems
ldrb r1, [r5]
adds r1, 0x1
lsls r1, 24
@@ -14559,7 +14559,7 @@ _0809CF52:
bl PlaySE
movs r0, 0x1
negs r0, r0
- bl MoveMenuCursor
+ bl Menu_MoveCursor
b _0809CF8E
.align 2, 0
_0809CF6C: .4byte gMain
@@ -14571,10 +14571,10 @@ _0809CF70:
movs r0, 0x5
bl PlaySE
movs r0, 0x1
- bl MoveMenuCursor
+ bl Menu_MoveCursor
b _0809CF8E
_0809CF86:
- bl GetMenuCursorPos
+ bl Menu_GetCursorPos
lsls r0, 24
lsrs r5, r0, 24
_0809CF8E:
@@ -14582,7 +14582,7 @@ _0809CF8E:
negs r0, r0
cmp r5, r0
beq _0809CFB2
- bl HandleDestroyMenuCursors
+ bl Menu_DestroyCursor
ldr r0, _0809CFD0 @ =gUnknown_083B6DB4
ldr r1, [r0]
ldr r2, _0809CFD4 @ =0x000011ba
@@ -14593,7 +14593,7 @@ _0809CF8E:
ldrb r1, [r1]
movs r2, 0x1D
movs r3, 0xF
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
_0809CFB2:
cmp r5, 0
blt _0809CFC4
diff --git a/asm/pokenav.s b/asm/pokenav.s
index 83ceed00f..7c766addc 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -229,7 +229,7 @@ _080F07E0:
lsrs r1, 16
bl sub_80F445C
_080F07F4:
- ldr r0, _080F0814 @ =gWindowConfig_81E710C
+ ldr r0, _080F0814 @ =gWindowTemplate_81E710C
bl BasicInitMenuWindow
ldr r0, _080F0818 @ =gUnknown_083DFEC4
ldr r0, [r0]
@@ -237,13 +237,13 @@ _080F07F4:
adds r0, r1
movs r1, 0x1
movs r2, 0x6
- bl MenuPrint
+ bl Menu_PrintText
_080F080A:
pop {r0}
bx r0
.align 2, 0
_080F0810: .4byte 0x00008788
-_080F0814: .4byte gWindowConfig_81E710C
+_080F0814: .4byte gWindowTemplate_81E710C
_080F0818: .4byte gUnknown_083DFEC4
thumb_func_end ShowMapNamePopUpWindow
@@ -252,7 +252,7 @@ sub_80F081C: @ 80F081C
push {r4,r5,lr}
lsls r0, 24
lsrs r5, r0, 24
- ldr r0, _080F0838 @ =gWindowConfig_81E710C
+ ldr r0, _080F0838 @ =gWindowTemplate_81E710C
bl BasicInitMenuWindow
cmp r5, 0x4
bhi _080F08C6
@@ -262,7 +262,7 @@ sub_80F081C: @ 80F081C
ldr r0, [r0]
mov pc, r0
.align 2, 0
-_080F0838: .4byte gWindowConfig_81E710C
+_080F0838: .4byte gWindowTemplate_81E710C
_080F083C: .4byte _080F0840
.align 2, 0
_080F0840:
@@ -342,17 +342,17 @@ _080F08E0: .4byte 0x0001869f
thumb_func_start sub_80F08E4
sub_80F08E4: @ 80F08E4
push {lr}
- ldr r0, _080F08FC @ =gWindowConfig_81E710C
+ ldr r0, _080F08FC @ =gWindowTemplate_81E710C
bl BasicInitMenuWindow
movs r0, 0
movs r1, 0x9
movs r2, 0xB
movs r3, 0x10
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
pop {r0}
bx r0
.align 2, 0
-_080F08FC: .4byte gWindowConfig_81E710C
+_080F08FC: .4byte gWindowTemplate_81E710C
thumb_func_end sub_80F08E4
thumb_func_start sub_80F0900
@@ -376,7 +376,7 @@ sub_80F0900: @ 80F0900
movs r1, 0x1
movs r2, 0x1F
movs r3, 0xF
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
_080F092A:
ldrh r0, [r5]
lsrs r2, r4, 16
@@ -527,13 +527,13 @@ _080F0A40:
adds r0, r4, 0
adds r1, r3, 0
bl sub_80F4428
- ldr r0, _080F0A70 @ =gWindowConfig_81E70D4
+ ldr r0, _080F0A70 @ =gWindowTemplate_81E70D4
bl BasicInitMenuWindow
lsls r2, r5, 24
lsrs r2, 24
adds r0, r4, 0
movs r1, 0xD
- bl MenuPrint
+ bl Menu_PrintText
pop {r4,r5}
pop {r0}
bx r0
@@ -541,7 +541,7 @@ _080F0A40:
_080F0A64: .4byte gUnknown_083DFEC4
_080F0A68: .4byte 0x000087c8
_080F0A6C: .4byte 0x00008788
-_080F0A70: .4byte gWindowConfig_81E70D4
+_080F0A70: .4byte gWindowTemplate_81E70D4
thumb_func_end sub_80F0A24
thumb_func_start sub_80F0A74
@@ -561,13 +561,13 @@ sub_80F0A74: @ 80F0A74
bl sub_80F700C
movs r0, 0x1F
ands r7, r0
- ldr r0, _080F0AE4 @ =gWindowConfig_81E70D4
+ ldr r0, _080F0AE4 @ =gWindowTemplate_81E70D4
bl BasicInitMenuWindow
lsls r2, r7, 3
adds r0, r4, 0
movs r1, 0x61
movs r3, 0
- bl MenuPrint_PixelCoords
+ bl Menu_PrintTextPixelCoords
ldr r1, _080F0AE8 @ =0x0000d158
adds r0, r5, r1
ldrh r0, [r0]
@@ -597,7 +597,7 @@ sub_80F0A74: @ 80F0A74
.align 2, 0
_080F0ADC: .4byte gUnknown_083DFEC4
_080F0AE0: .4byte 0x00008788
-_080F0AE4: .4byte gWindowConfig_81E70D4
+_080F0AE4: .4byte gWindowTemplate_81E70D4
_080F0AE8: .4byte 0x0000d158
_080F0AEC: .4byte 0x0000ceed
_080F0AF0: .4byte 0x0600f000
@@ -688,13 +688,13 @@ _080F0B60:
ldrsh r0, [r0, r1]
cmp r2, r0
beq _080F0BAA
- ldr r0, _080F0BC8 @ =gWindowConfig_81E70D4
+ ldr r0, _080F0BC8 @ =gWindowTemplate_81E70D4
bl BasicInitMenuWindow
adds r1, r4, 0
adds r3, r1, 0x1
movs r0, 0xC
movs r2, 0x1F
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
_080F0BAA:
ldrh r0, [r6]
cmp r0, 0
@@ -709,9 +709,9 @@ _080F0BB4:
_080F0BBC: .4byte 0x00000306
_080F0BC0: .4byte 0x00008778
_080F0BC4: .4byte 0x0000876c
-_080F0BC8: .4byte gWindowConfig_81E70D4
+_080F0BC8: .4byte gWindowTemplate_81E70D4
_080F0BCC:
- ldr r0, _080F0C10 @ =gWindowConfig_81E70D4
+ ldr r0, _080F0C10 @ =gWindowTemplate_81E70D4
bl BasicInitMenuWindow
ldr r1, _080F0C14 @ =0x00008778
adds r0, r5, r1
@@ -726,7 +726,7 @@ _080F0BE2:
movs r0, 0xC
adds r1, r4, 0
movs r2, 0x1F
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
adds r4, 0x2
movs r0, 0x1F
ands r4, r0
@@ -745,7 +745,7 @@ _080F0BE2:
movs r0, 0
b _080F0C22
.align 2, 0
-_080F0C10: .4byte gWindowConfig_81E70D4
+_080F0C10: .4byte gWindowTemplate_81E70D4
_080F0C14: .4byte 0x00008778
_080F0C18: .4byte gUnknown_083DFEC4
_080F0C1C: .4byte 0x0000d15c
@@ -804,7 +804,7 @@ _080F0C64:
bls _080F0CD0
movs r0, 0
strh r0, [r1]
- ldr r0, _080F0CC4 @ =gWindowConfig_81E70D4
+ ldr r0, _080F0CC4 @ =gWindowTemplate_81E70D4
bl BasicInitMenuWindow
ldr r0, _080F0CC8 @ =0x00008770
adds r1, r4, r0
@@ -835,7 +835,7 @@ _080F0C64:
.align 2, 0
_080F0CBC: .4byte 0x00000306
_080F0CC0: .4byte 0x0000ffff
-_080F0CC4: .4byte gWindowConfig_81E70D4
+_080F0CC4: .4byte gWindowTemplate_81E70D4
_080F0CC8: .4byte 0x00008770
_080F0CCC: .4byte 0x00008778
_080F0CD0:
@@ -942,7 +942,7 @@ _080F0D78:
_080F0D8C:
movs r0, 0
strh r0, [r1]
- ldr r0, _080F0DBC @ =gWindowConfig_81E70D4
+ ldr r0, _080F0DBC @ =gWindowTemplate_81E70D4
bl BasicInitMenuWindow
ldr r0, _080F0DC0 @ =0x00008778
adds r1, r4, r0
@@ -962,7 +962,7 @@ _080F0D8C:
mov pc, r0
.align 2, 0
_080F0DB8: .4byte 0x00000306
-_080F0DBC: .4byte gWindowConfig_81E70D4
+_080F0DBC: .4byte gWindowTemplate_81E70D4
_080F0DC0: .4byte 0x00008778
_080F0DC4: .4byte _080F0DC8
.align 2, 0
@@ -1032,7 +1032,7 @@ _080F0E42:
_080F0E54:
movs r1, 0x61
movs r3, 0
- bl MenuPrint_PixelCoords
+ bl Menu_PrintTextPixelCoords
b _080F0EA0
.align 2, 0
_080F0E60: .4byte gUnknown_083DFEC4
@@ -1054,7 +1054,7 @@ _080F0E6C:
adds r0, r4, 0
movs r1, 0x61
movs r3, 0
- bl MenuPrint_PixelCoords
+ bl Menu_PrintTextPixelCoords
b _080F0D6C
.align 2, 0
_080F0E94: .4byte gUnknown_083DFEC4
@@ -1141,13 +1141,13 @@ _080F0F10:
adds r4, r0
movs r0, 0x1F
ands r4, r0
- ldr r0, _080F0F60 @ =gWindowConfig_81E70D4
+ ldr r0, _080F0F60 @ =gWindowTemplate_81E70D4
bl BasicInitMenuWindow
adds r3, r4, 0x1
movs r0, 0xC
adds r1, r4, 0
movs r2, 0x1F
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
@@ -1160,7 +1160,7 @@ _080F0F52:
.align 2, 0
_080F0F58: .4byte 0x00000306
_080F0F5C: .4byte 0x00008778
-_080F0F60: .4byte gWindowConfig_81E70D4
+_080F0F60: .4byte gWindowTemplate_81E70D4
thumb_func_end sub_80F0EF4
thumb_func_start sub_80F0F64
@@ -1260,7 +1260,7 @@ sub_80F0FFC: @ 80F0FFC
adds r0, r5, 0
movs r2, 0
bl GetMapSectionName
- ldr r0, _080F1054 @ =gWindowConfig_81E710C
+ ldr r0, _080F1054 @ =gWindowTemplate_81E710C
bl BasicInitMenuWindow
adds r0, r5, 0
bl sub_80F19DC
@@ -1274,7 +1274,7 @@ sub_80F0FFC: @ 80F0FFC
adds r0, r4, 0
movs r1, 0
movs r2, 0x5
- bl MenuPrint
+ bl Menu_PrintText
pop {r4,r5}
pop {r0}
bx r0
@@ -1282,7 +1282,7 @@ sub_80F0FFC: @ 80F0FFC
_080F1048: .4byte gUnknown_083DFEC4
_080F104C: .4byte 0x00008788
_080F1050: .4byte 0x0000ceea
-_080F1054: .4byte gWindowConfig_81E710C
+_080F1054: .4byte gWindowTemplate_81E710C
_080F1058: .4byte 0x0000d138
thumb_func_end sub_80F0FFC
@@ -1357,17 +1357,17 @@ _080F10E8:
_080F10FC: .4byte gUnknown_083DFEC4
_080F1100: .4byte 0x0000d162
_080F1104:
- ldr r0, _080F110C @ =gWindowConfig_81E70B8
- bl SetUpWindowConfig
+ ldr r0, _080F110C @ =gWindowTemplate_81E70B8
+ bl Text_LoadWindowTemplate
b _080F1218
.align 2, 0
-_080F110C: .4byte gWindowConfig_81E70B8
+_080F110C: .4byte gWindowTemplate_81E70B8
_080F1110:
- ldr r0, _080F1118 @ =gWindowConfig_81E70B8
+ ldr r0, _080F1118 @ =gWindowTemplate_81E70B8
bl MultistepInitMenuWindowBegin
b _080F1218
.align 2, 0
-_080F1118: .4byte gWindowConfig_81E70B8
+_080F1118: .4byte gWindowTemplate_81E70B8
_080F111C:
bl MultistepInitMenuWindowContinue
cmp r0, 0
@@ -1376,7 +1376,7 @@ _080F111C:
_080F1126:
b _080F1226
_080F1128:
- bl MenuZeroFillScreen
+ bl Menu_EraseScreen
b _080F1218
_080F112E:
bl sub_80F1614
@@ -1761,7 +1761,7 @@ sub_80F1438: @ 80F1438
adds r0, r4, r1
movs r1, 0xD
movs r2, 0x1
- bl MenuPrint
+ bl Menu_PrintText
ldr r0, _080F1478 @ =0x00008788
adds r5, r4, r0
ldr r1, _080F147C @ =0x0000876e
@@ -1775,7 +1775,7 @@ sub_80F1438: @ 80F1438
adds r0, r5, 0
movs r1, 0x1
movs r2, 0x5
- bl MenuPrint
+ bl Menu_PrintText
pop {r4,r5}
pop {r0}
bx r0
@@ -1793,7 +1793,7 @@ sub_80F1480: @ 80F1480
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x10
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
pop {r0}
bx r0
thumb_func_end sub_80F1480
@@ -1914,11 +1914,11 @@ _080F158A:
adds r0, r6, 0
movs r1, 0xC
movs r2, 0xD
- bl MenuPrint
+ bl Menu_PrintText
adds r0, r7, 0
movs r1, 0xC
movs r2, 0xF
- bl MenuPrint
+ bl Menu_PrintText
pop {r4-r7}
pop {r0}
bx r0
@@ -1933,7 +1933,7 @@ sub_80F15A8: @ 80F15A8
movs r1, 0xD
movs r2, 0x1B
movs r3, 0x10
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
ldr r0, _080F1600 @ =gUnknown_083DFEC4
ldr r4, [r0]
ldr r0, _080F1604 @ =0x00008788
@@ -1964,7 +1964,7 @@ sub_80F15A8: @ 80F15A8
adds r0, r5, 0
movs r1, 0xC
movs r2, 0xD
- bl MenuPrint
+ bl Menu_PrintText
pop {r4,r5}
pop {r0}
bx r0
@@ -2422,7 +2422,7 @@ _080F19B8:
movs r1, 0x1
movs r2, 0x70
movs r3, 0x1
- bl MenuPrint_PixelCoords
+ bl Menu_PrintTextPixelCoords
pop {r4,r5}
pop {r0}
bx r0
@@ -2502,7 +2502,7 @@ _080F1A46:
movs r0, 0xE
movs r2, 0x1C
movs r3, 0xF
- bl MenuFillWindowRectWithBlankTile
+ bl Menu_BlankWindowRect
movs r0, 0
strb r0, [r5]
_080F1A60:
@@ -7663,9 +7663,9 @@ sub_80F4194: @ 80F4194
str r1, [r4, 0x4]
str r3, [r4, 0x8]
ldr r0, [r4, 0x8]
- ldr r0, _080F42B4 @ =gWindowConfig_81E70F0
+ ldr r0, _080F42B4 @ =gWindowTemplate_81E70F0
adds r1, r6, 0
- bl sub_8004E3C
+ bl Text_InitWindow8004E3C
movs r3, 0x88
lsls r3, 2
adds r1, r6, r3
@@ -7779,7 +7779,7 @@ _080F42A4: .4byte gUnknown_083DFEC8
_080F42A8: .4byte 0x00001111
_080F42AC: .4byte 0x040000d4
_080F42B0: .4byte 0x81000140
-_080F42B4: .4byte gWindowConfig_81E70F0
+_080F42B4: .4byte gWindowTemplate_81E70F0
_080F42B8: .4byte 0x81000030
_080F42BC: .4byte 0x0fffffff
_080F42C0: .4byte 0x80000040
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-29 19:17:16 +0000