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
include/string_util.h
+1 -1
View File
@@ -10,7 +10,7 @@ enum StringConvertMode
STR_CONV_MODE_LEADING_ZEROS STR_CONV_MODE_LEADING_ZEROS
}; };
u8 *StringCopy10(u8 *dest, const u8 *src); u8 *StringCopy_Nickname(u8 *dest, const u8 *src);
u8 *StringGetEnd10(u8 *str); u8 *StringGetEnd10(u8 *str);
u8 *StringCopy7(u8 *dest, const u8 *src); u8 *StringCopy7(u8 *dest, const u8 *src);
u8 *StringCopy(u8 *dest, const u8 *src); u8 *StringCopy(u8 *dest, const u8 *src);
src/battle_controller_link_opponent.c
+1 -1
View File
@@ -499,7 +499,7 @@ static u32 CopyLinkOpponentMonData(u8 monId, u8 *dst)
battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM); battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM);
battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID); battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID);
GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname); GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname);
StringCopy10(battleMon.nickname, nickname); StringCopy_Nickname(battleMon.nickname, nickname);
GetMonData(&gEnemyParty[monId], MON_DATA_OT_NAME, battleMon.otName); GetMonData(&gEnemyParty[monId], MON_DATA_OT_NAME, battleMon.otName);
src = (u8 *)&battleMon; src = (u8 *)&battleMon;
for (size = 0; size < sizeof(battleMon); ++size) for (size = 0; size < sizeof(battleMon); ++size)
src/battle_controller_link_partner.c
+1 -1
View File
@@ -454,7 +454,7 @@ static u32 CopyLinkPartnerMonData(u8 monId, u8 *dst)
battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM);
battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID);
GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname);
StringCopy10(battleMon.nickname, nickname); StringCopy_Nickname(battleMon.nickname, nickname);
GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName); GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName);
src = (u8 *)&battleMon; src = (u8 *)&battleMon;
for (size = 0; size < sizeof(battleMon); ++size) for (size = 0; size < sizeof(battleMon); ++size)
src/battle_controller_oak_old_man.c
+1 -1
View File
@@ -1034,7 +1034,7 @@ static u32 CopyOakOldManMonData(u8 monId, u8 *dst)
battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM);
battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID);
GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname);
StringCopy10(battleMon.nickname, nickname); StringCopy_Nickname(battleMon.nickname, nickname);
GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName); GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName);
src = (u8 *)&battleMon; src = (u8 *)&battleMon;
for (size = 0; size < sizeof(battleMon); ++size) for (size = 0; size < sizeof(battleMon); ++size)
src/battle_controller_opponent.c
+1 -1
View File
@@ -493,7 +493,7 @@ static u32 GetOpponentMonData(u8 monId, u8 *dst)
battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM); battleMon.abilityNum = GetMonData(&gEnemyParty[monId], MON_DATA_ABILITY_NUM);
battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID); battleMon.otId = GetMonData(&gEnemyParty[monId], MON_DATA_OT_ID);
GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname); GetMonData(&gEnemyParty[monId], MON_DATA_NICKNAME, nickname);
StringCopy10(battleMon.nickname, nickname); StringCopy_Nickname(battleMon.nickname, nickname);
GetMonData(&gEnemyParty[monId], MON_DATA_OT_NAME, battleMon.otName); GetMonData(&gEnemyParty[monId], MON_DATA_OT_NAME, battleMon.otName);
src = (u8 *)&battleMon; src = (u8 *)&battleMon;
for (size = 0; size < sizeof(battleMon); ++size) for (size = 0; size < sizeof(battleMon); ++size)
src/battle_controller_player.c
+1 -1
View File
@@ -1551,7 +1551,7 @@ static u32 CopyPlayerMonData(u8 monId, u8 *dst)
battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM); battleMon.abilityNum = GetMonData(&gPlayerParty[monId], MON_DATA_ABILITY_NUM);
battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID); battleMon.otId = GetMonData(&gPlayerParty[monId], MON_DATA_OT_ID);
GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[monId], MON_DATA_NICKNAME, nickname);
StringCopy10(battleMon.nickname, nickname); StringCopy_Nickname(battleMon.nickname, nickname);
GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName); GetMonData(&gPlayerParty[monId], MON_DATA_OT_NAME, battleMon.otName);
src = (u8 *)&battleMon; src = (u8 *)&battleMon;
for (size = 0; size < sizeof(battleMon); ++size) for (size = 0; size < sizeof(battleMon); ++size)
src/battle_controller_pokedude.c
+1 -1
View File
@@ -782,7 +782,7 @@ static u32 CopyPokedudeMonData(u8 monId, u8 *dst)
battleMon.abilityNum = GetMonData(mon, MON_DATA_ABILITY_NUM); battleMon.abilityNum = GetMonData(mon, MON_DATA_ABILITY_NUM);
battleMon.otId = GetMonData(mon, MON_DATA_OT_ID); battleMon.otId = GetMonData(mon, MON_DATA_OT_ID);
GetMonData(mon, MON_DATA_NICKNAME, nickname); GetMonData(mon, MON_DATA_NICKNAME, nickname);
StringCopy10(battleMon.nickname, nickname); StringCopy_Nickname(battleMon.nickname, nickname);
GetMonData(mon, MON_DATA_OT_NAME, battleMon.otName); GetMonData(mon, MON_DATA_OT_NAME, battleMon.otName);
src = (u8 *)&battleMon; src = (u8 *)&battleMon;
for (size = 0; size < sizeof(battleMon); ++size) for (size = 0; size < sizeof(battleMon); ++size)
src/daycare.c
+2 -2
View File
@@ -356,7 +356,7 @@ static u8 *DayCare_GetMonNickname(struct Pokemon *mon, u8 *dest)
u8 nickname[POKEMON_NAME_LENGTH * 2]; u8 nickname[POKEMON_NAME_LENGTH * 2];
GetMonData(mon, MON_DATA_NICKNAME, nickname); GetMonData(mon, MON_DATA_NICKNAME, nickname);
return StringCopy10(dest, nickname); return StringCopy_Nickname(dest, nickname);
} }
static u8 *DayCare_GetBoxMonNickname(struct BoxPokemon *mon, u8 *dest) static u8 *DayCare_GetBoxMonNickname(struct BoxPokemon *mon, u8 *dest)
@@ -364,7 +364,7 @@ static u8 *DayCare_GetBoxMonNickname(struct BoxPokemon *mon, u8 *dest)
u8 nickname[POKEMON_NAME_LENGTH * 2]; u8 nickname[POKEMON_NAME_LENGTH * 2];
GetBoxMonData(mon, MON_DATA_NICKNAME, nickname); GetBoxMonData(mon, MON_DATA_NICKNAME, nickname);
return StringCopy10(dest, nickname); return StringCopy_Nickname(dest, nickname);
} }
u8 CountPokemonInDaycare(struct DayCare *daycare) u8 CountPokemonInDaycare(struct DayCare *daycare)
src/evolution_scene.c
+4 -4
View File
@@ -246,7 +246,7 @@ void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, bool8 canStopEvo,
AllocateMonSpritesGfx(); AllocateMonSpritesGfx();
GetMonData(mon, MON_DATA_NICKNAME, name); GetMonData(mon, MON_DATA_NICKNAME, name);
StringCopy10(gStringVar1, name); StringCopy_Nickname(gStringVar1, name);
StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]); StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]);
// preEvo sprite // preEvo sprite
@@ -469,7 +469,7 @@ void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpri
u8 id; u8 id;
GetMonData(mon, MON_DATA_NICKNAME, name); GetMonData(mon, MON_DATA_NICKNAME, name);
StringCopy10(gStringVar1, name); StringCopy_Nickname(gStringVar1, name);
StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]); StringCopy(gStringVar2, gSpeciesNames[speciesToEvolve]);
gAffineAnimsDisabled = TRUE; gAffineAnimsDisabled = TRUE;
@@ -744,7 +744,7 @@ static void Task_EvolutionScene(u8 taskId)
gTasks[taskId].tLearnsFirstMove = FALSE; gTasks[taskId].tLearnsFirstMove = FALSE;
gTasks[taskId].tLearnMoveState = 0; gTasks[taskId].tLearnMoveState = 0;
GetMonData(mon, MON_DATA_NICKNAME, text); GetMonData(mon, MON_DATA_NICKNAME, text);
StringCopy10(gBattleTextBuff1, text); StringCopy_Nickname(gBattleTextBuff1, text);
if (var == MON_HAS_MAX_MOVES) if (var == MON_HAS_MAX_MOVES)
gTasks[taskId].tState = 22; gTasks[taskId].tState = 22;
@@ -1120,7 +1120,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
gTasks[taskId].tLearnsFirstMove = FALSE; gTasks[taskId].tLearnsFirstMove = FALSE;
gTasks[taskId].tLearnMoveState = 0; gTasks[taskId].tLearnMoveState = 0;
GetMonData(mon, MON_DATA_NICKNAME, text); GetMonData(mon, MON_DATA_NICKNAME, text);
StringCopy10(gBattleTextBuff1, text); StringCopy_Nickname(gBattleTextBuff1, text);
if (var == MON_HAS_MAX_MOVES) if (var == MON_HAS_MAX_MOVES)
gTasks[taskId].tState = 20; gTasks[taskId].tState = 20;
src/learn_move.c
+1 -1
View File
@@ -757,7 +757,7 @@ static void MoveRelearnerInitListMenuBuffersEtc(void)
for (i = 0; i < sMoveRelearner->numLearnableMoves; i++) for (i = 0; i < sMoveRelearner->numLearnableMoves; i++)
StringCopy(sMoveRelearner->listMenuStrbufs[i], gMoveNames[sMoveRelearner->learnableMoves[i]]); StringCopy(sMoveRelearner->listMenuStrbufs[i], gMoveNames[sMoveRelearner->learnableMoves[i]]);
GetMonData(&gPlayerParty[sMoveRelearner->selectedPartyMember], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[sMoveRelearner->selectedPartyMember], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar1, nickname); StringCopy_Nickname(gStringVar1, nickname);
StringCopy(sMoveRelearner->listMenuStrbufs[sMoveRelearner->numLearnableMoves], gFameCheckerText_Cancel); StringCopy(sMoveRelearner->listMenuStrbufs[sMoveRelearner->numLearnableMoves], gFameCheckerText_Cancel);
sMoveRelearner->numLearnableMoves++; sMoveRelearner->numLearnableMoves++;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
src/pokemon.c
+1 -1
View File
@@ -3912,7 +3912,7 @@ static void CopyPlayerPartyMonToBattleData(u8 battlerId, u8 partyIndex)
gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2; gBattleMons[battlerId].type2 = gBaseStats[gBattleMons[battlerId].species].type2;
gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].abilityNum); gBattleMons[battlerId].ability = GetAbilityBySpecies(gBattleMons[battlerId].species, gBattleMons[battlerId].abilityNum);
GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[partyIndex], MON_DATA_NICKNAME, nickname);
StringCopy10(gBattleMons[battlerId].nickname, nickname); StringCopy_Nickname(gBattleMons[battlerId].nickname, nickname);
GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[battlerId].otName); GetMonData(&gPlayerParty[partyIndex], MON_DATA_OT_NAME, gBattleMons[battlerId].otName);
hpSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(battlerId)]; hpSwitchout = &gBattleStruct->hpOnSwitchout[GetBattlerSide(battlerId)];
src/string_util.c
+2 -2
View File
@@ -37,10 +37,10 @@ extern u8 gExpandedPlaceholder_Groudon[];
extern u8 gExpandedPlaceholder_Red[]; extern u8 gExpandedPlaceholder_Red[];
extern u8 gExpandedPlaceholder_Green[]; extern u8 gExpandedPlaceholder_Green[];
u8 *StringCopy10(u8 *dest, const u8 *src) u8 *StringCopy_Nickname(u8 *dest, const u8 *src)
{ {
u8 i; u8 i;
u32 limit = 10; u32 limit = POKEMON_NAME_LENGTH;
for (i = 0; i < limit; i++) for (i = 0; i < limit; i++)
{ {
src/trade.c
+2 -2
View File
@@ -2183,7 +2183,7 @@ static u8 GetNicknameStringWidthByPartyAndMonIdx(u8 *dest, u8 whichParty, u8 par
GetMonData(&gPlayerParty[partyIdx], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[partyIdx], MON_DATA_NICKNAME, nickname);
else else
GetMonData(&gEnemyParty[partyIdx], MON_DATA_NICKNAME, nickname); GetMonData(&gEnemyParty[partyIdx], MON_DATA_NICKNAME, nickname);
StringCopy10(dest, nickname); StringCopy_Nickname(dest, nickname);
return GetStringWidth(0, dest, GetFontAttribute(0, FONTATTR_LETTER_SPACING)); return GetStringWidth(0, dest, GetFontAttribute(0, FONTATTR_LETTER_SPACING));
} }
@@ -2246,7 +2246,7 @@ static void PrintPartyNicknames(u8 whichParty)
for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[whichParty]; i++) for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[whichParty]; i++)
{ {
GetMonData(&party[i], MON_DATA_NICKNAME, buff); GetMonData(&party[i], MON_DATA_NICKNAME, buff);
StringCopy10(nickname, buff); StringCopy_Nickname(nickname, buff);
PrintPartyMonNickname(whichParty, i, nickname); PrintPartyMonNickname(whichParty, i, nickname);
} }
} }
src/trade_scene.c
+5 -5
View File
@@ -1239,17 +1239,17 @@ static void TradeBufferOTnameAndNicknames(void)
mpId = GetMultiplayerId(); mpId = GetMultiplayerId();
StringCopy(gStringVar1, gLinkPlayers[mpId ^ 1].name); StringCopy(gStringVar1, gLinkPlayers[mpId ^ 1].name);
GetMonData(&gEnemyParty[gSelectedTradeMonPositions[1] % 6], MON_DATA_NICKNAME, nickname); GetMonData(&gEnemyParty[gSelectedTradeMonPositions[1] % 6], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar3, nickname); StringCopy_Nickname(gStringVar3, nickname);
GetMonData(&gPlayerParty[gSelectedTradeMonPositions[0]], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[gSelectedTradeMonPositions[0]], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar2, nickname); StringCopy_Nickname(gStringVar2, nickname);
} }
else else
{ {
inGameTrade = &sInGameTrades[gSpecialVar_0x8004]; inGameTrade = &sInGameTrades[gSpecialVar_0x8004];
StringCopy(gStringVar1, inGameTrade->otName); StringCopy(gStringVar1, inGameTrade->otName);
StringCopy10(gStringVar3, inGameTrade->nickname); StringCopy_Nickname(gStringVar3, inGameTrade->nickname);
GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, 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]; u8 nickname[30];
const struct InGameTrade * inGameTrade = &sInGameTrades[gSpecialVar_0x8004]; const struct InGameTrade * inGameTrade = &sInGameTrades[gSpecialVar_0x8004];
GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, nickname); GetMonData(&gPlayerParty[gSpecialVar_0x8005], MON_DATA_NICKNAME, nickname);
StringCopy10(gStringVar1, nickname); StringCopy_Nickname(gStringVar1, nickname);
StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]); StringCopy(gStringVar2, gSpeciesNames[inGameTrade->species]);
} }