1 files changed, 23 insertions, 21 deletions

diff --git a/src/fldeff_rocksmash.c b/src/fldeff_rocksmash.c
index 058922f06..397741806 100644
--- a/src/fldeff_rocksmash.c
+++ b/src/fldeff_rocksmash.c
@@ -12,12 +12,13 @@
 #include "event_object_movement.h"
 #include "constants/songs.h"
 #include "constants/event_objects.h"
+#include "constants/event_object_movement.h"
 #include "constants/maps.h"
 
-static void task08_080C9820(u8 taskId);
-static void sub_80C98FC(u8 taskId);
-static void sub_80C98B0(u8 taskId);
-static void sub_80C99A0(u8 taskId);
+static void Task_FieldEffectShowMon_Init(u8 taskId);
+static void Task_FieldEffectShowMon_WaitFldeff(u8 taskId);
+static void Task_FieldEffectShowMon_WaitPlayerAnim(u8 taskId);
+static void Task_FieldEffectShowMon_Cleanup(u8 taskId);
 static void sub_80C9A10(void);
 static void sub_80C9A60(void);
 
@@ -36,13 +37,13 @@ bool8 CheckObjectGraphicsInFrontOfPlayer(u8 graphicsId)
     return TRUE;
 }
 
-u8 oei_task_add(void)
+u8 CreateFieldEffectShowMon(void)
 {
     GetXYCoordsOneStepInFrontOfPlayer(&gPlayerFacingPosition.x, &gPlayerFacingPosition.y);
-    return CreateTask(task08_080C9820, 8);
+    return CreateTask(Task_FieldEffectShowMon_Init, 8);
 }
 
-static void task08_080C9820(u8 taskId)
+static void Task_FieldEffectShowMon_Init(u8 taskId)
 {
     u8 mapObjId;
 
@@ -54,48 +55,49 @@ static void task08_080C9820(u8 taskId)
     {
         if (gMapHeader.mapType == MAP_TYPE_UNDERWATER)
         {
+            // Leftover from RS, inhibits the player anim while underwater.
             FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
-            gTasks[taskId].func = sub_80C98FC;
+            gTasks[taskId].func = Task_FieldEffectShowMon_WaitFldeff;
         }
         else
         {
             sub_805CB70();
-            ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], 0x45);
-            gTasks[taskId].func = sub_80C98B0;
+            ObjectEventSetHeldMovement(&gObjectEvents[mapObjId], MOVEMENT_ACTION_UNKNOWN_STEP_45);
+            gTasks[taskId].func = Task_FieldEffectShowMon_WaitPlayerAnim;
         }
     }
 }
 
-static void sub_80C98B0(u8 taskId)
+static void Task_FieldEffectShowMon_WaitPlayerAnim(u8 taskId)
 {
     if (ObjectEventCheckHeldMovementStatus(&gObjectEvents[gPlayerAvatar.objectEventId]) == TRUE)
     {
         FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
-        gTasks[taskId].func = sub_80C98FC;
+        gTasks[taskId].func = Task_FieldEffectShowMon_WaitFldeff;
     }
 }
 
-static void sub_80C98FC(u8 taskId)
+static void Task_FieldEffectShowMon_WaitFldeff(u8 taskId)
 {
     if (!FieldEffectActiveListContains(FLDEFF_FIELD_MOVE_SHOW_MON))
     {
         gFieldEffectArguments[1] = GetPlayerFacingDirection();
-        if (gFieldEffectArguments[1] == 1)
+        if (gFieldEffectArguments[1] == DIR_SOUTH)
             gFieldEffectArguments[2] = 0;
-        if (gFieldEffectArguments[1] == 2)
+        if (gFieldEffectArguments[1] == DIR_NORTH)
             gFieldEffectArguments[2] = 1;
-        if (gFieldEffectArguments[1] == 3)
+        if (gFieldEffectArguments[1] == DIR_WEST)
             gFieldEffectArguments[2] = 2;
-        if (gFieldEffectArguments[1] == 4)
+        if (gFieldEffectArguments[1] == DIR_EAST)
             gFieldEffectArguments[2] = 3;
         ObjectEventSetGraphicsId(&gObjectEvents[gPlayerAvatar.objectEventId], GetPlayerAvatarGraphicsIdByCurrentState());
         StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectArguments[2]);
-        FieldEffectActiveListRemove(6);
-        gTasks[taskId].func = sub_80C99A0;
+        FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON);
+        gTasks[taskId].func = Task_FieldEffectShowMon_Cleanup;
     }
 }
 
-static void sub_80C99A0(u8 taskId)
+static void Task_FieldEffectShowMon_Cleanup(u8 taskId)
 {
     FLDEFF_CALL_FUNC_IN_DATA();
     gPlayerAvatar.unk6 = FALSE;
@@ -121,7 +123,7 @@ static void sub_80C9A10(void)
 
 bool8 FldEff_UseRockSmash(void)
 {
-    u8 taskId = oei_task_add();
+    u8 taskId = CreateFieldEffectShowMon();
 
     FLDEFF_SET_FUNC_TO_DATA(sub_80C9A60);
     IncrementGameStat(GAME_STAT_USED_ROCK_SMASH);