diff options
| author | scnorton <scnorton@biociphers.org> | 2017-07-20 17:44:01 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-07-20 17:44:01 -0400 |
| commit | f18645e5d7e4fb4d9b060a77625d305a27791f43 (patch) | |
| tree | 0c6827fa5df0c3d59c3259b8956af8562edf9ed2 | |
| parent | bab5b59b088452951e3afec325a8cacbb5f8d21f (diff) | |
sub_80BCBF8
| -rw-r--r-- | asm/secret_base.s | 45 | ||||
| -rw-r--r-- | src/secret_base.c | 10 |
2 files changed, 10 insertions, 45 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index d9e36cfbd..855545884 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -6,51 +6,6 @@ .section .text_80BC1D0 - thumb_func_start sub_80BCBF8 -sub_80BCBF8: @ 80BCBF8 - push {r4,r5,lr} - sub sp, 0x8 - lsls r0, 24 - lsrs r0, 24 - lsls r4, r0, 2 - adds r4, r0 - lsls r4, 3 - ldr r5, _080BCC4C @ =gTasks + 0x8 - adds r0, r4, r5 - ldrb r3, [r0, 0x6] - adds r3, 0x1 - lsls r3, 24 - lsrs r3, 24 - ldrb r0, [r0, 0x2] - str r0, [sp] - movs r0, 0xB - str r0, [sp, 0x4] - movs r0, 0 - movs r1, 0x12 - movs r2, 0x2 - bl InitMenu - movs r0, 0x1 - movs r1, 0 - movs r2, 0xC - movs r3, 0x5 - bl MenuZeroFillWindowRect - movs r0, 0 - bl StartVerticalScrollIndicators - movs r0, 0x1 - bl StartVerticalScrollIndicators - subs r5, 0x8 - adds r4, r5 - ldr r0, _080BCC50 @ =sub_80BC824 - str r0, [r4] - add sp, 0x8 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080BCC4C: .4byte gTasks + 0x8 -_080BCC50: .4byte sub_80BC824 - thumb_func_end sub_80BCBF8 - thumb_func_start sub_80BCC54 sub_80BCC54: @ 80BCC54 push {r4,r5,lr} diff --git a/src/secret_base.c b/src/secret_base.c index 6304e3acf..291ddc41d 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -1406,3 +1406,13 @@ void sub_80BCBC0(u8 taskId) sub_80BC7D8(taskId); gTasks[taskId].func = sub_80BC824; } + +void sub_80BCBF8(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + InitMenu(0, 18, 2, data[3] + 1, data[1], 11); + MenuZeroFillWindowRect(1, 0, 12, 5); + StartVerticalScrollIndicators(0); + StartVerticalScrollIndicators(1); + gTasks[taskId].func = sub_80BC824; +} |