1 files changed, 12 insertions, 12 deletions

diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index 6840df686..d68d66d08 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -15,7 +15,7 @@ static void sub_80E5934(u8 taskId);
 extern const u8 gUnknown_84169F8[];
 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);
@@ -28,8 +28,8 @@ bool8 hm_prepare_dive_probably(void)
 
 void ChooseMonForSoftboiled(u8 taskId)
 {
-    gPartyMenu.unkB = 10;
-    gPartyMenu.unkA = gPartyMenu.unk9;
+    gPartyMenu.action = 10;
+    gPartyMenu.slotId2 = gPartyMenu.slotId;
     AnimatePartySlot(GetCursorSelectionMonId(), 1);
     DisplayPartyMenuStdMessage(5);
     gTasks[taskId].func = Task_HandleChooseMonInput;
@@ -37,14 +37,14 @@ void ChooseMonForSoftboiled(u8 taskId)
 
 void sub_80E5724(u8 taskId)
 {
-    u8 r8 = gPartyMenu.unk9;
-    u8 r5 = gPartyMenu.unkA;
+    u8 r8 = gPartyMenu.slotId;
+    u8 r5 = gPartyMenu.slotId2;
     u16 curHp;
     s16 delta;
 
     if (r5 > 6)
     {
-        gPartyMenu.unkB = 0;
+        gPartyMenu.action = 0;
         DisplayPartyMenuStdMessage(0);
         gTasks[taskId].func = Task_HandleChooseMonInput;
     }
@@ -66,12 +66,12 @@ void sub_80E5724(u8 taskId)
 static void sub_80E57E8(u8 taskId)
 {
     PlaySE(SE_KAIFUKU);
-    PartyMenuModifyHP(taskId, gPartyMenu.unkA, 1, GetMonData(&gPlayerParty[gPartyMenu.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[gPartyMenu.unkA], gStringVar1);
+    GetMonNickname(&gPlayerParty[gPartyMenu.slotId2], gStringVar1);
     StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
     DisplayPartyMenuMessage(gStringVar4, 0);
     ScheduleBgCopyTilemapToVram(2);
@@ -82,10 +82,10 @@ static void sub_80E58A0(u8 taskId)
 {
     if (IsPartyMenuTextPrinterActive() != TRUE)
     {
-        gPartyMenu.unkB = 0;
-        AnimatePartySlot(gPartyMenu.unk9, 0);
-        gPartyMenu.unk9 = gPartyMenu.unkA;
-        AnimatePartySlot(gPartyMenu.unkA, 1);
+        gPartyMenu.action = 0;
+        AnimatePartySlot(gPartyMenu.slotId, 0);
+        gPartyMenu.slotId = gPartyMenu.slotId2;
+        AnimatePartySlot(gPartyMenu.slotId2, 1);
         ClearStdWindowAndFrameToTransparent(6, 0);
         ClearWindowTilemap(6);
         DisplayPartyMenuStdMessage(0);