Support multiple ".party" files

rh-hideout · Nov 10, 2023 · e5d1e2c · e5d1e2c
1 parent 72ebc41
commit e5d1e2c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/data.c b/src/data.c
@@ -306,6 +306,11 @@ const union AnimCmd *const gAnims_MonPic[MAX_MON_PIC_FRAMES] =
 #include "data/pokemon_graphics/front_pic_table.h"
 
 #include "data/text/trainer_class_names.h"
+
+const struct Trainer gTrainers[] =
+{
 #include "data/trainers.h"
+};
+
 #include "data/text/species_names.h"
 #include "data/text/move_names.h"
diff --git a/tools/trainerproc/main.c b/tools/trainerproc/main.c
@@ -1355,8 +1355,6 @@ static void fprint_trainers(FILE *f, struct Parsed *parsed)
 
     fprintf(f, "#line 1 \"%s\"\n", parsed->source->path);
     fprintf(f, "\n");
-    fprintf(f, "const struct Trainer gTrainers[] =\n");
-    fprintf(f, "{\n");
 
     for (int i = 0; i < parsed->trainers_n; i++)
     {
@@ -1585,8 +1583,6 @@ static void fprint_trainers(FILE *f, struct Parsed *parsed)
         fprintf(f, "        },\n");
         fprintf(f, "    },\n");
     }
-
-    fprintf(f, "};\n");
 }
 
 static void usage(FILE *file, char *argv0)