diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-02-16 17:55:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-16 17:55:56 -0500 |
| commit | 33126a06331f8afce668a1152a26e9ed6f5d9a16 (patch) | |
| tree | 0d603397418119f4f055b29a339e094fba1a4141 /src/pokemon_summary_screen.c | |
| parent | bc4f88d72c5efd05f6dd5ee76966a1fc7c69bc3a (diff) | |
| parent | 57e3f5e0f8743191420de5d5569680ade54c4619 (diff) | |
Merge pull request #392 from Deokishisu/ExternalEvents-doc
Mirror pokeemerald PR#1329 & PR#1335 to pokefirered
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 f3898464c..03b9c6744 100644 --- a/src/pokemon_summary_screen.c +++ b/src/pokemon_summary_screen.c @@ -2623,7 +2623,7 @@ static void sub_8137578(void) if (GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_MET_LEVEL) == 0) { - if (GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_OBEDIENCE) == 1) + if (GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_EVENT_LEGAL) == 1) { if (sub_813B7E0(nature)) DynamicPlaceholderTextUtil_ExpandPlaceholders(natureMetOrHatchedAtLevelStr, gUnknown_841996D); @@ -2718,7 +2718,7 @@ static void sub_8137724(void) if (GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_MET_LEVEL) == 0) { - if (GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_OBEDIENCE) == 1) + if (GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_EVENT_LEGAL) == 1) { if (sub_813B7E0(nature)) DynamicPlaceholderTextUtil_ExpandPlaceholders(natureMetOrHatchedAtLevelStr, gUnknown_84199F4); @@ -2772,7 +2772,7 @@ static void sub_8137970(void) if (sMonSummaryScreen->monList.mons != gEnemyParty) { - if (metLocation == METLOC_FATEFUL_ENCOUNTER || GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_OBEDIENCE) == 1) + if (metLocation == METLOC_FATEFUL_ENCOUNTER || GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_EVENT_LEGAL) == 1) chosenStrIndex = 4; else { @@ -2790,7 +2790,7 @@ static void sub_8137970(void) } else { - if (metLocation == METLOC_FATEFUL_ENCOUNTER || GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_OBEDIENCE) == 1) + if (metLocation == METLOC_FATEFUL_ENCOUNTER || GetMonData(&sMonSummaryScreen->currentMon, MON_DATA_EVENT_LEGAL) == 1) chosenStrIndex = 4; else { |