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/trade.c | |
parent | 2f81b4a204d051aeb88580dc63381011ec49fcbb (diff) | |
parent | a97ef533d204c263cf72a9f05a74eeb21c28d87b (diff) |
Merge pull request #216 from PikalaxALT/link_rfu
Port link_rfu from Emerald
Diffstat (limited to 'src/trade.c')
-rw-r--r-- | src/trade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trade.c b/src/trade.c index 10ed51d69..05a259e60 100644 --- a/src/trade.c +++ b/src/trade.c @@ -2763,7 +2763,7 @@ static bool32 IsDeoxysOrMewUntradable(u16 species, bool8 isObedientBitSet) return FALSE; } -int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet) +int GetUnionRoomTradeMessageId(struct GFtgtGnameSub a0, struct GFtgtGnameSub a1, u16 species1, u16 species2, u8 type, u16 species3, u8 isObedientBitSet) { u8 r9 = a0.hasNationalDex; u8 r4 = a0.isChampion; @@ -2843,7 +2843,7 @@ int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, str return 0; } -int CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct a0, u16 species, u16 a2, u8 a3) +int CanRegisterMonForTradingBoard(struct GFtgtGnameSub a0, u16 species, u16 a2, u8 a3) { u8 canTradeEggAndNational = a0.hasNationalDex; |