diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:28:03 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-02-16 11:28:03 -0500 |
| commit | fd0fc184d6d06e01e017ba88b06d3c1709e626de (patch) | |
| tree | 56e7852cb2d20931985caf1e25003fdc43391025 /src/party_menu.c | |
| parent | 91844cdfb2e0c3c1fd00fae45d1cec2be763c522 (diff) | |
| parent | 4e07002d13c97f90cb8885298c0db2c331dc2b07 (diff) | |
Merge branch 'master' of https://github.com/pret/pokefirered into doc-pokemonleague
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 df0e70b37..600350ca9 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 GFtgtGnameSub *)sub_80F9800(), species2, species, obedience)) + switch (CanRegisterMonForTradingBoard(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), 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 GFtgtGnameSub *)sub_80F9800(), gUnknown_203B064, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience); + u32 stringId = GetUnionRoomTradeMessageId(*(struct GFtgtGnameSub *)GetHostRFUtgtGname(), gPartnerTgtGnameSub, species2, gUnionRoomOfferedSpecies, gUnionRoomRequestedMonType, species, obedience); if (stringId != UR_TRADE_MSG_NONE) { |