From 1069adae46a4e8eb6fdc953c60d0381c394a8e55 Mon Sep 17 00:00:00 2001 From: Tustin2121 Date: Sat, 17 Aug 2019 12:08:08 -0400 Subject: Renaming unknown link room ids to be the same as name This descrepency was causing a lot of annoyance when using porymap, because porymap generated the ids in map_groups.h from the name, and mapjson was generating map_groups.h from the id in the json files. So just name them the same already like every other map in the repo. --- include/constants/map_groups.h | 122 ++++++++++++++++++++--------------------- 1 file changed, 61 insertions(+), 61 deletions(-) (limited to 'include/constants') diff --git a/include/constants/map_groups.h b/include/constants/map_groups.h index dc2ac2f32..6a3276b44 100755 --- a/include/constants/map_groups.h +++ b/include/constants/map_groups.h @@ -398,67 +398,67 @@ #define MAP_METEOR_FALLS_STEVENS_CAVE (107 | (24 << 8)) // Map Group 25 -#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) -#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) -#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) -#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) -#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) -#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) -#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) -#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) -#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) -#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) -#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) -#define MAP_TRADE_CENTER (25 | (25 << 8)) -#define MAP_RECORD_CORNER (26 | (25 << 8)) -#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_29 (29 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_30 (30 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_31 (31 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_32 (32 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_33 (33 | (25 << 8)) -#define MAP_UNKNOWN_MAP_25_34 (34 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8)) -#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8)) -#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) -#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) -#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) -#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) -#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) -#define MAP_UNION_ROOM (60 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE1 (0 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE1 (1 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE1 (2 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE1 (3 | (25 << 8)) +#define MAP_SECRET_BASE_TREE1 (4 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB1 (5 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE2 (6 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE2 (7 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE2 (8 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE2 (9 | (25 << 8)) +#define MAP_SECRET_BASE_TREE2 (10 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB2 (11 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE3 (12 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE3 (13 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE3 (14 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE3 (15 | (25 << 8)) +#define MAP_SECRET_BASE_TREE3 (16 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB3 (17 | (25 << 8)) +#define MAP_SECRET_BASE_RED_CAVE4 (18 | (25 << 8)) +#define MAP_SECRET_BASE_BROWN_CAVE4 (19 | (25 << 8)) +#define MAP_SECRET_BASE_BLUE_CAVE4 (20 | (25 << 8)) +#define MAP_SECRET_BASE_YELLOW_CAVE4 (21 | (25 << 8)) +#define MAP_SECRET_BASE_TREE4 (22 | (25 << 8)) +#define MAP_SECRET_BASE_SHRUB4 (23 | (25 << 8)) +#define MAP_SINGLE_BATTLE_COLOSSEUM (24 | (25 << 8)) +#define MAP_TRADE_CENTER (25 | (25 << 8)) +#define MAP_RECORD_CORNER (26 | (25 << 8)) +#define MAP_DOUBLE_BATTLE_COLOSSEUM (27 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM1 (28 | (25 << 8)) +#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_29 (29 | (25 << 8)) +#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_30 (30 | (25 << 8)) +#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_31 (31 | (25 << 8)) +#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_32 (32 | (25 << 8)) +#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_33 (33 | (25 << 8)) +#define MAP_UNKNOWN_LINK_CONTEST_ROOM_25_34 (34 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM2 (35 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM3 (36 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM4 (37 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM5 (38 | (25 << 8)) +#define MAP_LINK_CONTEST_ROOM6 (39 | (25 << 8)) +#define MAP_INSIDE_OF_TRUCK (40 | (25 << 8)) +#define MAP_SS_TIDAL_CORRIDOR (41 | (25 << 8)) +#define MAP_SS_TIDAL_LOWER_DECK (42 | (25 << 8)) +#define MAP_SS_TIDAL_ROOMS (43 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE01 (44 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE02 (45 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE03 (46 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE04 (47 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE05 (48 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE06 (49 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE07 (50 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE08 (51 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE09 (52 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE10 (53 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE11 (54 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE12 (55 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE13 (56 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE14 (57 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE15 (58 | (25 << 8)) +#define MAP_BATTLE_PYRAMID_SQUARE16 (59 | (25 << 8)) +#define MAP_UNION_ROOM (60 | (25 << 8)) // Map Group 26 #define MAP_SAFARI_ZONE_NORTHWEST (0 | (26 << 8)) -- cgit v1.2.3 From d931ba96020397ec9a9740a9d67aac8a99bf11f6 Mon Sep 17 00:00:00 2001 From: GriffinR <25753467+GriffinRichards@users.noreply.github.com> Date: Mon, 5 Aug 2019 20:37:09 -0400 Subject: document remaining funcs --- include/constants/lilycove_lady.h | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 include/constants/lilycove_lady.h (limited to 'include/constants') diff --git a/include/constants/lilycove_lady.h b/include/constants/lilycove_lady.h new file mode 100644 index 000000000..6ef70d8a7 --- /dev/null +++ b/include/constants/lilycove_lady.h @@ -0,0 +1,30 @@ +#ifndef GUARD_LILYCOVE_LADY_CONSTANTS_H +#define GUARD_LILYCOVE_LADY_CONSTANTS_H + +#define LILYCOVE_LADY_QUIZ 0 +#define LILYCOVE_LADY_FAVOR 1 +#define LILYCOVE_LADY_CONTEST 2 +#define LILYCOVE_LADY_COUNT 3 + +#define LILYCOVE_LADY_STATE_READY 0 +#define LILYCOVE_LADY_STATE_COMPLETED 1 +#define LILYCOVE_LADY_STATE_PRIZE 2 + +#define QUIZ_AUTHOR_PLAYER 0 +#define QUIZ_AUTHOR_OTHER_PLAYER 1 +#define QUIZ_AUTHOR_LADY 2 + +// Would be redundant with the above set if GF hadn't mixed the order +#define QUIZ_AUTHOR_NAME_LADY 0 +#define QUIZ_AUTHOR_NAME_PLAYER 1 +#define QUIZ_AUTHOR_NAME_OTHER_PLAYER 2 + +// TODO use array count macro? +#define QUIZ_QUESTION_LEN 9 //ARRAY_COUNT(sQuizLadyQuestion#) +#define NUM_QUIZ_QUESTIONS 16 //ARRAY_COUNT(sQuizLadyQuizQuestions) +#define FAVOR_DESCRIPTION_NUM 6 //ARRAY_COUNT(sFavorLadyDescriptions) + +#define LILYCOVE_LADY_GIFT_THRESHOLD 5 + + +#endif -- cgit v1.2.3 From 5fb7ab05dd1e0897687ef9eb79bd9769c42c679c Mon Sep 17 00:00:00 2001 From: GriffinR <25753467+GriffinRichards@users.noreply.github.com> Date: Tue, 6 Aug 2019 13:52:10 -0400 Subject: clean up --- include/constants/global.h | 2 ++ include/constants/lilycove_lady.h | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) (limited to 'include/constants') diff --git a/include/constants/global.h b/include/constants/global.h index ff28d6a4b..1177f0444 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -50,6 +50,8 @@ #define PYRAMID_BAG_ITEMS_COUNT 10 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. +#define TRAINER_ID_LENGTH 4 + // string lengths #define ITEM_NAME_LENGTH 14 #define POKEMON_NAME_LENGTH 10 diff --git a/include/constants/lilycove_lady.h b/include/constants/lilycove_lady.h index 6ef70d8a7..01f60ccf4 100644 --- a/include/constants/lilycove_lady.h +++ b/include/constants/lilycove_lady.h @@ -10,6 +10,8 @@ #define LILYCOVE_LADY_STATE_COMPLETED 1 #define LILYCOVE_LADY_STATE_PRIZE 2 +#define LILYCOVE_LADY_GIFT_THRESHOLD 5 + #define QUIZ_AUTHOR_PLAYER 0 #define QUIZ_AUTHOR_OTHER_PLAYER 1 #define QUIZ_AUTHOR_LADY 2 @@ -18,13 +20,7 @@ #define QUIZ_AUTHOR_NAME_LADY 0 #define QUIZ_AUTHOR_NAME_PLAYER 1 #define QUIZ_AUTHOR_NAME_OTHER_PLAYER 2 - -// TODO use array count macro? -#define QUIZ_QUESTION_LEN 9 //ARRAY_COUNT(sQuizLadyQuestion#) -#define NUM_QUIZ_QUESTIONS 16 //ARRAY_COUNT(sQuizLadyQuizQuestions) -#define FAVOR_DESCRIPTION_NUM 6 //ARRAY_COUNT(sFavorLadyDescriptions) - -#define LILYCOVE_LADY_GIFT_THRESHOLD 5 - + +#define QUIZ_QUESTION_LEN 9 #endif -- cgit v1.2.3 From f08615881ea84bc441ea1aba4682adc2a6315a29 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 18 Aug 2019 01:35:30 -0400 Subject: Changes from review --- include/constants/contest.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 include/constants/contest.h (limited to 'include/constants') diff --git a/include/constants/contest.h b/include/constants/contest.h new file mode 100644 index 000000000..d3296222b --- /dev/null +++ b/include/constants/contest.h @@ -0,0 +1,19 @@ +#ifndef GUARD_CONSTANTS_CONTEST_H +#define GUARD_CONSTANTS_CONTEST_H + +#define CONTESTANT_COUNT 4 +#define APPLAUSE_METER_SIZE 5 +#define CONTEST_TURN_COUNT 5 + +#define LINK_CONTEST_FLAG_IS_LINK (1 << 0) +#define LINK_CONTEST_FLAG_IS_WIRELESS (1 << 1) +#define LINK_CONTEST_FLAG_HAS_RS_PLAYER (1 << 2) + +#define CONTEST_CATEGORY_COOL 0 +#define CONTEST_CATEGORY_BEAUTY 1 +#define CONTEST_CATEGORY_CUTE 2 +#define CONTEST_CATEGORY_SMART 3 +#define CONTEST_CATEGORY_TOUGH 4 +#define CONTEST_CATEGORIES_COUNT 5 + +#endif // GUARD_CONSTANTS_CONTEST_H -- cgit v1.2.3 From a46f7952f9c820ab2e8bf633e2b2d2541a31cf01 Mon Sep 17 00:00:00 2001 From: GriffinR <25753467+GriffinRichards@users.noreply.github.com> Date: Wed, 7 Aug 2019 21:18:21 -0400 Subject: Use DIR constants for createvobject Also uses event object ids in LinkContestRoom1 --- include/constants/global.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'include/constants') diff --git a/include/constants/global.h b/include/constants/global.h index 1177f0444..a862ecad2 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -76,4 +76,14 @@ #define OPTIONS_BATTLE_STYLE_SHIFT 0 #define OPTIONS_BATTLE_STYLE_SET 1 +#define DIR_NONE 0 +#define DIR_SOUTH 1 +#define DIR_NORTH 2 +#define DIR_WEST 3 +#define DIR_EAST 4 +#define DIR_SOUTHWEST 5 +#define DIR_SOUTHEAST 6 +#define DIR_NORTHWEST 7 +#define DIR_NORTHEAST 8 + #endif // GUARD_CONSTANTS_GLOBAL_H -- cgit v1.2.3 From 85d97542cdb269278aad3cc3735c29845f9d8738 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 8 Sep 2019 11:53:48 -0400 Subject: Use MAX_MON_MOVES constants --- include/constants/global.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/constants') diff --git a/include/constants/global.h b/include/constants/global.h index a862ecad2..ba06ff721 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -51,6 +51,7 @@ #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. #define TRAINER_ID_LENGTH 4 +#define MAX_MON_MOVES 4 // string lengths #define ITEM_NAME_LENGTH 14 -- cgit v1.2.3 From 06af24bce58b9285166d27fc371ad3c3dbb63a29 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Sun, 15 Sep 2019 23:47:07 -0400 Subject: Use misc ScrCmd constants --- include/constants/berry.h | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 include/constants/berry.h (limited to 'include/constants') diff --git a/include/constants/berry.h b/include/constants/berry.h new file mode 100644 index 000000000..d413b9947 --- /dev/null +++ b/include/constants/berry.h @@ -0,0 +1,28 @@ +#ifndef GUARD_CONSTANTS_BERRY_H +#define GUARD_CONSTANTS_BERRY_H + +#define BERRY_NONE 0 + +#define BERRY_FIRMNESS_UNKNOWN 0 +#define BERRY_FIRMNESS_VERY_SOFT 1 +#define BERRY_FIRMNESS_SOFT 2 +#define BERRY_FIRMNESS_HARD 3 +#define BERRY_FIRMNESS_VERY_HARD 4 +#define BERRY_FIRMNESS_SUPER_HARD 5 + +#define FLAVOR_SPICY 0 +#define FLAVOR_DRY 1 +#define FLAVOR_SWEET 2 +#define FLAVOR_BITTER 3 +#define FLAVOR_SOUR 4 +#define FLAVOR_COUNT 5 + +#define BERRY_STAGE_NO_BERRY 0 // there is no tree planted and the soil is completely flat. +#define BERRY_STAGE_PLANTED 1 +#define BERRY_STAGE_SPROUTED 2 +#define BERRY_STAGE_TALLER 3 +#define BERRY_STAGE_FLOWERING 4 +#define BERRY_STAGE_BERRIES 5 +#define BERRY_STAGE_SPARKLING 255 + +#endif // GUARD_CONSTANTS_BERRY_H -- cgit v1.2.3 From aac9658a8ee9a23bbb7cf8a56496a49b8cdbe61d Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Sep 2019 14:24:07 -0400 Subject: Document some field_specials data --- include/constants/battle_frontier.h | 4 ++++ include/constants/field_specials.h | 44 +++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 include/constants/field_specials.h (limited to 'include/constants') diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index 1224c0f31..9675615de 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_BATTLE_FRONTIER_H #define GUARD_CONSTANTS_BATTLE_FRONTIER_H +#define FRONTIER_CHALLENGE(facility, mode) ((facility << 8) + mode) + // Battle Frontier facility ids. #define FRONTIER_FACILITY_TOWER 0 #define FRONTIER_FACILITY_DOME 1 @@ -41,6 +43,8 @@ #define SPECIAL_BATTLE_PIKE_DOUBLE 9 #define SPECIAL_BATTLE_PYRAMID 10 +#define MAX_BATTLE_FRONTIER_POINTS 9999 + // For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special. #define RESULTS_LINK_CONTEST 7 diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h new file mode 100644 index 000000000..73d3fb272 --- /dev/null +++ b/include/constants/field_specials.h @@ -0,0 +1,44 @@ +#ifndef GUARD_CONSTANTS_FIELD_SPECIALS_H +#define GUARD_CONSTANTS_FIELD_SPECIALS_H + +// PC Locations +#define PC_LOCATION_OTHER 0 +#define PC_LOCATION_BRENDANS_HOUSE 1 +#define PC_LOCATION_MAYS_HOUSE 2 + +// Scrollable Multichoice Menus +#define SCROLL_MULTI_NONE 0 +#define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR 1 +#define SCROLL_MULTI_POKEMON_FAN_CLUB_RATER 2 +#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_1 3 +#define SCROLL_MULTI_BF_EXCHANGE_CORNER_DECOR_VENDOR_2 4 +#define SCROLL_MULTI_BF_EXCHANGE_CORNER_VITAMIN_VENDOR 5 +#define SCROLL_MULTI_BF_EXCHANGE_CORNER_HOLD_ITEM_VENDOR 6 +#define SCROLL_MULTI_BERRY_POWDER_VENDOR 7 +#define SCROLL_MULTI_BF_RECEPTIONIST 8 +#define SCROLL_MULTI_BF_MOVE_TUTOR_1 9 +#define SCROLL_MULTI_BF_MOVE_TUTOR_2 10 +#define SCROLL_MULTI_SS_TIDAL_DESTINATION 11 +#define SCROLL_MULTI_BATTLE_TENT_RULES 12 + +#define MAX_SCROLL_MULTI_LENGTH 16 + +// Dept Store Floor Numbers +#define DEPT_STORE_FLOORNUM_B4F 0 +#define DEPT_STORE_FLOORNUM_B3F 1 +#define DEPT_STORE_FLOORNUM_B2F 2 +#define DEPT_STORE_FLOORNUM_B1F 3 +#define DEPT_STORE_FLOORNUM_1F 4 +#define DEPT_STORE_FLOORNUM_2F 5 +#define DEPT_STORE_FLOORNUM_3F 6 +#define DEPT_STORE_FLOORNUM_4F 7 +#define DEPT_STORE_FLOORNUM_5F 8 +#define DEPT_STORE_FLOORNUM_6F 9 +#define DEPT_STORE_FLOORNUM_7F 10 +#define DEPT_STORE_FLOORNUM_8F 11 +#define DEPT_STORE_FLOORNUM_9F 12 +#define DEPT_STORE_FLOORNUM_10F 13 +#define DEPT_STORE_FLOORNUM_11F 14 +#define DEPT_STORE_FLOORNUM_ROOFTOP 15 + +#endif // GUARD_CONSTANTS_FIELD_SPECIALS_H -- cgit v1.2.3 From 3dbd375779220dd07c88cdcfae51c43b723a86ec Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Sep 2019 17:03:43 -0400 Subject: Some frontier field_specials documentation --- include/constants/field_specials.h | 29 +++++++++++++++++++++++++++++ include/constants/vars.h | 6 +++--- 2 files changed, 32 insertions(+), 3 deletions(-) (limited to 'include/constants') diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h index 73d3fb272..e9042dba3 100644 --- a/include/constants/field_specials.h +++ b/include/constants/field_specials.h @@ -41,4 +41,33 @@ #define DEPT_STORE_FLOORNUM_11F 14 #define DEPT_STORE_FLOORNUM_ROOFTOP 15 +// Frontier Maniac +#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES 0 +#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES 1 +#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS 2 +#define FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS 3 +#define FRONTIER_MANIAC_BATTLE_DOME 4 +#define FRONTIER_MANIAC_BATTLE_FACTORY 5 +#define FRONTIER_MANIAC_BATTLE_PALACE 6 +#define FRONTIER_MANIAC_BATTLE_ARENA 7 +#define FRONTIER_MANIAC_BATTLE_PIKE 8 +#define FRONTIER_MANIAC_BATTLE_PYRAMID 9 +#define FRONTIER_MANIAC_FACILITY_COUNT 10 + +#define FRONTIER_MANIAC_MESSAGE_COUNT 3 + +// Frontier Gambler +#define FRONTIER_GAMBLER_WAITING 0 +#define FRONTIER_GAMBLER_PLACED_BET 1 +#define FRONTIER_GAMBLER_WON 2 +#define FRONTIER_GAMBLER_LOST 3 + +#define FRONTIER_GAMBLER_BET_5 0 +#define FRONTIER_GAMBLER_BET_10 1 +#define FRONTIER_GAMBLER_BET_15 2 +#define FRONTIER_GAMBLER_BET_CANCEL 3 + +#define FRONTIER_GAMBLER_CHALLENGE_COUNT 12 + + #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H diff --git a/include/constants/vars.h b/include/constants/vars.h index 6b213c8cc..dd07092b0 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -61,10 +61,10 @@ #define VAR_0x402E 0x402E #define VAR_FRONTIER_MANIAC_FACILITY 0x402F -#define VAR_FRONTIER_GAMBLER_FACILITY 0x4030 -#define VAR_FRONTIER_GAMBLER_SET_FACILITY_F 0x4031 +#define VAR_FRONTIER_GAMBLER_CHALLENGE 0x4030 +#define VAR_FRONTIER_GAMBLER_SET_CHALLENGE 0x4031 #define VAR_FRONTIER_GAMBLER_AMOUNT_BET 0x4032 -#define VAR_FRONTIER_GAMBLER_PLACED_BET_F 0x4033 +#define VAR_FRONTIER_GAMBLER_STATE 0x4033 #define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 #define VAR_DEOXYS_ROCK_LEVEL 0x4035 -- cgit v1.2.3 From 6ab49da81133c86a0609832a1336efbee67c1b22 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Fri, 13 Sep 2019 20:22:09 -0400 Subject: Clean up field_specials documentation --- include/constants/battle_frontier.h | 28 ++++++++++++++++++++++++++++ include/constants/field_specials.h | 37 ++++++++----------------------------- 2 files changed, 36 insertions(+), 29 deletions(-) (limited to 'include/constants') diff --git a/include/constants/battle_frontier.h b/include/constants/battle_frontier.h index 9675615de..d287dd2db 100644 --- a/include/constants/battle_frontier.h +++ b/include/constants/battle_frontier.h @@ -45,6 +45,34 @@ #define MAX_BATTLE_FRONTIER_POINTS 9999 +// Frontier Maniac +#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES 0 +#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES 1 +#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS 2 +#define FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS 3 +#define FRONTIER_MANIAC_BATTLE_DOME 4 +#define FRONTIER_MANIAC_BATTLE_FACTORY 5 +#define FRONTIER_MANIAC_BATTLE_PALACE 6 +#define FRONTIER_MANIAC_BATTLE_ARENA 7 +#define FRONTIER_MANIAC_BATTLE_PIKE 8 +#define FRONTIER_MANIAC_BATTLE_PYRAMID 9 +#define FRONTIER_MANIAC_FACILITY_COUNT 10 + +#define FRONTIER_MANIAC_MESSAGE_COUNT 3 + +// Frontier Gambler +#define FRONTIER_GAMBLER_WAITING 0 +#define FRONTIER_GAMBLER_PLACED_BET 1 +#define FRONTIER_GAMBLER_WON 2 +#define FRONTIER_GAMBLER_LOST 3 + +#define FRONTIER_GAMBLER_BET_5 0 +#define FRONTIER_GAMBLER_BET_10 1 +#define FRONTIER_GAMBLER_BET_15 2 +#define FRONTIER_GAMBLER_BET_CANCEL 3 + +#define FRONTIER_GAMBLER_CHALLENGE_COUNT 12 + // For 'ShowFacilityResultsWindow' function which is a part of the 'CallFrontierUtilFunc' special. #define RESULTS_LINK_CONTEST 7 diff --git a/include/constants/field_specials.h b/include/constants/field_specials.h index e9042dba3..5ec38d1d4 100644 --- a/include/constants/field_specials.h +++ b/include/constants/field_specials.h @@ -6,6 +6,13 @@ #define PC_LOCATION_BRENDANS_HOUSE 1 #define PC_LOCATION_MAYS_HOUSE 2 +// SS Tidal Locations +#define SS_TIDAL_LOCATION_OTHER 0 +#define SS_TIDAL_LOCATION_SLATEPORT 1 +#define SS_TIDAL_LOCATION_LILYCOVE 2 +#define SS_TIDAL_LOCATION_ROUTE124 3 +#define SS_TIDAL_LOCATION_ROUTE131 4 + // Scrollable Multichoice Menus #define SCROLL_MULTI_NONE 0 #define SCROLL_MULTI_GLASS_WORKSHOP_VENDOR 1 @@ -21,6 +28,7 @@ #define SCROLL_MULTI_SS_TIDAL_DESTINATION 11 #define SCROLL_MULTI_BATTLE_TENT_RULES 12 +#define MAX_SCROLL_MULTI_ON_SCREEN 6 #define MAX_SCROLL_MULTI_LENGTH 16 // Dept Store Floor Numbers @@ -41,33 +49,4 @@ #define DEPT_STORE_FLOORNUM_11F 14 #define DEPT_STORE_FLOORNUM_ROOFTOP 15 -// Frontier Maniac -#define FRONTIER_MANIAC_BATTLE_TOWER_SINGLES 0 -#define FRONTIER_MANIAC_BATTLE_TOWER_DOUBLES 1 -#define FRONTIER_MANIAC_BATTLE_TOWER_MULTIS 2 -#define FRONTIER_MANIAC_BATTLE_TOWER_LINK_MULTIS 3 -#define FRONTIER_MANIAC_BATTLE_DOME 4 -#define FRONTIER_MANIAC_BATTLE_FACTORY 5 -#define FRONTIER_MANIAC_BATTLE_PALACE 6 -#define FRONTIER_MANIAC_BATTLE_ARENA 7 -#define FRONTIER_MANIAC_BATTLE_PIKE 8 -#define FRONTIER_MANIAC_BATTLE_PYRAMID 9 -#define FRONTIER_MANIAC_FACILITY_COUNT 10 - -#define FRONTIER_MANIAC_MESSAGE_COUNT 3 - -// Frontier Gambler -#define FRONTIER_GAMBLER_WAITING 0 -#define FRONTIER_GAMBLER_PLACED_BET 1 -#define FRONTIER_GAMBLER_WON 2 -#define FRONTIER_GAMBLER_LOST 3 - -#define FRONTIER_GAMBLER_BET_5 0 -#define FRONTIER_GAMBLER_BET_10 1 -#define FRONTIER_GAMBLER_BET_15 2 -#define FRONTIER_GAMBLER_BET_CANCEL 3 - -#define FRONTIER_GAMBLER_CHALLENGE_COUNT 12 - - #endif // GUARD_CONSTANTS_FIELD_SPECIALS_H -- cgit v1.2.3 From 6ab192e7393a23ef811a83bdc7e631eafdf368b9 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 17 Sep 2019 01:49:07 -0400 Subject: Review changes for #807 --- include/constants/flags.h | 2 +- include/constants/vars.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'include/constants') diff --git a/include/constants/flags.h b/include/constants/flags.h index 7aa5c3ed3..d097eeb1b 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1400,7 +1400,7 @@ #define FLAG_ENABLE_SHIP_BIRTH_ISLAND (SYSTEM_FLAGS + 0x75) #define FLAG_ENABLE_SHIP_FARAWAY_ISLAND (SYSTEM_FLAGS + 0x76) -#define FLAG_SYS_STORAGE_UNKNOWN_FLAG (SYSTEM_FLAGS + 0x77) +#define FLAG_SHOWN_BOX_WAS_FULL_MESSAGE (SYSTEM_FLAGS + 0x77) #define FLAG_ARRIVED_ON_FARAWAY_ISLAND (SYSTEM_FLAGS + 0x78) #define FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT (SYSTEM_FLAGS + 0x79) diff --git a/include/constants/vars.h b/include/constants/vars.h index dd07092b0..72b15654e 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -68,7 +68,7 @@ #define VAR_DEOXYS_ROCK_STEP_COUNT 0x4034 #define VAR_DEOXYS_ROCK_LEVEL 0x4035 -#define VAR_STORAGE_UNKNOWN 0x4036 +#define VAR_PC_BOX_TO_SEND_MON 0x4036 #define VAR_UNUSUAL_WEATHER_LOCATION 0x4037 #define VAR_UNUSUAL_WEATHER_STEP_COUNTER 0x4038 #define VAR_SHOULD_END_UNUSUAL_WEATHER 0x4039 -- cgit v1.2.3 From b596322ca2a4fa575311397158ce2ecb0053781b Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 18 Sep 2019 18:57:25 -0400 Subject: Initial script_menu documentation --- include/constants/item.h | 20 ++++++ include/constants/script_menu.h | 156 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 176 insertions(+) create mode 100644 include/constants/item.h create mode 100644 include/constants/script_menu.h (limited to 'include/constants') diff --git a/include/constants/item.h b/include/constants/item.h new file mode 100644 index 000000000..a5c34418d --- /dev/null +++ b/include/constants/item.h @@ -0,0 +1,20 @@ +#ifndef GUARD_ITEM_CONSTANTS_H +#define GUARD_ITEM_CONSTANTS_H + +// These constants are used in gItems +#define POCKET_NONE 0 +#define POCKET_ITEMS 1 +#define POCKET_POKE_BALLS 2 +#define POCKET_TM_HM 3 +#define POCKET_BERRIES 4 +#define POCKET_KEY_ITEMS 5 + +#define ITEMS_POCKET 0 +#define BALLS_POCKET 1 +#define TMHM_POCKET 2 +#define BERRIES_POCKET 3 +#define KEYITEMS_POCKET 4 +#define POCKETS_COUNT 5 + + +#endif // GUARD_ITEM_CONSTANTS_H diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h new file mode 100644 index 000000000..9fa5ca1d9 --- /dev/null +++ b/include/constants/script_menu.h @@ -0,0 +1,156 @@ +#ifndef GUARD_SCRIPT_MENU_CONSTANTS_H +#define GUARD_SCRIPT_MENU_CONSTANTS_H + +#define MULTICHOICE(name) {name, ARRAY_COUNT(name)} + +#define MULTICHOICE_B 127 + +// Multichoice Ids +#define MULTI_0 0 +#define MULTI_EXIT 1 +#define MULTI_ENTERINFO 2 +#define MULTI_CONTEST_INFO 3 +#define MULTI_CONTEST_TYPE 4 +#define MULTI_DECOR_NO_REGISTRY 5 +#define MULTI_DECOR_REGISTRY 6 +#define MULTI_7 7 // +#define MULTI_UNUSED_8 8 +#define MULTI_UNUSED_9 9 +#define MULTI_UNUSED_10 10 +#define MULTI_11 11 // +#define MULTI_BIKE 12 // +#define MULTI_STATUS 13 // +#define MULTI_14 14 // +#define MULTI_UNUSED_15 15 +#define MULTI_16 16 // +#define MULTI_YESNOINFO 17 +#define MULTI_18 18 // +#define MULTI_UNUSED_19 19 +#define MULTI_YESNOINFO_2 20 +#define MULTI_UNUSED_21 21 +#define MULTI_UNUSED_22 22 +#define MULTI_23 23 // +#define MULTI_24 24 // +#define MULTI_MECHADOLL1_Q1 25 +#define MULTI_MECHADOLL1_Q2 26 +#define MULTI_MECHADOLL1_Q3 27 +#define MULTI_MECHADOLL2_Q1 28 +#define MULTI_MECHADOLL2_Q2 29 +#define MULTI_MECHADOLL2_Q3 30 +#define MULTI_MECHADOLL3_Q1 31 +#define MULTI_MECHADOLL3_Q2 32 +#define MULTI_MECHADOLL3_Q3 33 +#define MULTI_MECHADOLL4_Q1 34 +#define MULTI_MECHADOLL4_Q2 35 +#define MULTI_MECHADOLL4_Q3 36 +#define MULTI_MECHADOLL5_Q1 37 +#define MULTI_MECHADOLL5_Q2 38 +#define MULTI_MECHADOLL5_Q3 39 +#define MULTI_UNUSED_40 40 +#define MULTI_UNUSED_41 41 +#define MULTI_VENDING_MACHINE 42 +#define MULTI_MACH_BIKE_INFO 43 +#define MULTI_ACRO_BIKE_INFO 44 +#define MULTI_45 45 // +#define MULTI_46 46 // +#define MULTI_47 47 //used? +#define MULTI_GAME_CORNER_DOLLS 48 +#define MULTI_GAME_CORNER_COINS 49 +#define MULTI_50 50 // +#define MULTI_UNUSED_51 51 +#define MULTI_52 52 // +#define MULTI_53 53 // +#define MULTI_RIGHTLEFT 54 +#define MULTI_GAME_CORNER_TMS 55 +#define MULTI_56 56 // +#define MULTI_FLOOR 57 +#define MULTI_SHARDS_R 58 +#define MULTI_SHARDS_Y 59 +#define MULTI_SHARDS_RY 60 +#define MULTI_SHARDS_B 61 +#define MULTI_SHARDS_RB 62 +#define MULTI_SHARDS_YB 63 +#define MULTI_SHARDS_RYB 64 +#define MULTI_SHARDS_G 65 +#define MULTI_SHARDS_RG 66 +#define MULTI_SHARDS_YG 67 +#define MULTI_SHARDS_RYG 68 +#define MULTI_SHARDS_BG 69 +#define MULTI_SHARDS_RBG 70 +#define MULTI_SHARDS_YBG 71 +#define MULTI_SHARDS_RYBG 72 +#define MULTI_73 73 // +#define MULTI_74 74 // +#define MULTI_75 75 // +#define MULTI_76 76 // +#define MULTI_77 77 // +#define MULTI_78 78 // +#define MULTI_79 79 // +#define MULTI_80 80 // +#define MULTI_81 81 // +#define MULTI_CONTEST_RANK 82 +#define MULTI_83 83 // +#define MULTI_84 84 // +#define MULTI_85 85 // +#define MULTI_UNUSED_START_MENU 86 +#define MULTI_87 87 // +#define MULTI_TENT 88 +#define MULTI_UNUSED_SSTIDAL_1 89 // these 4 replaced by scrollable mulitchoice +#define MULTI_UNUSED_SSTIDAL_2 90 +#define MULTI_UNUSED_SSTIDAL_3 91 +#define MULTI_UNUSED_SSTIDAL_4 92 +#define MULTI_FOSSIL 93 // +#define MULTI_YESNO 94 +#define MULTI_95 95 // +#define MULTI_96 96 // +#define MULTI_97 97 // +#define MULTI_98 98 // +#define MULTI_99 99 // +#define MULTI_100 100 // +#define MULTI_101 101 // +#define MULTI_102 102 // +#define MULTI_103 103 // +#define MULTI_104 104 // +#define MULTI_105 105 // +#define MULTI_106 106 // +#define MULTI_107 107 // +#define MULTI_TV_LATI 108 +#define MULTI_109 109 // +#define MULTI_110 110 // +#define MULTI_111 111 // +#define MULTI_112 112 // +#define MULTI_TAG_MATCH_TYPE 113 + +// Std String Ids +#define STDSTRING_COOL 0 +#define STDSTRING_BEAUTY 1 +#define STDSTRING_CUTE 2 +#define STDSTRING_SMART 3 +#define STDSTRING_TOUGH 4 +#define STDSTRING_NORMAL 5 +#define STDSTRING_SUPER 6 +#define STDSTRING_HYPER 7 +#define STDSTRING_MASTER 8 +#define STDSTRING_COOL2 9 +#define STDSTRING_BEAUTY2 10 +#define STDSTRING_CUTE2 11 +#define STDSTRING_SMART2 12 +#define STDSTRING_TOUGH2 13 +#define STDSTRING_ITEMS 14 +#define STDSTRING_KEYITEMS 15 +#define STDSTRING_POKEBALLS 16 +#define STDSTRING_TMHMS 17 +#define STDSTRING_BERRIES 18 +#define STDSTRING_SINGLE 19 +#define STDSTRING_DOUBLE 20 +#define STDSTRING_MULTI 21 +#define STDSTRING_MULTI_LINK 22 +#define STDSTRING_BATTLE_TOWER 23 +#define STDSTRING_BATTLE_DOME 24 +#define STDSTRING_BATTLE_FACTORY 25 +#define STDSTRING_BATTLE_PALACE 26 +#define STDSTRING_BATTLE_ARENA 27 +#define STDSTRING_BATTLE_PIKE 28 +#define STDSTRING_BATTLE_PYRAMID 29 + +#endif //GUARD_SCRIPT_MENU_CONSTANTS_H \ No newline at end of file -- cgit v1.2.3 From de0084ef7a932e27c0020c589f0e2916aef5aeb8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 19 Sep 2019 00:56:51 -0400 Subject: Document multichoice ids --- include/constants/script_menu.h | 114 ++++++++++++++++++++-------------------- 1 file changed, 57 insertions(+), 57 deletions(-) (limited to 'include/constants') diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index 9fa5ca1d9..a3a48e588 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -3,34 +3,34 @@ #define MULTICHOICE(name) {name, ARRAY_COUNT(name)} -#define MULTICHOICE_B 127 +#define MULTI_B_PRESSED 127 // Multichoice Ids -#define MULTI_0 0 -#define MULTI_EXIT 1 +#define MULTI_BRINEY_ON_DEWFORD 0 +#define MULTI_UNUSED_1 1 #define MULTI_ENTERINFO 2 #define MULTI_CONTEST_INFO 3 #define MULTI_CONTEST_TYPE 4 -#define MULTI_DECOR_NO_REGISTRY 5 +#define MULTI_DECOR_NOREGISTRY 5 #define MULTI_DECOR_REGISTRY 6 -#define MULTI_7 7 // +#define MULTI_REGISTER_MENU 7 #define MULTI_UNUSED_8 8 #define MULTI_UNUSED_9 9 #define MULTI_UNUSED_10 10 -#define MULTI_11 11 // -#define MULTI_BIKE 12 // -#define MULTI_STATUS 13 // -#define MULTI_14 14 // +#define MULTI_FRONTIER_PASS_INFO 11 +#define MULTI_BIKE 12 +#define MULTI_STATUS_INFO 13 +#define MULTI_BRINEY_OFF_DEWFORD 14 #define MULTI_UNUSED_15 15 -#define MULTI_16 16 // +#define MULTI_VIEWED_PAINTINGS 16 #define MULTI_YESNOINFO 17 -#define MULTI_18 18 // +#define MULTI_BATTLE_MODE 18 #define MULTI_UNUSED_19 19 #define MULTI_YESNOINFO_2 20 #define MULTI_UNUSED_21 21 #define MULTI_UNUSED_22 22 -#define MULTI_23 23 // -#define MULTI_24 24 // +#define MULTI_CHALLENGEINFO 23 +#define MULTI_LEVEL_MODE 24 #define MULTI_MECHADOLL1_Q1 25 #define MULTI_MECHADOLL1_Q2 26 #define MULTI_MECHADOLL1_Q3 27 @@ -51,19 +51,19 @@ #define MULTI_VENDING_MACHINE 42 #define MULTI_MACH_BIKE_INFO 43 #define MULTI_ACRO_BIKE_INFO 44 -#define MULTI_45 45 // -#define MULTI_46 46 // -#define MULTI_47 47 //used? +#define MULTI_SATISFACTION 45 +#define MULTI_STERN_DEEPSEA 46 +#define MULTI_UNUSED_ASH_VENDOR 47 // Replaced by scrollable multichoice #define MULTI_GAME_CORNER_DOLLS 48 #define MULTI_GAME_CORNER_COINS 49 -#define MULTI_50 50 // +#define MULTI_HOWS_FISHING 50 #define MULTI_UNUSED_51 51 -#define MULTI_52 52 // -#define MULTI_53 53 // +#define MULTI_SSTIDAL_SLATEPORT_1 52 +#define MULTI_SSTIDAL_BATTLE_FRONTIER 53 #define MULTI_RIGHTLEFT 54 #define MULTI_GAME_CORNER_TMS 55 -#define MULTI_56 56 // -#define MULTI_FLOOR 57 +#define MULTI_SSTIDAL_SLATEPORT_2 56 +#define MULTI_FLOORS 57 #define MULTI_SHARDS_R 58 #define MULTI_SHARDS_Y 59 #define MULTI_SHARDS_RY 60 @@ -79,46 +79,46 @@ #define MULTI_SHARDS_RBG 70 #define MULTI_SHARDS_YBG 71 #define MULTI_SHARDS_RYBG 72 -#define MULTI_73 73 // -#define MULTI_74 74 // -#define MULTI_75 75 // -#define MULTI_76 76 // -#define MULTI_77 77 // -#define MULTI_78 78 // -#define MULTI_79 79 // -#define MULTI_80 80 // -#define MULTI_81 81 // +#define MULTI_TOURNEY_WITH_RECORD 73 +#define MULTI_LINK_SERVICES_A1 74 +#define MULTI_LINK_SERVICES_A2 75 +#define MULTI_LINK_SERVICES_B1 76 +#define MULTI_LINK_SERVICES_B2 77 +#define MULTI_LINK_SERVICES_C 78 +#define MULTI_LINK_SERVICES_D 79 +#define MULTI_WIRELESS_MINIGAME 80 +#define MULTI_LINK_LEADER 81 #define MULTI_CONTEST_RANK 82 -#define MULTI_83 83 // -#define MULTI_84 84 // -#define MULTI_85 85 // -#define MULTI_UNUSED_START_MENU 86 -#define MULTI_87 87 // +#define MULTI_FRONTIER_ITEM_CHOOSE 83 +#define MULTI_LINK_CONTEST_INFO 84 +#define MULTI_LINK_CONTEST_MODE 85 +#define MULTI_FORCED_START_MENU 86 +#define MULTI_FRONTIER_GAMBLER_BET 87 #define MULTI_TENT 88 -#define MULTI_UNUSED_SSTIDAL_1 89 // these 4 replaced by scrollable mulitchoice -#define MULTI_UNUSED_SSTIDAL_2 90 -#define MULTI_UNUSED_SSTIDAL_3 91 -#define MULTI_UNUSED_SSTIDAL_4 92 -#define MULTI_FOSSIL 93 // +#define MULTI_UNUSED_SSTIDAL_1 89 // These 4 replaced by scrollable multichoice +#define MULTI_UNUSED_SSTIDAL_2 90 // +#define MULTI_UNUSED_SSTIDAL_3 91 // +#define MULTI_UNUSED_SSTIDAL_4 92 // +#define MULTI_FOSSIL 93 #define MULTI_YESNO 94 -#define MULTI_95 95 // -#define MULTI_96 96 // -#define MULTI_97 97 // -#define MULTI_98 98 // -#define MULTI_99 99 // -#define MULTI_100 100 // -#define MULTI_101 101 // -#define MULTI_102 102 // -#define MULTI_103 103 // -#define MULTI_104 104 // -#define MULTI_105 105 // -#define MULTI_106 106 // -#define MULTI_107 107 // +#define MULTI_FRONTIER_RULES 95 +#define MULTI_BATTLE_ARENA_RULES 96 +#define MULTI_BATTLE_TOWER_RULES 97 +#define MULTI_BATTLE_DOME_RULES 98 +#define MULTI_BATTLE_FACTORY_RULES 99 +#define MULTI_BATTLE_PALACE_RULES 100 +#define MULTI_BATTLE_PYRAMID_RULES 101 +#define MULTI_BATTLE_PIKE_RULES 102 +#define MULTI_GO_ON_RECORD_REST_RETIRE 103 +#define MULTI_GO_ON_REST_RETIRE 104 +#define MULTI_GO_ON_RECORD_RETIRE 105 +#define MULTI_GO_ON_RETIRE 106 +#define MULTI_TOURNEY_NO_RECORD 107 #define MULTI_TV_LATI 108 -#define MULTI_109 109 // -#define MULTI_110 110 // -#define MULTI_111 111 // -#define MULTI_112 112 // +#define MULTI_BATTLE_TOWER_FEELINGS 109 +#define MULTI_WHERES_RAYQUAZA 110 +#define MULTI_SLATEPORT_TENT_RULES 111 +#define MULTI_FALLARBOR_TENT_RULES 112 #define MULTI_TAG_MATCH_TYPE 113 // Std String Ids -- cgit v1.2.3 From 275695c1896fb4b51669eab89febcbe0460765d1 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 19 Sep 2019 17:26:25 -0400 Subject: Document more script_menu, lilycove harbor --- include/constants/flags.h | 2 +- include/constants/script_menu.h | 242 +++++++++++++++++++++------------------- 2 files changed, 128 insertions(+), 116 deletions(-) (limited to 'include/constants') diff --git a/include/constants/flags.h b/include/constants/flags.h index d097eeb1b..4679e953c 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -701,7 +701,7 @@ #define FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_BRENDAN 0x2E9 #define FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_BRENDAN 0x2EA #define FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION 0x2EB -#define FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER 0x2EC +#define FLAG_HIDE_LILYCOVE_HARBOR_EVENT_TICKET_TAKER 0x2EC #define FLAG_HIDE_SLATEPORT_CITY_SCOTT 0x2ED #define FLAG_HIDE_ROUTE_101_ZIGZAGOON 0x2EE #define FLAG_HIDE_VICTORY_ROAD_EXIT_WALLY 0x2EF diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index a3a48e588..820ecad6e 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -3,123 +3,135 @@ #define MULTICHOICE(name) {name, ARRAY_COUNT(name)} +#define MAX_MULTICHOICE_WIDTH 28 + #define MULTI_B_PRESSED 127 // Multichoice Ids -#define MULTI_BRINEY_ON_DEWFORD 0 -#define MULTI_UNUSED_1 1 -#define MULTI_ENTERINFO 2 -#define MULTI_CONTEST_INFO 3 -#define MULTI_CONTEST_TYPE 4 -#define MULTI_DECOR_NOREGISTRY 5 -#define MULTI_DECOR_REGISTRY 6 -#define MULTI_REGISTER_MENU 7 -#define MULTI_UNUSED_8 8 -#define MULTI_UNUSED_9 9 -#define MULTI_UNUSED_10 10 -#define MULTI_FRONTIER_PASS_INFO 11 -#define MULTI_BIKE 12 -#define MULTI_STATUS_INFO 13 -#define MULTI_BRINEY_OFF_DEWFORD 14 -#define MULTI_UNUSED_15 15 -#define MULTI_VIEWED_PAINTINGS 16 -#define MULTI_YESNOINFO 17 -#define MULTI_BATTLE_MODE 18 -#define MULTI_UNUSED_19 19 -#define MULTI_YESNOINFO_2 20 -#define MULTI_UNUSED_21 21 -#define MULTI_UNUSED_22 22 -#define MULTI_CHALLENGEINFO 23 -#define MULTI_LEVEL_MODE 24 -#define MULTI_MECHADOLL1_Q1 25 -#define MULTI_MECHADOLL1_Q2 26 -#define MULTI_MECHADOLL1_Q3 27 -#define MULTI_MECHADOLL2_Q1 28 -#define MULTI_MECHADOLL2_Q2 29 -#define MULTI_MECHADOLL2_Q3 30 -#define MULTI_MECHADOLL3_Q1 31 -#define MULTI_MECHADOLL3_Q2 32 -#define MULTI_MECHADOLL3_Q3 33 -#define MULTI_MECHADOLL4_Q1 34 -#define MULTI_MECHADOLL4_Q2 35 -#define MULTI_MECHADOLL4_Q3 36 -#define MULTI_MECHADOLL5_Q1 37 -#define MULTI_MECHADOLL5_Q2 38 -#define MULTI_MECHADOLL5_Q3 39 -#define MULTI_UNUSED_40 40 -#define MULTI_UNUSED_41 41 -#define MULTI_VENDING_MACHINE 42 -#define MULTI_MACH_BIKE_INFO 43 -#define MULTI_ACRO_BIKE_INFO 44 -#define MULTI_SATISFACTION 45 -#define MULTI_STERN_DEEPSEA 46 -#define MULTI_UNUSED_ASH_VENDOR 47 // Replaced by scrollable multichoice -#define MULTI_GAME_CORNER_DOLLS 48 -#define MULTI_GAME_CORNER_COINS 49 -#define MULTI_HOWS_FISHING 50 -#define MULTI_UNUSED_51 51 -#define MULTI_SSTIDAL_SLATEPORT_1 52 -#define MULTI_SSTIDAL_BATTLE_FRONTIER 53 -#define MULTI_RIGHTLEFT 54 -#define MULTI_GAME_CORNER_TMS 55 -#define MULTI_SSTIDAL_SLATEPORT_2 56 -#define MULTI_FLOORS 57 -#define MULTI_SHARDS_R 58 -#define MULTI_SHARDS_Y 59 -#define MULTI_SHARDS_RY 60 -#define MULTI_SHARDS_B 61 -#define MULTI_SHARDS_RB 62 -#define MULTI_SHARDS_YB 63 -#define MULTI_SHARDS_RYB 64 -#define MULTI_SHARDS_G 65 -#define MULTI_SHARDS_RG 66 -#define MULTI_SHARDS_YG 67 -#define MULTI_SHARDS_RYG 68 -#define MULTI_SHARDS_BG 69 -#define MULTI_SHARDS_RBG 70 -#define MULTI_SHARDS_YBG 71 -#define MULTI_SHARDS_RYBG 72 -#define MULTI_TOURNEY_WITH_RECORD 73 -#define MULTI_LINK_SERVICES_A1 74 -#define MULTI_LINK_SERVICES_A2 75 -#define MULTI_LINK_SERVICES_B1 76 -#define MULTI_LINK_SERVICES_B2 77 -#define MULTI_LINK_SERVICES_C 78 -#define MULTI_LINK_SERVICES_D 79 -#define MULTI_WIRELESS_MINIGAME 80 -#define MULTI_LINK_LEADER 81 -#define MULTI_CONTEST_RANK 82 -#define MULTI_FRONTIER_ITEM_CHOOSE 83 -#define MULTI_LINK_CONTEST_INFO 84 -#define MULTI_LINK_CONTEST_MODE 85 -#define MULTI_FORCED_START_MENU 86 -#define MULTI_FRONTIER_GAMBLER_BET 87 -#define MULTI_TENT 88 -#define MULTI_UNUSED_SSTIDAL_1 89 // These 4 replaced by scrollable multichoice -#define MULTI_UNUSED_SSTIDAL_2 90 // -#define MULTI_UNUSED_SSTIDAL_3 91 // -#define MULTI_UNUSED_SSTIDAL_4 92 // -#define MULTI_FOSSIL 93 -#define MULTI_YESNO 94 -#define MULTI_FRONTIER_RULES 95 -#define MULTI_BATTLE_ARENA_RULES 96 -#define MULTI_BATTLE_TOWER_RULES 97 -#define MULTI_BATTLE_DOME_RULES 98 -#define MULTI_BATTLE_FACTORY_RULES 99 -#define MULTI_BATTLE_PALACE_RULES 100 -#define MULTI_BATTLE_PYRAMID_RULES 101 -#define MULTI_BATTLE_PIKE_RULES 102 -#define MULTI_GO_ON_RECORD_REST_RETIRE 103 -#define MULTI_GO_ON_REST_RETIRE 104 -#define MULTI_GO_ON_RECORD_RETIRE 105 -#define MULTI_GO_ON_RETIRE 106 -#define MULTI_TOURNEY_NO_RECORD 107 -#define MULTI_TV_LATI 108 -#define MULTI_BATTLE_TOWER_FEELINGS 109 -#define MULTI_WHERES_RAYQUAZA 110 -#define MULTI_SLATEPORT_TENT_RULES 111 -#define MULTI_FALLARBOR_TENT_RULES 112 -#define MULTI_TAG_MATCH_TYPE 113 +#define MULTI_BRINEY_ON_DEWFORD 0 +#define MULTI_PC 1 // Exit only, populated by CreatePCMultichoice +#define MULTI_ENTERINFO 2 +#define MULTI_CONTEST_INFO 3 +#define MULTI_CONTEST_TYPE 4 +#define MULTI_DECOR_NOREGISTRY 5 +#define MULTI_DECOR_REGISTRY 6 +#define MULTI_REGISTER_MENU 7 +#define MULTI_SSTIDAL_LILYCOVE 8 // Exit only, populated by CreateLilycoveSSTidalMultichoice +#define MULTI_UNUSED_9 9 +#define MULTI_UNUSED_10 10 +#define MULTI_FRONTIER_PASS_INFO 11 +#define MULTI_BIKE 12 +#define MULTI_STATUS_INFO 13 +#define MULTI_BRINEY_OFF_DEWFORD 14 +#define MULTI_UNUSED_15 15 +#define MULTI_VIEWED_PAINTINGS 16 +#define MULTI_YESNOINFO 17 +#define MULTI_BATTLE_MODE 18 +#define MULTI_UNUSED_19 19 +#define MULTI_YESNOINFO_2 20 +#define MULTI_UNUSED_21 21 +#define MULTI_UNUSED_22 22 +#define MULTI_CHALLENGEINFO 23 +#define MULTI_LEVEL_MODE 24 +#define MULTI_MECHADOLL1_Q1 25 +#define MULTI_MECHADOLL1_Q2 26 +#define MULTI_MECHADOLL1_Q3 27 +#define MULTI_MECHADOLL2_Q1 28 +#define MULTI_MECHADOLL2_Q2 29 +#define MULTI_MECHADOLL2_Q3 30 +#define MULTI_MECHADOLL3_Q1 31 +#define MULTI_MECHADOLL3_Q2 32 +#define MULTI_MECHADOLL3_Q3 33 +#define MULTI_MECHADOLL4_Q1 34 +#define MULTI_MECHADOLL4_Q2 35 +#define MULTI_MECHADOLL4_Q3 36 +#define MULTI_MECHADOLL5_Q1 37 +#define MULTI_MECHADOLL5_Q2 38 +#define MULTI_MECHADOLL5_Q3 39 +#define MULTI_UNUSED_40 40 +#define MULTI_UNUSED_41 41 +#define MULTI_VENDING_MACHINE 42 +#define MULTI_MACH_BIKE_INFO 43 +#define MULTI_ACRO_BIKE_INFO 44 +#define MULTI_SATISFACTION 45 +#define MULTI_STERN_DEEPSEA 46 +#define MULTI_UNUSED_ASH_VENDOR 47 // Replaced by scrollable multichoice +#define MULTI_GAME_CORNER_DOLLS 48 +#define MULTI_GAME_CORNER_COINS 49 +#define MULTI_HOWS_FISHING 50 +#define MULTI_UNUSED_51 51 +#define MULTI_SSTIDAL_SLATEPORT_1 52 // TODO: rename +#define MULTI_SSTIDAL_BATTLE_FRONTIER 53 +#define MULTI_RIGHTLEFT 54 +#define MULTI_GAME_CORNER_TMS 55 +#define MULTI_SSTIDAL_SLATEPORT_2 56 // +#define MULTI_FLOORS 57 +#define MULTI_SHARDS_R 58 +#define MULTI_SHARDS_Y 59 +#define MULTI_SHARDS_RY 60 +#define MULTI_SHARDS_B 61 +#define MULTI_SHARDS_RB 62 +#define MULTI_SHARDS_YB 63 +#define MULTI_SHARDS_RYB 64 +#define MULTI_SHARDS_G 65 +#define MULTI_SHARDS_RG 66 +#define MULTI_SHARDS_YG 67 +#define MULTI_SHARDS_RYG 68 +#define MULTI_SHARDS_BG 69 +#define MULTI_SHARDS_RBG 70 +#define MULTI_SHARDS_YBG 71 +#define MULTI_SHARDS_RYBG 72 +#define MULTI_TOURNEY_WITH_RECORD 73 +#define MULTI_LINK_SERVICES_A1 74 // TODO: rename +#define MULTI_LINK_SERVICES_A2 75 // +#define MULTI_LINK_SERVICES_B1 76 // +#define MULTI_LINK_SERVICES_B2 77 // +#define MULTI_LINK_SERVICES_C 78 // +#define MULTI_LINK_SERVICES_D 79 // +#define MULTI_WIRELESS_MINIGAME 80 +#define MULTI_LINK_LEADER 81 +#define MULTI_CONTEST_RANK 82 +#define MULTI_FRONTIER_ITEM_CHOOSE 83 +#define MULTI_LINK_CONTEST_INFO 84 +#define MULTI_LINK_CONTEST_MODE 85 +#define MULTI_FORCED_START_MENU 86 +#define MULTI_FRONTIER_GAMBLER_BET 87 +#define MULTI_TENT 88 +#define MULTI_UNUSED_SSTIDAL_1 89 // These 4 were replaced by CreateLilycoveSSTidalMultichoice +#define MULTI_UNUSED_SSTIDAL_2 90 // +#define MULTI_UNUSED_SSTIDAL_3 91 // +#define MULTI_UNUSED_SSTIDAL_4 92 // +#define MULTI_FOSSIL 93 +#define MULTI_YESNO 94 +#define MULTI_FRONTIER_RULES 95 +#define MULTI_BATTLE_ARENA_RULES 96 +#define MULTI_BATTLE_TOWER_RULES 97 +#define MULTI_BATTLE_DOME_RULES 98 +#define MULTI_BATTLE_FACTORY_RULES 99 +#define MULTI_BATTLE_PALACE_RULES 100 +#define MULTI_BATTLE_PYRAMID_RULES 101 +#define MULTI_BATTLE_PIKE_RULES 102 +#define MULTI_GO_ON_RECORD_REST_RETIRE 103 +#define MULTI_GO_ON_REST_RETIRE 104 +#define MULTI_GO_ON_RECORD_RETIRE 105 +#define MULTI_GO_ON_RETIRE 106 +#define MULTI_TOURNEY_NO_RECORD 107 +#define MULTI_TV_LATI 108 +#define MULTI_BATTLE_TOWER_FEELINGS 109 +#define MULTI_WHERES_RAYQUAZA 110 +#define MULTI_SLATEPORT_TENT_RULES 111 +#define MULTI_FALLARBOR_TENT_RULES 112 +#define MULTI_TAG_MATCH_TYPE 113 + +// Lilycove SS Tidal Multichoice Selections +#define SSTIDAL_SELECTION_SLATEPORT 0 +#define SSTIDAL_SELECTION_BATTLE_FRONTIER 1 +#define SSTIDAL_SELECTION_SOUTHERN_ISLAND 2 +#define SSTIDAL_SELECTION_NAVEL_ROCK 3 +#define SSTIDAL_SELECTION_BIRTH_ISLAND 4 +#define SSTIDAL_SELECTION_FARAWAY_ISLAND 5 +#define SSTIDAL_SELECTION_EXIT 6 +#define SSTIDAL_SELECTION_COUNT 7 // Std String Ids #define STDSTRING_COOL 0 @@ -153,4 +165,4 @@ #define STDSTRING_BATTLE_PIKE 28 #define STDSTRING_BATTLE_PYRAMID 29 -#endif //GUARD_SCRIPT_MENU_CONSTANTS_H \ No newline at end of file +#endif //GUARD_SCRIPT_MENU_CONSTANTS_H -- cgit v1.2.3 From 9fb24bbbce150809430a8728d239a8b095e10120 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 19 Sep 2019 18:31:09 -0400 Subject: Remainder of script_menu documentation --- include/constants/script_menu.h | 228 ++++++++++++++++++++-------------------- 1 file changed, 114 insertions(+), 114 deletions(-) (limited to 'include/constants') diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index 820ecad6e..013cb8a27 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -8,120 +8,120 @@ #define MULTI_B_PRESSED 127 // Multichoice Ids -#define MULTI_BRINEY_ON_DEWFORD 0 -#define MULTI_PC 1 // Exit only, populated by CreatePCMultichoice -#define MULTI_ENTERINFO 2 -#define MULTI_CONTEST_INFO 3 -#define MULTI_CONTEST_TYPE 4 -#define MULTI_DECOR_NOREGISTRY 5 -#define MULTI_DECOR_REGISTRY 6 -#define MULTI_REGISTER_MENU 7 -#define MULTI_SSTIDAL_LILYCOVE 8 // Exit only, populated by CreateLilycoveSSTidalMultichoice -#define MULTI_UNUSED_9 9 -#define MULTI_UNUSED_10 10 -#define MULTI_FRONTIER_PASS_INFO 11 -#define MULTI_BIKE 12 -#define MULTI_STATUS_INFO 13 -#define MULTI_BRINEY_OFF_DEWFORD 14 -#define MULTI_UNUSED_15 15 -#define MULTI_VIEWED_PAINTINGS 16 -#define MULTI_YESNOINFO 17 -#define MULTI_BATTLE_MODE 18 -#define MULTI_UNUSED_19 19 -#define MULTI_YESNOINFO_2 20 -#define MULTI_UNUSED_21 21 -#define MULTI_UNUSED_22 22 -#define MULTI_CHALLENGEINFO 23 -#define MULTI_LEVEL_MODE 24 -#define MULTI_MECHADOLL1_Q1 25 -#define MULTI_MECHADOLL1_Q2 26 -#define MULTI_MECHADOLL1_Q3 27 -#define MULTI_MECHADOLL2_Q1 28 -#define MULTI_MECHADOLL2_Q2 29 -#define MULTI_MECHADOLL2_Q3 30 -#define MULTI_MECHADOLL3_Q1 31 -#define MULTI_MECHADOLL3_Q2 32 -#define MULTI_MECHADOLL3_Q3 33 -#define MULTI_MECHADOLL4_Q1 34 -#define MULTI_MECHADOLL4_Q2 35 -#define MULTI_MECHADOLL4_Q3 36 -#define MULTI_MECHADOLL5_Q1 37 -#define MULTI_MECHADOLL5_Q2 38 -#define MULTI_MECHADOLL5_Q3 39 -#define MULTI_UNUSED_40 40 -#define MULTI_UNUSED_41 41 -#define MULTI_VENDING_MACHINE 42 -#define MULTI_MACH_BIKE_INFO 43 -#define MULTI_ACRO_BIKE_INFO 44 -#define MULTI_SATISFACTION 45 -#define MULTI_STERN_DEEPSEA 46 -#define MULTI_UNUSED_ASH_VENDOR 47 // Replaced by scrollable multichoice -#define MULTI_GAME_CORNER_DOLLS 48 -#define MULTI_GAME_CORNER_COINS 49 -#define MULTI_HOWS_FISHING 50 -#define MULTI_UNUSED_51 51 -#define MULTI_SSTIDAL_SLATEPORT_1 52 // TODO: rename -#define MULTI_SSTIDAL_BATTLE_FRONTIER 53 -#define MULTI_RIGHTLEFT 54 -#define MULTI_GAME_CORNER_TMS 55 -#define MULTI_SSTIDAL_SLATEPORT_2 56 // -#define MULTI_FLOORS 57 -#define MULTI_SHARDS_R 58 -#define MULTI_SHARDS_Y 59 -#define MULTI_SHARDS_RY 60 -#define MULTI_SHARDS_B 61 -#define MULTI_SHARDS_RB 62 -#define MULTI_SHARDS_YB 63 -#define MULTI_SHARDS_RYB 64 -#define MULTI_SHARDS_G 65 -#define MULTI_SHARDS_RG 66 -#define MULTI_SHARDS_YG 67 -#define MULTI_SHARDS_RYG 68 -#define MULTI_SHARDS_BG 69 -#define MULTI_SHARDS_RBG 70 -#define MULTI_SHARDS_YBG 71 -#define MULTI_SHARDS_RYBG 72 -#define MULTI_TOURNEY_WITH_RECORD 73 -#define MULTI_LINK_SERVICES_A1 74 // TODO: rename -#define MULTI_LINK_SERVICES_A2 75 // -#define MULTI_LINK_SERVICES_B1 76 // -#define MULTI_LINK_SERVICES_B2 77 // -#define MULTI_LINK_SERVICES_C 78 // -#define MULTI_LINK_SERVICES_D 79 // -#define MULTI_WIRELESS_MINIGAME 80 -#define MULTI_LINK_LEADER 81 -#define MULTI_CONTEST_RANK 82 -#define MULTI_FRONTIER_ITEM_CHOOSE 83 -#define MULTI_LINK_CONTEST_INFO 84 -#define MULTI_LINK_CONTEST_MODE 85 -#define MULTI_FORCED_START_MENU 86 -#define MULTI_FRONTIER_GAMBLER_BET 87 -#define MULTI_TENT 88 -#define MULTI_UNUSED_SSTIDAL_1 89 // These 4 were replaced by CreateLilycoveSSTidalMultichoice -#define MULTI_UNUSED_SSTIDAL_2 90 // -#define MULTI_UNUSED_SSTIDAL_3 91 // -#define MULTI_UNUSED_SSTIDAL_4 92 // -#define MULTI_FOSSIL 93 -#define MULTI_YESNO 94 -#define MULTI_FRONTIER_RULES 95 -#define MULTI_BATTLE_ARENA_RULES 96 -#define MULTI_BATTLE_TOWER_RULES 97 -#define MULTI_BATTLE_DOME_RULES 98 -#define MULTI_BATTLE_FACTORY_RULES 99 -#define MULTI_BATTLE_PALACE_RULES 100 -#define MULTI_BATTLE_PYRAMID_RULES 101 -#define MULTI_BATTLE_PIKE_RULES 102 -#define MULTI_GO_ON_RECORD_REST_RETIRE 103 -#define MULTI_GO_ON_REST_RETIRE 104 -#define MULTI_GO_ON_RECORD_RETIRE 105 -#define MULTI_GO_ON_RETIRE 106 -#define MULTI_TOURNEY_NO_RECORD 107 -#define MULTI_TV_LATI 108 -#define MULTI_BATTLE_TOWER_FEELINGS 109 -#define MULTI_WHERES_RAYQUAZA 110 -#define MULTI_SLATEPORT_TENT_RULES 111 -#define MULTI_FALLARBOR_TENT_RULES 112 -#define MULTI_TAG_MATCH_TYPE 113 +#define MULTI_BRINEY_ON_DEWFORD 0 +#define MULTI_PC 1 // Exit only, populated by CreatePCMultichoice +#define MULTI_ENTERINFO 2 +#define MULTI_CONTEST_INFO 3 +#define MULTI_CONTEST_TYPE 4 +#define MULTI_DECOR_NOREGISTRY 5 +#define MULTI_DECOR_REGISTRY 6 +#define MULTI_REGISTER_MENU 7 +#define MULTI_SSTIDAL_LILYCOVE 8 // Exit only, populated by CreateLilycoveSSTidalMultichoice +#define MULTI_UNUSED_9 9 +#define MULTI_UNUSED_10 10 +#define MULTI_FRONTIER_PASS_INFO 11 +#define MULTI_BIKE 12 +#define MULTI_STATUS_INFO 13 +#define MULTI_BRINEY_OFF_DEWFORD 14 +#define MULTI_UNUSED_15 15 +#define MULTI_VIEWED_PAINTINGS 16 +#define MULTI_YESNOINFO 17 +#define MULTI_BATTLE_MODE 18 +#define MULTI_UNUSED_19 19 +#define MULTI_YESNOINFO_2 20 +#define MULTI_UNUSED_21 21 +#define MULTI_UNUSED_22 22 +#define MULTI_CHALLENGEINFO 23 +#define MULTI_LEVEL_MODE 24 +#define MULTI_MECHADOLL1_Q1 25 +#define MULTI_MECHADOLL1_Q2 26 +#define MULTI_MECHADOLL1_Q3 27 +#define MULTI_MECHADOLL2_Q1 28 +#define MULTI_MECHADOLL2_Q2 29 +#define MULTI_MECHADOLL2_Q3 30 +#define MULTI_MECHADOLL3_Q1 31 +#define MULTI_MECHADOLL3_Q2 32 +#define MULTI_MECHADOLL3_Q3 33 +#define MULTI_MECHADOLL4_Q1 34 +#define MULTI_MECHADOLL4_Q2 35 +#define MULTI_MECHADOLL4_Q3 36 +#define MULTI_MECHADOLL5_Q1 37 +#define MULTI_MECHADOLL5_Q2 38 +#define MULTI_MECHADOLL5_Q3 39 +#define MULTI_UNUSED_40 40 +#define MULTI_UNUSED_41 41 +#define MULTI_VENDING_MACHINE 42 +#define MULTI_MACH_BIKE_INFO 43 +#define MULTI_ACRO_BIKE_INFO 44 +#define MULTI_SATISFACTION 45 +#define MULTI_STERN_DEEPSEA 46 +#define MULTI_UNUSED_ASH_VENDOR 47 // Replaced by scrollable multichoice +#define MULTI_GAME_CORNER_DOLLS 48 +#define MULTI_GAME_CORNER_COINS 49 +#define MULTI_HOWS_FISHING 50 +#define MULTI_UNUSED_51 51 +#define MULTI_SSTIDAL_SLATEPORT_WITH_BF 52 +#define MULTI_SSTIDAL_BATTLE_FRONTIER 53 +#define MULTI_RIGHTLEFT 54 +#define MULTI_GAME_CORNER_TMS 55 +#define MULTI_SSTIDAL_SLATEPORT_NO_BF 56 +#define MULTI_FLOORS 57 +#define MULTI_SHARDS_R 58 +#define MULTI_SHARDS_Y 59 +#define MULTI_SHARDS_RY 60 +#define MULTI_SHARDS_B 61 +#define MULTI_SHARDS_RB 62 +#define MULTI_SHARDS_YB 63 +#define MULTI_SHARDS_RYB 64 +#define MULTI_SHARDS_G 65 +#define MULTI_SHARDS_RG 66 +#define MULTI_SHARDS_YG 67 +#define MULTI_SHARDS_RYG 68 +#define MULTI_SHARDS_BG 69 +#define MULTI_SHARDS_RBG 70 +#define MULTI_SHARDS_YBG 71 +#define MULTI_SHARDS_RYBG 72 +#define MULTI_TOURNEY_WITH_RECORD 73 +#define MULTI_LINK_SERVICES_A1 74 // TODO: rename +#define MULTI_LINK_SERVICES_A2 75 // +#define MULTI_LINK_SERVICES_B1 76 // +#define MULTI_LINK_SERVICES_B2 77 // +#define MULTI_LINK_SERVICES_C 78 // +#define MULTI_LINK_SERVICES_D 79 // +#define MULTI_WIRELESS_MINIGAME 80 +#define MULTI_LINK_LEADER 81 +#define MULTI_CONTEST_RANK 82 +#define MULTI_FRONTIER_ITEM_CHOOSE 83 +#define MULTI_LINK_CONTEST_INFO 84 +#define MULTI_LINK_CONTEST_MODE 85 +#define MULTI_FORCED_START_MENU 86 +#define MULTI_FRONTIER_GAMBLER_BET 87 +#define MULTI_TENT 88 +#define MULTI_UNUSED_SSTIDAL_1 89 // These 4 were replaced by CreateLilycoveSSTidalMultichoice +#define MULTI_UNUSED_SSTIDAL_2 90 // +#define MULTI_UNUSED_SSTIDAL_3 91 // +#define MULTI_UNUSED_SSTIDAL_4 92 // +#define MULTI_FOSSIL 93 +#define MULTI_YESNO 94 +#define MULTI_FRONTIER_RULES 95 +#define MULTI_BATTLE_ARENA_RULES 96 +#define MULTI_BATTLE_TOWER_RULES 97 +#define MULTI_BATTLE_DOME_RULES 98 +#define MULTI_BATTLE_FACTORY_RULES 99 +#define MULTI_BATTLE_PALACE_RULES 100 +#define MULTI_BATTLE_PYRAMID_RULES 101 +#define MULTI_BATTLE_PIKE_RULES 102 +#define MULTI_GO_ON_RECORD_REST_RETIRE 103 +#define MULTI_GO_ON_REST_RETIRE 104 +#define MULTI_GO_ON_RECORD_RETIRE 105 +#define MULTI_GO_ON_RETIRE 106 +#define MULTI_TOURNEY_NO_RECORD 107 +#define MULTI_TV_LATI 108 +#define MULTI_BATTLE_TOWER_FEELINGS 109 +#define MULTI_WHERES_RAYQUAZA 110 +#define MULTI_SLATEPORT_TENT_RULES 111 +#define MULTI_FALLARBOR_TENT_RULES 112 +#define MULTI_TAG_MATCH_TYPE 113 // Lilycove SS Tidal Multichoice Selections #define SSTIDAL_SELECTION_SLATEPORT 0 -- cgit v1.2.3 From b6dffcf8b774ca06287dda30fa5a6323bd8835f6 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Thu, 19 Sep 2019 19:23:24 -0400 Subject: Clean up script_menu documentation --- include/constants/script_menu.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/constants') diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index 013cb8a27..b7ec908c1 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -82,12 +82,12 @@ #define MULTI_SHARDS_YBG 71 #define MULTI_SHARDS_RYBG 72 #define MULTI_TOURNEY_WITH_RECORD 73 -#define MULTI_LINK_SERVICES_A1 74 // TODO: rename -#define MULTI_LINK_SERVICES_A2 75 // -#define MULTI_LINK_SERVICES_B1 76 // -#define MULTI_LINK_SERVICES_B2 77 // -#define MULTI_LINK_SERVICES_C 78 // -#define MULTI_LINK_SERVICES_D 79 // +#define MULTI_CABLE_CLUB_NO_RECORD_MIX 74 +#define MULTI_WIRELESS_NO_RECORD_BERRY 75 +#define MULTI_CABLE_CLUB_WITH_RECORD_MIX 76 +#define MULTI_WIRELESS_NO_BERRY 77 +#define MULTI_WIRELESS_NO_RECORD 78 +#define MULTI_WIRELESS_ALL_SERVICES 79 #define MULTI_WIRELESS_MINIGAME 80 #define MULTI_LINK_LEADER 81 #define MULTI_CONTEST_RANK 82 -- cgit v1.2.3 From 80f58f7b24058db4f6e6ab62b24875d0b78b084a Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 17 Sep 2019 15:24:44 -0400 Subject: Document PLAYER_HAS constants, consolidate poke constants --- include/constants/pokemon.h | 270 +++++++++++++++++++++++++++++++++----------- 1 file changed, 202 insertions(+), 68 deletions(-) (limited to 'include/constants') diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 5d0e562bc..6ba269336 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -2,81 +2,81 @@ #define GUARD_CONSTANTS_POKEMON_H // Pokemon types -#define TYPE_NONE 0xFF -#define TYPE_NORMAL 0x00 -#define TYPE_FIGHTING 0x01 -#define TYPE_FLYING 0x02 -#define TYPE_POISON 0x03 -#define TYPE_GROUND 0x04 -#define TYPE_ROCK 0x05 -#define TYPE_BUG 0x06 -#define TYPE_GHOST 0x07 -#define TYPE_STEEL 0x08 -#define TYPE_MYSTERY 0x09 -#define TYPE_FIRE 0x0a -#define TYPE_WATER 0x0b -#define TYPE_GRASS 0x0c -#define TYPE_ELECTRIC 0x0d -#define TYPE_PSYCHIC 0x0e -#define TYPE_ICE 0x0f -#define TYPE_DRAGON 0x10 -#define TYPE_DARK 0x11 -#define NUMBER_OF_MON_TYPES 0x12 +#define TYPE_NONE 255 +#define TYPE_NORMAL 0 +#define TYPE_FIGHTING 1 +#define TYPE_FLYING 2 +#define TYPE_POISON 3 +#define TYPE_GROUND 4 +#define TYPE_ROCK 5 +#define TYPE_BUG 6 +#define TYPE_GHOST 7 +#define TYPE_STEEL 8 +#define TYPE_MYSTERY 9 +#define TYPE_FIRE 10 +#define TYPE_WATER 11 +#define TYPE_GRASS 12 +#define TYPE_ELECTRIC 13 +#define TYPE_PSYCHIC 14 +#define TYPE_ICE 15 +#define TYPE_DRAGON 16 +#define TYPE_DARK 17 +#define NUMBER_OF_MON_TYPES 18 // Pokemon egg groups -#define EGG_GROUP_NONE 0 -#define EGG_GROUP_MONSTER 1 -#define EGG_GROUP_WATER_1 2 -#define EGG_GROUP_BUG 3 -#define EGG_GROUP_FLYING 4 -#define EGG_GROUP_FIELD 5 -#define EGG_GROUP_FAIRY 6 -#define EGG_GROUP_GRASS 7 -#define EGG_GROUP_HUMAN_LIKE 8 -#define EGG_GROUP_WATER_3 9 -#define EGG_GROUP_MINERAL 10 -#define EGG_GROUP_AMORPHOUS 11 -#define EGG_GROUP_WATER_2 12 -#define EGG_GROUP_DITTO 13 -#define EGG_GROUP_DRAGON 14 -#define EGG_GROUP_UNDISCOVERED 15 +#define EGG_GROUP_NONE 0 +#define EGG_GROUP_MONSTER 1 +#define EGG_GROUP_WATER_1 2 +#define EGG_GROUP_BUG 3 +#define EGG_GROUP_FLYING 4 +#define EGG_GROUP_FIELD 5 +#define EGG_GROUP_FAIRY 6 +#define EGG_GROUP_GRASS 7 +#define EGG_GROUP_HUMAN_LIKE 8 +#define EGG_GROUP_WATER_3 9 +#define EGG_GROUP_MINERAL 10 +#define EGG_GROUP_AMORPHOUS 11 +#define EGG_GROUP_WATER_2 12 +#define EGG_GROUP_DITTO 13 +#define EGG_GROUP_DRAGON 14 +#define EGG_GROUP_UNDISCOVERED 15 // Pokemon natures -#define NATURE_HARDY 0 -#define NATURE_LONELY 1 -#define NATURE_BRAVE 2 -#define NATURE_ADAMANT 3 -#define NATURE_NAUGHTY 4 -#define NATURE_BOLD 5 -#define NATURE_DOCILE 6 -#define NATURE_RELAXED 7 -#define NATURE_IMPISH 8 -#define NATURE_LAX 9 -#define NATURE_TIMID 10 -#define NATURE_HASTY 11 -#define NATURE_SERIOUS 12 -#define NATURE_JOLLY 13 -#define NATURE_NAIVE 14 -#define NATURE_MODEST 15 -#define NATURE_MILD 16 -#define NATURE_QUIET 17 -#define NATURE_BASHFUL 18 -#define NATURE_RASH 19 -#define NATURE_CALM 20 -#define NATURE_GENTLE 21 -#define NATURE_SASSY 22 -#define NATURE_CAREFUL 23 -#define NATURE_QUIRKY 24 +#define NATURE_HARDY 0 +#define NATURE_LONELY 1 +#define NATURE_BRAVE 2 +#define NATURE_ADAMANT 3 +#define NATURE_NAUGHTY 4 +#define NATURE_BOLD 5 +#define NATURE_DOCILE 6 +#define NATURE_RELAXED 7 +#define NATURE_IMPISH 8 +#define NATURE_LAX 9 +#define NATURE_TIMID 10 +#define NATURE_HASTY 11 +#define NATURE_SERIOUS 12 +#define NATURE_JOLLY 13 +#define NATURE_NAIVE 14 +#define NATURE_MODEST 15 +#define NATURE_MILD 16 +#define NATURE_QUIET 17 +#define NATURE_BASHFUL 18 +#define NATURE_RASH 19 +#define NATURE_CALM 20 +#define NATURE_GENTLE 21 +#define NATURE_SASSY 22 +#define NATURE_CAREFUL 23 +#define NATURE_QUIRKY 24 // Pokemon Stats -#define STAT_HP 0 -#define STAT_ATK 1 -#define STAT_DEF 2 -#define STAT_SPEED 3 -#define STAT_SPATK 4 -#define STAT_SPDEF 5 -#define STAT_ACC 6 // Only in battles. +#define STAT_HP 0 +#define STAT_ATK 1 +#define STAT_DEF 2 +#define STAT_SPEED 3 +#define STAT_SPATK 4 +#define STAT_SPDEF 5 +#define STAT_ACC 6 // Only in battles. #define STAT_EVASION 7 // Only in battles. #define NUM_STATS 6 @@ -85,4 +85,138 @@ // Shiny odds #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 +// Mon Data +#define MON_DATA_PERSONALITY 0 +#define MON_DATA_OT_ID 1 +#define MON_DATA_NICKNAME 2 +#define MON_DATA_LANGUAGE 3 +#define MON_DATA_SANITY_IS_BAD_EGG 4 +#define MON_DATA_SANITY_HAS_SPECIES 5 +#define MON_DATA_SANITY_IS_EGG 6 +#define MON_DATA_OT_NAME 7 +#define MON_DATA_MARKINGS 8 +#define MON_DATA_CHECKSUM 9 +#define MON_DATA_ENCRYPT_SEPARATOR 10 +#define MON_DATA_SPECIES 11 +#define MON_DATA_HELD_ITEM 12 +#define MON_DATA_MOVE1 13 +#define MON_DATA_MOVE2 14 +#define MON_DATA_MOVE3 15 +#define MON_DATA_MOVE4 16 +#define MON_DATA_PP1 17 +#define MON_DATA_PP2 18 +#define MON_DATA_PP3 19 +#define MON_DATA_PP4 20 +#define MON_DATA_PP_BONUSES 21 +#define MON_DATA_COOL 22 +#define MON_DATA_BEAUTY 23 +#define MON_DATA_CUTE 24 +#define MON_DATA_EXP 25 +#define MON_DATA_HP_EV 26 +#define MON_DATA_ATK_EV 27 +#define MON_DATA_DEF_EV 28 +#define MON_DATA_SPEED_EV 29 +#define MON_DATA_SPATK_EV 30 +#define MON_DATA_SPDEF_EV 31 +#define MON_DATA_FRIENDSHIP 32 +#define MON_DATA_SMART 33 +#define MON_DATA_POKERUS 34 +#define MON_DATA_MET_LOCATION 35 +#define MON_DATA_MET_LEVEL 36 +#define MON_DATA_MET_GAME 37 +#define MON_DATA_POKEBALL 38 +#define MON_DATA_HP_IV 39 +#define MON_DATA_ATK_IV 40 +#define MON_DATA_DEF_IV 41 +#define MON_DATA_SPEED_IV 42 +#define MON_DATA_SPATK_IV 43 +#define MON_DATA_SPDEF_IV 44 +#define MON_DATA_IS_EGG 45 +#define MON_DATA_ABILITY_NUM 46 +#define MON_DATA_TOUGH 47 +#define MON_DATA_SHEEN 48 +#define MON_DATA_OT_GENDER 49 +#define MON_DATA_COOL_RIBBON 50 +#define MON_DATA_BEAUTY_RIBBON 51 +#define MON_DATA_CUTE_RIBBON 52 +#define MON_DATA_SMART_RIBBON 53 +#define MON_DATA_TOUGH_RIBBON 54 +#define MON_DATA_STATUS 55 +#define MON_DATA_LEVEL 56 +#define MON_DATA_HP 57 +#define MON_DATA_MAX_HP 58 +#define MON_DATA_ATK 59 +#define MON_DATA_DEF 60 +#define MON_DATA_SPEED 61 +#define MON_DATA_SPATK 62 +#define MON_DATA_SPDEF 63 +#define MON_DATA_MAIL 64 +#define MON_DATA_SPECIES2 65 +#define MON_DATA_IVS 66 +#define MON_DATA_CHAMPION_RIBBON 67 +#define MON_DATA_WINNING_RIBBON 68 +#define MON_DATA_VICTORY_RIBBON 69 +#define MON_DATA_ARTIST_RIBBON 70 +#define MON_DATA_EFFORT_RIBBON 71 +#define MON_DATA_GIFT_RIBBON_1 72 +#define MON_DATA_GIFT_RIBBON_2 73 +#define MON_DATA_GIFT_RIBBON_3 74 +#define MON_DATA_GIFT_RIBBON_4 75 +#define MON_DATA_GIFT_RIBBON_5 76 +#define MON_DATA_GIFT_RIBBON_6 77 +#define MON_DATA_GIFT_RIBBON_7 78 +#define MON_DATA_FATEFUL_ENCOUNTER 79 +#define MON_DATA_OBEDIENCE 80 +#define MON_DATA_KNOWN_MOVES 81 +#define MON_DATA_RIBBON_COUNT 82 +#define MON_DATA_RIBBONS 83 +#define MON_DATA_ATK2 84 +#define MON_DATA_DEF2 85 +#define MON_DATA_SPEED2 86 +#define MON_DATA_SPATK2 87 +#define MON_DATA_SPDEF2 88 + +#define MAX_LEVEL 100 + +#define OT_ID_PLAYER_ID 0 +#define OT_ID_PRESET 1 +#define OT_ID_RANDOM_NO_SHINY 2 + + +#define MON_GIVEN_TO_PARTY 0 +#define MON_GIVEN_TO_PC 1 +#define MON_CANT_GIVE 2 + +#define PLAYER_HAS_TWO_USABLE_MONS 0 +#define PLAYER_HAS_ONE_MON 1 +#define PLAYER_HAS_ONE_USABLE_MON 2 + +#define MON_MALE 0x00 +#define MON_FEMALE 0xFE +#define MON_GENDERLESS 0xFF + +#define FRIENDSHIP_EVENT_GROW_LEVEL 0 +#define FRIENDSHIP_EVENT_VITAMIN 1 // unused +#define FRIENDSHIP_EVENT_BATTLE_ITEM 2 // unused +#define FRIENDSHIP_EVENT_LEAGUE_BATTLE 3 +#define FRIENDSHIP_EVENT_LEARN_TMHM 4 +#define FRIENDSHIP_EVENT_WALKING 5 +#define FRIENDSHIP_EVENT_FAINT_SMALL 6 +#define FRIENDSHIP_EVENT_FAINT_OUTSIDE_BATTLE 7 +#define FRIENDSHIP_EVENT_FAINT_LARGE 8 + +#define STATUS_PRIMARY_NONE 0 +#define STATUS_PRIMARY_POISON 1 +#define STATUS_PRIMARY_PARALYSIS 2 +#define STATUS_PRIMARY_SLEEP 3 +#define STATUS_PRIMARY_FREEZE 4 +#define STATUS_PRIMARY_BURN 5 +#define STATUS_PRIMARY_POKERUS 6 +#define STATUS_PRIMARY_FAINTED 7 + +#define MAX_TOTAL_EVS 510 +#define EV_ITEM_RAISE_LIMIT 100 + +#define UNOWN_FORM_COUNT 28 + #endif // GUARD_CONSTANTS_POKEMON_H -- cgit v1.2.3 From 1ffa890d27273590f5d9b99b15c3747dc06106d8 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 17 Sep 2019 15:53:30 -0400 Subject: Consolidate remaining pokemon constants --- include/constants/pokemon.h | 52 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 50 insertions(+), 2 deletions(-) (limited to 'include/constants') diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 6ba269336..14c2acdf6 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -23,7 +23,6 @@ #define TYPE_DARK 17 #define NUMBER_OF_MON_TYPES 18 - // Pokemon egg groups #define EGG_GROUP_NONE 0 #define EGG_GROUP_MONSTER 1 @@ -85,7 +84,7 @@ // Shiny odds #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536 -// Mon Data +// Flags for Get(Box)MonData / Set(Box)MonData #define MON_DATA_PERSONALITY 0 #define MON_DATA_OT_ID 1 #define MON_DATA_NICKNAME 2 @@ -219,4 +218,53 @@ #define UNOWN_FORM_COUNT 28 +// Battle move flags +#define FLAG_MAKES_CONTACT 0x1 +#define FLAG_PROTECT_AFFECTED 0x2 +#define FLAG_MAGICCOAT_AFFECTED 0x4 +#define FLAG_SNATCH_AFFECTED 0x8 +#define FLAG_MIRROR_MOVE_AFFECTED 0x10 +#define FLAG_KINGSROCK_AFFECTED 0x20 + +// Growth rates +#define GROWTH_MEDIUM_FAST 0 +#define GROWTH_ERRATIC 1 +#define GROWTH_FLUCTUATING 2 +#define GROWTH_MEDIUM_SLOW 3 +#define GROWTH_FAST 4 +#define GROWTH_SLOW 5 + +// Body colors for pokedex search +#define BODY_COLOR_RED 0 +#define BODY_COLOR_BLUE 1 +#define BODY_COLOR_YELLOW 2 +#define BODY_COLOR_GREEN 3 +#define BODY_COLOR_BLACK 4 +#define BODY_COLOR_BROWN 5 +#define BODY_COLOR_PURPLE 6 +#define BODY_COLOR_GRAY 7 +#define BODY_COLOR_WHITE 8 +#define BODY_COLOR_PINK 9 + +#define F_SUMMARY_SCREEN_FLIP_SPRITE 0x80 + +// Evolution type flags +#define EVO_FRIENDSHIP 0x0001 // Pokémon levels up with friendship ≥ 220 +#define EVO_FRIENDSHIP_DAY 0x0002 // Pokémon levels up during the day with friendship ≥ 220 +#define EVO_FRIENDSHIP_NIGHT 0x0003 // Pokémon levels up at night with friendship ≥ 220 +#define EVO_LEVEL 0x0004 // Pokémon reaches the specified level +#define EVO_TRADE 0x0005 // Pokémon is traded +#define EVO_TRADE_ITEM 0x0006 // Pokémon is traded while it's holding the specified item +#define EVO_ITEM 0x0007 // specified item is used on Pokémon +#define EVO_LEVEL_ATK_GT_DEF 0x0008 // Pokémon reaches the specified level with attack > defense +#define EVO_LEVEL_ATK_EQ_DEF 0x0009 // Pokémon reaches the specified level with attack = defense +#define EVO_LEVEL_ATK_LT_DEF 0x000a // Pokémon reaches the specified level with attack < defense +#define EVO_LEVEL_SILCOON 0x000b // Pokémon reaches the specified level with a Silcoon personality value +#define EVO_LEVEL_CASCOON 0x000c // Pokémon reaches the specified level with a Cascoon personality value +#define EVO_LEVEL_NINJASK 0x000d // Pokémon reaches the specified level (special value for Ninjask) +#define EVO_LEVEL_SHEDINJA 0x000e // Pokémon reaches the specified level (special value for Shedinja) +#define EVO_BEAUTY 0x000f // Pokémon levels up with beauty ≥ specified value + +#define EVOS_PER_MON 5 + #endif // GUARD_CONSTANTS_POKEMON_H -- cgit v1.2.3 From 801ca37f0402083d7c0749cbf2ea473bf9dc4894 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 25 Sep 2019 14:48:22 -0400 Subject: Document day_care.inc and related --- include/constants/daycare.h | 32 ++++++++++++++++++++++++++++++++ include/constants/global.h | 2 ++ include/constants/pokemon.h | 2 ++ 3 files changed, 36 insertions(+) create mode 100644 include/constants/daycare.h (limited to 'include/constants') diff --git a/include/constants/daycare.h b/include/constants/daycare.h new file mode 100644 index 000000000..cc7f67a25 --- /dev/null +++ b/include/constants/daycare.h @@ -0,0 +1,32 @@ +#ifndef GUARD_DAYCARE_CONSTANTS_H +#define GUARD_DAYCARE_CONSTANTS_H + +// Egg parents +#define EGG_MOTHER 0 +#define EGG_FATHER 1 +#define NEITHER_PARENT -1 + +// Parent compatability scores +#define PARENTS_INCOMPATIBLE 0 +#define PARENTS_LOW_COMPATIBILITY 20 +#define PARENTS_MED_COMPATABILITY 50 +#define PARENTS_MAX_COMPATABILITY 70 + +// Daycare state +#define DAYCARE_NO_MONS 0 +#define DAYCARE_EGG_WAITING 1 +#define DAYCARE_ONE_MON 2 +#define DAYCARE_TWO_MONS 3 + +#define INHERITED_IV_COUNT 3 +#define EGG_HATCH_LEVEL 5 +#define EGG_GENDER_MALE 0x8000 // used to create a male egg from a female-only parent species (e.g. Nidoran) + +#define DAYCARE_LEVEL_MENU_EXIT 5 +#define DAYCARE_EXITED_LEVEL_MENU 2 // would be redundant with above if GF had used the same value + +// Array buffers +#define EGG_MOVES_ARRAY_COUNT 10 +#define EGG_LVL_UP_MOVES_ARRAY_COUNT 50 + +#endif //GUARD_DAYCARE_CONSTANTS_H diff --git a/include/constants/global.h b/include/constants/global.h index ba06ff721..7e0b5cfa4 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -51,6 +51,7 @@ #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. #define TRAINER_ID_LENGTH 4 +#define PARTY_SIZE 6 #define MAX_MON_MOVES 4 // string lengths @@ -62,6 +63,7 @@ #define MALE 0 #define FEMALE 1 +#define GENDER_COUNT 2 #define OPTIONS_BUTTON_MODE_NORMAL 0 #define OPTIONS_BUTTON_MODE_LR 1 diff --git a/include/constants/pokemon.h b/include/constants/pokemon.h index 14c2acdf6..52a4f0254 100644 --- a/include/constants/pokemon.h +++ b/include/constants/pokemon.h @@ -41,6 +41,8 @@ #define EGG_GROUP_DRAGON 14 #define EGG_GROUP_UNDISCOVERED 15 +#define EGG_GROUPS_PER_MON 2 + // Pokemon natures #define NATURE_HARDY 0 #define NATURE_LONELY 1 -- cgit v1.2.3 From 4e98a0cc4b13b4b4f504025106c4c53e4ca0db2f Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 25 Sep 2019 18:05:12 -0400 Subject: Remove Egg parent constants --- include/constants/daycare.h | 5 ----- 1 file changed, 5 deletions(-) (limited to 'include/constants') diff --git a/include/constants/daycare.h b/include/constants/daycare.h index cc7f67a25..103f920f2 100644 --- a/include/constants/daycare.h +++ b/include/constants/daycare.h @@ -1,11 +1,6 @@ #ifndef GUARD_DAYCARE_CONSTANTS_H #define GUARD_DAYCARE_CONSTANTS_H -// Egg parents -#define EGG_MOTHER 0 -#define EGG_FATHER 1 -#define NEITHER_PARENT -1 - // Parent compatability scores #define PARENTS_INCOMPATIBLE 0 #define PARENTS_LOW_COMPATIBILITY 20 -- cgit v1.2.3