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

4 files changed, 421 insertions, 421 deletions

diff --git a/src/scene/berry_blender.c b/src/scene/berry_blender.c
index f54c6271d..029d352df 100644
--- a/src/scene/berry_blender.c
+++ b/src/scene/berry_blender.c
@@ -2156,223 +2156,223 @@ __attribute__((naked))
 static void Blender_CalculatePokeblock(struct BlenderBerry* berries, struct Pokeblock* pokeblock, u8 a2, u8* flavours, u16 a4)
 {
     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, 0x10\n\
-	str r0, [sp]\n\
-	mov r8, r1\n\
-	str r3, [sp, 0x4]\n\
-	ldr r0, [sp, 0x30]\n\
-	lsls r2, 24\n\
-	lsrs r2, 24\n\
-	mov r9, r2\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	str r0, [sp, 0x8]\n\
-	ldr r7, _080505DC @ =gUnknown_03000510\n\
-	adds r2, r7, 0\n\
-	movs r1, 0\n\
-	adds r0, r7, 0\n\
-	adds r0, 0xA\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    sub sp, 0x10\n\
+    str r0, [sp]\n\
+    mov r8, r1\n\
+    str r3, [sp, 0x4]\n\
+    ldr r0, [sp, 0x30]\n\
+    lsls r2, 24\n\
+    lsrs r2, 24\n\
+    mov r9, r2\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    str r0, [sp, 0x8]\n\
+    ldr r7, _080505DC @ =gUnknown_03000510\n\
+    adds r2, r7, 0\n\
+    movs r1, 0\n\
+    adds r0, r7, 0\n\
+    adds r0, 0xA\n\
 _0805054A:\n\
-	strh r1, [r0]\n\
-	subs r0, 0x2\n\
-	cmp r0, r2\n\
-	bge _0805054A\n\
-	movs r6, 0\n\
-	cmp r6, r9\n\
-	bge _08050580\n\
-	ldr r0, _080505DC @ =gUnknown_03000510\n\
-	mov r12, r0\n\
-	ldr r5, [sp]\n\
-	adds r5, 0x9\n\
+    strh r1, [r0]\n\
+    subs r0, 0x2\n\
+    cmp r0, r2\n\
+    bge _0805054A\n\
+    movs r6, 0\n\
+    cmp r6, r9\n\
+    bge _08050580\n\
+    ldr r0, _080505DC @ =gUnknown_03000510\n\
+    mov r12, r0\n\
+    ldr r5, [sp]\n\
+    adds r5, 0x9\n\
 _08050560:\n\
-	movs r3, 0\n\
-	adds r4, r5, 0\n\
-	mov r2, r12\n\
+    movs r3, 0\n\
+    adds r4, r5, 0\n\
+    mov r2, r12\n\
 _08050566:\n\
-	adds r1, r4, r3\n\
-	ldrh r0, [r2]\n\
-	ldrb r1, [r1]\n\
-	adds r0, r1\n\
-	strh r0, [r2]\n\
-	adds r2, 0x2\n\
-	adds r3, 0x1\n\
-	cmp r3, 0x5\n\
-	ble _08050566\n\
-	adds r5, 0x10\n\
-	adds r6, 0x1\n\
-	cmp r6, r9\n\
-	blt _08050560\n\
+    adds r1, r4, r3\n\
+    ldrh r0, [r2]\n\
+    ldrb r1, [r1]\n\
+    adds r0, r1\n\
+    strh r0, [r2]\n\
+    adds r2, 0x2\n\
+    adds r3, 0x1\n\
+    cmp r3, 0x5\n\
+    ble _08050566\n\
+    adds r5, 0x10\n\
+    adds r6, 0x1\n\
+    cmp r6, r9\n\
+    blt _08050560\n\
 _08050580:\n\
-	movs r1, 0\n\
-	ldrsh r3, [r7, r1]\n\
-	ldrh r0, [r7]\n\
-	ldrh r1, [r7, 0x2]\n\
-	subs r0, r1\n\
-	strh r0, [r7]\n\
-	ldrh r0, [r7, 0x4]\n\
-	subs r1, r0\n\
-	strh r1, [r7, 0x2]\n\
-	ldrh r1, [r7, 0x6]\n\
-	subs r0, r1\n\
-	strh r0, [r7, 0x4]\n\
-	ldrh r0, [r7, 0x8]\n\
-	subs r1, r0\n\
-	strh r1, [r7, 0x6]\n\
-	subs r0, r3\n\
-	strh r0, [r7, 0x8]\n\
-	movs r3, 0\n\
-	movs r2, 0\n\
-	adds r1, r7, 0\n\
-	movs r6, 0x4\n\
+    movs r1, 0\n\
+    ldrsh r3, [r7, r1]\n\
+    ldrh r0, [r7]\n\
+    ldrh r1, [r7, 0x2]\n\
+    subs r0, r1\n\
+    strh r0, [r7]\n\
+    ldrh r0, [r7, 0x4]\n\
+    subs r1, r0\n\
+    strh r1, [r7, 0x2]\n\
+    ldrh r1, [r7, 0x6]\n\
+    subs r0, r1\n\
+    strh r0, [r7, 0x4]\n\
+    ldrh r0, [r7, 0x8]\n\
+    subs r1, r0\n\
+    strh r1, [r7, 0x6]\n\
+    subs r0, r3\n\
+    strh r0, [r7, 0x8]\n\
+    movs r3, 0\n\
+    movs r2, 0\n\
+    adds r1, r7, 0\n\
+    movs r6, 0x4\n\
 _080505AA:\n\
-	movs r4, 0\n\
-	ldrsh r0, [r1, r4]\n\
-	cmp r0, 0\n\
-	bge _080505B6\n\
-	strh r2, [r1]\n\
-	adds r3, 0x1\n\
+    movs r4, 0\n\
+    ldrsh r0, [r1, r4]\n\
+    cmp r0, 0\n\
+    bge _080505B6\n\
+    strh r2, [r1]\n\
+    adds r3, 0x1\n\
 _080505B6:\n\
-	adds r1, 0x2\n\
-	subs r6, 0x1\n\
-	cmp r6, 0\n\
-	bge _080505AA\n\
-	lsls r0, r3, 24\n\
-	lsrs r0, 24\n\
-	mov r10, r0\n\
-	movs r4, 0\n\
-	ldr r1, _080505DC @ =gUnknown_03000510\n\
-	movs r6, 0x4\n\
+    adds r1, 0x2\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _080505AA\n\
+    lsls r0, r3, 24\n\
+    lsrs r0, 24\n\
+    mov r10, r0\n\
+    movs r4, 0\n\
+    ldr r1, _080505DC @ =gUnknown_03000510\n\
+    movs r6, 0x4\n\
 _080505CA:\n\
-	ldrh r2, [r1]\n\
-	movs r5, 0\n\
-	ldrsh r0, [r1, r5]\n\
-	cmp r0, 0\n\
-	ble _080505E4\n\
-	cmp r0, r3\n\
-	bge _080505E0\n\
-	strh r4, [r1]\n\
-	b _080505E4\n\
-	.align 2, 0\n\
+    ldrh r2, [r1]\n\
+    movs r5, 0\n\
+    ldrsh r0, [r1, r5]\n\
+    cmp r0, 0\n\
+    ble _080505E4\n\
+    cmp r0, r3\n\
+    bge _080505E0\n\
+    strh r4, [r1]\n\
+    b _080505E4\n\
+    .align 2, 0\n\
 _080505DC: .4byte gUnknown_03000510\n\
 _080505E0:\n\
-	subs r0, r2, r3\n\
-	strh r0, [r1]\n\
+    subs r0, r2, r3\n\
+    strh r0, [r1]\n\
 _080505E4:\n\
-	adds r1, 0x2\n\
-	subs r6, 0x1\n\
-	cmp r6, 0\n\
-	bge _080505CA\n\
-	ldr r1, _080506C4 @ =gUnknown_03000510\n\
-	ldr r2, _080506C8 @ =gUnknown_03000530\n\
-	movs r6, 0x4\n\
+    adds r1, 0x2\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _080505CA\n\
+    ldr r1, _080506C4 @ =gUnknown_03000510\n\
+    ldr r2, _080506C8 @ =gUnknown_03000530\n\
+    movs r6, 0x4\n\
 _080505F2:\n\
-	movs r3, 0\n\
-	ldrsh r0, [r1, r3]\n\
-	stm r2!, {r0}\n\
-	adds r1, 0x2\n\
-	subs r6, 0x1\n\
-	cmp r6, 0\n\
-	bge _080505F2\n\
-	ldr r1, _080506CC @ =0x0000014d\n\
-	ldr r0, [sp, 0x8]\n\
-	bl __udivsi3\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	adds r3, r0, 0\n\
-	adds r3, 0x64\n\
-	ldr r4, _080506D0 @ =gUnknown_0300055C\n\
-	str r3, [r4]\n\
-	movs r6, 0x4\n\
+    movs r3, 0\n\
+    ldrsh r0, [r1, r3]\n\
+    stm r2!, {r0}\n\
+    adds r1, 0x2\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _080505F2\n\
+    ldr r1, _080506CC @ =0x0000014d\n\
+    ldr r0, [sp, 0x8]\n\
+    bl __udivsi3\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    adds r3, r0, 0\n\
+    adds r3, 0x64\n\
+    ldr r4, _080506D0 @ =gUnknown_0300055C\n\
+    str r3, [r4]\n\
+    movs r6, 0x4\n\
 _08050616:\n\
-	movs r0, 0\n\
-	ldrsh r5, [r7, r0]\n\
-	adds r0, r5, 0\n\
-	muls r0, r3\n\
-	movs r1, 0xA\n\
-	str r3, [sp, 0xC]\n\
-	bl __divsi3\n\
-	adds r5, r0, 0\n\
-	movs r1, 0xA\n\
-	bl __modsi3\n\
-	adds r4, r0, 0\n\
-	adds r0, r5, 0\n\
-	movs r1, 0xA\n\
-	bl __divsi3\n\
-	adds r5, r0, 0\n\
-	ldr r3, [sp, 0xC]\n\
-	cmp r4, 0x4\n\
-	ble _08050642\n\
-	adds r5, 0x1\n\
+    movs r0, 0\n\
+    ldrsh r5, [r7, r0]\n\
+    adds r0, r5, 0\n\
+    muls r0, r3\n\
+    movs r1, 0xA\n\
+    str r3, [sp, 0xC]\n\
+    bl __divsi3\n\
+    adds r5, r0, 0\n\
+    movs r1, 0xA\n\
+    bl __modsi3\n\
+    adds r4, r0, 0\n\
+    adds r0, r5, 0\n\
+    movs r1, 0xA\n\
+    bl __divsi3\n\
+    adds r5, r0, 0\n\
+    ldr r3, [sp, 0xC]\n\
+    cmp r4, 0x4\n\
+    ble _08050642\n\
+    adds r5, 0x1\n\
 _08050642:\n\
-	strh r5, [r7]\n\
-	adds r7, 0x2\n\
-	subs r6, 0x1\n\
-	cmp r6, 0\n\
-	bge _08050616\n\
-	ldr r1, _080506C4 @ =gUnknown_03000510\n\
-	ldr r2, _080506D4 @ =gUnknown_03000548\n\
-	movs r6, 0x4\n\
+    strh r5, [r7]\n\
+    adds r7, 0x2\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _08050616\n\
+    ldr r1, _080506C4 @ =gUnknown_03000510\n\
+    ldr r2, _080506D4 @ =gUnknown_03000548\n\
+    movs r6, 0x4\n\
 _08050652:\n\
-	movs r3, 0\n\
-	ldrsh r0, [r1, r3]\n\
-	stm r2!, {r0}\n\
-	adds r1, 0x2\n\
-	subs r6, 0x1\n\
-	cmp r6, 0\n\
-	bge _08050652\n\
-	ldr r4, _080506C4 @ =gUnknown_03000510\n\
-	ldr r0, [sp]\n\
-	adds r1, r4, 0\n\
-	mov r2, r9\n\
-	mov r3, r10\n\
-	bl Blender_GetPokeblockColor\n\
-	mov r5, r8\n\
-	strb r0, [r5]\n\
-	movs r1, 0xA\n\
-	ldrsh r0, [r4, r1]\n\
-	mov r1, r9\n\
-	bl __divsi3\n\
-	mov r3, r9\n\
-	subs r0, r3\n\
-	strh r0, [r4, 0xA]\n\
-	lsls r0, 16\n\
-	cmp r0, 0\n\
-	bge _0805068C\n\
-	movs r0, 0\n\
-	strh r0, [r4, 0xA]\n\
+    movs r3, 0\n\
+    ldrsh r0, [r1, r3]\n\
+    stm r2!, {r0}\n\
+    adds r1, 0x2\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _08050652\n\
+    ldr r4, _080506C4 @ =gUnknown_03000510\n\
+    ldr r0, [sp]\n\
+    adds r1, r4, 0\n\
+    mov r2, r9\n\
+    mov r3, r10\n\
+    bl Blender_GetPokeblockColor\n\
+    mov r5, r8\n\
+    strb r0, [r5]\n\
+    movs r1, 0xA\n\
+    ldrsh r0, [r4, r1]\n\
+    mov r1, r9\n\
+    bl __divsi3\n\
+    mov r3, r9\n\
+    subs r0, r3\n\
+    strh r0, [r4, 0xA]\n\
+    lsls r0, 16\n\
+    cmp r0, 0\n\
+    bge _0805068C\n\
+    movs r0, 0\n\
+    strh r0, [r4, 0xA]\n\
 _0805068C:\n\
-	mov r5, r8\n\
-	ldrb r0, [r5]\n\
-	cmp r0, 0xC\n\
-	bne _080506E6\n\
-	bl Random\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	movs r1, 0xA\n\
-	bl __umodsi3\n\
-	lsls r0, 16\n\
-	lsrs r3, r0, 16\n\
-	movs r6, 0\n\
-	ldr r0, _080506D8 @ =gUnknown_082165DF\n\
-	adds r0, r3, r0\n\
-	ldrb r0, [r0]\n\
-	adds r1, r4, 0\n\
-	movs r4, 0x1\n\
-	movs r3, 0x2\n\
+    mov r5, r8\n\
+    ldrb r0, [r5]\n\
+    cmp r0, 0xC\n\
+    bne _080506E6\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    movs r1, 0xA\n\
+    bl __umodsi3\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    movs r6, 0\n\
+    ldr r0, _080506D8 @ =gUnknown_082165DF\n\
+    adds r0, r3, r0\n\
+    ldrb r0, [r0]\n\
+    adds r1, r4, 0\n\
+    movs r4, 0x1\n\
+    movs r3, 0x2\n\
 _080506B4:\n\
-	adds r2, r0, 0\n\
-	asrs r2, r6\n\
-	ands r2, r4\n\
-	cmp r2, 0\n\
-	beq _080506DC\n\
-	strh r3, [r1]\n\
-	b _080506DE\n\
-	.align 2, 0\n\
+    adds r2, r0, 0\n\
+    asrs r2, r6\n\
+    ands r2, r4\n\
+    cmp r2, 0\n\
+    beq _080506DC\n\
+    strh r3, [r1]\n\
+    b _080506DE\n\
+    .align 2, 0\n\
 _080506C4: .4byte gUnknown_03000510\n\
 _080506C8: .4byte gUnknown_03000530\n\
 _080506CC: .4byte 0x0000014d\n\
@@ -2380,61 +2380,61 @@ _080506D0: .4byte gUnknown_0300055C\n\
 _080506D4: .4byte gUnknown_03000548\n\
 _080506D8: .4byte gUnknown_082165DF\n\
 _080506DC:\n\
-	strh r2, [r1]\n\
+    strh r2, [r1]\n\
 _080506DE:\n\
-	adds r1, 0x2\n\
-	adds r6, 0x1\n\
-	cmp r6, 0x4\n\
-	ble _080506B4\n\
+    adds r1, 0x2\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x4\n\
+    ble _080506B4\n\
 _080506E6:\n\
-	ldr r7, _08050740 @ =gUnknown_03000510\n\
-	movs r2, 0xFF\n\
-	adds r1, r7, 0\n\
-	movs r6, 0x5\n\
+    ldr r7, _08050740 @ =gUnknown_03000510\n\
+    movs r2, 0xFF\n\
+    adds r1, r7, 0\n\
+    movs r6, 0x5\n\
 _080506EE:\n\
-	movs r3, 0\n\
-	ldrsh r0, [r1, r3]\n\
-	cmp r0, 0xFF\n\
-	ble _080506F8\n\
-	strh r2, [r1]\n\
+    movs r3, 0\n\
+    ldrsh r0, [r1, r3]\n\
+    cmp r0, 0xFF\n\
+    ble _080506F8\n\
+    strh r2, [r1]\n\
 _080506F8:\n\
-	adds r1, 0x2\n\
-	subs r6, 0x1\n\
-	cmp r6, 0\n\
-	bge _080506EE\n\
-	ldrh r0, [r7]\n\
-	mov r4, r8\n\
-	strb r0, [r4, 0x1]\n\
-	ldrh r0, [r7, 0x2]\n\
-	strb r0, [r4, 0x2]\n\
-	ldrh r0, [r7, 0x4]\n\
-	strb r0, [r4, 0x3]\n\
-	ldrh r0, [r7, 0x6]\n\
-	strb r0, [r4, 0x4]\n\
-	ldrh r0, [r7, 0x8]\n\
-	strb r0, [r4, 0x5]\n\
-	ldrh r0, [r7, 0xA]\n\
-	strb r0, [r4, 0x6]\n\
-	movs r6, 0\n\
-	adds r2, r7, 0\n\
+    adds r1, 0x2\n\
+    subs r6, 0x1\n\
+    cmp r6, 0\n\
+    bge _080506EE\n\
+    ldrh r0, [r7]\n\
+    mov r4, r8\n\
+    strb r0, [r4, 0x1]\n\
+    ldrh r0, [r7, 0x2]\n\
+    strb r0, [r4, 0x2]\n\
+    ldrh r0, [r7, 0x4]\n\
+    strb r0, [r4, 0x3]\n\
+    ldrh r0, [r7, 0x6]\n\
+    strb r0, [r4, 0x4]\n\
+    ldrh r0, [r7, 0x8]\n\
+    strb r0, [r4, 0x5]\n\
+    ldrh r0, [r7, 0xA]\n\
+    strb r0, [r4, 0x6]\n\
+    movs r6, 0\n\
+    adds r2, r7, 0\n\
 _0805071E:\n\
-	ldr r5, [sp, 0x4]\n\
-	adds r1, r5, r6\n\
-	ldrh r0, [r2]\n\
-	strb r0, [r1]\n\
-	adds r2, 0x2\n\
-	adds r6, 0x1\n\
-	cmp r6, 0x5\n\
-	ble _0805071E\n\
-	add sp, 0x10\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    ldr r5, [sp, 0x4]\n\
+    adds r1, r5, r6\n\
+    ldrh r0, [r2]\n\
+    strb r0, [r1]\n\
+    adds r2, 0x2\n\
+    adds r6, 0x1\n\
+    cmp r6, 0x5\n\
+    ble _0805071E\n\
+    add sp, 0x10\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _08050740: .4byte gUnknown_03000510\n\
         .syntax divided");
 }
