diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-06-14 22:00:09 -0500 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2018-06-15 07:49:21 -0500 |
| commit | acc1a5d4461476567facf08ee0fa64e28cdd3c76 (patch) | |
| tree | 0a99ff1bf3836d2d39c2a0f380cff21fc8359d67 /src | |
| parent | 0c8cfc2297a0fd7fb3b9ff3c422e871d8b14595a (diff) | |
Get all map constants from include/ rather than constants/
Diffstat (limited to 'src')
| -rw-r--r-- | src/field_door.c | 2 | ||||
| -rw-r--r-- | src/wild_encounter.c | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/field_door.c b/src/field_door.c index f73c6bb55..fe9de01fd 100644 --- a/src/field_door.c +++ b/src/field_door.c @@ -889,7 +889,7 @@ bool8 sub_808A964(void) { if (FlagGet(FLAG_SPECIAL_FLAG_0x4002)) { - if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR_2)) + if (gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2) && gSaveBlock1Ptr->location.mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2)) { return TRUE; } diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 279b6e672..862672e19 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -3437,8 +3437,8 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTH), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTH), .landMonsInfo = &gSafariZone_South_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = NULL, @@ -3861,8 +3861,8 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = &gSafariZone_Southwest_FishingMonsInfo, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), - .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTH), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTH), .landMonsInfo = &gSafariZone_North_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = &gSafariZone_North_RockSmashMonsInfo, @@ -4053,16 +4053,16 @@ const struct WildPokemonHeader gWildMonHeaders[] = .fishingMonsInfo = NULL, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_EM_2), - .mapNum = MAP_NUM(SAFARI_ZONE_EM_2), + .mapGroup = MAP_GROUP(SAFARI_ZONE_SOUTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_SOUTHEAST), .landMonsInfo = &gSafariZone_Southeast_LandMonsInfo, .waterMonsInfo = &gSafariZone_Southeast_WaterMonsInfo, .rockSmashMonsInfo = NULL, .fishingMonsInfo = &gSafariZone_Southeast_FishingMonsInfo, }, { - .mapGroup = MAP_GROUP(SAFARI_ZONE_EM_1), - .mapNum = MAP_NUM(SAFARI_ZONE_EM_1), + .mapGroup = MAP_GROUP(SAFARI_ZONE_NORTHEAST), + .mapNum = MAP_NUM(SAFARI_ZONE_NORTHEAST), .landMonsInfo = &gSafariZone_Northeast_LandMonsInfo, .waterMonsInfo = NULL, .rockSmashMonsInfo = &gSafariZone_Northeast_RockSmashMonsInfo, |