through debug_sub_808E660

2 files changed, 124 insertions, 451 deletions

diff --git a/asm/tomomichi_debug_menu.s b/asm/tomomichi_debug_menu.s
index b5e56a5d8..5c7be51ae 100644
--- a/asm/tomomichi_debug_menu.s
+++ b/asm/tomomichi_debug_menu.s
@@ -3,457 +3,6 @@
 	.include "constants/gba_constants.inc"
 	.include "include/macros.inc"
 
-	thumb_func_start debug_sub_808E36C
-debug_sub_808E36C:
-	push	{lr}
-	add	sp, sp, #0xfffffff8
-	bl	Menu_EraseScreen
-	mov	r0, #0x0
-	mov	r1, #0x0
-	mov	r2, #0x18
-	mov	r3, #0xb
-	bl	Menu_DrawStdWindowFrame
-	ldr	r3, ._473       @ gUnknown_Debug_083C32AC
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x5
-	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, #0x5
-	bl	InitMenu
-	ldr	r1, ._473 + 4   @ gMenuCallback
-	ldr	r0, ._473 + 8   @ debug_sub_808E3BC
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._474:
-	.align	2, 0
-._473:
-	.word	gUnknown_Debug_083C32AC
-	.word	gMenuCallback
-	.word	debug_sub_808E3BC+1
-
-	thumb_func_end debug_sub_808E36C
-
-	thumb_func_start debug_sub_808E3BC
-debug_sub_808E3BC:
-	push	{lr}
-	bl	Menu_ProcessInput
-	lsl	r0, r0, #0x18
-	asr	r1, r0, #0x18
-	mov	r0, #0x2
-	neg	r0, r0
-	cmp	r1, r0
-	bne	._475	@cond_branch
-	mov	r0, #0x0
-	b	._478
-._475:
-	mov	r0, #0x1
-	neg	r0, r0
-	cmp	r1, r0
-	beq	._477	@cond_branch
-	ldr	r2, ._479       @ gMenuCallback
-	ldr	r0, ._479 + 4   @ gUnknown_Debug_083C32AC
-	lsl	r1, r1, #0x3
-	add	r0, r0, #0x4
-	add	r1, r1, r0
-	ldr	r0, [r1]
-	str	r0, [r2]
-	mov	r0, #0x0
-	b	._478
-._480:
-	.align	2, 0
-._479:
-	.word	gMenuCallback
-	.word	gUnknown_Debug_083C32AC
-._477:
-	bl	CloseMenu
-	mov	r0, #0x1
-._478:
-	pop	{r1}
-	bx	r1
-
-	thumb_func_end debug_sub_808E3BC
-
-	thumb_func_start debug_sub_808E400
-debug_sub_808E400:
-	push	{r4, lr}
-	add	sp, sp, #0xfffffff8
-	bl	Menu_EraseScreen
-	mov	r0, #0x0
-	mov	r1, #0x0
-	mov	r2, #0x1d
-	mov	r3, #0x7
-	bl	Menu_DrawStdWindowFrame
-	ldr	r3, ._481       @ gUnknown_Debug_083C347C
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x3
-	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, #0x3
-	bl	InitMenu
-	ldr	r0, ._481 + 4   @ gDebug_0300070F
-	strb	r4, [r0]
-	ldr	r1, ._481 + 8   @ gMenuCallback
-	ldr	r0, ._481 + 12  @ debug_sub_808E5B8
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r4}
-	pop	{r1}
-	bx	r1
-._482:
-	.align	2, 0
-._481:
-	.word	gUnknown_Debug_083C347C
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808E5B8+1
-
-	thumb_func_end debug_sub_808E400
-
-	thumb_func_start debug_sub_808E458
-debug_sub_808E458:
-	push	{lr}
-	add	sp, sp, #0xfffffff8
-	bl	Menu_EraseScreen
-	mov	r0, #0x0
-	mov	r1, #0x0
-	mov	r2, #0x1d
-	mov	r3, #0x5
-	bl	Menu_DrawStdWindowFrame
-	ldr	r3, ._483       @ gUnknown_Debug_083C3494
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x2
-	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, #0x2
-	bl	InitMenu
-	ldr	r1, ._483 + 4   @ gDebug_0300070F
-	mov	r0, #0x1
-	strb	r0, [r1]
-	ldr	r1, ._483 + 8   @ gMenuCallback
-	ldr	r0, ._483 + 12  @ debug_sub_808E5B8
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._484:
-	.align	2, 0
-._483:
-	.word	gUnknown_Debug_083C3494
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808E5B8+1
-
-	thumb_func_end debug_sub_808E458
-
-	thumb_func_start debug_sub_808E4B0
-debug_sub_808E4B0:
-	push	{lr}
-	add	sp, sp, #0xfffffff8
-	bl	Menu_EraseScreen
-	mov	r0, #0x0
-	mov	r1, #0x0
-	mov	r2, #0x1d
-	mov	r3, #0xd
-	bl	Menu_DrawStdWindowFrame
-	ldr	r3, ._485       @ gUnknown_Debug_083C34A4
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x6
-	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, #0x6
-	bl	InitMenu
-	ldr	r1, ._485 + 4   @ gDebug_0300070F
-	mov	r0, #0x2
-	strb	r0, [r1]
-	ldr	r1, ._485 + 8   @ gMenuCallback
-	ldr	r0, ._485 + 12  @ debug_sub_808E5B8
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._486:
-	.align	2, 0
-._485:
-	.word	gUnknown_Debug_083C34A4
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808E5B8+1
-
-	thumb_func_end debug_sub_808E4B0
-
-	thumb_func_start debug_sub_808E508
-debug_sub_808E508:
-	push	{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, ._487       @ gUnknown_Debug_083C34D4
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x9
-	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, #0x9
-	bl	InitMenu
-	ldr	r1, ._487 + 4   @ gDebug_0300070F
-	mov	r0, #0x3
-	strb	r0, [r1]
-	ldr	r1, ._487 + 8   @ gMenuCallback
-	ldr	r0, ._487 + 12  @ debug_sub_808E5B8
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._488:
-	.align	2, 0
-._487:
-	.word	gUnknown_Debug_083C34D4
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808E5B8+1
-
-	thumb_func_end debug_sub_808E508
-
-	thumb_func_start debug_sub_808E560
-debug_sub_808E560:
-	push	{lr}
-	add	sp, sp, #0xfffffff8
-	bl	Menu_EraseScreen
-	mov	r0, #0x0
-	mov	r1, #0x0
-	mov	r2, #0x1d
-	mov	r3, #0xb
-	bl	Menu_DrawStdWindowFrame
-	ldr	r3, ._489       @ gUnknown_Debug_083C351C
-	mov	r0, #0x2
-	mov	r1, #0x1
-	mov	r2, #0x5
-	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, #0x5
-	bl	InitMenu
-	ldr	r1, ._489 + 4   @ gDebug_0300070F
-	mov	r0, #0x4
-	strb	r0, [r1]
-	ldr	r1, ._489 + 8   @ gMenuCallback
-	ldr	r0, ._489 + 12  @ debug_sub_808E5B8
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._490:
-	.align	2, 0
-._489:
-	.word	gUnknown_Debug_083C351C
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808E5B8+1
-
-	thumb_func_end debug_sub_808E560
-
-	thumb_func_start debug_sub_808E5B8
-debug_sub_808E5B8:
-	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, ._494       @ gDebug_0300070F
-	ldrb	r0, [r5]
-	lsl	r1, r1, #0x18
-	lsr	r1, r1, #0x18
-	bl	debug_sub_808E604
-	ldrb	r0, [r5]
-	bl	debug_sub_808E660
-	lsl	r4, r4, #0x18
-	asr	r4, r4, #0x18
-	mov	r0, #0x2
-	neg	r0, r0
-	cmp	r4, r0
-	beq	._491	@cond_branch
-	mov	r0, #0x1
-	neg	r0, r0
-	cmp	r4, r0
-	beq	._492	@cond_branch
-._491:
-	mov	r0, #0x0
-	b	._493
-._495:
-	.align	2, 0
-._494:
-	.word	gDebug_0300070F
-._492:
-	bl	CloseMenu
-	mov	r0, #0x1
-._493:
-	pop	{r4, r5}
-	pop	{r1}
-	bx	r1
-
-	thumb_func_end debug_sub_808E5B8
-
-	thumb_func_start debug_sub_808E604
-debug_sub_808E604:
-	push	{r4, r5, lr}
-	lsl	r0, r0, #0x18
-	lsr	r2, r0, #0x18
-	lsl	r1, r1, #0x18
-	lsr	r3, r1, #0x18
-	ldr	r0, ._498       @ gMain
-	ldrh	r1, [r0, #0x30]
-	mov	r0, #0x80
-	lsl	r0, r0, #0x1
-	and	r0, r0, r1
-	cmp	r0, #0
-	beq	._496	@cond_branch
-	mov	r5, #0x1
-	b	._497
-._499:
-	.align	2, 0
-._498:
-	.word	gMain
-._496:
-	mov	r0, #0x80
-	lsl	r0, r0, #0x2
-	and	r0, r0, r1
-	cmp	r0, #0
-	beq	._500	@cond_branch
-	ldr	r5, ._501       @ 0xffff
-._497:
-	ldr	r1, ._501 + 4   @ gUnknown_Debug_083C354A
-	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
-._500:
-	pop	{r4, r5}
-	pop	{r0}
-	bx	r0
-._502:
-	.align	2, 0
-._501:
-	.word	0xffff
-	.word	gUnknown_Debug_083C354A
-
-	thumb_func_end debug_sub_808E604
-
-	thumb_func_start debug_sub_808E660
-debug_sub_808E660:
-	push	{r4, r5, r6, r7, lr}
-	mov	r7, r8
-	push	{r7}
-	lsl	r0, r0, #0x18
-	lsr	r1, r0, #0x18
-	mov	r5, #0x0
-	ldr	r0, ._505       @ gUnknown_Debug_083C3544
-	add	r0, r1, r0
-	ldrb	r2, [r0]
-	cmp	r5, r2
-	bcs	._503	@cond_branch
-	ldr	r0, ._505 + 4   @ gUnknown_Debug_083C354A
-	mov	r8, r0
-	lsl	r0, r1, #0x3
-	add	r0, r0, r1
-	lsl	r7, r0, #0x1
-	add	r6, r2, #0
-._504:
-	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	._504	@cond_branch
-._503:
-	pop	{r3}
-	mov	r8, r3
-	pop	{r4, r5, r6, r7}
-	pop	{r0}
-	bx	r0
-._506:
-	.align	2, 0
-._505:
-	.word	gUnknown_Debug_083C3544
-	.word	gUnknown_Debug_083C354A
-
-	thumb_func_end debug_sub_808E660
-
 	thumb_func_start debug_sub_808E6C0
 debug_sub_808E6C0:
 	push	{lr}
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index b741436a2..a2dcbabae 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -191,6 +191,10 @@ bool8 debug_sub_808E010(void);
 bool8 debug_sub_808E264(void);
 void debug_sub_808E310(u8, u8);
 void debug_sub_808E2B0(u8);
+bool8 debug_sub_808E3BC(void);
+bool8 debug_sub_808E5B8(void);
+void debug_sub_808E604(u8, u8);
+void debug_sub_808E660(u8);
 
 extern const u8 DebugScript_081C1CFE[];
 extern const u8 DebugScript_081C1D07[];
@@ -3555,4 +3559,124 @@ void debug_sub_808E310(u8 whichMenu, u8 cursorPos)
     VarSet(gUnknown_Debug_83C3C4E[whichMenu][cursorPos], VarGet(gUnknown_Debug_83C3C4E[whichMenu][cursorPos]) + delta);
 }
 
+bool8 debug_sub_808E36C(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 24, 2 * ARRAY_COUNT(gUnknown_Debug_083C32AC) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C32AC), gUnknown_Debug_083C32AC);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C32AC), 0, 23);
+    gMenuCallback = debug_sub_808E3BC;
+    return FALSE;
+}
+
+bool8 debug_sub_808E3BC(void)
+{
+    s8 input = Menu_ProcessInput();
+
+    if (input == -2)
+        return FALSE;
+    if (input == -1)
+    {
+        CloseMenu();
+        return TRUE;
+    }
+    gMenuCallback = gUnknown_Debug_083C32AC[input].func;
+    return FALSE;
+}
+
+bool8 debug_sub_808E400(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C347C) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C347C), gUnknown_Debug_083C347C);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C347C), 0, 28);
+    gDebug_0300070F = 0;
+    gMenuCallback = debug_sub_808E5B8;
+    return FALSE;
+}
+
+bool8 debug_sub_808E458(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C3494) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C3494), gUnknown_Debug_083C3494);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C3494), 0, 28);
+    gDebug_0300070F = 1;
+    gMenuCallback = debug_sub_808E5B8;
+    return FALSE;
+}
+
+bool8 debug_sub_808E4B0(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C34A4) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C34A4), gUnknown_Debug_083C34A4);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C34A4), 0, 28);
+    gDebug_0300070F = 2;
+    gMenuCallback = debug_sub_808E5B8;
+    return FALSE;
+}
+
+bool8 debug_sub_808E508(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C34D4) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C34D4), gUnknown_Debug_083C34D4);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C34D4), 0, 28);
+    gDebug_0300070F = 3;
+    gMenuCallback = debug_sub_808E5B8;
+    return FALSE;
+}
+
+bool8 debug_sub_808E560(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C351C) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C351C), gUnknown_Debug_083C351C);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C351C), 0, 28);
+    gDebug_0300070F = 4;
+    gMenuCallback = debug_sub_808E5B8;
+    return FALSE;
+}
+
+bool8 debug_sub_808E5B8(void)
+{
+    s8 input = Menu_ProcessInput();
+    s8 cursorPos = Menu_GetCursorPos();
+
+    debug_sub_808E604(gDebug_0300070F, cursorPos);
+    debug_sub_808E660(gDebug_0300070F);
+    if (input == -2)
+        return FALSE;
+    if (input == -1)
+    {
+        CloseMenu();
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void debug_sub_808E604(u8 whichMenu, u8 cursorPos)
+{
+    u16 delta;
+
+    if (gMain.newAndRepeatedKeys & R_BUTTON)
+        delta = +1;
+    else if (gMain.newAndRepeatedKeys & L_BUTTON)
+        delta = -1;
+    else
+        return;
+    VarSet(gUnknown_Debug_083C354A[whichMenu][cursorPos], VarGet(gUnknown_Debug_083C354A[whichMenu][cursorPos]) + delta);
+}
+
+void debug_sub_808E660(u8 whichMenu)
+{
+    u8 i;
+
+    for (i = 0; i < gUnknown_Debug_083C3544[whichMenu]; i++)
+    {
+        debug_sub_808F31C(24, 2 * i + 1, VarGet(gUnknown_Debug_083C354A[whichMenu][i]));
+    }
+}
+
 #endif