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

Merge pull request #417 from SatoMew/master

Browse Source 
Replace rival labels
This commit is contained in:
GriffinR authored and GitHub committed 2021-04-18 18:23:00 -04:00
2 parents 9392ba8ab1 c128e68062
commit 918ed2d31e
16 files changed
+230 -230
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/item.c
+1 -1
View File
@@ -598,7 +598,7 @@ void TrySetObtainedItemQuestLogEvent(u16 itemId)
|| itemId == ITEM_SAPPHIRE
)
{
if (itemId != ITEM_TOWN_MAP || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_GARYS_HOUSE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_GARYS_HOUSE)))
if (itemId != ITEM_TOWN_MAP || (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(PALLET_TOWN_RIVALS_HOUSE) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(PALLET_TOWN_RIVALS_HOUSE)))
{
ptr = malloc(sizeof(*ptr));
ptr->itemId = itemId;