From ae3119a9c82f44ee006cf131f05c56596c43a922 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 26 Oct 2017 21:59:54 -0400
Subject: [PATCH] sub_80E9E90

---
 asm/secret_base.s | 63 -----------------------------------------------
 src/secret_base.c | 32 ++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 63 deletions(-)

diff --git a/asm/secret_base.s b/asm/secret_base.s
index 88ffb813f..68af6bd4c 100644
--- a/asm/secret_base.s
+++ b/asm/secret_base.s
@@ -5,69 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80E9E90
-sub_80E9E90: @ 80E9E90
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, =gTasks + 0x8
-	adds r4, r0, r1
-	ldrb r0, [r4, 0xA]
-	bl ListMenuHandleInput
-	adds r5, r0, 0
-	ldrb r0, [r4, 0xA]
-	adds r1, r4, 0x4
-	adds r2, r4, 0x2
-	bl get_coro_args_x18_x1A
-	movs r0, 0x2
-	negs r0, r0
-	cmp r5, r0
-	beq _080E9EC8
-	adds r0, 0x1
-	cmp r5, r0
-	bne _080E9F0C
-	b _080E9F1A
-	.pool
-_080E9EC8:
-	movs r0, 0x5
-	bl PlaySE
-	ldrb r0, [r4, 0xA]
-	movs r1, 0
-	movs r2, 0
-	bl sub_81AE6C8
-	ldrb r0, [r4, 0x10]
-	bl RemoveScrollIndicatorArrowPair
-	ldrb r0, [r4, 0xC]
-	movs r1, 0
-	bl sub_819746C
-	ldrb r0, [r4, 0xC]
-	bl ClearWindowTilemap
-	ldrb r0, [r4, 0xC]
-	bl RemoveWindow
-	movs r0, 0
-	bl schedule_bg_copy_tilemap_to_vram
-	ldr r0, =gUnknown_0203A020
-	ldr r0, [r0]
-	bl Free
-	adds r0, r6, 0
-	bl task_pc_turn_off
-	b _080E9F1A
-	.pool
-_080E9F0C:
-	movs r0, 0x5
-	bl PlaySE
-	strh r5, [r4, 0x8]
-	adds r0, r6, 0
-	bl sub_80E9F20
-_080E9F1A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80E9E90
-
 	thumb_func_start sub_80E9F20
 sub_80E9F20: @ 80E9F20
 	push {r4-r6,lr}
diff --git a/src/secret_base.c b/src/secret_base.c
index 73bc78826..f066a3c25 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -50,6 +50,7 @@ void game_continue(u8 taskId);
 void sub_80E9E00(u8 taskId);
 void sub_80E9E44(u8 taskId);
 void sub_80E9E90(u8 taskId);
+void sub_80E9F20(u8 taskId);
 void task_pc_turn_off(u8 taskId);
 u8 sub_80EA20C(u8 sbId);
 
@@ -1052,3 +1053,34 @@ void sub_80E9E44(u8 taskId)
     data = gTasks[taskId].data;
     data[8] = AddScrollIndicatorArrowPairParametrized(0x02, 0xbc, 0x0c, 0x94, data[0] - data[3], 0x13f8, 0x13f8, &data[2]);
 }
+
+void sub_80E9E90(u8 taskId)
+{
+    s16 *data;
+    s32 input;
+
+    data = gTasks[taskId].data;
+    input = ListMenuHandleInput(data[5]);
+    get_coro_args_x18_x1A(data[5], &data[2], &data[1]);
+    switch (input)
+    {
+        case -1:
+            break;
+        case -2:
+            PlaySE(SE_SELECT);
+            sub_81AE6C8(data[5], NULL, NULL);
+            RemoveScrollIndicatorArrowPair(data[8]);
+            sub_819746C(data[6], 0);
+            ClearWindowTilemap(data[6]);
+            RemoveWindow(data[6]);
+            schedule_bg_copy_tilemap_to_vram(0);
+            free(gUnknown_0203A020);
+            task_pc_turn_off(taskId);
+            break;
+        default:
+            PlaySE(SE_SELECT);
+            data[4] = input;
+            sub_80E9F20(taskId);
+            break;
+    }
+}