summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorscnorton <scnorton@biociphers.org>2017-07-20 15:35:26 -0400
committerscnorton <scnorton@biociphers.org>2017-07-20 15:35:26 -0400
commit01865ff248543d58e78a63237e15e849fd8e590a (patch)
treeaacaf9cec4b2211fdef5c7624ee344abc263c2b7
parent3339df8b2fb8644bc57820a446e094d75afd3879 (diff)
sub_80BC7D8
-rw-r--r--asm/secret_base.s39
-rw-r--r--src/secret_base.c8
2 files changed, 8 insertions, 39 deletions
diff --git a/asm/secret_base.s b/asm/secret_base.s
index 817f2e4f8..e996f8eb1 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -6,45 +6,6 @@
.section .text_80BC1D0
- thumb_func_start sub_80BC7D8
-sub_80BC7D8: @ 80BC7D8
- push {r4,r5,lr}
- sub sp, 0x8
- adds r5, r0, 0
- lsls r5, 24
- lsrs r5, 24
- lsls r4, r5, 2
- adds r4, r5
- lsls r4, 3
- ldr r0, _080BC820 @ =gTasks + 0x8
- adds r4, r0
- movs r0, 0x11
- movs r1, 0
- movs r2, 0x1D
- movs r3, 0x13
- bl MenuDrawTextWindow
- ldrb r3, [r4, 0x6]
- adds r3, 0x1
- lsls r3, 24
- lsrs r3, 24
- ldrb r0, [r4, 0x2]
- str r0, [sp]
- movs r0, 0xB
- str r0, [sp, 0x4]
- movs r0, 0
- movs r1, 0x12
- movs r2, 0x2
- bl InitMenu
- adds r0, r5, 0
- bl sub_80BC6B0
- add sp, 0x8
- pop {r4,r5}
- pop {r0}
- bx r0
- .align 2, 0
-_080BC820: .4byte gTasks + 0x8
- thumb_func_end sub_80BC7D8
-
thumb_func_start sub_80BC824
sub_80BC824: @ 80BC824
push {r4-r6,lr}
diff --git a/src/secret_base.c b/src/secret_base.c
index a4776719e..1f4e257db 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -1230,3 +1230,11 @@ void sub_80BC6B0(u8 taskId)
else
CreateVerticalScrollIndicators(0, 0xbc, 0x08);
}
+
+void sub_80BC7D8(u8 taskId)
+{
+ s16 *data = gTasks[taskId].data;
+ MenuDrawTextWindow(17, 0, 29, 19);
+ InitMenu(0, 18, 2, data[3] + 1, data[1], 11);
+ sub_80BC6B0(taskId);
+}