diff options
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/easy_chat.h | 17 | ||||
| -rw-r--r-- | include/constants/union_room.h | 45 |
2 files changed, 46 insertions, 16 deletions
diff --git a/include/constants/easy_chat.h b/include/constants/easy_chat.h index 4ef90ed60..7261365c2 100644 --- a/include/constants/easy_chat.h +++ b/include/constants/easy_chat.h @@ -6,22 +6,7 @@ #define EASY_CHAT_TYPE_BATTLE_WON 2 #define EASY_CHAT_TYPE_BATTLE_LOST 3 #define EASY_CHAT_TYPE_MAIL 4 -#define EASY_CHAT_TYPE_INTERVIEW 5 -#define EASY_CHAT_TYPE_BARD_SONG 6 -#define EASY_CHAT_TYPE_FAN_CLUB 7 -#define EASY_CHAT_TYPE_UNK_8 8 -#define EASY_CHAT_TYPE_TRENDY_PHRASE 9 -#define EASY_CHAT_TYPE_GABBY_AND_TY 10 -#define EASY_CHAT_TYPE_CONTEST_INTERVIEW 11 -#define EASY_CHAT_TYPE_BATTLE_TOWER_INTERVIEW 12 -#define EASY_CHAT_TYPE_GOOD_SAYING 13 -#define EASY_CHAT_TYPE_FAN_QUESTION 14 -#define EASY_CHAT_TYPE_QUIZ_ANSWER 15 -#define EASY_CHAT_TYPE_QUIZ_QUESTION 16 -#define EASY_CHAT_TYPE_QUIZ_SET_QUESTION 17 -#define EASY_CHAT_TYPE_QUIZ_SET_ANSWER 18 -#define EASY_CHAT_TYPE_APPRENTICE 19 -#define EASY_CHAT_TYPE_QUESTIONNAIRE 20 +#define EASY_CHAT_TYPE_QUESTIONNAIRE 14 #define EC_GROUP_POKEMON_2 0x0 #define EC_GROUP_TRAINER 0x1 diff --git a/include/constants/union_room.h b/include/constants/union_room.h index 021424773..b23860645 100644 --- a/include/constants/union_room.h +++ b/include/constants/union_room.h @@ -1,6 +1,48 @@ #ifndef GUARD_CONSTANTS_UNION_ROOM_H #define GUARD_CONSTANTS_UNION_ROOM_H +#define UNION_ROOM_SPAWN_NONE 0 +#define UNION_ROOM_SPAWN_IN 1 +#define UNION_ROOM_SPAWN_OUT 2 + +#define ACTIVITY_NONE 0 +#define ACTIVITY_BATTLE 1 +#define ACTIVITY_DBLBATTLE 2 +#define ACTIVITY_MLTBATTLE 3 +#define ACTIVITY_TRADE 4 +#define ACTIVITY_CHAT 5 +#define ACTIVITY_WCARD 6 +#define ACTIVITY_WNEWS 7 +#define ACTIVITY_CARD 8 +#define ACTIVITY_PJUMP 9 +#define ACTIVITY_BCRUSH 10 +#define ACTIVITY_BPICK 11 +#define ACTIVITY_SEARCH 12 +#define ACTIVITY_SPINTRADE 13 +#define ACTIVITY_ITEMTRADE 14 + +// Player response +#define ACTIVITY_ACCEPT 17 +#define ACTIVITY_DECLINE 18 + +#define ACTIVITY_NPCTALK 19 +#define ACTIVITY_PLYRTALK 20 + +// Duplicate IDs? +#define ACTIVITY_WCARD2 21 +#define ACTIVITY_WNEWS2 22 + +#define IN_UNION_ROOM 0x40 + +// Used in UR_AddTextPrinterParameterized +#define UR_COLOR_DKE_WHT_LTE 0 +#define UR_COLOR_RED_WHT_LTR 1 +#define UR_COLOR_GRN_WHT_LTG 2 +#define UR_COLOR_WHT_WHT_LTE 3 +#define UR_COLOR_WHT_DKE_LTE 4 +#define UR_COLOR_GRN_DN6_LTB 5 +#define UR_COLOR_DN5_DN6_LTB 6 + #define LINK_GROUP_SINGLE_BATTLE 0 #define LINK_GROUP_DOUBLE_BATTLE 1 #define LINK_GROUP_MULTI_BATTLE 2 @@ -12,4 +54,7 @@ #define LINK_GROUP_WONDER_NEWS 8 #define NUM_LINK_GROUP_TYPES 9 +#define LINK_GROUP_UNION_ROOM_RESUME 9 +#define LINK_GROUP_UNION_ROOM_INIT 10 + #endif //GUARD_CONSTANTS_UNION_ROOM_H |