1 files changed, 16 insertions, 15 deletions

diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index f592ed532..9951fe581 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -1,6 +1,4 @@
 #include "global.h"
-#include "constants/rgb.h"
-#include "constants/songs.h"
 #include "event_data.h"
 #include "event_scripts.h"
 #include "field_effect.h"
@@ -14,22 +12,25 @@
 #include "sprite.h"
 #include "task.h"
 #include "wild_encounter.h"
+#include "constants/field_effects.h"
+#include "constants/rgb.h"
+#include "constants/songs.h"
 
-void hm2_sweet_scent(void);
-void sub_8159F5C(void);
-void sub_8159FEC(u8 taskId);
-void sub_815A090(u8 taskId);
+static void FieldCallback_SweetScent(void);
+static void StartSweetScentFieldEffect(void);
+static void TrySweetScentEncounter(u8 taskId);
+static void FailSweetScentEncounter(u8 taskId);
 void sub_81BE6B8(void);
 void sub_81BE72C(void);
 
 bool8 SetUpFieldMove_SweetScent(void)
 {
     gFieldCallback2 = FieldCallback_PrepareFadeInFromMenu;
-    gPostMenuFieldCallback = hm2_sweet_scent;
+    gPostMenuFieldCallback = FieldCallback_SweetScent;
     return TRUE;
 }
 
-void hm2_sweet_scent(void)
+static void FieldCallback_SweetScent(void)
 {
     FieldEffectStart(FLDEFF_SWEET_SCENT);
     gFieldEffectArguments[0] = GetCursorSelectionMonId();
@@ -41,12 +42,12 @@ bool8 FldEff_SweetScent(void)
 
     sub_80AC3D0();
     taskId = oei_task_add();
-    gTasks[taskId].data[8] = (u32)sub_8159F5C >> 16;
-    gTasks[taskId].data[9] = (u32)sub_8159F5C;
+    gTasks[taskId].data[8] = (u32)StartSweetScentFieldEffect >> 16;
+    gTasks[taskId].data[9] = (u32)StartSweetScentFieldEffect;
     return FALSE;
 }
 
-void sub_8159F5C(void)
+static void StartSweetScentFieldEffect(void)
 {
     u8 taskId;
 
@@ -54,12 +55,12 @@ void sub_8159F5C(void)
     CpuFastSet(gPlttBufferUnfaded, gPaletteDecompressionBuffer, 0x100);
     CpuFastSet(gPlttBufferFaded, gPlttBufferUnfaded, 0x100);
     BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 0, 8, RGB_RED);
-    taskId = CreateTask(sub_8159FEC, 0);
+    taskId = CreateTask(TrySweetScentEncounter, 0);
     gTasks[taskId].data[0] = 0;
     FieldEffectActiveListRemove(FLDEFF_SWEET_SCENT);
 }
 
-void sub_8159FEC(u8 taskId)
+static void TrySweetScentEncounter(u8 taskId)
 {
     if (!gPaletteFade.active)
     {
@@ -74,7 +75,7 @@ void sub_8159FEC(u8 taskId)
             }
             else
             {
-                gTasks[taskId].func = sub_815A090;
+                gTasks[taskId].func = FailSweetScentEncounter;
                 BeginNormalPaletteFade(~(1 << (gSprites[GetPlayerAvatarObjectId()].oam.paletteNum + 16)), 4, 8, 0, RGB_RED);
                 sub_81BE6B8();
             }
@@ -86,7 +87,7 @@ void sub_8159FEC(u8 taskId)
     }
 }
 
-void sub_815A090(u8 taskId)
+static void FailSweetScentEncounter(u8 taskId)
 {
     if (!gPaletteFade.active)
     {