diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-16 17:55:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:55:56 -0500 |
| commit | 33126a06331f8afce668a1152a26e9ed6f5d9a16 (patch) | |
| tree | 0d603397418119f4f055b29a339e094fba1a4141 /src/party_menu.c | |
| parent | bc4f88d72c5efd05f6dd5ee76966a1fc7c69bc3a (diff) | |
| parent | 57e3f5e0f8743191420de5d5569680ade54c4619 (diff) | |
Merge pull request #392 from Deokishisu/ExternalEvents-doc
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
Diffstat (limited to 'src/party_menu.c')
| -rw-r--r-- | src/party_menu.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/party_menu.c b/src/party_menu.c index ec782a03d..b01e62a03 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3867,9 +3867,9 @@ static void CursorCB_Register(u8 taskId) { u16 species2 = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES2); u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES); - u8 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE); + u8 isEventLegal = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_EVENT_LEGAL); - switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), species2, species, obedience)) + switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), species2, species, isEventLegal)) { case CANT_REGISTER_MON: StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow); @@ -3894,8 +3894,8 @@ 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 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE); - u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), gPartnerTgtGnameSub, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience); + u8 isEventLegal = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_EVENT_LEGAL); + u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), gPartnerTgtGnameSub, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, isEventLegal); if (stringId != UR_TRADE_MSG_NONE) { |