diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-10-02 20:02:21 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-10-02 20:16:47 -0400 |
| commit | d9ab841b0d72a52676131846447de26e59e7a16d (patch) | |
| tree | dae3b90cb5f7ea7428cf3cf89527980769875188 /src/item_use.c | |
| parent | 872d5eaf4ad70598f597a64469cdf5cd32d44ba4 (diff) | |
| parent | 32f2bb3ddaf1107f8e6bb02c0acadc96ecc55772 (diff) | |
Merge pull request #106 from PikalaxALT/berry_pouch
Berry pouch
Diffstat (limited to 'src/item_use.c')
| -rw-r--r-- | src/item_use.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/item_use.c b/src/item_use.c index 3653a1699..5fa9390c1 100644 --- a/src/item_use.c +++ b/src/item_use.c @@ -435,7 +435,7 @@ void FieldUseFunc_BerryPouch(u8 taskId) void InitBerryPouchFromBag(void) { - InitBerryPouch(0, ReturnToBagFromKeyItem, 0); + InitBerryPouch(BERRYPOUCH_FROMFIELD, ReturnToBagFromKeyItem, 0); } void Task_InitBerryPouchFromField(u8 taskId) @@ -444,7 +444,7 @@ void Task_InitBerryPouchFromField(u8 taskId) { CleanupOverworldWindowsAndTilemaps(); sub_80A1184(); - InitBerryPouch(0, CB2_ReturnToField, 1); + InitBerryPouch(BERRYPOUCH_FROMFIELD, CB2_ReturnToField, 1); DestroyTask(taskId); } } @@ -457,7 +457,7 @@ void BattleUseFunc_BerryPouch(u8 taskId) void InitBerryPouchFromBattle(void) { - InitBerryPouch(4, sub_8107ECC, 0); + InitBerryPouch(BERRYPOUCH_FROMBATTLE, sub_8107ECC, 0); } void FieldUseFunc_TeachyTv(u8 taskId) @@ -852,7 +852,7 @@ void FieldUseFunc_OakStopsYou(u8 taskId) if (GetPocketByItemId(gSpecialVar_ItemId) == POCKET_BERRY_POUCH) { StringExpandPlaceholders(gStringVar4, gUnknown_8416425); - DisplayItemMessageInBerryPouch(taskId, 4, gStringVar4, sub_813E2B8); + DisplayItemMessageInBerryPouch(taskId, 4, gStringVar4, Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu); } else sub_80A1110(taskId, gTasks[taskId].data[3]); |