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

Merge pull request #668 from Kurausukun/pockets

Browse Source 
Add Constant for 3 Main Bag Pockets
This commit is contained in:
GriffinR
2025-02-03 12:29:05 -05:00
committed by GitHub
parent 355b92f791 bceff5fb5f
commit bf6bfbd2ed
4 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/global.h
+7 -6
View File
@@ -47,12 +47,13 @@
#define UNION_ROOM_KB_ROW_COUNT 10 #define UNION_ROOM_KB_ROW_COUNT 10
#define GIFT_RIBBONS_COUNT 11 #define GIFT_RIBBONS_COUNT 11
#define POCKET_ITEMS 1 #define POCKET_ITEMS 1
#define POCKET_KEY_ITEMS 2 #define POCKET_KEY_ITEMS 2
#define POCKET_POKE_BALLS 3 #define POCKET_POKE_BALLS 3
#define POCKET_TM_CASE 4 #define POCKET_TM_CASE 4
#define POCKET_BERRY_POUCH 5 #define POCKET_BERRY_POUCH 5
#define NUM_BAG_POCKETS 5 #define NUM_BAG_POCKETS 5
#define NUM_BAG_POCKETS_NO_CASES 3 // number of pockets without considering TM case or berry pouch
// Contests // Contests
#define CONTEST_CATEGORIES_COUNT 5 #define CONTEST_CATEGORIES_COUNT 5
include/item_menu.h
+2 -2
View File
@@ -15,8 +15,8 @@ struct BagStruct
u8 location; u8 location;
bool8 bagOpen; bool8 bagOpen;
u16 pocket; u16 pocket;
u16 itemsAbove[3]; u16 itemsAbove[NUM_BAG_POCKETS_NO_CASES];
u16 cursorPos[3]; u16 cursorPos[NUM_BAG_POCKETS_NO_CASES];
}; };
extern struct BagStruct gBagMenuState; extern struct BagStruct gBagMenuState;
src/item.c
+1 -1
View File
@@ -331,7 +331,7 @@ void ClearBag(void)
{ {
u16 i; u16 i;
for (i = 0; i < 5; i++) for (i = 0; i < NUM_BAG_POCKETS; i++)
{ {
ClearItemSlots(gBagPockets[i].itemSlots, gBagPockets[i].capacity); ClearItemSlots(gBagPockets[i].itemSlots, gBagPockets[i].capacity);
} }
src/item_menu.c
+10 -10
View File
@@ -47,8 +47,8 @@ struct BagMenuAlloc
u16 contextMenuSelectedItem; u16 contextMenuSelectedItem;
u8 pocketScrollArrowsTask; u8 pocketScrollArrowsTask;
u8 pocketSwitchArrowsTask; u8 pocketSwitchArrowsTask;
u8 nItems[3]; u8 nItems[NUM_BAG_POCKETS_NO_CASES];
u8 maxShowed[3]; u8 maxShowed[NUM_BAG_POCKETS_NO_CASES];
u8 data[4]; u8 data[4];
}; };
@@ -57,8 +57,8 @@ struct BagSlots
struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT]; struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT];
struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT]; struct ItemSlot bagPocket_KeyItems[BAG_KEYITEMS_COUNT];
struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT]; struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT];
u16 itemsAbove[3]; u16 itemsAbove[NUM_BAG_POCKETS_NO_CASES];
u16 cursorPos[3]; u16 cursorPos[NUM_BAG_POCKETS_NO_CASES];
u16 registeredItem; u16 registeredItem;
u16 pocket; u16 pocket;
}; };
@@ -832,7 +832,7 @@ void ResetBagCursorPositions(void)
u8 i; u8 i;
gBagMenuState.pocket = POCKET_ITEMS - 1; gBagMenuState.pocket = POCKET_ITEMS - 1;
gBagMenuState.bagOpen = FALSE; gBagMenuState.bagOpen = FALSE;
for (i = 0; i < 3; i++) for (i = 0; i < NUM_BAG_POCKETS_NO_CASES; i++)
{ {
gBagMenuState.itemsAbove[i] = 0; gBagMenuState.itemsAbove[i] = 0;
gBagMenuState.cursorPos[i] = 0; gBagMenuState.cursorPos[i] = 0;
@@ -857,7 +857,7 @@ void PocketCalculateInitialCursorPosAndItemsAbove(u8 pocketId)
static void CalculateInitialCursorPosAndItemsAbove(void) static void CalculateInitialCursorPosAndItemsAbove(void)
{ {
u8 i; u8 i;
for (i = 0; i < 3; i++) for (i = 0; i < NUM_BAG_POCKETS_NO_CASES; i++)
{ {
PocketCalculateInitialCursorPosAndItemsAbove(i); PocketCalculateInitialCursorPosAndItemsAbove(i);
} }
@@ -868,7 +868,7 @@ static void UpdatePocketScrollPositions(void)
u8 i; u8 i;
u8 j; u8 j;
for (i = 0; i < 3; i++) for (i = 0; i < NUM_BAG_POCKETS_NO_CASES; i++)
{ {
if (gBagMenuState.itemsAbove[i] > 3) if (gBagMenuState.itemsAbove[i] > 3)
{ {
@@ -1011,7 +1011,7 @@ void Pocket_CalculateNItemsAndMaxShowed(u8 pocketId)
static void All_CalculateNItemsAndMaxShowed(void) static void All_CalculateNItemsAndMaxShowed(void)
{ {
u8 i; u8 i;
for (i = 0; i < 3; i++) for (i = 0; i < NUM_BAG_POCKETS_NO_CASES; i++)
Pocket_CalculateNItemsAndMaxShowed(i); Pocket_CalculateNItemsAndMaxShowed(i);
} }
@@ -2067,7 +2067,7 @@ static void BackUpPlayerBag(void)
memcpy(sBackupPlayerBag->bagPocket_PokeBalls, gSaveBlock1Ptr->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT * sizeof(struct ItemSlot)); memcpy(sBackupPlayerBag->bagPocket_PokeBalls, gSaveBlock1Ptr->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT * sizeof(struct ItemSlot));
sBackupPlayerBag->registeredItem = gSaveBlock1Ptr->registeredItem; sBackupPlayerBag->registeredItem = gSaveBlock1Ptr->registeredItem;
sBackupPlayerBag->pocket = gBagMenuState.pocket; sBackupPlayerBag->pocket = gBagMenuState.pocket;
for (i = 0; i < 3; i++) for (i = 0; i < NUM_BAG_POCKETS_NO_CASES; i++)
{ {
sBackupPlayerBag->itemsAbove[i] = gBagMenuState.itemsAbove[i]; sBackupPlayerBag->itemsAbove[i] = gBagMenuState.itemsAbove[i];
sBackupPlayerBag->cursorPos[i] = gBagMenuState.cursorPos[i]; sBackupPlayerBag->cursorPos[i] = gBagMenuState.cursorPos[i];
@@ -2087,7 +2087,7 @@ static void RestorePlayerBag(void)
memcpy(gSaveBlock1Ptr->bagPocket_PokeBalls, sBackupPlayerBag->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT * sizeof(struct ItemSlot)); memcpy(gSaveBlock1Ptr->bagPocket_PokeBalls, sBackupPlayerBag->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT * sizeof(struct ItemSlot));
gSaveBlock1Ptr->registeredItem = sBackupPlayerBag->registeredItem; gSaveBlock1Ptr->registeredItem = sBackupPlayerBag->registeredItem;
gBagMenuState.pocket = sBackupPlayerBag->pocket; gBagMenuState.pocket = sBackupPlayerBag->pocket;
for (i = 0; i < 3; i++) for (i = 0; i < NUM_BAG_POCKETS_NO_CASES; i++)
{ {
gBagMenuState.itemsAbove[i] = sBackupPlayerBag->itemsAbove[i]; gBagMenuState.itemsAbove[i] = sBackupPlayerBag->itemsAbove[i];
gBagMenuState.cursorPos[i] = sBackupPlayerBag->cursorPos[i]; gBagMenuState.cursorPos[i] = sBackupPlayerBag->cursorPos[i];