diff --git a/src/scene/egg_hatch.c b/src/scene/egg_hatch.c
index 2b68d83e8..aa3d45250 100644
--- a/src/scene/egg_hatch.c
+++ b/src/scene/egg_hatch.c
@@ -323,69 +323,69 @@ __attribute__((naked))
 static bool8 sub_8042ABC(void* a, u8 b)
 {
     asm(".syntax unified\n\
-	push {r4-r6,lr}\n\
-	sub sp, 0x20\n\
-	adds r5, r0, 0\n\
-	lsls r4, r1, 24\n\
-	lsrs r4, 24\n\
-	lsls r0, r4, 2\n\
-	adds r0, r4\n\
-	lsls r0, 4\n\
-	adds r0, r5, r0\n\
-	mov r1, sp\n\
-	bl GetBoxMonNick\n\
-	lsls r0, r4, 3\n\
-	subs r0, r4\n\
-	lsls r1, r0, 3\n\
-	adds r0, r5, r1\n\
-	adds r0, 0xC0\n\
-	ldrh r0, [r0]\n\
-	cmp r0, 0\n\
-	beq _08042B40\n\
-	adds r0, r1, 0\n\
-	adds r0, 0xA0\n\
-	adds r5, r0\n\
-	adds r6, r5, 0\n\
-	adds r6, 0x2C\n\
-	mov r0, sp\n\
-	adds r1, r6, 0\n\
-	bl StringCompareWithoutExtCtrlCodes\n\
-	cmp r0, 0\n\
-	bne _08042B08\n\
-	ldr r0, _08042B30 @ =gSaveBlock2\n\
-	adds r1, r5, 0\n\
-	adds r1, 0x24\n\
-	bl StringCompareWithoutExtCtrlCodes\n\
-	cmp r0, 0\n\
-	beq _08042B40\n\
+    push {r4-r6,lr}\n\
+    sub sp, 0x20\n\
+    adds r5, r0, 0\n\
+    lsls r4, r1, 24\n\
+    lsrs r4, 24\n\
+    lsls r0, r4, 2\n\
+    adds r0, r4\n\
+    lsls r0, 4\n\
+    adds r0, r5, r0\n\
+    mov r1, sp\n\
+    bl GetBoxMonNick\n\
+    lsls r0, r4, 3\n\
+    subs r0, r4\n\
+    lsls r1, r0, 3\n\
+    adds r0, r5, r1\n\
+    adds r0, 0xC0\n\
+    ldrh r0, [r0]\n\
+    cmp r0, 0\n\
+    beq _08042B40\n\
+    adds r0, r1, 0\n\
+    adds r0, 0xA0\n\
+    adds r5, r0\n\
+    adds r6, r5, 0\n\
+    adds r6, 0x2C\n\
+    mov r0, sp\n\
+    adds r1, r6, 0\n\
+    bl StringCompareWithoutExtCtrlCodes\n\
+    cmp r0, 0\n\
+    bne _08042B08\n\
+    ldr r0, _08042B30 @ =gSaveBlock2\n\
+    adds r1, r5, 0\n\
+    adds r1, 0x24\n\
+    bl StringCompareWithoutExtCtrlCodes\n\
+    cmp r0, 0\n\
+    beq _08042B40\n\
 _08042B08:\n\
-	ldr r0, _08042B34 @ =gStringVar1\n\
-	mov r1, sp\n\
-	bl StringCopy\n\
-	ldr r4, _08042B38 @ =gStringVar2\n\
-	adds r1, r5, 0\n\
-	adds r1, 0x24\n\
-	adds r0, r4, 0\n\
-	bl StringCopy\n\
-	ldr r0, _08042B3C @ =gStringVar3\n\
-	adds r1, r6, 0\n\
-	bl StringCopy\n\
-	adds r0, r4, 0\n\
-	bl SanitizeNameString\n\
-	movs r0, 0x1\n\
-	b _08042B42\n\
-	.align 2, 0\n\
+    ldr r0, _08042B34 @ =gStringVar1\n\
+    mov r1, sp\n\
+    bl StringCopy\n\
+    ldr r4, _08042B38 @ =gStringVar2\n\
+    adds r1, r5, 0\n\
+    adds r1, 0x24\n\
+    adds r0, r4, 0\n\
+    bl StringCopy\n\
+    ldr r0, _08042B3C @ =gStringVar3\n\
+    adds r1, r6, 0\n\
+    bl StringCopy\n\
+    adds r0, r4, 0\n\
+    bl SanitizeNameString\n\
+    movs r0, 0x1\n\
+    b _08042B42\n\
+    .align 2, 0\n\
 _08042B30: .4byte gSaveBlock2\n\
 _08042B34: .4byte gStringVar1\n\
 _08042B38: .4byte gStringVar2\n\
 _08042B3C: .4byte gStringVar3\n\
 _08042B40:\n\
-	movs r0, 0\n\
+    movs r0, 0\n\
 _08042B42:\n\
-	add sp, 0x20\n\
-	pop {r4-r6}\n\
-	pop {r1}\n\
-	bx r1\n\
+    add sp, 0x20\n\
+    pop {r4-r6}\n\
+    pop {r1}\n\
+    bx r1\n\
         .syntax divided");
 }
 
