diff options
author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-02-28 16:41:54 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-28 16:41:54 -0600 |
commit | a57e04e14df2ee716e6432287ae5e83c0b76715b (patch) | |
tree | f99d5bf20a5e261266d05555320d509fa97c6b4e /include/constants/flags.h | |
parent | 0cd9ba36ce985a6bba1d47d0c57cd82b80543602 (diff) | |
parent | 1616f998fc6124b8894109b3137a8448cb85f0d6 (diff) |
Merge pull request #220 from PikalaxALT/trainer_rematch
Decompile trainer_rematch
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 |