diff options
| author | huderlem <huderlem@gmail.com> | 2019-11-07 19:55:19 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-07 19:55:19 -0600 |
| commit | 1ceee6ef70a163118b67d78a9581fba443e1c13c (patch) | |
| tree | a7c9a97825222145dd4488fccbd8e02e24484df8 /include | |
| parent | 662a9915cf40c6549c04a1383e21e08533bd585d (diff) | |
| parent | 4334e31a7eb22f80a2571f48ccbff458a4f2d735 (diff) | |
Merge pull request #884 from GriffinRichards/doc-halloffame
Document a few towns/cities
Diffstat (limited to 'include')
| -rw-r--r-- | include/constants/flags.h | 6 | ||||
| -rw-r--r-- | include/save_location.h | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/include/constants/flags.h b/include/constants/flags.h index ed42894ff..0ab22c1ef 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -119,7 +119,7 @@ #define FLAG_OCEANIC_MUSEUM_MET_REPORTER 0x69 #define FLAG_RECEIVED_HM04 0x6A #define FLAG_RECEIVED_HM06 0x6B -#define FLAG_FLANNERY_GIVES_BADGE_INFO 0x6C +#define FLAG_WHITEOUT_TO_LAVARIDGE 0x6C // Set after defeating Flannery, so the player cant white out from poison before receiving Go Goggles #define FLAG_RECEIVED_HM05 0x6D #define FLAG_RECEIVED_HM02 0x6E #define FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT 0x6F @@ -969,8 +969,8 @@ #define FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA 0x39E #define FLAG_HIDE_MT_CHIMNEY_TEAM_MAGMA 0x39F #define FLAG_HIDE_FALLARBOR_HOUSE_PROF_COZMO 0x3A0 -#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_1 0x3A1 -#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_2 0x3A2 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL 0x3A1 +#define FLAG_HIDE_LAVARIDGE_TOWN_RIVAL_ON_BIKE 0x3A2 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1 0x3A3 #define FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2 0x3A4 #define FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL 0x3A5 diff --git a/include/save_location.h b/include/save_location.h index c330124ad..6c2ae0e6b 100644 --- a/include/save_location.h +++ b/include/save_location.h @@ -6,9 +6,14 @@ #define POKECENTER_SAVEWARP (1 << 1) #define LOBBY_SAVEWARP (1 << 2) #define UNK_SPECIAL_SAVE_WARP_FLAG_3 (1 << 3) +// +// +// +// +#define CHAMPION_SAVEWARP (1 << 7) void TrySetMapSaveWarpStatus(void); void sub_81AFDA0(void); -void sub_81AFDD0(void); +void SetChampionSaveWarp(void); #endif // GUARD_SAVE_LOCATION_H |