diff --git a/src/scene/hall_of_fame.c b/src/scene/hall_of_fame.c
index a04f9d65b..78909e289 100644
--- a/src/scene/hall_of_fame.c
+++ b/src/scene/hall_of_fame.c
@@ -224,12 +224,12 @@ static const struct SpriteFrameImage sSpriteImageTable_840B67C[] =
 static const struct SpriteFrameImage* const sUnknown_0840B69C[7] =
 {
     sSpriteImageTable_840B5BC,
-	sSpriteImageTable_840B5DC,
-	sSpriteImageTable_840B5FC,
-	sSpriteImageTable_840B61C,
-	sSpriteImageTable_840B63C,
-	sSpriteImageTable_840B65C,
-	sSpriteImageTable_840B67C
+    sSpriteImageTable_840B5DC,
+    sSpriteImageTable_840B5FC,
+    sSpriteImageTable_840B61C,
+    sSpriteImageTable_840B63C,
+    sSpriteImageTable_840B65C,
+    sSpriteImageTable_840B67C
 };
 
 static const struct SpriteTemplate sUnknown_0840B6B8 =
@@ -365,22 +365,22 @@ static const union AnimCmd sSpriteAnim_840B758[] =
 static const union AnimCmd* const sSpriteAnimTable_840B760[] =
 {
     sSpriteAnim_840B6D8,
-	sSpriteAnim_840B6E0,
-	sSpriteAnim_840B6E8,
-	sSpriteAnim_840B6F0,
-	sSpriteAnim_840B6F8,
-	sSpriteAnim_840B700,
-	sSpriteAnim_840B708,
-	sSpriteAnim_840B710,
-	sSpriteAnim_840B718,
-	sSpriteAnim_840B720,
-	sSpriteAnim_840B728,
-	sSpriteAnim_840B730,
-	sSpriteAnim_840B738,
-	sSpriteAnim_840B740,
-	sSpriteAnim_840B748,
-	sSpriteAnim_840B750,
-	sSpriteAnim_840B758
+    sSpriteAnim_840B6E0,
+    sSpriteAnim_840B6E8,
+    sSpriteAnim_840B6F0,
+    sSpriteAnim_840B6F8,
+    sSpriteAnim_840B700,
+    sSpriteAnim_840B708,
+    sSpriteAnim_840B710,
+    sSpriteAnim_840B718,
+    sSpriteAnim_840B720,
+    sSpriteAnim_840B728,
+    sSpriteAnim_840B730,
+    sSpriteAnim_840B738,
+    sSpriteAnim_840B740,
+    sSpriteAnim_840B748,
+    sSpriteAnim_840B750,
+    sSpriteAnim_840B758
 };
 
 static const struct SpriteTemplate sSpriteTemplate_840B7A4 =
