diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-12 01:39:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-12 01:39:28 -0400 |
| commit | a274cc6a76a59768bcfaef345d55a39f6c1ddbac (patch) | |
| tree | e6977a9d8066e946148b8d1dfcf95e721b59e54f /src/shop.c | |
| parent | 810ca5f8ff79aeec6ffe8e982f4786aade616b4d (diff) | |
| parent | 876a89eba4903e5ef1ccad22b1ee52023fb24513 (diff) | |
Merge branch 'master' into flatten_sprite_pos
Diffstat (limited to 'src/shop.c')
| -rwxr-xr-x | src/shop.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/shop.c b/src/shop.c index d534e91f4..f4e3fa2d8 100755 --- a/src/shop.c +++ b/src/shop.c @@ -91,7 +91,7 @@ static void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId); static void Task_HandleShopMenuBuy(u8 taskId); static void Task_HandleShopMenuSell(u8 taskId); static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list); -static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y); +static void BuyMenuPrintPriceInList(u8 windowId, u32 itemId, u8 y); static const struct YesNoFuncTable sShopPurchaseYesNoFuncs = { @@ -552,17 +552,17 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, s BuyMenuPrint(2, description, 3, 1, 0, 0); } -static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y) +static void BuyMenuPrintPriceInList(u8 windowId, u32 itemId, u8 y) { u8 x; - if (item != LIST_CANCEL) + if (itemId != LIST_CANCEL) { if (sMartInfo.martType == MART_TYPE_NORMAL) { ConvertIntToDecimalStringN( gStringVar1, - ItemId_GetPrice(item) >> GetPriceReduction(POKENEWS_SLATEPORT), + ItemId_GetPrice(itemId) >> GetPriceReduction(POKENEWS_SLATEPORT), STR_CONV_MODE_LEFT_ALIGN, 5); } @@ -570,7 +570,7 @@ static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y) { ConvertIntToDecimalStringN( gStringVar1, - gDecorations[item].price, + gDecorations[itemId].price, STR_CONV_MODE_LEFT_ALIGN, 5); } |