Merge conflict resolves into review changes

1 files changed, 6 insertions, 6 deletions

diff --git a/src/fldeff_softboiled.c b/src/fldeff_softboiled.c
index c18602c68..733263bbc 100644
--- a/src/fldeff_softboiled.c
+++ b/src/fldeff_softboiled.c
@@ -34,7 +34,7 @@ void sub_8161560(u8 taskId)
     gUnknown_0203CEC8.unkB = 0xA;
     gUnknown_0203CEC8.unkA =  gUnknown_0203CEC8.slotId;
     sub_81B0FCC(GetCursorSelectionMonId(), 0x1);
-    display_pokemon_menu_message(0x5);
+    DisplayPartyMenuStdMessage(5);
     gTasks[taskId].func = sub_81B1370;
 }
 
@@ -47,7 +47,7 @@ void sub_81615A8(u8 taskId)
     if(pokemonIndex > 6)
     {
         gUnknown_0203CEC8.unkB = 0;
-        display_pokemon_menu_message(0x0);
+        DisplayPartyMenuStdMessage(0);
         gTasks[taskId].func = sub_81B1370;
         return;
     }
@@ -73,7 +73,7 @@ static void sub_81616C0(u8 taskId)
 {
     GetMonNickname(&gPlayerParty[gUnknown_0203CEC8.unkA], gStringVar1);
     StringExpandPlaceholders(gStringVar4, gText_PkmnHPRestoredByVar2);
-    sub_81B1B5C(gStringVar4, 0);
+    DisplayPartyMenuMessage(gStringVar4, 0);
     schedule_bg_copy_tilemap_to_vram(2);
     gTasks[taskId].func = sub_8161724;
 }
@@ -88,7 +88,7 @@ static void sub_8161724(u8 taskId)
     sub_81B0FCC(gUnknown_0203CEC8.unkA, 1);
     ClearStdWindowAndFrameToTransparent(0x6, FALSE);
     ClearWindowTilemap(0x6);
-    display_pokemon_menu_message(0);
+    DisplayPartyMenuStdMessage(0);
     gTasks[taskId].func = sub_81B1370;
 }
 
@@ -96,14 +96,14 @@ static void sub_8161784(u8 taskId)
 {
     if(sub_81B1BD4() == 1)
         return;
-    display_pokemon_menu_message(0x5);
+    DisplayPartyMenuStdMessage(5);
     gTasks[taskId].func = sub_81B1370;
 }
 
 static void sub_81617B8(u8 taskId)
 {
     PlaySE(SE_SELECT);
-    sub_81B1B5C(gText_CantBeUsedOnPkmn, 0);
+    DisplayPartyMenuMessage(gText_CantBeUsedOnPkmn, 0);
     schedule_bg_copy_tilemap_to_vram(2);
     gTasks[taskId].func = sub_8161784;
 }