Merge branch 'master' of https://github.com/pret/pokeruby into refactor_src

4 files changed, 538 insertions, 538 deletions

diff --git a/src/field/berry_tag_screen.c b/src/field/berry_tag_screen.c
index 50db5388c..a965f386c 100644
--- a/src/field/berry_tag_screen.c
+++ b/src/field/berry_tag_screen.c
@@ -363,30 +363,30 @@ static void sub_81466A0(void)
 
 static void sub_81466E8(u8 taskId, s8 direction)
 {
-	u8 berryPocket = 3;
-	s16 *data = gTasks[taskId].data;
-
-	if (gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos == 0
-	 && direction < 0)
-		return;
-	if (gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos + 1 == gBagPocketScrollStates[berryPocket].numSlots
-	 && direction > 0)
-		return;
-
-	PlaySE(SE_SELECT);
-	if (gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos + direction < 0)
-		data[1] = -(gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos);
-	else if (gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos + direction >= gBagPocketScrollStates[berryPocket].numSlots)
-		data[1] = gBagPocketScrollStates[berryPocket].numSlots - gBagPocketScrollStates[berryPocket].scrollTop - gBagPocketScrollStates[berryPocket].cursorPos - 1;
-	else
-		data[1] = direction;
-
-	gTasks[taskId].func = sub_8146798;
-
-	if (direction < 0)
-		data[0] = -16;
-	else
-		data[0] = 16;
+    u8 berryPocket = 3;
+    s16 *data = gTasks[taskId].data;
+
+    if (gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos == 0
+     && direction < 0)
+        return;
+    if (gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos + 1 == gBagPocketScrollStates[berryPocket].numSlots
+     && direction > 0)
+        return;
+
+    PlaySE(SE_SELECT);
+    if (gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos + direction < 0)
+        data[1] = -(gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos);
+    else if (gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos + direction >= gBagPocketScrollStates[berryPocket].numSlots)
+        data[1] = gBagPocketScrollStates[berryPocket].numSlots - gBagPocketScrollStates[berryPocket].scrollTop - gBagPocketScrollStates[berryPocket].cursorPos - 1;
+    else
+        data[1] = direction;
+
+    gTasks[taskId].func = sub_8146798;
+
+    if (direction < 0)
+        data[0] = -16;
+    else
+        data[0] = 16;
 
 }
 
@@ -411,36 +411,36 @@ static void sub_8146798(u8 taskId)
 
 static void sub_8146810(s8 berry)
 {
-	u8 berryPocket = 3;
-
-	if (berry > 0)
-	{
-		if (gBagPocketScrollStates[berryPocket].cursorPos + berry > 7)
-		{
-			gBagPocketScrollStates[berryPocket].scrollTop += gBagPocketScrollStates[berryPocket].cursorPos - 7 + berry;
-			gBagPocketScrollStates[berryPocket].cursorPos = 7;
-		}
-		else
-		{
-			gBagPocketScrollStates[berryPocket].cursorPos += berry;
-		}
-	}
-	else
-	{
-		if (gBagPocketScrollStates[berryPocket].cursorPos + berry < 0)
-		{
-			gBagPocketScrollStates[berryPocket].scrollTop += gBagPocketScrollStates[berryPocket].cursorPos + berry;
-			gBagPocketScrollStates[berryPocket].cursorPos = 0;
-		}
-		else
-		{
-			gBagPocketScrollStates[berryPocket].cursorPos += berry;
-		}
-	}
-	gScriptItemId = gCurrentBagPocketItemSlots[gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos].itemId;
-	DestroySprite(&gSprites[gUnknown_0203932C]);
-	sub_81466A0();
-	sub_80A7DD4();
+    u8 berryPocket = 3;
+
+    if (berry > 0)
+    {
+        if (gBagPocketScrollStates[berryPocket].cursorPos + berry > 7)
+        {
+            gBagPocketScrollStates[berryPocket].scrollTop += gBagPocketScrollStates[berryPocket].cursorPos - 7 + berry;
+            gBagPocketScrollStates[berryPocket].cursorPos = 7;
+        }
+        else
+        {
+            gBagPocketScrollStates[berryPocket].cursorPos += berry;
+        }
+    }
+    else
+    {
+        if (gBagPocketScrollStates[berryPocket].cursorPos + berry < 0)
+        {
+            gBagPocketScrollStates[berryPocket].scrollTop += gBagPocketScrollStates[berryPocket].cursorPos + berry;
+            gBagPocketScrollStates[berryPocket].cursorPos = 0;
+        }
+        else
+        {
+            gBagPocketScrollStates[berryPocket].cursorPos += berry;
+        }
+    }
+    gScriptItemId = gCurrentBagPocketItemSlots[gBagPocketScrollStates[berryPocket].scrollTop + gBagPocketScrollStates[berryPocket].cursorPos].itemId;
+    DestroySprite(&gSprites[gUnknown_0203932C]);
+    sub_81466A0();
+    sub_80A7DD4();
 }
 
 static void sub_81468BC(void)
