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

Name Wally struct and use bag macros

Browse Source
This commit is contained in:
Sebastian Gabl
2020-02-04 12:24:39 +01:00
committed by huderlem
parent 39d70e364a
commit 0bd9639478
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/item_menu.c
+17 -17
View File
@@ -432,8 +432,8 @@ struct ListBuffer2 {
}; };
struct TempWallyStruct { struct TempWallyStruct {
struct ItemSlot bagPocket_Items[30]; struct ItemSlot bagPocket_Items[BAG_ITEMS_COUNT];
struct ItemSlot bagPocket_PokeBalls[16]; struct ItemSlot bagPocket_PokeBalls[BAG_POKEBALLS_COUNT];
u16 cursorPosition[POCKETS_COUNT]; u16 cursorPosition[POCKETS_COUNT];
u16 scrollPosition[POCKETS_COUNT]; u16 scrollPosition[POCKETS_COUNT];
u8 filler[0x2]; u8 filler[0x2];
@@ -445,7 +445,7 @@ EWRAM_DATA struct BagStruct gBagPositionStruct = {0};
static EWRAM_DATA struct ListBuffer1 *sListBuffer1 = 0; static EWRAM_DATA struct ListBuffer1 *sListBuffer1 = 0;
static EWRAM_DATA struct ListBuffer2 *sListBuffer2 = 0; static EWRAM_DATA struct ListBuffer2 *sListBuffer2 = 0;
EWRAM_DATA u16 gSpecialVar_ItemId = 0; EWRAM_DATA u16 gSpecialVar_ItemId = 0;
static EWRAM_DATA struct TempWallyStruct *gUnknown_0203CE80 = 0; static EWRAM_DATA struct TempWallyStruct *gTempWallyBag = 0;
extern u8 *const gPocketNamesStringsTable[]; extern u8 *const gPocketNamesStringsTable[];
extern u8* gReturnToXStringsTable[]; extern u8* gReturnToXStringsTable[];
@@ -2130,17 +2130,17 @@ void PrepareBagForWallyTutorial(void)
{ {
u32 i; u32 i;
gUnknown_0203CE80 = AllocZeroed(sizeof(struct TempWallyStruct)); gTempWallyBag = AllocZeroed(sizeof(struct TempWallyStruct));
memcpy(gUnknown_0203CE80->bagPocket_Items, gSaveBlock1Ptr->bagPocket_Items, sizeof(gSaveBlock1Ptr->bagPocket_Items)); memcpy(gTempWallyBag->bagPocket_Items, gSaveBlock1Ptr->bagPocket_Items, sizeof(gSaveBlock1Ptr->bagPocket_Items));
memcpy(gUnknown_0203CE80->bagPocket_PokeBalls, gSaveBlock1Ptr->bagPocket_PokeBalls, sizeof(gSaveBlock1Ptr->bagPocket_PokeBalls)); memcpy(gTempWallyBag->bagPocket_PokeBalls, gSaveBlock1Ptr->bagPocket_PokeBalls, sizeof(gSaveBlock1Ptr->bagPocket_PokeBalls));
gUnknown_0203CE80->pocket = gBagPositionStruct.pocket; gTempWallyBag->pocket = gBagPositionStruct.pocket;
for (i = 0; i <= 4; i++) for (i = 0; i <= 4; i++)
{ {
gUnknown_0203CE80->cursorPosition[i] = gBagPositionStruct.cursorPosition[i]; gTempWallyBag->cursorPosition[i] = gBagPositionStruct.cursorPosition[i];
gUnknown_0203CE80->scrollPosition[i] = gBagPositionStruct.scrollPosition[i]; gTempWallyBag->scrollPosition[i] = gBagPositionStruct.scrollPosition[i];
} }
ClearItemSlots(gSaveBlock1Ptr->bagPocket_Items, 30); ClearItemSlots(gSaveBlock1Ptr->bagPocket_Items, BAG_ITEMS_COUNT);
ClearItemSlots(gSaveBlock1Ptr->bagPocket_PokeBalls, 16); ClearItemSlots(gSaveBlock1Ptr->bagPocket_PokeBalls, BAG_POKEBALLS_COUNT);
ResetBagScrollPositions(); ResetBagScrollPositions();
} }
@@ -2148,15 +2148,15 @@ void RestoreBagAfterWallyTutorial(void)
{ {
u32 i; u32 i;
memcpy(gSaveBlock1Ptr->bagPocket_Items, gUnknown_0203CE80->bagPocket_Items, sizeof(gUnknown_0203CE80->bagPocket_Items)); memcpy(gSaveBlock1Ptr->bagPocket_Items, gTempWallyBag->bagPocket_Items, sizeof(gTempWallyBag->bagPocket_Items));
memcpy(gSaveBlock1Ptr->bagPocket_PokeBalls, gUnknown_0203CE80->bagPocket_PokeBalls, sizeof(gUnknown_0203CE80->bagPocket_PokeBalls)); memcpy(gSaveBlock1Ptr->bagPocket_PokeBalls, gTempWallyBag->bagPocket_PokeBalls, sizeof(gTempWallyBag->bagPocket_PokeBalls));
gBagPositionStruct.pocket = gUnknown_0203CE80->pocket; gBagPositionStruct.pocket = gTempWallyBag->pocket;
for (i = 0; i <= 4; i++) for (i = 0; i <= 4; i++)
{ {
gBagPositionStruct.cursorPosition[i] = gUnknown_0203CE80->cursorPosition[i]; gBagPositionStruct.cursorPosition[i] = gTempWallyBag->cursorPosition[i];
gBagPositionStruct.scrollPosition[i] = gUnknown_0203CE80->scrollPosition[i]; gBagPositionStruct.scrollPosition[i] = gTempWallyBag->scrollPosition[i];
} }
Free(gUnknown_0203CE80); Free(gTempWallyBag);
} }
void DoWallyTutorialBagMenu(void) void DoWallyTutorialBagMenu(void)