diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/trade.h | 31 | ||||
| -rw-r--r-- | include/link.h | 14 | ||||
| -rw-r--r-- | include/party_menu.h | 2 | ||||
| -rw-r--r-- | include/pokemon_storage_system.h | 2 | ||||
| -rw-r--r-- | include/trade.h | 2 |
5 files changed, 47 insertions, 4 deletions
diff --git a/include/constants/trade.h b/include/constants/trade.h index bd66a16aa..f03ced677 100644 --- a/include/constants/trade.h +++ b/include/constants/trade.h @@ -4,6 +4,7 @@ #define TRADE_PLAYER 0 #define TRADE_PARTNER 1 +// In-game Trade IDs #define INGAME_TRADE_SEEDOT 0 #define INGAME_TRADE_PLUSLE 1 #define INGAME_TRADE_HORSEA 2 @@ -13,6 +14,21 @@ #define PLAYER_MON_VALID 1 #define PARTNER_MON_INVALID 2 +// Flag IDs for sending link data +#define CHOSE_VALID_MON 1 +#define CHOSE_INVALID_MON 2 +#define WANTS_TO_TRADE 1 +#define WANTS_TO_CANCEL 2 + +// Return values for CanTradeSelectedMon +#define CAN_TRADE_MON 0 +#define CANT_TRADE_LAST_MON 1 +#define CANT_TRADE_NATIONAL 2 +#define CANT_TRADE_EGG 3 +#define CANT_TRADE_INVALID_MON 4 +#define CANT_TRADE_EGG2 5 + +// Indexes for sTradeActionTexts #define TRADE_ACTION_TEXT_CANCEL 0 #define TRADE_ACTION_TEXT_CHOOSE_MON 1 #define TRADE_ACTION_TEXT_SUMMARY 2 @@ -34,6 +50,21 @@ #define TRADE_MSG_EGG_CANT_BE_TRADED 7 #define TRADE_MSG_FRIENDS_MON_CANT_BE_TRADED 8 +// Queue actions +#define QUEUE_SEND_DATA 0 +#define QUEUE_STANDBY 1 +#define QUEUE_ONLY_MON1 2 +#define QUEUE_ONLY_MON2 3 +#define QUEUE_UNUSED1 4 +#define QUEUE_UNUSED2 5 +#define QUEUE_MON_CANT_BE_TRADED 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 + // Message indexes for sUnionRoomTradeMessages #define UR_TRADE_MSG_NONE 0 #define UR_TRADE_MSG_NOT_MON_PARTNER_WANTS 1 diff --git a/include/link.h b/include/link.h index c14084066..4d6e4593c 100644 --- a/include/link.h +++ b/include/link.h @@ -48,7 +48,7 @@ #define EXTRACT_LINK_ERRORS(status) \ (((status) & LINK_STAT_ERRORS) >> LINK_STAT_ERRORS_SHIFT) -#define LINKCMD_SEND_LINK_TYPE 0x2222 +#define LINKCMD_SEND_LINK_TYPE 0x2222 #define LINKCMD_0x2FFE 0x2FFE #define LINKCMD_SEND_HELD_KEYS 0x4444 #define LINKCMD_0x5555 0x5555 @@ -59,9 +59,21 @@ #define LINKCMD_CONT_BLOCK 0x8888 #define LINKCMD_0xAAAA 0xAAAA #define LINKCMD_0xAAAB 0xAAAB +#define LINKCMD_0xAABB 0xAABB // used in trade #define LINKCMD_INIT_BLOCK 0xBBBB +#define LINKCMD_0xBBCC 0xBBCC // used in trade #define LINKCMD_SEND_HELD_KEYS_2 0xCAFE #define LINKCMD_0xCCCC 0xCCCC +#define LINKCMD_0xCCDD 0xCCDD // all below linkcmds used in trade +#define LINKCMD_0xDDDD 0xDDDD +#define LINKCMD_0xDDEE 0xDDEE +#define LINKCMD_0xEEAA 0xEEAA +#define LINKCMD_0xEEBB 0xEEBB +#define LINKCMD_0xEECC 0xEECC + +#define LINKCMD_0xABCD 0xABCD +#define LINKCMD_0xDCBA 0xDCBA + struct LinkStatus { diff --git a/include/party_menu.h b/include/party_menu.h index 1ea9ea1d1..1f66ef3f9 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -103,7 +103,7 @@ void sub_81B47E0(u8 taskId); bool8 FieldCallback_PrepareFadeInFromMenu(void); void sub_81B58A8(void); void LoadHeldItemIcons(void); -void sub_81B5D4C(u8 *a, u8 *b, u8 c); +void DrawHeldItemIconsForTrade(u8 *a, u8 *b, u8 c); void sub_81B617C(void); void ItemUseCB_Medicine(u8 taskId, TaskFunc task); void sub_81B67C8(u8 taskId, TaskFunc task); diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h index 4c319e59d..7b6a38678 100644 --- a/include/pokemon_storage_system.h +++ b/include/pokemon_storage_system.h @@ -25,7 +25,7 @@ struct PokemonStorage extern struct PokemonStorage *gPokemonStoragePtr; -void sub_80C6D80(const u8 *string, void *dst, u8 arg2, u8 arg3, s32 arg4); +void DrawTextWindowAndBufferTiles(const u8 *string, void *dst, u8 arg2, u8 arg3, s32 bytesToBuffer); u8 CountMonsInBox(u8 boxId); s16 GetFirstFreeBoxSpot(u8 boxId); u8 CountPartyAliveNonEggMonsExcept(u8 slotToIgnore); diff --git a/include/trade.h b/include/trade.h index 9975e17af..9d48f6b23 100644 --- a/include/trade.h +++ b/include/trade.h @@ -11,7 +11,7 @@ extern struct MailStruct gTradeMail[PARTY_SIZE]; extern u8 gSelectedTradeMonPositions[2]; // Exported ROM declarations -extern const struct WindowTemplate gUnknown_0833900C; +extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate; s32 sub_807A728(void); void sub_80773AC(void); |