through debug_sub_808EAFC

2 files changed, 91 insertions, 319 deletions

diff --git a/asm/tomomichi_debug_menu.s b/asm/tomomichi_debug_menu.s
index 0308f3e7a..a357044e2 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_808E90C
-debug_sub_808E90C:
-	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, ._535       @ gUnknown_Debug_083C35C4
-	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, ._535 + 4   @ gMenuCallback
-	ldr	r0, ._535 + 8   @ debug_sub_808E95C
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._536:
-	.align	2, 0
-._535:
-	.word	gUnknown_Debug_083C35C4
-	.word	gMenuCallback
-	.word	debug_sub_808E95C+1
-
-	thumb_func_end debug_sub_808E90C
-
-	thumb_func_start debug_sub_808E95C
-debug_sub_808E95C:
-	push	{lr}
-	bl	Menu_ProcessInput
-	lsl	r0, r0, #0x18
-	asr	r1, r0, #0x18
-	mov	r0, #0x2
-	neg	r0, r0
-	cmp	r1, r0
-	bne	._537	@cond_branch
-	mov	r0, #0x0
-	b	._540
-._537:
-	mov	r0, #0x1
-	neg	r0, r0
-	cmp	r1, r0
-	beq	._539	@cond_branch
-	ldr	r2, ._541       @ gMenuCallback
-	ldr	r0, ._541 + 4   @ gUnknown_Debug_083C35C4
-	lsl	r1, r1, #0x3
-	add	r0, r0, #0x4
-	add	r1, r1, r0
-	ldr	r0, [r1]
-	str	r0, [r2]
-	mov	r0, #0x0
-	b	._540
-._542:
-	.align	2, 0
-._541:
-	.word	gMenuCallback
-	.word	gUnknown_Debug_083C35C4
-._539:
-	bl	CloseMenu
-	mov	r0, #0x1
-._540:
-	pop	{r1}
-	bx	r1
-
-	thumb_func_end debug_sub_808E95C
-
-	thumb_func_start debug_sub_808E9A0
-debug_sub_808E9A0:
-	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, ._543       @ gUnknown_Debug_083C369C
-	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, ._543 + 4   @ gDebug_0300070F
-	strb	r4, [r0]
-	ldr	r1, ._543 + 8   @ gMenuCallback
-	ldr	r0, ._543 + 12  @ debug_sub_808EA50
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r4}
-	pop	{r1}
-	bx	r1
-._544:
-	.align	2, 0
-._543:
-	.word	gUnknown_Debug_083C369C
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808EA50+1
-
-	thumb_func_end debug_sub_808E9A0
-
-	thumb_func_start debug_sub_808E9F8
-debug_sub_808E9F8:
-	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, ._545       @ gUnknown_Debug_083C36E4
-	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, ._545 + 4   @ gDebug_0300070F
-	mov	r0, #0x1
-	strb	r0, [r1]
-	ldr	r1, ._545 + 8   @ gMenuCallback
-	ldr	r0, ._545 + 12  @ debug_sub_808EA50
-	str	r0, [r1]
-	mov	r0, #0x0
-	add	sp, sp, #0x8
-	pop	{r1}
-	bx	r1
-._546:
-	.align	2, 0
-._545:
-	.word	gUnknown_Debug_083C36E4
-	.word	gDebug_0300070F
-	.word	gMenuCallback
-	.word	debug_sub_808EA50+1
-
-	thumb_func_end debug_sub_808E9F8
-
-	thumb_func_start debug_sub_808EA50
-debug_sub_808EA50:
-	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, ._550       @ gDebug_0300070F
-	ldrb	r0, [r5]
-	lsl	r1, r1, #0x18
-	lsr	r1, r1, #0x18
-	bl	debug_sub_808EAFC
-	ldrb	r0, [r5]
-	bl	debug_sub_808EA9C
-	lsl	r4, r4, #0x18
-	asr	r4, r4, #0x18
-	mov	r0, #0x2
-	neg	r0, r0
-	cmp	r4, r0
-	beq	._547	@cond_branch
-	mov	r0, #0x1
-	neg	r0, r0
-	cmp	r4, r0
-	beq	._548	@cond_branch
-._547:
-	mov	r0, #0x0
-	b	._549
-._551:
-	.align	2, 0
-._550:
-	.word	gDebug_0300070F
-._548:
-	bl	CloseMenu
-	mov	r0, #0x1
-._549:
-	pop	{r4, r5}
-	pop	{r1}
-	bx	r1
-
-	thumb_func_end debug_sub_808EA50
-
-	thumb_func_start debug_sub_808EA9C
-debug_sub_808EA9C:
-	push	{r4, r5, r6, r7, lr}
-	mov	r7, r8
-	push	{r7}
-	lsl	r0, r0, #0x18
-	lsr	r1, r0, #0x18
-	mov	r5, #0x0
-	ldr	r0, ._554       @ gUnknown_Debug_083C371C
-	add	r0, r1, r0
-	ldrb	r2, [r0]
-	cmp	r5, r2
-	bcs	._552	@cond_branch
-	ldr	r0, ._554 + 4   @ gUnknown_Debug_083C371E
-	mov	r8, r0
-	lsl	r0, r1, #0x3
-	add	r0, r0, r1
-	lsl	r7, r0, #0x1
-	add	r6, r2, #0
-._553:
-	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	._553	@cond_branch
-._552:
-	pop	{r3}
-	mov	r8, r3
-	pop	{r4, r5, r6, r7}
-	pop	{r0}
-	bx	r0
-._555:
-	.align	2, 0
-._554:
-	.word	gUnknown_Debug_083C371C
-	.word	gUnknown_Debug_083C371E
-
-	thumb_func_end debug_sub_808EA9C
-
-	thumb_func_start debug_sub_808EAFC
-debug_sub_808EAFC:
-	push	{r4, r5, lr}
-	lsl	r0, r0, #0x18
-	lsr	r2, r0, #0x18
-	lsl	r1, r1, #0x18
-	lsr	r3, r1, #0x18
-	ldr	r0, ._558       @ gMain
-	ldrh	r1, [r0, #0x2e]
-	mov	r0, #0x80
-	lsl	r0, r0, #0x1
-	and	r0, r0, r1
-	cmp	r0, #0
-	beq	._556	@cond_branch
-	mov	r5, #0x1
-	b	._557
-._559:
-	.align	2, 0
-._558:
-	.word	gMain
-._556:
-	mov	r0, #0x80
-	lsl	r0, r0, #0x2
-	and	r0, r0, r1
-	cmp	r0, #0
-	beq	._560	@cond_branch
-	ldr	r5, ._561       @ 0xffff
-._557:
-	ldr	r1, ._561 + 4   @ gUnknown_Debug_083C371E
-	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
-._560:
-	pop	{r4, r5}
-	pop	{r0}
-	bx	r0
-._562:
-	.align	2, 0
-._561:
-	.word	0xffff
-	.word	gUnknown_Debug_083C371E
-
-	thumb_func_end debug_sub_808EAFC
-
 	thumb_func_start debug_sub_808EB58
 debug_sub_808EB58:
 	push	{lr}
diff --git a/src/debug/tomomichi_debug_menu.c b/src/debug/tomomichi_debug_menu.c
index 7602885c2..66b6f5add 100644
--- a/src/debug/tomomichi_debug_menu.c
+++ b/src/debug/tomomichi_debug_menu.c
@@ -199,6 +199,10 @@ bool8 debug_sub_808E710(void);
 bool8 debug_sub_808E804(void);
 void debug_sub_808E850(u8, u8);
 void debug_sub_808E8AC(u8);
+bool8 debug_sub_808E95C(void);
+bool8 debug_sub_808EA50(void);
+void debug_sub_808EA9C(u8);
+void debug_sub_808EAFC(u8, u8);
 
 extern const u8 DebugScript_081C1CFE[];
 extern const u8 DebugScript_081C1D07[];
@@ -3770,4 +3774,91 @@ void debug_sub_808E8AC(u8 whichMenu)
     }
 }
 
