diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-31 20:43:42 -0400 |
| commit | cd069446e06c277222be0aaa05fb43b090259234 (patch) | |
| tree | a740e2042ff6af3465cfdaa15fc29c35269cfa70 /src/item_use.c | |
| parent | 3181c64c64afa47b3adc04f325ad3798c8c324ec (diff) | |
| parent | 93c4e35d844046d12c7d8bcc64e8fc3e03e85e0d (diff) | |
Merge branch 'master' into pokedex-area-const-array
Diffstat (limited to 'src/item_use.c')
| -rwxr-xr-x | src/item_use.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/item_use.c b/src/item_use.c index e646a18ee..7947964ca 100755 --- a/src/item_use.c +++ b/src/item_use.c @@ -4,6 +4,7 @@ #include "battle_pyramid.h" #include "battle_pyramid_bag.h" #include "berry.h" +#include "berry_powder.h" #include "bike.h" #include "coins.h" #include "data2.h" @@ -45,8 +46,6 @@ extern u8 Route102_EventScript_274482[]; extern u8 Route102_EventScript_2744C0[]; extern u8 BattleFrontier_OutsideEast_EventScript_242CFC[]; -extern s32 sub_80247BC(void); - void SetUpItemUseCallback(u8 taskId); void MapPostLoadHook_UseItem(void); void sub_80AF6D4(void); @@ -638,7 +637,7 @@ void ItemUseOutOfBattle_CoinCase(u8 taskId) void ItemUseOutOfBattle_PowderJar(u8 taskId) { - ConvertIntToDecimalStringN(gStringVar1, sub_80247BC(), 0, 5); + ConvertIntToDecimalStringN(gStringVar1, GetBerryPowder(), 0, 5); StringExpandPlaceholders(gStringVar4, gText_PowderQty); if (!gTasks[taskId].data[3]) |