Merge branch 'master' into document-eventscripts
This commit is contained in:
19
include/constants/contest.h
Normal file
19
include/constants/contest.h
Normal file
@@ -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
|
||||
@@ -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
|
||||
@@ -74,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
|
||||
|
||||
26
include/constants/lilycove_lady.h
Normal file
26
include/constants/lilycove_lady.h
Normal file
@@ -0,0 +1,26 @@
|
||||
#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 LILYCOVE_LADY_GIFT_THRESHOLD 5
|
||||
|
||||
#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
|
||||
|
||||
#define QUIZ_QUESTION_LEN 9
|
||||
|
||||
#endif
|
||||
@@ -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))
|
||||
|
||||
Reference in New Issue
Block a user