summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_1.s20
-rw-r--r--asm/battle_anim_81258BC.s4
-rw-r--r--asm/contest_link_80C2020.s6
-rw-r--r--asm/pokemon_storage_system.s62
-rw-r--r--asm/pokenav.s34
5 files changed, 63 insertions, 63 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/battle_anim_81258BC.s b/asm/battle_anim_81258BC.s
index 2c19ad731..c13faaa77 100644
--- a/asm/battle_anim_81258BC.s
+++ b/asm/battle_anim_81258BC.s
@@ -49,11 +49,11 @@ sub_812AF10: @ 812AF10
movs r1, 0xE
movs r2, 0x1B
movs r3, 0x13
- bl MenuDrawTextWindow
+ bl Menu_DrawStdWindowFrame
ldr r0, _0812AF2C @ =gStringVar4
movs r1, 0x3
movs r2, 0xF
- bl MenuPrint
+ bl Menu_PrintText
pop {r0}
bx r0
.align 2, 0
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s
index 608daba87..096ce91e7 100644
--- a/asm/contest_link_80C2020.s
+++ b/asm/contest_link_80C2020.s
@@ -17,7 +17,7 @@ sub_80C2020: @ 80C2020
bl SetUpWindowConfig
ldr r0, _080C20F4 @ =gMenuWindow
adds r1, r4, 0
- bl InitWindowFromConfig
+ bl Text_InitWindowWithTemplate
ldr r1, _080C20F8 @ =REG_BG0CNT
movs r2, 0xF8
lsls r2, 6
@@ -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}
@@ -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
diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 69c6d9e4f..2954c0b09 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,7 +676,7 @@ _08095FA2:
ldr r0, [r1]
movs r1, 0x2
movs r2, 0xF
- bl MenuPrint
+ bl Menu_PrintText
b _080960F4
.align 2, 0
_08095FC0: .4byte gMain
@@ -687,7 +687,7 @@ _08095FC8:
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,7 +892,7 @@ 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
@@ -1854,7 +1854,7 @@ _080968F0: .4byte gWindowConfig_81E6D00
_080968F4:
ldr r0, _08096900 @ =gWindowConfig_81E6D00
bl InitMenuWindow
- bl MenuZeroFillScreen
+ bl Menu_EraseScreen
b _0809697A
.align 2, 0
_08096900: .4byte gWindowConfig_81E6D00
@@ -1993,7 +1993,7 @@ _08096A3C: .4byte gWindowConfig_81E6D00
_08096A40:
ldr r0, _08096A4C @ =gWindowConfig_81E6D00
bl InitMenuWindow
- bl MenuZeroFillScreen
+ bl Menu_EraseScreen
b _08096AD8
.align 2, 0
_08096A4C: .4byte gWindowConfig_81E6D00
@@ -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
@@ -5671,12 +5671,12 @@ sub_8098A5C: @ 8098A5C
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
@@ -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
@@ -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:
@@ -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..7db96ed0f 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -237,7 +237,7 @@ _080F07F4:
adds r0, r1
movs r1, 0x1
movs r2, 0x6
- bl MenuPrint
+ bl Menu_PrintText
_080F080A:
pop {r0}
bx r0
@@ -348,7 +348,7 @@ sub_80F08E4: @ 80F08E4
movs r1, 0x9
movs r2, 0xB
movs r3, 0x10
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
pop {r0}
bx r0
.align 2, 0
@@ -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
@@ -533,7 +533,7 @@ _080F0A40:
lsrs r2, 24
adds r0, r4, 0
movs r1, 0xD
- bl MenuPrint
+ bl Menu_PrintText
pop {r4,r5}
pop {r0}
bx r0
@@ -694,7 +694,7 @@ _080F0B60:
adds r3, r1, 0x1
movs r0, 0xC
movs r2, 0x1F
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
_080F0BAA:
ldrh r0, [r6]
cmp r0, 0
@@ -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
@@ -1147,7 +1147,7 @@ _080F0F10:
movs r0, 0xC
adds r1, r4, 0
movs r2, 0x1F
- bl MenuZeroFillWindowRect
+ bl Menu_EraseWindowRect
ldrh r0, [r5]
adds r0, 0x1
strh r0, [r5]
@@ -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
@@ -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
@@ -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:
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-18 08:24:18 +0000