diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:41:54 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-09-16 15:41:54 -0400 |
| commit | 559833ccf622eef7932369b169f279a0b73c807f (patch) | |
| tree | 4bec10795ab76bc055dfd9c3d73c3e79100ec38d /include/flags.h | |
| parent | c7f28f034c4a86b6373b45941f47e5a231392ad0 (diff) | |
| parent | 19d2d73c7064375e6cef64ced734052170d4361b (diff) | |
Merge branch 'master' into field_map_obj
Diffstat (limited to 'include/flags.h')
| -rw-r--r-- | include/flags.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/flags.h b/include/flags.h index 56e87b895..19ec01b56 100644 --- a/include/flags.h +++ b/include/flags.h @@ -2,8 +2,8 @@ #define GUARD_FLAGS_H #define TRAINER_FLAG_START 0x500 -#define TRAINERS_FLAG_NO 0x360 -#define CODE_FLAGS (TRAINER_FLAG_START + TRAINERS_FLAG_NO) +#define TRAINERS_FLAG_NO 0x356 +#define CODE_FLAGS (TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // SYSTEM FLAGS @@ -84,6 +84,8 @@ #define SYS_CTRL_OBJ_DELETE CODE_FLAGS + 0x61 #define SYS_RESET_RTC_ENABLE CODE_FLAGS + 0x62 +#define SYS_STORAGE_UNKNOWN_FLAG CODE_FLAGS + 0x77 + #define SYS_MYSTERY_GIFT_ENABLE CODE_FLAGS + 0x7B // SPECIAL FLAGS (unknown purpose) |