FldEff_UseSurf

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