diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/berry_crush_3.s | 8 | ||||
| -rw-r--r-- | asm/berry_pouch.s | 14 | ||||
| -rw-r--r-- | asm/cable_car_util.s | 162 | ||||
| -rw-r--r-- | asm/clear_save_data_screen.s | 4 | ||||
| -rw-r--r-- | asm/diploma.s | 607 | ||||
| -rw-r--r-- | asm/field_specials.s | 10 | ||||
| -rw-r--r-- | asm/hall_of_fame.s | 12 | ||||
| -rw-r--r-- | asm/item_menu.s | 6 | ||||
| -rw-r--r-- | asm/link_rfu_3.s | 2 | ||||
| -rw-r--r-- | asm/mailbox_pc.s | 2 | ||||
| -rw-r--r-- | asm/menu.s | 3455 | ||||
| -rw-r--r-- | asm/overworld.s | 6 | ||||
| -rw-r--r-- | asm/party_menu.s | 36 | ||||
| -rw-r--r-- | asm/player_pc.s | 28 | ||||
| -rw-r--r-- | asm/pokedex.s | 6 | ||||
| -rw-r--r-- | asm/pokemon_jump_2.s | 2 | ||||
| -rw-r--r-- | asm/pokemon_special_anim.s | 2 | ||||
| -rw-r--r-- | asm/pokemon_storage_system.s | 28 | ||||
| -rw-r--r-- | asm/script_menu.s | 26 | ||||
| -rw-r--r-- | asm/shop.s | 18 | ||||
| -rw-r--r-- | asm/slot_machine.s | 4 | ||||
| -rw-r--r-- | asm/start_menu.s | 14 | ||||
| -rw-r--r-- | asm/trade.s | 6 | ||||
| -rw-r--r-- | asm/trainer_card.s | 4 | ||||
| -rw-r--r-- | asm/union_room_chat.s | 18 |
25 files changed, 128 insertions, 4352 deletions
diff --git a/asm/berry_crush_3.s b/asm/berry_crush_3.s index 581b84793..b10f29f8d 100644 --- a/asm/berry_crush_3.s +++ b/asm/berry_crush_3.s @@ -2102,7 +2102,7 @@ _0814E6E0: movs r1, 0 adds r2, r4, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _0814E7F8 .align 2, 0 _0814E700: .4byte 0x0000021d @@ -2246,7 +2246,7 @@ sub_814E80C: @ 814E80C adds r5, r4, r0 ldrb r0, [r5] movs r1, 0x1 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r5] bl RemoveWindow adds r0, r4, 0 @@ -2314,7 +2314,7 @@ _0814E876: movs r1, 0 adds r2, r4, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _0814EA66 .align 2, 0 _0814E8A8: .4byte gUnknown_846E3F0 @@ -2499,7 +2499,7 @@ _0814EA3C: .4byte gMain _0814EA40: ldrb r0, [r7, 0x2] movs r1, 0x1 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r7, 0x2] bl ClearWindowTilemap ldrb r0, [r7, 0x2] diff --git a/asm/berry_pouch.s b/asm/berry_pouch.s index 8eb127d52..60d6873e6 100644 --- a/asm/berry_pouch.s +++ b/asm/berry_pouch.s @@ -1974,7 +1974,7 @@ _0813DC86: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0x6 bl sub_813EA08 adds r4, r0, 0 @@ -2051,7 +2051,7 @@ sub_813DDA0: @ 813DDA0 lsrs r0, 24 cmp r0, 0x1 beq _0813DDFE - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 @@ -3509,7 +3509,7 @@ _0813EA38: movs r1, 0 movs r2, 0xA movs r3, 0xC - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette b _0813EA60 .align 2, 0 _0813EA4C: .4byte gUnknown_203F38C @@ -3519,7 +3519,7 @@ _0813EA54: movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette _0813EA60: movs r0, 0x2 bl ScheduleBgCopyTilemapToVram @@ -3545,7 +3545,7 @@ sub_813EA78: @ 813EA78 movs r1, 0 movs r2, 0x1 movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette pop {r0} bx r0 .align 2, 0 @@ -3562,7 +3562,7 @@ sub_813EA98: @ 813EA98 adds r4, r0 ldrb r0, [r4] movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl ClearWindowTilemap ldrb r0, [r4] @@ -3589,7 +3589,7 @@ sub_813EACC: @ 813EACC cmp r0, 0xFF beq _0813EB04 movs r1, 0 - bl ClearMenuWindow_BorderThickness2 + bl ClearDialogWindowAndFrameToTransparent ldrb r0, [r4] bl ClearWindowTilemap ldrb r0, [r4] diff --git a/asm/cable_car_util.s b/asm/cable_car_util.s deleted file mode 100644 index 4a8f99176..000000000 --- a/asm/cable_car_util.s +++ /dev/null @@ -1,162 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80D9614 -sub_80D9614: @ 80D9614 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r10, r0 - ldr r0, [sp, 0x24] - ldr r4, [sp, 0x28] - lsls r1, 16 - lsrs r1, 16 - mov r9, r1 - lsls r2, 24 - lsrs r2, 24 - str r2, [sp] - lsls r3, 24 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r4, 24 - lsrs r4, 24 - mov r8, r4 - movs r0, 0 - lsrs r4, r3, 24 - cmp r0, r8 - bcs _080D968E -_080D9646: - ldr r2, [sp] - movs r3, 0 - adds r6, r4, 0x1 - adds r0, 0x1 - mov r12, r0 - cmp r3, r7 - bcs _080D9678 - lsls r5, r4, 6 -_080D9656: - lsls r0, r2, 1 - adds r0, r5 - add r0, r10 - mov r1, r9 - strh r1, [r0] - adds r1, r2, 0x1 - adds r0, r1, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r1, r0 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r7 - bcc _080D9656 -_080D9678: - adds r0, r6, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r6, r0 - lsls r0, 24 - lsrs r4, r0, 24 - mov r1, r12 - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, r8 - bcc _080D9646 -_080D968E: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80D9614 - - thumb_func_start sub_80D96A0 -sub_80D96A0: @ 80D96A0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x4 - mov r10, r0 - ldr r0, [sp, 0x24] - ldr r4, [sp, 0x28] - lsls r2, 24 - lsrs r2, 24 - str r2, [sp] - lsls r3, 24 - lsls r0, 24 - lsrs r0, 24 - mov r12, r0 - lsls r4, 24 - lsrs r4, 24 - mov r9, r4 - movs r0, 0 - adds r5, r1, 0 - lsrs r4, r3, 24 - cmp r0, r9 - bcs _080D971A -_080D96D0: - ldr r2, [sp] - movs r3, 0 - adds r7, r4, 0x1 - adds r0, 0x1 - mov r8, r0 - cmp r3, r12 - bcs _080D9704 - lsls r6, r4, 6 -_080D96E0: - lsls r0, r2, 1 - adds r0, r6 - add r0, r10 - ldrh r1, [r5] - strh r1, [r0] - adds r5, 0x2 - adds r1, r2, 0x1 - adds r0, r1, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r1, r0 - lsls r0, 24 - lsrs r2, r0, 24 - adds r0, r3, 0x1 - lsls r0, 24 - lsrs r3, r0, 24 - cmp r3, r12 - bcc _080D96E0 -_080D9704: - adds r0, r7, 0 - asrs r0, 5 - lsls r0, 5 - subs r0, r7, r0 - lsls r0, 24 - lsrs r4, r0, 24 - mov r1, r8 - lsls r0, r1, 24 - lsrs r0, 24 - cmp r0, r9 - bcc _080D96D0 -_080D971A: - add sp, 0x4 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_80D96A0 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/clear_save_data_screen.s b/asm/clear_save_data_screen.s index ccae18c34..f6cd11410 100644 --- a/asm/clear_save_data_screen.s +++ b/asm/clear_save_data_screen.s @@ -120,7 +120,7 @@ _080F5660: movs r1, 0x1 movs r2, 0x1 movs r3, 0xF - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette movs r0, 0x1 str r0, [sp] str r0, [sp, 0x4] @@ -304,7 +304,7 @@ _080F57D4: lsrs r4, r0, 24 cmp r4, 0 bne _080F57FE - bl sub_81100E8 + bl DestroyYesNoMenu adds r0, r6, 0 bl DestroyTask bl FreeAllWindowBuffers diff --git a/asm/diploma.s b/asm/diploma.s deleted file mode 100644 index 9e3d1b3ee..000000000 --- a/asm/diploma.s +++ /dev/null @@ -1,607 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start sub_80F4BFC -sub_80F4BFC: @ 80F4BFC - push {lr} - bl LoadOam - bl ProcessSpriteCopyRequests - bl TransferPlttBuffer - pop {r0} - bx r0 - thumb_func_end sub_80F4BFC - - thumb_func_start sub_80F4C10 -sub_80F4C10: @ 80F4C10 - push {r4,lr} - ldr r4, _080F4C40 @ =gUnknown_203AB48 - ldr r0, _080F4C44 @ =0x00001004 - bl AllocZeroed - str r0, [r4] - movs r1, 0 - strb r1, [r0] - ldr r0, [r4] - strb r1, [r0, 0x1] - ldr r0, [r4] - strb r1, [r0, 0x2] - bl sub_80F4E24 - ldr r0, _080F4C48 @ =sub_80F4C68 - movs r1, 0 - bl CreateTask - ldr r0, _080F4C4C @ =sub_80F4C50 - bl SetMainCallback2 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F4C40: .4byte gUnknown_203AB48 -_080F4C44: .4byte 0x00001004 -_080F4C48: .4byte sub_80F4C68 -_080F4C4C: .4byte sub_80F4C50 - thumb_func_end sub_80F4C10 - - thumb_func_start sub_80F4C50 -sub_80F4C50: @ 80F4C50 - push {lr} - bl RunTasks - bl AnimateSprites - bl BuildOamBuffer - bl UpdatePaletteFade - pop {r0} - bx r0 - thumb_func_end sub_80F4C50 - - thumb_func_start sub_80F4C68 -sub_80F4C68: @ 80F4C68 - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r4, r0, 24 - ldr r0, _080F4C84 @ =gUnknown_203AB48 - ldr r0, [r0] - ldrb r0, [r0, 0x2] - cmp r0, 0x8 - bhi _080F4D30 - lsls r0, 2 - ldr r1, _080F4C88 @ =_080F4C8C - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080F4C84: .4byte gUnknown_203AB48 -_080F4C88: .4byte _080F4C8C - .align 2, 0 -_080F4C8C: - .4byte _080F4CB0 - .4byte _080F4CB8 - .4byte _080F4CBE - .4byte _080F4CCA - .4byte _080F4CDC - .4byte _080F4CFC - .4byte _080F4D02 - .4byte _080F4D10 - .4byte _080F4D22 -_080F4CB0: - movs r0, 0 - bl SetVBlankCallback - b _080F4D50 -_080F4CB8: - bl sub_80F4E40 - b _080F4D50 -_080F4CBE: - bl sub_80F4F9C - lsls r0, 24 - cmp r0, 0 - beq _080F4D5A - b _080F4D50 -_080F4CCA: - ldr r1, _080F4CD8 @ =gUnknown_84154E8 - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl CopyToBgTilemapBuffer - b _080F4D50 - .align 2, 0 -_080F4CD8: .4byte gUnknown_84154E8 -_080F4CDC: - bl sub_8088F84 - lsls r0, 16 - cmp r0, 0 - beq _080F4CF2 - movs r1, 0x80 - lsls r1, 1 - movs r0, 0x14 - bl SetGpuReg - b _080F4D50 -_080F4CF2: - movs r0, 0x14 - movs r1, 0 - bl SetGpuReg - b _080F4D50 -_080F4CFC: - bl sub_80F5018 - b _080F4D50 -_080F4D02: - movs r0, 0 - bl CopyBgTilemapBufferToVram - movs r0, 0x1 - bl CopyBgTilemapBufferToVram - b _080F4D50 -_080F4D10: - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0x10 - movs r3, 0 - bl BeginNormalPaletteFade - b _080F4D50 -_080F4D22: - ldr r0, _080F4D2C @ =sub_80F4BFC - bl SetVBlankCallback - b _080F4D50 - .align 2, 0 -_080F4D2C: .4byte sub_80F4BFC -_080F4D30: - ldr r0, _080F4D64 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - bne _080F4D50 - movs r0, 0x5 - bl PlayFanfareByFanfareNum - ldr r0, _080F4D68 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, _080F4D6C @ =sub_80F4D74 - str r0, [r1] -_080F4D50: - ldr r0, _080F4D70 @ =gUnknown_203AB48 - ldr r1, [r0] - ldrb r0, [r1, 0x2] - adds r0, 0x1 - strb r0, [r1, 0x2] -_080F4D5A: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080F4D64: .4byte gPaletteFade -_080F4D68: .4byte gTasks -_080F4D6C: .4byte sub_80F4D74 -_080F4D70: .4byte gUnknown_203AB48 - thumb_func_end sub_80F4C68 - - thumb_func_start sub_80F4D74 -sub_80F4D74: @ 80F4D74 - push {r4,lr} - sub sp, 0x4 - lsls r0, 24 - lsrs r2, r0, 24 - ldr r4, _080F4D90 @ =gUnknown_203AB48 - ldr r0, [r4] - ldrb r1, [r0] - cmp r1, 0x1 - beq _080F4DA8 - cmp r1, 0x1 - bgt _080F4D94 - cmp r1, 0 - beq _080F4D9A - b _080F4DD6 - .align 2, 0 -_080F4D90: .4byte gUnknown_203AB48 -_080F4D94: - cmp r1, 0x2 - beq _080F4DD0 - b _080F4DD6 -_080F4D9A: - movs r0, 0 - bl WaitFanfare - lsls r0, 24 - cmp r0, 0 - beq _080F4DD6 - b _080F4DC2 -_080F4DA8: - ldr r0, _080F4DCC @ =gMain - ldrh r0, [r0, 0x2E] - ands r1, r0 - cmp r1, 0 - beq _080F4DD6 - movs r0, 0x1 - negs r0, r0 - movs r1, 0 - str r1, [sp] - movs r2, 0 - movs r3, 0x10 - bl BeginNormalPaletteFade -_080F4DC2: - ldr r1, [r4] - ldrb r0, [r1] - adds r0, 0x1 - strb r0, [r1] - b _080F4DD6 - .align 2, 0 -_080F4DCC: .4byte gMain -_080F4DD0: - adds r0, r2, 0 - bl sub_80F4DE0 -_080F4DD6: - add sp, 0x4 - pop {r4} - pop {r0} - bx r0 - thumb_func_end sub_80F4D74 - - thumb_func_start sub_80F4DE0 -sub_80F4DE0: @ 80F4DE0 - push {r4,r5,lr} - lsls r0, 24 - lsrs r2, r0, 24 - ldr r0, _080F4E18 @ =gPaletteFade - ldrb r1, [r0, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r5, r0, 24 - cmp r5, 0 - bne _080F4E10 - adds r0, r2, 0 - bl DestroyTask - bl FreeAllWindowBuffers - ldr r4, _080F4E1C @ =gUnknown_203AB48 - ldr r0, [r4] - bl Free - str r5, [r4] - ldr r0, _080F4E20 @ =sub_80568FC - bl SetMainCallback2 -_080F4E10: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F4E18: .4byte gPaletteFade -_080F4E1C: .4byte gUnknown_203AB48 -_080F4E20: .4byte sub_80568FC - thumb_func_end sub_80F4DE0 - - thumb_func_start sub_80F4E24 -sub_80F4E24: @ 80F4E24 - push {lr} - bl ResetSpriteData - bl ResetPaletteFade - bl FreeAllSpritePalettes - bl ResetTasks - bl ScanlineEffect_Stop - pop {r0} - bx r0 - thumb_func_end sub_80F4E24 - - thumb_func_start sub_80F4E40 -sub_80F4E40: @ 80F4E40 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x10 - movs r3, 0xC0 - lsls r3, 19 - movs r4, 0xC0 - lsls r4, 9 - add r0, sp, 0xC - mov r8, r0 - add r2, sp, 0x8 - movs r6, 0 - ldr r1, _080F4F88 @ =0x040000d4 - movs r5, 0x80 - lsls r5, 5 - ldr r7, _080F4F8C @ =0x81000800 - movs r0, 0x81 - lsls r0, 24 - mov r12, r0 -_080F4E66: - strh r6, [r2] - add r0, sp, 0x8 - str r0, [r1] - str r3, [r1, 0x4] - str r7, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r3, r5 - subs r4, r5 - cmp r4, r5 - bhi _080F4E66 - strh r6, [r2] - add r2, sp, 0x8 - str r2, [r1] - str r3, [r1, 0x4] - lsrs r0, r4, 1 - mov r2, r12 - orrs r0, r2 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - movs r0, 0xE0 - lsls r0, 19 - movs r3, 0x80 - lsls r3, 3 - movs r4, 0 - str r4, [sp, 0xC] - ldr r2, _080F4F88 @ =0x040000d4 - mov r1, r8 - str r1, [r2] - str r0, [r2, 0x4] - lsrs r0, r3, 2 - movs r1, 0x85 - lsls r1, 24 - orrs r0, r1 - str r0, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r1, 0xA0 - lsls r1, 19 - add r0, sp, 0x8 - strh r4, [r0] - str r0, [r2] - str r1, [r2, 0x4] - lsrs r3, 1 - movs r0, 0x81 - lsls r0, 24 - orrs r3, r0 - str r3, [r2, 0x8] - ldr r0, [r2, 0x8] - movs r0, 0 - movs r1, 0 - bl SetGpuReg - movs r0, 0 - bl ResetBgsAndClearDma3BusyFlags - ldr r1, _080F4F90 @ =gUnknown_8415A08 - movs r0, 0 - movs r2, 0x2 - bl InitBgsFromTemplates - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x2 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgX - movs r0, 0x3 - movs r1, 0 - movs r2, 0 - bl ChangeBgY - ldr r0, _080F4F94 @ =gUnknown_8415A10 - bl InitWindows - bl DeactivateAllTextPrinters - movs r1, 0x82 - lsls r1, 5 - movs r0, 0 - bl SetGpuReg - ldr r0, _080F4F98 @ =gUnknown_203AB48 - ldr r1, [r0] - adds r1, 0x4 - movs r0, 0x1 - bl SetBgTilemapBuffer - movs r0, 0 - bl ShowBg - movs r0, 0x1 - bl ShowBg - movs r5, 0x1E - str r5, [sp] - movs r4, 0x14 - str r4, [sp, 0x4] - movs r0, 0 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - str r5, [sp] - str r4, [sp, 0x4] - movs r0, 0x1 - movs r1, 0 - movs r2, 0 - movs r3, 0 - bl FillBgTilemapBufferRect_Palette0 - add sp, 0x10 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080F4F88: .4byte 0x040000d4 -_080F4F8C: .4byte 0x81000800 -_080F4F90: .4byte gUnknown_8415A08 -_080F4F94: .4byte gUnknown_8415A10 -_080F4F98: .4byte gUnknown_203AB48 - thumb_func_end sub_80F4E40 - - thumb_func_start sub_80F4F9C -sub_80F4F9C: @ 80F4F9C - push {lr} - sub sp, 0x4 - ldr r0, _080F4FB4 @ =gUnknown_203AB48 - ldr r0, [r0] - ldrb r0, [r0, 0x1] - cmp r0, 0x1 - beq _080F4FC8 - cmp r0, 0x1 - bgt _080F4FB8 - cmp r0, 0 - beq _080F4FC2 - b _080F4FF8 - .align 2, 0 -_080F4FB4: .4byte gUnknown_203AB48 -_080F4FB8: - cmp r0, 0x2 - beq _080F4FE0 - cmp r0, 0x3 - beq _080F4FEE - b _080F4FF8 -_080F4FC2: - bl ResetTempTileDataBuffers - b _080F5000 -_080F4FC8: - ldr r1, _080F4FDC @ =gUnknown_84147C0 - movs r0, 0 - str r0, [sp] - movs r0, 0x1 - movs r2, 0 - movs r3, 0 - bl DecompressAndCopyTileDataToVram - b _080F5000 - .align 2, 0 -_080F4FDC: .4byte gUnknown_84147C0 -_080F4FE0: - bl FreeTempTileDataBuffersIfPossible - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _080F5000 - b _080F500A -_080F4FEE: - ldr r0, _080F4FFC @ =gUnknown_8415954 - movs r1, 0 - movs r2, 0x40 - bl LoadPalette -_080F4FF8: - movs r0, 0x1 - b _080F500C - .align 2, 0 -_080F4FFC: .4byte gUnknown_8415954 -_080F5000: - ldr r0, _080F5014 @ =gUnknown_203AB48 - ldr r1, [r0] - ldrb r0, [r1, 0x1] - adds r0, 0x1 - strb r0, [r1, 0x1] -_080F500A: - movs r0, 0 -_080F500C: - add sp, 0x4 - pop {r1} - bx r1 - .align 2, 0 -_080F5014: .4byte gUnknown_203AB48 - thumb_func_end sub_80F4F9C - - thumb_func_start sub_80F5018 -sub_80F5018: @ 80F5018 - push {r4-r6,lr} - sub sp, 0xAC - bl DynamicPlaceholderTextUtil_Reset - ldr r0, _080F5040 @ =gSaveBlock2Ptr - ldr r1, [r0] - movs r0, 0 - bl DynamicPlaceholderTextUtil_SetPlaceholderPtr - bl sub_8088F84 - lsls r0, 16 - cmp r0, 0 - beq _080F5048 - ldr r1, _080F5044 @ =gUnknown_841B68F - movs r0, 0x1 - bl DynamicPlaceholderTextUtil_SetPlaceholderPtr - b _080F5050 - .align 2, 0 -_080F5040: .4byte gSaveBlock2Ptr -_080F5044: .4byte gUnknown_841B68F -_080F5048: - ldr r1, _080F50E0 @ =gUnknown_841B698 - movs r0, 0x1 - bl DynamicPlaceholderTextUtil_SetPlaceholderPtr -_080F5050: - movs r0, 0 - movs r1, 0 - bl FillWindowPixelBuffer - ldr r1, _080F50E4 @ =gUnknown_841B60E - add r0, sp, 0xC - bl DynamicPlaceholderTextUtil_ExpandPlaceholders - movs r5, 0x1 - negs r5, r5 - movs r0, 0x2 - add r1, sp, 0xC - adds r2, r5, 0 - bl GetStringWidth - lsrs r2, r0, 1 - movs r4, 0x78 - subs r2, r4, r2 - lsls r2, 24 - lsrs r2, 24 - ldr r6, _080F50E8 @ =gUnknown_8415A04 - str r6, [sp] - str r5, [sp, 0x4] - add r0, sp, 0xC - str r0, [sp, 0x8] - movs r0, 0 - movs r1, 0x2 - movs r3, 0x4 - bl AddTextPrinterParameterized3 - ldr r1, _080F50EC @ =gUnknown_841B619 - add r0, sp, 0xC - bl DynamicPlaceholderTextUtil_ExpandPlaceholders - movs r0, 0x2 - add r1, sp, 0xC - adds r2, r5, 0 - bl GetStringWidth - lsrs r0, 1 - subs r4, r0 - lsls r4, 24 - lsrs r4, 24 - str r6, [sp] - str r5, [sp, 0x4] - add r0, sp, 0xC - str r0, [sp, 0x8] - movs r0, 0 - movs r1, 0x2 - adds r2, r4, 0 - movs r3, 0x1E - bl AddTextPrinterParameterized3 - str r6, [sp] - movs r0, 0 - str r0, [sp, 0x4] - ldr r0, _080F50F0 @ =gUnknown_841B684 - str r0, [sp, 0x8] - movs r0, 0 - movs r1, 0x2 - movs r2, 0x78 - movs r3, 0x69 - bl AddTextPrinterParameterized3 - movs r0, 0 - bl PutWindowTilemap - add sp, 0xAC - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080F50E0: .4byte gUnknown_841B698 -_080F50E4: .4byte gUnknown_841B60E -_080F50E8: .4byte gUnknown_8415A04 -_080F50EC: .4byte gUnknown_841B619 -_080F50F0: .4byte gUnknown_841B684 - thumb_func_end sub_80F5018 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/field_specials.s b/asm/field_specials.s index c1555f2bb..4c37e0638 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -9,13 +9,13 @@ sub_80CA618: @ 80CA618 push {lr} bl sub_8112364 - ldr r0, _080CA62C @ =sub_80F4C10 + ldr r0, _080CA62C @ =CB2_ShowDiploma bl SetMainCallback2 bl ScriptContext2_Enable pop {r0} bx r0 .align 2, 0 -_080CA62C: .4byte sub_80F4C10 +_080CA62C: .4byte CB2_ShowDiploma thumb_func_end sub_80CA618 thumb_func_start sub_80CA630 @@ -2076,7 +2076,7 @@ sub_80CB580: @ 80CB580 movs r1, 0 adds r2, r5, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette ldrb r0, [r4] ldr r2, _080CB630 @ =gUnknown_8418075 movs r1, 0x2 @@ -2141,7 +2141,7 @@ sub_80CB63C: @ 80CB63C ldr r4, _080CB654 @ =gUnknown_2039A0C ldrb r0, [r4] movs r1, 0x1 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl RemoveWindow pop {r4} @@ -2862,7 +2862,7 @@ sub_80CBBAC: @ 80CBBAC lsls r0, 24 lsrs r0, 24 movs r1, 0x1 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrh r0, [r4, 0x22] lsls r0, 24 lsrs r0, 24 diff --git a/asm/hall_of_fame.s b/asm/hall_of_fame.s index 4d861b902..19ff62664 100644 --- a/asm/hall_of_fame.s +++ b/asm/hall_of_fame.s @@ -1607,7 +1607,7 @@ sub_80F2AA4: @ 80F2AA4 movs r1, 0x1E movs r2, 0 movs r3, 0xC - bl CreateWindow_SnapRight_StdPal + bl CreateTopBarWindowLoadPalette movs r0, 0x3 bl Save_LoadGameData lsls r0, 24 @@ -1894,7 +1894,7 @@ _080F2CB4: adds r0, r5, 0 movs r2, 0 movs r3, 0 - bl Menu_PrintHelpSystemUIHeader + bl TopBarWindowPrintTwoStrings b _080F2D34 .align 2, 0 _080F2D08: .4byte 0xffff0000 @@ -1911,7 +1911,7 @@ _080F2D24: adds r0, r5, 0 movs r2, 0 movs r3, 0 - bl Menu_PrintHelpSystemUIHeader + bl TopBarWindowPrintTwoStrings _080F2D34: ldr r0, _080F2D58 @ =gTasks ldr r1, [sp, 0x14] @@ -2298,7 +2298,7 @@ sub_80F3030: @ 80F3030 bl HideBg movs r0, 0x3 bl HideBg - bl sub_810F740 + bl DestroyTopBarWindow bl FreeAllWindowBuffers movs r0, 0x1 bl UnsetBgTilemapBuffer @@ -2342,7 +2342,7 @@ sub_80F30A4: @ 80F30A4 ldr r0, _080F30FC @ =gText_ABUTTONExit movs r1, 0x8 movs r2, 0x1 - bl PrintTextOnRightSnappedWindow + bl TopBarWindowPrintString movs r0, 0 movs r1, 0 bl DrawDialogueFrame @@ -2750,7 +2750,7 @@ sub_80F33DC: @ 80F33DC movs r0, 0x1 movs r1, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette movs r7, 0 str r7, [sp] str r7, [sp, 0x4] diff --git a/asm/item_menu.s b/asm/item_menu.s index 8d01691a5..e85f63872 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -3715,7 +3715,7 @@ _08109AD4: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0x6 movs r1, 0 bl sub_810B9DC @@ -3791,7 +3791,7 @@ sub_8109BE4: @ 8109BE4 lsrs r0, 24 cmp r0, 0x1 beq _08109C42 - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 @@ -6507,7 +6507,7 @@ _0810B290: movs r0, 0x5 bl PlaySE movs r0, 0x1 - bl MoveMenuCursorNoWrapAround + bl Menu_MoveCursorNoWrapAround b _0810B36C _0810B29E: movs r0, 0x5 diff --git a/asm/link_rfu_3.s b/asm/link_rfu_3.s index 78c09b0ff..d4a88c18f 100644 --- a/asm/link_rfu_3.s +++ b/asm/link_rfu_3.s @@ -8586,7 +8586,7 @@ _0811A168: _0811A174: cmp r5, 0 beq _0811A186 - bl sub_81100E8 + bl DestroyYesNoMenu movs r0, 0 strb r0, [r4] movs r0, 0x3 diff --git a/asm/mailbox_pc.s b/asm/mailbox_pc.s index e41fb23c1..7e792681f 100644 --- a/asm/mailbox_pc.s +++ b/asm/mailbox_pc.s @@ -81,7 +81,7 @@ sub_810EBE0: @ 810EBE0 adds r4, r0 ldrb r0, [r4] movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl ClearWindowTilemap ldrb r0, [r4] diff --git a/asm/menu.s b/asm/menu.s deleted file mode 100644 index c8e823fc1..000000000 --- a/asm/menu.s +++ /dev/null @@ -1,3455 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start DrawDialogFrameWithCustomTileAndPalette -DrawDialogFrameWithCustomTileAndPalette: @ 810EDC4 - push {r4,r5,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0810EE00 @ =gUnknown_203ADF0 - strh r2, [r0] - ldr r0, _0810EE04 @ =gUnknown_203ADF2 - strb r3, [r0] - ldr r1, _0810EE08 @ =sub_810EE5C - adds r0, r5, 0 - bl CallWindowFunction - adds r0, r5, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - adds r0, r5, 0 - bl PutWindowTilemap - cmp r4, 0x1 - bne _0810EDFA - adds r0, r5, 0 - movs r1, 0x3 - bl CopyWindowToVram -_0810EDFA: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0810EE00: .4byte gUnknown_203ADF0 -_0810EE04: .4byte gUnknown_203ADF2 -_0810EE08: .4byte sub_810EE5C - thumb_func_end DrawDialogFrameWithCustomTileAndPalette - - thumb_func_start sub_810EE0C -sub_810EE0C: @ 810EE0C - push {r4-r6,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r6, r0, 24 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0810EE50 @ =gUnknown_203ADF0 - strh r2, [r0] - ldr r5, _0810EE54 @ =gUnknown_203ADF2 - adds r0, r6, 0 - movs r1, 0x5 - bl GetWindowAttribute - strb r0, [r5] - ldr r1, _0810EE58 @ =sub_810EE5C - adds r0, r6, 0 - bl CallWindowFunction - adds r0, r6, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - adds r0, r6, 0 - bl PutWindowTilemap - cmp r4, 0x1 - bne _0810EE4A - adds r0, r6, 0 - movs r1, 0x3 - bl CopyWindowToVram -_0810EE4A: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0810EE50: .4byte gUnknown_203ADF0 -_0810EE54: .4byte gUnknown_203ADF2 -_0810EE58: .4byte sub_810EE5C - thumb_func_end sub_810EE0C - - thumb_func_start sub_810EE5C -sub_810EE5C: @ 810EE5C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - adds r6, r0, 0 - adds r5, r2, 0 - lsls r6, 24 - lsrs r6, 24 - lsls r0, r1, 24 - lsls r5, 24 - lsls r3, 24 - lsrs r3, 24 - str r3, [sp, 0x10] - ldr r1, _0810F228 @ =gUnknown_203ADF0 - mov r9, r1 - ldrh r1, [r1] - lsrs r2, r0, 24 - str r2, [sp, 0xC] - movs r3, 0xFE - lsls r3, 24 - adds r2, r0, r3 - lsrs r2, 24 - str r2, [sp, 0x14] - lsrs r0, r5, 24 - mov r10, r0 - movs r2, 0xFF - lsls r2, 24 - adds r5, r2 - lsrs r5, 24 - movs r4, 0x1 - str r4, [sp] - str r4, [sp, 0x4] - ldr r3, _0810F22C @ =gUnknown_203ADF2 - mov r8, r3 - ldrb r0, [r3] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x14] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - mov r0, r9 - ldrh r1, [r0] - adds r1, 0x1 - lsls r1, 16 - lsrs r1, 16 - ldr r0, [sp, 0xC] - subs r0, 0x1 - lsls r2, r0, 24 - lsrs r2, 24 - str r2, [sp, 0x18] - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x18] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0x2 - lsls r1, 16 - lsrs r1, 16 - ldr r0, [sp, 0x10] - str r0, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0xC] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0x3 - lsls r1, 16 - lsrs r1, 16 - ldr r0, [sp, 0xC] - ldr r2, [sp, 0x10] - adds r7, r0, r2 - lsls r2, r7, 24 - lsrs r2, 24 - str r2, [sp, 0x1C] - str r4, [sp] - str r4, [sp, 0x4] - mov r3, r8 - ldrb r0, [r3] - str r0, [sp, 0x8] - adds r0, r6, 0 - adds r3, r5, 0 - bl FillBgTilemapBufferRect - mov r0, r9 - ldrh r1, [r0] - adds r1, 0x4 - lsls r1, 16 - lsrs r1, 16 - adds r0, r7, 0x1 - lsls r2, r0, 24 - lsrs r7, r2, 24 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - adds r2, r7, 0 - adds r3, r5, 0 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0x5 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x14] - mov r3, r10 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0x6 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x18] - mov r3, r10 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0x8 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x1C] - mov r3, r10 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0x9 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - adds r2, r7, 0 - mov r3, r10 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0xA - lsls r1, 16 - lsrs r1, 16 - mov r5, r10 - adds r5, 0x1 - lsls r5, 24 - lsrs r5, 24 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x14] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0xB - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x18] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0xC - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x1C] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - mov r3, r9 - ldrh r1, [r3] - adds r1, 0xD - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - adds r2, r7, 0 - adds r3, r5, 0 - bl FillBgTilemapBufferRect - ldr r3, _0810F230 @ =0x0000080a - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - mov r5, r10 - adds r5, 0x2 - lsls r5, 24 - lsrs r5, 24 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x14] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - ldr r3, _0810F234 @ =0x0000080b - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x18] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - ldr r3, _0810F238 @ =0x0000080c - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x1C] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - ldr r3, _0810F23C @ =0x0000080d - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - adds r2, r7, 0 - adds r3, r5, 0 - bl FillBgTilemapBufferRect - ldr r3, _0810F240 @ =0x00000805 - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - mov r5, r10 - adds r5, 0x3 - lsls r5, 24 - lsrs r5, 24 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x14] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - ldr r3, _0810F244 @ =0x00000806 - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x18] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - ldr r3, _0810F248 @ =0x00000808 - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x1C] - adds r3, r5, 0 - bl FillBgTilemapBufferRect - ldr r3, _0810F24C @ =0x00000809 - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - adds r2, r7, 0 - adds r3, r5, 0 - bl FillBgTilemapBufferRect - movs r3, 0x80 - lsls r3, 4 - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - movs r2, 0x4 - add r10, r2 - mov r3, r10 - lsls r3, 24 - lsrs r3, 24 - mov r10, r3 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x14] - bl FillBgTilemapBufferRect - ldr r3, _0810F250 @ =0x00000801 - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r2, r8 - ldrb r0, [r2] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x18] - mov r3, r10 - bl FillBgTilemapBufferRect - ldr r3, _0810F254 @ =0x00000802 - adds r1, r3, 0 - mov r0, r9 - ldrh r0, [r0] - adds r1, r0 - lsls r1, 16 - lsrs r1, 16 - ldr r2, [sp, 0x10] - str r2, [sp] - str r4, [sp, 0x4] - mov r3, r8 - ldrb r0, [r3] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0xC] - mov r3, r10 - bl FillBgTilemapBufferRect - ldr r0, _0810F258 @ =0x00000803 - adds r1, r0, 0 - mov r2, r9 - ldrh r2, [r2] - adds r1, r2 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r3, r8 - ldrb r0, [r3] - str r0, [sp, 0x8] - adds r0, r6, 0 - ldr r2, [sp, 0x1C] - mov r3, r10 - bl FillBgTilemapBufferRect - ldr r0, _0810F25C @ =0x00000804 - adds r1, r0, 0 - mov r2, r9 - ldrh r2, [r2] - adds r1, r2 - lsls r1, 16 - lsrs r1, 16 - str r4, [sp] - str r4, [sp, 0x4] - mov r3, r8 - ldrb r0, [r3] - str r0, [sp, 0x8] - adds r0, r6, 0 - adds r2, r7, 0 - mov r3, r10 - bl FillBgTilemapBufferRect - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0810F228: .4byte gUnknown_203ADF0 -_0810F22C: .4byte gUnknown_203ADF2 -_0810F230: .4byte 0x0000080a -_0810F234: .4byte 0x0000080b -_0810F238: .4byte 0x0000080c -_0810F23C: .4byte 0x0000080d -_0810F240: .4byte 0x00000805 -_0810F244: .4byte 0x00000806 -_0810F248: .4byte 0x00000808 -_0810F24C: .4byte 0x00000809 -_0810F250: .4byte 0x00000801 -_0810F254: .4byte 0x00000802 -_0810F258: .4byte 0x00000803 -_0810F25C: .4byte 0x00000804 - thumb_func_end sub_810EE5C - - thumb_func_start ClearMenuWindow_BorderThickness2 -ClearMenuWindow_BorderThickness2: @ 810F260 - push {r4,r5,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r4, 24 - ldr r1, _0810F294 @ =sub_810F298 - adds r0, r5, 0 - bl CallWindowFunction - adds r0, r5, 0 - movs r1, 0 - bl FillWindowPixelBuffer - adds r0, r5, 0 - bl ClearWindowTilemap - cmp r4, 0x1 - bne _0810F28E - adds r0, r5, 0 - movs r1, 0x3 - bl CopyWindowToVram -_0810F28E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0810F294: .4byte sub_810F298 - thumb_func_end ClearMenuWindow_BorderThickness2 - - thumb_func_start sub_810F298 -sub_810F298: @ 810F298 - push {r4,r5,lr} - sub sp, 0xC - adds r4, r1, 0 - adds r5, r2, 0 - ldr r1, [sp, 0x18] - lsls r0, 24 - lsrs r0, 24 - lsls r4, 24 - lsls r5, 24 - lsls r3, 24 - lsls r1, 24 - movs r2, 0xFE - lsls r2, 24 - adds r4, r2 - lsrs r4, 24 - movs r2, 0xFF - lsls r2, 24 - adds r5, r2 - lsrs r5, 24 - movs r2, 0x80 - lsls r2, 19 - adds r3, r2 - lsrs r3, 24 - str r3, [sp] - movs r2, 0x80 - lsls r2, 18 - adds r1, r2 - lsrs r1, 24 - str r1, [sp, 0x4] - movs r1, 0 - str r1, [sp, 0x8] - adds r2, r4, 0 - adds r3, r5, 0 - bl FillBgTilemapBufferRect - add sp, 0xC - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_810F298 - - thumb_func_start SetWindowBorderStyle -SetWindowBorderStyle: @ 810F2E8 - push {r4,r5,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0810F324 @ =gUnknown_203ADF0 - strh r2, [r0] - ldr r0, _0810F328 @ =gUnknown_203ADF2 - strb r3, [r0] - ldr r1, _0810F32C @ =DrawWindowBorder - adds r0, r5, 0 - bl CallWindowFunction - adds r0, r5, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - adds r0, r5, 0 - bl PutWindowTilemap - cmp r4, 0x1 - bne _0810F31E - adds r0, r5, 0 - movs r1, 0x3 - bl CopyWindowToVram -_0810F31E: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0810F324: .4byte gUnknown_203ADF0 -_0810F328: .4byte gUnknown_203ADF2 -_0810F32C: .4byte DrawWindowBorder - thumb_func_end SetWindowBorderStyle - - thumb_func_start sub_810F330 -sub_810F330: @ 810F330 - push {r4-r6,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r6, r0, 24 - lsls r4, 24 - lsrs r4, 24 - ldr r0, _0810F374 @ =gUnknown_203ADF0 - strh r2, [r0] - ldr r5, _0810F378 @ =gUnknown_203ADF2 - adds r0, r6, 0 - movs r1, 0x5 - bl GetWindowAttribute - strb r0, [r5] - ldr r1, _0810F37C @ =DrawWindowBorder - adds r0, r6, 0 - bl CallWindowFunction - adds r0, r6, 0 - movs r1, 0x11 - bl FillWindowPixelBuffer - adds r0, r6, 0 - bl PutWindowTilemap - cmp r4, 0x1 - bne _0810F36E - adds r0, r6, 0 - movs r1, 0x3 - bl CopyWindowToVram -_0810F36E: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0810F374: .4byte gUnknown_203ADF0 -_0810F378: .4byte gUnknown_203ADF2 -_0810F37C: .4byte DrawWindowBorder - thumb_func_end sub_810F330 - - thumb_func_start DrawWindowBorder -DrawWindowBorder: @ 810F380 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - mov r9, r0 - adds r6, r1, 0 - adds r4, r2, 0 - ldr r0, [sp, 0x38] - mov r1, r9 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r6, 24 - lsls r4, 24 - lsls r3, 24 - lsrs r3, 24 - str r3, [sp, 0x10] - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x14] - ldr r2, _0810F4D0 @ =gUnknown_203ADF0 - ldrh r1, [r2] - lsrs r0, r6, 24 - str r0, [sp, 0xC] - movs r2, 0xFF - lsls r2, 24 - adds r6, r2 - lsrs r6, 24 - lsrs r0, r4, 24 - mov r8, r0 - adds r4, r2 - lsrs r4, 24 - movs r5, 0x1 - str r5, [sp] - str r5, [sp, 0x4] - ldr r7, _0810F4D4 @ =gUnknown_203ADF2 - ldrb r0, [r7] - str r0, [sp, 0x8] - mov r0, r9 - adds r2, r6, 0 - adds r3, r4, 0 - bl FillBgTilemapBufferRect - ldr r2, _0810F4D0 @ =gUnknown_203ADF0 - ldrh r1, [r2] - adds r1, 0x1 - lsls r1, 16 - lsrs r1, 16 - ldr r0, [sp, 0x10] - str r0, [sp] - str r5, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0x8] - mov r0, r9 - ldr r2, [sp, 0xC] - adds r3, r4, 0 - bl FillBgTilemapBufferRect - ldr r2, _0810F4D0 @ =gUnknown_203ADF0 - ldrh r1, [r2] - adds r1, 0x2 - lsls r1, 16 - lsrs r1, 16 - ldr r0, [sp, 0xC] - ldr r2, [sp, 0x10] - adds r0, r2 - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - str r5, [sp] - str r5, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0x8] - mov r0, r9 - mov r2, r10 - adds r3, r4, 0 - bl FillBgTilemapBufferRect - ldr r0, _0810F4D0 @ =gUnknown_203ADF0 - ldrh r1, [r0] - adds r1, 0x3 - lsls r1, 16 - lsrs r1, 16 - str r5, [sp] - ldr r2, [sp, 0x14] - str r2, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0x8] - mov r0, r9 - adds r2, r6, 0 - mov r3, r8 - bl FillBgTilemapBufferRect - ldr r0, _0810F4D0 @ =gUnknown_203ADF0 - ldrh r1, [r0] - adds r1, 0x5 - lsls r1, 16 - lsrs r1, 16 - str r5, [sp] - ldr r2, [sp, 0x14] - str r2, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0x8] - mov r0, r9 - mov r2, r10 - mov r3, r8 - bl FillBgTilemapBufferRect - ldr r0, _0810F4D0 @ =gUnknown_203ADF0 - ldrh r1, [r0] - adds r1, 0x6 - lsls r1, 16 - lsrs r1, 16 - ldr r2, [sp, 0x14] - add r8, r2 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - str r5, [sp] - str r5, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0x8] - mov r0, r9 - adds r2, r6, 0 - mov r3, r8 - bl FillBgTilemapBufferRect - ldr r2, _0810F4D0 @ =gUnknown_203ADF0 - ldrh r1, [r2] - adds r1, 0x7 - lsls r1, 16 - lsrs r1, 16 - ldr r0, [sp, 0x10] - str r0, [sp] - str r5, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0x8] - mov r0, r9 - ldr r2, [sp, 0xC] - mov r3, r8 - bl FillBgTilemapBufferRect - ldr r2, _0810F4D0 @ =gUnknown_203ADF0 - ldrh r1, [r2] - adds r1, 0x8 - lsls r1, 16 - lsrs r1, 16 - str r5, [sp] - str r5, [sp, 0x4] - ldrb r0, [r7] - str r0, [sp, 0x8] - mov r0, r9 - mov r2, r10 - mov r3, r8 - bl FillBgTilemapBufferRect - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0810F4D0: .4byte gUnknown_203ADF0 -_0810F4D4: .4byte gUnknown_203ADF2 - thumb_func_end DrawWindowBorder - - thumb_func_start ClearMenuWindow -ClearMenuWindow: @ 810F4D8 - push {r4,r5,lr} - adds r4, r1, 0 - lsls r0, 24 - lsrs r5, r0, 24 - lsls r4, 24 - lsrs r4, 24 - ldr r1, _0810F50C @ =sub_810F510 - adds r0, r5, 0 - bl CallWindowFunction - adds r0, r5, 0 - movs r1, 0 - bl FillWindowPixelBuffer - adds r0, r5, 0 - bl ClearWindowTilemap - cmp r4, 0x1 - bne _0810F506 - adds r0, r5, 0 - movs r1, 0x3 - bl CopyWindowToVram -_0810F506: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_0810F50C: .4byte sub_810F510 - thumb_func_end ClearMenuWindow - - thumb_func_start sub_810F510 -sub_810F510: @ 810F510 - push {r4,r5,lr} - sub sp, 0xC - adds r4, r1, 0 - adds r5, r2, 0 - ldr r1, [sp, 0x18] - lsls r0, 24 - lsrs r0, 24 - lsls r4, 24 - lsls r5, 24 - lsls r3, 24 - lsls r1, 24 - movs r2, 0xFF - lsls r2, 24 - adds r4, r2 - lsrs r4, 24 - adds r5, r2 - lsrs r5, 24 - movs r2, 0x80 - lsls r2, 18 - adds r3, r2 - lsrs r3, 24 - str r3, [sp] - adds r1, r2 - lsrs r1, 24 - str r1, [sp, 0x4] - movs r1, 0 - str r1, [sp, 0x8] - adds r2, r4, 0 - adds r3, r5, 0 - bl FillBgTilemapBufferRect - add sp, 0xC - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_810F510 - - thumb_func_start CreateWindow_SnapRight_StdPal -CreateWindow_SnapRight_StdPal: @ 810F558 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x8 - ldr r4, [sp, 0x20] - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r7, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - lsls r3, 24 - lsrs r5, r3, 24 - lsls r4, 16 - lsrs r4, 16 - mov r0, sp - movs r1, 0 - movs r2, 0x8 - bl memset - cmp r6, 0x3 - bls _0810F58E - movs r1, 0 - mov r0, sp - strb r1, [r0] - b _0810F592 -_0810F58E: - mov r0, sp - strb r6, [r0] -_0810F592: - mov r1, sp - mov r0, r8 - strb r0, [r1, 0x2] - movs r0, 0x2 - strb r0, [r1, 0x4] - movs r0, 0x1E - subs r0, r7 - strb r0, [r1, 0x1] - strb r7, [r1, 0x3] - strb r5, [r1, 0x5] - strh r4, [r1, 0x6] - ldr r4, _0810F5BC @ =gUnknown_203ADF4 - mov r0, sp - bl AddWindow - strb r0, [r4] - cmp r5, 0xF - bls _0810F5C0 - movs r5, 0xF0 - b _0810F5C4 - .align 2, 0 -_0810F5BC: .4byte gUnknown_203ADF4 -_0810F5C0: - lsls r0, r5, 28 - lsrs r5, r0, 24 -_0810F5C4: - movs r0, 0x2 - bl stdpal_get - adds r1, r5, 0 - movs r2, 0x20 - bl LoadPalette - ldr r0, _0810F5E4 @ =gUnknown_203ADF4 - ldrb r0, [r0] - add sp, 0x8 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0810F5E4: .4byte gUnknown_203ADF4 - thumb_func_end CreateWindow_SnapRight_StdPal - - thumb_func_start PrintTextOnRightSnappedWindow -PrintTextOnRightSnappedWindow: @ 810F5E8 - push {r4-r6,lr} - sub sp, 0xC - adds r5, r0, 0 - lsls r2, 24 - lsrs r6, r2, 24 - ldr r4, _0810F648 @ =gUnknown_203ADF4 - ldrb r0, [r4] - cmp r0, 0xFF - beq _0810F63E - bl PutWindowTilemap - ldrb r0, [r4] - movs r1, 0xFF - bl FillWindowPixelBuffer - movs r0, 0 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - ldrb r1, [r4] - movs r3, 0x14 - negs r3, r3 - adds r2, r3, 0 - subs r2, r0 - lsls r2, 24 - lsrs r2, 24 - ldr r0, _0810F64C @ =gUnknown_8456618 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r1, 0 - movs r1, 0 - movs r3, 0x1 - bl AddTextPrinterParameterized3 - cmp r6, 0 - beq _0810F63E - ldrb r0, [r4] - movs r1, 0x3 - bl CopyWindowToVram -_0810F63E: - add sp, 0xC - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0810F648: .4byte gUnknown_203ADF4 -_0810F64C: .4byte gUnknown_8456618 - thumb_func_end PrintTextOnRightSnappedWindow - - thumb_func_start Menu_PrintHelpSystemUIHeader -Menu_PrintHelpSystemUIHeader: @ 810F650 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0x18 - mov r8, r0 - adds r5, r1, 0 - ldr r0, [sp, 0x30] - lsls r2, 24 - lsrs r2, 24 - lsls r0, 24 - lsrs r7, r0, 24 - ldr r0, _0810F67C @ =gUnknown_203ADF4 - ldrb r1, [r0] - adds r6, r0, 0 - cmp r1, 0xFF - beq _0810F6F6 - cmp r2, 0 - beq _0810F680 - add r1, sp, 0x14 - movs r0, 0 - b _0810F684 - .align 2, 0 -_0810F67C: .4byte gUnknown_203ADF4 -_0810F680: - add r1, sp, 0x14 - movs r0, 0xF -_0810F684: - strb r0, [r1] - movs r0, 0x1 - strb r0, [r1, 0x1] - movs r0, 0x2 - strb r0, [r1, 0x2] - adds r4, r6, 0 - ldrb r0, [r4] - bl PutWindowTilemap - ldrb r0, [r4] - movs r1, 0xFF - bl FillWindowPixelBuffer - cmp r5, 0 - beq _0810F6CE - movs r0, 0 - adds r1, r5, 0 - movs r2, 0 - bl GetStringWidth - ldrb r1, [r4] - movs r3, 0x14 - negs r3, r3 - adds r2, r3, 0 - subs r2, r0 - lsls r2, 24 - lsrs r2, 24 - add r0, sp, 0x14 - str r0, [sp] - movs r0, 0 - str r0, [sp, 0x4] - str r5, [sp, 0x8] - adds r0, r1, 0 - movs r1, 0 - movs r3, 0x1 - bl AddTextPrinterParameterized3 -_0810F6CE: - ldrb r0, [r6] - movs r1, 0 - str r1, [sp] - str r1, [sp, 0x4] - add r2, sp, 0x14 - str r2, [sp, 0x8] - str r1, [sp, 0xC] - mov r3, r8 - str r3, [sp, 0x10] - movs r1, 0x1 - movs r2, 0x4 - movs r3, 0x1 - bl AddTextPrinterParameterized4 - cmp r7, 0 - beq _0810F6F6 - ldrb r0, [r6] - movs r1, 0x3 - bl CopyWindowToVram -_0810F6F6: - add sp, 0x18 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end Menu_PrintHelpSystemUIHeader - - thumb_func_start sub_810F704 -sub_810F704: @ 810F704 - push {lr} - ldr r1, _0810F718 @ =gUnknown_203ADF4 - ldrb r0, [r1] - cmp r0, 0xFF - beq _0810F714 - movs r1, 0x3 - bl CopyWindowToVram -_0810F714: - pop {r0} - bx r0 - .align 2, 0 -_0810F718: .4byte gUnknown_203ADF4 - thumb_func_end sub_810F704 - - thumb_func_start sub_810F71C -sub_810F71C: @ 810F71C - push {r4,lr} - ldr r4, _0810F73C @ =gUnknown_203ADF4 - ldrb r0, [r4] - cmp r0, 0xFF - beq _0810F734 - movs r1, 0xFF - bl FillWindowPixelBuffer - ldrb r0, [r4] - movs r1, 0x3 - bl CopyWindowToVram -_0810F734: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0810F73C: .4byte gUnknown_203ADF4 - thumb_func_end sub_810F71C - - thumb_func_start sub_810F740 -sub_810F740: @ 810F740 - push {r4,lr} - ldr r4, _0810F770 @ =gUnknown_203ADF4 - ldrb r0, [r4] - cmp r0, 0xFF - beq _0810F768 - movs r1, 0 - bl FillWindowPixelBuffer - ldrb r0, [r4] - bl ClearWindowTilemap - ldrb r0, [r4] - movs r1, 0x3 - bl CopyWindowToVram - ldrb r0, [r4] - bl RemoveWindow - movs r0, 0xFF - strb r0, [r4] -_0810F768: - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_0810F770: .4byte gUnknown_203ADF4 - thumb_func_end sub_810F740 - - thumb_func_start sub_810F774 -sub_810F774: @ 810F774 - push {r4-r7,lr} - mov r7, r8 - push {r7} - ldr r4, [sp, 0x18] - mov r8, r4 - ldr r4, [sp, 0x1C] - ldr r5, [sp, 0x20] - ldr r6, [sp, 0x24] - mov r12, r6 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r7, r5, 24 - ldr r5, _0810F7B8 @ =gUnknown_203ADE4 - movs r6, 0 - strb r2, [r5] - strb r3, [r5, 0x1] - strb r6, [r5, 0x3] - subs r4, 0x1 - strb r4, [r5, 0x4] - strb r0, [r5, 0x5] - strb r1, [r5, 0x6] - mov r0, r8 - strb r0, [r5, 0x8] - mov r4, r12 - strb r4, [r5, 0xB] - cmp r7, 0 - blt _0810F7B4 - movs r0, 0x4 - ldrsb r0, [r5, r0] - cmp r7, r0 - ble _0810F7BC -_0810F7B4: - strb r6, [r5, 0x2] - b _0810F7BE - .align 2, 0 -_0810F7B8: .4byte gUnknown_203ADE4 -_0810F7BC: - strb r7, [r5, 0x2] -_0810F7BE: - movs r0, 0 - bl MoveMenuCursor - ldr r0, _0810F7D4 @ =gUnknown_203ADE4 - ldrb r0, [r0, 0x2] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_0810F7D4: .4byte gUnknown_203ADE4 - thumb_func_end sub_810F774 - - thumb_func_start ProgramAndPlaceMenuCursorOnWindow -ProgramAndPlaceMenuCursorOnWindow: @ 810F7D8 - push {r4-r6,lr} - sub sp, 0x10 - ldr r4, [sp, 0x20] - ldr r5, [sp, 0x24] - ldr r6, [sp, 0x28] - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - str r4, [sp] - str r5, [sp, 0x4] - str r6, [sp, 0x8] - movs r4, 0 - str r4, [sp, 0xC] - bl sub_810F774 - lsls r0, 24 - lsrs r0, 24 - add sp, 0x10 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end ProgramAndPlaceMenuCursorOnWindow - - thumb_func_start sub_810F818 -sub_810F818: @ 810F818 - push {r4-r6,lr} - mov r6, r8 - push {r6} - sub sp, 0x14 - mov r8, r0 - adds r6, r1, 0 - ldr r4, [sp, 0x28] - ldr r5, [sp, 0x2C] - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r6, 24 - lsrs r6, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - adds r0, r6, 0 - movs r1, 0x1 - str r2, [sp, 0xC] - str r3, [sp, 0x10] - bl GetMenuCursorDimensionByFont - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - str r4, [sp, 0x4] - str r5, [sp, 0x8] - mov r0, r8 - adds r1, r6, 0 - ldr r2, [sp, 0xC] - ldr r3, [sp, 0x10] - bl ProgramAndPlaceMenuCursorOnWindow - lsls r0, 24 - lsrs r0, 24 - add sp, 0x14 - pop {r3} - mov r8, r3 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_810F818 - - thumb_func_start RedrawMenuCursor -RedrawMenuCursor: @ 810F874 - push {r4-r6,lr} - mov r6, r9 - mov r5, r8 - push {r5,r6} - sub sp, 0xC - adds r6, r0, 0 - mov r8, r1 - lsls r6, 24 - lsrs r6, 24 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - ldr r5, _0810F8FC @ =gUnknown_203ADE4 - ldrb r0, [r5, 0x6] - movs r1, 0 - bl GetMenuCursorDimensionByFont - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldrb r0, [r5, 0x6] - movs r1, 0x1 - bl GetMenuCursorDimensionByFont - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r5, 0x5] - mov r9, r1 - ldrb r2, [r5] - ldrb r1, [r5, 0x8] - adds r3, r1, 0 - muls r3, r6 - ldrb r6, [r5, 0x1] - adds r3, r6 - lsls r3, 16 - lsrs r3, 16 - str r4, [sp] - str r0, [sp, 0x4] - mov r0, r9 - movs r1, 0x1 - bl FillWindowPixelRect - ldrb r0, [r5, 0x5] - ldrb r1, [r5, 0x6] - ldr r2, _0810F900 @ =gFameCheckerText_ListMenuCursor - ldrb r3, [r5] - ldrb r4, [r5, 0x8] - mov r6, r8 - muls r6, r4 - adds r4, r6, 0 - ldrb r5, [r5, 0x1] - adds r4, r5 - lsls r4, 24 - lsrs r4, 24 - str r4, [sp] - movs r4, 0 - str r4, [sp, 0x4] - str r4, [sp, 0x8] - bl AddTextPrinterParameterized - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_0810F8FC: .4byte gUnknown_203ADE4 -_0810F900: .4byte gFameCheckerText_ListMenuCursor - thumb_func_end RedrawMenuCursor - - thumb_func_start MoveMenuCursor -MoveMenuCursor: @ 810F904 - push {r4,r5,lr} - ldr r1, _0810F924 @ =gUnknown_203ADE4 - ldrb r5, [r1, 0x2] - movs r2, 0x2 - ldrsb r2, [r1, r2] - lsls r0, 24 - asrs r3, r0, 24 - adds r2, r3 - movs r0, 0x3 - ldrsb r0, [r1, r0] - adds r4, r1, 0 - cmp r2, r0 - bge _0810F928 - ldrb r0, [r4, 0x4] - b _0810F936 - .align 2, 0 -_0810F924: .4byte gUnknown_203ADE4 -_0810F928: - movs r0, 0x4 - ldrsb r0, [r4, r0] - cmp r2, r0 - ble _0810F934 - ldrb r0, [r4, 0x3] - b _0810F936 -_0810F934: - adds r0, r3, r5 -_0810F936: - strb r0, [r4, 0x2] - ldrb r1, [r4, 0x2] - adds r0, r5, 0 - bl RedrawMenuCursor - ldrb r0, [r4, 0x2] - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end MoveMenuCursor - - thumb_func_start MoveMenuCursorNoWrapAround -MoveMenuCursorNoWrapAround: @ 810F948 - push {r4,r5,lr} - ldr r1, _0810F968 @ =gUnknown_203ADE4 - ldrb r5, [r1, 0x2] - movs r2, 0x2 - ldrsb r2, [r1, r2] - lsls r0, 24 - asrs r3, r0, 24 - adds r2, r3 - movs r0, 0x3 - ldrsb r0, [r1, r0] - adds r4, r1, 0 - cmp r2, r0 - bge _0810F96C - ldrb r0, [r4, 0x3] - b _0810F97A - .align 2, 0 -_0810F968: .4byte gUnknown_203ADE4 -_0810F96C: - movs r0, 0x4 - ldrsb r0, [r4, r0] - cmp r2, r0 - ble _0810F978 - ldrb r0, [r4, 0x4] - b _0810F97A -_0810F978: - adds r0, r3, r5 -_0810F97A: - strb r0, [r4, 0x2] - ldrb r1, [r4, 0x2] - adds r0, r5, 0 - bl RedrawMenuCursor - ldrb r0, [r4, 0x2] - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end MoveMenuCursorNoWrapAround - - thumb_func_start GetMenuCursorPos -GetMenuCursorPos: @ 810F98C - ldr r0, _0810F994 @ =gUnknown_203ADE4 - ldrb r0, [r0, 0x2] - bx lr - .align 2, 0 -_0810F994: .4byte gUnknown_203ADE4 - thumb_func_end GetMenuCursorPos - - thumb_func_start ProcessMenuInput -ProcessMenuInput: @ 810F998 - push {r4,lr} - ldr r0, _0810F9BC @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0810F9C4 - ldr r4, _0810F9C0 @ =gUnknown_203ADE4 - ldrb r0, [r4, 0xB] - cmp r0, 0 - bne _0810F9B4 - movs r0, 0x5 - bl PlaySE -_0810F9B4: - movs r0, 0x2 - ldrsb r0, [r4, r0] - b _0810F9FE - .align 2, 0 -_0810F9BC: .4byte gMain -_0810F9C0: .4byte gUnknown_203ADE4 -_0810F9C4: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0810F9D2 - movs r0, 0x1 - negs r0, r0 - b _0810F9FE -_0810F9D2: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0810F9E6 - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 - negs r0, r0 - b _0810F9F6 -_0810F9E6: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0810F9FA - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 -_0810F9F6: - bl MoveMenuCursor -_0810F9FA: - movs r0, 0x2 - negs r0, r0 -_0810F9FE: - pop {r4} - pop {r1} - bx r1 - thumb_func_end ProcessMenuInput - - thumb_func_start ProcessMenuInputNoWrapAround -ProcessMenuInputNoWrapAround: @ 810FA04 - push {r4-r6,lr} - ldr r4, _0810FA2C @ =gUnknown_203ADE4 - ldrb r5, [r4, 0x2] - adds r6, r5, 0 - ldr r0, _0810FA30 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0810FA34 - ldrb r0, [r4, 0xB] - cmp r0, 0 - bne _0810FA24 - movs r0, 0x5 - bl PlaySE -_0810FA24: - movs r0, 0x2 - ldrsb r0, [r4, r0] - b _0810FA7C - .align 2, 0 -_0810FA2C: .4byte gUnknown_203ADE4 -_0810FA30: .4byte gMain -_0810FA34: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0810FA42 - movs r0, 0x1 - negs r0, r0 - b _0810FA7C -_0810FA42: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _0810FA5C - movs r0, 0x1 - negs r0, r0 - bl MoveMenuCursorNoWrapAround - lsls r0, 24 - lsrs r0, 24 - cmp r5, r0 - beq _0810FA78 - b _0810FA72 -_0810FA5C: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _0810FA78 - movs r0, 0x1 - bl MoveMenuCursorNoWrapAround - lsls r0, 24 - lsrs r0, 24 - cmp r6, r0 - beq _0810FA78 -_0810FA72: - movs r0, 0x5 - bl PlaySE -_0810FA78: - movs r0, 0x2 - negs r0, r0 -_0810FA7C: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end ProcessMenuInputNoWrapAround - - thumb_func_start ProcessMenuInput_other -ProcessMenuInput_other: @ 810FA84 - push {r4,lr} - ldr r2, _0810FAA8 @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0810FAB0 - ldr r4, _0810FAAC @ =gUnknown_203ADE4 - ldrb r0, [r4, 0xB] - cmp r0, 0 - bne _0810FAA0 - movs r0, 0x5 - bl PlaySE -_0810FAA0: - movs r0, 0x2 - ldrsb r0, [r4, r0] - b _0810FAE8 - .align 2, 0 -_0810FAA8: .4byte gMain -_0810FAAC: .4byte gUnknown_203ADE4 -_0810FAB0: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0810FABE - movs r0, 0x1 - negs r0, r0 - b _0810FAE8 -_0810FABE: - ldrh r0, [r2, 0x30] - movs r1, 0xF0 - ands r1, r0 - cmp r1, 0x40 - bne _0810FAD4 - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 - negs r0, r0 - b _0810FAE0 -_0810FAD4: - cmp r1, 0x80 - bne _0810FAE4 - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 -_0810FAE0: - bl MoveMenuCursor -_0810FAE4: - movs r0, 0x2 - negs r0, r0 -_0810FAE8: - pop {r4} - pop {r1} - bx r1 - thumb_func_end ProcessMenuInput_other - - thumb_func_start ProcessMenuInputNoWrapAround_other -ProcessMenuInputNoWrapAround_other: @ 810FAF0 - push {r4-r6,lr} - ldr r4, _0810FB18 @ =gUnknown_203ADE4 - ldrb r5, [r4, 0x2] - adds r6, r5, 0 - ldr r2, _0810FB1C @ =gMain - ldrh r1, [r2, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0810FB20 - ldrb r0, [r4, 0xB] - cmp r0, 0 - bne _0810FB10 - movs r0, 0x5 - bl PlaySE -_0810FB10: - movs r0, 0x2 - ldrsb r0, [r4, r0] - b _0810FB66 - .align 2, 0 -_0810FB18: .4byte gUnknown_203ADE4 -_0810FB1C: .4byte gMain -_0810FB20: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0810FB2E - movs r0, 0x1 - negs r0, r0 - b _0810FB66 -_0810FB2E: - ldrh r0, [r2, 0x30] - movs r1, 0xF0 - ands r1, r0 - cmp r1, 0x40 - bne _0810FB4A - movs r0, 0x1 - negs r0, r0 - bl MoveMenuCursorNoWrapAround - lsls r0, 24 - lsrs r0, 24 - cmp r5, r0 - beq _0810FB62 - b _0810FB5C -_0810FB4A: - cmp r1, 0x80 - bne _0810FB62 - movs r0, 0x1 - bl MoveMenuCursorNoWrapAround - lsls r0, 24 - lsrs r0, 24 - cmp r6, r0 - beq _0810FB62 -_0810FB5C: - movs r0, 0x5 - bl PlaySE -_0810FB62: - movs r0, 0x2 - negs r0, r0 -_0810FB66: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end ProcessMenuInputNoWrapAround_other - - thumb_func_start PrintTextArray -PrintTextArray: @ 810FB6C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - ldr r4, [sp, 0x2C] - ldr r5, [sp, 0x30] - lsls r0, 24 - lsrs r6, r0, 24 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - lsls r2, 24 - lsrs r2, 24 - mov r9, r2 - lsls r3, 24 - lsrs r3, 24 - mov r8, r3 - lsls r4, 24 - lsrs r7, r4, 24 - lsls r5, 24 - lsrs r5, 24 - movs r4, 0 - cmp r4, r5 - bcs _0810FBD0 -_0810FBA0: - lsls r0, r4, 3 - ldr r1, [sp, 0x34] - adds r0, r1 - ldr r2, [r0] - adds r0, r7, 0 - muls r0, r4 - add r0, r8 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - adds r0, r6, 0 - mov r1, r10 - mov r3, r9 - bl AddTextPrinterParameterized - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r5 - bcc _0810FBA0 -_0810FBD0: - adds r0, r6, 0 - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end PrintTextArray - - thumb_func_start sub_810FBE8 -sub_810FBE8: @ 810FBE8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - ldr r4, [sp, 0x40] - ldr r5, [sp, 0x44] - ldr r6, [sp, 0x4C] - ldr r7, [sp, 0x50] - mov r8, r7 - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r1, 24 - str r1, [sp, 0x14] - lsls r2, 24 - lsrs r2, 24 - str r2, [sp, 0x18] - lsls r3, 24 - lsrs r3, 24 - str r3, [sp, 0x1C] - lsls r4, 24 - lsrs r4, 24 - mov r10, r4 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - mov r9, r6 - mov r0, r8 - lsls r0, 24 - lsrs r6, r0, 24 - movs r4, 0 - cmp r4, r5 - bcs _0810FC68 -_0810FC30: - lsls r0, r4, 3 - ldr r1, [sp, 0x48] - adds r0, r1 - ldr r2, [r0] - mov r0, r10 - muls r0, r4 - ldr r1, [sp, 0x1C] - adds r0, r1, r0 - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - mov r0, r9 - str r0, [sp, 0xC] - str r6, [sp, 0x10] - adds r0, r7, 0 - ldr r1, [sp, 0x14] - ldr r3, [sp, 0x18] - bl AddTextPrinterParameterized5 - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r5 - bcc _0810FC30 -_0810FC68: - adds r0, r7, 0 - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_810FBE8 - - thumb_func_start sub_810FC80 -sub_810FC80: @ 810FC80 - push {r4-r7,lr} - mov r7, r8 - push {r7} - sub sp, 0xC - mov r8, r0 - adds r6, r1, 0 - adds r4, r2, 0 - adds r5, r3, 0 - ldr r7, [sp, 0x24] - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r6, 24 - lsrs r6, 24 - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - adds r0, r6, 0 - movs r1, 0 - bl GetMenuCursorDimensionByFont - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - str r4, [sp] - str r5, [sp, 0x4] - str r7, [sp, 0x8] - mov r0, r8 - adds r1, r6, 0 - movs r3, 0 - bl PrintTextArray - add sp, 0xC - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_810FC80 - - thumb_func_start AddItemMenuActionTextPrinters -AddItemMenuActionTextPrinters: @ 810FCD0 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - adds r6, r1, 0 - mov r8, r2 - ldr r1, [sp, 0x38] - mov r9, r1 - ldr r1, [sp, 0x3C] - ldr r2, [sp, 0x40] - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0x10] - lsls r6, 24 - lsrs r6, 24 - mov r4, r8 - lsls r4, 24 - lsrs r4, 24 - mov r8, r4 - lsls r3, 24 - lsrs r3, 24 - str r3, [sp, 0x14] - mov r0, r9 - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - lsls r2, 24 - lsrs r7, r2, 24 - mov r0, sp - ldrb r1, [r0, 0x10] - strb r1, [r0, 0x4] - strb r6, [r0, 0x5] - adds r0, r6, 0 - movs r1, 0x5 - bl GetFontAttribute - mov r3, sp - lsls r0, 4 - ldrb r2, [r3, 0xC] - movs r5, 0xF - adds r1, r5, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xC] - adds r0, r6, 0 - movs r1, 0x6 - bl GetFontAttribute - mov r3, sp - adds r1, r5, 0 - ands r1, r0 - ldrb r2, [r3, 0xD] - movs r4, 0x10 - negs r4, r4 - adds r0, r4, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0xD] - adds r0, r6, 0 - movs r1, 0x7 - bl GetFontAttribute - mov r3, sp - lsls r0, 4 - ldrb r2, [r3, 0xD] - adds r1, r5, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xD] - adds r0, r6, 0 - movs r1, 0x4 - bl GetFontAttribute - mov r1, sp - ands r5, r0 - ldrb r0, [r1, 0xC] - ands r4, r0 - orrs r4, r5 - strb r4, [r1, 0xC] - mov r0, sp - mov r2, r9 - strb r2, [r0, 0xA] - adds r0, r6, 0 - movs r1, 0x3 - bl GetFontAttribute - mov r1, sp - strb r0, [r1, 0xB] - mov r0, sp - mov r4, r8 - strb r4, [r0, 0x6] - strb r4, [r0, 0x8] - movs r4, 0 - cmp r4, r7 - bcs _0810FDCA - mov r5, sp -_0810FD9A: - ldr r1, [sp, 0x48] - adds r0, r1, r4 - ldrb r0, [r0] - lsls r0, 3 - ldr r2, [sp, 0x44] - adds r0, r2 - ldr r0, [r0] - str r0, [sp] - mov r0, r10 - muls r0, r4 - ldr r1, [sp, 0x14] - adds r0, r1, r0 - strb r0, [r5, 0x7] - strb r0, [r5, 0x9] - mov r0, sp - movs r1, 0xFF - movs r2, 0 - bl AddTextPrinter - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r7 - bcc _0810FD9A -_0810FDCA: - ldr r0, [sp, 0x10] - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end AddItemMenuActionTextPrinters - - thumb_func_start sub_810FDE4 -sub_810FDE4: @ 810FDE4 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0x14 - mov r9, r0 - adds r4, r1, 0 - adds r6, r2, 0 - mov r8, r3 - ldr r7, [sp, 0x30] - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - lsls r4, 24 - lsrs r4, 24 - lsls r6, 24 - lsrs r6, 24 - mov r0, r8 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - adds r0, r4, 0 - movs r1, 0 - bl GetFontAttribute - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - adds r0, r4, 0 - movs r1, 0x2 - bl GetFontAttribute - lsls r0, 24 - lsrs r0, 24 - str r0, [sp] - str r6, [sp, 0x4] - mov r0, r8 - str r0, [sp, 0x8] - str r7, [sp, 0xC] - ldr r0, [sp, 0x34] - str r0, [sp, 0x10] - mov r0, r9 - adds r1, r4, 0 - adds r2, r5, 0 - movs r3, 0 - bl AddItemMenuActionTextPrinters - add sp, 0x14 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_810FDE4 - - thumb_func_start SetWindowTemplateFields -SetWindowTemplateFields: @ 810FE50 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x8 - ldr r4, [sp, 0x28] - mov r12, r4 - ldr r4, [sp, 0x2C] - mov r9, r4 - ldr r4, [sp, 0x30] - mov r10, r4 - ldr r7, [sp, 0x34] - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsls r3, 24 - mov r4, r9 - lsls r4, 24 - lsrs r4, 24 - mov r9, r4 - mov r4, r10 - lsls r4, 24 - mov r10, r4 - ldr r4, _0810FEF0 @ =0xffffff00 - mov r8, r4 - mov r5, r8 - ldr r4, [sp] - ands r5, r4 - orrs r5, r1 - str r5, [sp] - lsrs r2, 16 - ldr r6, _0810FEF4 @ =0xffff00ff - adds r4, r6, 0 - ands r4, r5 - orrs r4, r2 - str r4, [sp] - lsrs r3, 8 - ldr r1, _0810FEF8 @ =0xff00ffff - ands r1, r4 - orrs r1, r3 - str r1, [sp] - mov r2, r12 - lsls r2, 24 - mov r12, r2 - ldr r2, _0810FEFC @ =0x00ffffff - ands r1, r2 - mov r4, r12 - orrs r4, r1 - str r4, [sp] - ldr r1, [sp, 0x4] - mov r2, r8 - ands r1, r2 - mov r4, r9 - orrs r1, r4 - mov r8, r1 - str r1, [sp, 0x4] - mov r1, r10 - lsrs r1, 16 - mov r2, r8 - ands r6, r2 - orrs r6, r1 - str r6, [sp, 0x4] - lsls r2, r7, 16 - ldr r1, _0810FF00 @ =0x0000ffff - ands r6, r1 - orrs r6, r2 - str r6, [sp, 0x4] - ldr r1, [sp] - ldr r2, [sp, 0x4] - str r1, [r0] - str r2, [r0, 0x4] - add sp, 0x8 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r2} - bx r2 - .align 2, 0 -_0810FEF0: .4byte 0xffffff00 -_0810FEF4: .4byte 0xffff00ff -_0810FEF8: .4byte 0xff00ffff -_0810FEFC: .4byte 0x00ffffff -_0810FF00: .4byte 0x0000ffff - thumb_func_end SetWindowTemplateFields - - thumb_func_start sub_810FF04 -sub_810FF04: @ 810FF04 - push {r4-r6,lr} - sub sp, 0x20 - adds r4, r0, 0 - adds r5, r1, 0 - adds r6, r2, 0 - ldr r0, [sp, 0x30] - ldr r1, [sp, 0x34] - ldr r2, [sp, 0x38] - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 16 - lsrs r2, 16 - str r3, [sp] - str r0, [sp, 0x4] - str r1, [sp, 0x8] - str r2, [sp, 0xC] - add r0, sp, 0x10 - adds r1, r4, 0 - adds r2, r5, 0 - adds r3, r6, 0 - bl SetWindowTemplateFields - ldr r0, [sp, 0x10] - ldr r1, [sp, 0x14] - str r0, [sp, 0x18] - str r1, [sp, 0x1C] - add r0, sp, 0x18 - bl AddWindow - lsls r0, 16 - lsrs r0, 16 - add sp, 0x20 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_810FF04 - - thumb_func_start CreateYesNoMenu -CreateYesNoMenu: @ 810FF60 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - adds r6, r1, 0 - mov r8, r2 - mov r9, r3 - ldr r4, [sp, 0x3C] - ldr r5, [sp, 0x40] - ldr r1, [sp, 0x44] - mov r10, r1 - lsls r6, 24 - lsrs r6, 24 - mov r1, r8 - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - mov r1, r9 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r4, 16 - lsrs r4, 16 - lsls r5, 24 - lsrs r5, 24 - mov r1, r10 - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - ldr r7, _0811009C @ =gUnknown_203ADF3 - bl AddWindow - strb r0, [r7] - ldrb r0, [r7] - movs r1, 0x1 - adds r2, r4, 0 - adds r3, r5, 0 - bl SetWindowBorderStyle - ldr r0, _081100A0 @ =gUnknown_841623D - str r0, [sp, 0xC] - add r1, sp, 0xC - ldrb r0, [r7] - strb r0, [r1, 0x4] - adds r0, r1, 0 - strb r6, [r0, 0x5] - adds r0, r6, 0 - movs r1, 0 - bl GetMenuCursorDimensionByFont - add r1, sp, 0xC - add r0, r8 - strb r0, [r1, 0x6] - adds r0, r1, 0 - mov r1, r9 - strb r1, [r0, 0x7] - adds r1, r0, 0 - ldrb r0, [r0, 0x6] - strb r0, [r1, 0x8] - adds r0, r1, 0 - ldrb r0, [r0, 0x7] - strb r0, [r1, 0x9] - adds r0, r6, 0 - movs r1, 0x5 - bl GetFontAttribute - add r3, sp, 0xC - lsls r0, 4 - ldrb r2, [r3, 0xC] - movs r5, 0xF - adds r1, r5, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xC] - adds r0, r6, 0 - movs r1, 0x6 - bl GetFontAttribute - add r3, sp, 0xC - adds r1, r5, 0 - ands r1, r0 - ldrb r2, [r3, 0xD] - movs r4, 0x10 - negs r4, r4 - adds r0, r4, 0 - ands r0, r2 - orrs r0, r1 - strb r0, [r3, 0xD] - adds r0, r6, 0 - movs r1, 0x7 - bl GetFontAttribute - add r3, sp, 0xC - lsls r0, 4 - ldrb r2, [r3, 0xD] - adds r1, r5, 0 - ands r1, r2 - orrs r1, r0 - strb r1, [r3, 0xD] - adds r0, r6, 0 - movs r1, 0x4 - bl GetFontAttribute - add r1, sp, 0xC - ands r5, r0 - ldrb r0, [r1, 0xC] - ands r4, r0 - orrs r4, r5 - strb r4, [r1, 0xC] - adds r0, r6, 0 - movs r1, 0x2 - bl GetFontAttribute - add r1, sp, 0xC - strb r0, [r1, 0xA] - adds r0, r6, 0 - movs r1, 0x3 - bl GetFontAttribute - add r1, sp, 0xC - strb r0, [r1, 0xB] - adds r0, r1, 0 - movs r1, 0xFF - movs r2, 0 - bl AddTextPrinter - adds r0, r6, 0 - movs r1, 0x1 - bl GetFontAttribute - add r1, sp, 0xC - ldrb r1, [r1, 0xB] - adds r0, r1 - lsls r0, 24 - lsrs r0, 24 - ldrb r1, [r7] - str r0, [sp] - movs r0, 0x2 - str r0, [sp, 0x4] - mov r0, r10 - str r0, [sp, 0x8] - adds r0, r1, 0 - adds r1, r6, 0 - mov r2, r8 - mov r3, r9 - bl ProgramAndPlaceMenuCursorOnWindow - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0811009C: .4byte gUnknown_203ADF3 -_081100A0: .4byte gUnknown_841623D - thumb_func_end CreateYesNoMenu - - thumb_func_start sub_81100A4 -sub_81100A4: @ 81100A4 - push {lr} - sub sp, 0xC - lsls r1, 24 - lsrs r1, 24 - lsls r2, 16 - lsrs r2, 16 - lsls r3, 24 - lsrs r3, 24 - str r2, [sp] - str r3, [sp, 0x4] - movs r2, 0 - str r2, [sp, 0x8] - movs r3, 0 - bl CreateYesNoMenu - add sp, 0xC - pop {r0} - bx r0 - thumb_func_end sub_81100A4 - - thumb_func_start Menu_ProcessInputNoWrapClearOnChoose -Menu_ProcessInputNoWrapClearOnChoose: @ 81100C8 - push {r4,lr} - bl ProcessMenuInputNoWrapAround - lsls r0, 24 - asrs r4, r0, 24 - movs r0, 0x2 - negs r0, r0 - cmp r4, r0 - beq _081100DE - bl sub_81100E8 -_081100DE: - adds r0, r4, 0 - pop {r4} - pop {r1} - bx r1 - thumb_func_end Menu_ProcessInputNoWrapClearOnChoose - - thumb_func_start sub_81100E8 -sub_81100E8: @ 81100E8 - push {r4,lr} - ldr r4, _08110100 @ =gUnknown_203ADF3 - ldrb r0, [r4] - movs r1, 0x1 - bl ClearMenuWindow - ldrb r0, [r4] - bl RemoveWindow - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_08110100: .4byte gUnknown_203ADF3 - thumb_func_end sub_81100E8 - - thumb_func_start sub_8110104 -sub_8110104: @ 8110104 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x20 - ldr r4, [sp, 0x40] - ldr r5, [sp, 0x44] - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0xC] - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - lsls r2, 24 - lsrs r2, 24 - str r2, [sp, 0x10] - lsls r3, 24 - lsrs r3, 24 - str r3, [sp, 0x14] - lsls r4, 24 - lsrs r6, r4, 24 - lsls r5, 24 - lsrs r5, 24 - str r5, [sp, 0x18] - mov r0, r9 - movs r1, 0 - bl GetFontAttribute - lsls r0, 24 - lsrs r0, 24 - mov r10, r0 - mov r0, r9 - movs r1, 0x1 - bl GetFontAttribute - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x10 - subs r1, r0 - lsrs r0, r1, 31 - adds r1, r0 - asrs r1, 1 - lsls r1, 24 - lsrs r1, 24 - str r1, [sp, 0x1C] - movs r5, 0 - b _081101B8 -_08110164: - movs r4, 0 - adds r1, r5, 0x1 - mov r8, r1 - cmp r4, r6 - bcs _081101B2 - ldr r1, [sp, 0x14] - adds r0, r1, 0 - muls r0, r5 - ldr r1, [sp, 0x1C] - adds r0, r1, r0 - lsls r0, 24 - lsrs r7, r0, 24 -_0811017C: - adds r0, r5, 0 - muls r0, r6 - adds r0, r4 - lsls r0, 3 - ldr r1, [sp, 0x48] - adds r0, r1 - ldr r2, [r0] - ldr r0, [sp, 0x10] - adds r3, r0, 0 - muls r3, r4 - add r3, r10 - lsls r3, 24 - lsrs r3, 24 - str r7, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - ldr r0, [sp, 0xC] - mov r1, r9 - bl AddTextPrinterParameterized - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r6 - bcc _0811017C -_081101B2: - mov r1, r8 - lsls r0, r1, 24 - lsrs r5, r0, 24 -_081101B8: - ldr r0, [sp, 0x18] - cmp r5, r0 - bcc _08110164 - ldr r0, [sp, 0xC] - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x20 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_8110104 - - thumb_func_start sub_81101D8 -sub_81101D8: @ 81101D8 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x1C - ldr r4, [sp, 0x3C] - ldr r5, [sp, 0x40] - lsls r0, 24 - lsrs r0, 24 - str r0, [sp, 0xC] - lsls r1, 24 - lsrs r1, 24 - mov r10, r1 - lsls r2, 24 - lsrs r2, 24 - str r2, [sp, 0x10] - lsls r3, 24 - lsrs r3, 24 - str r3, [sp, 0x14] - lsls r4, 24 - lsrs r6, r4, 24 - lsls r5, 24 - lsrs r5, 24 - str r5, [sp, 0x18] - mov r0, r10 - movs r1, 0 - bl GetFontAttribute - lsls r0, 24 - lsrs r0, 24 - mov r9, r0 - movs r5, 0 - b _08110272 -_0811021C: - movs r4, 0 - adds r1, r5, 0x1 - mov r8, r1 - cmp r4, r6 - bcs _0811026C - ldr r1, [sp, 0x14] - adds r0, r1, 0 - muls r0, r5 - lsls r0, 24 - lsrs r7, r0, 24 -_08110230: - adds r0, r5, 0 - muls r0, r6 - adds r0, r4 - ldr r1, [sp, 0x48] - adds r0, r1, r0 - ldrb r0, [r0] - lsls r0, 3 - ldr r1, [sp, 0x44] - adds r0, r1 - ldr r2, [r0] - ldr r0, [sp, 0x10] - adds r3, r0, 0 - muls r3, r4 - add r3, r9 - lsls r3, 24 - lsrs r3, 24 - str r7, [sp] - movs r0, 0xFF - str r0, [sp, 0x4] - movs r0, 0 - str r0, [sp, 0x8] - ldr r0, [sp, 0xC] - mov r1, r10 - bl AddTextPrinterParameterized - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 - cmp r4, r6 - bcc _08110230 -_0811026C: - mov r1, r8 - lsls r0, r1, 24 - lsrs r5, r0, 24 -_08110272: - ldr r0, [sp, 0x18] - cmp r5, r0 - bcc _0811021C - ldr r0, [sp, 0xC] - movs r1, 0x2 - bl CopyWindowToVram - add sp, 0x1C - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end sub_81101D8 - - thumb_func_start sub_8110290 -sub_8110290: @ 8110290 - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - ldr r4, [sp, 0x20] - mov r12, r4 - ldr r4, [sp, 0x24] - mov r8, r4 - ldr r4, [sp, 0x28] - mov r9, r4 - ldr r4, [sp, 0x2C] - mov r10, r4 - ldr r4, [sp, 0x30] - ldr r5, [sp, 0x34] - lsls r4, 24 - lsrs r4, 24 - lsls r5, 24 - lsrs r7, r5, 24 - ldr r5, _081102E8 @ =gUnknown_203ADE4 - movs r6, 0 - strb r2, [r5] - strb r3, [r5, 0x1] - strb r6, [r5, 0x3] - subs r4, 0x1 - strb r4, [r5, 0x4] - strb r0, [r5, 0x5] - strb r1, [r5, 0x6] - mov r0, r12 - strb r0, [r5, 0x7] - mov r4, r8 - strb r4, [r5, 0x8] - mov r0, r9 - strb r0, [r5, 0x9] - mov r4, r10 - strb r4, [r5, 0xA] - cmp r7, 0 - blt _081102E4 - movs r0, 0x4 - ldrsb r0, [r5, r0] - cmp r7, r0 - ble _081102EC -_081102E4: - strb r6, [r5, 0x2] - b _081102EE - .align 2, 0 -_081102E8: .4byte gUnknown_203ADE4 -_081102EC: - strb r7, [r5, 0x2] -_081102EE: - movs r0, 0 - movs r1, 0 - bl sub_8110450 - ldr r0, _08110308 @ =gUnknown_203ADE4 - ldrb r0, [r0, 0x2] - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - .align 2, 0 -_08110308: .4byte gUnknown_203ADE4 - thumb_func_end sub_8110290 - - thumb_func_start sub_811030C -sub_811030C: @ 811030C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0x18 - ldr r4, [sp, 0x38] - ldr r5, [sp, 0x3C] - ldr r6, [sp, 0x40] - ldr r7, [sp, 0x44] - lsls r0, 24 - lsrs r0, 24 - lsls r1, 24 - lsrs r1, 24 - lsls r2, 24 - lsrs r2, 24 - lsls r3, 24 - lsrs r3, 24 - lsls r4, 24 - lsrs r4, 24 - mov r8, r4 - lsls r5, 24 - lsrs r5, 24 - lsls r6, 24 - lsrs r6, 24 - lsls r7, 24 - adds r4, r7, 0 - lsrs r4, 24 - mov r9, r4 - movs r7, 0x10 - mov r10, r7 - adds r4, r5, 0 - muls r4, r6 - lsls r4, 24 - lsrs r4, 24 - mov r7, r8 - str r7, [sp] - mov r7, r10 - str r7, [sp, 0x4] - str r5, [sp, 0x8] - str r6, [sp, 0xC] - str r4, [sp, 0x10] - mov r4, r9 - str r4, [sp, 0x14] - bl sub_8110290 - lsls r0, 24 - lsrs r0, 24 - add sp, 0x18 - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_811030C - - thumb_func_start sub_811037C -sub_811037C: @ 811037C - push {r4-r7,lr} - mov r7, r10 - mov r6, r9 - mov r5, r8 - push {r5-r7} - sub sp, 0xC - mov r8, r0 - lsls r0, 24 - lsrs r0, 24 - mov r8, r0 - lsls r0, r1, 24 - lsrs r7, r0, 24 - ldr r5, _08110448 @ =gUnknown_203ADE4 - ldrb r0, [r5, 0x6] - movs r1, 0 - bl GetMenuCursorDimensionByFont - mov r9, r0 - mov r1, r9 - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - ldrb r0, [r5, 0x6] - movs r1, 0x1 - bl GetMenuCursorDimensionByFont - adds r6, r0, 0 - lsls r6, 24 - lsrs r6, 24 - ldrb r0, [r5, 0x9] - mov r10, r0 - mov r0, r8 - mov r1, r10 - bl __umodsi3 - ldrb r1, [r5, 0x7] - adds r4, r1, 0 - muls r4, r0 - ldrb r1, [r5] - adds r4, r1 - lsls r4, 24 - lsrs r4, 24 - mov r0, r8 - mov r1, r10 - bl __udivsi3 - ldrb r1, [r5, 0x8] - adds r3, r1, 0 - muls r3, r0 - ldrb r0, [r5, 0x1] - adds r3, r0 - lsls r3, 24 - lsrs r3, 24 - ldrb r0, [r5, 0x5] - mov r1, r9 - str r1, [sp] - str r6, [sp, 0x4] - movs r1, 0x11 - adds r2, r4, 0 - bl FillWindowPixelRect - ldrb r6, [r5, 0x9] - adds r0, r7, 0 - adds r1, r6, 0 - bl __umodsi3 - ldrb r1, [r5, 0x7] - adds r4, r1, 0 - muls r4, r0 - ldrb r0, [r5] - adds r4, r0 - lsls r4, 24 - lsrs r4, 24 - adds r0, r7, 0 - adds r1, r6, 0 - bl __udivsi3 - ldrb r1, [r5, 0x8] - adds r3, r1, 0 - muls r3, r0 - ldrb r1, [r5, 0x1] - adds r3, r1 - lsls r3, 24 - lsrs r3, 24 - ldrb r0, [r5, 0x5] - ldrb r1, [r5, 0x6] - ldr r2, _0811044C @ =gFameCheckerText_ListMenuCursor - str r3, [sp] - movs r3, 0 - str r3, [sp, 0x4] - str r3, [sp, 0x8] - adds r3, r4, 0 - bl AddTextPrinterParameterized - add sp, 0xC - pop {r3-r5} - mov r8, r3 - mov r9, r4 - mov r10, r5 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08110448: .4byte gUnknown_203ADE4 -_0811044C: .4byte gFameCheckerText_ListMenuCursor - thumb_func_end sub_811037C - - thumb_func_start sub_8110450 -sub_8110450: @ 8110450 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r1, 24 - lsrs r1, 24 - mov r9, r1 - ldr r1, _0811048C @ =gUnknown_203ADE4 - ldrb r2, [r1, 0x2] - mov r8, r2 - lsls r0, 24 - asrs r6, r0, 24 - adds r5, r1, 0 - cmp r6, 0 - beq _081104A6 - movs r7, 0x2 - ldrsb r7, [r5, r7] - ldrb r4, [r5, 0x9] - adds r0, r7, 0 - adds r1, r4, 0 - bl __modsi3 - adds r0, r6 - cmp r0, 0 - bge _08110490 - adds r0, r4, 0 - adds r0, 0xFF - add r0, r8 - b _081104A4 - .align 2, 0 -_0811048C: .4byte gUnknown_203ADE4 -_08110490: - cmp r0, r4 - blt _081104A0 - adds r0, r7, 0 - adds r1, r4, 0 - bl __divsi3 - muls r0, r4 - b _081104A4 -_081104A0: - mov r1, r8 - adds r0, r6, r1 -_081104A4: - strb r0, [r5, 0x2] -_081104A6: - mov r2, r9 - lsls r0, r2, 24 - asrs r6, r0, 24 - cmp r6, 0 - beq _081104EA - movs r0, 0x2 - ldrsb r0, [r5, r0] - ldrb r4, [r5, 0x9] - adds r1, r4, 0 - bl __divsi3 - adds r1, r0, r6 - cmp r1, 0 - bge _081104CE - ldrb r0, [r5, 0xA] - subs r0, 0x1 - muls r0, r4 - ldrb r1, [r5, 0x2] - adds r0, r1 - b _081104E8 -_081104CE: - ldrb r0, [r5, 0xA] - cmp r1, r0 - blt _081104E0 - subs r0, 0x1 - adds r1, r4, 0 - muls r1, r0 - ldrb r0, [r5, 0x2] - subs r0, r1 - b _081104E8 -_081104E0: - adds r0, r4, 0 - muls r0, r6 - ldrb r2, [r5, 0x2] - adds r0, r2 -_081104E8: - strb r0, [r5, 0x2] -_081104EA: - movs r1, 0x2 - ldrsb r1, [r5, r1] - movs r0, 0x4 - ldrsb r0, [r5, r0] - cmp r1, r0 - bgt _08110500 - ldrb r1, [r5, 0x2] - mov r0, r8 - bl sub_811037C - b _08110504 -_08110500: - mov r0, r8 - strb r0, [r5, 0x2] -_08110504: - ldrb r0, [r5, 0x2] - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8110450 - - thumb_func_start sub_8110514 -sub_8110514: @ 8110514 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r1, 24 - lsrs r1, 24 - mov r8, r1 - ldr r1, _0811058C @ =gUnknown_203ADE4 - ldrb r7, [r1, 0x2] - lsls r0, 24 - asrs r4, r0, 24 - adds r5, r1, 0 - cmp r4, 0 - beq _08110548 - movs r0, 0x2 - ldrsb r0, [r5, r0] - ldrb r6, [r5, 0x9] - adds r1, r6, 0 - bl __modsi3 - adds r0, r4 - cmp r0, 0 - blt _08110548 - cmp r0, r6 - bge _08110548 - adds r0, r4, r7 - strb r0, [r5, 0x2] -_08110548: - mov r1, r8 - lsls r0, r1, 24 - asrs r4, r0, 24 - cmp r4, 0 - beq _08110574 - movs r0, 0x2 - ldrsb r0, [r5, r0] - ldrb r6, [r5, 0x9] - adds r1, r6, 0 - bl __divsi3 - adds r0, r4 - cmp r0, 0 - blt _08110574 - ldrb r1, [r5, 0xA] - cmp r0, r1 - bge _08110574 - adds r0, r6, 0 - muls r0, r4 - ldrb r1, [r5, 0x2] - adds r0, r1 - strb r0, [r5, 0x2] -_08110574: - movs r1, 0x2 - ldrsb r1, [r5, r1] - movs r0, 0x4 - ldrsb r0, [r5, r0] - cmp r1, r0 - bgt _08110590 - ldrb r1, [r5, 0x2] - adds r0, r7, 0 - bl sub_811037C - b _08110592 - .align 2, 0 -_0811058C: .4byte gUnknown_203ADE4 -_08110590: - strb r7, [r5, 0x2] -_08110592: - ldrb r0, [r5, 0x2] - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_8110514 - - thumb_func_start sub_81105A0 -sub_81105A0: @ 81105A0 - push {r4,lr} - ldr r4, _081105C0 @ =gMain - ldrh r1, [r4, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _081105C8 - movs r0, 0x5 - bl PlaySE - ldr r0, _081105C4 @ =gUnknown_203ADE4 - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - b _08110648 - .align 2, 0 -_081105C0: .4byte gMain -_081105C4: .4byte gUnknown_203ADE4 -_081105C8: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _081105D6 - movs r0, 0x1 - negs r0, r0 - b _08110648 -_081105D6: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _081105EC - movs r0, 0x5 - bl PlaySE - movs r1, 0x1 - negs r1, r1 - movs r0, 0 - b _08110640 -_081105EC: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08110600 - movs r0, 0x5 - bl PlaySE - movs r0, 0 - movs r1, 0x1 - b _08110640 -_08110600: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - bne _08110614 - bl GetLRKeysState - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08110620 -_08110614: - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 - negs r0, r0 - b _0811063E -_08110620: - ldrh r1, [r4, 0x2E] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - bne _08110636 - bl GetLRKeysState - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08110644 -_08110636: - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 -_0811063E: - movs r1, 0 -_08110640: - bl sub_8110450 -_08110644: - movs r0, 0x2 - negs r0, r0 -_08110648: - pop {r4} - pop {r1} - bx r1 - thumb_func_end sub_81105A0 - - thumb_func_start sub_8110650 -sub_8110650: @ 8110650 - push {r4-r6,lr} - ldr r5, _08110670 @ =gUnknown_203ADE4 - ldrb r4, [r5, 0x2] - ldr r6, _08110674 @ =gMain - ldrh r1, [r6, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08110678 - movs r0, 0x5 - bl PlaySE - movs r0, 0x2 - ldrsb r0, [r5, r0] - b _081106EE - .align 2, 0 -_08110670: .4byte gUnknown_203ADE4 -_08110674: .4byte gMain -_08110678: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08110686 - movs r0, 0x1 - negs r0, r0 - b _081106EE -_08110686: - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08110696 - movs r1, 0x1 - negs r1, r1 - movs r0, 0 - b _081106D8 -_08110696: - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _081106A4 - movs r0, 0 - movs r1, 0x1 - b _081106D8 -_081106A4: - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - bne _081106B8 - bl GetLRKeysState - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _081106BE -_081106B8: - movs r0, 0x1 - negs r0, r0 - b _081106D6 -_081106BE: - ldrh r1, [r6, 0x2E] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - bne _081106D4 - bl GetLRKeysState - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _081106EA -_081106D4: - movs r0, 0x1 -_081106D6: - movs r1, 0 -_081106D8: - bl sub_8110514 - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - beq _081106EA - movs r0, 0x5 - bl PlaySE -_081106EA: - movs r0, 0x2 - negs r0, r0 -_081106EE: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8110650 - - thumb_func_start sub_81106F4 -sub_81106F4: @ 81106F4 - push {r4,r5,lr} - ldr r4, _08110714 @ =gMain - ldrh r1, [r4, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0811071C - movs r0, 0x5 - bl PlaySE - ldr r0, _08110718 @ =gUnknown_203ADE4 - ldrb r0, [r0, 0x2] - lsls r0, 24 - asrs r0, 24 - b _08110798 - .align 2, 0 -_08110714: .4byte gMain -_08110718: .4byte gUnknown_203ADE4 -_0811071C: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _0811072A - movs r0, 0x1 - negs r0, r0 - b _08110798 -_0811072A: - ldrh r0, [r4, 0x30] - movs r5, 0xF0 - adds r1, r5, 0 - ands r1, r0 - cmp r1, 0x40 - bne _08110744 - movs r0, 0x5 - bl PlaySE - movs r1, 0x1 - negs r1, r1 - movs r0, 0 - b _08110790 -_08110744: - cmp r1, 0x80 - bne _08110754 - movs r0, 0x5 - bl PlaySE - movs r0, 0 - movs r1, 0x1 - b _08110790 -_08110754: - cmp r1, 0x20 - beq _08110764 - bl sub_80BF66C - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _08110770 -_08110764: - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 - negs r0, r0 - b _0811078E -_08110770: - ldrh r1, [r4, 0x30] - adds r0, r5, 0 - ands r0, r1 - cmp r0, 0x10 - beq _08110786 - bl sub_80BF66C - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08110794 -_08110786: - movs r0, 0x5 - bl PlaySE - movs r0, 0x1 -_0811078E: - movs r1, 0 -_08110790: - bl sub_8110450 -_08110794: - movs r0, 0x2 - negs r0, r0 -_08110798: - pop {r4,r5} - pop {r1} - bx r1 - thumb_func_end sub_81106F4 - - thumb_func_start sub_81107A0 -sub_81107A0: @ 81107A0 - push {r4-r6,lr} - ldr r6, _081107C0 @ =gUnknown_203ADE4 - ldrb r4, [r6, 0x2] - ldr r5, _081107C4 @ =gMain - ldrh r1, [r5, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _081107C8 - movs r0, 0x5 - bl PlaySE - movs r0, 0x2 - ldrsb r0, [r6, r0] - b _0811083A - .align 2, 0 -_081107C0: .4byte gUnknown_203ADE4 -_081107C4: .4byte gMain -_081107C8: - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _081107D6 - movs r0, 0x1 - negs r0, r0 - b _0811083A -_081107D6: - ldrh r0, [r5, 0x30] - movs r6, 0xF0 - adds r1, r6, 0 - ands r1, r0 - cmp r1, 0x40 - bne _081107EA - movs r1, 0x1 - negs r1, r1 - movs r0, 0 - b _08110824 -_081107EA: - cmp r1, 0x80 - bne _081107F4 - movs r0, 0 - movs r1, 0x1 - b _08110824 -_081107F4: - cmp r1, 0x20 - beq _08110804 - bl sub_80BF66C - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0811080A -_08110804: - movs r0, 0x1 - negs r0, r0 - b _08110822 -_0811080A: - ldrh r1, [r5, 0x30] - adds r0, r6, 0 - ands r0, r1 - cmp r0, 0x10 - beq _08110820 - bl sub_80BF66C - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x2 - bne _08110836 -_08110820: - movs r0, 0x1 -_08110822: - movs r1, 0 -_08110824: - bl sub_8110514 - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - beq _08110836 - movs r0, 0x5 - bl PlaySE -_08110836: - movs r0, 0x2 - negs r0, r0 -_0811083A: - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_81107A0 - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/overworld.s b/asm/overworld.s index dec8f6715..934fd29f3 100644 --- a/asm/overworld.s +++ b/asm/overworld.s @@ -3799,8 +3799,8 @@ _080568F4: .4byte gFieldCallback _080568F8: .4byte FieldCallback_ReturnToEventScript2 thumb_func_end CB2_ReturnToFieldContinueScriptPlayMapMusic - thumb_func_start sub_80568FC -sub_80568FC: @ 80568FC + thumb_func_start CB2_Overworld +CB2_Overworld: @ 80568FC push {lr} bl sub_80569BC ldr r1, _08056910 @ =gFieldCallback @@ -3812,7 +3812,7 @@ sub_80568FC: @ 80568FC .align 2, 0 _08056910: .4byte gFieldCallback _08056914: .4byte sub_807DF7C - thumb_func_end sub_80568FC + thumb_func_end CB2_Overworld thumb_func_start sub_8056918 sub_8056918: @ 8056918 diff --git a/asm/party_menu.s b/asm/party_menu.s index d2052f4c2..ace2e3554 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -3234,7 +3234,7 @@ sub_8120328: @ 8120328 bne _0812035E movs r0, 0x6 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0x6 bl ClearWindowTilemap _0812035E: @@ -3302,7 +3302,7 @@ sub_81203B8: @ 81203B8 beq _08120410 movs r0, 0x6 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0x6 bl ClearWindowTilemap bl MenuHelpers_LinkSomething @@ -6507,7 +6507,7 @@ sub_8121CE4: @ 8121CE4 cmp r0, 0xFF beq _08121D04 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl RemoveWindow movs r0, 0xFF @@ -6608,7 +6608,7 @@ _08121DB0: movs r1, 0 movs r2, 0x58 movs r3, 0xF - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette ldr r4, _08121DF0 @ =gStringVar4 ldr r1, _08121DF4 @ =gUnknown_845A2E8 lsls r0, r6, 2 @@ -6770,7 +6770,7 @@ _08121ED2: movs r1, 0 movs r2, 0x4F movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette cmp r4, 0x3 bne _08121F00 ldr r0, [r6] @@ -6854,7 +6854,7 @@ _08121F7A: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl sub_810F774 + bl Menu_InitCursorInternal movs r0, 0x2 bl ScheduleBgCopyTilemapToVram ldr r0, [r4] @@ -6882,7 +6882,7 @@ sub_8121FC0: @ 8121FC0 movs r1, 0 movs r2, 0x4F movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette ldr r2, _08122008 @ =gTextFlags ldrb r0, [r2] movs r1, 0x1 @@ -6947,7 +6947,7 @@ sub_8122034: @ 8122034 movs r1, 0 movs r2, 0x4F movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette ldr r0, [r4] ldrb r0, [r0, 0xC] pop {r4} @@ -7054,7 +7054,7 @@ sub_8122110: @ 8122110 bl ClearWindowTilemap adds r0, r4, 0 movs r1, 0 - bl ClearMenuWindow_BorderThickness2 + bl ClearDialogWindowAndFrameToTransparent adds r0, r4, 0 bl RemoveWindow movs r0, 0x2 @@ -8550,27 +8550,27 @@ sub_8122C5C: @ 8122C5C ldrb r0, [r0, 0x17] cmp r0, 0x3 bhi _08122CA0 - bl ProcessMenuInputNoWrapAround_other + bl Menu_ProcessInputNoWrapAround_other b _08122CA4 .align 2, 0 _08122C94: .4byte gPaletteFade _08122C98: .4byte gTasks+0x8 _08122C9C: .4byte gUnknown_203B09C _08122CA0: - bl ProcessMenuInput_other + bl Menu_ProcessInput_other _08122CA4: lsls r0, 24 lsrs r5, r0, 24 movs r0, 0 ldrsh r4, [r7, r0] - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 24 cmp r4, r0 beq _08122CCE ldr r0, _08122D14 @ =gUnknown_203B09C ldr r4, [r0] - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 24 adds r4, 0xF @@ -8578,7 +8578,7 @@ _08122CA4: ldrb r0, [r4] bl sub_8122138 _08122CCE: - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 24 strh r0, [r7] @@ -11600,7 +11600,7 @@ sub_81245A4: @ 81245A4 push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 - bl GetMenuCursorPos + bl Menu_GetCursorPos ldr r5, _08124610 @ =gUnknown_203B09C ldr r1, [r5] lsls r0, 24 @@ -13684,7 +13684,7 @@ _08125680: mov r1, r8 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0x2 bl ScheduleBgCopyTilemapToVram add sp, 0x10 @@ -13706,7 +13706,7 @@ sub_81256C0: @ 81256C0 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - bl ProcessMenuInput + bl Menu_ProcessInput lsls r0, 24 asrs r1, r0, 24 movs r0, 0x2 @@ -13813,7 +13813,7 @@ sub_8125790: @ 8125790 ldr r0, [r0] adds r0, 0xC bl sub_8121CE4 - bl GetMenuCursorPos + bl Menu_GetCursorPos ldr r1, _081257C4 @ =gUnknown_203B0A0 lsls r0, 24 lsrs r0, 24 diff --git a/asm/player_pc.s b/asm/player_pc.s index dfcac85f4..32838be77 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -187,7 +187,7 @@ _080EB77E: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0 bl ScheduleBgCopyTilemapToVram ldr r1, _080EB814 @ =gTasks @@ -223,7 +223,7 @@ sub_80EB81C: @ 80EB81C lsls r6, r1, 3 ldr r7, _080EB870 @ =gTasks+0x8 adds r4, r6, r7 - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround lsls r0, 24 asrs r5, r0, 24 movs r0, 0x2 @@ -237,7 +237,7 @@ sub_80EB81C: @ 80EB81C bl PlaySE ldrb r0, [r4, 0x14] movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4, 0x14] bl ClearWindowTilemap ldrb r0, [r4, 0x14] @@ -256,7 +256,7 @@ _080EB874: .4byte sub_80EB9B8 _080EB878: ldrb r0, [r4, 0x14] movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4, 0x14] bl ClearWindowTilemap ldrb r0, [r4, 0x14] @@ -488,7 +488,7 @@ _080EBA1E: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0 bl ScheduleBgCopyTilemapToVram ldr r1, _080EBA88 @ =gUnknown_84021DC @@ -541,7 +541,7 @@ sub_80EBAB8: @ 80EBAB8 ands r0, r1 cmp r0, 0 beq _080EBAE8 - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 cmp r0, 0 beq _080EBB64 @@ -557,7 +557,7 @@ _080EBAE8: ands r0, r1 cmp r0, 0 beq _080EBB20 - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 24 cmp r0, 0x2 @@ -566,9 +566,9 @@ _080EBAE8: bl PlaySE movs r0, 0x1 _080EBB04: - bl MoveMenuCursor + bl Menu_MoveCursor ldr r4, _080EBB1C @ =gUnknown_84021DC - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 22 adds r0, r4 @@ -586,7 +586,7 @@ _080EBB20: movs r0, 0x5 bl PlaySE ldr r4, _080EBB48 @ =gUnknown_8402208 - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 21 adds r4, 0x4 @@ -752,7 +752,7 @@ _080EBC78: .4byte sub_80EBCAC _080EBC7C: ldrb r0, [r4, 0x14] movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4, 0x14] bl ClearWindowTilemap ldrb r0, [r4, 0x14] @@ -861,7 +861,7 @@ sub_80EBD48: @ 80EBD48 adds r4, r0 ldrb r0, [r4, 0x14] movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4, 0x14] bl ClearWindowTilemap ldrb r0, [r4, 0x14] @@ -1341,7 +1341,7 @@ sub_80EC0D8: @ 80EC0D8 movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0 bl ScheduleBgCopyTilemapToVram ldr r1, _080EC154 @ =gTasks @@ -1369,7 +1369,7 @@ sub_80EC15C: @ 80EC15C lsls r0, 24 lsrs r5, r0, 24 adds r6, r5, 0 - bl ProcessMenuInput_other + bl Menu_ProcessInput_other lsls r0, 24 asrs r4, r0, 24 movs r0, 0x2 diff --git a/asm/pokedex.s b/asm/pokedex.s index 279270fbb..69ca5adcf 100644 --- a/asm/pokedex.s +++ b/asm/pokedex.s @@ -220,8 +220,8 @@ _08088F7C: bx r1 thumb_func_end sub_8088F58 - thumb_func_start sub_8088F84 -sub_8088F84: @ 8088F84 + thumb_func_start HasAllKantoMons +HasAllKantoMons: @ 8088F84 push {r4,r5,lr} movs r0, 0 _08088F88: @@ -277,6 +277,6 @@ _08088FE8: pop {r4,r5} pop {r1} bx r1 - thumb_func_end sub_8088F84 + thumb_func_end HasAllKantoMons .align 2, 0 @ Don't pad with nop. diff --git a/asm/pokemon_jump_2.s b/asm/pokemon_jump_2.s index 7ef149fec..8fc385744 100644 --- a/asm/pokemon_jump_2.s +++ b/asm/pokemon_jump_2.s @@ -5304,7 +5304,7 @@ sub_814A218: @ 814A218 _0814A22C: .4byte gUnknown_203F3D8 _0814A230: bl sub_814A6CC - bl sub_81100E8 + bl DestroyYesNoMenu movs r0, 0 bl CopyBgTilemapBufferToVram ldr r1, [r5] diff --git a/asm/pokemon_special_anim.s b/asm/pokemon_special_anim.s index 5c91419df..c8906230b 100644 --- a/asm/pokemon_special_anim.s +++ b/asm/pokemon_special_anim.s @@ -1703,7 +1703,7 @@ sub_811D2D0: @ 811D2D0 bl ClearWindowTilemap movs r0, 0 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0 movs r1, 0x1 bl CopyWindowToVram diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index a5e91a4a6..a7777c2ca 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1466,7 +1466,7 @@ _0808C454: strh r0, [r5, 0x8] b _0808C69C _0808C45C: - bl ProcessMenuInput + bl Menu_ProcessInput lsls r0, 24 asrs r0, 24 strh r0, [r5, 0xC] @@ -1665,8 +1665,8 @@ _0808C5D8: _0808C5F4: movs r0, 0x1 negs r0, r0 - bl MoveMenuCursor - bl GetMenuCursorPos + bl Menu_MoveCursor + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xA] @@ -1699,8 +1699,8 @@ _0808C624: strh r6, [r5, 0xA] _0808C63C: movs r0, 0x1 - bl MoveMenuCursor - bl GetMenuCursorPos + bl Menu_MoveCursor + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 24 strh r0, [r5, 0xA] @@ -1861,7 +1861,7 @@ sub_808C72C: @ 808C72C movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor mov r0, r10 strh r5, [r0] add sp, 0xC @@ -8349,7 +8349,7 @@ sub_808FCE8: @ 808FCE8 lsls r4, 24 asrs r4, 24 adds r0, r4, 0 - bl MoveMenuCursorNoWrapAround + bl Menu_MoveCursorNoWrapAround add sp, 0xC pop {r4} pop {r0} @@ -8363,7 +8363,7 @@ sub_808FD20: @ 808FD20 push {lr} movs r0, 0x1 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0 bl ScheduleBgCopyTilemapToVram pop {r0} @@ -18931,7 +18931,7 @@ sub_8094E88: @ 8094E88 movs r1, 0 movs r2, 0xB movs r3, 0xE - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette ldr r2, [r5] adds r0, r2, r4 ldrb r0, [r0] @@ -18961,7 +18961,7 @@ sub_8094E88: @ 8094E88 movs r1, 0x1 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0 bl ScheduleBgCopyTilemapToVram ldr r0, [r5] @@ -19023,7 +19023,7 @@ _08094FB6: bl PlaySE movs r0, 0x1 negs r0, r0 - bl MoveMenuCursor + bl Menu_MoveCursor b _08094FF2 .align 2, 0 _08094FD0: .4byte gMain @@ -19035,10 +19035,10 @@ _08094FD4: movs r0, 0x5 bl PlaySE movs r0, 0x1 - bl MoveMenuCursor + bl Menu_MoveCursor b _08094FF2 _08094FEA: - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r5, r0, 24 _08094FF2: @@ -19077,7 +19077,7 @@ sub_8095024: @ 8095024 adds r0, r4 ldrb r0, [r0] movs r1, 0x1 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldr r0, [r5] adds r0, r4 ldrb r0, [r0] diff --git a/asm/script_menu.s b/asm/script_menu.s index 0d5cabbcf..59af843f1 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -271,7 +271,7 @@ _0809CB32: movs r1, 0x2 movs r2, 0x8 movs r3, 0x2 - bl sub_810FBE8 + bl MultichoiceList_PrintItems b _0809CB7A .align 2, 0 _0809CB54: .4byte sub_809D6D4 @@ -290,7 +290,7 @@ _0809CB5C: movs r1, 0x2 movs r2, 0x8 movs r3, 0x2 - bl sub_810FBE8 + bl MultichoiceList_PrintItems _0809CB7A: movs r0, 0xE str r0, [sp] @@ -301,7 +301,7 @@ _0809CB7A: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor ldr r0, [sp, 0x18] adds r1, r7, 0 adds r2, r5, 0 @@ -475,10 +475,10 @@ _0809CCD0: ldrsh r0, [r5, r1] cmp r0, 0 bne _0809CCDE - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround b _0809CCE2 _0809CCDE: - bl ProcessMenuInput + bl Menu_ProcessInput _0809CCE2: lsls r0, 24 lsrs r4, r0, 24 @@ -562,7 +562,7 @@ _0809CD78: bl FillWindowPixelBuffer ldr r4, _0809CDAC @ =gUnknown_83E0738 _0809CD82: - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 22 adds r0, r4 @@ -587,7 +587,7 @@ _0809CDB0: movs r1, 0x11 bl FillWindowPixelBuffer ldr r4, _0809CDE8 @ =gUnknown_83E0748 - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 22 adds r0, r4 @@ -833,7 +833,7 @@ _0809CF08: movs r1, 0x1 adds r2, r5, 0 movs r3, 0x10 - bl sub_8110104 + bl MultichoiceGrid_PrintItems ldrb r0, [r4, 0x14] str r5, [sp] str r7, [sp, 0x4] @@ -843,7 +843,7 @@ _0809CF08: movs r1, 0x1 movs r2, 0 movs r3, 0x1 - bl sub_811030C + bl MultichoiceGrid_InitCursor movs r0, 0 bl ScheduleBgCopyTilemapToVram _0809CFB8: @@ -874,7 +874,7 @@ sub_809CFDC: @ 809CFDC lsls r0, 3 ldr r1, _0809D018 @ =gTasks+0x8 adds r5, r0, r1 - bl sub_8110650 + bl Menu_ProcessInputGridLayout lsls r0, 24 asrs r1, r0, 24 movs r0, 0x2 @@ -1138,7 +1138,7 @@ _0809D1FA: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0 mov r1, r9 adds r2, r6, 0 @@ -1721,7 +1721,7 @@ sub_809D6B0: @ 809D6B0 bl ClearWindowTilemap adds r0, r4, 0 movs r1, 0x1 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent adds r0, r4, 0 bl RemoveWindow pop {r4} @@ -1946,7 +1946,7 @@ _0809D844: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0 mov r1, r9 adds r2, r7, 0 diff --git a/asm/shop.s b/asm/shop.s index 01bca8033..c0f4779b7 100644 --- a/asm/shop.s +++ b/asm/shop.s @@ -74,7 +74,7 @@ _0809AAF8: movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor ldrb r0, [r4] bl PutWindowTilemap ldrb r0, [r4] @@ -194,7 +194,7 @@ sub_809AC10: @ 809AC10 lsls r0, 24 lsrs r4, r0, 24 adds r5, r4, 0 - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround lsls r0, 24 asrs r1, r0, 24 movs r0, 0x2 @@ -211,7 +211,7 @@ sub_809AC10: @ 809AC10 b _0809AC52 _0809AC3C: ldr r4, _0809AC58 @ =gUnknown_83DF09C - bl GetMenuCursorPos + bl Menu_GetCursorPos lsls r0, 24 lsrs r0, 21 adds r4, 0x4 @@ -332,7 +332,7 @@ sub_809AD24: @ 809AD24 ldr r4, _0809AD3C @ =gUnknown_2039950 ldrb r0, [r4] movs r1, 0x2 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] bl RemoveWindow pop {r4} @@ -2396,10 +2396,10 @@ _0809BDD4: bl sub_809B73C movs r0, 0x3 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0x1 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0x3 bl ClearWindowTilemap movs r0, 0x1 @@ -2442,10 +2442,10 @@ _0809BE54: bl sub_809B73C movs r0, 0x3 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0x1 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0x3 bl ClearWindowTilemap movs r0, 0x1 @@ -2601,7 +2601,7 @@ sub_809BF98: @ 809BF98 adds r4, r5, r6 movs r0, 0x2 movs r1, 0 - bl ClearMenuWindow_BorderThickness2 + bl ClearDialogWindowAndFrameToTransparent ldrb r0, [r4, 0xE] movs r1, 0x1 bl sub_809B57C diff --git a/asm/slot_machine.s b/asm/slot_machine.s index b355fed51..c5f6d2b72 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -4607,7 +4607,7 @@ sub_8141AD8: @ 8141AD8 lsls r4, 24 asrs r4, 24 adds r0, r4, 0 - bl MoveMenuCursorNoWrapAround + bl Menu_MoveCursorNoWrapAround bl sub_814112C movs r1, 0x1 str r1, [r0, 0x28] @@ -4627,7 +4627,7 @@ sub_8141B18: @ 8141B18 ldr r0, [r4, 0x28] cmp r0, 0 beq _08141B2E - bl sub_81100E8 + bl DestroyYesNoMenu movs r0, 0 str r0, [r4, 0x28] _08141B2E: diff --git a/asm/start_menu.s b/asm/start_menu.s index 4f898b88c..f7ea9a712 100644 --- a/asm/start_menu.s +++ b/asm/start_menu.s @@ -220,7 +220,7 @@ sub_806EF18: @ 806EF18 ldr r4, _0806EF40 @ =gUnknown_2037101 ldrb r0, [r4] movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldrb r0, [r4] movs r1, 0x2 bl CopyWindowToVram @@ -438,7 +438,7 @@ _0806F0C4: movs r1, 0x2 movs r2, 0 movs r3, 0 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor strb r0, [r4] bl MenuHelpers_LinkSomething lsls r0, 24 @@ -663,7 +663,7 @@ sub_806F280: @ 806F280 bl PlaySE movs r0, 0x1 negs r0, r0 - bl MoveMenuCursor + bl Menu_MoveCursor ldr r4, _0806F360 @ =gUnknown_20370F4 strb r0, [r4] bl MenuHelpers_LinkSomething @@ -698,7 +698,7 @@ _0806F2D2: movs r0, 0x5 bl PlaySE movs r0, 0x1 - bl MoveMenuCursor + bl Menu_MoveCursor ldr r4, _0806F360 @ =gUnknown_20370F4 strb r0, [r4] bl MenuHelpers_LinkSomething @@ -1080,7 +1080,7 @@ sub_806F5C8: @ 806F5C8 _0806F5E4: movs r0, 0 movs r1, 0 - bl ClearMenuWindow_BorderThickness2 + bl ClearDialogWindowAndFrameToTransparent bl sub_806F14C bl sub_812B248 ldr r1, _0806F5FC @ =gUnknown_20370F0 @@ -1093,7 +1093,7 @@ _0806F600: .4byte sub_806F280 _0806F604: movs r0, 0 movs r1, 0x1 - bl ClearMenuWindow_BorderThickness2 + bl ClearDialogWindowAndFrameToTransparent bl sub_80696C0 bl ScriptContext2_Disable bl sub_812B248 @@ -2019,7 +2019,7 @@ sub_806FCF4: @ 806FCF4 movs r1, 0 adds r2, r4, 0 movs r3, 0xD - bl SetWindowBorderStyle + bl DrawStdFrameWithCustomTileAndPalette ldr r4, _0806FE60 @ =gStringVar4 movs r0, 0x3 adds r1, r4, 0 diff --git a/asm/trade.s b/asm/trade.s index 468183b24..61328d618 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -3379,7 +3379,7 @@ _0804E208: movs r1, 0x3 movs r2, 0x10 movs r3, 0x2 - bl sub_810FC80 + bl UnionRoomAndTradeMenuPrintOptions movs r0, 0x10 str r0, [sp] movs r0, 0x2 @@ -3390,7 +3390,7 @@ _0804E208: movs r1, 0x3 movs r2, 0 movs r3, 0 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0x1 bl PutWindowTilemap movs r0, 0x1 @@ -3533,7 +3533,7 @@ _0804E384: .4byte 0x06010000 sub_804E388: @ 804E388 push {lr} sub sp, 0x4 - bl ProcessMenuInputNoWrapAround + bl Menu_ProcessInputNoWrapAround lsls r0, 24 asrs r0, 24 movs r1, 0x1 diff --git a/asm/trainer_card.s b/asm/trainer_card.s index a5a3613dc..0ccec8553 100644 --- a/asm/trainer_card.s +++ b/asm/trainer_card.s @@ -1070,7 +1070,7 @@ _080898BE: adds r0, 0x1 strb r0, [r5, 0x1] _080898CE: - bl sub_8088F84 + bl HasAllKantoMons lsls r0, 16 cmp r0, 0 beq _080898DE @@ -1117,7 +1117,7 @@ _08089918: _0808991C: bl sub_8088F58 strb r0, [r5, 0x3] - bl sub_8088F84 + bl HasAllKantoMons adds r6, r5, 0 adds r6, 0x4D strb r0, [r6] diff --git a/asm/union_room_chat.s b/asm/union_room_chat.s index 609cf8366..9f8d7da11 100644 --- a/asm/union_room_chat.s +++ b/asm/union_room_chat.s @@ -499,7 +499,7 @@ _081287FE: .align 2, 0 _0812880C: .4byte gUnknown_203B0E0 _08128810: - bl ProcessMenuInput + bl Menu_ProcessInput lsls r0, 24 asrs r0, 8 lsrs r6, r0, 16 @@ -534,7 +534,7 @@ _08128848: movs r0, 0x5 bl PlaySE movs r0, 0x1 - bl MoveMenuCursor + bl Menu_MoveCursor b _081288CE .align 2, 0 _08128864: .4byte gMain @@ -4299,7 +4299,7 @@ sub_812A424: @ 812A424 movs r1, 0x2 movs r2, 0 movs r3, 0x2 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor _0812A4F0: add sp, 0x14 pop {r3} @@ -4329,7 +4329,7 @@ sub_812A51C: @ 812A51C lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldr r0, [r4] ldrb r0, [r0, 0x18] bl ClearWindowTilemap @@ -4366,7 +4366,7 @@ _0812A564: .4byte gUnknown_203B0E4 thumb_func_start sub_812A568 sub_812A568: @ 812A568 push {lr} - bl ProcessMenuInput + bl Menu_ProcessInput lsls r0, 24 asrs r0, 24 pop {r1} @@ -4568,7 +4568,7 @@ sub_812A6F4: @ 812A6F4 lsls r0, 24 lsrs r0, 24 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent ldr r0, [r4] ldrb r0, [r0, 0x1E] bl ClearWindowTilemap @@ -4987,7 +4987,7 @@ sub_812AA10: @ 812AA10 movs r1, 0x2 movs r2, 0xE movs r3, 0x5 - bl sub_810FC80 + bl UnionRoomAndTradeMenuPrintOptions bl sub_81296F4 lsls r0, 24 lsrs r0, 24 @@ -5000,7 +5000,7 @@ sub_812AA10: @ 812AA10 movs r1, 0x2 movs r2, 0 movs r3, 0 - bl ProgramAndPlaceMenuCursorOnWindow + bl Menu_InitCursor movs r0, 0x3 bl PutWindowTilemap add sp, 0xC @@ -5015,7 +5015,7 @@ sub_812AA64: @ 812AA64 push {lr} movs r0, 0x3 movs r1, 0 - bl ClearMenuWindow + bl ClearStdWindowAndFrameToTransparent movs r0, 0x3 bl ClearWindowTilemap pop {r0} |