From 07fa82c911c5a22f0671a4ea798056b8de3c0a80 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 10 Oct 2019 03:50:51 -0400 Subject: Last non-anim trade.c doc --- include/constants/trade.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include/constants') diff --git a/include/constants/trade.h b/include/constants/trade.h index 8a2626c9a..4fb8966d0 100644 --- a/include/constants/trade.h +++ b/include/constants/trade.h @@ -12,10 +12,6 @@ #define INGAME_TRADE_HORSEA 2 #define INGAME_TRADE_MEOWTH 3 -#define PLAYER_MON_INVALID 0 -#define PLAYER_MON_VALID 1 -#define PARTNER_MON_INVALID 2 - // Flag IDs for sending link data #define INITIATE_TRADE 1 #define CANCEL_TRADE 2 @@ -24,7 +20,7 @@ #define READY_FINISH_TRADE 1 #define FINISH_TRADE 2 -// Return values for CanTradeSelectedMon +// Return values for CanTradeSelectedMon and CanTradeSelectedPartyMenuMon #define CAN_TRADE_MON 0 #define CANT_TRADE_LAST_MON 1 #define CANT_TRADE_NATIONAL 2 @@ -32,6 +28,16 @@ #define CANT_TRADE_INVALID_MON 4 #define CANT_TRADE_EGG2 5 +// Return values for CheckValidityOfTradeMons +#define PLAYER_MON_INVALID 0 +#define BOTH_MONS_VALID 1 +#define PARTNER_MON_INVALID 2 + +// Return values for GetGameProgressForLinkTrade +#define TRADE_BOTH_PLAYERS_READY 0 +#define TRADE_PLAYER_NOT_READY 1 +#define TRADE_PARTNER_NOT_READY 2 + // Indexes for sTradeActionTexts #define TRADE_TEXT_CANCEL 0 #define TRADE_TEXT_CHOOSE_MON 1 @@ -40,12 +46,7 @@ #define TRADE_TEXT_CANCEL_TRADE 4 #define TRADE_TEXT_JP_QUIT 5 -#define MENU_ACTION_SUMMARY 0 -#define MENU_ACTION_TRADE 1 -#define MENU_ACTION_CONFIRM_TRADE 0 -#define MENU_ACTION_CANCEL_TRADE 1 - -#define DRAW_PARTY_BEGIN 1 +// Checked to confirm DrawTradeMenuParty has reached final state #define DRAW_PARTY_FINISH 5 // Message indexes for sTradeMessages @@ -59,7 +60,7 @@ #define TRADE_MSG_EGG_CANT_BE_TRADED 7 #define TRADE_MSG_FRIENDS_MON_CANT_BE_TRADED 8 -// Queue actions +// IDs for QueueAction #define QUEUE_SEND_DATA 0 #define QUEUE_STANDBY 1 #define QUEUE_ONLY_MON1 2 @@ -70,7 +71,6 @@ #define QUEUE_EGG_CANT_BE_TRADED 7 #define QUEUE_FRIENDS_MON_CANT_BE_TRADED 8 -// Queue delays #define QUEUE_DELAY_MSG 3 #define QUEUE_DELAY_DATA 5 -- cgit v1.2.3