sub_80BC980

3 files changed, 13 insertions, 47 deletions

diff --git a/asm/secret_base.s b/asm/secret_base.s
index f76481f43..8d1671508 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -6,53 +6,6 @@
 
 .section .text_80BC1D0
 
-	thumb_func_start sub_80BC980
-sub_80BC980: @ 80BC980
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	movs r0, 0
-	bl PauseVerticalScrollIndicator
-	movs r0, 0x1
-	bl PauseVerticalScrollIndicator
-	movs r0, 0x1
-	movs r1, 0
-	movs r2, 0xC
-	movs r3, 0x5
-	bl MenuDrawTextWindow
-	ldr r3, _080BC9D8 @ =gUnknown_083D13D4
-	movs r0, 0x2
-	movs r1, 0x1
-	movs r2, 0x2
-	bl PrintMenuItems
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xA
-	str r0, [sp, 0x4]
-	movs r0, 0
-	movs r1, 0x2
-	movs r2, 0x1
-	movs r3, 0x2
-	bl InitMenu
-	ldr r1, _080BC9DC @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	ldr r1, _080BC9E0 @ =sub_80BC9E4
-	str r1, [r0]
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080BC9D8: .4byte gUnknown_083D13D4
-_080BC9DC: .4byte gTasks
-_080BC9E0: .4byte sub_80BC9E4
-	thumb_func_end sub_80BC980
-
 	thumb_func_start sub_80BC9E4
 sub_80BC9E4: @ 80BC9E4
 	push {r4,r5,lr}
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 1df5053e7..761932bda 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -26,5 +26,6 @@ void sub_80F996C(u8);
 void LoadScrollIndicatorPalette(void);
 void sub_80F98A4(u8);
 void StartVerticalScrollIndicators(u8);
+void PauseVerticalScrollIndicator(u8);
 
 #endif // GUARD_MENU_HELPERS_H
diff --git a/src/secret_base.c b/src/secret_base.c
index 6530ea7c6..ecc230425 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -16,6 +16,7 @@
 #include "map_constants.h"
 #include "map_name_popup.h"
 #include "menu.h"
+#include "menu_helpers.h"
 #include "metatile_behavior.h"
 #include "palette.h"
 #include "pokemon.h"
@@ -38,6 +39,7 @@ void sub_80BC824(u8);
 void sub_80BCC54(u8);
 u8 sub_80BC948(u8);
 void sub_80BC980(u8);
+void sub_80BC9E4(u8);
 
 const struct
 {
@@ -1317,3 +1319,13 @@ u8 sub_80BC948(u8 a0)
     }
     return 0;
 }
+
+void sub_80BC980(u8 taskId)
+{
+    PauseVerticalScrollIndicator(0);
+    PauseVerticalScrollIndicator(1);
+    MenuDrawTextWindow(1, 0, 12, 5);
+    PrintMenuItems(2, 1, 2, gUnknown_083D13D4);
+    InitMenu(0, 2, 1, 2, 0, 10);
+    gTasks[taskId].func = sub_80BC9E4;
+}