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

Rename non-mapsec constants

Browse Source
This commit is contained in:
Diegoisawesome
2019-01-08 13:40:11 -06:00
parent 37d7348e01
commit af2c39860d
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pokemon_summary_screen.c
+4 -4
View File
@@ -3048,11 +3048,11 @@ static void BufferMonTrainerMemo(void)
else
text = (sum->metLocation >= MAPSEC_NONE) ? gText_XNatureMetSomewhereAt : gText_XNatureMetAtYZ;
}
else if (sum->metLocation == MAPSEC_FATEFUL_ENCOUNTER)
else if (sum->metLocation == METLOC_FATEFUL_ENCOUNTER)
{
text = gText_XNatureFatefulEncounter;
}
else if (sum->metLocation != MAPSEC_IN_GAME_TRADE && DidMonComeFromGBAGames())
else if (sum->metLocation != METLOC_IN_GAME_TRADE && DidMonComeFromGBAGames())
{
text = (sum->metLocation >= MAPSEC_NONE) ? gText_XNatureObtainedInTrade : gText_XNatureProbablyMetAt;
}
@@ -3183,11 +3183,11 @@ static void PrintEggMemo(void)
if (pssData->summary.sanity != 1)
{
if (sum->metLocation == MAPSEC_FATEFUL_ENCOUNTER)
if (sum->metLocation == METLOC_FATEFUL_ENCOUNTER)
text = gText_PeculiarEggNicePlace;
else if (DidMonComeFromGBAGames() == FALSE || DoesMonOTMatchOwner() == FALSE)
text = gText_PeculiarEggTrade;
else if (sum->metLocation == MAPSEC_SPECIAL_EGG)
else if (sum->metLocation == METLOC_SPECIAL_EGG)
text = (DidMonComeFromRSE() == TRUE) ? gText_EggFromHotSprings : gText_EggFromTraveler;
else
text = gText_OddEggFoundByCouple;