PARAMETRIZE_LABEL in test/species.c

rh-hideout · Mar 5, 2024 · 1e4540d · 1e4540d
1 parent 72bdaf1
commit 1e4540d
Showing 1 changed file with 20 additions and 7 deletions.
diff --git a/test/species.c b/test/species.c
@@ -6,12 +6,16 @@ TEST("Form species ID tables are shared between all forms")
 {
     u32 i;
     u32 species = SPECIES_NONE;
+    const u16 *formSpeciesIdTable;
     for (i = 0; i < NUM_SPECIES; i++)
     {
-        if (gSpeciesInfo[i].formSpeciesIdTable) PARAMETRIZE { species = i; }
+        if (gSpeciesInfo[i].formSpeciesIdTable)
+        {
+            PARAMETRIZE_LABEL("%S", gSpeciesInfo[i].speciesName) { species = i; }
+        }
     }
 
-    const u16 *formSpeciesIdTable = gSpeciesInfo[species].formSpeciesIdTable;
+    formSpeciesIdTable = gSpeciesInfo[species].formSpeciesIdTable;
     for (i = 0; formSpeciesIdTable[i] != FORM_SPECIES_END; i++)
     {
         u32 formSpeciesId = formSpeciesIdTable[i];
@@ -23,13 +27,18 @@ TEST("Form change tables contain only forms in the form species ID table")
 {
     u32 i, j;
     u32 species = SPECIES_NONE;
+    const struct FormChange *formChangeTable;
+    const u16 *formSpeciesIdTable;
     for (i = 0; i < NUM_SPECIES; i++)
     {
-        if (gSpeciesInfo[i].formChangeTable) PARAMETRIZE { species = i; }
+        if (gSpeciesInfo[i].formChangeTable)
+        {
+            PARAMETRIZE_LABEL("%S", gSpeciesInfo[i].speciesName) { species = i; }
+        }
     }
 
-    const struct FormChange *formChangeTable = gSpeciesInfo[species].formChangeTable;
-    const u16 *formSpeciesIdTable = gSpeciesInfo[species].formSpeciesIdTable;
+    formChangeTable = gSpeciesInfo[species].formChangeTable;
+    formSpeciesIdTable = gSpeciesInfo[species].formSpeciesIdTable;
     EXPECT(formSpeciesIdTable);
 
     for (i = 0; formChangeTable[i].method != FORM_CHANGE_TERMINATOR; i++)
@@ -51,12 +60,16 @@ TEST("Form change targets have the appropriate species flags")
 {
     u32 i;
     u32 species = SPECIES_NONE;
+    const struct FormChange *formChangeTable;
     for (i = 0; i < NUM_SPECIES; i++)
     {
-        if (gSpeciesInfo[i].formChangeTable) PARAMETRIZE { species = i; }
+        if (gSpeciesInfo[i].formChangeTable)
+        {
+            PARAMETRIZE_LABEL("%S", gSpeciesInfo[i].speciesName) { species = i; }
+        }
     }
 
-    const struct FormChange *formChangeTable = gSpeciesInfo[species].formChangeTable;
+    formChangeTable = gSpeciesInfo[species].formChangeTable;
     for (i = 0; formChangeTable[i].method != FORM_CHANGE_TERMINATOR; i++)
     {
         const struct SpeciesInfo *targetSpeciesInfo = &gSpeciesInfo[formChangeTable[i].targetSpecies];