1 files changed, 74 insertions, 74 deletions

diff --git a/src/menu.c b/src/menu.c
index ef458124b..a9c4aaa43 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -154,9 +154,9 @@ void MenuPrint(const u8 *str, u8 left, u8 top)
     sub_8003460(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
 }
 
-void MenuZeroFillWindowRect(u8 a1, u8 a2, u8 a3, u8 a4)
+void MenuZeroFillWindowRect(u8 left, u8 top, u8 right, u8 bottom)
 {
-    ZeroFillWindowRect(gMenuWindowPtr, a1, a2, a3, a4);
+    ZeroFillWindowRect(gMenuWindowPtr, left, top, right, bottom);
 }
 
 void MenuFillWindowRectWithBlankTile(u8 left, u8 top, u8 right, u8 bottom)
@@ -205,7 +205,7 @@ void MenuPrintMessage(const u8 *str, u8 left, u8 top)
     sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, left, top);
 }
 
-void sub_8072044(const u8 *str)
+void MenuPrintMessageDefaultCoords(const u8 *str)
 {
     sub_8002EB0(gMenuWindowPtr, str, gMenuTextTileOffset, 2, 15);
 }
@@ -571,7 +571,7 @@ void PrintMenuItems(u8 left, u8 top, u8 menuItemCount, const struct MenuAction m
         MenuPrint(menuItems[i].text, left, top + 2 * i);
 }
 
-void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction menuItems[], const u8 *order)
+void PrintMenuItemsReordered(u8 left, u8 top, u8 menuItemCount, const struct MenuAction2 menuItems[], const u8 *order)
 {
     u8 i;
 
@@ -630,82 +630,82 @@ __attribute__((naked))
 int sub_8072AB0(const u8 *str, u8 left, u16 top, u8 width, u8 height, u32 a6)
 {
     asm(".syntax unified\n\
-	push {r4-r7,lr}\n\
-	sub sp, 0x10\n\
-	mov r12, r0\n\
-	ldr r0, [sp, 0x24]\n\
-	ldr r4, [sp, 0x28]\n\
-	str r4, [sp, 0xC]\n\
-	lsls r1, 24\n\
-	lsrs r5, r1, 24\n\
-	lsls r2, 16\n\
-	lsrs r4, r2, 16\n\
-	lsls r3, 24\n\
-	lsrs r6, r3, 24\n\
-	lsls r0, 24\n\
-	lsrs r7, r0, 24\n\
-	ldr r0, _08072AF8 @ =gMenuWindowPtr\n\
-	ldr r0, [r0]\n\
-	ldr r1, _08072AFC @ =gMenuTextTileOffset\n\
-	ldrh r3, [r1]\n\
-	str r5, [sp]\n\
-	str r4, [sp, 0x4]\n\
-	str r6, [sp, 0x8]\n\
-	movs r1, 0\n\
-	mov r2, r12\n\
-	bl sub_8004FD0\n\
-	adds r1, r0, 0\n\
-	lsls r1, 24\n\
-	lsrs r2, r1, 24\n\
-	movs r3, 0x7\n\
-	ands r3, r5\n\
-	cmp r3, 0\n\
-	bne _08072B00\n\
-	adds r1, r6, 0x7\n\
-	asrs r1, 3\n\
-	subs r1, 0x1\n\
-	b _08072B0C\n\
-	.align 2, 0\n\
+    push {r4-r7,lr}\n\
+    sub sp, 0x10\n\
+    mov r12, r0\n\
+    ldr r0, [sp, 0x24]\n\
+    ldr r4, [sp, 0x28]\n\
+    str r4, [sp, 0xC]\n\
+    lsls r1, 24\n\
+    lsrs r5, r1, 24\n\
+    lsls r2, 16\n\
+    lsrs r4, r2, 16\n\
+    lsls r3, 24\n\
+    lsrs r6, r3, 24\n\
+    lsls r0, 24\n\
+    lsrs r7, r0, 24\n\
+    ldr r0, _08072AF8 @ =gMenuWindowPtr\n\
+    ldr r0, [r0]\n\
+    ldr r1, _08072AFC @ =gMenuTextTileOffset\n\
+    ldrh r3, [r1]\n\
+    str r5, [sp]\n\
+    str r4, [sp, 0x4]\n\
+    str r6, [sp, 0x8]\n\
+    movs r1, 0\n\
+    mov r2, r12\n\
+    bl sub_8004FD0\n\
+    adds r1, r0, 0\n\
+    lsls r1, 24\n\
+    lsrs r2, r1, 24\n\
+    movs r3, 0x7\n\
+    ands r3, r5\n\
+    cmp r3, 0\n\
+    bne _08072B00\n\
+    adds r1, r6, 0x7\n\
+    asrs r1, 3\n\
+    subs r1, 0x1\n\
+    b _08072B0C\n\
+    .align 2, 0\n\
 _08072AF8: .4byte gMenuWindowPtr\n\
 _08072AFC: .4byte gMenuTextTileOffset\n\
 _08072B00:\n\
-	adds r3, r6, r3\n\
-	subs r1, r3, 0x1\n\
-	cmp r1, 0\n\
-	bge _08072B0A\n\
-	adds r1, r3, 0x6\n\
+    adds r3, r6, r3\n\
+    subs r1, r3, 0x1\n\
+    cmp r1, 0\n\
+    bge _08072B0A\n\
+    adds r1, r3, 0x6\n\
 _08072B0A:\n\
-	asrs r1, 3\n\
+    asrs r1, 3\n\
 _08072B0C:\n\
-	lsls r1, 24\n\
-	lsrs r1, 24\n\
-	adds r6, r1, 0\n\
-	lsrs r5, 3\n\
-	adds r1, r7, 0x7\n\
-	asrs r1, 3\n\
-	lsls r1, 24\n\
-	lsrs r7, r1, 24\n\
-	lsrs r4, 3\n\
-	cmp r2, r7\n\
-	bcs _08072B3E\n\
-	lsls r1, r2, 1\n\
-	adds r1, r4, r1\n\
-	lsls r1, 24\n\
-	lsrs r1, 24\n\
-	adds r2, r5, r6\n\
-	lsls r2, 24\n\
-	lsrs r2, 24\n\
-	adds r3, r7, r4\n\
-	subs r3, 0x1\n\
-	lsls r3, 24\n\
-	lsrs r3, 24\n\
-	adds r0, r5, 0\n\
-	bl MenuFillWindowRectWithBlankTile\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    adds r6, r1, 0\n\
+    lsrs r5, 3\n\
+    adds r1, r7, 0x7\n\
+    asrs r1, 3\n\
+    lsls r1, 24\n\
+    lsrs r7, r1, 24\n\
+    lsrs r4, 3\n\
+    cmp r2, r7\n\
+    bcs _08072B3E\n\
+    lsls r1, r2, 1\n\
+    adds r1, r4, r1\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    adds r2, r5, r6\n\
+    lsls r2, 24\n\
+    lsrs r2, 24\n\
+    adds r3, r7, r4\n\
+    subs r3, 0x1\n\
+    lsls r3, 24\n\
+    lsrs r3, 24\n\
+    adds r0, r5, 0\n\
+    bl MenuFillWindowRectWithBlankTile\n\
 _08072B3E:\n\
-	add sp, 0x10\n\
-	pop {r4-r7}\n\
-	pop {r1}\n\
-	bx r1\n\
+    add sp, 0x10\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
     .syntax divided\n");
 }
 #endif