atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1830 from sphericalice/registered-item-none

Browse source 
Use the ITEM_NONE constant for the registeredItem save block field
This commit is contained in:
GriffinR 2022-12-18 16:11:29 -05:00 committed by GitHub
commit 7a480c0a87
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/item_menu.c
View file

@ -987,7 +987,7 @@ static void BagMenu_ItemPrintCallback(u8 windowId, u32 itemIndex, u8 y)
else else
{ {
// Print registered icon // Print registered icon
if (gSaveBlock1Ptr->registeredItem && gSaveBlock1Ptr->registeredItem == itemId) if (gSaveBlock1Ptr->registeredItem != ITEM_NONE && gSaveBlock1Ptr->registeredItem == itemId)
BlitBitmapToWindow(windowId, sRegisteredSelect_Gfx, 96, y - 1, 24, 16); BlitBitmapToWindow(windowId, sRegisteredSelect_Gfx, 96, y - 1, 24, 16);
} }
} }
@ -1909,7 +1909,7 @@ static void ItemMenu_Register(u8 taskId)
u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket]; u16 *cursorPos = &gBagPosition.cursorPosition[gBagPosition.pocket];
if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId) if (gSaveBlock1Ptr->registeredItem == gSpecialVar_ItemId)
gSaveBlock1Ptr->registeredItem = 0; gSaveBlock1Ptr->registeredItem = ITEM_NONE;
else else
gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId; gSaveBlock1Ptr->registeredItem = gSpecialVar_ItemId;
DestroyListMenuTask(tListTaskId, scrollPos, cursorPos); DestroyListMenuTask(tListTaskId, scrollPos, cursorPos);

3
src/new_game.c
View file

@ -44,6 +44,7 @@
#include "berry_powder.h" #include "berry_powder.h"
#include "mystery_gift.h" #include "mystery_gift.h"
#include "union_room_chat.h" #include "union_room_chat.h"
#include "constants/items.h"
extern const u8 EventScript_ResetAllMapFlags[]; extern const u8 EventScript_ResetAllMapFlags[];
@ -181,7 +182,7 @@ void NewGameInitData(void)
ResetPokemonStorageSystem(); ResetPokemonStorageSystem();
ClearRoamerData(); ClearRoamerData();
ClearRoamerLocationData(); ClearRoamerLocationData();
gSaveBlock1Ptr->registeredItem = 0; gSaveBlock1Ptr->registeredItem = ITEM_NONE;
ClearBag(); ClearBag();
NewGameInitPCItems(); NewGameInitPCItems();
ClearPokeblocks(); ClearPokeblocks();