+bool8 debug_sub_808E90C(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 24, 2 * ARRAY_COUNT(gUnknown_Debug_083C35C4) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C35C4), gUnknown_Debug_083C35C4);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C35C4), 0, 23);
+    gMenuCallback = debug_sub_808E95C;
+    return FALSE;
+}
+
+bool8 debug_sub_808E95C(void)
+{
+    s8 input = Menu_ProcessInput();
+
+    if (input == -2)
+        return FALSE;
+    if (input == -1)
+    {
+        CloseMenu();
+        return TRUE;
+    }
+    gMenuCallback = gUnknown_Debug_083C35C4[input].func;
+    return FALSE;
+}
+
+bool8 debug_sub_808E9A0(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C369C) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C369C), gUnknown_Debug_083C369C);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C369C), 0, 28);
+    gDebug_0300070F = 0;
+    gMenuCallback = debug_sub_808EA50;
+    return FALSE;
+}
+
+bool8 debug_sub_808E9F8(void)
+{
+    Menu_EraseScreen();
+    Menu_DrawStdWindowFrame(0, 0, 29, 2 * ARRAY_COUNT(gUnknown_Debug_083C36E4) + 1);
+    Menu_PrintItems(2, 1, ARRAY_COUNT(gUnknown_Debug_083C36E4), gUnknown_Debug_083C36E4);
+    InitMenu(0, 1, 1, ARRAY_COUNT(gUnknown_Debug_083C36E4), 0, 28);
+    gDebug_0300070F = 1;
+    gMenuCallback = debug_sub_808EA50;
+    return FALSE;
+}
+
+bool8 debug_sub_808EA50(void)
+{
+    s8 input = Menu_ProcessInput();
+    s8 cursorPos = Menu_GetCursorPos();
+
+    debug_sub_808EAFC(gDebug_0300070F, cursorPos);
+    debug_sub_808EA9C(gDebug_0300070F);
+    if (input == -2)
+        return FALSE;
+    if (input == -1)
+    {
+        CloseMenu();
+        return TRUE;
+    }
+    return FALSE;
+}
+
+void debug_sub_808EA9C(u8 whichMenu)
+{
+    u8 i;
+
+    for (i = 0; i < gUnknown_Debug_083C371C[whichMenu]; i++)
+    {
+        debug_sub_808F31C(24, 2 * i + 1, VarGet(gUnknown_Debug_083C371E[whichMenu][i]));
+    }
+}
+
+void debug_sub_808EAFC(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_083C371E[whichMenu][cursorPos], VarGet(gUnknown_Debug_083C371E[whichMenu][cursorPos]) + delta);
+}
+
 #endif