diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2017-12-17 22:51:40 -0600 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2017-12-17 22:51:40 -0600 |
| commit | 6a674e1e83db097d7a31a3786d12e42987f09f70 (patch) | |
| tree | 2aaad3869de2a5ec02f71b30cd325e066d944d1f /src/battle_2.c | |
| parent | 720bd555bce8141e5e321e082cf80e7f4401d455 (diff) | |
| parent | 46fa2557d777096803ff90ba95d5500a9c03d2c5 (diff) | |
Merge remote-tracking branch 'Egg/decompile_mail_data'
Diffstat (limited to 'src/battle_2.c')
| -rw-r--r-- | src/battle_2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/battle_2.c b/src/battle_2.c index 80945ba8b..7bde3d174 100644 --- a/src/battle_2.c +++ b/src/battle_2.c @@ -185,7 +185,7 @@ extern void sub_80356D0(void); extern void GetFrontierTrainerName(u8* dst, u16 trainerId); // battle tower extern void sub_8166188(void); // battle tower, sets link battle mons level but why? extern void sub_8165B88(u8* dst, u16 trainerId); // battle tower, gets language -extern void sub_81DB4DC(u8* dst, u8 arg2); // +extern void PadNameString(u8* dst, u8 arg2); // extern void sub_81B9150(void); extern void sub_800AC34(void); extern void sub_80B3AF8(u8 taskId); // cable club @@ -1140,7 +1140,7 @@ static void sub_80379F8(u8 arrayIdPlus) gUnknown_02022FF8[i].gender = GetMonGender(&gPlayerParty[arrayIdPlus + i]); StripExtCtrlCodes(gUnknown_02022FF8[i].nickname); if (GetMonData(&gPlayerParty[arrayIdPlus + i], MON_DATA_LANGUAGE) != LANGUAGE_JAPANESE) - sub_81DB4DC(gUnknown_02022FF8[i].nickname, 0); + PadNameString(gUnknown_02022FF8[i].nickname, CHAR_SPACE); } memcpy(gUnknown_02023058, gUnknown_02022FF8, sizeof(gUnknown_02022FF8)); } |