diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/pokemon.h | 2 | ||||
| -rw-r--r-- | include/pokemon_storage_system_internal.h | 2 | ||||
| -rw-r--r-- | include/pokemon_summary_screen.h | 4 | ||||
| -rw-r--r-- | include/strings.h | 62 |
4 files changed, 35 insertions, 35 deletions
diff --git a/include/pokemon.h b/include/pokemon.h index 6027b9b5a..075a50792 100644 --- a/include/pokemon.h +++ b/include/pokemon.h @@ -417,7 +417,7 @@ void AdjustFriendship(struct Pokemon *mon, u8 event); void MonGainEVs(struct Pokemon *mon, u16 defeatedSpecies); u16 GetMonEVCount(struct Pokemon *mon); void RandomlyGivePartyPokerus(struct Pokemon *party); -u8 CheckPartyPokerus(struct Pokemon *party, u8 selection); +u8 CheckPartyPokerus(struct Pokemon *party, u8 party_bm); u8 CheckPartyHasHadPokerus(struct Pokemon *party, u8 selection); void PartySpreadPokerus(struct Pokemon *party); bool8 TryIncrementMonLevel(struct Pokemon *mon); diff --git a/include/pokemon_storage_system_internal.h b/include/pokemon_storage_system_internal.h index f08144243..4e1bf0557 100644 --- a/include/pokemon_storage_system_internal.h +++ b/include/pokemon_storage_system_internal.h @@ -354,7 +354,7 @@ struct PokemonStorageSystemData /* 2172 */ u16 field_2176[3]; /* 2178 */ u8 field_2186; /* 2179 */ u8 field_2187; - /* 217a */ u8 field_2188; + /* 217a */ u8 summaryScreenMode; /* 217c */ union { struct Pokemon *mon; diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h index f70337677..8ee0cbafd 100644 --- a/include/pokemon_summary_screen.h +++ b/include/pokemon_summary_screen.h @@ -12,7 +12,7 @@ void SummaryScreen_SetUnknownTaskId(u8 a0); void SummaryScreen_DestroyUnknownTask(void); u8 GetLastViewedMonIndex(void); void ShowPokemonSummaryScreen(struct Pokemon * party, u8 cursorPos, u8 lastIdx, void (*callback)(void), u8 a4); -void sub_8138B38(u8); +void SetPokemonSummaryScreenMode(u8); // The Pokemon Summary Screen can operate in different modes. Certain features, // such as move re-ordering, are available in the different modes. @@ -22,7 +22,7 @@ enum PokemonSummaryScreenMode PSS_MODE_UNK1, PSS_MODE_SELECT_MOVE, PSS_MODE_FORGET_MOVE, - PSS_MODE_UNK4, + PSS_MODE_TRADE, PSS_MODE_BOX, }; diff --git a/include/strings.h b/include/strings.h index 5ff490fcf..5ba630f4a 100644 --- a/include/strings.h +++ b/include/strings.h @@ -1501,41 +1501,41 @@ extern const u8 gText_NotEvenANibble[]; extern const u8 gText_ItGotAway[]; // pokemon_summary_screen -extern const u8 gUnknown_8419C39[]; -extern const u8 gUnknown_8419C92[]; -extern const u8 gUnknown_8419CA2[]; -extern const u8 gUnknown_8419C45[]; -extern const u8 gUnknown_8419C82[]; -extern const u8 gUnknown_8416202[]; -extern const u8 gUnknown_84161EF[]; -extern const u8 gUnknown_841620E[]; -extern const u8 gUnknown_8416210[]; +extern const u8 gText_PokeSum_PageName_KnownMoves[]; +extern const u8 gText_PokeSum_Controls_PickSwitch[]; +extern const u8 gText_PokeSum_Controls_Pick[]; +extern const u8 gText_PokeSum_NoData[]; +extern const u8 gText_PokeSum_Controls_PageDetail[]; +extern const u8 gText_PokeSum_DexNoUnknown[]; +extern const u8 gText_PokeSum_Item_None[]; +extern const u8 gText_PokeSum_OneHyphen[]; +extern const u8 gText_PokeSum_TwoHyphens[]; extern const u8 gUnknown_8416238[]; extern const u8 gUnknown_8419C13[]; -extern const u8 gUnknown_8419C0B[]; -extern const u8 gUnknown_841996D[]; -extern const u8 gUnknown_841992F[]; -extern const u8 gUnknown_84198D5[]; -extern const u8 gUnknown_84198B4[]; -extern const u8 gUnknown_84197ED[]; -extern const u8 gUnknown_84197B8[]; -extern const u8 gUnknown_8419841[]; -extern const u8 gUnknown_8419822[]; +extern const u8 gText_PokeSum_ATrade[]; +extern const u8 gText_PokeSum_FatefulEncounterHatched_BoldGentleGrammar[]; +extern const u8 gText_PokeSum_FatefulEncounterHatched[]; +extern const u8 gText_PokeSum_Hatched_BoldGentleGrammar[]; +extern const u8 gText_PokeSum_Hatched[]; +extern const u8 gText_PokeSum_FatefulEncounterMet_BoldGentleGrammar[]; +extern const u8 gText_PokeSum_FatefulEncounterMet[]; +extern const u8 gText_PokeSum_Met_BoldGentleGrammar[]; +extern const u8 gText_PokeSum_Met[]; extern const u8 gUnknown_841979D[]; extern const u8 gUnknown_8419782[]; -extern const u8 gUnknown_84199F4[]; -extern const u8 gUnknown_84199AB[]; -extern const u8 gUnknown_8419860[]; -extern const u8 gUnknown_841988A[]; -extern const u8 gUnknown_8419C4D[]; -extern const u8 gUnknown_8419C59[]; -extern const u8 gUnknown_8419C1D[]; -extern const u8 gUnknown_8419C62[]; -extern const u8 gUnknown_8419C72[]; -extern const u8 gUnknown_8419C2A[]; -extern const u8 gUnknown_8419C7B[]; -extern const u8 gUnknown_8419CA9[]; -extern const u8 gUnknown_8419CB9[]; +extern const u8 gText_PokeSum_ApparentlyFatefulEncounterHatched_BoldGentleGrammar[]; +extern const u8 gText_PokeSum_ApparentlyFatefulEncounterHatched[]; +extern const u8 gText_PokeSum_ApparentlyMet[]; +extern const u8 gText_PokeSum_ApparentlyMet_BoldGentleGrammar[]; +extern const u8 gText_PokeSum_ExpPoints[]; +extern const u8 gText_PokeSum_NextLv[]; +extern const u8 gText_PokeSum_PageName_PokemonInfo[]; +extern const u8 gText_PokeSum_Controls_PageCancel[]; +extern const u8 gText_PokeSum_Controls_Cancel[]; +extern const u8 gText_PokeSum_PageName_PokemonSkills[]; +extern const u8 gText_PokeSum_Controls_Page[]; +extern const u8 gText_PokeSum_Controls_PickDelete[]; +extern const u8 gText_PokeSum_HmMovesCantBeForgotten[]; extern const u8 gUnknown_8419B44[]; extern const u8 gUnknown_8419B7B[]; extern const u8 gUnknown_8419BAE[]; |