rename town/city vars

This commit is contained in:
GriffinR
2019-08-05 11:23:45 -04:00
committed by GitHub
parent 0f5d96e5f5
commit c2bf668fdd
43 changed files with 210 additions and 210 deletions

View File

@@ -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;