Use Surf field effect

7 files changed, 107 insertions, 302 deletions

diff --git a/asm/field_effect.s b/asm/field_effect.s
index de72a2657..8fc5386b9 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -5,298 +5,6 @@
 
 	.text
 
-	thumb_func_start FldEff_UseSurf
-FldEff_UseSurf: @ 8086944
-	push {r4,lr}
-	ldr r0, _08086980 @ =Task_FldEffUseSurf
-	movs r1, 0xFF
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, _08086984 @ =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r0, _08086988 @ =gFieldEffectArguments
-	ldr r0, [r0]
-	strh r0, [r1, 0x26]
-	bl sav1_reset_battle_music_maybe
-	ldr r4, _0808698C @ =0x00000131 @MUS_NAMINORI
-	adds r0, r4, 0
-	bl sub_8056124
-	cmp r0, 0
-	beq _08086978
-	adds r0, r4, 0
-	bl Overworld_ChangeMusicTo
-_08086978:
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08086980: .4byte Task_FldEffUseSurf
-_08086984: .4byte gTasks
-_08086988: .4byte gFieldEffectArguments
-_0808698C: .4byte 0x00000131 @MUS_NAMINORI
-	thumb_func_end FldEff_UseSurf
-
-	thumb_func_start Task_FldEffUseSurf
-Task_FldEffUseSurf: @ 8086990
-	push {lr}
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	ldr r3, _080869B8 @ =sUseSurfEffectFuncs
-	ldr r2, _080869BC @ =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
-_080869B8: .4byte sUseSurfEffectFuncs
-_080869BC: .4byte gTasks
-	thumb_func_end Task_FldEffUseSurf
-
-	thumb_func_start UseSurfEffect_1
-UseSurfEffect_1: @ 80869C0
-	push {r4-r6,lr}
-	mov r6, r8
-	push {r6}
-	adds r4, r0, 0
-	bl ScriptContext2_Enable
-	bl FreezeObjectEvents
-	ldr r5, _08086A18 @ =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, _08086A1C @ =gObjectEvents
-	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
-_08086A18: .4byte gPlayerAvatar
-_08086A1C: .4byte gObjectEvents
-	thumb_func_end UseSurfEffect_1
-
-	thumb_func_start UseSurfEffect_2
-UseSurfEffect_2: @ 8086A20
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r0, _08086A64 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086A68 @ =gObjectEvents
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl ObjectEventIsMovementOverridden
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086A4A
-	adds r0, r4, 0
-	bl ObjectEventClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086A5C
-_08086A4A:
-	bl sub_805CB70
-	adds r0, r4, 0
-	movs r1, 0x45
-	bl ObjectEventSetHeldMovement
-	ldrh r0, [r5, 0x8]
-	adds r0, 0x1
-	strh r0, [r5, 0x8]
-_08086A5C:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086A64: .4byte gPlayerAvatar
-_08086A68: .4byte gObjectEvents
-	thumb_func_end UseSurfEffect_2
-
-	thumb_func_start UseSurfEffect_3
-UseSurfEffect_3: @ 8086A6C
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r0, _08086AA8 @ =gPlayerAvatar
-	ldrb r1, [r0, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086AAC @ =gObjectEvents
-	adds r0, r1
-	bl ObjectEventCheckHeldMovementStatus
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086AA2
-	ldr r2, _08086AB0 @ =gFieldEffectArguments
-	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]
-_08086AA2:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086AA8: .4byte gPlayerAvatar
-_08086AAC: .4byte gObjectEvents
-_08086AB0: .4byte gFieldEffectArguments
-	thumb_func_end UseSurfEffect_3
-
-	thumb_func_start UseSurfEffect_4
-UseSurfEffect_4: @ 8086AB4
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	movs r0, 0x6
-	bl FieldEffectActiveListContains
-	lsls r0, 24
-	cmp r0, 0
-	bne _08086B1E
-	ldr r5, _08086B24 @ =gPlayerAvatar
-	ldrb r0, [r5, 0x5]
-	lsls r4, r0, 3
-	adds r4, r0
-	lsls r4, 2
-	ldr r0, _08086B28 @ =gObjectEvents
-	adds r4, r0
-	movs r0, 0x2
-	bl GetPlayerAvatarGraphicsIdByStateId
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl ObjectEventSetGraphicsId
-	adds r0, r4, 0
-	bl ObjectEventClearHeldMovementIfFinished
-	ldrb r0, [r4, 0x18]
-	lsrs r0, 4
-	bl sub_80641C0
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl ObjectEventSetHeldMovement
-	ldr r1, _08086B2C @ =gFieldEffectArguments
-	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]
-_08086B1E:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086B24: .4byte gPlayerAvatar
-_08086B28: .4byte gObjectEvents
-_08086B2C: .4byte gFieldEffectArguments
-	thumb_func_end UseSurfEffect_4
-
-	thumb_func_start UseSurfEffect_5
-UseSurfEffect_5: @ 8086B30
-	push {r4,r5,lr}
-	ldr r5, _08086B9C @ =gPlayerAvatar
-	ldrb r1, [r5, 0x5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _08086BA0 @ =gObjectEvents
-	adds r4, r0, r1
-	adds r0, r4, 0
-	bl ObjectEventClearHeldMovementIfFinished
-	lsls r0, 24
-	cmp r0, 0
-	beq _08086B96
-	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 GetFaceDirectionMovementAction
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl ObjectEventSetHeldMovement
-	ldrb r0, [r4, 0x1A]
-	movs r1, 0x1
-	bl sub_80DC44C
-	bl UnfreezeObjectEvents
-	bl ScriptContext2_Disable
-	movs r0, 0x9
-	bl FieldEffectActiveListRemove
-	ldr r0, _08086BA4 @ =Task_FldEffUseSurf
-	bl FindTaskIdByFunc
-	lsls r0, 24
-	lsrs r0, 24
-	bl DestroyTask
-	movs r0, 0x16
-	bl HelpSystem_SetSomeVariable2
-_08086B96:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08086B9C: .4byte gPlayerAvatar
-_08086BA0: .4byte gObjectEvents
-_08086BA4: .4byte Task_FldEffUseSurf
-	thumb_func_end UseSurfEffect_5
-
 	thumb_func_start FldEff_Unk41
 FldEff_Unk41: @ 8086BA8
 	push {lr}
diff --git a/data/field_effect.s b/data/field_effect.s
index 004dd555a..c24b7d3f6 100644
--- a/data/field_effect.s
+++ b/data/field_effect.s
@@ -7,14 +7,6 @@
 	.align 2
 
 	.align 2
-sUseSurfEffectFuncs:: @ 83CC154 dataptr
-	.4byte UseSurfEffect_1
-	.4byte UseSurfEffect_2
-	.4byte UseSurfEffect_3
-	.4byte UseSurfEffect_4
-	.4byte UseSurfEffect_5
-
-	.align 2
 sUnk41EffectFuncs:: @ 83CC168 dataptr
 	.4byte Unk41Effect_1
 	.4byte Unk41Effect_2
diff --git a/include/constants/event_object_movement.h b/include/constants/event_object_movement.h
index 08713a602..d2f0a945b 100644
--- a/include/constants/event_object_movement.h
+++ b/include/constants/event_object_movement.h
@@ -153,7 +153,7 @@
 #define MOVEMENT_ACTION_PLAYER_RUN_UP_SLOW              0x42
 #define MOVEMENT_ACTION_PLAYER_RUN_LEFT_SLOW            0x43
 #define MOVEMENT_ACTION_PLAYER_RUN_RIGHT_SLOW           0x44
-#define MOVEMENT_ACTION_UNKNOWN_STEP_45                 0x45
+#define MOVEMENT_ACTION_START_ANIM_IN_DIRECTION         0x45
 #define MOVEMENT_ACTION_JUMP_SPECIAL_DOWN               0x46
 #define MOVEMENT_ACTION_JUMP_SPECIAL_UP                 0x47
 #define MOVEMENT_ACTION_JUMP_SPECIAL_LEFT               0x48
diff --git a/include/event_object_movement.h b/include/event_object_movement.h
index 29254ec5d..1e63727fb 100644
--- a/include/event_object_movement.h
+++ b/include/event_object_movement.h
@@ -118,6 +118,7 @@ void RfuUnionObjectStartWarp(u8 objectEventId, u8 animNo);
 bool32 RfuUnionObjectIsWarping(u8 objectEventId);
 u8 sub_8063F2C(u8 direction);
 u8 sub_8064194(u8 direction);
+u8 sub_80641C0(u8 direction);
 
 void sub_805F378(s16 x, s16 y);
 
diff --git a/include/overworld.h b/include/overworld.h
index 3b7fd7bc1..4fceee38b 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -85,6 +85,8 @@ void sub_8084EBC(s16, s16);
 void sub_80555E0(void);
 void copy_saved_warp3_bank_and_enter_x_to_warp1(void);
 u8 IsMapTypeOutdoors(u8 mapType);
+void sav1_reset_battle_music_maybe(void);
+bool32 sub_8056124(u16 song);
 
 void player_avatar_init_params_reset(void);
 
diff --git a/src/field_effect.c b/src/field_effect.c
index ecdc834ae..9695e4900 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -7,6 +7,7 @@
 #include "field_camera.h"
 #include "field_control_avatar.h"
 #include "field_effect.h"
+#include "field_effect_helpers.h"
 #include "field_effect_scripts.h"
 #include "field_fadetransition.h"
 #include "field_player_avatar.h"
@@ -24,6 +25,7 @@
 #include "trainer_pokemon_sprites.h"
 #include "trig.h"
 #include "util.h"
+#include "constants/event_object_movement.h"
 #include "constants/metatile_behaviors.h"
 #include "constants/songs.h"
 
@@ -2865,3 +2867,103 @@ void sub_8086920(struct Sprite * sprite)
         sprite->pos1.x -= 20;
     }
 }
