Merge branch 'master' into weather

1 files changed, 3 insertions, 3 deletions

diff --git a/src/shop.c b/src/shop.c
index 9b78878bd..c44cbca12 100755
--- a/src/shop.c
+++ b/src/shop.c
@@ -17,7 +17,7 @@
 #include "item_menu.h"
 #include "list_menu.h"
 #include "main.h"
-#include "malloc.h"
+#include "alloc.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "money.h"
@@ -447,8 +447,8 @@ static void CB2_InitBuyMenu(void)
         clear_scheduled_bg_copies_to_vram();
         gShopDataPtr = AllocZeroed(sizeof(struct ShopData));
         gShopDataPtr->scrollIndicatorsTaskId = 0xFF;
-        gShopDataPtr->itemSpriteIds[0] = -1;
-        gShopDataPtr->itemSpriteIds[1] = -1;
+        gShopDataPtr->itemSpriteIds[0] = 0xFF;
+        gShopDataPtr->itemSpriteIds[1] = 0xFF;
         BuyMenuBuildListMenuTemplate();
         BuyMenuInitBgs();
         FillBgTilemapBufferRect_Palette0(0, 0, 0, 0, 0x20, 0x20);