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

2 files changed, 121 insertions, 121 deletions

diff --git a/src/engine/menu.c b/src/engine/menu.c
index ef458124b..1096fa0bd 100644
--- a/src/engine/menu.c
+++ b/src/engine/menu.c
@@ -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
diff --git a/src/engine/option_menu.c b/src/engine/option_menu.c
index 7f8d76528..dfc49b035 100644
--- a/src/engine/option_menu.c
+++ b/src/engine/option_menu.c
@@ -486,61 +486,61 @@ __attribute__((naked))
 static void FrameType_DrawChoices(u8 selection)
 {
     asm(".syntax unified\n\
-	push {r4-r6,lr}\n\
-	sub sp, 0x10\n\
-	lsls r0, 24\n\
-	movs r1, 0x80\n\
-	lsls r1, 17\n\
-	adds r0, r1\n\
-	lsrs r5, r0, 24\n\
-	ldr r1, _0808C368 @ =gSystemText_Type\n\
-	mov r0, sp\n\
-	bl StringCopy\n\
-	ldr r1, _0808C36C @ =gSystemText_Terminator\n\
-	mov r0, sp\n\
-	bl StringAppend\n\
-	adds r4, r0, 0\n\
-	adds r0, r5, 0\n\
-	movs r1, 0xA\n\
-	bl __udivsi3\n\
-	adds r1, r0, 0\n\
-	lsls r0, r1, 24\n\
-	lsrs r6, r0, 24\n\
-	cmp r6, 0\n\
-	beq _0808C370\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xA1\n\
-	strb r0, [r4]\n\
-	adds r4, 0x1\n\
-	adds r0, r5, 0\n\
-	movs r1, 0xA\n\
-	bl __umodsi3\n\
-	adds r0, 0xA1\n\
-	strb r0, [r4]\n\
-	b _0808C380\n\
-	.align 2, 0\n\
+    push {r4-r6,lr}\n\
+    sub sp, 0x10\n\
+    lsls r0, 24\n\
+    movs r1, 0x80\n\
+    lsls r1, 17\n\
+    adds r0, r1\n\
+    lsrs r5, r0, 24\n\
+    ldr r1, _0808C368 @ =gSystemText_Type\n\
+    mov r0, sp\n\
+    bl StringCopy\n\
+    ldr r1, _0808C36C @ =gSystemText_Terminator\n\
+    mov r0, sp\n\
+    bl StringAppend\n\
+    adds r4, r0, 0\n\
+    adds r0, r5, 0\n\
+    movs r1, 0xA\n\
+    bl __udivsi3\n\
+    adds r1, r0, 0\n\
+    lsls r0, r1, 24\n\
+    lsrs r6, r0, 24\n\
+    cmp r6, 0\n\
+    beq _0808C370\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xA1\n\
+    strb r0, [r4]\n\
+    adds r4, 0x1\n\
+    adds r0, r5, 0\n\
+    movs r1, 0xA\n\
+    bl __umodsi3\n\
+    adds r0, 0xA1\n\
+    strb r0, [r4]\n\
+    b _0808C380\n\
+    .align 2, 0\n\
 _0808C368: .4byte gSystemText_Type\n\
 _0808C36C: .4byte gSystemText_Terminator\n\
 _0808C370:\n\
-	adds r0, r5, 0\n\
-	movs r1, 0xA\n\
-	bl __umodsi3\n\
-	adds r0, 0xA1\n\
-	strb r0, [r4]\n\
-	adds r4, 0x1\n\
-	strb r6, [r4]\n\
+    adds r0, r5, 0\n\
+    movs r1, 0xA\n\
+    bl __umodsi3\n\
+    adds r0, 0xA1\n\
+    strb r0, [r4]\n\
+    adds r4, 0x1\n\
+    strb r6, [r4]\n\
 _0808C380:\n\
-	adds r4, 0x1\n\
-	movs r0, 0xFF\n\
-	strb r0, [r4]\n\
-	mov r0, sp\n\
-	movs r1, 0xF\n\
-	movs r2, 0xF\n\
-	bl MenuPrint\n\
-	add sp, 0x10\n\
-	pop {r4-r6}\n\
-	pop {r0}\n\
-	bx r0\n\
+    adds r4, 0x1\n\
+    movs r0, 0xFF\n\
+    strb r0, [r4]\n\
+    mov r0, sp\n\
+    movs r1, 0xF\n\
+    movs r2, 0xF\n\
+    bl MenuPrint\n\
+    add sp, 0x10\n\
+    pop {r4-r6}\n\
+    pop {r0}\n\
+    bx r0\n\
     .syntax divided\n");
 }
 #endif