Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-28 04:46:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed all instances of gSpeciesNames so that it uses GetSpeciesName

Browse Source
This commit is contained in:
Eduardo Quezada
2023-07-07 14:37:51 -04:00
parent adfc0af372
commit 3aaa89ce71
33 changed files with 187 additions and 185 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/apprentice.c
View File

@@ -592,7 +592,7 @@ static void CreateApprenticeMenu(u8 menu)
speciesTableId = APPRENTICE_SPECIES_ID(i);
species = gApprentices[PLAYER_APPRENTICE.id].species[speciesTableId];
strings[i] = gSpeciesNames[species];
strings[i] = GetSpeciesName(species);
}
break;
case APPRENTICE_ASK_2SPECIES:
@@ -600,8 +600,8 @@ static void CreateApprenticeMenu(u8 menu)
top = 8;
if (PLAYER_APPRENTICE.questionsAnswered >= NUM_WHICH_MON_QUESTIONS)
return;
strings[1] = gSpeciesNames[gApprenticeQuestionData->altSpeciesId];
strings[0] = gSpeciesNames[gApprenticeQuestionData->speciesId];
strings[1] = GetSpeciesName(gApprenticeQuestionData->altSpeciesId);
strings[0] = GetSpeciesName(gApprenticeQuestionData->speciesId);
break;
case APPRENTICE_ASK_MOVES:
left = 17;
@@ -1050,13 +1050,13 @@ static void ApprenticeBufferString(void)
switch (gSpecialVar_0x8006)
{
case APPRENTICE_BUFF_SPECIES1:
StringCopy(stringDst, gSpeciesNames[gApprenticeQuestionData->speciesId]);
StringCopy(stringDst, GetSpeciesName(gApprenticeQuestionData->speciesId));
break;
case APPRENTICE_BUFF_SPECIES2:
StringCopy(stringDst, gSpeciesNames[gApprenticeQuestionData->altSpeciesId]);
StringCopy(stringDst, GetSpeciesName(gApprenticeQuestionData->altSpeciesId));
break;
case APPRENTICE_BUFF_SPECIES3:
StringCopy(stringDst, gSpeciesNames[gApprenticeQuestionData->speciesId]);
StringCopy(stringDst, GetSpeciesName(gApprenticeQuestionData->speciesId));
break;
case APPRENTICE_BUFF_MOVE1:
StringCopy(stringDst, gMoveNames[gApprenticeQuestionData->moveId1]);
@@ -1083,7 +1083,7 @@ static void ApprenticeBufferString(void)
break;
case APPRENTICE_BUFF_LEAD_MON_SPECIES:
speciesArrayId = APPRENTICE_SPECIES_ID(PLAYER_APPRENTICE.leadMonId);
StringCopy(stringDst, gSpeciesNames[gApprentices[PLAYER_APPRENTICE.id].species[speciesArrayId]]);
StringCopy(stringDst, GetSpeciesName(gApprentices[PLAYER_APPRENTICE.id].species[speciesArrayId]));
break;
}
}