diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-11 03:21:23 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-03-16 12:37:04 -0500 |
| commit | eeb329909c7caab645445849a2f75257a3c72be5 (patch) | |
| tree | 14b34ff51ecb9bdb1d4d66e753a330333969527c /src | |
| parent | 9848f84b9ec2d5950cb5dc4600b7651486ff986a (diff) | |
Fix anonymous struct
Diffstat (limited to 'src')
| -rw-r--r-- | src/region_map.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/src/region_map.c b/src/region_map.c index a8b3fc3b2..25b47479d 100644 --- a/src/region_map.c +++ b/src/region_map.c @@ -36,6 +36,13 @@ // Static type declarations +struct FlagControlledFlyDest +{ + const u8 *const *name; + u16 mapSecId; + u16 flag; +}; + // Static RAM declarations static EWRAM_DATA struct RegionMap *gRegionMap = NULL; @@ -319,17 +326,13 @@ static const u8 *const gUnknown_085A1ED4[] = gText_PokemonCenter }; -static const struct +static const struct FlagControlledFlyDest gUnknown_085A1EDC[] = { - const u8 *const *name; - u16 mapSecId; - u16 flag; -} -gUnknown_085A1EDC[] = -{ - gUnknown_085A1ED4, - MAPSEC_EVER_GRANDE_CITY, - FLAG_LANDMARK_POKEMON_LEAGUE + { + .name = gUnknown_085A1ED4, + .mapSecId = MAPSEC_EVER_GRANDE_CITY, + .flag = FLAG_LANDMARK_POKEMON_LEAGUE + } }; static const struct BgTemplate gUnknown_085A1EE4[] = @@ -1774,7 +1777,7 @@ static void sub_8124904(void) if (sFlyMap->regionMap.iconDrawType > MAPSECTYPE_NONE && sFlyMap->regionMap.iconDrawType <= MAPSECTYPE_BATTLE_FRONTIER) { flag = FALSE; - for (i = 0; i < 1; i++) + for (i = 0; i < ARRAY_COUNT(gUnknown_085A1EDC); i++) { if (sFlyMap->regionMap.mapSecId == gUnknown_085A1EDC[i].mapSecId) { |