Merge pull request #316 from PikalaxALT/decoration

Decoration

1 files changed, 447 insertions, 448 deletions

diff --git a/src/secret_base.c b/src/secret_base.c
index c210a55d2..aae3853f9 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -12,10 +12,11 @@
 #include "map_constants.h"
 #include "task.h"
 #include "palette.h"
-#include "decoration.h"
 #include "field_weather.h"
 #include "metatile_behavior.h"
 #include "pokemon.h"
+#include "script.h"
+#include "decoration.h"
 
 extern u8 gUnknown_020387DC;
 extern u16 gSpecialVar_0x8004;
@@ -29,8 +30,6 @@ extern const struct
     u16 unk_083D1358_1;
 } gUnknown_083D1358[7];
 extern const u8 gUnknown_083D1374[4 * 16];
-extern void *gUnknown_0300485C;
-extern const u8 sub_807D770(void);
 extern const u8 gUnknown_083D13EC[12];
 extern const u8 sub_80BCCA4(u8);
 extern u8 gUnknown_081A2E14[];
@@ -393,84 +392,84 @@ void sub_80BBCCC(u8 flagIn)
 {
     asm(".syntax unified\n\
     push {r4-r7,lr}\n\
-	mov r7, r8\n\
-	push {r7}\n\
-	sub sp, 0x4\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	mov r8, r0\n\
-	bl CurrentMapIsSecretBase\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	beq _080BBDBC\n\
-	ldr r0, _080BBD70 @ =0x00004054\n\
-	bl VarGet\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
-	movs r1, 0\n\
-	mov r0, sp\n\
-	strh r1, [r0]\n\
-	ldr r6, _080BBD74 @ =gSaveBlock1\n\
-	mov r4, sp\n\
-	ldr r0, _080BBD78 @ =0x00001a2a\n\
-	adds r7, r6, r0\n\
+    mov r7, r8\n\
+    push {r7}\n\
+    sub sp, 0x4\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    mov r8, r0\n\
+    bl CurrentMapIsSecretBase\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    beq _080BBDBC\n\
+    ldr r0, _080BBD70 @ =0x00004054\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    movs r1, 0\n\
+    mov r0, sp\n\
+    strh r1, [r0]\n\
+    ldr r6, _080BBD74 @ =gSaveBlock1\n\
+    mov r4, sp\n\
+    ldr r0, _080BBD78 @ =0x00001a2a\n\
+    adds r7, r6, r0\n\
 _080BBCFC:\n\
-	lsls r0, r5, 2\n\
-	adds r0, r5\n\
-	lsls r0, 5\n\
-	ldrh r1, [r4]\n\
-	adds r2, r0, r1\n\
-	ldr r1, _080BBD7C @ =0x00001a1a\n\
-	adds r0, r6, r1\n\
-	adds r1, r2, r0\n\
-	ldrb r0, [r1]\n\
-	subs r0, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0x77\n\
-	bhi _080BBD3A\n\
-	ldr r0, _080BBD80 @ =gDecorations\n\
-	ldrb r3, [r1]\n\
-	lsls r1, r3, 5\n\
-	adds r1, r0\n\
-	ldrb r0, [r1, 0x11]\n\
-	cmp r0, 0x4\n\
-	beq _080BBD3A\n\
-	adds r0, r2, r7\n\
-	ldrb r2, [r0]\n\
-	lsrs r0, r2, 4\n\
-	adds r0, 0x7\n\
-	movs r1, 0xF\n\
-	ands r1, r2\n\
-	adds r1, 0x7\n\
-	adds r2, r3, 0\n\
-	bl sub_80FF394\n\
+    lsls r0, r5, 2\n\
+    adds r0, r5\n\
+    lsls r0, 5\n\
+    ldrh r1, [r4]\n\
+    adds r2, r0, r1\n\
+    ldr r1, _080BBD7C @ =0x00001a1a\n\
+    adds r0, r6, r1\n\
+    adds r1, r2, r0\n\
+    ldrb r0, [r1]\n\
+    subs r0, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0x77\n\
+    bhi _080BBD3A\n\
+    ldr r0, _080BBD80 @ =gDecorations\n\
+    ldrb r3, [r1]\n\
+    lsls r1, r3, 5\n\
+    adds r1, r0\n\
+    ldrb r0, [r1, 0x11]\n\
+    cmp r0, 0x4\n\
+    beq _080BBD3A\n\
+    adds r0, r2, r7\n\
+    ldrb r2, [r0]\n\
+    lsrs r0, r2, 4\n\
+    adds r0, 0x7\n\
+    movs r1, 0xF\n\
+    ands r1, r2\n\
+    adds r1, 0x7\n\
+    adds r2, r3, 0\n\
+    bl sub_80FF394\n\
 _080BBD3A:\n\
-	ldrh r0, [r4]\n\
-	adds r0, 0x1\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	strh r0, [r4]\n\
-	cmp r0, 0xF\n\
-	bls _080BBCFC\n\
-	cmp r5, 0\n\
-	beq _080BBD88\n\
-	mov r4, sp\n\
-	adds r4, 0x2\n\
-	movs r2, 0x88\n\
-	lsls r2, 2\n\
-	mov r0, sp\n\
-	adds r1, r4, 0\n\
-	bl sub_80BB764\n\
-	mov r0, sp\n\
-	ldrh r0, [r0]\n\
-	adds r0, 0x7\n\
-	ldrh r1, [r4]\n\
-	adds r1, 0x7\n\
-	ldr r2, _080BBD84 @ =0x00000e21\n\
-	bl MapGridSetMetatileIdAt\n\
-	b _080BBDBC\n\
-	.align 2, 0\n\
+    ldrh r0, [r4]\n\
+    adds r0, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    strh r0, [r4]\n\
+    cmp r0, 0xF\n\
+    bls _080BBCFC\n\
+    cmp r5, 0\n\
+    beq _080BBD88\n\
+    mov r4, sp\n\
+    adds r4, 0x2\n\
+    movs r2, 0x88\n\
+    lsls r2, 2\n\
+    mov r0, sp\n\
+    adds r1, r4, 0\n\
+    bl sub_80BB764\n\
+    mov r0, sp\n\
+    ldrh r0, [r0]\n\
+    adds r0, 0x7\n\
+    ldrh r1, [r4]\n\
+    adds r1, 0x7\n\
+    ldr r2, _080BBD84 @ =0x00000e21\n\
+    bl MapGridSetMetatileIdAt\n\
+    b _080BBDBC\n\
+    .align 2, 0\n\
 _080BBD70: .4byte 0x00004054\n\
 _080BBD74: .4byte gSaveBlock1\n\
 _080BBD78: .4byte 0x00001a2a\n\
@@ -478,37 +477,37 @@ _080BBD7C: .4byte 0x00001a1a\n\
 _080BBD80: .4byte gDecorations\n\
 _080BBD84: .4byte 0x00000e21\n\
 _080BBD88:\n\
-	mov r0, r8\n\
-	cmp r0, 0x1\n\
-	bne _080BBDBC\n\
-	ldr r0, _080BBDC8 @ =0x00004089\n\
-	bl VarGet\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	cmp r0, 0x1\n\
-	bne _080BBDBC\n\
-	mov r4, sp\n\
-	adds r4, 0x2\n\
-	movs r2, 0x88\n\
-	lsls r2, 2\n\
-	mov r0, sp\n\
-	adds r1, r4, 0\n\
-	bl sub_80BB764\n\
-	mov r0, sp\n\
-	ldrh r0, [r0]\n\
-	adds r0, 0x7\n\
-	ldrh r1, [r4]\n\
-	adds r1, 0x7\n\
-	ldr r2, _080BBDCC @ =0x00000e0a\n\
-	bl MapGridSetMetatileIdAt\n\
+    mov r0, r8\n\
+    cmp r0, 0x1\n\
+    bne _080BBDBC\n\
+    ldr r0, _080BBDC8 @ =0x00004089\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, 0x1\n\
+    bne _080BBDBC\n\
+    mov r4, sp\n\
+    adds r4, 0x2\n\
+    movs r2, 0x88\n\
+    lsls r2, 2\n\
+    mov r0, sp\n\
+    adds r1, r4, 0\n\
+    bl sub_80BB764\n\
+    mov r0, sp\n\
+    ldrh r0, [r0]\n\
+    adds r0, 0x7\n\
+    ldrh r1, [r4]\n\
+    adds r1, 0x7\n\
+    ldr r2, _080BBDCC @ =0x00000e0a\n\
+    bl MapGridSetMetatileIdAt\n\
 _080BBDBC:\n\
-	add sp, 0x4\n\
-	pop {r3}\n\
-	mov r8, r3\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    add sp, 0x4\n\
+    pop {r3}\n\
+    mov r8, r3\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _080BBDC8: .4byte 0x00004089\n\
 _080BBDCC: .4byte 0x00000e0a\n\
 .syntax divided\n");
@@ -518,220 +517,220 @@ __attribute__((naked))
 void sub_80BBDD0(void)
 {
     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, 0x14\n\
-	ldr r0, _080BBE00 @ =0x00004054\n\
-	bl VarGet\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	bl CurrentMapIsSecretBase\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	bne _080BBE08\n\
-	ldr r0, _080BBE04 @ =gSaveBlock1 + 0x2688\n\
-	str r0, [sp, 0x4]\n\
-	adds r0, 0xC\n\
-	str r0, [sp, 0x8]\n\
-	movs r1, 0xC\n\
-	str r1, [sp, 0xC]\n\
-	b _080BBE1E\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, 0x14\n\
+    ldr r0, _080BBE00 @ =0x00004054\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    bl CurrentMapIsSecretBase\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080BBE08\n\
+    ldr r0, _080BBE04 @ =gSaveBlock1 + 0x2688\n\
+    str r0, [sp, 0x4]\n\
+    adds r0, 0xC\n\
+    str r0, [sp, 0x8]\n\
+    movs r1, 0xC\n\
+    str r1, [sp, 0xC]\n\
+    b _080BBE1E\n\
+    .align 2, 0\n\
 _080BBE00: .4byte 0x00004054\n\
 _080BBE04: .4byte gSaveBlock1 + 0x2688\n\
 _080BBE08:\n\
-	lsls r1, r4, 2\n\
-	adds r1, r4\n\
-	lsls r1, 5\n\
-	ldr r0, _080BBF7C @ =gSaveBlock1 + 0x1A1A\n\
-	adds r2, r1, r0\n\
-	str r2, [sp, 0x4]\n\
-	adds r0, 0x10\n\
-	adds r1, r0\n\
-	str r1, [sp, 0x8]\n\
-	movs r3, 0x10\n\
-	str r3, [sp, 0xC]\n\
+    lsls r1, r4, 2\n\
+    adds r1, r4\n\
+    lsls r1, 5\n\
+    ldr r0, _080BBF7C @ =gSaveBlock1 + 0x1A1A\n\
+    adds r2, r1, r0\n\
+    str r2, [sp, 0x4]\n\
+    adds r0, 0x10\n\
+    adds r1, r0\n\
+    str r1, [sp, 0x8]\n\
+    movs r3, 0x10\n\
+    str r3, [sp, 0xC]\n\
 _080BBE1E:\n\
-	movs r6, 0\n\
-	ldr r4, [sp, 0xC]\n\
-	cmp r6, r4\n\
-	bcc _080BBE28\n\
-	b _080BBF6C\n\
+    movs r6, 0\n\
+    ldr r4, [sp, 0xC]\n\
+    cmp r6, r4\n\
+    bcc _080BBE28\n\
+    b _080BBF6C\n\
 _080BBE28:\n\
-	ldr r5, _080BBF80 @ =gSaveBlock1\n\
-	mov r10, r5\n\
+    ldr r5, _080BBF80 @ =gSaveBlock1\n\
+    mov r10, r5\n\
 _080BBE2C:\n\
-	ldr r1, [sp, 0x4]\n\
-	adds r0, r1, r6\n\
-	ldrb r1, [r0]\n\
-	mov r9, r0\n\
-	adds r2, r6, 0x1\n\
-	str r2, [sp, 0x10]\n\
-	cmp r1, 0\n\
-	bne _080BBE3E\n\
-	b _080BBF5E\n\
+    ldr r1, [sp, 0x4]\n\
+    adds r0, r1, r6\n\
+    ldrb r1, [r0]\n\
+    mov r9, r0\n\
+    adds r2, r6, 0x1\n\
+    str r2, [sp, 0x10]\n\
+    cmp r1, 0\n\
+    bne _080BBE3E\n\
+    b _080BBF5E\n\
 _080BBE3E:\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 5\n\
-	ldr r3, _080BBF84 @ =gDecorations\n\
-	adds r0, r3\n\
-	ldrb r0, [r0, 0x11]\n\
-	cmp r0, 0x4\n\
-	beq _080BBE4E\n\
-	b _080BBF5E\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 5\n\
+    ldr r3, _080BBF84 @ =gDecorations\n\
+    adds r0, r3\n\
+    ldrb r0, [r0, 0x11]\n\
+    cmp r0, 0x4\n\
+    beq _080BBE4E\n\
+    b _080BBF5E\n\
 _080BBE4E:\n\
-	movs r5, 0\n\
-	ldr r0, _080BBF88 @ =gMapHeader\n\
-	ldr r2, [r0, 0x4]\n\
-	ldrb r3, [r2]\n\
-	mov r8, r0\n\
-	cmp r5, r3\n\
-	bcs _080BBE8E\n\
-	ldr r0, [r2, 0x4]\n\
-	ldrh r1, [r0, 0x14]\n\
-	ldr r4, _080BBF8C @ =gSpecialVar_0x8004\n\
-	ldrh r0, [r4]\n\
-	adds r0, 0xAE\n\
-	adds r7, r4, 0\n\
-	cmp r1, r0\n\
-	beq _080BBE8E\n\
-	adds r4, r2, 0\n\
-	adds r2, r3, 0\n\
+    movs r5, 0\n\
+    ldr r0, _080BBF88 @ =gMapHeader\n\
+    ldr r2, [r0, 0x4]\n\
+    ldrb r3, [r2]\n\
+    mov r8, r0\n\
+    cmp r5, r3\n\
+    bcs _080BBE8E\n\
+    ldr r0, [r2, 0x4]\n\
+    ldrh r1, [r0, 0x14]\n\
+    ldr r4, _080BBF8C @ =gSpecialVar_0x8004\n\
+    ldrh r0, [r4]\n\
+    adds r0, 0xAE\n\
+    adds r7, r4, 0\n\
+    cmp r1, r0\n\
+    beq _080BBE8E\n\
+    adds r4, r2, 0\n\
+    adds r2, r3, 0\n\
 _080BBE70:\n\
-	adds r0, r5, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r5, r0, 24\n\
-	cmp r5, r2\n\
-	bcs _080BBE8E\n\
-	ldr r1, [r4, 0x4]\n\
-	lsls r0, r5, 1\n\
-	adds r0, r5\n\
-	lsls r0, 3\n\
-	adds r0, r1\n\
-	ldrh r1, [r0, 0x14]\n\
-	ldrh r0, [r7]\n\
-	adds r0, 0xAE\n\
-	cmp r1, r0\n\
-	bne _080BBE70\n\
+    adds r0, r5, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
+    cmp r5, r2\n\
+    bcs _080BBE8E\n\
+    ldr r1, [r4, 0x4]\n\
+    lsls r0, r5, 1\n\
+    adds r0, r5\n\
+    lsls r0, 3\n\
+    adds r0, r1\n\
+    ldrh r1, [r0, 0x14]\n\
+    ldrh r0, [r7]\n\
+    adds r0, 0xAE\n\
+    cmp r1, r0\n\
+    bne _080BBE70\n\
 _080BBE8E:\n\
-	mov r1, r8\n\
-	ldr r0, [r1, 0x4]\n\
-	ldrb r0, [r0]\n\
-	cmp r5, r0\n\
-	beq _080BBF5E\n\
-	ldr r7, _080BBF90 @ =gSpecialVar_0x8006\n\
-	ldr r2, [sp, 0x8]\n\
-	adds r1, r2, r6\n\
-	ldrb r0, [r1]\n\
-	lsrs r0, 4\n\
-	strh r0, [r7]\n\
-	ldr r6, _080BBF94 @ =gSpecialVar_0x8007\n\
-	ldrb r1, [r1]\n\
-	movs r0, 0xF\n\
-	ands r0, r1\n\
-	strh r0, [r6]\n\
-	ldrh r0, [r7]\n\
-	adds r0, 0x7\n\
-	ldrh r1, [r6]\n\
-	adds r1, 0x7\n\
-	bl MapGridGetMetatileBehaviorAt\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	adds r0, r4, 0\n\
-	bl sub_80572D8\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0x1\n\
-	beq _080BBEDA\n\
-	adds r0, r4, 0\n\
-	bl sub_80572EC\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0x1\n\
-	bne _080BBF5E\n\
+    mov r1, r8\n\
+    ldr r0, [r1, 0x4]\n\
+    ldrb r0, [r0]\n\
+    cmp r5, r0\n\
+    beq _080BBF5E\n\
+    ldr r7, _080BBF90 @ =gSpecialVar_0x8006\n\
+    ldr r2, [sp, 0x8]\n\
+    adds r1, r2, r6\n\
+    ldrb r0, [r1]\n\
+    lsrs r0, 4\n\
+    strh r0, [r7]\n\
+    ldr r6, _080BBF94 @ =gSpecialVar_0x8007\n\
+    ldrb r1, [r1]\n\
+    movs r0, 0xF\n\
+    ands r0, r1\n\
+    strh r0, [r6]\n\
+    ldrh r0, [r7]\n\
+    adds r0, 0x7\n\
+    ldrh r1, [r6]\n\
+    adds r1, 0x7\n\
+    bl MapGridGetMetatileBehaviorAt\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    adds r0, r4, 0\n\
+    bl sub_80572D8\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0x1\n\
+    beq _080BBEDA\n\
+    adds r0, r4, 0\n\
+    bl sub_80572EC\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0x1\n\
+    bne _080BBF5E\n\
 _080BBEDA:\n\
-	mov r3, r8\n\
-	ldr r0, [r3, 0x4]\n\
-	ldr r1, [r0, 0x4]\n\
-	lsls r4, r5, 1\n\
-	adds r4, r5\n\
-	lsls r4, 3\n\
-	adds r1, r4, r1\n\
-	ldr r5, _080BBF98 @ =0x00003f20\n\
-	adds r0, r5, 0\n\
-	ldrb r1, [r1, 0x1]\n\
-	adds r0, r1\n\
-	ldr r1, _080BBF9C @ =gScriptResult\n\
-	strh r0, [r1]\n\
-	ldrh r0, [r1]\n\
-	mov r2, r9\n\
-	ldrb r1, [r2]\n\
-	lsls r1, 5\n\
-	ldr r3, _080BBFA0 @ =gDecorations + 0x1C\n\
-	adds r1, r3\n\
-	ldr r1, [r1]\n\
-	ldrh r1, [r1]\n\
-	bl VarSet\n\
-	mov r5, r8\n\
-	ldr r0, [r5, 0x4]\n\
-	ldr r0, [r0, 0x4]\n\
-	adds r4, r0\n\
-	ldrb r0, [r4]\n\
-	ldr r1, _080BBF9C @ =gScriptResult\n\
-	strh r0, [r1]\n\
-	ldr r2, _080BBF8C @ =gSpecialVar_0x8004\n\
-	ldrh r0, [r2]\n\
-	adds r0, 0xAE\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	bl FlagReset\n\
-	ldr r3, _080BBF9C @ =gScriptResult\n\
-	ldrb r0, [r3]\n\
-	mov r4, r10\n\
-	ldrb r1, [r4, 0x5]\n\
-	ldrb r2, [r4, 0x4]\n\
-	bl show_sprite\n\
-	ldr r5, _080BBF9C @ =gScriptResult\n\
-	ldrb r0, [r5]\n\
-	ldrb r1, [r4, 0x5]\n\
-	ldrb r2, [r4, 0x4]\n\
-	movs r4, 0\n\
-	ldrsh r3, [r7, r4]\n\
-	movs r5, 0\n\
-	ldrsh r4, [r6, r5]\n\
-	str r4, [sp]\n\
-	bl sub_805C0F8\n\
-	ldr r1, _080BBF9C @ =gScriptResult\n\
-	ldrb r0, [r1]\n\
-	mov r2, r10\n\
-	ldrb r1, [r2, 0x5]\n\
-	ldrb r2, [r2, 0x4]\n\
-	bl sub_805C78C\n\
-	ldr r3, _080BBF8C @ =gSpecialVar_0x8004\n\
-	ldrh r0, [r3]\n\
-	adds r0, 0x1\n\
-	strh r0, [r3]\n\
+    mov r3, r8\n\
+    ldr r0, [r3, 0x4]\n\
+    ldr r1, [r0, 0x4]\n\
+    lsls r4, r5, 1\n\
+    adds r4, r5\n\
+    lsls r4, 3\n\
+    adds r1, r4, r1\n\
+    ldr r5, _080BBF98 @ =0x00003f20\n\
+    adds r0, r5, 0\n\
+    ldrb r1, [r1, 0x1]\n\
+    adds r0, r1\n\
+    ldr r1, _080BBF9C @ =gScriptResult\n\
+    strh r0, [r1]\n\
+    ldrh r0, [r1]\n\
+    mov r2, r9\n\
+    ldrb r1, [r2]\n\
+    lsls r1, 5\n\
+    ldr r3, _080BBFA0 @ =gDecorations + 0x1C\n\
+    adds r1, r3\n\
+    ldr r1, [r1]\n\
+    ldrh r1, [r1]\n\
+    bl VarSet\n\
+    mov r5, r8\n\
+    ldr r0, [r5, 0x4]\n\
+    ldr r0, [r0, 0x4]\n\
+    adds r4, r0\n\
+    ldrb r0, [r4]\n\
+    ldr r1, _080BBF9C @ =gScriptResult\n\
+    strh r0, [r1]\n\
+    ldr r2, _080BBF8C @ =gSpecialVar_0x8004\n\
+    ldrh r0, [r2]\n\
+    adds r0, 0xAE\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    bl FlagReset\n\
+    ldr r3, _080BBF9C @ =gScriptResult\n\
+    ldrb r0, [r3]\n\
+    mov r4, r10\n\
+    ldrb r1, [r4, 0x5]\n\
+    ldrb r2, [r4, 0x4]\n\
+    bl show_sprite\n\
+    ldr r5, _080BBF9C @ =gScriptResult\n\
+    ldrb r0, [r5]\n\
+    ldrb r1, [r4, 0x5]\n\
+    ldrb r2, [r4, 0x4]\n\
+    movs r4, 0\n\
+    ldrsh r3, [r7, r4]\n\
+    movs r5, 0\n\
+    ldrsh r4, [r6, r5]\n\
+    str r4, [sp]\n\
+    bl sub_805C0F8\n\
+    ldr r1, _080BBF9C @ =gScriptResult\n\
+    ldrb r0, [r1]\n\
+    mov r2, r10\n\
+    ldrb r1, [r2, 0x5]\n\
+    ldrb r2, [r2, 0x4]\n\
+    bl sub_805C78C\n\
+    ldr r3, _080BBF8C @ =gSpecialVar_0x8004\n\
+    ldrh r0, [r3]\n\
+    adds r0, 0x1\n\
+    strh r0, [r3]\n\
 _080BBF5E:\n\
-	ldr r4, [sp, 0x10]\n\
-	lsls r0, r4, 24\n\
-	lsrs r6, r0, 24\n\
-	ldr r5, [sp, 0xC]\n\
-	cmp r6, r5\n\
-	bcs _080BBF6C\n\
-	b _080BBE2C\n\
+    ldr r4, [sp, 0x10]\n\
+    lsls r0, r4, 24\n\
+    lsrs r6, r0, 24\n\
+    ldr r5, [sp, 0xC]\n\
+    cmp r6, r5\n\
+    bcs _080BBF6C\n\
+    b _080BBE2C\n\
 _080BBF6C:\n\
-	add sp, 0x14\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\
+    add sp, 0x14\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\
 _080BBF7C: .4byte gSaveBlock1 + 0x1A1A\n\
 _080BBF80: .4byte gSaveBlock1\n\
 _080BBF84: .4byte gDecorations\n\
@@ -902,148 +901,148 @@ __attribute__((naked))
 void sub_80BC300(void)
 {
     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\
-	movs r0, 0\n\
-	mov r10, r0\n\
-	movs r6, 0\n\
-	mov r9, r6\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\
+    movs r0, 0\n\
+    mov r10, r0\n\
+    movs r6, 0\n\
+    mov r9, r6\n\
 _080BC314:\n\
-	movs r4, 0\n\
-	lsls r3, r6, 2\n\
-	lsls r2, r6, 1\n\
-	ldr r7, _080BC424 @ =gPlayerParty\n\
-	adds r1, r6, 0x1\n\
-	str r1, [sp]\n\
-	adds r1, r3, 0\n\
+    movs r4, 0\n\
+    lsls r3, r6, 2\n\
+    lsls r2, r6, 1\n\
+    ldr r7, _080BC424 @ =gPlayerParty\n\
+    adds r1, r6, 0x1\n\
+    str r1, [sp]\n\
+    adds r1, r3, 0\n\
 _080BC322:\n\
-	adds r0, r1, r4\n\
-	lsls r0, 1\n\
-	ldr r5, _080BC428 @ =gSaveBlock1 + 0x1A54\n\
-	adds r0, r5, r0\n\
-	mov r5, r9\n\
-	strh r5, [r0]\n\
-	adds r0, r4, 0x1\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	cmp r4, 0x3\n\
-	bls _080BC322\n\
-	ldr r1, _080BC42C @ =gSaveBlock1 + 0x1A84\n\
-	adds r0, r1, r2\n\
-	strh r5, [r0]\n\
-	ldr r5, _080BC430 @ =gSaveBlock1 + 0x1A90\n\
-	adds r0, r5, r2\n\
-	mov r1, r9\n\
-	strh r1, [r0]\n\
-	ldr r2, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\
-	adds r0, r2, r6\n\
-	mov r5, r9\n\
-	strb r5, [r0]\n\
-	ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\
-	adds r0, r1, r3\n\
-	mov r2, r9\n\
-	str r2, [r0]\n\
-	ldr r3, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\
-	adds r0, r3, r6\n\
-	strb r2, [r0]\n\
-	movs r0, 0x64\n\
-	adds r5, r6, 0\n\
-	muls r5, r0\n\
-	adds r4, r5, r7\n\
-	adds r0, r4, 0\n\
-	movs r1, 0xB\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	beq _080BC408\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x2D\n\
-	bl GetMonData\n\
-	cmp r0, 0\n\
-	bne _080BC408\n\
-	movs r4, 0\n\
-	mov r0, r10\n\
-	lsls r0, 2\n\
-	mov r8, r0\n\
-	mov r1, r10\n\
-	lsls r7, r1, 1\n\
-	adds r1, 0x1\n\
-	str r1, [sp, 0x4]\n\
-	ldr r2, _080BC424 @ =gPlayerParty\n\
+    adds r0, r1, r4\n\
+    lsls r0, 1\n\
+    ldr r5, _080BC428 @ =gSaveBlock1 + 0x1A54\n\
+    adds r0, r5, r0\n\
+    mov r5, r9\n\
+    strh r5, [r0]\n\
+    adds r0, r4, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    cmp r4, 0x3\n\
+    bls _080BC322\n\
+    ldr r1, _080BC42C @ =gSaveBlock1 + 0x1A84\n\
+    adds r0, r1, r2\n\
+    strh r5, [r0]\n\
+    ldr r5, _080BC430 @ =gSaveBlock1 + 0x1A90\n\
+    adds r0, r5, r2\n\
+    mov r1, r9\n\
+    strh r1, [r0]\n\
+    ldr r2, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\
+    adds r0, r2, r6\n\
+    mov r5, r9\n\
+    strb r5, [r0]\n\
+    ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\
+    adds r0, r1, r3\n\
+    mov r2, r9\n\
+    str r2, [r0]\n\
+    ldr r3, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\
+    adds r0, r3, r6\n\
+    strb r2, [r0]\n\
+    movs r0, 0x64\n\
+    adds r5, r6, 0\n\
+    muls r5, r0\n\
+    adds r4, r5, r7\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xB\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    beq _080BC408\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x2D\n\
+    bl GetMonData\n\
+    cmp r0, 0\n\
+    bne _080BC408\n\
+    movs r4, 0\n\
+    mov r0, r10\n\
+    lsls r0, 2\n\
+    mov r8, r0\n\
+    mov r1, r10\n\
+    lsls r7, r1, 1\n\
+    adds r1, 0x1\n\
+    str r1, [sp, 0x4]\n\
+    ldr r2, _080BC424 @ =gPlayerParty\n\
 _080BC38E:\n\
-	adds r1, r4, 0\n\
-	adds r1, 0xD\n\
-	adds r0, r5, r2\n\
-	str r2, [sp, 0x8]\n\
-	bl GetMonData\n\
-	mov r3, r8\n\
-	adds r1, r3, r4\n\
-	lsls r1, 1\n\
-	ldr r3, _080BC428 @ =gSaveBlock1 + 0x1A54\n\
-	adds r1, r3, r1\n\
-	strh r0, [r1]\n\
-	adds r0, r4, 0x1\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	ldr r2, [sp, 0x8]\n\
-	cmp r4, 0x3\n\
-	bls _080BC38E\n\
-	movs r0, 0x64\n\
-	adds r4, r6, 0\n\
-	muls r4, r0\n\
-	ldr r0, _080BC424 @ =gPlayerParty\n\
-	adds r4, r0\n\
-	adds r0, r4, 0\n\
-	movs r1, 0xB\n\
-	bl GetMonData\n\
-	ldr r5, _080BC42C @ =gSaveBlock1 + 0x1A84\n\
-	adds r1, r5, r7\n\
-	strh r0, [r1]\n\
-	adds r0, r4, 0\n\
-	movs r1, 0xC\n\
-	bl GetMonData\n\
-	ldr r2, _080BC430 @ =gSaveBlock1 + 0x1A90\n\
-	adds r1, r2, r7\n\
-	strh r0, [r1]\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x38\n\
-	bl GetMonData\n\
-	ldr r1, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\
-	add r1, r10\n\
-	strb r0, [r1]\n\
-	adds r0, r4, 0\n\
-	movs r1, 0\n\
-	bl GetMonData\n\
-	ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\
-	add r1, r8\n\
-	str r0, [r1]\n\
-	adds r0, r4, 0\n\
-	bl sub_80BC298\n\
-	ldr r1, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\
-	add r1, r10\n\
-	strb r0, [r1]\n\
-	ldr r3, [sp, 0x4]\n\
-	lsls r0, r3, 16\n\
-	lsrs r0, 16\n\
-	mov r10, r0\n\
+    adds r1, r4, 0\n\
+    adds r1, 0xD\n\
+    adds r0, r5, r2\n\
+    str r2, [sp, 0x8]\n\
+    bl GetMonData\n\
+    mov r3, r8\n\
+    adds r1, r3, r4\n\
+    lsls r1, 1\n\
+    ldr r3, _080BC428 @ =gSaveBlock1 + 0x1A54\n\
+    adds r1, r3, r1\n\
+    strh r0, [r1]\n\
+    adds r0, r4, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    ldr r2, [sp, 0x8]\n\
+    cmp r4, 0x3\n\
+    bls _080BC38E\n\
+    movs r0, 0x64\n\
+    adds r4, r6, 0\n\
+    muls r4, r0\n\
+    ldr r0, _080BC424 @ =gPlayerParty\n\
+    adds r4, r0\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xB\n\
+    bl GetMonData\n\
+    ldr r5, _080BC42C @ =gSaveBlock1 + 0x1A84\n\
+    adds r1, r5, r7\n\
+    strh r0, [r1]\n\
+    adds r0, r4, 0\n\
+    movs r1, 0xC\n\
+    bl GetMonData\n\
+    ldr r2, _080BC430 @ =gSaveBlock1 + 0x1A90\n\
+    adds r1, r2, r7\n\
+    strh r0, [r1]\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x38\n\
+    bl GetMonData\n\
+    ldr r1, _080BC434 @ =gSaveBlock1 + 0x1A9C\n\
+    add r1, r10\n\
+    strb r0, [r1]\n\
+    adds r0, r4, 0\n\
+    movs r1, 0\n\
+    bl GetMonData\n\
+    ldr r1, _080BC438 @ =gSaveBlock1 + 0x1A3C\n\
+    add r1, r8\n\
+    str r0, [r1]\n\
+    adds r0, r4, 0\n\
+    bl sub_80BC298\n\
+    ldr r1, _080BC43C @ =gSaveBlock1 + 0x1AA2\n\
+    add r1, r10\n\
+    strb r0, [r1]\n\
+    ldr r3, [sp, 0x4]\n\
+    lsls r0, r3, 16\n\
+    lsrs r0, 16\n\
+    mov r10, r0\n\
 _080BC408:\n\
-	ldr r5, [sp]\n\
-	lsls r0, r5, 16\n\
-	lsrs r6, r0, 16\n\
-	cmp r6, 0x5\n\
-	bls _080BC314\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 {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    ldr r5, [sp]\n\
+    lsls r0, r5, 16\n\
+    lsrs r6, r0, 16\n\
+    cmp r6, 0x5\n\
+    bls _080BC314\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 {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _080BC424: .4byte gPlayerParty\n\
 _080BC428: .4byte gSaveBlock1 + 0x1A54\n\
 _080BC42C: .4byte gSaveBlock1 + 0x1A84\n\