From 454d7bbdd7ee6c5cb61680da855755869662968f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 5 Jun 2017 10:58:50 -0400
Subject: Decompile asm/decoration_inventory.s

---
 asm/decoration_inventory.s     | 404 -----------------------------------------
 include/decoration_inventory.h |   8 +
 ld_script.txt                  |   2 +-
 src/decoration_inventory.c     | 156 ++++++++++++++++
 4 files changed, 165 insertions(+), 405 deletions(-)
 delete mode 100644 asm/decoration_inventory.s
 create mode 100644 include/decoration_inventory.h
 create mode 100644 src/decoration_inventory.c

diff --git a/asm/decoration_inventory.s b/asm/decoration_inventory.s
deleted file mode 100644
index 953d770ae..000000000
--- a/asm/decoration_inventory.s
+++ /dev/null
@@ -1,404 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-	
-	thumb_func_start ClearDecorationInventory
-ClearDecorationInventory: @ 8133F4C
-	push {r4,r5,lr}
-	lsls r0, 24
-	movs r3, 0
-	ldr r1, _08133F7C @ =gDecorationInventories
-	lsrs r2, r0, 21
-	adds r0, r2, r1
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcs _08133F76
-	adds r5, r1, 0
-	movs r4, 0
-_08133F62:
-	adds r0, r2, r5
-	ldr r1, [r0]
-	adds r1, r3
-	strb r4, [r1]
-	adds r1, r3, 0x1
-	lsls r1, 24
-	lsrs r3, r1, 24
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcc _08133F62
-_08133F76:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08133F7C: .4byte gDecorationInventories
-	thumb_func_end ClearDecorationInventory
-
-	thumb_func_start ClearDecorationInventories
-ClearDecorationInventories: @ 8133F80
-	push {r4,lr}
-	movs r4, 0
-_08133F84:
-	adds r0, r4, 0
-	bl ClearDecorationInventory
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _08133F84
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end ClearDecorationInventories
-
-	thumb_func_start sub_8133F9C
-sub_8133F9C: @ 8133F9C
-	push {r4,lr}
-	lsls r0, 24
-	movs r2, 0
-	ldr r1, _08133FC8 @ =gDecorationInventories
-	lsrs r0, 21
-	adds r0, r1
-	movs r1, 0x4
-	ldrsb r1, [r0, r1]
-	cmp r2, r1
-	bge _08133FD8
-	adds r4, r0, 0
-	adds r3, r1, 0
-_08133FB4:
-	lsls r0, r2, 24
-	asrs r1, r0, 24
-	ldr r0, [r4]
-	adds r0, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _08133FCC
-	adds r0, r1, 0
-	b _08133FDC
-	.align 2, 0
-_08133FC8: .4byte gDecorationInventories
-_08133FCC:
-	adds r0, r1, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	asrs r0, 24
-	cmp r0, r3
-	blt _08133FB4
-_08133FD8:
-	movs r0, 0x1
-	negs r0, r0
-_08133FDC:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8133F9C
-
-	thumb_func_start sub_8133FE4
-sub_8133FE4: @ 8133FE4
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldr r1, _08134010 @ =gDecorations
-	lsls r0, r3, 5
-	adds r0, r1
-	ldrb r0, [r0, 0x13]
-	movs r2, 0
-	ldr r1, _08134014 @ =gDecorationInventories
-	lsls r0, 3
-	adds r0, r1
-	ldrb r1, [r0, 0x4]
-	cmp r2, r1
-	bcs _08134022
-	ldr r4, [r0]
-_08134002:
-	adds r0, r4, r2
-	ldrb r0, [r0]
-	cmp r0, r3
-	bne _08134018
-	movs r0, 0x1
-	b _08134024
-	.align 2, 0
-_08134010: .4byte gDecorations
-_08134014: .4byte gDecorationInventories
-_08134018:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, r1
-	bcc _08134002
-_08134022:
-	movs r0, 0
-_08134024:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8133FE4
-
-	thumb_func_start IsThereStorageSpaceForDecoration
-IsThereStorageSpaceForDecoration: @ 813402C
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r4, r0, 0
-	cmp r4, 0
-	beq _0813406C
-	ldr r1, _08134064 @ =gDecorations
-	lsls r0, r4, 5
-	adds r0, r1
-	ldrb r5, [r0, 0x13]
-	adds r0, r5, 0
-	bl sub_8133F9C
-	lsls r0, 24
-	asrs r2, r0, 24
-	movs r0, 0x1
-	negs r0, r0
-	cmp r2, r0
-	beq _0813406C
-	ldr r0, _08134068 @ =gDecorationInventories
-	lsls r1, r5, 3
-	adds r1, r0
-	ldr r0, [r1]
-	adds r0, r2
-	strb r4, [r0]
-	movs r0, 0x1
-	b _0813406E
-	.align 2, 0
-_08134064: .4byte gDecorations
-_08134068: .4byte gDecorationInventories
-_0813406C:
-	movs r0, 0
-_0813406E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end IsThereStorageSpaceForDecoration
-
-	thumb_func_start sub_8134074
-sub_8134074: @ 8134074
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0
-	beq _081340A0
-	ldr r1, _0813409C @ =gDecorations
-	lsls r0, 5
-	adds r0, r1
-	ldrb r0, [r0, 0x13]
-	bl sub_8133F9C
-	lsls r0, 24
-	asrs r0, 24
-	movs r1, 0x1
-	negs r1, r1
-	cmp r0, r1
-	beq _081340A0
-	movs r0, 0x1
-	b _081340A2
-	.align 2, 0
-_0813409C: .4byte gDecorations
-_081340A0:
-	movs r0, 0
-_081340A2:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8134074
-
-	thumb_func_start sub_81340A8
-sub_81340A8: @ 81340A8
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	movs r3, 0
-	cmp r5, 0
-	bne _081340C4
-	b _081340F2
-_081340B6:
-	movs r0, 0
-	strb r0, [r1]
-	adds r0, r6, 0
-	bl sub_8134104
-	movs r0, 0x1
-	b _081340F4
-_081340C4:
-	ldr r2, _081340FC @ =gDecorationInventories
-	ldr r1, _08134100 @ =gDecorations
-	lsls r0, r5, 5
-	adds r0, r1
-	ldrb r4, [r0, 0x13]
-	lsls r0, r4, 3
-	adds r0, r2
-	ldrb r1, [r0, 0x4]
-	cmp r3, r1
-	bcs _081340F2
-	adds r6, r4, 0
-	adds r4, r0, 0
-	adds r2, r1, 0
-_081340DE:
-	ldr r0, [r4]
-	adds r1, r0, r3
-	ldrb r0, [r1]
-	cmp r0, r5
-	beq _081340B6
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	cmp r3, r2
-	bcc _081340DE
-_081340F2:
-	movs r0, 0
-_081340F4:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081340FC: .4byte gDecorationInventories
-_08134100: .4byte gDecorations
-	thumb_func_end sub_81340A8
-
-	thumb_func_start sub_8134104
-sub_8134104: @ 8134104
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	movs r6, 0
-	ldr r2, _08134190 @ =gDecorationInventories
-	lsrs r1, r0, 21
-	adds r0, r1, r2
-	ldrb r0, [r0, 0x4]
-	cmp r6, r0
-	bcs _08134180
-	adds r7, r1, 0
-	mov r8, r0
-	str r0, [sp]
-_08134126:
-	adds r1, r6, 0x1
-	lsls r0, r1, 24
-	lsrs r3, r0, 24
-	adds r2, r7, 0
-	mov r12, r1
-	cmp r3, r8
-	bcs _08134174
-	ldr r1, _08134190 @ =gDecorationInventories
-	mov r10, r1
-	adds r0, r1, 0
-	mov r9, r0
-_0813413C:
-	mov r1, r10
-	adds r5, r2, r1
-	ldr r1, [r5]
-	adds r0, r1, r3
-	ldrb r4, [r0]
-	adds r2, r4, 0
-	cmp r2, 0
-	beq _08134162
-	adds r0, r1, r6
-	ldrb r1, [r0]
-	cmp r1, 0
-	beq _08134158
-	cmp r1, r2
-	bls _08134162
-_08134158:
-	ldrb r1, [r0]
-	strb r4, [r0]
-	ldr r0, [r5]
-	adds r0, r3
-	strb r1, [r0]
-_08134162:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	adds r2, r7, 0
-	mov r1, r9
-	adds r0, r2, r1
-	ldrb r0, [r0, 0x4]
-	cmp r3, r0
-	bcc _0813413C
-_08134174:
-	mov r1, r12
-	lsls r0, r1, 24
-	lsrs r6, r0, 24
-	ldr r0, [sp]
-	cmp r6, r0
-	bcc _08134126
-_08134180:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08134190: .4byte gDecorationInventories
-	thumb_func_end sub_8134104
-
-	thumb_func_start sub_8134194
-sub_8134194: @ 8134194
-	push {r4,r5,lr}
-	lsls r0, 24
-	movs r4, 0
-	movs r3, 0
-	ldr r2, _081341D0 @ =gDecorationInventories
-	lsrs r1, r0, 21
-	adds r0, r1, r2
-	ldrb r0, [r0, 0x4]
-	cmp r4, r0
-	bcs _081341C8
-	adds r5, r2, 0
-_081341AA:
-	adds r2, r1, r5
-	ldr r0, [r2]
-	adds r0, r3
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _081341BC
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-_081341BC:
-	adds r0, r3, 0x1
-	lsls r0, 24
-	lsrs r3, r0, 24
-	ldrb r2, [r2, 0x4]
-	cmp r3, r2
-	bcc _081341AA
-_081341C8:
-	adds r0, r4, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_081341D0: .4byte gDecorationInventories
-	thumb_func_end sub_8134194
-
-	thumb_func_start sub_81341D4
-sub_81341D4: @ 81341D4
-	push {r4,r5,lr}
-	movs r5, 0
-	movs r4, 0
-_081341DA:
-	adds r0, r4, 0
-	bl sub_8134194
-	adds r0, r5, r0
-	lsls r0, 24
-	lsrs r5, r0, 24
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x7
-	bls _081341DA
-	adds r0, r5, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81341D4
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h
new file mode 100644
index 000000000..dd87e7239
--- /dev/null
+++ b/include/decoration_inventory.h
@@ -0,0 +1,8 @@
+//
+// Created by Scott Norton on 6/5/17.
+//
+
+#ifndef POKERUBY_DECORATION_INVENTORY_H
+#define POKERUBY_DECORATION_INVENTORY_H
+
+#endif //POKERUBY_DECORATION_INVENTORY_H
diff --git a/ld_script.txt b/ld_script.txt
index 687280f94..b4c30ad57 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -253,7 +253,7 @@ SECTIONS {
         asm/battle_anim_812C144.o(.text);
         asm/learn_move.o(.text);
         src/fldeff_softboiled.o(.text);
-        asm/decoration_inventory.o(.text);
+        src/decoration_inventory.o(.text);
         src/roamer.o(.text);
         asm/battle_tower.o(.text);
         asm/use_pokeblock.o(.text);
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
new file mode 100644
index 000000000..a483629b1
--- /dev/null
+++ b/src/decoration_inventory.c
@@ -0,0 +1,156 @@
+//
+// Created by Scott Norton on 6/5/17.
+//
+
+#include "global.h"
+#include "sprite.h"
+#include "task.h"
+#include "decoration.h"
+#include "decoration_inventory.h"
+
+void ClearDecorationInventory(u8 invIdx)
+{
+    u8 i;
+    for (i=0; i<gDecorationInventories[invIdx].size; i++)
+    {
+        gDecorationInventories[invIdx].items[i] = DECOR_NONE;
+    }
+}
+
+void ClearDecorationInventories(void)
+{
+    u8 i;
+    for (i=0; i<8; i++)
+    {
+        ClearDecorationInventory(i);
+    }
+}
+
+s8 sub_8133F9C(u8 invIdx)
+{
+    s8 i;
+    for (i=0; i<(s8)gDecorationInventories[invIdx].size; i++)
+    {
+        if (gDecorationInventories[invIdx].items[i] == DECOR_NONE)
+        {
+            return i;
+        }
+    }
+    return -1;
+}
+
+bool8 sub_8133FE4(u8 decorIdx)
+{
+    u8 invIdx;
+    u8 i;
+    invIdx = gDecorations[decorIdx].decor_field_13;
+    for (i=0; i<gDecorationInventories[invIdx].size; i++)
+    {
+        if (gDecorationInventories[invIdx].items[i] == decorIdx)
+        {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+bool8 IsThereStorageSpaceForDecoration(u8 decorIdx)
+{
+    u8 invIdx;
+    s8 invSlot;
+    if (decorIdx == DECOR_NONE)
+    {
+        return FALSE;
+    }
+    invIdx = gDecorations[decorIdx].decor_field_13;
+    invSlot = sub_8133F9C(invIdx);
+    if (invSlot == -1)
+    {
+        return FALSE;
+    }
+    gDecorationInventories[invIdx].items[invSlot] = decorIdx;
+    return TRUE;
+}
+
+bool8 sub_8134074(u8 decorIdx)
+{
+    u8 invIdx;
+    if (decorIdx == DECOR_NONE)
+    {
+        return FALSE;
+    }
+    invIdx = gDecorations[decorIdx].decor_field_13;
+    if (sub_8133F9C(invIdx) == -1)
+    {
+        return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 sub_81340A8(u8 decorIdx)
+{
+    u8 i;
+    u8 invIdx;
+    i = 0;
+    if (decorIdx == DECOR_NONE)
+    {
+        return FALSE;
+    }
+    for (i=0; i<gDecorationInventories[gDecorations[decorIdx].decor_field_13].size; i++)
+    {
+        invIdx = gDecorations[decorIdx].decor_field_13;
+        if (gDecorationInventories[invIdx].items[i] == decorIdx)
+        {
+            gDecorationInventories[invIdx].items[i] = DECOR_NONE;
+            sub_8134104(invIdx);
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
+void sub_8134104(u8 invIdx)
+{
+    u8 i;
+    u8 j;
+    u8 tmp;
+    for (i=0; i<gDecorationInventories[invIdx].size; i++)
+    {
+        for (j=i+1; j<gDecorationInventories[invIdx].size; j++)
+        {
+            if (gDecorationInventories[invIdx].items[j] != 0 && (gDecorationInventories[invIdx].items[i] == DECOR_NONE || gDecorationInventories[invIdx].items[i] > gDecorationInventories[invIdx].items[j]))
+            {
+                tmp = gDecorationInventories[invIdx].items[i];
+                gDecorationInventories[invIdx].items[i] = gDecorationInventories[invIdx].items[j];
+                gDecorationInventories[invIdx].items[j] = tmp;
+            }
+        }
+    }
+}
+
+u8 sub_8134194(u8 invIdx)
+{
+    u8 i;
+    u8 count;
+    count = 0;
+    for (i=0; i<gDecorationInventories[invIdx].size; i++)
+    {
+        if (gDecorationInventories[invIdx].items[i] != 0)
+        {
+            count++;
+        }
+    }
+    return count;
+}
+
+u8 sub_81341D4(void)
+{
+    u8 i;
+    u8 count;
+    count = 0;
+    for (i=0; i<8; i++)
+    {
+        count += sub_8134194(i);
+    }
+    return count;
+}
-- 
cgit v1.2.3


From 4a6d595e5171ed4dc3742c3ff43e771b731a9716 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 5 Jun 2017 16:34:47 -0400
Subject: Assign types to structures passed to secret base exchange packet
 receipt subroutine staged for decompilation; decompile sub_8041324

---
 include/asm.inc.h       |  2 +-
 include/global.h        | 12 +++++--
 include/record_mixing.h |  2 +-
 src/daycare.c           | 84 +++++++++++++--------------------------------
 src/record_mixing.c     | 91 ++++++-------------------------------------------
 5 files changed, 45 insertions(+), 146 deletions(-)

diff --git a/include/asm.inc.h b/include/asm.inc.h
index e087acd28..7c090dec2 100644
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -42,7 +42,7 @@ void LoadWordFromTwoHalfwords(u16 *, u32 *);
 u8 Daycare_CountPokemon(struct BoxPokemon *);
 
 // asm/daycare.o
-void sub_8041324(struct BoxPokemon *, void *);
+void sub_8041324(struct BoxPokemon *, struct RecordMixing_UnknownStruct *);
 void sub_8041790(int i);
 u16 sub_8041870(u16);
 void sub_8041940(void);
diff --git a/include/global.h b/include/global.h
index 9a95cf41f..716aae15f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -472,10 +472,16 @@ struct GabbyAndTyData {
     /*2b1b*/ u8 valB_5:3;
 };
 
-struct RecordMixing_UnknownStruct {
+struct RecordMixing_UnknownStructSub {
 	u8 data[0x38];
 };
 
+struct RecordMixing_UnknownStruct {
+	struct RecordMixing_UnknownStructSub data[2];
+	u32 unk70;
+	u16 unk74[0x2];
+};
+
 struct SaveBlock1 /* 0x02025734 */
 {
     /*0x00*/ struct Coords16 pos;
@@ -551,8 +557,8 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2DFC*/ u8 filler_2DFC[0x8];
     /*0x2E04*/ SB_Struct sbStruct;
     /*0x2F9C*/ struct BoxPokemon daycareData[2];
-    /*0x303C*/ struct RecordMixing_UnknownStruct filler_303C[2];
-    /*0x30AC*/ u8 filler_30AC[0xA];
+    /*0x303C*/ struct RecordMixing_UnknownStruct filler_303C;
+    /*0x30AC*/ u8 filler_30B4[0x2];
     /*0x30B6*/ u8 filler_30B6;
     /*0x30B7*/ u8 filler_30B7[1];
     /*0x30B8*/ u8 linkBattleRecords[5][16];
diff --git a/include/record_mixing.h b/include/record_mixing.h
index 72a089ca1..ec30f50a0 100644
--- a/include/record_mixing.h
+++ b/include/record_mixing.h
@@ -27,7 +27,7 @@ void sub_80B9BC4(u32 a, u32 b, u32 c, u32 d);
 u8 sub_80B9C4C(u8 *a);
 
 // ASM
-void sub_80B9C6C(void *, u32, u8, void *);
+void sub_80B9C6C(struct RecordMixing_UnknownStruct *, u32, u8, void *);
 void sub_80B9F3C(void *, u8);
 void sub_80BA00C(u8);
 
diff --git a/src/daycare.c b/src/daycare.c
index 92be45cfa..5bcbff6af 100644
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -1,5 +1,7 @@
 #include "global.h"
 #include "pokemon.h"
+#include "species.h"
+#include "items.h"
 #include "string_util.h"
 #include "asm.h"
 
@@ -34,67 +36,29 @@ u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data)
 }
 
 #ifndef ASDF
-__attribute__((naked))
-void sub_8041324(struct BoxPokemon * box_pokemon, void * void_pointer)
+void sub_8041324(struct BoxPokemon * box_pokemon, struct RecordMixing_UnknownStruct * void_pointer)
 {
-    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\
-    mov r9, r0\n\
-    mov r10, r1\n\
-    movs r7, 0\n\
-    movs r5, 0\n\
-    mov r6, r10\n\
-    adds r6, 0x74\n\
-    movs r0, 0x1\n\
-    mov r8, r0\n\
-_0804133E:\n\
-    lsls r0, r5, 2\n\
-    adds r0, r5\n\
-    lsls r0, 4\n\
-    mov r1, r9\n\
-    adds r4, r1, r0\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xB\n\
-    bl GetBoxMonData\n\
-    cmp r0, 0\n\
-    beq _0804136E\n\
-    adds r0, r7, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r7, r0, 24\n\
-    adds r0, r4, 0\n\
-    movs r1, 0xC\n\
-    bl GetBoxMonData\n\
-    adds r1, r0, 0\n\
-    cmp r1, 0\n\
-    bne _0804136E\n\
-    lsls r0, r5, 1\n\
-    adds r0, r6, r0\n\
-    b _08041374\n\
-_0804136E:\n\
-    lsls r0, r5, 1\n\
-    adds r0, r6, r0\n\
-    mov r1, r8\n\
-_08041374:\n\
-    strh r1, [r0]\n\
-    adds r0, r5, 0x1\n\
-    lsls r0, 24\n\
-    lsrs r5, r0, 24\n\
-    cmp r5, 0x1\n\
-    bls _0804133E\n\
-    mov r0, r10\n\
-    str r7, [r0, 0x70]\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\
-    .syntax divided\n");
+    u8 i;
+    u8 specCount;
+    specCount = 0;
+    for (i=0; i<2; i++)
+    {
+        if (GetBoxMonData(&box_pokemon[i], MON_DATA_SPECIES) != SPECIES_NONE)
+        {
+            specCount ++;
+            if (GetBoxMonData(&box_pokemon[i], MON_DATA_HELD_ITEM) == ITEM_NONE)
+            {
+                void_pointer->unk74[i] = 0;
+            } else
+            {
+                void_pointer->unk74[i] = 1;
+            }
+        } else
+        {
+            void_pointer->unk74[i] = 1;
+        }
+    }
+    void_pointer->unk70 = specCount;
 }
 #endif
 
diff --git a/src/record_mixing.c b/src/record_mixing.c
index c84cfd2ae..6749941dd 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -13,18 +13,19 @@
 #include "strings2.h"
 #include "task.h"
 
+
 extern void *recordMixingSecretBases;
 extern void *recordMixingTvShows;
 extern void *gUnknown_083D0274;
 extern void *gUnknown_083D0278;
 extern void *recordMixingEasyChatPairs;
-extern void *gUnknown_083D0280;
 extern void *gUnknown_083D0284;
 extern u8 gUnknown_083D0288[2];
 extern u8 gUnknown_083D028A[2][3];
 extern u8 gUnknown_083D0290[9][4];
 
-extern struct RecordMixing_UnknownStruct gUnknown_02038738[2];  //Don't know what type this points to
+extern struct RecordMixing_UnknownStruct gUnknown_02038738;  //Don't know what type this points to
+extern struct RecordMixing_UnknownStruct *gUnknown_083D0280;
 extern u16 gSpecialVar_0x8005;
 extern u32 gUnknown_03005D2C;
 extern u8 gUnknown_03000718;
@@ -40,11 +41,11 @@ void sub_80B929C(void)
 
 struct PlayerRecords {
     struct SecretBaseRecord secretBases[20];
-    u8 tvShows[25][36];
+    TVShow tvShows[25];
     u8 filler1004[0x40];
     u8 filler1044[0x40];
     struct EasyChatPair easyChatPairs[5];
-    u8 filler10AC[0x78];
+    struct RecordMixing_UnknownStruct filler10AC;
     u8 filler1124[0xA4];
     u16 filler11C8[0x34];
 };
@@ -65,10 +66,10 @@ void RecordMixing_PrepareExchangePacket(void)
     memcpy(unk_2018000.filler1004, gUnknown_083D0274, 0x40);
     memcpy(unk_2018000.filler1044, gUnknown_083D0278, 0x40);
     memcpy(unk_2018000.easyChatPairs, recordMixingEasyChatPairs, 0x28);
-    gUnknown_02038738[0] = gSaveBlock1.filler_303C[0];
-    gUnknown_02038738[1] = gSaveBlock1.filler_303C[1];
-    sub_8041324(gSaveBlock1.daycareData, gUnknown_02038738);
-    memcpy(unk_2018000.filler10AC, gUnknown_083D0280, 0x78);
+    gUnknown_02038738.data[0] = gSaveBlock1.filler_303C.data[0];
+    gUnknown_02038738.data[1] = gSaveBlock1.filler_303C.data[1];
+    sub_8041324(gSaveBlock1.daycareData, &gUnknown_02038738);
+    memcpy(&unk_2018000.filler10AC, gUnknown_083D0280, sizeof(struct RecordMixing_UnknownStruct));
     memcpy(unk_2018000.filler1124, gUnknown_083D0284, 0xA4);
 
     if (GetMultiplayerId() == 0)
@@ -83,7 +84,7 @@ void RecordMixing_ReceiveExchangePacket(u32 a)
     sub_80B9B1C(unk_2008000.filler1044, sizeof(struct PlayerRecords), a);
     //UB: Too many arguments for function "sub_80FA4E4"
     sub_80FA4E4(unk_2008000.easyChatPairs, sizeof(struct PlayerRecords), a);
-    sub_80B9C6C(unk_2008000.filler10AC, sizeof(struct PlayerRecords), a, unk_2008000.tvShows);
+    sub_80B9C6C(&unk_2008000.filler10AC, sizeof(struct PlayerRecords), a, unk_2008000.tvShows);
     sub_80B9B70(unk_2008000.filler1124, sizeof(struct PlayerRecords), a);
     sub_80B9F3C(unk_2008000.filler11C8, a);
 }
@@ -517,75 +518,3 @@ u8 sub_80B9C4C(u8 *a)
     return r2;
 }
 
-struct UnkStruct1
-{
-    u8 unk0[4];
-    u8 unk4[4];
-    u8 unk8[4];
-    u8 fillerC[0x10];
-    u8 unk1C[4][2];
-    u8 filler24[8];
-    void *unk2C;
-    u32 unk30;
-    u32 unk34;
-    void *unk38;
-    u32 unk3C;
-    u32 unk40;
-    u8 filler44[4];
-    u32 unk48;
-    u32 unk4C;
-    u32 unk50;
-
-};
-
-/*
-//Not finished
-extern void sub_80B9C6C(void *a, u32 b, u8 c, void *d)
-{
-    struct UnkStruct1 s;
-    u16 r8;
-    u16 r3;
-
-    s.unk2C = a;
-    s.unk30 = b;
-    s.unk38 = d;
-    s.unk34 = c;
-    s.unk40 = Random();
-    SeedRng(gLinkPlayers[0].trainerId);
-    r8 = GetLinkPlayerCount();
-    r3 = 0;
-
-    s.unk4C = 12;
-
-    while (r3 < 4)
-    {
-
-        s.unk4[r3] |= 0xFF;
-        s.unk8[r3] = 0;
-
-        s.unk1C[r3][0] = 0;
-        s.unk1C[r3][1] = 0;
-        r3++;
-    }
-    s.unk3C = 0;
-    r3 = 0;
-    s.unk50 = r8 << 16;
-    s.unk48 = s.unk30 * s.unk34;
-
-    if (s.unk3C < r8)
-    {
-        do  //_080B9D00
-        {
-            u32 *r6 = (u32 *)(s.unk2C + s.unk30 * r3);
-            if (r6[0x1C] != 0 && r6[0x1C] > 0)
-            {
-
-            }
-            //_080B9D3C
-        }
-        while (r3 < r8);
-    }
-    //_080B9D46
-}
-*/
-
-- 
cgit v1.2.3


From dc79b94bb32c758253aba698115b60cb5a683266 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 5 Jun 2017 17:45:15 -0400
Subject: Nonmatching sub_80B9BC4

---
 include/record_mixing.h |  2 +-
 src/record_mixing.c     | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/include/record_mixing.h b/include/record_mixing.h
index ec30f50a0..103f5ad64 100644
--- a/include/record_mixing.h
+++ b/include/record_mixing.h
@@ -23,7 +23,7 @@ void sub_80B9A88(u8 *a);
 void sub_80B9B1C(u8 *a, size_t size, u8 index);
 void sub_80B9B70(u8 *a, size_t size, u8 index);
 u8 sub_80B9BBC(u16 *a);
-void sub_80B9BC4(u32 a, u32 b, u32 c, u32 d);
+void sub_80B9BC4(struct RecordMixing_UnknownStruct *, size_t, u8 [][2], u8, u8);
 u8 sub_80B9C4C(u8 *a);
 
 // ASM
diff --git a/src/record_mixing.c b/src/record_mixing.c
index 6749941dd..f9cb4116e 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -429,14 +429,20 @@ u8 sub_80B9BBC(u16 *a)
 #undef NONMATCHING
 #ifdef NONMATCHING
 
-void sub_80B9BC4(u32 a, u32 b, u32 c, u32 d)
+void sub_80B9BC4(struct RecordMixing_UnknownStruct *a, size_t b, u8 c[][2], u8 d, u8 e)
 {
+    struct RecordMixing_UnknownStructSub *offA;
+    struct RecordMixing_UnknownStructSub *offB;
+    struct RecordMixing_UnknownStructSub v0;
+    v0 = (offA = ((struct RecordMixing_UnknownStruct *)(b * c[d][0] + (u32)&a))->data)[c[d][1]];
+    offA[c[d][1]] = (offB = ((struct RecordMixing_UnknownStruct *)(b * c[e][0] + (u32)&a))->data)[c[e][1]];
+    offB[c[e][1]] = v0;
     //ToDo: Figure out what this strange stack usage is
 }
 
 #else
 __attribute__((naked))
-void sub_80B9BC4(u32 a, u32 b, u32 c, u32 d)
+void sub_80B9BC4(struct RecordMixing_UnknownStruct *a, size_t b, u8 c[][2], u8 d, u8 e)
 {
     asm(".syntax unified\n\
     push {r4-r6,lr}\n\
-- 
cgit v1.2.3


From 416ef99e4217e1f309b7560974fb5dabfa1329a8 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 6 Jun 2017 17:58:40 -0400
Subject: Pick up decompiling field_effect.s

---
 asm/field_effect.s      | 335 ------------------------------------------------
 include/field_effect.h  |  10 ++
 include/field_weather.h |   2 +
 include/gba/types.h     |   2 +-
 src/field_effect.c      |  98 +++++++++++++-
 src/palette.c           |   8 +-
 6 files changed, 114 insertions(+), 341 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 2dfa491dc..246e66d04 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,341 +6,6 @@
 
 	.text
 
-	thumb_func_start CreateTrainerSprite_BirchSpeech
-CreateTrainerSprite_BirchSpeech: @ 80859BC
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x18
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	mov r9, r3
-	ldr r7, [sp, 0x34]
-	lsls r4, 24
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r6, 16
-	lsrs r6, 16
-	mov r0, r9
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	lsrs r4, 21
-	ldr r3, _08085A44 @ =gTrainerFrontPicPaletteTable
-	mov r8, r3
-	add r8, r4
-	mov r0, r8
-	adds r1, r7, 0
-	bl LoadCompressedObjectPaletteOverrideBuffer
-	ldr r0, _08085A48 @ =gTrainerFrontPicTable
-	adds r4, r0
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl LoadCompressedObjectPicOverrideBuffer
-	mov r1, sp
-	ldrh r0, [r4, 0x6]
-	movs r2, 0
-	strh r0, [r1]
-	mov r3, r8
-	ldrh r0, [r3, 0x4]
-	strh r0, [r1, 0x2]
-	ldr r0, _08085A4C @ =gOamData_839F0F4
-	str r0, [sp, 0x4]
-	ldr r0, _08085A50 @ =gDummySpriteAnimTable
-	str r0, [sp, 0x8]
-	str r2, [sp, 0xC]
-	ldr r0, _08085A54 @ =gDummySpriteAffineAnimTable
-	str r0, [sp, 0x10]
-	ldr r0, _08085A58 @ =SpriteCallbackDummy
-	str r0, [sp, 0x14]
-	lsls r5, 16
-	asrs r5, 16
-	lsls r6, 16
-	asrs r6, 16
-	mov r0, sp
-	adds r1, r5, 0
-	adds r2, r6, 0
-	mov r3, r9
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	add sp, 0x18
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08085A44: .4byte gTrainerFrontPicPaletteTable
-_08085A48: .4byte gTrainerFrontPicTable
-_08085A4C: .4byte gOamData_839F0F4
-_08085A50: .4byte gDummySpriteAnimTable
-_08085A54: .4byte gDummySpriteAffineAnimTable
-_08085A58: .4byte SpriteCallbackDummy
-	thumb_func_end CreateTrainerSprite_BirchSpeech
-
-	thumb_func_start LoadTrainerGfx_TrainerCard
-LoadTrainerGfx_TrainerCard: @ 8085A5C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r1, r2, 0
-	lsls r4, 24
-	lsls r5, 16
-	lsrs r5, 16
-	ldr r0, _08085A8C @ =gTrainerFrontPicTable
-	lsrs r4, 21
-	adds r0, r4, r0
-	ldr r0, [r0]
-	bl LZDecompressVram
-	ldr r0, _08085A90 @ =gTrainerFrontPicPaletteTable
-	adds r4, r0
-	ldr r0, [r4]
-	adds r1, r5, 0
-	movs r2, 0x20
-	bl LoadCompressedPalette
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085A8C: .4byte gTrainerFrontPicTable
-_08085A90: .4byte gTrainerFrontPicPaletteTable
-	thumb_func_end LoadTrainerGfx_TrainerCard
-
-	thumb_func_start CreateBirchSprite
-CreateBirchSprite: @ 8085A94
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r6, 24
-	lsrs r6, 24
-	ldr r0, _08085ACC @ =gUnknown_0839F114
-	bl LoadSpritePalette
-	ldr r0, _08085AD0 @ =gSpriteTemplate_839F128
-	lsls r4, 16
-	asrs r4, 16
-	lsls r5, 16
-	asrs r5, 16
-	adds r1, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08085ACC: .4byte gUnknown_0839F114
-_08085AD0: .4byte gSpriteTemplate_839F128
-	thumb_func_end CreateBirchSprite
-
-	thumb_func_start CreateMonSprite_PicBox
-CreateMonSprite_PicBox: @ 8085AD4
-	push {r4-r6,lr}
-	mov r6, r10
-	mov r5, r9
-	mov r4, r8
-	push {r4-r6}
-	sub sp, 0x8
-	adds r4, r0, 0
-	adds r6, r1, 0
-	mov r8, r2
-	mov r10, r3
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r6, 16
-	lsrs r6, 16
-	mov r0, r8
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	mov r0, r10
-	lsls r0, 24
-	lsrs r0, 24
-	mov r10, r0
-	lsls r0, r4, 3
-	mov r9, r0
-	ldr r0, _08085B74 @ =gMonFrontPicTable
-	add r0, r9
-	ldr r1, _08085B78 @ =gMonFrontPicCoords
-	lsls r2, r4, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	ldr r3, _08085B7C @ =gUnknown_081FAF4C
-	ldr r3, [r3, 0xC]
-	str r3, [sp]
-	str r4, [sp, 0x4]
-	bl DecompressPicFromTable_2
-	ldr r5, _08085B80 @ =gMonPaletteTable
-	add r9, r5
-	mov r0, r9
-	bl LoadCompressedObjectPalette
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl GetMonSpriteTemplate_803C56C
-	ldr r4, _08085B84 @ =gUnknown_02024E8C
-	ldrh r0, [r5, 0x4]
-	strh r0, [r4, 0x2]
-	ldrh r0, [r5, 0x4]
-	bl IndexOfSpritePaletteTag
-	adds r0, 0x10
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_807DE38
-	lsls r6, 16
-	asrs r6, 16
-	mov r0, r8
-	lsls r0, 16
-	asrs r0, 16
-	mov r8, r0
-	adds r0, r4, 0
-	adds r1, r6, 0
-	mov r2, r8
-	mov r3, r10
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	add sp, 0x8
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08085B74: .4byte gMonFrontPicTable
-_08085B78: .4byte gMonFrontPicCoords
-_08085B7C: .4byte gUnknown_081FAF4C
-_08085B80: .4byte gMonPaletteTable
-_08085B84: .4byte gUnknown_02024E8C
-	thumb_func_end CreateMonSprite_PicBox
-
-	thumb_func_start CreateMonSprite_FieldMove
-CreateMonSprite_FieldMove: @ 8085B88
-	push {r4-r6,lr}
-	mov r6, r10
-	mov r5, r9
-	mov r4, r8
-	push {r4-r6}
-	sub sp, 0xC
-	adds r5, r0, 0
-	mov r10, r1
-	adds r4, r2, 0
-	adds r6, r3, 0
-	ldr r0, [sp, 0x28]
-	mov r8, r0
-	ldr r0, [sp, 0x2C]
-	mov r9, r0
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r6, 16
-	lsrs r6, 16
-	mov r0, r8
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	mov r0, r9
-	lsls r0, 24
-	lsrs r0, 24
-	mov r9, r0
-	lsls r0, r5, 3
-	ldr r1, _08085C34 @ =gMonFrontPicTable
-	adds r0, r1
-	ldr r1, _08085C38 @ =gMonFrontPicCoords
-	lsls r2, r5, 2
-	adds r2, r1
-	ldrb r1, [r2]
-	ldrb r2, [r2, 0x1]
-	ldr r3, _08085C3C @ =gUnknown_081FAF4C
-	ldr r3, [r3, 0xC]
-	str r3, [sp]
-	str r5, [sp, 0x4]
-	str r4, [sp, 0x8]
-	bl HandleLoadSpecialPokePic
-	adds r0, r5, 0
-	mov r1, r10
-	adds r2, r4, 0
-	bl sub_80409C8
-	adds r4, r0, 0
-	bl LoadCompressedObjectPalette
-	adds r0, r5, 0
-	movs r1, 0x3
-	bl GetMonSpriteTemplate_803C56C
-	ldr r5, _08085C40 @ =gUnknown_02024E8C
-	ldrh r0, [r4, 0x4]
-	strh r0, [r5, 0x2]
-	ldrh r0, [r4, 0x4]
-	bl IndexOfSpritePaletteTag
-	adds r0, 0x10
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_807DE38
-	lsls r6, 16
-	asrs r6, 16
-	mov r0, r8
-	lsls r0, 16
-	asrs r0, 16
-	mov r8, r0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	mov r2, r8
-	mov r3, r9
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08085C34: .4byte gMonFrontPicTable
-_08085C38: .4byte gMonFrontPicCoords
-_08085C3C: .4byte gUnknown_081FAF4C
-_08085C40: .4byte gUnknown_02024E8C
-	thumb_func_end CreateMonSprite_FieldMove
-
-	thumb_func_start FreeResourcesAndDestroySprite
-FreeResourcesAndDestroySprite: @ 8085C44
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_807DE68
-	ldrb r0, [r4, 0x5]
-	lsrs r0, 4
-	bl GetSpritePaletteTagByPaletteNum
-	lsls r0, 16
-	lsrs r0, 16
-	bl FreeSpritePaletteByTag
-	ldrb r0, [r4, 0x1]
-	lsls r0, 30
-	cmp r0, 0
-	beq _08085C6E
-	ldrb r0, [r4, 0x3]
-	lsls r0, 26
-	lsrs r0, 27
-	bl FreeOamMatrix
-_08085C6E:
-	adds r0, r4, 0
-	bl DestroySprite
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end FreeResourcesAndDestroySprite
-
 	thumb_func_start MultiplyInvertedPaletteRGBComponents
 MultiplyInvertedPaletteRGBComponents: @ 8085C7C
 	push {r4-r7,lr}
diff --git a/include/field_effect.h b/include/field_effect.h
index a46c048cb..d4ec0c8b4 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -3,6 +3,15 @@
 
 #include "sprite.h"
 
+extern const struct SpritePalette gTrainerFrontPicPaletteTable[2];
+extern const struct SpritePalette gUnknown_0839F114;
+extern const struct SpriteSheet gTrainerFrontPicTable[2];
+extern const struct SpriteTemplate gSpriteTemplate_839F128;
+extern const struct OamData gOamData_839F0F4;
+extern struct SpriteTemplate gUnknown_02024E8C;
+
+extern const struct SpritePalette *sub_80409C8(u16, u32, u32);
+
 u32 FieldEffectStart(u8 id);
 bool8 FieldEffectCmd_loadtiles(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadfadedpal(u8 **script, u32 *val);
@@ -25,5 +34,6 @@ void FieldEffectActiveListClear(void);
 void FieldEffectActiveListAdd(u8 id);
 void FieldEffectActiveListRemove(u8 id);
 bool8 FieldEffectActiveListContains(u8 id);
+void sub_807DE38(u8 index);
 
 #endif // GUARD_FIELD_EFFECT_H
diff --git a/include/field_weather.h b/include/field_weather.h
index af07c970d..df216aea7 100644
--- a/include/field_weather.h
+++ b/include/field_weather.h
@@ -31,6 +31,8 @@ void sub_807D874(u8);
 // ...
 void sub_807DB64(u8, u8);
 // ...
+void sub_807DE68(void);
+// ...
 void PlayRainSoundEffect(void);
 // ...
 void SetSav1Weather(u32);
diff --git a/include/gba/types.h b/include/gba/types.h
index fd8a20a4c..96e057ab7 100644
--- a/include/gba/types.h
+++ b/include/gba/types.h
@@ -34,7 +34,7 @@ struct PlttData
     u16 g:5; // green
     u16 b:5; // blue
     u16 unused_15:1;
-};
+} /*__attribute__((packed))*/;
 
 struct OamData
 {
diff --git a/src/field_effect.c b/src/field_effect.c
index bbc1144c1..e13809d27 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1,8 +1,11 @@
 #include "global.h"
-#include "field_effect.h"
+#include "data2.h"
 #include "field_weather.h"
+#include "decompress.h"
 #include "sprite.h"
+#include "palette.h"
 #include "text.h"
+#include "field_effect.h"
 
 typedef bool8 (*FldEffCmd)(u8 **, u32 *);
 
@@ -207,3 +210,96 @@ bool8 FieldEffectActiveListContains(u8 id)
             return TRUE;
     return FALSE;
 }
+
+u8 CreateTrainerSprite_BirchSpeech(u8 gender, s16 x, s16 y, u8 subpriority, u8 *buffer)
+{
+    struct SpriteTemplate spriteTemplate;
+    LoadCompressedObjectPaletteOverrideBuffer(&gTrainerFrontPicPaletteTable[gender], buffer);
+    LoadCompressedObjectPicOverrideBuffer(&gTrainerFrontPicTable[gender], buffer);
+    spriteTemplate.tileTag = gTrainerFrontPicTable[gender].tag;
+    spriteTemplate.paletteTag = gTrainerFrontPicPaletteTable[gender].tag;
+    spriteTemplate.oam = &gOamData_839F0F4;
+    spriteTemplate.anims = gDummySpriteAnimTable;
+    spriteTemplate.images = NULL;
+    spriteTemplate.affineAnims = gDummySpriteAffineAnimTable;
+    spriteTemplate.callback = SpriteCallbackDummy;
+    return CreateSprite(&spriteTemplate, x, y, subpriority);
+}
+
+void LoadTrainerGfx_TrainerCard(u8 gender, u16 palOffset, u8 *dest)
+{
+    LZDecompressVram(gTrainerFrontPicTable[gender].data, dest);
+    LoadCompressedPalette(gTrainerFrontPicPaletteTable[gender].data, palOffset, 0x20);
+}
+
+u8 CreateBirchSprite(s16 x, s16 y, u8 subpriority)
+{
+    LoadSpritePalette(&gUnknown_0839F114);
+    return CreateSprite(&gSpriteTemplate_839F128, x, y, subpriority);
+}
+
+u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority)
+{
+    DecompressPicFromTable_2(&gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset, gUnknown_081FAF4C[3], gUnknown_081FAF4C[3], species);
+    LoadCompressedObjectPalette(&gMonPaletteTable[species]);
+    GetMonSpriteTemplate_803C56C(species, 3);
+    gUnknown_02024E8C.paletteTag = gMonPaletteTable[0].tag;
+    sub_807DE38(IndexOfSpritePaletteTag(gMonPaletteTable[0].tag) + 0x10);
+    return CreateSprite(&gUnknown_02024E8C, x, y, subpriority);
+}
+
+u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subpriority)
+{
+    const struct SpritePalette *spritePalette;
+    HandleLoadSpecialPokePic(&gMonFrontPicTable[species], gMonFrontPicCoords[species].coords, gMonFrontPicCoords[species].y_offset, (u32)gUnknown_081FAF4C[3] /* this is actually u8* or something, pointing to ewram */, gUnknown_081FAF4C[3], species, g);
+    spritePalette = sub_80409C8(species, d, g);
+    LoadCompressedObjectPalette(spritePalette);
+    GetMonSpriteTemplate_803C56C(species, 3);
+    gUnknown_02024E8C.paletteTag = spritePalette->tag;
+    sub_807DE38(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10);
+    return CreateSprite(&gUnknown_02024E8C, x, y, subpriority);
+}
+
+void FreeResourcesAndDestroySprite(struct Sprite *sprite)
+{
+    sub_807DE68();
+    FreeSpritePaletteByTag(GetSpritePaletteTagByPaletteNum(sprite->oam.paletteNum));
+    if (sprite->oam.affineMode != 0)
+    {
+        FreeOamMatrix(sprite->oam.matrixNum);
+    }
+    DestroySprite(sprite);
+}
+
+#undef NONMATCHING
+#ifdef NONMATCHING
+void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
+{
+    int curRed;
+    int curGreen;
+    int curBlue;
+
+    curRed = gPlttBufferUnfaded[i] & 0x1f;
+    curGreen = (gPlttBufferUnfaded[i] & (0x1f << 5)) >> 5;
+    curBlue = (gPlttBufferUnfaded[i] & (0x1f << 10)) >> 10;
+    curRed += (((0x1f - curRed) * r) >> 4);
+    curGreen += (((0x1f - curGreen) * g) >> 4);
+    curBlue += (((0x1f - curBlue) * b) >> 4);
+    gPlttBufferFaded[i] = RGB(curRed, curGreen, curBlue);
+}
+
+void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
+{
+    int curRed;
+    int curGreen;
+    int curBlue;
+
+    curRed = gPlttBufferUnfaded[i] & 0x1f;
+    curGreen = (gPlttBufferUnfaded[i] & (0x1f << 5)) >> 5;
+    curBlue = (gPlttBufferUnfaded[i] & (0x1f << 10)) >> 10;
+    curRed -= ((curRed * r) >> 4);
+    curGreen -= ((curGreen * g) >> 4);
+    curBlue -= ((curBlue * b) >> 4);
+    gPlttBufferFaded[i] = RGB(curRed, curGreen, curBlue);
+}
+#endif
diff --git a/src/palette.c b/src/palette.c
index 165eb2eae..a610049bc 100644
--- a/src/palette.c
+++ b/src/palette.c
@@ -615,7 +615,7 @@ static u8 UpdateFastPaletteFade(void)
             if (b < b0)
                 b = b0;
 
-            gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
+            gPlttBufferFaded[i] = RGB(r, g, b);
         }
         break;
     case FAST_FADE_OUT_TO_WHTIE:
@@ -633,7 +633,7 @@ static u8 UpdateFastPaletteFade(void)
             if (b > 31)
                 b = 31;
 
-            gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
+            gPlttBufferFaded[i] = RGB(r, g, b);
         }
         break;
     case FAST_FADE_IN_FROM_BLACK:
@@ -659,7 +659,7 @@ static u8 UpdateFastPaletteFade(void)
             if (b > b0)
                 b = b0;
 
-            gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
+            gPlttBufferFaded[i] = RGB(r, g, b);
         }
         break;
     case FAST_FADE_OUT_TO_BLACK:
@@ -677,7 +677,7 @@ static u8 UpdateFastPaletteFade(void)
             if (b < 0)
                 b = 0;
 
-            gPlttBufferFaded[i] = r | (g << 5) | (b << 10);
+            gPlttBufferFaded[i] = RGB(r, g, b);
         }
     }
 
-- 
cgit v1.2.3


From a89c10aa0a2426096a9588f2a5294825f69e3e7f Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Tue, 6 Jun 2017 18:56:46 -0400
Subject: Pokecenter Heal and Hall Of Fame Record Effect, 1

---
 asm/field_effect.s     | 511 -------------------------------------------------
 include/field_effect.h |  68 +++++++
 src/field_effect.c     | 266 +++++++++++++++++++++++++
 3 files changed, 334 insertions(+), 511 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 246e66d04..fe930912e 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,517 +6,6 @@
 
 	.text
 
-	thumb_func_start MultiplyInvertedPaletteRGBComponents
-MultiplyInvertedPaletteRGBComponents: @ 8085C7C
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	lsls r0, 16
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	ldr r4, _08085D00 @ =gPlttBufferUnfaded
-	lsrs r0, 15
-	adds r4, r0, r4
-	ldrh r4, [r4]
-	movs r5, 0x1F
-	mov r9, r5
-	mov r8, r4
-	mov r6, r8
-	ands r6, r5
-	mov r8, r6
-	movs r6, 0xF8
-	lsls r6, 2
-	ands r6, r4
-	lsrs r6, 5
-	movs r5, 0xF8
-	lsls r5, 7
-	ands r4, r5
-	lsrs r4, 10
-	mov r7, r9
-	mov r5, r8
-	subs r7, r5
-	mov r12, r7
-	mov r7, r12
-	muls r7, r1
-	adds r1, r7, 0
-	asrs r1, 4
-	add r8, r1
-	mov r5, r9
-	subs r1, r5, r6
-	muls r1, r2
-	asrs r1, 4
-	adds r6, r1
-	subs r5, r4
-	mov r9, r5
-	mov r1, r9
-	muls r1, r3
-	asrs r1, 4
-	adds r4, r1
-	mov r7, r8
-	lsls r7, 16
-	lsls r6, 21
-	orrs r6, r7
-	lsls r4, 26
-	orrs r4, r6
-	lsrs r4, 16
-	ldr r1, _08085D04 @ =gPlttBufferFaded
-	adds r0, r1
-	strh r4, [r0]
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085D00: .4byte gPlttBufferUnfaded
-_08085D04: .4byte gPlttBufferFaded
-	thumb_func_end MultiplyInvertedPaletteRGBComponents
-
-	thumb_func_start MultiplyPaletteRGBComponents
-MultiplyPaletteRGBComponents: @ 8085D08
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	lsls r0, 16
-	lsls r1, 24
-	lsrs r1, 24
-	lsls r2, 24
-	lsrs r2, 24
-	lsls r3, 24
-	lsrs r3, 24
-	ldr r4, _08085D78 @ =gPlttBufferUnfaded
-	lsrs r0, 15
-	adds r4, r0, r4
-	ldrh r4, [r4]
-	movs r5, 0x1F
-	mov r8, r5
-	mov r6, r8
-	ands r6, r4
-	mov r8, r6
-	movs r5, 0xF8
-	lsls r5, 2
-	ands r5, r4
-	lsrs r5, 5
-	movs r6, 0xF8
-	lsls r6, 7
-	ands r4, r6
-	lsrs r4, 10
-	mov r6, r8
-	muls r6, r1
-	adds r1, r6, 0
-	asrs r1, 4
-	mov r6, r8
-	subs r6, r1
-	adds r1, r5, 0
-	muls r1, r2
-	asrs r1, 4
-	subs r5, r1
-	adds r1, r4, 0
-	muls r1, r3
-	asrs r1, 4
-	subs r4, r1
-	lsls r6, 16
-	lsls r5, 21
-	orrs r5, r6
-	lsls r4, 26
-	orrs r4, r5
-	lsrs r4, 16
-	ldr r1, _08085D7C @ =gPlttBufferFaded
-	adds r0, r1
-	strh r4, [r0]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085D78: .4byte gPlttBufferUnfaded
-_08085D7C: .4byte gPlttBufferFaded
-	thumb_func_end MultiplyPaletteRGBComponents
-
-	thumb_func_start FldEff_PokecenterHeal
-FldEff_PokecenterHeal: @ 8085D80
-	push {r4,lr}
-	bl CalculatePlayerPartyCount
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, _08085DBC @ =Task_PokecenterHeal
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08085DC0 @ =gTasks
-	adds r1, r0
-	strh r4, [r1, 0xA]
-	movs r0, 0x5D
-	strh r0, [r1, 0xC]
-	movs r0, 0x24
-	strh r0, [r1, 0xE]
-	movs r0, 0x7C
-	strh r0, [r1, 0x10]
-	movs r0, 0x18
-	strh r0, [r1, 0x12]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08085DBC: .4byte Task_PokecenterHeal
-_08085DC0: .4byte gTasks
-	thumb_func_end FldEff_PokecenterHeal
-
-	thumb_func_start Task_PokecenterHeal
-Task_PokecenterHeal: @ 8085DC4
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08085DEC @ =gTasks
-	adds r1, r0
-	ldr r2, _08085DF0 @ =gUnknown_0839F268
-	movs r3, 0x8
-	ldrsh r0, [r1, r3]
-	lsls r0, 2
-	adds r0, r2
-	ldr r2, [r0]
-	adds r0, r1, 0
-	bl _call_via_r2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085DEC: .4byte gTasks
-_08085DF0: .4byte gUnknown_0839F268
-	thumb_func_end Task_PokecenterHeal
-
-	thumb_func_start PokecenterHealEffect_0
-PokecenterHealEffect_0: @ 8085DF4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	movs r2, 0xC
-	ldrsh r1, [r4, r2]
-	movs r3, 0xE
-	ldrsh r2, [r4, r3]
-	movs r3, 0x1
-	bl CreatePokeballGlowSprite
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x14]
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	movs r2, 0x12
-	ldrsh r1, [r4, r2]
-	bl PokecenterHealEffectHelper
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x16]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PokecenterHealEffect_0
-
-	thumb_func_start PokecenterHealEffect_1
-PokecenterHealEffect_1: @ 8085E30
-	push {r4,lr}
-	adds r2, r0, 0
-	ldr r3, _08085E68 @ =gSprites
-	movs r1, 0x14
-	ldrsh r0, [r2, r1]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	movs r4, 0x2E
-	ldrsh r0, [r1, r4]
-	cmp r0, 0x1
-	ble _08085E62
-	movs r0, 0x16
-	ldrsh r1, [r2, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r1, [r0, 0x2E]
-	adds r1, 0x1
-	strh r1, [r0, 0x2E]
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-_08085E62:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085E68: .4byte gSprites
-	thumb_func_end PokecenterHealEffect_1
-
-	thumb_func_start PokecenterHealEffect_2
-PokecenterHealEffect_2: @ 8085E6C
-	push {lr}
-	adds r3, r0, 0
-	ldr r2, _08085E90 @ =gSprites
-	movs r0, 0x14
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0x2E
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x4
-	ble _08085E8C
-	ldrh r0, [r3, 0x8]
-	adds r0, 0x1
-	strh r0, [r3, 0x8]
-_08085E8C:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085E90: .4byte gSprites
-	thumb_func_end PokecenterHealEffect_2
-
-	thumb_func_start PokecenterHealEffect_3
-PokecenterHealEffect_3: @ 8085E94
-	push {lr}
-	ldr r2, _08085ECC @ =gSprites
-	movs r3, 0x14
-	ldrsh r1, [r0, r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r0, r2
-	movs r2, 0x2E
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x6
-	ble _08085EC6
-	adds r0, r1, 0
-	bl DestroySprite
-	movs r0, 0x19
-	bl FieldEffectActiveListRemove
-	ldr r0, _08085ED0 @ =Task_PokecenterHeal
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08085EC6:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085ECC: .4byte gSprites
-_08085ED0: .4byte Task_PokecenterHeal
-	thumb_func_end PokecenterHealEffect_3
-
-	thumb_func_start FldEff_HallOfFameRecord
-FldEff_HallOfFameRecord: @ 8085ED4
-	push {r4,lr}
-	bl CalculatePlayerPartyCount
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, _08085F08 @ =Task_HallOfFameRecord
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08085F0C @ =gTasks
-	adds r1, r0
-	strh r4, [r1, 0xA]
-	movs r0, 0x75
-	strh r0, [r1, 0xC]
-	movs r0, 0x34
-	strh r0, [r1, 0xE]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08085F08: .4byte Task_HallOfFameRecord
-_08085F0C: .4byte gTasks
-	thumb_func_end FldEff_HallOfFameRecord
-
-	thumb_func_start Task_HallOfFameRecord
-Task_HallOfFameRecord: @ 8085F10
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08085F38 @ =gTasks
-	adds r1, r0
-	ldr r2, _08085F3C @ =gUnknown_0839F278
-	movs r3, 0x8
-	ldrsh r0, [r1, r3]
-	lsls r0, 2
-	adds r0, r2
-	ldr r2, [r0]
-	adds r0, r1, 0
-	bl _call_via_r2
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085F38: .4byte gTasks
-_08085F3C: .4byte gUnknown_0839F278
-	thumb_func_end Task_HallOfFameRecord
-
-	thumb_func_start HallOfFameRecordEffect_0
-HallOfFameRecordEffect_0: @ 8085F40
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	movs r2, 0xC
-	ldrsh r1, [r4, r2]
-	movs r3, 0xE
-	ldrsh r2, [r4, r3]
-	movs r3, 0
-	bl CreatePokeballGlowSprite
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x14]
-	ldr r0, _08085FB0 @ =Task_HallOfFameRecord
-	bl FindTaskIdByFunc
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	movs r1, 0x78
-	movs r2, 0x18
-	movs r3, 0
-	bl HallOfFameRecordEffectHelper
-	adds r0, r4, 0
-	movs r1, 0x28
-	movs r2, 0x8
-	movs r3, 0x1
-	bl HallOfFameRecordEffectHelper
-	adds r0, r4, 0
-	movs r1, 0x48
-	movs r2, 0x8
-	movs r3, 0x1
-	bl HallOfFameRecordEffectHelper
-	adds r0, r4, 0
-	movs r1, 0xA8
-	movs r2, 0x8
-	movs r3, 0x1
-	bl HallOfFameRecordEffectHelper
-	adds r0, r4, 0
-	movs r1, 0xC8
-	movs r2, 0x8
-	movs r3, 0x1
-	bl HallOfFameRecordEffectHelper
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085FB0: .4byte Task_HallOfFameRecord
-	thumb_func_end HallOfFameRecordEffect_0
-
-	thumb_func_start HallOfFameRecordEffect_1
-HallOfFameRecordEffect_1: @ 8085FB4
-	push {lr}
-	adds r3, r0, 0
-	ldr r2, _08085FE0 @ =gSprites
-	movs r0, 0x14
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0x2E
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x1
-	ble _08085FDA
-	ldrh r0, [r3, 0x26]
-	adds r0, 0x1
-	strh r0, [r3, 0x26]
-	ldrh r0, [r3, 0x8]
-	adds r0, 0x1
-	strh r0, [r3, 0x8]
-_08085FDA:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08085FE0: .4byte gSprites
-	thumb_func_end HallOfFameRecordEffect_1
-
-	thumb_func_start HallOfFameRecordEffect_2
-HallOfFameRecordEffect_2: @ 8085FE4
-	push {lr}
-	adds r3, r0, 0
-	ldr r2, _08086008 @ =gSprites
-	movs r0, 0x14
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0x2E
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x4
-	ble _08086004
-	ldrh r0, [r3, 0x8]
-	adds r0, 0x1
-	strh r0, [r3, 0x8]
-_08086004:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086008: .4byte gSprites
-	thumb_func_end HallOfFameRecordEffect_2
-
-	thumb_func_start HallOfFameRecordEffect_3
-HallOfFameRecordEffect_3: @ 808600C
-	push {lr}
-	ldr r2, _08086044 @ =gSprites
-	movs r3, 0x14
-	ldrsh r1, [r0, r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r0, r2
-	movs r2, 0x2E
-	ldrsh r0, [r1, r2]
-	cmp r0, 0x6
-	ble _0808603E
-	adds r0, r1, 0
-	bl DestroySprite
-	movs r0, 0x3E
-	bl FieldEffectActiveListRemove
-	ldr r0, _08086048 @ =Task_HallOfFameRecord
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_0808603E:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086044: .4byte gSprites
-_08086048: .4byte Task_HallOfFameRecord
-	thumb_func_end HallOfFameRecordEffect_3
-
 	thumb_func_start CreatePokeballGlowSprite
 CreatePokeballGlowSprite: @ 808604C
 	push {r4-r6,lr}
diff --git a/include/field_effect.h b/include/field_effect.h
index d4ec0c8b4..e3e80b3df 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -3,6 +3,74 @@
 
 #include "sprite.h"
 
+enum FieldEffectScriptIdx
+{
+    FLDEFF_EXCLAMATION_MARK_ICON_1,
+    FLDEFF_USE_CUT_ON_GRASS,
+    FLDEFF_USE_CUT_ON_TREE,
+    FLDEFF_SHADOW,
+    FLDEFF_TALL_GRASS,
+    FLDEFF_RIPPLE,
+    FLDEFF_FIELD_MOVE_SHOW_MON,
+    FLDEFF_ASH,
+    FLDEFF_SURF_BLOB,
+    FLDEFF_USE_SURF,
+    FLDEFF_DUST,
+    FLDEFF_USE_SECRET_POWER_CAVE,
+    FLDEFF_JUMP_TALL_GRASS,
+    FLDEFF_SAND_FOOTPRINTS,
+    FLDEFF_JUMP_BIG_SPLASH,
+    FLDEFF_SPLASH,
+    FLDEFF_JUMP_SMALL_SPLASH,
+    FLDEFF_LONG_GRASS,
+    FLDEFF_JUMP_LONG_GRASS,
+    FLDEFF_UNKNOWN_19,
+    FLDEFF_UNKNOWN_20,
+    FLDEFF_UNKNOWN_21,
+    FLDEFF_UNKNOWN_22,
+    FLDEFF_BERRY_TREE_GROWTH_SPARKLE,
+    FLDEFF_DEEP_SAND_FOOTPRINTS,
+    FLDEFF_POKECENTER_HEAL,
+    FLDEFF_USE_SECRET_POWER_TREE,
+    FLDEFF_USE_SECRET_POWER_SHRUB,
+    FLDEFF_TREE_DISGUISE,
+    FLDEFF_MOUNTAIN_DISGUISE,
+    FLDEFF_NPCFLY_OUT,
+    FLDEFF_USE_FLY,
+    FLDEFF_FLY_IN,
+    FLDEFF_EXCLAMATION_MARK_ICON_2,
+    FLDEFF_FEET_IN_FLOWING_WATER,
+    FLDEFF_BIKE_TIRE_TRACKS,
+    FLDEFF_SAND_DISGUISE,
+    FLDEFF_USE_ROCK_SMASH,
+    FLDEFF_USE_DIG,
+    FLDEFF_SAND_PILE,
+    FLDEFF_USE_STRENGTH,
+    FLDEFF_SHORT_GRASS,
+    FLDEFF_HOT_SPRINGS_WATER,
+    FLDEFF_USE_WATERFALL,
+    FLDEFF_USE_DIVE,
+    FLDEFF_POKEBALL,
+    FLDEFF_HEART_ICON,
+    FLDEFF_NOP_47,
+    FLDEFF_NOP_48,
+    FLDEFF_POP_OUT_OF_ASH,
+    FLDEFF_LAVARIDGE_GYM_WARP,
+    FLDEFF_SWEET_SCENT,
+    FLDEFF_SAND_PILLAR,
+    FLDEFF_BUBBLES,
+    FLDEFF_SPARKLE,
+    FLDEFF_SECRET_POWER_CAVE,
+    FLDEFF_SECRET_POWER_TREE,
+    FLDEFF_SECRET_POWER_SHRUB,
+    FLDEFF_CUT_GRASS,
+    FLDEFF_FIELD_MOVE_SHOW_MON_INIT,
+    FLDEFF_USE_FLY_ANCIENT_TOMB,
+    FLDEFF_PCTURN_ON,
+    FLDEFF_HALL_OF_FAME_RECORD,
+    FLDEFF_USE_TELEPORT
+};
+
 extern const struct SpritePalette gTrainerFrontPicPaletteTable[2];
 extern const struct SpritePalette gUnknown_0839F114;
 extern const struct SpriteSheet gTrainerFrontPicTable[2];
diff --git a/src/field_effect.c b/src/field_effect.c
index e13809d27..72fd281af 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -5,6 +5,7 @@
 #include "sprite.h"
 #include "palette.h"
 #include "text.h"
+#include "task.h"
 #include "field_effect.h"
 
 typedef bool8 (*FldEffCmd)(u8 **, u32 *);
@@ -302,4 +303,269 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
     curBlue -= ((curBlue * b) >> 4);
     gPlttBufferFaded[i] = RGB(curRed, curGreen, curBlue);
 }
+#else
+__attribute__((naked))
+void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
+{
+    asm(".syntax unified\n"
+    "\tpush {r4-r7,lr}\n"
+    "\tmov r7, r9\n"
+    "\tmov r6, r8\n"
+    "\tpush {r6,r7}\n"
+    "\tlsls r0, 16\n"
+    "\tlsls r1, 24\n"
+    "\tlsrs r1, 24\n"
+    "\tlsls r2, 24\n"
+    "\tlsrs r2, 24\n"
+    "\tlsls r3, 24\n"
+    "\tlsrs r3, 24\n"
+    "\tldr r4, _08085D00 @ =gPlttBufferUnfaded\n"
+    "\tlsrs r0, 15\n"
+    "\tadds r4, r0, r4\n"
+    "\tldrh r4, [r4]\n"
+    "\tmovs r5, 0x1F\n"
+    "\tmov r9, r5\n"
+    "\tmov r8, r4\n"
+    "\tmov r6, r8\n"
+    "\tands r6, r5\n"
+    "\tmov r8, r6\n"
+    "\tmovs r6, 0xF8\n"
+    "\tlsls r6, 2\n"
+    "\tands r6, r4\n"
+    "\tlsrs r6, 5\n"
+    "\tmovs r5, 0xF8\n"
+    "\tlsls r5, 7\n"
+    "\tands r4, r5\n"
+    "\tlsrs r4, 10\n"
+    "\tmov r7, r9\n"
+    "\tmov r5, r8\n"
+    "\tsubs r7, r5\n"
+    "\tmov r12, r7\n"
+    "\tmov r7, r12\n"
+    "\tmuls r7, r1\n"
+    "\tadds r1, r7, 0\n"
+    "\tasrs r1, 4\n"
+    "\tadd r8, r1\n"
+    "\tmov r5, r9\n"
+    "\tsubs r1, r5, r6\n"
+    "\tmuls r1, r2\n"
+    "\tasrs r1, 4\n"
+    "\tadds r6, r1\n"
+    "\tsubs r5, r4\n"
+    "\tmov r9, r5\n"
+    "\tmov r1, r9\n"
+    "\tmuls r1, r3\n"
+    "\tasrs r1, 4\n"
+    "\tadds r4, r1\n"
+    "\tmov r7, r8\n"
+    "\tlsls r7, 16\n"
+    "\tlsls r6, 21\n"
+    "\torrs r6, r7\n"
+    "\tlsls r4, 26\n"
+    "\torrs r4, r6\n"
+    "\tlsrs r4, 16\n"
+    "\tldr r1, _08085D04 @ =gPlttBufferFaded\n"
+    "\tadds r0, r1\n"
+    "\tstrh r4, [r0]\n"
+    "\tpop {r3,r4}\n"
+    "\tmov r8, r3\n"
+    "\tmov r9, r4\n"
+    "\tpop {r4-r7}\n"
+    "\tpop {r0}\n"
+    "\tbx r0\n"
+    "\t.align 2, 0\n"
+    "_08085D00: .4byte gPlttBufferUnfaded\n"
+    "_08085D04: .4byte gPlttBufferFaded\n"
+    ".syntax divided");
+}
+
+__attribute__((naked))
+void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
+{
+    asm(".syntax unified\n"
+    "\tpush {r4-r6,lr}\n"
+    "\tmov r6, r8\n"
+    "\tpush {r6}\n"
+    "\tlsls r0, 16\n"
+    "\tlsls r1, 24\n"
+    "\tlsrs r1, 24\n"
+    "\tlsls r2, 24\n"
+    "\tlsrs r2, 24\n"
+    "\tlsls r3, 24\n"
+    "\tlsrs r3, 24\n"
+    "\tldr r4, _08085D78 @ =gPlttBufferUnfaded\n"
+    "\tlsrs r0, 15\n"
+    "\tadds r4, r0, r4\n"
+    "\tldrh r4, [r4]\n"
+    "\tmovs r5, 0x1F\n"
+    "\tmov r8, r5\n"
+    "\tmov r6, r8\n"
+    "\tands r6, r4\n"
+    "\tmov r8, r6\n"
+    "\tmovs r5, 0xF8\n"
+    "\tlsls r5, 2\n"
+    "\tands r5, r4\n"
+    "\tlsrs r5, 5\n"
+    "\tmovs r6, 0xF8\n"
+    "\tlsls r6, 7\n"
+    "\tands r4, r6\n"
+    "\tlsrs r4, 10\n"
+    "\tmov r6, r8\n"
+    "\tmuls r6, r1\n"
+    "\tadds r1, r6, 0\n"
+    "\tasrs r1, 4\n"
+    "\tmov r6, r8\n"
+    "\tsubs r6, r1\n"
+    "\tadds r1, r5, 0\n"
+    "\tmuls r1, r2\n"
+    "\tasrs r1, 4\n"
+    "\tsubs r5, r1\n"
+    "\tadds r1, r4, 0\n"
+    "\tmuls r1, r3\n"
+    "\tasrs r1, 4\n"
+    "\tsubs r4, r1\n"
+    "\tlsls r6, 16\n"
+    "\tlsls r5, 21\n"
+    "\torrs r5, r6\n"
+    "\tlsls r4, 26\n"
+    "\torrs r4, r5\n"
+    "\tlsrs r4, 16\n"
+    "\tldr r1, _08085D7C @ =gPlttBufferFaded\n"
+    "\tadds r0, r1\n"
+    "\tstrh r4, [r0]\n"
+    "\tpop {r3}\n"
+    "\tmov r8, r3\n"
+    "\tpop {r4-r6}\n"
+    "\tpop {r0}\n"
+    "\tbx r0\n"
+    "\t.align 2, 0\n"
+    "_08085D78: .4byte gPlttBufferUnfaded\n"
+    "_08085D7C: .4byte gPlttBufferFaded\n"
+    ".syntax divided");
+}
 #endif
+
+void Task_PokecenterHeal(u8 taskId);
+extern const void (*gUnknown_0839F268[4])(struct Task *);
+u8 CreatePokeballGlowSprite(s16, s16, s16, u16);
+u8 PokecenterHealEffectHelper(s16, s16);
+
+bool8 FldEff_PokecenterHeal(void)
+{
+    u8 nPokemon;
+    struct Task *task;
+
+    nPokemon = CalculatePlayerPartyCount();
+    task = &gTasks[CreateTask(Task_PokecenterHeal, 0xff)];
+    task->data[1] = nPokemon;
+    task->data[2] = 0x5d;
+    task->data[3] = 0x24;
+    task->data[4] = 0x7c;
+    task->data[5] = 0x18;
+    return FALSE;
+}
+
+void Task_PokecenterHeal(u8 taskId)
+{
+    struct Task *task;
+    task = &gTasks[taskId];
+    gUnknown_0839F268[task->data[0]](task);
+}
+
+void PokecenterHealEffect_0(struct Task *task)
+{
+    task->data[0]++;
+    task->data[6] = CreatePokeballGlowSprite(task->data[1], task->data[2], task->data[3], 1);
+    task->data[7] = PokecenterHealEffectHelper(task->data[4], task->data[5]);
+}
+
+void PokecenterHealEffect_1(struct Task *task)
+{
+    if (gSprites[task->data[6]].data0 > 1)
+    {
+        gSprites[task->data[7]].data0++;
+        task->data[0]++;
+    }
+}
+
+void PokecenterHealEffect_2(struct Task *task)
+{
+    if (gSprites[task->data[6]].data0 > 4)
+    {
+        task->data[0]++;
+    }
+}
+
+void PokecenterHealEffect_3(struct Task *task)
+{
+    if (gSprites[task->data[6]].data0 > 6)
+    {
+        DestroySprite(&gSprites[task->data[6]]);
+        FieldEffectActiveListRemove(FLDEFF_POKECENTER_HEAL);
+        DestroyTask(FindTaskIdByFunc(Task_PokecenterHeal));
+    }
+}
+
+void Task_HallOfFameRecord(u8 taskId);
+extern const void (*gUnknown_0839F278[4])(struct Task *);
+void HallOfFameRecordEffectHelper(u8, u8, u8, u8);
+
+bool8 FldEff_HallOfFameRecord(void)
+{
+    u8 nPokemon;
+    struct Task *task;
+
+    nPokemon = CalculatePlayerPartyCount();
+    task = &gTasks[CreateTask(Task_HallOfFameRecord, 0xff)];
+    task->data[1] = nPokemon;
+    task->data[2] = 0x75;
+    task->data[3] = 0x34;
+    return FALSE;
+}
+
+void Task_HallOfFameRecord(u8 taskId)
+{
+    struct Task *task;
+    task = &gTasks[taskId];
+    gUnknown_0839F278[task->data[0]](task);
+}
+
+void HallOfFameRecordEffect_0(struct Task *task)
+{
+    u8 taskId;
+    task->data[0]++;
+    task->data[6] = CreatePokeballGlowSprite(task->data[1], task->data[2], task->data[3], 0);
+    taskId = FindTaskIdByFunc(Task_HallOfFameRecord);
+    HallOfFameRecordEffectHelper(taskId, 0x78, 0x18, 0);
+    HallOfFameRecordEffectHelper(taskId, 0x28, 0x08, 1);
+    HallOfFameRecordEffectHelper(taskId, 0x48, 0x08, 1);
+    HallOfFameRecordEffectHelper(taskId, 0xa8, 0x08, 1);
+    HallOfFameRecordEffectHelper(taskId, 0xc8, 0x08, 1);
+}
+
+void HallOfFameRecordEffect_1(struct Task *task)
+{
+    if (gSprites[task->data[6]].data0 > 1)
+    {
+        task->data[15]++; // was this ever initialized? is this ever used?
+        task->data[0]++;
+    }
+}
+
+void HallOfFameRecordEffect_2(struct Task *task)
+{
+    if (gSprites[task->data[6]].data0 > 4)
+    {
+        task->data[0]++;
+    }
+}
+
+void HallOfFameRecordEffect_3(struct Task *task)
+{
+    if (gSprites[task->data[6]].data0 > 6)
+    {
+        DestroySprite(&gSprites[task->data[6]]);
+        FieldEffectActiveListRemove(FLDEFF_HALL_OF_FAME_RECORD);
+        DestroyTask(FindTaskIdByFunc(Task_HallOfFameRecord));
+    }
+}
-- 
cgit v1.2.3


From 12a379873526bbaf819ed3dc8ff70a9ee1c3f397 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 6 Jun 2017 22:23:10 -0400
Subject: Pokecenter and HOF field effects, 2

---
 asm/field_effect.s | 714 -----------------------------------------------------
 src/field_effect.c | 215 +++++++++++++++-
 2 files changed, 214 insertions(+), 715 deletions(-)
 mode change 100644 => 100755 asm/field_effect.s
 mode change 100644 => 100755 src/field_effect.c

diff --git a/asm/field_effect.s b/asm/field_effect.s
old mode 100644
new mode 100755
index fe930912e..0bd7dc9d6
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,720 +6,6 @@
 
 	.text
 
-	thumb_func_start CreatePokeballGlowSprite
-CreatePokeballGlowSprite: @ 808604C
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	mov r8, r0
-	adds r4, r1, 0
-	adds r5, r2, 0
-	adds r6, r3, 0
-	lsls r0, 16
-	lsrs r0, 16
-	mov r8, r0
-	lsls r4, 16
-	lsrs r4, 16
-	lsls r5, 16
-	lsrs r5, 16
-	lsls r6, 16
-	lsrs r6, 16
-	ldr r0, _08086098 @ =SpriteCB_PokeballGlowEffect
-	bl CreateInvisibleSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r2, _0808609C @ =gSprites
-	adds r1, r2
-	strh r4, [r1, 0x24]
-	strh r5, [r1, 0x26]
-	strh r6, [r1, 0x38]
-	mov r2, r8
-	strh r2, [r1, 0x3A]
-	strh r0, [r1, 0x3C]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086098: .4byte SpriteCB_PokeballGlowEffect
-_0808609C: .4byte gSprites
-	thumb_func_end CreatePokeballGlowSprite
-
-	thumb_func_start SpriteCB_PokeballGlowEffect
-SpriteCB_PokeballGlowEffect: @ 80860A0
-	push {lr}
-	ldr r2, _080860B8 @ =gUnknown_0839F288
-	movs r3, 0x2E
-	ldrsh r1, [r0, r3]
-	lsls r1, 2
-	adds r1, r2
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080860B8: .4byte gUnknown_0839F288
-	thumb_func_end SpriteCB_PokeballGlowEffect
-
-	thumb_func_start PokeballGlowEffect_0
-PokeballGlowEffect_0: @ 80860BC
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r1, [r4, 0x30]
-	movs r2, 0x30
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _080860D4
-	subs r0, r1, 0x1
-	strh r0, [r4, 0x30]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08086130
-_080860D4:
-	movs r0, 0x19
-	strh r0, [r4, 0x30]
-	ldr r0, _08086148 @ =gSpriteTemplate_839F208
-	ldr r1, _0808614C @ =gUnknown_0839F2A8
-	movs r2, 0x32
-	ldrsh r3, [r4, r2]
-	lsls r3, 2
-	adds r3, r1
-	ldrh r1, [r4, 0x24]
-	ldrh r2, [r3]
-	adds r1, r2
-	lsls r1, 16
-	asrs r1, 16
-	ldrh r2, [r4, 0x26]
-	ldrh r3, [r3, 0x2]
-	adds r2, r3
-	lsls r2, 16
-	asrs r2, 16
-	movs r3, 0
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08086150 @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r2
-	movs r2, 0x8
-	orrs r0, r2
-	strb r0, [r1, 0x5]
-	ldrh r0, [r4, 0x3C]
-	strh r0, [r1, 0x2E]
-	ldrh r0, [r4, 0x32]
-	adds r0, 0x1
-	strh r0, [r4, 0x32]
-	ldrh r0, [r4, 0x3A]
-	subs r0, 0x1
-	strh r0, [r4, 0x3A]
-	movs r0, 0x17
-	bl PlaySE
-_08086130:
-	movs r1, 0x3A
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _08086142
-	movs r0, 0x20
-	strh r0, [r4, 0x30]
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-_08086142:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086148: .4byte gSpriteTemplate_839F208
-_0808614C: .4byte gUnknown_0839F2A8
-_08086150: .4byte gSprites
-	thumb_func_end PokeballGlowEffect_0
-
-	thumb_func_start PokeballGlowEffect_1
-PokeballGlowEffect_1: @ 8086154
-	push {lr}
-	adds r1, r0, 0
-	ldrh r0, [r1, 0x30]
-	subs r0, 0x1
-	strh r0, [r1, 0x30]
-	lsls r0, 16
-	asrs r2, r0, 16
-	cmp r2, 0
-	bne _08086184
-	ldrh r0, [r1, 0x2E]
-	adds r0, 0x1
-	strh r0, [r1, 0x2E]
-	movs r0, 0x8
-	strh r0, [r1, 0x30]
-	strh r2, [r1, 0x32]
-	strh r2, [r1, 0x34]
-	movs r2, 0x38
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _08086184
-	movs r0, 0xB8
-	lsls r0, 1
-	bl PlayFanfare
-_08086184:
-	pop {r0}
-	bx r0
-	thumb_func_end PokeballGlowEffect_1
-
-	thumb_func_start PokeballGlowEffect_2
-PokeballGlowEffect_2: @ 8086188
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	adds r7, r0, 0
-	ldrh r0, [r7, 0x30]
-	subs r0, 0x1
-	strh r0, [r7, 0x30]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080861B8
-	movs r0, 0x8
-	strh r0, [r7, 0x30]
-	ldrh r0, [r7, 0x32]
-	adds r0, 0x1
-	movs r1, 0x3
-	ands r0, r1
-	strh r0, [r7, 0x32]
-	cmp r0, 0
-	bne _080861B8
-	ldrh r0, [r7, 0x34]
-	adds r0, 0x1
-	strh r0, [r7, 0x34]
-_080861B8:
-	ldrh r4, [r7, 0x32]
-	adds r4, 0x3
-	movs r0, 0x3
-	mov r8, r0
-	mov r1, r8
-	ands r4, r1
-	ldr r3, _080862B0 @ =0x00001007
-	mov r10, r3
-	mov r0, r10
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	movs r1, 0x84
-	lsls r1, 17
-	adds r0, r1
-	lsrs r0, 16
-	ldr r6, _080862B4 @ =gUnknown_0839F2C0
-	adds r1, r4, r6
-	ldrb r1, [r1]
-	ldr r5, _080862B8 @ =gUnknown_0839F2C4
-	adds r2, r4, r5
-	ldrb r2, [r2]
-	ldr r3, _080862BC @ =gUnknown_0839F2C8
-	mov r9, r3
-	add r4, r9
-	ldrb r3, [r4]
-	bl MultiplyInvertedPaletteRGBComponents
-	ldrh r4, [r7, 0x32]
-	adds r4, 0x2
-	mov r0, r8
-	ands r4, r0
-	mov r0, r10
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	movs r1, 0x83
-	lsls r1, 17
-	adds r0, r1
-	lsrs r0, 16
-	adds r1, r4, r6
-	ldrb r1, [r1]
-	adds r2, r4, r5
-	ldrb r2, [r2]
-	add r4, r9
-	ldrb r3, [r4]
-	bl MultiplyInvertedPaletteRGBComponents
-	ldrh r4, [r7, 0x32]
-	adds r4, 0x1
-	mov r3, r8
-	ands r4, r3
-	mov r0, r10
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	movs r1, 0x81
-	lsls r1, 17
-	adds r0, r1
-	lsrs r0, 16
-	adds r1, r4, r6
-	ldrb r1, [r1]
-	adds r2, r4, r5
-	ldrb r2, [r2]
-	add r4, r9
-	ldrb r3, [r4]
-	bl MultiplyInvertedPaletteRGBComponents
-	ldrh r4, [r7, 0x32]
-	lsls r4, 24
-	lsrs r4, 24
-	mov r0, r10
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	ldr r3, _080862C0 @ =0x01050000
-	adds r0, r3
-	lsrs r0, 16
-	adds r6, r4, r6
-	ldrb r6, [r6]
-	adds r5, r4, r5
-	ldrb r5, [r5]
-	add r4, r9
-	ldrb r4, [r4]
-	adds r1, r6, 0
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl MultiplyInvertedPaletteRGBComponents
-	mov r0, r10
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	ldr r1, _080862C4 @ =0x01030000
-	adds r0, r1
-	lsrs r0, 16
-	adds r1, r6, 0
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl MultiplyInvertedPaletteRGBComponents
-	movs r3, 0x34
-	ldrsh r0, [r7, r3]
-	cmp r0, 0x2
-	ble _080862A2
-	ldrh r0, [r7, 0x2E]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r7, 0x2E]
-	movs r0, 0x8
-	strh r0, [r7, 0x30]
-	strh r1, [r7, 0x32]
-_080862A2:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080862B0: .4byte 0x00001007
-_080862B4: .4byte gUnknown_0839F2C0
-_080862B8: .4byte gUnknown_0839F2C4
-_080862BC: .4byte gUnknown_0839F2C8
-_080862C0: .4byte 0x01050000
-_080862C4: .4byte 0x01030000
-	thumb_func_end PokeballGlowEffect_2
-
-	thumb_func_start PokeballGlowEffect_3
-PokeballGlowEffect_3: @ 80862C8
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r2, r0, 0
-	ldrh r0, [r2, 0x30]
-	subs r0, 0x1
-	strh r0, [r2, 0x30]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080862F8
-	movs r0, 0x8
-	strh r0, [r2, 0x30]
-	ldrh r0, [r2, 0x32]
-	adds r0, 0x1
-	movs r1, 0x3
-	ands r0, r1
-	strh r0, [r2, 0x32]
-	cmp r0, 0x3
-	bne _080862F8
-	ldrh r0, [r2, 0x2E]
-	adds r0, 0x1
-	strh r0, [r2, 0x2E]
-	movs r0, 0x1E
-	strh r0, [r2, 0x30]
-_080862F8:
-	ldrh r4, [r2, 0x32]
-	lsls r4, 24
-	lsrs r4, 24
-	ldr r0, _080863A4 @ =0x00001007
-	mov r8, r0
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	movs r1, 0x84
-	lsls r1, 17
-	adds r0, r1
-	lsrs r0, 16
-	ldr r1, _080863A8 @ =gUnknown_0839F2C0
-	adds r1, r4, r1
-	ldrb r6, [r1]
-	ldr r1, _080863AC @ =gUnknown_0839F2C4
-	adds r1, r4, r1
-	ldrb r5, [r1]
-	ldr r1, _080863B0 @ =gUnknown_0839F2C8
-	adds r4, r1
-	ldrb r4, [r4]
-	adds r1, r6, 0
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl MultiplyInvertedPaletteRGBComponents
-	mov r0, r8
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	movs r1, 0x83
-	lsls r1, 17
-	adds r0, r1
-	lsrs r0, 16
-	adds r1, r6, 0
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl MultiplyInvertedPaletteRGBComponents
-	mov r0, r8
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	movs r1, 0x81
-	lsls r1, 17
-	adds r0, r1
-	lsrs r0, 16
-	adds r1, r6, 0
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl MultiplyInvertedPaletteRGBComponents
-	mov r0, r8
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	ldr r1, _080863B4 @ =0x01050000
-	adds r0, r1
-	lsrs r0, 16
-	adds r1, r6, 0
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl MultiplyInvertedPaletteRGBComponents
-	mov r0, r8
-	bl IndexOfSpritePaletteTag
-	lsls r0, 24
-	lsrs r0, 4
-	ldr r1, _080863B8 @ =0x01030000
-	adds r0, r1
-	lsrs r0, 16
-	adds r1, r6, 0
-	adds r2, r5, 0
-	adds r3, r4, 0
-	bl MultiplyInvertedPaletteRGBComponents
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080863A4: .4byte 0x00001007
-_080863A8: .4byte gUnknown_0839F2C0
-_080863AC: .4byte gUnknown_0839F2C4
-_080863B0: .4byte gUnknown_0839F2C8
-_080863B4: .4byte 0x01050000
-_080863B8: .4byte 0x01030000
-	thumb_func_end PokeballGlowEffect_3
-
-	thumb_func_start PokeballGlowEffect_4
-PokeballGlowEffect_4: @ 80863BC
-	push {lr}
-	adds r1, r0, 0
-	ldrh r0, [r1, 0x30]
-	subs r0, 0x1
-	strh r0, [r1, 0x30]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080863D2
-	ldrh r0, [r1, 0x2E]
-	adds r0, 0x1
-	strh r0, [r1, 0x2E]
-_080863D2:
-	pop {r0}
-	bx r0
-	thumb_func_end PokeballGlowEffect_4
-
-	thumb_func_start PokeballGlowEffect_5
-PokeballGlowEffect_5: @ 80863D8
-	ldrh r1, [r0, 0x2E]
-	adds r1, 0x1
-	strh r1, [r0, 0x2E]
-	bx lr
-	thumb_func_end PokeballGlowEffect_5
-
-	thumb_func_start PokeballGlowEffect_6
-PokeballGlowEffect_6: @ 80863E0
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x38
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _080863F6
-	bl IsFanfareTaskInactive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080863FC
-_080863F6:
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-_080863FC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end PokeballGlowEffect_6
-
-	thumb_func_start PokeballGlowEffect_7
-PokeballGlowEffect_7: @ 8086404
-	bx lr
-	thumb_func_end PokeballGlowEffect_7
-
-	thumb_func_start SpriteCB_PokeballGlow
-SpriteCB_PokeballGlow: @ 8086408
-	push {lr}
-	adds r3, r0, 0
-	ldr r2, _0808642C @ =gSprites
-	movs r0, 0x2E
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0x2E
-	ldrsh r0, [r0, r1]
-	cmp r0, 0x4
-	ble _08086428
-	adds r0, r3, 0
-	bl FieldEffectFreeGraphicsResources
-_08086428:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808642C: .4byte gSprites
-	thumb_func_end SpriteCB_PokeballGlow
-
-	thumb_func_start PokecenterHealEffectHelper
-PokecenterHealEffectHelper: @ 8086430
-	push {r4,lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	ldr r0, _08086480 @ =gSpriteTemplate_839F220
-	lsls r3, 16
-	asrs r3, 16
-	lsls r2, 16
-	asrs r2, 16
-	adds r1, r3, 0
-	movs r3, 0
-	bl CreateSpriteAtEnd
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, _08086484 @ =gSprites
-	adds r0, r1
-	ldrb r2, [r0, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r2
-	movs r2, 0x8
-	orrs r1, r2
-	strb r1, [r0, 0x5]
-	adds r3, r0, 0
-	adds r3, 0x3E
-	ldrb r1, [r3]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r3]
-	ldr r1, _08086488 @ =gUnknown_0839F1A0
-	bl SetSubspriteTables
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086480: .4byte gSpriteTemplate_839F220
-_08086484: .4byte gSprites
-_08086488: .4byte gUnknown_0839F1A0
-	thumb_func_end PokecenterHealEffectHelper
-
-	thumb_func_start SpriteCB_PokecenterMonitor
-SpriteCB_PokecenterMonitor: @ 808648C
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _080864B0
-	movs r0, 0
-	strh r0, [r4, 0x2E]
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r1, [r2]
-	subs r0, 0x5
-	ands r0, r1
-	strb r0, [r2]
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAnim
-_080864B0:
-	adds r0, r4, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080864C4
-	adds r0, r4, 0
-	bl FieldEffectFreeGraphicsResources
-_080864C4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end SpriteCB_PokecenterMonitor
-
-	thumb_func_start HallOfFameRecordEffectHelper
-HallOfFameRecordEffectHelper: @ 80864CC
-	push {r4,r5,lr}
-	lsls r0, 16
-	lsrs r5, r0, 16
-	lsls r1, 16
-	lsrs r1, 16
-	lsls r2, 16
-	lsrs r2, 16
-	lsls r3, 24
-	cmp r3, 0
-	bne _08086514
-	ldr r0, _08086508 @ =gSpriteTemplate_839F238
-	lsls r1, 16
-	asrs r1, 16
-	lsls r2, 16
-	asrs r2, 16
-	movs r3, 0
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	ldr r1, _0808650C @ =gSprites
-	adds r0, r1
-	ldr r1, _08086510 @ =gUnknown_0839F1C8
-	bl SetSubspriteTables
-	b _08086528
-	.align 2, 0
-_08086508: .4byte gSpriteTemplate_839F238
-_0808650C: .4byte gSprites
-_08086510: .4byte gUnknown_0839F1C8
-_08086514:
-	ldr r0, _08086548 @ =gSpriteTemplate_839F250
-	lsls r1, 16
-	asrs r1, 16
-	lsls r2, 16
-	asrs r2, 16
-	movs r3, 0
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r4, r0, 24
-_08086528:
-	ldr r1, _0808654C @ =gSprites
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	adds r0, r1
-	adds r3, r0, 0
-	adds r3, 0x3E
-	ldrb r1, [r3]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r3]
-	strh r5, [r0, 0x2E]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086548: .4byte gSpriteTemplate_839F250
-_0808654C: .4byte gSprites
-	thumb_func_end HallOfFameRecordEffectHelper
-
-	thumb_func_start SpriteCB_HallOfFameMonitor
-SpriteCB_HallOfFameMonitor: @ 8086550
-	push {lr}
-	adds r3, r0, 0
-	ldr r2, _080865B8 @ =gTasks
-	movs r0, 0x2E
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r1, 0x26
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _080865A6
-	ldrh r1, [r3, 0x30]
-	movs r2, 0x30
-	ldrsh r0, [r3, r2]
-	cmp r0, 0
-	beq _0808657E
-	subs r0, r1, 0x1
-	strh r0, [r3, 0x30]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080865A0
-_0808657E:
-	movs r0, 0x10
-	strh r0, [r3, 0x30]
-	movs r0, 0x3E
-	adds r0, r3
-	mov r12, r0
-	ldrb r2, [r0]
-	lsls r0, r2, 29
-	lsrs r0, 31
-	movs r1, 0x1
-	eors r1, r0
-	lsls r1, 2
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	orrs r0, r1
-	mov r1, r12
-	strb r0, [r1]
-_080865A0:
-	ldrh r0, [r3, 0x32]
-	adds r0, 0x1
-	strh r0, [r3, 0x32]
-_080865A6:
-	movs r2, 0x32
-	ldrsh r0, [r3, r2]
-	cmp r0, 0x7F
-	ble _080865B4
-	adds r0, r3, 0
-	bl FieldEffectFreeGraphicsResources
-_080865B4:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080865B8: .4byte gTasks
-	thumb_func_end SpriteCB_HallOfFameMonitor
-
 	thumb_func_start sub_80865BC
 sub_80865BC: @ 80865BC
 	push {lr}
diff --git a/src/field_effect.c b/src/field_effect.c
old mode 100644
new mode 100755
index 72fd281af..1dfc7e107
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -6,6 +6,8 @@
 #include "palette.h"
 #include "text.h"
 #include "task.h"
+#include "sound.h"
+#include "songs.h"
 #include "field_effect.h"
 
 typedef bool8 (*FldEffCmd)(u8 **, u32 *);
@@ -508,7 +510,7 @@ void PokecenterHealEffect_3(struct Task *task)
 
 void Task_HallOfFameRecord(u8 taskId);
 extern const void (*gUnknown_0839F278[4])(struct Task *);
-void HallOfFameRecordEffectHelper(u8, u8, u8, u8);
+void HallOfFameRecordEffectHelper(s16, s16, s16, u8);
 
 bool8 FldEff_HallOfFameRecord(void)
 {
@@ -569,3 +571,214 @@ void HallOfFameRecordEffect_3(struct Task *task)
         DestroyTask(FindTaskIdByFunc(Task_HallOfFameRecord));
     }
 }
+
+void SpriteCB_PokeballGlowEffect(struct Sprite *);
+extern const void (*gUnknown_0839F288[8])(struct Sprite *);
+extern const struct SpriteTemplate gSpriteTemplate_839F208;
+extern const struct SpriteTemplate gSpriteTemplate_839F220;
+extern const struct SpriteTemplate gSpriteTemplate_839F238;
+extern const struct SpriteTemplate gSpriteTemplate_839F250;
+extern const struct SubspriteTable gUnknown_0839F1A0;
+extern const struct SubspriteTable gUnknown_0839F1C8;
+extern const struct Coords16 gUnknown_0839F2A8[6];
+
+u8 CreatePokeballGlowSprite(s16 data6, s16 x, s16 y, u16 data5)
+{
+    u8 spriteId;
+    struct Sprite *sprite;
+    spriteId = CreateInvisibleSprite(SpriteCB_PokeballGlowEffect);
+    sprite = &gSprites[spriteId];
+    sprite->pos2.x = x;
+    sprite->pos2.y = y;
+    sprite->data5 = data5;
+    sprite->data6 = data6;
+    sprite->data7 = spriteId;
+    return spriteId;
+}
+
+void SpriteCB_PokeballGlowEffect(struct Sprite *sprite)
+{
+    gUnknown_0839F288[sprite->data0](sprite);
+}
+
+void PokeballGlowEffect_0(struct Sprite *sprite)
+{
+    u8 endSpriteId;
+    if (sprite->data1 == 0 || (--sprite->data1) == 0)
+    {
+        sprite->data1 = 25;
+        endSpriteId = CreateSpriteAtEnd(&gSpriteTemplate_839F208, gUnknown_0839F2A8[sprite->data2].x + sprite->pos2.x, gUnknown_0839F2A8[sprite->data2].y + sprite->pos2.y, 0);
+        gSprites[endSpriteId].oam.priority = 2;
+        gSprites[endSpriteId].data0 = sprite->data7;
+        sprite->data2++;
+        sprite->data6--;
+        PlaySE(SE_BOWA);
+    }
+    if (sprite->data6 == 0)
+    {
+        sprite->data1 = 32;
+        sprite->data0++;
+    }
+}
+
+extern const u8 gUnknown_0839F2C0[4]; // red
+extern const u8 gUnknown_0839F2C4[4]; // green
+extern const u8 gUnknown_0839F2C8[4]; // blue
+
+void PokeballGlowEffect_1(struct Sprite *sprite)
+{
+    if ((--sprite->data1) == 0)
+    {
+        sprite->data0++;
+        sprite->data1 = 8;
+        sprite->data2 = 0;
+        sprite->data3 = 0;
+        if (sprite->data5)
+        {
+            PlayFanfare(BGM_ME_ASA);
+        }
+    }
+}
+
+void PokeballGlowEffect_2(struct Sprite *sprite)
+{
+    u8 phase;
+    if ((--sprite->data1) == 0)
+    {
+        sprite->data1 = 8;
+        sprite->data2++;
+        sprite->data2 &= 3;
+        if (sprite->data2 == 0)
+        {
+            sprite->data3++;
+        }
+    }
+    phase = (sprite->data2 + 3) & 3;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    phase = (sprite->data2 + 2) & 3;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    phase = (sprite->data2 + 1) & 3;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    phase = sprite->data2;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    if (sprite->data3 > 2)
+    {
+        sprite->data0++;
+        sprite->data1 = 8;
+        sprite->data2 = 0;
+    }
+}
+
+void PokeballGlowEffect_3(struct Sprite *sprite)
+{
+    u8 phase;
+    if ((--sprite->data1) == 0)
+    {
+        sprite->data1 = 8;
+        sprite->data2++;
+        sprite->data2 &= 3;
+        if (sprite->data2 == 3)
+        {
+            sprite->data0++;
+            sprite->data1 = 30;
+        }
+    }
+    phase = sprite->data2;
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x108, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x106, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x102, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x105, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+    MultiplyInvertedPaletteRGBComponents((IndexOfSpritePaletteTag(0x1007) << 4) + 0x103, gUnknown_0839F2C0[phase], gUnknown_0839F2C4[phase], gUnknown_0839F2C8[phase]);
+}
+
+void PokeballGlowEffect_4(struct Sprite *sprite)
+{
+    if ((--sprite->data1) == 0)
+    {
+        sprite->data0++;
+    }
+}
+
+void PokeballGlowEffect_5(struct Sprite *sprite)
+{
+    sprite->data0++;
+}
+
+void PokeballGlowEffect_6(struct Sprite *sprite)
+{
+    if (sprite->data5 == 0 || IsFanfareTaskInactive())
+    {
+        sprite->data0++;
+    }
+}
+
+void PokeballGlowEffect_7(struct Sprite *sprite)
+{
+}
+
+void SpriteCB_PokeballGlow(struct Sprite *sprite)
+{
+    if (gSprites[sprite->data0].data0 > 4)
+    {
+        FieldEffectFreeGraphicsResources(sprite);
+    }
+}
+
+u8 PokecenterHealEffectHelper(s16 x, s16 y)
+{
+    u8 spriteIdAtEnd;
+    struct Sprite *sprite;
+    spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F220, x, y, 0);
+    sprite = &gSprites[spriteIdAtEnd];
+    sprite->oam.priority = 2;
+    sprite->invisible = 1;
+    SetSubspriteTables(sprite, &gUnknown_0839F1A0);
+    return spriteIdAtEnd;
+}
+
+void SpriteCB_PokecenterMonitor(struct Sprite *sprite)
+{
+    if (sprite->data0 != 0)
+    {
+        sprite->data0 = 0;
+        sprite->invisible = 0;
+        StartSpriteAnim(sprite, 1);
+    }
+    if (sprite->animEnded)
+    {
+        FieldEffectFreeGraphicsResources(sprite);
+    }
+}
+
+void HallOfFameRecordEffectHelper(s16 a0, s16 a1, s16 a2, u8 a3)
+{
+    u8 spriteIdAtEnd;
+    if (!a3)
+    {
+        spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F238, a1, a2, 0);
+        SetSubspriteTables(&gSprites[spriteIdAtEnd], &gUnknown_0839F1C8);
+    } else
+    {
+        spriteIdAtEnd = CreateSpriteAtEnd(&gSpriteTemplate_839F250, a1, a2, 0);
+    }
+    gSprites[spriteIdAtEnd].invisible = 1;
+    gSprites[spriteIdAtEnd].data0 = a0;
+}
+
+void SpriteCB_HallOfFameMonitor(struct Sprite *sprite)
+{
+    if (gTasks[sprite->data0].data[15])
+    {
+        if (sprite->data1 == 0 || (--sprite->data1) == 0)
+        {
+            sprite->data1 = 16;
+            sprite->invisible ^= 1;
+        }
+        sprite->data2++;
+    }
+    if (sprite->data2 > 127)
+    {
+        FieldEffectFreeGraphicsResources(sprite);
+    }
+}
-- 
cgit v1.2.3


From d48792a69d0687f50401db08e5b133cd60a9a81a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 6 Jun 2017 23:18:03 -0400
Subject: Some functions related to queueing overworld fly fldeff

---
 asm/field_effect.s     | 186 -------------------------------------------------
 include/asm.inc.h      |   6 +-
 include/field_effect.h |   2 +
 include/rom4.h         |   2 +-
 src/field_effect.c     |  91 ++++++++++++++++++++++++
 5 files changed, 97 insertions(+), 190 deletions(-)
 mode change 100644 => 100755 include/asm.inc.h
 mode change 100644 => 100755 include/field_effect.h
 mode change 100644 => 100755 include/rom4.h

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 0bd7dc9d6..5ea82d1ca 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,192 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80865BC
-sub_80865BC: @ 80865BC
-	push {lr}
-	ldr r0, _080865D0 @ =c2_exit_to_overworld_2_switch
-	bl SetMainCallback2
-	ldr r1, _080865D4 @ =gUnknown_0300485C
-	ldr r0, _080865D8 @ =mapldr_080842E8
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080865D0: .4byte c2_exit_to_overworld_2_switch
-_080865D4: .4byte gUnknown_0300485C
-_080865D8: .4byte mapldr_080842E8
-	thumb_func_end sub_80865BC
-
-	thumb_func_start mapldr_080842E8
-mapldr_080842E8: @ 80865DC
-	push {lr}
-	bl pal_fill_black
-	ldr r0, _080865FC @ =task00_8084310
-	movs r1, 0
-	bl CreateTask
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	ldr r1, _08086600 @ =gUnknown_0300485C
-	movs r0, 0
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080865FC: .4byte task00_8084310
-_08086600: .4byte gUnknown_0300485C
-	thumb_func_end mapldr_080842E8
-
-	thumb_func_start task00_8084310
-task00_8084310: @ 8086604
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	lsls r0, r6, 2
-	adds r0, r6
-	lsls r0, 3
-	ldr r1, _0808666C @ =gTasks
-	adds r4, r0, r1
-	movs r0, 0x8
-	ldrsh r5, [r4, r0]
-	cmp r5, 0
-	bne _08086640
-	bl sub_807D770
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086666
-	ldr r1, _08086670 @ =gUnknown_0202FF84
-	ldr r0, _08086674 @ =gLastFieldPokeMenuOpened
-	ldrb r0, [r0]
-	str r0, [r1]
-	cmp r0, 0x5
-	ble _08086634
-	str r5, [r1]
-_08086634:
-	movs r0, 0x1F
-	bl FieldEffectStart
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08086640:
-	movs r0, 0x1F
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _08086666
-	bl flag_var_implications_of_teleport_
-	bl warp_in
-	ldr r0, _08086678 @ =CB2_LoadMap
-	bl SetMainCallback2
-	ldr r1, _0808667C @ =gUnknown_0300485C
-	ldr r0, _08086680 @ =mapldr_08084390
-	str r0, [r1]
-	adds r0, r6, 0
-	bl DestroyTask
-_08086666:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808666C: .4byte gTasks
-_08086670: .4byte gUnknown_0202FF84
-_08086674: .4byte gLastFieldPokeMenuOpened
-_08086678: .4byte CB2_LoadMap
-_0808667C: .4byte gUnknown_0300485C
-_08086680: .4byte mapldr_08084390
-	thumb_func_end task00_8084310
-
-	thumb_func_start mapldr_08084390
-mapldr_08084390: @ 8086684
-	push {r4,lr}
-	bl sub_8053E90
-	bl pal_fill_black
-	ldr r0, _080866DC @ =c3_080843F8
-	movs r1, 0
-	bl CreateTask
-	ldr r4, _080866E0 @ =gMapObjects
-	ldr r3, _080866E4 @ =gPlayerAvatar
-	ldrb r1, [r3, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	ldrb r1, [r0, 0x1]
-	movs r2, 0x20
-	orrs r1, r2
-	strb r1, [r0, 0x1]
-	ldrb r1, [r3]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _080866C6
-	ldrb r1, [r3, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r1, 0x3
-	bl FieldObjectTurn
-_080866C6:
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	ldr r1, _080866E8 @ =gUnknown_0300485C
-	movs r0, 0
-	str r0, [r1]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080866DC: .4byte c3_080843F8
-_080866E0: .4byte gMapObjects
-_080866E4: .4byte gPlayerAvatar
-_080866E8: .4byte gUnknown_0300485C
-	thumb_func_end mapldr_08084390
-
-	thumb_func_start c3_080843F8
-c3_080843F8: @ 80866EC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r5, r0, 0
-	lsls r0, r5, 2
-	adds r0, r5
-	lsls r0, 3
-	ldr r1, _08086740 @ =gTasks
-	adds r4, r0, r1
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _0808671E
-	ldr r0, _08086744 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08086738
-	movs r0, 0x20
-	bl FieldEffectStart
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_0808671E:
-	movs r0, 0x20
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _08086738
-	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
-	adds r0, r5, 0
-	bl DestroyTask
-_08086738:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086740: .4byte gTasks
-_08086744: .4byte gPaletteFade
-	thumb_func_end c3_080843F8
-
 	thumb_func_start sub_8086748
 sub_8086748: @ 8086748
 	push {lr}
diff --git a/include/asm.inc.h b/include/asm.inc.h
old mode 100644
new mode 100755
index 7c090dec2..3837af64b
--- a/include/asm.inc.h
+++ b/include/asm.inc.h
@@ -207,9 +207,9 @@ void sub_8083A84(TaskFunc);
 s32 sub_8083BF4(u8 id);
 
 // asm/field_effect.o
-u8 CreateTrainerSprite_BirchSpeech(u8, u16, u16, u8, void *);
-void LoadTrainerGfx_TrainerCard(u8 gender, int, void *);
-u8 CreateBirchSprite(u8, u8, u8);
+u8 CreateTrainerSprite_BirchSpeech(u8, s16, s16, u8, u8 *);
+void LoadTrainerGfx_TrainerCard(u8 gender, u16, u8 *);
+u8 CreateBirchSprite(s16, s16, u8);
 
 // asm/unknown_task.o
 void remove_some_task(void);
diff --git a/include/field_effect.h b/include/field_effect.h
old mode 100644
new mode 100755
index e3e80b3df..d35ca599b
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -80,6 +80,8 @@ extern struct SpriteTemplate gUnknown_02024E8C;
 
 extern const struct SpritePalette *sub_80409C8(u16, u32, u32);
 
+extern u8 gLastFieldPokeMenuOpened;
+
 u32 FieldEffectStart(u8 id);
 bool8 FieldEffectCmd_loadtiles(u8 **script, u32 *val);
 bool8 FieldEffectCmd_loadfadedpal(u8 **script, u32 *val);
diff --git a/include/rom4.h b/include/rom4.h
old mode 100644
new mode 100755
index 476a0e103..ab63068b2
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -18,7 +18,7 @@ struct LinkPlayerMapObject
 };
 
 // sub_8052F5C
-// flag_var_implications_of_teleport_
+void flag_var_implications_of_teleport_(void);
 void new_game(void);
 void sub_8053014(void);
 void sub_8053050(void);
diff --git a/src/field_effect.c b/src/field_effect.c
index 1dfc7e107..931116c16 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1,13 +1,20 @@
 #include "global.h"
+#include "asm.h"
 #include "data2.h"
+#include "script.h"
+#include "main.h"
 #include "field_weather.h"
 #include "decompress.h"
 #include "sprite.h"
 #include "palette.h"
 #include "text.h"
+#include "rom4.h"
 #include "task.h"
 #include "sound.h"
 #include "songs.h"
+#include "decoration.h"
+#include "field_map_obj_helpers.h"
+#include "field_map_obj.h"
 #include "field_effect.h"
 
 typedef bool8 (*FldEffCmd)(u8 **, u32 *);
@@ -782,3 +789,87 @@ void SpriteCB_HallOfFameMonitor(struct Sprite *sprite)
         FieldEffectFreeGraphicsResources(sprite);
     }
 }
+
+void mapldr_080842E8(void);
+void mapldr_08084390(void);
+void task00_8084310(u8);
+void c3_080843F8(u8);
+
+void sub_80865BC(void)
+{
+    SetMainCallback2(c2_exit_to_overworld_2_switch);
+    gUnknown_0300485C = mapldr_080842E8;
+}
+
+void mapldr_080842E8(void)
+{
+    pal_fill_black();
+    CreateTask(task00_8084310, 0);
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    gUnknown_0300485C = NULL;
+}
+
+void task00_8084310(u8 taskId)
+{
+    struct Task *task;
+    task = &gTasks[taskId];
+    if (!task->data[0])
+    {
+        if (!sub_807D770())
+        {
+            return;
+        }
+        gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+        if ((int)gUnknown_0202FF84[0] > 5)
+        {
+            gUnknown_0202FF84[0] = 0;
+        }
+        FieldEffectStart(FLDEFF_USE_FLY);
+        task->data[0]++;
+    }
+    if (!FieldEffectActiveListContains(FLDEFF_USE_FLY))
+    {
+        flag_var_implications_of_teleport_();
+        warp_in();
+        SetMainCallback2(CB2_LoadMap);
+        gUnknown_0300485C = mapldr_08084390;
+        DestroyTask(taskId);
+    }
+}
+
+void mapldr_08084390(void)
+{
+    sub_8053E90();
+    pal_fill_black();
+    CreateTask(c3_080843F8, 0);
+    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+    if (gPlayerAvatar.flags & 0x08)
+    {
+        FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_WEST);
+    }
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    gUnknown_0300485C = NULL;
+}
+
+void c3_080843F8(u8 taskId)
+{
+    struct Task *task;
+    task = &gTasks[taskId];
+    if (task->data[0] == 0)
+    {
+        if (gPaletteFade.active)
+        {
+            return;
+        }
+        FieldEffectStart(FLDEFF_FLY_IN);
+        task->data[0]++;
+    }
+    if (!FieldEffectActiveListContains(FLDEFF_FLY_IN))
+    {
+        ScriptContext2_Disable();
+        UnfreezeMapObjects();
+        DestroyTask(taskId);
+    }
+}
-- 
cgit v1.2.3


From bbc25771031be86bf19f11ddf2b078dd5364ca30 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 7 Jun 2017 08:50:09 -0400
Subject: Up through sub_80867AC (nonmatching wip)

---
 asm/field_effect.s | 131 -----------------------------------------------------
 src/field_effect.c |  41 +++++++++++++++++
 2 files changed, 41 insertions(+), 131 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 5ea82d1ca..e78d0af3b 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,137 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8086748
-sub_8086748: @ 8086748
-	push {lr}
-	bl sub_8053E90
-	bl pal_fill_for_map_transition
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	ldr r0, _0808676C @ =sub_8086774
-	movs r1, 0
-	bl CreateTask
-	ldr r1, _08086770 @ =gUnknown_0300485C
-	movs r0, 0
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808676C: .4byte sub_8086774
-_08086770: .4byte gUnknown_0300485C
-	thumb_func_end sub_8086748
-
-	thumb_func_start sub_8086774
-sub_8086774: @ 8086774
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _080867A4 @ =gTasks
-	adds r4, r1, r0
-	ldr r5, _080867A8 @ =gUnknown_0839F2CC
-_08086786:
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	bne _08086786
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080867A4: .4byte gTasks
-_080867A8: .4byte gUnknown_0839F2CC
-	thumb_func_end sub_8086774
-
-	thumb_func_start sub_80867AC
-sub_80867AC: @ 80867AC
-	push {r4-r6,lr}
-	mov r6, r9
-	mov r5, r8
-	push {r5,r6}
-	mov r9, r0
-	ldr r6, _08086848 @ =gPlayerAvatar
-	ldrb r0, [r6, 0x5]
-	lsls r5, r0, 3
-	adds r5, r0
-	lsls r5, 2
-	ldr r0, _0808684C @ =gMapObjects
-	mov r8, r0
-	add r5, r8
-	ldrb r0, [r6, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08086850 @ =gSprites
-	adds r4, r0
-	bl CameraObjectReset2
-	ldrb r1, [r6, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	add r0, r8
-	ldrb r1, [r0, 0x1]
-	movs r2, 0x20
-	orrs r1, r2
-	strb r1, [r0, 0x1]
-	movs r0, 0x1
-	strb r0, [r6, 0x6]
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFaceDirectionAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
-	adds r3, r4, 0
-	adds r3, 0x42
-	ldrb r0, [r3]
-	lsrs r0, 6
-	mov r1, r9
-	strh r0, [r1, 0x10]
-	ldrb r0, [r5, 0x3]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r5, 0x3]
-	ldrb r1, [r4, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r4, 0x5]
-	ldrb r1, [r3]
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r3]
-	mov r1, r9
-	ldrh r0, [r1, 0x8]
-	adds r0, 0x1
-	strh r0, [r1, 0x8]
-	movs r0, 0x1
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086848: .4byte gPlayerAvatar
-_0808684C: .4byte gMapObjects
-_08086850: .4byte gSprites
-	thumb_func_end sub_80867AC
-
 	thumb_func_start sub_8086854
 sub_8086854: @ 8086854
 	push {r4,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 931116c16..ad8fa3648 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -13,6 +13,7 @@
 #include "sound.h"
 #include "songs.h"
 #include "decoration.h"
+#include "field_player_avatar.h"
 #include "field_map_obj_helpers.h"
 #include "field_map_obj.h"
 #include "field_effect.h"
@@ -873,3 +874,43 @@ void c3_080843F8(u8 taskId)
         DestroyTask(taskId);
     }
 }
+
+extern void pal_fill_for_map_transition(void);
+void sub_8086774(u8);
+extern const bool8 (*gUnknown_0839F2CC[7])(struct Task *);
+extern void CameraObjectReset2(void);
+
+void sub_8086748(void)
+{
+    sub_8053E90();
+    pal_fill_for_map_transition();
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    CreateTask(sub_8086774, 0);
+    gUnknown_0300485C = NULL;
+}
+
+void sub_8086774(u8 taskId)
+{
+    struct Task *task;
+    task = &gTasks[taskId];
+    while (gUnknown_0839F2CC[task->data[0]](task));
+}
+
+bool8 sub_80867AC(struct Task *task)
+{
+    struct MapObject *playerObject;
+    struct Sprite *playerSprite;
+    playerObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    playerSprite = &gSprites[gPlayerAvatar.spriteId];
+    CameraObjectReset2();
+    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+    gPlayerAvatar.unk6 = 1;
+    FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
+    task->data[4] = playerSprite->subspriteMode;
+    playerObject->mapobj_bit_27 = 1;
+    playerSprite->oam.priority = 1;
+    playerSprite->subspriteMode = 2;
+    task->data[0]++;
+}
+
-- 
cgit v1.2.3


From 585cab7a47066e5e70d89180e7e7154652058400 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Wed, 7 Jun 2017 15:45:12 -0400
Subject: sub_8086870 (nonmatching)

---
 asm/field_effect.s | 75 -------------------------------------------
 include/global.h   |  2 ++
 src/field_effect.c | 94 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 3 files changed, 93 insertions(+), 78 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index e78d0af3b..c23d85338 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,81 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8086854
-sub_8086854: @ 8086854
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_807D770
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086868
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08086868:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8086854
-
-	thumb_func_start sub_8086870
-sub_8086870: @ 8086870
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r6, _080868D4 @ =gPlayerAvatar
-	ldrb r0, [r6, 0x4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _080868D8 @ =gSprites
-	adds r2, r0
-	adds r0, r2, 0
-	adds r0, 0x29
-	movs r4, 0
-	ldrsb r4, [r0, r4]
-	lsls r0, r4, 17
-	negs r0, r0
-	ldrh r1, [r2, 0x22]
-	ldr r3, _080868DC @ =gSpriteCoordOffsetY
-	adds r1, r4
-	ldrh r3, [r3]
-	adds r1, r3
-	asrs r0, 16
-	adds r0, r1
-	negs r0, r0
-	movs r1, 0
-	strh r0, [r2, 0x26]
-	movs r0, 0x1
-	strh r0, [r5, 0xA]
-	strh r1, [r5, 0xC]
-	ldr r2, _080868E0 @ =gMapObjects
-	ldrb r0, [r6, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrb r2, [r1, 0x1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1, 0x1]
-	movs r0, 0x2B
-	bl PlaySE
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080868D4: .4byte gPlayerAvatar
-_080868D8: .4byte gSprites
-_080868DC: .4byte gSpriteCoordOffsetY
-_080868E0: .4byte gMapObjects
-	thumb_func_end sub_8086870
-
 	thumb_func_start sub_80868E4
 sub_80868E4: @ 80868E4
 	push {r4-r6,lr}
diff --git a/include/global.h b/include/global.h
index 716aae15f..67a9548b6 100644
--- a/include/global.h
+++ b/include/global.h
@@ -10,6 +10,8 @@
 // to help in decompiling
 #define asm_comment(x) asm volatile("@ -- " x " -- ")
 
+#define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n")
+
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
 
 #define POKEMON_NAME_LENGTH 10
diff --git a/src/field_effect.c b/src/field_effect.c
index ad8fa3648..a40b6d0cb 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -894,10 +894,10 @@ void sub_8086774(u8 taskId)
 {
     struct Task *task;
     task = &gTasks[taskId];
-    while (gUnknown_0839F2CC[task->data[0]](task));
+    while (gUnknown_0839F2CC[task->data[0]](task)); // return code signifies whether to continue blocking here
 }
 
-bool8 sub_80867AC(struct Task *task)
+bool8 sub_80867AC(struct Task *task) // gUnknown_0839F2CC[0]
 {
     struct MapObject *playerObject;
     struct Sprite *playerSprite;
@@ -908,9 +908,97 @@ bool8 sub_80867AC(struct Task *task)
     gPlayerAvatar.unk6 = 1;
     FieldObjectSetSpecialAnim(playerObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
     task->data[4] = playerSprite->subspriteMode;
-    playerObject->mapobj_bit_27 = 1;
+    playerObject->mapobj_bit_26 = 1;
     playerSprite->oam.priority = 1;
     playerSprite->subspriteMode = 2;
     task->data[0]++;
+    return TRUE;
+}
+
+bool8 sub_8086854(struct Task *task) // gUnknown_0839F2CC[1]
+{
+    if (sub_807D770())
+    {
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+#ifdef NONMATCHING
+bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
+{
+    struct Sprite *sprite;
+    s16 centerToCornerVecY;
+    int ctcvy;
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    centerToCornerVecY = sprite->centerToCornerVecY;
+    ctcvy = -(centerToCornerVecY << 17);
+    sprite->pos2.y = -((sprite->pos1.y + centerToCornerVecY + gSpriteCoordOffsetY) + (ctcvy >> 16));
+    task->data[1] = 1;
+    task->data[2] = 0;
+    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0;
+    PlaySE(SE_RU_HYUU);
+    task->data[0]++;
+    return FALSE;
 }
+#else
+__attribute__((naked))
+bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
+{
+    asm_unified("\tpush {r4-r6,lr}\n"
+                "\tadds r5, r0, 0\n"
+                "\tldr r6, _080868D4 @ =gPlayerAvatar\n"
+                "\tldrb r0, [r6, 0x4]\n"
+                "\tlsls r2, r0, 4\n"
+                "\tadds r2, r0\n"
+                "\tlsls r2, 2\n"
+                "\tldr r0, _080868D8 @ =gSprites\n"
+                "\tadds r2, r0\n"
+                "\tadds r0, r2, 0\n"
+                "\tadds r0, 0x29\n"
+                "\tmovs r4, 0\n"
+                "\tldrsb r4, [r0, r4] @ =gSprites[gPlayerAvatar.spriteId].centerToCornerVecY\n"
+                "\tlsls r0, r4, 17\n"
+                "\tnegs r0, r0\n"
+                "\tldrh r1, [r2, 0x22] @ =gSprites[gPlayerAvatar.spriteId].pos1.y\n"
+                "\tldr r3, _080868DC @ =gSpriteCoordOffsetY\n"
+                "\tadds r1, r4\n"
+                "\tldrh r3, [r3]\n"
+                "\tadds r1, r3\n"
+                "\tasrs r0, 16\n"
+                "\tadds r0, r1\n"
+                "\tnegs r0, r0\n"
+                "\tmovs r1, 0\n"
+                "\tstrh r0, [r2, 0x26]\n"
+                "\tmovs r0, 0x1\n"
+                "\tstrh r0, [r5, 0xA]\n"
+                "\tstrh r1, [r5, 0xC]\n"
+                "\tldr r2, _080868E0 @ =gMapObjects\n"
+                "\tldrb r0, [r6, 0x5]\n"
+                "\tlsls r1, r0, 3\n"
+                "\tadds r1, r0\n"
+                "\tlsls r1, 2\n"
+                "\tadds r1, r2\n"
+                "\tldrb r2, [r1, 0x1]\n"
+                "\tmovs r0, 0x21\n"
+                "\tnegs r0, r0\n"
+                "\tands r0, r2\n"
+                "\tstrb r0, [r1, 0x1]\n"
+                "\tmovs r0, 0x2B\n"
+                "\tbl PlaySE\n"
+                "\tldrh r0, [r5, 0x8]\n"
+                "\tadds r0, 0x1\n"
+                "\tstrh r0, [r5, 0x8]\n"
+                "\tmovs r0, 0\n"
+                "\tpop {r4-r6}\n"
+                "\tpop {r1}\n"
+                "\tbx r1\n"
+                "\t.align 2, 0\n"
+                "_080868D4: .4byte gPlayerAvatar\n"
+                "_080868D8: .4byte gSprites\n"
+                "_080868DC: .4byte gSpriteCoordOffsetY\n"
+                "_080868E0: .4byte gMapObjects");
+}
+#endif
+
 
-- 
cgit v1.2.3


From e4ccb588f4104e7b800d1a18927536617e0e284a Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 7 Jun 2017 19:08:27 -0400
Subject: Fly-related functions?

---
 asm/field_effect.s | 492 -----------------------------------------------------
 src/field_effect.c | 211 +++++++++++++++++++++++
 2 files changed, 211 insertions(+), 492 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index c23d85338..cad14c42e 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,498 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80868E4
-sub_80868E4: @ 80868E4
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	ldr r2, _08086990 @ =gPlayerAvatar
-	ldrb r1, [r2, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086994 @ =gMapObjects
-	adds r6, r0, r1
-	ldrb r1, [r2, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086998 @ =gSprites
-	adds r5, r0, r1
-	ldrh r0, [r4, 0xA]
-	ldrh r1, [r5, 0x26]
-	adds r0, r1
-	strh r0, [r5, 0x26]
-	ldrh r2, [r4, 0xA]
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x7
-	bgt _08086926
-	ldrh r1, [r4, 0xC]
-	adds r0, r2, r1
-	strh r0, [r4, 0xC]
-	movs r1, 0xF
-	ands r0, r1
-	cmp r0, 0
-	beq _08086926
-	lsls r0, r2, 1
-	strh r0, [r4, 0xA]
-_08086926:
-	ldrh r2, [r4, 0xE]
-	movs r1, 0xE
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _08086964
-	movs r0, 0x26
-	ldrsh r1, [r5, r0]
-	movs r0, 0x10
-	negs r0, r0
-	cmp r1, r0
-	blt _08086964
-	adds r0, r2, 0x1
-	strh r0, [r4, 0xE]
-	ldrb r1, [r6, 0x3]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r6, 0x3]
-	ldrb r1, [r4, 0x10]
-	adds r3, r5, 0
-	adds r3, 0x42
-	lsls r1, 6
-	ldrb r2, [r3]
-	movs r0, 0x3F
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	ldrb r0, [r6]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r6]
-_08086964:
-	movs r1, 0x26
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	blt _08086988
-	movs r0, 0xD6
-	bl PlaySE
-	ldrb r0, [r6]
-	movs r1, 0x8
-	orrs r0, r1
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r6]
-	movs r0, 0
-	strh r0, [r5, 0x26]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08086988:
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086990: .4byte gPlayerAvatar
-_08086994: .4byte gMapObjects
-_08086998: .4byte gSprites
-	thumb_func_end sub_80868E4
-
-	thumb_func_start sub_808699C
-sub_808699C: @ 808699C
-	push {lr}
-	ldrh r1, [r0, 0x8]
-	adds r1, 0x1
-	movs r2, 0
-	strh r1, [r0, 0x8]
-	movs r1, 0x4
-	strh r1, [r0, 0xA]
-	strh r2, [r0, 0xC]
-	movs r0, 0
-	bl SetCameraPanningCallback
-	movs r0, 0x1
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808699C
-
-	thumb_func_start sub_80869B8
-sub_80869B8: @ 80869B8
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0xA
-	ldrsh r1, [r4, r0]
-	movs r0, 0
-	bl SetCameraPanning
-	ldrh r0, [r4, 0xA]
-	negs r2, r0
-	strh r2, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	movs r1, 0x3
-	ands r0, r1
-	cmp r0, 0
-	bne _080869E0
-	lsls r0, r2, 16
-	asrs r0, 17
-	strh r0, [r4, 0xA]
-_080869E0:
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080869EE
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_080869EE:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80869B8
-
-	thumb_func_start sub_80869F8
-sub_80869F8: @ 80869F8
-	push {lr}
-	ldr r1, _08086A24 @ =gPlayerAvatar
-	movs r0, 0
-	strb r0, [r1, 0x6]
-	bl ScriptContext2_Disable
-	bl CameraObjectReset1
-	bl UnfreezeMapObjects
-	bl InstallCameraPanAheadCallback
-	ldr r0, _08086A28 @ =sub_8086774
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086A24: .4byte gPlayerAvatar
-_08086A28: .4byte sub_8086774
-	thumb_func_end sub_80869F8
-
-	thumb_func_start sub_8086A2C
-sub_8086A2C: @ 8086A2C
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, _08086A60 @ =sub_8086A68
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08086A64 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	movs r0, 0
-	strh r0, [r1, 0xA]
-	cmp r4, 0x6A
-	bne _08086A58
-	movs r0, 0x1
-	strh r0, [r1, 0xA]
-_08086A58:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086A60: .4byte sub_8086A68
-_08086A64: .4byte gTasks
-	thumb_func_end sub_8086A2C
-
-	thumb_func_start sub_8086A68
-sub_8086A68: @ 8086A68
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08086A98 @ =gTasks
-	adds r4, r1, r0
-	ldr r5, _08086A9C @ =gUnknown_0839F2E8
-_08086A7A:
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	bne _08086A7A
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086A98: .4byte gTasks
-_08086A9C: .4byte gUnknown_0839F2E8
-	thumb_func_end sub_8086A68
-
-	thumb_func_start sub_8086AA0
-sub_8086AA0: @ 8086AA0
-	push {r4,lr}
-	adds r4, r0, 0
-	bl FreezeMapObjects
-	bl CameraObjectReset2
-	ldrb r0, [r4, 0xA]
-	bl sub_80B4824
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8086AA0
-
-	thumb_func_start sub_8086AC0
-sub_8086AC0: @ 8086AC0
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _08086B28 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086B2C @ =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086AEA
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086B1E
-_08086AEA:
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	bl GetFaceDirectionAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	movs r1, 0
-	strh r0, [r5, 0x8]
-	strh r1, [r5, 0xC]
-	strh r1, [r5, 0xE]
-	ldrb r0, [r5, 0xA]
-	cmp r0, 0
-	bne _08086B18
-	movs r0, 0x4
-	strh r0, [r5, 0x8]
-_08086B18:
-	movs r0, 0x50
-	bl PlaySE
-_08086B1E:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086B28: .4byte gPlayerAvatar
-_08086B2C: .4byte gMapObjects
-	thumb_func_end sub_8086AC0
-
-	thumb_func_start sub_8086B30
-sub_8086B30: @ 8086B30
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8086B98
-	movs r1, 0xC
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x3
-	ble _08086B4A
-	bl sub_8086C30
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08086B4A:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8086B30
-
-	thumb_func_start sub_8086B54
-sub_8086B54: @ 8086B54
-	push {lr}
-	bl sub_8086B98
-	bl sub_8086C40
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8086B54
-
-	thumb_func_start sub_8086B64
-sub_8086B64: @ 8086B64
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8086BE4
-	movs r1, 0xC
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x3
-	ble _08086B7E
-	bl sub_8086C30
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08086B7E:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8086B64
-
-	thumb_func_start sub_8086B88
-sub_8086B88: @ 8086B88
-	push {lr}
-	bl sub_8086BE4
-	bl sub_8086C40
-	movs r0, 0
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8086B88
-
-	thumb_func_start sub_8086B98
-sub_8086B98: @ 8086B98
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _08086BDC @ =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08086BE0 @ =gSprites
-	adds r4, r0
-	movs r0, 0xC
-	ldrsh r1, [r5, r0]
-	movs r0, 0x84
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r0, 0xC
-	ldrsh r1, [r5, r0]
-	movs r0, 0x94
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r5, 0xE]
-	adds r0, 0x1
-	strh r0, [r5, 0xE]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08086BD6
-	ldrh r0, [r5, 0xC]
-	adds r0, 0x1
-	strh r0, [r5, 0xC]
-_08086BD6:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086BDC: .4byte gPlayerAvatar
-_08086BE0: .4byte gSprites
-	thumb_func_end sub_8086B98
-
-	thumb_func_start sub_8086BE4
-sub_8086BE4: @ 8086BE4
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _08086C28 @ =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08086C2C @ =gSprites
-	adds r4, r0
-	movs r0, 0xC
-	ldrsh r1, [r5, r0]
-	movs r0, 0x7C
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r0, 0xC
-	ldrsh r1, [r5, r0]
-	movs r0, 0x76
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r5, 0xE]
-	adds r0, 0x1
-	strh r0, [r5, 0xE]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08086C22
-	ldrh r0, [r5, 0xC]
-	adds r0, 0x1
-	strh r0, [r5, 0xC]
-_08086C22:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086C28: .4byte gPlayerAvatar
-_08086C2C: .4byte gSprites
-	thumb_func_end sub_8086BE4
-
-	thumb_func_start sub_8086C30
-sub_8086C30: @ 8086C30
-	push {lr}
-	bl sub_8053FF8
-	bl fade_8080918
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8086C30
-
-	thumb_func_start sub_8086C40
-sub_8086C40: @ 8086C40
-	push {lr}
-	ldr r0, _08086C80 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08086C7C
-	bl sub_8054034
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08086C7C
-	bl sub_80B483C
-	bl warp_in
-	ldr r1, _08086C84 @ =gUnknown_0300485C
-	ldr r0, _08086C88 @ =sub_8086C94
-	str r0, [r1]
-	ldr r0, _08086C8C @ =CB2_LoadMap
-	bl SetMainCallback2
-	ldr r0, _08086C90 @ =sub_8086A68
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08086C7C:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086C80: .4byte gPaletteFade
-_08086C84: .4byte gUnknown_0300485C
-_08086C88: .4byte sub_8086C94
-_08086C8C: .4byte CB2_LoadMap
-_08086C90: .4byte sub_8086A68
-	thumb_func_end sub_8086C40
-
 	thumb_func_start sub_8086C94
 sub_8086C94: @ 8086C94
 	push {lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index a40b6d0cb..664e59ecf 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2,6 +2,7 @@
 #include "asm.h"
 #include "data2.h"
 #include "script.h"
+#include "trig.h"
 #include "main.h"
 #include "field_weather.h"
 #include "decompress.h"
@@ -16,6 +17,7 @@
 #include "field_player_avatar.h"
 #include "field_map_obj_helpers.h"
 #include "field_map_obj.h"
+#include "field_camera.h"
 #include "field_effect.h"
 
 typedef bool8 (*FldEffCmd)(u8 **, u32 *);
@@ -879,6 +881,7 @@ extern void pal_fill_for_map_transition(void);
 void sub_8086774(u8);
 extern const bool8 (*gUnknown_0839F2CC[7])(struct Task *);
 extern void CameraObjectReset2(void);
+extern void CameraObjectReset1(void);
 
 void sub_8086748(void)
 {
@@ -1001,4 +1004,212 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
 }
 #endif
 
+bool8 sub_80868E4(struct Task *task)
+{
+    struct MapObject *mapObject;
+    struct Sprite *sprite;
+
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    sprite->pos2.y += task->data[1];
+    if (task->data[1] < 8)
+    {
+        task->data[2] += task->data[1];
+        if (task->data[2] & 0xf)
+        {
+            task->data[1] <<= 1;
+        }
+    }
+    if (task->data[3] == 0 && sprite->pos2.y >= -16)
+    {
+        task->data[3]++;
+        mapObject->mapobj_bit_26 = 0;
+        sprite->subspriteMode = task->data[4];
+        mapObject->mapobj_bit_2 = 1;
+    }
+    if (sprite->pos2.y >= 0)
+    {
+        PlaySE(SE_W070);
+        mapObject->mapobj_bit_3 = 1;
+        mapObject->mapobj_bit_5 = 1;
+        sprite->pos2.y = 0;
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_808699C(struct Task *task)
+{
+    task->data[0]++;
+    task->data[1] = 4;
+    task->data[2] = 0;
+    SetCameraPanningCallback(NULL);
+    return TRUE;
+}
+
+bool8 sub_80869B8(struct Task *task)
+{
+    SetCameraPanning(0, task->data[1]);
+    task->data[1] = -task->data[1];
+    task->data[2]++;
+    if ((task->data[2] & 3) == 0)
+    {
+        task->data[1] >>= 1;
+    }
+    if (task->data[1] == 0)
+    {
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80869F8(struct Task *task)
+{
+    gPlayerAvatar.unk6 = 0;
+    ScriptContext2_Disable();
+    CameraObjectReset1();
+    UnfreezeMapObjects();
+    InstallCameraPanAheadCallback();
+    DestroyTask(FindTaskIdByFunc(sub_8086774));
+    return FALSE;
+}
+
+void sub_8086A68(u8);
+extern const bool8 (*gUnknown_0839F2E8[6])(struct Task *);
+extern void sub_80B4824(u8);
+void sub_8086B98(struct Task *);
+void sub_8086BE4(struct Task *);
+void sub_8086C30(void);
+void sub_8086C40(void);
+
+void sub_8086A2C(u8 a0, u8 priority)
+{
+    u8 taskId;
+    taskId = CreateTask(sub_8086A68, priority);
+    gTasks[taskId].data[1] = 0;
+    if (a0 == 0x6a)
+    {
+        gTasks[taskId].data[1] = 1;
+    }
+}
+
+void sub_8086A68(u8 taskId)
+{
+    struct Task *task;
+    task = &gTasks[taskId];
+    while (gUnknown_0839F2E8[task->data[0]](task));
+}
+
+bool8 sub_8086AA0(struct Task *task)
+{
+    FreezeMapObjects();
+    CameraObjectReset2();
+    sub_80B4824(task->data[1]);
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_8086AC0(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(player_get_direction_lower_nybble()));
+        task->data[0]++;
+        task->data[2] = 0;
+        task->data[3] = 0;
+        if ((u8)task->data[1] == 0)
+        {
+            task->data[0] = 4;
+        }
+        PlaySE(SE_ESUKA);
+    }
+    return FALSE;
+}
+
+bool8 sub_8086B30(struct Task *task)
+{
+    sub_8086B98(task);
+    if (task->data[2] > 3)
+    {
+        sub_8086C30();
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_8086B54(struct Task *task)
+{
+    sub_8086B98(task);
+    sub_8086C40();
+    return FALSE;
+}
+
+bool8 sub_8086B64(struct Task *task)
+{
+    sub_8086BE4(task);
+    if (task->data[2] > 3)
+    {
+        sub_8086C30();
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_8086B88(struct Task *task)
+{
+    sub_8086BE4(task);
+    sub_8086C40();
+    return FALSE;
+}
+
+void sub_8086B98(struct Task *task)
+{
+    struct Sprite *sprite;
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    sprite->pos2.x = Cos(0x84, task->data[2]);
+    sprite->pos2.y = Sin(0x94, task->data[2]);
+    task->data[3]++;
+    if (task->data[3] & 1)
+    {
+        task->data[2]++;
+    }
+}
 
+void sub_8086BE4(struct Task *task)
+{
+    struct Sprite *sprite;
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    sprite->pos2.x = Cos(0x7c, task->data[2]);
+    sprite->pos2.y = Sin(0x76, task->data[2]);
+    task->data[3]++;
+    if (task->data[3] & 1)
+    {
+        task->data[2]++;
+    }
+}
+
+extern void sub_8053FF8(void);
+extern void fade_8080918(void);
+bool8 sub_8054034(void);
+void sub_8086C94(void);
+void sub_80B483C(void);
+
+void sub_8086C30(void)
+{
+    sub_8053FF8();
+    fade_8080918();
+}
+
+void sub_8086C40(void)
+{
+    if (!gPaletteFade.active && sub_8054034() == TRUE)
+    {
+        sub_80B483C();
+        warp_in();
+        gUnknown_0300485C = sub_8086C94;
+        SetMainCallback2(CB2_LoadMap);
+        DestroyTask(FindTaskIdByFunc(sub_8086A68));
+    }
+}
-- 
cgit v1.2.3


From 3da6d1f0007a61e808a57bd33a5068a1a241bf5f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 7 Jun 2017 21:14:40 -0400
Subject: okay this isn't fly, but wtf is it? whatever it is, it's finished

---
 asm/field_effect.s | 337 -----------------------------------------------------
 src/field_effect.c | 142 +++++++++++++++++++++-
 2 files changed, 136 insertions(+), 343 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index cad14c42e..1b4fb59fc 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,343 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8086C94
-sub_8086C94: @ 8086C94
-	push {lr}
-	bl sub_8053E90
-	bl pal_fill_for_map_transition
-	bl ScriptContext2_Enable
-	ldr r0, _08086CB4 @ =sub_8086CBC
-	movs r1, 0
-	bl CreateTask
-	ldr r1, _08086CB8 @ =gUnknown_0300485C
-	movs r0, 0
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086CB4: .4byte sub_8086CBC
-_08086CB8: .4byte gUnknown_0300485C
-	thumb_func_end sub_8086C94
-
-	thumb_func_start sub_8086CBC
-sub_8086CBC: @ 8086CBC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r0, _08086CEC @ =gTasks
-	adds r4, r1, r0
-	ldr r5, _08086CF0 @ =gUnknown_0839F300
-_08086CCE:
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	bne _08086CCE
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086CEC: .4byte gTasks
-_08086CF0: .4byte gUnknown_0839F300
-	thumb_func_end sub_8086CBC
-
-	thumb_func_start sub_8086CF4
-sub_8086CF4: @ 8086CF4
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	bl CameraObjectReset2
-	ldr r0, _08086D54 @ =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08086D58 @ =gMapObjects
-	adds r4, r0
-	movs r0, 0x4
-	bl GetFaceDirectionAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	mov r4, sp
-	adds r4, 0x2
-	mov r0, sp
-	adds r1, r4, 0
-	bl PlayerGetDestCoords
-	mov r0, sp
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r1, r0, 24
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0x10
-	strh r0, [r5, 0xA]
-	cmp r1, 0x6B
-	bne _08086D5C
-	movs r1, 0x1
-	movs r0, 0x3
-	strh r0, [r5, 0x8]
-	b _08086D5E
-	.align 2, 0
-_08086D54: .4byte gPlayerAvatar
-_08086D58: .4byte gMapObjects
-_08086D5C:
-	movs r1, 0
-_08086D5E:
-	adds r0, r1, 0
-	bl sub_80B4824
-	movs r0, 0x1
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8086CF4
-
-	thumb_func_start sub_8086D70
-sub_8086D70: @ 8086D70
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _08086DA8 @ =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08086DAC @ =gSprites
-	adds r4, r0
-	movs r0, 0xA
-	ldrsh r1, [r5, r0]
-	movs r0, 0x84
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r0, 0xA
-	ldrsh r1, [r5, r0]
-	movs r0, 0x94
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086DA8: .4byte gPlayerAvatar
-_08086DAC: .4byte gSprites
-	thumb_func_end sub_8086D70
-
-	thumb_func_start sub_8086DB0
-sub_8086DB0: @ 8086DB0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r0, _08086E08 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086E0C @ =gSprites
-	adds r5, r0, r1
-	movs r0, 0xA
-	ldrsh r1, [r4, r0]
-	movs r0, 0x84
-	bl Cos
-	strh r0, [r5, 0x24]
-	movs r0, 0xA
-	ldrsh r1, [r4, r0]
-	movs r0, 0x94
-	bl Sin
-	strh r0, [r5, 0x26]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08086DEE
-	ldrh r0, [r4, 0xA]
-	subs r0, 0x1
-	strh r0, [r4, 0xA]
-_08086DEE:
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _08086DFE
-	strh r0, [r5, 0x24]
-	strh r0, [r5, 0x26]
-	movs r0, 0x5
-	strh r0, [r4, 0x8]
-_08086DFE:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086E08: .4byte gPlayerAvatar
-_08086E0C: .4byte gSprites
-	thumb_func_end sub_8086DB0
-
-	thumb_func_start sub_8086E10
-sub_8086E10: @ 8086E10
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _08086E48 @ =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08086E4C @ =gSprites
-	adds r4, r0
-	movs r0, 0xA
-	ldrsh r1, [r5, r0]
-	movs r0, 0x7C
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r0, 0xA
-	ldrsh r1, [r5, r0]
-	movs r0, 0x76
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086E48: .4byte gPlayerAvatar
-_08086E4C: .4byte gSprites
-	thumb_func_end sub_8086E10
-
-	thumb_func_start sub_8086E50
-sub_8086E50: @ 8086E50
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r0, _08086EA8 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086EAC @ =gSprites
-	adds r5, r0, r1
-	movs r0, 0xA
-	ldrsh r1, [r4, r0]
-	movs r0, 0x7C
-	bl Cos
-	strh r0, [r5, 0x24]
-	movs r0, 0xA
-	ldrsh r1, [r4, r0]
-	movs r0, 0x76
-	bl Sin
-	strh r0, [r5, 0x26]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	movs r1, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _08086E8E
-	ldrh r0, [r4, 0xA]
-	subs r0, 0x1
-	strh r0, [r4, 0xA]
-_08086E8E:
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _08086EA0
-	strh r0, [r5, 0x24]
-	strh r0, [r5, 0x26]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08086EA0:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086EA8: .4byte gPlayerAvatar
-_08086EAC: .4byte gSprites
-	thumb_func_end sub_8086E50
-
-	thumb_func_start sub_8086EB0
-sub_8086EB0: @ 8086EB0
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80B4850
-	lsls r0, 24
-	cmp r0, 0
-	bne _08086ECC
-	bl sub_80B483C
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x1
-	b _08086ECE
-_08086ECC:
-	movs r0, 0
-_08086ECE:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8086EB0
-
-	thumb_func_start sub_8086ED4
-sub_8086ED4: @ 8086ED4
-	push {r4,lr}
-	ldr r0, _08086F20 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086F24 @ =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086F18
-	bl CameraObjectReset1
-	bl ScriptContext2_Disable
-	movs r0, 0x4
-	bl GetGoSpeed0AnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldr r0, _08086F28 @ =sub_8086CBC
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08086F18:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086F20: .4byte gPlayerAvatar
-_08086F24: .4byte gMapObjects
-_08086F28: .4byte sub_8086CBC
-	thumb_func_end sub_8086ED4
-
 	thumb_func_start FldEff_UseWaterfall
 FldEff_UseWaterfall: @ 8086F2C
 	push {r4,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 664e59ecf..f3319169f 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1076,11 +1076,19 @@ bool8 sub_80869F8(struct Task *task)
 
 void sub_8086A68(u8);
 extern const bool8 (*gUnknown_0839F2E8[6])(struct Task *);
+extern const bool8 (*gUnknown_0839F300[7])(struct Task *);
 extern void sub_80B4824(u8);
+extern void sub_8053FF8(void);
+extern void fade_8080918(void);
+
 void sub_8086B98(struct Task *);
 void sub_8086BE4(struct Task *);
 void sub_8086C30(void);
 void sub_8086C40(void);
+bool8 sub_8054034(void);
+void sub_8086C94(void);
+void sub_80B483C(void);
+void sub_8086CBC(u8);
 
 void sub_8086A2C(u8 a0, u8 priority)
 {
@@ -1190,12 +1198,6 @@ void sub_8086BE4(struct Task *task)
     }
 }
 
-extern void sub_8053FF8(void);
-extern void fade_8080918(void);
-bool8 sub_8054034(void);
-void sub_8086C94(void);
-void sub_80B483C(void);
-
 void sub_8086C30(void)
 {
     sub_8053FF8();
@@ -1213,3 +1215,131 @@ void sub_8086C40(void)
         DestroyTask(FindTaskIdByFunc(sub_8086A68));
     }
 }
+
+void sub_8086C94(void)
+{
+    sub_8053E90();
+    pal_fill_for_map_transition();
+    ScriptContext2_Enable();
+    CreateTask(sub_8086CBC, 0);
+    gUnknown_0300485C = NULL;
+}
+
+void sub_8086CBC(u8 taskId)
+{
+    struct Task *task;
+    task = &gTasks[taskId];
+    while (gUnknown_0839F300[task->data[0]](task));
+}
+
+bool8 sub_8086CF4(struct Task *task)
+{
+    struct MapObject *mapObject;
+    s16 x;
+    s16 y;
+    u8 behavior;
+    CameraObjectReset2();
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(DIR_EAST));
+    PlayerGetDestCoords(&x, &y);
+    behavior = MapGridGetMetatileBehaviorAt(x, y);
+    task->data[0]++;
+    task->data[1] = 16;
+    if (behavior == 0x6b)
+    {
+        behavior = 1;
+        task->data[0] = 3;
+    } else
+    {
+        behavior = 0;
+    }
+    sub_80B4824(behavior);
+    return TRUE;
+}
+
+bool8 sub_8086D70(struct Task *task)
+{
+    struct Sprite *sprite;
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    sprite->pos2.x = Cos(0x84, task->data[1]);
+    sprite->pos2.y = Sin(0x94, task->data[1]);
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_8086DB0(struct Task *task)
+{
+    struct Sprite *sprite;
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    sprite->pos2.x = Cos(0x84, task->data[1]);
+    sprite->pos2.y = Sin(0x94, task->data[1]);
+    task->data[2]++;
+    if (task->data[2] & 1)
+    {
+        task->data[1]--;
+    }
+    if (task->data[1] == 0)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        task->data[0] = 5;
+    }
+    return FALSE;
+}
+
+bool8 sub_8086E10(struct Task *task)
+{
+    struct Sprite *sprite;
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    sprite->pos2.x = Cos(0x7c, task->data[1]);
+    sprite->pos2.y = Sin(0x76, task->data[1]);
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_8086E50(struct Task *task)
+{
+    struct Sprite *sprite;
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    sprite->pos2.x = Cos(0x7c, task->data[1]);
+    sprite->pos2.y = Sin(0x76, task->data[1]);
+    task->data[2]++;
+    if (task->data[2] & 1)
+    {
+        task->data[1]--;
+    }
+    if (task->data[1] == 0)
+    {
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+extern bool8 sub_80B4850(void);
+
+bool8 sub_8086EB0(struct Task *task)
+{
+    if (sub_80B4850())
+    {
+        return FALSE;
+    }
+    sub_80B483C();
+    task->data[0]++;
+    return TRUE;
+}
+
+bool8 sub_8086ED4(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        CameraObjectReset1();
+        ScriptContext2_Disable();
+        FieldObjectSetSpecialAnim(mapObject, GetGoSpeed0AnimId(DIR_EAST));
+        DestroyTask(FindTaskIdByFunc(sub_8086CBC));
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 459f56eab50d34bf06c32ec06593340e0ce68702 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 8 Jun 2017 18:51:43 -0400
Subject: Waterfall field effect

---
 asm/field_effect.s | 204 -----------------------------------------------------
 src/field_effect.c |  74 +++++++++++++++++++
 2 files changed, 74 insertions(+), 204 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 1b4fb59fc..df8affab5 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,210 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_UseWaterfall
-FldEff_UseWaterfall: @ 8086F2C
-	push {r4,lr}
-	ldr r4, _08086F58 @ =sub_8086F64
-	adds r0, r4, 0
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08086F5C @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, _08086F60 @ =gUnknown_0202FF84
-	ldr r2, [r2]
-	strh r2, [r1, 0xA]
-	bl _call_via_r4
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086F58: .4byte sub_8086F64
-_08086F5C: .4byte gTasks
-_08086F60: .4byte gUnknown_0202FF84
-	thumb_func_end FldEff_UseWaterfall
-
-	thumb_func_start sub_8086F64
-sub_8086F64: @ 8086F64
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r5, _08086FA0 @ =gUnknown_0839F31C
-	ldr r2, _08086FA4 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_08086F76:
-	movs r0, 0x8
-	ldrsh r2, [r4, r0]
-	lsls r2, 2
-	adds r2, r5
-	ldr r0, _08086FA8 @ =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _08086FAC @ =gMapObjects
-	adds r1, r0
-	ldr r2, [r2]
-	adds r0, r4, 0
-	bl _call_via_r2
-	lsls r0, 24
-	cmp r0, 0
-	bne _08086F76
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086FA0: .4byte gUnknown_0839F31C
-_08086FA4: .4byte gTasks
-_08086FA8: .4byte gPlayerAvatar
-_08086FAC: .4byte gMapObjects
-	thumb_func_end sub_8086F64
-
-	thumb_func_start sub_8086FB0
-sub_8086FB0: @ 8086FB0
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptContext2_Enable
-	ldr r1, _08086FCC @ =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r1, 0x6]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086FCC: .4byte gPlayerAvatar
-	thumb_func_end sub_8086FB0
-
-	thumb_func_start waterfall_1_do_anim_probably
-waterfall_1_do_anim_probably: @ 8086FD0
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl ScriptContext2_Enable
-	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	bne _08087000
-	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	ldr r1, _08087008 @ =gUnknown_0202FF84
-	movs r2, 0xA
-	ldrsh r0, [r4, r2]
-	str r0, [r1]
-	movs r0, 0x3B
-	bl FieldEffectStart
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08087000:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08087008: .4byte gUnknown_0202FF84
-	thumb_func_end waterfall_1_do_anim_probably
-
-	thumb_func_start waterfall_2_wait_anim_finish_probably
-waterfall_2_wait_anim_finish_probably: @ 808700C
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x6
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _08087026
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x1
-	b _08087028
-_08087026:
-	movs r0, 0
-_08087028:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end waterfall_2_wait_anim_finish_probably
-
-	thumb_func_start sub_8087030
-sub_8087030: @ 8087030
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	movs r0, 0x2
-	bl GetSimpleGoAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8087030
-
-	thumb_func_start sub_8087058
-sub_8087058: @ 8087058
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	bne _0808706E
-	movs r0, 0
-	b _080870AA
-_0808706E:
-	ldrb r0, [r4, 0x1E]
-	bl MetatileBehavior_IsWaterfall
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0
-	bne _080870A4
-	bl ScriptContext2_Disable
-	ldr r0, _0808709C @ =gPlayerAvatar
-	strb r4, [r0, 0x6]
-	ldr r0, _080870A0 @ =sub_8086F64
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	movs r0, 0x2B
-	bl FieldEffectActiveListRemove
-	movs r0, 0
-	b _080870AA
-	.align 2, 0
-_0808709C: .4byte gPlayerAvatar
-_080870A0: .4byte sub_8086F64
-_080870A4:
-	movs r0, 0x3
-	strh r0, [r5, 0x8]
-	movs r0, 0x1
-_080870AA:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8087058
-
 	thumb_func_start FldEff_UseDive
 FldEff_UseDive: @ 80870B0
 	push {r4,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index f3319169f..7c1c3f282 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -17,6 +17,7 @@
 #include "field_player_avatar.h"
 #include "field_map_obj_helpers.h"
 #include "field_map_obj.h"
+#include "metatile_behavior.h"
 #include "field_camera.h"
 #include "field_effect.h"
 
@@ -1343,3 +1344,76 @@ bool8 sub_8086ED4(struct Task *task)
     }
     return FALSE;
 }
+
+void sub_8086F64(u8);
+extern const bool8 (*gUnknown_0839F31C[5])(struct Task *, struct MapObject *);
+
+bool8 FldEff_UseWaterfall(void)
+{
+    u8 taskId;
+    taskId = CreateTask(sub_8086F64, 0xff);
+    gTasks[taskId].data[1] = gUnknown_0202FF84[0];
+    sub_8086F64(taskId);
+    return FALSE;
+}
+
+void sub_8086F64(u8 taskId)
+{
+    while (gUnknown_0839F31C[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId]));
+}
+
+bool8 sub_8086FB0(struct Task *task, struct MapObject *mapObject)
+{
+    ScriptContext2_Enable();
+    gPlayerAvatar.unk6 = 1;
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObject)
+{
+    ScriptContext2_Enable();
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
+    {
+        FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
+        gUnknown_0202FF84[0] = task->data[1];
+        FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 waterfall_2_wait_anim_finish_probably(struct Task *task, struct MapObject *mapObject)
+{
+    if (FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
+    {
+        return FALSE;
+    }
+    task->data[0]++;
+    return TRUE;
+}
+
+bool8 sub_8087030(struct Task *task, struct MapObject *mapObject)
+{
+    FieldObjectSetSpecialAnim(mapObject, GetSimpleGoAnimId(DIR_NORTH));
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_8087058(struct Task *task, struct MapObject *mapObject)
+{
+    if (!FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        return FALSE;
+    }
+    if (MetatileBehavior_IsWaterfall(mapObject->mapobj_unk_1E))
+    {
+        task->data[0] = 3;
+        return TRUE;
+    }
+    ScriptContext2_Disable();
+    gPlayerAvatar.unk6 = 0;
+    DestroyTask(FindTaskIdByFunc(sub_8086F64));
+    FieldEffectActiveListRemove(FLDEFF_USE_WATERFALL);
+    return FALSE;
+}
-- 
cgit v1.2.3


From 77c679492c15a5b30e4338d2366c2958d7cff4d9 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Thu, 8 Jun 2017 19:09:43 -0400
Subject: Dive field effect

---
 asm/field_effect.s | 137 -----------------------------------------------------
 src/field_effect.c |  48 +++++++++++++++++++
 2 files changed, 48 insertions(+), 137 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index df8affab5..24300044f 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,143 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_UseDive
-FldEff_UseDive: @ 80870B0
-	push {r4,lr}
-	ldr r4, _080870E0 @ =Task_Dive
-	adds r0, r4, 0
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _080870E4 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r3, _080870E8 @ =gUnknown_0202FF84
-	ldr r2, [r3]
-	strh r2, [r1, 0x26]
-	ldr r2, [r3, 0x4]
-	strh r2, [r1, 0x24]
-	bl _call_via_r4
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080870E0: .4byte Task_Dive
-_080870E4: .4byte gTasks
-_080870E8: .4byte gUnknown_0202FF84
-	thumb_func_end FldEff_UseDive
-
-	thumb_func_start Task_Dive
-Task_Dive: @ 80870EC
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r5, _0808711C @ =gUnknown_0839F330
-	ldr r2, _08087120 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_080870FE:
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-	lsls r0, 24
-	cmp r0, 0
-	bne _080870FE
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808711C: .4byte gUnknown_0839F330
-_08087120: .4byte gTasks
-	thumb_func_end Task_Dive
-
-	thumb_func_start sub_8087124
-sub_8087124: @ 8087124
-	ldr r2, _08087134 @ =gPlayerAvatar
-	movs r1, 0x1
-	strb r1, [r2, 0x6]
-	ldrh r1, [r0, 0x8]
-	adds r1, 0x1
-	strh r1, [r0, 0x8]
-	movs r0, 0
-	bx lr
-	.align 2, 0
-_08087134: .4byte gPlayerAvatar
-	thumb_func_end sub_8087124
-
-	thumb_func_start dive_2_unknown
-dive_2_unknown: @ 8087138
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptContext2_Enable
-	ldr r1, _0808715C @ =gUnknown_0202FF84
-	movs r2, 0x26
-	ldrsh r0, [r4, r2]
-	str r0, [r1]
-	movs r0, 0x3B
-	bl FieldEffectStart
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808715C: .4byte gUnknown_0202FF84
-	thumb_func_end dive_2_unknown
-
-	thumb_func_start dive_3_unknown
-dive_3_unknown: @ 8087160
-	push {lr}
-	sub sp, 0x8
-	mov r1, sp
-	adds r1, 0x2
-	mov r0, sp
-	bl PlayerGetDestCoords
-	movs r0, 0x6
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _080871A4
-	ldr r2, _080871AC @ =gMapObjects
-	ldr r0, _080871B0 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x1E]
-	mov r0, sp
-	bl dive_warp
-	ldr r0, _080871B4 @ =Task_Dive
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	movs r0, 0x2C
-	bl FieldEffectActiveListRemove
-_080871A4:
-	movs r0, 0
-	add sp, 0x8
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080871AC: .4byte gMapObjects
-_080871B0: .4byte gPlayerAvatar
-_080871B4: .4byte Task_Dive
-	thumb_func_end dive_3_unknown
-
 	thumb_func_start sub_80871B8
 sub_80871B8: @ 80871B8
 	push {lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 7c1c3f282..af6f5a36a 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1417,3 +1417,51 @@ bool8 sub_8087058(struct Task *task, struct MapObject *mapObject)
     FieldEffectActiveListRemove(FLDEFF_USE_WATERFALL);
     return FALSE;
 }
+
+void Task_Dive(u8);
+extern const bool8 (*gUnknown_0839F330[3])(struct Task *);
+extern int dive_warp(struct MapPosition *, u16);
+
+bool8 FldEff_UseDive(void)
+{
+    u8 taskId;
+    taskId = CreateTask(Task_Dive, 0xff);
+    gTasks[taskId].data[15] = gUnknown_0202FF84[0];
+    gTasks[taskId].data[14] = gUnknown_0202FF84[1];
+    Task_Dive(taskId);
+    return FALSE;
+}
+
+void Task_Dive(u8 taskId)
+{
+    while (gUnknown_0839F330[gTasks[taskId].data[0]](&gTasks[taskId]));
+}
+
+bool8 sub_8087124(struct Task *task)
+{
+    gPlayerAvatar.unk6 = 1;
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 dive_2_unknown(struct Task *task)
+{
+    ScriptContext2_Enable();
+    gUnknown_0202FF84[0] = task->data[15];
+    FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 dive_3_unknown(struct Task *task)
+{
+    struct MapPosition mapPosition;
+    PlayerGetDestCoords(&mapPosition.x, &mapPosition.y);
+    if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
+    {
+        dive_warp(&mapPosition, gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E);
+        DestroyTask(FindTaskIdByFunc(Task_Dive));
+        FieldEffectActiveListRemove(FLDEFF_USE_DIVE);
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 14e1400cfdf8cddc4839164fdcc9f5506764a455 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Fri, 9 Jun 2017 11:07:49 -0400
Subject: Field Effect first half of lavaridge gym fall down

---
 asm/field_effect.s | 341 -----------------------------------------------------
 src/field_effect.c | 182 ++++++++++++++++++----------
 2 files changed, 118 insertions(+), 405 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 24300044f..74ea6190d 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,347 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_80871B8
-sub_80871B8: @ 80871B8
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, _080871CC @ =sub_80871D0
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080871CC: .4byte sub_80871D0
-	thumb_func_end sub_80871B8
-
-	thumb_func_start sub_80871D0
-sub_80871D0: @ 80871D0
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r6, _08087218 @ =gUnknown_0839F33C
-	ldr r2, _0808721C @ =gTasks
-	ldr r5, _08087220 @ =gPlayerAvatar
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_080871E4:
-	movs r0, 0x8
-	ldrsh r3, [r4, r0]
-	lsls r3, 2
-	adds r3, r6
-	ldrb r0, [r5, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _08087224 @ =gMapObjects
-	adds r1, r0
-	ldrb r0, [r5, 0x4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _08087228 @ =gSprites
-	adds r2, r0
-	ldr r3, [r3]
-	adds r0, r4, 0
-	bl _call_via_r3
-	lsls r0, 24
-	cmp r0, 0
-	bne _080871E4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087218: .4byte gUnknown_0839F33C
-_0808721C: .4byte gTasks
-_08087220: .4byte gPlayerAvatar
-_08087224: .4byte gMapObjects
-_08087228: .4byte gSprites
-	thumb_func_end sub_80871D0
-
-	thumb_func_start sub_808722C
-sub_808722C: @ 808722C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl FreezeMapObjects
-	bl CameraObjectReset2
-	movs r0, 0
-	bl SetCameraPanningCallback
-	ldr r0, _08087260 @ =gPlayerAvatar
-	movs r2, 0x1
-	strb r2, [r0, 0x6]
-	ldrb r0, [r5, 0x3]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r5, 0x3]
-	strh r2, [r4, 0xA]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08087260: .4byte gPlayerAvatar
-	thumb_func_end sub_808722C
-
-	thumb_func_start sub_8087264
-sub_8087264: @ 8087264
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0xA
-	ldrsh r1, [r4, r0]
-	movs r0, 0
-	bl SetCameraPanning
-	ldrh r0, [r4, 0xA]
-	negs r0, r0
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x7
-	ble _08087290
-	movs r0, 0
-	strh r0, [r4, 0xC]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08087290:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8087264
-
-	thumb_func_start sub_8087298
-sub_8087298: @ 8087298
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r0, 0
-	strh r0, [r2, 0x26]
-	movs r0, 0x1
-	strh r0, [r4, 0xE]
-	ldr r3, _080872E0 @ =gUnknown_0202FF84
-	movs r5, 0x10
-	ldrsh r0, [r1, r5]
-	str r0, [r3]
-	movs r5, 0x12
-	ldrsh r0, [r1, r5]
-	str r0, [r3, 0x4]
-	adds r0, r2, 0
-	adds r0, 0x43
-	ldrb r0, [r0]
-	subs r0, 0x1
-	str r0, [r3, 0x8]
-	ldrb r0, [r2, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r3, 0xC]
-	movs r0, 0x32
-	bl FieldEffectStart
-	movs r0, 0xB2
-	bl PlaySE
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x1
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080872E0: .4byte gUnknown_0202FF84
-	thumb_func_end sub_8087298
-
-	thumb_func_start sub_80872E4
-sub_80872E4: @ 80872E4
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	adds r6, r1, 0
-	adds r5, r2, 0
-	movs r0, 0xA
-	ldrsh r1, [r4, r0]
-	movs r0, 0
-	bl SetCameraPanning
-	ldrh r0, [r4, 0xA]
-	negs r2, r0
-	strh r2, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r1, r0, 0x1
-	strh r1, [r4, 0xC]
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, 0x11
-	bgt _0808731E
-	movs r0, 0x1
-	ands r1, r0
-	cmp r1, 0
-	bne _08087330
-	lsls r0, r2, 16
-	asrs r0, 16
-	cmp r0, 0x3
-	bgt _08087330
-	lsls r0, r2, 1
-	b _0808732E
-_0808731E:
-	movs r0, 0x4
-	ands r1, r0
-	cmp r1, 0
-	bne _08087330
-	lsls r0, r2, 16
-	cmp r0, 0
-	ble _08087330
-	asrs r0, 17
-_0808732E:
-	strh r0, [r4, 0xA]
-_08087330:
-	movs r1, 0xC
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x6
-	ble _0808737C
-	adds r0, r5, 0
-	adds r0, 0x29
-	movs r1, 0
-	ldrsb r1, [r0, r1]
-	lsls r2, r1, 17
-	negs r2, r2
-	movs r7, 0x26
-	ldrsh r3, [r5, r7]
-	movs r7, 0x22
-	ldrsh r0, [r5, r7]
-	adds r0, r1
-	ldr r1, _08087374 @ =gSpriteCoordOffsetY
-	movs r7, 0
-	ldrsh r1, [r1, r7]
-	adds r0, r1
-	asrs r2, 16
-	adds r0, r2
-	cmn r3, r0
-	ble _08087378
-	ldrh r0, [r5, 0x26]
-	ldrh r1, [r4, 0xE]
-	subs r0, r1
-	strh r0, [r5, 0x26]
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, 0x7
-	bgt _0808737C
-	adds r0, r1, 0x1
-	strh r0, [r4, 0xE]
-	b _0808737C
-	.align 2, 0
-_08087374: .4byte gSpriteCoordOffsetY
-_08087378:
-	movs r0, 0x1
-	strh r0, [r4, 0x10]
-_0808737C:
-	ldrh r2, [r4, 0x12]
-	movs r1, 0x12
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080873BA
-	movs r7, 0x26
-	ldrsh r1, [r5, r7]
-	movs r0, 0x10
-	negs r0, r0
-	cmp r1, r0
-	bge _080873BA
-	adds r0, r2, 0x1
-	strh r0, [r4, 0x12]
-	ldrb r0, [r6, 0x3]
-	movs r2, 0x4
-	orrs r0, r2
-	strb r0, [r6, 0x3]
-	ldrb r1, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r5, 0x5]
-	adds r2, r5, 0
-	adds r2, 0x42
-	ldrb r1, [r2]
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2]
-_080873BA:
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080873D0
-	movs r7, 0x10
-	ldrsh r0, [r4, r7]
-	cmp r0, 0
-	beq _080873D0
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_080873D0:
-	movs r0, 0
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80872E4
-
-	thumb_func_start sub_80873D8
-sub_80873D8: @ 80873D8
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8053FF8
-	bl fade_8080918
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80873D8
-
-	thumb_func_start sub_80873F4
-sub_80873F4: @ 80873F4
-	push {lr}
-	ldr r0, _08087434 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808742C
-	bl sub_8054034
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808742C
-	bl warp_in
-	ldr r1, _08087438 @ =gUnknown_0300485C
-	ldr r0, _0808743C @ =mapldr_080851BC
-	str r0, [r1]
-	ldr r0, _08087440 @ =CB2_LoadMap
-	bl SetMainCallback2
-	ldr r0, _08087444 @ =sub_80871D0
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_0808742C:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08087434: .4byte gPaletteFade
-_08087438: .4byte gUnknown_0300485C
-_0808743C: .4byte mapldr_080851BC
-_08087440: .4byte CB2_LoadMap
-_08087444: .4byte sub_80871D0
-	thumb_func_end sub_80873F4
-
 	thumb_func_start mapldr_080851BC
 mapldr_080851BC: @ 8087448
 	push {lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index af6f5a36a..320c61b29 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -928,16 +928,13 @@ bool8 sub_8086854(struct Task *task) // gUnknown_0839F2CC[1]
     return FALSE;
 }
 
-#ifdef NONMATCHING
 bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
 {
     struct Sprite *sprite;
     s16 centerToCornerVecY;
-    int ctcvy;
     sprite = &gSprites[gPlayerAvatar.spriteId];
-    centerToCornerVecY = sprite->centerToCornerVecY;
-    ctcvy = -(centerToCornerVecY << 17);
-    sprite->pos2.y = -((sprite->pos1.y + centerToCornerVecY + gSpriteCoordOffsetY) + (ctcvy >> 16));
+    centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
+    sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
     task->data[1] = 1;
     task->data[2] = 0;
     gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0;
@@ -945,65 +942,6 @@ bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
     task->data[0]++;
     return FALSE;
 }
-#else
-__attribute__((naked))
-bool8 sub_8086870(struct Task *task) // gUnknown_0839F2CC[2]
-{
-    asm_unified("\tpush {r4-r6,lr}\n"
-                "\tadds r5, r0, 0\n"
-                "\tldr r6, _080868D4 @ =gPlayerAvatar\n"
-                "\tldrb r0, [r6, 0x4]\n"
-                "\tlsls r2, r0, 4\n"
-                "\tadds r2, r0\n"
-                "\tlsls r2, 2\n"
-                "\tldr r0, _080868D8 @ =gSprites\n"
-                "\tadds r2, r0\n"
-                "\tadds r0, r2, 0\n"
-                "\tadds r0, 0x29\n"
-                "\tmovs r4, 0\n"
-                "\tldrsb r4, [r0, r4] @ =gSprites[gPlayerAvatar.spriteId].centerToCornerVecY\n"
-                "\tlsls r0, r4, 17\n"
-                "\tnegs r0, r0\n"
-                "\tldrh r1, [r2, 0x22] @ =gSprites[gPlayerAvatar.spriteId].pos1.y\n"
-                "\tldr r3, _080868DC @ =gSpriteCoordOffsetY\n"
-                "\tadds r1, r4\n"
-                "\tldrh r3, [r3]\n"
-                "\tadds r1, r3\n"
-                "\tasrs r0, 16\n"
-                "\tadds r0, r1\n"
-                "\tnegs r0, r0\n"
-                "\tmovs r1, 0\n"
-                "\tstrh r0, [r2, 0x26]\n"
-                "\tmovs r0, 0x1\n"
-                "\tstrh r0, [r5, 0xA]\n"
-                "\tstrh r1, [r5, 0xC]\n"
-                "\tldr r2, _080868E0 @ =gMapObjects\n"
-                "\tldrb r0, [r6, 0x5]\n"
-                "\tlsls r1, r0, 3\n"
-                "\tadds r1, r0\n"
-                "\tlsls r1, 2\n"
-                "\tadds r1, r2\n"
-                "\tldrb r2, [r1, 0x1]\n"
-                "\tmovs r0, 0x21\n"
-                "\tnegs r0, r0\n"
-                "\tands r0, r2\n"
-                "\tstrb r0, [r1, 0x1]\n"
-                "\tmovs r0, 0x2B\n"
-                "\tbl PlaySE\n"
-                "\tldrh r0, [r5, 0x8]\n"
-                "\tadds r0, 0x1\n"
-                "\tstrh r0, [r5, 0x8]\n"
-                "\tmovs r0, 0\n"
-                "\tpop {r4-r6}\n"
-                "\tpop {r1}\n"
-                "\tbx r1\n"
-                "\t.align 2, 0\n"
-                "_080868D4: .4byte gPlayerAvatar\n"
-                "_080868D8: .4byte gSprites\n"
-                "_080868DC: .4byte gSpriteCoordOffsetY\n"
-                "_080868E0: .4byte gMapObjects");
-}
-#endif
 
 bool8 sub_80868E4(struct Task *task)
 {
@@ -1465,3 +1403,119 @@ bool8 dive_3_unknown(struct Task *task)
     }
     return FALSE;
 }
+
+void sub_80871D0(u8);
+extern const bool8 (*gUnknown_0839F33C[6])(struct Task *, struct MapObject *, struct Sprite *);
+void mapldr_080851BC(void);
+
+void sub_80871B8(u8 priority)
+{
+    CreateTask(sub_80871D0, priority);
+}
+
+void sub_80871D0(u8 taskId)
+{
+    while (gUnknown_0839F33C[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+}
+
+bool8 sub_808722C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    FreezeMapObjects();
+    CameraObjectReset2();
+    SetCameraPanningCallback(NULL);
+    gPlayerAvatar.unk6 = 1;
+    mapObject->mapobj_bit_26 = 1;
+    task->data[1] = 1;
+    task->data[0]++;
+    return TRUE;
+}
+
+bool8 sub_8087264(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    SetCameraPanning(0, task->data[1]);
+    task->data[1] = -task->data[1];
+    task->data[2]++;
+    if (task->data[2] > 7)
+    {
+        task->data[2] = 0;
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_8087298(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite->pos2.y = 0;
+    task->data[3] = 1;
+    gUnknown_0202FF84[0] = mapObject->coords2.x;
+    gUnknown_0202FF84[1] = mapObject->coords2.y;
+    gUnknown_0202FF84[2] = sprite->subpriority - 1;
+    gUnknown_0202FF84[3] = sprite->oam.priority;
+    FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
+    PlaySE(SE_W153);
+    task->data[0]++;
+    return TRUE;
+}
+
+bool8 sub_80872E4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    s16 centerToCornerVecY;
+    SetCameraPanning(0, task->data[1]);
+    if (task->data[1] = -task->data[1], ++task->data[2] <= 17)
+    {
+        if (!(task->data[2] & 1) && (task->data[1] <= 3))
+        {
+            task->data[1] <<= 1;
+        }
+    } else if (!(task->data[2] & 4) && (task->data[1] > 0))
+    {
+        task->data[1] >>= 1;
+    }
+    if (task->data[2] > 6)
+    {
+        centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
+        if (sprite->pos2.y > -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY))
+        {
+            sprite->pos2.y -= task->data[3];
+            if (task->data[3] <= 7)
+            {
+                task->data[3]++;
+            }
+        } else
+        {
+            task->data[4] = 1;
+        }
+    }
+    if (task->data[5] == 0 && sprite->pos2.y < -0x10)
+    {
+        task->data[5]++;
+        mapObject->mapobj_bit_26 = 1;
+        sprite->oam.priority = 1;
+        sprite->subspriteMode = 2;
+    }
+    if (task->data[1] == 0 && task->data[4] != 0)
+    {
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80873D8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sub_8053FF8();
+    fade_8080918();
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_80873F4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (!gPaletteFade.active && sub_8054034() == TRUE)
+    {
+        warp_in();
+        gUnknown_0300485C = mapldr_080851BC;
+        SetMainCallback2(CB2_LoadMap);
+        DestroyTask(FindTaskIdByFunc(sub_80871D0));
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From d7c21854332787d2f932bbe2934456850994f730 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Fri, 9 Jun 2017 11:34:18 -0400
Subject: Second half of Flannery gym animation (increased uncertainty about
 which direction it is for)

---
 asm/field_effect.s | 200 -----------------------------------------------------
 src/field_effect.c |  68 ++++++++++++++++++
 2 files changed, 68 insertions(+), 200 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 74ea6190d..c1bf59255 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,206 +6,6 @@
 
 	.text
 
-	thumb_func_start mapldr_080851BC
-mapldr_080851BC: @ 8087448
-	push {lr}
-	bl sub_8053E90
-	bl pal_fill_for_map_transition
-	bl ScriptContext2_Enable
-	ldr r0, _08087468 @ =gUnknown_0300485C
-	movs r1, 0
-	str r1, [r0]
-	ldr r0, _0808746C @ =sub_8087470
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087468: .4byte gUnknown_0300485C
-_0808746C: .4byte sub_8087470
-	thumb_func_end mapldr_080851BC
-
-	thumb_func_start sub_8087470
-sub_8087470: @ 8087470
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r6, _080874B8 @ =gUnknown_0839F354
-	ldr r2, _080874BC @ =gTasks
-	ldr r5, _080874C0 @ =gPlayerAvatar
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_08087484:
-	movs r0, 0x8
-	ldrsh r3, [r4, r0]
-	lsls r3, 2
-	adds r3, r6
-	ldrb r0, [r5, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _080874C4 @ =gMapObjects
-	adds r1, r0
-	ldrb r0, [r5, 0x4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _080874C8 @ =gSprites
-	adds r2, r0
-	ldr r3, [r3]
-	adds r0, r4, 0
-	bl _call_via_r3
-	lsls r0, 24
-	cmp r0, 0
-	bne _08087484
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080874B8: .4byte gUnknown_0839F354
-_080874BC: .4byte gTasks
-_080874C0: .4byte gPlayerAvatar
-_080874C4: .4byte gMapObjects
-_080874C8: .4byte gSprites
-	thumb_func_end sub_8087470
-
-	thumb_func_start sub_80874CC
-sub_80874CC: @ 80874CC
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	bl CameraObjectReset2
-	bl FreezeMapObjects
-	ldr r1, _080874F8 @ =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r1, 0x6]
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080874F8: .4byte gPlayerAvatar
-	thumb_func_end sub_80874CC
-
-	thumb_func_start sub_80874FC
-sub_80874FC: @ 80874FC
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	bl sub_807D770
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808753C
-	ldr r1, _08087544 @ =gUnknown_0202FF84
-	movs r2, 0x10
-	ldrsh r0, [r5, r2]
-	str r0, [r1]
-	movs r2, 0x12
-	ldrsh r0, [r5, r2]
-	str r0, [r1, 0x4]
-	adds r0, r6, 0
-	adds r0, 0x43
-	ldrb r0, [r0]
-	subs r0, 0x1
-	str r0, [r1, 0x8]
-	ldrb r0, [r6, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r1, 0xC]
-	movs r0, 0x31
-	bl FieldEffectStart
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_0808753C:
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08087544: .4byte gUnknown_0202FF84
-	thumb_func_end sub_80874FC
-
-	thumb_func_start sub_8087548
-sub_8087548: @ 8087548
-	push {r4,lr}
-	adds r2, r0, 0
-	adds r4, r1, 0
-	movs r0, 0xA
-	ldrsh r1, [r2, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087598 @ =gSprites
-	adds r0, r1
-	adds r0, 0x2B
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bls _08087590
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x1]
-	bl CameraObjectReset1
-	movs r0, 0xAF
-	bl PlaySE
-	movs r0, 0x4
-	bl sub_80608A4
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-_08087590:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08087598: .4byte gSprites
-	thumb_func_end sub_8087548
-
-	thumb_func_start sub_808759C
-sub_808759C: @ 808759C
-	push {lr}
-	adds r0, r1, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080875C6
-	ldr r1, _080875CC @ =gPlayerAvatar
-	movs r0, 0
-	strb r0, [r1, 0x6]
-	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
-	ldr r0, _080875D0 @ =sub_8087470
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_080875C6:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080875CC: .4byte gPlayerAvatar
-_080875D0: .4byte sub_8087470
-	thumb_func_end sub_808759C
-
 	thumb_func_start FldEff_LavaridgeGymWarp
 FldEff_LavaridgeGymWarp: @ 80875D4
 	push {r4,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 320c61b29..20e23c8fa 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1519,3 +1519,71 @@ bool8 sub_80873F4(struct Task *task, struct MapObject *mapObject, struct Sprite
     }
     return FALSE;
 }
+
+void sub_8087470(u8);
+extern const bool8 (*gUnknown_0839F354[4])(struct Task *, struct MapObject *, struct Sprite *);
+extern u8 sub_80608A4(u8);
+
+void mapldr_080851BC(void)
+{
+    sub_8053E90();
+    pal_fill_for_map_transition();
+    ScriptContext2_Enable();
+    gUnknown_0300485C = NULL;
+    CreateTask(sub_8087470, 0);
+}
+
+void sub_8087470(u8 taskId)
+{
+    while (gUnknown_0839F354[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+}
+
+bool8 sub_80874CC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    CameraObjectReset2();
+    FreezeMapObjects();
+    gPlayerAvatar.unk6 = 1;
+    mapObject->mapobj_bit_13 = 1;
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (sub_807D770())
+    {
+        gUnknown_0202FF84[0] = mapObject->coords2.x;
+        gUnknown_0202FF84[1] = mapObject->coords2.y;
+        gUnknown_0202FF84[2] = sprite->subpriority - 1;
+        gUnknown_0202FF84[3] = sprite->oam.priority;
+        task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_8087548(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    sprite = &gSprites[task->data[1]];
+    if (sprite->animCmdIndex > 1)
+    {
+        task->data[0]++;
+        mapObject->mapobj_bit_13 = 0;
+        CameraObjectReset1();
+        PlaySE(SE_W091);
+        FieldObjectSetSpecialAnim(mapObject, sub_80608A4(DIR_EAST));
+    }
+    return FALSE;
+}
+
+bool8 sub_808759C(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        gPlayerAvatar.unk6 = 0;
+        ScriptContext2_Disable();
+        UnfreezeMapObjects();
+        DestroyTask(FindTaskIdByFunc(sub_8087470));
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 95b82b5dbb11e63f4cbaa09981dea04f9b729777 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalax1@gmail.com>
Date: Fri, 9 Jun 2017 13:59:11 -0400
Subject: FldEff_LavaridgeGymWarp

---
 asm/field_effect.s | 304 -----------------------------------------------------
 src/field_effect.c |  99 +++++++++++++++++
 2 files changed, 99 insertions(+), 304 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index c1bf59255..12ec64032 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,310 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_LavaridgeGymWarp
-FldEff_LavaridgeGymWarp: @ 80875D4
-	push {r4,lr}
-	ldr r4, _0808762C @ =gUnknown_0202FF84
-	adds r1, r4, 0x4
-	adds r0, r4, 0
-	movs r2, 0x8
-	movs r3, 0x8
-	bl sub_8060470
-	ldr r0, _08087630 @ =gFieldEffectObjectTemplatePointers
-	adds r0, 0x84
-	ldr r0, [r0]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	movs r3, 0x4
-	ldrsh r2, [r4, r3]
-	ldrb r3, [r4, 0x8]
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08087634 @ =gSprites
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r1
-	movs r1, 0x3
-	ldrb r3, [r4, 0xC]
-	ands r3, r1
-	lsls r3, 2
-	ldrb r4, [r2, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r4
-	orrs r1, r3
-	strb r1, [r2, 0x5]
-	adds r2, 0x3E
-	ldrb r1, [r2]
-	movs r3, 0x2
-	orrs r1, r3
-	strb r1, [r2]
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808762C: .4byte gUnknown_0202FF84
-_08087630: .4byte gFieldEffectObjectTemplatePointers
-_08087634: .4byte gSprites
-	thumb_func_end FldEff_LavaridgeGymWarp
-
-	thumb_func_start sub_8087638
-sub_8087638: @ 8087638
-	push {lr}
-	adds r2, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _08087650
-	adds r0, r2, 0
-	movs r1, 0x32
-	bl FieldEffectStop
-_08087650:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8087638
-
-	thumb_func_start sub_8087654
-sub_8087654: @ 8087654
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r0, _08087668 @ =sub_808766C
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087668: .4byte sub_808766C
-	thumb_func_end sub_8087654
-
-	thumb_func_start sub_808766C
-sub_808766C: @ 808766C
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r6, _080876B4 @ =gUnknown_0839F364
-	ldr r2, _080876B8 @ =gTasks
-	ldr r5, _080876BC @ =gPlayerAvatar
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r4, r1, r2
-_08087680:
-	movs r0, 0x8
-	ldrsh r3, [r4, r0]
-	lsls r3, 2
-	adds r3, r6
-	ldrb r0, [r5, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _080876C0 @ =gMapObjects
-	adds r1, r0
-	ldrb r0, [r5, 0x4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _080876C4 @ =gSprites
-	adds r2, r0
-	ldr r3, [r3]
-	adds r0, r4, 0
-	bl _call_via_r3
-	lsls r0, 24
-	cmp r0, 0
-	bne _08087680
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080876B4: .4byte gUnknown_0839F364
-_080876B8: .4byte gTasks
-_080876BC: .4byte gPlayerAvatar
-_080876C0: .4byte gMapObjects
-_080876C4: .4byte gSprites
-	thumb_func_end sub_808766C
-
-	thumb_func_start sub_80876C8
-sub_80876C8: @ 80876C8
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	bl FreezeMapObjects
-	bl CameraObjectReset2
-	ldr r1, _080876F4 @ =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r1, 0x6]
-	ldrb r0, [r4, 0x3]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r4, 0x3]
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080876F4: .4byte gPlayerAvatar
-	thumb_func_end sub_80876C8
-
-	thumb_func_start sub_80876F8
-sub_80876F8: @ 80876F8
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r4, r1, 0
-	adds r6, r2, 0
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808776C
-	ldrh r1, [r5, 0xA]
-	movs r2, 0xA
-	ldrsh r0, [r5, r2]
-	cmp r0, 0x3
-	ble _0808774C
-	ldr r1, _08087748 @ =gUnknown_0202FF84
-	movs r2, 0x10
-	ldrsh r0, [r4, r2]
-	str r0, [r1]
-	movs r2, 0x12
-	ldrsh r0, [r4, r2]
-	str r0, [r1, 0x4]
-	adds r0, r6, 0
-	adds r0, 0x43
-	ldrb r0, [r0]
-	subs r0, 0x1
-	str r0, [r1, 0x8]
-	ldrb r0, [r6, 0x5]
-	lsls r0, 28
-	lsrs r0, 30
-	str r0, [r1, 0xC]
-	movs r0, 0x31
-	bl FieldEffectStart
-	strh r0, [r5, 0xA]
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	b _0808776C
-	.align 2, 0
-_08087748: .4byte gUnknown_0202FF84
-_0808774C:
-	adds r0, r1, 0x1
-	strh r0, [r5, 0xA]
-	ldrb r0, [r4, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	bl GetStepInPlaceDelay4AnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	movs r0, 0x27
-	bl PlaySE
-_0808776C:
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80876F8
-
-	thumb_func_start sub_8087774
-sub_8087774: @ 8087774
-	push {r4,lr}
-	adds r3, r0, 0
-	adds r4, r1, 0
-	ldr r2, _080877A8 @ =gSprites
-	movs r0, 0xA
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	adds r0, 0x2B
-	ldrb r0, [r0]
-	cmp r0, 0x2
-	bne _0808779E
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x20
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	ldrh r0, [r3, 0x8]
-	adds r0, 0x1
-	strh r0, [r3, 0x8]
-_0808779E:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080877A8: .4byte gSprites
-	thumb_func_end sub_8087774
-
-	thumb_func_start sub_80877AC
-sub_80877AC: @ 80877AC
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r0, 0x31
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _080877CA
-	bl sub_8053FF8
-	bl fade_8080918
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_080877CA:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80877AC
-
-	thumb_func_start sub_80877D4
-sub_80877D4: @ 80877D4
-	push {lr}
-	ldr r0, _08087814 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0808780C
-	bl sub_8054034
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _0808780C
-	bl warp_in
-	ldr r1, _08087818 @ =gUnknown_0300485C
-	ldr r0, _0808781C @ =sub_8086748
-	str r0, [r1]
-	ldr r0, _08087820 @ =CB2_LoadMap
-	bl SetMainCallback2
-	ldr r0, _08087824 @ =sub_808766C
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_0808780C:
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08087814: .4byte gPaletteFade
-_08087818: .4byte gUnknown_0300485C
-_0808781C: .4byte sub_8086748
-_08087820: .4byte CB2_LoadMap
-_08087824: .4byte sub_808766C
-	thumb_func_end sub_80877D4
-
 	thumb_func_start FldEff_PopOutOfAsh
 FldEff_PopOutOfAsh: @ 8087828
 	push {r4,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 20e23c8fa..1661245c5 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1587,3 +1587,102 @@ bool8 sub_808759C(struct Task *task, struct MapObject *mapObject, struct Sprite
     }
     return FALSE;
 }
+
+extern void sub_8060470(s16 *x, s16 *y, s16 dx, s16 dy);
+extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36];
+
+u8 FldEff_LavaridgeGymWarp(void)
+{
+    u8 spriteId;
+    sub_8060470((s16 *)&gUnknown_0202FF84[0], (s16 *)&gUnknown_0202FF84[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
+    gSprites[spriteId].oam.priority = gUnknown_0202FF84[3];
+    gSprites[spriteId].coordOffsetEnabled = 1;
+    return spriteId;
+}
+
+void sub_8087638(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        FieldEffectStop(sprite, FLDEFF_LAVARIDGE_GYM_WARP);
+    }
+}
+
+void sub_808766C(u8);
+extern const bool8 (*gUnknown_0839F364[5])(struct Task *, struct MapObject *, struct Sprite *);
+
+void sub_8087654(u8 priority)
+{
+    CreateTask(sub_808766C, priority);
+}
+
+void sub_808766C(u8 taskId)
+{
+    while(gUnknown_0839F364[gTasks[taskId].data[0]](&gTasks[taskId], &gMapObjects[gPlayerAvatar.mapObjectId], &gSprites[gPlayerAvatar.spriteId]));
+}
+
+bool8 sub_80876C8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    FreezeMapObjects();
+    CameraObjectReset2();
+    gPlayerAvatar.unk6 = 1;
+    mapObject->mapobj_bit_26 = 1;
+    task->data[0]++;
+    return FALSE;
+}
+
+bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        if (task->data[1] > 3)
+        {
+            gUnknown_0202FF84[0] = mapObject->coords2.x;
+            gUnknown_0202FF84[1] = mapObject->coords2.y;
+            gUnknown_0202FF84[2] = sprite->subpriority - 1;
+            gUnknown_0202FF84[3] = sprite->oam.priority;
+            task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
+            task->data[0]++;
+        } else
+        {
+            task->data[1]++;
+            FieldObjectSetSpecialAnim(mapObject, GetStepInPlaceDelay4AnimId(mapObject->mapobj_unk_18));
+            PlaySE(SE_FU_ZUZUZU);
+        }
+    }
+    return FALSE;
+}
+
+bool8 sub_8087774(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (gSprites[task->data[1]].animCmdIndex == 2)
+    {
+        mapObject->mapobj_bit_13 = 1;
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80877AC(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (!FieldEffectActiveListContains(FLDEFF_POP_OUT_OF_ASH))
+    {
+        sub_8053FF8();
+        fade_8080918();
+        task->data[0]++;
+    }
+    return FALSE;
+}
+
+bool8 sub_80877D4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
+{
+    if (!gPaletteFade.active && sub_8054034() == TRUE)
+    {
+        warp_in();
+        gUnknown_0300485C = sub_8086748;
+        SetMainCallback2(CB2_LoadMap);
+        DestroyTask(FindTaskIdByFunc(sub_808766C));
+    }
+    return FALSE;
+}
-- 
cgit v1.2.3


From 5980e95c3daadaa2fe91713fa72b36eeead7678f Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Fri, 9 Jun 2017 20:05:28 -0400
Subject: FldEff_PopOutOfAsh (misnamed?)

---
 asm/field_effect.s | 438 -----------------------------------------------------
 include/rom4.h     |   2 +-
 src/field_effect.c | 133 ++++++++++++++++
 3 files changed, 134 insertions(+), 439 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 12ec64032..073fec5db 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,444 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_PopOutOfAsh
-FldEff_PopOutOfAsh: @ 8087828
-	push {r4,lr}
-	ldr r4, _08087880 @ =gUnknown_0202FF84
-	adds r1, r4, 0x4
-	adds r0, r4, 0
-	movs r2, 0x8
-	movs r3, 0x8
-	bl sub_8060470
-	ldr r0, _08087884 @ =gFieldEffectObjectTemplatePointers
-	adds r0, 0x80
-	ldr r0, [r0]
-	movs r2, 0
-	ldrsh r1, [r4, r2]
-	movs r3, 0x4
-	ldrsh r2, [r4, r3]
-	ldrb r3, [r4, 0x8]
-	bl CreateSpriteAtEnd
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, _08087888 @ =gSprites
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r1
-	movs r1, 0x3
-	ldrb r3, [r4, 0xC]
-	ands r3, r1
-	lsls r3, 2
-	ldrb r4, [r2, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r4
-	orrs r1, r3
-	strb r1, [r2, 0x5]
-	adds r2, 0x3E
-	ldrb r1, [r2]
-	movs r3, 0x2
-	orrs r1, r3
-	strb r1, [r2]
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08087880: .4byte gUnknown_0202FF84
-_08087884: .4byte gFieldEffectObjectTemplatePointers
-_08087888: .4byte gSprites
-	thumb_func_end FldEff_PopOutOfAsh
-
-	thumb_func_start sub_808788C
-sub_808788C: @ 808788C
-	push {lr}
-	adds r2, r0, 0
-	adds r0, 0x3F
-	ldrb r1, [r0]
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080878A4
-	adds r0, r2, 0
-	movs r1, 0x31
-	bl FieldEffectStop
-_080878A4:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808788C
-
-	thumb_func_start sub_80878A8
-sub_80878A8: @ 80878A8
-	push {lr}
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	ldr r0, _080878C0 @ =sub_80878C4
-	movs r1, 0x50
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080878C0: .4byte sub_80878C4
-	thumb_func_end sub_80878A8
-
-	thumb_func_start sub_80878C4
-sub_80878C4: @ 80878C4
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _080878EC @ =gUnknown_0839F378
-	ldr r2, _080878F0 @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080878EC: .4byte gUnknown_0839F378
-_080878F0: .4byte gTasks
-	thumb_func_end sub_80878C4
-
-	thumb_func_start sub_80878F4
-sub_80878F4: @ 80878F4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x40
-	strh r0, [r4, 0x24]
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x26]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80878F4
-
-	thumb_func_start sub_8087914
-sub_8087914: @ 8087914
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _080879B8 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldrh r1, [r4, 0x24]
-	movs r2, 0x24
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _08087940
-	subs r0, r1, 0x1
-	strh r0, [r4, 0x24]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08087940
-	bl sub_8053FF8
-	bl fade_8080918
-_08087940:
-	ldr r0, _080879BC @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080879C0 @ =gMapObjects
-	adds r5, r0, r1
-	adds r0, r5, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _08087966
-	adds r0, r5, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08087A20
-_08087966:
-	movs r1, 0x24
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080879D8
-	ldr r0, _080879C4 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _080879D8
-	bl sub_8054034
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _080879D8
-	ldrh r1, [r4, 0x26]
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl FieldObjectSetDirection
-	bl sub_8053678
-	bl warp_in
-	ldr r1, _080879C8 @ =gUnknown_0300485C
-	ldr r0, _080879CC @ =mapldr_080859D4
-	str r0, [r1]
-	ldr r0, _080879D0 @ =CB2_LoadMap
-	bl SetMainCallback2
-	ldr r0, _080879D4 @ =sub_80878C4
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	b _08087A20
-	.align 2, 0
-_080879B8: .4byte gUnknown_0839F380
-_080879BC: .4byte gPlayerAvatar
-_080879C0: .4byte gMapObjects
-_080879C4: .4byte gPaletteFade
-_080879C8: .4byte gUnknown_0300485C
-_080879CC: .4byte mapldr_080859D4
-_080879D0: .4byte CB2_LoadMap
-_080879D4: .4byte sub_80878C4
-_080879D8:
-	ldrh r1, [r4, 0xA]
-	movs r2, 0xA
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _080879EC
-	subs r0, r1, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08087A20
-_080879EC:
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r0, [r0]
-	bl GetFaceDirectionAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r5, 0
-	bl FieldObjectSetSpecialAnim
-	ldrh r1, [r4, 0xC]
-	movs r2, 0xC
-	ldrsh r0, [r4, r2]
-	cmp r0, 0xB
-	bgt _08087A14
-	adds r0, r1, 0x1
-	strh r0, [r4, 0xC]
-_08087A14:
-	ldrh r1, [r4, 0xC]
-	lsls r1, 16
-	asrs r1, 18
-	movs r0, 0x8
-	asrs r0, r1
-	strh r0, [r4, 0xA]
-_08087A20:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8087914
-
-	thumb_func_start mapldr_080859D4
-mapldr_080859D4: @ 8087A28
-	push {lr}
-	bl sub_8053E90
-	bl pal_fill_for_map_transition
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	ldr r1, _08087A64 @ =gUnknown_0300485C
-	movs r0, 0
-	str r0, [r1]
-	ldr r2, _08087A68 @ =gMapObjects
-	ldr r0, _08087A6C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x1]
-	movs r2, 0x20
-	orrs r1, r2
-	strb r1, [r0, 0x1]
-	ldr r0, _08087A70 @ =sub_8087A74
-	movs r1, 0
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087A64: .4byte gUnknown_0300485C
-_08087A68: .4byte gMapObjects
-_08087A6C: .4byte gPlayerAvatar
-_08087A70: .4byte sub_8087A74
-	thumb_func_end mapldr_080859D4
-
-	thumb_func_start sub_8087A74
-sub_8087A74: @ 8087A74
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08087A9C @ =gUnknown_0839F388
-	ldr r2, _08087AA0 @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087A9C: .4byte gUnknown_0839F388
-_08087AA0: .4byte gTasks
-	thumb_func_end sub_8087A74
-
-	thumb_func_start sub_8087AA4
-sub_8087AA4: @ 8087AA4
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_807D770
-	lsls r0, 24
-	cmp r0, 0
-	beq _08087AC2
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x26]
-_08087AC2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8087AA4
-
-	thumb_func_start sub_8087AC8
-sub_8087AC8: @ 8087AC8
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r5, r0, 0
-	ldr r1, _08087B4C @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r0, _08087B50 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087B54 @ =gMapObjects
-	adds r6, r0, r1
-	ldrh r1, [r5, 0xA]
-	movs r2, 0xA
-	ldrsh r0, [r5, r2]
-	cmp r0, 0
-	beq _08087AFA
-	subs r0, r1, 0x1
-	strh r0, [r5, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08087B8C
-_08087AFA:
-	adds r0, r6, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _08087B12
-	adds r0, r6, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08087BA0
-_08087B12:
-	movs r1, 0xC
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1F
-	ble _08087B5C
-	movs r2, 0x26
-	ldrsh r4, [r5, r2]
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r4, r0
-	bne _08087B5C
-	ldrb r1, [r6, 0x1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r6, 0x1]
-	bl ScriptContext2_Disable
-	bl UnfreezeMapObjects
-	ldr r0, _08087B58 @ =sub_8087A74
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	b _08087BA0
-	.align 2, 0
-_08087B4C: .4byte gUnknown_0839F380
-_08087B50: .4byte gPlayerAvatar
-_08087B54: .4byte gMapObjects
-_08087B58: .4byte sub_8087A74
-_08087B5C:
-	ldrb r0, [r6, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r0, [r0]
-	bl GetFaceDirectionAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r6, 0
-	bl FieldObjectSetSpecialAnim
-	ldrh r1, [r5, 0xC]
-	movs r2, 0xC
-	ldrsh r0, [r5, r2]
-	cmp r0, 0x1F
-	bgt _08087B84
-	adds r0, r1, 0x1
-	strh r0, [r5, 0xC]
-_08087B84:
-	ldrh r0, [r5, 0xC]
-	lsls r0, 16
-	asrs r0, 18
-	strh r0, [r5, 0xA]
-_08087B8C:
-	ldrb r2, [r6, 0x1]
-	lsls r1, r2, 26
-	lsrs r1, 31
-	movs r0, 0x1
-	eors r1, r0
-	lsls r1, 5
-	subs r0, 0x22
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r6, 0x1]
-_08087BA0:
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8087AC8
-
 	thumb_func_start sub_8087BA8
 sub_8087BA8: @ 8087BA8
 	push {lr}
diff --git a/include/rom4.h b/include/rom4.h
index ab63068b2..9bfb9a51f 100755
--- a/include/rom4.h
+++ b/include/rom4.h
@@ -52,7 +52,7 @@ void sub_8053570(void);
 void sub_8053588(u8);
 void sub_80535C4(s16 a1, s16 a2);
 void sub_805363C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y);
-// sub_8053678
+void sub_8053678(void);
 void sub_8053690(s8, s8, s8, s8, s8);
 // warp1_set_to_warp2
 void sub_80536E4(s8, s8, s8, s8, s8);
diff --git a/src/field_effect.c b/src/field_effect.c
index 1661245c5..f20c2ed60 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1675,6 +1675,11 @@ bool8 sub_80877AC(struct Task *task, struct MapObject *mapObject, struct Sprite
     return FALSE;
 }
 
+void sub_80878C4(u8);
+extern u8 gUnknown_0839F380[5];
+extern const void (*gUnknown_0839F378[2])(struct Task *);
+void mapldr_080859D4(void);
+
 bool8 sub_80877D4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
 {
     if (!gPaletteFade.active && sub_8054034() == TRUE)
@@ -1686,3 +1691,131 @@ bool8 sub_80877D4(struct Task *task, struct MapObject *mapObject, struct Sprite
     }
     return FALSE;
 }
+
+u8 FldEff_PopOutOfAsh(void)
+{
+    u8 spriteId;
+    sub_8060470((s16 *)&gUnknown_0202FF84[0], (s16 *)&gUnknown_0202FF84[1], 8, 8);
+    spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
+    gSprites[spriteId].oam.priority = gUnknown_0202FF84[3];
+    gSprites[spriteId].coordOffsetEnabled = 1;
+    return spriteId;
+}
+
+void sub_808788C(struct Sprite *sprite)
+{
+    if (sprite->animEnded)
+    {
+        FieldEffectStop(sprite, FLDEFF_POP_OUT_OF_ASH);
+    }
+}
+
+void sub_80878A8(void)
+{
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    CreateTask(sub_80878C4, 0x50);
+}
+
+void sub_80878C4(u8 taskId)
+{
+    gUnknown_0839F378[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_80878F4(struct Task *task)
+{
+    task->data[0]++;
+    task->data[14] = 64;
+    task->data[15] = player_get_direction_lower_nybble();
+}
+
+void sub_8087914(struct Task *task)
+{
+    struct MapObject *mapObject;
+    u8 unknown_0839F380[5];
+    memcpy(unknown_0839F380, gUnknown_0839F380, sizeof gUnknown_0839F380);
+    if (task->data[14] != 0 && (--task->data[14]) == 0)
+    {
+        sub_8053FF8();
+        fade_8080918();
+    }
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        if (task->data[14] == 0 && !gPaletteFade.active && sub_8054034() == TRUE)
+        {
+            FieldObjectSetDirection(mapObject, task->data[15]);
+            sub_8053678();
+            warp_in();
+            gUnknown_0300485C = mapldr_080859D4;
+            SetMainCallback2(CB2_LoadMap);
+            DestroyTask(FindTaskIdByFunc(sub_80878C4));
+        } else if (task->data[1] == 0 || (--task->data[1]) == 0)
+        {
+            FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->mapobj_unk_18]));
+            if (task->data[2] < 12)
+            {
+                task->data[2]++;
+            }
+            task->data[1] = 8 >> (task->data[2] >> 2);
+        }
+    }
+}
+
+void sub_8087A74(u8);
+extern const void (*gUnknown_0839F388[2])(struct Task *);
+
+void mapldr_080859D4(void)
+{
+    sub_8053E90();
+    pal_fill_for_map_transition();
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    gUnknown_0300485C = NULL;
+    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+    CreateTask(sub_8087A74, 0);
+}
+
+void sub_8087A74(u8 taskId)
+{
+    gUnknown_0839F388[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_8087AA4(struct Task *task)
+{
+    if (sub_807D770())
+    {
+        task->data[0]++;
+        task->data[15] = player_get_direction_lower_nybble();
+    }
+}
+
+void sub_8087AC8(struct Task *task)
+{
+    struct MapObject *mapObject;
+    u8 unknown_0839F380[5];
+    memcpy(unknown_0839F380, gUnknown_0839F380, sizeof gUnknown_0839F380);
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (task->data[1] == 0 || (--task->data[1]) == 0)
+    {
+        if (FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) && !FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+        {
+            return;
+        }
+        if (task->data[2] >= 32 && task->data[15] == player_get_direction_lower_nybble())
+        {
+            mapObject->mapobj_bit_13 = 0;
+            ScriptContext2_Disable();
+            UnfreezeMapObjects();
+            DestroyTask(FindTaskIdByFunc(sub_8087A74));
+            return;
+        }
+        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(unknown_0839F380[mapObject->mapobj_unk_18]));
+        if (task->data[2] < 32)
+        {
+            task->data[2]++;
+        }
+        task->data[1] = task->data[2] >> 2;
+    }
+    mapObject->mapobj_bit_13 ^= 1;
+}
-- 
cgit v1.2.3


From 66b7c04c71d54baf37f0928dd50004af87596993 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 10 Jun 2017 09:57:36 -0400
Subject: Another map-changing field effect (evil team hideout warp pads?)

---
 asm/field_effect.s | 598 -----------------------------------------------------
 src/field_effect.c | 189 +++++++++++++++++
 2 files changed, 189 insertions(+), 598 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 073fec5db..311ec86a0 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,604 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8087BA8
-sub_8087BA8: @ 8087BA8
-	push {lr}
-	ldr r0, _08087BB8 @ =sub_8087BBC
-	movs r1, 0
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087BB8: .4byte sub_8087BBC
-	thumb_func_end sub_8087BA8
-
-	thumb_func_start sub_8087BBC
-sub_8087BBC: @ 8087BBC
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08087BE4 @ =gUnknown_0839F390
-	ldr r2, _08087BE8 @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087BE4: .4byte gUnknown_0839F390
-_08087BE8: .4byte gTasks
-	thumb_func_end sub_8087BBC
-
-	thumb_func_start sub_8087BEC
-sub_8087BEC: @ 8087BEC
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	bl CameraObjectReset2
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8087BEC
-
-	thumb_func_start sub_8087C14
-sub_8087C14: @ 8087C14
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _08087C98 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r0, _08087C9C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087CA0 @ =gMapObjects
-	adds r5, r0, r1
-	ldrh r1, [r4, 0xA]
-	movs r2, 0xA
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	beq _08087C46
-	subs r0, r1, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08087C60
-_08087C46:
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r5, 0
-	bl FieldObjectTurn
-	movs r0, 0x8
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-_08087C60:
-	movs r1, 0xC
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x7
-	ble _08087C8E
-	movs r2, 0x26
-	ldrsh r1, [r4, r2]
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	cmp r1, r0
-	bne _08087C8E
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x4
-	strh r0, [r4, 0xA]
-	movs r0, 0x8
-	strh r0, [r4, 0xC]
-	movs r0, 0x1
-	strh r0, [r4, 0xE]
-	movs r0, 0x2D
-	bl PlaySE
-_08087C8E:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087C98: .4byte gUnknown_0839F380
-_08087C9C: .4byte gPlayerAvatar
-_08087CA0: .4byte gMapObjects
-	thumb_func_end sub_8087C14
-
-	thumb_func_start sub_8087CA4
-sub_8087CA4: @ 8087CA4
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _08087D68 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r2, _08087D6C @ =gPlayerAvatar
-	ldrb r1, [r2, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087D70 @ =gMapObjects
-	adds r3, r0, r1
-	ldrb r1, [r2, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087D74 @ =gSprites
-	adds r5, r0, r1
-	ldrh r0, [r4, 0xA]
-	subs r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bgt _08087CEE
-	movs r0, 0x4
-	strh r0, [r4, 0xA]
-	ldrb r0, [r3, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r3, 0
-	bl FieldObjectTurn
-_08087CEE:
-	ldrh r0, [r5, 0x22]
-	ldrh r1, [r4, 0xE]
-	subs r0, r1
-	strh r0, [r5, 0x22]
-	ldrh r1, [r4, 0xE]
-	ldrh r2, [r4, 0x10]
-	adds r0, r1, r2
-	strh r0, [r4, 0x10]
-	ldrh r0, [r4, 0xC]
-	subs r0, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	bgt _08087D1A
-	movs r0, 0x4
-	strh r0, [r4, 0xC]
-	lsls r0, r1, 16
-	asrs r0, 16
-	cmp r0, 0x7
-	bgt _08087D1A
-	lsls r0, r1, 1
-	strh r0, [r4, 0xE]
-_08087D1A:
-	movs r1, 0x10
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x8
-	ble _08087D48
-	ldrb r1, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r5, 0x5]
-	adds r2, r5, 0
-	adds r2, 0x42
-	ldrb r1, [r2]
-	movs r0, 0xC0
-	ands r0, r1
-	cmp r0, 0
-	beq _08087D48
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2]
-_08087D48:
-	movs r2, 0x10
-	ldrsh r0, [r4, r2]
-	cmp r0, 0xA7
-	ble _08087D5E
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	bl sub_8053FF8
-	bl fade_8080918
-_08087D5E:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087D68: .4byte gUnknown_0839F380
-_08087D6C: .4byte gPlayerAvatar
-_08087D70: .4byte gMapObjects
-_08087D74: .4byte gSprites
-	thumb_func_end sub_8087CA4
-
-	thumb_func_start sub_8087D78
-sub_8087D78: @ 8087D78
-	push {lr}
-	ldr r0, _08087DB8 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08087DB4
-	bl sub_8054034
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08087DB4
-	bl sub_8053570
-	bl warp_in
-	ldr r0, _08087DBC @ =CB2_LoadMap
-	bl SetMainCallback2
-	ldr r1, _08087DC0 @ =gUnknown_0300485C
-	ldr r0, _08087DC4 @ =mapldr_08085D88
-	str r0, [r1]
-	ldr r0, _08087DC8 @ =sub_8087BBC
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08087DB4:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087DB8: .4byte gPaletteFade
-_08087DBC: .4byte CB2_LoadMap
-_08087DC0: .4byte gUnknown_0300485C
-_08087DC4: .4byte mapldr_08085D88
-_08087DC8: .4byte sub_8087BBC
-	thumb_func_end sub_8087D78
-
-	thumb_func_start mapldr_08085D88
-mapldr_08085D88: @ 8087DCC
-	push {lr}
-	bl sub_8053E90
-	bl pal_fill_for_map_transition
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	ldr r1, _08087E0C @ =gUnknown_0300485C
-	movs r0, 0
-	str r0, [r1]
-	ldr r2, _08087E10 @ =gMapObjects
-	ldr r0, _08087E14 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r1, [r0, 0x1]
-	movs r2, 0x20
-	orrs r1, r2
-	strb r1, [r0, 0x1]
-	bl CameraObjectReset2
-	ldr r0, _08087E18 @ =sub_8087E1C
-	movs r1, 0
-	bl CreateTask
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087E0C: .4byte gUnknown_0300485C
-_08087E10: .4byte gMapObjects
-_08087E14: .4byte gPlayerAvatar
-_08087E18: .4byte sub_8087E1C
-	thumb_func_end mapldr_08085D88
-
-	thumb_func_start sub_8087E1C
-sub_8087E1C: @ 8087E1C
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08087E44 @ =gUnknown_0839F3A0
-	ldr r2, _08087E48 @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087E44: .4byte gUnknown_0839F3A0
-_08087E48: .4byte gTasks
-	thumb_func_end sub_8087E1C
-
-	thumb_func_start sub_8087E4C
-sub_8087E4C: @ 8087E4C
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl sub_807D770
-	lsls r0, 24
-	cmp r0, 0
-	beq _08087EC2
-	ldr r5, _08087EC8 @ =gPlayerAvatar
-	ldrb r0, [r5, 0x4]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r0, _08087ECC @ =gSprites
-	adds r2, r0
-	adds r0, r2, 0
-	adds r0, 0x29
-	movs r4, 0
-	ldrsb r4, [r0, r4]
-	lsls r0, r4, 17
-	negs r0, r0
-	ldrh r1, [r2, 0x22]
-	ldr r3, _08087ED0 @ =gSpriteCoordOffsetY
-	adds r1, r4
-	ldrh r3, [r3]
-	adds r1, r3
-	asrs r0, 16
-	adds r0, r1
-	negs r0, r0
-	strh r0, [r2, 0x26]
-	ldr r3, _08087ED4 @ =gMapObjects
-	ldrb r0, [r5, 0x5]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrb r3, [r1, 0x1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r3
-	strb r0, [r1, 0x1]
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-	movs r0, 0x8
-	strh r0, [r6, 0xA]
-	movs r0, 0x1
-	strh r0, [r6, 0xC]
-	adds r2, 0x42
-	ldrb r0, [r2]
-	lsrs r0, 6
-	strh r0, [r6, 0x24]
-	bl player_get_direction_lower_nybble
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r6, 0x26]
-	movs r0, 0x2D
-	bl PlaySE
-_08087EC2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08087EC8: .4byte gPlayerAvatar
-_08087ECC: .4byte gSprites
-_08087ED0: .4byte gSpriteCoordOffsetY
-_08087ED4: .4byte gMapObjects
-	thumb_func_end sub_8087E4C
-
-	thumb_func_start sub_8087ED8
-sub_8087ED8: @ 8087ED8
-	push {r4-r7,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _08087F40 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r2, _08087F44 @ =gPlayerAvatar
-	ldrb r1, [r2, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087F48 @ =gMapObjects
-	adds r6, r0, r1
-	ldrb r1, [r2, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08087F4C @ =gSprites
-	adds r5, r0, r1
-	ldrh r0, [r4, 0xA]
-	ldrh r1, [r5, 0x26]
-	adds r0, r1
-	strh r0, [r5, 0x26]
-	lsls r0, 16
-	asrs r0, 16
-	movs r1, 0x8
-	negs r1, r1
-	cmp r0, r1
-	blt _08087F50
-	ldrh r1, [r4, 0x22]
-	movs r2, 0x22
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	bne _08087F76
-	adds r0, r1, 0x1
-	strh r0, [r4, 0x22]
-	ldrb r0, [r6]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r6]
-	ldrh r1, [r4, 0x24]
-	adds r3, r5, 0
-	adds r3, 0x42
-	lsls r1, 6
-	ldrb r2, [r3]
-	movs r0, 0x3F
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r3]
-	b _08087F76
-	.align 2, 0
-_08087F40: .4byte gUnknown_0839F380
-_08087F44: .4byte gPlayerAvatar
-_08087F48: .4byte gMapObjects
-_08087F4C: .4byte gSprites
-_08087F50:
-	ldrb r1, [r5, 0x5]
-	movs r0, 0xD
-	negs r0, r0
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r5, 0x5]
-	adds r2, r5, 0
-	adds r2, 0x42
-	ldrb r1, [r2]
-	movs r0, 0xC0
-	ands r0, r1
-	cmp r0, 0
-	beq _08087F76
-	movs r0, 0x3F
-	ands r0, r1
-	movs r1, 0x80
-	orrs r0, r1
-	strb r0, [r2]
-_08087F76:
-	ldrh r2, [r5, 0x26]
-	movs r3, 0x26
-	ldrsh r1, [r5, r3]
-	movs r0, 0x30
-	negs r0, r0
-	cmp r1, r0
-	blt _08087F9A
-	ldrh r1, [r4, 0xA]
-	movs r3, 0xA
-	ldrsh r0, [r4, r3]
-	cmp r0, 0x1
-	ble _08087F9A
-	movs r0, 0x1
-	ands r0, r2
-	cmp r0, 0
-	bne _08087F9A
-	subs r0, r1, 0x1
-	strh r0, [r4, 0xA]
-_08087F9A:
-	ldrh r0, [r4, 0xC]
-	subs r0, 0x1
-	movs r7, 0
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08087FBC
-	movs r0, 0x4
-	strh r0, [r4, 0xC]
-	ldrb r0, [r6, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r6, 0
-	bl FieldObjectTurn
-_08087FBC:
-	movs r1, 0x26
-	ldrsh r0, [r5, r1]
-	cmp r0, 0
-	blt _08087FD2
-	strh r7, [r5, 0x26]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x1
-	strh r0, [r4, 0xA]
-	strh r7, [r4, 0xC]
-_08087FD2:
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8087ED8
-
-	thumb_func_start sub_8087FDC
-sub_8087FDC: @ 8087FDC
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	ldr r1, _08088058 @ =gUnknown_0839F380
-	mov r0, sp
-	movs r2, 0x5
-	bl memcpy
-	ldr r0, _0808805C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088060 @ =gMapObjects
-	adds r5, r0, r1
-	ldrh r0, [r4, 0xA]
-	subs r0, 0x1
-	strh r0, [r4, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08088050
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	add r0, sp
-	ldrb r1, [r0]
-	adds r0, r5, 0
-	bl FieldObjectTurn
-	movs r0, 0x8
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x4
-	ble _08088050
-	movs r0, 0x24
-	ldrsh r1, [r4, r0]
-	ldrb r0, [r5, 0x18]
-	lsls r0, 28
-	lsrs r0, 28
-	cmp r1, r0
-	bne _08088050
-	bl ScriptContext2_Disable
-	bl CameraObjectReset1
-	bl UnfreezeMapObjects
-	ldr r0, _08088064 @ =sub_8087E1C
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08088050:
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088058: .4byte gUnknown_0839F380
-_0808805C: .4byte gPlayerAvatar
-_08088060: .4byte gMapObjects
-_08088064: .4byte sub_8087E1C
-	thumb_func_end sub_8087FDC
-
 	thumb_func_start FldEff_FieldMoveShowMon
 FldEff_FieldMoveShowMon: @ 8088068
 	push {r4,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index f20c2ed60..8a874efb6 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -1819,3 +1819,192 @@ void sub_8087AC8(struct Task *task)
     }
     mapObject->mapobj_bit_13 ^= 1;
 }
+
+void sub_8087BBC(u8);
+extern const void (*gUnknown_0839F390[4])(struct Task *);
+void mapldr_08085D88(void);
+
+void sub_8087BA8(void)
+{
+    CreateTask(sub_8087BBC, 0);
+}
+
+void sub_8087BBC(u8 taskId)
+{
+    gUnknown_0839F390[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_8087BEC(struct Task *task)
+{
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    CameraObjectReset2();
+    task->data[15] = player_get_direction_lower_nybble();
+    task->data[0]++;
+}
+
+void sub_8087C14(struct Task *task)
+{
+    struct MapObject *mapObject;
+    u8 unknown_0839F380[5];
+    memcpy(unknown_0839F380, gUnknown_0839F380, sizeof gUnknown_0839F380);
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (task->data[1] == 0 || (--task->data[1]) == 0)
+    {
+        FieldObjectTurn(mapObject, unknown_0839F380[mapObject->mapobj_unk_18]);
+        task->data[1] = 8;
+        task->data[2]++;
+    }
+    if (task->data[2] > 7 && task->data[15] == mapObject->mapobj_unk_18)
+    {
+        task->data[0]++;
+        task->data[1] = 4;
+        task->data[2] = 8;
+        task->data[3] = 1;
+        PlaySE(SE_TK_WARPIN);
+    }
+}
+
+void sub_8087CA4(struct Task *task)
+{
+    struct MapObject *mapObject;
+    struct Sprite *sprite;
+    u8 unknown_0839F380[5];
+    memcpy(unknown_0839F380, gUnknown_0839F380, sizeof gUnknown_0839F380);
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    if ((--task->data[1]) <= 0)
+    {
+        task->data[1] = 4;
+        FieldObjectTurn(mapObject, unknown_0839F380[mapObject->mapobj_unk_18]);
+    }
+    sprite->pos1.y -= task->data[3];
+    task->data[4] += task->data[3];
+    if ((--task->data[2]) <= 0 && (task->data[2] = 4, task->data[3] < 8))
+    {
+        task->data[3] <<= 1;
+    }
+    if (task->data[4] > 8 && (sprite->oam.priority = 1, sprite->subspriteMode != 0))
+    {
+        sprite->subspriteMode = 2;
+    }
+    if (task->data[4] >= 0xa8)
+    {
+        task->data[0]++;
+        sub_8053FF8();
+        fade_8080918();
+    }
+}
+
+void sub_8087D78(struct Task *task)
+{
+    if (!gPaletteFade.active && sub_8054034() == TRUE)
+    {
+        sub_8053570();
+        warp_in();
+        SetMainCallback2(CB2_LoadMap);
+        gUnknown_0300485C = mapldr_08085D88;
+        DestroyTask(FindTaskIdByFunc(sub_8087BBC));
+    }
+}
+
+void sub_8087E1C(u8);
+extern const void (*gUnknown_0839F3A0[3])(struct Task *);
+
+void mapldr_08085D88(void)
+{
+    sub_8053E90();
+    pal_fill_for_map_transition();
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    gUnknown_0300485C = NULL;
+    gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 1;
+    CameraObjectReset2();
+    CreateTask(sub_8087E1C, 0);
+}
+
+void sub_8087E1C(u8 taskId)
+{
+    gUnknown_0839F3A0[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_8087E4C(struct Task *task)
+{
+    struct Sprite *sprite;
+    s16 centerToCornerVecY;
+    if (sub_807D770())
+    {
+        sprite = &gSprites[gPlayerAvatar.spriteId];
+        centerToCornerVecY = -(sprite->centerToCornerVecY << 1);
+        sprite->pos2.y = -(sprite->pos1.y + sprite->centerToCornerVecY + gSpriteCoordOffsetY + centerToCornerVecY);
+        gMapObjects[gPlayerAvatar.mapObjectId].mapobj_bit_13 = 0;
+        task->data[0]++;
+        task->data[1] = 8;
+        task->data[2] = 1;
+        task->data[14] = sprite->subspriteMode;
+        task->data[15] = player_get_direction_lower_nybble();
+        PlaySE(SE_TK_WARPIN);
+    }
+}
+
+void sub_8087ED8(struct Task *task)
+{
+    u8 unknown_0839F380[5];
+    struct MapObject *mapObject;
+    struct Sprite *sprite;
+    memcpy(unknown_0839F380, gUnknown_0839F380, sizeof gUnknown_0839F380);
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    if ((sprite->pos2.y += task->data[1]) >= -8)
+    {
+        if (task->data[13] == 0)
+        {
+            task->data[13]++;
+            mapObject->mapobj_bit_2 = 1;
+            sprite->subspriteMode = task->data[14];
+        }
+    } else
+    {
+        sprite->oam.priority = 1;
+        if (sprite->subspriteMode != 0)
+        {
+            sprite->subspriteMode = 2;
+        }
+    }
+    if (sprite->pos2.y >= -0x30 && task->data[1] > 1 && !(sprite->pos2.y & 1))
+    {
+        task->data[1]--;
+    }
+    if ((--task->data[2]) == 0)
+    {
+        task->data[2] = 4;
+        FieldObjectTurn(mapObject, unknown_0839F380[mapObject->mapobj_unk_18]);
+    }
+    if (sprite->pos2.y >= 0)
+    {
+        sprite->pos2.y = 0;
+        task->data[0]++;
+        task->data[1] = 1;
+        task->data[2] = 0;
+    }
+}
+
+void sub_8087FDC(struct Task *task)
+{
+    u8 unknown_0839F380[5];
+    struct MapObject *mapObject;
+    memcpy(unknown_0839F380, gUnknown_0839F380, sizeof gUnknown_0839F380);
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if ((--task->data[1]) == 0)
+    {
+        FieldObjectTurn(mapObject, unknown_0839F380[mapObject->mapobj_unk_18]);
+        task->data[1] = 8;
+        if ((++task->data[2]) > 4 && task->data[14] == mapObject->mapobj_unk_18)
+        {
+            ScriptContext2_Disable();
+            CameraObjectReset1();
+            UnfreezeMapObjects();
+            DestroyTask(FindTaskIdByFunc(sub_8087E1C));
+        }
+    }
+}
-- 
cgit v1.2.3


From 40bcba1a64f2377166b419ecbabf8ac4a097b8ef Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 10 Jun 2017 10:07:06 -0400
Subject: Init functions for FieldMoveShowMon

---
 asm/field_effect.s | 88 ------------------------------------------------------
 src/field_effect.c | 32 ++++++++++++++++++++
 2 files changed, 32 insertions(+), 88 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 311ec86a0..d0ea81b82 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,94 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_FieldMoveShowMon
-FldEff_FieldMoveShowMon: @ 8088068
-	push {r4,lr}
-	bl sav1_map_get_light_level
-	lsls r0, 24
-	lsrs r0, 24
-	bl is_light_level_1_2_3_5_or_6
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	bne _08088088
-	ldr r0, _08088084 @ =sub_8088120
-	b _0808808A
-	.align 2, 0
-_08088084: .4byte sub_8088120
-_08088088:
-	ldr r0, _080880B8 @ =sub_808847C
-_0808808A:
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r2, _080880BC @ =gUnknown_0202FF84
-	ldr r0, [r2]
-	ldr r1, [r2, 0x4]
-	ldr r2, [r2, 0x8]
-	bl sub_8088830
-	ldr r2, _080880C0 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r1, r2
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r1, 0x26]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080880B8: .4byte sub_808847C
-_080880BC: .4byte gUnknown_0202FF84
-_080880C0: .4byte gTasks
-	thumb_func_end FldEff_FieldMoveShowMon
-
-	thumb_func_start FldEff_FieldMoveShowMonInit
-FldEff_FieldMoveShowMonInit: @ 80880C4
-	push {r4-r6,lr}
-	ldr r5, _08088118 @ =gUnknown_0202FF84
-	ldr r0, [r5]
-	movs r6, 0x80
-	lsls r6, 24
-	ands r6, r0
-	lsls r0, 24
-	lsrs r0, 24
-	movs r1, 0x64
-	adds r4, r0, 0
-	muls r4, r1
-	ldr r0, _0808811C @ =gPlayerParty
-	adds r4, r0
-	adds r0, r4, 0
-	movs r1, 0xB
-	bl GetMonData
-	str r0, [r5]
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl GetMonData
-	str r0, [r5, 0x4]
-	adds r0, r4, 0
-	movs r1, 0
-	bl GetMonData
-	str r0, [r5, 0x8]
-	ldr r0, [r5]
-	orrs r0, r6
-	str r0, [r5]
-	movs r0, 0x6
-	bl FieldEffectStart
-	movs r0, 0x3B
-	bl FieldEffectActiveListRemove
-	movs r0, 0
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08088118: .4byte gUnknown_0202FF84
-_0808811C: .4byte gPlayerParty
-	thumb_func_end FldEff_FieldMoveShowMonInit
-
 	thumb_func_start sub_8088120
 sub_8088120: @ 8088120
 	push {lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 8a874efb6..3a56dfdcb 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2008,3 +2008,35 @@ void sub_8087FDC(struct Task *task)
         }
     }
 }
+
+void sub_8088120(u8);
+void sub_808847C(u8);
+u8 sub_8088830(u32, u32, u32);
+
+bool8 FldEff_FieldMoveShowMon(void)
+{
+    u8 taskId;
+    if (is_light_level_1_2_3_5_or_6(sav1_map_get_light_level()) == TRUE)
+    {
+        taskId = CreateTask(sub_8088120, 0xff);
+    } else
+    {
+        taskId = CreateTask(sub_808847C, 0xff);
+    }
+    gTasks[taskId].data[15] = sub_8088830(gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
+    return FALSE;
+}
+
+bool8 FldEff_FieldMoveShowMonInit(void)
+{
+    struct Pokemon *pokemon;
+    u32 flag = gUnknown_0202FF84[0] & 0x80000000;
+    pokemon = &gPlayerParty[(u8)gUnknown_0202FF84[0]];
+    gUnknown_0202FF84[0] = GetMonData(pokemon, MON_DATA_SPECIES);
+    gUnknown_0202FF84[1] = GetMonData(pokemon, MON_DATA_OT_ID);
+    gUnknown_0202FF84[2] = GetMonData(pokemon, MON_DATA_PERSONALITY);
+    gUnknown_0202FF84[0] |= flag;
+    FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON);
+    FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
+    return FALSE;
+}
-- 
cgit v1.2.3


From 19c16e2f94dda9fe354692f6e449b271e845ad22 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sat, 10 Jun 2017 21:36:41 -0400
Subject: Attempt at decompiling field effect for sending out pokemon for field
 move

---
 asm/field_effect.s     | 402 -------------------------------------------------
 include/field_effect.h |  23 +++
 include/gba/defines.h  |   3 +
 src/field_effect.c     | 280 ++++++++++++++++++++++++++++++++++
 4 files changed, 306 insertions(+), 402 deletions(-)
 mode change 100644 => 100755 include/gba/defines.h

diff --git a/asm/field_effect.s b/asm/field_effect.s
index d0ea81b82..9f8f50afc 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,408 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8088120
-sub_8088120: @ 8088120
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08088148 @ =gUnknown_0839F3AC
-	ldr r2, _0808814C @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088148: .4byte gUnknown_0839F3AC
-_0808814C: .4byte gTasks
-	thumb_func_end sub_8088120
-
-	thumb_func_start sub_8088150
-sub_8088150: @ 8088150
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	ldr r6, _080881A0 @ =REG_WININ
-	ldrh r0, [r6]
-	strh r0, [r4, 0x1E]
-	ldr r5, _080881A4 @ =REG_WINOUT
-	ldrh r0, [r5]
-	strh r0, [r4, 0x20]
-	adds r0, r4, 0
-	adds r0, 0x22
-	ldr r1, _080881A8 @ =gMain
-	ldr r1, [r1, 0xC]
-	bl StoreWordInTwoHalfwords
-	ldr r1, _080881AC @ =0x0000f0f1
-	strh r1, [r4, 0xA]
-	ldr r0, _080881B0 @ =0x00005051
-	strh r0, [r4, 0xC]
-	movs r0, 0x3F
-	strh r0, [r4, 0xE]
-	movs r0, 0x3E
-	strh r0, [r4, 0x10]
-	ldr r0, _080881B4 @ =REG_WIN0H
-	strh r1, [r0]
-	ldr r1, _080881B8 @ =REG_WIN0V
-	ldrh r0, [r4, 0xC]
-	strh r0, [r1]
-	ldrh r0, [r4, 0xE]
-	strh r0, [r6]
-	ldrh r0, [r4, 0x10]
-	strh r0, [r5]
-	ldr r0, _080881BC @ =sub_80883DC
-	bl SetVBlankCallback
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080881A0: .4byte REG_WININ
-_080881A4: .4byte REG_WINOUT
-_080881A8: .4byte gMain
-_080881AC: .4byte 0x0000f0f1
-_080881B0: .4byte 0x00005051
-_080881B4: .4byte REG_WIN0H
-_080881B8: .4byte REG_WIN0V
-_080881BC: .4byte sub_80883DC
-	thumb_func_end sub_8088150
-
-	thumb_func_start sub_80881C0
-sub_80881C0: @ 80881C0
-	push {r4-r6,lr}
-	sub sp, 0x4
-	adds r6, r0, 0
-	ldr r0, _08088218 @ =REG_BG0CNT
-	ldrh r1, [r0]
-	lsrs r1, 2
-	lsls r1, 30
-	lsrs r1, 16
-	ldrh r4, [r0]
-	lsrs r4, 8
-	lsls r4, 27
-	lsrs r4, 16
-	ldr r0, _0808821C @ =gFieldMoveStreaksTiles
-	movs r5, 0xC0
-	lsls r5, 19
-	adds r1, r5
-	movs r2, 0x80
-	lsls r2, 1
-	bl CpuSet
-	movs r0, 0
-	str r0, [sp]
-	adds r5, r4, r5
-	ldr r2, _08088220 @ =0x05000200
-	mov r0, sp
-	adds r1, r5, 0
-	bl CpuSet
-	ldr r0, _08088224 @ =gFieldMoveStreaksPalette
-	movs r1, 0xF0
-	movs r2, 0x20
-	bl LoadPalette
-	adds r0, r4, 0
-	bl sub_808843C
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-	add sp, 0x4
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088218: .4byte REG_BG0CNT
-_0808821C: .4byte gFieldMoveStreaksTiles
-_08088220: .4byte 0x05000200
-_08088224: .4byte gFieldMoveStreaksPalette
-	thumb_func_end sub_80881C0
-
-	thumb_func_start sub_8088228
-sub_8088228: @ 8088228
-	push {r4-r7,lr}
-	adds r3, r0, 0
-	ldrh r0, [r3, 0x12]
-	subs r0, 0x10
-	strh r0, [r3, 0x12]
-	ldrh r6, [r3, 0xA]
-	ldrh r2, [r3, 0xC]
-	movs r7, 0xFF
-	lsrs r1, r6, 8
-	subs r1, 0x10
-	lsls r1, 16
-	lsrs r0, r2, 8
-	subs r0, 0x2
-	lsls r0, 16
-	lsrs r4, r0, 16
-	adds r0, r7, 0
-	ands r0, r2
-	adds r5, r0, 0x2
-	lsrs r2, r1, 16
-	cmp r1, 0
-	bge _08088254
-	movs r2, 0
-_08088254:
-	lsls r0, r4, 16
-	asrs r0, 16
-	cmp r0, 0x27
-	bgt _0808825E
-	movs r4, 0x28
-_0808825E:
-	cmp r5, 0x78
-	ble _08088264
-	movs r5, 0x78
-_08088264:
-	lsls r2, 16
-	asrs r2, 16
-	lsls r1, r2, 8
-	adds r0, r7, 0
-	ands r0, r6
-	orrs r1, r0
-	strh r1, [r3, 0xA]
-	lsls r0, r4, 16
-	asrs r4, r0, 16
-	lsls r0, r4, 8
-	adds r1, r5, 0
-	orrs r0, r1
-	strh r0, [r3, 0xC]
-	cmp r2, 0
-	bne _080882A4
-	cmp r4, 0x28
-	bne _080882A4
-	cmp r1, 0x78
-	bne _080882A4
-	ldr r2, _080882AC @ =gSprites
-	movs r0, 0x26
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, _080882B0 @ =sub_8088890
-	str r1, [r0]
-	ldrh r0, [r3, 0x8]
-	adds r0, 0x1
-	strh r0, [r3, 0x8]
-_080882A4:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080882AC: .4byte gSprites
-_080882B0: .4byte sub_8088890
-	thumb_func_end sub_8088228
-
-	thumb_func_start sub_80882B4
-sub_80882B4: @ 80882B4
-	push {lr}
-	adds r3, r0, 0
-	ldrh r0, [r3, 0x12]
-	subs r0, 0x10
-	strh r0, [r3, 0x12]
-	ldr r2, _080882E0 @ =gSprites
-	movs r0, 0x26
-	ldrsh r1, [r3, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0x3C
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _080882DA
-	ldrh r0, [r3, 0x8]
-	adds r0, 0x1
-	strh r0, [r3, 0x8]
-_080882DA:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080882E0: .4byte gSprites
-	thumb_func_end sub_80882B4
-
-	thumb_func_start sub_80882E4
-sub_80882E4: @ 80882E4
-	push {r4,lr}
-	adds r3, r0, 0
-	ldrh r0, [r3, 0x12]
-	subs r0, 0x10
-	strh r0, [r3, 0x12]
-	ldrh r2, [r3, 0xC]
-	lsls r1, r2, 16
-	movs r0, 0xFF
-	asrs r1, 24
-	adds r1, 0x6
-	lsls r1, 16
-	ands r0, r2
-	subs r0, 0x6
-	lsls r0, 16
-	lsrs r2, r0, 16
-	lsrs r4, r1, 16
-	asrs r1, 16
-	cmp r1, 0x50
-	ble _0808830C
-	movs r4, 0x50
-_0808830C:
-	lsls r0, r2, 16
-	asrs r0, 16
-	cmp r0, 0x50
-	bgt _08088316
-	movs r2, 0x51
-_08088316:
-	lsls r0, r4, 16
-	asrs r0, 16
-	lsls r1, r0, 8
-	lsls r2, 16
-	asrs r2, 16
-	orrs r1, r2
-	strh r1, [r3, 0xC]
-	cmp r0, 0x50
-	bne _08088332
-	cmp r2, 0x51
-	bne _08088332
-	ldrh r0, [r3, 0x8]
-	adds r0, 0x1
-	strh r0, [r3, 0x8]
-_08088332:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80882E4
-
-	thumb_func_start sub_8088338
-sub_8088338: @ 8088338
-	push {r4,lr}
-	sub sp, 0x4
-	adds r4, r0, 0
-	ldr r0, _08088378 @ =REG_BG0CNT
-	ldrh r1, [r0]
-	lsrs r1, 8
-	lsls r1, 27
-	lsrs r1, 16
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xC0
-	lsls r0, 19
-	adds r1, r0
-	ldr r2, _0808837C @ =0x05000200
-	mov r0, sp
-	bl CpuSet
-	movs r0, 0xF1
-	strh r0, [r4, 0xA]
-	movs r0, 0xA1
-	strh r0, [r4, 0xC]
-	ldrh r0, [r4, 0x1E]
-	strh r0, [r4, 0xE]
-	ldrh r0, [r4, 0x20]
-	strh r0, [r4, 0x10]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088378: .4byte REG_BG0CNT
-_0808837C: .4byte 0x05000200
-	thumb_func_end sub_8088338
-
-	thumb_func_start sub_8088380
-sub_8088380: @ 8088380
-	push {r4,r5,lr}
-	sub sp, 0x4
-	adds r5, r0, 0
-	adds r0, 0x22
-	mov r1, sp
-	bl LoadWordFromTwoHalfwords
-	ldr r0, [sp]
-	bl SetVBlankCallback
-	ldr r4, _080883D0 @ =gWindowConfig_81E6CE4
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	adds r0, r4, 0
-	bl InitMenuWindow
-	movs r0, 0x26
-	ldrsh r1, [r5, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080883D4 @ =gSprites
-	adds r0, r1
-	bl FreeResourcesAndDestroySprite
-	movs r0, 0x6
-	bl FieldEffectActiveListRemove
-	ldr r0, _080883D8 @ =sub_8088120
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080883D0: .4byte gWindowConfig_81E6CE4
-_080883D4: .4byte gSprites
-_080883D8: .4byte sub_8088120
-	thumb_func_end sub_8088380
-
-	thumb_func_start sub_80883DC
-sub_80883DC: @ 80883DC
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r0, _08088430 @ =sub_8088120
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r0, _08088434 @ =gTasks
-	adds r4, r0
-	adds r0, r4, 0
-	adds r0, 0x22
-	mov r1, sp
-	bl LoadWordFromTwoHalfwords
-	ldr r0, [sp]
-	bl _call_via_r0
-	ldr r1, _08088438 @ =REG_WIN0H
-	ldrh r0, [r4, 0xA]
-	strh r0, [r1]
-	adds r1, 0x4
-	ldrh r0, [r4, 0xC]
-	strh r0, [r1]
-	adds r1, 0x4
-	ldrh r0, [r4, 0xE]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrh r0, [r4, 0x10]
-	strh r0, [r1]
-	subs r1, 0x3A
-	ldrh r0, [r4, 0x12]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrh r0, [r4, 0x14]
-	strh r0, [r1]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088430: .4byte sub_8088120
-_08088434: .4byte gTasks
-_08088438: .4byte REG_WIN0H
-	thumb_func_end sub_80883DC
-
 	thumb_func_start sub_808843C
 sub_808843C: @ 808843C
 	push {r4,r5,lr}
diff --git a/include/field_effect.h b/include/field_effect.h
index d35ca599b..6306b81ac 100755
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -106,4 +106,27 @@ void FieldEffectActiveListRemove(u8 id);
 bool8 FieldEffectActiveListContains(u8 id);
 void sub_807DE38(u8 index);
 
+void SpriteCB_PokeballGlow(struct Sprite *);
+void SpriteCB_PokecenterMonitor(struct Sprite *);
+void SpriteCB_HallOfFameMonitor(struct Sprite *);
+
+void PokecenterHealEffect_0(struct Task *);
+void PokecenterHealEffect_1(struct Task *);
+void PokecenterHealEffect_2(struct Task *);
+void PokecenterHealEffect_3(struct Task *);
+
+void HallOfFameRecordEffect_0(struct Task *);
+void HallOfFameRecordEffect_1(struct Task *);
+void HallOfFameRecordEffect_2(struct Task *);
+void HallOfFameRecordEffect_3(struct Task *);
+
+void PokeballGlowEffect_0(struct Sprite *);
+void PokeballGlowEffect_1(struct Sprite *);
+void PokeballGlowEffect_2(struct Sprite *);
+void PokeballGlowEffect_3(struct Sprite *);
+void PokeballGlowEffect_4(struct Sprite *);
+void PokeballGlowEffect_5(struct Sprite *);
+void PokeballGlowEffect_6(struct Sprite *);
+void PokeballGlowEffect_7(struct Sprite *);
+
 #endif // GUARD_FIELD_EFFECT_H
diff --git a/include/gba/defines.h b/include/gba/defines.h
old mode 100644
new mode 100755
index 0f7f06755..e88d2da8b
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -58,4 +58,7 @@
 
 #define WIN_RANGE(a, b) (((a) << 8) | (b))
 
+#define min(a, b) (a >= b ? a : b)
+#define max(a, b) (a <= b ? a : b)
+
 #endif // GUARD_GBA_DEFINES
diff --git a/src/field_effect.c b/src/field_effect.c
index 3a56dfdcb..5719245e5 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -7,6 +7,7 @@
 #include "field_weather.h"
 #include "decompress.h"
 #include "sprite.h"
+#include "menu.h"
 #include "palette.h"
 #include "text.h"
 #include "rom4.h"
@@ -2012,6 +2013,13 @@ void sub_8087FDC(struct Task *task)
 void sub_8088120(u8);
 void sub_808847C(u8);
 u8 sub_8088830(u32, u32, u32);
+extern const void (*gUnknown_0839F3AC[7])(struct Task *);
+extern const void (*gUnknown_0839F3C8[7])(struct Task *);
+extern const u32 gFieldMoveStreaksTiles[];
+extern const u16 gFieldMoveStreaksPalette[16];
+void sub_80883DC(void);
+void sub_808843C(u16);
+void sub_8088890(struct Sprite *);
 
 bool8 FldEff_FieldMoveShowMon(void)
 {
@@ -2040,3 +2048,275 @@ bool8 FldEff_FieldMoveShowMonInit(void)
     FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
     return FALSE;
 }
+
+void sub_8088120(u8 taskId)
+{
+    gUnknown_0839F3AC[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_8088150(struct Task *task)
+{
+    task->data[11] = REG_WININ;
+    task->data[12] = REG_WINOUT;
+    StoreWordInTwoHalfwords(&task->data[13], (u32)gMain.vblankCallback);
+    task->data[1] = 0xf0f1;
+    task->data[2] = 0x5051;
+    task->data[3] = 0x3f;
+    task->data[4] = 0x3e;
+    REG_WIN0H = task->data[1];
+    REG_WIN0V = task->data[2];
+    REG_WININ = task->data[3];
+    REG_WINOUT = task->data[4];
+    SetVBlankCallback(sub_80883DC);
+    task->data[0]++;
+}
+
+void sub_80881C0(struct Task *task)
+{
+    u32 zero;
+    u16 offset;
+    u16 delta;
+    offset = ((REG_BG0CNT >> 2) << 14);
+    delta = ((REG_BG0CNT >> 8) << 11);
+    CpuSet(gFieldMoveStreaksTiles, (void *)(VRAM + offset), 0x100);
+    zero = 0;
+    CpuSet(&zero, (void *)(VRAM + delta), 0x5000200);
+    LoadPalette(gFieldMoveStreaksPalette, 0xf0, 0x20);
+    sub_808843C(delta);
+    task->data[0]++;
+}
+
+#ifdef NONMATCHING
+void sub_8088228(struct Task *task)
+{
+    s16 v0;
+    s16 v2;
+    s16 v3;
+    task->data[5] -= 16;
+    // The order in which registers are loaded is incorrect.
+    v0 = ((u16)task->data[1] >> 8) - 0x10;
+    v2 = ((u16)task->data[2] >> 8) - 2;
+    v3 = ((u16)task->data[2] & 0xff) + 2;
+    if (v0 < 0)
+    {
+        v0 = 0;
+    }
+    if (v2 < 0x28)
+    {
+        v2 = 0x28;
+    }
+    if (v3 > 0x78)
+    {
+        v3 = 0x78;
+    }
+    task->data[1] = (v0 << 8) | (task->data[1] & 0xff);
+    task->data[2] = (v2 << 8) | v3;
+    if (v0 == 0 && v2 == 0x28 && v3 == 0x78)
+    {
+        gSprites[task->data[15]].callback = sub_8088890;
+        task->data[0]++;
+    }
+}
+#else
+__attribute__((naked))
+void sub_8088228(struct Task *task)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                "\tadds r3, r0, 0\n"
+                "\tldrh r0, [r3, 0x12]\n"
+                "\tsubs r0, 0x10\n"
+                "\tstrh r0, [r3, 0x12]\n"
+                "\tldrh r6, [r3, 0xA]\n"
+                "\tldrh r2, [r3, 0xC]\n"
+                "\tmovs r7, 0xFF\n"
+                "\tlsrs r1, r6, 8\n"
+                "\tsubs r1, 0x10\n"
+                "\tlsls r1, 16\n"
+                "\tlsrs r0, r2, 8\n"
+                "\tsubs r0, 0x2\n"
+                "\tlsls r0, 16\n"
+                "\tlsrs r4, r0, 16\n"
+                "\tadds r0, r7, 0\n"
+                "\tands r0, r2\n"
+                "\tadds r5, r0, 0x2\n"
+                "\tlsrs r2, r1, 16\n"
+                "\tcmp r1, 0\n"
+                "\tbge _08088254\n"
+                "\tmovs r2, 0\n"
+                "_08088254:\n"
+                "\tlsls r0, r4, 16\n"
+                "\tasrs r0, 16\n"
+                "\tcmp r0, 0x27\n"
+                "\tbgt _0808825E\n"
+                "\tmovs r4, 0x28\n"
+                "_0808825E:\n"
+                "\tcmp r5, 0x78\n"
+                "\tble _08088264\n"
+                "\tmovs r5, 0x78\n"
+                "_08088264:\n"
+                "\tlsls r2, 16\n"
+                "\tasrs r2, 16\n"
+                "\tlsls r1, r2, 8\n"
+                "\tadds r0, r7, 0\n"
+                "\tands r0, r6\n"
+                "\torrs r1, r0\n"
+                "\tstrh r1, [r3, 0xA]\n"
+                "\tlsls r0, r4, 16\n"
+                "\tasrs r4, r0, 16\n"
+                "\tlsls r0, r4, 8\n"
+                "\tadds r1, r5, 0\n"
+                "\torrs r0, r1\n"
+                "\tstrh r0, [r3, 0xC]\n"
+                "\tcmp r2, 0\n"
+                "\tbne _080882A4\n"
+                "\tcmp r4, 0x28\n"
+                "\tbne _080882A4\n"
+                "\tcmp r1, 0x78\n"
+                "\tbne _080882A4\n"
+                "\tldr r2, _080882AC @ =gSprites\n"
+                "\tmovs r0, 0x26\n"
+                "\tldrsh r1, [r3, r0]\n"
+                "\tlsls r0, r1, 4\n"
+                "\tadds r0, r1\n"
+                "\tlsls r0, 2\n"
+                "\tadds r2, 0x1C\n"
+                "\tadds r0, r2\n"
+                "\tldr r1, _080882B0 @ =sub_8088890\n"
+                "\tstr r1, [r0]\n"
+                "\tldrh r0, [r3, 0x8]\n"
+                "\tadds r0, 0x1\n"
+                "\tstrh r0, [r3, 0x8]\n"
+                "_080882A4:\n"
+                "\tpop {r4-r7}\n"
+                "\tpop {r0}\n"
+                "\tbx r0\n"
+                "\t.align 2, 0\n"
+                "_080882AC: .4byte gSprites\n"
+                "_080882B0: .4byte sub_8088890");
+}
+#endif
+
+void sub_80882B4(struct Task *task)
+{
+    task->data[5] -= 0x10;
+    if (gSprites[task->data[15]].data7)
+    {
+        task->data[0]++;
+    }
+}
+
+#ifdef NONMATCHING
+void sub_80882E4(struct Task *task)
+{
+    s16 v2;
+    s16 v3;
+    task->data[5] -= 0x10;
+    // The order in which registers are loaded is incorrect.
+    v2 = (task->data[2] >> 8) + 6;
+    v3 = (task->data[2] & 0xff) - 6;
+    if (v2 > 0x50)
+    {
+        v2 = 0x50;
+    }
+    if (v3 < 0x51)
+    {
+        v3 = 0x51;
+    }
+    task->data[2] = (v2 << 8) | v3;
+    if (v2 == 0x50 && v3 == 0x51)
+    {
+        task->data[0]++;
+    }
+}
+#else
+__attribute__((naked))
+void sub_80882E4(struct Task *task)
+{
+    asm_unified("\tpush {r4,lr}\n"
+                "\tadds r3, r0, 0\n"
+                "\tldrh r0, [r3, 0x12]\n"
+                "\tsubs r0, 0x10\n"
+                "\tstrh r0, [r3, 0x12]\n"
+                "\tldrh r2, [r3, 0xC]\n"
+                "\tlsls r1, r2, 16\n"
+                "\tmovs r0, 0xFF\n"
+                "\tasrs r1, 24\n"
+                "\tadds r1, 0x6\n"
+                "\tlsls r1, 16\n"
+                "\tands r0, r2\n"
+                "\tsubs r0, 0x6\n"
+                "\tlsls r0, 16\n"
+                "\tlsrs r2, r0, 16\n"
+                "\tlsrs r4, r1, 16\n"
+                "\tasrs r1, 16\n"
+                "\tcmp r1, 0x50\n"
+                "\tble _0808830C\n"
+                "\tmovs r4, 0x50\n"
+                "_0808830C:\n"
+                "\tlsls r0, r2, 16\n"
+                "\tasrs r0, 16\n"
+                "\tcmp r0, 0x50\n"
+                "\tbgt _08088316\n"
+                "\tmovs r2, 0x51\n"
+                "_08088316:\n"
+                "\tlsls r0, r4, 16\n"
+                "\tasrs r0, 16\n"
+                "\tlsls r1, r0, 8\n"
+                "\tlsls r2, 16\n"
+                "\tasrs r2, 16\n"
+                "\torrs r1, r2\n"
+                "\tstrh r1, [r3, 0xC]\n"
+                "\tcmp r0, 0x50\n"
+                "\tbne _08088332\n"
+                "\tcmp r2, 0x51\n"
+                "\tbne _08088332\n"
+                "\tldrh r0, [r3, 0x8]\n"
+                "\tadds r0, 0x1\n"
+                "\tstrh r0, [r3, 0x8]\n"
+                "_08088332:\n"
+                "\tpop {r4}\n"
+                "\tpop {r0}\n"
+                "\tbx r0");
+}
+#endif
+
+void sub_8088338(struct Task *task)
+{
+    u32 zero;
+    u16 bg0cnt;
+    bg0cnt = (REG_BG0CNT >> 8) << 11;
+    zero = 0;
+    CpuSet(&zero, (void *)VRAM + bg0cnt, 0x5000200);
+    task->data[1] = 0xf1;
+    task->data[2] = 0xa1;
+    task->data[3] = task->data[11];
+    task->data[4] = task->data[12];
+    task->data[0]++;
+}
+
+void sub_8088380(struct Task *task)
+{
+    IntrCallback callback;
+    LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback);
+    SetVBlankCallback(callback);
+    SetUpWindowConfig(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowConfig_81E6CE4);
+    FreeResourcesAndDestroySprite(&gSprites[task->data[15]]);
+    FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
+    DestroyTask(FindTaskIdByFunc(sub_8088120));
+}
+
+void sub_80883DC(void)
+{
+    struct Task *task;
+    IntrCallback callback;
+    task = &gTasks[FindTaskIdByFunc(sub_8088120)];
+    LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&callback);
+    callback();
+    REG_WIN0H = task->data[1];
+    REG_WIN0V = task->data[2];
+    REG_WININ = task->data[3];
+    REG_WINOUT = task->data[4];
+    REG_BG0HOFS = task->data[5];
+    REG_BG0VOFS = task->data[6];
+}
-- 
cgit v1.2.3


From 1ebb2b84a202b345435356381fb0dea9a5d7033d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 11 Jun 2017 10:21:44 -0400
Subject: Use CpuCopy and CpuFill macros

---
 asm/field_effect.s | 34 ----------------------------------
 src/field_effect.c | 22 +++++++++++++++-------
 2 files changed, 15 insertions(+), 41 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 9f8f50afc..c513d479c 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,40 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_808843C
-sub_808843C: @ 808843C
-	push {r4,r5,lr}
-	lsls r0, 16
-	lsrs r0, 16
-	ldr r1, _08088470 @ =0x06000140
-	adds r2, r0, r1
-	movs r1, 0
-	ldr r5, _08088474 @ =gFieldMoveStreaksTilemap
-	movs r0, 0xF0
-	lsls r0, 8
-	adds r4, r0, 0
-	ldr r3, _08088478 @ =0x0000013f
-_08088452:
-	lsls r0, r1, 1
-	adds r0, r5
-	ldrh r0, [r0]
-	orrs r0, r4
-	strh r0, [r2]
-	adds r0, r1, 0x1
-	lsls r0, 16
-	lsrs r1, r0, 16
-	adds r2, 0x2
-	cmp r1, r3
-	bls _08088452
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088470: .4byte 0x06000140
-_08088474: .4byte gFieldMoveStreaksTilemap
-_08088478: .4byte 0x0000013f
-	thumb_func_end sub_808843C
-
 	thumb_func_start sub_808847C
 sub_808847C: @ 808847C
 	push {lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 5719245e5..f9645613b 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2017,6 +2017,7 @@ extern const void (*gUnknown_0839F3AC[7])(struct Task *);
 extern const void (*gUnknown_0839F3C8[7])(struct Task *);
 extern const u32 gFieldMoveStreaksTiles[];
 extern const u16 gFieldMoveStreaksPalette[16];
+extern const u16 gFieldMoveStreaksTilemap[0x140];
 void sub_80883DC(void);
 void sub_808843C(u16);
 void sub_8088890(struct Sprite *);
@@ -2073,14 +2074,12 @@ void sub_8088150(struct Task *task)
 
 void sub_80881C0(struct Task *task)
 {
-    u32 zero;
     u16 offset;
     u16 delta;
     offset = ((REG_BG0CNT >> 2) << 14);
     delta = ((REG_BG0CNT >> 8) << 11);
-    CpuSet(gFieldMoveStreaksTiles, (void *)(VRAM + offset), 0x100);
-    zero = 0;
-    CpuSet(&zero, (void *)(VRAM + delta), 0x5000200);
+    CpuCopy16(gFieldMoveStreaksTiles, (void *)(VRAM + offset), 0x200);
+    CpuFill32(0, (void *)(VRAM + delta), 0x800);
     LoadPalette(gFieldMoveStreaksPalette, 0xf0, 0x20);
     sub_808843C(delta);
     task->data[0]++;
@@ -2282,11 +2281,9 @@ void sub_80882E4(struct Task *task)
 
 void sub_8088338(struct Task *task)
 {
-    u32 zero;
     u16 bg0cnt;
     bg0cnt = (REG_BG0CNT >> 8) << 11;
-    zero = 0;
-    CpuSet(&zero, (void *)VRAM + bg0cnt, 0x5000200);
+    CpuFill32(0, (void *)VRAM + bg0cnt, 0x800);
     task->data[1] = 0xf1;
     task->data[2] = 0xa1;
     task->data[3] = task->data[11];
@@ -2320,3 +2317,14 @@ void sub_80883DC(void)
     REG_BG0HOFS = task->data[5];
     REG_BG0VOFS = task->data[6];
 }
+
+void sub_808843C(u16 offs)
+{
+    u16 i;
+    u16 *dest;
+    dest = (u16 *)(VRAM + 0x140 + offs);
+    for (i=0; i<0x140; i++, dest++)
+    {
+        *dest = gFieldMoveStreaksTilemap[i] | 0xf000;
+    }
+}
-- 
cgit v1.2.3


From ba16f9d35f5c6f5daee0a24301d8c48031f6c4df Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 11 Jun 2017 14:12:18 -0400
Subject: Get those two functions matching.  Thanks camthesaxman\!

---
 src/field_effect.c | 152 +++++------------------------------------------------
 1 file changed, 12 insertions(+), 140 deletions(-)

diff --git a/src/field_effect.c b/src/field_effect.c
index f9645613b..cd58e84ba 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2085,17 +2085,18 @@ void sub_80881C0(struct Task *task)
     task->data[0]++;
 }
 
-#ifdef NONMATCHING
 void sub_8088228(struct Task *task)
 {
     s16 v0;
     s16 v2;
     s16 v3;
     task->data[5] -= 16;
-    // The order in which registers are loaded is incorrect.
-    v0 = ((u16)task->data[1] >> 8) - 0x10;
-    v2 = ((u16)task->data[2] >> 8) - 2;
-    v3 = ((u16)task->data[2] & 0xff) + 2;
+    v0 = ((u16)task->data[1] >> 8);
+    v2 = ((u16)task->data[2] >> 8);
+    v3 = ((u16)task->data[2] & 0xff);
+    v0 -= 16;
+    v2 -= 2;
+    v3 += 2;
     if (v0 < 0)
     {
         v0 = 0;
@@ -2116,103 +2117,25 @@ void sub_8088228(struct Task *task)
         task->data[0]++;
     }
 }
-#else
-__attribute__((naked))
-void sub_8088228(struct Task *task)
-{
-    asm_unified("\tpush {r4-r7,lr}\n"
-                "\tadds r3, r0, 0\n"
-                "\tldrh r0, [r3, 0x12]\n"
-                "\tsubs r0, 0x10\n"
-                "\tstrh r0, [r3, 0x12]\n"
-                "\tldrh r6, [r3, 0xA]\n"
-                "\tldrh r2, [r3, 0xC]\n"
-                "\tmovs r7, 0xFF\n"
-                "\tlsrs r1, r6, 8\n"
-                "\tsubs r1, 0x10\n"
-                "\tlsls r1, 16\n"
-                "\tlsrs r0, r2, 8\n"
-                "\tsubs r0, 0x2\n"
-                "\tlsls r0, 16\n"
-                "\tlsrs r4, r0, 16\n"
-                "\tadds r0, r7, 0\n"
-                "\tands r0, r2\n"
-                "\tadds r5, r0, 0x2\n"
-                "\tlsrs r2, r1, 16\n"
-                "\tcmp r1, 0\n"
-                "\tbge _08088254\n"
-                "\tmovs r2, 0\n"
-                "_08088254:\n"
-                "\tlsls r0, r4, 16\n"
-                "\tasrs r0, 16\n"
-                "\tcmp r0, 0x27\n"
-                "\tbgt _0808825E\n"
-                "\tmovs r4, 0x28\n"
-                "_0808825E:\n"
-                "\tcmp r5, 0x78\n"
-                "\tble _08088264\n"
-                "\tmovs r5, 0x78\n"
-                "_08088264:\n"
-                "\tlsls r2, 16\n"
-                "\tasrs r2, 16\n"
-                "\tlsls r1, r2, 8\n"
-                "\tadds r0, r7, 0\n"
-                "\tands r0, r6\n"
-                "\torrs r1, r0\n"
-                "\tstrh r1, [r3, 0xA]\n"
-                "\tlsls r0, r4, 16\n"
-                "\tasrs r4, r0, 16\n"
-                "\tlsls r0, r4, 8\n"
-                "\tadds r1, r5, 0\n"
-                "\torrs r0, r1\n"
-                "\tstrh r0, [r3, 0xC]\n"
-                "\tcmp r2, 0\n"
-                "\tbne _080882A4\n"
-                "\tcmp r4, 0x28\n"
-                "\tbne _080882A4\n"
-                "\tcmp r1, 0x78\n"
-                "\tbne _080882A4\n"
-                "\tldr r2, _080882AC @ =gSprites\n"
-                "\tmovs r0, 0x26\n"
-                "\tldrsh r1, [r3, r0]\n"
-                "\tlsls r0, r1, 4\n"
-                "\tadds r0, r1\n"
-                "\tlsls r0, 2\n"
-                "\tadds r2, 0x1C\n"
-                "\tadds r0, r2\n"
-                "\tldr r1, _080882B0 @ =sub_8088890\n"
-                "\tstr r1, [r0]\n"
-                "\tldrh r0, [r3, 0x8]\n"
-                "\tadds r0, 0x1\n"
-                "\tstrh r0, [r3, 0x8]\n"
-                "_080882A4:\n"
-                "\tpop {r4-r7}\n"
-                "\tpop {r0}\n"
-                "\tbx r0\n"
-                "\t.align 2, 0\n"
-                "_080882AC: .4byte gSprites\n"
-                "_080882B0: .4byte sub_8088890");
-}
-#endif
 
 void sub_80882B4(struct Task *task)
 {
-    task->data[5] -= 0x10;
+    task->data[5] -= 16;
     if (gSprites[task->data[15]].data7)
     {
         task->data[0]++;
     }
 }
 
-#ifdef NONMATCHING
 void sub_80882E4(struct Task *task)
 {
     s16 v2;
     s16 v3;
-    task->data[5] -= 0x10;
-    // The order in which registers are loaded is incorrect.
-    v2 = (task->data[2] >> 8) + 6;
-    v3 = (task->data[2] & 0xff) - 6;
+    task->data[5] -= 16;
+    v2 = (task->data[2] >> 8);
+    v3 = (task->data[2] & 0xff);
+    v2 += 6;
+    v3 -= 6;
     if (v2 > 0x50)
     {
         v2 = 0x50;
@@ -2227,57 +2150,6 @@ void sub_80882E4(struct Task *task)
         task->data[0]++;
     }
 }
-#else
-__attribute__((naked))
-void sub_80882E4(struct Task *task)
-{
-    asm_unified("\tpush {r4,lr}\n"
-                "\tadds r3, r0, 0\n"
-                "\tldrh r0, [r3, 0x12]\n"
-                "\tsubs r0, 0x10\n"
-                "\tstrh r0, [r3, 0x12]\n"
-                "\tldrh r2, [r3, 0xC]\n"
-                "\tlsls r1, r2, 16\n"
-                "\tmovs r0, 0xFF\n"
-                "\tasrs r1, 24\n"
-                "\tadds r1, 0x6\n"
-                "\tlsls r1, 16\n"
-                "\tands r0, r2\n"
-                "\tsubs r0, 0x6\n"
-                "\tlsls r0, 16\n"
-                "\tlsrs r2, r0, 16\n"
-                "\tlsrs r4, r1, 16\n"
-                "\tasrs r1, 16\n"
-                "\tcmp r1, 0x50\n"
-                "\tble _0808830C\n"
-                "\tmovs r4, 0x50\n"
-                "_0808830C:\n"
-                "\tlsls r0, r2, 16\n"
-                "\tasrs r0, 16\n"
-                "\tcmp r0, 0x50\n"
-                "\tbgt _08088316\n"
-                "\tmovs r2, 0x51\n"
-                "_08088316:\n"
-                "\tlsls r0, r4, 16\n"
-                "\tasrs r0, 16\n"
-                "\tlsls r1, r0, 8\n"
-                "\tlsls r2, 16\n"
-                "\tasrs r2, 16\n"
-                "\torrs r1, r2\n"
-                "\tstrh r1, [r3, 0xC]\n"
-                "\tcmp r0, 0x50\n"
-                "\tbne _08088332\n"
-                "\tcmp r2, 0x51\n"
-                "\tbne _08088332\n"
-                "\tldrh r0, [r3, 0x8]\n"
-                "\tadds r0, 0x1\n"
-                "\tstrh r0, [r3, 0x8]\n"
-                "_08088332:\n"
-                "\tpop {r4}\n"
-                "\tpop {r0}\n"
-                "\tbx r0");
-}
-#endif
 
 void sub_8088338(struct Task *task)
 {
-- 
cgit v1.2.3


From 433a33ad6516fe18ce378edbb1539e805708d06e Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Sun, 11 Jun 2017 14:58:09 -0400
Subject: Most of darkness field move streaks field effect

---
 asm/field_effect.s | 323 -----------------------------------------------------
 src/field_effect.c | 109 +++++++++++++++++-
 2 files changed, 108 insertions(+), 324 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index c513d479c..9b9d03b1a 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,329 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_808847C
-sub_808847C: @ 808847C
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _080884A4 @ =gUnknown_0839F3C8
-	ldr r2, _080884A8 @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080884A4: .4byte gUnknown_0839F3C8
-_080884A8: .4byte gTasks
-	thumb_func_end sub_808847C
-
-	thumb_func_start sub_80884AC
-sub_80884AC: @ 80884AC
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r1, _080884DC @ =REG_BG0HOFS
-	ldrh r0, [r4, 0xA]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrh r0, [r4, 0xC]
-	strh r0, [r1]
-	adds r0, r4, 0
-	adds r0, 0x22
-	ldr r1, _080884E0 @ =gMain
-	ldr r1, [r1, 0xC]
-	bl StoreWordInTwoHalfwords
-	ldr r0, _080884E4 @ =sub_80886B0
-	bl SetVBlankCallback
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080884DC: .4byte REG_BG0HOFS
-_080884E0: .4byte gMain
-_080884E4: .4byte sub_80886B0
-	thumb_func_end sub_80884AC
-
-	thumb_func_start sub_80884E8
-sub_80884E8: @ 80884E8
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	sub sp, 0x4
-	adds r6, r0, 0
-	ldr r0, _08088544 @ =REG_BG0CNT
-	ldrh r1, [r0]
-	lsrs r1, 2
-	lsls r1, 30
-	lsrs r1, 16
-	ldrh r4, [r0]
-	lsrs r4, 8
-	lsls r4, 27
-	lsrs r4, 16
-	movs r0, 0
-	mov r8, r0
-	strh r4, [r6, 0x20]
-	ldr r0, _08088548 @ =gDarknessFieldMoveStreaksTiles
-	movs r5, 0xC0
-	lsls r5, 19
-	adds r1, r5
-	movs r2, 0x40
-	bl CpuSet
-	mov r0, r8
-	str r0, [sp]
-	adds r4, r5
-	ldr r2, _0808854C @ =0x05000200
-	mov r0, sp
-	adds r1, r4, 0
-	bl CpuSet
-	ldr r0, _08088550 @ =gDarknessFieldMoveStreaksPalette
-	movs r1, 0xF0
-	movs r2, 0x20
-	bl LoadPalette
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-	add sp, 0x4
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088544: .4byte REG_BG0CNT
-_08088548: .4byte gDarknessFieldMoveStreaksTiles
-_0808854C: .4byte 0x05000200
-_08088550: .4byte gDarknessFieldMoveStreaksPalette
-	thumb_func_end sub_80884E8
-
-	thumb_func_start sub_8088554
-sub_8088554: @ 8088554
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_8088708
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808858A
-	ldr r1, _08088598 @ =REG_WIN1H
-	movs r0, 0xF0
-	strh r0, [r1]
-	adds r1, 0x4
-	ldr r2, _0808859C @ =0x00002878
-	adds r0, r2, 0
-	strh r0, [r1]
-	ldr r2, _080885A0 @ =gSprites
-	movs r0, 0x26
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r2, 0x1C
-	adds r0, r2
-	ldr r1, _080885A4 @ =sub_8088890
-	str r1, [r0]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_0808858A:
-	adds r0, r4, 0
-	bl sub_80886F8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088598: .4byte REG_WIN1H
-_0808859C: .4byte 0x00002878
-_080885A0: .4byte gSprites
-_080885A4: .4byte sub_8088890
-	thumb_func_end sub_8088554
-
-	thumb_func_start sub_80885A8
-sub_80885A8: @ 80885A8
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80886F8
-	ldr r2, _080885D4 @ =gSprites
-	movs r0, 0x26
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	movs r1, 0x3C
-	ldrsh r0, [r0, r1]
-	cmp r0, 0
-	beq _080885CC
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_080885CC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080885D4: .4byte gSprites
-	thumb_func_end sub_80885A8
-
-	thumb_func_start sub_80885D8
-sub_80885D8: @ 80885D8
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80886F8
-	ldrh r1, [r4, 0xA]
-	movs r0, 0x7
-	ands r0, r1
-	movs r1, 0
-	strh r0, [r4, 0xE]
-	strh r1, [r4, 0x10]
-	ldr r0, _08088604 @ =REG_WIN1H
-	ldr r2, _08088608 @ =0x0000ffff
-	adds r1, r2, 0
-	strh r1, [r0]
-	adds r0, 0x4
-	strh r1, [r0]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088604: .4byte REG_WIN1H
-_08088608: .4byte 0x0000ffff
-	thumb_func_end sub_80885D8
-
-	thumb_func_start sub_808860C
-sub_808860C: @ 808860C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl sub_80886F8
-	adds r0, r4, 0
-	bl sub_80887C0
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088626
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08088626:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808860C
-
-	thumb_func_start sub_808862C
-sub_808862C: @ 808862C
-	push {r4,r5,lr}
-	sub sp, 0x8
-	adds r5, r0, 0
-	ldr r0, _0808869C @ =REG_BG0CNT
-	ldrh r1, [r0]
-	lsrs r1, 8
-	lsls r1, 27
-	lsrs r1, 16
-	movs r0, 0
-	str r0, [sp]
-	movs r0, 0xC0
-	lsls r0, 19
-	adds r1, r0
-	ldr r2, _080886A0 @ =0x05000200
-	mov r0, sp
-	bl CpuSet
-	adds r0, r5, 0
-	adds r0, 0x22
-	add r1, sp, 0x4
-	bl LoadWordFromTwoHalfwords
-	ldr r0, [sp, 0x4]
-	bl SetVBlankCallback
-	ldr r4, _080886A4 @ =gWindowConfig_81E6CE4
-	adds r0, r4, 0
-	bl SetUpWindowConfig
-	adds r0, r4, 0
-	bl InitMenuWindow
-	movs r0, 0x26
-	ldrsh r1, [r5, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080886A8 @ =gSprites
-	adds r0, r1
-	bl FreeResourcesAndDestroySprite
-	movs r0, 0x6
-	bl FieldEffectActiveListRemove
-	ldr r0, _080886AC @ =sub_808847C
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	add sp, 0x8
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808869C: .4byte REG_BG0CNT
-_080886A0: .4byte 0x05000200
-_080886A4: .4byte gWindowConfig_81E6CE4
-_080886A8: .4byte gSprites
-_080886AC: .4byte sub_808847C
-	thumb_func_end sub_808862C
-
-	thumb_func_start sub_80886B0
-sub_80886B0: @ 80886B0
-	push {r4,lr}
-	sub sp, 0x4
-	ldr r0, _080886EC @ =sub_808847C
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 2
-	adds r4, r0
-	lsls r4, 3
-	ldr r0, _080886F0 @ =gTasks
-	adds r4, r0
-	adds r0, r4, 0
-	adds r0, 0x22
-	mov r1, sp
-	bl LoadWordFromTwoHalfwords
-	ldr r0, [sp]
-	bl _call_via_r0
-	ldr r1, _080886F4 @ =REG_BG0HOFS
-	ldrh r0, [r4, 0xA]
-	strh r0, [r1]
-	adds r1, 0x2
-	ldrh r0, [r4, 0xC]
-	strh r0, [r1]
-	add sp, 0x4
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080886EC: .4byte sub_808847C
-_080886F0: .4byte gTasks
-_080886F4: .4byte REG_BG0HOFS
-	thumb_func_end sub_80886B0
-
-	thumb_func_start sub_80886F8
-sub_80886F8: @ 80886F8
-	ldrh r1, [r0, 0xA]
-	subs r1, 0x10
-	strh r1, [r0, 0xA]
-	ldrh r1, [r0, 0xE]
-	adds r1, 0x10
-	strh r1, [r0, 0xE]
-	bx lr
-	thumb_func_end sub_80886F8
-
 	thumb_func_start sub_8088708
 sub_8088708: @ 8088708
 	push {r4-r7,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index cd58e84ba..53f8aaed4 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2015,9 +2015,12 @@ void sub_808847C(u8);
 u8 sub_8088830(u32, u32, u32);
 extern const void (*gUnknown_0839F3AC[7])(struct Task *);
 extern const void (*gUnknown_0839F3C8[7])(struct Task *);
-extern const u32 gFieldMoveStreaksTiles[];
+extern const u32 gFieldMoveStreaksTiles[0x200];
 extern const u16 gFieldMoveStreaksPalette[16];
 extern const u16 gFieldMoveStreaksTilemap[0x140];
+extern const u32 gDarknessFieldMoveStreaksTiles[0x80];
+extern const u16 gDarknessFieldMoveStreaksPalette[16];
+extern const u16 gDarknessFieldMoveStreaksTilemap[0x140];
 void sub_80883DC(void);
 void sub_808843C(u16);
 void sub_8088890(struct Sprite *);
@@ -2200,3 +2203,107 @@ void sub_808843C(u16 offs)
         *dest = gFieldMoveStreaksTilemap[i] | 0xf000;
     }
 }
+
+void sub_80886B0(void);
+bool8 sub_8088708(struct Task *);
+void sub_80886F8(struct Task *);
+bool8 sub_80887C0(struct Task *);
+
+void sub_808847C(u8 taskId)
+{
+    gUnknown_0839F3C8[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_80884AC(struct Task *task)
+{
+    REG_BG0HOFS = task->data[1];
+    REG_BG0VOFS = task->data[2];
+    StoreWordInTwoHalfwords((u16 *)&task->data[13], (u32)gMain.vblankCallback);
+    SetVBlankCallback(sub_80886B0);
+    task->data[0]++;
+}
+
+void sub_80884E8(struct Task *task)
+{
+    u16 offset;
+    u16 delta;
+    offset = ((REG_BG0CNT >> 2) << 14);
+    delta = ((REG_BG0CNT >> 8) << 11);
+    task->data[12] = delta;
+    CpuCopy16(gDarknessFieldMoveStreaksTiles, (void *)(VRAM + offset), 0x80);
+    CpuFill32(0, (void *)(VRAM + delta), 0x800);
+    LoadPalette(gDarknessFieldMoveStreaksPalette, 0xf0, 0x20);
+    task->data[0]++;
+}
+
+void sub_8088554(struct Task *task)
+{
+    if (sub_8088708(task))
+    {
+        REG_WIN1H = 0x00f0;
+        REG_WIN1V = 0x2878;
+        gSprites[task->data[15]].callback = sub_8088890;
+        task->data[0]++;
+    }
+    sub_80886F8(task);
+}
+
+void sub_80885A8(struct Task *task)
+{
+    sub_80886F8(task);
+    if (gSprites[task->data[15]].data7)
+    {
+        task->data[0]++;
+    }
+}
+
+void sub_80885D8(struct Task *task)
+{
+    sub_80886F8(task);
+    task->data[3] = task->data[1] & 7;
+    task->data[4] = 0;
+    REG_WIN1H = 0xffff;
+    REG_WIN1V = 0xffff;
+    task->data[0]++;
+}
+
+void sub_808860C(struct Task *task)
+{
+    sub_80886F8(task);
+    if (sub_80887C0(task))
+    {
+        task->data[0]++;
+    }
+}
+
+void sub_808862C(struct Task *task)
+{
+    IntrCallback intrCallback;
+    u16 bg0cnt;
+    bg0cnt = (REG_BG0CNT >> 8) << 11;
+    CpuFill32(0, (void *)VRAM + bg0cnt, 0x800);
+    LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&intrCallback);
+    SetVBlankCallback(intrCallback);
+    SetUpWindowConfig(&gWindowConfig_81E6CE4);
+    InitMenuWindow(&gWindowConfig_81E6CE4);
+    FreeResourcesAndDestroySprite(&gSprites[task->data[15]]);
+    FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
+    DestroyTask(FindTaskIdByFunc(sub_808847C));
+}
+
+void sub_80886B0(void)
+{
+    IntrCallback intrCallback;
+    struct Task *task;
+    task = &gTasks[FindTaskIdByFunc(sub_808847C)];
+    LoadWordFromTwoHalfwords((u16 *)&task->data[13], (u32 *)&intrCallback);
+    intrCallback();
+    REG_BG0HOFS = task->data[1];
+    REG_BG0VOFS = task->data[2];
+}
+
+void sub_80886F8(struct Task *task)
+{
+    task->data[1] -= 16;
+    task->data[3] += 16;
+}
-- 
cgit v1.2.3


From a3162cb844dbbc6bbfd850163526c42cc0191d1c Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 11 Jun 2017 21:04:00 -0400
Subject: Finish FldEff_FieldMoveShowMon except solitary nonmatching function

---
 asm/field_effect.s | 290 -----------------------------------------------------
 include/global.h   |   8 ++
 src/field_effect.c | 212 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 218 insertions(+), 292 deletions(-)
 mode change 100644 => 100755 include/global.h

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 9b9d03b1a..d84fd7218 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,296 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_8088708
-sub_8088708: @ 8088708
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	adds r5, r0, 0
-	ldrh r2, [r5, 0x10]
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1F
-	ble _08088724
-	movs r0, 0x1
-	b _080887A8
-_08088724:
-	ldrh r0, [r5, 0xE]
-	lsls r0, 16
-	asrs r3, r0, 19
-	movs r1, 0x1F
-	ands r3, r1
-	movs r4, 0x10
-	ldrsh r0, [r5, r4]
-	cmp r3, r0
-	blt _080887A6
-	movs r0, 0x20
-	subs r3, r0, r3
-	ands r3, r1
-	subs r0, r2
-	mov r12, r0
-	mov r7, r12
-	ands r7, r1
-	mov r12, r7
-	ldrh r0, [r5, 0x20]
-	ldr r1, _080887B8 @ =0x06000140
-	adds r1, r0
-	mov r8, r1
-	movs r4, 0
-	ldr r7, _080887BC @ =gDarknessFieldMoveStreaksTilemap
-	mov r10, r7
-	movs r0, 0xF0
-	lsls r0, 8
-	mov r9, r0
-	adds r1, r3, 0x1
-	movs r0, 0x1F
-	ands r1, r0
-	str r1, [sp]
-	mov r6, r12
-	adds r6, 0x1
-	ands r6, r0
-_08088768:
-	lsls r1, r4, 5
-	adds r2, r1, r3
-	lsls r2, 1
-	add r2, r8
-	mov r7, r12
-	adds r0, r7, r1
-	lsls r0, 1
-	add r0, r10
-	ldrh r0, [r0]
-	mov r7, r9
-	orrs r0, r7
-	strh r0, [r2]
-	ldr r0, [sp]
-	adds r2, r1, r0
-	lsls r2, 1
-	add r2, r8
-	adds r1, r6, r1
-	lsls r1, 1
-	add r1, r10
-	ldrh r0, [r1]
-	mov r1, r9
-	orrs r0, r1
-	strh r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x9
-	bls _08088768
-	ldrh r0, [r5, 0x10]
-	adds r0, 0x2
-	strh r0, [r5, 0x10]
-_080887A6:
-	movs r0, 0
-_080887A8:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080887B8: .4byte 0x06000140
-_080887BC: .4byte gDarknessFieldMoveStreaksTilemap
-	thumb_func_end sub_8088708
-
-	thumb_func_start sub_80887C0
-sub_80887C0: @ 80887C0
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	cmp r0, 0x1F
-	ble _080887D0
-	movs r0, 0x1
-	b _08088824
-_080887D0:
-	ldrh r0, [r5, 0xE]
-	lsls r0, 16
-	asrs r0, 19
-	lsls r0, 16
-	lsrs r2, r0, 16
-	movs r1, 0x10
-	ldrsh r0, [r5, r1]
-	cmp r2, r0
-	blt _08088822
-	ldrh r0, [r5, 0xA]
-	lsls r0, 16
-	asrs r2, r0, 19
-	movs r0, 0x1F
-	ands r2, r0
-	ldrh r0, [r5, 0x20]
-	ldr r1, _0808882C @ =0x06000140
-	adds r6, r0, r1
-	movs r3, 0
-	movs r0, 0xF0
-	lsls r0, 8
-	adds r7, r0, 0
-	adds r4, r2, 0x1
-	movs r0, 0x1F
-	ands r4, r0
-_08088800:
-	lsls r0, r3, 5
-	adds r1, r0, r2
-	lsls r1, 1
-	adds r1, r6
-	strh r7, [r1]
-	adds r0, r4
-	lsls r0, 1
-	adds r0, r6
-	strh r7, [r0]
-	adds r0, r3, 0x1
-	lsls r0, 16
-	lsrs r3, r0, 16
-	cmp r3, 0x9
-	bls _08088800
-	ldrh r0, [r5, 0x10]
-	adds r0, 0x2
-	strh r0, [r5, 0x10]
-_08088822:
-	movs r0, 0
-_08088824:
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808882C: .4byte 0x06000140
-	thumb_func_end sub_80887C0
-
-	thumb_func_start sub_8088830
-sub_8088830: @ 8088830
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r6, r0, 0
-	movs r5, 0x80
-	lsls r5, 24
-	ands r5, r6
-	lsrs r5, 16
-	lsls r5, 16
-	lsrs r5, 16
-	ldr r0, _08088884 @ =0x7fffffff
-	ands r6, r0
-	lsls r0, r6, 16
-	lsrs r0, 16
-	movs r3, 0xA0
-	lsls r3, 1
-	movs r4, 0x50
-	str r4, [sp]
-	movs r4, 0
-	str r4, [sp, 0x4]
-	bl CreateMonSprite_FieldMove
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r1, _08088888 @ =gSprites
-	adds r2, r1
-	ldr r1, _0808888C @ =SpriteCallbackDummy
-	str r1, [r2, 0x1C]
-	ldrb r3, [r2, 0x5]
-	movs r1, 0xD
-	negs r1, r1
-	ands r1, r3
-	strb r1, [r2, 0x5]
-	strh r6, [r2, 0x2E]
-	strh r5, [r2, 0x3A]
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08088884: .4byte 0x7fffffff
-_08088888: .4byte gSprites
-_0808888C: .4byte SpriteCallbackDummy
-	thumb_func_end sub_8088830
-
-	thumb_func_start sub_8088890
-sub_8088890: @ 8088890
-	push {lr}
-	adds r1, r0, 0
-	ldrh r0, [r1, 0x20]
-	subs r0, 0x14
-	strh r0, [r1, 0x20]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x78
-	bgt _080888D0
-	movs r0, 0x78
-	strh r0, [r1, 0x20]
-	movs r0, 0x1E
-	strh r0, [r1, 0x30]
-	ldr r0, _080888C4 @ =sub_80888D4
-	str r0, [r1, 0x1C]
-	movs r2, 0x3A
-	ldrsh r0, [r1, r2]
-	cmp r0, 0
-	beq _080888C8
-	ldrh r0, [r1, 0x2E]
-	movs r1, 0
-	movs r2, 0x7D
-	movs r3, 0xA
-	bl PlayCry2
-	b _080888D0
-	.align 2, 0
-_080888C4: .4byte sub_80888D4
-_080888C8:
-	ldrh r0, [r1, 0x2E]
-	movs r1, 0
-	bl PlayCry1
-_080888D0:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8088890
-
-	thumb_func_start sub_80888D4
-sub_80888D4: @ 80888D4
-	push {lr}
-	adds r1, r0, 0
-	ldrh r0, [r1, 0x30]
-	subs r0, 0x1
-	strh r0, [r1, 0x30]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080888E8
-	ldr r0, _080888EC @ =sub_80888F0
-	str r0, [r1, 0x1C]
-_080888E8:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080888EC: .4byte sub_80888F0
-	thumb_func_end sub_80888D4
-
-	thumb_func_start sub_80888F0
-sub_80888F0: @ 80888F0
-	push {lr}
-	adds r2, r0, 0
-	ldrh r3, [r2, 0x20]
-	movs r0, 0x20
-	ldrsh r1, [r2, r0]
-	movs r0, 0x40
-	negs r0, r0
-	cmp r1, r0
-	bge _08088908
-	movs r0, 0x1
-	strh r0, [r2, 0x3C]
-	b _0808890E
-_08088908:
-	adds r0, r3, 0
-	subs r0, 0x14
-	strh r0, [r2, 0x20]
-_0808890E:
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80888F0
-
 	thumb_func_start FldEff_UseSurf
 FldEff_UseSurf: @ 8088914
 	push {lr}
diff --git a/include/global.h b/include/global.h
old mode 100644
new mode 100755
index 67a9548b6..13db2620f
--- a/include/global.h
+++ b/include/global.h
@@ -12,6 +12,14 @@
 
 #define asm_unified(x) asm(".syntax unified\n" x "\n.syntax divided\n")
 
+#define nonmatching(fndec, x) {\
+__attribute__((naked))\
+fndec\
+{\
+	asm_unified(x);\
+}\
+}
+
 #define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
 
 #define POKEMON_NAME_LENGTH 10
diff --git a/src/field_effect.c b/src/field_effect.c
index 53f8aaed4..12a5e1092 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2017,10 +2017,10 @@ extern const void (*gUnknown_0839F3AC[7])(struct Task *);
 extern const void (*gUnknown_0839F3C8[7])(struct Task *);
 extern const u32 gFieldMoveStreaksTiles[0x200];
 extern const u16 gFieldMoveStreaksPalette[16];
-extern const u16 gFieldMoveStreaksTilemap[0x140];
+extern const u16 gFieldMoveStreaksTilemap[10 * 32];
 extern const u32 gDarknessFieldMoveStreaksTiles[0x80];
 extern const u16 gDarknessFieldMoveStreaksPalette[16];
-extern const u16 gDarknessFieldMoveStreaksTilemap[0x140];
+extern const u16 gDarknessFieldMoveStreaksTilemap[10 * 32];
 void sub_80883DC(void);
 void sub_808843C(u16);
 void sub_8088890(struct Sprite *);
@@ -2307,3 +2307,211 @@ void sub_80886F8(struct Task *task)
     task->data[1] -= 16;
     task->data[3] += 16;
 }
+
+#ifdef NONMATCHING
+bool8 sub_8088708(struct Task *task)
+{
+    u16 i;
+    u16 srcOffs;
+    u16 dstOffs;
+    u16 *dest;
+    if (task->data[4] >= 32)
+    {
+        return TRUE;
+    }
+    dstOffs = (task->data[3] >> 3) & 0x1f;
+    if (dstOffs >= task->data[4])
+    {
+        dstOffs = (32 - dstOffs) & 0x1f;
+        srcOffs = (32 - task->data[4]) & 0x1f;
+        dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]);
+        for (i=0; i<10; i++)
+        {
+            dest[dstOffs + i * 32] = gDarknessFieldMoveStreaksTilemap[srcOffs + i * 32] | 0xf000;
+            dest[((dstOffs + 1) & 0x1f) + i * 32] = gDarknessFieldMoveStreaksTilemap[((srcOffs + 1) & 0x1f) + i * 32] | 0xf000;
+        }
+        task->data[4] += 2;
+    }
+    return FALSE;
+}
+#else
+__attribute__((naked))
+bool8 sub_8088708(struct Task *task)
+{
+    asm_unified("\tpush {r4-r7,lr}\n"
+                    "\tmov r7, r10\n"
+                    "\tmov r6, r9\n"
+                    "\tmov r5, r8\n"
+                    "\tpush {r5-r7}\n"
+                    "\tsub sp, 0x4\n"
+                    "\tadds r5, r0, 0\n"
+                    "\tldrh r2, [r5, 0x10]\n"
+                    "\tmovs r1, 0x10\n"
+                    "\tldrsh r0, [r5, r1]\n"
+                    "\tcmp r0, 0x1F\n"
+                    "\tble _08088724\n"
+                    "\tmovs r0, 0x1\n"
+                    "\tb _080887A8\n"
+                    "_08088724:\n"
+                    "\tldrh r0, [r5, 0xE]\n"
+                    "\tlsls r0, 16\n"
+                    "\tasrs r3, r0, 19\n"
+                    "\tmovs r1, 0x1F\n"
+                    "\tands r3, r1\n"
+                    "\tmovs r4, 0x10\n"
+                    "\tldrsh r0, [r5, r4]\n"
+                    "\tcmp r3, r0\n"
+                    "\tblt _080887A6\n"
+                    "\tmovs r0, 0x20\n"
+                    "\tsubs r3, r0, r3\n"
+                    "\tands r3, r1\n"
+                    "\tsubs r0, r2\n"
+                    "\tmov r12, r0\n"
+                    "\tmov r7, r12\n"
+                    "\tands r7, r1\n"
+                    "\tmov r12, r7\n"
+                    "\tldrh r0, [r5, 0x20]\n"
+                    "\tldr r1, _080887B8 @ =0x06000140\n"
+                    "\tadds r1, r0\n"
+                    "\tmov r8, r1\n"
+                    "\tmovs r4, 0\n"
+                    "\tldr r7, _080887BC @ =gDarknessFieldMoveStreaksTilemap\n"
+                    "\tmov r10, r7\n"
+                    "\tmovs r0, 0xF0\n"
+                    "\tlsls r0, 8\n"
+                    "\tmov r9, r0\n"
+                    "\tadds r1, r3, 0x1\n"
+                    "\tmovs r0, 0x1F\n"
+                    "\tands r1, r0\n"
+                    "\tstr r1, [sp]\n"
+                    "\tmov r6, r12\n"
+                    "\tadds r6, 0x1\n"
+                    "\tands r6, r0\n"
+                    "_08088768:\n"
+                    "\tlsls r1, r4, 5\n"
+                    "\tadds r2, r1, r3\n"
+                    "\tlsls r2, 1\n"
+                    "\tadd r2, r8\n"
+                    "\tmov r7, r12\n"
+                    "\tadds r0, r7, r1\n"
+                    "\tlsls r0, 1\n"
+                    "\tadd r0, r10\n"
+                    "\tldrh r0, [r0]\n"
+                    "\tmov r7, r9\n"
+                    "\torrs r0, r7\n"
+                    "\tstrh r0, [r2]\n"
+                    "\tldr r0, [sp]\n"
+                    "\tadds r2, r1, r0\n"
+                    "\tlsls r2, 1\n"
+                    "\tadd r2, r8\n"
+                    "\tadds r1, r6, r1\n"
+                    "\tlsls r1, 1\n"
+                    "\tadd r1, r10\n"
+                    "\tldrh r0, [r1]\n"
+                    "\tmov r1, r9\n"
+                    "\torrs r0, r1\n"
+                    "\tstrh r0, [r2]\n"
+                    "\tadds r0, r4, 0x1\n"
+                    "\tlsls r0, 16\n"
+                    "\tlsrs r4, r0, 16\n"
+                    "\tcmp r4, 0x9\n"
+                    "\tbls _08088768\n"
+                    "\tldrh r0, [r5, 0x10]\n"
+                    "\tadds r0, 0x2\n"
+                    "\tstrh r0, [r5, 0x10]\n"
+                    "_080887A6:\n"
+                    "\tmovs r0, 0\n"
+                    "_080887A8:\n"
+                    "\tadd sp, 0x4\n"
+                    "\tpop {r3-r5}\n"
+                    "\tmov r8, r3\n"
+                    "\tmov r9, r4\n"
+                    "\tmov r10, r5\n"
+                    "\tpop {r4-r7}\n"
+                    "\tpop {r1}\n"
+                    "\tbx r1\n"
+                    "\t.align 2, 0\n"
+                    "_080887B8: .4byte 0x06000140\n"
+                    "_080887BC: .4byte gDarknessFieldMoveStreaksTilemap");
+}
+#endif
+
+bool8 sub_80887C0(struct Task *task)
+{
+    u16 i;
+    u16 dstOffs;
+    u16 *dest;
+    if (task->data[4] >= 32)
+    {
+        return TRUE;
+    }
+    dstOffs = task->data[3] >> 3;
+    if (dstOffs >= task->data[4])
+    {
+        dstOffs = (task->data[1] >> 3) & 0x1f;
+        dest = (u16 *)(VRAM + 0x140 + (u16)task->data[12]);
+        for (i=0; i<10; i++)
+        {
+            dest[dstOffs + i * 32] = 0xf000;
+            dest[((dstOffs + 1) & 0x1f) + i * 32] = 0xf000;
+        }
+        task->data[4] += 2;
+    }
+    return FALSE;
+}
+
+u8 sub_8088830(u32 a0, u32 a1, u32 a2)
+{
+    u16 v0;
+    u8 monSprite;
+    struct Sprite *sprite;
+    v0 = (a0 & 0x80000000) >> 16;
+    a0 &= 0x7fffffff;
+    monSprite = CreateMonSprite_FieldMove(a0, a1, a2, 0x140, 0x50, 0);
+    sprite = &gSprites[monSprite];
+    sprite->callback = SpriteCallbackDummy;
+    sprite->oam.priority = 0;
+    sprite->data0 = a0;
+    sprite->data6 = v0;
+    return monSprite;
+}
+
+void sub_80888D4(struct Sprite *);
+
+void sub_8088890(struct Sprite *sprite)
+{
+    if ((sprite->pos1.x -= 20) <= 0x78)
+    {
+        sprite->pos1.x = 0x78;
+        sprite->data1 = 30;
+        sprite->callback = sub_80888D4;
+        if (sprite->data6)
+        {
+            PlayCry2(sprite->data0, 0, 0x7d, 0xa);
+        } else
+        {
+            PlayCry1(sprite->data0, 0);
+        }
+    }
+}
+
+void sub_80888F0(struct Sprite *);
+
+void sub_80888D4(struct Sprite *sprite)
+{
+    if ((--sprite->data1) == 0)
+    {
+        sprite->callback = sub_80888F0;
+    }
+}
+
+void sub_80888F0(struct Sprite *sprite)
+{
+    if (sprite->pos1.x < -0x40)
+    {
+        sprite->data7 = 1;
+    } else
+    {
+        sprite->pos1.x -= 20;
+    }
+}
-- 
cgit v1.2.3


From 0ed7376e9ab879ce9a4628442540185d28dea537 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Sun, 11 Jun 2017 21:36:39 -0400
Subject: FldEff_UseSurf

---
 asm/field_effect.s | 283 -----------------------------------------------------
 src/field_effect.c |  87 ++++++++++++++++
 2 files changed, 87 insertions(+), 283 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index d84fd7218..cc01bbf60 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,289 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_UseSurf
-FldEff_UseSurf: @ 8088914
-	push {lr}
-	ldr r0, _08088944 @ =sub_8088954
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08088948 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r0, _0808894C @ =gUnknown_0202FF84
-	ldr r0, [r0]
-	strh r0, [r1, 0x26]
-	bl sav1_reset_battle_music_maybe
-	ldr r0, _08088950 @ =0x0000016d
-	bl sub_8053FB0
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08088944: .4byte sub_8088954
-_08088948: .4byte gTasks
-_0808894C: .4byte gUnknown_0202FF84
-_08088950: .4byte 0x0000016d
-	thumb_func_end FldEff_UseSurf
-
-	thumb_func_start sub_8088954
-sub_8088954: @ 8088954
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _0808897C @ =gUnknown_0839F3E4
-	ldr r2, _08088980 @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808897C: .4byte gUnknown_0839F3E4
-_08088980: .4byte gTasks
-	thumb_func_end sub_8088954
-
-	thumb_func_start sub_8088984
-sub_8088984: @ 8088984
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r4, r0, 0
-	bl ScriptContext2_Enable
-	bl FreezeMapObjects
-	ldr r5, _080889DC @ =gPlayerAvatar
-	movs r0, 0x1
-	strb r0, [r5, 0x6]
-	movs r0, 0x8
-	bl SetPlayerAvatarStateMask
-	adds r6, r4, 0
-	adds r6, 0xA
-	movs r0, 0xC
-	adds r0, r4
-	mov r8, r0
-	adds r0, r6, 0
-	mov r1, r8
-	bl PlayerGetDestCoords
-	ldr r2, _080889E0 @ =gMapObjects
-	ldrb r1, [r5, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r2
-	ldrb r0, [r0, 0x18]
-	lsrs r0, 4
-	adds r1, r6, 0
-	mov r2, r8
-	bl MoveCoords
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	pop {r3}
-	mov r8, r3
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080889DC: .4byte gPlayerAvatar
-_080889E0: .4byte gMapObjects
-	thumb_func_end sub_8088984
-
-	thumb_func_start sub_80889E4
-sub_80889E4: @ 80889E4
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _08088A28 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088A2C @ =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088A0E
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088A20
-_08088A0E:
-	bl sub_8059BF4
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_08088A20:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088A28: .4byte gPlayerAvatar
-_08088A2C: .4byte gMapObjects
-	thumb_func_end sub_80889E4
-
-	thumb_func_start sub_8088A30
-sub_8088A30: @ 8088A30
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _08088A6C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088A70 @ =gMapObjects
-	adds r0, r1
-	bl FieldObjectCheckIfSpecialAnimFinishedOrInactive
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088A66
-	ldr r2, _08088A74 @ =gUnknown_0202FF84
-	movs r1, 0x26
-	ldrsh r0, [r4, r1]
-	movs r1, 0x80
-	lsls r1, 24
-	orrs r0, r1
-	str r0, [r2]
-	movs r0, 0x3B
-	bl FieldEffectStart
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08088A66:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088A6C: .4byte gPlayerAvatar
-_08088A70: .4byte gMapObjects
-_08088A74: .4byte gUnknown_0202FF84
-	thumb_func_end sub_8088A30
-
-	thumb_func_start sub_8088A78
-sub_8088A78: @ 8088A78
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r0, 0x6
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _08088AE2
-	ldr r5, _08088AE8 @ =gPlayerAvatar
-	ldrb r0, [r5, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08088AEC @ =gMapObjects
-	adds r4, r0
-	movs r0, 0x3
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_805B980
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	ldrb r0, [r4, 0x18]
-	lsrs r0, 4
-	bl sub_80608D0
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldr r1, _08088AF0 @ =gUnknown_0202FF84
-	movs r2, 0xA
-	ldrsh r0, [r6, r2]
-	str r0, [r1]
-	movs r2, 0xC
-	ldrsh r0, [r6, r2]
-	str r0, [r1, 0x4]
-	ldrb r0, [r5, 0x5]
-	str r0, [r1, 0x8]
-	movs r0, 0x8
-	bl FieldEffectStart
-	strb r0, [r4, 0x1A]
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-_08088AE2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088AE8: .4byte gPlayerAvatar
-_08088AEC: .4byte gMapObjects
-_08088AF0: .4byte gUnknown_0202FF84
-	thumb_func_end sub_8088A78
-
-	thumb_func_start sub_8088AF4
-sub_8088AF4: @ 8088AF4
-	push {r4,r5,lr}
-	ldr r5, _08088B5C @ =gPlayerAvatar
-	ldrb r1, [r5, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088B60 @ =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088B54
-	movs r0, 0
-	strb r0, [r5, 0x6]
-	ldrb r1, [r5]
-	movs r0, 0xDF
-	ands r0, r1
-	strb r0, [r5]
-	ldrb r0, [r4, 0x18]
-	lsrs r0, 4
-	bl GetFaceDirectionAnimId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl FieldObjectSetSpecialAnim
-	ldrb r0, [r4, 0x1A]
-	movs r1, 0x1
-	bl sub_8127ED0
-	bl UnfreezeMapObjects
-	bl ScriptContext2_Disable
-	movs r0, 0x9
-	bl FieldEffectActiveListRemove
-	ldr r0, _08088B64 @ =sub_8088954
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08088B54:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088B5C: .4byte gPlayerAvatar
-_08088B60: .4byte gMapObjects
-_08088B64: .4byte sub_8088954
-	thumb_func_end sub_8088AF4
-
 	thumb_func_start FldEff_NPCFlyOut
 FldEff_NPCFlyOut: @ 8088B68
 	push {r4,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 12a5e1092..c7a7d8d5b 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2515,3 +2515,90 @@ void sub_80888F0(struct Sprite *sprite)
         sprite->pos1.x -= 20;
     }
 }
+
+void sub_8088954(u8);
+extern const void (*gUnknown_0839F3E4[5])(struct Task *);
+
+u8 FldEff_UseSurf(void)
+{
+    u8 taskId;
+    taskId = CreateTask(sub_8088954, 0xff);
+    gTasks[taskId].data[15] = gUnknown_0202FF84[0];
+    sav1_reset_battle_music_maybe();
+    sub_8053FB0(0x016d);
+    return FALSE;
+}
+
+void sub_8088954(u8 taskId)
+{
+    gUnknown_0839F3E4[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_8088984(struct Task *task)
+{
+    ScriptContext2_Enable();
+    FreezeMapObjects();
+    gPlayerAvatar.unk6 = 1;
+    SetPlayerAvatarStateMask(8);
+    PlayerGetDestCoords(&task->data[1], &task->data[2]);
+    MoveCoords(gMapObjects[gPlayerAvatar.mapObjectId].placeholder18, &task->data[1], &task->data[2]);
+    task->data[0]++;
+}
+
+void sub_80889E4(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        sub_8059BF4();
+        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        task->data[0]++;
+    }
+}
+
+void sub_8088A30(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject))
+    {
+        gUnknown_0202FF84[0] = task->data[15] | 0x80000000;
+        FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
+        task->data[0]++;
+    }
+}
+
+void sub_8088A78(struct Task *task)
+{
+    struct MapObject *mapObject;
+    if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
+    {
+        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(3));
+        FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
+        FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->placeholder18));
+        gUnknown_0202FF84[0] = task->data[1];
+        gUnknown_0202FF84[1] = task->data[2];
+        gUnknown_0202FF84[2] = gPlayerAvatar.mapObjectId;
+        mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB);
+        task->data[0]++;
+    }
+}
+
+void sub_8088AF4(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        gPlayerAvatar.unk6 = 0;
+        gPlayerAvatar.flags &= 0xdf;
+        FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(mapObject->placeholder18));
+        sub_8127ED0(mapObject->mapobj_unk_1A, 1);
+        UnfreezeMapObjects();
+        ScriptContext2_Disable();
+        FieldEffectActiveListRemove(FLDEFF_USE_SURF);
+        DestroyTask(FindTaskIdByFunc(sub_8088954));
+    }
+}
-- 
cgit v1.2.3


From e74f4cc8c7aa66618212c6e5b74f21f4bbe29b6e Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 12 Jun 2017 08:28:29 -0400
Subject: FldEff_NPCFlyOut

---
 asm/field_effect.s | 109 -----------------------------------------------------
 src/field_effect.c |  37 ++++++++++++++++++
 2 files changed, 37 insertions(+), 109 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index cc01bbf60..0bc37eb93 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,115 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_NPCFlyOut
-FldEff_NPCFlyOut: @ 8088B68
-	push {r4,lr}
-	ldr r0, _08088BB4 @ =gFieldEffectObjectTemplatePointers
-	ldr r0, [r0, 0x68]
-	movs r1, 0x78
-	movs r2, 0
-	movs r3, 0x1
-	bl CreateSprite
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	lsls r2, r4, 4
-	adds r2, r4
-	lsls r2, 2
-	ldr r0, _08088BB8 @ =gSprites
-	adds r2, r0
-	ldrb r1, [r2, 0x5]
-	movs r0, 0xF
-	ands r0, r1
-	movs r1, 0xD
-	negs r1, r1
-	ands r0, r1
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2, 0x5]
-	ldr r0, _08088BBC @ =sub_8088BC4
-	str r0, [r2, 0x1C]
-	ldr r0, _08088BC0 @ =gUnknown_0202FF84
-	ldr r0, [r0]
-	strh r0, [r2, 0x30]
-	movs r0, 0x9E
-	bl PlaySE
-	adds r0, r4, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08088BB4: .4byte gFieldEffectObjectTemplatePointers
-_08088BB8: .4byte gSprites
-_08088BBC: .4byte sub_8088BC4
-_08088BC0: .4byte gUnknown_0202FF84
-	thumb_func_end FldEff_NPCFlyOut
-
-	thumb_func_start sub_8088BC4
-sub_8088BC4: @ 8088BC4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r1, 0x32
-	ldrsh r0, [r4, r1]
-	movs r1, 0x8C
-	bl Cos
-	movs r5, 0
-	strh r0, [r4, 0x24]
-	movs r2, 0x32
-	ldrsh r0, [r4, r2]
-	movs r1, 0x48
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x32]
-	adds r0, 0x4
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x32]
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	beq _08088C26
-	movs r2, 0x30
-	ldrsh r0, [r4, r2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _08088C3C @ =gSprites
-	adds r1, r0
-	adds r3, r1, 0
-	adds r3, 0x3E
-	ldrb r2, [r3]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r3]
-	ldrh r0, [r4, 0x24]
-	ldrh r2, [r4, 0x20]
-	adds r0, r2
-	strh r0, [r1, 0x20]
-	ldrh r0, [r4, 0x26]
-	ldrh r2, [r4, 0x22]
-	adds r0, r2
-	subs r0, 0x8
-	strh r0, [r1, 0x22]
-	strh r5, [r1, 0x24]
-	strh r5, [r1, 0x26]
-_08088C26:
-	movs r1, 0x32
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x7F
-	ble _08088C36
-	adds r0, r4, 0
-	movs r1, 0x1E
-	bl FieldEffectStop
-_08088C36:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088C3C: .4byte gSprites
-	thumb_func_end sub_8088BC4
-
 	thumb_func_start FldEff_UseFly
 FldEff_UseFly: @ 8088C40
 	push {lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index c7a7d8d5b..eeb12300b 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2602,3 +2602,40 @@ void sub_8088AF4(struct Task *task)
         DestroyTask(FindTaskIdByFunc(sub_8088954));
     }
 }
+
+void sub_8088BC4(struct Sprite *);
+
+u8 FldEff_NPCFlyOut(void)
+{
+    u8 spriteId;
+    struct Sprite *sprite;
+    spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0x78, 0, 1);
+    sprite = &gSprites[spriteId];
+    sprite->oam.paletteNum = 0;
+    sprite->oam.priority = 1;
+    sprite->callback = sub_8088BC4;
+    sprite->data1 = gUnknown_0202FF84[0];
+    PlaySE(SE_W019);
+    return spriteId;
+}
+
+void sub_8088BC4(struct Sprite *sprite)
+{
+    struct Sprite *npcSprite;
+    sprite->pos2.x = Cos(sprite->data2, 0x8c);
+    sprite->pos2.y = Sin(sprite->data2, 0x48);
+    sprite->data2 = (sprite->data2 + 4) & 0xff;
+    if (sprite->data0)
+    {
+        npcSprite = &gSprites[sprite->data1];
+        npcSprite->coordOffsetEnabled = 0;
+        npcSprite->pos1.x = sprite->pos1.x + sprite->pos2.x;
+        npcSprite->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
+        npcSprite->pos2.x = 0;
+        npcSprite->pos2.y = 0;
+    }
+    if (sprite->data2 >= 0x80)
+    {
+        FieldEffectStop(sprite, FLDEFF_NPCFLY_OUT);
+    }
+}
-- 
cgit v1.2.3


From b3df9aad1ddbee7e467bf1799030a5f7987b5f32 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 12 Jun 2017 09:26:59 -0400
Subject: FldEff_UseFly

---
 asm/field_effect.s | 661 -----------------------------------------------------
 src/field_effect.c | 231 +++++++++++++++++++
 2 files changed, 231 insertions(+), 661 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 0bc37eb93..61adcee87 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,667 +6,6 @@
 
 	.text
 
-	thumb_func_start FldEff_UseFly
-FldEff_UseFly: @ 8088C40
-	push {lr}
-	ldr r0, _08088C64 @ =sub_8088C70
-	movs r1, 0xFE
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08088C68 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r0, _08088C6C @ =gUnknown_0202FF84
-	ldr r0, [r0]
-	strh r0, [r1, 0xA]
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08088C64: .4byte sub_8088C70
-_08088C68: .4byte gTasks
-_08088C6C: .4byte gUnknown_0202FF84
-	thumb_func_end FldEff_UseFly
-
-	thumb_func_start sub_8088C70
-sub_8088C70: @ 8088C70
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08088C98 @ =gUnknown_0839F3F8
-	ldr r2, _08088C9C @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088C98: .4byte gUnknown_0839F3F8
-_08088C9C: .4byte gTasks
-	thumb_func_end sub_8088C70
-
-	thumb_func_start sub_8088CA0
-sub_8088CA0: @ 8088CA0
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r6, _08088CF0 @ =gPlayerAvatar
-	ldrb r1, [r6, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088CF4 @ =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088CCA
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088CE8
-_08088CCA:
-	ldrb r0, [r6]
-	strh r0, [r5, 0x26]
-	movs r0, 0x1
-	strb r0, [r6, 0x6]
-	bl SetPlayerAvatarStateMask
-	bl sub_8059BF4
-	adds r0, r4, 0
-	movs r1, 0x39
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_08088CE8:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088CF0: .4byte gPlayerAvatar
-_08088CF4: .4byte gMapObjects
-	thumb_func_end sub_8088CA0
-
-	thumb_func_start sub_8088CF8
-sub_8088CF8: @ 8088CF8
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _08088D30 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088D34 @ =gMapObjects
-	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088D28
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	ldr r1, _08088D38 @ =gUnknown_0202FF84
-	movs r2, 0xA
-	ldrsh r0, [r4, r2]
-	str r0, [r1]
-	movs r0, 0x3B
-	bl FieldEffectStart
-_08088D28:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088D30: .4byte gPlayerAvatar
-_08088D34: .4byte gMapObjects
-_08088D38: .4byte gUnknown_0202FF84
-	thumb_func_end sub_8088CF8
-
-	thumb_func_start sub_8088D3C
-sub_8088D3C: @ 8088D3C
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r0, 0x6
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _08088D84
-	ldr r0, _08088D8C @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088D90 @ =gMapObjects
-	adds r5, r0, r1
-	ldrh r1, [r4, 0x26]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _08088D74
-	ldrb r0, [r5, 0x1A]
-	movs r1, 0x2
-	bl sub_8127ED0
-	ldrb r0, [r5, 0x1A]
-	movs r1, 0
-	bl sub_8127EFC
-_08088D74:
-	bl sub_8088F60
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08088D84:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088D8C: .4byte gPlayerAvatar
-_08088D90: .4byte gMapObjects
-	thumb_func_end sub_8088D3C
-
-	thumb_func_start sub_8088D94
-sub_8088D94: @ 8088D94
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrb r0, [r4, 0xA]
-	bl sub_8088FA4
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088DC8
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x10
-	strh r0, [r4, 0xC]
-	movs r0, 0x1
-	bl SetPlayerAvatarTransitionFlags
-	ldr r0, _08088DD0 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088DD4 @ =gMapObjects
-	adds r0, r1
-	movs r1, 0x2
-	bl FieldObjectSetSpecialAnim
-_08088DC8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088DD0: .4byte gPlayerAvatar
-_08088DD4: .4byte gMapObjects
-	thumb_func_end sub_8088D94
-
-	thumb_func_start sub_8088DD8
-sub_8088DD8: @ 8088DD8
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _08088E24 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088E28 @ =gMapObjects
-	adds r2, r0, r1
-	ldrh r1, [r4, 0xC]
-	movs r3, 0xC
-	ldrsh r0, [r4, r3]
-	cmp r0, 0
-	beq _08088DFE
-	subs r0, r1, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08088E1C
-_08088DFE:
-	adds r0, r2, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088E1C
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x9E
-	bl PlaySE
-	ldrb r0, [r4, 0xA]
-	bl sub_8088FC0
-_08088E1C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088E24: .4byte gPlayerAvatar
-_08088E28: .4byte gMapObjects
-	thumb_func_end sub_8088DD8
-
-	thumb_func_start sub_8088E2C
-sub_8088E2C: @ 8088E2C
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldrh r0, [r5, 0xC]
-	adds r0, 0x1
-	strh r0, [r5, 0xC]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x7
-	ble _08088EA2
-	ldr r0, _08088EA8 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08088EAC @ =gMapObjects
-	adds r4, r0, r1
-	movs r0, 0x3
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_805B980
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r6, _08088EB0 @ =gSprites
-	adds r0, r6
-	movs r1, 0x16
-	bl StartSpriteAnim
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x10
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	adds r0, r4, 0
-	movs r1, 0x48
-	bl FieldObjectSetSpecialAnim
-	ldrh r1, [r5, 0x26]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _08088E98
-	ldrb r1, [r4, 0x1A]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r6
-	bl DestroySprite
-_08088E98:
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0
-	strh r0, [r5, 0xC]
-_08088EA2:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088EA8: .4byte gPlayerAvatar
-_08088EAC: .4byte gMapObjects
-_08088EB0: .4byte gSprites
-	thumb_func_end sub_8088E2C
-
-	thumb_func_start sub_8088EB4
-sub_8088EB4: @ 8088EB4
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldrh r0, [r5, 0xC]
-	adds r0, 0x1
-	strh r0, [r5, 0xC]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x9
-	ble _08088F00
-	ldr r0, _08088F08 @ =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08088F0C @ =gMapObjects
-	adds r4, r0
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimActive
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x1]
-	ldrb r1, [r4, 0x2]
-	movs r0, 0x41
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x2]
-	ldrb r0, [r5, 0xA]
-	ldrb r1, [r4, 0x4]
-	bl sub_8088FFC
-	bl CameraObjectReset2
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_08088F00:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088F08: .4byte gPlayerAvatar
-_08088F0C: .4byte gMapObjects
-	thumb_func_end sub_8088EB4
-
-	thumb_func_start sub_8088F10
-sub_8088F10: @ 8088F10
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrb r0, [r4, 0xA]
-	bl sub_8088FA4
-	lsls r0, 24
-	cmp r0, 0
-	beq _08088F2A
-	bl fade_8080918
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_08088F2A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8088F10
-
-	thumb_func_start sub_8088F30
-sub_8088F30: @ 8088F30
-	push {lr}
-	ldr r0, _08088F58 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08088F52
-	movs r0, 0x1F
-	bl FieldEffectActiveListRemove
-	ldr r0, _08088F5C @ =sub_8088C70
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08088F52:
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088F58: .4byte gPaletteFade
-_08088F5C: .4byte sub_8088C70
-	thumb_func_end sub_8088F30
-
-	thumb_func_start sub_8088F60
-sub_8088F60: @ 8088F60
-	push {lr}
-	ldr r0, _08088F98 @ =gFieldEffectObjectTemplatePointers
-	ldr r0, [r0, 0x68]
-	movs r1, 0xFF
-	movs r2, 0xB4
-	movs r3, 0x1
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	ldr r1, _08088F9C @ =gSprites
-	adds r2, r1
-	ldrb r3, [r2, 0x5]
-	movs r1, 0xF
-	ands r1, r3
-	movs r3, 0xD
-	negs r3, r3
-	ands r1, r3
-	movs r3, 0x4
-	orrs r1, r3
-	strb r1, [r2, 0x5]
-	ldr r1, _08088FA0 @ =sub_8089018
-	str r1, [r2, 0x1C]
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08088F98: .4byte gFieldEffectObjectTemplatePointers
-_08088F9C: .4byte gSprites
-_08088FA0: .4byte sub_8089018
-	thumb_func_end sub_8088F60
-
-	thumb_func_start sub_8088FA4
-sub_8088FA4: @ 8088FA4
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08088FBC @ =gSprites
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldrh r0, [r1, 0x3C]
-	lsls r0, 24
-	lsrs r0, 24
-	bx lr
-	.align 2, 0
-_08088FBC: .4byte gSprites
-	thumb_func_end sub_8088FA4
-
-	thumb_func_start sub_8088FC0
-sub_8088FC0: @ 8088FC0
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08088FF4 @ =gSprites
-	adds r4, r0
-	ldr r0, _08088FF8 @ =sub_80890D8
-	str r0, [r4, 0x1C]
-	movs r1, 0
-	movs r0, 0x78
-	strh r0, [r4, 0x20]
-	strh r1, [r4, 0x22]
-	strh r1, [r4, 0x24]
-	strh r1, [r4, 0x26]
-	adds r0, r4, 0
-	adds r0, 0x2E
-	movs r2, 0x10
-	bl memset
-	movs r0, 0x40
-	strh r0, [r4, 0x3A]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08088FF4: .4byte gSprites
-_08088FF8: .4byte sub_80890D8
-	thumb_func_end sub_8088FC0
-
-	thumb_func_start sub_8088FFC
-sub_8088FFC: @ 8088FFC
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08089014 @ =gSprites
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r3
-	strh r1, [r2, 0x3A]
-	bx lr
-	.align 2, 0
-_08089014: .4byte gSprites
-	thumb_func_end sub_8088FFC
-
-	thumb_func_start sub_8089018
-sub_8089018: @ 8089018
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x3C
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _080890C4
-	movs r1, 0x2E
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _0808905C
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x3
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	ldr r0, _080890CC @ =gSpriteAffineAnimTable_0839F44C
-	str r0, [r4, 0x10]
-	adds r0, r4, 0
-	bl InitSpriteAffineAnim
-	adds r0, r4, 0
-	movs r1, 0
-	bl StartSpriteAffineAnim
-	movs r0, 0x76
-	strh r0, [r4, 0x20]
-	ldr r0, _080890D0 @ =0x0000ffd0
-	strh r0, [r4, 0x22]
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	movs r0, 0x40
-	strh r0, [r4, 0x30]
-	adds r0, 0xC0
-	strh r0, [r4, 0x32]
-_0808905C:
-	ldrh r0, [r4, 0x32]
-	lsls r0, 16
-	asrs r0, 24
-	ldrh r1, [r4, 0x30]
-	adds r0, r1
-	strh r0, [r4, 0x30]
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	movs r1, 0x78
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	movs r1, 0x78
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r2, [r4, 0x32]
-	movs r0, 0x32
-	ldrsh r1, [r4, r0]
-	ldr r0, _080890D4 @ =0x000007ff
-	cmp r1, r0
-	bgt _08089092
-	adds r0, r2, 0
-	adds r0, 0x60
-	strh r0, [r4, 0x32]
-_08089092:
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x81
-	ble _080890C4
-	ldrh r0, [r4, 0x3C]
-	adds r0, 0x1
-	strh r0, [r4, 0x3C]
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x4
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x3]
-	lsls r0, 26
-	lsrs r0, 27
-	bl FreeOamMatrix
-	ldrb r1, [r4, 0x1]
-	lsrs r1, 6
-	ldrb r2, [r4, 0x3]
-	lsrs r2, 6
-	adds r0, r4, 0
-	movs r3, 0
-	bl CalcCenterToCornerVec
-_080890C4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080890CC: .4byte gSpriteAffineAnimTable_0839F44C
-_080890D0: .4byte 0x0000ffd0
-_080890D4: .4byte 0x000007ff
-	thumb_func_end sub_8089018
-
-	thumb_func_start sub_80890D8
-sub_80890D8: @ 80890D8
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	movs r1, 0x32
-	ldrsh r0, [r4, r1]
-	movs r1, 0x8C
-	bl Cos
-	movs r5, 0
-	strh r0, [r4, 0x24]
-	movs r2, 0x32
-	ldrsh r0, [r4, r2]
-	movs r1, 0x48
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r0, [r4, 0x32]
-	adds r0, 0x4
-	movs r1, 0xFF
-	ands r0, r1
-	strh r0, [r4, 0x32]
-	movs r1, 0x3A
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x40
-	beq _08089136
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _08089148 @ =gSprites
-	adds r1, r0
-	adds r3, r1, 0
-	adds r3, 0x3E
-	ldrb r2, [r3]
-	movs r0, 0x3
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r3]
-	ldrh r0, [r4, 0x24]
-	ldrh r2, [r4, 0x20]
-	adds r0, r2
-	strh r0, [r1, 0x20]
-	ldrh r0, [r4, 0x26]
-	ldrh r2, [r4, 0x22]
-	adds r0, r2
-	subs r0, 0x8
-	strh r0, [r1, 0x22]
-	strh r5, [r1, 0x24]
-	strh r5, [r1, 0x26]
-_08089136:
-	movs r1, 0x32
-	ldrsh r0, [r4, r1]
-	cmp r0, 0x7F
-	ble _08089142
-	movs r0, 0x1
-	strh r0, [r4, 0x3C]
-_08089142:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089148: .4byte gSprites
-	thumb_func_end sub_80890D8
-
 	thumb_func_start sub_808914C
 sub_808914C: @ 808914C
 	push {r4,lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index eeb12300b..15f42c9f8 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2639,3 +2639,234 @@ void sub_8088BC4(struct Sprite *sprite)
         FieldEffectStop(sprite, FLDEFF_NPCFLY_OUT);
     }
 }
+
+void sub_8088C70(u8);
+extern const void (*gUnknown_0839F3F8[9])(struct Task *);
+extern void sub_8127EFC(u8, u8);
+u8 sub_8088F60(void);
+bool8 sub_8088FA4(u8);
+void sub_8088FC0(u8);
+void sub_8088FFC(u8, u8);
+void sub_8089018(struct Sprite *);
+void sub_80890D8(struct Sprite *);
+extern const union AffineAnimCmd *gSpriteAffineAnimTable_0839F44C[];
+
+u8 FldEff_UseFly(void)
+{
+    u8 taskId;
+    taskId = CreateTask(sub_8088C70, 0xfe);
+    gTasks[taskId].data[1] = gUnknown_0202FF84[0];
+    return 0;
+}
+
+void sub_8088C70(u8 taskId)
+{
+    gUnknown_0839F3F8[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_8088CA0(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        task->data[15] = gPlayerAvatar.flags;
+        gPlayerAvatar.unk6 = 0x01;
+        SetPlayerAvatarStateMask(1);
+        sub_8059BF4();
+        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        task->data[0]++;
+    }
+}
+
+void sub_8088CF8(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        task->data[0]++;
+        gUnknown_0202FF84[0] = task->data[1];
+        FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
+    }
+}
+
+void sub_8088D3C(struct Task *task)
+{
+    struct MapObject *mapObject;
+    if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
+    {
+        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        if (task->data[15] & 0x08)
+        {
+            sub_8127ED0(mapObject->mapobj_unk_1A, 2);
+            sub_8127EFC(mapObject->mapobj_unk_1A, 0);
+        }
+        task->data[1] = sub_8088F60();
+        task->data[0]++;
+    }
+}
+
+void sub_8088D94(struct Task *task)
+{
+    if (sub_8088FA4(task->data[1]))
+    {
+        task->data[0]++;
+        task->data[2] = 16;
+        SetPlayerAvatarTransitionFlags(0x01);
+        FieldObjectSetSpecialAnim(&gMapObjects[gPlayerAvatar.mapObjectId], 0x02);
+    }
+}
+
+void sub_8088DD8(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if ((task->data[2] == 0 || (--task->data[2]) == 0) && FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        task->data[0]++;
+        PlaySE(SE_W019);
+        sub_8088FC0(task->data[1]);
+    }
+}
+
+void sub_8088E2C(struct Task *task)
+{
+    struct MapObject *mapObject;
+    if ((++task->data[2]) >= 8)
+    {
+        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x03));
+        StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16);
+        mapObject->mapobj_bit_12 = 1;
+        FieldObjectSetSpecialAnim(mapObject, 0x48);
+        if (task->data[15] & 0x08)
+        {
+            DestroySprite(&gSprites[mapObject->mapobj_unk_1A]);
+        }
+        task->data[0]++;
+        task->data[2] = 0;
+    }
+}
+
+void sub_8088EB4(struct Task *task)
+{
+    struct MapObject *mapObject;
+    if ((++task->data[2]) >= 10)
+    {
+        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        FieldObjectClearAnimIfSpecialAnimActive(mapObject);
+        mapObject->mapobj_bit_12 = 0;
+        mapObject->mapobj_bit_22 = 0;
+        sub_8088FFC(task->data[1], mapObject->spriteId);
+        CameraObjectReset2();
+        task->data[0]++;
+    }
+}
+
+void sub_8088F10(struct Task *task)
+{
+    if (sub_8088FA4(task->data[1]))
+    {
+        fade_8080918();
+        task->data[0]++;
+    }
+}
+
+void sub_8088F30(struct Task *task)
+{
+    if (!gPaletteFade.active)
+    {
+        FieldEffectActiveListRemove(FLDEFF_USE_FLY);
+        DestroyTask(FindTaskIdByFunc(sub_8088C70));
+    }
+}
+
+u8 sub_8088F60(void)
+{
+    u8 spriteId;
+    struct Sprite *sprite;
+    spriteId = CreateSprite(gFieldEffectObjectTemplatePointers[26], 0xff, 0xb4, 0x1);
+    sprite = &gSprites[spriteId];
+    sprite->oam.paletteNum = 0;
+    sprite->oam.priority = 1;
+    sprite->callback = sub_8089018;
+    return spriteId;
+}
+
+u8 sub_8088FA4(u8 spriteId)
+{
+    return gSprites[spriteId].data7;
+}
+
+void sub_8088FC0(u8 spriteId)
+{
+    struct Sprite *sprite;
+    sprite = &gSprites[spriteId];
+    sprite->callback = sub_80890D8;
+    sprite->pos1.x = 0x78;
+    sprite->pos1.y = 0x00;
+    sprite->pos2.x = 0;
+    sprite->pos2.y = 0;
+    memset(&sprite->data0, 0, 8 * sizeof(u16) /* zero all data cells */);
+    sprite->data6 = 0x40;
+}
+
+void sub_8088FFC(u8 a0, u8 a1)
+{
+    gSprites[a0].data6 = a1;
+}
+
+void sub_8089018(struct Sprite *sprite)
+{
+    if (sprite->data7 == 0)
+    {
+        if (sprite->data0 == 0)
+        {
+            sprite->oam.affineMode = 3;
+            sprite->affineAnims = gSpriteAffineAnimTable_0839F44C;
+            InitSpriteAffineAnim(sprite);
+            StartSpriteAffineAnim(sprite, 0);
+            sprite->pos1.x = 0x76;
+            sprite->pos1.y = -0x30;
+            sprite->data0++;
+            sprite->data1 = 0x40;
+            sprite->data2 = 0x100;
+        }
+        sprite->data1 += (sprite->data2 >> 8);
+        sprite->pos2.x = Cos(sprite->data1, 0x78);
+        sprite->pos2.y = Sin(sprite->data1, 0x78);
+        if (sprite->data2 < 0x800)
+        {
+            sprite->data2 += 0x60;
+        }
+        if (sprite->data1 > 0x81)
+        {
+            sprite->data7++;
+            sprite->oam.affineMode = 0;
+            FreeOamMatrix(sprite->oam.matrixNum);
+            CalcCenterToCornerVec(sprite, sprite->oam.shape, sprite->oam.size, 0);
+        }
+    }
+}
+
+void sub_80890D8(struct Sprite *sprite)
+{
+    struct Sprite *sprite1;
+    sprite->pos2.x = Cos(sprite->data2, 0x8c);
+    sprite->pos2.y = Sin(sprite->data2, 0x48);
+    sprite->data2 = (sprite->data2 + 4) & 0xff;
+    if (sprite->data6 != 0x40)
+    {
+        sprite1 = &gSprites[sprite->data6];
+        sprite1->coordOffsetEnabled = 0;
+        sprite1->pos1.x = sprite->pos1.x + sprite->pos2.x;
+        sprite1->pos1.y = sprite->pos1.y + sprite->pos2.y - 8;
+        sprite1->pos2.x = 0;
+        sprite1->pos2.y = 0;
+    }
+    if (sprite->data2 >= 0x80)
+    {
+        sprite->data7 = 1;
+    }
+}
-- 
cgit v1.2.3


From e600694768b4badf5fca03e9671d13c54abedfd1 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 12 Jun 2017 12:16:45 -0400
Subject: Another sprite callback currently unlinked to any known/decompiled
 routine

---
 asm/field_effect.s | 140 -----------------------------------------------------
 src/field_effect.c |  50 +++++++++++++++++++
 2 files changed, 50 insertions(+), 140 deletions(-)

diff --git a/asm/field_effect.s b/asm/field_effect.s
index 61adcee87..b3c9d75d8 100755
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -6,146 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_808914C
-sub_808914C: @ 808914C
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0x3C
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _08089220
-	movs r2, 0x2E
-	ldrsh r0, [r4, r2]
-	cmp r0, 0
-	bne _08089196
-	ldrb r0, [r4, 0x1]
-	movs r1, 0x3
-	orrs r0, r1
-	strb r0, [r4, 0x1]
-	ldr r0, _08089228 @ =gSpriteAffineAnimTable_0839F44C
-	str r0, [r4, 0x10]
-	adds r0, r4, 0
-	bl InitSpriteAffineAnim
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl StartSpriteAffineAnim
-	movs r0, 0x5E
-	strh r0, [r4, 0x20]
-	ldr r0, _0808922C @ =0x0000ffe0
-	strh r0, [r4, 0x22]
-	ldrh r0, [r4, 0x2E]
-	adds r0, 0x1
-	strh r0, [r4, 0x2E]
-	movs r0, 0xF0
-	strh r0, [r4, 0x30]
-	movs r0, 0x80
-	lsls r0, 4
-	strh r0, [r4, 0x32]
-	movs r0, 0x80
-	strh r0, [r4, 0x36]
-_08089196:
-	ldrh r1, [r4, 0x32]
-	lsls r1, 16
-	asrs r1, 24
-	ldrh r2, [r4, 0x30]
-	adds r2, r1
-	ldrh r0, [r4, 0x34]
-	adds r0, r1
-	strh r0, [r4, 0x34]
-	movs r0, 0xFF
-	ands r2, r0
-	strh r2, [r4, 0x30]
-	movs r3, 0x30
-	ldrsh r0, [r4, r3]
-	movs r1, 0x20
-	bl Cos
-	strh r0, [r4, 0x24]
-	movs r1, 0x30
-	ldrsh r0, [r4, r1]
-	movs r1, 0x78
-	bl Sin
-	strh r0, [r4, 0x26]
-	ldrh r1, [r4, 0x32]
-	movs r2, 0x32
-	ldrsh r0, [r4, r2]
-	movs r2, 0x80
-	lsls r2, 1
-	cmp r0, r2
-	ble _080891D8
-	ldrh r0, [r4, 0x36]
-	subs r0, r1, r0
-	strh r0, [r4, 0x32]
-_080891D8:
-	ldrh r1, [r4, 0x36]
-	movs r3, 0x36
-	ldrsh r0, [r4, r3]
-	cmp r0, 0xFF
-	bgt _080891E8
-	adds r0, r1, 0
-	adds r0, 0x18
-	strh r0, [r4, 0x36]
-_080891E8:
-	movs r1, 0x32
-	ldrsh r0, [r4, r1]
-	cmp r0, 0xFF
-	bgt _080891F2
-	strh r2, [r4, 0x32]
-_080891F2:
-	movs r2, 0x34
-	ldrsh r0, [r4, r2]
-	cmp r0, 0x3B
-	ble _08089220
-	ldrh r0, [r4, 0x3C]
-	adds r0, 0x1
-	strh r0, [r4, 0x3C]
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x4
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x3]
-	lsls r0, 26
-	lsrs r0, 27
-	bl FreeOamMatrix
-	adds r2, r4, 0
-	adds r2, 0x3E
-	ldrb r0, [r2]
-	movs r1, 0x4
-	orrs r0, r1
-	strb r0, [r2]
-_08089220:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089228: .4byte gSpriteAffineAnimTable_0839F44C
-_0808922C: .4byte 0x0000ffe0
-	thumb_func_end sub_808914C
-
-	thumb_func_start sub_8089230
-sub_8089230: @ 8089230
-	push {r4,lr}
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r4, 0
-	bl sub_8088FC0
-	ldr r1, _08089254 @ =gSprites
-	lsls r0, r4, 4
-	adds r0, r4
-	lsls r0, 2
-	adds r1, 0x1C
-	adds r0, r1
-	ldr r1, _08089258 @ =sub_808914C
-	str r1, [r0]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089254: .4byte gSprites
-_08089258: .4byte sub_808914C
-	thumb_func_end sub_8089230
-
 	thumb_func_start FldEff_FlyIn
 FldEff_FlyIn: @ 808925C
 	push {lr}
diff --git a/src/field_effect.c b/src/field_effect.c
index 15f42c9f8..9269f7db0 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2870,3 +2870,53 @@ void sub_80890D8(struct Sprite *sprite)
         sprite->data7 = 1;
     }
 }
+
+void sub_808914C(struct Sprite *sprite)
+{
+    if (sprite->data7 == 0)
+    {
+        if (sprite->data0 == 0)
+        {
+            sprite->oam.affineMode = 3;
+            sprite->affineAnims = gSpriteAffineAnimTable_0839F44C;
+            InitSpriteAffineAnim(sprite);
+            StartSpriteAffineAnim(sprite, 1);
+            sprite->pos1.x = 0x5e;
+            sprite->pos1.y = -0x20;
+            sprite->data0++;
+            sprite->data1 = 0xf0;
+            sprite->data2 = 0x800;
+            sprite->data4 = 0x80;
+        }
+        sprite->data1 += sprite->data2 >> 8;
+        sprite->data3 += sprite->data2 >> 8;
+        sprite->data1 &= 0xff;
+        sprite->pos2.x = Cos(sprite->data1, 0x20);
+        sprite->pos2.y = Sin(sprite->data1, 0x78);
+        if (sprite->data2 > 0x100)
+        {
+            sprite->data2 -= sprite->data4;
+        }
+        if (sprite->data4 < 0x100)
+        {
+            sprite->data4 += 24;
+        }
+        if (sprite->data2 < 0x100)
+        {
+            sprite->data2 = 0x100;
+        }
+        if (sprite->data3 >= 60)
+        {
+            sprite->data7++;
+            sprite->oam.affineMode = 0;
+            FreeOamMatrix(sprite->oam.matrixNum);
+            sprite->invisible = 1;
+        }
+    }
+}
+
+void sub_8089230(u8 spriteId)
+{
+    sub_8088FC0(spriteId);
+    gSprites[spriteId].callback = sub_808914C;
+}
-- 
cgit v1.2.3


From db6818ca9149304463e5e2219ec90993a3af53b2 Mon Sep 17 00:00:00 2001
From: scnorton <scnorton@biociphers.org>
Date: Mon, 12 Jun 2017 13:58:12 -0400
Subject: FldEff_FlyIn (last remaining field effect)

---
 asm/field_effect.s | 405 -----------------------------------------------------
 ld_script.txt      |   1 -
 src/field_effect.c | 132 +++++++++++++++++
 3 files changed, 132 insertions(+), 406 deletions(-)
 delete mode 100755 asm/field_effect.s

diff --git a/asm/field_effect.s b/asm/field_effect.s
deleted file mode 100755
index b3c9d75d8..000000000
--- a/asm/field_effect.s
+++ /dev/null
@@ -1,405 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start FldEff_FlyIn
-FldEff_FlyIn: @ 808925C
-	push {lr}
-	ldr r0, _0808926C @ =sub_8089270
-	movs r1, 0xFE
-	bl CreateTask
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.align 2, 0
-_0808926C: .4byte sub_8089270
-	thumb_func_end FldEff_FlyIn
-
-	thumb_func_start sub_8089270
-sub_8089270: @ 8089270
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _08089298 @ =gUnknown_0839F454
-	ldr r2, _0808929C @ =gTasks
-	lsls r0, r1, 2
-	adds r0, r1
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x8
-	ldrsh r1, [r0, r2]
-	lsls r1, 2
-	adds r1, r3
-	ldr r1, [r1]
-	bl _call_via_r1
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089298: .4byte gUnknown_0839F454
-_0808929C: .4byte gTasks
-	thumb_func_end sub_8089270
-
-	thumb_func_start sub_80892A0
-sub_80892A0: @ 80892A0
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r6, _08089348 @ =gPlayerAvatar
-	ldrb r1, [r6, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0808934C @ =gMapObjects
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive
-	lsls r0, 24
-	cmp r0, 0
-	beq _080892CA
-	adds r0, r4, 0
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08089342
-_080892CA:
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	movs r0, 0x11
-	strh r0, [r5, 0xC]
-	ldrb r0, [r6]
-	strh r0, [r5, 0x26]
-	movs r0, 0x1
-	strb r0, [r6, 0x6]
-	bl SetPlayerAvatarStateMask
-	ldrh r1, [r5, 0x26]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _080892F2
-	ldrb r0, [r4, 0x1A]
-	movs r1, 0
-	bl sub_8127ED0
-_080892F2:
-	movs r0, 0x3
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_805B980
-	bl CameraObjectReset2
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl FieldObjectTurn
-	ldrb r1, [r4, 0x4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08089350 @ =gSprites
-	adds r0, r1
-	movs r1, 0x16
-	bl StartSpriteAnim
-	ldrb r1, [r4, 0x1]
-	movs r0, 0x21
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r4, 0x1]
-	bl sub_8088F60
-	lsls r0, 24
-	lsrs r0, 24
-	strh r0, [r5, 0xA]
-	bl sub_8088FC0
-	ldrb r0, [r5, 0xA]
-	ldrb r1, [r4, 0x4]
-	bl sub_8088FFC
-_08089342:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089348: .4byte gPlayerAvatar
-_0808934C: .4byte gMapObjects
-_08089350: .4byte gSprites
-	thumb_func_end sub_80892A0
-
-	thumb_func_start sub_8089354
-sub_8089354: @ 8089354
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldrh r1, [r5, 0xC]
-	movs r2, 0xC
-	ldrsh r0, [r5, r2]
-	cmp r0, 0
-	beq _0808936C
-	subs r0, r1, 0x1
-	strh r0, [r5, 0xC]
-	lsls r0, 16
-	cmp r0, 0
-	bne _080893AC
-_0808936C:
-	ldr r0, _080893B4 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080893B8 @ =gMapObjects
-	adds r0, r1
-	ldrb r0, [r0, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _080893BC @ =gSprites
-	adds r4, r0
-	ldrb r0, [r5, 0xA]
-	movs r1, 0x40
-	bl sub_8088FFC
-	ldrh r0, [r4, 0x24]
-	ldrh r1, [r4, 0x20]
-	adds r0, r1
-	movs r1, 0
-	strh r0, [r4, 0x20]
-	ldrh r0, [r4, 0x26]
-	ldrh r2, [r4, 0x22]
-	adds r0, r2
-	strh r0, [r4, 0x22]
-	strh r1, [r4, 0x24]
-	strh r1, [r4, 0x26]
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-	strh r1, [r5, 0xC]
-_080893AC:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080893B4: .4byte gPlayerAvatar
-_080893B8: .4byte gMapObjects
-_080893BC: .4byte gSprites
-	thumb_func_end sub_8089354
-
-	thumb_func_start sub_80893C0
-sub_80893C0: @ 80893C0
-	push {r4,lr}
-	sub sp, 0x24
-	adds r4, r0, 0
-	ldr r1, _08089408 @ =gUnknown_0839F470
-	mov r0, sp
-	movs r2, 0x24
-	bl memcpy
-	ldr r0, _0808940C @ =gPlayerAvatar
-	ldrb r0, [r0, 0x4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	ldr r0, _08089410 @ =gSprites
-	adds r1, r0
-	movs r2, 0xC
-	ldrsh r0, [r4, r2]
-	lsls r0, 1
-	add r0, sp
-	ldrh r0, [r0]
-	strh r0, [r1, 0x26]
-	ldrh r0, [r4, 0xC]
-	adds r0, 0x1
-	strh r0, [r4, 0xC]
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x11
-	ble _080893FE
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-_080893FE:
-	add sp, 0x24
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089408: .4byte gUnknown_0839F470
-_0808940C: .4byte gPlayerAvatar
-_08089410: .4byte gSprites
-	thumb_func_end sub_80893C0
-
-	thumb_func_start sub_8089414
-sub_8089414: @ 8089414
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	ldrb r0, [r6, 0xA]
-	bl sub_8088FA4
-	lsls r0, 24
-	cmp r0, 0
-	beq _08089478
-	ldr r0, _08089480 @ =gPlayerAvatar
-	ldrb r0, [r0, 0x5]
-	lsls r5, r0, 3
-	adds r5, r0
-	lsls r5, 2
-	ldr r0, _08089484 @ =gMapObjects
-	adds r5, r0
-	ldrb r0, [r5, 0x4]
-	lsls r4, r0, 4
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08089488 @ =gSprites
-	adds r4, r0
-	ldrb r1, [r5, 0x1]
-	movs r0, 0x11
-	negs r0, r0
-	ands r0, r1
-	strb r0, [r5, 0x1]
-	movs r0, 0x10
-	ldrsh r1, [r5, r0]
-	movs r0, 0x12
-	ldrsh r2, [r5, r0]
-	adds r0, r5, 0
-	bl sub_805C058
-	movs r0, 0
-	strh r0, [r4, 0x24]
-	strh r0, [r4, 0x26]
-	adds r4, 0x3E
-	ldrb r0, [r4]
-	movs r1, 0x2
-	orrs r0, r1
-	strb r0, [r4]
-	bl sub_8059BF4
-	adds r0, r5, 0
-	movs r1, 0x39
-	bl FieldObjectSetSpecialAnim
-	ldrh r0, [r6, 0x8]
-	adds r0, 0x1
-	strh r0, [r6, 0x8]
-_08089478:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08089480: .4byte gPlayerAvatar
-_08089484: .4byte gMapObjects
-_08089488: .4byte gSprites
-	thumb_func_end sub_8089414
-
-	thumb_func_start sub_808948C
-sub_808948C: @ 808948C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _080894BC @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080894C0 @ =gMapObjects
-	adds r0, r1
-	bl FieldObjectClearAnimIfSpecialAnimFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _080894B4
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	ldrb r0, [r4, 0xA]
-	bl sub_8089230
-_080894B4:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080894BC: .4byte gPlayerAvatar
-_080894C0: .4byte gMapObjects
-	thumb_func_end sub_808948C
-
-	thumb_func_start sub_80894C4
-sub_80894C4: @ 80894C4
-	push {r4,lr}
-	adds r4, r0, 0
-	ldrb r0, [r4, 0xA]
-	bl sub_8088FA4
-	lsls r0, 24
-	cmp r0, 0
-	beq _080894F0
-	movs r0, 0xA
-	ldrsh r1, [r4, r0]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _080894F8 @ =gSprites
-	adds r0, r1
-	bl DestroySprite
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r0, 0x10
-	strh r0, [r4, 0xA]
-_080894F0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080894F8: .4byte gSprites
-	thumb_func_end sub_80894C4
-
-	thumb_func_start fishE
-fishE: @ 80894FC
-	push {r4-r7,lr}
-	adds r5, r0, 0
-	ldrh r0, [r5, 0xA]
-	subs r0, 0x1
-	strh r0, [r5, 0xA]
-	lsls r0, 16
-	cmp r0, 0
-	bne _08089566
-	ldr r6, _0808956C @ =gPlayerAvatar
-	ldrb r1, [r6, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08089570 @ =gMapObjects
-	adds r4, r0, r1
-	movs r7, 0
-	ldrh r1, [r5, 0x26]
-	movs r0, 0x8
-	ands r0, r1
-	cmp r0, 0
-	beq _08089530
-	movs r7, 0x3
-	ldrb r0, [r4, 0x1A]
-	movs r1, 0x1
-	bl sub_8127ED0
-_08089530:
-	adds r0, r7, 0
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl sub_805B980
-	adds r0, r4, 0
-	movs r1, 0x1
-	bl FieldObjectTurn
-	ldrh r0, [r5, 0x26]
-	strb r0, [r6]
-	movs r0, 0
-	strb r0, [r6, 0x6]
-	movs r0, 0x20
-	bl FieldEffectActiveListRemove
-	ldr r0, _08089574 @ =sub_8089270
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-_08089566:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0808956C: .4byte gPlayerAvatar
-_08089570: .4byte gMapObjects
-_08089574: .4byte sub_8089270
-	thumb_func_end fishE
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/ld_script.txt b/ld_script.txt
index b4c30ad57..24a7c2ddf 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -134,7 +134,6 @@ SECTIONS {
         src/trainer_see.o(.text);
         src/wild_encounter.o(.text);
         src/field_effect.o(.text);
-        asm/field_effect.o(.text);
         asm/unknown_task.o(.text);
         asm/pokemon_menu.o(.text);
         src/option_menu.o(.text);
diff --git a/src/field_effect.c b/src/field_effect.c
index 9269f7db0..6cff8b864 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -2920,3 +2920,135 @@ void sub_8089230(u8 spriteId)
     sub_8088FC0(spriteId);
     gSprites[spriteId].callback = sub_808914C;
 }
+
+void sub_8089270(u8);
+extern const void (*gUnknown_0839F454[7])(struct Task *);
+extern const s16 gUnknown_0839F470[18];
+
+u8 FldEff_FlyIn(void)
+{
+    CreateTask(sub_8089270, 0xfe);
+    return 0;
+}
+
+void sub_8089270(u8 taskId)
+{
+    gUnknown_0839F454[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void sub_80892A0(struct Task *task)
+{
+    struct MapObject *mapObject;
+    mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+    if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject) || FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
+    {
+        task->data[0]++;
+        task->data[2] = 17;
+        task->data[15] = gPlayerAvatar.flags;
+        gPlayerAvatar.unk6 = 1;
+        SetPlayerAvatarStateMask(0x01);
+        if (task->data[15] & 0x08)
+        {
+            sub_8127ED0(mapObject->mapobj_unk_1A, 0);
+        }
+        sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(0x3));
+        CameraObjectReset2();
+        FieldObjectTurn(mapObject, DIR_WEST);
+        StartSpriteAnim(&gSprites[mapObject->spriteId], 0x16);
+        mapObject->mapobj_bit_13 = 0;
+        task->data[1] = sub_8088F60();
+        sub_8088FC0(task->data[1]);
+        sub_8088FFC(task->data[1], mapObject->spriteId);
+    }
+}
+
+void sub_8089354(struct Task *task)
+{
+    struct MapObject *mapObject;
+    struct Sprite *sprite;
+    if (task->data[2] == 0 || (--task->data[2]) == 0)
+    {
+        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        sprite = &gSprites[mapObject->spriteId];
+        sub_8088FFC(task->data[1], 0x40);
+        sprite->pos1.x += sprite->pos2.x;
+        sprite->pos1.y += sprite->pos2.y;
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        task->data[0]++;
+        task->data[2] = 0;
+    }
+}
+
+void sub_80893C0(struct Task *task)
+{
+    s16 unknown_0839F470[18];
+    struct Sprite *sprite;
+    memcpy(unknown_0839F470, gUnknown_0839F470, sizeof gUnknown_0839F470);
+    sprite = &gSprites[gPlayerAvatar.spriteId];
+    sprite->pos2.y = unknown_0839F470[task->data[2]];
+    if ((++task->data[2]) >= 18)
+    {
+        task->data[0]++;
+    }
+}
+
+void sub_8089414(struct Task *task)
+{
+    struct MapObject *mapObject;
+    struct Sprite *sprite;
+    if (sub_8088FA4(task->data[1]))
+    {
+        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        sprite = &gSprites[mapObject->spriteId];
+        mapObject->mapobj_bit_12 = 0;
+        sub_805C058(mapObject, mapObject->coords2.x, mapObject->coords2.y);
+        sprite->pos2.x = 0;
+        sprite->pos2.y = 0;
+        sprite->coordOffsetEnabled = 1;
+        sub_8059BF4();
+        FieldObjectSetSpecialAnim(mapObject, 0x39);
+        task->data[0]++;
+    }
+}
+
+void sub_808948C(struct Task *task)
+{
+    if (FieldObjectClearAnimIfSpecialAnimFinished(&gMapObjects[gPlayerAvatar.mapObjectId]))
+    {
+        task->data[0]++;
+        sub_8089230(task->data[1]);
+    }
+}
+
+void sub_80894C4(struct Task *task)
+{
+    if (sub_8088FA4(task->data[1]))
+    {
+        DestroySprite(&gSprites[task->data[1]]);
+        task->data[0]++;
+        task->data[1] = 0x10;
+    }
+}
+
+void fishE(struct Task *task)
+{
+    u8 state;
+    struct MapObject *mapObject;
+    if ((--task->data[1]) == 0)
+    {
+        mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
+        state = 0;
+        if (task->data[15] & 0x08)
+        {
+            state = 3;
+            sub_8127ED0(mapObject->mapobj_unk_1A, 1);
+        }
+        sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(state));
+        FieldObjectTurn(mapObject, DIR_SOUTH);
+        gPlayerAvatar.flags = task->data[15];
+        gPlayerAvatar.unk6 = 0;
+        FieldEffectActiveListRemove(FLDEFF_FLY_IN);
+        DestroyTask(FindTaskIdByFunc(sub_8089270));
+    }
+}
-- 
cgit v1.2.3


From 28f5eee3737942c9779b6943fac6c30160efa3b8 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 12 Jun 2017 20:37:47 -0400
Subject: Convert data/field_effect.s to C

---
 Makefile                |  20 ++-
 data/field_effect.s     | 433 ------------------------------------------------
 include/field_effect.h  | 106 ++++++++++++
 include/sprite.h        |   4 +-
 ld_script.txt           |   3 +-
 src/data/field_effect.c | 400 ++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 526 insertions(+), 440 deletions(-)
 delete mode 100644 data/field_effect.s
 mode change 100644 => 100755 include/sprite.h
 create mode 100755 src/data/field_effect.c

diff --git a/Makefile b/Makefile
index f656b86b6..f5d8a6553 100644
--- a/Makefile
+++ b/Makefile
@@ -40,10 +40,11 @@ VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_d
 $(VERSIONS) $(VERSIONS:%=compare_%)
 
 
-$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,src,asm,data}))
+$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,src,src/data,asm,data}))
 
 C_SRCS := $(wildcard src/*.c)
 ASM_SRCS := $(wildcard asm/*.s)
+DATA_C_SRCS := $(wildcard src/data/*.c)
 DATA_ASM_SRCS := $(wildcard data/*.s)
 
 SONG_SRCS := $(wildcard sound/songs/*.s)
@@ -109,22 +110,33 @@ define VERSION_RULES
 
 $1_C_OBJS := $$(C_SRCS:%.c=build/$1/%.o)
 $1_ASM_OBJS := $$(ASM_SRCS:%.s=build/$1/%.o)
+$1_DATA_C_OBJS := $$(DATA_C_SRCS:%.c=build/$1/%.o)
 $1_DATA_ASM_OBJS := $$(DATA_ASM_SRCS:%.s=build/$1/%.o)
 
 ifeq ($$(NODEP),)
 build/$1/src/%.o: c_dep = $$(shell $$(SCANINC) src/$$(*F).c)
+build/$1/src/data/%.o: c_dep = $$(shell $$(SCANINC) src/data/$$(*F).c)
 build/$1/asm/%.o: asm_dep = $$(shell $$(SCANINC) asm/$$(*F).s)
 build/$1/data/%.o: asm_dep = $$(shell $$(SCANINC) data/$$(*F).s)
 endif
 
-$1_OBJS := $$($1_C_OBJS) $$($1_ASM_OBJS) $$($1_DATA_ASM_OBJS) $$(SONG_OBJS)
+$1_OBJS := $$($1_C_OBJS) $$($1_DATA_C_OBJS) $$($1_ASM_OBJS) $$($1_DATA_ASM_OBJS) $$(SONG_OBJS)
 $1_OBJS_REL := $$($1_OBJS:build/$1/%=%)
 $1_OBJS_REL := $$($1_OBJS_REL:sound/%=../../sound/%)
 
 $$($1_C_OBJS): VERSION := $2
 $$($1_C_OBJS): REVISION := $3
 $$($1_C_OBJS): LANGUAGE := $4
-build/$1/%.o : %.c $$$$(c_dep)
+build/$1/src/%.o : src/%.c $$$$(c_dep)
+	@$$(CPP) $$(CPPFLAGS) -D $$(VERSION) -D REVISION=$$(REVISION) -D $$(LANGUAGE) $$< -o build/$1/$$*.i
+	@$$(PREPROC) build/$1/$$*.i charmap.txt | $$(CC1) $$(CFLAGS) -o build/$1/$$*.s
+	@printf ".text\n\t.align\t2, 0\n" >> build/$1/$$*.s
+	$$(AS) $$(ASFLAGS) -o $$@ build/$1/$$*.s
+
+$$($1_DATA_C_OBJS): VERSION := $2
+$$($1_DATA_C_OBJS): REVISION := $3
+$$($1_DATA_C_OBJS): LANGUAGE := $4
+build/$1/src/data/%.o : src/data/%.c $$$$(c_dep)
 	@$$(CPP) $$(CPPFLAGS) -D $$(VERSION) -D REVISION=$$(REVISION) -D $$(LANGUAGE) $$< -o build/$1/$$*.i
 	@$$(PREPROC) build/$1/$$*.i charmap.txt | $$(CC1) $$(CFLAGS) -o build/$1/$$*.s
 	@printf ".text\n\t.align\t2, 0\n" >> build/$1/$$*.s
@@ -147,7 +159,7 @@ build/$1/sym_bss.ld: sym_bss.txt
 	cd build/$1 && ../../$$(RAMSCRGEN) .bss ../../sym_bss.txt $$(LANGUAGE) >sym_bss.ld
 
 build/$1/sym_common.ld: LANGUAGE := $4
-build/$1/sym_common.ld: sym_common.txt $$($1_C_OBJS) $$(wildcard common_syms/*.txt)
+build/$1/sym_common.ld: sym_common.txt $$($1_C_OBJS) $$($1_DATA_C_OBJS) $$(wildcard common_syms/*.txt)
 	cd build/$1 && ../../$$(RAMSCRGEN) COMMON ../../sym_common.txt $$(LANGUAGE) -c src,../../common_syms >sym_common.ld
 
 build/$1/sym_ewram.ld: LANGUAGE := $4
diff --git a/data/field_effect.s b/data/field_effect.s
deleted file mode 100644
index 3347bc19c..000000000
--- a/data/field_effect.s
+++ /dev/null
@@ -1,433 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gSpriteImage_839DC14:: @ 839DC14
-	.incbin "graphics/birch_speech/birch.4bpp"
-
-	.align 2
-gBirchPalette:: @ 839E414
-	.incbin "graphics/birch_speech/birch.gbapal"
-
-	.align 2
-gSpriteImage_839E434:: @ 839E434
-	.incbin "graphics/misc/pokeball_glow.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette4: @ 839E454
-	.incbin "graphics/field_effect_objects/palettes/04.gbapal"
-
-	.align 2
-gSpriteImage_839E474:: @ 839E474
-	.incbin "graphics/misc/pokecenter_monitor/0.4bpp"
-
-	.align 2
-gSpriteImage_839E534:: @ 839E534
-	.incbin "graphics/misc/pokecenter_monitor/1.4bpp"
-
-	.align 2
-gSpriteImage_839E5F4:: @ 839E5F4
-	.incbin "graphics/misc/big_hof_monitor.4bpp"
-
-	.align 2
-gSpriteImage_839E7F4:: @ 839E7F4
-	.incbin "graphics/misc/small_hof_monitor.4bpp"
-
-	.align 2
-gFieldEffectObjectPalette5: @ 839E8F4
-	.incbin "graphics/field_effect_objects/palettes/05.gbapal"
-
-@ Graphics for the lights streaking past your Pokémon when it uses a field move.
-
-	.align 2
-gFieldMoveStreaksTiles:: @ 839E914
-	.incbin "graphics/misc/field_move_streaks.4bpp"
-
-	.align 2
-gFieldMoveStreaksPalette:: @ 839EB14
-	.incbin "graphics/misc/field_move_streaks.gbapal"
-
-	.align 2
-gFieldMoveStreaksTilemap:: @ 839EB34
-	.incbin "graphics/misc/field_move_streaks_map.bin"
-
-@ The following light streaks effect is used when the map is dark (e.g. a cave).
-
-	.align 2
-gDarknessFieldMoveStreaksTiles:: @ 839EDB4
-	.incbin "graphics/misc/darkness_field_move_streaks.4bpp"
-
-	.align 2
-gDarknessFieldMoveStreaksPalette:: @ 839EE34
-	.incbin "graphics/misc/darkness_field_move_streaks.gbapal"
-
-	.align 2
-gDarknessFieldMoveStreaksTilemap:: @ 839EE54
-	.incbin "graphics/misc/darkness_field_move_streaks_map.bin"
-
-	.align 2
-gFieldEffectScriptFuncs:: @ 839F0D4
-	.4byte FieldEffectCmd_loadtiles
-	.4byte FieldEffectCmd_loadfadedpal
-	.4byte FieldEffectCmd_loadpal
-	.4byte FieldEffectCmd_callnative
-	.4byte FieldEffectCmd_end
-	.4byte FieldEffectCmd_loadgfx_callnative
-	.4byte FieldEffectCmd_loadtiles_callnative
-	.4byte FieldEffectCmd_loadfadedpal_callnative
-
-	.align 2
-gOamData_839F0F4:: @ 839F0F4
-	.2byte 0x0000
-	.2byte 0xC000
-	.2byte 0x0000
-
-	.align 2
-gOamData_839F0FC:: @ 839F0FC
-	.2byte 0x0000
-	.2byte 0x0000
-	.2byte 0x0000
-
-	.align 2
-gOamData_839F104:: @ 839F104
-	.2byte 0x0000
-	.2byte 0x4000
-	.2byte 0x0000
-
-	.align 2
-gSpriteImageTable_839F10C:: @ 839F10C
-	obj_frame_tiles gSpriteImage_839DC14, 0x800
-
-	.align 2
-gUnknown_0839F114:: @ 839F114
-	obj_pal gBirchPalette, 0x1006
-
-	.align 2
-gSpriteAnim_839F11C:: @ 839F11C
-	obj_image_anim_frame 0, 1
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_839F124:: @ 839F124
-	.4byte gSpriteAnim_839F11C
-
-	.align 2
-gSpriteTemplate_839F128:: @ 839F128
-	spr_template 0xFFFF, 4102, gOamData_839F0F4, gSpriteAnimTable_839F124, gSpriteImageTable_839F10C, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gFieldEffectObjectPaletteInfo4:: @ 839F140
-	obj_pal gFieldEffectObjectPalette4, 0x1007
-
-	.align 2
-gFieldEffectObjectPaletteInfo5:: @ 839F148
-	obj_pal gFieldEffectObjectPalette5, 0x1010
-
-	.align 2
-gOamData_839F150:: @ 839F150
-	.2byte 0x4000
-	.2byte 0x8000
-	.2byte 0x0000
-
-	.align 2
-gSpriteImageTable_839F158:: @ 839F158
-	obj_frame_tiles gSpriteImage_839E434, 0x20
-
-	.align 2
-gSpriteImageTable_839F160:: @ 839F160
-	obj_frame_tiles gSpriteImage_839E474, 0xc0
-	obj_frame_tiles gSpriteImage_839E534, 0xc0
-
-	.align 2
-gSpriteImageTable_839F170:: @ 839F170
-	obj_frame_tiles gSpriteImage_839E5F4, 0x200
-
-	.align 2
-gSpriteImageTable_839F178:: @ 839F178
-	obj_frame_tiles gSpriteImage_839E7F4, 0x200
-
-	.align 2
-Unknown_39F180:: @ 839F180
-	subsprite -12,  -8, 2,   0, 16x8
-	subsprite   4,  -8, 2,   2, 8x8
-	subsprite -12,   0, 2,   3, 16x8
-	subsprite   4,   0, 2,   5, 8x8
-
-	.align 2
-gUnknown_0839F1A0:: @ 839F1A0
-	.4byte 4, Unknown_39F180
-
-	.align 2
-Unknown_39F1A8:: @ 39F1A8
-	subsprite -32,  -8, 2,   0, 32x8
-	subsprite   0,  -8, 2,   4, 32x8
-	subsprite -32,   0, 2,   8, 32x8
-	subsprite   0,   0, 2,  12, 32x8
-
-	.align 2
-gUnknown_0839F1C8:: @ 839F1C8
-	.4byte 4, Unknown_39F1A8
-
-	.align 2
-gSpriteAnim_839F1D0:: @ 839F1D0
-	obj_image_anim_frame 0, 1
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnim_839F1D8:: @ 839F1D8
-	obj_image_anim_frame 0, 16
-	obj_image_anim_frame 1, 16
-	obj_image_anim_frame 0, 16
-	obj_image_anim_frame 1, 16
-	obj_image_anim_frame 0, 16
-	obj_image_anim_frame 1, 16
-	obj_image_anim_frame 0, 16
-	obj_image_anim_frame 1, 16
-	obj_image_anim_end
-
-	.align 2
-gSpriteAnimTable_839F1FC:: @ 839F1FC
-	.4byte gSpriteAnim_839F1D0
-	.4byte gSpriteAnim_839F1D8
-
-	.align 2
-gSpriteAnimTable_839F204:: @ 839F204
-	.4byte gSpriteAnim_839F1D0
-
-	.align 2
-gSpriteTemplate_839F208:: @ 839F208
-	spr_template 0xFFFF, 4103, gOamData_839F0FC, gSpriteAnimTable_839F1FC, gSpriteImageTable_839F158, gDummySpriteAffineAnimTable, SpriteCB_PokeballGlow
-
-	.align 2
-gSpriteTemplate_839F220:: @ 839F220
-	spr_template 0xFFFF, 4100, gOamData_839F104, gSpriteAnimTable_839F1FC, gSpriteImageTable_839F160, gDummySpriteAffineAnimTable, SpriteCB_PokecenterMonitor
-
-	.align 2
-gSpriteTemplate_839F238:: @ 839F238
-	spr_template 0xFFFF, 4112, gOamData_839F104, gSpriteAnimTable_839F204, gSpriteImageTable_839F170, gDummySpriteAffineAnimTable, SpriteCB_HallOfFameMonitor
-
-	.align 2
-gSpriteTemplate_839F250:: @ 839F250
-	spr_template 0xFFFF, 4112, gOamData_839F150, gSpriteAnimTable_839F204, gSpriteImageTable_839F178, gDummySpriteAffineAnimTable, SpriteCB_HallOfFameMonitor
-
-	.align 2
-gUnknown_0839F268:: @ 839F268
-	.4byte PokecenterHealEffect_0
-	.4byte PokecenterHealEffect_1
-	.4byte PokecenterHealEffect_2
-	.4byte PokecenterHealEffect_3
-
-	.align 2
-gUnknown_0839F278:: @ 839F278
-	.4byte HallOfFameRecordEffect_0
-	.4byte HallOfFameRecordEffect_1
-	.4byte HallOfFameRecordEffect_2
-	.4byte HallOfFameRecordEffect_3
-
-	.align 2
-gUnknown_0839F288:: @ 839F288
-	.4byte PokeballGlowEffect_0
-	.4byte PokeballGlowEffect_1
-	.4byte PokeballGlowEffect_2
-	.4byte PokeballGlowEffect_3
-	.4byte PokeballGlowEffect_4
-	.4byte PokeballGlowEffect_5
-	.4byte PokeballGlowEffect_6
-	.4byte PokeballGlowEffect_7
-
-gUnknown_0839F2A8:: @ 839F2A8
-	.2byte 0, 0
-	.2byte 6, 0
-	.2byte 0, 4
-	.2byte 6, 4
-	.2byte 0, 8
-	.2byte 6, 8
-
-gUnknown_0839F2C0:: @ 839F2C0
-	.byte 16, 12, 8, 0
-
-gUnknown_0839F2C4:: @ 839F2C4
-	.byte 16, 12, 8, 0
-
-gUnknown_0839F2C8:: @ 839F2C8
-	.space 4
-
-	.align 2
-gUnknown_0839F2CC:: @ 839F2CC
-	.4byte sub_80867AC
-	.4byte sub_8086854
-	.4byte sub_8086870
-	.4byte sub_80868E4
-	.4byte sub_808699C
-	.4byte sub_80869B8
-	.4byte sub_80869F8
-
-	.align 2
-gUnknown_0839F2E8:: @ 839F2E8
-	.4byte sub_8086AA0
-	.4byte sub_8086AC0
-	.4byte sub_8086B30
-	.4byte sub_8086B54
-	.4byte sub_8086B64
-	.4byte sub_8086B88
-
-	.align 2
-gUnknown_0839F300:: @ 839F300
-	.4byte sub_8086CF4
-	.4byte sub_8086D70
-	.4byte sub_8086DB0
-	.4byte sub_8086E10
-	.4byte sub_8086E50
-	.4byte sub_8086EB0
-	.4byte sub_8086ED4
-
-	.align 2
-gUnknown_0839F31C:: @ 839F31C
-	.4byte sub_8086FB0
-	.4byte waterfall_1_do_anim_probably
-	.4byte waterfall_2_wait_anim_finish_probably
-	.4byte sub_8087030
-	.4byte sub_8087058
-
-	.align 2
-gUnknown_0839F330:: @ 839F330
-	.4byte sub_8087124
-	.4byte dive_2_unknown
-	.4byte dive_3_unknown
-
-	.align 2
-gUnknown_0839F33C:: @ 839F33C
-	.4byte sub_808722C
-	.4byte sub_8087264
-	.4byte sub_8087298
-	.4byte sub_80872E4
-	.4byte sub_80873D8
-	.4byte sub_80873F4
-
-	.align 2
-gUnknown_0839F354:: @ 839F354
-	.4byte sub_80874CC
-	.4byte sub_80874FC
-	.4byte sub_8087548
-	.4byte sub_808759C
-
-	.align 2
-gUnknown_0839F364:: @ 839F364
-	.4byte sub_80876C8
-	.4byte sub_80876F8
-	.4byte sub_8087774
-	.4byte sub_80877AC
-	.4byte sub_80877D4
-
-	.align 2
-gUnknown_0839F378:: @ 839F378
-	.4byte sub_80878F4
-	.4byte sub_8087914
-
-gUnknown_0839F380:: @ 839F380
-	.byte 1, 3, 4, 2, 1
-
-	.align 2
-gUnknown_0839F388:: @ 839F388
-	.4byte sub_8087AA4
-	.4byte sub_8087AC8
-
-	.align 2
-gUnknown_0839F390:: @ 839F390
-	.4byte sub_8087BEC
-	.4byte sub_8087C14
-	.4byte sub_8087CA4
-	.4byte sub_8087D78
-
-	.align 2
-gUnknown_0839F3A0:: @ 839F3A0
-	.4byte sub_8087E4C
-	.4byte sub_8087ED8
-	.4byte sub_8087FDC
-
-	.align 2
-gUnknown_0839F3AC:: @ 839F3AC
-	.4byte sub_8088150
-	.4byte sub_80881C0
-	.4byte sub_8088228
-	.4byte sub_80882B4
-	.4byte sub_80882E4
-	.4byte sub_8088338
-	.4byte sub_8088380
-
-	.align 2
-gUnknown_0839F3C8:: @ 839F3C8
-	.4byte sub_80884AC
-	.4byte sub_80884E8
-	.4byte sub_8088554
-	.4byte sub_80885A8
-	.4byte sub_80885D8
-	.4byte sub_808860C
-	.4byte sub_808862C
-
-	.align 2
-gUnknown_0839F3E4:: @ 839F3E4
-	.4byte sub_8088984
-	.4byte sub_80889E4
-	.4byte sub_8088A30
-	.4byte sub_8088A78
-	.4byte sub_8088AF4
-
-	.align 2
-gUnknown_0839F3F8:: @ 839F3F8
-	.4byte sub_8088CA0
-	.4byte sub_8088CF8
-	.4byte sub_8088D3C
-	.4byte sub_8088D94
-	.4byte sub_8088DD8
-	.4byte sub_8088E2C
-	.4byte sub_8088EB4
-	.4byte sub_8088F10
-	.4byte sub_8088F30
-
-SpriteAffineAnim_839F41C:
-	obj_rot_scal_anim_frame 8, 8, -30, 0
-	obj_rot_scal_anim_frame 28, 28, 0, 30
-	obj_rot_scal_anim_end
-
-SpriteAffineAnim_839F434:
-	obj_rot_scal_anim_frame 256, 256, 64, 0
-	obj_rot_scal_anim_frame -10, -10, 0, 22
-	obj_rot_scal_anim_end
-
-	.align 2
-gSpriteAffineAnimTable_0839F44C:: @ 839F44C
-	.4byte SpriteAffineAnim_839F41C
-	.4byte SpriteAffineAnim_839F434
-
-	.align 2
-gUnknown_0839F454:: @ 839F454
-	.4byte sub_80892A0
-	.4byte sub_8089354
-	.4byte sub_80893C0
-	.4byte sub_8089414
-	.4byte sub_808948C
-	.4byte sub_80894C4
-	.4byte fishE
-
-gUnknown_0839F470:: @ 839F470
-	.2byte -2
-	.2byte -4
-	.2byte -5
-	.2byte -6
-	.2byte -7
-	.2byte -8
-	.2byte -8
-	.2byte -8
-	.2byte -7
-	.2byte -7
-	.2byte -6
-	.2byte -5
-	.2byte -3
-	.2byte -2
-	.2byte 0
-	.2byte 2
-	.2byte 4
-	.2byte 8
diff --git a/include/field_effect.h b/include/field_effect.h
index 6306b81ac..2cf7f0c7a 100755
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -129,4 +129,110 @@ void PokeballGlowEffect_5(struct Sprite *);
 void PokeballGlowEffect_6(struct Sprite *);
 void PokeballGlowEffect_7(struct Sprite *);
 
+bool8 sub_80867AC(struct Task *);
+bool8 sub_8086854(struct Task *);
+bool8 sub_8086870(struct Task *);
+bool8 sub_80868E4(struct Task *);
+bool8 sub_808699C(struct Task *);
+bool8 sub_80869B8(struct Task *);
+bool8 sub_80869F8(struct Task *);
+
+bool8 sub_8086AA0(struct Task *);
+bool8 sub_8086AC0(struct Task *);
+bool8 sub_8086B30(struct Task *);
+bool8 sub_8086B54(struct Task *);
+bool8 sub_8086B64(struct Task *);
+bool8 sub_8086B88(struct Task *);
+
+bool8 sub_8086CF4(struct Task *);
+bool8 sub_8086D70(struct Task *);
+bool8 sub_8086DB0(struct Task *);
+bool8 sub_8086E10(struct Task *);
+bool8 sub_8086E50(struct Task *);
+bool8 sub_8086EB0(struct Task *);
+bool8 sub_8086ED4(struct Task *);
+
+bool8 sub_8086FB0(struct Task *, struct MapObject *);
+bool8 waterfall_1_do_anim_probably(struct Task *, struct MapObject *);
+bool8 waterfall_2_wait_anim_finish_probably(struct Task *, struct MapObject *);
+bool8 sub_8087030(struct Task *, struct MapObject *);
+bool8 sub_8087058(struct Task *, struct MapObject *);
+
+bool8 sub_8087124(struct Task *);
+bool8 dive_2_unknown(struct Task *);
+bool8 dive_3_unknown(struct Task *);
+
+bool8 sub_808722C(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_8087264(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_8087298(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80872E4(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80873D8(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80873F4(struct Task *, struct MapObject *, struct Sprite *);
+
+bool8 sub_80874CC(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80874FC(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_8087548(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_808759C(struct Task *, struct MapObject *, struct Sprite *);
+
+bool8 sub_80876C8(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80876F8(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_8087774(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80877AC(struct Task *, struct MapObject *, struct Sprite *);
+bool8 sub_80877D4(struct Task *, struct MapObject *, struct Sprite *);
+
+void sub_80878F4(struct Task *);
+void sub_8087914(struct Task *);
+
+void sub_8087AA4(struct Task *);
+void sub_8087AC8(struct Task *);
+
+void sub_8087BEC(struct Task *);
+void sub_8087C14(struct Task *);
+void sub_8087CA4(struct Task *);
+void sub_8087D78(struct Task *);
+
+void sub_8087E4C(struct Task *);
+void sub_8087ED8(struct Task *);
+void sub_8087FDC(struct Task *);
+
+void sub_8088150(struct Task *);
+void sub_80881C0(struct Task *);
+void sub_8088228(struct Task *);
+void sub_80882B4(struct Task *);
+void sub_80882E4(struct Task *);
+void sub_8088338(struct Task *);
+void sub_8088380(struct Task *);
+
+void sub_80884AC(struct Task *);
+void sub_80884E8(struct Task *);
+void sub_8088554(struct Task *);
+void sub_80885A8(struct Task *);
+void sub_80885D8(struct Task *);
+void sub_808860C(struct Task *);
+void sub_808862C(struct Task *);
+
+void sub_8088984(struct Task *);
+void sub_80889E4(struct Task *);
+void sub_8088A30(struct Task *);
+void sub_8088A78(struct Task *);
+void sub_8088AF4(struct Task *);
+
+void sub_8088CA0(struct Task *);
+void sub_8088CF8(struct Task *);
+void sub_8088D3C(struct Task *);
+void sub_8088D94(struct Task *);
+void sub_8088DD8(struct Task *);
+void sub_8088E2C(struct Task *);
+void sub_8088EB4(struct Task *);
+void sub_8088F10(struct Task *);
+void sub_8088F30(struct Task *);
+
+void sub_80892A0(struct Task *);
+void sub_8089354(struct Task *);
+void sub_80893C0(struct Task *);
+void sub_8089414(struct Task *);
+void sub_808948C(struct Task *);
+void sub_80894C4(struct Task *);
+void fishE(struct Task *);
+
 #endif // GUARD_FIELD_EFFECT_H
diff --git a/include/sprite.h b/include/sprite.h
old mode 100644
new mode 100755
index bda635885..6bf7a38c5
--- a/include/sprite.h
+++ b/include/sprite.h
@@ -131,7 +131,7 @@ struct Subsprite
 struct SubspriteTable
 {
     u8 subspriteCount;
-    struct Subsprite *subsprites;
+    const struct Subsprite *subsprites;
 };
 
 struct Sprite;
@@ -142,7 +142,7 @@ struct SpriteTemplate
     u16 paletteTag;
     const struct OamData *oam;
     const union AnimCmd *const *anims;
-    struct SpriteFrameImage *images;
+    const struct SpriteFrameImage *images;
     const union AffineAnimCmd *const *affineAnims;
     void (*callback)(struct Sprite *);
 };
diff --git a/ld_script.txt b/ld_script.txt
index 24a7c2ddf..418520720 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -389,7 +389,8 @@ SECTIONS {
         data/trainer_see.o(.rodata);
         src/wild_encounter.o(.rodata);
         data/wild_encounter.o(.rodata);
-        data/field_effect.o(.rodata);
+        src/data/field_effect.o(.rodata);
+        src/data/field_effect.o(.data);
         data/pokemon_menu.o(.rodata);
         data/option_menu.o(.rodata);
         data/pokedex.o(.rodata);
diff --git a/src/data/field_effect.c b/src/data/field_effect.c
new file mode 100755
index 000000000..4aae09667
--- /dev/null
+++ b/src/data/field_effect.c
@@ -0,0 +1,400 @@
+//
+// Created by scott on 6/8/2017.
+//
+
+#include "global.h"
+#include "sprite.h"
+#include "task.h"
+#include "field_effect.h"
+
+#define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
+
+#define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr}
+
+const u32 gSpriteImage_839DC14[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
+const u16 gBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
+const u32 gSpriteImage_839E434[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
+const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/field_effect_objects/palettes/04.gbapal");
+const u32 gSpriteImage_839E474[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
+const u32 gSpriteImage_839E534[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
+const u32 gSpriteImage_839E5F4[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
+const u32 gSpriteImage_839E7F4[] = INCBIN_U32("graphics/misc/small_hof_monitor.4bpp");
+const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/field_effect_objects/palettes/05.gbapal");
+
+// Graphics for the lights streaking past your Pokemon when it uses a field move.
+const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
+const u16 gFieldMoveStreaksPalette[16] = INCBIN_U16("graphics/misc/field_move_streaks.gbapal");
+const u16 gFieldMoveStreaksTilemap[] = INCBIN_U16("graphics/misc/field_move_streaks_map.bin");
+
+// The following light streaks effect is used when the map is dark (e.g. a cave).
+const u32 gDarknessFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/darkness_field_move_streaks.4bpp");
+const u16 gDarknessFieldMoveStreaksPalette[16] = INCBIN_U16("graphics/misc/darkness_field_move_streaks.gbapal");
+const u16 gDarknessFieldMoveStreaksTilemap[] = INCBIN_U16("graphics/misc/darkness_field_move_streaks_map.bin");
+
+bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = {
+    FieldEffectCmd_loadtiles,
+    FieldEffectCmd_loadfadedpal,
+    FieldEffectCmd_loadpal,
+    FieldEffectCmd_callnative,
+    FieldEffectCmd_end,
+    FieldEffectCmd_loadgfx_callnative,
+    FieldEffectCmd_loadtiles_callnative,
+    FieldEffectCmd_loadfadedpal_callnative,
+};
+
+const struct OamData gOamData_839F0F4 = {.size = 3};
+const struct OamData gOamData_839F0FC = {.size = 0};
+const struct OamData gOamData_839F104 = {.size = 1};
+
+const struct SpriteFrameImage gSpriteImageTable_839F10C[] = {
+    obj_frame_tiles(gSpriteImage_839DC14)
+};
+const struct SpritePalette gUnknown_0839F114 = {.data = gBirchPalette, .tag = 0x1006};
+
+const union AnimCmd gSpriteAnim_839F11C[] = {
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_839F124[] = {
+    gSpriteAnim_839F11C
+};
+
+const struct SpriteTemplate gSpriteTemplate_839F128 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4102,
+    .oam = &gOamData_839F0F4,
+    .anims = (const union AnimCmd *const *)&gSpriteAnimTable_839F124,
+    .images = gSpriteImageTable_839F10C,
+    .affineAnims = (const union AffineAnimCmd *const *)&gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo4 = {.data = gFieldEffectObjectPalette4, .tag = 0x1007};
+const struct SpritePalette gFieldEffectObjectPaletteInfo5 = {.data = gFieldEffectObjectPalette5, .tag = 0x1010};
+const struct OamData gOamData_839F150 = {
+    .shape = 1,
+    .size = 2
+};
+
+const struct SpriteFrameImage gSpriteImageTable_839F158[] = {
+    obj_frame_tiles(gSpriteImage_839E434)
+};
+
+const struct SpriteFrameImage gSpriteImageTable_839F160[] = {
+    obj_frame_tiles(gSpriteImage_839E474),
+    obj_frame_tiles(gSpriteImage_839E534)
+};
+
+const struct SpriteFrameImage gSpriteImageTable_839F170[] = {
+    obj_frame_tiles(gSpriteImage_839E5F4)
+};
+
+const struct SpriteFrameImage gSpriteImageTable_839F178[] = {
+    {.data = (u8 *)gSpriteImage_839E7F4, .size = 0x200} // the macro breaks down here
+};
+
+const struct Subsprite Unknown_39F180[] = {
+    {.x = -12, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 0},
+    {.x =   4, .y = -8, .priority = 2, .tileOffset = 2, .shape = 0, .size = 0},
+    {.x = -12, .y =  0, .priority = 2, .tileOffset = 3, .shape = 1, .size = 0},
+    {.x =   4, .y =  0, .priority = 2, .tileOffset = 5, .shape = 0, .size = 0}
+};
+
+const struct SubspriteTable gUnknown_0839F1A0 = subsprite_table(Unknown_39F180);
+
+const struct Subsprite Unknown_39F1A8[] = {
+    {.x = -32, .y = -8, .priority = 2, .tileOffset =  0, .shape = 1, .size = 1},
+    {.x =   0, .y = -8, .priority = 2, .tileOffset =  4, .shape = 1, .size = 1},
+    {.x = -32, .y =  0, .priority = 2, .tileOffset =  8, .shape = 1, .size = 1},
+    {.x =   0, .y =  0, .priority = 2, .tileOffset = 12, .shape = 1, .size = 1}
+};
+
+const struct SubspriteTable gUnknown_0839F1C8 = subsprite_table(Unknown_39F1A8);
+
+const union AnimCmd gSpriteAnim_839F1D0[] = {
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gSpriteAnim_839F1D8[] = {
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_839F1FC[] = {
+    gSpriteAnim_839F1D0,
+    gSpriteAnim_839F1D8
+};
+
+const union AnimCmd *const gSpriteAnimTable_839F204[] = {
+    gSpriteAnim_839F1D0
+};
+
+const struct SpriteTemplate gSpriteTemplate_839F208 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4103,
+    .oam = &gOamData_839F0FC,
+    .anims = gSpriteAnimTable_839F1FC,
+    .images = gSpriteImageTable_839F158,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_PokeballGlow
+};
+
+
+const struct SpriteTemplate gSpriteTemplate_839F220 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4100,
+    .oam = &gOamData_839F104,
+    .anims = gSpriteAnimTable_839F1FC,
+    .images = gSpriteImageTable_839F160,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_PokecenterMonitor
+};
+
+
+const struct SpriteTemplate gSpriteTemplate_839F238 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4112,
+    .oam = &gOamData_839F104,
+    .anims = gSpriteAnimTable_839F204,
+    .images = gSpriteImageTable_839F170,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_HallOfFameMonitor
+};
+
+
+const struct SpriteTemplate gSpriteTemplate_839F250 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4112,
+    .oam = &gOamData_839F150,
+    .anims = gSpriteAnimTable_839F204,
+    .images = gSpriteImageTable_839F178,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_HallOfFameMonitor
+};
+
+void (*const gUnknown_0839F268[])(struct Task *) = {
+    PokecenterHealEffect_0,
+    PokecenterHealEffect_1,
+    PokecenterHealEffect_2,
+    PokecenterHealEffect_3
+};
+
+void (*const gUnknown_0839F278[])(struct Task *) = {
+    HallOfFameRecordEffect_0,
+    HallOfFameRecordEffect_1,
+    HallOfFameRecordEffect_2,
+    HallOfFameRecordEffect_3
+};
+
+void (*const gUnknown_0839F288[])(struct Sprite *) = {
+    PokeballGlowEffect_0,
+    PokeballGlowEffect_1,
+    PokeballGlowEffect_2,
+    PokeballGlowEffect_3,
+    PokeballGlowEffect_4,
+    PokeballGlowEffect_5,
+    PokeballGlowEffect_6,
+    PokeballGlowEffect_7
+};
+
+const struct Coords16 gUnknown_0839F2A8[] = {
+    {.x = 0, .y = 0},
+    {.x = 6, .y = 0},
+    {.x = 0, .y = 4},
+    {.x = 6, .y = 4},
+    {.x = 0, .y = 8},
+    {.x = 6, .y = 8}
+};
+
+const u8 gUnknown_0839F2C0[] = {16, 12, 8, 0};
+const u8 gUnknown_0839F2C4[] = {16, 12, 8, 0};
+const u8 gUnknown_0839F2C8[] = { 0,  0, 0, 0};
+
+bool8 (*const gUnknown_0839F2CC[])(struct Task *) = {
+    sub_80867AC,
+    sub_8086854,
+    sub_8086870,
+    sub_80868E4,
+    sub_808699C,
+    sub_80869B8,
+    sub_80869F8
+};
+
+bool8 (*const gUnknown_0839F2E8[])(struct Task *) = {
+    sub_8086AA0,
+    sub_8086AC0,
+    sub_8086B30,
+    sub_8086B54,
+    sub_8086B64,
+    sub_8086B88
+};
+
+bool8 (*const gUnknown_0839F300[])(struct Task *) = {
+    sub_8086CF4,
+    sub_8086D70,
+    sub_8086DB0,
+    sub_8086E10,
+    sub_8086E50,
+    sub_8086EB0,
+    sub_8086ED4
+};
+
+bool8 (*const gUnknown_0839F31C[])(struct Task *, struct MapObject *) = {
+    sub_8086FB0,
+    waterfall_1_do_anim_probably,
+    waterfall_2_wait_anim_finish_probably,
+    sub_8087030,
+    sub_8087058
+};
+
+bool8 (*const gUnknown_0839F330[])(struct Task *) = {
+    sub_8087124,
+    dive_2_unknown,
+    dive_3_unknown
+};
+
+bool8 (*const gUnknown_0839F33C[])(struct Task *, struct MapObject *, struct Sprite *) = {
+    sub_808722C,
+    sub_8087264,
+    sub_8087298,
+    sub_80872E4,
+    sub_80873D8,
+    sub_80873F4
+};
+
+bool8 (*const gUnknown_0839F354[])(struct Task *, struct MapObject *, struct Sprite *) = {
+    sub_80874CC,
+    sub_80874FC,
+    sub_8087548,
+    sub_808759C
+};
+
+bool8 (*const gUnknown_0839F364[])(struct Task *, struct MapObject *, struct Sprite *) = {
+    sub_80876C8,
+    sub_80876F8,
+    sub_8087774,
+    sub_80877AC,
+    sub_80877D4
+};
+
+void (*const gUnknown_0839F378[])(struct Task *) = {
+    sub_80878F4,
+    sub_8087914
+};
+
+const u8 gUnknown_0839F380[] = {1, 3, 4, 2, 1};
+
+void (*const gUnknown_0839F388[])(struct Task *) = {
+    sub_8087AA4,
+    sub_8087AC8
+};
+
+void (*const gUnknown_0839F390[])(struct Task *) = {
+    sub_8087BEC,
+    sub_8087C14,
+    sub_8087CA4,
+    sub_8087D78
+};
+
+void (*const gUnknown_0839F3A0[])(struct Task *) = {
+    sub_8087E4C,
+    sub_8087ED8,
+    sub_8087FDC
+};
+
+void (*const gUnknown_0839F3AC[])(struct Task *) = {
+    sub_8088150,
+    sub_80881C0,
+    sub_8088228,
+    sub_80882B4,
+    sub_80882E4,
+    sub_8088338,
+    sub_8088380
+};
+
+void (*const gUnknown_0839F3C8[])(struct Task *) = {
+    sub_80884AC,
+    sub_80884E8,
+    sub_8088554,
+    sub_80885A8,
+    sub_80885D8,
+    sub_808860C,
+    sub_808862C
+};
+
+void (*const gUnknown_0839F3E4[])(struct Task *) = {
+    sub_8088984,
+    sub_80889E4,
+    sub_8088A30,
+    sub_8088A78,
+    sub_8088AF4
+};
+
+void (*const gUnknown_0839F3F8[])(struct Task *) = {
+    sub_8088CA0,
+    sub_8088CF8,
+    sub_8088D3C,
+    sub_8088D94,
+    sub_8088DD8,
+    sub_8088E2C,
+    sub_8088EB4,
+    sub_8088F10,
+    sub_8088F30
+};
+
+const union AffineAnimCmd SpriteAffineAnim_839F41C[] = {
+    AFFINEANIMCMD_FRAME(8, 8, -30, 0),
+    AFFINEANIMCMD_FRAME(28, 28, 0, 30),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd SpriteAffineAnim_839F434[] = {
+    AFFINEANIMCMD_FRAME(256, 256, 64, 0),
+    AFFINEANIMCMD_FRAME(-10, -10, 0, 22),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_0839F44C[] = {
+    SpriteAffineAnim_839F41C,
+    SpriteAffineAnim_839F434
+};
+
+void (*const gUnknown_0839F454[])(struct Task *) = {
+    sub_80892A0,
+    sub_8089354,
+    sub_80893C0,
+    sub_8089414,
+    sub_808948C,
+    sub_80894C4,
+    fishE
+};
+
+const s16 gUnknown_0839F470[] = {
+    -2,
+    -4,
+    -5,
+    -6,
+    -7,
+    -8,
+    -8,
+    -8,
+    -7,
+    -7,
+    -6,
+    -5,
+    -3,
+    -2,
+     0,
+     2,
+     4,
+     8
+};
-- 
cgit v1.2.3


From 8f48da59b18f0d0431e8c64d369d3e82f96be191 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Mon, 12 Jun 2017 20:57:16 -0400
Subject: Merge field_effects data into src/field_effect.c

---
 Makefile                |  20 +--
 ld_script.txt           |   3 +-
 src/data/field_effect.c | 400 --------------------------------------------
 src/field_effect.c      | 434 +++++++++++++++++++++++++++++++++++++++++++-----
 4 files changed, 396 insertions(+), 461 deletions(-)
 delete mode 100755 src/data/field_effect.c

diff --git a/Makefile b/Makefile
index f5d8a6553..f656b86b6 100644
--- a/Makefile
+++ b/Makefile
@@ -40,11 +40,10 @@ VERSIONS := ruby sapphire ruby_rev1 sapphire_rev1 ruby_rev2 sapphire_rev2 ruby_d
 $(VERSIONS) $(VERSIONS:%=compare_%)
 
 
-$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,src,src/data,asm,data}))
+$(shell mkdir -p build/ $(VERSIONS:%=build/%/{,src,asm,data}))
 
 C_SRCS := $(wildcard src/*.c)
 ASM_SRCS := $(wildcard asm/*.s)
-DATA_C_SRCS := $(wildcard src/data/*.c)
 DATA_ASM_SRCS := $(wildcard data/*.s)
 
 SONG_SRCS := $(wildcard sound/songs/*.s)
@@ -110,33 +109,22 @@ define VERSION_RULES
 
 $1_C_OBJS := $$(C_SRCS:%.c=build/$1/%.o)
 $1_ASM_OBJS := $$(ASM_SRCS:%.s=build/$1/%.o)
-$1_DATA_C_OBJS := $$(DATA_C_SRCS:%.c=build/$1/%.o)
 $1_DATA_ASM_OBJS := $$(DATA_ASM_SRCS:%.s=build/$1/%.o)
 
 ifeq ($$(NODEP),)
 build/$1/src/%.o: c_dep = $$(shell $$(SCANINC) src/$$(*F).c)
-build/$1/src/data/%.o: c_dep = $$(shell $$(SCANINC) src/data/$$(*F).c)
 build/$1/asm/%.o: asm_dep = $$(shell $$(SCANINC) asm/$$(*F).s)
 build/$1/data/%.o: asm_dep = $$(shell $$(SCANINC) data/$$(*F).s)
 endif
 
-$1_OBJS := $$($1_C_OBJS) $$($1_DATA_C_OBJS) $$($1_ASM_OBJS) $$($1_DATA_ASM_OBJS) $$(SONG_OBJS)
+$1_OBJS := $$($1_C_OBJS) $$($1_ASM_OBJS) $$($1_DATA_ASM_OBJS) $$(SONG_OBJS)
 $1_OBJS_REL := $$($1_OBJS:build/$1/%=%)
 $1_OBJS_REL := $$($1_OBJS_REL:sound/%=../../sound/%)
 
 $$($1_C_OBJS): VERSION := $2
 $$($1_C_OBJS): REVISION := $3
 $$($1_C_OBJS): LANGUAGE := $4
-build/$1/src/%.o : src/%.c $$$$(c_dep)
-	@$$(CPP) $$(CPPFLAGS) -D $$(VERSION) -D REVISION=$$(REVISION) -D $$(LANGUAGE) $$< -o build/$1/$$*.i
-	@$$(PREPROC) build/$1/$$*.i charmap.txt | $$(CC1) $$(CFLAGS) -o build/$1/$$*.s
-	@printf ".text\n\t.align\t2, 0\n" >> build/$1/$$*.s
-	$$(AS) $$(ASFLAGS) -o $$@ build/$1/$$*.s
-
-$$($1_DATA_C_OBJS): VERSION := $2
-$$($1_DATA_C_OBJS): REVISION := $3
-$$($1_DATA_C_OBJS): LANGUAGE := $4
-build/$1/src/data/%.o : src/data/%.c $$$$(c_dep)
+build/$1/%.o : %.c $$$$(c_dep)
 	@$$(CPP) $$(CPPFLAGS) -D $$(VERSION) -D REVISION=$$(REVISION) -D $$(LANGUAGE) $$< -o build/$1/$$*.i
 	@$$(PREPROC) build/$1/$$*.i charmap.txt | $$(CC1) $$(CFLAGS) -o build/$1/$$*.s
 	@printf ".text\n\t.align\t2, 0\n" >> build/$1/$$*.s
@@ -159,7 +147,7 @@ build/$1/sym_bss.ld: sym_bss.txt
 	cd build/$1 && ../../$$(RAMSCRGEN) .bss ../../sym_bss.txt $$(LANGUAGE) >sym_bss.ld
 
 build/$1/sym_common.ld: LANGUAGE := $4
-build/$1/sym_common.ld: sym_common.txt $$($1_C_OBJS) $$($1_DATA_C_OBJS) $$(wildcard common_syms/*.txt)
+build/$1/sym_common.ld: sym_common.txt $$($1_C_OBJS) $$(wildcard common_syms/*.txt)
 	cd build/$1 && ../../$$(RAMSCRGEN) COMMON ../../sym_common.txt $$(LANGUAGE) -c src,../../common_syms >sym_common.ld
 
 build/$1/sym_ewram.ld: LANGUAGE := $4
diff --git a/ld_script.txt b/ld_script.txt
index 418520720..811339ee5 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -389,8 +389,7 @@ SECTIONS {
         data/trainer_see.o(.rodata);
         src/wild_encounter.o(.rodata);
         data/wild_encounter.o(.rodata);
-        src/data/field_effect.o(.rodata);
-        src/data/field_effect.o(.data);
+        src/field_effect.o(.rodata);
         data/pokemon_menu.o(.rodata);
         data/option_menu.o(.rodata);
         data/pokedex.o(.rodata);
diff --git a/src/data/field_effect.c b/src/data/field_effect.c
deleted file mode 100755
index 4aae09667..000000000
--- a/src/data/field_effect.c
+++ /dev/null
@@ -1,400 +0,0 @@
-//
-// Created by scott on 6/8/2017.
-//
-
-#include "global.h"
-#include "sprite.h"
-#include "task.h"
-#include "field_effect.h"
-
-#define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
-
-#define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr}
-
-const u32 gSpriteImage_839DC14[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
-const u16 gBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
-const u32 gSpriteImage_839E434[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
-const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/field_effect_objects/palettes/04.gbapal");
-const u32 gSpriteImage_839E474[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
-const u32 gSpriteImage_839E534[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
-const u32 gSpriteImage_839E5F4[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
-const u32 gSpriteImage_839E7F4[] = INCBIN_U32("graphics/misc/small_hof_monitor.4bpp");
-const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/field_effect_objects/palettes/05.gbapal");
-
-// Graphics for the lights streaking past your Pokemon when it uses a field move.
-const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
-const u16 gFieldMoveStreaksPalette[16] = INCBIN_U16("graphics/misc/field_move_streaks.gbapal");
-const u16 gFieldMoveStreaksTilemap[] = INCBIN_U16("graphics/misc/field_move_streaks_map.bin");
-
-// The following light streaks effect is used when the map is dark (e.g. a cave).
-const u32 gDarknessFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/darkness_field_move_streaks.4bpp");
-const u16 gDarknessFieldMoveStreaksPalette[16] = INCBIN_U16("graphics/misc/darkness_field_move_streaks.gbapal");
-const u16 gDarknessFieldMoveStreaksTilemap[] = INCBIN_U16("graphics/misc/darkness_field_move_streaks_map.bin");
-
-bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = {
-    FieldEffectCmd_loadtiles,
-    FieldEffectCmd_loadfadedpal,
-    FieldEffectCmd_loadpal,
-    FieldEffectCmd_callnative,
-    FieldEffectCmd_end,
-    FieldEffectCmd_loadgfx_callnative,
-    FieldEffectCmd_loadtiles_callnative,
-    FieldEffectCmd_loadfadedpal_callnative,
-};
-
-const struct OamData gOamData_839F0F4 = {.size = 3};
-const struct OamData gOamData_839F0FC = {.size = 0};
-const struct OamData gOamData_839F104 = {.size = 1};
-
-const struct SpriteFrameImage gSpriteImageTable_839F10C[] = {
-    obj_frame_tiles(gSpriteImage_839DC14)
-};
-const struct SpritePalette gUnknown_0839F114 = {.data = gBirchPalette, .tag = 0x1006};
-
-const union AnimCmd gSpriteAnim_839F11C[] = {
-    ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
-    ANIMCMD_END
-};
-
-const union AnimCmd *const gSpriteAnimTable_839F124[] = {
-    gSpriteAnim_839F11C
-};
-
-const struct SpriteTemplate gSpriteTemplate_839F128 = {
-    .tileTag = 0xffff,
-    .paletteTag = 4102,
-    .oam = &gOamData_839F0F4,
-    .anims = (const union AnimCmd *const *)&gSpriteAnimTable_839F124,
-    .images = gSpriteImageTable_839F10C,
-    .affineAnims = (const union AffineAnimCmd *const *)&gDummySpriteAffineAnimTable,
-    .callback = SpriteCallbackDummy
-};
-
-const struct SpritePalette gFieldEffectObjectPaletteInfo4 = {.data = gFieldEffectObjectPalette4, .tag = 0x1007};
-const struct SpritePalette gFieldEffectObjectPaletteInfo5 = {.data = gFieldEffectObjectPalette5, .tag = 0x1010};
-const struct OamData gOamData_839F150 = {
-    .shape = 1,
-    .size = 2
-};
-
-const struct SpriteFrameImage gSpriteImageTable_839F158[] = {
-    obj_frame_tiles(gSpriteImage_839E434)
-};
-
-const struct SpriteFrameImage gSpriteImageTable_839F160[] = {
-    obj_frame_tiles(gSpriteImage_839E474),
-    obj_frame_tiles(gSpriteImage_839E534)
-};
-
-const struct SpriteFrameImage gSpriteImageTable_839F170[] = {
-    obj_frame_tiles(gSpriteImage_839E5F4)
-};
-
-const struct SpriteFrameImage gSpriteImageTable_839F178[] = {
-    {.data = (u8 *)gSpriteImage_839E7F4, .size = 0x200} // the macro breaks down here
-};
-
-const struct Subsprite Unknown_39F180[] = {
-    {.x = -12, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 0},
-    {.x =   4, .y = -8, .priority = 2, .tileOffset = 2, .shape = 0, .size = 0},
-    {.x = -12, .y =  0, .priority = 2, .tileOffset = 3, .shape = 1, .size = 0},
-    {.x =   4, .y =  0, .priority = 2, .tileOffset = 5, .shape = 0, .size = 0}
-};
-
-const struct SubspriteTable gUnknown_0839F1A0 = subsprite_table(Unknown_39F180);
-
-const struct Subsprite Unknown_39F1A8[] = {
-    {.x = -32, .y = -8, .priority = 2, .tileOffset =  0, .shape = 1, .size = 1},
-    {.x =   0, .y = -8, .priority = 2, .tileOffset =  4, .shape = 1, .size = 1},
-    {.x = -32, .y =  0, .priority = 2, .tileOffset =  8, .shape = 1, .size = 1},
-    {.x =   0, .y =  0, .priority = 2, .tileOffset = 12, .shape = 1, .size = 1}
-};
-
-const struct SubspriteTable gUnknown_0839F1C8 = subsprite_table(Unknown_39F1A8);
-
-const union AnimCmd gSpriteAnim_839F1D0[] = {
-    ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
-    ANIMCMD_JUMP(0)
-};
-
-const union AnimCmd gSpriteAnim_839F1D8[] = {
-    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
-    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
-    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
-    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
-    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
-    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
-    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
-    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
-    ANIMCMD_END
-};
-
-const union AnimCmd *const gSpriteAnimTable_839F1FC[] = {
-    gSpriteAnim_839F1D0,
-    gSpriteAnim_839F1D8
-};
-
-const union AnimCmd *const gSpriteAnimTable_839F204[] = {
-    gSpriteAnim_839F1D0
-};
-
-const struct SpriteTemplate gSpriteTemplate_839F208 = {
-    .tileTag = 0xffff,
-    .paletteTag = 4103,
-    .oam = &gOamData_839F0FC,
-    .anims = gSpriteAnimTable_839F1FC,
-    .images = gSpriteImageTable_839F158,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCB_PokeballGlow
-};
-
-
-const struct SpriteTemplate gSpriteTemplate_839F220 = {
-    .tileTag = 0xffff,
-    .paletteTag = 4100,
-    .oam = &gOamData_839F104,
-    .anims = gSpriteAnimTable_839F1FC,
-    .images = gSpriteImageTable_839F160,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCB_PokecenterMonitor
-};
-
-
-const struct SpriteTemplate gSpriteTemplate_839F238 = {
-    .tileTag = 0xffff,
-    .paletteTag = 4112,
-    .oam = &gOamData_839F104,
-    .anims = gSpriteAnimTable_839F204,
-    .images = gSpriteImageTable_839F170,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCB_HallOfFameMonitor
-};
-
-
-const struct SpriteTemplate gSpriteTemplate_839F250 = {
-    .tileTag = 0xffff,
-    .paletteTag = 4112,
-    .oam = &gOamData_839F150,
-    .anims = gSpriteAnimTable_839F204,
-    .images = gSpriteImageTable_839F178,
-    .affineAnims = gDummySpriteAffineAnimTable,
-    .callback = SpriteCB_HallOfFameMonitor
-};
-
-void (*const gUnknown_0839F268[])(struct Task *) = {
-    PokecenterHealEffect_0,
-    PokecenterHealEffect_1,
-    PokecenterHealEffect_2,
-    PokecenterHealEffect_3
-};
-
-void (*const gUnknown_0839F278[])(struct Task *) = {
-    HallOfFameRecordEffect_0,
-    HallOfFameRecordEffect_1,
-    HallOfFameRecordEffect_2,
-    HallOfFameRecordEffect_3
-};
-
-void (*const gUnknown_0839F288[])(struct Sprite *) = {
-    PokeballGlowEffect_0,
-    PokeballGlowEffect_1,
-    PokeballGlowEffect_2,
-    PokeballGlowEffect_3,
-    PokeballGlowEffect_4,
-    PokeballGlowEffect_5,
-    PokeballGlowEffect_6,
-    PokeballGlowEffect_7
-};
-
-const struct Coords16 gUnknown_0839F2A8[] = {
-    {.x = 0, .y = 0},
-    {.x = 6, .y = 0},
-    {.x = 0, .y = 4},
-    {.x = 6, .y = 4},
-    {.x = 0, .y = 8},
-    {.x = 6, .y = 8}
-};
-
-const u8 gUnknown_0839F2C0[] = {16, 12, 8, 0};
-const u8 gUnknown_0839F2C4[] = {16, 12, 8, 0};
-const u8 gUnknown_0839F2C8[] = { 0,  0, 0, 0};
-
-bool8 (*const gUnknown_0839F2CC[])(struct Task *) = {
-    sub_80867AC,
-    sub_8086854,
-    sub_8086870,
-    sub_80868E4,
-    sub_808699C,
-    sub_80869B8,
-    sub_80869F8
-};
-
-bool8 (*const gUnknown_0839F2E8[])(struct Task *) = {
-    sub_8086AA0,
-    sub_8086AC0,
-    sub_8086B30,
-    sub_8086B54,
-    sub_8086B64,
-    sub_8086B88
-};
-
-bool8 (*const gUnknown_0839F300[])(struct Task *) = {
-    sub_8086CF4,
-    sub_8086D70,
-    sub_8086DB0,
-    sub_8086E10,
-    sub_8086E50,
-    sub_8086EB0,
-    sub_8086ED4
-};
-
-bool8 (*const gUnknown_0839F31C[])(struct Task *, struct MapObject *) = {
-    sub_8086FB0,
-    waterfall_1_do_anim_probably,
-    waterfall_2_wait_anim_finish_probably,
-    sub_8087030,
-    sub_8087058
-};
-
-bool8 (*const gUnknown_0839F330[])(struct Task *) = {
-    sub_8087124,
-    dive_2_unknown,
-    dive_3_unknown
-};
-
-bool8 (*const gUnknown_0839F33C[])(struct Task *, struct MapObject *, struct Sprite *) = {
-    sub_808722C,
-    sub_8087264,
-    sub_8087298,
-    sub_80872E4,
-    sub_80873D8,
-    sub_80873F4
-};
-
-bool8 (*const gUnknown_0839F354[])(struct Task *, struct MapObject *, struct Sprite *) = {
-    sub_80874CC,
-    sub_80874FC,
-    sub_8087548,
-    sub_808759C
-};
-
-bool8 (*const gUnknown_0839F364[])(struct Task *, struct MapObject *, struct Sprite *) = {
-    sub_80876C8,
-    sub_80876F8,
-    sub_8087774,
-    sub_80877AC,
-    sub_80877D4
-};
-
-void (*const gUnknown_0839F378[])(struct Task *) = {
-    sub_80878F4,
-    sub_8087914
-};
-
-const u8 gUnknown_0839F380[] = {1, 3, 4, 2, 1};
-
-void (*const gUnknown_0839F388[])(struct Task *) = {
-    sub_8087AA4,
-    sub_8087AC8
-};
-
-void (*const gUnknown_0839F390[])(struct Task *) = {
-    sub_8087BEC,
-    sub_8087C14,
-    sub_8087CA4,
-    sub_8087D78
-};
-
-void (*const gUnknown_0839F3A0[])(struct Task *) = {
-    sub_8087E4C,
-    sub_8087ED8,
-    sub_8087FDC
-};
-
-void (*const gUnknown_0839F3AC[])(struct Task *) = {
-    sub_8088150,
-    sub_80881C0,
-    sub_8088228,
-    sub_80882B4,
-    sub_80882E4,
-    sub_8088338,
-    sub_8088380
-};
-
-void (*const gUnknown_0839F3C8[])(struct Task *) = {
-    sub_80884AC,
-    sub_80884E8,
-    sub_8088554,
-    sub_80885A8,
-    sub_80885D8,
-    sub_808860C,
-    sub_808862C
-};
-
-void (*const gUnknown_0839F3E4[])(struct Task *) = {
-    sub_8088984,
-    sub_80889E4,
-    sub_8088A30,
-    sub_8088A78,
-    sub_8088AF4
-};
-
-void (*const gUnknown_0839F3F8[])(struct Task *) = {
-    sub_8088CA0,
-    sub_8088CF8,
-    sub_8088D3C,
-    sub_8088D94,
-    sub_8088DD8,
-    sub_8088E2C,
-    sub_8088EB4,
-    sub_8088F10,
-    sub_8088F30
-};
-
-const union AffineAnimCmd SpriteAffineAnim_839F41C[] = {
-    AFFINEANIMCMD_FRAME(8, 8, -30, 0),
-    AFFINEANIMCMD_FRAME(28, 28, 0, 30),
-    AFFINEANIMCMD_END
-};
-
-const union AffineAnimCmd SpriteAffineAnim_839F434[] = {
-    AFFINEANIMCMD_FRAME(256, 256, 64, 0),
-    AFFINEANIMCMD_FRAME(-10, -10, 0, 22),
-    AFFINEANIMCMD_END
-};
-
-const union AffineAnimCmd *const gSpriteAffineAnimTable_0839F44C[] = {
-    SpriteAffineAnim_839F41C,
-    SpriteAffineAnim_839F434
-};
-
-void (*const gUnknown_0839F454[])(struct Task *) = {
-    sub_80892A0,
-    sub_8089354,
-    sub_80893C0,
-    sub_8089414,
-    sub_808948C,
-    sub_80894C4,
-    fishE
-};
-
-const s16 gUnknown_0839F470[] = {
-    -2,
-    -4,
-    -5,
-    -6,
-    -7,
-    -8,
-    -8,
-    -8,
-    -7,
-    -7,
-    -6,
-    -5,
-    -3,
-    -2,
-     0,
-     2,
-     4,
-     8
-};
diff --git a/src/field_effect.c b/src/field_effect.c
index 6cff8b864..8728155e1 100755
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -22,14 +22,402 @@
 #include "field_camera.h"
 #include "field_effect.h"
 
-typedef bool8 (*FldEffCmd)(u8 **, u32 *);
+#define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
+
+#define obj_frame_tiles(ptr) {.data = (u8 *)ptr, .size = sizeof ptr}
+
+const u32 gSpriteImage_839DC14[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
+const u16 gBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
+const u32 gSpriteImage_839E434[] = INCBIN_U32("graphics/misc/pokeball_glow.4bpp");
+const u16 gFieldEffectObjectPalette4[16] = INCBIN_U16("graphics/field_effect_objects/palettes/04.gbapal");
+const u32 gSpriteImage_839E474[] = INCBIN_U32("graphics/misc/pokecenter_monitor/0.4bpp");
+const u32 gSpriteImage_839E534[] = INCBIN_U32("graphics/misc/pokecenter_monitor/1.4bpp");
+const u32 gSpriteImage_839E5F4[] = INCBIN_U32("graphics/misc/big_hof_monitor.4bpp");
+const u32 gSpriteImage_839E7F4[] = INCBIN_U32("graphics/misc/small_hof_monitor.4bpp");
+const u16 gFieldEffectObjectPalette5[16] = INCBIN_U16("graphics/field_effect_objects/palettes/05.gbapal");
+
+// Graphics for the lights streaking past your Pokemon when it uses a field move.
+const u32 gFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/field_move_streaks.4bpp");
+const u16 gFieldMoveStreaksPalette[16] = INCBIN_U16("graphics/misc/field_move_streaks.gbapal");
+const u16 gFieldMoveStreaksTilemap[] = INCBIN_U16("graphics/misc/field_move_streaks_map.bin");
+
+// The following light streaks effect is used when the map is dark (e.g. a cave).
+const u32 gDarknessFieldMoveStreaksTiles[] = INCBIN_U32("graphics/misc/darkness_field_move_streaks.4bpp");
+const u16 gDarknessFieldMoveStreaksPalette[16] = INCBIN_U16("graphics/misc/darkness_field_move_streaks.gbapal");
+const u16 gDarknessFieldMoveStreaksTilemap[] = INCBIN_U16("graphics/misc/darkness_field_move_streaks_map.bin");
+
+bool8 (*const gFieldEffectScriptFuncs[])(u8 **, u32 *) = {
+    FieldEffectCmd_loadtiles,
+    FieldEffectCmd_loadfadedpal,
+    FieldEffectCmd_loadpal,
+    FieldEffectCmd_callnative,
+    FieldEffectCmd_end,
+    FieldEffectCmd_loadgfx_callnative,
+    FieldEffectCmd_loadtiles_callnative,
+    FieldEffectCmd_loadfadedpal_callnative,
+};
+
+const struct OamData gOamData_839F0F4 = {.size = 3};
+const struct OamData gOamData_839F0FC = {.size = 0};
+const struct OamData gOamData_839F104 = {.size = 1};
+
+const struct SpriteFrameImage gSpriteImageTable_839F10C[] = {
+    obj_frame_tiles(gSpriteImage_839DC14)
+};
+const struct SpritePalette gUnknown_0839F114 = {.data = gBirchPalette, .tag = 0x1006};
+
+const union AnimCmd gSpriteAnim_839F11C[] = {
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_839F124[] = {
+    gSpriteAnim_839F11C
+};
+
+const struct SpriteTemplate gSpriteTemplate_839F128 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4102,
+    .oam = &gOamData_839F0F4,
+    .anims = (const union AnimCmd *const *)&gSpriteAnimTable_839F124,
+    .images = gSpriteImageTable_839F10C,
+    .affineAnims = (const union AffineAnimCmd *const *)&gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy
+};
+
+const struct SpritePalette gFieldEffectObjectPaletteInfo4 = {.data = gFieldEffectObjectPalette4, .tag = 0x1007};
+const struct SpritePalette gFieldEffectObjectPaletteInfo5 = {.data = gFieldEffectObjectPalette5, .tag = 0x1010};
+const struct OamData gOamData_839F150 = {
+    .shape = 1,
+    .size = 2
+};
+
+const struct SpriteFrameImage gSpriteImageTable_839F158[] = {
+    obj_frame_tiles(gSpriteImage_839E434)
+};
+
+const struct SpriteFrameImage gSpriteImageTable_839F160[] = {
+    obj_frame_tiles(gSpriteImage_839E474),
+    obj_frame_tiles(gSpriteImage_839E534)
+};
+
+const struct SpriteFrameImage gSpriteImageTable_839F170[] = {
+    obj_frame_tiles(gSpriteImage_839E5F4)
+};
+
+const struct SpriteFrameImage gSpriteImageTable_839F178[] = {
+    {.data = (u8 *)gSpriteImage_839E7F4, .size = 0x200} // the macro breaks down here
+};
+
+const struct Subsprite Unknown_39F180[] = {
+    {.x = -12, .y = -8, .priority = 2, .tileOffset = 0, .shape = 1, .size = 0},
+    {.x =   4, .y = -8, .priority = 2, .tileOffset = 2, .shape = 0, .size = 0},
+    {.x = -12, .y =  0, .priority = 2, .tileOffset = 3, .shape = 1, .size = 0},
+    {.x =   4, .y =  0, .priority = 2, .tileOffset = 5, .shape = 0, .size = 0}
+};
+
+const struct SubspriteTable gUnknown_0839F1A0 = subsprite_table(Unknown_39F180);
+
+const struct Subsprite Unknown_39F1A8[] = {
+    {.x = -32, .y = -8, .priority = 2, .tileOffset =  0, .shape = 1, .size = 1},
+    {.x =   0, .y = -8, .priority = 2, .tileOffset =  4, .shape = 1, .size = 1},
+    {.x = -32, .y =  0, .priority = 2, .tileOffset =  8, .shape = 1, .size = 1},
+    {.x =   0, .y =  0, .priority = 2, .tileOffset = 12, .shape = 1, .size = 1}
+};
+
+const struct SubspriteTable gUnknown_0839F1C8 = subsprite_table(Unknown_39F1A8);
+
+const union AnimCmd gSpriteAnim_839F1D0[] = {
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 1),
+    ANIMCMD_JUMP(0)
+};
+
+const union AnimCmd gSpriteAnim_839F1D8[] = {
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 0, .duration = 16),
+    ANIMCMD_FRAME(.imageValue = 1, .duration = 16),
+    ANIMCMD_END
+};
+
+const union AnimCmd *const gSpriteAnimTable_839F1FC[] = {
+    gSpriteAnim_839F1D0,
+    gSpriteAnim_839F1D8
+};
+
+const union AnimCmd *const gSpriteAnimTable_839F204[] = {
+    gSpriteAnim_839F1D0
+};
+
+const struct SpriteTemplate gSpriteTemplate_839F208 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4103,
+    .oam = &gOamData_839F0FC,
+    .anims = gSpriteAnimTable_839F1FC,
+    .images = gSpriteImageTable_839F158,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_PokeballGlow
+};
+
+
+const struct SpriteTemplate gSpriteTemplate_839F220 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4100,
+    .oam = &gOamData_839F104,
+    .anims = gSpriteAnimTable_839F1FC,
+    .images = gSpriteImageTable_839F160,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_PokecenterMonitor
+};
+
+
+const struct SpriteTemplate gSpriteTemplate_839F238 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4112,
+    .oam = &gOamData_839F104,
+    .anims = gSpriteAnimTable_839F204,
+    .images = gSpriteImageTable_839F170,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_HallOfFameMonitor
+};
+
+
+const struct SpriteTemplate gSpriteTemplate_839F250 = {
+    .tileTag = 0xffff,
+    .paletteTag = 4112,
+    .oam = &gOamData_839F150,
+    .anims = gSpriteAnimTable_839F204,
+    .images = gSpriteImageTable_839F178,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCB_HallOfFameMonitor
+};
+
+void (*const gUnknown_0839F268[])(struct Task *) = {
+    PokecenterHealEffect_0,
+    PokecenterHealEffect_1,
+    PokecenterHealEffect_2,
+    PokecenterHealEffect_3
+};
+
+void (*const gUnknown_0839F278[])(struct Task *) = {
+    HallOfFameRecordEffect_0,
+    HallOfFameRecordEffect_1,
+    HallOfFameRecordEffect_2,
+    HallOfFameRecordEffect_3
+};
+
+void (*const gUnknown_0839F288[])(struct Sprite *) = {
+    PokeballGlowEffect_0,
+    PokeballGlowEffect_1,
+    PokeballGlowEffect_2,
+    PokeballGlowEffect_3,
+    PokeballGlowEffect_4,
+    PokeballGlowEffect_5,
+    PokeballGlowEffect_6,
+    PokeballGlowEffect_7
+};
+
+const struct Coords16 gUnknown_0839F2A8[] = {
+    {.x = 0, .y = 0},
+    {.x = 6, .y = 0},
+    {.x = 0, .y = 4},
+    {.x = 6, .y = 4},
+    {.x = 0, .y = 8},
+    {.x = 6, .y = 8}
+};
+
+const u8 gUnknown_0839F2C0[] = {16, 12, 8, 0};
+const u8 gUnknown_0839F2C4[] = {16, 12, 8, 0};
+const u8 gUnknown_0839F2C8[] = { 0,  0, 0, 0};
+
+bool8 (*const gUnknown_0839F2CC[])(struct Task *) = {
+    sub_80867AC,
+    sub_8086854,
+    sub_8086870,
+    sub_80868E4,
+    sub_808699C,
+    sub_80869B8,
+    sub_80869F8
+};
+
+bool8 (*const gUnknown_0839F2E8[])(struct Task *) = {
+    sub_8086AA0,
+    sub_8086AC0,
+    sub_8086B30,
+    sub_8086B54,
+    sub_8086B64,
+    sub_8086B88
+};
+
+bool8 (*const gUnknown_0839F300[])(struct Task *) = {
+    sub_8086CF4,
+    sub_8086D70,
+    sub_8086DB0,
+    sub_8086E10,
+    sub_8086E50,
+    sub_8086EB0,
+    sub_8086ED4
+};
+
+bool8 (*const gUnknown_0839F31C[])(struct Task *, struct MapObject *) = {
+    sub_8086FB0,
+    waterfall_1_do_anim_probably,
+    waterfall_2_wait_anim_finish_probably,
+    sub_8087030,
+    sub_8087058
+};
+
+bool8 (*const gUnknown_0839F330[])(struct Task *) = {
+    sub_8087124,
+    dive_2_unknown,
+    dive_3_unknown
+};
+
+bool8 (*const gUnknown_0839F33C[])(struct Task *, struct MapObject *, struct Sprite *) = {
+    sub_808722C,
+    sub_8087264,
+    sub_8087298,
+    sub_80872E4,
+    sub_80873D8,
+    sub_80873F4
+};
+
+bool8 (*const gUnknown_0839F354[])(struct Task *, struct MapObject *, struct Sprite *) = {
+    sub_80874CC,
+    sub_80874FC,
+    sub_8087548,
+    sub_808759C
+};
+
+bool8 (*const gUnknown_0839F364[])(struct Task *, struct MapObject *, struct Sprite *) = {
+    sub_80876C8,
+    sub_80876F8,
+    sub_8087774,
+    sub_80877AC,
+    sub_80877D4
+};
+
+void (*const gUnknown_0839F378[])(struct Task *) = {
+    sub_80878F4,
+    sub_8087914
+};
+
+const u8 gUnknown_0839F380[] = {1, 3, 4, 2, 1};
+
+void (*const gUnknown_0839F388[])(struct Task *) = {
+    sub_8087AA4,
+    sub_8087AC8
+};
+
+void (*const gUnknown_0839F390[])(struct Task *) = {
+    sub_8087BEC,
+    sub_8087C14,
+    sub_8087CA4,
+    sub_8087D78
+};
+
+void (*const gUnknown_0839F3A0[])(struct Task *) = {
+    sub_8087E4C,
+    sub_8087ED8,
+    sub_8087FDC
+};
+
+void (*const gUnknown_0839F3AC[])(struct Task *) = {
+    sub_8088150,
+    sub_80881C0,
+    sub_8088228,
+    sub_80882B4,
+    sub_80882E4,
+    sub_8088338,
+    sub_8088380
+};
+
+void (*const gUnknown_0839F3C8[])(struct Task *) = {
+    sub_80884AC,
+    sub_80884E8,
+    sub_8088554,
+    sub_80885A8,
+    sub_80885D8,
+    sub_808860C,
+    sub_808862C
+};
+
+void (*const gUnknown_0839F3E4[])(struct Task *) = {
+    sub_8088984,
+    sub_80889E4,
+    sub_8088A30,
+    sub_8088A78,
+    sub_8088AF4
+};
+
+void (*const gUnknown_0839F3F8[])(struct Task *) = {
+    sub_8088CA0,
+    sub_8088CF8,
+    sub_8088D3C,
+    sub_8088D94,
+    sub_8088DD8,
+    sub_8088E2C,
+    sub_8088EB4,
+    sub_8088F10,
+    sub_8088F30
+};
+
+const union AffineAnimCmd SpriteAffineAnim_839F41C[] = {
+    AFFINEANIMCMD_FRAME(8, 8, -30, 0),
+    AFFINEANIMCMD_FRAME(28, 28, 0, 30),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd SpriteAffineAnim_839F434[] = {
+    AFFINEANIMCMD_FRAME(256, 256, 64, 0),
+    AFFINEANIMCMD_FRAME(-10, -10, 0, 22),
+    AFFINEANIMCMD_END
+};
+
+const union AffineAnimCmd *const gSpriteAffineAnimTable_0839F44C[] = {
+    SpriteAffineAnim_839F41C,
+    SpriteAffineAnim_839F434
+};
+
+void (*const gUnknown_0839F454[])(struct Task *) = {
+    sub_80892A0,
+    sub_8089354,
+    sub_80893C0,
+    sub_8089414,
+    sub_808948C,
+    sub_80894C4,
+    fishE
+};
+
+const s16 gUnknown_0839F470[] = {
+    -2,
+    -4,
+    -5,
+    -6,
+    -7,
+    -8,
+    -8,
+    -8,
+    -7,
+    -7,
+    -6,
+    -5,
+    -3,
+    -2,
+    0,
+    2,
+    4,
+    8
+};
 
 static u8 sActiveList[32];
 
 extern u8 *gFieldEffectScriptPointers[];
 
-extern FldEffCmd gFieldEffectScriptFuncs[];
-
 u32 FieldEffectStart(u8 id)
 {
     u8 *script;
@@ -460,7 +848,6 @@ void MultiplyPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
 #endif
 
 void Task_PokecenterHeal(u8 taskId);
-extern const void (*gUnknown_0839F268[4])(struct Task *);
 u8 CreatePokeballGlowSprite(s16, s16, s16, u16);
 u8 PokecenterHealEffectHelper(s16, s16);
 
@@ -521,7 +908,6 @@ void PokecenterHealEffect_3(struct Task *task)
 }
 
 void Task_HallOfFameRecord(u8 taskId);
-extern const void (*gUnknown_0839F278[4])(struct Task *);
 void HallOfFameRecordEffectHelper(s16, s16, s16, u8);
 
 bool8 FldEff_HallOfFameRecord(void)
@@ -585,14 +971,6 @@ void HallOfFameRecordEffect_3(struct Task *task)
 }
 
 void SpriteCB_PokeballGlowEffect(struct Sprite *);
-extern const void (*gUnknown_0839F288[8])(struct Sprite *);
-extern const struct SpriteTemplate gSpriteTemplate_839F208;
-extern const struct SpriteTemplate gSpriteTemplate_839F220;
-extern const struct SpriteTemplate gSpriteTemplate_839F238;
-extern const struct SpriteTemplate gSpriteTemplate_839F250;
-extern const struct SubspriteTable gUnknown_0839F1A0;
-extern const struct SubspriteTable gUnknown_0839F1C8;
-extern const struct Coords16 gUnknown_0839F2A8[6];
 
 u8 CreatePokeballGlowSprite(s16 data6, s16 x, s16 y, u16 data5)
 {
@@ -633,10 +1011,6 @@ void PokeballGlowEffect_0(struct Sprite *sprite)
     }
 }
 
-extern const u8 gUnknown_0839F2C0[4]; // red
-extern const u8 gUnknown_0839F2C4[4]; // green
-extern const u8 gUnknown_0839F2C8[4]; // blue
-
 void PokeballGlowEffect_1(struct Sprite *sprite)
 {
     if ((--sprite->data1) == 0)
@@ -881,7 +1255,6 @@ void c3_080843F8(u8 taskId)
 
 extern void pal_fill_for_map_transition(void);
 void sub_8086774(u8);
-extern const bool8 (*gUnknown_0839F2CC[7])(struct Task *);
 extern void CameraObjectReset2(void);
 extern void CameraObjectReset1(void);
 
@@ -1015,8 +1388,6 @@ bool8 sub_80869F8(struct Task *task)
 }
 
 void sub_8086A68(u8);
-extern const bool8 (*gUnknown_0839F2E8[6])(struct Task *);
-extern const bool8 (*gUnknown_0839F300[7])(struct Task *);
 extern void sub_80B4824(u8);
 extern void sub_8053FF8(void);
 extern void fade_8080918(void);
@@ -1285,7 +1656,6 @@ bool8 sub_8086ED4(struct Task *task)
 }
 
 void sub_8086F64(u8);
-extern const bool8 (*gUnknown_0839F31C[5])(struct Task *, struct MapObject *);
 
 bool8 FldEff_UseWaterfall(void)
 {
@@ -1358,7 +1728,6 @@ bool8 sub_8087058(struct Task *task, struct MapObject *mapObject)
 }
 
 void Task_Dive(u8);
-extern const bool8 (*gUnknown_0839F330[3])(struct Task *);
 extern int dive_warp(struct MapPosition *, u16);
 
 bool8 FldEff_UseDive(void)
@@ -1406,7 +1775,6 @@ bool8 dive_3_unknown(struct Task *task)
 }
 
 void sub_80871D0(u8);
-extern const bool8 (*gUnknown_0839F33C[6])(struct Task *, struct MapObject *, struct Sprite *);
 void mapldr_080851BC(void);
 
 void sub_80871B8(u8 priority)
@@ -1522,7 +1890,6 @@ bool8 sub_80873F4(struct Task *task, struct MapObject *mapObject, struct Sprite
 }
 
 void sub_8087470(u8);
-extern const bool8 (*gUnknown_0839F354[4])(struct Task *, struct MapObject *, struct Sprite *);
 extern u8 sub_80608A4(u8);
 
 void mapldr_080851BC(void)
@@ -1611,7 +1978,6 @@ void sub_8087638(struct Sprite *sprite)
 }
 
 void sub_808766C(u8);
-extern const bool8 (*gUnknown_0839F364[5])(struct Task *, struct MapObject *, struct Sprite *);
 
 void sub_8087654(u8 priority)
 {
@@ -1677,8 +2043,6 @@ bool8 sub_80877AC(struct Task *task, struct MapObject *mapObject, struct Sprite
 }
 
 void sub_80878C4(u8);
-extern u8 gUnknown_0839F380[5];
-extern const void (*gUnknown_0839F378[2])(struct Task *);
 void mapldr_080859D4(void);
 
 bool8 sub_80877D4(struct Task *task, struct MapObject *mapObject, struct Sprite *sprite)
@@ -1764,7 +2128,6 @@ void sub_8087914(struct Task *task)
 }
 
 void sub_8087A74(u8);
-extern const void (*gUnknown_0839F388[2])(struct Task *);
 
 void mapldr_080859D4(void)
 {
@@ -1822,7 +2185,6 @@ void sub_8087AC8(struct Task *task)
 }
 
 void sub_8087BBC(u8);
-extern const void (*gUnknown_0839F390[4])(struct Task *);
 void mapldr_08085D88(void);
 
 void sub_8087BA8(void)
@@ -1910,7 +2272,6 @@ void sub_8087D78(struct Task *task)
 }
 
 void sub_8087E1C(u8);
-extern const void (*gUnknown_0839F3A0[3])(struct Task *);
 
 void mapldr_08085D88(void)
 {
@@ -2013,14 +2374,6 @@ void sub_8087FDC(struct Task *task)
 void sub_8088120(u8);
 void sub_808847C(u8);
 u8 sub_8088830(u32, u32, u32);
-extern const void (*gUnknown_0839F3AC[7])(struct Task *);
-extern const void (*gUnknown_0839F3C8[7])(struct Task *);
-extern const u32 gFieldMoveStreaksTiles[0x200];
-extern const u16 gFieldMoveStreaksPalette[16];
-extern const u16 gFieldMoveStreaksTilemap[10 * 32];
-extern const u32 gDarknessFieldMoveStreaksTiles[0x80];
-extern const u16 gDarknessFieldMoveStreaksPalette[16];
-extern const u16 gDarknessFieldMoveStreaksTilemap[10 * 32];
 void sub_80883DC(void);
 void sub_808843C(u16);
 void sub_8088890(struct Sprite *);
@@ -2517,7 +2870,6 @@ void sub_80888F0(struct Sprite *sprite)
 }
 
 void sub_8088954(u8);
-extern const void (*gUnknown_0839F3E4[5])(struct Task *);
 
 u8 FldEff_UseSurf(void)
 {
@@ -2641,7 +2993,6 @@ void sub_8088BC4(struct Sprite *sprite)
 }
 
 void sub_8088C70(u8);
-extern const void (*gUnknown_0839F3F8[9])(struct Task *);
 extern void sub_8127EFC(u8, u8);
 u8 sub_8088F60(void);
 bool8 sub_8088FA4(u8);
@@ -2649,7 +3000,6 @@ void sub_8088FC0(u8);
 void sub_8088FFC(u8, u8);
 void sub_8089018(struct Sprite *);
 void sub_80890D8(struct Sprite *);
-extern const union AffineAnimCmd *gSpriteAffineAnimTable_0839F44C[];
 
 u8 FldEff_UseFly(void)
 {
@@ -2922,8 +3272,6 @@ void sub_8089230(u8 spriteId)
 }
 
 void sub_8089270(u8);
-extern const void (*gUnknown_0839F454[7])(struct Task *);
-extern const s16 gUnknown_0839F470[18];
 
 u8 FldEff_FlyIn(void)
 {
-- 
cgit v1.2.3


From 355498d85b71536580025364ccaa5ceb94c4194d Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 13 Jun 2017 19:28:50 -0400
Subject: Decoration inventory data

---
 data/decoration.s              |  0
 data/decoration_inventory.s    | 16 ----------------
 data/decorations.inc           |  0
 include/decoration_inventory.h |  0
 include/menu.h                 |  0
 include/sprite.h               |  0
 ld_script.txt                  |  2 +-
 src/decoration.c               | 28 ++++++++++++++--------------
 src/decoration_inventory.c     | 13 +++++++++++++
 src/menu.c                     |  0
 src/scrcmd.c                   |  0
 11 files changed, 28 insertions(+), 31 deletions(-)
 mode change 100644 => 100755 data/decoration.s
 delete mode 100644 data/decoration_inventory.s
 mode change 100644 => 100755 data/decorations.inc
 mode change 100644 => 100755 include/decoration_inventory.h
 mode change 100644 => 100755 include/menu.h
 mode change 100644 => 100755 include/sprite.h
 mode change 100644 => 100755 ld_script.txt
 mode change 100644 => 100755 src/decoration_inventory.c
 mode change 100644 => 100755 src/menu.c
 mode change 100644 => 100755 src/scrcmd.c

diff --git a/data/decoration.s b/data/decoration.s
old mode 100644
new mode 100755
diff --git a/data/decoration_inventory.s b/data/decoration_inventory.s
deleted file mode 100644
index a70dedbe5..000000000
--- a/data/decoration_inventory.s
+++ /dev/null
@@ -1,16 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-@ pointer to decorations, capacity
-	.align 2
-gDecorationInventories:: @ 8402E40
-	.4byte gSaveBlock1 + 0x26A0, 10 @ DESK
-	.4byte gSaveBlock1 + 0x26AA, 10 @ CHAIR
-	.4byte gSaveBlock1 + 0x26B4, 10 @ PLANT
-	.4byte gSaveBlock1 + 0x26BE, 30 @ ORNAMENT
-	.4byte gSaveBlock1 + 0x26DC, 30 @ MAT
-	.4byte gSaveBlock1 + 0x26FA, 10 @ POSTER
-	.4byte gSaveBlock1 + 0x2704, 40 @ DOLL
-	.4byte gSaveBlock1 + 0x272C, 10 @ CUSHION
diff --git a/data/decorations.inc b/data/decorations.inc
old mode 100644
new mode 100755
diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h
old mode 100644
new mode 100755
diff --git a/include/menu.h b/include/menu.h
old mode 100644
new mode 100755
diff --git a/include/sprite.h b/include/sprite.h
old mode 100644
new mode 100755
diff --git a/ld_script.txt b/ld_script.txt
old mode 100644
new mode 100755
index b4c30ad57..884b886d6
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -461,7 +461,7 @@ SECTIONS {
         data/battle_anim_81258BC.o(.rodata);
         data/battle_anim_812C144.o(.rodata);
         data/learn_move.o(.rodata);
-        data/decoration_inventory.o(.rodata);
+        src/decoration_inventory.o(.rodata);
         src/roamer.o(.rodata);
         data/battle_tower.o(.rodata);
         data/use_pokeblock.o(.rodata);
diff --git a/src/decoration.c b/src/decoration.c
index 729f14280..3fa230cd5 100755
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -2105,7 +2105,7 @@ void sub_8100B6C(void)
             }
             for (j=0; j<gUnknown_020391B4[i].var02; j++)
             {
-                for (k=0; k<gUnknown_020391B4[i].var01; k++)
+                for (k=0; k<gUnknown_020391B4[i].width; k++)
                 {
                     MapGridSetMetatileEntryAt(x + 7 + k, y + 7 - j, ((u16 *)gMapHeader.mapData->map)[(x + k) + gMapHeader.mapData->width * (y - j)] | 0x3000);
                 }
@@ -2277,43 +2277,43 @@ void sub_8101118(u8 decorIdx, struct UnkStruct_020391B4 *unk_020391B4)
 {
     if (gDecorations[decorIdx].decor_field_12 == 0)
     {
-        unk_020391B4->var01 = 1;
+        unk_020391B4->width = 1;
         unk_020391B4->var02 = 1;
     } else if (gDecorations[decorIdx].decor_field_12 == 1)
     {
-        unk_020391B4->var01 = 2;
+        unk_020391B4->width = 2;
         unk_020391B4->var02 = 1;
     } else if (gDecorations[decorIdx].decor_field_12 == 2)
     {
-        unk_020391B4->var01 = 3;
+        unk_020391B4->width = 3;
         unk_020391B4->var02 = 1;
     } else if (gDecorations[decorIdx].decor_field_12 == 3)
     {
-        unk_020391B4->var01 = 4;
+        unk_020391B4->width = 4;
         unk_020391B4->var02 = 2;
     } else if (gDecorations[decorIdx].decor_field_12 == 4)
     {
-        unk_020391B4->var01 = 2;
+        unk_020391B4->width = 2;
         unk_020391B4->var02 = 2;
     } else if (gDecorations[decorIdx].decor_field_12 == 5)
     {
-        unk_020391B4->var01 = 1;
+        unk_020391B4->width = 1;
         unk_020391B4->var02 = 2;
     } else if (gDecorations[decorIdx].decor_field_12 == 6)
     {
-        unk_020391B4->var01 = 1;
+        unk_020391B4->width = 1;
         unk_020391B4->var02 = 3;
     } else if (gDecorations[decorIdx].decor_field_12 == 7)
     {
-        unk_020391B4->var01 = 2;
+        unk_020391B4->width = 2;
         unk_020391B4->var02 = 4;
     } else if (gDecorations[decorIdx].decor_field_12 == 8)
     {
-        unk_020391B4->var01 = 3;
+        unk_020391B4->width = 3;
         unk_020391B4->var02 = 3;
     } else if (gDecorations[decorIdx].decor_field_12 == 9)
     {
-        unk_020391B4->var01 = 3;
+        unk_020391B4->width = 3;
         unk_020391B4->var02 = 2;
     }
 }
@@ -2340,9 +2340,9 @@ bool8 sub_8101200(u8 taskId, u8 decorIdx, struct UnkStruct_020391B4 *unk_020391B
     {
         unk_020391B4->var02--;
     }
-    if (x >= xOff && x < xOff + unk_020391B4->var01 && y > yOff - unk_020391B4->var02 && y <= yOff)
+    if (x >= xOff && x < xOff + unk_020391B4->width && y > yOff - unk_020391B4->var02 && y <= yOff)
     {
-        sub_8101198(unk_020391B4->var01 - (x - xOff + 1), yOff - y);
+        sub_8101198(unk_020391B4->width - (x - xOff + 1), yOff - y);
         return TRUE;
     }
     return FALSE;
@@ -2434,7 +2434,7 @@ void sub_8101460(u8 taskId)
         {
             xOff = ewram_1f000.pos[gUnknown_020391B4[0].var00] >> 4;
             yOff = ewram_1f000.pos[gUnknown_020391B4[0].var00] & 0xf;
-            sub_81013B8(xOff, yOff - gUnknown_020391B4[0].var02 + 1, xOff + gUnknown_020391B4[0].var01 - 1, yOff);
+            sub_81013B8(xOff, yOff - gUnknown_020391B4[0].var02 + 1, xOff + gUnknown_020391B4[0].width - 1, yOff);
         }
     }
 }
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
old mode 100644
new mode 100755
index a483629b1..c3dfdb2a8
--- a/src/decoration_inventory.c
+++ b/src/decoration_inventory.c
@@ -8,6 +8,19 @@
 #include "decoration.h"
 #include "decoration_inventory.h"
 
+#define DECOR_INV(ptr) {.items = (u8 *)&ptr, .size = sizeof ptr}
+
+struct DecorationInventory const gDecorationInventories[] = {
+    DECOR_INV(gSaveBlock1.decorDesk),
+    DECOR_INV(gSaveBlock1.decorChair),
+    DECOR_INV(gSaveBlock1.decorPlant),
+    DECOR_INV(gSaveBlock1.decorOrnament),
+    DECOR_INV(gSaveBlock1.decorMat),
+    DECOR_INV(gSaveBlock1.decorPoster),
+    DECOR_INV(gSaveBlock1.decorDoll),
+    DECOR_INV(gSaveBlock1.decorCushion)
+};
+
 void ClearDecorationInventory(u8 invIdx)
 {
     u8 i;
diff --git a/src/menu.c b/src/menu.c
old mode 100644
new mode 100755
diff --git a/src/scrcmd.c b/src/scrcmd.c
old mode 100644
new mode 100755
-- 
cgit v1.2.3


From 826664fbdab63fef78bd29d95cf06db5175d9e43 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 13 Jun 2017 21:55:42 -0400
Subject: Propagate decoration category field label

---
 src/decoration_inventory.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
index a483629b1..879ceeb82 100644
--- a/src/decoration_inventory.c
+++ b/src/decoration_inventory.c
@@ -43,7 +43,7 @@ bool8 sub_8133FE4(u8 decorIdx)
 {
     u8 invIdx;
     u8 i;
-    invIdx = gDecorations[decorIdx].decor_field_13;
+    invIdx = gDecorations[decorIdx].category;
     for (i=0; i<gDecorationInventories[invIdx].size; i++)
     {
         if (gDecorationInventories[invIdx].items[i] == decorIdx)
@@ -62,7 +62,7 @@ bool8 IsThereStorageSpaceForDecoration(u8 decorIdx)
     {
         return FALSE;
     }
-    invIdx = gDecorations[decorIdx].decor_field_13;
+    invIdx = gDecorations[decorIdx].category;
     invSlot = sub_8133F9C(invIdx);
     if (invSlot == -1)
     {
@@ -79,7 +79,7 @@ bool8 sub_8134074(u8 decorIdx)
     {
         return FALSE;
     }
-    invIdx = gDecorations[decorIdx].decor_field_13;
+    invIdx = gDecorations[decorIdx].category;
     if (sub_8133F9C(invIdx) == -1)
     {
         return FALSE;
@@ -96,9 +96,9 @@ bool8 sub_81340A8(u8 decorIdx)
     {
         return FALSE;
     }
-    for (i=0; i<gDecorationInventories[gDecorations[decorIdx].decor_field_13].size; i++)
+    for (i=0; i<gDecorationInventories[gDecorations[decorIdx].category].size; i++)
     {
-        invIdx = gDecorations[decorIdx].decor_field_13;
+        invIdx = gDecorations[decorIdx].category;
         if (gDecorationInventories[invIdx].items[i] == decorIdx)
         {
             gDecorationInventories[invIdx].items[i] = DECOR_NONE;
-- 
cgit v1.2.3


From 701fd38c53050ab89380b32448700e39dc685cd6 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Tue, 13 Jun 2017 22:09:06 -0400
Subject: Fix mixed whitespace

---
 include/battle.h           |   48 +-
 include/contest_painting.h |    8 +-
 include/global.h           |  170 +++----
 include/items.h            |  758 +++++++++++++++---------------
 include/naming_screen.h    |    2 +-
 include/save.h             |   12 +-
 src/field_map_obj.c        |  274 +++++------
 src/secret_base.c          |  890 +++++++++++++++++------------------
 src/tv.c                   | 1112 ++++++++++++++++++++++----------------------
 src/util.c                 |  690 +++++++++++++--------------
 10 files changed, 1982 insertions(+), 1982 deletions(-)

diff --git a/include/battle.h b/include/battle.h
index 9714c6add..47ddef71d 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -107,9 +107,9 @@ struct SmallItemStruct
 struct BattleStruct /* 0x2000000 */
 {
     u8 filler0[0x15DDE];
-	/*0x15DDE*/ u8 unk15DDE;
-	/*0x15DDF*/ u8 unk15DDF;
-	/*0x15DE0*/ u8 filler15DE0[0x23C]; // 0xAF off?
+    /*0x15DDE*/ u8 unk15DDE;
+    /*0x15DDF*/ u8 unk15DDF;
+    /*0x15DE0*/ u8 filler15DE0[0x23C]; // 0xAF off?
     struct SmallBattleStruct1 unk;
     u8 filler1[0x68];
     /* 0x16089 */ u8 safariFleeRate;
@@ -148,27 +148,27 @@ extern struct AI_ThinkingStruct gAIThinkingSpace;
 
 struct UnknownStruct11
 {
-	u8 unk0;
-	u8 unk1;
-	u8 unk2;
-	u8 unk3;
-	u8 unk4;
-	u8 unk5_0:1;
-	u8 unk5_1:1;
-	u16 unk6;
-	u8 unk8[10];
-	u8 unk12;
-	u8 unk13;
-	u8 unk14[10];
-	u8 filler1E[2];
-	u16 unk20;
-	u16 unk22;
-	u16 unk24;
-	u16 unk26;
-	u16 unk28;
-	u8 unk2A[10];
-	u8 filler34[2];
-	u8 unk36[10];
+    u8 unk0;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u8 unk4;
+    u8 unk5_0:1;
+    u8 unk5_1:1;
+    u16 unk6;
+    u8 unk8[10];
+    u8 unk12;
+    u8 unk13;
+    u8 unk14[10];
+    u8 filler1E[2];
+    u16 unk20;
+    u16 unk22;
+    u16 unk24;
+    u16 unk26;
+    u16 unk28;
+    u8 unk2A[10];
+    u8 filler34[2];
+    u8 unk36[10];
 };
 
 #endif // GUARD_BATTLE_H
diff --git a/include/contest_painting.h b/include/contest_painting.h
index a67748d02..5c1b065c2 100644
--- a/include/contest_painting.h
+++ b/include/contest_painting.h
@@ -8,10 +8,10 @@
 
 enum
 {
-	NORMAL_RANK,
-	SUPER_RANK,
-	HYPER_RANK,
-	MASTER_RANK,
+    NORMAL_RANK,
+    SUPER_RANK,
+    HYPER_RANK,
+    MASTER_RANK,
 };
 
 enum
diff --git a/include/global.h b/include/global.h
index 13db2620f..7c6c5ab5f 100755
--- a/include/global.h
+++ b/include/global.h
@@ -16,7 +16,7 @@
 __attribute__((naked))\
 fndec\
 {\
-	asm_unified(x);\
+    asm_unified(x);\
 }\
 }
 
@@ -108,7 +108,7 @@ struct SecretBaseRecord
     /*0x1A09*/ u8 sbr_field_1_0:4;
     /*0x1A09*/ u8 gender:1;
     /*0x1A09*/ u8 sbr_field_1_5:1;
-	/*0x1A09*/ u8 sbr_field_1_6:2;
+    /*0x1A09*/ u8 sbr_field_1_6:2;
     /*0x1A0A*/ u8 sbr_field_2[7]; // 0xFF bytes?
     /*0x1A12*/ u8 trainerId[4]; // byte 0 is used for determining trainer class
     /*0x1A16*/ u16 sbr_field_e;
@@ -204,16 +204,16 @@ struct EasyChatPair
 struct TVShowCommon {
     /*0x00*/ u8 var00;
     /*0x01*/ u8 var01;
-	/*0x02*/ u8 pad02[20];
-	/*0x16*/ u16 var16[3];
-	/*0x1C*/ u8 srcTrainerId3Lo;
-	/*0x1D*/ u8 srcTrainerId3Hi;
-	/*0x1E*/ u8 srcTrainerId2Lo;
-	/*0x1F*/ u8 srcTrainerId2Hi;
-	/*0x20*/ u8 srcTrainerIdLo;
-	/*0x21*/ u8 srcTrainerIdHi;
-	/*0x22*/ u8 trainerIdLo;
-	/*0x23*/ u8 trainerIdHi;
+    /*0x02*/ u8 pad02[20];
+    /*0x16*/ u16 var16[3];
+    /*0x1C*/ u8 srcTrainerId3Lo;
+    /*0x1D*/ u8 srcTrainerId3Hi;
+    /*0x1E*/ u8 srcTrainerId2Lo;
+    /*0x1F*/ u8 srcTrainerId2Hi;
+    /*0x20*/ u8 srcTrainerIdLo;
+    /*0x21*/ u8 srcTrainerIdHi;
+    /*0x22*/ u8 trainerIdLo;
+    /*0x23*/ u8 trainerIdHi;
 };
 
 struct TVShowFanClubLetter {
@@ -229,7 +229,7 @@ struct TVShowRecentHappenings {
     /*0x00*/ u8 var00;
     /*0x01*/ u8 var01;
     /*0x02*/ u16 var02;
-	/*0x04*/ u16 var04[6];
+    /*0x04*/ u16 var04[6];
     /*0x10*/ u8 playerName[8];
     /*0x18*/ u8 language;
     /*0x19*/ u8 pad19[10];
@@ -251,10 +251,10 @@ struct TVShowFanclubOpinions {
 };
 
 struct TVShowUnknownType04 {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u8 pad02[4];
-	/*0x06*/ u16 var06;
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u8 pad02[4];
+    /*0x06*/ u16 var06;
 };
 
 struct TVShowNameRaterShow {
@@ -271,34 +271,34 @@ struct TVShowNameRaterShow {
 };
 
 struct TVShowBravoTrainerPokemonProfiles {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u16 species;
-	/*0x04*/ u16 var04[2];
-	/*0x08*/ u8 pokemonNickname[11];
-	/*0x13*/ u8 contestCategory:3;
-	/*0x13*/ u8 contestRank:2;
-	/*0x13*/ u8 contestResult:2;
-	/*0x13*/ u8 var13_7:1;
-	/*0x14*/ u16 var14;
-	/*0x16*/ u8 playerName[8];
-	/*0x1E*/ u8 language;
-	/*0x1F*/ u8 var1f;
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u16 species;
+    /*0x04*/ u16 var04[2];
+    /*0x08*/ u8 pokemonNickname[11];
+    /*0x13*/ u8 contestCategory:3;
+    /*0x13*/ u8 contestRank:2;
+    /*0x13*/ u8 contestResult:2;
+    /*0x13*/ u8 var13_7:1;
+    /*0x14*/ u16 var14;
+    /*0x16*/ u8 playerName[8];
+    /*0x1E*/ u8 language;
+    /*0x1F*/ u8 var1f;
 };
 
 struct TVShowBravoTrainerBattleTowerSpotlight {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u8 trainerName[8];
-	/*0x0A*/ u16 species;
-	/*0x0C*/ u8 pokemonName[8];
-	/*0x14*/ u16 defeatedSpecies;
-	/*0x16*/ u16 var16;
-	/*0x18*/ u16 var18[1];
-	/*0x1A*/ u8 btLevel;
-	/*0x1B*/ u8 var1b;
-	/*0x1C*/ u8 var1c;
-	/*0x1D*/ u8 language;
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u8 trainerName[8];
+    /*0x0A*/ u16 species;
+    /*0x0C*/ u8 pokemonName[8];
+    /*0x14*/ u16 defeatedSpecies;
+    /*0x16*/ u16 var16;
+    /*0x18*/ u16 var18[1];
+    /*0x1A*/ u8 btLevel;
+    /*0x1B*/ u8 var1b;
+    /*0x1C*/ u8 var1c;
+    /*0x1D*/ u8 language;
 };
 
 struct TVShowPokemonToday {
@@ -314,15 +314,15 @@ struct TVShowPokemonToday {
 };
 
 struct TVShowSmartShopper {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u8 priceReduced;
-	/*0x03*/ u8 language;
-	/*0x04*/ u8 pad04[2];
-	/*0x06*/ u16 itemIds[3];
-	/*0x0C*/ u16 itemAmounts[3];
-	/*0x12*/ u8 shopLocation;
-	/*0x13*/ u8 playerName[8];
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u8 priceReduced;
+    /*0x03*/ u8 language;
+    /*0x04*/ u8 pad04[2];
+    /*0x06*/ u16 itemIds[3];
+    /*0x0C*/ u16 itemAmounts[3];
+    /*0x12*/ u8 shopLocation;
+    /*0x13*/ u8 playerName[8];
 };
 
 struct TVShowPokemonTodayFailed {
@@ -339,27 +339,27 @@ struct TVShowPokemonTodayFailed {
 };
 
 struct TVShowPokemonAngler {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u8 var02;
-	/*0x03*/ u8 var03;
-	/*0x04*/ u16 var04;
-	/*0x06*/ u8 language;
-	u8 pad07[12];
-	/*0x13*/ u8 playerName[8];
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u8 var02;
+    /*0x03*/ u8 var03;
+    /*0x04*/ u16 var04;
+    /*0x06*/ u8 language;
+    u8 pad07[12];
+    /*0x13*/ u8 playerName[8];
 };
 
 struct TVShowWorldOfMasters {
-	/*0x00*/ u8 var00;
-	/*0x01*/ u8 var01;
-	/*0x02*/ u16 var02;
-	/*0x04*/ u16 var04;
-	/*0x06*/ u16 var06;
-	/*0x08*/ u16 var08;
-	/*0x0a*/ u8 var0a;
-	/*0x0b*/ u8 language;
-	u8 pad0c[7];
-	/*0x13*/ u8 playerName[8];
+    /*0x00*/ u8 var00;
+    /*0x01*/ u8 var01;
+    /*0x02*/ u16 var02;
+    /*0x04*/ u16 var04;
+    /*0x06*/ u16 var06;
+    /*0x08*/ u16 var08;
+    /*0x0a*/ u8 var0a;
+    /*0x0b*/ u8 language;
+    u8 pad0c[7];
+    /*0x13*/ u8 playerName[8];
 };
 
 struct TVShowMassOutbreak {
@@ -386,15 +386,15 @@ typedef union TVShow {
     struct TVShowFanClubLetter fanclubLetter;
     struct TVShowRecentHappenings recentHappenings;
     struct TVShowFanclubOpinions fanclubOpinions;
-	struct TVShowUnknownType04 unkShow04;
+    struct TVShowUnknownType04 unkShow04;
     struct TVShowNameRaterShow nameRaterShow;
-	struct TVShowBravoTrainerPokemonProfiles bravoTrainer;
-	struct TVShowBravoTrainerBattleTowerSpotlight bravoTrainerTower;
+    struct TVShowBravoTrainerPokemonProfiles bravoTrainer;
+    struct TVShowBravoTrainerBattleTowerSpotlight bravoTrainerTower;
     struct TVShowPokemonToday pokemonToday;
-	struct TVShowSmartShopper smartshopperShow;
+    struct TVShowSmartShopper smartshopperShow;
     struct TVShowPokemonTodayFailed pokemonTodayFailed;
-	struct TVShowPokemonAngler pokemonAngler;
-	struct TVShowWorldOfMasters worldOfMasters;
+    struct TVShowPokemonAngler pokemonAngler;
+    struct TVShowWorldOfMasters worldOfMasters;
     struct TVShowMassOutbreak massOutbreak;
 } TVShow;
 
@@ -456,9 +456,9 @@ typedef union SB_Struct {
 // size is 0x198
 
 struct UnknownSaveStruct2ABC {
-	u8 val0;
-	u8 val1;
-	u16 val2;
+    u8 val0;
+    u8 val1;
+    u16 val2;
 };
 
 struct GabbyAndTyData {
@@ -483,13 +483,13 @@ struct GabbyAndTyData {
 };
 
 struct RecordMixing_UnknownStructSub {
-	u8 data[0x38];
+    u8 data[0x38];
 };
 
 struct RecordMixing_UnknownStruct {
-	struct RecordMixing_UnknownStructSub data[2];
-	u32 unk70;
-	u16 unk74[0x2];
+    struct RecordMixing_UnknownStructSub data[2];
+    u32 unk70;
+    u16 unk74[0x2];
 };
 
 struct SaveBlock1 /* 0x02025734 */
@@ -541,7 +541,7 @@ struct SaveBlock1 /* 0x02025734 */
     /*0x2704*/ u8 decorDoll[40];
     /*0x272C*/ u8 decorCushion[10];
     /*0x2736*/ u8 padding_2736[2];
-	/*0x2738*/ TVShow tvShows[25];
+    /*0x2738*/ TVShow tvShows[25];
     /*0x2ABC*/ struct UnknownSaveStruct2ABC unknown_2ABC[16];
     /*0x2AFC*/ u16 outbreakPokemonSpecies;
     /*0x2AFE*/ u8 outbreakLocationMapNum;
@@ -608,8 +608,8 @@ struct Pokedex
 struct SaveBlock2_Sub
 {
     /*0x0000, 0x00A4*/ u8 filler_000[0x3D8];
-	/*0x03D8, 0x0480*/ u16 var_480;
-	/*0x03DA, 0x0482*/ u16 var_482;
+    /*0x03D8, 0x0480*/ u16 var_480;
+    /*0x03DA, 0x0482*/ u16 var_482;
     /*0x03DC, 0x0484*/ u8 filler_3DC[0xD1];
     /*0x04AD, 0x0555*/ u8 var_4AD;
     /*0x04AE, 0x0556*/ u8 var_4AE;
diff --git a/include/items.h b/include/items.h
index 11cc2113c..f3c506b43 100644
--- a/include/items.h
+++ b/include/items.h
@@ -2,387 +2,387 @@
 #define GUARD_ITEMS_H
 
 enum {
-	ITEM_NONE,           // 0x000
-	ITEM_MASTER_BALL,    // 0x001
-	ITEM_ULTRA_BALL,     // 0x002
-	ITEM_GREAT_BALL,     // 0x003
-	ITEM_POKE_BALL,      // 0x004
-	ITEM_SAFARI_BALL,    // 0x005
-	ITEM_NET_BALL,       // 0x006
-	ITEM_DIVE_BALL,      // 0x007
-	ITEM_NEST_BALL,      // 0x008
-	ITEM_REPEAT_BALL,    // 0x009
-	ITEM_TIMER_BALL,     // 0x00a
-	ITEM_LUXURY_BALL,    // 0x00b
-	ITEM_PREMIER_BALL,   // 0x00c
-	ITEM_POTION,         // 0x00d
-	ITEM_ANTIDOTE,       // 0x00e
-	ITEM_BURN_HEAL,      // 0x00f
-	ITEM_ICE_HEAL,       // 0x010
-	ITEM_AWAKENING,      // 0x011
-	ITEM_PARALYZE_HEAL,  // 0x012
-	ITEM_FULL_RESTORE,   // 0x013
-	ITEM_MAX_POTION,     // 0x014
-	ITEM_HYPER_POTION,   // 0x015
-	ITEM_SUPER_POTION,   // 0x016
-	ITEM_FULL_HEAL,      // 0x017
-	ITEM_REVIVE,         // 0x018
-	ITEM_MAX_REVIVE,     // 0x019
-	ITEM_FRESH_WATER,    // 0x01a
-	ITEM_SODA_POP,       // 0x01b
-	ITEM_LEMONADE,       // 0x01c
-	ITEM_MOOMOO_MILK,    // 0x01d
-	ITEM_ENERGY_POWDER,  // 0x01e
-	ITEM_ENERGY_ROOT,    // 0x01f
-	ITEM_HEAL_POWDER,    // 0x020
-	ITEM_REVIVAL_HERB,   // 0x021
-	ITEM_ETHER,          // 0x022
-	ITEM_MAX_ETHER,      // 0x023
-	ITEM_ELIXIR,         // 0x024
-	ITEM_MAX_ELIXIR,     // 0x025
-	ITEM_LAVA_COOKIE,    // 0x026
-	ITEM_BLUE_FLUTE,     // 0x027
-	ITEM_YELLOW_FLUTE,   // 0x028
-	ITEM_RED_FLUTE,      // 0x029
-	ITEM_BLACK_FLUTE,    // 0x02a
-	ITEM_WHITE_FLUTE,    // 0x02b
-	ITEM_BERRY_JUICE,    // 0x02c
-	ITEM_SACRED_ASH,     // 0x02d
-	ITEM_SHOAL_SALT,     // 0x02e
-	ITEM_SHOAL_SHELL,    // 0x02f
-	ITEM_RED_SHARD,      // 0x030
-	ITEM_BLUE_SHARD,     // 0x031
-	ITEM_YELLOW_SHARD,   // 0x032
-	ITEM_GREEN_SHARD,    // 0x033
-	ITEM_034,
-	ITEM_035,
-	ITEM_036,
-	ITEM_037,
-	ITEM_038,
-	ITEM_039,
-	ITEM_03A,
-	ITEM_03B,
-	ITEM_03C,
-	ITEM_03D,
-	ITEM_03E,
-	ITEM_HP_UP,          // 0x03f
-	ITEM_PROTEIN,        // 0x040
-	ITEM_IRON,           // 0x041
-	ITEM_CARBOS,         // 0x042
-	ITEM_CALCIUM,        // 0x043
-	ITEM_RARE_CANDY,     // 0x044
-	ITEM_PP_UP,          // 0x045
-	ITEM_ZINC,           // 0x046
-	ITEM_PP_MAX,         // 0x047
-	ITEM_048,
-	ITEM_GUARD_SPEC,     // 0x049
-	ITEM_DIRE_HIT,       // 0x04a
-	ITEM_X_ATTACK,       // 0x04b
-	ITEM_X_DEFEND,       // 0x04c
-	ITEM_X_SPEED,        // 0x04d
-	ITEM_X_ACCURACY,     // 0x04e
-	ITEM_X_SPECIAL,      // 0x04f
-	ITEM_POKE_DOLL,      // 0x050
-	ITEM_FLUFFY_TAIL,    // 0x051
-	ITEM_052,
-	ITEM_SUPER_REPEL,    // 0x053
-	ITEM_MAX_REPEL,      // 0x054
-	ITEM_ESCAPE_ROPE,    // 0x055
-	ITEM_REPEL,          // 0x056
-	ITEM_057,
-	ITEM_058,
-	ITEM_059,
-	ITEM_05A,
-	ITEM_05B,
-	ITEM_05C,
-	ITEM_SUN_STONE,      // 0x05d
-	ITEM_MOON_STONE,     // 0x05e
-	ITEM_FIRE_STONE,     // 0x05f
-	ITEM_THUNDER_STONE,  // 0x060
-	ITEM_WATER_STONE,    // 0x061
-	ITEM_LEAF_STONE,     // 0x062
-	ITEM_063,
-	ITEM_064,
-	ITEM_065,
-	ITEM_066,
-	ITEM_TINY_MUSHROOM,  // 0x067
-	ITEM_BIG_MUSHROOM,   // 0x068
-	ITEM_069,
-	ITEM_PEARL,          // 0x06a
-	ITEM_BIG_PEARL,      // 0x06b
-	ITEM_STARDUST,       // 0x06c
-	ITEM_STAR_PIECE,     // 0x06d
-	ITEM_NUGGET,         // 0x06e
-	ITEM_HEART_SCALE,    // 0x06f
-	ITEM_070,
-	ITEM_071,
-	ITEM_072,
-	ITEM_073,
-	ITEM_074,
-	ITEM_075,
-	ITEM_076,
-	ITEM_077,
-	ITEM_078,
-	ITEM_ORANGE_MAIL,    // 0x079
-	ITEM_HARBOR_MAIL,    // 0x07a
-	ITEM_GLITTER_MAIL,   // 0x07b
-	ITEM_MECH_MAIL,      // 0x07c
-	ITEM_WOOD_MAIL,      // 0x07d
-	ITEM_WAVE_MAIL,      // 0x07e
-	ITEM_BEAD_MAIL,      // 0x07f
-	ITEM_SHADOW_MAIL,    // 0x080
-	ITEM_TROPIC_MAIL,    // 0x081
-	ITEM_DREAM_MAIL,     // 0x082
-	ITEM_FAB_MAIL,       // 0x083
-	ITEM_RETRO_MAIL,     // 0x084
-	ITEM_CHERI_BERRY,    // 0x085
-	ITEM_CHESTO_BERRY,   // 0x086
-	ITEM_PECHA_BERRY,    // 0x087
-	ITEM_RAWST_BERRY,    // 0x088
-	ITEM_ASPEAR_BERRY,   // 0x089
-	ITEM_LEPPA_BERRY,    // 0x08a
-	ITEM_ORAN_BERRY,     // 0x08b
-	ITEM_PERSIM_BERRY,   // 0x08c
-	ITEM_LUM_BERRY,      // 0x08d
-	ITEM_SITRUS_BERRY,   // 0x08e
-	ITEM_FIGY_BERRY,     // 0x08f
-	ITEM_WIKI_BERRY,     // 0x090
-	ITEM_MAGO_BERRY,     // 0x091
-	ITEM_AGUAV_BERRY,    // 0x092
-	ITEM_IAPAPA_BERRY,   // 0x093
-	ITEM_RAZZ_BERRY,     // 0x094
-	ITEM_BLUK_BERRY,     // 0x095
-	ITEM_NANAB_BERRY,    // 0x096
-	ITEM_WEPEAR_BERRY,   // 0x097
-	ITEM_PINAP_BERRY,    // 0x098
-	ITEM_POMEG_BERRY,    // 0x099
-	ITEM_KELPSY_BERRY,   // 0x09a
-	ITEM_QUALOT_BERRY,   // 0x09b
-	ITEM_HONDEW_BERRY,   // 0x09c
-	ITEM_GREPA_BERRY,    // 0x09d
-	ITEM_TAMATO_BERRY,   // 0x09e
-	ITEM_CORNN_BERRY,    // 0x09f
-	ITEM_MAGOST_BERRY,   // 0x0a0
-	ITEM_RABUTA_BERRY,   // 0x0a1
-	ITEM_NOMEL_BERRY,    // 0x0a2
-	ITEM_SPELON_BERRY,   // 0x0a3
-	ITEM_PAMTRE_BERRY,   // 0x0a4
-	ITEM_WATMEL_BERRY,   // 0x0a5
-	ITEM_DURIN_BERRY,    // 0x0a6
-	ITEM_BELUE_BERRY,    // 0x0a7
-	ITEM_LIECHI_BERRY,   // 0x0a8
-	ITEM_GANLON_BERRY,   // 0x0a9
-	ITEM_SALAC_BERRY,    // 0x0aa
-	ITEM_PETAYA_BERRY,   // 0x0ab
-	ITEM_APICOT_BERRY,   // 0x0ac
-	ITEM_LANSAT_BERRY,   // 0x0ad
-	ITEM_STARF_BERRY,    // 0x0ae
-	ITEM_ENIGMA_BERRY,   // 0x0af
-	ITEM_0B0,
-	ITEM_0B1,
-	ITEM_0B2,
-	ITEM_BRIGHT_POWDER,  // 0x0b3
-	ITEM_WHITE_HERB,     // 0x0b4
-	ITEM_MACHO_BRACE,    // 0x0b5
-	ITEM_EXP_SHARE,      // 0x0b6
-	ITEM_QUICK_CLAW,     // 0x0b7
-	ITEM_SOOTHE_BELL,    // 0x0b8
-	ITEM_MENTAL_HERB,    // 0x0b9
-	ITEM_CHOICE_BAND,    // 0x0ba
-	ITEM_KINGS_ROCK,     // 0x0bb
-	ITEM_SILVER_POWDER,  // 0x0bc
-	ITEM_AMULET_COIN,    // 0x0bd
-	ITEM_CLEANSE_TAG,    // 0x0be
-	ITEM_SOUL_DEW,       // 0x0bf
-	ITEM_DEEP_SEA_TOOTH, // 0x0c0
-	ITEM_DEEP_SEA_SCALE, // 0x0c1
-	ITEM_SMOKE_BALL,     // 0x0c2
-	ITEM_EVERSTONE,      // 0x0c3
-	ITEM_FOCUS_BAND,     // 0x0c4
-	ITEM_LUCKY_EGG,      // 0x0c5
-	ITEM_SCOPE_LENS,     // 0x0c6
-	ITEM_METAL_COAT,     // 0x0c7
-	ITEM_LEFTOVERS,      // 0x0c8
-	ITEM_DRAGON_SCALE,   // 0x0c9
-	ITEM_LIGHT_BALL,     // 0x0ca
-	ITEM_SOFT_SAND,      // 0x0cb
-	ITEM_HARD_STONE,     // 0x0cc
-	ITEM_MIRACLE_SEED,   // 0x0cd
-	ITEM_BLACK_GLASSES,  // 0x0ce
-	ITEM_BLACK_BELT,     // 0x0cf
-	ITEM_MAGNET,         // 0x0d0
-	ITEM_MYSTIC_WATER,   // 0x0d1
-	ITEM_SHARP_BEAK,     // 0x0d2
-	ITEM_POISON_BARB,    // 0x0d3
-	ITEM_NEVER_MELT_ICE, // 0x0d4
-	ITEM_SPELL_TAG,      // 0x0d5
-	ITEM_TWISTED_SPOON,  // 0x0d6
-	ITEM_CHARCOAL,       // 0x0d7
-	ITEM_DRAGON_FANG,    // 0x0d8
-	ITEM_SILK_SCARF,     // 0x0d9
-	ITEM_UP_GRADE,       // 0x0da
-	ITEM_SHELL_BELL,     // 0x0db
-	ITEM_SEA_INCENSE,    // 0x0dc
-	ITEM_LAX_INCENSE,    // 0x0dd
-	ITEM_LUCKY_PUNCH,    // 0x0de
-	ITEM_METAL_POWDER,   // 0x0df
-	ITEM_THICK_CLUB,     // 0x0e0
-	ITEM_STICK,          // 0x0e1
-	ITEM_0E2,
-	ITEM_0E3,
-	ITEM_0E4,
-	ITEM_0E5,
-	ITEM_0E6,
-	ITEM_0E7,
-	ITEM_0E8,
-	ITEM_0E9,
-	ITEM_0EA,
-	ITEM_0EB,
-	ITEM_0EC,
-	ITEM_0ED,
-	ITEM_0EE,
-	ITEM_0EF,
-	ITEM_0F0,
-	ITEM_0F1,
-	ITEM_0F2,
-	ITEM_0F3,
-	ITEM_0F4,
-	ITEM_0F5,
-	ITEM_0F6,
-	ITEM_0F7,
-	ITEM_0F8,
-	ITEM_0F9,
-	ITEM_0FA,
-	ITEM_0FB,
-	ITEM_0FC,
-	ITEM_0FD,
-	ITEM_RED_SCARF,      // 0x0fe
-	ITEM_BLUE_SCARF,     // 0x0ff
-	ITEM_PINK_SCARF,     // 0x100
-	ITEM_GREEN_SCARF,    // 0x101
-	ITEM_YELLOW_SCARF,   // 0x102
-	ITEM_MACH_BIKE,      // 0x103
-	ITEM_COIN_CASE,      // 0x104
-	ITEM_ITEMFINDER,     // 0x105
-	ITEM_OLD_ROD,        // 0x106
-	ITEM_GOOD_ROD,       // 0x107
-	ITEM_SUPER_ROD,      // 0x108
-	ITEM_SS_TICKET,      // 0x109
-	ITEM_CONTEST_PASS,   // 0x10a
-	ITEM_10B,
-	ITEM_WAILMER_PAIL,   // 0x10c
-	ITEM_DEVON_GOODS,    // 0x10d
-	ITEM_SOOT_SACK,      // 0x10e
-	ITEM_BASEMENT_KEY,   // 0x10f
-	ITEM_ACRO_BIKE,      // 0x110
-	ITEM_POKEBLOCK_CASE, // 0x111
-	ITEM_LETTER,         // 0x112
-	ITEM_EON_TICKET,     // 0x113
-	ITEM_RED_ORB,        // 0x114
-	ITEM_BLUE_ORB,       // 0x115
-	ITEM_SCANNER,        // 0x116
-	ITEM_GO_GOGGLES,     // 0x117
-	ITEM_METEORITE,      // 0x118
-	ITEM_ROOM_1_KEY,     // 0x119
-	ITEM_ROOM_2_KEY,     // 0x11a
-	ITEM_ROOM_4_KEY,     // 0x11b
-	ITEM_ROOM_6_KEY,     // 0x11c
-	ITEM_STORAGE_KEY,    // 0x11d
-	ITEM_ROOT_FOSSIL,    // 0x11e
-	ITEM_CLAW_FOSSIL,    // 0x11f
-	ITEM_DEVON_SCOPE,    // 0x120
-	ITEM_TM01,           // 0x121
-	ITEM_TM02,           // 0x122
-	ITEM_TM03,           // 0x123
-	ITEM_TM04,           // 0x124
-	ITEM_TM05,           // 0x125
-	ITEM_TM06,           // 0x126
-	ITEM_TM07,           // 0x127
-	ITEM_TM08,           // 0x128
-	ITEM_TM09,           // 0x129
-	ITEM_TM10,           // 0x12a
-	ITEM_TM11,           // 0x12b
-	ITEM_TM12,           // 0x12c
-	ITEM_TM13,           // 0x12d
-	ITEM_TM14,           // 0x12e
-	ITEM_TM15,           // 0x12f
-	ITEM_TM16,           // 0x130
-	ITEM_TM17,           // 0x131
-	ITEM_TM18,           // 0x132
-	ITEM_TM19,           // 0x133
-	ITEM_TM20,           // 0x134
-	ITEM_TM21,           // 0x135
-	ITEM_TM22,           // 0x136
-	ITEM_TM23,           // 0x137
-	ITEM_TM24,           // 0x138
-	ITEM_TM25,           // 0x139
-	ITEM_TM26,           // 0x13a
-	ITEM_TM27,           // 0x13b
-	ITEM_TM28,           // 0x13c
-	ITEM_TM29,           // 0x13d
-	ITEM_TM30,           // 0x13e
-	ITEM_TM31,           // 0x13f
-	ITEM_TM32,           // 0x140
-	ITEM_TM33,           // 0x141
-	ITEM_TM34,           // 0x142
-	ITEM_TM35,           // 0x143
-	ITEM_TM36,           // 0x144
-	ITEM_TM37,           // 0x145
-	ITEM_TM38,           // 0x146
-	ITEM_TM39,           // 0x147
-	ITEM_TM40,           // 0x148
-	ITEM_TM41,           // 0x149
-	ITEM_TM42,           // 0x14a
-	ITEM_TM43,           // 0x14b
-	ITEM_TM44,           // 0x14c
-	ITEM_TM45,           // 0x14d
-	ITEM_TM46,           // 0x14e
-	ITEM_TM47,           // 0x14f
-	ITEM_TM48,           // 0x150
-	ITEM_TM49,           // 0x151
-	ITEM_TM50,           // 0x152
-	ITEM_HM01,           // 0x153
-	ITEM_HM02,           // 0x154
-	ITEM_HM03,           // 0x155
-	ITEM_HM04,           // 0x156
-	ITEM_HM05,           // 0x157
-	ITEM_HM06,           // 0x158
-	ITEM_HM07,           // 0x159
-	ITEM_HM08,           // 0x15a
-	ITEM_15B,
-	ITEM_15C,
+    ITEM_NONE,           // 0x000
+    ITEM_MASTER_BALL,    // 0x001
+    ITEM_ULTRA_BALL,     // 0x002
+    ITEM_GREAT_BALL,     // 0x003
+    ITEM_POKE_BALL,      // 0x004
+    ITEM_SAFARI_BALL,    // 0x005
+    ITEM_NET_BALL,       // 0x006
+    ITEM_DIVE_BALL,      // 0x007
+    ITEM_NEST_BALL,      // 0x008
+    ITEM_REPEAT_BALL,    // 0x009
+    ITEM_TIMER_BALL,     // 0x00a
+    ITEM_LUXURY_BALL,    // 0x00b
+    ITEM_PREMIER_BALL,   // 0x00c
+    ITEM_POTION,         // 0x00d
+    ITEM_ANTIDOTE,       // 0x00e
+    ITEM_BURN_HEAL,      // 0x00f
+    ITEM_ICE_HEAL,       // 0x010
+    ITEM_AWAKENING,      // 0x011
+    ITEM_PARALYZE_HEAL,  // 0x012
+    ITEM_FULL_RESTORE,   // 0x013
+    ITEM_MAX_POTION,     // 0x014
+    ITEM_HYPER_POTION,   // 0x015
+    ITEM_SUPER_POTION,   // 0x016
+    ITEM_FULL_HEAL,      // 0x017
+    ITEM_REVIVE,         // 0x018
+    ITEM_MAX_REVIVE,     // 0x019
+    ITEM_FRESH_WATER,    // 0x01a
+    ITEM_SODA_POP,       // 0x01b
+    ITEM_LEMONADE,       // 0x01c
+    ITEM_MOOMOO_MILK,    // 0x01d
+    ITEM_ENERGY_POWDER,  // 0x01e
+    ITEM_ENERGY_ROOT,    // 0x01f
+    ITEM_HEAL_POWDER,    // 0x020
+    ITEM_REVIVAL_HERB,   // 0x021
+    ITEM_ETHER,          // 0x022
+    ITEM_MAX_ETHER,      // 0x023
+    ITEM_ELIXIR,         // 0x024
+    ITEM_MAX_ELIXIR,     // 0x025
+    ITEM_LAVA_COOKIE,    // 0x026
+    ITEM_BLUE_FLUTE,     // 0x027
+    ITEM_YELLOW_FLUTE,   // 0x028
+    ITEM_RED_FLUTE,      // 0x029
+    ITEM_BLACK_FLUTE,    // 0x02a
+    ITEM_WHITE_FLUTE,    // 0x02b
+    ITEM_BERRY_JUICE,    // 0x02c
+    ITEM_SACRED_ASH,     // 0x02d
+    ITEM_SHOAL_SALT,     // 0x02e
+    ITEM_SHOAL_SHELL,    // 0x02f
+    ITEM_RED_SHARD,      // 0x030
+    ITEM_BLUE_SHARD,     // 0x031
+    ITEM_YELLOW_SHARD,   // 0x032
+    ITEM_GREEN_SHARD,    // 0x033
+    ITEM_034,
+    ITEM_035,
+    ITEM_036,
+    ITEM_037,
+    ITEM_038,
+    ITEM_039,
+    ITEM_03A,
+    ITEM_03B,
+    ITEM_03C,
+    ITEM_03D,
+    ITEM_03E,
+    ITEM_HP_UP,          // 0x03f
+    ITEM_PROTEIN,        // 0x040
+    ITEM_IRON,           // 0x041
+    ITEM_CARBOS,         // 0x042
+    ITEM_CALCIUM,        // 0x043
+    ITEM_RARE_CANDY,     // 0x044
+    ITEM_PP_UP,          // 0x045
+    ITEM_ZINC,           // 0x046
+    ITEM_PP_MAX,         // 0x047
+    ITEM_048,
+    ITEM_GUARD_SPEC,     // 0x049
+    ITEM_DIRE_HIT,       // 0x04a
+    ITEM_X_ATTACK,       // 0x04b
+    ITEM_X_DEFEND,       // 0x04c
+    ITEM_X_SPEED,        // 0x04d
+    ITEM_X_ACCURACY,     // 0x04e
+    ITEM_X_SPECIAL,      // 0x04f
+    ITEM_POKE_DOLL,      // 0x050
+    ITEM_FLUFFY_TAIL,    // 0x051
+    ITEM_052,
+    ITEM_SUPER_REPEL,    // 0x053
+    ITEM_MAX_REPEL,      // 0x054
+    ITEM_ESCAPE_ROPE,    // 0x055
+    ITEM_REPEL,          // 0x056
+    ITEM_057,
+    ITEM_058,
+    ITEM_059,
+    ITEM_05A,
+    ITEM_05B,
+    ITEM_05C,
+    ITEM_SUN_STONE,      // 0x05d
+    ITEM_MOON_STONE,     // 0x05e
+    ITEM_FIRE_STONE,     // 0x05f
+    ITEM_THUNDER_STONE,  // 0x060
+    ITEM_WATER_STONE,    // 0x061
+    ITEM_LEAF_STONE,     // 0x062
+    ITEM_063,
+    ITEM_064,
+    ITEM_065,
+    ITEM_066,
+    ITEM_TINY_MUSHROOM,  // 0x067
+    ITEM_BIG_MUSHROOM,   // 0x068
+    ITEM_069,
+    ITEM_PEARL,          // 0x06a
+    ITEM_BIG_PEARL,      // 0x06b
+    ITEM_STARDUST,       // 0x06c
+    ITEM_STAR_PIECE,     // 0x06d
+    ITEM_NUGGET,         // 0x06e
+    ITEM_HEART_SCALE,    // 0x06f
+    ITEM_070,
+    ITEM_071,
+    ITEM_072,
+    ITEM_073,
+    ITEM_074,
+    ITEM_075,
+    ITEM_076,
+    ITEM_077,
+    ITEM_078,
+    ITEM_ORANGE_MAIL,    // 0x079
+    ITEM_HARBOR_MAIL,    // 0x07a
+    ITEM_GLITTER_MAIL,   // 0x07b
+    ITEM_MECH_MAIL,      // 0x07c
+    ITEM_WOOD_MAIL,      // 0x07d
+    ITEM_WAVE_MAIL,      // 0x07e
+    ITEM_BEAD_MAIL,      // 0x07f
+    ITEM_SHADOW_MAIL,    // 0x080
+    ITEM_TROPIC_MAIL,    // 0x081
+    ITEM_DREAM_MAIL,     // 0x082
+    ITEM_FAB_MAIL,       // 0x083
+    ITEM_RETRO_MAIL,     // 0x084
+    ITEM_CHERI_BERRY,    // 0x085
+    ITEM_CHESTO_BERRY,   // 0x086
+    ITEM_PECHA_BERRY,    // 0x087
+    ITEM_RAWST_BERRY,    // 0x088
+    ITEM_ASPEAR_BERRY,   // 0x089
+    ITEM_LEPPA_BERRY,    // 0x08a
+    ITEM_ORAN_BERRY,     // 0x08b
+    ITEM_PERSIM_BERRY,   // 0x08c
+    ITEM_LUM_BERRY,      // 0x08d
+    ITEM_SITRUS_BERRY,   // 0x08e
+    ITEM_FIGY_BERRY,     // 0x08f
+    ITEM_WIKI_BERRY,     // 0x090
+    ITEM_MAGO_BERRY,     // 0x091
+    ITEM_AGUAV_BERRY,    // 0x092
+    ITEM_IAPAPA_BERRY,   // 0x093
+    ITEM_RAZZ_BERRY,     // 0x094
+    ITEM_BLUK_BERRY,     // 0x095
+    ITEM_NANAB_BERRY,    // 0x096
+    ITEM_WEPEAR_BERRY,   // 0x097
+    ITEM_PINAP_BERRY,    // 0x098
+    ITEM_POMEG_BERRY,    // 0x099
+    ITEM_KELPSY_BERRY,   // 0x09a
+    ITEM_QUALOT_BERRY,   // 0x09b
+    ITEM_HONDEW_BERRY,   // 0x09c
+    ITEM_GREPA_BERRY,    // 0x09d
+    ITEM_TAMATO_BERRY,   // 0x09e
+    ITEM_CORNN_BERRY,    // 0x09f
+    ITEM_MAGOST_BERRY,   // 0x0a0
+    ITEM_RABUTA_BERRY,   // 0x0a1
+    ITEM_NOMEL_BERRY,    // 0x0a2
+    ITEM_SPELON_BERRY,   // 0x0a3
+    ITEM_PAMTRE_BERRY,   // 0x0a4
+    ITEM_WATMEL_BERRY,   // 0x0a5
+    ITEM_DURIN_BERRY,    // 0x0a6
+    ITEM_BELUE_BERRY,    // 0x0a7
+    ITEM_LIECHI_BERRY,   // 0x0a8
+    ITEM_GANLON_BERRY,   // 0x0a9
+    ITEM_SALAC_BERRY,    // 0x0aa
+    ITEM_PETAYA_BERRY,   // 0x0ab
+    ITEM_APICOT_BERRY,   // 0x0ac
+    ITEM_LANSAT_BERRY,   // 0x0ad
+    ITEM_STARF_BERRY,    // 0x0ae
+    ITEM_ENIGMA_BERRY,   // 0x0af
+    ITEM_0B0,
+    ITEM_0B1,
+    ITEM_0B2,
+    ITEM_BRIGHT_POWDER,  // 0x0b3
+    ITEM_WHITE_HERB,     // 0x0b4
+    ITEM_MACHO_BRACE,    // 0x0b5
+    ITEM_EXP_SHARE,      // 0x0b6
+    ITEM_QUICK_CLAW,     // 0x0b7
+    ITEM_SOOTHE_BELL,    // 0x0b8
+    ITEM_MENTAL_HERB,    // 0x0b9
+    ITEM_CHOICE_BAND,    // 0x0ba
+    ITEM_KINGS_ROCK,     // 0x0bb
+    ITEM_SILVER_POWDER,  // 0x0bc
+    ITEM_AMULET_COIN,    // 0x0bd
+    ITEM_CLEANSE_TAG,    // 0x0be
+    ITEM_SOUL_DEW,       // 0x0bf
+    ITEM_DEEP_SEA_TOOTH, // 0x0c0
+    ITEM_DEEP_SEA_SCALE, // 0x0c1
+    ITEM_SMOKE_BALL,     // 0x0c2
+    ITEM_EVERSTONE,      // 0x0c3
+    ITEM_FOCUS_BAND,     // 0x0c4
+    ITEM_LUCKY_EGG,      // 0x0c5
+    ITEM_SCOPE_LENS,     // 0x0c6
+    ITEM_METAL_COAT,     // 0x0c7
+    ITEM_LEFTOVERS,      // 0x0c8
+    ITEM_DRAGON_SCALE,   // 0x0c9
+    ITEM_LIGHT_BALL,     // 0x0ca
+    ITEM_SOFT_SAND,      // 0x0cb
+    ITEM_HARD_STONE,     // 0x0cc
+    ITEM_MIRACLE_SEED,   // 0x0cd
+    ITEM_BLACK_GLASSES,  // 0x0ce
+    ITEM_BLACK_BELT,     // 0x0cf
+    ITEM_MAGNET,         // 0x0d0
+    ITEM_MYSTIC_WATER,   // 0x0d1
+    ITEM_SHARP_BEAK,     // 0x0d2
+    ITEM_POISON_BARB,    // 0x0d3
+    ITEM_NEVER_MELT_ICE, // 0x0d4
+    ITEM_SPELL_TAG,      // 0x0d5
+    ITEM_TWISTED_SPOON,  // 0x0d6
+    ITEM_CHARCOAL,       // 0x0d7
+    ITEM_DRAGON_FANG,    // 0x0d8
+    ITEM_SILK_SCARF,     // 0x0d9
+    ITEM_UP_GRADE,       // 0x0da
+    ITEM_SHELL_BELL,     // 0x0db
+    ITEM_SEA_INCENSE,    // 0x0dc
+    ITEM_LAX_INCENSE,    // 0x0dd
+    ITEM_LUCKY_PUNCH,    // 0x0de
+    ITEM_METAL_POWDER,   // 0x0df
+    ITEM_THICK_CLUB,     // 0x0e0
+    ITEM_STICK,          // 0x0e1
+    ITEM_0E2,
+    ITEM_0E3,
+    ITEM_0E4,
+    ITEM_0E5,
+    ITEM_0E6,
+    ITEM_0E7,
+    ITEM_0E8,
+    ITEM_0E9,
+    ITEM_0EA,
+    ITEM_0EB,
+    ITEM_0EC,
+    ITEM_0ED,
+    ITEM_0EE,
+    ITEM_0EF,
+    ITEM_0F0,
+    ITEM_0F1,
+    ITEM_0F2,
+    ITEM_0F3,
+    ITEM_0F4,
+    ITEM_0F5,
+    ITEM_0F6,
+    ITEM_0F7,
+    ITEM_0F8,
+    ITEM_0F9,
+    ITEM_0FA,
+    ITEM_0FB,
+    ITEM_0FC,
+    ITEM_0FD,
+    ITEM_RED_SCARF,      // 0x0fe
+    ITEM_BLUE_SCARF,     // 0x0ff
+    ITEM_PINK_SCARF,     // 0x100
+    ITEM_GREEN_SCARF,    // 0x101
+    ITEM_YELLOW_SCARF,   // 0x102
+    ITEM_MACH_BIKE,      // 0x103
+    ITEM_COIN_CASE,      // 0x104
+    ITEM_ITEMFINDER,     // 0x105
+    ITEM_OLD_ROD,        // 0x106
+    ITEM_GOOD_ROD,       // 0x107
+    ITEM_SUPER_ROD,      // 0x108
+    ITEM_SS_TICKET,      // 0x109
+    ITEM_CONTEST_PASS,   // 0x10a
+    ITEM_10B,
+    ITEM_WAILMER_PAIL,   // 0x10c
+    ITEM_DEVON_GOODS,    // 0x10d
+    ITEM_SOOT_SACK,      // 0x10e
+    ITEM_BASEMENT_KEY,   // 0x10f
+    ITEM_ACRO_BIKE,      // 0x110
+    ITEM_POKEBLOCK_CASE, // 0x111
+    ITEM_LETTER,         // 0x112
+    ITEM_EON_TICKET,     // 0x113
+    ITEM_RED_ORB,        // 0x114
+    ITEM_BLUE_ORB,       // 0x115
+    ITEM_SCANNER,        // 0x116
+    ITEM_GO_GOGGLES,     // 0x117
+    ITEM_METEORITE,      // 0x118
+    ITEM_ROOM_1_KEY,     // 0x119
+    ITEM_ROOM_2_KEY,     // 0x11a
+    ITEM_ROOM_4_KEY,     // 0x11b
+    ITEM_ROOM_6_KEY,     // 0x11c
+    ITEM_STORAGE_KEY,    // 0x11d
+    ITEM_ROOT_FOSSIL,    // 0x11e
+    ITEM_CLAW_FOSSIL,    // 0x11f
+    ITEM_DEVON_SCOPE,    // 0x120
+    ITEM_TM01,           // 0x121
+    ITEM_TM02,           // 0x122
+    ITEM_TM03,           // 0x123
+    ITEM_TM04,           // 0x124
+    ITEM_TM05,           // 0x125
+    ITEM_TM06,           // 0x126
+    ITEM_TM07,           // 0x127
+    ITEM_TM08,           // 0x128
+    ITEM_TM09,           // 0x129
+    ITEM_TM10,           // 0x12a
+    ITEM_TM11,           // 0x12b
+    ITEM_TM12,           // 0x12c
+    ITEM_TM13,           // 0x12d
+    ITEM_TM14,           // 0x12e
+    ITEM_TM15,           // 0x12f
+    ITEM_TM16,           // 0x130
+    ITEM_TM17,           // 0x131
+    ITEM_TM18,           // 0x132
+    ITEM_TM19,           // 0x133
+    ITEM_TM20,           // 0x134
+    ITEM_TM21,           // 0x135
+    ITEM_TM22,           // 0x136
+    ITEM_TM23,           // 0x137
+    ITEM_TM24,           // 0x138
+    ITEM_TM25,           // 0x139
+    ITEM_TM26,           // 0x13a
+    ITEM_TM27,           // 0x13b
+    ITEM_TM28,           // 0x13c
+    ITEM_TM29,           // 0x13d
+    ITEM_TM30,           // 0x13e
+    ITEM_TM31,           // 0x13f
+    ITEM_TM32,           // 0x140
+    ITEM_TM33,           // 0x141
+    ITEM_TM34,           // 0x142
+    ITEM_TM35,           // 0x143
+    ITEM_TM36,           // 0x144
+    ITEM_TM37,           // 0x145
+    ITEM_TM38,           // 0x146
+    ITEM_TM39,           // 0x147
+    ITEM_TM40,           // 0x148
+    ITEM_TM41,           // 0x149
+    ITEM_TM42,           // 0x14a
+    ITEM_TM43,           // 0x14b
+    ITEM_TM44,           // 0x14c
+    ITEM_TM45,           // 0x14d
+    ITEM_TM46,           // 0x14e
+    ITEM_TM47,           // 0x14f
+    ITEM_TM48,           // 0x150
+    ITEM_TM49,           // 0x151
+    ITEM_TM50,           // 0x152
+    ITEM_HM01,           // 0x153
+    ITEM_HM02,           // 0x154
+    ITEM_HM03,           // 0x155
+    ITEM_HM04,           // 0x156
+    ITEM_HM05,           // 0x157
+    ITEM_HM06,           // 0x158
+    ITEM_HM07,           // 0x159
+    ITEM_HM08,           // 0x15a
+    ITEM_15B,
+    ITEM_15C,
 
-	// FireRed/LeafGreen
-	ITEM_OAKS_PARCEL,    // 0x15d
-	ITEM_POKE_FLUTE,     // 0x15e
-	ITEM_SECRET_KEY,     // 0x15f
-	ITEM_BIKE_VOUCHER,   // 0x160
-	ITEM_GOLD_TEETH,     // 0x161
-	ITEM_OLD_AMBER,      // 0x162
-	ITEM_CARD_KEY,       // 0x163
-	ITEM_LIFT_KEY,       // 0x164
-	ITEM_HELIX_FOSSIL,   // 0x165
-	ITEM_DOME_FOSSIL,    // 0x166
-	ITEM_SILPH_SCOPE,    // 0x167
-	ITEM_BICYCLE,        // 0x168
-	ITEM_TOWN_MAP,       // 0x169
-	ITEM_VS_SEEKER,      // 0x16a
-	ITEM_FAME_CHECKER,   // 0x16b
-	ITEM_TM_CASE,        // 0x16c
-	ITEM_BERRY_POUCH,    // 0x16d
-	ITEM_TEACHY_TV,      // 0x16e
-	ITEM_TRI_PASS,       // 0x16f
-	ITEM_RAINBOW_PASS,   // 0x170
-	ITEM_TEA,            // 0x171
-	ITEM_MYSTIC_TICKET,  // 0x172
-	ITEM_AURORA_TICKET,  // 0x173
-	ITEM_POWDER_JAR,     // 0x174
-	ITEM_RUBY,           // 0x175
-	ITEM_SAPPHIRE,       // 0x176
+    // FireRed/LeafGreen
+    ITEM_OAKS_PARCEL,    // 0x15d
+    ITEM_POKE_FLUTE,     // 0x15e
+    ITEM_SECRET_KEY,     // 0x15f
+    ITEM_BIKE_VOUCHER,   // 0x160
+    ITEM_GOLD_TEETH,     // 0x161
+    ITEM_OLD_AMBER,      // 0x162
+    ITEM_CARD_KEY,       // 0x163
+    ITEM_LIFT_KEY,       // 0x164
+    ITEM_HELIX_FOSSIL,   // 0x165
+    ITEM_DOME_FOSSIL,    // 0x166
+    ITEM_SILPH_SCOPE,    // 0x167
+    ITEM_BICYCLE,        // 0x168
+    ITEM_TOWN_MAP,       // 0x169
+    ITEM_VS_SEEKER,      // 0x16a
+    ITEM_FAME_CHECKER,   // 0x16b
+    ITEM_TM_CASE,        // 0x16c
+    ITEM_BERRY_POUCH,    // 0x16d
+    ITEM_TEACHY_TV,      // 0x16e
+    ITEM_TRI_PASS,       // 0x16f
+    ITEM_RAINBOW_PASS,   // 0x170
+    ITEM_TEA,            // 0x171
+    ITEM_MYSTIC_TICKET,  // 0x172
+    ITEM_AURORA_TICKET,  // 0x173
+    ITEM_POWDER_JAR,     // 0x174
+    ITEM_RUBY,           // 0x175
+    ITEM_SAPPHIRE,       // 0x176
 
-	// Emerald
-	ITEM_MAGMA_EMBLEM,   // 0x177
-	ITEM_OLD_SEA_MAP,    // 0x178
+    // Emerald
+    ITEM_MAGMA_EMBLEM,   // 0x177
+    ITEM_OLD_SEA_MAP,    // 0x178
 };
 
 #endif // GUARD_ITEMS_H
diff --git a/include/naming_screen.h b/include/naming_screen.h
index 62d0c0029..d136417ba 100644
--- a/include/naming_screen.h
+++ b/include/naming_screen.h
@@ -45,7 +45,7 @@ struct NamingScreenData
  /*0x10*/ u8 unk10;
  /*0x11*/ u8 textBuffer[0x10];
  /*0x21*/ u8 filler21[0x13];
-			const struct NamingScreenTemplate *template;
+            const struct NamingScreenTemplate *template;
  /*0x38*/ u8 *destBuffer;
  /*0x3C*/ u16 unk3C;  //savedKeyRepeatStartDelay
  /*0x3E*/ u16 unk3E;
diff --git a/include/save.h b/include/save.h
index 46bf48d60..3feaa1f3d 100644
--- a/include/save.h
+++ b/include/save.h
@@ -39,12 +39,12 @@ enum
 // Do save types
 enum
 {
-	NORMAL_SAVE,
-	LINK_SAVE,
-	EREADER_SAVE, // mossdeep event
-	HOF_SAVE,
-	DIFFERENT_FILE_SAVE,
-	HOF_DELETE_SAVE // unused
+    NORMAL_SAVE,
+    LINK_SAVE,
+    EREADER_SAVE, // mossdeep event
+    HOF_SAVE,
+    DIFFERENT_FILE_SAVE,
+    HOF_DELETE_SAVE // unused
 };
 
 void ClearSaveData(void);
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index eaad98cb0..26cd1de02 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -4302,39 +4302,39 @@ __attribute__((naked))
 int state_to_direction(u8 a0, u8 a1, u8 a2)
 {
     asm(".syntax unified\n\
-	push {r4,lr}\n\
-	lsls r0, 24\n\
-	lsrs r4, r0, 24\n\
-	lsls r1, 24\n\
-	lsrs r1, 24\n\
-	adds r0, r1, 0\n\
-	lsls r2, 24\n\
-	lsrs r2, 24\n\
-	cmp r1, 0\n\
-	beq _08060BFC\n\
-	cmp r2, 0\n\
-	beq _08060BFC\n\
-	cmp r1, 0x4\n\
-	bhi _08060BFC\n\
-	cmp r2, 0x4\n\
-	bls _08060C00\n\
+    push {r4,lr}\n\
+    lsls r0, 24\n\
+    lsrs r4, r0, 24\n\
+    lsls r1, 24\n\
+    lsrs r1, 24\n\
+    adds r0, r1, 0\n\
+    lsls r2, 24\n\
+    lsrs r2, 24\n\
+    cmp r1, 0\n\
+    beq _08060BFC\n\
+    cmp r2, 0\n\
+    beq _08060BFC\n\
+    cmp r1, 0x4\n\
+    bhi _08060BFC\n\
+    cmp r2, 0x4\n\
+    bls _08060C00\n\
 _08060BFC:\n\
-	movs r0, 0\n\
-	b _08060C12\n\
+    movs r0, 0\n\
+    b _08060C12\n\
 _08060C00:\n\
-	adds r1, r2, 0\n\
-	bl zffu_offset_calc\n\
-	ldr r2, _08060C18 @ =gUnknown_08375767\n\
-	lsls r1, r4, 2\n\
-	subs r1, 0x5\n\
-	adds r0, r1\n\
-	adds r0, r2\n\
-	ldrb r0, [r0]\n\
+    adds r1, r2, 0\n\
+    bl zffu_offset_calc\n\
+    ldr r2, _08060C18 @ =gUnknown_08375767\n\
+    lsls r1, r4, 2\n\
+    subs r1, 0x5\n\
+    adds r0, r1\n\
+    adds r0, r2\n\
+    ldrb r0, [r0]\n\
 _08060C12:\n\
-	pop {r4}\n\
-	pop {r1}\n\
-	bx r1\n\
-	.align 2, 0\n\
+    pop {r4}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
 _08060C18: .4byte gUnknown_08375767\n\
 .syntax divided\n");
 }
@@ -6609,121 +6609,121 @@ void sub_80634E8(struct MapObject *mapObject, struct Sprite *sprite)
 __attribute__((naked))
 void sub_80634E8(struct MapObject *mapObject, struct Sprite *sprite) {
     asm(".syntax unified\n\
-	push {r4-r6,lr}\n\
-	adds r5, r0, 0\n\
-	adds r4, r1, 0\n\
-	ldrb r1, [r5, 0x1]\n\
-	movs r0, 0x41\n\
-	negs r0, r0\n\
-	ands r0, r1\n\
-	strb r0, [r5, 0x1]\n\
-	ldrb r0, [r5, 0x5]\n\
-	bl GetFieldObjectGraphicsInfo\n\
-	adds r6, r0, 0\n\
-	adds r0, r4, 0\n\
-	adds r0, 0x3E\n\
-	ldrb r1, [r0]\n\
-	movs r0, 0x2\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	beq _0806354C\n\
-	ldrh r1, [r4, 0x24]\n\
-	ldrh r0, [r4, 0x20]\n\
-	adds r1, r0\n\
-	adds r0, r4, 0\n\
-	adds r0, 0x28\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 24\n\
-	asrs r0, 24\n\
-	ldr r2, _08063544 @ =gSpriteCoordOffsetX\n\
-	adds r0, r1\n\
-	ldrh r2, [r2]\n\
-	adds r0, r2\n\
-	lsls r0, 16\n\
-	lsrs r3, r0, 16\n\
-	ldrh r1, [r4, 0x26]\n\
-	ldrh r0, [r4, 0x22]\n\
-	adds r1, r0\n\
-	adds r0, r4, 0\n\
-	adds r0, 0x29\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 24\n\
-	asrs r0, 24\n\
-	ldr r2, _08063548 @ =gSpriteCoordOffsetY\n\
-	adds r0, r1\n\
-	ldrh r2, [r2]\n\
-	adds r0, r2\n\
-	b _08063574\n\
-	.align 2, 0\n\
+    push {r4-r6,lr}\n\
+    adds r5, r0, 0\n\
+    adds r4, r1, 0\n\
+    ldrb r1, [r5, 0x1]\n\
+    movs r0, 0x41\n\
+    negs r0, r0\n\
+    ands r0, r1\n\
+    strb r0, [r5, 0x1]\n\
+    ldrb r0, [r5, 0x5]\n\
+    bl GetFieldObjectGraphicsInfo\n\
+    adds r6, r0, 0\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x3E\n\
+    ldrb r1, [r0]\n\
+    movs r0, 0x2\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _0806354C\n\
+    ldrh r1, [r4, 0x24]\n\
+    ldrh r0, [r4, 0x20]\n\
+    adds r1, r0\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x28\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    ldr r2, _08063544 @ =gSpriteCoordOffsetX\n\
+    adds r0, r1\n\
+    ldrh r2, [r2]\n\
+    adds r0, r2\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    ldrh r1, [r4, 0x26]\n\
+    ldrh r0, [r4, 0x22]\n\
+    adds r1, r0\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x29\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    ldr r2, _08063548 @ =gSpriteCoordOffsetY\n\
+    adds r0, r1\n\
+    ldrh r2, [r2]\n\
+    adds r0, r2\n\
+    b _08063574\n\
+    .align 2, 0\n\
 _08063544: .4byte gSpriteCoordOffsetX\n\
 _08063548: .4byte gSpriteCoordOffsetY\n\
 _0806354C:\n\
-	ldrh r1, [r4, 0x24]\n\
-	ldrh r0, [r4, 0x20]\n\
-	adds r1, r0\n\
-	adds r0, r4, 0\n\
-	adds r0, 0x28\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 24\n\
-	asrs r0, 24\n\
-	adds r0, r1\n\
-	lsls r0, 16\n\
-	lsrs r3, r0, 16\n\
-	ldrh r1, [r4, 0x26]\n\
-	ldrh r0, [r4, 0x22]\n\
-	adds r1, r0\n\
-	adds r0, r4, 0\n\
-	adds r0, 0x29\n\
-	ldrb r0, [r0]\n\
-	lsls r0, 24\n\
-	asrs r0, 24\n\
-	adds r0, r1\n\
+    ldrh r1, [r4, 0x24]\n\
+    ldrh r0, [r4, 0x20]\n\
+    adds r1, r0\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x28\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    adds r0, r1\n\
+    lsls r0, 16\n\
+    lsrs r3, r0, 16\n\
+    ldrh r1, [r4, 0x26]\n\
+    ldrh r0, [r4, 0x22]\n\
+    adds r1, r0\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x29\n\
+    ldrb r0, [r0]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    adds r0, r1\n\
 _08063574:\n\
-	lsls r0, 16\n\
-	lsrs r2, r0, 16\n\
-	ldrh r0, [r6, 0x8]\n\
-	adds r0, r3\n\
-	lsls r0, 16\n\
-	lsrs r1, r0, 16\n\
-	ldrh r0, [r6, 0xA]\n\
-	adds r0, r2\n\
-	lsls r0, 16\n\
-	lsrs r4, r0, 16\n\
-	lsls r0, r3, 16\n\
-	asrs r0, 16\n\
-	cmp r0, 0xFF\n\
-	bgt _0806359C\n\
-	lsls r0, r1, 16\n\
-	asrs r0, 16\n\
-	movs r1, 0x10\n\
-	negs r1, r1\n\
-	cmp r0, r1\n\
-	bge _080635A4\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 16\n\
+    ldrh r0, [r6, 0x8]\n\
+    adds r0, r3\n\
+    lsls r0, 16\n\
+    lsrs r1, r0, 16\n\
+    ldrh r0, [r6, 0xA]\n\
+    adds r0, r2\n\
+    lsls r0, 16\n\
+    lsrs r4, r0, 16\n\
+    lsls r0, r3, 16\n\
+    asrs r0, 16\n\
+    cmp r0, 0xFF\n\
+    bgt _0806359C\n\
+    lsls r0, r1, 16\n\
+    asrs r0, 16\n\
+    movs r1, 0x10\n\
+    negs r1, r1\n\
+    cmp r0, r1\n\
+    bge _080635A4\n\
 _0806359C:\n\
-	ldrb r0, [r5, 0x1]\n\
-	movs r1, 0x40\n\
-	orrs r0, r1\n\
-	strb r0, [r5, 0x1]\n\
+    ldrb r0, [r5, 0x1]\n\
+    movs r1, 0x40\n\
+    orrs r0, r1\n\
+    strb r0, [r5, 0x1]\n\
 _080635A4:\n\
-	lsls r0, r2, 16\n\
-	asrs r0, 16\n\
-	cmp r0, 0xAF\n\
-	bgt _080635B8\n\
-	lsls r0, r4, 16\n\
-	asrs r0, 16\n\
-	movs r1, 0x10\n\
-	negs r1, r1\n\
-	cmp r0, r1\n\
-	bge _080635C0\n\
+    lsls r0, r2, 16\n\
+    asrs r0, 16\n\
+    cmp r0, 0xAF\n\
+    bgt _080635B8\n\
+    lsls r0, r4, 16\n\
+    asrs r0, 16\n\
+    movs r1, 0x10\n\
+    negs r1, r1\n\
+    cmp r0, r1\n\
+    bge _080635C0\n\
 _080635B8:\n\
-	ldrb r0, [r5, 0x1]\n\
-	movs r1, 0x40\n\
-	orrs r0, r1\n\
-	strb r0, [r5, 0x1]\n\
+    ldrb r0, [r5, 0x1]\n\
+    movs r1, 0x40\n\
+    orrs r0, r1\n\
+    strb r0, [r5, 0x1]\n\
 _080635C0:\n\
-	pop {r4-r6}\n\
-	pop {r0}\n\
-	bx r0\n\
+    pop {r4-r6}\n\
+    pop {r0}\n\
+    bx r0\n\
 .syntax divided\n");
 }
 #endif
diff --git a/src/secret_base.c b/src/secret_base.c
index 4ff0b6b17..aae3853f9 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -392,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\
@@ -477,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");
@@ -517,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\
@@ -901,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\
diff --git a/src/tv.c b/src/tv.c
index 566d547a6..e1bf7c8fe 100644
--- a/src/tv.c
+++ b/src/tv.c
@@ -182,100 +182,100 @@ __attribute__((naked))
 u8 special_0x44(void)
 {
     asm(".syntax unified\n"
-    "	push {r4-r7,lr}\n"
-    "	mov r7, r9\n"
-    "	mov r6, r8\n"
-    "	push {r6,r7}\n"
-    "	movs r4, 0x5\n"
-    "	ldr r1, _080BD874 @ =gSaveBlock1\n"
-    "	ldr r2, _080BD878 @ =0x000027ec\n"
-    "	adds r0, r1, r2\n"
-    "	ldrb r0, [r0]\n"
-    "	cmp r0, 0\n"
-    "	beq _080BD834\n"
-    "	adds r2, r1, 0\n"
-    "	ldr r1, _080BD87C @ =0x00002738\n"
+    "    push {r4-r7,lr}\n"
+    "    mov r7, r9\n"
+    "    mov r6, r8\n"
+    "    push {r6,r7}\n"
+    "    movs r4, 0x5\n"
+    "    ldr r1, _080BD874 @ =gSaveBlock1\n"
+    "    ldr r2, _080BD878 @ =0x000027ec\n"
+    "    adds r0, r1, r2\n"
+    "    ldrb r0, [r0]\n"
+    "    cmp r0, 0\n"
+    "    beq _080BD834\n"
+    "    adds r2, r1, 0\n"
+    "    ldr r1, _080BD87C @ =0x00002738\n"
     "_080BD81A:\n"
-    "	adds r0, r4, 0x1\n"
-    "	lsls r0, 24\n"
-    "	lsrs r4, r0, 24\n"
-    "	cmp r4, 0x17\n"
-    "	bhi _080BD834\n"
-    "	lsls r0, r4, 3\n"
-    "	adds r0, r4\n"
-    "	lsls r0, 2\n"
-    "	adds r0, r2\n"
-    "	adds r0, r1\n"
-    "	ldrb r0, [r0]\n"
-    "	cmp r0, 0\n"
-    "	bne _080BD81A\n"
+    "    adds r0, r4, 0x1\n"
+    "    lsls r0, 24\n"
+    "    lsrs r4, r0, 24\n"
+    "    cmp r4, 0x17\n"
+    "    bhi _080BD834\n"
+    "    lsls r0, r4, 3\n"
+    "    adds r0, r4\n"
+    "    lsls r0, 2\n"
+    "    adds r0, r2\n"
+    "    adds r0, r1\n"
+    "    ldrb r0, [r0]\n"
+    "    cmp r0, 0\n"
+    "    bne _080BD81A\n"
     "_080BD834:\n"
-    "	bl Random\n"
-    "	lsls r0, 16\n"
-    "	lsrs r0, 16\n"
-    "	adds r1, r4, 0\n"
-    "	bl __modsi3\n"
-    "	lsls r0, 24\n"
-    "	lsrs r4, r0, 24\n"
-    "	mov r8, r4\n"
-    "	ldr r7, _080BD874 @ =gSaveBlock1\n"
-    "	ldr r0, _080BD87C @ =0x00002738\n"
-    "	adds r0, r7\n"
-    "	mov r9, r0\n"
+    "    bl Random\n"
+    "    lsls r0, 16\n"
+    "    lsrs r0, 16\n"
+    "    adds r1, r4, 0\n"
+    "    bl __modsi3\n"
+    "    lsls r0, 24\n"
+    "    lsrs r4, r0, 24\n"
+    "    mov r8, r4\n"
+    "    ldr r7, _080BD874 @ =gSaveBlock1\n"
+    "    ldr r0, _080BD87C @ =0x00002738\n"
+    "    adds r0, r7\n"
+    "    mov r9, r0\n"
     "_080BD850:\n"
-    "	lsls r0, r4, 3\n"
-    "	adds r0, r4\n"
-    "	lsls r6, r0, 2\n"
-    "	adds r5, r6, r7\n"
-    "	ldr r1, _080BD87C @ =0x00002738\n"
-    "	adds r0, r5, r1\n"
-    "	ldrb r0, [r0]\n"
-    "	bl sub_80BFB54\n"
-    "	lsls r0, 24\n"
-    "	lsrs r0, 24\n"
-    "	cmp r0, 0x4\n"
-    "	beq _080BD884\n"
-    "	ldr r2, _080BD880 @ =0x00002739\n"
-    "	adds r0, r5, r2\n"
-    "	ldrb r0, [r0]\n"
-    "	b _080BD890\n"
-    "	.align 2, 0\n"
+    "    lsls r0, r4, 3\n"
+    "    adds r0, r4\n"
+    "    lsls r6, r0, 2\n"
+    "    adds r5, r6, r7\n"
+    "    ldr r1, _080BD87C @ =0x00002738\n"
+    "    adds r0, r5, r1\n"
+    "    ldrb r0, [r0]\n"
+    "    bl sub_80BFB54\n"
+    "    lsls r0, 24\n"
+    "    lsrs r0, 24\n"
+    "    cmp r0, 0x4\n"
+    "    beq _080BD884\n"
+    "    ldr r2, _080BD880 @ =0x00002739\n"
+    "    adds r0, r5, r2\n"
+    "    ldrb r0, [r0]\n"
+    "    b _080BD890\n"
+    "    .align 2, 0\n"
     "_080BD874: .4byte gSaveBlock1\n"
     "_080BD878: .4byte 0x000027ec\n"
     "_080BD87C: .4byte 0x00002738\n"
     "_080BD880: .4byte 0x00002739\n"
     "_080BD884:\n"
-    "	mov r0, r9\n"
-    "	adds r1, r6, r0\n"
-    "	ldrh r0, [r1, 0x16]\n"
-    "	cmp r0, 0\n"
-    "	bne _080BD898\n"
-    "	ldrb r0, [r1, 0x1]\n"
+    "    mov r0, r9\n"
+    "    adds r1, r6, r0\n"
+    "    ldrh r0, [r1, 0x16]\n"
+    "    cmp r0, 0\n"
+    "    bne _080BD898\n"
+    "    ldrb r0, [r1, 0x1]\n"
     "_080BD890:\n"
-    "	cmp r0, 0x1\n"
-    "	bne _080BD898\n"
-    "	adds r0, r4, 0\n"
-    "	b _080BD8AC\n"
+    "    cmp r0, 0x1\n"
+    "    bne _080BD898\n"
+    "    adds r0, r4, 0\n"
+    "    b _080BD8AC\n"
     "_080BD898:\n"
-    "	cmp r4, 0\n"
-    "	bne _080BD8A0\n"
-    "	movs r4, 0x17\n"
-    "	b _080BD8A6\n"
+    "    cmp r4, 0\n"
+    "    bne _080BD8A0\n"
+    "    movs r4, 0x17\n"
+    "    b _080BD8A6\n"
     "_080BD8A0:\n"
-    "	subs r0, r4, 0x1\n"
-    "	lsls r0, 24\n"
-    "	lsrs r4, r0, 24\n"
+    "    subs r0, r4, 0x1\n"
+    "    lsls r0, 24\n"
+    "    lsrs r4, r0, 24\n"
     "_080BD8A6:\n"
-    "	cmp r4, r8\n"
-    "	bne _080BD850\n"
-    "	movs r0, 0xFF\n"
+    "    cmp r4, r8\n"
+    "    bne _080BD850\n"
+    "    movs r0, 0xFF\n"
     "_080BD8AC:\n"
-    "	pop {r3,r4}\n"
-    "	mov r8, r3\n"
-    "	mov r9, r4\n"
-    "	pop {r4-r7}\n"
-    "	pop {r1}\n"
-    "	bx r1\n"
+    "    pop {r3,r4}\n"
+    "    mov r8, r3\n"
+    "    mov r9, r4\n"
+    "    pop {r4-r7}\n"
+    "    pop {r1}\n"
+    "    bx r1\n"
     ".syntax divided\n");
 }
 #endif
@@ -680,88 +680,88 @@ void sub_80BE074(void) {
 __attribute__((naked))
 void sub_80BE074(void) {
     asm(".syntax unified\n\
-	push {r4-r7,lr}\n\
-	ldr r0, _080BE118 @ =0x0000ffff\n\
-	bl sub_80BF77C\n\
-	lsls r0, 24\n\
-	cmp r0, 0\n\
-	bne _080BE112\n\
-	movs r1, 0\n\
-	movs r5, 0\n\
-	ldr r2, _080BE11C @ =gUnknown_03004316\n\
+    push {r4-r7,lr}\n\
+    ldr r0, _080BE118 @ =0x0000ffff\n\
+    bl sub_80BF77C\n\
+    lsls r0, 24\n\
+    cmp r0, 0\n\
+    bne _080BE112\n\
+    movs r1, 0\n\
+    movs r5, 0\n\
+    ldr r2, _080BE11C @ =gUnknown_03004316\n\
 _080BE088:\n\
-	adds r0, r1, r2\n\
-	ldrb r0, [r0]\n\
-	adds r0, r5, r0\n\
-	lsls r0, 16\n\
-	lsrs r5, r0, 16\n\
-	adds r0, r1, 0x1\n\
-	lsls r0, 24\n\
-	lsrs r1, r0, 24\n\
-	cmp r1, 0xA\n\
-	bls _080BE088\n\
-	cmp r5, 0xFF\n\
-	bls _080BE0A2\n\
-	movs r5, 0xFF\n\
+    adds r0, r1, r2\n\
+    ldrb r0, [r0]\n\
+    adds r0, r5, r0\n\
+    lsls r0, 16\n\
+    lsrs r5, r0, 16\n\
+    adds r0, r1, 0x1\n\
+    lsls r0, 24\n\
+    lsrs r1, r0, 24\n\
+    cmp r1, 0xA\n\
+    bls _080BE088\n\
+    cmp r5, 0xFF\n\
+    bls _080BE0A2\n\
+    movs r5, 0xFF\n\
 _080BE0A2:\n\
-	cmp r5, 0x2\n\
-	bls _080BE112\n\
-	ldr r7, _080BE120 @ =gUnknown_02024D26\n\
-	ldrb r0, [r7]\n\
-	cmp r0, 0x1\n\
-	bne _080BE112\n\
-	ldr r6, _080BE124 @ =gSaveBlock1 + 0x2738\n\
-	adds r0, r6, 0\n\
-	bl sub_80BF74C\n\
-	ldr r4, _080BE128 @ =gUnknown_03005D38\n\
-	strb r0, [r4]\n\
-	lsls r0, 24\n\
-	asrs r0, 24\n\
-	movs r1, 0x1\n\
-	negs r1, r1\n\
-	cmp r0, r1\n\
-	beq _080BE112\n\
-	movs r0, 0x17\n\
-	bl sub_80BF1B4\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0x1\n\
-	beq _080BE112\n\
-	movs r0, 0\n\
-	ldrsb r0, [r4, r0]\n\
-	lsls r4, r0, 3\n\
-	adds r4, r0\n\
-	lsls r4, 2\n\
-	adds r4, r6\n\
+    cmp r5, 0x2\n\
+    bls _080BE112\n\
+    ldr r7, _080BE120 @ =gUnknown_02024D26\n\
+    ldrb r0, [r7]\n\
+    cmp r0, 0x1\n\
+    bne _080BE112\n\
+    ldr r6, _080BE124 @ =gSaveBlock1 + 0x2738\n\
+    adds r0, r6, 0\n\
+    bl sub_80BF74C\n\
+    ldr r4, _080BE128 @ =gUnknown_03005D38\n\
+    strb r0, [r4]\n\
+    lsls r0, 24\n\
+    asrs r0, 24\n\
+    movs r1, 0x1\n\
+    negs r1, r1\n\
+    cmp r0, r1\n\
+    beq _080BE112\n\
+    movs r0, 0x17\n\
+    bl sub_80BF1B4\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0x1\n\
+    beq _080BE112\n\
+    movs r0, 0\n\
+    ldrsb r0, [r4, r0]\n\
+    lsls r4, r0, 3\n\
+    adds r4, r0\n\
+    lsls r4, 2\n\
+    adds r4, r6\n\
     @ -- Here the compiler puts the status flag in the wrong register. --\n\
-	movs r1, 0\n\
-	movs r0, 0x17\n\
-	strb r0, [r4]\n\
-	strb r1, [r4, 0x1]\n\
-	ldr r1, _080BE12C @ =gUnknown_030042E0\n\
-	ldrh r0, [r1, 0x6]\n\
-	strh r0, [r4, 0xC]\n\
-	ldrh r0, [r1, 0x20]\n\
-	strh r0, [r4, 0xE]\n\
-	strb r5, [r4, 0x10]\n\
-	ldrb r0, [r7]\n\
-	strb r0, [r4, 0x11]\n\
-	ldr r0, _080BE130 @ =gMapHeader\n\
-	ldrb r0, [r0, 0x14]\n\
-	strb r0, [r4, 0x12]\n\
-	adds r0, r4, 0\n\
-	adds r0, 0x13\n\
-	ldr r1, _080BE134 @ =gSaveBlock2\n\
-	bl StringCopy\n\
-	adds r0, r4, 0\n\
-	bl sub_80BE138\n\
-	movs r0, 2 @ GAME_LANGUAGE\n\
-	strb r0, [r4, 0x2]\n\
+    movs r1, 0\n\
+    movs r0, 0x17\n\
+    strb r0, [r4]\n\
+    strb r1, [r4, 0x1]\n\
+    ldr r1, _080BE12C @ =gUnknown_030042E0\n\
+    ldrh r0, [r1, 0x6]\n\
+    strh r0, [r4, 0xC]\n\
+    ldrh r0, [r1, 0x20]\n\
+    strh r0, [r4, 0xE]\n\
+    strb r5, [r4, 0x10]\n\
+    ldrb r0, [r7]\n\
+    strb r0, [r4, 0x11]\n\
+    ldr r0, _080BE130 @ =gMapHeader\n\
+    ldrb r0, [r0, 0x14]\n\
+    strb r0, [r4, 0x12]\n\
+    adds r0, r4, 0\n\
+    adds r0, 0x13\n\
+    ldr r1, _080BE134 @ =gSaveBlock2\n\
+    bl StringCopy\n\
+    adds r0, r4, 0\n\
+    bl sub_80BE138\n\
+    movs r0, 2 @ GAME_LANGUAGE\n\
+    strb r0, [r4, 0x2]\n\
 _080BE112:\n\
-	pop {r4-r7}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    pop {r4-r7}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _080BE118: .4byte 0x0000ffff\n\
 _080BE11C: .4byte gUnknown_03004316\n\
 _080BE120: .4byte gUnknown_02024D26\n\
@@ -2033,119 +2033,119 @@ __attribute__((naked))
 void GetMomOrDadStringForTVMessage(void)
 {
     asm(".syntax unified\n\
-	push {r4,lr}\n\
-	ldr r1, _080BFC40 @ =gSaveBlock1\n\
-	movs r0, 0x4\n\
-	ldrsb r0, [r1, r0]\n\
-	cmp r0, 0x1\n\
-	bne _080BFC6C\n\
-	ldr r0, _080BFC44 @ =gSaveBlock2\n\
-	ldrb r0, [r0, 0x8]\n\
-	cmp r0, 0\n\
-	bne _080BFC54\n\
-	movs r0, 0x5\n\
-	ldrsb r0, [r1, r0]\n\
-	cmp r0, 0\n\
-	bne _080BFC6C\n\
-	ldr r0, _080BFC48 @ =gStringVar1\n\
-	ldr r1, _080BFC4C @ =gOtherText_Mom\n\
-	bl StringCopy\n\
-	ldr r0, _080BFC50 @ =0x00004003\n\
-	movs r1, 0x1\n\
-	bl VarSet\n\
-	b _080BFC6C\n\
-	.align 2, 0\n\
+    push {r4,lr}\n\
+    ldr r1, _080BFC40 @ =gSaveBlock1\n\
+    movs r0, 0x4\n\
+    ldrsb r0, [r1, r0]\n\
+    cmp r0, 0x1\n\
+    bne _080BFC6C\n\
+    ldr r0, _080BFC44 @ =gSaveBlock2\n\
+    ldrb r0, [r0, 0x8]\n\
+    cmp r0, 0\n\
+    bne _080BFC54\n\
+    movs r0, 0x5\n\
+    ldrsb r0, [r1, r0]\n\
+    cmp r0, 0\n\
+    bne _080BFC6C\n\
+    ldr r0, _080BFC48 @ =gStringVar1\n\
+    ldr r1, _080BFC4C @ =gOtherText_Mom\n\
+    bl StringCopy\n\
+    ldr r0, _080BFC50 @ =0x00004003\n\
+    movs r1, 0x1\n\
+    bl VarSet\n\
+    b _080BFC6C\n\
+    .align 2, 0\n\
 _080BFC40: .4byte gSaveBlock1\n\
 _080BFC44: .4byte gSaveBlock2\n\
 _080BFC48: .4byte gStringVar1\n\
 _080BFC4C: .4byte gOtherText_Mom\n\
 _080BFC50: .4byte 0x00004003\n\
 _080BFC54:\n\
-	movs r0, 0x5\n\
-	ldrsb r0, [r1, r0]\n\
-	cmp r0, 0x2\n\
-	bne _080BFC6C\n\
-	ldr r0, _080BFCB4 @ =gStringVar1\n\
-	ldr r1, _080BFCB8 @ =gOtherText_Mom\n\
-	bl StringCopy\n\
-	ldr r0, _080BFCBC @ =0x00004003\n\
-	movs r1, 0x1\n\
-	bl VarSet\n\
+    movs r0, 0x5\n\
+    ldrsb r0, [r1, r0]\n\
+    cmp r0, 0x2\n\
+    bne _080BFC6C\n\
+    ldr r0, _080BFCB4 @ =gStringVar1\n\
+    ldr r1, _080BFCB8 @ =gOtherText_Mom\n\
+    bl StringCopy\n\
+    ldr r0, _080BFCBC @ =0x00004003\n\
+    movs r1, 0x1\n\
+    bl VarSet\n\
 _080BFC6C:\n\
-	ldr r4, _080BFCBC @ =0x00004003\n\
-	adds r0, r4, 0\n\
-	bl VarGet\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	cmp r0, 0x1\n\
-	beq _080BFCAA\n\
-	adds r0, r4, 0\n\
-	bl VarGet\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	cmp r0, 0x2\n\
-	beq _080BFCC0\n\
-	adds r0, r4, 0\n\
-	bl VarGet\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	cmp r0, 0x2\n\
-	bls _080BFCD4\n\
-	adds r0, r4, 0\n\
-	bl VarGet\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	movs r1, 0x1\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	bne _080BFCC0\n\
+    ldr r4, _080BFCBC @ =0x00004003\n\
+    adds r0, r4, 0\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, 0x1\n\
+    beq _080BFCAA\n\
+    adds r0, r4, 0\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, 0x2\n\
+    beq _080BFCC0\n\
+    adds r0, r4, 0\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    cmp r0, 0x2\n\
+    bls _080BFCD4\n\
+    adds r0, r4, 0\n\
+    bl VarGet\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    movs r1, 0x1\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    bne _080BFCC0\n\
 _080BFCAA:\n\
-	ldr r0, _080BFCB4 @ =gStringVar1\n\
-	ldr r1, _080BFCB8 @ =gOtherText_Mom\n\
-	bl StringCopy\n\
-	b _080BFD10\n\
-	.align 2, 0\n\
+    ldr r0, _080BFCB4 @ =gStringVar1\n\
+    ldr r1, _080BFCB8 @ =gOtherText_Mom\n\
+    bl StringCopy\n\
+    b _080BFD10\n\
+    .align 2, 0\n\
 _080BFCB4: .4byte gStringVar1\n\
 _080BFCB8: .4byte gOtherText_Mom\n\
 _080BFCBC: .4byte 0x00004003\n\
 _080BFCC0:\n\
-	ldr r0, _080BFCCC @ =gStringVar1\n\
-	ldr r1, _080BFCD0 @ =gOtherText_Dad\n\
-	bl StringCopy\n\
-	b _080BFD10\n\
-	.align 2, 0\n\
+    ldr r0, _080BFCCC @ =gStringVar1\n\
+    ldr r1, _080BFCD0 @ =gOtherText_Dad\n\
+    bl StringCopy\n\
+    b _080BFD10\n\
+    .align 2, 0\n\
 _080BFCCC: .4byte gStringVar1\n\
 _080BFCD0: .4byte gOtherText_Dad\n\
 _080BFCD4:\n\
-	bl Random\n\
-	lsls r0, 16\n\
-	lsrs r0, 16\n\
-	movs r1, 0x1\n\
-	ands r0, r1\n\
-	cmp r0, 0\n\
-	beq _080BFD00\n\
-	ldr r0, _080BFCF8 @ =gStringVar1\n\
-	ldr r1, _080BFCFC @ =gOtherText_Mom\n\
-	bl StringCopy\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x1\n\
-	bl VarSet\n\
-	b _080BFD10\n\
-	.align 2, 0\n\
+    bl Random\n\
+    lsls r0, 16\n\
+    lsrs r0, 16\n\
+    movs r1, 0x1\n\
+    ands r0, r1\n\
+    cmp r0, 0\n\
+    beq _080BFD00\n\
+    ldr r0, _080BFCF8 @ =gStringVar1\n\
+    ldr r1, _080BFCFC @ =gOtherText_Mom\n\
+    bl StringCopy\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x1\n\
+    bl VarSet\n\
+    b _080BFD10\n\
+    .align 2, 0\n\
 _080BFCF8: .4byte gStringVar1\n\
 _080BFCFC: .4byte gOtherText_Mom\n\
 _080BFD00:\n\
-	ldr r0, _080BFD18 @ =gStringVar1\n\
-	ldr r1, _080BFD1C @ =gOtherText_Dad\n\
-	bl StringCopy\n\
-	adds r0, r4, 0\n\
-	movs r1, 0x2\n\
-	bl VarSet\n\
+    ldr r0, _080BFD18 @ =gStringVar1\n\
+    ldr r1, _080BFD1C @ =gOtherText_Dad\n\
+    bl StringCopy\n\
+    adds r0, r4, 0\n\
+    movs r1, 0x2\n\
+    bl VarSet\n\
 _080BFD10:\n\
-	pop {r4}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    pop {r4}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _080BFD18: .4byte gStringVar1\n\
 _080BFD1C: .4byte gOtherText_Dad\n\
 .syntax divided\n");
@@ -2276,119 +2276,119 @@ bool8 sub_80BFF68(TVShow * arg1[25], TVShow * arg2[25], u8 idx) {
 __attribute__((naked))
 bool8 sub_80BFF68(TVShow * arg1[25], TVShow * arg2[25], u8 idx) {
     asm(".syntax unified\n\
-	push {r4-r7,lr}\n\
-	sub sp, 0x4\n\
-	lsls r2, 24\n\
-	lsrs r7, r2, 24\n\
-	ldr r4, [r0]\n\
-	ldr r6, [r1]\n\
-	movs r5, 0\n\
-	ldr r2, _080BFFA4 @ =gUnknown_03000722\n\
-	movs r1, 0\n\
-	ldrsb r1, [r2, r1]\n\
-	lsls r0, r1, 3\n\
-	adds r0, r1\n\
-	lsls r0, 2\n\
-	adds r0, r6 @ this is the only mimsmatch\n\
-	ldrb r0, [r0]\n\
-	str r2, [sp]\n\
-	bl sub_80BFB54\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	adds r1, r0, 0\n\
-	ldr r2, [sp]\n\
-	cmp r0, 0x3\n\
-	beq _080BFFD8\n\
-	cmp r0, 0x3\n\
-	bgt _080BFFA8\n\
-	cmp r0, 0x2\n\
-	beq _080BFFAE\n\
-	b _080C0026\n\
-	.align 2, 0\n\
+    push {r4-r7,lr}\n\
+    sub sp, 0x4\n\
+    lsls r2, 24\n\
+    lsrs r7, r2, 24\n\
+    ldr r4, [r0]\n\
+    ldr r6, [r1]\n\
+    movs r5, 0\n\
+    ldr r2, _080BFFA4 @ =gUnknown_03000722\n\
+    movs r1, 0\n\
+    ldrsb r1, [r2, r1]\n\
+    lsls r0, r1, 3\n\
+    adds r0, r1\n\
+    lsls r0, 2\n\
+    adds r0, r6 @ this is the only mimsmatch\n\
+    ldrb r0, [r0]\n\
+    str r2, [sp]\n\
+    bl sub_80BFB54\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    adds r1, r0, 0\n\
+    ldr r2, [sp]\n\
+    cmp r0, 0x3\n\
+    beq _080BFFD8\n\
+    cmp r0, 0x3\n\
+    bgt _080BFFA8\n\
+    cmp r0, 0x2\n\
+    beq _080BFFAE\n\
+    b _080C0026\n\
+    .align 2, 0\n\
 _080BFFA4: .4byte gUnknown_03000722\n\
 _080BFFA8:\n\
-	cmp r1, 0x4\n\
-	beq _080C0000\n\
-	b _080C0026\n\
+    cmp r1, 0x4\n\
+    beq _080C0000\n\
+    b _080C0026\n\
 _080BFFAE:\n\
-	ldr r0, _080BFFD4 @ =gUnknown_03005D38\n\
-	movs r1, 0\n\
-	ldrsb r1, [r0, r1]\n\
-	lsls r0, r1, 3\n\
-	adds r0, r1\n\
-	lsls r0, 2\n\
-	adds r0, r4, r0\n\
-	ldrb r2, [r2]\n\
-	lsls r2, 24\n\
-	asrs r2, 24\n\
-	lsls r1, r2, 3\n\
-	adds r1, r2\n\
-	lsls r1, 2\n\
-	adds r1, r6, r1\n\
-	adds r2, r7, 0\n\
-	bl sub_80C004C\n\
-	b _080C0022\n\
-	.align 2, 0\n\
+    ldr r0, _080BFFD4 @ =gUnknown_03005D38\n\
+    movs r1, 0\n\
+    ldrsb r1, [r0, r1]\n\
+    lsls r0, r1, 3\n\
+    adds r0, r1\n\
+    lsls r0, 2\n\
+    adds r0, r4, r0\n\
+    ldrb r2, [r2]\n\
+    lsls r2, 24\n\
+    asrs r2, 24\n\
+    lsls r1, r2, 3\n\
+    adds r1, r2\n\
+    lsls r1, 2\n\
+    adds r1, r6, r1\n\
+    adds r2, r7, 0\n\
+    bl sub_80C004C\n\
+    b _080C0022\n\
+    .align 2, 0\n\
 _080BFFD4: .4byte gUnknown_03005D38\n\
 _080BFFD8:\n\
-	ldr r0, _080BFFFC @ =gUnknown_03005D38\n\
-	movs r1, 0\n\
-	ldrsb r1, [r0, r1]\n\
-	lsls r0, r1, 3\n\
-	adds r0, r1\n\
-	lsls r0, 2\n\
-	adds r0, r4, r0\n\
-	ldrb r2, [r2]\n\
-	lsls r2, 24\n\
-	asrs r2, 24\n\
-	lsls r1, r2, 3\n\
-	adds r1, r2\n\
-	lsls r1, 2\n\
-	adds r1, r6, r1\n\
-	adds r2, r7, 0\n\
-	bl sub_80C00B4\n\
-	b _080C0022\n\
-	.align 2, 0\n\
+    ldr r0, _080BFFFC @ =gUnknown_03005D38\n\
+    movs r1, 0\n\
+    ldrsb r1, [r0, r1]\n\
+    lsls r0, r1, 3\n\
+    adds r0, r1\n\
+    lsls r0, 2\n\
+    adds r0, r4, r0\n\
+    ldrb r2, [r2]\n\
+    lsls r2, 24\n\
+    asrs r2, 24\n\
+    lsls r1, r2, 3\n\
+    adds r1, r2\n\
+    lsls r1, 2\n\
+    adds r1, r6, r1\n\
+    adds r2, r7, 0\n\
+    bl sub_80C00B4\n\
+    b _080C0022\n\
+    .align 2, 0\n\
 _080BFFFC: .4byte gUnknown_03005D38\n\
 _080C0000:\n\
-	ldr r0, _080C0030 @ =gUnknown_03005D38\n\
-	movs r1, 0\n\
-	ldrsb r1, [r0, r1]\n\
-	lsls r0, r1, 3\n\
-	adds r0, r1\n\
-	lsls r0, 2\n\
-	adds r0, r4, r0\n\
-	ldrb r2, [r2]\n\
-	lsls r2, 24\n\
-	asrs r2, 24\n\
-	lsls r1, r2, 3\n\
-	adds r1, r2\n\
-	lsls r1, 2\n\
-	adds r1, r6, r1\n\
-	adds r2, r7, 0\n\
-	bl sub_80C0134\n\
+    ldr r0, _080C0030 @ =gUnknown_03005D38\n\
+    movs r1, 0\n\
+    ldrsb r1, [r0, r1]\n\
+    lsls r0, r1, 3\n\
+    adds r0, r1\n\
+    lsls r0, 2\n\
+    adds r0, r4, r0\n\
+    ldrb r2, [r2]\n\
+    lsls r2, 24\n\
+    asrs r2, 24\n\
+    lsls r1, r2, 3\n\
+    adds r1, r2\n\
+    lsls r1, 2\n\
+    adds r1, r6, r1\n\
+    adds r2, r7, 0\n\
+    bl sub_80C0134\n\
 _080C0022:\n\
-	lsls r0, 24\n\
-	lsrs r5, r0, 24\n\
+    lsls r0, 24\n\
+    lsrs r5, r0, 24\n\
 _080C0026:\n\
-	cmp r5, 0x1\n\
-	beq _080C0034\n\
-	movs r0, 0\n\
-	b _080C0040\n\
-	.align 2, 0\n\
+    cmp r5, 0x1\n\
+    beq _080C0034\n\
+    movs r0, 0\n\
+    b _080C0040\n\
+    .align 2, 0\n\
 _080C0030: .4byte gUnknown_03005D38\n\
 _080C0034:\n\
-	ldr r0, _080C0048 @ =gUnknown_03000722\n\
-	ldrb r1, [r0]\n\
-	adds r0, r6, 0\n\
-	bl sub_80BF55C\n\
-	movs r0, 0x1\n\
+    ldr r0, _080C0048 @ =gUnknown_03000722\n\
+    ldrb r1, [r0]\n\
+    adds r0, r6, 0\n\
+    bl sub_80BF55C\n\
+    movs r0, 0x1\n\
 _080C0040:\n\
-	add sp, 0x4\n\
-	pop {r4-r7}\n\
-	pop {r1}\n\
-	bx r1\n\
-	.align 2, 0\n\
+    add sp, 0x4\n\
+    pop {r4-r7}\n\
+    pop {r1}\n\
+    bx r1\n\
+    .align 2, 0\n\
 _080C0048: .4byte gUnknown_03000722\n\
 .syntax divided\n");
 }
@@ -2509,206 +2509,206 @@ void sub_80C01D4(void)
 __attribute__((naked))
 void sub_80C01D4(void) {
     asm(".syntax unified\n\
-	push {r4-r6,lr}\n\
-	movs r6, 0\n\
+    push {r4-r6,lr}\n\
+    movs r6, 0\n\
 _080C01D8:\n\
-	ldr r0, _080C01F8 @ =gSaveBlock1\n\
-	lsls r2, r6, 3\n\
-	adds r1, r2, r6\n\
-	lsls r1, 2\n\
-	adds r1, r0\n\
-	ldr r0, _080C01FC @ =0x00002738\n\
-	adds r1, r0\n\
-	ldrb r0, [r1]\n\
-	cmp r0, 0x29\n\
-	bls _080C01EE\n\
-	b _default\n\
+    ldr r0, _080C01F8 @ =gSaveBlock1\n\
+    lsls r2, r6, 3\n\
+    adds r1, r2, r6\n\
+    lsls r1, 2\n\
+    adds r1, r0\n\
+    ldr r0, _080C01FC @ =0x00002738\n\
+    adds r1, r0\n\
+    ldrb r0, [r1]\n\
+    cmp r0, 0x29\n\
+    bls _080C01EE\n\
+    b _default\n\
 _080C01EE:\n\
-	lsls r0, 2\n\
-	ldr r1, _080C0200 @ =_080C0204\n\
-	adds r0, r1\n\
-	ldr r0, [r0]\n\
-	mov pc, r0\n\
-	.align 2, 0\n\
+    lsls r0, 2\n\
+    ldr r1, _080C0200 @ =_080C0204\n\
+    adds r0, r1\n\
+    ldr r0, [r0]\n\
+    mov pc, r0\n\
+    .align 2, 0\n\
 _080C01F8: .4byte gSaveBlock1\n\
 _080C01FC: .4byte 0x00002738\n\
 _080C0200: .4byte _080C0204\n\
-	.align 2, 0\n\
+    .align 2, 0\n\
 _080C0204:\n\
-	.4byte _break\n\
-	.4byte _fanclubLetter @ TVSHOW_FAN_CLUB_LETTER\n\
-	.4byte _break    @ TVSHOW_RECENT_HAPPENINGS\n\
-	.4byte _fanclubOpinions @ TVSHOW_PKMN_FAN_CLUB_OPINIONS\n\
-	.4byte _showtype4 @ TVSHOW_UNKN_SHOWTYPE_04\n\
-	.4byte _nameRater @ TVSHOW_NAME_RATER_SHOW\n\
-	.4byte _bravoTrainerContest @ TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE\n\
-	.4byte _bravoTrainerTower @ TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _pokemonTodayS @ TVSHOW_POKEMON_TODAY_CAUGHT\n\
-	.4byte _break    @ TVSHOW_SMART_SHOPPER\n\
-	.4byte _pokemonTodayF @ TVSHOW_POKEMON_TODAY_FAILED\n\
-	.4byte _fishing @ TVSHOW_FISHING_ADVICE\n\
-	.4byte _worldOfMasters @ TVSHOW_WORLD_OF_MASTERS\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _default\n\
-	.4byte _break    @ TVSHOW_MASS_OUTBREAK\n\
+    .4byte _break\n\
+    .4byte _fanclubLetter @ TVSHOW_FAN_CLUB_LETTER\n\
+    .4byte _break    @ TVSHOW_RECENT_HAPPENINGS\n\
+    .4byte _fanclubOpinions @ TVSHOW_PKMN_FAN_CLUB_OPINIONS\n\
+    .4byte _showtype4 @ TVSHOW_UNKN_SHOWTYPE_04\n\
+    .4byte _nameRater @ TVSHOW_NAME_RATER_SHOW\n\
+    .4byte _bravoTrainerContest @ TVSHOW_BRAVO_TRAINER_POKEMON_PROFILE\n\
+    .4byte _bravoTrainerTower @ TVSHOW_BRAVO_TRAINER_BATTLE_TOWER_PROFILE\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _pokemonTodayS @ TVSHOW_POKEMON_TODAY_CAUGHT\n\
+    .4byte _break    @ TVSHOW_SMART_SHOPPER\n\
+    .4byte _pokemonTodayF @ TVSHOW_POKEMON_TODAY_FAILED\n\
+    .4byte _fishing @ TVSHOW_FISHING_ADVICE\n\
+    .4byte _worldOfMasters @ TVSHOW_WORLD_OF_MASTERS\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _default\n\
+    .4byte _break    @ TVSHOW_MASS_OUTBREAK\n\
 _fanclubLetter:\n\
-	adds r0, r2, r6\n\
-	lsls r0, 2\n\
-	ldr r1, _080C02B8 @ =gSaveBlock1 + 0x2738\n\
-	adds r0, r1\n\
-	ldrh r0, [r0, 0x2]\n\
-	b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
-	.align 2, 0\n\
+    adds r0, r2, r6\n\
+    lsls r0, 2\n\
+    ldr r1, _080C02B8 @ =gSaveBlock1 + 0x2738\n\
+    adds r0, r1\n\
+    ldrh r0, [r0, 0x2]\n\
+    b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
+    .align 2, 0\n\
 _080C02B8: .4byte gSaveBlock1 + 0x2738\n\
 _fanclubOpinions:\n\
-	adds r0, r2, r6\n\
-	lsls r0, 2\n\
-	ldr r1, _080C02C8 @ =gSaveBlock1 + 0x2738\n\
-	adds r0, r1\n\
-	ldrh r0, [r0, 0x2]\n\
-	b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
-	.align 2, 0\n\
+    adds r0, r2, r6\n\
+    lsls r0, 2\n\
+    ldr r1, _080C02C8 @ =gSaveBlock1 + 0x2738\n\
+    adds r0, r1\n\
+    ldrh r0, [r0, 0x2]\n\
+    b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
+    .align 2, 0\n\
 _080C02C8: .4byte gSaveBlock1 + 0x2738\n\
 _showtype4:\n\
-	adds r0, r2, r6\n\
-	lsls r0, 2\n\
-	ldr r1, _080C02D8 @ =gSaveBlock1 + 0x2738\n\
-	adds r0, r1\n\
-	ldrh r0, [r0, 0x6]\n\
-	b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
-	.align 2, 0\n\
+    adds r0, r2, r6\n\
+    lsls r0, 2\n\
+    ldr r1, _080C02D8 @ =gSaveBlock1 + 0x2738\n\
+    adds r0, r1\n\
+    ldrh r0, [r0, 0x6]\n\
+    b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
+    .align 2, 0\n\
 _080C02D8: .4byte gSaveBlock1 + 0x2738\n\
 _nameRater:\n\
-	adds r4, r2, r6\n\
-	lsls r4, 2\n\
-	ldr r0, _080C02F4 @ =gSaveBlock1 + 0x2738\n\
-	adds r4, r0\n\
-	ldrh r0, [r4, 0x2]\n\
-	lsls r5, r6, 24\n\
-	lsrs r5, 24\n\
-	adds r1, r5, 0\n\
-	bl sub_80C03C8\n\
-	ldrh r0, [r4, 0x1C]\n\
-	b _checkSpecies2 @ sub_80C03C8(r0, i)\n\
-	.align 2, 0\n\
+    adds r4, r2, r6\n\
+    lsls r4, 2\n\
+    ldr r0, _080C02F4 @ =gSaveBlock1 + 0x2738\n\
+    adds r4, r0\n\
+    ldrh r0, [r4, 0x2]\n\
+    lsls r5, r6, 24\n\
+    lsrs r5, 24\n\
+    adds r1, r5, 0\n\
+    bl sub_80C03C8\n\
+    ldrh r0, [r4, 0x1C]\n\
+    b _checkSpecies2 @ sub_80C03C8(r0, i)\n\
+    .align 2, 0\n\
 _080C02F4: .4byte gSaveBlock1 + 0x2738\n\
 _bravoTrainerContest:\n\
-	adds r0, r2, r6\n\
-	lsls r0, 2\n\
-	ldr r1, _080C0304 @ =gSaveBlock1 + 0x2738\n\
-	adds r0, r1\n\
-	ldrh r0, [r0, 0x2]\n\
-	b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
-	.align 2, 0\n\
+    adds r0, r2, r6\n\
+    lsls r0, 2\n\
+    ldr r1, _080C0304 @ =gSaveBlock1 + 0x2738\n\
+    adds r0, r1\n\
+    ldrh r0, [r0, 0x2]\n\
+    b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
+    .align 2, 0\n\
 _080C0304: .4byte gSaveBlock1 + 0x2738\n\
 _bravoTrainerTower:\n\
-	adds r4, r2, r6\n\
-	lsls r4, 2\n\
-	ldr r0, _080C0320 @ =gSaveBlock1 + 0x2738\n\
-	adds r4, r0\n\
-	ldrh r0, [r4, 0xA]\n\
-	lsls r5, r6, 24\n\
-	lsrs r5, 24\n\
-	adds r1, r5, 0\n\
-	bl sub_80C03C8\n\
-	ldrh r0, [r4, 0x14]\n\
-	b _checkSpecies2 @ sub_80C03C8(r0, i)\n\
-	.align 2, 0\n\
+    adds r4, r2, r6\n\
+    lsls r4, 2\n\
+    ldr r0, _080C0320 @ =gSaveBlock1 + 0x2738\n\
+    adds r4, r0\n\
+    ldrh r0, [r4, 0xA]\n\
+    lsls r5, r6, 24\n\
+    lsrs r5, 24\n\
+    adds r1, r5, 0\n\
+    bl sub_80C03C8\n\
+    ldrh r0, [r4, 0x14]\n\
+    b _checkSpecies2 @ sub_80C03C8(r0, i)\n\
+    .align 2, 0\n\
 _080C0320: .4byte gSaveBlock1 + 0x2738\n\
 _pokemonTodayS:\n\
-	adds r0, r2, r6\n\
-	lsls r0, 2\n\
-	ldr r1, _080C0330 @ =gSaveBlock1 + 0x2738\n\
-	adds r0, r1\n\
-	ldrh r0, [r0, 0x10]\n\
-	b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
-	.align 2, 0\n\
+    adds r0, r2, r6\n\
+    lsls r0, 2\n\
+    ldr r1, _080C0330 @ =gSaveBlock1 + 0x2738\n\
+    adds r0, r1\n\
+    ldrh r0, [r0, 0x10]\n\
+    b _checkSpecies1 @ sub_80C03C8(r0, i)\n\
+    .align 2, 0\n\
 _080C0330: .4byte gSaveBlock1 + 0x2738\n\
 _pokemonTodayF:\n\
-	adds r4, r2, r6\n\
-	lsls r4, 2\n\
-	ldr r0, _080C034C @ =gSaveBlock1 + 0x2738\n\
-	adds r4, r0\n\
-	ldrh r0, [r4, 0xC]\n\
-	lsls r5, r6, 24\n\
-	lsrs r5, 24\n\
-	adds r1, r5, 0\n\
-	bl sub_80C03C8\n\
-	ldrh r0, [r4, 0xE]\n\
-	b _checkSpecies2 @ sub_80C03C8(r0, i)\n\
-	.align 2, 0\n\
+    adds r4, r2, r6\n\
+    lsls r4, 2\n\
+    ldr r0, _080C034C @ =gSaveBlock1 + 0x2738\n\
+    adds r4, r0\n\
+    ldrh r0, [r4, 0xC]\n\
+    lsls r5, r6, 24\n\
+    lsrs r5, 24\n\
+    adds r1, r5, 0\n\
+    bl sub_80C03C8\n\
+    ldrh r0, [r4, 0xE]\n\
+    b _checkSpecies2 @ sub_80C03C8(r0, i)\n\
+    .align 2, 0\n\
 _080C034C: .4byte gSaveBlock1 + 0x2738\n\
 _fishing:\n\
-	adds r0, r2, r6\n\
-	lsls r0, 2\n\
-	ldr r1, _080C0364 @ =gSaveBlock1 + 0x2738\n\
-	adds r0, r1\n\
-	ldrh r0, [r0, 0x4]\n\
+    adds r0, r2, r6\n\
+    lsls r0, 2\n\
+    ldr r1, _080C0364 @ =gSaveBlock1 + 0x2738\n\
+    adds r0, r1\n\
+    ldrh r0, [r0, 0x4]\n\
 _checkSpecies1:\n\
-	lsls r1, r6, 24\n\
-	lsrs r1, 24\n\
-	bl sub_80C03C8\n\
-	b _break\n\
-	.align 2, 0\n\
+    lsls r1, r6, 24\n\
+    lsrs r1, 24\n\
+    bl sub_80C03C8\n\
+    b _break\n\
+    .align 2, 0\n\
 _080C0364: .4byte gSaveBlock1 + 0x2738\n\
 _worldOfMasters:\n\
-	adds r4, r2, r6\n\
-	lsls r4, 2\n\
-	ldr r0, _080C0388 @ =gSaveBlock1 + 0x2738\n\
-	adds r4, r0\n\
-	ldrh r0, [r4, 0x8]\n\
-	lsls r5, r6, 24\n\
-	lsrs r5, 24\n\
-	adds r1, r5, 0\n\
-	bl sub_80C03C8\n\
-	ldrh r0, [r4, 0x4]\n\
+    adds r4, r2, r6\n\
+    lsls r4, 2\n\
+    ldr r0, _080C0388 @ =gSaveBlock1 + 0x2738\n\
+    adds r4, r0\n\
+    ldrh r0, [r4, 0x8]\n\
+    lsls r5, r6, 24\n\
+    lsrs r5, 24\n\
+    adds r1, r5, 0\n\
+    bl sub_80C03C8\n\
+    ldrh r0, [r4, 0x4]\n\
 _checkSpecies2:\n\
-	adds r1, r5, 0\n\
-	bl sub_80C03C8\n\
-	b _break\n\
-	.align 2, 0\n\
+    adds r1, r5, 0\n\
+    bl sub_80C03C8\n\
+    b _break\n\
+    .align 2, 0\n\
 _080C0388: .4byte gSaveBlock1 + 0x2738\n\
 _default:\n\
-	lsls r0, r6, 24\n\
-	lsrs r0, 24\n\
-	bl sub_80C03A8\n\
+    lsls r0, r6, 24\n\
+    lsrs r0, 24\n\
+    bl sub_80C03A8\n\
 _break:\n\
-	adds r0, r6, 0x1\n\
-	lsls r0, 16\n\
-	lsrs r6, r0, 16\n\
-	cmp r6, 0x17\n\
-	bhi _080C03A0\n\
-	b _080C01D8\n\
+    adds r0, r6, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r6, r0, 16\n\
+    cmp r6, 0x17\n\
+    bhi _080C03A0\n\
+    b _080C01D8\n\
 _080C03A0:\n\
-	pop {r4-r6}\n\
-	pop {r0}\n\
-	bx r0\n\
+    pop {r4-r6}\n\
+    pop {r0}\n\
+    bx r0\n\
 .syntax divided\n");
 }
 #endif
@@ -2738,43 +2738,43 @@ void sub_80C0408(void) {
 __attribute__((naked))
 void sub_80C0408(void) {
     asm(".syntax unified\n\
-	push {r4-r6,lr}\n\
-	ldr r0, _080C044C @ =0x00000804\n\
-	bl FlagGet\n\
-	lsls r0, 24\n\
-	lsrs r0, 24\n\
-	cmp r0, 0x1\n\
-	beq _080C0444\n\
-	movs r2, 0\n\
-	ldr r6, _080C0450 @ =gSaveBlock1\n\
-	ldr r4, _080C0454 @ =0x00002739\n\
-	movs r3, 0\n\
-	ldr r5, _080C0458 @ =0x00002738\n\
+    push {r4-r6,lr}\n\
+    ldr r0, _080C044C @ =0x00000804\n\
+    bl FlagGet\n\
+    lsls r0, 24\n\
+    lsrs r0, 24\n\
+    cmp r0, 0x1\n\
+    beq _080C0444\n\
+    movs r2, 0\n\
+    ldr r6, _080C0450 @ =gSaveBlock1\n\
+    ldr r4, _080C0454 @ =0x00002739\n\
+    movs r3, 0\n\
+    ldr r5, _080C0458 @ =0x00002738\n\
 _080C0422:\n\
-	lsls r0, r2, 3\n\
-	adds r0, r2\n\
-	lsls r0, 2\n\
-	adds r1, r0, r6\n\
-	adds r0, r1, r5\n\
-	ldrb r0, [r0]\n\
-	cmp r0, 0x7\n\
-	beq _080C0436\n\
-	cmp r0, 0x29\n\
-	bne _080C043A\n\
+    lsls r0, r2, 3\n\
+    adds r0, r2\n\
+    lsls r0, 2\n\
+    adds r1, r0, r6\n\
+    adds r0, r1, r5\n\
+    ldrb r0, [r0]\n\
+    cmp r0, 0x7\n\
+    beq _080C0436\n\
+    cmp r0, 0x29\n\
+    bne _080C043A\n\
 _080C0436:\n\
-	adds r0, r1, r4\n\
-	strb r3, [r0]\n\
+    adds r0, r1, r4\n\
+    strb r3, [r0]\n\
 _080C043A:\n\
-	adds r0, r2, 0x1\n\
-	lsls r0, 16\n\
-	lsrs r2, r0, 16\n\
-	cmp r2, 0x17\n\
-	bls _080C0422\n\
+    adds r0, r2, 0x1\n\
+    lsls r0, 16\n\
+    lsrs r2, r0, 16\n\
+    cmp r2, 0x17\n\
+    bls _080C0422\n\
 _080C0444:\n\
-	pop {r4-r6}\n\
-	pop {r0}\n\
-	bx r0\n\
-	.align 2, 0\n\
+    pop {r4-r6}\n\
+    pop {r0}\n\
+    bx r0\n\
+    .align 2, 0\n\
 _080C044C: .4byte 0x00000804\n\
 _080C0450: .4byte gSaveBlock1\n\
 _080C0454: .4byte 0x00002739\n\
diff --git a/src/util.c b/src/util.c
index 2278c50fe..55608854c 100644
--- a/src/util.c
+++ b/src/util.c
@@ -6,41 +6,41 @@ extern const u8 gSpriteDimensions[3][4][2];
 extern const u16 gCrc16Table[];
 
 u8 CreateInvisibleSpriteWithCallback(void (*callback)(struct Sprite *)) {
-	u8 sprite = CreateSprite(&gInvisibleSpriteTemplate, 248, 168, 14);
-	gSprites[sprite].invisible = TRUE;
-	gSprites[sprite].callback = callback;
-	return sprite;
+    u8 sprite = CreateSprite(&gInvisibleSpriteTemplate, 248, 168, 14);
+    gSprites[sprite].invisible = TRUE;
+    gSprites[sprite].callback = callback;
+    return sprite;
 }
 
 void StoreWordInTwoHalfwords(u16 *h, u32 w) {
-	h[0] = (u16)(w);
-	h[1] = (u16)(w >> 16);
+    h[0] = (u16)(w);
+    h[1] = (u16)(w >> 16);
 }
 
 void LoadWordFromTwoHalfwords(u16 *h, u32 *w) {
-	*w = h[0] | (s16)h[1] << 16;
+    *w = h[0] | (s16)h[1] << 16;
 }
 
 void SetBgAffineStruct(struct BgAffineSrcData *src, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha) {
-	src->texX = texX;
-	src->texY = texY;
-	src->scrX = scrX;
-	src->scrY = scrY;
-	src->sx = sx;
-	src->sy = sy;
-	src->alpha = alpha;
+    src->texX = texX;
+    src->texY = texY;
+    src->scrX = scrX;
+    src->scrY = scrY;
+    src->sx = sx;
+    src->sy = sy;
+    src->alpha = alpha;
 }
 
 void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s16 scrY, s16 sx, s16 sy, u16 alpha) {
-	struct BgAffineSrcData src;
-	SetBgAffineStruct(
-		&src,
-		texX, texY,
-		scrX, scrY,
-		sx, sy,
-		alpha
-	);
-	BgAffineSet(&src, dest, 1);
+    struct BgAffineSrcData src;
+    SetBgAffineStruct(
+        &src,
+        texX, texY,
+        scrX, scrY,
+        sx, sy,
+        alpha
+    );
+    BgAffineSet(&src, dest, 1);
 }
 
 #ifdef NONMATCHING
@@ -48,342 +48,342 @@ void DoBgAffineSet(struct BgAffineDstData *dest, u32 texX, u32 texY, s16 scrX, s
 // Functionally equivalent.
 // Only the two yflip loops don't match.
 void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output) {
-	u8 x, y;
-	s8 i, j;
-	u8 xflip[32];
-	u8 h = gSpriteDimensions[shape][size][1];
-	u8 w = gSpriteDimensions[shape][size][0];
-	for (y = 0; y < h; y++) {
-		int filler = 32 - w;
-		for (x = 0; x < w; x++) {
-			int tile = (*tilemap & 0x3ff) * 32;
-			int attr = *tilemap & 0xc00;
-			if (attr == 0) {
-				void *src = tiles + tile;
-				void *dest = output;
-				int length = 32;
-				DmaCopy32(3, src, dest, length);
-			} else if (attr == 0x800) { // yflip
-				for (i = 0; i < 8; i++) {
-					void *src = tiles;
-					void *dest = output;
-					int length = 4;
-					// this is likely wrong, but makes it closer to matching
-					src += tile + (7 - i) * 4;
-					dest += i * 4;
-					DmaCopy32(3, src, dest, length);
-				}
-			} else { // xflip
-				for (i = 0; i < 8; i++) {
-					for (j = 0; j < 4; j++) {
-						u8 i2 = i * 4;
-						xflip[i2 + (3-j)] = (tiles[tile + i2 + j] & 0xf) << 4;
-						xflip[i2 + (3-j)] |= tiles[tile + i2 + j] >> 4;
-					}
-				}
-				if (*tilemap & 0x800) { // yflip
-					for (i = 0; i < 8; i++) {
-						void *src = xflip + (7-i) * 4;
-						void *dest = output + i*4;
-						int length = 4;
-						DmaCopy32(3, src, dest, length);
-					}
-				} else {
-					void *src = xflip;
-					void *dest = output;
-					int length = 32;
-					DmaCopy32(3, src, dest, length);
-				}
-			}
-			tilemap++;
-			output += 32;
-		}
-		tilemap += filler;
-	}
+    u8 x, y;
+    s8 i, j;
+    u8 xflip[32];
+    u8 h = gSpriteDimensions[shape][size][1];
+    u8 w = gSpriteDimensions[shape][size][0];
+    for (y = 0; y < h; y++) {
+        int filler = 32 - w;
+        for (x = 0; x < w; x++) {
+            int tile = (*tilemap & 0x3ff) * 32;
+            int attr = *tilemap & 0xc00;
+            if (attr == 0) {
+                void *src = tiles + tile;
+                void *dest = output;
+                int length = 32;
+                DmaCopy32(3, src, dest, length);
+            } else if (attr == 0x800) { // yflip
+                for (i = 0; i < 8; i++) {
+                    void *src = tiles;
+                    void *dest = output;
+                    int length = 4;
+                    // this is likely wrong, but makes it closer to matching
+                    src += tile + (7 - i) * 4;
+                    dest += i * 4;
+                    DmaCopy32(3, src, dest, length);
+                }
+            } else { // xflip
+                for (i = 0; i < 8; i++) {
+                    for (j = 0; j < 4; j++) {
+                        u8 i2 = i * 4;
+                        xflip[i2 + (3-j)] = (tiles[tile + i2 + j] & 0xf) << 4;
+                        xflip[i2 + (3-j)] |= tiles[tile + i2 + j] >> 4;
+                    }
+                }
+                if (*tilemap & 0x800) { // yflip
+                    for (i = 0; i < 8; i++) {
+                        void *src = xflip + (7-i) * 4;
+                        void *dest = output + i*4;
+                        int length = 4;
+                        DmaCopy32(3, src, dest, length);
+                    }
+                } else {
+                    void *src = xflip;
+                    void *dest = output;
+                    int length = 32;
+                    DmaCopy32(3, src, dest, length);
+                }
+            }
+            tilemap++;
+            output += 32;
+        }
+        tilemap += filler;
+    }
 }
 
 #else
 
 __attribute__((naked)) void CopySpriteTiles(u8 shape, u8 size, u8 *tiles, u16 *tilemap, u8 *output) {
-	asm("\n"
-	"	.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, 0x3C\n"
-	"	str r2, [sp, 0x20]\n"
-	"	adds r4, r3, 0\n"
-	"	ldr r7, [sp, 0x5C]\n"
-	"	lsls r0, 24\n"
-	"	lsls r1, 24\n"
-	"	ldr r2, _08041008 @ =gSpriteDimensions\n"
-	"	lsrs r1, 23\n"
-	"	lsrs r0, 21\n"
-	"	adds r1, r0\n"
-	"	adds r0, r2, 0x1\n"
-	"	adds r0, r1, r0\n"
-	"	ldrb r0, [r0]\n"
-	"	str r0, [sp, 0x24]\n"
-	"	adds r1, r2\n"
-	"	ldrb r1, [r1]\n"
-	"	str r1, [sp, 0x28]\n"
-	"	movs r1, 0\n"
-	"	cmp r1, r0\n"
-	"	bcc _08040FB4\n"
-	"	b _08041136\n"
-	"_08040FB4:\n"
-	"	movs r0, 0x20\n"
-	"	ldr r2, [sp, 0x28]\n"
-	"	subs r0, r2\n"
-	"	lsls r0, 1\n"
-	"	str r0, [sp, 0x2C]\n"
-	"_08040FBE:\n"
-	"	movs r2, 0\n"
-	"	adds r1, 0x1\n"
-	"	str r1, [sp, 0x34]\n"
-	"	ldr r3, [sp, 0x28]\n"
-	"	cmp r2, r3\n"
-	"	bcc _08040FCC\n"
-	"	b _08041124\n"
-	"_08040FCC:\n"
-	"	ldr r0, _0804100C @ =0x040000d4\n"
-	"	mov r8, r0\n"
-	"_08040FD0:\n"
-	"	ldrh r1, [r4]\n"
-	"	ldr r0, _08041010 @ =0x000003ff\n"
-	"	ands r0, r1\n"
-	"	lsls r0, 5\n"
-	"	mov r12, r0\n"
-	"	movs r0, 0xC0\n"
-	"	lsls r0, 4\n"
-	"	ands r0, r1\n"
-	"	mov r3, sp\n"
-	"	strh r1, [r3, 0x38]\n"
-	"	cmp r0, 0\n"
-	"	bne _08041018\n"
-	"	ldr r0, [sp, 0x20]\n"
-	"	add r0, r12\n"
-	"	mov r1, r8\n"
-	"	str r0, [r1]\n"
-	"	str r7, [r1, 0x4]\n"
-	"	ldr r3, _08041014 @ =0x84000008\n"
-	"	str r3, [r1, 0x8]\n"
-	"	ldr r0, [r1, 0x8]\n"
-	"	adds r4, 0x2\n"
-	"	str r4, [sp, 0x30]\n"
-	"	adds r7, 0x20\n"
-	"	mov r10, r7\n"
-	"	adds r2, 0x1\n"
-	"	mov r9, r2\n"
-	"	b _08041112\n"
-	"	.align 2, 0\n"
-	"_08041008: .4byte gSpriteDimensions\n"
-	"_0804100C: .4byte 0x040000d4\n"
-	"_08041010: .4byte 0x000003ff\n"
-	"_08041014: .4byte 0x84000008\n"
-	"_08041018:\n"
-	"	movs r1, 0x80\n"
-	"	lsls r1, 4\n"
-	"	cmp r0, r1\n"
-	"	bne _08041068\n"
-	"	movs r3, 0\n"
-	"	adds r4, 0x2\n"
-	"	str r4, [sp, 0x30]\n"
-	"	movs r0, 0x20\n"
-	"	adds r0, r7\n"
-	"	mov r10, r0\n"
-	"	adds r2, 0x1\n"
-	"	mov r9, r2\n"
-	"	ldr r4, _08041060 @ =0x040000d4\n"
-	"	ldr r6, _08041064 @ =0x84000001\n"
-	"	movs r5, 0x7\n"
-	"_08041036:\n"
-	"	lsls r2, r3, 24\n"
-	"	asrs r2, 24\n"
-	"	subs r0, r5, r2\n"
-	"	lsls r0, 2\n"
-	"	add r0, r12\n"
-	"	ldr r1, [sp, 0x20]\n"
-	"	adds r0, r1, r0\n"
-	"	lsls r1, r2, 2\n"
-	"	adds r1, r7, r1\n"
-	"	str r0, [r4]\n"
-	"	str r1, [r4, 0x4]\n"
-	"	str r6, [r4, 0x8]\n"
-	"	ldr r0, [r4, 0x8]\n"
-	"	adds r2, 0x1\n"
-	"	lsls r2, 24\n"
-	"	lsrs r3, r2, 24\n"
-	"	asrs r2, 24\n"
-	"	cmp r2, 0x7\n"
-	"	ble _08041036\n"
-	"	b _08041112\n"
-	"	.align 2, 0\n"
-	"_08041060: .4byte 0x040000d4\n"
-	"_08041064: .4byte 0x84000001\n"
-	"_08041068:\n"
-	"	movs r3, 0\n"
-	"	adds r4, 0x2\n"
-	"	str r4, [sp, 0x30]\n"
-	"	movs r0, 0x20\n"
-	"	adds r0, r7\n"
-	"	mov r10, r0\n"
-	"	adds r2, 0x1\n"
-	"	mov r9, r2\n"
-	"_08041078:\n"
-	"	movs r2, 0\n"
-	"	lsls r4, r3, 24\n"
-	"	lsls r0, r4, 2\n"
-	"	lsrs r0, 24\n"
-	"	adds r6, r0, 0x3\n"
-	"	mov r1, r12\n"
-	"	adds r5, r1, r0\n"
-	"_08041086:\n"
-	"	lsls r1, r2, 24\n"
-	"	asrs r1, 24\n"
-	"	subs r0, r6, r1\n"
-	"	mov r2, sp\n"
-	"	adds r3, r2, r0\n"
-	"	adds r0, r5, r1\n"
-	"	ldr r2, [sp, 0x20]\n"
-	"	adds r0, r2, r0\n"
-	"	ldrb r2, [r0]\n"
-	"	movs r0, 0xF\n"
-	"	ands r0, r2\n"
-	"	lsls r0, 4\n"
-	"	lsrs r2, 4\n"
-	"	orrs r0, r2\n"
-	"	strb r0, [r3]\n"
-	"	adds r1, 0x1\n"
-	"	lsls r1, 24\n"
-	"	lsrs r2, r1, 24\n"
-	"	asrs r1, 24\n"
-	"	cmp r1, 0x3\n"
-	"	ble _08041086\n"
-	"	movs r3, 0x80\n"
-	"	lsls r3, 17\n"
-	"	adds r0, r4, r3\n"
-	"	lsrs r3, r0, 24\n"
-	"	asrs r0, 24\n"
-	"	cmp r0, 0x7\n"
-	"	ble _08041078\n"
-	"	movs r0, 0x80\n"
-	"	lsls r0, 4\n"
-	"	mov r1, sp\n"
-	"	ldrh r1, [r1, 0x38]\n"
-	"	ands r0, r1\n"
-	"	cmp r0, 0\n"
-	"	beq _08041104\n"
-	"	movs r3, 0\n"
-	"	ldr r4, _080410FC @ =0x040000d4\n"
-	"	ldr r6, _08041100 @ =0x84000001\n"
-	"	movs r5, 0x7\n"
-	"_080410D4:\n"
-	"	lsls r1, r3, 24\n"
-	"	asrs r1, 24\n"
-	"	subs r0, r5, r1\n"
-	"	lsls r0, 2\n"
-	"	mov r3, sp\n"
-	"	adds r2, r3, r0\n"
-	"	lsls r0, r1, 2\n"
-	"	adds r0, r7, r0\n"
-	"	str r2, [r4]\n"
-	"	str r0, [r4, 0x4]\n"
-	"	str r6, [r4, 0x8]\n"
-	"	ldr r0, [r4, 0x8]\n"
-	"	adds r1, 0x1\n"
-	"	lsls r1, 24\n"
-	"	lsrs r3, r1, 24\n"
-	"	asrs r1, 24\n"
-	"	cmp r1, 0x7\n"
-	"	ble _080410D4\n"
-	"	b _08041112\n"
-	"	.align 2, 0\n"
-	"_080410FC: .4byte 0x040000d4\n"
-	"_08041100: .4byte 0x84000001\n"
-	"_08041104:\n"
-	"	mov r0, sp\n"
-	"	mov r1, r8\n"
-	"	str r0, [r1]\n"
-	"	str r7, [r1, 0x4]\n"
-	"	ldr r2, _08041148 @ =0x84000008\n"
-	"	str r2, [r1, 0x8]\n"
-	"	ldr r0, [r1, 0x8]\n"
-	"_08041112:\n"
-	"	ldr r4, [sp, 0x30]\n"
-	"	mov r7, r10\n"
-	"	mov r3, r9\n"
-	"	lsls r0, r3, 24\n"
-	"	lsrs r2, r0, 24\n"
-	"	ldr r0, [sp, 0x28]\n"
-	"	cmp r2, r0\n"
-	"	bcs _08041124\n"
-	"	b _08040FD0\n"
-	"_08041124:\n"
-	"	ldr r1, [sp, 0x2C]\n"
-	"	adds r4, r1\n"
-	"	ldr r2, [sp, 0x34]\n"
-	"	lsls r0, r2, 24\n"
-	"	lsrs r1, r0, 24\n"
-	"	ldr r3, [sp, 0x24]\n"
-	"	cmp r1, r3\n"
-	"	bcs _08041136\n"
-	"	b _08040FBE\n"
-	"_08041136:\n"
-	"	add sp, 0x3C\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"
-	"_08041148: .4byte 0x84000008\n"
-	"	.syntax divided\n"
-	);
+    asm("\n"
+    "    .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, 0x3C\n"
+    "    str r2, [sp, 0x20]\n"
+    "    adds r4, r3, 0\n"
+    "    ldr r7, [sp, 0x5C]\n"
+    "    lsls r0, 24\n"
+    "    lsls r1, 24\n"
+    "    ldr r2, _08041008 @ =gSpriteDimensions\n"
+    "    lsrs r1, 23\n"
+    "    lsrs r0, 21\n"
+    "    adds r1, r0\n"
+    "    adds r0, r2, 0x1\n"
+    "    adds r0, r1, r0\n"
+    "    ldrb r0, [r0]\n"
+    "    str r0, [sp, 0x24]\n"
+    "    adds r1, r2\n"
+    "    ldrb r1, [r1]\n"
+    "    str r1, [sp, 0x28]\n"
+    "    movs r1, 0\n"
+    "    cmp r1, r0\n"
+    "    bcc _08040FB4\n"
+    "    b _08041136\n"
+    "_08040FB4:\n"
+    "    movs r0, 0x20\n"
+    "    ldr r2, [sp, 0x28]\n"
+    "    subs r0, r2\n"
+    "    lsls r0, 1\n"
+    "    str r0, [sp, 0x2C]\n"
+    "_08040FBE:\n"
+    "    movs r2, 0\n"
+    "    adds r1, 0x1\n"
+    "    str r1, [sp, 0x34]\n"
+    "    ldr r3, [sp, 0x28]\n"
+    "    cmp r2, r3\n"
+    "    bcc _08040FCC\n"
+    "    b _08041124\n"
+    "_08040FCC:\n"
+    "    ldr r0, _0804100C @ =0x040000d4\n"
+    "    mov r8, r0\n"
+    "_08040FD0:\n"
+    "    ldrh r1, [r4]\n"
+    "    ldr r0, _08041010 @ =0x000003ff\n"
+    "    ands r0, r1\n"
+    "    lsls r0, 5\n"
+    "    mov r12, r0\n"
+    "    movs r0, 0xC0\n"
+    "    lsls r0, 4\n"
+    "    ands r0, r1\n"
+    "    mov r3, sp\n"
+    "    strh r1, [r3, 0x38]\n"
+    "    cmp r0, 0\n"
+    "    bne _08041018\n"
+    "    ldr r0, [sp, 0x20]\n"
+    "    add r0, r12\n"
+    "    mov r1, r8\n"
+    "    str r0, [r1]\n"
+    "    str r7, [r1, 0x4]\n"
+    "    ldr r3, _08041014 @ =0x84000008\n"
+    "    str r3, [r1, 0x8]\n"
+    "    ldr r0, [r1, 0x8]\n"
+    "    adds r4, 0x2\n"
+    "    str r4, [sp, 0x30]\n"
+    "    adds r7, 0x20\n"
+    "    mov r10, r7\n"
+    "    adds r2, 0x1\n"
+    "    mov r9, r2\n"
+    "    b _08041112\n"
+    "    .align 2, 0\n"
+    "_08041008: .4byte gSpriteDimensions\n"
+    "_0804100C: .4byte 0x040000d4\n"
+    "_08041010: .4byte 0x000003ff\n"
+    "_08041014: .4byte 0x84000008\n"
+    "_08041018:\n"
+    "    movs r1, 0x80\n"
+    "    lsls r1, 4\n"
+    "    cmp r0, r1\n"
+    "    bne _08041068\n"
+    "    movs r3, 0\n"
+    "    adds r4, 0x2\n"
+    "    str r4, [sp, 0x30]\n"
+    "    movs r0, 0x20\n"
+    "    adds r0, r7\n"
+    "    mov r10, r0\n"
+    "    adds r2, 0x1\n"
+    "    mov r9, r2\n"
+    "    ldr r4, _08041060 @ =0x040000d4\n"
+    "    ldr r6, _08041064 @ =0x84000001\n"
+    "    movs r5, 0x7\n"
+    "_08041036:\n"
+    "    lsls r2, r3, 24\n"
+    "    asrs r2, 24\n"
+    "    subs r0, r5, r2\n"
+    "    lsls r0, 2\n"
+    "    add r0, r12\n"
+    "    ldr r1, [sp, 0x20]\n"
+    "    adds r0, r1, r0\n"
+    "    lsls r1, r2, 2\n"
+    "    adds r1, r7, r1\n"
+    "    str r0, [r4]\n"
+    "    str r1, [r4, 0x4]\n"
+    "    str r6, [r4, 0x8]\n"
+    "    ldr r0, [r4, 0x8]\n"
+    "    adds r2, 0x1\n"
+    "    lsls r2, 24\n"
+    "    lsrs r3, r2, 24\n"
+    "    asrs r2, 24\n"
+    "    cmp r2, 0x7\n"
+    "    ble _08041036\n"
+    "    b _08041112\n"
+    "    .align 2, 0\n"
+    "_08041060: .4byte 0x040000d4\n"
+    "_08041064: .4byte 0x84000001\n"
+    "_08041068:\n"
+    "    movs r3, 0\n"
+    "    adds r4, 0x2\n"
+    "    str r4, [sp, 0x30]\n"
+    "    movs r0, 0x20\n"
+    "    adds r0, r7\n"
+    "    mov r10, r0\n"
+    "    adds r2, 0x1\n"
+    "    mov r9, r2\n"
+    "_08041078:\n"
+    "    movs r2, 0\n"
+    "    lsls r4, r3, 24\n"
+    "    lsls r0, r4, 2\n"
+    "    lsrs r0, 24\n"
+    "    adds r6, r0, 0x3\n"
+    "    mov r1, r12\n"
+    "    adds r5, r1, r0\n"
+    "_08041086:\n"
+    "    lsls r1, r2, 24\n"
+    "    asrs r1, 24\n"
+    "    subs r0, r6, r1\n"
+    "    mov r2, sp\n"
+    "    adds r3, r2, r0\n"
+    "    adds r0, r5, r1\n"
+    "    ldr r2, [sp, 0x20]\n"
+    "    adds r0, r2, r0\n"
+    "    ldrb r2, [r0]\n"
+    "    movs r0, 0xF\n"
+    "    ands r0, r2\n"
+    "    lsls r0, 4\n"
+    "    lsrs r2, 4\n"
+    "    orrs r0, r2\n"
+    "    strb r0, [r3]\n"
+    "    adds r1, 0x1\n"
+    "    lsls r1, 24\n"
+    "    lsrs r2, r1, 24\n"
+    "    asrs r1, 24\n"
+    "    cmp r1, 0x3\n"
+    "    ble _08041086\n"
+    "    movs r3, 0x80\n"
+    "    lsls r3, 17\n"
+    "    adds r0, r4, r3\n"
+    "    lsrs r3, r0, 24\n"
+    "    asrs r0, 24\n"
+    "    cmp r0, 0x7\n"
+    "    ble _08041078\n"
+    "    movs r0, 0x80\n"
+    "    lsls r0, 4\n"
+    "    mov r1, sp\n"
+    "    ldrh r1, [r1, 0x38]\n"
+    "    ands r0, r1\n"
+    "    cmp r0, 0\n"
+    "    beq _08041104\n"
+    "    movs r3, 0\n"
+    "    ldr r4, _080410FC @ =0x040000d4\n"
+    "    ldr r6, _08041100 @ =0x84000001\n"
+    "    movs r5, 0x7\n"
+    "_080410D4:\n"
+    "    lsls r1, r3, 24\n"
+    "    asrs r1, 24\n"
+    "    subs r0, r5, r1\n"
+    "    lsls r0, 2\n"
+    "    mov r3, sp\n"
+    "    adds r2, r3, r0\n"
+    "    lsls r0, r1, 2\n"
+    "    adds r0, r7, r0\n"
+    "    str r2, [r4]\n"
+    "    str r0, [r4, 0x4]\n"
+    "    str r6, [r4, 0x8]\n"
+    "    ldr r0, [r4, 0x8]\n"
+    "    adds r1, 0x1\n"
+    "    lsls r1, 24\n"
+    "    lsrs r3, r1, 24\n"
+    "    asrs r1, 24\n"
+    "    cmp r1, 0x7\n"
+    "    ble _080410D4\n"
+    "    b _08041112\n"
+    "    .align 2, 0\n"
+    "_080410FC: .4byte 0x040000d4\n"
+    "_08041100: .4byte 0x84000001\n"
+    "_08041104:\n"
+    "    mov r0, sp\n"
+    "    mov r1, r8\n"
+    "    str r0, [r1]\n"
+    "    str r7, [r1, 0x4]\n"
+    "    ldr r2, _08041148 @ =0x84000008\n"
+    "    str r2, [r1, 0x8]\n"
+    "    ldr r0, [r1, 0x8]\n"
+    "_08041112:\n"
+    "    ldr r4, [sp, 0x30]\n"
+    "    mov r7, r10\n"
+    "    mov r3, r9\n"
+    "    lsls r0, r3, 24\n"
+    "    lsrs r2, r0, 24\n"
+    "    ldr r0, [sp, 0x28]\n"
+    "    cmp r2, r0\n"
+    "    bcs _08041124\n"
+    "    b _08040FD0\n"
+    "_08041124:\n"
+    "    ldr r1, [sp, 0x2C]\n"
+    "    adds r4, r1\n"
+    "    ldr r2, [sp, 0x34]\n"
+    "    lsls r0, r2, 24\n"
+    "    lsrs r1, r0, 24\n"
+    "    ldr r3, [sp, 0x24]\n"
+    "    cmp r1, r3\n"
+    "    bcs _08041136\n"
+    "    b _08040FBE\n"
+    "_08041136:\n"
+    "    add sp, 0x3C\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"
+    "_08041148: .4byte 0x84000008\n"
+    "    .syntax divided\n"
+    );
 }
 
 #endif
 
 int CountTrailingZeroBits(u32 value) {
-	u8 i;
-	for (i = 0; i < 32; i++) {
-		if ((value & 1) == 0) {
-			value >>= 1;
-		} else {
-			return i;
-		}
-	}
-	return 0;
+    u8 i;
+    for (i = 0; i < 32; i++) {
+        if ((value & 1) == 0) {
+            value >>= 1;
+        } else {
+            return i;
+        }
+    }
+    return 0;
 }
 
 u16 CalcCRC16(u8 *data, int length) {
-	u16 i, j;
-	u16 crc = 0x1121;
-	for (i = 0; i < length; i++) {
-		crc ^= data[i];
-		for (j = 0; j < 8; j++) {
-			if (crc & 1) {
-				crc = (crc >> 1) ^ 0x8408;
-			} else {
-				crc >>= 1;
-			}
-		}
-	}
-	return ~crc;
+    u16 i, j;
+    u16 crc = 0x1121;
+    for (i = 0; i < length; i++) {
+        crc ^= data[i];
+        for (j = 0; j < 8; j++) {
+            if (crc & 1) {
+                crc = (crc >> 1) ^ 0x8408;
+            } else {
+                crc >>= 1;
+            }
+        }
+    }
+    return ~crc;
 }
 
 u16 CalcCRC16WithTable(u8 *data, int length) {
-	u16 i;
-	u16 crc = 0x1121;
-	u8 byte;
-	for (i = 0; i < length; i++) {
-		byte = crc >> 8;
-		crc ^= data[i];
-		crc = byte ^ gCrc16Table[(u8)crc];
-	}
-	return ~crc;
+    u16 i;
+    u16 crc = 0x1121;
+    u8 byte;
+    for (i = 0; i < length; i++) {
+        byte = crc >> 8;
+        crc ^= data[i];
+        crc = byte ^ gCrc16Table[(u8)crc];
+    }
+    return ~crc;
 }
-- 
cgit v1.2.3


From 3d4c2f73cb19ef1f5215600c15272dd4d54c4fc0 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 14 Jun 2017 22:54:42 -0400
Subject: FILE MODES BrokeBack

---
 data/maps/UnknownMap_082CF564/border.bin |   0
 data/maps/UnknownMap_082CF564/map.bin    | Bin
 data/maps/UnknownMap_082D05D8/border.bin |   0
 data/maps/UnknownMap_082D05D8/map.bin    | Bin
 data/maps/UnknownMap_082D05FC/border.bin |   0
 data/maps/UnknownMap_082D05FC/map.bin    | Bin
 data/maps/UnknownMap_082E55C8/border.bin |   0
 data/maps/UnknownMap_082E55C8/map.bin    | Bin
 data/maps/UnknownMap_082E55EC/border.bin |   0
 data/maps/UnknownMap_082E55EC/map.bin    | Bin
 data/maps/UnknownMap_082E5610/border.bin |   0
 data/maps/UnknownMap_082E5610/map.bin    | Bin
 data/maps/UnknownMap_082E5634/border.bin |   0
 data/maps/UnknownMap_082E5634/map.bin    | Bin
 data/maps/UnknownMap_082E5658/border.bin |   0
 data/maps/UnknownMap_082E5658/map.bin    | Bin
 data/maps/UnknownMap_082E567C/border.bin |   0
 data/maps/UnknownMap_082E567C/map.bin    | Bin
 data/maps/UnknownMap_082E56A0/border.bin |   0
 data/maps/UnknownMap_082E56A0/map.bin    | Bin
 data/maps/UnknownMap_082E56C4/border.bin |   0
 data/maps/UnknownMap_082E56C4/map.bin    | Bin
 data/maps/UnknownMap_082E56E8/border.bin |   0
 data/maps/UnknownMap_082E56E8/map.bin    | Bin
 data/maps/UnknownMap_082E570C/border.bin |   0
 data/maps/UnknownMap_082E570C/map.bin    | Bin
 data/maps/UnknownMap_082E5730/border.bin |   0
 data/maps/UnknownMap_082E5730/map.bin    | Bin
 data/maps/UnknownMap_082E5754/border.bin |   0
 data/maps/UnknownMap_082E5754/map.bin    | Bin
 data/maps/UnknownMap_082E5778/border.bin |   0
 data/maps/UnknownMap_082E5778/map.bin    | Bin
 data/maps/UnknownMap_082E579C/border.bin |   0
 data/maps/UnknownMap_082E579C/map.bin    | Bin
 data/maps/UnknownMap_082EDF30/border.bin |   0
 data/maps/UnknownMap_082EDF30/map.bin    |   0
 data/maps/UnknownMap_082FF894/border.bin |   0
 data/maps/UnknownMap_082FF894/map.bin    | Bin
 data/maps/UnknownMap_08302970/border.bin |   0
 data/maps/UnknownMap_08302970/map.bin    |   0
 data/maps/UnknownMap_083041B4/border.bin |   0
 data/maps/UnknownMap_083041B4/map.bin    |   0
 data/maps/UnreferencedMap/border.bin     |   0
 data/maps/UnreferencedMap/map.bin        |   0
 include/asm.inc.h                        |   0
 include/decoration.h                     |   0
 include/decoration_inventory.h           |   0
 include/field_effect.h                   |   0
 include/gba/defines.h                    |   0
 include/global.h                         |   0
 include/menu.h                           |   0
 include/rom4.h                           |   0
 include/sprite.h                         |   0
 src/decoration.c                         |   0
 src/decoration_inventory.c               |   0
 src/field_effect.c                       |   0
 src/menu.c                               |   0
 src/scrcmd.c                             |   0
 58 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 data/maps/UnknownMap_082CF564/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082CF564/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082D05D8/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082D05D8/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082D05FC/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082D05FC/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E55C8/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E55C8/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E55EC/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E55EC/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5610/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5610/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5634/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5634/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5658/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5658/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E567C/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E567C/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E56A0/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E56A0/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E56C4/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E56C4/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E56E8/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E56E8/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E570C/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E570C/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5730/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5730/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5754/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5754/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5778/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E5778/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E579C/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082E579C/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082EDF30/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082EDF30/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082FF894/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_082FF894/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_08302970/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_08302970/map.bin
 mode change 100755 => 100644 data/maps/UnknownMap_083041B4/border.bin
 mode change 100755 => 100644 data/maps/UnknownMap_083041B4/map.bin
 mode change 100755 => 100644 data/maps/UnreferencedMap/border.bin
 mode change 100755 => 100644 data/maps/UnreferencedMap/map.bin
 mode change 100755 => 100644 include/asm.inc.h
 mode change 100755 => 100644 include/decoration.h
 mode change 100755 => 100644 include/decoration_inventory.h
 mode change 100755 => 100644 include/field_effect.h
 mode change 100755 => 100644 include/gba/defines.h
 mode change 100755 => 100644 include/global.h
 mode change 100755 => 100644 include/menu.h
 mode change 100755 => 100644 include/rom4.h
 mode change 100755 => 100644 include/sprite.h
 mode change 100755 => 100644 src/decoration.c
 mode change 100755 => 100644 src/decoration_inventory.c
 mode change 100755 => 100644 src/field_effect.c
 mode change 100755 => 100644 src/menu.c
 mode change 100755 => 100644 src/scrcmd.c

diff --git a/data/maps/UnknownMap_082CF564/border.bin b/data/maps/UnknownMap_082CF564/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082CF564/map.bin b/data/maps/UnknownMap_082CF564/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082D05D8/border.bin b/data/maps/UnknownMap_082D05D8/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082D05D8/map.bin b/data/maps/UnknownMap_082D05D8/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082D05FC/border.bin b/data/maps/UnknownMap_082D05FC/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082D05FC/map.bin b/data/maps/UnknownMap_082D05FC/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E55C8/border.bin b/data/maps/UnknownMap_082E55C8/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E55C8/map.bin b/data/maps/UnknownMap_082E55C8/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E55EC/border.bin b/data/maps/UnknownMap_082E55EC/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E55EC/map.bin b/data/maps/UnknownMap_082E55EC/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5610/border.bin b/data/maps/UnknownMap_082E5610/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5610/map.bin b/data/maps/UnknownMap_082E5610/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5634/border.bin b/data/maps/UnknownMap_082E5634/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5634/map.bin b/data/maps/UnknownMap_082E5634/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5658/border.bin b/data/maps/UnknownMap_082E5658/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5658/map.bin b/data/maps/UnknownMap_082E5658/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E567C/border.bin b/data/maps/UnknownMap_082E567C/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E567C/map.bin b/data/maps/UnknownMap_082E567C/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E56A0/border.bin b/data/maps/UnknownMap_082E56A0/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E56A0/map.bin b/data/maps/UnknownMap_082E56A0/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E56C4/border.bin b/data/maps/UnknownMap_082E56C4/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E56C4/map.bin b/data/maps/UnknownMap_082E56C4/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E56E8/border.bin b/data/maps/UnknownMap_082E56E8/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E56E8/map.bin b/data/maps/UnknownMap_082E56E8/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E570C/border.bin b/data/maps/UnknownMap_082E570C/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E570C/map.bin b/data/maps/UnknownMap_082E570C/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5730/border.bin b/data/maps/UnknownMap_082E5730/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5730/map.bin b/data/maps/UnknownMap_082E5730/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5754/border.bin b/data/maps/UnknownMap_082E5754/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5754/map.bin b/data/maps/UnknownMap_082E5754/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5778/border.bin b/data/maps/UnknownMap_082E5778/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E5778/map.bin b/data/maps/UnknownMap_082E5778/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E579C/border.bin b/data/maps/UnknownMap_082E579C/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082E579C/map.bin b/data/maps/UnknownMap_082E579C/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082EDF30/border.bin b/data/maps/UnknownMap_082EDF30/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082EDF30/map.bin b/data/maps/UnknownMap_082EDF30/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082FF894/border.bin b/data/maps/UnknownMap_082FF894/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_082FF894/map.bin b/data/maps/UnknownMap_082FF894/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_08302970/border.bin b/data/maps/UnknownMap_08302970/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_08302970/map.bin b/data/maps/UnknownMap_08302970/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_083041B4/border.bin b/data/maps/UnknownMap_083041B4/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnknownMap_083041B4/map.bin b/data/maps/UnknownMap_083041B4/map.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnreferencedMap/border.bin b/data/maps/UnreferencedMap/border.bin
old mode 100755
new mode 100644
diff --git a/data/maps/UnreferencedMap/map.bin b/data/maps/UnreferencedMap/map.bin
old mode 100755
new mode 100644
diff --git a/include/asm.inc.h b/include/asm.inc.h
old mode 100755
new mode 100644
diff --git a/include/decoration.h b/include/decoration.h
old mode 100755
new mode 100644
diff --git a/include/decoration_inventory.h b/include/decoration_inventory.h
old mode 100755
new mode 100644
diff --git a/include/field_effect.h b/include/field_effect.h
old mode 100755
new mode 100644
diff --git a/include/gba/defines.h b/include/gba/defines.h
old mode 100755
new mode 100644
diff --git a/include/global.h b/include/global.h
old mode 100755
new mode 100644
diff --git a/include/menu.h b/include/menu.h
old mode 100755
new mode 100644
diff --git a/include/rom4.h b/include/rom4.h
old mode 100755
new mode 100644
diff --git a/include/sprite.h b/include/sprite.h
old mode 100755
new mode 100644
diff --git a/src/decoration.c b/src/decoration.c
old mode 100755
new mode 100644
diff --git a/src/decoration_inventory.c b/src/decoration_inventory.c
old mode 100755
new mode 100644
diff --git a/src/field_effect.c b/src/field_effect.c
old mode 100755
new mode 100644
diff --git a/src/menu.c b/src/menu.c
old mode 100755
new mode 100644
diff --git a/src/scrcmd.c b/src/scrcmd.c
old mode 100755
new mode 100644
-- 
cgit v1.2.3


From d8f4d3da44d52ac56d93a41edb24cf0a803f5c67 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 14 Jun 2017 23:02:07 -0400
Subject: Remove unnecessary macros

---
 src/daycare.c      | 2 --
 src/field_effect.c | 1 -
 2 files changed, 3 deletions(-)
 mode change 100644 => 100755 src/daycare.c
 mode change 100644 => 100755 src/field_effect.c

diff --git a/src/daycare.c b/src/daycare.c
old mode 100644
new mode 100755
index 5bcbff6af..381450a0b
--- a/src/daycare.c
+++ b/src/daycare.c
@@ -35,7 +35,6 @@ u8 Daycare_CountPokemon(struct BoxPokemon *daycare_data)
     return count;
 }
 
-#ifndef ASDF
 void sub_8041324(struct BoxPokemon * box_pokemon, struct RecordMixing_UnknownStruct * void_pointer)
 {
     u8 i;
@@ -60,7 +59,6 @@ void sub_8041324(struct BoxPokemon * box_pokemon, struct RecordMixing_UnknownStr
     }
     void_pointer->unk70 = specCount;
 }
-#endif
 
 s8 Daycare_FindEmptySpot(struct BoxPokemon * daycare_data)
 {
diff --git a/src/field_effect.c b/src/field_effect.c
old mode 100644
new mode 100755
index 8728155e1..2bf9b3dc9
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -674,7 +674,6 @@ void FreeResourcesAndDestroySprite(struct Sprite *sprite)
     DestroySprite(sprite);
 }
 
-#undef NONMATCHING
 #ifdef NONMATCHING
 void MultiplyInvertedPaletteRGBComponents(u16 i, u8 r, u8 g, u8 b)
 {
-- 
cgit v1.2.3


From baa9f7f55f64f15f5bff54017537b8e467671b34 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 14 Jun 2017 23:07:27 -0400
Subject: Move min/max macros to global.h

---
 include/gba/defines.h | 3 ---
 include/global.h      | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)
 mode change 100644 => 100755 include/gba/defines.h
 mode change 100644 => 100755 include/global.h

diff --git a/include/gba/defines.h b/include/gba/defines.h
old mode 100644
new mode 100755
index e88d2da8b..0f7f06755
--- a/include/gba/defines.h
+++ b/include/gba/defines.h
@@ -58,7 +58,4 @@
 
 #define WIN_RANGE(a, b) (((a) << 8) | (b))
 
-#define min(a, b) (a >= b ? a : b)
-#define max(a, b) (a <= b ? a : b)
-
 #endif // GUARD_GBA_DEFINES
diff --git a/include/global.h b/include/global.h
old mode 100644
new mode 100755
index ba06b3e57..0e7c43437
--- a/include/global.h
+++ b/include/global.h
@@ -25,6 +25,9 @@ fndec\
 #define POKEMON_NAME_LENGTH 10
 #define OT_NAME_LENGTH 7
 
+#define min(a, b) (a >= b ? a : b)
+#define max(a, b) (a <= b ? a : b)
+
 enum
 {
     VERSION_SAPPHIRE = 1,
-- 
cgit v1.2.3