Port trainer data archive packing to C++

pret · Jan 31, 2025 · 5c246df · 5c246df
1 parent 38436e0
commit 5c246df
Show file tree

Hide file tree

Showing 937 changed files with 285 additions and 1,090 deletions.
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/include/struct_defs/trainer_data.h b/include/struct_defs/trainer_data.h
@@ -9,6 +9,8 @@
 
 #include "constants/moves.h"
 
+#define TRAINER_MON_FORM_SHIFT 10
+
 #define MAX_TRAINER_ITEMS 4
 #define MAX_DV            255
 

diff --git a/res/trainers/trainer_ace_trainer_abel.json → res/trainers/data/ace_trainer_abel.json b/res/trainers/trainer_ace_trainer_abel.json → res/trainers/data/ace_trainer_abel.json
diff --git a/res/trainers/trainer_ace_trainer_alicia.json → res/trainers/data/ace_trainer_alicia.json b/res/trainers/trainer_ace_trainer_alicia.json → res/trainers/data/ace_trainer_alicia.json
diff --git a/res/trainers/trainer_ace_trainer_allen.json → res/trainers/data/ace_trainer_allen.json b/res/trainers/trainer_ace_trainer_allen.json → res/trainers/data/ace_trainer_allen.json
diff --git a/res/trainers/trainer_ace_trainer_alyssa.json → res/trainers/data/ace_trainer_alyssa.json b/res/trainers/trainer_ace_trainer_alyssa.json → res/trainers/data/ace_trainer_alyssa.json
diff --git a/res/trainers/trainer_ace_trainer_anton.json → res/trainers/data/ace_trainer_anton.json b/res/trainers/trainer_ace_trainer_anton.json → res/trainers/data/ace_trainer_anton.json
diff --git a/res/trainers/trainer_ace_trainer_arthur.json → res/trainers/data/ace_trainer_arthur.json b/res/trainers/trainer_ace_trainer_arthur.json → res/trainers/data/ace_trainer_arthur.json
diff --git a/res/trainers/trainer_ace_trainer_blake.json → res/trainers/data/ace_trainer_blake.json b/res/trainers/trainer_ace_trainer_blake.json → res/trainers/data/ace_trainer_blake.json
diff --git a/res/trainers/trainer_ace_trainer_brandi.json → res/trainers/data/ace_trainer_brandi.json b/res/trainers/trainer_ace_trainer_brandi.json → res/trainers/data/ace_trainer_brandi.json
diff --git a/...trainers/trainer_ace_trainer_breanna.json → res/trainers/data/ace_trainer_breanna.json b/...trainers/trainer_ace_trainer_breanna.json → res/trainers/data/ace_trainer_breanna.json
diff --git a/res/trainers/trainer_ace_trainer_brenda.json → res/trainers/data/ace_trainer_brenda.json b/res/trainers/trainer_ace_trainer_brenda.json → res/trainers/data/ace_trainer_brenda.json
diff --git a/res/trainers/trainer_ace_trainer_brenna.json → res/trainers/data/ace_trainer_brenna.json b/res/trainers/trainer_ace_trainer_brenna.json → res/trainers/data/ace_trainer_brenna.json
diff --git a/...ainers/trainer_ace_trainer_catherine.json → res/trainers/data/ace_trainer_catherine.json b/...ainers/trainer_ace_trainer_catherine.json → res/trainers/data/ace_trainer_catherine.json
diff --git a/res/trainers/trainer_ace_trainer_cesar.json → res/trainers/data/ace_trainer_cesar.json b/res/trainers/trainer_ace_trainer_cesar.json → res/trainers/data/ace_trainer_cesar.json
diff --git a/...trainers/trainer_ace_trainer_clarice.json → res/trainers/data/ace_trainer_clarice.json b/...trainers/trainer_ace_trainer_clarice.json → res/trainers/data/ace_trainer_clarice.json
diff --git a/res/trainers/trainer_ace_trainer_dalton.json → res/trainers/data/ace_trainer_dalton.json b/res/trainers/trainer_ace_trainer_dalton.json → res/trainers/data/ace_trainer_dalton.json
diff --git a/...s/trainer_ace_trainer_dalton_rematch.json → ...ners/data/ace_trainer_dalton_rematch.json b/...s/trainer_ace_trainer_dalton_rematch.json → ...ners/data/ace_trainer_dalton_rematch.json
diff --git a/res/trainers/trainer_ace_trainer_dana.json → res/trainers/data/ace_trainer_dana.json b/res/trainers/trainer_ace_trainer_dana.json → res/trainers/data/ace_trainer_dana.json
diff --git a/res/trainers/trainer_ace_trainer_deanna.json → res/trainers/data/ace_trainer_deanna.json b/res/trainers/trainer_ace_trainer_deanna.json → res/trainers/data/ace_trainer_deanna.json
diff --git a/...s/trainer_ace_trainer_deanna_rematch.json → ...ners/data/ace_trainer_deanna_rematch.json b/...s/trainer_ace_trainer_deanna_rematch.json → ...ners/data/ace_trainer_deanna_rematch.json
diff --git a/res/trainers/trainer_ace_trainer_dennis.json → res/trainers/data/ace_trainer_dennis.json b/res/trainers/trainer_ace_trainer_dennis.json → res/trainers/data/ace_trainer_dennis.json
diff --git a/...trainer_ace_trainer_dennis_rematch_1.json → ...rs/data/ace_trainer_dennis_rematch_1.json b/...trainer_ace_trainer_dennis_rematch_1.json → ...rs/data/ace_trainer_dennis_rematch_1.json
diff --git a/...trainer_ace_trainer_dennis_rematch_2.json → ...rs/data/ace_trainer_dennis_rematch_2.json b/...trainer_ace_trainer_dennis_rematch_2.json → ...rs/data/ace_trainer_dennis_rematch_2.json
diff --git a/...trainers/trainer_ace_trainer_destiny.json → res/trainers/data/ace_trainer_destiny.json b/...trainers/trainer_ace_trainer_destiny.json → res/trainers/data/ace_trainer_destiny.json
diff --git a/res/trainers/trainer_ace_trainer_ernest.json → res/trainers/data/ace_trainer_ernest.json b/res/trainers/trainer_ace_trainer_ernest.json → res/trainers/data/ace_trainer_ernest.json
diff --git a/res/trainers/trainer_ace_trainer_felix.json → res/trainers/data/ace_trainer_felix.json b/res/trainers/trainer_ace_trainer_felix.json → res/trainers/data/ace_trainer_felix.json
diff --git a/...trainers/trainer_ace_trainer_garrett.json → res/trainers/data/ace_trainer_garrett.json b/...trainers/trainer_ace_trainer_garrett.json → res/trainers/data/ace_trainer_garrett.json
diff --git a/res/trainers/trainer_ace_trainer_graham.json → res/trainers/data/ace_trainer_graham.json b/res/trainers/trainer_ace_trainer_graham.json → res/trainers/data/ace_trainer_graham.json
diff --git a/res/trainers/trainer_ace_trainer_henry.json → res/trainers/data/ace_trainer_henry.json b/res/trainers/trainer_ace_trainer_henry.json → res/trainers/data/ace_trainer_henry.json
diff --git a/res/trainers/trainer_ace_trainer_isaiah.json → res/trainers/data/ace_trainer_isaiah.json b/res/trainers/trainer_ace_trainer_isaiah.json → res/trainers/data/ace_trainer_isaiah.json
diff --git a/res/trainers/trainer_ace_trainer_jake.json → res/trainers/data/ace_trainer_jake.json b/res/trainers/trainer_ace_trainer_jake.json → res/trainers/data/ace_trainer_jake.json
diff --git a/...ers/trainer_ace_trainer_jake_rematch.json → ...ainers/data/ace_trainer_jake_rematch.json b/...ers/trainer_ace_trainer_jake_rematch.json → ...ainers/data/ace_trainer_jake_rematch.json
diff --git a/res/trainers/trainer_ace_trainer_jamie.json → res/trainers/data/ace_trainer_jamie.json b/res/trainers/trainer_ace_trainer_jamie.json → res/trainers/data/ace_trainer_jamie.json
diff --git a/res/trainers/trainer_ace_trainer_jasmin.json → res/trainers/data/ace_trainer_jasmin.json b/res/trainers/trainer_ace_trainer_jasmin.json → res/trainers/data/ace_trainer_jasmin.json
diff --git a/res/trainers/trainer_ace_trainer_jonah.json → res/trainers/data/ace_trainer_jonah.json b/res/trainers/trainer_ace_trainer_jonah.json → res/trainers/data/ace_trainer_jonah.json
diff --git a/res/trainers/trainer_ace_trainer_jose.json → res/trainers/data/ace_trainer_jose.json b/res/trainers/trainer_ace_trainer_jose.json → res/trainers/data/ace_trainer_jose.json
diff --git a/...ainers/trainer_ace_trainer_kassandra.json → res/trainers/data/ace_trainer_kassandra.json b/...ainers/trainer_ace_trainer_kassandra.json → res/trainers/data/ace_trainer_kassandra.json
diff --git a/res/trainers/trainer_ace_trainer_keenan.json → res/trainers/data/ace_trainer_keenan.json b/res/trainers/trainer_ace_trainer_keenan.json → res/trainers/data/ace_trainer_keenan.json
diff --git a/res/trainers/trainer_ace_trainer_laura.json → res/trainers/data/ace_trainer_laura.json b/res/trainers/trainer_ace_trainer_laura.json → res/trainers/data/ace_trainer_laura.json
diff --git a/res/trainers/trainer_ace_trainer_maria.json → res/trainers/data/ace_trainer_maria.json b/res/trainers/trainer_ace_trainer_maria.json → res/trainers/data/ace_trainer_maria.json
diff --git a/res/trainers/trainer_ace_trainer_mariah.json → res/trainers/data/ace_trainer_mariah.json b/res/trainers/trainer_ace_trainer_mariah.json → res/trainers/data/ace_trainer_mariah.json
diff --git a/res/trainers/trainer_ace_trainer_maya.json → res/trainers/data/ace_trainer_maya.json b/res/trainers/trainer_ace_trainer_maya.json → res/trainers/data/ace_trainer_maya.json
diff --git a/...s/trainer_ace_trainer_maya_rematch_1.json → ...ners/data/ace_trainer_maya_rematch_1.json b/...s/trainer_ace_trainer_maya_rematch_1.json → ...ners/data/ace_trainer_maya_rematch_1.json
diff --git a/...s/trainer_ace_trainer_maya_rematch_2.json → ...ners/data/ace_trainer_maya_rematch_2.json b/...s/trainer_ace_trainer_maya_rematch_2.json → ...ners/data/ace_trainer_maya_rematch_2.json
diff --git a/res/trainers/trainer_ace_trainer_meagan.json → res/trainers/data/ace_trainer_meagan.json b/res/trainers/trainer_ace_trainer_meagan.json → res/trainers/data/ace_trainer_meagan.json
diff --git a/res/trainers/trainer_ace_trainer_micah.json → res/trainers/data/ace_trainer_micah.json b/res/trainers/trainer_ace_trainer_micah.json → res/trainers/data/ace_trainer_micah.json
diff --git a/...trainers/trainer_ace_trainer_mikayla.json → res/trainers/data/ace_trainer_mikayla.json b/...trainers/trainer_ace_trainer_mikayla.json → res/trainers/data/ace_trainer_mikayla.json
diff --git a/res/trainers/trainer_ace_trainer_moira.json → res/trainers/data/ace_trainer_moira.json b/res/trainers/trainer_ace_trainer_moira.json → res/trainers/data/ace_trainer_moira.json
diff --git a/...rs/trainer_ace_trainer_moira_rematch.json → ...iners/data/ace_trainer_moira_rematch.json b/...rs/trainer_ace_trainer_moira_rematch.json → ...iners/data/ace_trainer_moira_rematch.json
diff --git a/...trainers/trainer_ace_trainer_monique.json → res/trainers/data/ace_trainer_monique.json b/...trainers/trainer_ace_trainer_monique.json → res/trainers/data/ace_trainer_monique.json
diff --git a/...trainers/trainer_ace_trainer_natasha.json → res/trainers/data/ace_trainer_natasha.json b/...trainers/trainer_ace_trainer_natasha.json → res/trainers/data/ace_trainer_natasha.json
diff --git a/res/trainers/trainer_ace_trainer_olivia.json → res/trainers/data/ace_trainer_olivia.json b/res/trainers/trainer_ace_trainer_olivia.json → res/trainers/data/ace_trainer_olivia.json
diff --git a/...s/trainer_ace_trainer_olivia_rematch.json → ...ners/data/ace_trainer_olivia_rematch.json b/...s/trainer_ace_trainer_olivia_rematch.json → ...ners/data/ace_trainer_olivia_rematch.json
diff --git a/res/trainers/trainer_ace_trainer_omar.json → res/trainers/data/ace_trainer_omar.json b/res/trainers/trainer_ace_trainer_omar.json → res/trainers/data/ace_trainer_omar.json
diff --git a/res/trainers/trainer_ace_trainer_quinn.json → res/trainers/data/ace_trainer_quinn.json b/res/trainers/trainer_ace_trainer_quinn.json → res/trainers/data/ace_trainer_quinn.json
diff --git a/...trainers/trainer_ace_trainer_rodolfo.json → res/trainers/data/ace_trainer_rodolfo.json b/...trainers/trainer_ace_trainer_rodolfo.json → res/trainers/data/ace_trainer_rodolfo.json
diff --git a/.../trainer_ace_trainer_rodolfo_rematch.json → ...ers/data/ace_trainer_rodolfo_rematch.json b/.../trainer_ace_trainer_rodolfo_rematch.json → ...ers/data/ace_trainer_rodolfo_rematch.json
diff --git a/res/trainers/trainer_ace_trainer_ruben.json → res/trainers/data/ace_trainer_ruben.json b/res/trainers/trainer_ace_trainer_ruben.json → res/trainers/data/ace_trainer_ruben.json
diff --git a/res/trainers/trainer_ace_trainer_sandra.json → res/trainers/data/ace_trainer_sandra.json b/res/trainers/trainer_ace_trainer_sandra.json → res/trainers/data/ace_trainer_sandra.json
diff --git a/res/trainers/trainer_ace_trainer_saul.json → res/trainers/data/ace_trainer_saul.json b/res/trainers/trainer_ace_trainer_saul.json → res/trainers/data/ace_trainer_saul.json
diff --git a/...ers/trainer_ace_trainer_saul_rematch.json → ...ainers/data/ace_trainer_saul_rematch.json b/...ers/trainer_ace_trainer_saul_rematch.json → ...ainers/data/ace_trainer_saul_rematch.json
diff --git a/...rainers/trainer_ace_trainer_savannah.json → res/trainers/data/ace_trainer_savannah.json b/...rainers/trainer_ace_trainer_savannah.json → res/trainers/data/ace_trainer_savannah.json
diff --git a/res/trainers/trainer_ace_trainer_sergio.json → res/trainers/data/ace_trainer_sergio.json b/res/trainers/trainer_ace_trainer_sergio.json → res/trainers/data/ace_trainer_sergio.json
diff --git a/...trainers/trainer_ace_trainer_shannon.json → res/trainers/data/ace_trainer_shannon.json b/...trainers/trainer_ace_trainer_shannon.json → res/trainers/data/ace_trainer_shannon.json
diff --git a/.../trainer_ace_trainer_shannon_rematch.json → ...ers/data/ace_trainer_shannon_rematch.json b/.../trainer_ace_trainer_shannon_rematch.json → ...ers/data/ace_trainer_shannon_rematch.json
diff --git a/res/trainers/trainer_ace_trainer_skylar.json → res/trainers/data/ace_trainer_skylar.json b/res/trainers/trainer_ace_trainer_skylar.json → res/trainers/data/ace_trainer_skylar.json
diff --git a/res/trainers/trainer_ace_trainer_stefan.json → res/trainers/data/ace_trainer_stefan.json b/res/trainers/trainer_ace_trainer_stefan.json → res/trainers/data/ace_trainer_stefan.json
diff --git a/res/trainers/trainer_ace_trainer_sydney.json → res/trainers/data/ace_trainer_sydney.json b/res/trainers/trainer_ace_trainer_sydney.json → res/trainers/data/ace_trainer_sydney.json
diff --git a/...trainers/trainer_ace_trainer_zachery.json → res/trainers/data/ace_trainer_zachery.json b/...trainers/trainer_ace_trainer_zachery.json → res/trainers/data/ace_trainer_zachery.json
diff --git a/res/trainers/trainer_aroma_lady_alison.json → res/trainers/data/aroma_lady_alison.json b/res/trainers/trainer_aroma_lady_alison.json → res/trainers/data/aroma_lady_alison.json
diff --git a/res/trainers/trainer_aroma_lady_angela.json → res/trainers/data/aroma_lady_angela.json b/res/trainers/trainer_aroma_lady_angela.json → res/trainers/data/aroma_lady_angela.json
diff --git a/...rainers/trainer_aroma_lady_elizabeth.json → res/trainers/data/aroma_lady_elizabeth.json b/...rainers/trainer_aroma_lady_elizabeth.json → res/trainers/data/aroma_lady_elizabeth.json
diff --git a/...ainer_aroma_lady_elizabeth_rematch_1.json → .../data/aroma_lady_elizabeth_rematch_1.json b/...ainer_aroma_lady_elizabeth_rematch_1.json → .../data/aroma_lady_elizabeth_rematch_1.json
diff --git a/...ainer_aroma_lady_elizabeth_rematch_2.json → .../data/aroma_lady_elizabeth_rematch_2.json b/...ainer_aroma_lady_elizabeth_rematch_2.json → .../data/aroma_lady_elizabeth_rematch_2.json
diff --git a/...ainer_aroma_lady_elizabeth_rematch_3.json → .../data/aroma_lady_elizabeth_rematch_3.json b/...ainer_aroma_lady_elizabeth_rematch_3.json → .../data/aroma_lady_elizabeth_rematch_3.json
diff --git a/res/trainers/trainer_aroma_lady_hannah.json → res/trainers/data/aroma_lady_hannah.json b/res/trainers/trainer_aroma_lady_hannah.json → res/trainers/data/aroma_lady_hannah.json
diff --git a/res/trainers/trainer_aroma_lady_jenna.json → res/trainers/data/aroma_lady_jenna.json b/res/trainers/trainer_aroma_lady_jenna.json → res/trainers/data/aroma_lady_jenna.json
diff --git a/res/trainers/trainer_aroma_lady_taylor.json → res/trainers/data/aroma_lady_taylor.json b/res/trainers/trainer_aroma_lady_taylor.json → res/trainers/data/aroma_lady_taylor.json
diff --git a/res/trainers/trainer_artist_ismael.json → res/trainers/data/artist_ismael.json b/res/trainers/trainer_artist_ismael.json → res/trainers/data/artist_ismael.json
diff --git a/res/trainers/trainer_artist_william.json → res/trainers/data/artist_william.json b/res/trainers/trainer_artist_william.json → res/trainers/data/artist_william.json
diff --git a/...ers/trainer_artist_william_rematch_1.json → ...ainers/data/artist_william_rematch_1.json b/...ers/trainer_artist_william_rematch_1.json → ...ainers/data/artist_william_rematch_1.json
diff --git a/...ers/trainer_artist_william_rematch_2.json → ...ainers/data/artist_william_rematch_2.json b/...ers/trainer_artist_william_rematch_2.json → ...ainers/data/artist_william_rematch_2.json
diff --git a/...ers/trainer_artist_william_rematch_3.json → ...ainers/data/artist_william_rematch_3.json b/...ers/trainer_artist_william_rematch_3.json → ...ainers/data/artist_william_rematch_3.json
diff --git a/res/trainers/trainer_battle_girl_helen.json → res/trainers/data/battle_girl_helen.json b/res/trainers/trainer_battle_girl_helen.json → res/trainers/data/battle_girl_helen.json
diff --git a/.../trainer_battle_girl_helen_rematch_1.json → ...ers/data/battle_girl_helen_rematch_1.json b/.../trainer_battle_girl_helen_rematch_1.json → ...ers/data/battle_girl_helen_rematch_1.json
diff --git a/.../trainer_battle_girl_helen_rematch_2.json → ...ers/data/battle_girl_helen_rematch_2.json b/.../trainer_battle_girl_helen_rematch_2.json → ...ers/data/battle_girl_helen_rematch_2.json
diff --git a/.../trainer_battle_girl_helen_rematch_3.json → ...ers/data/battle_girl_helen_rematch_3.json b/.../trainer_battle_girl_helen_rematch_3.json → ...ers/data/battle_girl_helen_rematch_3.json
diff --git a/res/trainers/trainer_battle_girl_kelsey.json → res/trainers/data/battle_girl_kelsey.json b/res/trainers/trainer_battle_girl_kelsey.json → res/trainers/data/battle_girl_kelsey.json
diff --git a/res/trainers/trainer_battle_girl_tyler.json → res/trainers/data/battle_girl_tyler.json b/res/trainers/trainer_battle_girl_tyler.json → res/trainers/data/battle_girl_tyler.json
diff --git a/res/trainers/trainer_beauty_cyndy.json → res/trainers/data/beauty_cyndy.json b/res/trainers/trainer_beauty_cyndy.json → res/trainers/data/beauty_cyndy.json
diff --git a/...iners/trainer_beauty_cyndy_rematch_1.json → ...trainers/data/beauty_cyndy_rematch_1.json b/...iners/trainer_beauty_cyndy_rematch_1.json → ...trainers/data/beauty_cyndy_rematch_1.json
diff --git a/...iners/trainer_beauty_cyndy_rematch_2.json → ...trainers/data/beauty_cyndy_rematch_2.json b/...iners/trainer_beauty_cyndy_rematch_2.json → ...trainers/data/beauty_cyndy_rematch_2.json
diff --git a/res/trainers/trainer_beauty_devon.json → res/trainers/data/beauty_devon.json b/res/trainers/trainer_beauty_devon.json → res/trainers/data/beauty_devon.json
diff --git a/res/trainers/trainer_beauty_gabriella.json → res/trainers/data/beauty_gabriella.json b/res/trainers/trainer_beauty_gabriella.json → res/trainers/data/beauty_gabriella.json
diff --git a/res/trainers/trainer_beauty_harley.json → res/trainers/data/beauty_harley.json b/res/trainers/trainer_beauty_harley.json → res/trainers/data/beauty_harley.json
diff --git a/res/trainers/trainer_beauty_lindsay.json → res/trainers/data/beauty_lindsay.json b/res/trainers/trainer_beauty_lindsay.json → res/trainers/data/beauty_lindsay.json
diff --git a/res/trainers/trainer_beauty_nicola.json → res/trainers/data/beauty_nicola.json b/res/trainers/trainer_beauty_nicola.json → res/trainers/data/beauty_nicola.json
diff --git a/...rs/trainer_belle_and_pa_ava_and_matt.json → ...iners/data/belle_and_pa_ava_and_matt.json b/...rs/trainer_belle_and_pa_ava_and_matt.json → ...iners/data/belle_and_pa_ava_and_matt.json
diff --git a/...rs/trainer_belle_and_pa_beth_and_bob.json → ...iners/data/belle_and_pa_beth_and_bob.json b/...rs/trainer_belle_and_pa_beth_and_bob.json → ...iners/data/belle_and_pa_beth_and_bob.json
diff --git a/...ainers/trainer_bird_keeper_alexandra.json → res/trainers/data/bird_keeper_alexandra.json b/...ainers/trainer_bird_keeper_alexandra.json → res/trainers/data/bird_keeper_alexandra.json
diff --git a/res/trainers/trainer_bird_keeper_audrey.json → res/trainers/data/bird_keeper_audrey.json b/res/trainers/trainer_bird_keeper_audrey.json → res/trainers/data/bird_keeper_audrey.json
diff --git a/...s/trainer_bird_keeper_audrey_rematch.json → ...ners/data/bird_keeper_audrey_rematch.json b/...s/trainer_bird_keeper_audrey_rematch.json → ...ners/data/bird_keeper_audrey_rematch.json
diff --git a/res/trainers/trainer_bird_keeper_autumn.json → res/trainers/data/bird_keeper_autumn.json b/res/trainers/trainer_bird_keeper_autumn.json → res/trainers/data/bird_keeper_autumn.json
diff --git a/...trainers/trainer_bird_keeper_brianna.json → res/trainers/data/bird_keeper_brianna.json b/...trainers/trainer_bird_keeper_brianna.json → res/trainers/data/bird_keeper_brianna.json
diff --git a/...rainer_bird_keeper_brianna_rematch_1.json → ...s/data/bird_keeper_brianna_rematch_1.json b/...rainer_bird_keeper_brianna_rematch_1.json → ...s/data/bird_keeper_brianna_rematch_1.json
diff --git a/...rainer_bird_keeper_brianna_rematch_2.json → ...s/data/bird_keeper_brianna_rematch_2.json b/...rainer_bird_keeper_brianna_rematch_2.json → ...s/data/bird_keeper_brianna_rematch_2.json
diff --git a/res/trainers/trainer_bird_keeper_geneva.json → res/trainers/data/bird_keeper_geneva.json b/res/trainers/trainer_bird_keeper_geneva.json → res/trainers/data/bird_keeper_geneva.json
diff --git a/res/trainers/trainer_bird_keeper_hana.json → res/trainers/data/bird_keeper_hana.json b/res/trainers/trainer_bird_keeper_hana.json → res/trainers/data/bird_keeper_hana.json
diff --git a/...ainers/trainer_bird_keeper_katherine.json → res/trainers/data/bird_keeper_katherine.json b/...ainers/trainer_bird_keeper_katherine.json → res/trainers/data/bird_keeper_katherine.json
diff --git a/...trainers/trainer_bird_keeper_krystal.json → res/trainers/data/bird_keeper_krystal.json b/...trainers/trainer_bird_keeper_krystal.json → res/trainers/data/bird_keeper_krystal.json
diff --git a/res/trainers/trainer_black_belt_adam.json → res/trainers/data/black_belt_adam.json b/res/trainers/trainer_black_belt_adam.json → res/trainers/data/black_belt_adam.json
diff --git a/res/trainers/trainer_black_belt_carl.json → res/trainers/data/black_belt_carl.json b/res/trainers/trainer_black_belt_carl.json → res/trainers/data/black_belt_carl.json
diff --git a/res/trainers/trainer_black_belt_colby.json → res/trainers/data/black_belt_colby.json b/res/trainers/trainer_black_belt_colby.json → res/trainers/data/black_belt_colby.json
diff --git a/res/trainers/trainer_black_belt_darren.json → res/trainers/data/black_belt_darren.json b/res/trainers/trainer_black_belt_darren.json → res/trainers/data/black_belt_darren.json
diff --git a/res/trainers/trainer_black_belt_david.json → res/trainers/data/black_belt_david.json b/res/trainers/trainer_black_belt_david.json → res/trainers/data/black_belt_david.json
diff --git a/res/trainers/trainer_black_belt_davon.json → res/trainers/data/black_belt_davon.json b/res/trainers/trainer_black_belt_davon.json → res/trainers/data/black_belt_davon.json
diff --git a/...ers/trainer_black_belt_davon_rematch.json → ...ainers/data/black_belt_davon_rematch.json b/...ers/trainer_black_belt_davon_rematch.json → ...ainers/data/black_belt_davon_rematch.json
diff --git a/res/trainers/trainer_black_belt_derek.json → res/trainers/data/black_belt_derek.json b/res/trainers/trainer_black_belt_derek.json → res/trainers/data/black_belt_derek.json
diff --git a/res/trainers/trainer_black_belt_eddie.json → res/trainers/data/black_belt_eddie.json b/res/trainers/trainer_black_belt_eddie.json → res/trainers/data/black_belt_eddie.json
diff --git a/res/trainers/trainer_black_belt_gregory.json → res/trainers/data/black_belt_gregory.json b/res/trainers/trainer_black_belt_gregory.json → res/trainers/data/black_belt_gregory.json
diff --git a/res/trainers/trainer_black_belt_griffin.json → res/trainers/data/black_belt_griffin.json b/res/trainers/trainer_black_belt_griffin.json → res/trainers/data/black_belt_griffin.json
diff --git a/res/trainers/trainer_black_belt_jarrett.json → res/trainers/data/black_belt_jarrett.json b/res/trainers/trainer_black_belt_jarrett.json → res/trainers/data/black_belt_jarrett.json
diff --git a/res/trainers/trainer_black_belt_jeffery.json → res/trainers/data/black_belt_jeffery.json b/res/trainers/trainer_black_belt_jeffery.json → res/trainers/data/black_belt_jeffery.json
diff --git a/res/trainers/trainer_black_belt_kendal.json → res/trainers/data/black_belt_kendal.json b/res/trainers/trainer_black_belt_kendal.json → res/trainers/data/black_belt_kendal.json
diff --git a/res/trainers/trainer_black_belt_kyle.json → res/trainers/data/black_belt_kyle.json b/res/trainers/trainer_black_belt_kyle.json → res/trainers/data/black_belt_kyle.json
diff --git a/res/trainers/trainer_black_belt_luke.json → res/trainers/data/black_belt_luke.json b/res/trainers/trainer_black_belt_luke.json → res/trainers/data/black_belt_luke.json
diff --git a/res/trainers/trainer_black_belt_miles.json → res/trainers/data/black_belt_miles.json b/res/trainers/trainer_black_belt_miles.json → res/trainers/data/black_belt_miles.json
diff --git a/...rainers/trainer_black_belt_nathaniel.json → res/trainers/data/black_belt_nathaniel.json b/...rainers/trainer_black_belt_nathaniel.json → res/trainers/data/black_belt_nathaniel.json
diff --git a/res/trainers/trainer_black_belt_philip.json → res/trainers/data/black_belt_philip.json b/res/trainers/trainer_black_belt_philip.json → res/trainers/data/black_belt_philip.json
diff --git a/...rs/trainer_black_belt_philip_rematch.json → ...iners/data/black_belt_philip_rematch.json b/...rs/trainer_black_belt_philip_rematch.json → ...iners/data/black_belt_philip_rematch.json
diff --git a/res/trainers/trainer_black_belt_rafael.json → res/trainers/data/black_belt_rafael.json b/res/trainers/trainer_black_belt_rafael.json → res/trainers/data/black_belt_rafael.json
diff --git a/res/trainers/trainer_black_belt_ray.json → res/trainers/data/black_belt_ray.json b/res/trainers/trainer_black_belt_ray.json → res/trainers/data/black_belt_ray.json
diff --git a/res/trainers/trainer_black_belt_ricky.json → res/trainers/data/black_belt_ricky.json b/res/trainers/trainer_black_belt_ricky.json → res/trainers/data/black_belt_ricky.json
diff --git a/res/trainers/trainer_black_belt_sean.json → res/trainers/data/black_belt_sean.json b/res/trainers/trainer_black_belt_sean.json → res/trainers/data/black_belt_sean.json
diff --git a/res/trainers/trainer_black_belt_willie.json → res/trainers/data/black_belt_willie.json b/res/trainers/trainer_black_belt_willie.json → res/trainers/data/black_belt_willie.json
diff --git a/res/trainers/trainer_breeder_albert.json → res/trainers/data/breeder_albert.json b/res/trainers/trainer_breeder_albert.json → res/trainers/data/breeder_albert.json
diff --git a/...ers/trainer_breeder_albert_rematch_1.json → ...ainers/data/breeder_albert_rematch_1.json b/...ers/trainer_breeder_albert_rematch_1.json → ...ainers/data/breeder_albert_rematch_1.json
diff --git a/...ers/trainer_breeder_albert_rematch_2.json → ...ainers/data/breeder_albert_rematch_2.json b/...ers/trainer_breeder_albert_rematch_2.json → ...ainers/data/breeder_albert_rematch_2.json
diff --git a/...ers/trainer_breeder_albert_rematch_3.json → ...ainers/data/breeder_albert_rematch_3.json b/...ers/trainer_breeder_albert_rematch_3.json → ...ainers/data/breeder_albert_rematch_3.json
diff --git a/res/trainers/trainer_breeder_amber.json → res/trainers/data/breeder_amber.json b/res/trainers/trainer_breeder_amber.json → res/trainers/data/breeder_amber.json
diff --git a/res/trainers/trainer_breeder_jennifer.json → res/trainers/data/breeder_jennifer.json b/res/trainers/trainer_breeder_jennifer.json → res/trainers/data/breeder_jennifer.json
diff --git a/...s/trainer_breeder_jennifer_rematch_1.json → ...ners/data/breeder_jennifer_rematch_1.json b/...s/trainer_breeder_jennifer_rematch_1.json → ...ners/data/breeder_jennifer_rematch_1.json
diff --git a/...s/trainer_breeder_jennifer_rematch_2.json → ...ners/data/breeder_jennifer_rematch_2.json b/...s/trainer_breeder_jennifer_rematch_2.json → ...ners/data/breeder_jennifer_rematch_2.json
diff --git a/...s/trainer_breeder_jennifer_rematch_3.json → ...ners/data/breeder_jennifer_rematch_3.json b/...s/trainer_breeder_jennifer_rematch_3.json → ...ners/data/breeder_jennifer_rematch_3.json
diff --git a/res/trainers/trainer_breeder_kahlil.json → res/trainers/data/breeder_kahlil.json b/res/trainers/trainer_breeder_kahlil.json → res/trainers/data/breeder_kahlil.json
diff --git a/res/trainers/trainer_breeder_kaylee.json → res/trainers/data/breeder_kaylee.json b/res/trainers/trainer_breeder_kaylee.json → res/trainers/data/breeder_kaylee.json
diff --git a/res/trainers/trainer_buck_battleground.json → res/trainers/data/buck_battleground.json b/res/trainers/trainer_buck_battleground.json → res/trainers/data/buck_battleground.json
diff --git a/...trainers/trainer_buck_stark_mountain.json → res/trainers/data/buck_stark_mountain.json b/...trainers/trainer_buck_stark_mountain.json → res/trainers/data/buck_stark_mountain.json
diff --git a/...trainers/trainer_bug_catcher_brandon.json → res/trainers/data/bug_catcher_brandon.json b/...trainers/trainer_bug_catcher_brandon.json → res/trainers/data/bug_catcher_brandon.json
diff --git a/...rainer_bug_catcher_brandon_rematch_1.json → ...s/data/bug_catcher_brandon_rematch_1.json b/...rainer_bug_catcher_brandon_rematch_1.json → ...s/data/bug_catcher_brandon_rematch_1.json
diff --git a/...rainer_bug_catcher_brandon_rematch_2.json → ...s/data/bug_catcher_brandon_rematch_2.json b/...rainer_bug_catcher_brandon_rematch_2.json → ...s/data/bug_catcher_brandon_rematch_2.json
diff --git a/...rainer_bug_catcher_brandon_rematch_3.json → ...s/data/bug_catcher_brandon_rematch_3.json b/...rainer_bug_catcher_brandon_rematch_3.json → ...s/data/bug_catcher_brandon_rematch_3.json
diff --git a/res/trainers/trainer_bug_catcher_donald.json → res/trainers/data/bug_catcher_donald.json b/res/trainers/trainer_bug_catcher_donald.json → res/trainers/data/bug_catcher_donald.json
diff --git a/res/trainers/trainer_bug_catcher_jack.json → res/trainers/data/bug_catcher_jack.json b/res/trainers/trainer_bug_catcher_jack.json → res/trainers/data/bug_catcher_jack.json
diff --git a/...trainers/trainer_bug_catcher_phillip.json → res/trainers/data/bug_catcher_phillip.json b/...trainers/trainer_bug_catcher_phillip.json → res/trainers/data/bug_catcher_phillip.json
diff --git a/res/trainers/trainer_cameraman_darryl.json → res/trainers/data/cameraman_darryl.json b/res/trainers/trainer_cameraman_darryl.json → res/trainers/data/cameraman_darryl.json
diff --git a/res/trainers/trainer_cameraman_tevin.json → res/trainers/data/cameraman_tevin.json b/res/trainers/trainer_cameraman_tevin.json → res/trainers/data/cameraman_tevin.json
diff --git a/...rs/trainer_cameraman_tevin_rematch_1.json → ...iners/data/cameraman_tevin_rematch_1.json b/...rs/trainer_cameraman_tevin_rematch_1.json → ...iners/data/cameraman_tevin_rematch_1.json
diff --git a/...rs/trainer_cameraman_tevin_rematch_2.json → ...iners/data/cameraman_tevin_rematch_2.json b/...rs/trainer_cameraman_tevin_rematch_2.json → ...iners/data/cameraman_tevin_rematch_2.json
diff --git a/...rs/trainer_cameraman_tevin_rematch_3.json → ...iners/data/cameraman_tevin_rematch_3.json b/...rs/trainer_cameraman_tevin_rematch_3.json → ...iners/data/cameraman_tevin_rematch_3.json
diff --git a/...rs/trainer_cameraman_tevin_rematch_4.json → ...iners/data/cameraman_tevin_rematch_4.json b/...rs/trainer_cameraman_tevin_rematch_4.json → ...iners/data/cameraman_tevin_rematch_4.json
diff --git a/res/trainers/trainer_camper_anthony.json → res/trainers/data/camper_anthony.json b/res/trainers/trainer_camper_anthony.json → res/trainers/data/camper_anthony.json
diff --git a/res/trainers/trainer_camper_curtis.json → res/trainers/data/camper_curtis.json b/res/trainers/trainer_camper_curtis.json → res/trainers/data/camper_curtis.json
diff --git a/res/trainers/trainer_camper_diego.json → res/trainers/data/camper_diego.json b/res/trainers/trainer_camper_diego.json → res/trainers/data/camper_diego.json
diff --git a/res/trainers/trainer_camper_drew.json → res/trainers/data/camper_drew.json b/res/trainers/trainer_camper_drew.json → res/trainers/data/camper_drew.json
diff --git a/res/trainers/trainer_camper_jacob.json → res/trainers/data/camper_jacob.json b/res/trainers/trainer_camper_jacob.json → res/trainers/data/camper_jacob.json
diff --git a/res/trainers/trainer_camper_lawrence.json → res/trainers/data/camper_lawrence.json b/res/trainers/trainer_camper_lawrence.json → res/trainers/data/camper_lawrence.json
diff --git a/res/trainers/trainer_camper_parker.json → res/trainers/data/camper_parker.json b/res/trainers/trainer_camper_parker.json → res/trainers/data/camper_parker.json
diff --git a/res/trainers/trainer_camper_zackary.json → res/trainers/data/camper_zackary.json b/res/trainers/trainer_camper_zackary.json → res/trainers/data/camper_zackary.json
diff --git a/...ers/trainer_camper_zackary_rematch_1.json → ...ainers/data/camper_zackary_rematch_1.json b/...ers/trainer_camper_zackary_rematch_1.json → ...ainers/data/camper_zackary_rematch_1.json
diff --git a/...ers/trainer_camper_zackary_rematch_2.json → ...ainers/data/camper_zackary_rematch_2.json b/...ers/trainer_camper_zackary_rematch_2.json → ...ainers/data/camper_zackary_rematch_2.json
diff --git a/...ers/trainer_camper_zackary_rematch_3.json → ...ainers/data/camper_zackary_rematch_3.json b/...ers/trainer_camper_zackary_rematch_3.json → ...ainers/data/camper_zackary_rematch_3.json
diff --git a/res/trainers/trainer_champion_cynthia.json → res/trainers/data/champion_cynthia.json b/res/trainers/trainer_champion_cynthia.json → res/trainers/data/champion_cynthia.json
diff --git a/...ers/trainer_champion_cynthia_rematch.json → ...ainers/data/champion_cynthia_rematch.json b/...ers/trainer_champion_cynthia_rematch.json → ...ainers/data/champion_cynthia_rematch.json
diff --git a/...trainers/trainer_cheryl_battleground.json → res/trainers/data/cheryl_battleground.json b/...trainers/trainer_cheryl_battleground.json → res/trainers/data/cheryl_battleground.json
diff --git a/...rainers/trainer_cheryl_eterna_forest.json → res/trainers/data/cheryl_eterna_forest.json b/...rainers/trainer_cheryl_eterna_forest.json → res/trainers/data/cheryl_eterna_forest.json
diff --git a/res/trainers/trainer_clown_lee.json → res/trainers/data/clown_lee.json b/res/trainers/trainer_clown_lee.json → res/trainers/data/clown_lee.json
diff --git a/...trainers/trainer_clown_lee_rematch_1.json → res/trainers/data/clown_lee_rematch_1.json b/...trainers/trainer_clown_lee_rematch_1.json → res/trainers/data/clown_lee_rematch_1.json
diff --git a/...trainers/trainer_clown_lee_rematch_2.json → res/trainers/data/clown_lee_rematch_2.json b/...trainers/trainer_clown_lee_rematch_2.json → res/trainers/data/clown_lee_rematch_2.json
diff --git a/...trainers/trainer_clown_lee_rematch_3.json → res/trainers/data/clown_lee_rematch_3.json b/...trainers/trainer_clown_lee_rematch_3.json → res/trainers/data/clown_lee_rematch_3.json
diff --git a/...trainers/trainer_clown_lee_rematch_4.json → res/trainers/data/clown_lee_rematch_4.json b/...trainers/trainer_clown_lee_rematch_4.json → res/trainers/data/clown_lee_rematch_4.json
diff --git a/res/trainers/trainer_collector_brady.json → res/trainers/data/collector_brady.json b/res/trainers/trainer_collector_brady.json → res/trainers/data/collector_brady.json
diff --git a/res/trainers/trainer_collector_dean.json → res/trainers/data/collector_dean.json b/res/trainers/trainer_collector_dean.json → res/trainers/data/collector_dean.json
diff --git a/res/trainers/trainer_collector_douglas.json → res/trainers/data/collector_douglas.json b/res/trainers/trainer_collector_douglas.json → res/trainers/data/collector_douglas.json
diff --git a/res/trainers/trainer_collector_edwin.json → res/trainers/data/collector_edwin.json b/res/trainers/trainer_collector_edwin.json → res/trainers/data/collector_edwin.json
diff --git a/res/trainers/trainer_collector_eugene.json → res/trainers/data/collector_eugene.json b/res/trainers/trainer_collector_eugene.json → res/trainers/data/collector_eugene.json
diff --git a/res/trainers/trainer_collector_fernando.json → res/trainers/data/collector_fernando.json b/res/trainers/trainer_collector_fernando.json → res/trainers/data/collector_fernando.json
diff --git a/res/trainers/trainer_collector_ivan.json → res/trainers/data/collector_ivan.json b/res/trainers/trainer_collector_ivan.json → res/trainers/data/collector_ivan.json
diff --git a/...iners/trainer_collector_ivan_rematch.json → ...trainers/data/collector_ivan_rematch.json b/...iners/trainer_collector_ivan_rematch.json → ...trainers/data/collector_ivan_rematch.json
diff --git a/res/trainers/trainer_collector_jamal.json → res/trainers/data/collector_jamal.json b/res/trainers/trainer_collector_jamal.json → res/trainers/data/collector_jamal.json
diff --git a/res/trainers/trainer_collector_terry.json → res/trainers/data/collector_terry.json b/res/trainers/trainer_collector_terry.json → res/trainers/data/collector_terry.json
diff --git a/...ainer_commander_jupiter_spear_pillar.json → .../data/commander_jupiter_spear_pillar.json b/...ainer_commander_jupiter_spear_pillar.json → .../data/commander_jupiter_spear_pillar.json
diff --git a/...ner_commander_jupiter_stark_mountain.json → ...ata/commander_jupiter_stark_mountain.json b/...ner_commander_jupiter_stark_mountain.json → ...ata/commander_jupiter_stark_mountain.json
diff --git a/...upiter_team_galactic_eterna_building.json → ...upiter_team_galactic_eterna_building.json b/...upiter_team_galactic_eterna_building.json → ...upiter_team_galactic_eterna_building.json
diff --git a/...s/trainer_commander_mars_lake_verity.json → ...ners/data/commander_mars_lake_verity.json b/...s/trainer_commander_mars_lake_verity.json → ...ners/data/commander_mars_lake_verity.json
diff --git a/.../trainer_commander_mars_spear_pillar.json → ...ers/data/commander_mars_spear_pillar.json b/.../trainer_commander_mars_spear_pillar.json → ...ers/data/commander_mars_spear_pillar.json
diff --git a/...rainer_commander_mars_stark_mountain.json → ...s/data/commander_mars_stark_mountain.json b/...rainer_commander_mars_stark_mountain.json → ...s/data/commander_mars_stark_mountain.json
diff --git a/...iner_commander_mars_valley_windworks.json → ...data/commander_mars_valley_windworks.json b/...iner_commander_mars_valley_windworks.json → ...data/commander_mars_valley_windworks.json
diff --git a/...trainer_commander_saturn_galactic_hq.json → ...rs/data/commander_saturn_galactic_hq.json b/...trainer_commander_saturn_galactic_hq.json → ...rs/data/commander_saturn_galactic_hq.json
diff --git a/...rainer_commander_saturn_valor_cavern.json → ...s/data/commander_saturn_valor_cavern.json b/...rainer_commander_saturn_valor_cavern.json → ...s/data/commander_saturn_valor_cavern.json
diff --git a/res/trainers/trainer_cowgirl_shelley.json → res/trainers/data/cowgirl_shelley.json b/res/trainers/trainer_cowgirl_shelley.json → res/trainers/data/cowgirl_shelley.json
diff --git a/res/trainers/trainer_cyclist_axel.json → res/trainers/data/cyclist_axel.json b/res/trainers/trainer_cyclist_axel.json → res/trainers/data/cyclist_axel.json
diff --git a/res/trainers/trainer_cyclist_james.json → res/trainers/data/cyclist_james.json b/res/trainers/trainer_cyclist_james.json → res/trainers/data/cyclist_james.json
diff --git a/res/trainers/trainer_cyclist_john.json → res/trainers/data/cyclist_john.json b/res/trainers/trainer_cyclist_john.json → res/trainers/data/cyclist_john.json
diff --git a/...iners/trainer_cyclist_john_rematch_1.json → ...trainers/data/cyclist_john_rematch_1.json b/...iners/trainer_cyclist_john_rematch_1.json → ...trainers/data/cyclist_john_rematch_1.json
diff --git a/...iners/trainer_cyclist_john_rematch_2.json → ...trainers/data/cyclist_john_rematch_2.json b/...iners/trainer_cyclist_john_rematch_2.json → ...trainers/data/cyclist_john_rematch_2.json
diff --git a/...iners/trainer_cyclist_john_rematch_3.json → ...trainers/data/cyclist_john_rematch_3.json b/...iners/trainer_cyclist_john_rematch_3.json → ...trainers/data/cyclist_john_rematch_3.json
diff --git a/res/trainers/trainer_cyclist_kayla.json → res/trainers/data/cyclist_kayla.json b/res/trainers/trainer_cyclist_kayla.json → res/trainers/data/cyclist_kayla.json
diff --git a/...ners/trainer_cyclist_kayla_rematch_1.json → ...rainers/data/cyclist_kayla_rematch_1.json b/...ners/trainer_cyclist_kayla_rematch_1.json → ...rainers/data/cyclist_kayla_rematch_1.json
diff --git a/...ners/trainer_cyclist_kayla_rematch_2.json → ...rainers/data/cyclist_kayla_rematch_2.json b/...ners/trainer_cyclist_kayla_rematch_2.json → ...rainers/data/cyclist_kayla_rematch_2.json
diff --git a/...ners/trainer_cyclist_kayla_rematch_3.json → ...rainers/data/cyclist_kayla_rematch_3.json b/...ners/trainer_cyclist_kayla_rematch_3.json → ...rainers/data/cyclist_kayla_rematch_3.json
diff --git a/res/trainers/trainer_cyclist_megan.json → res/trainers/data/cyclist_megan.json b/res/trainers/trainer_cyclist_megan.json → res/trainers/data/cyclist_megan.json
diff --git a/res/trainers/trainer_cyclist_nicole.json → res/trainers/data/cyclist_nicole.json b/res/trainers/trainer_cyclist_nicole.json → res/trainers/data/cyclist_nicole.json
diff --git a/res/trainers/trainer_cyclist_rachel.json → res/trainers/data/cyclist_rachel.json b/res/trainers/trainer_cyclist_rachel.json → res/trainers/data/cyclist_rachel.json
diff --git a/res/trainers/trainer_cyclist_ryan.json → res/trainers/data/cyclist_ryan.json b/res/trainers/trainer_cyclist_ryan.json → res/trainers/data/cyclist_ryan.json
diff --git a/.../trainer_dawn_jubilife_city_chimchar.json → ...ers/data/dawn_jubilife_city_chimchar.json b/.../trainer_dawn_jubilife_city_chimchar.json → ...ers/data/dawn_jubilife_city_chimchar.json
diff --git a/...rs/trainer_dawn_jubilife_city_piplup.json → ...iners/data/dawn_jubilife_city_piplup.json b/...rs/trainer_dawn_jubilife_city_piplup.json → ...iners/data/dawn_jubilife_city_piplup.json
diff --git a/...s/trainer_dawn_jubilife_city_turtwig.json → ...ners/data/dawn_jubilife_city_turtwig.json b/...s/trainer_dawn_jubilife_city_turtwig.json → ...ners/data/dawn_jubilife_city_turtwig.json
diff --git a/...trainer_dawn_veilstone_city_chimchar.json → ...rs/data/dawn_veilstone_city_chimchar.json b/...trainer_dawn_veilstone_city_chimchar.json → ...rs/data/dawn_veilstone_city_chimchar.json
diff --git a/...s/trainer_dawn_veilstone_city_piplup.json → ...ners/data/dawn_veilstone_city_piplup.json b/...s/trainer_dawn_veilstone_city_piplup.json → ...ners/data/dawn_veilstone_city_piplup.json
diff --git a/.../trainer_dawn_veilstone_city_turtwig.json → ...ers/data/dawn_veilstone_city_turtwig.json b/.../trainer_dawn_veilstone_city_turtwig.json → ...ers/data/dawn_veilstone_city_turtwig.json
diff --git a/...iners/trainer_double_team_al_and_kay.json → ...trainers/data/double_team_al_and_kay.json b/...iners/trainer_double_team_al_and_kay.json → ...trainers/data/double_team_al_and_kay.json
diff --git a/...iners/trainer_double_team_jo_and_pat.json → ...trainers/data/double_team_jo_and_pat.json b/...iners/trainer_double_team_jo_and_pat.json → ...trainers/data/double_team_jo_and_pat.json
diff --git a/...ners/trainer_double_team_zac_and_jen.json → ...rainers/data/double_team_zac_and_jen.json b/...ners/trainer_double_team_zac_and_jen.json → ...rainers/data/double_team_zac_and_jen.json
diff --git a/...rainers/trainer_dragon_tamer_clinton.json → res/trainers/data/dragon_tamer_clinton.json b/...rainers/trainer_dragon_tamer_clinton.json → res/trainers/data/dragon_tamer_clinton.json
diff --git a/...trainers/trainer_dragon_tamer_darien.json → res/trainers/data/dragon_tamer_darien.json b/...trainers/trainer_dragon_tamer_darien.json → res/trainers/data/dragon_tamer_darien.json
diff --git a/res/trainers/trainer_dragon_tamer_drake.json → res/trainers/data/dragon_tamer_drake.json b/res/trainers/trainer_dragon_tamer_drake.json → res/trainers/data/dragon_tamer_drake.json
diff --git a/...ainers/trainer_dragon_tamer_geoffrey.json → res/trainers/data/dragon_tamer_geoffrey.json b/...ainers/trainer_dragon_tamer_geoffrey.json → res/trainers/data/dragon_tamer_geoffrey.json
diff --git a/...rainer_dragon_tamer_geoffrey_rematch.json → ...s/data/dragon_tamer_geoffrey_rematch.json b/...rainer_dragon_tamer_geoffrey_rematch.json → ...s/data/dragon_tamer_geoffrey_rematch.json
diff --git a/...trainers/trainer_dragon_tamer_hayden.json → res/trainers/data/dragon_tamer_hayden.json b/...trainers/trainer_dragon_tamer_hayden.json → res/trainers/data/dragon_tamer_hayden.json
diff --git a/.../trainer_dragon_tamer_hayden_rematch.json → ...ers/data/dragon_tamer_hayden_rematch.json b/.../trainer_dragon_tamer_hayden_rematch.json → ...ers/data/dragon_tamer_hayden_rematch.json
diff --git a/res/trainers/trainer_dragon_tamer_joe.json → res/trainers/data/dragon_tamer_joe.json b/res/trainers/trainer_dragon_tamer_joe.json → res/trainers/data/dragon_tamer_joe.json
diff --git a/...trainers/trainer_dragon_tamer_keegan.json → res/trainers/data/dragon_tamer_keegan.json b/...trainers/trainer_dragon_tamer_keegan.json → res/trainers/data/dragon_tamer_keegan.json
diff --git a/res/trainers/trainer_dragon_tamer_kenny.json → res/trainers/data/dragon_tamer_kenny.json b/res/trainers/trainer_dragon_tamer_kenny.json → res/trainers/data/dragon_tamer_kenny.json
diff --git a/...trainers/trainer_dragon_tamer_ondrej.json → res/trainers/data/dragon_tamer_ondrej.json b/...trainers/trainer_dragon_tamer_ondrej.json → res/trainers/data/dragon_tamer_ondrej.json
diff --git a/...rainers/trainer_dragon_tamer_patrick.json → res/trainers/data/dragon_tamer_patrick.json b/...rainers/trainer_dragon_tamer_patrick.json → res/trainers/data/dragon_tamer_patrick.json
diff --git a/...ainer_dragon_tamer_patrick_rematch_1.json → .../data/dragon_tamer_patrick_rematch_1.json b/...ainer_dragon_tamer_patrick_rematch_1.json → .../data/dragon_tamer_patrick_rematch_1.json
diff --git a/...ainer_dragon_tamer_patrick_rematch_2.json → .../data/dragon_tamer_patrick_rematch_2.json b/...ainer_dragon_tamer_patrick_rematch_2.json → .../data/dragon_tamer_patrick_rematch_2.json
diff --git a/...rainers/trainer_dragon_tamer_stanley.json → res/trainers/data/dragon_tamer_stanley.json b/...rainers/trainer_dragon_tamer_stanley.json → res/trainers/data/dragon_tamer_stanley.json
diff --git a/res/trainers/trainer_elite_four_aaron.json → res/trainers/data/elite_four_aaron.json b/res/trainers/trainer_elite_four_aaron.json → res/trainers/data/elite_four_aaron.json
diff --git a/...ers/trainer_elite_four_aaron_rematch.json → ...ainers/data/elite_four_aaron_rematch.json b/...ers/trainer_elite_four_aaron_rematch.json → ...ainers/data/elite_four_aaron_rematch.json
diff --git a/res/trainers/trainer_elite_four_bertha.json → res/trainers/data/elite_four_bertha.json b/res/trainers/trainer_elite_four_bertha.json → res/trainers/data/elite_four_bertha.json
diff --git a/...rs/trainer_elite_four_bertha_rematch.json → ...iners/data/elite_four_bertha_rematch.json b/...rs/trainer_elite_four_bertha_rematch.json → ...iners/data/elite_four_bertha_rematch.json
diff --git a/res/trainers/trainer_elite_four_flint.json → res/trainers/data/elite_four_flint.json b/res/trainers/trainer_elite_four_flint.json → res/trainers/data/elite_four_flint.json
diff --git a/.../trainer_elite_four_flint_fight_area.json → ...ers/data/elite_four_flint_fight_area.json b/.../trainer_elite_four_flint_fight_area.json → ...ers/data/elite_four_flint_fight_area.json
diff --git a/...ers/trainer_elite_four_flint_rematch.json → ...ainers/data/elite_four_flint_rematch.json b/...ers/trainer_elite_four_flint_rematch.json → ...ainers/data/elite_four_flint_rematch.json
diff --git a/res/trainers/trainer_elite_four_lucian.json → res/trainers/data/elite_four_lucian.json b/res/trainers/trainer_elite_four_lucian.json → res/trainers/data/elite_four_lucian.json
diff --git a/...rs/trainer_elite_four_lucian_rematch.json → ...iners/data/elite_four_lucian_rematch.json b/...rs/trainer_elite_four_lucian_rematch.json → ...iners/data/elite_four_lucian_rematch.json
diff --git a/res/trainers/trainer_fisherman_alec.json → res/trainers/data/fisherman_alec.json b/res/trainers/trainer_fisherman_alec.json → res/trainers/data/fisherman_alec.json
diff --git a/...iners/trainer_fisherman_alec_rematch.json → ...trainers/data/fisherman_alec_rematch.json b/...iners/trainer_fisherman_alec_rematch.json → ...trainers/data/fisherman_alec_rematch.json
diff --git a/res/trainers/trainer_fisherman_andrew.json → res/trainers/data/fisherman_andrew.json b/res/trainers/trainer_fisherman_andrew.json → res/trainers/data/fisherman_andrew.json
diff --git a/res/trainers/trainer_fisherman_brett.json → res/trainers/data/fisherman_brett.json b/res/trainers/trainer_fisherman_brett.json → res/trainers/data/fisherman_brett.json
diff --git a/res/trainers/trainer_fisherman_cody.json → res/trainers/data/fisherman_cody.json b/res/trainers/trainer_fisherman_cody.json → res/trainers/data/fisherman_cody.json
diff --git a/res/trainers/trainer_fisherman_cole.json → res/trainers/data/fisherman_cole.json b/res/trainers/trainer_fisherman_cole.json → res/trainers/data/fisherman_cole.json
diff --git a/res/trainers/trainer_fisherman_cory.json → res/trainers/data/fisherman_cory.json b/res/trainers/trainer_fisherman_cory.json → res/trainers/data/fisherman_cory.json
diff --git a/res/trainers/trainer_fisherman_erick.json → res/trainers/data/fisherman_erick.json b/res/trainers/trainer_fisherman_erick.json → res/trainers/data/fisherman_erick.json
diff --git a/res/trainers/trainer_fisherman_george.json → res/trainers/data/fisherman_george.json b/res/trainers/trainer_fisherman_george.json → res/trainers/data/fisherman_george.json
diff --git a/res/trainers/trainer_fisherman_joseph.json → res/trainers/data/fisherman_joseph.json b/res/trainers/trainer_fisherman_joseph.json → res/trainers/data/fisherman_joseph.json
diff --git a/...s/trainer_fisherman_joseph_rematch_1.json → ...ners/data/fisherman_joseph_rematch_1.json b/...s/trainer_fisherman_joseph_rematch_1.json → ...ners/data/fisherman_joseph_rematch_1.json
diff --git a/...s/trainer_fisherman_joseph_rematch_2.json → ...ners/data/fisherman_joseph_rematch_2.json b/...s/trainer_fisherman_joseph_rematch_2.json → ...ners/data/fisherman_joseph_rematch_2.json
diff --git a/res/trainers/trainer_fisherman_josh.json → res/trainers/data/fisherman_josh.json b/res/trainers/trainer_fisherman_josh.json → res/trainers/data/fisherman_josh.json
diff --git a/res/trainers/trainer_fisherman_juan.json → res/trainers/data/fisherman_juan.json b/res/trainers/trainer_fisherman_juan.json → res/trainers/data/fisherman_juan.json
diff --git a/res/trainers/trainer_fisherman_kenneth.json → res/trainers/data/fisherman_kenneth.json b/res/trainers/trainer_fisherman_kenneth.json → res/trainers/data/fisherman_kenneth.json
diff --git a/res/trainers/trainer_fisherman_luc.json → res/trainers/data/fisherman_luc.json b/res/trainers/trainer_fisherman_luc.json → res/trainers/data/fisherman_luc.json
diff --git a/res/trainers/trainer_fisherman_miguel.json → res/trainers/data/fisherman_miguel.json b/res/trainers/trainer_fisherman_miguel.json → res/trainers/data/fisherman_miguel.json
diff --git a/...ers/trainer_fisherman_miguel_rematch.json → ...ainers/data/fisherman_miguel_rematch.json b/...ers/trainer_fisherman_miguel_rematch.json → ...ainers/data/fisherman_miguel_rematch.json
diff --git a/res/trainers/trainer_fisherman_travis.json → res/trainers/data/fisherman_travis.json b/res/trainers/trainer_fisherman_travis.json → res/trainers/data/fisherman_travis.json
diff --git a/res/trainers/trainer_fisherman_walter.json → res/trainers/data/fisherman_walter.json b/res/trainers/trainer_fisherman_walter.json → res/trainers/data/fisherman_walter.json
diff --git a/res/trainers/trainer_fisherman_zachary.json → res/trainers/data/fisherman_zachary.json b/res/trainers/trainer_fisherman_zachary.json → res/trainers/data/fisherman_zachary.json
diff --git a/...actic_boss_cyrus_celestic_town_ruins.json → ...actic_boss_cyrus_celestic_town_ruins.json b/...actic_boss_cyrus_celestic_town_ruins.json → ...actic_boss_cyrus_celestic_town_ruins.json
diff --git a/...galactic_boss_cyrus_distortion_world.json → ...galactic_boss_cyrus_distortion_world.json b/...galactic_boss_cyrus_distortion_world.json → ...galactic_boss_cyrus_distortion_world.json
diff --git a/...iner_galactic_boss_cyrus_galactic_hq.json → ...data/galactic_boss_cyrus_galactic_hq.json b/...iner_galactic_boss_cyrus_galactic_hq.json → ...data/galactic_boss_cyrus_galactic_hq.json
diff --git a/...trainer_galactic_grunt_celestic_town.json → ...rs/data/galactic_grunt_celestic_town.json b/...trainer_galactic_grunt_celestic_town.json → ...rs/data/galactic_grunt_celestic_town.json
diff --git a/...ner_galactic_grunt_floaroma_meadow_1.json → ...ata/galactic_grunt_floaroma_meadow_1.json b/...ner_galactic_grunt_floaroma_meadow_1.json → ...ata/galactic_grunt_floaroma_meadow_1.json
diff --git a/...ner_galactic_grunt_floaroma_meadow_2.json → ...ata/galactic_grunt_floaroma_meadow_2.json b/...ner_galactic_grunt_floaroma_meadow_2.json → ...ata/galactic_grunt_floaroma_meadow_2.json
diff --git a/...rainer_galactic_grunt_galactic_hq_1f.json → ...s/data/galactic_grunt_galactic_hq_1f.json b/...rainer_galactic_grunt_galactic_hq_1f.json → ...s/data/galactic_grunt_galactic_hq_1f.json
diff --git a/...iner_galactic_grunt_galactic_hq_2f_1.json → ...data/galactic_grunt_galactic_hq_2f_1.json b/...iner_galactic_grunt_galactic_hq_2f_1.json → ...data/galactic_grunt_galactic_hq_2f_1.json
diff --git a/...iner_galactic_grunt_galactic_hq_2f_2.json → ...data/galactic_grunt_galactic_hq_2f_2.json b/...iner_galactic_grunt_galactic_hq_2f_2.json → ...data/galactic_grunt_galactic_hq_2f_2.json
diff --git a/...iner_galactic_grunt_galactic_hq_2f_3.json → ...data/galactic_grunt_galactic_hq_2f_3.json b/...iner_galactic_grunt_galactic_hq_2f_3.json → ...data/galactic_grunt_galactic_hq_2f_3.json
diff --git a/...iner_galactic_grunt_galactic_hq_3f_1.json → ...data/galactic_grunt_galactic_hq_3f_1.json b/...iner_galactic_grunt_galactic_hq_3f_1.json → ...data/galactic_grunt_galactic_hq_3f_1.json
diff --git a/...iner_galactic_grunt_galactic_hq_3f_2.json → ...data/galactic_grunt_galactic_hq_3f_2.json b/...iner_galactic_grunt_galactic_hq_3f_2.json → ...data/galactic_grunt_galactic_hq_3f_2.json
diff --git a/...iner_galactic_grunt_galactic_hq_3f_3.json → ...data/galactic_grunt_galactic_hq_3f_3.json b/...iner_galactic_grunt_galactic_hq_3f_3.json → ...data/galactic_grunt_galactic_hq_3f_3.json
diff --git a/...iner_galactic_grunt_galactic_hq_3f_4.json → ...data/galactic_grunt_galactic_hq_3f_4.json b/...iner_galactic_grunt_galactic_hq_3f_4.json → ...data/galactic_grunt_galactic_hq_3f_4.json
diff --git a/...ner_galactic_grunt_galactic_hq_b2f_1.json → ...ata/galactic_grunt_galactic_hq_b2f_1.json b/...ner_galactic_grunt_galactic_hq_b2f_1.json → ...ata/galactic_grunt_galactic_hq_b2f_1.json
diff --git a/...ner_galactic_grunt_galactic_hq_b2f_2.json → ...ata/galactic_grunt_galactic_hq_b2f_2.json b/...ner_galactic_grunt_galactic_hq_b2f_2.json → ...ata/galactic_grunt_galactic_hq_b2f_2.json
diff --git a/...trainer_galactic_grunt_iron_island_1.json → ...rs/data/galactic_grunt_iron_island_1.json b/...trainer_galactic_grunt_iron_island_1.json → ...rs/data/galactic_grunt_iron_island_1.json
diff --git a/...trainer_galactic_grunt_iron_island_2.json → ...rs/data/galactic_grunt_iron_island_2.json b/...trainer_galactic_grunt_iron_island_2.json → ...rs/data/galactic_grunt_iron_island_2.json
diff --git a/...ainer_galactic_grunt_jubilife_city_1.json → .../data/galactic_grunt_jubilife_city_1.json b/...ainer_galactic_grunt_jubilife_city_1.json → .../data/galactic_grunt_jubilife_city_1.json
diff --git a/...ainer_galactic_grunt_jubilife_city_2.json → .../data/galactic_grunt_jubilife_city_2.json b/...ainer_galactic_grunt_jubilife_city_2.json → .../data/galactic_grunt_jubilife_city_2.json
diff --git a/.../trainer_galactic_grunt_lake_valor_1.json → ...ers/data/galactic_grunt_lake_valor_1.json b/.../trainer_galactic_grunt_lake_valor_1.json → ...ers/data/galactic_grunt_lake_valor_1.json
diff --git a/.../trainer_galactic_grunt_lake_valor_2.json → ...ers/data/galactic_grunt_lake_valor_2.json b/.../trainer_galactic_grunt_lake_valor_2.json → ...ers/data/galactic_grunt_lake_valor_2.json
diff --git a/.../trainer_galactic_grunt_lake_valor_3.json → ...ers/data/galactic_grunt_lake_valor_3.json b/.../trainer_galactic_grunt_lake_valor_3.json → ...ers/data/galactic_grunt_lake_valor_3.json
diff --git a/...trainer_galactic_grunt_lake_verity_1.json → ...rs/data/galactic_grunt_lake_verity_1.json b/...trainer_galactic_grunt_lake_verity_1.json → ...rs/data/galactic_grunt_lake_verity_1.json
diff --git a/...trainer_galactic_grunt_lake_verity_2.json → ...rs/data/galactic_grunt_lake_verity_2.json b/...trainer_galactic_grunt_lake_verity_2.json → ...rs/data/galactic_grunt_lake_verity_2.json
diff --git a/...trainer_galactic_grunt_lake_verity_3.json → ...rs/data/galactic_grunt_lake_verity_3.json b/...trainer_galactic_grunt_lake_verity_3.json → ...rs/data/galactic_grunt_lake_verity_3.json
diff --git a/...trainer_galactic_grunt_lake_verity_4.json → ...rs/data/galactic_grunt_lake_verity_4.json b/...trainer_galactic_grunt_lake_verity_4.json → ...rs/data/galactic_grunt_lake_verity_4.json
diff --git a/...ainer_galactic_grunt_mt_coronet_3f_1.json → .../data/galactic_grunt_mt_coronet_3f_1.json b/...ainer_galactic_grunt_mt_coronet_3f_1.json → .../data/galactic_grunt_mt_coronet_3f_1.json
diff --git a/...ainer_galactic_grunt_mt_coronet_4f_1.json → .../data/galactic_grunt_mt_coronet_4f_1.json b/...ainer_galactic_grunt_mt_coronet_4f_1.json → .../data/galactic_grunt_mt_coronet_4f_1.json
diff --git a/...ainer_galactic_grunt_mt_coronet_4f_2.json → .../data/galactic_grunt_mt_coronet_4f_2.json b/...ainer_galactic_grunt_mt_coronet_4f_2.json → .../data/galactic_grunt_mt_coronet_4f_2.json