diff options
| author | huderlem <huderlem@gmail.com> | 2019-03-02 08:24:46 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-02 08:24:46 -0600 |
| commit | ee9694d9ba4b4a16048cd8abf7401075c06c880c (patch) | |
| tree | 8e02045dea75a5da9a75439797b34938187bc0c4 /src/region_map.c | |
| parent | 3b04cfa437b093a21cdc5021843b5f52a124861e (diff) | |
| parent | 25050b99444538535a67ba51b7aaf3d0bf90c50e (diff) | |
Merge pull request #587 from Phlosioneer/document-all-event-vars
Document all event vars
Diffstat (limited to 'src/region_map.c')
| -rw-r--r-- | src/region_map.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/region_map.c b/src/region_map.c index ff0c19167..814849bfd 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -883,7 +883,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) case MAP_TYPE_CITY: case MAP_TYPE_ROUTE: case MAP_TYPE_UNDERWATER: - case MAP_TYPE_6: + case MAP_TYPE_OCEAN_ROUTE: gRegionMap->mapSecId = gMapHeader.regionMapSectionId; gRegionMap->playerIsInCave = FALSE; mapWidth = gMapHeader.mapLayout->width; @@ -896,7 +896,7 @@ static void RegionMap_InitializeStateBasedOnPlayerLocation(void) } break; case MAP_TYPE_UNDERGROUND: - case MAP_TYPE_7: + case MAP_TYPE_UNUSED_2: if (gMapHeader.flags & 0x02) { mapHeader = Overworld_GetMapHeaderByGroupAndId(gSaveBlock1Ptr->escapeWarp.mapGroup, gSaveBlock1Ptr->escapeWarp.mapNum); @@ -1159,7 +1159,7 @@ static u16 RegionMap_GetTerraCaveMapSecId(void) { s16 idx; - idx = VarGet(VAR_0x4037) - 1; + idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION) - 1; if (idx < 0 || idx > 15) { idx = 0; @@ -1171,7 +1171,7 @@ static void RegionMap_GetMarineCaveCoords(u16 *x, u16 *y) { u16 idx; - idx = VarGet(VAR_0x4037); + idx = VarGet(VAR_UNUSUAL_WEATHER_LOCATION); if (idx < 9 || idx > 16) { idx = 9; |