diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-27 10:18:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-27 10:18:27 -0400 |
| commit | 3d9bad5558c6ef8828be7a50e3e553d55ca877e0 (patch) | |
| tree | 1ea4e595b35a0e248af16a09e1a0d7bd9a2afe6a /include/constants | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
| parent | 0c1f1281dab28d481e717ff1343a213b4e0da2a8 (diff) | |
Merge pull request #778 from GriffinRichards/document-eventscripts
Document some of event_scripts.s
Diffstat (limited to 'include/constants')
| -rw-r--r-- | include/constants/flags.h | 2 | ||||
| -rw-r--r-- | include/constants/global.h | 2 | ||||
| -rw-r--r-- | include/constants/script_menu.h | 4 |
3 files changed, 5 insertions, 3 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 4679e953c..d90451ad7 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -367,7 +367,7 @@ #define FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN 0x156 #define FLAG_MET_BATTLE_FRONTIER_BETTOR 0x157 #define FLAG_ENABLE_MR_STONE_POKENAV 0x158 -#define FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD 0x159 +#define FLAG_NURSE_MENTIONS_GOLD_CARD 0x159 #define FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR 0x15A #define FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR 0x15B diff --git a/include/constants/global.h b/include/constants/global.h index 7e0b5cfa4..091f735f4 100644 --- a/include/constants/global.h +++ b/include/constants/global.h @@ -46,6 +46,8 @@ #define BAG_TMHM_COUNT 64 #define BAG_BERRIES_COUNT 46 #define EVENT_OBJECT_TEMPLATES_COUNT 64 +#define DECOR_MAX_SECRET_BASE 16 +#define DECOR_MAX_PLAYERS_HOUSE 12 #define PYRAMID_BAG_ITEMS_COUNT 10 #define HALL_FACILITIES_COUNT 9 // 7 facilities for single mode + tower double mode + tower multi mode. diff --git a/include/constants/script_menu.h b/include/constants/script_menu.h index b7ec908c1..928ca00e0 100644 --- a/include/constants/script_menu.h +++ b/include/constants/script_menu.h @@ -13,8 +13,8 @@ #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_BASE_PC_NO_REGISTRY 5 +#define MULTI_BASE_PC_WITH_REGISTRY 6 #define MULTI_REGISTER_MENU 7 #define MULTI_SSTIDAL_LILYCOVE 8 // Exit only, populated by CreateLilycoveSSTidalMultichoice #define MULTI_UNUSED_9 9 |