diff --git a/src/scene/title_screen.c b/src/scene/title_screen.c
index ab0f1d505..2503b0654 100644
--- a/src/scene/title_screen.c
+++ b/src/scene/title_screen.c
@@ -437,99 +437,99 @@ __attribute__((naked))
 static void CreatePressStartBanner(s16 x, s16 y)
 {
     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\
-	lsls r0, 16\n\
-	ldr r2, _0807C3AC @ =0xffe00000\n\
-	adds r0, r2\n\
-	lsrs r0, 16\n\
-	movs r6, 0\n\
-	lsls r1, 16\n\
-	mov r10, r1\n\
-	mov r8, r10\n\
+    push {r4-r7,lr}\n\
+    mov r7, r10\n\
+    mov r6, r9\n\
+    mov r5, r8\n\
+    push {r5-r7}\n\
+    lsls r0, 16\n\
+    ldr r2, _0807C3AC @ =0xffe00000\n\
+    adds r0, r2\n\
+    lsrs r0, 16\n\
+    movs r6, 0\n\
+    lsls r1, 16\n\
+    mov r10, r1\n\
+    mov r8, r10\n\
 _0807C302:\n\
-	lsls r5, r0, 16\n\
-	asrs r5, 16\n\
-	ldr r0, _0807C3B0 @ =sStartCopyrightBannerSpriteTemplate\n\
-	adds r1, r5, 0\n\
-	mov r3, r8\n\
-	asrs r2, r3, 16\n\
-	movs r3, 0\n\
-	bl CreateSprite\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	lsls r4, r0, 4\n\
-	adds r4, r0\n\
-	lsls r4, 2\n\
-	ldr r0, _0807C3B4 @ =gSprites\n\
-	mov r9, r0\n\
-	add r4, r9\n\
-	adds r0, r4, 0\n\
-	adds r1, r6, 0\n\
-	bl StartSpriteAnim\n\
-	movs r7, 0x1\n\
-	strh r7, [r4, 0x2E]\n\
-	adds r0, r6, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r6, r0, 24\n\
-	adds r5, 0x20\n\
-	lsls r5, 16\n\
-	lsrs r0, r5, 16\n\
-	cmp r6, 0x2\n\
-	bls _0807C302\n\
-	ldr r1, _0807C3B0 @ =sStartCopyrightBannerSpriteTemplate\n\
-	mov r8, r1\n\
-	lsls r5, r0, 16\n\
-	asrs r5, 16\n\
-	mov r2, r10\n\
-	asrs r6, r2, 16\n\
-	mov r0, r8\n\
-	adds r1, r5, 0\n\
-	adds r2, r6, 0\n\
-	movs r3, 0\n\
-	bl CreateSprite\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	lsls r4, r0, 4\n\
-	adds r4, r0\n\
-	lsls r4, 2\n\
-	add r4, r9\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x8\n\
-	bl StartSpriteAnim\n\
-	strh r7, [r4, 0x2E]\n\
-	subs r5, 0x60\n\
-	lsls r5, 16\n\
-	asrs r5, 16\n\
-	subs r6, 0x8\n\
-	lsls r6, 16\n\
-	asrs r6, 16\n\
-	mov r0, r8\n\
-	adds r1, r5, 0\n\
-	adds r2, r6, 0\n\
-	movs r3, 0\n\
-	bl CreateSprite\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	lsls r4, r0, 4\n\
-	adds r4, r0\n\
-	lsls r4, 2\n\
-	add r4, r9\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x9\n\
-	bl StartSpriteAnim\n\
-	strh r7, [r4, 0x2E]\n\
-	pop {r3-r5}\n\
-	mov r8, r3\n\
-	mov r9, r4\n\
-	mov r10, r5\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    lsls r5, r0, 16\n\
+    asrs r5, 16\n\
+    ldr r0, _0807C3B0 @ =sStartCopyrightBannerSpriteTemplate\n\
+    adds r1, r5, 0\n\
+    mov r3, r8\n\
+    asrs r2, r3, 16\n\
+    movs r3, 0\n\
+    bl CreateSprite\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    lsls r4, r0, 4\n\
+    adds r4, r0\n\
+    lsls r4, 2\n\
+    ldr r0, _0807C3B4 @ =gSprites\n\
+    mov r9, r0\n\
+    add r4, r9\n\
+    adds r0, r4, 0\n\
+    adds r1, r6, 0\n\
+    bl StartSpriteAnim\n\
+    movs r7, 0x1\n\
+    strh r7, [r4, 0x2E]\n\
+    adds r0, r6, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r6, r0, 24\n\
+    adds r5, 0x20\n\
+    lsls r5, 16\n\
+    lsrs r0, r5, 16\n\
+    cmp r6, 0x2\n\
+    bls _0807C302\n\
+    ldr r1, _0807C3B0 @ =sStartCopyrightBannerSpriteTemplate\n\
+    mov r8, r1\n\
+    lsls r5, r0, 16\n\
+    asrs r5, 16\n\
+    mov r2, r10\n\
+    asrs r6, r2, 16\n\
+    mov r0, r8\n\
+    adds r1, r5, 0\n\
+    adds r2, r6, 0\n\
+    movs r3, 0\n\
+    bl CreateSprite\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    lsls r4, r0, 4\n\
+    adds r4, r0\n\
+    lsls r4, 2\n\
+    add r4, r9\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x8\n\
+    bl StartSpriteAnim\n\
+    strh r7, [r4, 0x2E]\n\
+    subs r5, 0x60\n\
+    lsls r5, 16\n\
+    asrs r5, 16\n\
+    subs r6, 0x8\n\
+    lsls r6, 16\n\
+    asrs r6, 16\n\
+    mov r0, r8\n\
+    adds r1, r5, 0\n\
+    adds r2, r6, 0\n\
+    movs r3, 0\n\
+    bl CreateSprite\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    lsls r4, r0, 4\n\
+    adds r4, r0\n\
+    lsls r4, 2\n\
+    add r4, r9\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x9\n\
+    bl StartSpriteAnim\n\
+    strh r7, [r4, 0x2E]\n\
+    pop {r3-r5}\n\
+    mov r8, r3\n\
+    mov r9, r4\n\
+    mov r10, r5\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _0807C3AC: .4byte 0xffe00000\n\
 _0807C3B0: .4byte sStartCopyrightBannerSpriteTemplate\n\
 _0807C3B4: .4byte gSprites\n\