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

Finish shop and fldeff_escalator

Browse Source
This commit is contained in:
Diegoisawesome
2018-10-18 12:05:02 -05:00
parent e75f0b4f80
commit 6206acd2d2
13 changed files with 985 additions and 2192 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/graphics.h
+4
View File
@@ -4029,4 +4029,8 @@ extern const u8 gUnknown_08D97CF4[];
extern const u8 gStatusGfx_Icons[];
extern const u8 gStatusPal_Icons[];
extern const u8 gBuyMenuFrame_Gfx[];
extern const u16 gBuyMenuFrame_Tilemap[];
extern const u16 gMenuMoneyPal[];
#endif //GUARD_GRAPHICS_H
include/item_menu.h
+1
View File
@@ -59,5 +59,6 @@ void bag_menu_mail_related(void);
void CB2_BagMenuFromStartMenu(void);
u8 sub_81ABB2C(u8 pocketId);
bool8 UseRegisteredKeyItemOnField(void);
void CB2_GoToSellMenu(void);
#endif //GUARD_item_menu_H
include/party_menu.h
-1
View File
@@ -70,6 +70,5 @@ extern void sub_81B67C8(u8, u16, TaskFunc);
extern void sub_81B79E8(u8, u16, TaskFunc);
extern void sub_81B6DC4(u8, u16, TaskFunc);
extern void sub_81B7C74(u8, u16, TaskFunc);
extern u16 ItemIdToBattleMoveId(u16);
#endif // GUARD_PARTY_MENU_H
include/shop.h
+21 -16
View File
@@ -1,7 +1,7 @@
#ifndef GUARD_SHOP_H
#define GUARD_SHOP_H
extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
extern EWRAM_DATA struct ItemSlot gMartPurchaseHistory[3];
enum
{
@@ -10,9 +10,19 @@ enum
MART_TYPE_2,
};
// shop view window NPC info enum
enum
{
EVENT_OBJ_ID,
X_COORD,
Y_COORD,
ANIM_NUM,
LAYER_TYPE
};
struct MartInfo
{
/*0x0*/ void (* callback) (void);
/*0x0*/ void (*callback)(void);
/*0x4*/ const struct MenuAction *menuActions;
/*0x8*/ const u16 *itemList;
/*0xC*/ u16 itemCount;
@@ -20,23 +30,18 @@ struct MartInfo
/*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;
/*0x0000*/ u16 tilemapBuffers[4][0x400];
/*0x2000*/ u32 totalCost;
/*0x2004*/ u16 itemsShowed;
/*0x2006*/ u16 selectedRow;
/*0x2008*/ u16 scrollOffset;
/*0x200A*/ u8 maxQuantity;
/*0x200B*/ u8 scrollIndicatorsTaskId;
/*0x200C*/ u8 unk200C;
/*0x200D*/ u8 unk200D[2];
/*0x200F*/ u8 filler200F[0xA1];
/*0x200C*/ u8 iconSlot;
/*0x200D*/ u8 itemSpriteIds[2];
/*0x2010*/ s16 viewportObjects[16][5];
};
void CreatePokemartMenu(const u16 *);
include/strings.h
+16
View File
@@ -855,5 +855,21 @@ extern const u8 gText_CanIHelpWithAnythingElse[];
extern const u8 gText_AnythingElseICanHelp[];
extern const u8 gText_QuitShopping[];
extern const u8 gText_PokedollarVar1[];
extern const u8 gText_YouDontHaveMoney[];
extern const u8 gText_Var1CertainlyHowMany2[];
extern const u8 gText_Var1CertainlyHowMany[];
extern const u8 gText_Var1IsItThatllBeVar2[];
extern const u8 gText_YouWantedVar1ThatllBeVar2[];
extern const u8 gText_InBagVar1[];
extern const u8 gText_Var1AndYouWantedVar2[];
extern const u8 gText_HereYouGoThankYou[];
extern const u8 gText_NoMoreRoomForThis[];
extern const u8 gText_ThankYouIllSendItHome[];
extern const u8 gText_ThanksIllSendItHome[];
extern const u8 gText_SpaceForVar1Full[];
extern const u8 gText_ThrowInPremierBall[];
extern const u8 gText_ShopBuy[];
extern const u8 gText_ShopSell[];
extern const u8 gText_ShopQuit[];
#endif //GUARD_STRINGS_H