summaryrefslogtreecommitdiff
path: root/src/berry_pouch.c
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-11-25 09:15:34 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2019-11-25 09:15:34 -0500
commit10aa908f56599c155ecf70ccee6b07eea07fb643 (patch)
tree0bec37a7083498f43dcf1124ceb0ce13c74ca420 /src/berry_pouch.c
parent0e3d574276db954994b0be24c61813b0b0e28c0c (diff)
parent46773995020da0bc7984933f7f407ff30394596d (diff)
Merge branch 'dism_more_data' of github.com:PikalaxALT/pokefirered into dism_more_data
Diffstat (limited to 'src/berry_pouch.c')
-rw-r--r--src/berry_pouch.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/berry_pouch.c b/src/berry_pouch.c
index b8b66c0bc..bb1b106af 100644
--- a/src/berry_pouch.c
+++ b/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;
}
}