resolve some undefined references

2 files changed, 51 insertions, 51 deletions

diff --git a/src/field/slot_machine.c b/src/field/slot_machine.c
index 311679cb7..3aefa80de 100644
--- a/src/field/slot_machine.c
+++ b/src/field/slot_machine.c
@@ -4217,7 +4217,7 @@ void debug_sub_811B2E8()
         "	mov	r0, sp\n"
         "	mov	r1, #0x6\n"
         "	mov	r2, #0x1\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	add	sp, sp, #0x4\n"
         "	pop	{r0}\n"
         "	bx	r0\n"
@@ -4238,75 +4238,75 @@ void debug_sub_811B310()
         "	ldr	r0, ._21\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x1\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 4\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x3\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 8\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x5\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 12\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x7\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 16\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x9\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 20\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0xb\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 24\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0xd\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 28\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0xf\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 32\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x11\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 36\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0x1\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 40\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0x3\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 44\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0x5\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 48\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0x7\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 52\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0x9\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 56\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0xb\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 60\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0xd\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 64\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0xf\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 68\n"
         "	mov	r1, #0xf\n"
         "	mov	r2, #0x11\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._21 + 72\n"
         "	ldrb	r0, [r0, #0x3]\n"
         "	cmp	r0, #0\n"
@@ -4314,7 +4314,7 @@ void debug_sub_811B310()
         "	ldr	r0, ._21 + 76\n"
         "	mov	r1, #0xa\n"
         "	mov	r2, #0x9\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	b	._20\n"
         "._22:\n"
         "	.align	2, 0\n"
@@ -4343,7 +4343,7 @@ void debug_sub_811B310()
         "	ldr	r0, ._30\n"
         "	mov	r1, #0xa\n"
         "	mov	r2, #0x9\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "._20:\n"
         "	ldr	r4, ._30 + 4\n"
         "	ldr	r1, [r4, #0x68]\n"
@@ -4354,7 +4354,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0xa\n"
         "	mov	r2, #0x3\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, [r4, #0x6c]\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x2\n"
@@ -4363,7 +4363,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0xa\n"
         "	mov	r2, #0x5\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	mov	r0, #0x10\n"
         "	ldsh	r1, [r4, r0]\n"
         "	mov	r0, sp\n"
@@ -4373,7 +4373,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0xa\n"
         "	mov	r2, #0x7\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, [r4, #0x70]\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x2\n"
@@ -4382,7 +4382,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0x14\n"
         "	mov	r2, #0x3\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, [r4, #0x74]\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x2\n"
@@ -4391,7 +4391,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0x14\n"
         "	mov	r2, #0x5\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, [r4, #0x78]\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x2\n"
@@ -4400,7 +4400,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0x14\n"
         "	mov	r2, #0x7\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, [r4, #0x7c]\n"
         "	mov	r0, sp\n"
         "	mov	r2, #0x2\n"
@@ -4409,7 +4409,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0x14\n"
         "	mov	r2, #0x9\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	add	r0, r4, #0\n"
         "	add	r0, r0, #0x80\n"
         "	ldr	r1, [r0]\n"
@@ -4420,7 +4420,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0x14\n"
         "	mov	r2, #0xb\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	add	r0, r4, #0\n"
         "	add	r0, r0, #0x84\n"
         "	ldr	r1, [r0]\n"
@@ -4431,7 +4431,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0x14\n"
         "	mov	r2, #0xd\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	add	r0, r4, #0\n"
         "	add	r0, r0, #0x88\n"
         "	ldr	r1, [r0]\n"
@@ -4442,7 +4442,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0x14\n"
         "	mov	r2, #0xf\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	add	r0, r4, #0\n"
         "	add	r0, r0, #0x8c\n"
         "	ldr	r1, [r0]\n"
@@ -4453,7 +4453,7 @@ void debug_sub_811B310()
         "	mov	r0, sp\n"
         "	mov	r1, #0x14\n"
         "	mov	r2, #0x11\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, ._30 + 8\n"
         "	ldrb	r0, [r1]\n"
         "	cmp	r0, #0\n"
@@ -4515,7 +4515,7 @@ void debug_sub_811B310()
         "._45:\n"
         "	ldr	r0, ._46\n"
         "	mov	r1, #0x17\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "._23:\n"
         "	bl	debug_sub_811B2E8\n"
         "	add	sp, sp, #0x8\n"
@@ -4684,7 +4684,7 @@ void debug_sub_811B654()
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x18\n"
         "	mov	r3, #0x13\n"
-        "	bl	MenuDrawTextWindow\n"
+        "	bl	Menu_DrawStdWindowFrame\n"
         "	bl	debug_sub_811B310\n"
         "	ldrh	r0, [r5, #0x8]\n"
         "	add	r0, r0, #0x1\n"
@@ -4749,20 +4749,20 @@ void debug_sub_811B654()
         "	beq	._83	@cond_branch\n"
         "	mov	r0, #0x3\n"
         "	strh	r0, [r5, #0x8]\n"
