diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/rom_8011DC0.s | 52 | ||||
| -rw-r--r-- | asm/rom_81D1C44.s | 10 |
2 files changed, 31 insertions, 31 deletions
diff --git a/asm/rom_8011DC0.s b/asm/rom_8011DC0.s index fafedeeff..c13ab9a96 100644 --- a/asm/rom_8011DC0.s +++ b/asm/rom_8011DC0.s @@ -472,7 +472,7 @@ sub_8017020: @ 8017020 bl sub_81973A4 movs r0, 0 movs r1, 0x1 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldr r0, =gStringVar4 adds r1, r4, 0 bl StringExpandPlaceholders @@ -517,7 +517,7 @@ _08017076: bl sub_81973A4 movs r0, 0 movs r1, 0x1 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldr r0, =gStringVar4 adds r1, r5, 0 bl StringExpandPlaceholders @@ -563,7 +563,7 @@ _080170CA: negs r0, r0 b _08017110 _080170D4: - bl DisplayYesNoMenu + bl DisplayYesNoMenuDefaultYes ldrb r0, [r4] adds r0, 0x1 strb r0, [r4] @@ -609,7 +609,7 @@ sub_8017118: @ 8017118 lsrs r4, 24 adds r0, r4, 0 movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame + bl DrawStdWindowFrame adds r0, r4, 0 movs r1, 0xFF bl FillWindowPixelBuffer @@ -705,7 +705,7 @@ _080171DC: strb r0, [r5] ldrb r0, [r5] movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame + bl DrawStdWindowFrame ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, [sp, 0x24] @@ -745,7 +745,7 @@ _08017228: bl DestroyListMenuTask ldrb r0, [r5] movs r1, 0x1 - bl sub_819746C + bl ClearStdWindowAndFrame ldrb r0, [r5] bl RemoveWindow movs r0, 0 @@ -765,7 +765,7 @@ _08017264: bl DestroyListMenuTask ldrb r0, [r5] movs r1, 0x1 - bl sub_819746C + bl ClearStdWindowAndFrame ldrb r0, [r5] bl RemoveWindow strb r4, [r7] @@ -818,7 +818,7 @@ _080172C8: strb r0, [r6] ldrb r0, [r6] movs r1, 0 - bl NewMenuHelpers_DrawStdWindowFrame + bl DrawStdWindowFrame ldr r0, =gMultiuseListMenuTemplate adds r2, r0, 0 ldr r1, [sp, 0x24] @@ -18242,7 +18242,7 @@ sub_801FEBC: @ 801FEBC lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldr r0, [r4] ldrb r0, [r0, 0x18] bl ClearWindowTilemap @@ -18470,7 +18470,7 @@ sub_8020094: @ 8020094 lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldr r0, [r4] ldrb r0, [r0, 0x1E] bl ClearWindowTilemap @@ -18913,7 +18913,7 @@ sub_802040C: @ 802040C push {lr} movs r0, 0x3 movs r1, 0 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent movs r0, 0x3 bl ClearWindowTilemap pop {r0} @@ -22378,7 +22378,7 @@ _0802210C: movs r1, 0 adds r2, r4, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _08022218 .pool _08022130: @@ -22509,7 +22509,7 @@ sub_802222C: @ 802222C adds r5, r4, r0 ldrb r0, [r5] movs r1, 0x1 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r5] bl RemoveWindow adds r0, r4, 0 @@ -22577,7 +22577,7 @@ _08022296: movs r1, 0 adds r2, r4, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _080224BA .pool _080222D0: @@ -22773,7 +22773,7 @@ _08022480: _08022494: ldrb r0, [r6, 0x2] movs r1, 0x1 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r6, 0x2] bl ClearWindowTilemap ldrb r0, [r6, 0x2] @@ -23864,7 +23864,7 @@ _08022D38: _08022D42: movs r0, 0 movs r1, 0 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldrb r1, [r5, 0x1] movs r0, 0x2 mov r8, r0 @@ -23946,7 +23946,7 @@ _08022DE8: beq _08022DFA movs r0, 0 movs r1, 0x1 - bl sub_8197434 + bl ClearDialogWindowAndFrame _08022DFA: ldrb r0, [r7, 0xE] movs r1, 0x1 @@ -24250,7 +24250,7 @@ _0802301E: _08023044: movs r0, 0 movs r1, 0x1 - bl sub_8197434 + bl ClearDialogWindowAndFrame movs r0, 0xA movs r1, 0x1 movs r2, 0 @@ -26462,7 +26462,7 @@ _080241A6: beq _0802421E movs r0, 0 movs r1, 0 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldr r2, =gText_SavingDontTurnOffPower movs r0, 0 str r0, [sp] @@ -26550,7 +26550,7 @@ _08024246: strb r0, [r5, 0xC] b _080242D8 _0802426A: - bl DisplayYesNoMenu + bl DisplayYesNoMenuDefaultYes b _080242D0 _08024270: bl Menu_ProcessInputNoWrapClearOnChoose @@ -26583,7 +26583,7 @@ _080242A4: _080242A6: movs r0, 0 movs r1, 0x1 - bl sub_8197434 + bl ClearDialogWindowAndFrame movs r4, 0 str r4, [sp] adds r0, r6, 0 @@ -26761,7 +26761,7 @@ _080243EA: _080243F6: movs r0, 0 movs r1, 0x1 - bl sub_8197434 + bl ClearDialogWindowAndFrame adds r0, r5, 0 bl sub_8021488 movs r0, 0x1 @@ -26819,7 +26819,7 @@ _0802445A: _08024460: movs r0, 0 movs r1, 0 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldrh r1, [r5, 0x14] cmp r1, 0x3 bne _08024490 @@ -27347,7 +27347,7 @@ sub_802482C: @ 802482C movs r1, 0 adds r2, r4, 0 adds r3, r5, 0 - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette ldr r2, =gText_Powder movs r0, 0x1 str r0, [sp] @@ -27446,7 +27446,7 @@ sub_8024918: @ 8024918 bl ClearWindowTilemap ldrb r0, [r4] movs r1, 0x1 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl RemoveWindow pop {r4} @@ -38552,7 +38552,7 @@ _0802A3A4: _0802A3AE: movs r0, 0 movs r1, 0 - bl NewMenuHelpers_DrawDialogueFrame + bl DrawDialogueFrame ldr r2, =gText_SavingDontTurnOffPower str r4, [sp] movs r0, 0x2 diff --git a/asm/rom_81D1C44.s b/asm/rom_81D1C44.s index a9ef8e4f2..36ebd29da 100644 --- a/asm/rom_81D1C44.s +++ b/asm/rom_81D1C44.s @@ -108,7 +108,7 @@ sub_81D1D04: @ 81D1D04 adds r4, r0 ldrb r0, [r4] movs r1, 0 - bl sub_8198070 + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl ClearWindowTilemap ldrb r0, [r4] @@ -1613,7 +1613,7 @@ _081D284A: movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _081D288E .pool _081D287C: @@ -1623,7 +1623,7 @@ _081D287C: movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette _081D288E: movs r0, 0x2 bl PutWindowTilemap @@ -1633,12 +1633,12 @@ _081D288E: movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette movs r0, 0x3 movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette bl nullsub_79 movs r0, 0x1 bl schedule_bg_copy_tilemap_to_vram |