diff options
| author | scnorton <scnorton@biociphers.org> | 2017-07-20 17:18:03 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-07-20 17:18:03 -0400 |
| commit | a44190a0b09c8fc0a6d5517218942f9aa3bbe188 (patch) | |
| tree | 2594ee7357ba91248caf33a2d37460ede27985dd | |
| parent | cc2bc365519a7a690e8d030fff961a18032c9d56 (diff) | |
sub_80BCA84
| -rw-r--r-- | asm/secret_base.s | 44 | ||||
| -rw-r--r-- | src/secret_base.c | 13 |
2 files changed, 13 insertions, 44 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s index 7bc4e28ec..9440307f8 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -6,50 +6,6 @@ .section .text_80BC1D0 - thumb_func_start sub_80BCA84 -sub_80BCA84: @ 80BCA84 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - lsls r4, r5, 2 - adds r4, r5 - lsls r4, 3 - ldr r0, _080BCAD8 @ =gTasks + 0x8 - adds r4, r0 - movs r0, 0 - bl DestroyVerticalScrollIndicator - movs r0, 0x1 - bl DestroyVerticalScrollIndicator - bl HandleDestroyMenuCursors - movs r0, 0 - movs r1, 0 - movs r2, 0x1D - movs r3, 0x13 - bl MenuZeroFillWindowRect - ldr r0, _080BCADC @ =gStringVar1 - ldrb r1, [r4, 0x8] - bl sub_80BC190 - ldr r4, _080BCAE0 @ =gStringVar4 - ldr r1, _080BCAE4 @ =gOtherText_OkayToDeleteFromRegistry - adds r0, r4, 0 - bl StringExpandPlaceholders - ldr r2, _080BCAE8 @ =sub_80BCAEC - adds r0, r5, 0 - adds r1, r4, 0 - movs r3, 0 - bl DisplayItemMessageOnField - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080BCAD8: .4byte gTasks + 0x8 -_080BCADC: .4byte gStringVar1 -_080BCAE0: .4byte gStringVar4 -_080BCAE4: .4byte gOtherText_OkayToDeleteFromRegistry -_080BCAE8: .4byte sub_80BCAEC - thumb_func_end sub_80BCA84 - thumb_func_start sub_80BCAEC sub_80BCAEC: @ 80BCAEC push {r4,lr} diff --git a/src/secret_base.c b/src/secret_base.c index bcf7371f4..b5d1ef310 100644 --- a/src/secret_base.c +++ b/src/secret_base.c @@ -40,6 +40,7 @@ void sub_80BCC54(u8); u8 sub_80BC948(u8); void sub_80BC980(u8); void sub_80BC9E4(u8); +void sub_80BCAEC(u8); const struct { @@ -1359,3 +1360,15 @@ void sub_80BC9E4(u8 taskId) sub_80BCBF8(taskId); } } + +void sub_80BCA84(u8 taskId) +{ + s16 *data = gTasks[taskId].data; + DestroyVerticalScrollIndicator(0); + DestroyVerticalScrollIndicator(1); + HandleDestroyMenuCursors(); + MenuZeroFillWindowRect(0, 0, 29, 19); + sub_80BC190(gStringVar1, data[4]); + StringExpandPlaceholders(gStringVar4, gOtherText_OkayToDeleteFromRegistry); + DisplayItemMessageOnField(taskId, gStringVar4, sub_80BCAEC, 0); +} |