diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/contest_link_80C2020.s | 2 | ||||
| -rw-r--r-- | asm/pokemon_storage_system.s | 18 | ||||
| -rw-r--r-- | asm/pokenav.s | 12 |
3 files changed, 16 insertions, 16 deletions
diff --git a/asm/contest_link_80C2020.s b/asm/contest_link_80C2020.s index 5e1265f6b..71788c918 100644 --- a/asm/contest_link_80C2020.s +++ b/asm/contest_link_80C2020.s @@ -14,7 +14,7 @@ sub_80C2020: @ 80C2020 strh r0, [r5] ldr r4, _080C20F0 @ =gWindowTemplate_81E6FA0 adds r0, r4, 0 - bl SetUpWindowConfig + bl Text_LoadWindowTemplate ldr r0, _080C20F4 @ =gMenuWindow adds r1, r4, 0 bl Text_InitWindowWithTemplate diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index fd49e1520..d878821cb 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -682,7 +682,7 @@ _08095FA2: _08095FC0: .4byte gMain _08095FC4: .4byte gUnknown_083B600C _08095FC8: - bl HandleDestroyMenuCursors + bl Menu_DestroyCursor movs r0, 0 movs r1, 0 movs r2, 0xD @@ -897,7 +897,7 @@ StorageSystemCreatePrimaryMenu: @ 8096168 movs r0, 0x1 movs r1, 0x1 movs r2, 0x4 - bl PrintMenuItems + bl Menu_PrintItems str r4, [sp] movs r0, 0xC str r0, [sp, 0x4] @@ -1643,7 +1643,7 @@ sub_80966F4: @ 80966F4 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 @@ -1847,7 +1847,7 @@ _080968D4: b _0809697A _080968E8: ldr r0, _080968F0 @ =gWindowTemplate_81E6D00 - bl SetUpWindowConfig + bl Text_LoadWindowTemplate b _0809697A .align 2, 0 _080968F0: .4byte gWindowTemplate_81E6D00 @@ -1986,7 +1986,7 @@ _08096A2C: .4byte gUnknown_0203847D _08096A30: .4byte gUnknown_0203847F _08096A34: ldr r0, _08096A3C @ =gWindowTemplate_81E6D00 - bl SetUpWindowConfig + bl Text_LoadWindowTemplate b _08096AD8 .align 2, 0 _08096A3C: .4byte gWindowTemplate_81E6D00 @@ -5666,7 +5666,7 @@ 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 @@ -8748,7 +8748,7 @@ sub_809A1BC: @ 809A1BC 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] @@ -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 @@ -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 diff --git a/asm/pokenav.s b/asm/pokenav.s index 34d8aba2e..7c766addc 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -567,7 +567,7 @@ sub_80F0A74: @ 80F0A74 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] @@ -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 @@ -1358,7 +1358,7 @@ _080F10FC: .4byte gUnknown_083DFEC4 _080F1100: .4byte 0x0000d162 _080F1104: ldr r0, _080F110C @ =gWindowTemplate_81E70B8 - bl SetUpWindowConfig + bl Text_LoadWindowTemplate b _080F1218 .align 2, 0 _080F110C: .4byte gWindowTemplate_81E70B8 @@ -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 @@ -7665,7 +7665,7 @@ sub_80F4194: @ 80F4194 ldr r0, [r4, 0x8] 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 |