From c2bf668fdd63b246a04e3e833e2eaef963cfb17b Mon Sep 17 00:00:00 2001 From: GriffinR <25753467+GriffinRichards@users.noreply.github.com> Date: Mon, 5 Aug 2019 11:23:45 -0400 Subject: rename town/city vars --- src/overworld.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') 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; -- cgit v1.2.3