-        "	bl	MenuZeroFillScreen\n"
+        "	bl	Menu_EraseScreen\n"
         "	mov	r0, #0x0\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0x9\n"
         "	mov	r3, #0x5\n"
-        "	bl	MenuDrawTextWindow\n"
+        "	bl	Menu_DrawStdWindowFrame\n"
         "	ldr	r0, ._85\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x1\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._85 + 4\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x3\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	b	._116\n"
         "._86:\n"
         "	.align	2, 0\n"
@@ -4778,21 +4778,21 @@ void debug_sub_811B654()
         "	strb	r4, [r0]\n"
         "	ldr	r0, ._91 + 4\n"
         "	strb	r4, [r0]\n"
-        "	bl	MenuZeroFillScreen\n"
+        "	bl	Menu_EraseScreen\n"
         "	mov	r0, #0x0\n"
         "	mov	r1, #0x0\n"
         "	mov	r2, #0xa\n"
         "	mov	r3, #0x13\n"
-        "	bl	MenuDrawTextWindow\n"
+        "	bl	Menu_DrawStdWindowFrame\n"
         "	ldr	r0, ._91 + 8\n"
         "	mov	r1, #0x1\n"
         "	mov	r2, #0x1\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r3, ._91 + 12\n"
         "	mov	r0, #0x2\n"
         "	mov	r1, #0x3\n"
         "	mov	r2, #0x8\n"
-        "	bl	PrintMenuItems\n"
+        "	bl	Menu_PrintItems\n"
         "	str	r4, [sp]\n"
         "	mov	r0, #0x9\n"
         "	str	r0, [sp, #0x4]\n"
@@ -4825,7 +4825,7 @@ void debug_sub_811B654()
         "	.word	_841B270\n"
         "	.word	unk_debug_bss_1+0x4\n"
         "._66:\n"
-        "	bl	ProcessMenuInput\n"
+        "	bl	Menu_ProcessInput\n"
         "	lsl	r0, r0, #0x18\n"
         "	asr	r2, r0, #0x18\n"
         "	mov	r0, #0x2\n"
@@ -4845,7 +4845,7 @@ void debug_sub_811B654()
         "	ldr	r0, [r1]\n"
         "	bl	_call_via_r0\n"
         "._94:\n"
-        "	bl	MenuZeroFillScreen\n"
+        "	bl	Menu_EraseScreen\n"
         "	add	r0, r6, #0\n"
         "	bl	DestroyTask\n"
         "	b	._116\n"
@@ -4938,7 +4938,7 @@ void debug_sub_811B654()
         "	and	r0, r0, r1\n"
         "	cmp	r0, #0\n"
         "	beq	._116	@cond_branch\n"
-        "	bl	MenuZeroFillScreen\n"
+        "	bl	Menu_EraseScreen\n"
         "	add	r0, r6, #0\n"
         "	bl	DestroyTask\n"
         "._116:\n"
@@ -4986,7 +4986,7 @@ void debug_sub_811B894()
         "	ldr	r0, ._122 + 8\n"
         "	mov	r1, #0x4\n"
         "	mov	r2, #0xf\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, ._122 + 12\n"
         "	mov	r0, #0x0\n"
         "	strb	r0, [r1]\n"
@@ -5027,7 +5027,7 @@ void debug_sub_811B894()
         "	mov	r1, #0x4\n"
         "	mov	r2, #0x2\n"
         "._121:\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r0, ._163 + 4\n"
         "	strb	r4, [r0]\n"
         "._126:\n"
@@ -5181,7 +5181,7 @@ void debug_sub_811B894()
         "	ldr	r0, ._163 + 12\n"
         "	mov	r1, #0x4\n"
         "	mov	r2, #0x0\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, ._163 + 4\n"
         "	mov	r0, #0x0\n"
         "	strb	r0, [r1]\n"
diff --git a/src/field/start_menu.c b/src/field/start_menu.c
index 36295b3f8..1e4eace87 100644
--- a/src/field/start_menu.c
+++ b/src/field/start_menu.c
@@ -278,11 +278,11 @@ void debug_sub_8075C40()
         "	mov	r2, #0x1\n"
         "	mov	r3, #0x8\n"
         "	bl	ConvertIntToDecimalStringN\n"
-        "	bl	MenuDisplayMessageBox\n"
+        "	bl	Menu_DisplayDialogueFrame\n"
         "	ldr	r0, ._16 + 16\n"
         "	mov	r1, #0x2\n"
         "	mov	r2, #0xf\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "._12:\n"
         "	ldrh	r0, [r5]\n"
         "	add	r0, r0, #0x1\n"
@@ -303,7 +303,7 @@ void debug_sub_8075C40()
         "	and	r0, r0, r1\n"
         "	cmp	r0, #0\n"
         "	beq	._18	@cond_branch\n"
-        "	bl	MenuZeroFillScreen\n"
+        "	bl	Menu_EraseScreen\n"
         "	bl	ScriptContext2_Disable\n"
         "	add	r0, r4, #0\n"
         "	bl	DestroyTask\n"