diff options
| author | garak <garakmon@gmail.com> | 2019-07-20 12:30:41 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-20 12:30:41 -0400 |
| commit | c39d25ff4d3cf6cb8b3a6fea208de0cc3c6a7c8c (patch) | |
| tree | bce0030d8901a6b84e705baca169989fff1a4f71 /src/shop.c | |
| parent | dfa3e079c0f55565fc60a6a1ba0ef04de9be94c2 (diff) | |
| parent | 4d5c1ca03b4e7db3c44c71afaa01b1549a282a19 (diff) | |
Merge branch 'master' into navdata
Diffstat (limited to 'src/shop.c')
| -rwxr-xr-x | src/shop.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/shop.c b/src/shop.c index 7f1a8f27e..bf15568fb 100755 --- a/src/shop.c +++ b/src/shop.c @@ -87,8 +87,8 @@ static void Task_ReturnToItemListAfterItemPurchase(u8 taskId); static void Task_ReturnToItemListAfterDecorationPurchase(u8 taskId); static void Task_HandleShopMenuBuy(u8 taskId); static void Task_HandleShopMenuSell(u8 taskId); -static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list); -static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y); +static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list); +static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y); static const struct YesNoFuncTable sShopPurchaseYesNoFuncs = { @@ -521,7 +521,7 @@ static void BuyMenuSetListEntry(struct ListMenuItem *menuItem, u16 item, u8 *nam menuItem->id = item; } -static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, struct ListMenu *list) +static void BuyMenuPrintItemDescriptionAndShowItemIcon(s32 item, bool8 onInit, struct ListMenu *list) { const u8 *description; if (onInit != TRUE) @@ -550,7 +550,7 @@ static void BuyMenuPrintItemDescriptionAndShowItemIcon(int item, bool8 onInit, s BuyMenuPrint(2, description, 3, 1, 0, 0); } -static void BuyMenuPrintPriceInList(u8 windowId, int item, u8 y) +static void BuyMenuPrintPriceInList(u8 windowId, s32 item, u8 y) { u8 x; |