through debug_sub_808E8AC

2 files changed, 91 insertions, 319 deletions

diff --git a/asm/tomomichi_debug_menu.s b/asm/tomomichi_debug_menu.s
index 5c7be51ae..0308f3e7a 100644
--- a/asm/tomomichi_debug_menu.s
+++ b/asm/tomomichi_debug_menu.s
@@ -3,325 +3,6 @@
 	.include "constants/gba_constants.inc"
 	.include "include/macros.inc"
 
-	thumb_func_start debug_sub_808E6C0
-debug_sub_808E6C0:
-	push	{lr}
-	add	sp, sp, #0xfffffff8
-	bl	Menu_EraseScreen
-	mov	r0, #0x0
-	mov	r1, #0x0
-	mov	r2, #0x18
-	mov	r3, #0x5
-	bl	Menu_DrawStdWindowFrame
-	ldr	r3, ._507       @ gUnknown_Debug_083C4644
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x2
-	bl	Menu_PrintItems
-	mov	r0, #0x0
-	str	r0, [sp]
-	mov	r0, #0x17
-	str	r0, [sp, #0x4]
-	mov	r0, #0x0
-	mov	r1, #0x1
-	mov	r2, #0x1
-	mov	r3, #0x2
-	bl	InitMenu
-	ldr	r1, ._507 + 4   @ gMenuCallback
-	ldr	r0, ._507 + 8   @ debug_sub_808E710
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._508:
-	.align	2, 0
-._507:
-	.word	gUnknown_Debug_083C4644
-	.word	gMenuCallback
-	.word	debug_sub_808E710+1
-
-	thumb_func_end debug_sub_808E6C0
-
-	thumb_func_start debug_sub_808E710
-debug_sub_808E710:
-	push	{lr}
-	bl	Menu_ProcessInput
-	lsl	r0, r0, #0x18
-	asr	r1, r0, #0x18
-	mov	r0, #0x2
-	neg	r0, r0
-	cmp	r1, r0
-	bne	._509	@cond_branch
-	mov	r0, #0x0
-	b	._512
-._509:
-	mov	r0, #0x1
-	neg	r0, r0
-	cmp	r1, r0
-	beq	._511	@cond_branch
-	ldr	r2, ._513       @ gMenuCallback
-	ldr	r0, ._513 + 4   @ gUnknown_Debug_083C4644
-	lsl	r1, r1, #0x3
-	add	r0, r0, #0x4
-	add	r1, r1, r0
-	ldr	r0, [r1]
-	str	r0, [r2]
-	mov	r0, #0x0
-	b	._512
-._514:
-	.align	2, 0
-._513:
-	.word	gMenuCallback
-	.word	gUnknown_Debug_083C4644
-._511:
-	bl	CloseMenu
-	mov	r0, #0x1
-._512:
-	pop	{r1}
-	bx	r1
-
-	thumb_func_end debug_sub_808E710
-
-	thumb_func_start debug_sub_808E754
-debug_sub_808E754:
-	push	{r4, lr}
-	add	sp, sp, #0xfffffff8
-	bl	Menu_EraseScreen
-	mov	r0, #0x0
-	mov	r1, #0x0
-	mov	r2, #0x1d
-	mov	r3, #0x13
-	bl	Menu_DrawStdWindowFrame
-	ldr	r3, ._515       @ gUnknown_Debug_083C470C
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x9
-	bl	Menu_PrintItems
-	mov	r4, #0x0
-	str	r4, [sp]
-	mov	r0, #0x1c
-	str	r0, [sp, #0x4]
-	mov	r0, #0x0
-	mov	r1, #0x1
-	mov	r2, #0x1
-	mov	r3, #0x9
-	bl	InitMenu
-	ldr	r0, ._515 + 4   @ gDebug_0300070F
-	strb	r4, [r0]
-	ldr	r1, ._515 + 8   @ gMenuCallback
-	ldr	r0, ._515 + 12  @ debug_sub_808E804
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r4}
-	pop	{r1}
-	bx	r1
-._516:
-	.align	2, 0
-._515:
-	.word	gUnknown_Debug_083C470C
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808E804+1
-
-	thumb_func_end debug_sub_808E754
-
-	thumb_func_start debug_sub_808E7AC
-debug_sub_808E7AC:
-	push	{lr}
-	add	sp, sp, #0xfffffff8
-	bl	Menu_EraseScreen
-	mov	r0, #0x0
-	mov	r1, #0x0
-	mov	r2, #0x1d
-	mov	r3, #0xf
-	bl	Menu_DrawStdWindowFrame
-	ldr	r3, ._517       @ gUnknown_Debug_083C4754C
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x7
-	bl	Menu_PrintItems
-	mov	r0, #0x0
-	str	r0, [sp]
-	mov	r0, #0x1c
-	str	r0, [sp, #0x4]
-	mov	r0, #0x0
-	mov	r1, #0x1
-	mov	r2, #0x1
-	mov	r3, #0x7
-	bl	InitMenu
-	ldr	r1, ._517 + 4   @ gDebug_0300070F
-	mov	r0, #0x1
-	strb	r0, [r1]
-	ldr	r1, ._517 + 8   @ gMenuCallback
-	ldr	r0, ._517 + 12  @ debug_sub_808E804
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._518:
-	.align	2, 0
-._517:
-	.word	gUnknown_Debug_083C4754C
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808E804+1
-
-	thumb_func_end debug_sub_808E7AC
-
-	thumb_func_start debug_sub_808E804
-debug_sub_808E804:
-	push	{r4, r5, lr}
-	bl	Menu_ProcessInput
-	add	r4, r0, #0
-	lsl	r4, r4, #0x18
-	lsr	r4, r4, #0x18
-	bl	Menu_GetCursorPos
-	add	r1, r0, #0
-	ldr	r5, ._522       @ gDebug_0300070F
-	ldrb	r0, [r5]
-	lsl	r1, r1, #0x18
-	lsr	r1, r1, #0x18
-	bl	debug_sub_808E850
-	ldrb	r0, [r5]
-	bl	debug_sub_808E8AC
-	lsl	r4, r4, #0x18
-	asr	r4, r4, #0x18
-	mov	r0, #0x2
-	neg	r0, r0
-	cmp	r4, r0
-	beq	._519	@cond_branch
-	mov	r0, #0x1
-	neg	r0, r0
-	cmp	r4, r0
-	beq	._520	@cond_branch
-._519:
-	mov	r0, #0x0
-	b	._521
-._523:
-	.align	2, 0
-._522:
-	.word	gDebug_0300070F
-._520:
-	bl	CloseMenu
-	mov	r0, #0x1
-._521:
-	pop	{r4, r5}
-	pop	{r1}
-	bx	r1
-
-	thumb_func_end debug_sub_808E804
-
-	thumb_func_start debug_sub_808E850
-debug_sub_808E850:
-	push	{r4, r5, lr}
-	lsl	r0, r0, #0x18
-	lsr	r2, r0, #0x18
-	lsl	r1, r1, #0x18
-	lsr	r3, r1, #0x18
-	ldr	r0, ._526       @ gMain
-	ldrh	r1, [r0, #0x2e]
-	mov	r0, #0x80
-	lsl	r0, r0, #0x1
-	and	r0, r0, r1
-	cmp	r0, #0
-	beq	._524	@cond_branch
-	mov	r5, #0x1
-	b	._525
-._527:
-	.align	2, 0
-._526:
-	.word	gMain
-._524:
-	mov	r0, #0x80
-	lsl	r0, r0, #0x2
-	and	r0, r0, r1
-	cmp	r0, #0
-	beq	._528	@cond_branch
-	ldr	r5, ._529       @ 0xffff
-._525:
-	ldr	r1, ._529 + 4   @ gUnknown_Debug_083C478E
-	lsl	r0, r2, #0x3
-	add	r0, r0, r2
-	add	r0, r0, r3
-	lsl	r0, r0, #0x1
-	add	r0, r0, r1
-	ldrh	r4, [r0]
-	add	r0, r4, #0
-	bl	VarGet
-	add	r1, r0, #0
-	add	r1, r5, r1
-	lsl	r1, r1, #0x10
-	lsr	r1, r1, #0x10
-	add	r0, r4, #0
-	bl	VarSet
-._528:
-	pop	{r4, r5}
-	pop	{r0}
-	bx	r0
-._530:
-	.align	2, 0
-._529:
-	.word	0xffff
-	.word	gUnknown_Debug_083C478E
-
-	thumb_func_end debug_sub_808E850
-
-	thumb_func_start debug_sub_808E8AC
-debug_sub_808E8AC:
-	push	{r4, r5, r6, r7, lr}
-	mov	r7, r8
-	push	{r7}
-	lsl	r0, r0, #0x18
-	lsr	r1, r0, #0x18
-	mov	r5, #0x0
-	ldr	r0, ._533       @ gUnknown_Debug_083C478C
-	add	r0, r1, r0
-	ldrb	r2, [r0]
-	cmp	r5, r2
-	bcs	._531	@cond_branch
-	ldr	r0, ._533 + 4   @ gUnknown_Debug_083C478E
-	mov	r8, r0
-	lsl	r0, r1, #0x3
-	add	r0, r0, r1
-	lsl	r7, r0, #0x1
-	add	r6, r2, #0
-._532:
-	lsl	r0, r5, #0x1
-	add	r4, r0, #1
-	lsl	r4, r4, #0x18
-	lsr	r4, r4, #0x18
-	add	r0, r0, r7
-	add r0, r0, r8
-	ldrh	r0, [r0]
-	bl	VarGet
-	add	r2, r0, #0
-	lsl	r2, r2, #0x10
-	lsr	r2, r2, #0x10
-	mov	r0, #0x18
-	add	r1, r4, #0
-	bl	debug_sub_808F31C
-	add	r0, r5, #1
-	lsl	r0, r0, #0x18
-	lsr	r5, r0, #0x18
-	cmp	r5, r6
-	bcc	._532	@cond_branch
-._531:
-	pop	{r3}
-	mov	r8, r3
-	pop	{r4, r5, r6, r7}
-	pop	{r0}
-	bx	r0
-._534:
-	.align	2, 0
-._533:
-	.word	gUnknown_Debug_083C478C
-	.word	gUnknown_Debug_083C478E
-
-	thumb_func_end debug_sub_808E8AC
-
 	thumb_func_start debug_sub_808E90C
 debug_sub_808E90C:
 	push	{lr}
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index a2dcbabae..7602885c2 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -195,6 +195,10 @@ bool8 debug_sub_808E3BC(void);
 bool8 debug_sub_808E5B8(void);
 void debug_sub_808E604(u8, u8);
 void debug_sub_808E660(u8);
+bool8 debug_sub_808E710(void);
+bool8 debug_sub_808E804(void);
+void debug_sub_808E850(u8, u8);
+void debug_sub_808E8AC(u8);
 
 extern const u8 DebugScript_081C1CFE[];
 extern const u8 DebugScript_081C1D07[];
@@ -3679,4 +3683,91 @@ void debug_sub_808E660(u8 whichMenu)
     }
 }
 
+bool8 debug_sub_808E6C0(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 24, 2 * ARRAY_COUNT(gUnknown_Debug_083C4644) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C4644), gUnknown_Debug_083C4644);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C4644), 0, 23);
+    gMenuCallback = debug_sub_808E710;
+    return FALSE;
+}
+
+bool8 debug_sub_808E710(void)
+{
+    s8 input = Menu_ProcessInput();
+
+    if (input == -2)
+        return FALSE;
+    if (input == -1)
+    {
+        CloseMenu();
+        return TRUE;
+    }
+    gMenuCallback = gUnknown_Debug_083C4644[input].func;
+    return FALSE;
+}
+
+bool8 debug_sub_808E754(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C470C) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C470C), gUnknown_Debug_083C470C);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C470C), 0, 28);
+    gDebug_0300070F = 0;
+    gMenuCallback = debug_sub_808E804;
+    return FALSE;
+}
+
+bool8 debug_sub_808E7AC(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C4754C) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C4754C), gUnknown_Debug_083C4754C);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C4754C), 0, 28);
+    gDebug_0300070F = 1;
+    gMenuCallback = debug_sub_808E804;
+    return FALSE;
+}
+
+bool8 debug_sub_808E804(void)
+{
+    s8 input = Menu_ProcessInput();
+    s8 cursorPos = Menu_GetCursorPos();
+
+    debug_sub_808E850(gDebug_0300070F, cursorPos);
+    debug_sub_808E8AC(gDebug_0300070F);
+    if (input == -2)
+        return FALSE;
+    if (input == -1)
+    {
+        CloseMenu();
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void debug_sub_808E850(u8 whichMenu, u8 cursorPos)
+{
+    u16 delta;
+
+    if (gMain.newKeys & R_BUTTON)
+        delta = +1;
+    else if (gMain.newKeys & L_BUTTON)
+        delta = -1;
+    else
+        return;
+    VarSet(gUnknown_Debug_083C478E[whichMenu][cursorPos], VarGet(gUnknown_Debug_083C478E[whichMenu][cursorPos]) + delta);
+}
+
+void debug_sub_808E8AC(u8 whichMenu)
+{
+    u8 i;
+
+    for (i = 0; i < gUnknown_Debug_083C478C[whichMenu]; i++)
+    {
+        debug_sub_808F31C(24, 2 * i + 1, VarGet(gUnknown_Debug_083C478E[whichMenu][i]));
+    }
+}
+
 #endif