diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/cable_club.h | 4 | ||||
| -rw-r--r-- | include/constants/union_room.h | 18 |
2 files changed, 20 insertions, 2 deletions
diff --git a/include/constants/cable_club.h b/include/constants/cable_club.h index 3250ce6f8..cbdd049db 100644 --- a/include/constants/cable_club.h +++ b/include/constants/cable_club.h @@ -12,6 +12,8 @@ #define USING_MINIGAME 8 #define USING_BATTLE_TOWER 9 +// Return states for the group of specials that use CreateLinkupTask +// A few also used by TryBecomeLinkLeader and TryJoinLinkGroup #define LINKUP_ONGOING 0 #define LINKUP_SUCCESS 1 #define LINKUP_SOMEONE_NOT_READY 2 @@ -20,7 +22,7 @@ #define LINKUP_FAILED 5 #define LINKUP_CONNECTION_ERROR 6 #define LINKUP_PLAYER_NOT_READY 7 -#define LINKUP_UNK8 8 +#define LINKUP_RETRY_ROLE_ASSIGN 8 #define LINKUP_PARTNER_NOT_READY 9 #define LINKUP_FAILED_CONTEST_GMODE 10 #define LINKUP_FAILED_BATTLE_TOWER 11 diff --git a/include/constants/union_room.h b/include/constants/union_room.h index 7b1d1a1be..d867fb340 100644 --- a/include/constants/union_room.h +++ b/include/constants/union_room.h @@ -44,7 +44,7 @@ #define ACTIVITY_BATTLE_TOWER 28 #define ACTIVITY_29 29 -#define IN_UNION_ROOM 0x40 +#define IN_UNION_ROOM (1 << 6) // Used in UR_AddTextPrinterParameterized #define UR_COLOR_DKE_WHT_LTE 0 @@ -83,4 +83,20 @@ #define UR_TRADE_NOTYPE 1 #define UR_TRADE_NOEGG 2 +#define UR_TRADE_READY 0 +#define UR_TRADE_PLAYER_NOT_READY 1 +#define UR_TRADE_PARTNER_NOT_READY 2 + +#define UR_INTERACT_PLAYER_1 1 +#define UR_INTERACT_PLAYER_2 2 +#define UR_INTERACT_PLAYER_3 3 +#define UR_INTERACT_PLAYER_4 4 +#define UR_INTERACT_PLAYER_5 5 +#define UR_INTERACT_PLAYER_6 6 +#define UR_INTERACT_PLAYER_7 7 +#define UR_INTERACT_PLAYER_8 8 +#define UR_INTERACT_ATTENDANT 9 +#define UR_INTERACT_UNUSED 10 +#define UR_INTERACT_START_MENU 11 + #endif //GUARD_CONSTANTS_UNION_ROOM_H |