Second half of Flannery gym animation (increased uncertainty about which direction it is for)

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