diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-03 08:16:14 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-03 08:16:14 -0600 |
| commit | 6aa410618f45c5b28de875d407aa14b907d4e5f5 (patch) | |
| tree | 91b7c68e65cb21efe5a8a1d3fda7c315c997a597 /src/pokedex_area_screen.c | |
| parent | e8b149e80e7b1411ce7a128e36ebc5d5490133e1 (diff) | |
| parent | 669e40cb15232f0631fba4a079a42dcc7e676adc (diff) | |
Merge pull request #721 from garakmon/rmsync
sync region map data
Diffstat (limited to 'src/pokedex_area_screen.c')
| -rw-r--r-- | src/pokedex_area_screen.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/pokedex_area_screen.c b/src/pokedex_area_screen.c index 76efdf08d..cd697270c 100644 --- a/src/pokedex_area_screen.c +++ b/src/pokedex_area_screen.c @@ -98,7 +98,7 @@ static const u16 sFeebasData[][3] = { static const u16 sLandmarkData[][2] = { {MAPSEC_SKY_PILLAR, FLAG_LANDMARK_SKY_PILLAR}, {MAPSEC_SEAFLOOR_CAVERN, FLAG_LANDMARK_SEAFLOOR_CAVERN}, - {MAPSEC_NOTHING} + {MAPSEC_NONE} }; static struct PokedexAreaScreenEwramStruct *const gPokedexAreaScreenPtr = &ePokedexAreaScreen; @@ -302,9 +302,9 @@ static void SetSpecialMapHasMon(u16 mapGroup, u16 mapNum) if (gPokedexAreaScreenPtr->numSpecialAreas < 0x20) { mapHeader = Overworld_GetMapHeaderByGroupAndId(mapGroup, mapNum); - if (mapHeader->regionMapSectionId < MAPSEC_NOTHING) + if (mapHeader->regionMapSectionId < MAPSEC_NONE) { - for (i = 0; sLandmarkData[i][0] != MAPSEC_NOTHING; i++) + for (i = 0; sLandmarkData[i][0] != MAPSEC_NONE; i++) { if (mapHeader->regionMapSectionId == sLandmarkData[i][0] && !FlagGet(sLandmarkData[i][1])) return; @@ -1348,10 +1348,10 @@ static void CreateAreaMarkerSprites(void) for (i = 0; i < gPokedexAreaScreenPtr->numSpecialAreas; i++) { mapSecId = gPokedexAreaScreenPtr->specialAreaRegionMapSectionIds[i]; - x = 8 * (gRegionMapLocations[mapSecId].x + 1) + 4; - y = 8 * (gRegionMapLocations[mapSecId].y) + 28; - x += 4 * (gRegionMapLocations[mapSecId].width - 1); - y += 4 * (gRegionMapLocations[mapSecId].height - 1); + x = 8 * (gRegionMapEntries[mapSecId].x + 1) + 4; + y = 8 * (gRegionMapEntries[mapSecId].y) + 28; + x += 4 * (gRegionMapEntries[mapSecId].width - 1); + y += 4 * (gRegionMapEntries[mapSecId].height - 1); spriteId = CreateSprite(&sAreaMarkerSpriteTemplate, x, y, 0); if (spriteId != MAX_SPRITES) { |