diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-01-15 11:07:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-15 11:07:17 -0500 |
| commit | 411f4852c60356c8595470e2d0873be2b4eebbe2 (patch) | |
| tree | af6bf0e3674fff0aaaa7b81ac6f5fde9e10f03f0 /src/party_menu.c | |
| parent | 2f81b4a204d051aeb88580dc63381011ec49fcbb (diff) | |
| parent | a97ef533d204c263cf72a9f05a74eeb21c28d87b (diff) | |
Merge pull request #216 from PikalaxALT/link_rfu
Port link_rfu from Emerald
Diffstat (limited to 'src/party_menu.c')
| -rw-r--r-- | 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 6e0b411bf..7022852d6 100644 --- a/src/party_menu.c +++ b/src/party_menu.c @@ -3881,7 +3881,7 @@ static void CursorCB_Register(u8 taskId) u16 species = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_SPECIES); u8 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE); - switch (CanRegisterMonForTradingBoard(*(struct UnkLinkRfuStruct_02022B14Substruct *)sub_80F9800(), species2, species, obedience)) + switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)sub_80F9800(), species2, species, obedience)) { case CANT_REGISTER_MON: StringExpandPlaceholders(gStringVar4, gText_PkmnCantBeTradedNow); @@ -3907,7 +3907,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 obedience = GetMonData(&gPlayerParty[gPartyMenu.slotId], MON_DATA_OBEDIENCE); - u32 stringId = GetUnionRoomTradeMessageId(*(struct UnkLinkRfuStruct_02022B14Substruct *)sub_80F9800(), gUnknown_203B064, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience); + u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)sub_80F9800(), gUnknown_203B064, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience); if (stringId != UR_TRADE_MSG_NONE) { |