diff --git a/src/field/item_menu.c b/src/field/item_menu.c
index fdc47ad67..4436bdfbe 100644
--- a/src/field/item_menu.c
+++ b/src/field/item_menu.c
@@ -2313,164 +2313,164 @@ __attribute__((naked))
 static void sub_80A5600(u8 taskId)
 {
     asm(".syntax unified\n\
-	push {r4,r5,lr}\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	movs r5, 0\n\
-	ldr r2, _080A563C @ =gMain\n\
-	ldrh r0, [r2, 0x30]\n\
-	movs r1, 0xF0\n\
-	ands r1, r0\n\
-	cmp r1, 0x40\n\
-	bne _080A5648\n\
-	ldr r4, _080A5640 @ =sPopupMenuSelection\n\
-	ldrb r0, [r4]\n\
-	cmp r0, 0\n\
-	bne _080A561E\n\
-	b _080A5736\n\
+    push {r4,r5,lr}\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    movs r5, 0\n\
+    ldr r2, _080A563C @ =gMain\n\
+    ldrh r0, [r2, 0x30]\n\
+    movs r1, 0xF0\n\
+    ands r1, r0\n\
+    cmp r1, 0x40\n\
+    bne _080A5648\n\
+    ldr r4, _080A5640 @ =sPopupMenuSelection\n\
+    ldrb r0, [r4]\n\
+    cmp r0, 0\n\
+    bne _080A561E\n\
+    b _080A5736\n\
 _080A561E:\n\
-	adds r1, r0, 0\n\
-	ldr r0, _080A5644 @ =sPopupMenuActionList\n\
-	ldr r0, [r0]\n\
-	adds r1, r0\n\
-	subs r1, 0x1\n\
-	ldrb r0, [r1]\n\
-	cmp r0, 0x8\n\
-	bne _080A5630\n\
-	b _080A5736\n\
+    adds r1, r0, 0\n\
+    ldr r0, _080A5644 @ =sPopupMenuActionList\n\
+    ldr r0, [r0]\n\
+    adds r1, r0\n\
+    subs r1, 0x1\n\
+    ldrb r0, [r1]\n\
+    cmp r0, 0x8\n\
+    bne _080A5630\n\
+    b _080A5736\n\
 _080A5630:\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	movs r0, 0x1\n\
-	negs r0, r0\n\
-	b _080A56D2\n\
-	.align 2, 0\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0x1\n\
+    negs r0, r0\n\
+    b _080A56D2\n\
+    .align 2, 0\n\
 _080A563C: .4byte gMain\n\
 _080A5640: .4byte sPopupMenuSelection\n\
 _080A5644: .4byte sPopupMenuActionList\n\
 _080A5648:\n\
-	cmp r1, 0x80\n\
-	bne _080A5680\n\
-	ldr r4, _080A5674 @ =sPopupMenuSelection\n\
-	ldrb r1, [r4]\n\
-	ldr r0, _080A5678 @ =gUnknown_02038564\n\
-	ldrb r0, [r0]\n\
-	subs r0, 0x1\n\
-	cmp r1, r0\n\
-	beq _080A5736\n\
-	cmp r1, 0x2\n\
-	beq _080A5736\n\
-	ldr r0, _080A567C @ =sPopupMenuActionList\n\
-	ldr r0, [r0]\n\
-	adds r0, r1, r0\n\
-	ldrb r0, [r0, 0x1]\n\
-	cmp r0, 0x8\n\
-	beq _080A5736\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	movs r0, 0x1\n\
-	b _080A56D2\n\
-	.align 2, 0\n\
+    cmp r1, 0x80\n\
+    bne _080A5680\n\
+    ldr r4, _080A5674 @ =sPopupMenuSelection\n\
+    ldrb r1, [r4]\n\
+    ldr r0, _080A5678 @ =gUnknown_02038564\n\
+    ldrb r0, [r0]\n\
+    subs r0, 0x1\n\
+    cmp r1, r0\n\
+    beq _080A5736\n\
+    cmp r1, 0x2\n\
+    beq _080A5736\n\
+    ldr r0, _080A567C @ =sPopupMenuActionList\n\
+    ldr r0, [r0]\n\
+    adds r0, r1, r0\n\
+    ldrb r0, [r0, 0x1]\n\
+    cmp r0, 0x8\n\
+    beq _080A5736\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0x1\n\
+    b _080A56D2\n\
+    .align 2, 0\n\
 _080A5674: .4byte sPopupMenuSelection\n\
 _080A5678: .4byte gUnknown_02038564\n\
 _080A567C: .4byte sPopupMenuActionList\n\
 _080A5680:\n\
-	cmp r1, 0x20\n\
-	bne _080A56B0\n\
-	ldr r4, _080A56A8 @ =sPopupMenuSelection\n\
-	ldrb r0, [r4]\n\
-	cmp r0, 0x2\n\
-	bls _080A5736\n\
-	adds r1, r0, 0\n\
-	ldr r0, _080A56AC @ =sPopupMenuActionList\n\
-	ldr r0, [r0]\n\
-	adds r1, r0\n\
-	subs r1, 0x3\n\
-	ldrb r0, [r1]\n\
-	cmp r0, 0x8\n\
-	beq _080A5736\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	movs r0, 0x3\n\
-	negs r0, r0\n\
-	b _080A56D2\n\
-	.align 2, 0\n\
+    cmp r1, 0x20\n\
+    bne _080A56B0\n\
+    ldr r4, _080A56A8 @ =sPopupMenuSelection\n\
+    ldrb r0, [r4]\n\
+    cmp r0, 0x2\n\
+    bls _080A5736\n\
+    adds r1, r0, 0\n\
+    ldr r0, _080A56AC @ =sPopupMenuActionList\n\
+    ldr r0, [r0]\n\
+    adds r1, r0\n\
+    subs r1, 0x3\n\
+    ldrb r0, [r1]\n\
+    cmp r0, 0x8\n\
+    beq _080A5736\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0x3\n\
+    negs r0, r0\n\
+    b _080A56D2\n\
+    .align 2, 0\n\
 _080A56A8: .4byte sPopupMenuSelection\n\
 _080A56AC: .4byte sPopupMenuActionList\n\
 _080A56B0:\n\
-	cmp r1, 0x10\n\
-	bne _080A56E4\n\
-	ldr r4, _080A56DC @ =sPopupMenuSelection\n\
-	ldrb r0, [r4]\n\
-	cmp r0, 0x2\n\
-	bhi _080A5736\n\
-	adds r1, r0, 0\n\
-	ldr r0, _080A56E0 @ =sPopupMenuActionList\n\
-	ldr r0, [r0]\n\
-	adds r1, r0\n\
-	ldrb r0, [r1, 0x3]\n\
-	cmp r0, 0x8\n\
-	beq _080A5736\n\
-	movs r0, 0x5\n\
-	bl PlaySE\n\
-	movs r0, 0x3\n\
+    cmp r1, 0x10\n\
+    bne _080A56E4\n\
+    ldr r4, _080A56DC @ =sPopupMenuSelection\n\
+    ldrb r0, [r4]\n\
+    cmp r0, 0x2\n\
+    bhi _080A5736\n\
+    adds r1, r0, 0\n\
+    ldr r0, _080A56E0 @ =sPopupMenuActionList\n\
+    ldr r0, [r0]\n\
+    adds r1, r0\n\
+    ldrb r0, [r1, 0x3]\n\
+    cmp r0, 0x8\n\
+    beq _080A5736\n\
+    movs r0, 0x5\n\
+    bl PlaySE\n\
+    movs r0, 0x3\n\
 _080A56D2:\n\
-	bl MoveMenuCursor3\n\
-	strb r0, [r4]\n\
-	b _080A5736\n\
-	.align 2, 0\n\
+    bl MoveMenuCursor3\n\
+    strb r0, [r4]\n\
+    b _080A5736\n\
+    .align 2, 0\n\
 _080A56DC: .4byte sPopupMenuSelection\n\
 _080A56E0: .4byte sPopupMenuActionList\n\
 _080A56E4:\n\
-	ldrh r1, [r2, 0x2E]\n\
-	movs r0, 0x1\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _080A5768\n\
-	movs r0, 0x2\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	beq _080A5736\n\
-	ldr r1, _080A574C @ =gTasks\n\
-	lsls r0, r4, 2\n\
-	adds r0, r4\n\
-	lsls r0, 3\n\
-	adds r0, r1\n\
-	strh r5, [r0, 0x1C]\n\
-	ldr r1, _080A5750 @ =gBagPocketScrollStates\n\
-	ldr r0, _080A5754 @ =sCurrentBagPocket\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 24\n\
-	asrs r0, 24\n\
-	lsls r0, 2\n\
-	adds r0, r1\n\
-	ldrb r2, [r0]\n\
-	adds r0, r4, 0\n\
-	adds r1, r2, 0\n\
-	bl sub_80A48E8\n\
-	ldr r0, _080A5758 @ =gBGTilemapBuffers + 0x800\n\
-	bl sub_80A4DA4\n\
-	ldr r1, _080A575C @ =sItemPopupMenuActions\n\
-	ldr r0, _080A5760 @ =sPopupMenuActionList\n\
-	ldr r0, [r0]\n\
-	ldrb r0, [r0, 0x5]\n\
-	lsls r0, 3\n\
-	adds r1, 0x4\n\
-	adds r0, r1\n\
-	ldr r5, [r0]\n\
-	adds r0, r4, 0\n\
-	bl _call_via_r5\n\
+    ldrh r1, [r2, 0x2E]\n\
+    movs r0, 0x1\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _080A5768\n\
+    movs r0, 0x2\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _080A5736\n\
+    ldr r1, _080A574C @ =gTasks\n\
+    lsls r0, r4, 2\n\
+    adds r0, r4\n\
+    lsls r0, 3\n\
+    adds r0, r1\n\
+    strh r5, [r0, 0x1C]\n\
+    ldr r1, _080A5750 @ =gBagPocketScrollStates\n\
+    ldr r0, _080A5754 @ =sCurrentBagPocket\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    lsls r0, 2\n\
+    adds r0, r1\n\
+    ldrb r2, [r0]\n\
+    adds r0, r4, 0\n\
+    adds r1, r2, 0\n\
+    bl sub_80A48E8\n\
+    ldr r0, _080A5758 @ =gBGTilemapBuffers + 0x800\n\
+    bl sub_80A4DA4\n\
+    ldr r1, _080A575C @ =sItemPopupMenuActions\n\
+    ldr r0, _080A5760 @ =sPopupMenuActionList\n\
+    ldr r0, [r0]\n\
+    ldrb r0, [r0, 0x5]\n\
+    lsls r0, 3\n\
+    adds r1, 0x4\n\
+    adds r0, r1\n\
+    ldr r5, [r0]\n\
+    adds r0, r4, 0\n\
+    bl _call_via_r5\n\
 _080A5736:\n\
-	cmp r5, 0\n\
-	bne _080A57BE\n\
-	ldr r0, _080A5764 @ =sPopupMenuSelection\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0\n\
-	bne _080A57AC\n\
-	movs r0, 0xC\n\
-	bl sub_8072DDC\n\
-	b _080A57BE\n\
-	.align 2, 0\n\
+    cmp r5, 0\n\
+    bne _080A57BE\n\
+    ldr r0, _080A5764 @ =sPopupMenuSelection\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0\n\
+    bne _080A57AC\n\
+    movs r0, 0xC\n\
+    bl sub_8072DDC\n\
+    b _080A57BE\n\
+    .align 2, 0\n\
 _080A574C: .4byte gTasks\n\
 _080A5750: .4byte gBagPocketScrollStates\n\
 _080A5754: .4byte sCurrentBagPocket\n\
@@ -2479,47 +2479,47 @@ _080A575C: .4byte sItemPopupMenuActions\n\
 _080A5760: .4byte sPopupMenuActionList\n\
 _080A5764: .4byte sPopupMenuSelection\n\
 _080A5768:\n\
-	ldr r1, _080A5798 @ =gTasks\n\
-	lsls r0, r4, 2\n\
-	adds r0, r4\n\
-	lsls r0, 3\n\
-	adds r0, r1\n\
-	strh r5, [r0, 0x1C]\n\
-	ldr r0, _080A579C @ =gBGTilemapBuffers + 0x800\n\
-	bl sub_80A4DA4\n\
-	ldr r1, _080A57A0 @ =sItemPopupMenuActions\n\
-	ldr r0, _080A57A4 @ =sPopupMenuSelection\n\
-	ldrb r2, [r0]\n\
-	ldr r0, _080A57A8 @ =sPopupMenuActionList\n\
-	ldr r0, [r0]\n\
-	adds r0, r2\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 3\n\
-	adds r1, 0x4\n\
-	adds r0, r1\n\
-	ldr r5, [r0]\n\
-	adds r0, r4, 0\n\
-	bl _call_via_r5\n\
-	b _080A5736\n\
-	.align 2, 0\n\
+    ldr r1, _080A5798 @ =gTasks\n\
+    lsls r0, r4, 2\n\
+    adds r0, r4\n\
+    lsls r0, 3\n\
+    adds r0, r1\n\
+    strh r5, [r0, 0x1C]\n\
+    ldr r0, _080A579C @ =gBGTilemapBuffers + 0x800\n\
+    bl sub_80A4DA4\n\
+    ldr r1, _080A57A0 @ =sItemPopupMenuActions\n\
+    ldr r0, _080A57A4 @ =sPopupMenuSelection\n\
+    ldrb r2, [r0]\n\
+    ldr r0, _080A57A8 @ =sPopupMenuActionList\n\
+    ldr r0, [r0]\n\
+    adds r0, r2\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 3\n\
+    adds r1, 0x4\n\
+    adds r0, r1\n\
+    ldr r5, [r0]\n\
+    adds r0, r4, 0\n\
+    bl _call_via_r5\n\
+    b _080A5736\n\
+    .align 2, 0\n\
 _080A5798: .4byte gTasks\n\
 _080A579C: .4byte gBGTilemapBuffers + 0x800\n\
 _080A57A0: .4byte sItemPopupMenuActions\n\
 _080A57A4: .4byte sPopupMenuSelection\n\
 _080A57A8: .4byte sPopupMenuActionList\n\
 _080A57AC:\n\
-	cmp r0, 0x2\n\
-	bhi _080A57B8\n\
-	movs r0, 0x2F\n\
-	bl sub_8072DCC\n\
-	b _080A57BE\n\
+    cmp r0, 0x2\n\
+    bhi _080A57B8\n\
+    movs r0, 0x2F\n\
+    bl sub_8072DCC\n\
+    b _080A57BE\n\
 _080A57B8:\n\
-	movs r0, 0x30\n\
-	bl sub_8072DCC\n\
+    movs r0, 0x30\n\
+    bl sub_8072DCC\n\
 _080A57BE:\n\
-	pop {r4,r5}\n\
-	pop {r0}\n\
-	bx r0\n\
+    pop {r4,r5}\n\
+    pop {r0}\n\
+    bx r0\n\
     .syntax divided\n");
 }
 
