diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-05 11:59:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-05 11:59:53 -0400 |
| commit | 9beeba842453c836d18ecce4b6760bf03bfdb513 (patch) | |
| tree | 5079a332346c7c5b0d513538d4f976cb72c9333d /src | |
| parent | f5e18718d95cd6da312cd8f9bae19d356a54af12 (diff) | |
| parent | 191f74525dd23ed8262d914e163a3c6b9c5b9751 (diff) | |
Merge pull request #764 from GriffinRichards/document-varnames
Document vars that are used and unnamed
Diffstat (limited to 'src')
| -rw-r--r-- | src/mirage_tower.c | 2 | ||||
| -rw-r--r-- | src/overworld.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mirage_tower.c b/src/mirage_tower.c index e398c2334..bb9c6e958 100644 --- a/src/mirage_tower.c +++ b/src/mirage_tower.c @@ -318,7 +318,7 @@ void SetMirageTowerVisibility(void) u16 rand; bool8 visible; - if (VarGet(VAR_ROUTE_111_STATE)) + if (VarGet(VAR_MIRAGE_TOWER_STATE)) { FlagClear(FLAG_MIRAGE_TOWER_VISIBLE); return; diff --git a/src/overworld.c b/src/overworld.c index 2097abc53..cefbd8159 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -1040,7 +1040,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp) case MAP_NUM(ROUTE128): return TRUE; default: - if (VarGet(VAR_RAYQUAZA_STATE) < 4) + if (VarGet(VAR_SOOTOPOLIS_CITY_STATE) < 4) return FALSE; switch (warp->mapNum) { @@ -1081,9 +1081,9 @@ static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp) static bool16 IsInflitratedSpaceCenter(struct WarpData *warp) { - if (VarGet(VAR_MOSSDEEP_STATE) == 0) + if (VarGet(VAR_MOSSDEEP_CITY_STATE) == 0) return FALSE; - else if (VarGet(VAR_MOSSDEEP_STATE) > 2) + else if (VarGet(VAR_MOSSDEEP_CITY_STATE) > 2) return FALSE; else if (warp->mapGroup != MAP_GROUP(MOSSDEEP_CITY_SPACE_CENTER_1F)) return FALSE; |