debug_sub_808BC48

2 files changed, 37 insertions, 65 deletions

diff --git a/asm/tomomichi_debug_menu.s b/asm/tomomichi_debug_menu.s
index 78010ba91..8e1be83f9 100644
--- a/asm/tomomichi_debug_menu.s
+++ b/asm/tomomichi_debug_menu.s
@@ -3,71 +3,6 @@
 	.include "constants/gba_constants.inc"
 	.include "include/macros.inc"
 
-	thumb_func_start debug_sub_808BC48
-debug_sub_808BC48:
-	push	{r4, lr}
-	bl	Menu_ProcessInput
-	lsl	r0, r0, #0x18
-	lsr	r4, r0, #0x18
-	bl	Menu_GetCursorPos
-	lsl	r0, r0, #0x18
-	asr	r0, r0, #0x18
-	cmp	r0, #0x1
-	beq	._25	@cond_branch
-	cmp	r0, #0x1
-	bgt	._26	@cond_branch
-	cmp	r0, #0
-	beq	._27	@cond_branch
-	b	._32
-._26:
-	cmp	r0, #0x2
-	beq	._29	@cond_branch
-	b	._32
-._27:
-	bl	debug_sub_808ED0C
-	b	._32
-._25:
-	bl	debug_sub_808ED9C
-	b	._32
-._29:
-	bl	debug_sub_808EE3C
-._32:
-	mov	r0, #0x0
-	bl	debug_sub_808EF8C
-	lsl	r0, r4, #0x18
-	asr	r1, r0, #0x18
-	mov	r0, #0x2
-	neg	r0, r0
-	cmp	r1, r0
-	beq	._36	@cond_branch
-	mov	r0, #0x1
-	neg	r0, r0
-	cmp	r1, r0
-	bne	._34	@cond_branch
-	bl	CloseMenu
-	mov	r0, #0x1
-	b	._35
-._34:
-	cmp	r1, #0x3
-	bne	._36	@cond_branch
-	ldr	r0, ._37        @ gMenuCallback
-	ldr	r1, ._37 + 4    @ gUnknown_Debug_083C0D2C
-	ldr	r1, [r1, #0x1c]
-	str	r1, [r0]
-._36:
-	mov	r0, #0x0
-._35:
-	pop	{r4}
-	pop	{r1}
-	bx	r1
-._38:
-	.align	2, 0
-._37:
-	.word	gMenuCallback
-	.word	gUnknown_Debug_083C0D2C
-
-	thumb_func_end debug_sub_808BC48
-
 	thumb_func_start debug_sub_808BCBC
 debug_sub_808BCBC:
 	push	{r4, lr}
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 11c66ace1..fef72e4b3 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -60,6 +60,10 @@ bool8 debug_sub_808E6C0(void);
 bool8 debug_sub_808E90C(void);
 bool8 debug_sub_808DA30(void);
 bool8 debug_sub_808DFC0(void);
+void debug_sub_808ED0C(void);
+void debug_sub_808ED9C(void);
+void debug_sub_808EE3C(void);
+void debug_sub_808EF8C(u32 a0);
 
 const u8 gUnknown_Debug_083C0C54[] = _("Contest graphics");
 const u8 gUnknown_Debug_083C0C65[] = _("Art Mus. graphics");
@@ -305,4 +309,37 @@ bool8 TomomichiDebugMenu_ControlWorks(void)
     return FALSE;
 }
 
+bool8 debug_sub_808BC48(void)
+{
+    s8 input = Menu_ProcessInput();
+    s8 cursorPos = Menu_GetCursorPos();
+
+    switch (cursorPos)
+    {
+        case 0:
+            debug_sub_808ED0C();
+            break;
+        case 1:
+            debug_sub_808ED9C();
+            break;
+        case 2:
+            debug_sub_808EE3C();
+            break;
+    }
+    debug_sub_808EF8C(0);
+    if (input == -2)
+        return FALSE;
+    if (input == -1)
+    {
+        CloseMenu();
+        return TRUE;
+    }
+    if (input == 3)
+    {
+        gMenuCallback = gUnknown_Debug_083C0D2C[3].func;
+        return FALSE;
+    }
+    return FALSE;
+}
+
 #endif