Minor labelling of field effects

3 files changed, 28 insertions, 28 deletions

diff --git a/src/data/field_event_obj/field_effect_objects.h b/src/data/field_event_obj/field_effect_objects.h
index 8c202eb58..82fde1769 100755
--- a/src/data/field_event_obj/field_effect_objects.h
+++ b/src/data/field_event_obj/field_effect_objects.h
@@ -124,25 +124,25 @@ const struct SpriteFrameImage gFieldEffectObjectPicTable_SurfBlob[] = {
     overworld_frame(gFieldEffectObjectPic_SurfBlob, 4, 4, 2),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CB94[] =
+const union AnimCmd gSurfBlobAnim_FaceSouth[] =
 {
     ANIMCMD_FRAME(0, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CB9C[] =
+const union AnimCmd gSurfBlobAnim_FaceNorth[] =
 {
     ANIMCMD_FRAME(1, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CBA4[] =
+const union AnimCmd gSurfBlobAnim_FaceWest[] =
 {
     ANIMCMD_FRAME(2, 1),
     ANIMCMD_JUMP(0),
 };
 
-const union AnimCmd gFieldEffectObjectImageAnim_850CBAC[] =
+const union AnimCmd gSurfBlobAnim_FaceEast[] =
 {
     ANIMCMD_FRAME(2, 1, .hFlip = TRUE),
     ANIMCMD_JUMP(0),
@@ -150,10 +150,10 @@ const union AnimCmd gFieldEffectObjectImageAnim_850CBAC[] =
 
 const union AnimCmd *const gFieldEffectObjectImageAnimTable_SurfBlob[] =
 {
-    gFieldEffectObjectImageAnim_850CB94,
-    gFieldEffectObjectImageAnim_850CB9C,
-    gFieldEffectObjectImageAnim_850CBA4,
-    gFieldEffectObjectImageAnim_850CBAC,
+    gSurfBlobAnim_FaceSouth,
+    gSurfBlobAnim_FaceNorth,
+    gSurfBlobAnim_FaceWest,
+    gSurfBlobAnim_FaceEast,
 };
 
 const struct SpriteTemplate gFieldEffectObjectTemplate_SurfBlob = {0xFFFF, 0xFFFF, &gEventObjectBaseOam_32x32, gFieldEffectObjectImageAnimTable_SurfBlob, gFieldEffectObjectPicTable_SurfBlob, gDummySpriteAffineAnimTable, UpdateSurfBlobFieldEffect};
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index c33885f47..6f4aaabed 100755
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -25,9 +25,9 @@ static void UpdateFeetInFlowingWaterFieldEffect(struct Sprite *);
 static void UpdateAshFieldEffect_Step0(struct Sprite *);
 static void UpdateAshFieldEffect_Step1(struct Sprite *);
 static void UpdateAshFieldEffect_Step2(struct Sprite *);
-static void sub_81556B0(struct EventObject *, struct Sprite *);
+static void SynchroniseSurfAnim(struct EventObject *, struct Sprite *);
 static void sub_81556E8(struct EventObject *, struct Sprite *);
-static void sub_815577C(struct EventObject *, struct Sprite *, struct Sprite *);
+static void CreateBobbingEffect(struct EventObject *, struct Sprite *, struct Sprite *);
 static void sub_8155850(struct Sprite *);
 static u32 ShowDisguiseFieldEffect(u8, u8, u8);
 
@@ -997,13 +997,13 @@ void UpdateSurfBlobFieldEffect(struct Sprite *sprite)
 
     eventObject = &gEventObjects[sprite->data[2]];
     linkedSprite = &gSprites[eventObject->spriteId];
-    sub_81556B0(eventObject, sprite);
+    SynchroniseSurfAnim(eventObject, sprite);
     sub_81556E8(eventObject, sprite);
-    sub_815577C(eventObject, linkedSprite, sprite);
+    CreateBobbingEffect(eventObject, linkedSprite, sprite);
     sprite->oam.priority = linkedSprite->oam.priority;
 }
 
-static void sub_81556B0(struct EventObject *eventObject, struct Sprite *sprite)
+static void SynchroniseSurfAnim(struct EventObject *eventObject, struct Sprite *sprite)
 {
     u8 surfBlobDirectionAnims[] = {
         0, // DIR_NONE
@@ -1126,7 +1126,7 @@ _08155770:\n\
 }
 #endif
 
-static void sub_815577C(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite)
+static void CreateBobbingEffect(struct EventObject *eventObject, struct Sprite *linkedSprite, struct Sprite *sprite)
 {
     u16 unk_085CDC6A[] = {3, 7};
     u8 v0 = sub_8155638(sprite);
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 6b8548f1a..df714d7db 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -1700,7 +1700,7 @@ static bool8 (*const sFishingStateFuncs[])(struct Task *) =
 };
 
 static void Task_Fishing(u8 taskId);
-static void sub_808CF78(void);
+static void AlignFishingAnimationFrames(void);
 
 #define tStep              data[0]
 #define tFrameCounter      data[1]
@@ -1759,7 +1759,7 @@ static bool8 Fishing2(struct Task *task)
 
 static bool8 Fishing3(struct Task *task)
 {
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     
     // Wait one second
     task->tFrameCounter++;
@@ -1791,7 +1791,7 @@ static bool8 Fishing5(struct Task *task)
 {
     const u8 dot[] = _("·");
 
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     task->tFrameCounter++;
     if (gMain.newKeys & A_BUTTON)
     {
@@ -1827,7 +1827,7 @@ static bool8 Fishing6(struct Task *task)
 {
     bool8 bite;
 
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     task->tStep++;
     bite = FALSE;
 
@@ -1872,7 +1872,7 @@ static bool8 Fishing6(struct Task *task)
 // Oh! A Bite!
 static bool8 Fishing7(struct Task *task)
 {
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     AddTextPrinterParameterized(0, 1, gText_OhABite, 0, 17, 0, NULL);
     task->tStep++;
     task->tFrameCounter = 0;
@@ -1884,7 +1884,7 @@ static bool8 Fishing8(struct Task *task)
 {
     const s16 reelTimeouts[3] = {36, 33, 30};
 
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     task->tFrameCounter++;
     if (task->tFrameCounter >= reelTimeouts[task->tFishingRod])
         task->tStep = FISHING_GOT_AWAY;
@@ -1903,7 +1903,7 @@ static bool8 Fishing9(struct Task *task)
         {70, 30}
     };
 
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     task->tStep++;
     if (task->tRoundsPlayed < task->tMinRoundsRequired)
     {
@@ -1922,7 +1922,7 @@ static bool8 Fishing9(struct Task *task)
 
 static bool8 Fishing10(struct Task *task)
 {
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     FillWindowPixelBuffer(0, 0x11);
     AddTextPrinterParameterized2(0, 1, gText_PokemonOnHook, 1, 0, 2, 1, 3);
     task->tStep++;
@@ -1933,7 +1933,7 @@ static bool8 Fishing10(struct Task *task)
 static bool8 Fishing11(struct Task *task)
 {
     if (task->tFrameCounter == 0)
-        sub_808CF78();
+        AlignFishingAnimationFrames();
 
     RunTextPrinters();
 
@@ -1969,7 +1969,7 @@ static bool8 Fishing11(struct Task *task)
 // Not even a nibble
 static bool8 Fishing12(struct Task *task)
 {
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
     FillWindowPixelBuffer(0, 0x11);
     AddTextPrinterParameterized2(0, 1, gText_NotEvenANibble, 1, 0, 2, 1, 3);
@@ -1980,7 +1980,7 @@ static bool8 Fishing12(struct Task *task)
 // It got away
 static bool8 Fishing13(struct Task *task)
 {
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], GetFishingNoCatchDirectionAnimNum(GetPlayerFacingDirection()));
     FillWindowPixelBuffer(0, 0x11);
     AddTextPrinterParameterized2(0, 1, gText_ItGotAway, 1, 0, 2, 1, 3);
@@ -1991,14 +1991,14 @@ static bool8 Fishing13(struct Task *task)
 // Wait one second
 static bool8 Fishing14(struct Task *task)
 {
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     task->tStep++;
     return FALSE;
 }
 
 static bool8 Fishing15(struct Task *task)
 {
-    sub_808CF78();
+    AlignFishingAnimationFrames();
     if (gSprites[gPlayerAvatar.spriteId].animEnded)
     {
         struct EventObject *playerEventObj = &gEventObjects[gPlayerAvatar.eventObjectId];
@@ -2033,7 +2033,7 @@ static bool8 Fishing16(struct Task *task)
 #undef tFrameCounter
 #undef tFishingRod
 
-static void sub_808CF78(void)
+static void AlignFishingAnimationFrames(void)
 {
     struct Sprite *playerSprite = &gSprites[gPlayerAvatar.spriteId];
     u8 animCmdIndex;