diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-01-12 22:42:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-12 22:42:43 -0500 |
| commit | 655910a16fcb7b62cf43b83bb00b21a9c3e55e82 (patch) | |
| tree | a619369a0d8b263f82d660ad7800f4b42328bb07 /include/constants/flags.h | |
| parent | 635267ce32bd696fe15391449efdf07fa35cf449 (diff) | |
| parent | fa5816915d2a089549bfae3851c36336eae35d43 (diff) | |
Merge branch 'master' into fix-eventobj
Diffstat (limited to 'include/constants/flags.h')
| -rw-r--r-- | include/constants/flags.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index be0899691..1163e394f 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1,6 +1,8 @@ #ifndef GUARD_CONSTANTS_FLAGS_H #define GUARD_CONSTANTS_FLAGS_H +#include "constants/opponents.h" + // Temporary Flags // These temporary flags are are cleared every time a map is loaded. They are used // for things like shortening an NPCs introduction text if the player already spoke @@ -533,8 +535,6 @@ #define FLAG_MYSTERY_EVENT_14 0x1F2 #define FLAG_MYSTERY_EVENT_15 0x1F3 -#define FLAG_TRICK_HOUSE_END_ROOM 0x1F5 // Trick House End Room Flag - // Hidden Items -- sorted by location #define FLAG_HIDDEN_ITEMS_START 0x1F4 #define FLAG_HIDDEN_ITEM_TRICK_HOUSE_NUGGET (FLAG_HIDDEN_ITEMS_START + 0x01) @@ -1342,13 +1342,17 @@ #define FLAG_UNUSED_0x4FF 0x4FF // Unused Flag -#define FLAG_TRAINER_FLAG_START 0x500 -#define TRAINERS_FLAG_NO 0x356 +// Trainer Flags +// Trainer flags occupy 0x500 - 0x85F, the last 9 of which are unused +// See constants/opponents.h. The values there + FLAG_TRAINER_FLAG_START are the flag IDs -#define SYSTEM_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x860 +#define TRAINER_FLAGS_START 0x500 +#define TRAINER_FLAGS_END (TRAINER_FLAGS_START + MAX_TRAINERS_COUNT - 1) // 0x85F // System Flags +#define SYSTEM_FLAGS (TRAINER_FLAGS_END + 1) // 0x860 + #define FLAG_SYS_POKEMON_GET (SYSTEM_FLAGS + 0) // FLAG_0x860 #define FLAG_SYS_POKEDEX_GET (SYSTEM_FLAGS + 1) #define FLAG_SYS_POKENAV_GET (SYSTEM_FLAGS + 2) |