ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-02-21 11:43:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix merge issue

Browse Source
This commit is contained in:
Phlosioneer 2019-03-03 22:27:57 -05:00
parent 2879fe7fe0
commit 05199f8fc7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pokemon_summary_screen.c
View File

@ -1407,7 +1407,7 @@ static bool8 ExtractMonDataToSummaryStruct(struct Pokemon *mon)
case 3:
GetMonData(mon, MON_DATA_OT_NAME, sum->OTName);
ConvertInternationalString((u8*)&sum->OTName, GetMonData(mon, MON_DATA_LANGUAGE));
sum->ailment = sub_81B205C(mon);
sum->ailment = GetMonAilment(mon);
sum->OTGender = GetMonData(mon, MON_DATA_OT_GENDER);
sum->OTID = GetMonData(mon, MON_DATA_OT_ID);
sum->metLocation = GetMonData(mon, MON_DATA_MET_LOCATION);