diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2021-11-01 15:25:22 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-01 15:25:22 -0400 |
commit | cd4462f58cce785f408af26a7a3b11ad08575a5a (patch) | |
tree | 2a35a97aa4fb1eae38861178967e6806b4f00e00 /include/constants | |
parent | 471608b56abbdf70a452896a0d895ffa5b4b06f9 (diff) | |
parent | e006569719969870ce480916a23cfd157fdcf454 (diff) |
Merge pull request #474 from lioniac/master
Multiple renamings and removed some orphaned functions
Diffstat (limited to 'include/constants')
-rw-r--r-- | include/constants/flags.h | 32 | ||||
-rw-r--r-- | include/constants/vars.h | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 9e76dd4de..3234d5385 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -1000,22 +1000,22 @@ #define FLAG_0x3D5 0x3D5 #define FLAG_0x3D6 0x3D6 #define FLAG_0x3D7 0x3D7 -#define FLAG_MYSTERY_EVENT_DONE 0x3D8 -#define FLAG_0x3D9 0x3D9 -#define FLAG_0x3DA 0x3DA -#define FLAG_0x3DB 0x3DB -#define FLAG_0x3DC 0x3DC -#define FLAG_0x3DD 0x3DD -#define FLAG_0x3DE 0x3DE -#define FLAG_0x3DF 0x3DF -#define FLAG_0x3E0 0x3E0 -#define FLAG_0x3E1 0x3E1 -#define FLAG_0x3E2 0x3E2 -#define FLAG_0x3E3 0x3E3 -#define FLAG_0x3E4 0x3E4 -#define FLAG_0x3E5 0x3E5 -#define FLAG_0x3E6 0x3E6 -#define FLAG_0x3E7 0x3E7 +#define FLAG_MYSTERY_GIFT_DONE 0x3D8 +#define FLAG_MYSTERY_GIFT_1 0x3D9 +#define FLAG_MYSTERY_GIFT_2 0x3DA +#define FLAG_MYSTERY_GIFT_3 0x3DB +#define FLAG_MYSTERY_GIFT_4 0x3DC +#define FLAG_MYSTERY_GIFT_5 0x3DD +#define FLAG_MYSTERY_GIFT_6 0x3DE +#define FLAG_MYSTERY_GIFT_7 0x3DF +#define FLAG_MYSTERY_GIFT_8 0x3E0 +#define FLAG_MYSTERY_GIFT_9 0x3E1 +#define FLAG_MYSTERY_GIFT_10 0x3E2 +#define FLAG_MYSTERY_GIFT_11 0x3E3 +#define FLAG_MYSTERY_GIFT_12 0x3E4 +#define FLAG_MYSTERY_GIFT_13 0x3E5 +#define FLAG_MYSTERY_GIFT_14 0x3E6 +#define FLAG_MYSTERY_GIFT_15 0x3E7 #define FLAG_HIDDEN_ITEMS_START 1000 // 0x3E8 #define FLAG_HIDDEN_ITEM(map, item) (FLAG_HIDDEN_ITEMS_START + HIDDEN_ITEM_##map##_##item) diff --git a/include/constants/vars.h b/include/constants/vars.h index 70efab478..bb301609d 100644 --- a/include/constants/vars.h +++ b/include/constants/vars.h @@ -123,7 +123,7 @@ #define VAR_LINK_WIN_BRAG_STATE 0x404B #define VAR_POKELOT_RND2 0x404C #define VAR_QL_ENTRANCE 0x404D -#define VAR_0x404E 0x404E +#define VAR_NATIONAL_DEX 0x404E #define VAR_LOTAD_SIZE_RECORD 0x404F // Map Scene |