Merge pull request #355 from lhearachel/trainer-datagen

Re-implement data generation for trainers
pret · Feb 1, 2025 · 5f63fd2 · 5f63fd2
2 parents bc5976d + 7e5f0e6
commit 5f63fd2
Show file tree

Hide file tree

Showing 1,008 changed files with 1,650 additions and 2,451 deletions.
diff --git a/asm/macros/scrcmd.inc b/asm/macros/scrcmd.inc
@@ -10,11 +10,10 @@
 #include "generated/save_types.h"
 #include "generated/sdat.h"
 #include "generated/species.h"
+#include "generated/trainers.h"
 
 #include "macros/movement.inc"
 
-#include "res/trainers/trdata.naix"
-
     .macro Noop
     .short 0
     .endm

diff --git a/generated/ai_flags.txt b/generated/ai_flags.txt
@@ -31,3 +31,4 @@ AI_FLAG_UNUSED_28
 AI_FLAG_ROAMING_POKEMON
 AI_FLAG_SAFARI
 AI_FLAG_CATCH_TUTORIAL
+AI_FLAG_ALL
diff --git a/generated/meson.build b/generated/meson.build
@@ -70,6 +70,7 @@ metang_generators = {
     'species': { 'type': 'enum', 'tag': 'Species' },
     'species_data_params': { 'type': 'enum', 'tag': 'SpeciesDataParam' },
     'text_banks': { 'type': 'enum', 'tag': 'TextBank' },
+    'trainers': { 'type': 'enum', 'tag': 'Trainer' },
     'trainer_classes': { 'type': 'enum', 'tag': 'TrainerClass' },
     'trainer_score_events': { 'type': 'enum', 'tag': 'TrainerScoreEvent' },
 }
@@ -113,6 +114,7 @@ endforeach
 
 species_txt = files('species.txt')
 text_banks_txt = files('text_banks.txt')
+trainers_txt = files('trainers.txt')
 
 py_consts_env = environment()
 py_consts_env.append('PYTHONPATH', meson.project_build_root())