diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-28 23:58:29 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-02-28 23:58:29 +0100 |
| commit | a28dfd6da4d74e093297c998a887741d1562e64d (patch) | |
| tree | 8155f4ce85e1ba928b0a4bcf69d6bf07bf74a6c7 /include/constants/flags.h | |
| parent | fed5f03097aef2dd39e33abdece1daaaf27da39f (diff) | |
| parent | bcef4e7d1c20bad3d4631c5a8314a8de8da80e49 (diff) | |
Merge branch 'master' into clear_battle_files
Diffstat (limited to 'include/constants/flags.h')
| -rw-r--r-- | include/constants/flags.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 63e053cbd..7f52018a1 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -91,7 +91,7 @@ #define FLAG_0x058 0x58 #define FLAG_0x059 0x59 #define FLAG_0x05A 0x5A -#define FLAG_0x05B 0x5B +#define FLAG_WATTSON_REMATCH_AVAILABLE 0x5B #define FLAG_0x05C 0x5C #define FLAG_0x05D 0x5D #define FLAG_0x05E 0x5E @@ -208,8 +208,8 @@ #define FLAG_0x0CD 0xCD #define FLAG_0x0CE 0xCE #define FLAG_0x0CF 0xCF -#define FLAG_0x0D0 0xD0 -#define FLAG_0x0D1 0xD1 +#define FLAG_GOT_BASEMENT_KEY_FROM_WATTSON 0xD0 +#define FLAG_GOT_TM24_FROM_WATTSON 0xD1 #define FLAG_0x0D2 0xD2 #define FLAG_0x0D3 0xD3 #define FLAG_0x0D4 0xD4 @@ -912,8 +912,8 @@ #define FLAG_0x38D 0x38D #define FLAG_0x38E 0x38E #define FLAG_0x38F 0x38F -#define FLAG_0x390 0x390 -#define FLAG_0x391 0x391 +#define FLAG_SPRITEVIS_MAUVILLE_CITY_WATTSON 0x390 +#define FLAG_SPRITEVIS_MAUVILLE_GYM_WATTSON 0x391 #define FLAG_0x392 0x392 #define FLAG_0x393 0x393 #define FLAG_0x394 0x394 @@ -961,7 +961,7 @@ #define FLAG_0x3BE 0x3BE #define FLAG_0x3BF 0x3BF #define FLAG_0x3C0 0x3C0 -#define FLAG_0x3C1 0x3C1 +#define FLAG_SPRITEVIS_SLATEPORT_MUSEUM_POPULATION 0x3C1 #define FLAG_0x3C2 0x3C2 #define FLAG_0x3C3 0x3C3 #define FLAG_0x3C4 0x3C4 |