Merge pull request #417 from SatoMew/master

Replace rival labels
2021-04-18 18:23:00 -04:00
parent 9392ba8ab1 c128e68062
commit 918ed2d31e
16 changed files with 230 additions and 230 deletions
@@ -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;