dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Get all map constants from include/ rather than constants/

Browse Source
This commit is contained in:
Marcus Huderle
2018-06-14 22:00:09 -05:00
parent 0c8cfc2297
commit acc1a5d446
621 changed files with 1839 additions and 2454 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/field_door.c
View File

@@ -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;
}

16
src/wild_encounter.c
View File

@@ -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,