ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-25 11:14:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change names from MAP_AREA_ to MAP_GROUP_

Browse Source
This commit is contained in:
Phlosioneer 2019-03-31 20:40:14 -04:00
parent 7f70b629f5
commit 3181c64c64
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/constants/maps.h
View File

@ -11,8 +11,8 @@
// These groups are used by pokedex_area_screen.c to find wild
// pokemon locations.
#define MAP_AREA_OVERWORLD_MONS MAP_GROUP(PETALBURG_CITY)
#define MAP_AREA_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R)
#define MAP_AREA_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST)
#define MAP_GROUP_OVERWORLD_MONS MAP_GROUP(PETALBURG_CITY)
#define MAP_GROUP_SPECIAL_MONS_1 MAP_GROUP(METEOR_FALLS_1F_1R)
#define MAP_GROUP_SPECIAL_MONS_2 MAP_GROUP(SAFARI_ZONE_NORTHWEST)
#endif // GUARD_CONSTANTS_MAPS_H

12
src/pokedex_area_screen.c
View File

@ -341,11 +341,11 @@ static void FindMapsWithMon(u16 species)
{
switch (sFeebasData[i][1])
{
case MAP_AREA_OVERWORLD_MONS:
case MAP_GROUP_OVERWORLD_MONS:
SetAreaHasMon(sFeebasData[i][1], sFeebasData[i][2]);
break;
case MAP_AREA_SPECIAL_MONS_1:
case MAP_AREA_SPECIAL_MONS_2:
case MAP_GROUP_SPECIAL_MONS_1:
case MAP_GROUP_SPECIAL_MONS_2:
SetSpecialMapHasMon(sFeebasData[i][1], sFeebasData[i][2]);
break;
}
@ -358,11 +358,11 @@ static void FindMapsWithMon(u16 species)
{
switch (gWildMonHeaders[i].mapGroup)
{
case MAP_AREA_OVERWORLD_MONS:
case MAP_GROUP_OVERWORLD_MONS:
SetAreaHasMon(gWildMonHeaders[i].mapGroup, gWildMonHeaders[i].mapNum);
break;
case MAP_AREA_SPECIAL_MONS_1:
case MAP_AREA_SPECIAL_MONS_2:
case MAP_GROUP_SPECIAL_MONS_1:
case MAP_GROUP_SPECIAL_MONS_2:
SetSpecialMapHasMon(gWildMonHeaders[i].mapGroup, gWildMonHeaders[i].mapNum);
break;
}