diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-10-15 22:46:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-15 22:46:43 -0400 |
| commit | e1900efe1ead0e3344ca95a327b453617c807b6a (patch) | |
| tree | 1f182808fc3f05d8e2accb0a3a9f47936debc0fd /src/party_menu.c | |
| parent | def6cc8158c09f3458866f1fa5983e58022c4101 (diff) | |
| parent | a4a3c1c9e5a0026415330eab9bea2f8f3e83e0a3 (diff) | |
Merge branch 'master' into doc-miscbattle
Diffstat (limited to 'src/party_menu.c')
| -rwxr-xr-x | src/party_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index b4ff08313..9829d62e9 100755 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3522,7 +3522,7 @@ static void CursorCb_Register(u8 taskId) u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES); u8 isEventLegal = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_EVENT_LEGAL); - switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), species2, species, isEventLegal)) + switch (CanRegisterMonForTradingBoard(*(struct RfuGameCompatibilityData *)GetHostRfuGameData(), species2, species, isEventLegal)) { case CANT_REGISTER_MON: StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow); @@ -3548,7 +3548,7 @@ static void CursorCb_Trade1(u8 taskId) u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2); u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES); u8 isEventLegal = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_EVENT_LEGAL); - u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), gPartnerTgtGnameSub, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, isEventLegal); + u32 stringId = GetUnionRoomTradeMessageId(*(struct RfuGameCompatibilityData *)GetHostRfuGameData(), gRfuPartnerCompatibilityData, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, isEventLegal); if (stringId != UR_TRADE_MSG_NONE) { |