resolve more undefined references

3 files changed, 24 insertions, 24 deletions

diff --git a/src/engine/mystery_event_menu.c b/src/engine/mystery_event_menu.c
index 522a185c8..8f280dc18 100644
--- a/src/engine/mystery_event_menu.c
+++ b/src/engine/mystery_event_menu.c
@@ -363,7 +363,7 @@ void debug_sub_815D04C()
         "	mov	r1, #0x4\n"
         "	mov	r2, #0xd\n"
         "	mov	r3, #0x7\n"
-        "	bl	MenuDrawTextWindow\n"
+        "	bl	Menu_DrawStdWindowFrame\n"
         "	ldr	r1, ._125 + 4\n"
         "	mov	r2, #0xa\n"
         "	ldsh	r0, [r4, r2]\n"
@@ -372,7 +372,7 @@ void debug_sub_815D04C()
         "	ldr	r0, [r0]\n"
         "	mov	r1, #0x5\n"
         "	mov	r2, #0x5\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldrh	r0, [r4, #0x8]\n"
         "	add	r0, r0, #0x1\n"
         "	strh	r0, [r4, #0x8]\n"
@@ -397,9 +397,9 @@ void debug_sub_815D04C()
         "	.align	2, 0\n"
         "._125:\n"
         "	.word	gTasks\n"
-        "	.word	gFlashSectors+0x9c\n"
+        "	.word	sUnusedFlashSectors+0x9c\n"
         "	.word	gMain\n"
-        "	.word	gFlashSectors+0x11c\n"
+        "	.word	sUnusedFlashSectors+0x11c\n"
         "._123:\n"
         "	sub	r0, r1, #1\n"
         "._124:\n"
@@ -435,7 +435,7 @@ void debug_sub_815D04C()
         "	.align	2, 0\n"
         "._130:\n"
         "	.word	gTasks\n"
-        "	.word	gFlashSectors+0x11c\n"
+        "	.word	sUnusedFlashSectors+0x11c\n"
         "._128:\n"
         "	ldrh	r0, [r4, #0xa]\n"
         "	add	r0, r0, #0x1\n"
@@ -481,7 +481,7 @@ void debug_sub_815D04C()
         "	.align	2, 0\n"
         "._133:\n"
         "	.word	gTasks\n"
-        "	.word	gFlashSectors+0x9c\n"
+        "	.word	sUnusedFlashSectors+0x9c\n"
         "	.word	+0x2004000\n"
         "	.word	0x43c\n"
         "\n"
@@ -554,7 +554,7 @@ void debug_sub_815D1D8()
         "	mov	r1, #0xe\n"
         "	mov	r2, #0x1b\n"
         "	mov	r3, #0x13\n"
-        "	bl	MenuDrawTextWindow\n"
+        "	bl	Menu_DrawStdWindowFrame\n"
         "	mov	r0, #0x1\n"
         "	neg	r0, r0\n"
         "	mov	r1, #0x0\n"
@@ -606,7 +606,7 @@ void debug_sub_815D1D8()
         "	.word	gUnknown_0841192C+0x14\n"
         "	.word	0x43c\n"
         "._144:\n"
-        "	bl	MenuUpdateWindowText\n"
+        "	bl	Menu_UpdateWindowText\n"
         "	lsl	r0, r0, #0x18\n"
         "	cmp	r0, #0\n"
         "	bne	._163	@cond_branch\n"
@@ -655,7 +655,7 @@ void debug_sub_815D1D8()
         "	.word	0x43c\n"
         "	.word	gUnknown_0841192C+0x28\n"
         "._146:\n"
-        "	bl	MenuUpdateWindowText\n"
+        "	bl	Menu_UpdateWindowText\n"
         "	lsl	r0, r0, #0x18\n"
         "	cmp	r0, #0\n"
         "	bne	._173	@cond_branch\n"
@@ -696,7 +696,7 @@ void debug_sub_815D1D8()
         "	.word	gMain\n"
         "	.word	0x43c\n"
         "._149:\n"
