Reading species names from gSpeciesInfo

rh-hideout · Nov 24, 2023 · ede5cc8 · ede5cc8
1 parent 9c0d472
commit ede5cc8
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 1,586 deletions.
diff --git a/include/data.h b/include/data.h
@@ -117,7 +117,6 @@ extern const struct CompressedSpriteSheet gMonFrontPicTableFemale[];
 
 extern const struct Trainer gTrainers[];
 extern const u8 gTrainerClassNames[][13];
-extern const u8 gSpeciesNames[NUM_SPECIES][POKEMON_NAME_LENGTH + 1];
 extern const u8 gMoveNames[MOVES_COUNT_DYNAMAX][MOVE_NAME_LENGTH + 1];
 extern const u8 *const gZMoveNames[];
 extern const u8 *const gMaxMoveNames[];

diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
@@ -1465,7 +1465,7 @@ void GenerateBattlePyramidWildMon(void)
 
     // Set species, name
     SetMonData(&gEnemyParty[0], MON_DATA_SPECIES, &species);
-    StringCopy(name, gSpeciesNames[species]);
+    StringCopy(name, GetSpeciesName(species));
     SetMonData(&gEnemyParty[0], MON_DATA_NICKNAME, &name);
 
     // set level

diff --git a/src/data.c b/src/data.c
@@ -293,5 +293,4 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] =
 #include "data/trainer_parties.h"
 #include "data/text/trainer_class_names.h"
 #include "data/trainers.h"
-#include "data/text/species_names.h"
 #include "data/text/move_names.h"