Made Types and Egg Groups into arrays

2022-11-22 17:05:25 -03:00
parent 4736b4b14d
commit 7327be6f9e
18 changed files with 850 additions and 1622 deletions
@@ -2465,8 +2465,8 @@ int GetUnionRoomTradeMessageId(struct RfuGameCompatibilityData player, struct Rf
    else
    {
        // Player's Pokémon must be of the type the partner requested
-        if (gSpeciesInfo[playerSpecies2].type1 != requestedType
-         && gSpeciesInfo[playerSpecies2].type2 != requestedType)
+        if (gSpeciesInfo[playerSpecies2].types[0] != requestedType
+         && gSpeciesInfo[playerSpecies2].types[1] != requestedType)
            return UR_TRADE_MSG_NOT_MON_PARTNER_WANTS;
    }