diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/trade.h | 22 | ||||
| -rw-r--r-- | include/link_rfu.h | 4 | ||||
| -rw-r--r-- | include/trade.h | 4 |
3 files changed, 15 insertions, 15 deletions
diff --git a/include/constants/trade.h b/include/constants/trade.h index 54e58f922..bd66a16aa 100644 --- a/include/constants/trade.h +++ b/include/constants/trade.h @@ -9,8 +9,6 @@ #define INGAME_TRADE_HORSEA 2 #define INGAME_TRADE_MEOWTH 3 -#define INGAME_TRADE_MAIL_LENGTH 9 - #define PLAYER_MON_INVALID 0 #define PLAYER_MON_VALID 1 #define PARTNER_MON_INVALID 2 @@ -26,15 +24,15 @@ #define MENU_ACTION_TRADE 1 // Message indexes for sTradeMessages -#define TRADE_MSG_STANDBY 0 -#define TRADE_MSG_CANCELED 1 -#define TRADE_MSG_ONLY_MON1 2 -#define TRADE_MSG_ONLY_MON2 3 -#define TRADE_MSG_WAITING_FOR_FRIEND 4 -#define TRADE_MSG_FRIEND_WANTS_TO_TRADE 5 -#define TRADE_MSG_MON_CANT_BE_TRADED 6 -#define TRADE_MSG_EGG_CANT_BE_TRADED 7 -#define TRADE_MSG_FRIENDS_MON_CANT_BE_TRADED 8 +#define TRADE_MSG_STANDBY 0 +#define TRADE_MSG_CANCELED 1 +#define TRADE_MSG_ONLY_MON1 2 +#define TRADE_MSG_ONLY_MON2 3 +#define TRADE_MSG_WAITING_FOR_FRIEND 4 +#define TRADE_MSG_FRIEND_WANTS_TO_TRADE 5 +#define TRADE_MSG_MON_CANT_BE_TRADED 6 +#define TRADE_MSG_EGG_CANT_BE_TRADED 7 +#define TRADE_MSG_FRIENDS_MON_CANT_BE_TRADED 8 // Message indexes for sUnionRoomTradeMessages #define UR_TRADE_MSG_NONE 0 @@ -53,5 +51,7 @@ #define CANT_REGISTER_MON 1 #define CANT_REGISTER_EGG 2 +#define LINK_TRADE_TIMEOUT 300 + #endif //GUARD_CONSTANTS_TRADE_H diff --git a/include/link_rfu.h b/include/link_rfu.h index d6e1009e1..3284aba88 100644 --- a/include/link_rfu.h +++ b/include/link_rfu.h @@ -128,7 +128,7 @@ struct UnkRfuStruct_Sub_Unused struct UnkRfuStruct_2 { - /* 0x000 */ void (*unk_00)(void); + /* 0x000 */ void (*linkRfuCallback)(void); /* 0x004 */ u16 unk_04; /* 0x006 */ u8 filler_06[4]; /* 0x00a */ u16 unk_0a; @@ -224,7 +224,7 @@ void sub_800F804(void); void sub_800F850(void); u8 sub_800FCD8(void); bool32 sub_800FE84(const u8 *src, size_t size); -void Rfu_set_zero(void); +void ClearLinkRfuCallback(void); u8 sub_80104F4(void); u8 rfu_get_multiplayer_id(void); bool8 sub_8010100(u8 a0); diff --git a/include/trade.h b/include/trade.h index ec94780cb..9975e17af 100644 --- a/include/trade.h +++ b/include/trade.h @@ -15,13 +15,13 @@ extern const struct WindowTemplate gUnknown_0833900C; s32 sub_807A728(void); void sub_80773AC(void); -void sub_807AE50(void); +void CB2_LinkTrade(void); int CanRegisterMonForTradingBoard(struct UnkLinkRfuStruct_02022B14Substruct a0, u16, u16, u8); int GetUnionRoomTradeMessageId(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6); int sub_807A918(struct Pokemon*, u16); void sub_807B140(void); void sub_807B154(void); -void sub_807F19C(void); +void InitTradeBg(void); void DrawTextOnTradeWindow(u8, const u8 *, u8); #endif //GUARD_TRADE_H |