dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

StringCopy10 to StringCopy_Nickname

Browse Source
This commit is contained in:
Eduardo Quezada
2022-07-27 14:35:19 -04:00
parent f998a7b661
commit 611112269e
14 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade_scene.c
+5 -5
View File
@@ -1239,17 +1239,17 @@ static void TradeBufferOTnameAndNicknames(void)
mpId = GetMultiplayerId();
StringCopy(gStringVar1, gLinkPlayers[mpId ^ 1].name);
GetMonData(&gEnemyParty[gSelectedTradeMonPositions[1] % 6], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar3, nickname);
StringCopy_Nickname(gStringVar3, nickname);
GetMonData(&gPlayerParty[gSelectedTradeMonPositions[0]], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar2, nickname);
StringCopy_Nickname(gStringVar2, nickname);
}
else
{
inGameTrade = &sInGameTrades[gSpecialVar_0x8004];
StringCopy(gStringVar1, inGameTrade->otName);
StringCopy10(gStringVar3, inGameTrade->nickname);
StringCopy_Nickname(gStringVar3, inGameTrade->nickname);
GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar2, nickname);
StringCopy_Nickname(gStringVar2, nickname);
}
}
@@ -2424,7 +2424,7 @@ static void BufferInGameTradeMonName(void)
u8 nickname[30];
const struct InGameTrade * inGameTrade = &sInGameTrades[gSpecialVar_0x8004];
GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar1, nickname);
StringCopy_Nickname(gStringVar1, nickname);
StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]);
}