diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-03 13:47:35 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-03-03 13:47:35 -0500 |
| commit | 89e5082d5174a1324cae803db1c9fbce92edf7a6 (patch) | |
| tree | 9f2eca7bad9656623e1f73e32352f869dfe7c605 /include | |
| parent | 8a7c2ded11a2adf4f09ddca814eb06fdbca13fd1 (diff) | |
| parent | dd22d97814bc152d356e076a8d0f19b0d3dd9230 (diff) | |
Merge branch 'master' of github.com:pret/pokefirered into berry_crush
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index 11b09512f..85d704680 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -766,8 +766,8 @@ #define FLAG_REVIVED_HELIX 0x2ED #define FLAG_REVIVED_AMBER 0x2EE #define FLAG_GOT_HM06 0x2EF -#define FLAG_SHOWED_MYSTICTICKET_TO_CAPTAIN 0x2F0 -#define FLAG_SHOWED_AURORATICKET_TO_CAPTAIN 0x2F1 +#define FLAG_SHOWN_MYSTIC_TICKET 0x2F0 +#define FLAG_SHOWN_AURORA_TICKET 0x2F1 #define FLAG_FOUGHT_LUGIA 0x2F2 #define FLAG_FOUGHT_HO_OH 0x2F3 #define FLAG_OAK_SAW_DEX_COMPLETION 0x2F4 @@ -1372,8 +1372,8 @@ #define FLAG_SYS_GOT_BERRY_POUCH (SYS_FLAGS + 0x47) #define FLAG_SYS_DEOXYS_AWAKENED (SYS_FLAGS + 0x48) #define FLAG_SYS_UNLOCKED_TANOBY_RUINS (SYS_FLAGS + 0x49) -#define FLAG_SYS_GOT_MYSTIC_TICKET (SYS_FLAGS + 0x4A) -#define FLAG_SYS_GOT_AURORA_TICKET (SYS_FLAGS + 0x4B) +#define FLAG_ENABLE_SHIP_NAVEL_ROCK (SYS_FLAGS + 0x4A) +#define FLAG_ENABLE_SHIP_BIRTH_ISLAND (SYS_FLAGS + 0x4B) // World Map Flags #define FLAG_WORLD_MAP_PALLET_TOWN (SYS_FLAGS + 0x90) |