diff --git a/src/field/rotating_gate.c b/src/field/rotating_gate.c
index bb3c31dfc..b88add469 100644
--- a/src/field/rotating_gate.c
+++ b/src/field/rotating_gate.c
@@ -881,115 +881,115 @@ static int RotatingGate_CanRotate(u8 gateId, int rotationDirection)
 __attribute__((naked)) static int RotatingGate_CanRotate(u8 a, int puzzleType)
 {
     asm(".syntax unified\n\
-	push {r4-r7,lr}\n\
-	mov r7, r10\n\
-	mov r6, r9\n\
-	mov r5, r8\n\
-	push {r5-r7}\n\
-	sub sp, 0xC\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	cmp r1, 0x1\n\
-	bne _080C7EAC\n\
-	ldr r0, _080C7EA8 @ =sRotatingGate_ArmPositionsAntiClockwiseRotation\n\
-	mov r10, r0\n\
-	b _080C7EB8\n\
-	.align 2, 0\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0xC\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    cmp r1, 0x1\n\
+    bne _080C7EAC\n\
+    ldr r0, _080C7EA8 @ =sRotatingGate_ArmPositionsAntiClockwiseRotation\n\
+    mov r10, r0\n\
+    b _080C7EB8\n\
+    .align 2, 0\n\
 _080C7EA8: .4byte sRotatingGate_ArmPositionsAntiClockwiseRotation\n\
 _080C7EAC:\n\
-	cmp r1, 0x2\n\
-	beq _080C7EB4\n\
+    cmp r1, 0x2\n\
+    beq _080C7EB4\n\
 _080C7EB0:\n\
-	movs r0, 0\n\
-	b _080C7F48\n\
+    movs r0, 0\n\
+    b _080C7F48\n\
 _080C7EB4:\n\
-	ldr r1, _080C7F58 @ =sRotatingGate_ArmPositionsClockwiseRotation\n\
-	mov r10, r1\n\
+    ldr r1, _080C7F58 @ =sRotatingGate_ArmPositionsClockwiseRotation\n\
+    mov r10, r1\n\
 _080C7EB8:\n\
-	adds r0, r4, 0\n\
-	bl RotatingGate_GetGateOrientation\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	str r0, [sp]\n\
-	ldr r0, _080C7F5C @ =gRotatingGate_PuzzleConfig\n\
-	ldr r1, [r0]\n\
-	lsls r0, r4, 3\n\
-	adds r0, r1\n\
-	ldrb r2, [r0, 0x4]\n\
-	ldrh r1, [r0]\n\
-	adds r1, 0x7\n\
-	ldrh r0, [r0, 0x2]\n\
-	adds r0, 0x7\n\
-	movs r3, 0\n\
-	lsls r2, 3\n\
-	str r2, [sp, 0x4]\n\
-	lsls r1, 16\n\
-	asrs r1, 16\n\
-	mov r9, r1\n\
-	lsls r0, 16\n\
-	asrs r0, 16\n\
-	mov r8, r0\n\
+    adds r0, r4, 0\n\
+    bl RotatingGate_GetGateOrientation\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    str r0, [sp]\n\
+    ldr r0, _080C7F5C @ =gRotatingGate_PuzzleConfig\n\
+    ldr r1, [r0]\n\
+    lsls r0, r4, 3\n\
+    adds r0, r1\n\
+    ldrb r2, [r0, 0x4]\n\
+    ldrh r1, [r0]\n\
+    adds r1, 0x7\n\
+    ldrh r0, [r0, 0x2]\n\
+    adds r0, 0x7\n\
+    movs r3, 0\n\
+    lsls r2, 3\n\
+    str r2, [sp, 0x4]\n\
+    lsls r1, 16\n\
+    asrs r1, 16\n\
+    mov r9, r1\n\
+    lsls r0, 16\n\
+    asrs r0, 16\n\
+    mov r8, r0\n\
 _080C7EE8:\n\
-	movs r6, 0\n\
-	ldr r2, [sp]\n\
-	adds r7, r2, r3\n\
-	lsls r0, r3, 1\n\
-	adds r5, r7, 0\n\
-	ldr r1, [sp, 0x4]\n\
-	adds r0, r1\n\
-	ldr r2, _080C7F60 @ =sRotatingGate_ArmLayout\n\
-	adds r4, r0, r2\n\
+    movs r6, 0\n\
+    ldr r2, [sp]\n\
+    adds r7, r2, r3\n\
+    lsls r0, r3, 1\n\
+    adds r5, r7, 0\n\
+    ldr r1, [sp, 0x4]\n\
+    adds r0, r1\n\
+    ldr r2, _080C7F60 @ =sRotatingGate_ArmLayout\n\
+    adds r4, r0, r2\n\
 _080C7EFA:\n\
-	adds r0, r5, 0\n\
-	cmp r5, 0\n\
-	bge _080C7F02\n\
-	adds r0, r7, 0x3\n\
+    adds r0, r5, 0\n\
+    cmp r5, 0\n\
+    bge _080C7F02\n\
+    adds r0, r7, 0x3\n\
 _080C7F02:\n\
-	asrs r0, 2\n\
-	lsls r0, 2\n\
-	subs r0, r5, r0\n\
-	lsls r0, 1\n\
-	adds r0, r6\n\
-	lsls r0, 24\n\
-	lsrs r1, r0, 24\n\
-	ldrb r0, [r4]\n\
-	cmp r0, 0\n\
-	beq _080C7F38\n\
-	lsls r1, 2\n\
-	add r1, r10\n\
-	movs r0, 0\n\
-	ldrsb r0, [r1, r0]\n\
-	add r0, r9\n\
-	ldrb r1, [r1, 0x1]\n\
-	lsls r1, 24\n\
-	asrs r1, 24\n\
-	add r1, r8\n\
-	str r3, [sp, 0x8]\n\
-	bl MapGridIsImpassableAt\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	ldr r3, [sp, 0x8]\n\
-	cmp r0, 0x1\n\
-	beq _080C7EB0\n\
+    asrs r0, 2\n\
+    lsls r0, 2\n\
+    subs r0, r5, r0\n\
+    lsls r0, 1\n\
+    adds r0, r6\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    ldrb r0, [r4]\n\
+    cmp r0, 0\n\
+    beq _080C7F38\n\
+    lsls r1, 2\n\
+    add r1, r10\n\
+    movs r0, 0\n\
+    ldrsb r0, [r1, r0]\n\
+    add r0, r9\n\
+    ldrb r1, [r1, 0x1]\n\
+    lsls r1, 24\n\
+    asrs r1, 24\n\
+    add r1, r8\n\
+    str r3, [sp, 0x8]\n\
+    bl MapGridIsImpassableAt\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    ldr r3, [sp, 0x8]\n\
+    cmp r0, 0x1\n\
+    beq _080C7EB0\n\
 _080C7F38:\n\
-	adds r4, 0x1\n\
-	adds r6, 0x1\n\
-	cmp r6, 0x1\n\
-	ble _080C7EFA\n\
-	adds r3, 0x1\n\
-	cmp r3, 0x3\n\
-	ble _080C7EE8\n\
-	movs r0, 0x1\n\
+    adds r4, 0x1\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x1\n\
+    ble _080C7EFA\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x3\n\
+    ble _080C7EE8\n\
+    movs r0, 0x1\n\
 _080C7F48:\n\
-	add sp, 0xC\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r1}\n\
-	bx r1\n\
-	.align 2, 0\n\
+    add sp, 0xC\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
 _080C7F58: .4byte sRotatingGate_ArmPositionsClockwiseRotation\n\
 _080C7F5C: .4byte gRotatingGate_PuzzleConfig\n\
 _080C7F60: .4byte sRotatingGate_ArmLayout\n\
@@ -1016,45 +1016,45 @@ static int RotatingGate_HasArm(u8 gateId, u8 armInfo)
 __attribute__((naked)) static int RotatingGate_HasArm(u8 a, u8 b)
 {
     asm(".syntax unified\n\
-	push {r4-r6,lr}\n\
-	adds r4, r1, 0\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	adds r6, r0, 0\n\
-	lsls r4, 24\n\
-	lsrs r5, r4, 24\n\
-	lsrs r4, 25\n\
-	movs r0, 0x1\n\
-	ands r5, r0\n\
-	adds r0, r6, 0\n\
-	bl RotatingGate_GetGateOrientation\n\
-	subs r4, r0\n\
-	adds r1, r4, 0x4\n\
-	adds r0, r1, 0\n\
-	cmp r1, 0\n\
-	bge _080C7F8A\n\
-	adds r0, r4, 0x7\n\
+    push {r4-r6,lr}\n\
+    adds r4, r1, 0\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r6, r0, 0\n\
+    lsls r4, 24\n\
+    lsrs r5, r4, 24\n\
+    lsrs r4, 25\n\
+    movs r0, 0x1\n\
+    ands r5, r0\n\
+    adds r0, r6, 0\n\
+    bl RotatingGate_GetGateOrientation\n\
+    subs r4, r0\n\
+    adds r1, r4, 0x4\n\
+    adds r0, r1, 0\n\
+    cmp r1, 0\n\
+    bge _080C7F8A\n\
+    adds r0, r4, 0x7\n\
 _080C7F8A:\n\
-	asrs r0, 2\n\
-	lsls r0, 2\n\
-	subs r0, r1, r0\n\
-	ldr r1, _080C7FB0 @ =gRotatingGate_PuzzleConfig\n\
-	ldr r2, [r1]\n\
-	lsls r1, r6, 3\n\
-	adds r1, r2\n\
-	ldrb r1, [r1, 0x4]\n\
-	ldr r2, _080C7FB4 @ =sRotatingGate_ArmLayout\n\
-	lsls r0, 24\n\
-	asrs r0, 23\n\
-	adds r0, r5\n\
-	lsls r1, 3\n\
-	adds r0, r1\n\
-	adds r0, r2\n\
-	ldrb r0, [r0]\n\
-	pop {r4-r6}\n\
-	pop {r1}\n\
-	bx r1\n\
-	.align 2, 0\n\
+    asrs r0, 2\n\
+    lsls r0, 2\n\
+    subs r0, r1, r0\n\
+    ldr r1, _080C7FB0 @ =gRotatingGate_PuzzleConfig\n\
+    ldr r2, [r1]\n\
+    lsls r1, r6, 3\n\
+    adds r1, r2\n\
+    ldrb r1, [r1, 0x4]\n\
+    ldr r2, _080C7FB4 @ =sRotatingGate_ArmLayout\n\
+    lsls r0, 24\n\
+    asrs r0, 23\n\
+    adds r0, r5\n\
+    lsls r1, 3\n\
+    adds r0, r1\n\
+    adds r0, r2\n\
+    ldrb r0, [r0]\n\
+    pop {r4-r6}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
 _080C7FB0: .4byte gRotatingGate_PuzzleConfig\n\
 _080C7FB4: .4byte sRotatingGate_ArmLayout\n\
 .syntax divided\n");
@@ -1095,53 +1095,53 @@ static u8 RotatingGate_GetRotationInfo(u8 direction, s16 x, s16 y)
 __attribute__((naked)) static u8 RotatingGate_GetRotationInfo(u8 a, s16 b, s16 c)
 {
     asm(".syntax unified\n\
-    	push {lr}\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	adds r3, r0, 0\n\
-	lsls r1, 16\n\
-	lsrs r1, 16\n\
-	lsls r2, 16\n\
-	lsrs r2, 16\n\
-	cmp r0, 0x2\n\
-	bne _080C8008\n\
-	ldr r3, _080C8004 @ =sRotatingGate_RotationInfoNorth\n\
-	b _080C802A\n\
-	.align 2, 0\n\
+        push {lr}\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r3, r0, 0\n\
+    lsls r1, 16\n\
+    lsrs r1, 16\n\
+    lsls r2, 16\n\
+    lsrs r2, 16\n\
+    cmp r0, 0x2\n\
+    bne _080C8008\n\
+    ldr r3, _080C8004 @ =sRotatingGate_RotationInfoNorth\n\
+    b _080C802A\n\
+    .align 2, 0\n\
 _080C8004: .4byte sRotatingGate_RotationInfoNorth\n\
 _080C8008:\n\
-	cmp r0, 0x1\n\
-	bne _080C8014\n\
-	ldr r3, _080C8010 @ =sRotatingGate_RotationInfoSouth\n\
-	b _080C802A\n\
-	.align 2, 0\n\
+    cmp r0, 0x1\n\
+    bne _080C8014\n\
+    ldr r3, _080C8010 @ =sRotatingGate_RotationInfoSouth\n\
+    b _080C802A\n\
+    .align 2, 0\n\
 _080C8010: .4byte sRotatingGate_RotationInfoSouth\n\
 _080C8014:\n\
-	cmp r0, 0x3\n\
-	bne _080C8020\n\
-	ldr r3, _080C801C @ =sRotatingGate_RotationInfoWest\n\
-	b _080C802A\n\
-	.align 2, 0\n\
+    cmp r0, 0x3\n\
+    bne _080C8020\n\
+    ldr r3, _080C801C @ =sRotatingGate_RotationInfoWest\n\
+    b _080C802A\n\
+    .align 2, 0\n\
 _080C801C: .4byte sRotatingGate_RotationInfoWest\n\
 _080C8020:\n\
-	cmp r3, 0x4\n\
-	beq _080C8028\n\
-	movs r0, 0xFF\n\
-	b _080C8038\n\
+    cmp r3, 0x4\n\
+    beq _080C8028\n\
+    movs r0, 0xFF\n\
+    b _080C8038\n\
 _080C8028:\n\
-	ldr r3, _080C803C @ =sRotatingGate_RotationInfoEast\n\
+    ldr r3, _080C803C @ =sRotatingGate_RotationInfoEast\n\
 _080C802A:\n\
-	lsls r0, r2, 16\n\
-	lsls r1, 16\n\
-	asrs r1, 16\n\
-	asrs r0, 14\n\
-	adds r0, r1\n\
-	adds r0, r3, r0\n\
-	ldrb r0, [r0]\n\
+    lsls r0, r2, 16\n\
+    lsls r1, 16\n\
+    asrs r1, 16\n\
+    asrs r0, 14\n\
+    adds r0, r1\n\
+    adds r0, r3, r0\n\
+    ldrb r0, [r0]\n\
 _080C8038:\n\
-	pop {r1}\n\
-	bx r1\n\
-	.align 2, 0\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
 _080C803C: .4byte sRotatingGate_RotationInfoEast\n\
 .syntax divided\n");
 }
diff --git a/src/field/script_menu.c b/src/field/script_menu.c
index f4ac55fb9..6e1a12a60 100644
--- a/src/field/script_menu.c
+++ b/src/field/script_menu.c
@@ -901,162 +901,162 @@ void CreatePCMenu(void)
 #elif GERMAN
 __attribute__((naked))
 void CreatePCMenu(void) {
-	asm(".syntax unified\n\
-	push {r4-r7,lr}\n\
-	sub sp, 0x18\n\
-	ldr r0, _080B5748 @ =0x0000084b\n\
-	bl FlagGet\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080B5750\n\
-	ldr r0, _080B574C @ =gPCText_LanettesPC\n\
-	b _080B5752\n\
-	.align 2, 0\n\
+    asm(".syntax unified\n\
+    push {r4-r7,lr}\n\
+    sub sp, 0x18\n\
+    ldr r0, _080B5748 @ =0x0000084b\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080B5750\n\
+    ldr r0, _080B574C @ =gPCText_LanettesPC\n\
+    b _080B5752\n\
+    .align 2, 0\n\
 _080B5748: .4byte 0x0000084b\n\
 _080B574C: .4byte gPCText_LanettesPC\n\
 _080B5750:\n\
-	ldr r0, _080B57E8 @ =gPCText_SomeonesPC\n\
+    ldr r0, _080B57E8 @ =gPCText_SomeonesPC\n\
 _080B5752:\n\
-	bl GetStringWidthInTilesForScriptMenu\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	str r0, [sp, 0x8]\n\
-	movs r4, 0x1\n\
-	ldr r0, _080B57EC @ =gPCText_PlayersPC\n\
-	bl GetStringWidthInTilesForScriptMenu\n\
-	lsls r1, r4, 2\n\
-	add r1, sp\n\
-	adds r1, 0x8\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	str r0, [r1]\n\
-	ldr r0, _080B57F0 @ =gPCText_LogOff\n\
-	bl GetStringWidthInTilesForScriptMenu\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	str r0, [sp, 0x10]\n\
-	movs r4, 0x3\n\
-	ldr r0, _080B57F4 @ =0x00000804\n\
-	bl FlagGet\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080B5798\n\
-	ldr r0, _080B57F8 @ =gPCText_HallOfFame\n\
-	bl GetStringWidthInTilesForScriptMenu\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	str r0, [sp, 0x14]\n\
-	movs r4, 0x4\n\
+    bl GetStringWidthInTilesForScriptMenu\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    str r0, [sp, 0x8]\n\
+    movs r4, 0x1\n\
+    ldr r0, _080B57EC @ =gPCText_PlayersPC\n\
+    bl GetStringWidthInTilesForScriptMenu\n\
+    lsls r1, r4, 2\n\
+    add r1, sp\n\
+    adds r1, 0x8\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    str r0, [r1]\n\
+    ldr r0, _080B57F0 @ =gPCText_LogOff\n\
+    bl GetStringWidthInTilesForScriptMenu\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    str r0, [sp, 0x10]\n\
+    movs r4, 0x3\n\
+    ldr r0, _080B57F4 @ =0x00000804\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080B5798\n\
+    ldr r0, _080B57F8 @ =gPCText_HallOfFame\n\
+    bl GetStringWidthInTilesForScriptMenu\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    str r0, [sp, 0x14]\n\
+    movs r4, 0x4\n\
 _080B5798:\n\
-	movs r5, 0\n\
-	cmp r5, r4\n\
-	bge _080B57B4\n\
-	add r2, sp, 0x8\n\
-	adds r1, r4, 0\n\
+    movs r5, 0\n\
+    cmp r5, r4\n\
+    bge _080B57B4\n\
+    add r2, sp, 0x8\n\
+    adds r1, r4, 0\n\
 _080B57A2:\n\
-	ldr r0, [r2]\n\
-	cmp r5, r0\n\
-	bge _080B57AC\n\
-	lsls r0, 24\n\
-	lsrs r5, r0, 24\n\
+    ldr r0, [r2]\n\
+    cmp r5, r0\n\
+    bge _080B57AC\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
 _080B57AC:\n\
-	adds r2, 0x4\n\
-	subs r1, 0x1\n\
-	cmp r1, 0\n\
-	bne _080B57A2\n\
+    adds r2, 0x4\n\
+    subs r1, 0x1\n\
+    cmp r1, 0\n\
+    bne _080B57A2\n\
 _080B57B4:\n\
-	ldr r0, _080B57F4 @ =0x00000804\n\
-	bl FlagGet\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080B57FC\n\
-	movs r7, 0x4\n\
-	adds r4, r5, 0x2\n\
-	lsls r2, r4, 24\n\
-	lsrs r2, 24\n\
-	movs r0, 0\n\
-	movs r1, 0\n\
-	movs r3, 0x9\n\
-	bl MenuDrawTextWindow\n\
-	ldr r0, _080B57F8 @ =gPCText_HallOfFame\n\
-	movs r1, 0x1\n\
-	movs r2, 0x5\n\
-	bl MenuPrint\n\
-	ldr r0, _080B57F0 @ =gPCText_LogOff\n\
-	movs r1, 0x1\n\
-	movs r2, 0x7\n\
-	bl MenuPrint\n\
-	b _080B5818\n\
-	.align 2, 0\n\
+    ldr r0, _080B57F4 @ =0x00000804\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080B57FC\n\
+    movs r7, 0x4\n\
+    adds r4, r5, 0x2\n\
+    lsls r2, r4, 24\n\
+    lsrs r2, 24\n\
+    movs r0, 0\n\
+    movs r1, 0\n\
+    movs r3, 0x9\n\
+    bl MenuDrawTextWindow\n\
+    ldr r0, _080B57F8 @ =gPCText_HallOfFame\n\
+    movs r1, 0x1\n\
+    movs r2, 0x5\n\
+    bl MenuPrint\n\
+    ldr r0, _080B57F0 @ =gPCText_LogOff\n\
+    movs r1, 0x1\n\
+    movs r2, 0x7\n\
+    bl MenuPrint\n\
+    b _080B5818\n\
+    .align 2, 0\n\
 _080B57E8: .4byte gPCText_SomeonesPC\n\
 _080B57EC: .4byte gPCText_PlayersPC\n\
 _080B57F0: .4byte gPCText_LogOff\n\
 _080B57F4: .4byte 0x00000804\n\
 _080B57F8: .4byte gPCText_HallOfFame\n\
 _080B57FC:\n\
-	movs r7, 0x3\n\
-	adds r4, r5, 0x2\n\
-	lsls r2, r4, 24\n\
-	lsrs r2, 24\n\
-	movs r0, 0\n\
-	movs r1, 0\n\
-	movs r3, 0x7\n\
-	bl MenuDrawTextWindow\n\
-	ldr r0, _080B5834 @ =gPCText_LogOff\n\
-	movs r1, 0x1\n\
-	movs r2, 0x5\n\
-	bl MenuPrint\n\
+    movs r7, 0x3\n\
+    adds r4, r5, 0x2\n\
+    lsls r2, r4, 24\n\
+    lsrs r2, 24\n\
+    movs r0, 0\n\
+    movs r1, 0\n\
+    movs r3, 0x7\n\
+    bl MenuDrawTextWindow\n\
+    ldr r0, _080B5834 @ =gPCText_LogOff\n\
+    movs r1, 0x1\n\
+    movs r2, 0x5\n\
+    bl MenuPrint\n\
 _080B5818:\n\
-	adds r6, r4, 0\n\
-	ldr r0, _080B5838 @ =0x0000084b\n\
-	bl FlagGet\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080B5840\n\
-	ldr r0, _080B583C @ =gPCText_LanettesPC\n\
-	movs r1, 0x1\n\
-	movs r2, 0x1\n\
-	bl MenuPrint\n\
-	b _080B584A\n\
-	.align 2, 0\n\
+    adds r6, r4, 0\n\
+    ldr r0, _080B5838 @ =0x0000084b\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080B5840\n\
+    ldr r0, _080B583C @ =gPCText_LanettesPC\n\
+    movs r1, 0x1\n\
+    movs r2, 0x1\n\
+    bl MenuPrint\n\
+    b _080B584A\n\
+    .align 2, 0\n\
 _080B5834: .4byte gPCText_LogOff\n\
 _080B5838: .4byte 0x0000084b\n\
 _080B583C: .4byte gPCText_LanettesPC\n\
 _080B5840:\n\
-	ldr r0, _080B5888 @ =gPCText_SomeonesPC\n\
-	movs r1, 0x1\n\
-	movs r2, 0x1\n\
-	bl MenuPrint\n\
+    ldr r0, _080B5888 @ =gPCText_SomeonesPC\n\
+    movs r1, 0x1\n\
+    movs r2, 0x1\n\
+    bl MenuPrint\n\
 _080B584A:\n\
-	ldr r0, _080B588C @ =gPCText_PlayersPC\n\
-	movs r1, 0x1\n\
-	movs r2, 0x3\n\
-	bl MenuPrint\n\
-	movs r4, 0\n\
-	str r4, [sp]\n\
-	adds r0, r5, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	str r0, [sp, 0x4]\n\
-	movs r0, 0\n\
-	movs r1, 0x1\n\
-	movs r2, 0x1\n\
-	adds r3, r7, 0\n\
-	bl InitMenu\n\
-	lsls r2, r6, 24\n\
-	lsrs r2, 24\n\
-	lsls r3, r7, 1\n\
-	adds r3, 0x1\n\
-	str r4, [sp]\n\
-	str r7, [sp, 0x4]\n\
-	movs r0, 0\n\
-	movs r1, 0\n\
-	bl sub_80B5230\n\
-	add sp, 0x18\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    ldr r0, _080B588C @ =gPCText_PlayersPC\n\
+    movs r1, 0x1\n\
+    movs r2, 0x3\n\
+    bl MenuPrint\n\
+    movs r4, 0\n\
+    str r4, [sp]\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    str r0, [sp, 0x4]\n\
+    movs r0, 0\n\
+    movs r1, 0x1\n\
+    movs r2, 0x1\n\
+    adds r3, r7, 0\n\
+    bl InitMenu\n\
+    lsls r2, r6, 24\n\
+    lsrs r2, 24\n\
+    lsls r3, r7, 1\n\
+    adds r3, 0x1\n\
+    str r4, [sp]\n\
+    str r7, [sp, 0x4]\n\
+    movs r0, 0\n\
+    movs r1, 0\n\
+    bl sub_80B5230\n\
+    add sp, 0x18\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _080B5888: .4byte gPCText_SomeonesPC\n\
 _080B588C: .4byte gPCText_PlayersPC\n\
     .syntax divided\n");