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

Merge pull request #352 from huderlem/shop

Browse Source 
[WIP] Shop
This commit is contained in:
Diegoisawesome
2018-10-14 19:03:48 -05:00
committed by GitHub
parent 7f211b2588 32fbf67d47
commit a9abb930aa
11 changed files with 753 additions and 1431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/battle_pyramid_bag.h
View File

@@ -11,7 +11,7 @@ struct PyramidBagResources
u8 windowIds[5];
u8 unk814;
u8 unk815;
u8 scrollArrowSpriteId;
u8 scrollIndicatorsTaskId;
const u8 *menuActionIds;
u8 filler81C[0x820 - 0x81C];
u8 menuActionsCount;

36
include/shop.h
View File

@@ -3,6 +3,42 @@
extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
enum
{
MART_TYPE_0, // normal mart
MART_TYPE_1,
MART_TYPE_2,
};
struct MartInfo
{
/*0x0*/ void (* callback) (void);
/*0x4*/ const struct MenuAction *menuActions;
/*0x8*/ const u16 *itemList;
/*0xC*/ u16 itemCount;
/*0xE*/ u8 windowId;
/*0xF*/ u8 martType;
};
struct BuyMenuLabel
{
u8 label[16];
};
struct ShopData
{
/*0x0000*/ u8 tilemapBuffers[4][0x800];
/*0x2000*/ u8 filler2000[0x4];
/*0x2004*/ u16 unk2004;
/*0x2006*/ u8 filler2006[0x2];
/*0x2008*/ u16 unk2008;
/*0x200A*/ u8 filler200A;
/*0x200B*/ u8 scrollIndicatorsTaskId;
/*0x200C*/ u8 unk200C;
/*0x200D*/ u8 unk200D[2];
/*0x200F*/ u8 filler200F[0xA1];
};
void CreatePokemartMenu(const u16 *);
void CreateDecorationShop1Menu(const u16 *);
void CreateDecorationShop2Menu(const u16 *);

7
include/strings.h
View File

@@ -151,8 +151,6 @@ extern const u8 gMenuText_Confirm[];
extern const u8 gMenuText_Show[];
extern const u8 gMenuText_Give2[];
extern const u8 gText_Cancel2[];
extern const u8 gText_WithdrawPokemon[];
extern const u8 gText_WithdrawMonDescription[];
extern const u8 gText_DepositPokemon[];
@@ -853,4 +851,9 @@ extern const u8 gText_CopperCard[];
extern const u8 gText_SilverCard[];
extern const u8 gText_GoldCard[];
extern const u8 gText_CanIHelpWithAnythingElse[];
extern const u8 gText_AnythingElseICanHelp[];
extern const u8 gText_QuitShopping[];
extern const u8 gText_PokedollarVar1[];
#endif //GUARD_STRINGS_H

1
include/tv.h
View File

@@ -50,5 +50,6 @@ void PutBattleUpdateOnTheAir(u8 opponentLinkPlayerId, u16 move, u16 speciesPlaye
void BravoTrainerPokemonProfile_BeforeInterview1(u16 move);
void UpdateTVScreensOnMap(int, int);
void TV_PrintIntToStringVar(u8 varIdx, int value);
void SaveRecordedItemPurchasesForTVShow(void);
#endif //GUARD_TV_H