diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/trade.h | 16 | ||||
| -rw-r--r-- | include/librfu.h | 10 | ||||
| -rw-r--r-- | include/trade.h | 2 | ||||
| -rw-r--r-- | include/union_room.h | 4 |
4 files changed, 21 insertions, 11 deletions
diff --git a/include/constants/trade.h b/include/constants/trade.h index a12ee7fca..dbaefcdc3 100644 --- a/include/constants/trade.h +++ b/include/constants/trade.h @@ -15,9 +15,6 @@ #define PLAYER_MON_VALID 1 #define PARTNER_MON_INVALID 2 -#define MON_VALID 0 - - #define TRADE_ACTION_TEXT_CANCEL 0 #define TRADE_ACTION_TEXT_CHOOSE_MON 1 #define TRADE_ACTION_TEXT_SUMMARY 2 @@ -28,6 +25,7 @@ #define MENU_ACTION_SUMMARY 0 #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 @@ -38,5 +36,17 @@ #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 +#define UR_TRADE_MSG_NOT_MON_PARTNER_WANTS 1 +#define UR_TRADE_MSG_NOT_EGG 2 +#define UR_TRADE_MSG_MON_CANT_BE_TRADED_1 3 +#define UR_TRADE_MSG_MON_CANT_BE_TRADED_2 4 +#define UR_TRADE_MSG_PARTNERS_MON_CANT_BE_TRADED 5 +#define UR_TRADE_MSG_EGG_CANT_BE_TRADED 6 +#define UR_TRADE_MSG_PARTNER_CANT_ACCEPT_MON 7 +#define UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_1 8 +#define UR_TRADE_MSG_CANT_TRADE_WITH_PARTNER_2 9 + #endif //GUARD_CONSTANTS_TRADE_H diff --git a/include/librfu.h b/include/librfu.h index 38c819835..55b5d264c 100644 --- a/include/librfu.h +++ b/include/librfu.h @@ -76,10 +76,10 @@ struct UnkLinkRfuStruct_02022B14Substruct u16 unk_00_4:1; u16 unk_00_5:1; u16 unk_00_6:1; - u16 unk_00_7:1; - u16 unk_01_0:1; - u16 unk_01_1:1; - u16 unk_01_2:4; + u16 isChampion:1; + u16 hasNationalDex:1; + u16 gameClear:1; // never read, redundant with isChampion + u16 unk_01_2:4; // always 3? u16 unk_01_6:2; u8 playerTrainerId[2]; }; @@ -93,7 +93,7 @@ struct __attribute__((packed, aligned(2))) UnkLinkRfuStruct_02022B14 u8 unk_0a_0:7; u8 unk_0a_7:1; u8 playerGender:1; - u8 unk_0b_1:7; + u8 level:7; u8 unk_0c; }; diff --git a/include/trade.h b/include/trade.h index e4d2a4897..b415bfa4e 100644 --- a/include/trade.h +++ b/include/trade.h @@ -17,7 +17,7 @@ s32 sub_807A728(void); void sub_80773AC(void); void sub_807AE50(void); int sub_807A8D0(struct UnkLinkRfuStruct_02022B14Substruct a0, u16, u16, u8); -int sub_807A7E0(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6); +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); diff --git a/include/union_room.h b/include/union_room.h index facc63986..2fd8d421d 100644 --- a/include/union_room.h +++ b/include/union_room.h @@ -156,8 +156,8 @@ extern u8 gUnknown_02022C2C; extern union UnkUnion_Main gUnknown_02022C30; extern struct UnkLinkRfuStruct_02022B14Substruct gUnknown_02022C38; -extern u16 gUnknown_02022C3C; -extern u8 gUnknown_02022C3E; +extern u16 gUnionRoomOfferedSpecies; +extern u8 gUnionRoomRequestedMonType; // Exported ROM declarations |