Up through sub_80867AC (nonmatching wip)

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]++;
+}
+