dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #106 from PikalaxALT/berry_pouch

Browse Source 
Berry pouch
This commit is contained in:
PikalaxALT
2019-10-02 20:02:21 -04:00
committed by PikalaxALT
parent 872d5eaf4a 32f2bb3dda
commit d9ab841b0d
25 changed files with 1703 additions and 3955 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/berry_pouch.h
+15 -4
View File
@@ -3,10 +3,21 @@
#include "task.h"
enum BerryPouchType
{
BERRYPOUCH_FROMFIELD,
BERRYPOUCH_FROMPARTYGIVE,
BERRYPOUCH_FROMMARTSELL,
BERRYPOUCH_FROMPOKEMONSTORAGEPC,
BERRYPOUCH_FROMBATTLE,
BERRYPOUCH_FROMBERRYCRUSH,
BERRYPOUCH_NA
};
void BerryPouch_StartFadeToExitCallback(u8 taskId);
void BerryPouch_SetExitCallback(void (*)(void));
void InitBerryPouch(u8, void (*)(void), u8);
void DisplayItemMessageInBerryPouch(u8 taskId, u8 bgId, const u8 * str, TaskFunc followUpFunc);
void sub_813E2B8(u8 taskId);
void BerryPouch_SetExitCallback(void (*exitCallback)(void));
void InitBerryPouch(u8 type, void (*savedCallback)(void), u8 allowSelect);
void DisplayItemMessageInBerryPouch(u8 taskId, u8 fontId, const u8 * str, TaskFunc followUpFunc);
void Task_BerryPouch_DestroyDialogueWindowAndRefreshListMenu(u8 taskId);
#endif //GUARD_BERRY_POUCH_H
include/graphics.h
+8
View File
@@ -998,4 +998,12 @@ extern const u16 gCreditsAllRightsReservedGfxPal[];
extern const u8 gCreditsAllRightsReservedGfxTiles[];
extern const u8 gCreditsAllRightsReservedGfxMap[];
// berry_pouch
extern const u32 gBerryPouchSpriteTiles[];
extern const u8 gBerryPouchBgGfx[];
extern const u32 gBerryPouchBgPals[];
extern const u32 gBerryPouchBgPal0FemaleOverride[];
extern const u32 gBerryPouchSpritePalette[];
extern const u8 gBerryPouchBg1Tilemap[];
#endif //GUARD_GRAPHICS_H
include/item.h
+4 -4
View File
@@ -64,18 +64,18 @@ u8 ItemId_GetSecondaryId(u16 itemId);
u16 itemid_get_market_price(u16 itemId);
void ClearItemSlotsInAllBagPockets(void);
void ClearPCItemSlots(void);
void CopyItemName(u16, u8 *);
void sub_809A824(u16 itemId);
bool8 AddBagItem(u16 itemId, u16 amount);
void SortPocketAndPlaceHMsFirst(struct BagPocket *);
u16 BagGetItemIdByPocketPosition(u8 a0, u16 a1);
u16 BagGetQuantityByPocketPosition(u8 a0, u16 a1);
void SortPocketAndPlaceHMsFirst(struct BagPocket * pocket);
u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 itemId);
u16 BagGetQuantityByPocketPosition(u8 pocketId, u16 itemId);
bool8 itemid_is_unique(u16 itemId);
void BagPocketCompaction(struct ItemSlot * slots, u8 capacity);
u16 GetPcItemQuantity(u16 *);
void ItemPcCompaction(void);
void RemoveItemFromPC(u16 itemId, u16 quantity);
void SortAndCompactBagPocket(struct BagPocket * pocket);
#endif // GUARD_ITEM_H
include/menu_helpers.h
+2 -1
View File
@@ -3,6 +3,7 @@
#include "global.h"
#include "task.h"
#include "window.h"
struct YesNoFuncTable
{
@@ -22,7 +23,7 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 tileNum, u8 palet
void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 fontId, u8 left, u8 top, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
u8 GetLRKeysState(void);
u8 sub_80BF66C(void);
bool8 sub_80BF6A8(u16 itemId);
bool8 itemid_link_can_give_berry(u16 itemId);
bool8 itemid_80BF6D8_mail_related(u16 itemId);
void ClearVramOamPltt(void);
include/party_menu.h
+1
View File
@@ -81,5 +81,6 @@ void sub_8127DA8(u8 battlerId, u8 multiplayerFlag);
void OpenPartyMenuInBattle(u8 arg);
void sub_8127EC4(u8 battlerId, u8 unk, u8 arrayIndex);
bool8 IsMultiBattle(void);
void sub_8126EDC(void);
#endif // GUARD_PARTY_MENU_H
include/strings.h
+9
View File
@@ -94,6 +94,7 @@ extern const u8 gText_Pokemon[];
extern const u8 gText_PkmnFainted3[];
extern const u8 gOtherText_Use[];
extern const u8 gOtherText_Toss[];
extern const u8 gOtherText_Give[];
extern const u8 gOtherText_Exit[];
extern const u8 gText_ThreeHyphens[];
@@ -315,4 +316,12 @@ extern const u8 gCreditsString_The_Royal_New_Zealand_Foundation_of_the_Blind_Gre
extern const u8 gCreditsString_Graphic_Designer[];
extern const u8 gCreditsString_Akira_Kinashi[];
// berry_pouch
extern const u8 gText_TheStrVar1CantBeHeldHere[];
extern const u8 gText_TossOutHowManyStrVar1s[];
extern const u8 gText_ThrewAwayStrVar2StrVar1s[];
extern const u8 gText_ThrowAwayStrVar2OfThisItemQM[];
extern const u8 gText_BerryPouch[];
extern const u8 gText_TheBerryPouchWillBePutAway[];
#endif //GUARD_STRINGS_H