-        "	bl	MenuUpdateWindowText\n"
+        "	bl	Menu_UpdateWindowText\n"
         "	bl	sub_8007ECC\n"
         "	lsl	r0, r0, #0x18\n"
         "	cmp	r0, #0\n"
@@ -730,11 +730,11 @@ void debug_sub_815D1D8()
         "	mov	r1, #0xf\n"
         "	mov	r2, #0x1a\n"
         "	mov	r3, #0x12\n"
-        "	bl	MenuFillWindowRectWithBlankTile\n"
+        "	bl	Menu_BlankWindowRect\n"
         "	ldr	r0, ._190 + 4\n"
         "	mov	r1, #0x4\n"
         "	mov	r2, #0xf\n"
-        "	bl	MenuPrint\n"
+        "	bl	Menu_PrintText\n"
         "	ldr	r1, ._190 + 8\n"
         "	ldr	r2, ._190 + 12\n"
         "	add	r1, r1, r2\n"
diff --git a/src/engine/reset_rtc_screen.c b/src/engine/reset_rtc_screen.c
index a11e1b3e3..df4ab4f76 100644
--- a/src/engine/reset_rtc_screen.c
+++ b/src/engine/reset_rtc_screen.c
@@ -789,7 +789,7 @@ void debug_sub_806F9E4()
 	mov	r1, #0x9\n\
 	mov	r2, #0x1d\n\
 	mov	r3, #0x13\n\
-	bl	MenuDrawTextWindow\n\
+	bl	Menu_DrawStdWindowFrame\n\
 	add	r4, r6, #0\n\
 	add	r4, r4, #0x50\n\
 	bl	RtcGetErrorStatus\n\
@@ -803,23 +803,23 @@ void debug_sub_806F9E4()
 	add	r0, r4, #0\n\
 	mov	r1, #0x2\n\
 	mov	r2, #0xa\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 	ldr	r0, ._158\n\
 	mov	r1, #0xc\n\
 	mov	r2, #0xc\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 	ldr	r0, ._158 + 4\n\
 	mov	r1, #0x14\n\
 	mov	r2, #0xc\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 	ldr	r0, ._158 + 8\n\
 	mov	r1, #0x1\n\
 	mov	r2, #0xe\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 	ldr	r0, ._158 + 12\n\
 	mov	r1, #0x1\n\
 	mov	r2, #0x10\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 ._151:\n\
 	ldrh	r0, [r5]\n\
 	add	r0, r0, #0x1\n\
@@ -868,19 +868,19 @@ void debug_sub_806F9E4()
 	add	r0, r6, #0\n\
 	mov	r1, #0x14\n\
 	mov	r2, #0xe\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 	mov	r0, r9\n\
 	mov	r1, #0xc\n\
 	mov	r2, #0xe\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 	mov	r0, sl\n\
 	mov	r1, #0x14\n\
 	mov	r2, #0x10\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 	mov	r0, r8\n\
 	mov	r1, #0xc\n\
 	mov	r2, #0x10\n\
-	bl	MenuPrint\n\
+	bl	Menu_PrintText\n\
 ._160:\n\
 	ldrh	r1, [r5, #0x2]\n\
 	mov	r2, #0x2\n\
diff --git a/src/engine/save.c b/src/engine/save.c
index e1fb47dcc..1245d0a62 100644
--- a/src/engine/save.c
+++ b/src/engine/save.c
@@ -731,7 +731,7 @@ void sub_813B79C()
         "	.align	2, 0\n"
         "._163:\n"
         "	.word	+0x2000000\n"
-        "	.word	gSaveSectionLocations\n"
+        "	.word	sSaveBlockChunks\n"
         "	.word	0xff4\n"
         "	.word	0xff6\n"
         "	.word	gHallOfFameSaveSectionLocations\n"
@@ -892,7 +892,7 @@ u8 Save_LoadGameData(u8 saveType)
     return result;
 }
 
-static const u8 sUnusedFlashSectors[] = { 30, 31 };
+const u8 sUnusedFlashSectors[] = { 30, 31 };
 
 bool8 unref_sub_8125F4C(struct UnkSaveSection *a1)
 {