fix merge conflicts

src/berry_pouch.c

@@ -765,7 +765,7 @@ static void PrintSelectedBerryDescription(s32 itemIdx)
 
 static void SetDescriptionWindowBorderPalette(s32 pal)
 {
-    SetBgRectPal(1, 0, 16, 30, 4, pal + 1);
+    SetBgTilemapPalette(1, 0, 16, 30, 4, pal + 1);
     ScheduleBgCopyTilemapToVram(1);
 }
 
@@ -1194,7 +1194,7 @@ static void Task_BerryPouch_Give(u8 taskId)
         Task_Give_PrintThereIsNoPokemon(taskId);
     else
     {
-        sResources->exitCallback = sub_8126EDC;
+        sResources->exitCallback = CB2_ChooseMonToGiveItem;
         gTasks[taskId].func = BerryPouch_StartFadeToExitCallback;
     }
 }
@@ -1251,7 +1251,7 @@ static void Task_ContextMenu_FromPartyGiveMenu(u8 taskId)
     }
     else
     {
-        sResources->exitCallback = c2_8123744;
+        sResources->exitCallback = CB2_GiveHoldItem;
         gTasks[taskId].func = BerryPouch_StartFadeToExitCallback;
     }
 }