1 files changed, 30 insertions, 30 deletions

diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 400a1d382..60437c125 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -13,9 +13,9 @@ static void sub_80E58A0(u8 taskId);
 static void sub_80E5934(u8 taskId);
 
 extern const u8 gUnknown_84169F8[];
-extern const u8 gUnknown_8416F27[];
+extern const u8 gText_PkmnHPRestoredByVar2[];
 
-bool8 hm_prepare_dive_probably(void)
+bool8 SetUpFieldMove_SoftBoiled(void)
 {
     u16 maxHp = GetMonData(&gPlayerParty[GetCursorSelectionMonId()], MON_DATA_MAX_HP);
     u16 curHp = GetMonData(&gPlayerParty[GetCursorSelectionMonId()], MON_DATA_HP);
@@ -26,27 +26,27 @@ bool8 hm_prepare_dive_probably(void)
         return FALSE;
 }
 
-void sub_80E56DC(u8 taskId)
+void ChooseMonForSoftboiled(u8 taskId)
 {
-    gUnknown_203B0A0.unkB = 10;
-    gUnknown_203B0A0.unkA = gUnknown_203B0A0.unk9;
-    sub_811F818(GetCursorSelectionMonId(), 1);
-    sub_8121D0C(5);
-    gTasks[taskId].func = sub_811FB28;
+    gPartyMenu.action = 10;
+    gPartyMenu.slotId2 = gPartyMenu.slotId;
+    AnimatePartySlot(GetCursorSelectionMonId(), 1);
+    DisplayPartyMenuStdMessage(5);
+    gTasks[taskId].func = Task_HandleChooseMonInput;
 }
 
-void sub_80E5724(u8 taskId)
+void Task_TryUseSoftboiledOnPartyMon(u8 taskId)
 {
-    u8 r8 = gUnknown_203B0A0.unk9;
-    u8 r5 = gUnknown_203B0A0.unkA;
+    u8 r8 = gPartyMenu.slotId;
+    u8 r5 = gPartyMenu.slotId2;
     u16 curHp;
     s16 delta;
 
     if (r5 > 6)
     {
-        gUnknown_203B0A0.unkB = 0;
-        sub_8121D0C(0);
-        gTasks[taskId].func = sub_811FB28;
+        gPartyMenu.action = 0;
+        DisplayPartyMenuStdMessage(0);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
     }
     else
     {
@@ -58,7 +58,7 @@ void sub_80E5724(u8 taskId)
         else
         {
             PlaySE(SE_KAIFUKU);
-            sub_8120760(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8);
+            PartyMenuModifyHP(taskId, r8, -1, GetMonData(&gPlayerParty[r8], MON_DATA_MAX_HP) / 5, sub_80E57E8);
         }
     }
 }
@@ -66,46 +66,46 @@ void sub_80E5724(u8 taskId)
 static void sub_80E57E8(u8 taskId)
 {
     PlaySE(SE_KAIFUKU);
-    sub_8120760(taskId, gUnknown_203B0A0.unkA, 1, GetMonData(&gPlayerParty[gUnknown_203B0A0.unk9], MON_DATA_MAX_HP) / 5, sub_80E583C);
+    PartyMenuModifyHP(taskId, gPartyMenu.slotId2, 1, GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_MAX_HP) / 5, sub_80E583C);
 }
 
 static void sub_80E583C(u8 taskId)
 {
-    GetMonNickname(&gPlayerParty[gUnknown_203B0A0.unkA], gStringVar1);
-    StringExpandPlaceholders(gStringVar4, gUnknown_8416F27);
-    sub_81202F8(gStringVar4, 0);
+    GetMonNickname(&gPlayerParty[gPartyMenu.slotId2], gStringVar1);
+    StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
+    DisplayPartyMenuMessage(gStringVar4, 0);
     ScheduleBgCopyTilemapToVram(2);
     gTasks[taskId].func = sub_80E58A0;
 }
 
 static void sub_80E58A0(u8 taskId)
 {
-    if (sub_8120370() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        gUnknown_203B0A0.unkB = 0;
-        sub_811F818(gUnknown_203B0A0.unk9, 0);
-        gUnknown_203B0A0.unk9 = gUnknown_203B0A0.unkA;
-        sub_811F818(gUnknown_203B0A0.unkA, 1);
+        gPartyMenu.action = 0;
+        AnimatePartySlot(gPartyMenu.slotId, 0);
+        gPartyMenu.slotId = gPartyMenu.slotId2;
+        AnimatePartySlot(gPartyMenu.slotId2, 1);
         ClearStdWindowAndFrameToTransparent(6, 0);
         ClearWindowTilemap(6);
-        sub_8121D0C(0);
-        gTasks[taskId].func = sub_811FB28;
+        DisplayPartyMenuStdMessage(0);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
     }
 }
 
 static void sub_80E5900(u8 taskId)
 {
-    if (sub_8120370() != TRUE)
+    if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        sub_8121D0C(5);
-        gTasks[taskId].func = sub_811FB28;
+        DisplayPartyMenuStdMessage(5);
+        gTasks[taskId].func = Task_HandleChooseMonInput;
     }
 }
 
 static void sub_80E5934(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    sub_81202F8(gUnknown_84169F8, 0);
+    DisplayPartyMenuMessage(gUnknown_84169F8, 0);
     ScheduleBgCopyTilemapToVram(2);
     gTasks[taskId].func = sub_80E5900;
 }