+
+void Task_FldEffUseSurf(u8 taskId);
+void UseSurfEffect_1(struct Task * task);
+void UseSurfEffect_2(struct Task * task);
+void UseSurfEffect_3(struct Task * task);
+void UseSurfEffect_4(struct Task * task);
+void UseSurfEffect_5(struct Task * task);
+
+void (*const sUseSurfEffectFuncs[])(struct Task * ) = {
+    UseSurfEffect_1,
+    UseSurfEffect_2,
+    UseSurfEffect_3,
+    UseSurfEffect_4,
+    UseSurfEffect_5,
+};
+
+u8 FldEff_UseSurf(void)
+{
+    u8 taskId = CreateTask(Task_FldEffUseSurf, 0xff);
+    gTasks[taskId].data[15] = gFieldEffectArguments[0];
+    sav1_reset_battle_music_maybe();
+    if (sub_8056124(MUS_NAMINORI))
+        Overworld_ChangeMusicTo(MUS_NAMINORI);
+    return FALSE;
+}
+
+void Task_FldEffUseSurf(u8 taskId)
+{
+    sUseSurfEffectFuncs[gTasks[taskId].data[0]](&gTasks[taskId]);
+}
+
+void UseSurfEffect_1(struct Task * task)
+{
+    ScriptContext2_Enable();
+    FreezeObjectEvents();
+    gPlayerAvatar.preventStep = TRUE;
+    SetPlayerAvatarStateMask(8);
+    PlayerGetDestCoords(&task->data[1], &task->data[2]);
+    MoveCoords(gObjectEvents[gPlayerAvatar.objectEventId].placeholder18, &task->data[1], &task->data[2]);
+    task->data[0]++;
+}
+
+void UseSurfEffect_2(struct Task * task)
+{
+    struct ObjectEvent * objectEvent;
+    objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+    if (!ObjectEventIsMovementOverridden(objectEvent) || ObjectEventClearHeldMovementIfFinished(objectEvent))
+    {
+        sub_805CB70();
+        ObjectEventSetHeldMovement(objectEvent, MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
+        task->data[0]++;
+    }
+}
+
+void UseSurfEffect_3(struct Task * task)
+{
+    struct ObjectEvent * objectEvent;
+    objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+    if (ObjectEventCheckHeldMovementStatus(objectEvent))
+    {
+        gFieldEffectArguments[0] = task->data[15] | 0x80000000;
+        FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
+        task->data[0]++;
+    }
+}
+
+void UseSurfEffect_4(struct Task * task)
+{
+    struct ObjectEvent * objectEvent;
+    if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
+    {
+        objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+        ObjectEventSetGraphicsId(objectEvent, GetPlayerAvatarGraphicsIdByStateId(2));
+        ObjectEventClearHeldMovementIfFinished(objectEvent);
+        ObjectEventSetHeldMovement(objectEvent, sub_80641C0(objectEvent->placeholder18));
+        gFieldEffectArguments[0] = task->data[1];
+        gFieldEffectArguments[1] = task->data[2];
+        gFieldEffectArguments[2] = gPlayerAvatar.objectEventId;
+        objectEvent->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB);
+        task->data[0]++;
+    }
+}
+
+void UseSurfEffect_5(struct Task * task)
+{
+    struct ObjectEvent * objectEvent;
+    objectEvent = &gObjectEvents[gPlayerAvatar.objectEventId];
+    if (ObjectEventClearHeldMovementIfFinished(objectEvent))
+    {
+        gPlayerAvatar.preventStep = FALSE;
+        gPlayerAvatar.flags &= 0xdf;
+        ObjectEventSetHeldMovement(objectEvent, GetFaceDirectionMovementAction(objectEvent->placeholder18));
+        sub_80DC44C(objectEvent->mapobj_unk_1A, 1);
+        UnfreezeObjectEvents();
+        ScriptContext2_Disable();
+        FieldEffectActiveListRemove(FLDEFF_USE_SURF);
+        DestroyTask(FindTaskIdByFunc(Task_FldEffUseSurf));
+        HelpSystem_SetSomeVariable2(22);
+    }
+}
diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 7ea18f40f..dc372ce18 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -62,7 +62,7 @@ static void Task_FieldEffectShowMon_Init(u8 taskId)
         else
         {
             sub_805CB70();
-            ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], MOVEMENT_ACTION_UNKNOWN_STEP_45);
+            ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], MOVEMENT_ACTION_START_ANIM_IN_DIRECTION);
             gTasks[taskId].func = Task_FieldEffectShowMon_WaitPlayerAnim;
         }
     }