dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into weather

Browse Source
This commit is contained in:
DizzyEggg
2018-12-09 11:56:50 +01:00
parent 606fb71392 0b91d2948a
commit 4683cdc30c
125 changed files with 29614 additions and 25811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/shop.c
View File

@@ -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);