diff options
| -rw-r--r-- | arm9/asm/unk_02001B80.s | 8 | ||||
| -rw-r--r-- | arm9/global.inc | 2 | ||||
| -rw-r--r-- | arm9/modules/18/asm/module_18.s | 4 | ||||
| -rw-r--r-- | arm9/src/list_menu.c | 7 |
4 files changed, 9 insertions, 12 deletions
diff --git a/arm9/asm/unk_02001B80.s b/arm9/asm/unk_02001B80.s index 6e08d1db..1b7f2aac 100644 --- a/arm9/asm/unk_02001B80.s +++ b/arm9/asm/unk_02001B80.s @@ -12,14 +12,6 @@ UNK_020ECAC8: ; 0x020ECAC8 .text - thumb_func_start FUN_02001B80 -FUN_02001B80: ; 0x02001B80 - ldr r3, _02001B88 ; =CopyWindowToVram - ldr r0, [r0, #0xc] - bx r3 - nop -_02001B88: .word CopyWindowToVram - thumb_func_start FUN_02001B8C FUN_02001B8C: ; 0x02001B8C push {r3-r7, lr} diff --git a/arm9/global.inc b/arm9/global.inc index c93890f2..10769fcb 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -202,7 +202,7 @@ .extern ListMenuGetTemplateField .extern ListMenuSetTemplateField .extern ListMenuGetItemStr -.extern FUN_02001B80 +.extern ListMenuCopyToVram .extern FUN_02001B8C .extern FUN_02001C14 .extern FUN_02001C34 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index d8d29d24..fb14c7c8 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -38637,7 +38637,7 @@ MOD18_0224C418: ; 0x0224C418 cmp r6, #0 beq _0224C434 add r0, r7, #0 - bl FUN_02001B80 + bl ListMenuCopyToVram _0224C434: add r0, r4, #0 add r0, #0x20 @@ -38761,7 +38761,7 @@ MOD18_0224C510: ; 0x0224C510 cmp r0, #0 beq _0224C546 ldr r0, [sp, #0xc] - bl FUN_02001B80 + bl ListMenuCopyToVram _0224C546: mov r0, #1 mvn r0, r0 diff --git a/arm9/src/list_menu.c b/arm9/src/list_menu.c index 7b663eca..e3832145 100644 --- a/arm9/src/list_menu.c +++ b/arm9/src/list_menu.c @@ -568,10 +568,15 @@ THUMB_FUNC BOOL ListMenuChangeSelection(struct ListMenu * list, u8 updateCursorA return FALSE; } -void ListMenuCallSelectionChangedCallback(struct ListMenu * list, u8 onInit) +THUMB_FUNC void ListMenuCallSelectionChangedCallback(struct ListMenu * list, u8 onInit) { if (list->template.moveCursorFunc != NULL) { list->template.moveCursorFunc(list, list->template.items[list->cursorPos + list->itemsAbove].index, onInit); } } + +THUMB_FUNC void ListMenuCopyToVram(struct ListMenu * list) +{ + CopyWindowToVram(list->template.window); +} |