diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-13 20:51:05 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2019-01-13 20:51:05 +0100 |
| commit | 4b420643dc33d93ec38ebaa3f4068c1766491c06 (patch) | |
| tree | 0b2cf61da41be02a78758147159250e242cca4a3 /src/pokemon_summary_screen.c | |
| parent | edddd847c585b729fbec96194e5e2d891149f27e (diff) | |
| parent | e13895e58ab38c8adbde1e572068692e8ee5ee35 (diff) | |
Merge branch 'master' into trainer_hill
Diffstat (limited to 'src/pokemon_summary_screen.c')
| -rw-r--r-- | src/pokemon_summary_screen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c index 14d5aa9dc..14bfba4ad 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -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; |