diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:27:36 -0500 |
|---|---|---|
| committer | GriffinR <griffin.g.richards@gmail.com> | 2020-01-15 16:27:36 -0500 |
| commit | 153858af6035015ca8aae24f44640ce7f25679bc (patch) | |
| tree | 66e6c438d0bb15348d0016195e17e19389cf6f99 /src/trade.c | |
| parent | 04d176334ad590d3462e3c1eb75c1313705ae183 (diff) | |
| parent | 3170b753442da34dbdff6f141f0d2223973c0e83 (diff) | |
Merge master into doc-questlog
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; |