diff --git a/generated/ai_flags.txt b/generated/ai_flags.txt index 59fbb57f1c..361136dd2e 100644 --- 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 index e776babe77..2fb0225a64 100644 --- 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 b/res/trainers/data/ace_trainer_abel.json similarity index 100% rename from res/trainers/trainer_ace_trainer_abel.json rename to res/trainers/data/ace_trainer_abel.json diff --git a/res/trainers/trainer_ace_trainer_alicia.json b/res/trainers/data/ace_trainer_alicia.json similarity index 100% rename from res/trainers/trainer_ace_trainer_alicia.json rename to res/trainers/data/ace_trainer_alicia.json diff --git a/res/trainers/trainer_ace_trainer_allen.json b/res/trainers/data/ace_trainer_allen.json similarity index 100% rename from res/trainers/trainer_ace_trainer_allen.json rename to res/trainers/data/ace_trainer_allen.json diff --git a/res/trainers/trainer_ace_trainer_alyssa.json b/res/trainers/data/ace_trainer_alyssa.json similarity index 100% rename from res/trainers/trainer_ace_trainer_alyssa.json rename to res/trainers/data/ace_trainer_alyssa.json diff --git a/res/trainers/trainer_ace_trainer_anton.json b/res/trainers/data/ace_trainer_anton.json similarity index 100% rename from res/trainers/trainer_ace_trainer_anton.json rename to res/trainers/data/ace_trainer_anton.json diff --git a/res/trainers/trainer_ace_trainer_arthur.json b/res/trainers/data/ace_trainer_arthur.json similarity index 100% rename from res/trainers/trainer_ace_trainer_arthur.json rename to res/trainers/data/ace_trainer_arthur.json diff --git a/res/trainers/trainer_ace_trainer_blake.json b/res/trainers/data/ace_trainer_blake.json similarity index 100% rename from res/trainers/trainer_ace_trainer_blake.json rename to res/trainers/data/ace_trainer_blake.json diff --git a/res/trainers/trainer_ace_trainer_brandi.json b/res/trainers/data/ace_trainer_brandi.json similarity index 100% rename from res/trainers/trainer_ace_trainer_brandi.json rename to res/trainers/data/ace_trainer_brandi.json diff --git a/res/trainers/trainer_ace_trainer_breanna.json b/res/trainers/data/ace_trainer_breanna.json similarity index 100% rename from res/trainers/trainer_ace_trainer_breanna.json rename to res/trainers/data/ace_trainer_breanna.json diff --git a/res/trainers/trainer_ace_trainer_brenda.json b/res/trainers/data/ace_trainer_brenda.json similarity index 100% rename from res/trainers/trainer_ace_trainer_brenda.json rename to res/trainers/data/ace_trainer_brenda.json diff --git a/res/trainers/trainer_ace_trainer_brenna.json b/res/trainers/data/ace_trainer_brenna.json similarity index 100% rename from res/trainers/trainer_ace_trainer_brenna.json rename to res/trainers/data/ace_trainer_brenna.json diff --git a/res/trainers/trainer_ace_trainer_catherine.json b/res/trainers/data/ace_trainer_catherine.json similarity index 100% rename from res/trainers/trainer_ace_trainer_catherine.json rename to res/trainers/data/ace_trainer_catherine.json diff --git a/res/trainers/trainer_ace_trainer_cesar.json b/res/trainers/data/ace_trainer_cesar.json similarity index 100% rename from res/trainers/trainer_ace_trainer_cesar.json rename to res/trainers/data/ace_trainer_cesar.json diff --git a/res/trainers/trainer_ace_trainer_clarice.json b/res/trainers/data/ace_trainer_clarice.json similarity index 100% rename from res/trainers/trainer_ace_trainer_clarice.json rename to res/trainers/data/ace_trainer_clarice.json diff --git a/res/trainers/trainer_ace_trainer_dalton.json b/res/trainers/data/ace_trainer_dalton.json similarity index 100% rename from res/trainers/trainer_ace_trainer_dalton.json rename to res/trainers/data/ace_trainer_dalton.json diff --git a/res/trainers/trainer_ace_trainer_dalton_rematch.json b/res/trainers/data/ace_trainer_dalton_rematch.json similarity index 100% rename from res/trainers/trainer_ace_trainer_dalton_rematch.json rename to res/trainers/data/ace_trainer_dalton_rematch.json diff --git a/res/trainers/trainer_ace_trainer_dana.json b/res/trainers/data/ace_trainer_dana.json similarity index 100% rename from res/trainers/trainer_ace_trainer_dana.json rename to res/trainers/data/ace_trainer_dana.json diff --git a/res/trainers/trainer_ace_trainer_deanna.json b/res/trainers/data/ace_trainer_deanna.json similarity index 100% rename from res/trainers/trainer_ace_trainer_deanna.json rename to res/trainers/data/ace_trainer_deanna.json diff --git a/res/trainers/trainer_ace_trainer_deanna_rematch.json b/res/trainers/data/ace_trainer_deanna_rematch.json similarity index 100% rename from res/trainers/trainer_ace_trainer_deanna_rematch.json rename to res/trainers/data/ace_trainer_deanna_rematch.json diff --git a/res/trainers/trainer_ace_trainer_dennis.json b/res/trainers/data/ace_trainer_dennis.json similarity index 100% rename from res/trainers/trainer_ace_trainer_dennis.json rename to res/trainers/data/ace_trainer_dennis.json diff --git a/res/trainers/trainer_ace_trainer_dennis_rematch_1.json b/res/trainers/data/ace_trainer_dennis_rematch_1.json similarity index 100% rename from res/trainers/trainer_ace_trainer_dennis_rematch_1.json rename to res/trainers/data/ace_trainer_dennis_rematch_1.json diff --git a/res/trainers/trainer_ace_trainer_dennis_rematch_2.json b/res/trainers/data/ace_trainer_dennis_rematch_2.json similarity index 100% rename from res/trainers/trainer_ace_trainer_dennis_rematch_2.json rename to res/trainers/data/ace_trainer_dennis_rematch_2.json diff --git a/res/trainers/trainer_ace_trainer_destiny.json b/res/trainers/data/ace_trainer_destiny.json similarity index 100% rename from res/trainers/trainer_ace_trainer_destiny.json rename to res/trainers/data/ace_trainer_destiny.json diff --git a/res/trainers/trainer_ace_trainer_ernest.json b/res/trainers/data/ace_trainer_ernest.json similarity index 100% rename from res/trainers/trainer_ace_trainer_ernest.json rename to res/trainers/data/ace_trainer_ernest.json diff --git a/res/trainers/trainer_ace_trainer_felix.json b/res/trainers/data/ace_trainer_felix.json similarity index 100% rename from res/trainers/trainer_ace_trainer_felix.json rename to res/trainers/data/ace_trainer_felix.json diff --git a/res/trainers/trainer_ace_trainer_garrett.json b/res/trainers/data/ace_trainer_garrett.json similarity index 100% rename from res/trainers/trainer_ace_trainer_garrett.json rename to res/trainers/data/ace_trainer_garrett.json diff --git a/res/trainers/trainer_ace_trainer_graham.json b/res/trainers/data/ace_trainer_graham.json similarity index 100% rename from res/trainers/trainer_ace_trainer_graham.json rename to res/trainers/data/ace_trainer_graham.json diff --git a/res/trainers/trainer_ace_trainer_henry.json b/res/trainers/data/ace_trainer_henry.json similarity index 100% rename from res/trainers/trainer_ace_trainer_henry.json rename to res/trainers/data/ace_trainer_henry.json diff --git a/res/trainers/trainer_ace_trainer_isaiah.json b/res/trainers/data/ace_trainer_isaiah.json similarity index 100% rename from res/trainers/trainer_ace_trainer_isaiah.json rename to res/trainers/data/ace_trainer_isaiah.json diff --git a/res/trainers/trainer_ace_trainer_jake.json b/res/trainers/data/ace_trainer_jake.json similarity index 100% rename from res/trainers/trainer_ace_trainer_jake.json rename to res/trainers/data/ace_trainer_jake.json diff --git a/res/trainers/trainer_ace_trainer_jake_rematch.json b/res/trainers/data/ace_trainer_jake_rematch.json similarity index 100% rename from res/trainers/trainer_ace_trainer_jake_rematch.json rename to res/trainers/data/ace_trainer_jake_rematch.json diff --git a/res/trainers/trainer_ace_trainer_jamie.json b/res/trainers/data/ace_trainer_jamie.json similarity index 100% rename from res/trainers/trainer_ace_trainer_jamie.json rename to res/trainers/data/ace_trainer_jamie.json diff --git a/res/trainers/trainer_ace_trainer_jasmin.json b/res/trainers/data/ace_trainer_jasmin.json similarity index 100% rename from res/trainers/trainer_ace_trainer_jasmin.json rename to res/trainers/data/ace_trainer_jasmin.json diff --git a/res/trainers/trainer_ace_trainer_jonah.json b/res/trainers/data/ace_trainer_jonah.json similarity index 100% rename from res/trainers/trainer_ace_trainer_jonah.json rename to res/trainers/data/ace_trainer_jonah.json diff --git a/res/trainers/trainer_ace_trainer_jose.json b/res/trainers/data/ace_trainer_jose.json similarity index 100% rename from res/trainers/trainer_ace_trainer_jose.json rename to res/trainers/data/ace_trainer_jose.json diff --git a/res/trainers/trainer_ace_trainer_kassandra.json b/res/trainers/data/ace_trainer_kassandra.json similarity index 100% rename from res/trainers/trainer_ace_trainer_kassandra.json rename to res/trainers/data/ace_trainer_kassandra.json diff --git a/res/trainers/trainer_ace_trainer_keenan.json b/res/trainers/data/ace_trainer_keenan.json similarity index 100% rename from res/trainers/trainer_ace_trainer_keenan.json rename to res/trainers/data/ace_trainer_keenan.json diff --git a/res/trainers/trainer_ace_trainer_laura.json b/res/trainers/data/ace_trainer_laura.json similarity index 100% rename from res/trainers/trainer_ace_trainer_laura.json rename to res/trainers/data/ace_trainer_laura.json diff --git a/res/trainers/trainer_ace_trainer_maria.json b/res/trainers/data/ace_trainer_maria.json similarity index 100% rename from res/trainers/trainer_ace_trainer_maria.json rename to res/trainers/data/ace_trainer_maria.json diff --git a/res/trainers/trainer_ace_trainer_mariah.json b/res/trainers/data/ace_trainer_mariah.json similarity index 100% rename from res/trainers/trainer_ace_trainer_mariah.json rename to res/trainers/data/ace_trainer_mariah.json diff --git a/res/trainers/trainer_ace_trainer_maya.json b/res/trainers/data/ace_trainer_maya.json similarity index 100% rename from res/trainers/trainer_ace_trainer_maya.json rename to res/trainers/data/ace_trainer_maya.json diff --git a/res/trainers/trainer_ace_trainer_maya_rematch_1.json b/res/trainers/data/ace_trainer_maya_rematch_1.json similarity index 100% rename from res/trainers/trainer_ace_trainer_maya_rematch_1.json rename to res/trainers/data/ace_trainer_maya_rematch_1.json diff --git a/res/trainers/trainer_ace_trainer_maya_rematch_2.json b/res/trainers/data/ace_trainer_maya_rematch_2.json similarity index 100% rename from res/trainers/trainer_ace_trainer_maya_rematch_2.json rename to res/trainers/data/ace_trainer_maya_rematch_2.json diff --git a/res/trainers/trainer_ace_trainer_meagan.json b/res/trainers/data/ace_trainer_meagan.json similarity index 100% rename from res/trainers/trainer_ace_trainer_meagan.json rename to res/trainers/data/ace_trainer_meagan.json diff --git a/res/trainers/trainer_ace_trainer_micah.json b/res/trainers/data/ace_trainer_micah.json similarity index 100% rename from res/trainers/trainer_ace_trainer_micah.json rename to res/trainers/data/ace_trainer_micah.json diff --git a/res/trainers/trainer_ace_trainer_mikayla.json b/res/trainers/data/ace_trainer_mikayla.json similarity index 100% rename from res/trainers/trainer_ace_trainer_mikayla.json rename to res/trainers/data/ace_trainer_mikayla.json diff --git a/res/trainers/trainer_ace_trainer_moira.json b/res/trainers/data/ace_trainer_moira.json similarity index 100% rename from res/trainers/trainer_ace_trainer_moira.json rename to res/trainers/data/ace_trainer_moira.json diff --git a/res/trainers/trainer_ace_trainer_moira_rematch.json b/res/trainers/data/ace_trainer_moira_rematch.json similarity index 100% rename from res/trainers/trainer_ace_trainer_moira_rematch.json rename to res/trainers/data/ace_trainer_moira_rematch.json diff --git a/res/trainers/trainer_ace_trainer_monique.json b/res/trainers/data/ace_trainer_monique.json similarity index 100% rename from res/trainers/trainer_ace_trainer_monique.json rename to res/trainers/data/ace_trainer_monique.json diff --git a/res/trainers/trainer_ace_trainer_natasha.json b/res/trainers/data/ace_trainer_natasha.json similarity index 100% rename from res/trainers/trainer_ace_trainer_natasha.json rename to res/trainers/data/ace_trainer_natasha.json diff --git a/res/trainers/trainer_ace_trainer_olivia.json b/res/trainers/data/ace_trainer_olivia.json similarity index 100% rename from res/trainers/trainer_ace_trainer_olivia.json rename to res/trainers/data/ace_trainer_olivia.json diff --git a/res/trainers/trainer_ace_trainer_olivia_rematch.json b/res/trainers/data/ace_trainer_olivia_rematch.json similarity index 100% rename from res/trainers/trainer_ace_trainer_olivia_rematch.json rename to res/trainers/data/ace_trainer_olivia_rematch.json diff --git a/res/trainers/trainer_ace_trainer_omar.json b/res/trainers/data/ace_trainer_omar.json similarity index 100% rename from res/trainers/trainer_ace_trainer_omar.json rename to res/trainers/data/ace_trainer_omar.json diff --git a/res/trainers/trainer_ace_trainer_quinn.json b/res/trainers/data/ace_trainer_quinn.json similarity index 100% rename from res/trainers/trainer_ace_trainer_quinn.json rename to res/trainers/data/ace_trainer_quinn.json diff --git a/res/trainers/trainer_ace_trainer_rodolfo.json b/res/trainers/data/ace_trainer_rodolfo.json similarity index 100% rename from res/trainers/trainer_ace_trainer_rodolfo.json rename to res/trainers/data/ace_trainer_rodolfo.json diff --git a/res/trainers/trainer_ace_trainer_rodolfo_rematch.json b/res/trainers/data/ace_trainer_rodolfo_rematch.json similarity index 100% rename from res/trainers/trainer_ace_trainer_rodolfo_rematch.json rename to res/trainers/data/ace_trainer_rodolfo_rematch.json diff --git a/res/trainers/trainer_ace_trainer_ruben.json b/res/trainers/data/ace_trainer_ruben.json similarity index 100% rename from res/trainers/trainer_ace_trainer_ruben.json rename to res/trainers/data/ace_trainer_ruben.json diff --git a/res/trainers/trainer_ace_trainer_sandra.json b/res/trainers/data/ace_trainer_sandra.json similarity index 100% rename from res/trainers/trainer_ace_trainer_sandra.json rename to res/trainers/data/ace_trainer_sandra.json diff --git a/res/trainers/trainer_ace_trainer_saul.json b/res/trainers/data/ace_trainer_saul.json similarity index 100% rename from res/trainers/trainer_ace_trainer_saul.json rename to res/trainers/data/ace_trainer_saul.json diff --git a/res/trainers/trainer_ace_trainer_saul_rematch.json b/res/trainers/data/ace_trainer_saul_rematch.json similarity index 100% rename from res/trainers/trainer_ace_trainer_saul_rematch.json rename to res/trainers/data/ace_trainer_saul_rematch.json diff --git a/res/trainers/trainer_ace_trainer_savannah.json b/res/trainers/data/ace_trainer_savannah.json similarity index 100% rename from res/trainers/trainer_ace_trainer_savannah.json rename to res/trainers/data/ace_trainer_savannah.json diff --git a/res/trainers/trainer_ace_trainer_sergio.json b/res/trainers/data/ace_trainer_sergio.json similarity index 100% rename from res/trainers/trainer_ace_trainer_sergio.json rename to res/trainers/data/ace_trainer_sergio.json diff --git a/res/trainers/trainer_ace_trainer_shannon.json b/res/trainers/data/ace_trainer_shannon.json similarity index 100% rename from res/trainers/trainer_ace_trainer_shannon.json rename to res/trainers/data/ace_trainer_shannon.json diff --git a/res/trainers/trainer_ace_trainer_shannon_rematch.json b/res/trainers/data/ace_trainer_shannon_rematch.json similarity index 100% rename from res/trainers/trainer_ace_trainer_shannon_rematch.json rename to res/trainers/data/ace_trainer_shannon_rematch.json diff --git a/res/trainers/trainer_ace_trainer_skylar.json b/res/trainers/data/ace_trainer_skylar.json similarity index 100% rename from res/trainers/trainer_ace_trainer_skylar.json rename to res/trainers/data/ace_trainer_skylar.json diff --git a/res/trainers/trainer_ace_trainer_stefan.json b/res/trainers/data/ace_trainer_stefan.json similarity index 100% rename from res/trainers/trainer_ace_trainer_stefan.json rename to res/trainers/data/ace_trainer_stefan.json diff --git a/res/trainers/trainer_ace_trainer_sydney.json b/res/trainers/data/ace_trainer_sydney.json similarity index 100% rename from res/trainers/trainer_ace_trainer_sydney.json rename to res/trainers/data/ace_trainer_sydney.json diff --git a/res/trainers/trainer_ace_trainer_zachery.json b/res/trainers/data/ace_trainer_zachery.json similarity index 100% rename from res/trainers/trainer_ace_trainer_zachery.json rename to res/trainers/data/ace_trainer_zachery.json diff --git a/res/trainers/trainer_aroma_lady_alison.json b/res/trainers/data/aroma_lady_alison.json similarity index 100% rename from res/trainers/trainer_aroma_lady_alison.json rename to res/trainers/data/aroma_lady_alison.json diff --git a/res/trainers/trainer_aroma_lady_angela.json b/res/trainers/data/aroma_lady_angela.json similarity index 100% rename from res/trainers/trainer_aroma_lady_angela.json rename to res/trainers/data/aroma_lady_angela.json diff --git a/res/trainers/trainer_aroma_lady_elizabeth.json b/res/trainers/data/aroma_lady_elizabeth.json similarity index 100% rename from res/trainers/trainer_aroma_lady_elizabeth.json rename to res/trainers/data/aroma_lady_elizabeth.json diff --git a/res/trainers/trainer_aroma_lady_elizabeth_rematch_1.json b/res/trainers/data/aroma_lady_elizabeth_rematch_1.json similarity index 100% rename from res/trainers/trainer_aroma_lady_elizabeth_rematch_1.json rename to res/trainers/data/aroma_lady_elizabeth_rematch_1.json diff --git a/res/trainers/trainer_aroma_lady_elizabeth_rematch_2.json b/res/trainers/data/aroma_lady_elizabeth_rematch_2.json similarity index 100% rename from res/trainers/trainer_aroma_lady_elizabeth_rematch_2.json rename to res/trainers/data/aroma_lady_elizabeth_rematch_2.json diff --git a/res/trainers/trainer_aroma_lady_elizabeth_rematch_3.json b/res/trainers/data/aroma_lady_elizabeth_rematch_3.json similarity index 100% rename from res/trainers/trainer_aroma_lady_elizabeth_rematch_3.json rename to res/trainers/data/aroma_lady_elizabeth_rematch_3.json diff --git a/res/trainers/trainer_aroma_lady_hannah.json b/res/trainers/data/aroma_lady_hannah.json similarity index 100% rename from res/trainers/trainer_aroma_lady_hannah.json rename to res/trainers/data/aroma_lady_hannah.json diff --git a/res/trainers/trainer_aroma_lady_jenna.json b/res/trainers/data/aroma_lady_jenna.json similarity index 100% rename from res/trainers/trainer_aroma_lady_jenna.json rename to res/trainers/data/aroma_lady_jenna.json diff --git a/res/trainers/trainer_aroma_lady_taylor.json b/res/trainers/data/aroma_lady_taylor.json similarity index 100% rename from res/trainers/trainer_aroma_lady_taylor.json rename to res/trainers/data/aroma_lady_taylor.json diff --git a/res/trainers/trainer_artist_ismael.json b/res/trainers/data/artist_ismael.json similarity index 100% rename from res/trainers/trainer_artist_ismael.json rename to res/trainers/data/artist_ismael.json diff --git a/res/trainers/trainer_artist_william.json b/res/trainers/data/artist_william.json similarity index 100% rename from res/trainers/trainer_artist_william.json rename to res/trainers/data/artist_william.json diff --git a/res/trainers/trainer_artist_william_rematch_1.json b/res/trainers/data/artist_william_rematch_1.json similarity index 100% rename from res/trainers/trainer_artist_william_rematch_1.json rename to res/trainers/data/artist_william_rematch_1.json diff --git a/res/trainers/trainer_artist_william_rematch_2.json b/res/trainers/data/artist_william_rematch_2.json similarity index 100% rename from res/trainers/trainer_artist_william_rematch_2.json rename to res/trainers/data/artist_william_rematch_2.json diff --git a/res/trainers/trainer_artist_william_rematch_3.json b/res/trainers/data/artist_william_rematch_3.json similarity index 100% rename from res/trainers/trainer_artist_william_rematch_3.json rename to res/trainers/data/artist_william_rematch_3.json diff --git a/res/trainers/trainer_battle_girl_helen.json b/res/trainers/data/battle_girl_helen.json similarity index 100% rename from res/trainers/trainer_battle_girl_helen.json rename to res/trainers/data/battle_girl_helen.json diff --git a/res/trainers/trainer_battle_girl_helen_rematch_1.json b/res/trainers/data/battle_girl_helen_rematch_1.json similarity index 100% rename from res/trainers/trainer_battle_girl_helen_rematch_1.json rename to res/trainers/data/battle_girl_helen_rematch_1.json diff --git a/res/trainers/trainer_battle_girl_helen_rematch_2.json b/res/trainers/data/battle_girl_helen_rematch_2.json similarity index 100% rename from res/trainers/trainer_battle_girl_helen_rematch_2.json rename to res/trainers/data/battle_girl_helen_rematch_2.json diff --git a/res/trainers/trainer_battle_girl_helen_rematch_3.json b/res/trainers/data/battle_girl_helen_rematch_3.json similarity index 100% rename from res/trainers/trainer_battle_girl_helen_rematch_3.json rename to res/trainers/data/battle_girl_helen_rematch_3.json diff --git a/res/trainers/trainer_battle_girl_kelsey.json b/res/trainers/data/battle_girl_kelsey.json similarity index 100% rename from res/trainers/trainer_battle_girl_kelsey.json rename to res/trainers/data/battle_girl_kelsey.json diff --git a/res/trainers/trainer_battle_girl_tyler.json b/res/trainers/data/battle_girl_tyler.json similarity index 100% rename from res/trainers/trainer_battle_girl_tyler.json rename to res/trainers/data/battle_girl_tyler.json diff --git a/res/trainers/trainer_beauty_cyndy.json b/res/trainers/data/beauty_cyndy.json similarity index 100% rename from res/trainers/trainer_beauty_cyndy.json rename to res/trainers/data/beauty_cyndy.json diff --git a/res/trainers/trainer_beauty_cyndy_rematch_1.json b/res/trainers/data/beauty_cyndy_rematch_1.json similarity index 100% rename from res/trainers/trainer_beauty_cyndy_rematch_1.json rename to res/trainers/data/beauty_cyndy_rematch_1.json diff --git a/res/trainers/trainer_beauty_cyndy_rematch_2.json b/res/trainers/data/beauty_cyndy_rematch_2.json similarity index 100% rename from res/trainers/trainer_beauty_cyndy_rematch_2.json rename to res/trainers/data/beauty_cyndy_rematch_2.json diff --git a/res/trainers/trainer_beauty_devon.json b/res/trainers/data/beauty_devon.json similarity index 100% rename from res/trainers/trainer_beauty_devon.json rename to res/trainers/data/beauty_devon.json diff --git a/res/trainers/trainer_beauty_gabriella.json b/res/trainers/data/beauty_gabriella.json similarity index 100% rename from res/trainers/trainer_beauty_gabriella.json rename to res/trainers/data/beauty_gabriella.json diff --git a/res/trainers/trainer_beauty_harley.json b/res/trainers/data/beauty_harley.json similarity index 100% rename from res/trainers/trainer_beauty_harley.json rename to res/trainers/data/beauty_harley.json diff --git a/res/trainers/trainer_beauty_lindsay.json b/res/trainers/data/beauty_lindsay.json similarity index 100% rename from res/trainers/trainer_beauty_lindsay.json rename to res/trainers/data/beauty_lindsay.json diff --git a/res/trainers/trainer_beauty_nicola.json b/res/trainers/data/beauty_nicola.json similarity index 100% rename from res/trainers/trainer_beauty_nicola.json rename to res/trainers/data/beauty_nicola.json diff --git a/res/trainers/trainer_belle_and_pa_ava_and_matt.json b/res/trainers/data/belle_and_pa_ava_and_matt.json similarity index 100% rename from res/trainers/trainer_belle_and_pa_ava_and_matt.json rename to res/trainers/data/belle_and_pa_ava_and_matt.json diff --git a/res/trainers/trainer_belle_and_pa_beth_and_bob.json b/res/trainers/data/belle_and_pa_beth_and_bob.json similarity index 100% rename from res/trainers/trainer_belle_and_pa_beth_and_bob.json rename to res/trainers/data/belle_and_pa_beth_and_bob.json diff --git a/res/trainers/trainer_bird_keeper_alexandra.json b/res/trainers/data/bird_keeper_alexandra.json similarity index 100% rename from res/trainers/trainer_bird_keeper_alexandra.json rename to res/trainers/data/bird_keeper_alexandra.json diff --git a/res/trainers/trainer_bird_keeper_audrey.json b/res/trainers/data/bird_keeper_audrey.json similarity index 100% rename from res/trainers/trainer_bird_keeper_audrey.json rename to res/trainers/data/bird_keeper_audrey.json diff --git a/res/trainers/trainer_bird_keeper_audrey_rematch.json b/res/trainers/data/bird_keeper_audrey_rematch.json similarity index 100% rename from res/trainers/trainer_bird_keeper_audrey_rematch.json rename to res/trainers/data/bird_keeper_audrey_rematch.json diff --git a/res/trainers/trainer_bird_keeper_autumn.json b/res/trainers/data/bird_keeper_autumn.json similarity index 100% rename from res/trainers/trainer_bird_keeper_autumn.json rename to res/trainers/data/bird_keeper_autumn.json diff --git a/res/trainers/trainer_bird_keeper_brianna.json b/res/trainers/data/bird_keeper_brianna.json similarity index 100% rename from res/trainers/trainer_bird_keeper_brianna.json rename to res/trainers/data/bird_keeper_brianna.json diff --git a/res/trainers/trainer_bird_keeper_brianna_rematch_1.json b/res/trainers/data/bird_keeper_brianna_rematch_1.json similarity index 100% rename from res/trainers/trainer_bird_keeper_brianna_rematch_1.json rename to res/trainers/data/bird_keeper_brianna_rematch_1.json diff --git a/res/trainers/trainer_bird_keeper_brianna_rematch_2.json b/res/trainers/data/bird_keeper_brianna_rematch_2.json similarity index 100% rename from res/trainers/trainer_bird_keeper_brianna_rematch_2.json rename to res/trainers/data/bird_keeper_brianna_rematch_2.json diff --git a/res/trainers/trainer_bird_keeper_geneva.json b/res/trainers/data/bird_keeper_geneva.json similarity index 100% rename from res/trainers/trainer_bird_keeper_geneva.json rename to res/trainers/data/bird_keeper_geneva.json diff --git a/res/trainers/trainer_bird_keeper_hana.json b/res/trainers/data/bird_keeper_hana.json similarity index 100% rename from res/trainers/trainer_bird_keeper_hana.json rename to res/trainers/data/bird_keeper_hana.json diff --git a/res/trainers/trainer_bird_keeper_katherine.json b/res/trainers/data/bird_keeper_katherine.json similarity index 100% rename from res/trainers/trainer_bird_keeper_katherine.json rename to res/trainers/data/bird_keeper_katherine.json diff --git a/res/trainers/trainer_bird_keeper_krystal.json b/res/trainers/data/bird_keeper_krystal.json similarity index 100% rename from res/trainers/trainer_bird_keeper_krystal.json rename to res/trainers/data/bird_keeper_krystal.json diff --git a/res/trainers/trainer_black_belt_adam.json b/res/trainers/data/black_belt_adam.json similarity index 100% rename from res/trainers/trainer_black_belt_adam.json rename to res/trainers/data/black_belt_adam.json diff --git a/res/trainers/trainer_black_belt_carl.json b/res/trainers/data/black_belt_carl.json similarity index 100% rename from res/trainers/trainer_black_belt_carl.json rename to res/trainers/data/black_belt_carl.json diff --git a/res/trainers/trainer_black_belt_colby.json b/res/trainers/data/black_belt_colby.json similarity index 100% rename from res/trainers/trainer_black_belt_colby.json rename to res/trainers/data/black_belt_colby.json diff --git a/res/trainers/trainer_black_belt_darren.json b/res/trainers/data/black_belt_darren.json similarity index 100% rename from res/trainers/trainer_black_belt_darren.json rename to res/trainers/data/black_belt_darren.json diff --git a/res/trainers/trainer_black_belt_david.json b/res/trainers/data/black_belt_david.json similarity index 100% rename from res/trainers/trainer_black_belt_david.json rename to res/trainers/data/black_belt_david.json diff --git a/res/trainers/trainer_black_belt_davon.json b/res/trainers/data/black_belt_davon.json similarity index 100% rename from res/trainers/trainer_black_belt_davon.json rename to res/trainers/data/black_belt_davon.json diff --git a/res/trainers/trainer_black_belt_davon_rematch.json b/res/trainers/data/black_belt_davon_rematch.json similarity index 100% rename from res/trainers/trainer_black_belt_davon_rematch.json rename to res/trainers/data/black_belt_davon_rematch.json diff --git a/res/trainers/trainer_black_belt_derek.json b/res/trainers/data/black_belt_derek.json similarity index 100% rename from res/trainers/trainer_black_belt_derek.json rename to res/trainers/data/black_belt_derek.json diff --git a/res/trainers/trainer_black_belt_eddie.json b/res/trainers/data/black_belt_eddie.json similarity index 100% rename from res/trainers/trainer_black_belt_eddie.json rename to res/trainers/data/black_belt_eddie.json diff --git a/res/trainers/trainer_black_belt_gregory.json b/res/trainers/data/black_belt_gregory.json similarity index 100% rename from res/trainers/trainer_black_belt_gregory.json rename to res/trainers/data/black_belt_gregory.json diff --git a/res/trainers/trainer_black_belt_griffin.json b/res/trainers/data/black_belt_griffin.json similarity index 100% rename from res/trainers/trainer_black_belt_griffin.json rename to res/trainers/data/black_belt_griffin.json diff --git a/res/trainers/trainer_black_belt_jarrett.json b/res/trainers/data/black_belt_jarrett.json similarity index 100% rename from res/trainers/trainer_black_belt_jarrett.json rename to res/trainers/data/black_belt_jarrett.json diff --git a/res/trainers/trainer_black_belt_jeffery.json b/res/trainers/data/black_belt_jeffery.json similarity index 100% rename from res/trainers/trainer_black_belt_jeffery.json rename to res/trainers/data/black_belt_jeffery.json diff --git a/res/trainers/trainer_black_belt_kendal.json b/res/trainers/data/black_belt_kendal.json similarity index 100% rename from res/trainers/trainer_black_belt_kendal.json rename to res/trainers/data/black_belt_kendal.json diff --git a/res/trainers/trainer_black_belt_kyle.json b/res/trainers/data/black_belt_kyle.json similarity index 100% rename from res/trainers/trainer_black_belt_kyle.json rename to res/trainers/data/black_belt_kyle.json diff --git a/res/trainers/trainer_black_belt_luke.json b/res/trainers/data/black_belt_luke.json similarity index 100% rename from res/trainers/trainer_black_belt_luke.json rename to res/trainers/data/black_belt_luke.json diff --git a/res/trainers/trainer_black_belt_miles.json b/res/trainers/data/black_belt_miles.json similarity index 100% rename from res/trainers/trainer_black_belt_miles.json rename to res/trainers/data/black_belt_miles.json diff --git a/res/trainers/trainer_black_belt_nathaniel.json b/res/trainers/data/black_belt_nathaniel.json similarity index 100% rename from res/trainers/trainer_black_belt_nathaniel.json rename to res/trainers/data/black_belt_nathaniel.json diff --git a/res/trainers/trainer_black_belt_philip.json b/res/trainers/data/black_belt_philip.json similarity index 100% rename from res/trainers/trainer_black_belt_philip.json rename to res/trainers/data/black_belt_philip.json diff --git a/res/trainers/trainer_black_belt_philip_rematch.json b/res/trainers/data/black_belt_philip_rematch.json similarity index 100% rename from res/trainers/trainer_black_belt_philip_rematch.json rename to res/trainers/data/black_belt_philip_rematch.json diff --git a/res/trainers/trainer_black_belt_rafael.json b/res/trainers/data/black_belt_rafael.json similarity index 100% rename from res/trainers/trainer_black_belt_rafael.json rename to res/trainers/data/black_belt_rafael.json diff --git a/res/trainers/trainer_black_belt_ray.json b/res/trainers/data/black_belt_ray.json similarity index 100% rename from res/trainers/trainer_black_belt_ray.json rename to res/trainers/data/black_belt_ray.json diff --git a/res/trainers/trainer_black_belt_ricky.json b/res/trainers/data/black_belt_ricky.json similarity index 100% rename from res/trainers/trainer_black_belt_ricky.json rename to res/trainers/data/black_belt_ricky.json diff --git a/res/trainers/trainer_black_belt_sean.json b/res/trainers/data/black_belt_sean.json similarity index 100% rename from res/trainers/trainer_black_belt_sean.json rename to res/trainers/data/black_belt_sean.json diff --git a/res/trainers/trainer_black_belt_willie.json b/res/trainers/data/black_belt_willie.json similarity index 100% rename from res/trainers/trainer_black_belt_willie.json rename to res/trainers/data/black_belt_willie.json diff --git a/res/trainers/trainer_breeder_albert.json b/res/trainers/data/breeder_albert.json similarity index 100% rename from res/trainers/trainer_breeder_albert.json rename to res/trainers/data/breeder_albert.json diff --git a/res/trainers/trainer_breeder_albert_rematch_1.json b/res/trainers/data/breeder_albert_rematch_1.json similarity index 100% rename from res/trainers/trainer_breeder_albert_rematch_1.json rename to res/trainers/data/breeder_albert_rematch_1.json diff --git a/res/trainers/trainer_breeder_albert_rematch_2.json b/res/trainers/data/breeder_albert_rematch_2.json similarity index 100% rename from res/trainers/trainer_breeder_albert_rematch_2.json rename to res/trainers/data/breeder_albert_rematch_2.json diff --git a/res/trainers/trainer_breeder_albert_rematch_3.json b/res/trainers/data/breeder_albert_rematch_3.json similarity index 100% rename from res/trainers/trainer_breeder_albert_rematch_3.json rename to res/trainers/data/breeder_albert_rematch_3.json diff --git a/res/trainers/trainer_breeder_amber.json b/res/trainers/data/breeder_amber.json similarity index 100% rename from res/trainers/trainer_breeder_amber.json rename to res/trainers/data/breeder_amber.json diff --git a/res/trainers/trainer_breeder_jennifer.json b/res/trainers/data/breeder_jennifer.json similarity index 100% rename from res/trainers/trainer_breeder_jennifer.json rename to res/trainers/data/breeder_jennifer.json diff --git a/res/trainers/trainer_breeder_jennifer_rematch_1.json b/res/trainers/data/breeder_jennifer_rematch_1.json similarity index 100% rename from res/trainers/trainer_breeder_jennifer_rematch_1.json rename to res/trainers/data/breeder_jennifer_rematch_1.json diff --git a/res/trainers/trainer_breeder_jennifer_rematch_2.json b/res/trainers/data/breeder_jennifer_rematch_2.json similarity index 100% rename from res/trainers/trainer_breeder_jennifer_rematch_2.json rename to res/trainers/data/breeder_jennifer_rematch_2.json diff --git a/res/trainers/trainer_breeder_jennifer_rematch_3.json b/res/trainers/data/breeder_jennifer_rematch_3.json similarity index 100% rename from res/trainers/trainer_breeder_jennifer_rematch_3.json rename to res/trainers/data/breeder_jennifer_rematch_3.json diff --git a/res/trainers/trainer_breeder_kahlil.json b/res/trainers/data/breeder_kahlil.json similarity index 100% rename from res/trainers/trainer_breeder_kahlil.json rename to res/trainers/data/breeder_kahlil.json diff --git a/res/trainers/trainer_breeder_kaylee.json b/res/trainers/data/breeder_kaylee.json similarity index 100% rename from res/trainers/trainer_breeder_kaylee.json rename to res/trainers/data/breeder_kaylee.json diff --git a/res/trainers/trainer_buck_battleground.json b/res/trainers/data/buck_battleground.json similarity index 100% rename from res/trainers/trainer_buck_battleground.json rename to res/trainers/data/buck_battleground.json diff --git a/res/trainers/trainer_buck_stark_mountain.json b/res/trainers/data/buck_stark_mountain.json similarity index 100% rename from res/trainers/trainer_buck_stark_mountain.json rename to res/trainers/data/buck_stark_mountain.json diff --git a/res/trainers/trainer_bug_catcher_brandon.json b/res/trainers/data/bug_catcher_brandon.json similarity index 100% rename from res/trainers/trainer_bug_catcher_brandon.json rename to res/trainers/data/bug_catcher_brandon.json diff --git a/res/trainers/trainer_bug_catcher_brandon_rematch_1.json b/res/trainers/data/bug_catcher_brandon_rematch_1.json similarity index 100% rename from res/trainers/trainer_bug_catcher_brandon_rematch_1.json rename to res/trainers/data/bug_catcher_brandon_rematch_1.json diff --git a/res/trainers/trainer_bug_catcher_brandon_rematch_2.json b/res/trainers/data/bug_catcher_brandon_rematch_2.json similarity index 100% rename from res/trainers/trainer_bug_catcher_brandon_rematch_2.json rename to res/trainers/data/bug_catcher_brandon_rematch_2.json diff --git a/res/trainers/trainer_bug_catcher_brandon_rematch_3.json b/res/trainers/data/bug_catcher_brandon_rematch_3.json similarity index 100% rename from res/trainers/trainer_bug_catcher_brandon_rematch_3.json rename to res/trainers/data/bug_catcher_brandon_rematch_3.json diff --git a/res/trainers/trainer_bug_catcher_donald.json b/res/trainers/data/bug_catcher_donald.json similarity index 100% rename from res/trainers/trainer_bug_catcher_donald.json rename to res/trainers/data/bug_catcher_donald.json diff --git a/res/trainers/trainer_bug_catcher_jack.json b/res/trainers/data/bug_catcher_jack.json similarity index 100% rename from res/trainers/trainer_bug_catcher_jack.json rename to res/trainers/data/bug_catcher_jack.json diff --git a/res/trainers/trainer_bug_catcher_phillip.json b/res/trainers/data/bug_catcher_phillip.json similarity index 100% rename from res/trainers/trainer_bug_catcher_phillip.json rename to res/trainers/data/bug_catcher_phillip.json diff --git a/res/trainers/trainer_cameraman_darryl.json b/res/trainers/data/cameraman_darryl.json similarity index 100% rename from res/trainers/trainer_cameraman_darryl.json rename to res/trainers/data/cameraman_darryl.json diff --git a/res/trainers/trainer_cameraman_tevin.json b/res/trainers/data/cameraman_tevin.json similarity index 100% rename from res/trainers/trainer_cameraman_tevin.json rename to res/trainers/data/cameraman_tevin.json diff --git a/res/trainers/trainer_cameraman_tevin_rematch_1.json b/res/trainers/data/cameraman_tevin_rematch_1.json similarity index 100% rename from res/trainers/trainer_cameraman_tevin_rematch_1.json rename to res/trainers/data/cameraman_tevin_rematch_1.json diff --git a/res/trainers/trainer_cameraman_tevin_rematch_2.json b/res/trainers/data/cameraman_tevin_rematch_2.json similarity index 100% rename from res/trainers/trainer_cameraman_tevin_rematch_2.json rename to res/trainers/data/cameraman_tevin_rematch_2.json diff --git a/res/trainers/trainer_cameraman_tevin_rematch_3.json b/res/trainers/data/cameraman_tevin_rematch_3.json similarity index 100% rename from res/trainers/trainer_cameraman_tevin_rematch_3.json rename to res/trainers/data/cameraman_tevin_rematch_3.json diff --git a/res/trainers/trainer_cameraman_tevin_rematch_4.json b/res/trainers/data/cameraman_tevin_rematch_4.json similarity index 100% rename from res/trainers/trainer_cameraman_tevin_rematch_4.json rename to res/trainers/data/cameraman_tevin_rematch_4.json diff --git a/res/trainers/trainer_camper_anthony.json b/res/trainers/data/camper_anthony.json similarity index 100% rename from res/trainers/trainer_camper_anthony.json rename to res/trainers/data/camper_anthony.json diff --git a/res/trainers/trainer_camper_curtis.json b/res/trainers/data/camper_curtis.json similarity index 100% rename from res/trainers/trainer_camper_curtis.json rename to res/trainers/data/camper_curtis.json diff --git a/res/trainers/trainer_camper_diego.json b/res/trainers/data/camper_diego.json similarity index 100% rename from res/trainers/trainer_camper_diego.json rename to res/trainers/data/camper_diego.json diff --git a/res/trainers/trainer_camper_drew.json b/res/trainers/data/camper_drew.json similarity index 100% rename from res/trainers/trainer_camper_drew.json rename to res/trainers/data/camper_drew.json diff --git a/res/trainers/trainer_camper_jacob.json b/res/trainers/data/camper_jacob.json similarity index 100% rename from res/trainers/trainer_camper_jacob.json rename to res/trainers/data/camper_jacob.json diff --git a/res/trainers/trainer_camper_lawrence.json b/res/trainers/data/camper_lawrence.json similarity index 100% rename from res/trainers/trainer_camper_lawrence.json rename to res/trainers/data/camper_lawrence.json diff --git a/res/trainers/trainer_camper_parker.json b/res/trainers/data/camper_parker.json similarity index 100% rename from res/trainers/trainer_camper_parker.json rename to res/trainers/data/camper_parker.json diff --git a/res/trainers/trainer_camper_zackary.json b/res/trainers/data/camper_zackary.json similarity index 100% rename from res/trainers/trainer_camper_zackary.json rename to res/trainers/data/camper_zackary.json diff --git a/res/trainers/trainer_camper_zackary_rematch_1.json b/res/trainers/data/camper_zackary_rematch_1.json similarity index 100% rename from res/trainers/trainer_camper_zackary_rematch_1.json rename to res/trainers/data/camper_zackary_rematch_1.json diff --git a/res/trainers/trainer_camper_zackary_rematch_2.json b/res/trainers/data/camper_zackary_rematch_2.json similarity index 100% rename from res/trainers/trainer_camper_zackary_rematch_2.json rename to res/trainers/data/camper_zackary_rematch_2.json diff --git a/res/trainers/trainer_camper_zackary_rematch_3.json b/res/trainers/data/camper_zackary_rematch_3.json similarity index 100% rename from res/trainers/trainer_camper_zackary_rematch_3.json rename to res/trainers/data/camper_zackary_rematch_3.json diff --git a/res/trainers/trainer_champion_cynthia.json b/res/trainers/data/champion_cynthia.json similarity index 100% rename from res/trainers/trainer_champion_cynthia.json rename to res/trainers/data/champion_cynthia.json diff --git a/res/trainers/trainer_champion_cynthia_rematch.json b/res/trainers/data/champion_cynthia_rematch.json similarity index 100% rename from res/trainers/trainer_champion_cynthia_rematch.json rename to res/trainers/data/champion_cynthia_rematch.json diff --git a/res/trainers/trainer_cheryl_battleground.json b/res/trainers/data/cheryl_battleground.json similarity index 100% rename from res/trainers/trainer_cheryl_battleground.json rename to res/trainers/data/cheryl_battleground.json diff --git a/res/trainers/trainer_cheryl_eterna_forest.json b/res/trainers/data/cheryl_eterna_forest.json similarity index 100% rename from res/trainers/trainer_cheryl_eterna_forest.json rename to res/trainers/data/cheryl_eterna_forest.json diff --git a/res/trainers/trainer_clown_lee.json b/res/trainers/data/clown_lee.json similarity index 100% rename from res/trainers/trainer_clown_lee.json rename to res/trainers/data/clown_lee.json diff --git a/res/trainers/trainer_clown_lee_rematch_1.json b/res/trainers/data/clown_lee_rematch_1.json similarity index 100% rename from res/trainers/trainer_clown_lee_rematch_1.json rename to res/trainers/data/clown_lee_rematch_1.json diff --git a/res/trainers/trainer_clown_lee_rematch_2.json b/res/trainers/data/clown_lee_rematch_2.json similarity index 100% rename from res/trainers/trainer_clown_lee_rematch_2.json rename to res/trainers/data/clown_lee_rematch_2.json diff --git a/res/trainers/trainer_clown_lee_rematch_3.json b/res/trainers/data/clown_lee_rematch_3.json similarity index 100% rename from res/trainers/trainer_clown_lee_rematch_3.json rename to res/trainers/data/clown_lee_rematch_3.json diff --git a/res/trainers/trainer_clown_lee_rematch_4.json b/res/trainers/data/clown_lee_rematch_4.json similarity index 100% rename from res/trainers/trainer_clown_lee_rematch_4.json rename to res/trainers/data/clown_lee_rematch_4.json diff --git a/res/trainers/trainer_collector_brady.json b/res/trainers/data/collector_brady.json similarity index 100% rename from res/trainers/trainer_collector_brady.json rename to res/trainers/data/collector_brady.json diff --git a/res/trainers/trainer_collector_dean.json b/res/trainers/data/collector_dean.json similarity index 100% rename from res/trainers/trainer_collector_dean.json rename to res/trainers/data/collector_dean.json diff --git a/res/trainers/trainer_collector_douglas.json b/res/trainers/data/collector_douglas.json similarity index 100% rename from res/trainers/trainer_collector_douglas.json rename to res/trainers/data/collector_douglas.json diff --git a/res/trainers/trainer_collector_edwin.json b/res/trainers/data/collector_edwin.json similarity index 100% rename from res/trainers/trainer_collector_edwin.json rename to res/trainers/data/collector_edwin.json diff --git a/res/trainers/trainer_collector_eugene.json b/res/trainers/data/collector_eugene.json similarity index 100% rename from res/trainers/trainer_collector_eugene.json rename to res/trainers/data/collector_eugene.json diff --git a/res/trainers/trainer_collector_fernando.json b/res/trainers/data/collector_fernando.json similarity index 100% rename from res/trainers/trainer_collector_fernando.json rename to res/trainers/data/collector_fernando.json diff --git a/res/trainers/trainer_collector_ivan.json b/res/trainers/data/collector_ivan.json similarity index 100% rename from res/trainers/trainer_collector_ivan.json rename to res/trainers/data/collector_ivan.json diff --git a/res/trainers/trainer_collector_ivan_rematch.json b/res/trainers/data/collector_ivan_rematch.json similarity index 100% rename from res/trainers/trainer_collector_ivan_rematch.json rename to res/trainers/data/collector_ivan_rematch.json diff --git a/res/trainers/trainer_collector_jamal.json b/res/trainers/data/collector_jamal.json similarity index 100% rename from res/trainers/trainer_collector_jamal.json rename to res/trainers/data/collector_jamal.json diff --git a/res/trainers/trainer_collector_terry.json b/res/trainers/data/collector_terry.json similarity index 100% rename from res/trainers/trainer_collector_terry.json rename to res/trainers/data/collector_terry.json diff --git a/res/trainers/trainer_commander_jupiter_spear_pillar.json b/res/trainers/data/commander_jupiter_spear_pillar.json similarity index 100% rename from res/trainers/trainer_commander_jupiter_spear_pillar.json rename to res/trainers/data/commander_jupiter_spear_pillar.json diff --git a/res/trainers/trainer_commander_jupiter_stark_mountain.json b/res/trainers/data/commander_jupiter_stark_mountain.json similarity index 100% rename from res/trainers/trainer_commander_jupiter_stark_mountain.json rename to res/trainers/data/commander_jupiter_stark_mountain.json diff --git a/res/trainers/trainer_commander_jupiter_team_galactic_eterna_building.json b/res/trainers/data/commander_jupiter_team_galactic_eterna_building.json similarity index 100% rename from res/trainers/trainer_commander_jupiter_team_galactic_eterna_building.json rename to res/trainers/data/commander_jupiter_team_galactic_eterna_building.json diff --git a/res/trainers/trainer_commander_mars_lake_verity.json b/res/trainers/data/commander_mars_lake_verity.json similarity index 100% rename from res/trainers/trainer_commander_mars_lake_verity.json rename to res/trainers/data/commander_mars_lake_verity.json diff --git a/res/trainers/trainer_commander_mars_spear_pillar.json b/res/trainers/data/commander_mars_spear_pillar.json similarity index 100% rename from res/trainers/trainer_commander_mars_spear_pillar.json rename to res/trainers/data/commander_mars_spear_pillar.json diff --git a/res/trainers/trainer_commander_mars_stark_mountain.json b/res/trainers/data/commander_mars_stark_mountain.json similarity index 100% rename from res/trainers/trainer_commander_mars_stark_mountain.json rename to res/trainers/data/commander_mars_stark_mountain.json diff --git a/res/trainers/trainer_commander_mars_valley_windworks.json b/res/trainers/data/commander_mars_valley_windworks.json similarity index 100% rename from res/trainers/trainer_commander_mars_valley_windworks.json rename to res/trainers/data/commander_mars_valley_windworks.json diff --git a/res/trainers/trainer_commander_saturn_galactic_hq.json b/res/trainers/data/commander_saturn_galactic_hq.json similarity index 100% rename from res/trainers/trainer_commander_saturn_galactic_hq.json rename to res/trainers/data/commander_saturn_galactic_hq.json diff --git a/res/trainers/trainer_commander_saturn_valor_cavern.json b/res/trainers/data/commander_saturn_valor_cavern.json similarity index 100% rename from res/trainers/trainer_commander_saturn_valor_cavern.json rename to res/trainers/data/commander_saturn_valor_cavern.json diff --git a/res/trainers/trainer_cowgirl_shelley.json b/res/trainers/data/cowgirl_shelley.json similarity index 100% rename from res/trainers/trainer_cowgirl_shelley.json rename to res/trainers/data/cowgirl_shelley.json diff --git a/res/trainers/trainer_cyclist_axel.json b/res/trainers/data/cyclist_axel.json similarity index 100% rename from res/trainers/trainer_cyclist_axel.json rename to res/trainers/data/cyclist_axel.json diff --git a/res/trainers/trainer_cyclist_james.json b/res/trainers/data/cyclist_james.json similarity index 100% rename from res/trainers/trainer_cyclist_james.json rename to res/trainers/data/cyclist_james.json diff --git a/res/trainers/trainer_cyclist_john.json b/res/trainers/data/cyclist_john.json similarity index 100% rename from res/trainers/trainer_cyclist_john.json rename to res/trainers/data/cyclist_john.json diff --git a/res/trainers/trainer_cyclist_john_rematch_1.json b/res/trainers/data/cyclist_john_rematch_1.json similarity index 100% rename from res/trainers/trainer_cyclist_john_rematch_1.json rename to res/trainers/data/cyclist_john_rematch_1.json diff --git a/res/trainers/trainer_cyclist_john_rematch_2.json b/res/trainers/data/cyclist_john_rematch_2.json similarity index 100% rename from res/trainers/trainer_cyclist_john_rematch_2.json rename to res/trainers/data/cyclist_john_rematch_2.json diff --git a/res/trainers/trainer_cyclist_john_rematch_3.json b/res/trainers/data/cyclist_john_rematch_3.json similarity index 100% rename from res/trainers/trainer_cyclist_john_rematch_3.json rename to res/trainers/data/cyclist_john_rematch_3.json diff --git a/res/trainers/trainer_cyclist_kayla.json b/res/trainers/data/cyclist_kayla.json similarity index 100% rename from res/trainers/trainer_cyclist_kayla.json rename to res/trainers/data/cyclist_kayla.json diff --git a/res/trainers/trainer_cyclist_kayla_rematch_1.json b/res/trainers/data/cyclist_kayla_rematch_1.json similarity index 100% rename from res/trainers/trainer_cyclist_kayla_rematch_1.json rename to res/trainers/data/cyclist_kayla_rematch_1.json diff --git a/res/trainers/trainer_cyclist_kayla_rematch_2.json b/res/trainers/data/cyclist_kayla_rematch_2.json similarity index 100% rename from res/trainers/trainer_cyclist_kayla_rematch_2.json rename to res/trainers/data/cyclist_kayla_rematch_2.json diff --git a/res/trainers/trainer_cyclist_kayla_rematch_3.json b/res/trainers/data/cyclist_kayla_rematch_3.json similarity index 100% rename from res/trainers/trainer_cyclist_kayla_rematch_3.json rename to res/trainers/data/cyclist_kayla_rematch_3.json diff --git a/res/trainers/trainer_cyclist_megan.json b/res/trainers/data/cyclist_megan.json similarity index 100% rename from res/trainers/trainer_cyclist_megan.json rename to res/trainers/data/cyclist_megan.json diff --git a/res/trainers/trainer_cyclist_nicole.json b/res/trainers/data/cyclist_nicole.json similarity index 100% rename from res/trainers/trainer_cyclist_nicole.json rename to res/trainers/data/cyclist_nicole.json diff --git a/res/trainers/trainer_cyclist_rachel.json b/res/trainers/data/cyclist_rachel.json similarity index 100% rename from res/trainers/trainer_cyclist_rachel.json rename to res/trainers/data/cyclist_rachel.json diff --git a/res/trainers/trainer_cyclist_ryan.json b/res/trainers/data/cyclist_ryan.json similarity index 100% rename from res/trainers/trainer_cyclist_ryan.json rename to res/trainers/data/cyclist_ryan.json diff --git a/res/trainers/trainer_dawn_jubilife_city_chimchar.json b/res/trainers/data/dawn_jubilife_city_chimchar.json similarity index 100% rename from res/trainers/trainer_dawn_jubilife_city_chimchar.json rename to res/trainers/data/dawn_jubilife_city_chimchar.json diff --git a/res/trainers/trainer_dawn_jubilife_city_piplup.json b/res/trainers/data/dawn_jubilife_city_piplup.json similarity index 100% rename from res/trainers/trainer_dawn_jubilife_city_piplup.json rename to res/trainers/data/dawn_jubilife_city_piplup.json diff --git a/res/trainers/trainer_dawn_jubilife_city_turtwig.json b/res/trainers/data/dawn_jubilife_city_turtwig.json similarity index 100% rename from res/trainers/trainer_dawn_jubilife_city_turtwig.json rename to res/trainers/data/dawn_jubilife_city_turtwig.json diff --git a/res/trainers/trainer_dawn_veilstone_city_chimchar.json b/res/trainers/data/dawn_veilstone_city_chimchar.json similarity index 100% rename from res/trainers/trainer_dawn_veilstone_city_chimchar.json rename to res/trainers/data/dawn_veilstone_city_chimchar.json diff --git a/res/trainers/trainer_dawn_veilstone_city_piplup.json b/res/trainers/data/dawn_veilstone_city_piplup.json similarity index 100% rename from res/trainers/trainer_dawn_veilstone_city_piplup.json rename to res/trainers/data/dawn_veilstone_city_piplup.json diff --git a/res/trainers/trainer_dawn_veilstone_city_turtwig.json b/res/trainers/data/dawn_veilstone_city_turtwig.json similarity index 100% rename from res/trainers/trainer_dawn_veilstone_city_turtwig.json rename to res/trainers/data/dawn_veilstone_city_turtwig.json diff --git a/res/trainers/trainer_double_team_al_and_kay.json b/res/trainers/data/double_team_al_and_kay.json similarity index 100% rename from res/trainers/trainer_double_team_al_and_kay.json rename to res/trainers/data/double_team_al_and_kay.json diff --git a/res/trainers/trainer_double_team_jo_and_pat.json b/res/trainers/data/double_team_jo_and_pat.json similarity index 100% rename from res/trainers/trainer_double_team_jo_and_pat.json rename to res/trainers/data/double_team_jo_and_pat.json diff --git a/res/trainers/trainer_double_team_zac_and_jen.json b/res/trainers/data/double_team_zac_and_jen.json similarity index 100% rename from res/trainers/trainer_double_team_zac_and_jen.json rename to res/trainers/data/double_team_zac_and_jen.json diff --git a/res/trainers/trainer_dragon_tamer_clinton.json b/res/trainers/data/dragon_tamer_clinton.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_clinton.json rename to res/trainers/data/dragon_tamer_clinton.json diff --git a/res/trainers/trainer_dragon_tamer_darien.json b/res/trainers/data/dragon_tamer_darien.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_darien.json rename to res/trainers/data/dragon_tamer_darien.json diff --git a/res/trainers/trainer_dragon_tamer_drake.json b/res/trainers/data/dragon_tamer_drake.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_drake.json rename to res/trainers/data/dragon_tamer_drake.json diff --git a/res/trainers/trainer_dragon_tamer_geoffrey.json b/res/trainers/data/dragon_tamer_geoffrey.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_geoffrey.json rename to res/trainers/data/dragon_tamer_geoffrey.json diff --git a/res/trainers/trainer_dragon_tamer_geoffrey_rematch.json b/res/trainers/data/dragon_tamer_geoffrey_rematch.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_geoffrey_rematch.json rename to res/trainers/data/dragon_tamer_geoffrey_rematch.json diff --git a/res/trainers/trainer_dragon_tamer_hayden.json b/res/trainers/data/dragon_tamer_hayden.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_hayden.json rename to res/trainers/data/dragon_tamer_hayden.json diff --git a/res/trainers/trainer_dragon_tamer_hayden_rematch.json b/res/trainers/data/dragon_tamer_hayden_rematch.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_hayden_rematch.json rename to res/trainers/data/dragon_tamer_hayden_rematch.json diff --git a/res/trainers/trainer_dragon_tamer_joe.json b/res/trainers/data/dragon_tamer_joe.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_joe.json rename to res/trainers/data/dragon_tamer_joe.json diff --git a/res/trainers/trainer_dragon_tamer_keegan.json b/res/trainers/data/dragon_tamer_keegan.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_keegan.json rename to res/trainers/data/dragon_tamer_keegan.json diff --git a/res/trainers/trainer_dragon_tamer_kenny.json b/res/trainers/data/dragon_tamer_kenny.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_kenny.json rename to res/trainers/data/dragon_tamer_kenny.json diff --git a/res/trainers/trainer_dragon_tamer_ondrej.json b/res/trainers/data/dragon_tamer_ondrej.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_ondrej.json rename to res/trainers/data/dragon_tamer_ondrej.json diff --git a/res/trainers/trainer_dragon_tamer_patrick.json b/res/trainers/data/dragon_tamer_patrick.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_patrick.json rename to res/trainers/data/dragon_tamer_patrick.json diff --git a/res/trainers/trainer_dragon_tamer_patrick_rematch_1.json b/res/trainers/data/dragon_tamer_patrick_rematch_1.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_patrick_rematch_1.json rename to res/trainers/data/dragon_tamer_patrick_rematch_1.json diff --git a/res/trainers/trainer_dragon_tamer_patrick_rematch_2.json b/res/trainers/data/dragon_tamer_patrick_rematch_2.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_patrick_rematch_2.json rename to res/trainers/data/dragon_tamer_patrick_rematch_2.json diff --git a/res/trainers/trainer_dragon_tamer_stanley.json b/res/trainers/data/dragon_tamer_stanley.json similarity index 100% rename from res/trainers/trainer_dragon_tamer_stanley.json rename to res/trainers/data/dragon_tamer_stanley.json diff --git a/res/trainers/trainer_elite_four_aaron.json b/res/trainers/data/elite_four_aaron.json similarity index 100% rename from res/trainers/trainer_elite_four_aaron.json rename to res/trainers/data/elite_four_aaron.json diff --git a/res/trainers/trainer_elite_four_aaron_rematch.json b/res/trainers/data/elite_four_aaron_rematch.json similarity index 100% rename from res/trainers/trainer_elite_four_aaron_rematch.json rename to res/trainers/data/elite_four_aaron_rematch.json diff --git a/res/trainers/trainer_elite_four_bertha.json b/res/trainers/data/elite_four_bertha.json similarity index 100% rename from res/trainers/trainer_elite_four_bertha.json rename to res/trainers/data/elite_four_bertha.json diff --git a/res/trainers/trainer_elite_four_bertha_rematch.json b/res/trainers/data/elite_four_bertha_rematch.json similarity index 100% rename from res/trainers/trainer_elite_four_bertha_rematch.json rename to res/trainers/data/elite_four_bertha_rematch.json diff --git a/res/trainers/trainer_elite_four_flint.json b/res/trainers/data/elite_four_flint.json similarity index 100% rename from res/trainers/trainer_elite_four_flint.json rename to res/trainers/data/elite_four_flint.json diff --git a/res/trainers/trainer_elite_four_flint_fight_area.json b/res/trainers/data/elite_four_flint_fight_area.json similarity index 100% rename from res/trainers/trainer_elite_four_flint_fight_area.json rename to res/trainers/data/elite_four_flint_fight_area.json diff --git a/res/trainers/trainer_elite_four_flint_rematch.json b/res/trainers/data/elite_four_flint_rematch.json similarity index 100% rename from res/trainers/trainer_elite_four_flint_rematch.json rename to res/trainers/data/elite_four_flint_rematch.json diff --git a/res/trainers/trainer_elite_four_lucian.json b/res/trainers/data/elite_four_lucian.json similarity index 100% rename from res/trainers/trainer_elite_four_lucian.json rename to res/trainers/data/elite_four_lucian.json diff --git a/res/trainers/trainer_elite_four_lucian_rematch.json b/res/trainers/data/elite_four_lucian_rematch.json similarity index 100% rename from res/trainers/trainer_elite_four_lucian_rematch.json rename to res/trainers/data/elite_four_lucian_rematch.json diff --git a/res/trainers/trainer_fisherman_alec.json b/res/trainers/data/fisherman_alec.json similarity index 100% rename from res/trainers/trainer_fisherman_alec.json rename to res/trainers/data/fisherman_alec.json diff --git a/res/trainers/trainer_fisherman_alec_rematch.json b/res/trainers/data/fisherman_alec_rematch.json similarity index 100% rename from res/trainers/trainer_fisherman_alec_rematch.json rename to res/trainers/data/fisherman_alec_rematch.json diff --git a/res/trainers/trainer_fisherman_andrew.json b/res/trainers/data/fisherman_andrew.json similarity index 100% rename from res/trainers/trainer_fisherman_andrew.json rename to res/trainers/data/fisherman_andrew.json diff --git a/res/trainers/trainer_fisherman_brett.json b/res/trainers/data/fisherman_brett.json similarity index 100% rename from res/trainers/trainer_fisherman_brett.json rename to res/trainers/data/fisherman_brett.json diff --git a/res/trainers/trainer_fisherman_cody.json b/res/trainers/data/fisherman_cody.json similarity index 100% rename from res/trainers/trainer_fisherman_cody.json rename to res/trainers/data/fisherman_cody.json diff --git a/res/trainers/trainer_fisherman_cole.json b/res/trainers/data/fisherman_cole.json similarity index 100% rename from res/trainers/trainer_fisherman_cole.json rename to res/trainers/data/fisherman_cole.json diff --git a/res/trainers/trainer_fisherman_cory.json b/res/trainers/data/fisherman_cory.json similarity index 100% rename from res/trainers/trainer_fisherman_cory.json rename to res/trainers/data/fisherman_cory.json diff --git a/res/trainers/trainer_fisherman_erick.json b/res/trainers/data/fisherman_erick.json similarity index 100% rename from res/trainers/trainer_fisherman_erick.json rename to res/trainers/data/fisherman_erick.json diff --git a/res/trainers/trainer_fisherman_george.json b/res/trainers/data/fisherman_george.json similarity index 100% rename from res/trainers/trainer_fisherman_george.json rename to res/trainers/data/fisherman_george.json diff --git a/res/trainers/trainer_fisherman_joseph.json b/res/trainers/data/fisherman_joseph.json similarity index 100% rename from res/trainers/trainer_fisherman_joseph.json rename to res/trainers/data/fisherman_joseph.json diff --git a/res/trainers/trainer_fisherman_joseph_rematch_1.json b/res/trainers/data/fisherman_joseph_rematch_1.json similarity index 100% rename from res/trainers/trainer_fisherman_joseph_rematch_1.json rename to res/trainers/data/fisherman_joseph_rematch_1.json diff --git a/res/trainers/trainer_fisherman_joseph_rematch_2.json b/res/trainers/data/fisherman_joseph_rematch_2.json similarity index 100% rename from res/trainers/trainer_fisherman_joseph_rematch_2.json rename to res/trainers/data/fisherman_joseph_rematch_2.json diff --git a/res/trainers/trainer_fisherman_josh.json b/res/trainers/data/fisherman_josh.json similarity index 100% rename from res/trainers/trainer_fisherman_josh.json rename to res/trainers/data/fisherman_josh.json diff --git a/res/trainers/trainer_fisherman_juan.json b/res/trainers/data/fisherman_juan.json similarity index 100% rename from res/trainers/trainer_fisherman_juan.json rename to res/trainers/data/fisherman_juan.json diff --git a/res/trainers/trainer_fisherman_kenneth.json b/res/trainers/data/fisherman_kenneth.json similarity index 100% rename from res/trainers/trainer_fisherman_kenneth.json rename to res/trainers/data/fisherman_kenneth.json diff --git a/res/trainers/trainer_fisherman_luc.json b/res/trainers/data/fisherman_luc.json similarity index 100% rename from res/trainers/trainer_fisherman_luc.json rename to res/trainers/data/fisherman_luc.json diff --git a/res/trainers/trainer_fisherman_miguel.json b/res/trainers/data/fisherman_miguel.json similarity index 100% rename from res/trainers/trainer_fisherman_miguel.json rename to res/trainers/data/fisherman_miguel.json diff --git a/res/trainers/trainer_fisherman_miguel_rematch.json b/res/trainers/data/fisherman_miguel_rematch.json similarity index 100% rename from res/trainers/trainer_fisherman_miguel_rematch.json rename to res/trainers/data/fisherman_miguel_rematch.json diff --git a/res/trainers/trainer_fisherman_travis.json b/res/trainers/data/fisherman_travis.json similarity index 100% rename from res/trainers/trainer_fisherman_travis.json rename to res/trainers/data/fisherman_travis.json diff --git a/res/trainers/trainer_fisherman_walter.json b/res/trainers/data/fisherman_walter.json similarity index 100% rename from res/trainers/trainer_fisherman_walter.json rename to res/trainers/data/fisherman_walter.json diff --git a/res/trainers/trainer_fisherman_zachary.json b/res/trainers/data/fisherman_zachary.json similarity index 100% rename from res/trainers/trainer_fisherman_zachary.json rename to res/trainers/data/fisherman_zachary.json diff --git a/res/trainers/trainer_galactic_boss_cyrus_celestic_town_ruins.json b/res/trainers/data/galactic_boss_cyrus_celestic_town_ruins.json similarity index 100% rename from res/trainers/trainer_galactic_boss_cyrus_celestic_town_ruins.json rename to res/trainers/data/galactic_boss_cyrus_celestic_town_ruins.json diff --git a/res/trainers/trainer_galactic_boss_cyrus_distortion_world.json b/res/trainers/data/galactic_boss_cyrus_distortion_world.json similarity index 100% rename from res/trainers/trainer_galactic_boss_cyrus_distortion_world.json rename to res/trainers/data/galactic_boss_cyrus_distortion_world.json diff --git a/res/trainers/trainer_galactic_boss_cyrus_galactic_hq.json b/res/trainers/data/galactic_boss_cyrus_galactic_hq.json similarity index 100% rename from res/trainers/trainer_galactic_boss_cyrus_galactic_hq.json rename to res/trainers/data/galactic_boss_cyrus_galactic_hq.json diff --git a/res/trainers/trainer_galactic_grunt_celestic_town.json b/res/trainers/data/galactic_grunt_celestic_town.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_celestic_town.json rename to res/trainers/data/galactic_grunt_celestic_town.json diff --git a/res/trainers/trainer_galactic_grunt_floaroma_meadow_1.json b/res/trainers/data/galactic_grunt_floaroma_meadow_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_floaroma_meadow_1.json rename to res/trainers/data/galactic_grunt_floaroma_meadow_1.json diff --git a/res/trainers/trainer_galactic_grunt_floaroma_meadow_2.json b/res/trainers/data/galactic_grunt_floaroma_meadow_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_floaroma_meadow_2.json rename to res/trainers/data/galactic_grunt_floaroma_meadow_2.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_1f.json b/res/trainers/data/galactic_grunt_galactic_hq_1f.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_1f.json rename to res/trainers/data/galactic_grunt_galactic_hq_1f.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_2f_1.json b/res/trainers/data/galactic_grunt_galactic_hq_2f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_2f_1.json rename to res/trainers/data/galactic_grunt_galactic_hq_2f_1.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_2f_2.json b/res/trainers/data/galactic_grunt_galactic_hq_2f_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_2f_2.json rename to res/trainers/data/galactic_grunt_galactic_hq_2f_2.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_2f_3.json b/res/trainers/data/galactic_grunt_galactic_hq_2f_3.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_2f_3.json rename to res/trainers/data/galactic_grunt_galactic_hq_2f_3.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_3f_1.json b/res/trainers/data/galactic_grunt_galactic_hq_3f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_3f_1.json rename to res/trainers/data/galactic_grunt_galactic_hq_3f_1.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_3f_2.json b/res/trainers/data/galactic_grunt_galactic_hq_3f_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_3f_2.json rename to res/trainers/data/galactic_grunt_galactic_hq_3f_2.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_3f_3.json b/res/trainers/data/galactic_grunt_galactic_hq_3f_3.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_3f_3.json rename to res/trainers/data/galactic_grunt_galactic_hq_3f_3.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_3f_4.json b/res/trainers/data/galactic_grunt_galactic_hq_3f_4.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_3f_4.json rename to res/trainers/data/galactic_grunt_galactic_hq_3f_4.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_b2f_1.json b/res/trainers/data/galactic_grunt_galactic_hq_b2f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_b2f_1.json rename to res/trainers/data/galactic_grunt_galactic_hq_b2f_1.json diff --git a/res/trainers/trainer_galactic_grunt_galactic_hq_b2f_2.json b/res/trainers/data/galactic_grunt_galactic_hq_b2f_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_galactic_hq_b2f_2.json rename to res/trainers/data/galactic_grunt_galactic_hq_b2f_2.json diff --git a/res/trainers/trainer_galactic_grunt_iron_island_1.json b/res/trainers/data/galactic_grunt_iron_island_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_iron_island_1.json rename to res/trainers/data/galactic_grunt_iron_island_1.json diff --git a/res/trainers/trainer_galactic_grunt_iron_island_2.json b/res/trainers/data/galactic_grunt_iron_island_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_iron_island_2.json rename to res/trainers/data/galactic_grunt_iron_island_2.json diff --git a/res/trainers/trainer_galactic_grunt_jubilife_city_1.json b/res/trainers/data/galactic_grunt_jubilife_city_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_jubilife_city_1.json rename to res/trainers/data/galactic_grunt_jubilife_city_1.json diff --git a/res/trainers/trainer_galactic_grunt_jubilife_city_2.json b/res/trainers/data/galactic_grunt_jubilife_city_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_jubilife_city_2.json rename to res/trainers/data/galactic_grunt_jubilife_city_2.json diff --git a/res/trainers/trainer_galactic_grunt_lake_valor_1.json b/res/trainers/data/galactic_grunt_lake_valor_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_lake_valor_1.json rename to res/trainers/data/galactic_grunt_lake_valor_1.json diff --git a/res/trainers/trainer_galactic_grunt_lake_valor_2.json b/res/trainers/data/galactic_grunt_lake_valor_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_lake_valor_2.json rename to res/trainers/data/galactic_grunt_lake_valor_2.json diff --git a/res/trainers/trainer_galactic_grunt_lake_valor_3.json b/res/trainers/data/galactic_grunt_lake_valor_3.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_lake_valor_3.json rename to res/trainers/data/galactic_grunt_lake_valor_3.json diff --git a/res/trainers/trainer_galactic_grunt_lake_verity_1.json b/res/trainers/data/galactic_grunt_lake_verity_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_lake_verity_1.json rename to res/trainers/data/galactic_grunt_lake_verity_1.json diff --git a/res/trainers/trainer_galactic_grunt_lake_verity_2.json b/res/trainers/data/galactic_grunt_lake_verity_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_lake_verity_2.json rename to res/trainers/data/galactic_grunt_lake_verity_2.json diff --git a/res/trainers/trainer_galactic_grunt_lake_verity_3.json b/res/trainers/data/galactic_grunt_lake_verity_3.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_lake_verity_3.json rename to res/trainers/data/galactic_grunt_lake_verity_3.json diff --git a/res/trainers/trainer_galactic_grunt_lake_verity_4.json b/res/trainers/data/galactic_grunt_lake_verity_4.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_lake_verity_4.json rename to res/trainers/data/galactic_grunt_lake_verity_4.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_3f_1.json b/res/trainers/data/galactic_grunt_mt_coronet_3f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_3f_1.json rename to res/trainers/data/galactic_grunt_mt_coronet_3f_1.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_4f_1.json b/res/trainers/data/galactic_grunt_mt_coronet_4f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_4f_1.json rename to res/trainers/data/galactic_grunt_mt_coronet_4f_1.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_4f_2.json b/res/trainers/data/galactic_grunt_mt_coronet_4f_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_4f_2.json rename to res/trainers/data/galactic_grunt_mt_coronet_4f_2.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_5f_1.json b/res/trainers/data/galactic_grunt_mt_coronet_5f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_5f_1.json rename to res/trainers/data/galactic_grunt_mt_coronet_5f_1.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_5f_2.json b/res/trainers/data/galactic_grunt_mt_coronet_5f_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_5f_2.json rename to res/trainers/data/galactic_grunt_mt_coronet_5f_2.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_6f.json b/res/trainers/data/galactic_grunt_mt_coronet_6f.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_6f.json rename to res/trainers/data/galactic_grunt_mt_coronet_6f.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet__3f_1.json b/res/trainers/data/galactic_grunt_mt_coronet__3f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet__3f_1.json rename to res/trainers/data/galactic_grunt_mt_coronet__3f_1.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_tunnel_room_1.json b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_tunnel_room_1.json rename to res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_1.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_tunnel_room_2.json b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_tunnel_room_2.json rename to res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_2.json diff --git a/res/trainers/trainer_galactic_grunt_mt_coronet_tunnel_room_3.json b/res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_3.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_mt_coronet_tunnel_room_3.json rename to res/trainers/data/galactic_grunt_mt_coronet_tunnel_room_3.json diff --git a/res/trainers/trainer_galactic_grunt_spear_pillar_1.json b/res/trainers/data/galactic_grunt_spear_pillar_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_spear_pillar_1.json rename to res/trainers/data/galactic_grunt_spear_pillar_1.json diff --git a/res/trainers/trainer_galactic_grunt_spear_pillar_2.json b/res/trainers/data/galactic_grunt_spear_pillar_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_spear_pillar_2.json rename to res/trainers/data/galactic_grunt_spear_pillar_2.json diff --git a/res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_1f_1.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_1f_1.json rename to res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_1.json diff --git a/res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_1f_2.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_1f_2.json rename to res/trainers/data/galactic_grunt_team_galactic_eterna_building_1f_2.json diff --git a/res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_2f_1.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_2f_1.json rename to res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_1.json diff --git a/res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_2f_2.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_2f_2.json rename to res/trainers/data/galactic_grunt_team_galactic_eterna_building_2f_2.json diff --git a/res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_3f.json b/res/trainers/data/galactic_grunt_team_galactic_eterna_building_3f.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_team_galactic_eterna_building_3f.json rename to res/trainers/data/galactic_grunt_team_galactic_eterna_building_3f.json diff --git a/res/trainers/trainer_galactic_grunt_valley_windworks_1.json b/res/trainers/data/galactic_grunt_valley_windworks_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_valley_windworks_1.json rename to res/trainers/data/galactic_grunt_valley_windworks_1.json diff --git a/res/trainers/trainer_galactic_grunt_valley_windworks_2.json b/res/trainers/data/galactic_grunt_valley_windworks_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_valley_windworks_2.json rename to res/trainers/data/galactic_grunt_valley_windworks_2.json diff --git a/res/trainers/trainer_galactic_grunt_valley_windworks_3.json b/res/trainers/data/galactic_grunt_valley_windworks_3.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_valley_windworks_3.json rename to res/trainers/data/galactic_grunt_valley_windworks_3.json diff --git a/res/trainers/trainer_galactic_grunt_valor_lakefront.json b/res/trainers/data/galactic_grunt_valor_lakefront.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_valor_lakefront.json rename to res/trainers/data/galactic_grunt_valor_lakefront.json diff --git a/res/trainers/trainer_galactic_grunt_veilstone_city_1.json b/res/trainers/data/galactic_grunt_veilstone_city_1.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_veilstone_city_1.json rename to res/trainers/data/galactic_grunt_veilstone_city_1.json diff --git a/res/trainers/trainer_galactic_grunt_veilstone_city_2.json b/res/trainers/data/galactic_grunt_veilstone_city_2.json similarity index 100% rename from res/trainers/trainer_galactic_grunt_veilstone_city_2.json rename to res/trainers/data/galactic_grunt_veilstone_city_2.json diff --git a/res/trainers/trainer_gentleman_jeremy.json b/res/trainers/data/gentleman_jeremy.json similarity index 100% rename from res/trainers/trainer_gentleman_jeremy.json rename to res/trainers/data/gentleman_jeremy.json diff --git a/res/trainers/trainer_gentleman_jeremy_rematch_1.json b/res/trainers/data/gentleman_jeremy_rematch_1.json similarity index 100% rename from res/trainers/trainer_gentleman_jeremy_rematch_1.json rename to res/trainers/data/gentleman_jeremy_rematch_1.json diff --git a/res/trainers/trainer_gentleman_jeremy_rematch_2.json b/res/trainers/data/gentleman_jeremy_rematch_2.json similarity index 100% rename from res/trainers/trainer_gentleman_jeremy_rematch_2.json rename to res/trainers/data/gentleman_jeremy_rematch_2.json diff --git a/res/trainers/trainer_gentleman_jeremy_rematch_3.json b/res/trainers/data/gentleman_jeremy_rematch_3.json similarity index 100% rename from res/trainers/trainer_gentleman_jeremy_rematch_3.json rename to res/trainers/data/gentleman_jeremy_rematch_3.json diff --git a/res/trainers/trainer_gentleman_leonardo.json b/res/trainers/data/gentleman_leonardo.json similarity index 100% rename from res/trainers/trainer_gentleman_leonardo.json rename to res/trainers/data/gentleman_leonardo.json diff --git a/res/trainers/trainer_guitarist_arturo.json b/res/trainers/data/guitarist_arturo.json similarity index 100% rename from res/trainers/trainer_guitarist_arturo.json rename to res/trainers/data/guitarist_arturo.json diff --git a/res/trainers/trainer_guitarist_arturo_rematch_1.json b/res/trainers/data/guitarist_arturo_rematch_1.json similarity index 100% rename from res/trainers/trainer_guitarist_arturo_rematch_1.json rename to res/trainers/data/guitarist_arturo_rematch_1.json diff --git a/res/trainers/trainer_guitarist_arturo_rematch_2.json b/res/trainers/data/guitarist_arturo_rematch_2.json similarity index 100% rename from res/trainers/trainer_guitarist_arturo_rematch_2.json rename to res/trainers/data/guitarist_arturo_rematch_2.json diff --git a/res/trainers/trainer_guitarist_arturo_rematch_3.json b/res/trainers/data/guitarist_arturo_rematch_3.json similarity index 100% rename from res/trainers/trainer_guitarist_arturo_rematch_3.json rename to res/trainers/data/guitarist_arturo_rematch_3.json diff --git a/res/trainers/trainer_guitarist_arturo_rematch_4.json b/res/trainers/data/guitarist_arturo_rematch_4.json similarity index 100% rename from res/trainers/trainer_guitarist_arturo_rematch_4.json rename to res/trainers/data/guitarist_arturo_rematch_4.json diff --git a/res/trainers/trainer_guitarist_jerry.json b/res/trainers/data/guitarist_jerry.json similarity index 100% rename from res/trainers/trainer_guitarist_jerry.json rename to res/trainers/data/guitarist_jerry.json diff --git a/res/trainers/trainer_guitarist_lonnie.json b/res/trainers/data/guitarist_lonnie.json similarity index 100% rename from res/trainers/trainer_guitarist_lonnie.json rename to res/trainers/data/guitarist_lonnie.json diff --git a/res/trainers/trainer_guitarist_preston.json b/res/trainers/data/guitarist_preston.json similarity index 100% rename from res/trainers/trainer_guitarist_preston.json rename to res/trainers/data/guitarist_preston.json diff --git a/res/trainers/trainer_guitarist_tony.json b/res/trainers/data/guitarist_tony.json similarity index 100% rename from res/trainers/trainer_guitarist_tony.json rename to res/trainers/data/guitarist_tony.json diff --git a/res/trainers/trainer_guitarist_tony_rematch.json b/res/trainers/data/guitarist_tony_rematch.json similarity index 100% rename from res/trainers/trainer_guitarist_tony_rematch.json rename to res/trainers/data/guitarist_tony_rematch.json diff --git a/res/trainers/trainer_hiker_alexander.json b/res/trainers/data/hiker_alexander.json similarity index 100% rename from res/trainers/trainer_hiker_alexander.json rename to res/trainers/data/hiker_alexander.json diff --git a/res/trainers/trainer_hiker_damon.json b/res/trainers/data/hiker_damon.json similarity index 100% rename from res/trainers/trainer_hiker_damon.json rename to res/trainers/data/hiker_damon.json diff --git a/res/trainers/trainer_hiker_daniel.json b/res/trainers/data/hiker_daniel.json similarity index 100% rename from res/trainers/trainer_hiker_daniel.json rename to res/trainers/data/hiker_daniel.json diff --git a/res/trainers/trainer_hiker_jonathan.json b/res/trainers/data/hiker_jonathan.json similarity index 100% rename from res/trainers/trainer_hiker_jonathan.json rename to res/trainers/data/hiker_jonathan.json diff --git a/res/trainers/trainer_hiker_justin.json b/res/trainers/data/hiker_justin.json similarity index 100% rename from res/trainers/trainer_hiker_justin.json rename to res/trainers/data/hiker_justin.json diff --git a/res/trainers/trainer_hiker_kevin.json b/res/trainers/data/hiker_kevin.json similarity index 100% rename from res/trainers/trainer_hiker_kevin.json rename to res/trainers/data/hiker_kevin.json diff --git a/res/trainers/trainer_hiker_lorenzo.json b/res/trainers/data/hiker_lorenzo.json similarity index 100% rename from res/trainers/trainer_hiker_lorenzo.json rename to res/trainers/data/hiker_lorenzo.json diff --git a/res/trainers/trainer_hiker_louis.json b/res/trainers/data/hiker_louis.json similarity index 100% rename from res/trainers/trainer_hiker_louis.json rename to res/trainers/data/hiker_louis.json diff --git a/res/trainers/trainer_hiker_maurice.json b/res/trainers/data/hiker_maurice.json similarity index 100% rename from res/trainers/trainer_hiker_maurice.json rename to res/trainers/data/hiker_maurice.json diff --git a/res/trainers/trainer_hiker_nicholas.json b/res/trainers/data/hiker_nicholas.json similarity index 100% rename from res/trainers/trainer_hiker_nicholas.json rename to res/trainers/data/hiker_nicholas.json diff --git a/res/trainers/trainer_hiker_reginald.json b/res/trainers/data/hiker_reginald.json similarity index 100% rename from res/trainers/trainer_hiker_reginald.json rename to res/trainers/data/hiker_reginald.json diff --git a/res/trainers/trainer_hiker_robert.json b/res/trainers/data/hiker_robert.json similarity index 100% rename from res/trainers/trainer_hiker_robert.json rename to res/trainers/data/hiker_robert.json diff --git a/res/trainers/trainer_hiker_theodore.json b/res/trainers/data/hiker_theodore.json similarity index 100% rename from res/trainers/trainer_hiker_theodore.json rename to res/trainers/data/hiker_theodore.json diff --git a/res/trainers/trainer_hiker_theodore_rematch_1.json b/res/trainers/data/hiker_theodore_rematch_1.json similarity index 100% rename from res/trainers/trainer_hiker_theodore_rematch_1.json rename to res/trainers/data/hiker_theodore_rematch_1.json diff --git a/res/trainers/trainer_hiker_theodore_rematch_2.json b/res/trainers/data/hiker_theodore_rematch_2.json similarity index 100% rename from res/trainers/trainer_hiker_theodore_rematch_2.json rename to res/trainers/data/hiker_theodore_rematch_2.json diff --git a/res/trainers/trainer_hiker_theodore_rematch_3.json b/res/trainers/data/hiker_theodore_rematch_3.json similarity index 100% rename from res/trainers/trainer_hiker_theodore_rematch_3.json rename to res/trainers/data/hiker_theodore_rematch_3.json diff --git a/res/trainers/trainer_idol_grace.json b/res/trainers/data/idol_grace.json similarity index 100% rename from res/trainers/trainer_idol_grace.json rename to res/trainers/data/idol_grace.json diff --git a/res/trainers/trainer_idol_grace_rematch_1.json b/res/trainers/data/idol_grace_rematch_1.json similarity index 100% rename from res/trainers/trainer_idol_grace_rematch_1.json rename to res/trainers/data/idol_grace_rematch_1.json diff --git a/res/trainers/trainer_idol_grace_rematch_2.json b/res/trainers/data/idol_grace_rematch_2.json similarity index 100% rename from res/trainers/trainer_idol_grace_rematch_2.json rename to res/trainers/data/idol_grace_rematch_2.json diff --git a/res/trainers/trainer_idol_grace_rematch_3.json b/res/trainers/data/idol_grace_rematch_3.json similarity index 100% rename from res/trainers/trainer_idol_grace_rematch_3.json rename to res/trainers/data/idol_grace_rematch_3.json diff --git a/res/trainers/trainer_idol_grace_rematch_4.json b/res/trainers/data/idol_grace_rematch_4.json similarity index 100% rename from res/trainers/trainer_idol_grace_rematch_4.json rename to res/trainers/data/idol_grace_rematch_4.json diff --git a/res/trainers/trainer_interviewers_roxy_and_oli.json b/res/trainers/data/interviewers_roxy_and_oli.json similarity index 100% rename from res/trainers/trainer_interviewers_roxy_and_oli.json rename to res/trainers/data/interviewers_roxy_and_oli.json diff --git a/res/trainers/trainer_interviewers_roxy_and_oli_rematch_1.json b/res/trainers/data/interviewers_roxy_and_oli_rematch_1.json similarity index 100% rename from res/trainers/trainer_interviewers_roxy_and_oli_rematch_1.json rename to res/trainers/data/interviewers_roxy_and_oli_rematch_1.json diff --git a/res/trainers/trainer_interviewers_roxy_and_oli_rematch_2.json b/res/trainers/data/interviewers_roxy_and_oli_rematch_2.json similarity index 100% rename from res/trainers/trainer_interviewers_roxy_and_oli_rematch_2.json rename to res/trainers/data/interviewers_roxy_and_oli_rematch_2.json diff --git a/res/trainers/trainer_interviewers_roxy_and_oli_rematch_3.json b/res/trainers/data/interviewers_roxy_and_oli_rematch_3.json similarity index 100% rename from res/trainers/trainer_interviewers_roxy_and_oli_rematch_3.json rename to res/trainers/data/interviewers_roxy_and_oli_rematch_3.json diff --git a/res/trainers/trainer_interviewers_roxy_and_oli_rematch_4.json b/res/trainers/data/interviewers_roxy_and_oli_rematch_4.json similarity index 100% rename from res/trainers/trainer_interviewers_roxy_and_oli_rematch_4.json rename to res/trainers/data/interviewers_roxy_and_oli_rematch_4.json diff --git a/res/trainers/trainer_jogger_craig.json b/res/trainers/data/jogger_craig.json similarity index 100% rename from res/trainers/trainer_jogger_craig.json rename to res/trainers/data/jogger_craig.json diff --git a/res/trainers/trainer_jogger_craig_rematch_1.json b/res/trainers/data/jogger_craig_rematch_1.json similarity index 100% rename from res/trainers/trainer_jogger_craig_rematch_1.json rename to res/trainers/data/jogger_craig_rematch_1.json diff --git a/res/trainers/trainer_jogger_craig_rematch_2.json b/res/trainers/data/jogger_craig_rematch_2.json similarity index 100% rename from res/trainers/trainer_jogger_craig_rematch_2.json rename to res/trainers/data/jogger_craig_rematch_2.json diff --git a/res/trainers/trainer_jogger_raul.json b/res/trainers/data/jogger_raul.json similarity index 100% rename from res/trainers/trainer_jogger_raul.json rename to res/trainers/data/jogger_raul.json diff --git a/res/trainers/trainer_jogger_richard.json b/res/trainers/data/jogger_richard.json similarity index 100% rename from res/trainers/trainer_jogger_richard.json rename to res/trainers/data/jogger_richard.json diff --git a/res/trainers/trainer_jogger_scott.json b/res/trainers/data/jogger_scott.json similarity index 100% rename from res/trainers/trainer_jogger_scott.json rename to res/trainers/data/jogger_scott.json diff --git a/res/trainers/trainer_jogger_wyatt.json b/res/trainers/data/jogger_wyatt.json similarity index 100% rename from res/trainers/trainer_jogger_wyatt.json rename to res/trainers/data/jogger_wyatt.json diff --git a/res/trainers/trainer_lady_celeste.json b/res/trainers/data/lady_celeste.json similarity index 100% rename from res/trainers/trainer_lady_celeste.json rename to res/trainers/data/lady_celeste.json diff --git a/res/trainers/trainer_lady_kylie.json b/res/trainers/data/lady_kylie.json similarity index 100% rename from res/trainers/trainer_lady_kylie.json rename to res/trainers/data/lady_kylie.json diff --git a/res/trainers/trainer_lady_melissa.json b/res/trainers/data/lady_melissa.json similarity index 100% rename from res/trainers/trainer_lady_melissa.json rename to res/trainers/data/lady_melissa.json diff --git a/res/trainers/trainer_lady_melissa_rematch_1.json b/res/trainers/data/lady_melissa_rematch_1.json similarity index 100% rename from res/trainers/trainer_lady_melissa_rematch_1.json rename to res/trainers/data/lady_melissa_rematch_1.json diff --git a/res/trainers/trainer_lady_melissa_rematch_2.json b/res/trainers/data/lady_melissa_rematch_2.json similarity index 100% rename from res/trainers/trainer_lady_melissa_rematch_2.json rename to res/trainers/data/lady_melissa_rematch_2.json diff --git a/res/trainers/trainer_lady_melissa_rematch_3.json b/res/trainers/data/lady_melissa_rematch_3.json similarity index 100% rename from res/trainers/trainer_lady_melissa_rematch_3.json rename to res/trainers/data/lady_melissa_rematch_3.json diff --git a/res/trainers/trainer_lass_blythe.json b/res/trainers/data/lass_blythe.json similarity index 100% rename from res/trainers/trainer_lass_blythe.json rename to res/trainers/data/lass_blythe.json diff --git a/res/trainers/trainer_lass_briana.json b/res/trainers/data/lass_briana.json similarity index 100% rename from res/trainers/trainer_lass_briana.json rename to res/trainers/data/lass_briana.json diff --git a/res/trainers/trainer_lass_caroline.json b/res/trainers/data/lass_caroline.json similarity index 100% rename from res/trainers/trainer_lass_caroline.json rename to res/trainers/data/lass_caroline.json diff --git a/res/trainers/trainer_lass_cassidy.json b/res/trainers/data/lass_cassidy.json similarity index 100% rename from res/trainers/trainer_lass_cassidy.json rename to res/trainers/data/lass_cassidy.json diff --git a/res/trainers/trainer_lass_kaitlin.json b/res/trainers/data/lass_kaitlin.json similarity index 100% rename from res/trainers/trainer_lass_kaitlin.json rename to res/trainers/data/lass_kaitlin.json diff --git a/res/trainers/trainer_lass_madeline.json b/res/trainers/data/lass_madeline.json similarity index 100% rename from res/trainers/trainer_lass_madeline.json rename to res/trainers/data/lass_madeline.json diff --git a/res/trainers/trainer_lass_madeline_rematch_1.json b/res/trainers/data/lass_madeline_rematch_1.json similarity index 100% rename from res/trainers/trainer_lass_madeline_rematch_1.json rename to res/trainers/data/lass_madeline_rematch_1.json diff --git a/res/trainers/trainer_lass_madeline_rematch_2.json b/res/trainers/data/lass_madeline_rematch_2.json similarity index 100% rename from res/trainers/trainer_lass_madeline_rematch_2.json rename to res/trainers/data/lass_madeline_rematch_2.json diff --git a/res/trainers/trainer_lass_madeline_rematch_3.json b/res/trainers/data/lass_madeline_rematch_3.json similarity index 100% rename from res/trainers/trainer_lass_madeline_rematch_3.json rename to res/trainers/data/lass_madeline_rematch_3.json diff --git a/res/trainers/trainer_lass_molly.json b/res/trainers/data/lass_molly.json similarity index 100% rename from res/trainers/trainer_lass_molly.json rename to res/trainers/data/lass_molly.json diff --git a/res/trainers/trainer_lass_natalie.json b/res/trainers/data/lass_natalie.json similarity index 100% rename from res/trainers/trainer_lass_natalie.json rename to res/trainers/data/lass_natalie.json diff --git a/res/trainers/trainer_lass_samantha.json b/res/trainers/data/lass_samantha.json similarity index 100% rename from res/trainers/trainer_lass_samantha.json rename to res/trainers/data/lass_samantha.json diff --git a/res/trainers/trainer_lass_samantha_rematch_1.json b/res/trainers/data/lass_samantha_rematch_1.json similarity index 100% rename from res/trainers/trainer_lass_samantha_rematch_1.json rename to res/trainers/data/lass_samantha_rematch_1.json diff --git a/res/trainers/trainer_lass_samantha_rematch_2.json b/res/trainers/data/lass_samantha_rematch_2.json similarity index 100% rename from res/trainers/trainer_lass_samantha_rematch_2.json rename to res/trainers/data/lass_samantha_rematch_2.json diff --git a/res/trainers/trainer_lass_samantha_rematch_3.json b/res/trainers/data/lass_samantha_rematch_3.json similarity index 100% rename from res/trainers/trainer_lass_samantha_rematch_3.json rename to res/trainers/data/lass_samantha_rematch_3.json diff --git a/res/trainers/trainer_lass_sarah.json b/res/trainers/data/lass_sarah.json similarity index 100% rename from res/trainers/trainer_lass_sarah.json rename to res/trainers/data/lass_sarah.json diff --git a/res/trainers/trainer_leader_byron.json b/res/trainers/data/leader_byron.json similarity index 100% rename from res/trainers/trainer_leader_byron.json rename to res/trainers/data/leader_byron.json diff --git a/res/trainers/trainer_leader_byron_rematch.json b/res/trainers/data/leader_byron_rematch.json similarity index 100% rename from res/trainers/trainer_leader_byron_rematch.json rename to res/trainers/data/leader_byron_rematch.json diff --git a/res/trainers/trainer_leader_candice.json b/res/trainers/data/leader_candice.json similarity index 100% rename from res/trainers/trainer_leader_candice.json rename to res/trainers/data/leader_candice.json diff --git a/res/trainers/trainer_leader_candice_rematch.json b/res/trainers/data/leader_candice_rematch.json similarity index 100% rename from res/trainers/trainer_leader_candice_rematch.json rename to res/trainers/data/leader_candice_rematch.json diff --git a/res/trainers/trainer_leader_fantina.json b/res/trainers/data/leader_fantina.json similarity index 100% rename from res/trainers/trainer_leader_fantina.json rename to res/trainers/data/leader_fantina.json diff --git a/res/trainers/trainer_leader_fantina_rematch.json b/res/trainers/data/leader_fantina_rematch.json similarity index 100% rename from res/trainers/trainer_leader_fantina_rematch.json rename to res/trainers/data/leader_fantina_rematch.json diff --git a/res/trainers/trainer_leader_gardenia.json b/res/trainers/data/leader_gardenia.json similarity index 100% rename from res/trainers/trainer_leader_gardenia.json rename to res/trainers/data/leader_gardenia.json diff --git a/res/trainers/trainer_leader_gardenia_rematch.json b/res/trainers/data/leader_gardenia_rematch.json similarity index 100% rename from res/trainers/trainer_leader_gardenia_rematch.json rename to res/trainers/data/leader_gardenia_rematch.json diff --git a/res/trainers/trainer_leader_maylene.json b/res/trainers/data/leader_maylene.json similarity index 100% rename from res/trainers/trainer_leader_maylene.json rename to res/trainers/data/leader_maylene.json diff --git a/res/trainers/trainer_leader_maylene_rematch.json b/res/trainers/data/leader_maylene_rematch.json similarity index 100% rename from res/trainers/trainer_leader_maylene_rematch.json rename to res/trainers/data/leader_maylene_rematch.json diff --git a/res/trainers/trainer_leader_roark.json b/res/trainers/data/leader_roark.json similarity index 100% rename from res/trainers/trainer_leader_roark.json rename to res/trainers/data/leader_roark.json diff --git a/res/trainers/trainer_leader_roark_rematch.json b/res/trainers/data/leader_roark_rematch.json similarity index 100% rename from res/trainers/trainer_leader_roark_rematch.json rename to res/trainers/data/leader_roark_rematch.json diff --git a/res/trainers/trainer_leader_volkner.json b/res/trainers/data/leader_volkner.json similarity index 100% rename from res/trainers/trainer_leader_volkner.json rename to res/trainers/data/leader_volkner.json diff --git a/res/trainers/trainer_leader_volkner_fight_area.json b/res/trainers/data/leader_volkner_fight_area.json similarity index 100% rename from res/trainers/trainer_leader_volkner_fight_area.json rename to res/trainers/data/leader_volkner_fight_area.json diff --git a/res/trainers/trainer_leader_volkner_rematch.json b/res/trainers/data/leader_volkner_rematch.json similarity index 100% rename from res/trainers/trainer_leader_volkner_rematch.json rename to res/trainers/data/leader_volkner_rematch.json diff --git a/res/trainers/trainer_leader_wake.json b/res/trainers/data/leader_wake.json similarity index 100% rename from res/trainers/trainer_leader_wake.json rename to res/trainers/data/leader_wake.json diff --git a/res/trainers/trainer_leader_wake_rematch.json b/res/trainers/data/leader_wake_rematch.json similarity index 100% rename from res/trainers/trainer_leader_wake_rematch.json rename to res/trainers/data/leader_wake_rematch.json diff --git a/res/trainers/trainer_lucas_jubilife_city_chimchar.json b/res/trainers/data/lucas_jubilife_city_chimchar.json similarity index 100% rename from res/trainers/trainer_lucas_jubilife_city_chimchar.json rename to res/trainers/data/lucas_jubilife_city_chimchar.json diff --git a/res/trainers/trainer_lucas_jubilife_city_piplup.json b/res/trainers/data/lucas_jubilife_city_piplup.json similarity index 100% rename from res/trainers/trainer_lucas_jubilife_city_piplup.json rename to res/trainers/data/lucas_jubilife_city_piplup.json diff --git a/res/trainers/trainer_lucas_jubilife_city_turtwig.json b/res/trainers/data/lucas_jubilife_city_turtwig.json similarity index 100% rename from res/trainers/trainer_lucas_jubilife_city_turtwig.json rename to res/trainers/data/lucas_jubilife_city_turtwig.json diff --git a/res/trainers/trainer_lucas_veilstone_city_chimchar.json b/res/trainers/data/lucas_veilstone_city_chimchar.json similarity index 100% rename from res/trainers/trainer_lucas_veilstone_city_chimchar.json rename to res/trainers/data/lucas_veilstone_city_chimchar.json diff --git a/res/trainers/trainer_lucas_veilstone_city_piplup.json b/res/trainers/data/lucas_veilstone_city_piplup.json similarity index 100% rename from res/trainers/trainer_lucas_veilstone_city_piplup.json rename to res/trainers/data/lucas_veilstone_city_piplup.json diff --git a/res/trainers/trainer_lucas_veilstone_city_turtwig.json b/res/trainers/data/lucas_veilstone_city_turtwig.json similarity index 100% rename from res/trainers/trainer_lucas_veilstone_city_turtwig.json rename to res/trainers/data/lucas_veilstone_city_turtwig.json diff --git a/res/trainers/trainer_maid_belinda.json b/res/trainers/data/maid_belinda.json similarity index 100% rename from res/trainers/trainer_maid_belinda.json rename to res/trainers/data/maid_belinda.json diff --git a/res/trainers/trainer_maid_clare.json b/res/trainers/data/maid_clare.json similarity index 100% rename from res/trainers/trainer_maid_clare.json rename to res/trainers/data/maid_clare.json diff --git a/res/trainers/trainer_maid_elena.json b/res/trainers/data/maid_elena.json similarity index 100% rename from res/trainers/trainer_maid_elena.json rename to res/trainers/data/maid_elena.json diff --git a/res/trainers/trainer_maid_emily.json b/res/trainers/data/maid_emily.json similarity index 100% rename from res/trainers/trainer_maid_emily.json rename to res/trainers/data/maid_emily.json diff --git a/res/trainers/trainer_maid_sophie.json b/res/trainers/data/maid_sophie.json similarity index 100% rename from res/trainers/trainer_maid_sophie.json rename to res/trainers/data/maid_sophie.json diff --git a/res/trainers/trainer_marley_battleground.json b/res/trainers/data/marley_battleground.json similarity index 100% rename from res/trainers/trainer_marley_battleground.json rename to res/trainers/data/marley_battleground.json diff --git a/res/trainers/trainer_marley_victory_road.json b/res/trainers/data/marley_victory_road.json similarity index 100% rename from res/trainers/trainer_marley_victory_road.json rename to res/trainers/data/marley_victory_road.json diff --git a/res/trainers/trainer_mira_battleground.json b/res/trainers/data/mira_battleground.json similarity index 100% rename from res/trainers/trainer_mira_battleground.json rename to res/trainers/data/mira_battleground.json diff --git a/res/trainers/trainer_mira_wayward_cave.json b/res/trainers/data/mira_wayward_cave.json similarity index 100% rename from res/trainers/trainer_mira_wayward_cave.json rename to res/trainers/data/mira_wayward_cave.json diff --git a/res/trainers/trainer_ninja_boy_brennan.json b/res/trainers/data/ninja_boy_brennan.json similarity index 100% rename from res/trainers/trainer_ninja_boy_brennan.json rename to res/trainers/data/ninja_boy_brennan.json diff --git a/res/trainers/trainer_ninja_boy_bruce.json b/res/trainers/data/ninja_boy_bruce.json similarity index 100% rename from res/trainers/trainer_ninja_boy_bruce.json rename to res/trainers/data/ninja_boy_bruce.json diff --git a/res/trainers/trainer_ninja_boy_davido.json b/res/trainers/data/ninja_boy_davido.json similarity index 100% rename from res/trainers/trainer_ninja_boy_davido.json rename to res/trainers/data/ninja_boy_davido.json diff --git a/res/trainers/trainer_ninja_boy_ethan.json b/res/trainers/data/ninja_boy_ethan.json similarity index 100% rename from res/trainers/trainer_ninja_boy_ethan.json rename to res/trainers/data/ninja_boy_ethan.json diff --git a/res/trainers/trainer_ninja_boy_fabian.json b/res/trainers/data/ninja_boy_fabian.json similarity index 100% rename from res/trainers/trainer_ninja_boy_fabian.json rename to res/trainers/data/ninja_boy_fabian.json diff --git a/res/trainers/trainer_ninja_boy_joel.json b/res/trainers/data/ninja_boy_joel.json similarity index 100% rename from res/trainers/trainer_ninja_boy_joel.json rename to res/trainers/data/ninja_boy_joel.json diff --git a/res/trainers/trainer_ninja_boy_matthew.json b/res/trainers/data/ninja_boy_matthew.json similarity index 100% rename from res/trainers/trainer_ninja_boy_matthew.json rename to res/trainers/data/ninja_boy_matthew.json diff --git a/res/trainers/trainer_ninja_boy_nathan.json b/res/trainers/data/ninja_boy_nathan.json similarity index 100% rename from res/trainers/trainer_ninja_boy_nathan.json rename to res/trainers/data/ninja_boy_nathan.json diff --git a/res/trainers/trainer_ninja_boy_nick.json b/res/trainers/data/ninja_boy_nick.json similarity index 100% rename from res/trainers/trainer_ninja_boy_nick.json rename to res/trainers/data/ninja_boy_nick.json diff --git a/res/trainers/trainer_ninja_boy_zach.json b/res/trainers/data/ninja_boy_zach.json similarity index 100% rename from res/trainers/trainer_ninja_boy_zach.json rename to res/trainers/data/ninja_boy_zach.json diff --git a/res/trainers/trainer_ninja_boy_zach_rematch_1.json b/res/trainers/data/ninja_boy_zach_rematch_1.json similarity index 100% rename from res/trainers/trainer_ninja_boy_zach_rematch_1.json rename to res/trainers/data/ninja_boy_zach_rematch_1.json diff --git a/res/trainers/trainer_ninja_boy_zach_rematch_2.json b/res/trainers/data/ninja_boy_zach_rematch_2.json similarity index 100% rename from res/trainers/trainer_ninja_boy_zach_rematch_2.json rename to res/trainers/data/ninja_boy_zach_rematch_2.json diff --git a/res/trainers/trainer_ninja_boy_zach_rematch_3.json b/res/trainers/data/ninja_boy_zach_rematch_3.json similarity index 100% rename from res/trainers/trainer_ninja_boy_zach_rematch_3.json rename to res/trainers/data/ninja_boy_zach_rematch_3.json diff --git a/res/trainers/trainer_none.json b/res/trainers/data/none.json similarity index 100% rename from res/trainers/trainer_none.json rename to res/trainers/data/none.json diff --git a/res/trainers/trainer_parasol_lady_alexa.json b/res/trainers/data/parasol_lady_alexa.json similarity index 100% rename from res/trainers/trainer_parasol_lady_alexa.json rename to res/trainers/data/parasol_lady_alexa.json diff --git a/res/trainers/trainer_parasol_lady_alexa_rematch_1.json b/res/trainers/data/parasol_lady_alexa_rematch_1.json similarity index 100% rename from res/trainers/trainer_parasol_lady_alexa_rematch_1.json rename to res/trainers/data/parasol_lady_alexa_rematch_1.json diff --git a/res/trainers/trainer_parasol_lady_alexa_rematch_2.json b/res/trainers/data/parasol_lady_alexa_rematch_2.json similarity index 100% rename from res/trainers/trainer_parasol_lady_alexa_rematch_2.json rename to res/trainers/data/parasol_lady_alexa_rematch_2.json diff --git a/res/trainers/trainer_parasol_lady_alexa_rematch_3.json b/res/trainers/data/parasol_lady_alexa_rematch_3.json similarity index 100% rename from res/trainers/trainer_parasol_lady_alexa_rematch_3.json rename to res/trainers/data/parasol_lady_alexa_rematch_3.json diff --git a/res/trainers/trainer_parasol_lady_sabrina.json b/res/trainers/data/parasol_lady_sabrina.json similarity index 100% rename from res/trainers/trainer_parasol_lady_sabrina.json rename to res/trainers/data/parasol_lady_sabrina.json diff --git a/res/trainers/trainer_pi_carlos.json b/res/trainers/data/pi_carlos.json similarity index 100% rename from res/trainers/trainer_pi_carlos.json rename to res/trainers/data/pi_carlos.json diff --git a/res/trainers/trainer_pi_carlos_rematch_1.json b/res/trainers/data/pi_carlos_rematch_1.json similarity index 100% rename from res/trainers/trainer_pi_carlos_rematch_1.json rename to res/trainers/data/pi_carlos_rematch_1.json diff --git a/res/trainers/trainer_pi_carlos_rematch_2.json b/res/trainers/data/pi_carlos_rematch_2.json similarity index 100% rename from res/trainers/trainer_pi_carlos_rematch_2.json rename to res/trainers/data/pi_carlos_rematch_2.json diff --git a/res/trainers/trainer_pi_kendrick.json b/res/trainers/data/pi_kendrick.json similarity index 100% rename from res/trainers/trainer_pi_kendrick.json rename to res/trainers/data/pi_kendrick.json diff --git a/res/trainers/trainer_picnicker_ana.json b/res/trainers/data/picnicker_ana.json similarity index 100% rename from res/trainers/trainer_picnicker_ana.json rename to res/trainers/data/picnicker_ana.json diff --git a/res/trainers/trainer_picnicker_cheyenne.json b/res/trainers/data/picnicker_cheyenne.json similarity index 100% rename from res/trainers/trainer_picnicker_cheyenne.json rename to res/trainers/data/picnicker_cheyenne.json diff --git a/res/trainers/trainer_picnicker_diana.json b/res/trainers/data/picnicker_diana.json similarity index 100% rename from res/trainers/trainer_picnicker_diana.json rename to res/trainers/data/picnicker_diana.json diff --git a/res/trainers/trainer_picnicker_karina.json b/res/trainers/data/picnicker_karina.json similarity index 100% rename from res/trainers/trainer_picnicker_karina.json rename to res/trainers/data/picnicker_karina.json diff --git a/res/trainers/trainer_picnicker_karina_rematch_1.json b/res/trainers/data/picnicker_karina_rematch_1.json similarity index 100% rename from res/trainers/trainer_picnicker_karina_rematch_1.json rename to res/trainers/data/picnicker_karina_rematch_1.json diff --git a/res/trainers/trainer_picnicker_karina_rematch_2.json b/res/trainers/data/picnicker_karina_rematch_2.json similarity index 100% rename from res/trainers/trainer_picnicker_karina_rematch_2.json rename to res/trainers/data/picnicker_karina_rematch_2.json diff --git a/res/trainers/trainer_picnicker_karina_rematch_3.json b/res/trainers/data/picnicker_karina_rematch_3.json similarity index 100% rename from res/trainers/trainer_picnicker_karina_rematch_3.json rename to res/trainers/data/picnicker_karina_rematch_3.json diff --git a/res/trainers/trainer_picnicker_lauren.json b/res/trainers/data/picnicker_lauren.json similarity index 100% rename from res/trainers/trainer_picnicker_lauren.json rename to res/trainers/data/picnicker_lauren.json diff --git a/res/trainers/trainer_picnicker_siena.json b/res/trainers/data/picnicker_siena.json similarity index 100% rename from res/trainers/trainer_picnicker_siena.json rename to res/trainers/data/picnicker_siena.json diff --git a/res/trainers/trainer_picnicker_summer.json b/res/trainers/data/picnicker_summer.json similarity index 100% rename from res/trainers/trainer_picnicker_summer.json rename to res/trainers/data/picnicker_summer.json diff --git a/res/trainers/trainer_picnicker_tori.json b/res/trainers/data/picnicker_tori.json similarity index 100% rename from res/trainers/trainer_picnicker_tori.json rename to res/trainers/data/picnicker_tori.json diff --git a/res/trainers/trainer_poke_kid_ariel.json b/res/trainers/data/poke_kid_ariel.json similarity index 100% rename from res/trainers/trainer_poke_kid_ariel.json rename to res/trainers/data/poke_kid_ariel.json diff --git a/res/trainers/trainer_poke_kid_ariel_rematch_1.json b/res/trainers/data/poke_kid_ariel_rematch_1.json similarity index 100% rename from res/trainers/trainer_poke_kid_ariel_rematch_1.json rename to res/trainers/data/poke_kid_ariel_rematch_1.json diff --git a/res/trainers/trainer_poke_kid_ariel_rematch_2.json b/res/trainers/data/poke_kid_ariel_rematch_2.json similarity index 100% rename from res/trainers/trainer_poke_kid_ariel_rematch_2.json rename to res/trainers/data/poke_kid_ariel_rematch_2.json diff --git a/res/trainers/trainer_poke_kid_ariel_rematch_3.json b/res/trainers/data/poke_kid_ariel_rematch_3.json similarity index 100% rename from res/trainers/trainer_poke_kid_ariel_rematch_3.json rename to res/trainers/data/poke_kid_ariel_rematch_3.json diff --git a/res/trainers/trainer_poke_kid_ariel_rematch_4.json b/res/trainers/data/poke_kid_ariel_rematch_4.json similarity index 100% rename from res/trainers/trainer_poke_kid_ariel_rematch_4.json rename to res/trainers/data/poke_kid_ariel_rematch_4.json diff --git a/res/trainers/trainer_poke_kid_danielle.json b/res/trainers/data/poke_kid_danielle.json similarity index 100% rename from res/trainers/trainer_poke_kid_danielle.json rename to res/trainers/data/poke_kid_danielle.json diff --git a/res/trainers/trainer_poke_kid_danielle_rematch_1.json b/res/trainers/data/poke_kid_danielle_rematch_1.json similarity index 100% rename from res/trainers/trainer_poke_kid_danielle_rematch_1.json rename to res/trainers/data/poke_kid_danielle_rematch_1.json diff --git a/res/trainers/trainer_poke_kid_danielle_rematch_2.json b/res/trainers/data/poke_kid_danielle_rematch_2.json similarity index 100% rename from res/trainers/trainer_poke_kid_danielle_rematch_2.json rename to res/trainers/data/poke_kid_danielle_rematch_2.json diff --git a/res/trainers/trainer_poke_kid_danielle_rematch_3.json b/res/trainers/data/poke_kid_danielle_rematch_3.json similarity index 100% rename from res/trainers/trainer_poke_kid_danielle_rematch_3.json rename to res/trainers/data/poke_kid_danielle_rematch_3.json diff --git a/res/trainers/trainer_poke_kid_janet.json b/res/trainers/data/poke_kid_janet.json similarity index 100% rename from res/trainers/trainer_poke_kid_janet.json rename to res/trainers/data/poke_kid_janet.json diff --git a/res/trainers/trainer_poke_kid_meghan.json b/res/trainers/data/poke_kid_meghan.json similarity index 100% rename from res/trainers/trainer_poke_kid_meghan.json rename to res/trainers/data/poke_kid_meghan.json diff --git a/res/trainers/trainer_pokefan_leonard.json b/res/trainers/data/pokefan_leonard.json similarity index 100% rename from res/trainers/trainer_pokefan_leonard.json rename to res/trainers/data/pokefan_leonard.json diff --git a/res/trainers/trainer_pokefan_meredith.json b/res/trainers/data/pokefan_meredith.json similarity index 100% rename from res/trainers/trainer_pokefan_meredith.json rename to res/trainers/data/pokefan_meredith.json diff --git a/res/trainers/trainer_pokefan_rebekah.json b/res/trainers/data/pokefan_rebekah.json similarity index 100% rename from res/trainers/trainer_pokefan_rebekah.json rename to res/trainers/data/pokefan_rebekah.json diff --git a/res/trainers/trainer_policeman_alex.json b/res/trainers/data/policeman_alex.json similarity index 100% rename from res/trainers/trainer_policeman_alex.json rename to res/trainers/data/policeman_alex.json diff --git a/res/trainers/trainer_policeman_bobby.json b/res/trainers/data/policeman_bobby.json similarity index 100% rename from res/trainers/trainer_policeman_bobby.json rename to res/trainers/data/policeman_bobby.json diff --git a/res/trainers/trainer_policeman_caleb.json b/res/trainers/data/policeman_caleb.json similarity index 100% rename from res/trainers/trainer_policeman_caleb.json rename to res/trainers/data/policeman_caleb.json diff --git a/res/trainers/trainer_policeman_danny.json b/res/trainers/data/policeman_danny.json similarity index 100% rename from res/trainers/trainer_policeman_danny.json rename to res/trainers/data/policeman_danny.json diff --git a/res/trainers/trainer_policeman_danny_rematch_1.json b/res/trainers/data/policeman_danny_rematch_1.json similarity index 100% rename from res/trainers/trainer_policeman_danny_rematch_1.json rename to res/trainers/data/policeman_danny_rematch_1.json diff --git a/res/trainers/trainer_policeman_danny_rematch_2.json b/res/trainers/data/policeman_danny_rematch_2.json similarity index 100% rename from res/trainers/trainer_policeman_danny_rematch_2.json rename to res/trainers/data/policeman_danny_rematch_2.json diff --git a/res/trainers/trainer_policeman_danny_rematch_3.json b/res/trainers/data/policeman_danny_rematch_3.json similarity index 100% rename from res/trainers/trainer_policeman_danny_rematch_3.json rename to res/trainers/data/policeman_danny_rematch_3.json diff --git a/res/trainers/trainer_policeman_dylan.json b/res/trainers/data/policeman_dylan.json similarity index 100% rename from res/trainers/trainer_policeman_dylan.json rename to res/trainers/data/policeman_dylan.json diff --git a/res/trainers/trainer_policeman_thomas.json b/res/trainers/data/policeman_thomas.json similarity index 100% rename from res/trainers/trainer_policeman_thomas.json rename to res/trainers/data/policeman_thomas.json diff --git a/res/trainers/trainer_psychic_abigail.json b/res/trainers/data/psychic_abigail.json similarity index 100% rename from res/trainers/trainer_psychic_abigail.json rename to res/trainers/data/psychic_abigail.json diff --git a/res/trainers/trainer_psychic_abigail_rematch_1.json b/res/trainers/data/psychic_abigail_rematch_1.json similarity index 100% rename from res/trainers/trainer_psychic_abigail_rematch_1.json rename to res/trainers/data/psychic_abigail_rematch_1.json diff --git a/res/trainers/trainer_psychic_abigail_rematch_2.json b/res/trainers/data/psychic_abigail_rematch_2.json similarity index 100% rename from res/trainers/trainer_psychic_abigail_rematch_2.json rename to res/trainers/data/psychic_abigail_rematch_2.json diff --git a/res/trainers/trainer_psychic_brittney.json b/res/trainers/data/psychic_brittney.json similarity index 100% rename from res/trainers/trainer_psychic_brittney.json rename to res/trainers/data/psychic_brittney.json diff --git a/res/trainers/trainer_psychic_brittney_rematch.json b/res/trainers/data/psychic_brittney_rematch.json similarity index 100% rename from res/trainers/trainer_psychic_brittney_rematch.json rename to res/trainers/data/psychic_brittney_rematch.json diff --git a/res/trainers/trainer_psychic_bryce.json b/res/trainers/data/psychic_bryce.json similarity index 100% rename from res/trainers/trainer_psychic_bryce.json rename to res/trainers/data/psychic_bryce.json diff --git a/res/trainers/trainer_psychic_chelsey.json b/res/trainers/data/psychic_chelsey.json similarity index 100% rename from res/trainers/trainer_psychic_chelsey.json rename to res/trainers/data/psychic_chelsey.json diff --git a/res/trainers/trainer_psychic_corbin.json b/res/trainers/data/psychic_corbin.json similarity index 100% rename from res/trainers/trainer_psychic_corbin.json rename to res/trainers/data/psychic_corbin.json diff --git a/res/trainers/trainer_psychic_corbin_rematch.json b/res/trainers/data/psychic_corbin_rematch.json similarity index 100% rename from res/trainers/trainer_psychic_corbin_rematch.json rename to res/trainers/data/psychic_corbin_rematch.json diff --git a/res/trainers/trainer_psychic_daisy.json b/res/trainers/data/psychic_daisy.json similarity index 100% rename from res/trainers/trainer_psychic_daisy.json rename to res/trainers/data/psychic_daisy.json diff --git a/res/trainers/trainer_psychic_daisy_rematch.json b/res/trainers/data/psychic_daisy_rematch.json similarity index 100% rename from res/trainers/trainer_psychic_daisy_rematch.json rename to res/trainers/data/psychic_daisy_rematch.json diff --git a/res/trainers/trainer_psychic_deandre.json b/res/trainers/data/psychic_deandre.json similarity index 100% rename from res/trainers/trainer_psychic_deandre.json rename to res/trainers/data/psychic_deandre.json diff --git a/res/trainers/trainer_psychic_desiree.json b/res/trainers/data/psychic_desiree.json similarity index 100% rename from res/trainers/trainer_psychic_desiree.json rename to res/trainers/data/psychic_desiree.json diff --git a/res/trainers/trainer_psychic_elijah.json b/res/trainers/data/psychic_elijah.json similarity index 100% rename from res/trainers/trainer_psychic_elijah.json rename to res/trainers/data/psychic_elijah.json diff --git a/res/trainers/trainer_psychic_kendra.json b/res/trainers/data/psychic_kendra.json similarity index 100% rename from res/trainers/trainer_psychic_kendra.json rename to res/trainers/data/psychic_kendra.json diff --git a/res/trainers/trainer_psychic_kody.json b/res/trainers/data/psychic_kody.json similarity index 100% rename from res/trainers/trainer_psychic_kody.json rename to res/trainers/data/psychic_kody.json diff --git a/res/trainers/trainer_psychic_landon.json b/res/trainers/data/psychic_landon.json similarity index 100% rename from res/trainers/trainer_psychic_landon.json rename to res/trainers/data/psychic_landon.json diff --git a/res/trainers/trainer_psychic_lindsey.json b/res/trainers/data/psychic_lindsey.json similarity index 100% rename from res/trainers/trainer_psychic_lindsey.json rename to res/trainers/data/psychic_lindsey.json diff --git a/res/trainers/trainer_psychic_maxwell.json b/res/trainers/data/psychic_maxwell.json similarity index 100% rename from res/trainers/trainer_psychic_maxwell.json rename to res/trainers/data/psychic_maxwell.json diff --git a/res/trainers/trainer_psychic_maxwell_rematch.json b/res/trainers/data/psychic_maxwell_rematch.json similarity index 100% rename from res/trainers/trainer_psychic_maxwell_rematch.json rename to res/trainers/data/psychic_maxwell_rematch.json diff --git a/res/trainers/trainer_psychic_mitchell.json b/res/trainers/data/psychic_mitchell.json similarity index 100% rename from res/trainers/trainer_psychic_mitchell.json rename to res/trainers/data/psychic_mitchell.json diff --git a/res/trainers/trainer_psychic_mitchell_rematch_1.json b/res/trainers/data/psychic_mitchell_rematch_1.json similarity index 100% rename from res/trainers/trainer_psychic_mitchell_rematch_1.json rename to res/trainers/data/psychic_mitchell_rematch_1.json diff --git a/res/trainers/trainer_psychic_mitchell_rematch_2.json b/res/trainers/data/psychic_mitchell_rematch_2.json similarity index 100% rename from res/trainers/trainer_psychic_mitchell_rematch_2.json rename to res/trainers/data/psychic_mitchell_rematch_2.json diff --git a/res/trainers/trainer_psychic_rachael.json b/res/trainers/data/psychic_rachael.json similarity index 100% rename from res/trainers/trainer_psychic_rachael.json rename to res/trainers/data/psychic_rachael.json diff --git a/res/trainers/trainer_psychic_sterling.json b/res/trainers/data/psychic_sterling.json similarity index 100% rename from res/trainers/trainer_psychic_sterling.json rename to res/trainers/data/psychic_sterling.json diff --git a/res/trainers/trainer_psychic_valencia.json b/res/trainers/data/psychic_valencia.json similarity index 100% rename from res/trainers/trainer_psychic_valencia.json rename to res/trainers/data/psychic_valencia.json diff --git a/res/trainers/trainer_rancher_marco.json b/res/trainers/data/rancher_marco.json similarity index 100% rename from res/trainers/trainer_rancher_marco.json rename to res/trainers/data/rancher_marco.json diff --git a/res/trainers/trainer_rancher_marco_rematch_1.json b/res/trainers/data/rancher_marco_rematch_1.json similarity index 100% rename from res/trainers/trainer_rancher_marco_rematch_1.json rename to res/trainers/data/rancher_marco_rematch_1.json diff --git a/res/trainers/trainer_rancher_marco_rematch_2.json b/res/trainers/data/rancher_marco_rematch_2.json similarity index 100% rename from res/trainers/trainer_rancher_marco_rematch_2.json rename to res/trainers/data/rancher_marco_rematch_2.json diff --git a/res/trainers/trainer_ranger_allison.json b/res/trainers/data/ranger_allison.json similarity index 100% rename from res/trainers/trainer_ranger_allison.json rename to res/trainers/data/ranger_allison.json diff --git a/res/trainers/trainer_ranger_allison_rematch_1.json b/res/trainers/data/ranger_allison_rematch_1.json similarity index 100% rename from res/trainers/trainer_ranger_allison_rematch_1.json rename to res/trainers/data/ranger_allison_rematch_1.json diff --git a/res/trainers/trainer_ranger_allison_rematch_2.json b/res/trainers/data/ranger_allison_rematch_2.json similarity index 100% rename from res/trainers/trainer_ranger_allison_rematch_2.json rename to res/trainers/data/ranger_allison_rematch_2.json diff --git a/res/trainers/trainer_ranger_allison_rematch_3.json b/res/trainers/data/ranger_allison_rematch_3.json similarity index 100% rename from res/trainers/trainer_ranger_allison_rematch_3.json rename to res/trainers/data/ranger_allison_rematch_3.json diff --git a/res/trainers/trainer_ranger_ashlee.json b/res/trainers/data/ranger_ashlee.json similarity index 100% rename from res/trainers/trainer_ranger_ashlee.json rename to res/trainers/data/ranger_ashlee.json diff --git a/res/trainers/trainer_ranger_ashlee_rematch.json b/res/trainers/data/ranger_ashlee_rematch.json similarity index 100% rename from res/trainers/trainer_ranger_ashlee_rematch.json rename to res/trainers/data/ranger_ashlee_rematch.json diff --git a/res/trainers/trainer_ranger_deshawn.json b/res/trainers/data/ranger_deshawn.json similarity index 100% rename from res/trainers/trainer_ranger_deshawn.json rename to res/trainers/data/ranger_deshawn.json diff --git a/res/trainers/trainer_ranger_dwayne.json b/res/trainers/data/ranger_dwayne.json similarity index 100% rename from res/trainers/trainer_ranger_dwayne.json rename to res/trainers/data/ranger_dwayne.json diff --git a/res/trainers/trainer_ranger_felicia.json b/res/trainers/data/ranger_felicia.json similarity index 100% rename from res/trainers/trainer_ranger_felicia.json rename to res/trainers/data/ranger_felicia.json diff --git a/res/trainers/trainer_ranger_jeffrey.json b/res/trainers/data/ranger_jeffrey.json similarity index 100% rename from res/trainers/trainer_ranger_jeffrey.json rename to res/trainers/data/ranger_jeffrey.json diff --git a/res/trainers/trainer_ranger_krista.json b/res/trainers/data/ranger_krista.json similarity index 100% rename from res/trainers/trainer_ranger_krista.json rename to res/trainers/data/ranger_krista.json diff --git a/res/trainers/trainer_ranger_kyler.json b/res/trainers/data/ranger_kyler.json similarity index 100% rename from res/trainers/trainer_ranger_kyler.json rename to res/trainers/data/ranger_kyler.json diff --git a/res/trainers/trainer_ranger_kyler_rematch.json b/res/trainers/data/ranger_kyler_rematch.json similarity index 100% rename from res/trainers/trainer_ranger_kyler_rematch.json rename to res/trainers/data/ranger_kyler_rematch.json diff --git a/res/trainers/trainer_ranger_taylor.json b/res/trainers/data/ranger_taylor.json similarity index 100% rename from res/trainers/trainer_ranger_taylor.json rename to res/trainers/data/ranger_taylor.json diff --git a/res/trainers/trainer_ranger_taylor_rematch_1.json b/res/trainers/data/ranger_taylor_rematch_1.json similarity index 100% rename from res/trainers/trainer_ranger_taylor_rematch_1.json rename to res/trainers/data/ranger_taylor_rematch_1.json diff --git a/res/trainers/trainer_ranger_taylor_rematch_2.json b/res/trainers/data/ranger_taylor_rematch_2.json similarity index 100% rename from res/trainers/trainer_ranger_taylor_rematch_2.json rename to res/trainers/data/ranger_taylor_rematch_2.json diff --git a/res/trainers/trainer_ranger_taylor_rematch_3.json b/res/trainers/data/ranger_taylor_rematch_3.json similarity index 100% rename from res/trainers/trainer_ranger_taylor_rematch_3.json rename to res/trainers/data/ranger_taylor_rematch_3.json diff --git a/res/trainers/trainer_reporters_kinsey.json b/res/trainers/data/reporters_kinsey.json similarity index 100% rename from res/trainers/trainer_reporters_kinsey.json rename to res/trainers/data/reporters_kinsey.json diff --git a/res/trainers/trainer_reporters_kinsey_rematch_1.json b/res/trainers/data/reporters_kinsey_rematch_1.json similarity index 100% rename from res/trainers/trainer_reporters_kinsey_rematch_1.json rename to res/trainers/data/reporters_kinsey_rematch_1.json diff --git a/res/trainers/trainer_reporters_kinsey_rematch_2.json b/res/trainers/data/reporters_kinsey_rematch_2.json similarity index 100% rename from res/trainers/trainer_reporters_kinsey_rematch_2.json rename to res/trainers/data/reporters_kinsey_rematch_2.json diff --git a/res/trainers/trainer_reporters_kinsey_rematch_3.json b/res/trainers/data/reporters_kinsey_rematch_3.json similarity index 100% rename from res/trainers/trainer_reporters_kinsey_rematch_3.json rename to res/trainers/data/reporters_kinsey_rematch_3.json diff --git a/res/trainers/trainer_reporters_kinsey_rematch_4.json b/res/trainers/data/reporters_kinsey_rematch_4.json similarity index 100% rename from res/trainers/trainer_reporters_kinsey_rematch_4.json rename to res/trainers/data/reporters_kinsey_rematch_4.json diff --git a/res/trainers/trainer_reporters_valerie.json b/res/trainers/data/reporters_valerie.json similarity index 100% rename from res/trainers/trainer_reporters_valerie.json rename to res/trainers/data/reporters_valerie.json diff --git a/res/trainers/trainer_rich_boy_jason.json b/res/trainers/data/rich_boy_jason.json similarity index 100% rename from res/trainers/trainer_rich_boy_jason.json rename to res/trainers/data/rich_boy_jason.json diff --git a/res/trainers/trainer_rich_boy_liam.json b/res/trainers/data/rich_boy_liam.json similarity index 100% rename from res/trainers/trainer_rich_boy_liam.json rename to res/trainers/data/rich_boy_liam.json diff --git a/res/trainers/trainer_rich_boy_roman.json b/res/trainers/data/rich_boy_roman.json similarity index 100% rename from res/trainers/trainer_rich_boy_roman.json rename to res/trainers/data/rich_boy_roman.json diff --git a/res/trainers/trainer_rich_boy_trey.json b/res/trainers/data/rich_boy_trey.json similarity index 100% rename from res/trainers/trainer_rich_boy_trey.json rename to res/trainers/data/rich_boy_trey.json diff --git a/res/trainers/trainer_rich_boy_trey_rematch_1.json b/res/trainers/data/rich_boy_trey_rematch_1.json similarity index 100% rename from res/trainers/trainer_rich_boy_trey_rematch_1.json rename to res/trainers/data/rich_boy_trey_rematch_1.json diff --git a/res/trainers/trainer_rich_boy_trey_rematch_2.json b/res/trainers/data/rich_boy_trey_rematch_2.json similarity index 100% rename from res/trainers/trainer_rich_boy_trey_rematch_2.json rename to res/trainers/data/rich_boy_trey_rematch_2.json diff --git a/res/trainers/trainer_riley_battleground.json b/res/trainers/data/riley_battleground.json similarity index 100% rename from res/trainers/trainer_riley_battleground.json rename to res/trainers/data/riley_battleground.json diff --git a/res/trainers/trainer_riley_iron_island.json b/res/trainers/data/riley_iron_island.json similarity index 100% rename from res/trainers/trainer_riley_iron_island.json rename to res/trainers/data/riley_iron_island.json diff --git a/res/trainers/trainer_rival_canalave_city_chimchar.json b/res/trainers/data/rival_canalave_city_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_canalave_city_chimchar.json rename to res/trainers/data/rival_canalave_city_chimchar.json diff --git a/res/trainers/trainer_rival_canalave_city_piplup.json b/res/trainers/data/rival_canalave_city_piplup.json similarity index 100% rename from res/trainers/trainer_rival_canalave_city_piplup.json rename to res/trainers/data/rival_canalave_city_piplup.json diff --git a/res/trainers/trainer_rival_canalave_city_turtwig.json b/res/trainers/data/rival_canalave_city_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_canalave_city_turtwig.json rename to res/trainers/data/rival_canalave_city_turtwig.json diff --git a/res/trainers/trainer_rival_fight_area_chimchar.json b/res/trainers/data/rival_fight_area_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_fight_area_chimchar.json rename to res/trainers/data/rival_fight_area_chimchar.json diff --git a/res/trainers/trainer_rival_fight_area_piplup.json b/res/trainers/data/rival_fight_area_piplup.json similarity index 100% rename from res/trainers/trainer_rival_fight_area_piplup.json rename to res/trainers/data/rival_fight_area_piplup.json diff --git a/res/trainers/trainer_rival_fight_area_turtwig.json b/res/trainers/data/rival_fight_area_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_fight_area_turtwig.json rename to res/trainers/data/rival_fight_area_turtwig.json diff --git a/res/trainers/trainer_rival_pastoria_city_chimchar.json b/res/trainers/data/rival_pastoria_city_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_pastoria_city_chimchar.json rename to res/trainers/data/rival_pastoria_city_chimchar.json diff --git a/res/trainers/trainer_rival_pastoria_city_piplup.json b/res/trainers/data/rival_pastoria_city_piplup.json similarity index 100% rename from res/trainers/trainer_rival_pastoria_city_piplup.json rename to res/trainers/data/rival_pastoria_city_piplup.json diff --git a/res/trainers/trainer_rival_pastoria_city_turtwig.json b/res/trainers/data/rival_pastoria_city_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_pastoria_city_turtwig.json rename to res/trainers/data/rival_pastoria_city_turtwig.json diff --git a/res/trainers/trainer_rival_pokemon_league_chimchar.json b/res/trainers/data/rival_pokemon_league_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_pokemon_league_chimchar.json rename to res/trainers/data/rival_pokemon_league_chimchar.json diff --git a/res/trainers/trainer_rival_pokemon_league_piplup.json b/res/trainers/data/rival_pokemon_league_piplup.json similarity index 100% rename from res/trainers/trainer_rival_pokemon_league_piplup.json rename to res/trainers/data/rival_pokemon_league_piplup.json diff --git a/res/trainers/trainer_rival_pokemon_league_turtwig.json b/res/trainers/data/rival_pokemon_league_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_pokemon_league_turtwig.json rename to res/trainers/data/rival_pokemon_league_turtwig.json diff --git a/res/trainers/trainer_rival_route_201_chimchar.json b/res/trainers/data/rival_route_201_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_route_201_chimchar.json rename to res/trainers/data/rival_route_201_chimchar.json diff --git a/res/trainers/trainer_rival_route_201_piplup.json b/res/trainers/data/rival_route_201_piplup.json similarity index 100% rename from res/trainers/trainer_rival_route_201_piplup.json rename to res/trainers/data/rival_route_201_piplup.json diff --git a/res/trainers/trainer_rival_route_201_turtwig.json b/res/trainers/data/rival_route_201_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_route_201_turtwig.json rename to res/trainers/data/rival_route_201_turtwig.json diff --git a/res/trainers/trainer_rival_route_203_chimchar.json b/res/trainers/data/rival_route_203_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_route_203_chimchar.json rename to res/trainers/data/rival_route_203_chimchar.json diff --git a/res/trainers/trainer_rival_route_203_piplup.json b/res/trainers/data/rival_route_203_piplup.json similarity index 100% rename from res/trainers/trainer_rival_route_203_piplup.json rename to res/trainers/data/rival_route_203_piplup.json diff --git a/res/trainers/trainer_rival_route_203_turtwig.json b/res/trainers/data/rival_route_203_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_route_203_turtwig.json rename to res/trainers/data/rival_route_203_turtwig.json diff --git a/res/trainers/trainer_rival_route_209_chimchar.json b/res/trainers/data/rival_route_209_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_route_209_chimchar.json rename to res/trainers/data/rival_route_209_chimchar.json diff --git a/res/trainers/trainer_rival_route_209_piplup.json b/res/trainers/data/rival_route_209_piplup.json similarity index 100% rename from res/trainers/trainer_rival_route_209_piplup.json rename to res/trainers/data/rival_route_209_piplup.json diff --git a/res/trainers/trainer_rival_route_209_turtwig.json b/res/trainers/data/rival_route_209_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_route_209_turtwig.json rename to res/trainers/data/rival_route_209_turtwig.json diff --git a/res/trainers/trainer_rival_spear_pillar_chimchar.json b/res/trainers/data/rival_spear_pillar_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_spear_pillar_chimchar.json rename to res/trainers/data/rival_spear_pillar_chimchar.json diff --git a/res/trainers/trainer_rival_spear_pillar_piplup.json b/res/trainers/data/rival_spear_pillar_piplup.json similarity index 100% rename from res/trainers/trainer_rival_spear_pillar_piplup.json rename to res/trainers/data/rival_spear_pillar_piplup.json diff --git a/res/trainers/trainer_rival_spear_pillar_turtwig.json b/res/trainers/data/rival_spear_pillar_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_spear_pillar_turtwig.json rename to res/trainers/data/rival_spear_pillar_turtwig.json diff --git a/res/trainers/trainer_rival_survival_area_1_chimchar.json b/res/trainers/data/rival_survival_area_1_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_survival_area_1_chimchar.json rename to res/trainers/data/rival_survival_area_1_chimchar.json diff --git a/res/trainers/trainer_rival_survival_area_1_piplup.json b/res/trainers/data/rival_survival_area_1_piplup.json similarity index 100% rename from res/trainers/trainer_rival_survival_area_1_piplup.json rename to res/trainers/data/rival_survival_area_1_piplup.json diff --git a/res/trainers/trainer_rival_survival_area_1_turtwig.json b/res/trainers/data/rival_survival_area_1_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_survival_area_1_turtwig.json rename to res/trainers/data/rival_survival_area_1_turtwig.json diff --git a/res/trainers/trainer_rival_survival_area_2_chimchar.json b/res/trainers/data/rival_survival_area_2_chimchar.json similarity index 100% rename from res/trainers/trainer_rival_survival_area_2_chimchar.json rename to res/trainers/data/rival_survival_area_2_chimchar.json diff --git a/res/trainers/trainer_rival_survival_area_2_piplup.json b/res/trainers/data/rival_survival_area_2_piplup.json similarity index 100% rename from res/trainers/trainer_rival_survival_area_2_piplup.json rename to res/trainers/data/rival_survival_area_2_piplup.json diff --git a/res/trainers/trainer_rival_survival_area_2_turtwig.json b/res/trainers/data/rival_survival_area_2_turtwig.json similarity index 100% rename from res/trainers/trainer_rival_survival_area_2_turtwig.json rename to res/trainers/data/rival_survival_area_2_turtwig.json diff --git a/res/trainers/trainer_roughneck_kirby.json b/res/trainers/data/roughneck_kirby.json similarity index 100% rename from res/trainers/trainer_roughneck_kirby.json rename to res/trainers/data/roughneck_kirby.json diff --git a/res/trainers/trainer_ruin_maniac_bryan.json b/res/trainers/data/ruin_maniac_bryan.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_bryan.json rename to res/trainers/data/ruin_maniac_bryan.json diff --git a/res/trainers/trainer_ruin_maniac_calvin.json b/res/trainers/data/ruin_maniac_calvin.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_calvin.json rename to res/trainers/data/ruin_maniac_calvin.json diff --git a/res/trainers/trainer_ruin_maniac_gerald.json b/res/trainers/data/ruin_maniac_gerald.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_gerald.json rename to res/trainers/data/ruin_maniac_gerald.json diff --git a/res/trainers/trainer_ruin_maniac_harry.json b/res/trainers/data/ruin_maniac_harry.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_harry.json rename to res/trainers/data/ruin_maniac_harry.json diff --git a/res/trainers/trainer_ruin_maniac_harry_rematch_1.json b/res/trainers/data/ruin_maniac_harry_rematch_1.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_harry_rematch_1.json rename to res/trainers/data/ruin_maniac_harry_rematch_1.json diff --git a/res/trainers/trainer_ruin_maniac_harry_rematch_2.json b/res/trainers/data/ruin_maniac_harry_rematch_2.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_harry_rematch_2.json rename to res/trainers/data/ruin_maniac_harry_rematch_2.json diff --git a/res/trainers/trainer_ruin_maniac_karl.json b/res/trainers/data/ruin_maniac_karl.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_karl.json rename to res/trainers/data/ruin_maniac_karl.json diff --git a/res/trainers/trainer_ruin_maniac_larry.json b/res/trainers/data/ruin_maniac_larry.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_larry.json rename to res/trainers/data/ruin_maniac_larry.json diff --git a/res/trainers/trainer_ruin_maniac_ronald.json b/res/trainers/data/ruin_maniac_ronald.json similarity index 100% rename from res/trainers/trainer_ruin_maniac_ronald.json rename to res/trainers/data/ruin_maniac_ronald.json diff --git a/res/trainers/trainer_sailor_damian.json b/res/trainers/data/sailor_damian.json similarity index 100% rename from res/trainers/trainer_sailor_damian.json rename to res/trainers/data/sailor_damian.json diff --git a/res/trainers/trainer_sailor_luther.json b/res/trainers/data/sailor_luther.json similarity index 100% rename from res/trainers/trainer_sailor_luther.json rename to res/trainers/data/sailor_luther.json diff --git a/res/trainers/trainer_sailor_marc.json b/res/trainers/data/sailor_marc.json similarity index 100% rename from res/trainers/trainer_sailor_marc.json rename to res/trainers/data/sailor_marc.json diff --git a/res/trainers/trainer_sailor_marc_rematch_1.json b/res/trainers/data/sailor_marc_rematch_1.json similarity index 100% rename from res/trainers/trainer_sailor_marc_rematch_1.json rename to res/trainers/data/sailor_marc_rematch_1.json diff --git a/res/trainers/trainer_sailor_marc_rematch_2.json b/res/trainers/data/sailor_marc_rematch_2.json similarity index 100% rename from res/trainers/trainer_sailor_marc_rematch_2.json rename to res/trainers/data/sailor_marc_rematch_2.json diff --git a/res/trainers/trainer_sailor_paul.json b/res/trainers/data/sailor_paul.json similarity index 100% rename from res/trainers/trainer_sailor_paul.json rename to res/trainers/data/sailor_paul.json diff --git a/res/trainers/trainer_sailor_samson.json b/res/trainers/data/sailor_samson.json similarity index 100% rename from res/trainers/trainer_sailor_samson.json rename to res/trainers/data/sailor_samson.json diff --git a/res/trainers/trainer_sailor_skyler.json b/res/trainers/data/sailor_skyler.json similarity index 100% rename from res/trainers/trainer_sailor_skyler.json rename to res/trainers/data/sailor_skyler.json diff --git a/res/trainers/trainer_sailor_zachariah.json b/res/trainers/data/sailor_zachariah.json similarity index 100% rename from res/trainers/trainer_sailor_zachariah.json rename to res/trainers/data/sailor_zachariah.json diff --git a/res/trainers/trainer_sailor_zachariah_rematch.json b/res/trainers/data/sailor_zachariah_rematch.json similarity index 100% rename from res/trainers/trainer_sailor_zachariah_rematch.json rename to res/trainers/data/sailor_zachariah_rematch.json diff --git a/res/trainers/trainer_school_kid_chance.json b/res/trainers/data/school_kid_chance.json similarity index 100% rename from res/trainers/trainer_school_kid_chance.json rename to res/trainers/data/school_kid_chance.json diff --git a/res/trainers/trainer_school_kid_christine.json b/res/trainers/data/school_kid_christine.json similarity index 100% rename from res/trainers/trainer_school_kid_christine.json rename to res/trainers/data/school_kid_christine.json diff --git a/res/trainers/trainer_school_kid_esteban.json b/res/trainers/data/school_kid_esteban.json similarity index 100% rename from res/trainers/trainer_school_kid_esteban.json rename to res/trainers/data/school_kid_esteban.json diff --git a/res/trainers/trainer_school_kid_forrest.json b/res/trainers/data/school_kid_forrest.json similarity index 100% rename from res/trainers/trainer_school_kid_forrest.json rename to res/trainers/data/school_kid_forrest.json diff --git a/res/trainers/trainer_school_kid_harrison.json b/res/trainers/data/school_kid_harrison.json similarity index 100% rename from res/trainers/trainer_school_kid_harrison.json rename to res/trainers/data/school_kid_harrison.json diff --git a/res/trainers/trainer_school_kid_mackenzie.json b/res/trainers/data/school_kid_mackenzie.json similarity index 100% rename from res/trainers/trainer_school_kid_mackenzie.json rename to res/trainers/data/school_kid_mackenzie.json diff --git a/res/trainers/trainer_school_kid_tiera.json b/res/trainers/data/school_kid_tiera.json similarity index 100% rename from res/trainers/trainer_school_kid_tiera.json rename to res/trainers/data/school_kid_tiera.json diff --git a/res/trainers/trainer_scientist_darrius.json b/res/trainers/data/scientist_darrius.json similarity index 100% rename from res/trainers/trainer_scientist_darrius.json rename to res/trainers/data/scientist_darrius.json diff --git a/res/trainers/trainer_scientist_emilio.json b/res/trainers/data/scientist_emilio.json similarity index 100% rename from res/trainers/trainer_scientist_emilio.json rename to res/trainers/data/scientist_emilio.json diff --git a/res/trainers/trainer_scientist_fredrick.json b/res/trainers/data/scientist_fredrick.json similarity index 100% rename from res/trainers/trainer_scientist_fredrick.json rename to res/trainers/data/scientist_fredrick.json diff --git a/res/trainers/trainer_scientist_shaun.json b/res/trainers/data/scientist_shaun.json similarity index 100% rename from res/trainers/trainer_scientist_shaun.json rename to res/trainers/data/scientist_shaun.json diff --git a/res/trainers/trainer_scientist_shaun_rematch_1.json b/res/trainers/data/scientist_shaun_rematch_1.json similarity index 100% rename from res/trainers/trainer_scientist_shaun_rematch_1.json rename to res/trainers/data/scientist_shaun_rematch_1.json diff --git a/res/trainers/trainer_scientist_shaun_rematch_2.json b/res/trainers/data/scientist_shaun_rematch_2.json similarity index 100% rename from res/trainers/trainer_scientist_shaun_rematch_2.json rename to res/trainers/data/scientist_shaun_rematch_2.json diff --git a/res/trainers/trainer_scientist_shaun_rematch_3.json b/res/trainers/data/scientist_shaun_rematch_3.json similarity index 100% rename from res/trainers/trainer_scientist_shaun_rematch_3.json rename to res/trainers/data/scientist_shaun_rematch_3.json diff --git a/res/trainers/trainer_scientist_stefano.json b/res/trainers/data/scientist_stefano.json similarity index 100% rename from res/trainers/trainer_scientist_stefano.json rename to res/trainers/data/scientist_stefano.json diff --git a/res/trainers/trainer_scientist_travon.json b/res/trainers/data/scientist_travon.json similarity index 100% rename from res/trainers/trainer_scientist_travon.json rename to res/trainers/data/scientist_travon.json diff --git a/res/trainers/trainer_skier_andrea.json b/res/trainers/data/skier_andrea.json similarity index 100% rename from res/trainers/trainer_skier_andrea.json rename to res/trainers/data/skier_andrea.json diff --git a/res/trainers/trainer_skier_andrea_rematch_1.json b/res/trainers/data/skier_andrea_rematch_1.json similarity index 100% rename from res/trainers/trainer_skier_andrea_rematch_1.json rename to res/trainers/data/skier_andrea_rematch_1.json diff --git a/res/trainers/trainer_skier_andrea_rematch_2.json b/res/trainers/data/skier_andrea_rematch_2.json similarity index 100% rename from res/trainers/trainer_skier_andrea_rematch_2.json rename to res/trainers/data/skier_andrea_rematch_2.json diff --git a/res/trainers/trainer_skier_bjorn.json b/res/trainers/data/skier_bjorn.json similarity index 100% rename from res/trainers/trainer_skier_bjorn.json rename to res/trainers/data/skier_bjorn.json diff --git a/res/trainers/trainer_skier_bjorn_rematch_1.json b/res/trainers/data/skier_bjorn_rematch_1.json similarity index 100% rename from res/trainers/trainer_skier_bjorn_rematch_1.json rename to res/trainers/data/skier_bjorn_rematch_1.json diff --git a/res/trainers/trainer_skier_bjorn_rematch_2.json b/res/trainers/data/skier_bjorn_rematch_2.json similarity index 100% rename from res/trainers/trainer_skier_bjorn_rematch_2.json rename to res/trainers/data/skier_bjorn_rematch_2.json diff --git a/res/trainers/trainer_skier_bradley.json b/res/trainers/data/skier_bradley.json similarity index 100% rename from res/trainers/trainer_skier_bradley.json rename to res/trainers/data/skier_bradley.json diff --git a/res/trainers/trainer_skier_edward.json b/res/trainers/data/skier_edward.json similarity index 100% rename from res/trainers/trainer_skier_edward.json rename to res/trainers/data/skier_edward.json diff --git a/res/trainers/trainer_skier_edward_rematch_1.json b/res/trainers/data/skier_edward_rematch_1.json similarity index 100% rename from res/trainers/trainer_skier_edward_rematch_1.json rename to res/trainers/data/skier_edward_rematch_1.json diff --git a/res/trainers/trainer_skier_edward_rematch_2.json b/res/trainers/data/skier_edward_rematch_2.json similarity index 100% rename from res/trainers/trainer_skier_edward_rematch_2.json rename to res/trainers/data/skier_edward_rematch_2.json diff --git a/res/trainers/trainer_skier_kaitlyn.json b/res/trainers/data/skier_kaitlyn.json similarity index 100% rename from res/trainers/trainer_skier_kaitlyn.json rename to res/trainers/data/skier_kaitlyn.json diff --git a/res/trainers/trainer_skier_lexie.json b/res/trainers/data/skier_lexie.json similarity index 100% rename from res/trainers/trainer_skier_lexie.json rename to res/trainers/data/skier_lexie.json diff --git a/res/trainers/trainer_skier_madison.json b/res/trainers/data/skier_madison.json similarity index 100% rename from res/trainers/trainer_skier_madison.json rename to res/trainers/data/skier_madison.json diff --git a/res/trainers/trainer_skier_madison_rematch_1.json b/res/trainers/data/skier_madison_rematch_1.json similarity index 100% rename from res/trainers/trainer_skier_madison_rematch_1.json rename to res/trainers/data/skier_madison_rematch_1.json diff --git a/res/trainers/trainer_skier_madison_rematch_2.json b/res/trainers/data/skier_madison_rematch_2.json similarity index 100% rename from res/trainers/trainer_skier_madison_rematch_2.json rename to res/trainers/data/skier_madison_rematch_2.json diff --git a/res/trainers/trainer_skier_shawn.json b/res/trainers/data/skier_shawn.json similarity index 100% rename from res/trainers/trainer_skier_shawn.json rename to res/trainers/data/skier_shawn.json diff --git a/res/trainers/trainer_socialite_rebecca.json b/res/trainers/data/socialite_rebecca.json similarity index 100% rename from res/trainers/trainer_socialite_rebecca.json rename to res/trainers/data/socialite_rebecca.json diff --git a/res/trainers/trainer_socialite_reina.json b/res/trainers/data/socialite_reina.json similarity index 100% rename from res/trainers/trainer_socialite_reina.json rename to res/trainers/data/socialite_reina.json diff --git a/res/trainers/trainer_socialite_reina_rematch_1.json b/res/trainers/data/socialite_reina_rematch_1.json similarity index 100% rename from res/trainers/trainer_socialite_reina_rematch_1.json rename to res/trainers/data/socialite_reina_rematch_1.json diff --git a/res/trainers/trainer_socialite_reina_rematch_2.json b/res/trainers/data/socialite_reina_rematch_2.json similarity index 100% rename from res/trainers/trainer_socialite_reina_rematch_2.json rename to res/trainers/data/socialite_reina_rematch_2.json diff --git a/res/trainers/trainer_swimmer_adrian.json b/res/trainers/data/swimmer_adrian.json similarity index 100% rename from res/trainers/trainer_swimmer_adrian.json rename to res/trainers/data/swimmer_adrian.json diff --git a/res/trainers/trainer_swimmer_aubree.json b/res/trainers/data/swimmer_aubree.json similarity index 100% rename from res/trainers/trainer_swimmer_aubree.json rename to res/trainers/data/swimmer_aubree.json diff --git a/res/trainers/trainer_swimmer_cassandra.json b/res/trainers/data/swimmer_cassandra.json similarity index 100% rename from res/trainers/trainer_swimmer_cassandra.json rename to res/trainers/data/swimmer_cassandra.json diff --git a/res/trainers/trainer_swimmer_claire.json b/res/trainers/data/swimmer_claire.json similarity index 100% rename from res/trainers/trainer_swimmer_claire.json rename to res/trainers/data/swimmer_claire.json diff --git a/res/trainers/trainer_swimmer_colton.json b/res/trainers/data/swimmer_colton.json similarity index 100% rename from res/trainers/trainer_swimmer_colton.json rename to res/trainers/data/swimmer_colton.json diff --git a/res/trainers/trainer_swimmer_crystal.json b/res/trainers/data/swimmer_crystal.json similarity index 100% rename from res/trainers/trainer_swimmer_crystal.json rename to res/trainers/data/swimmer_crystal.json diff --git a/res/trainers/trainer_swimmer_crystal_rematch.json b/res/trainers/data/swimmer_crystal_rematch.json similarity index 100% rename from res/trainers/trainer_swimmer_crystal_rematch.json rename to res/trainers/data/swimmer_crystal_rematch.json diff --git a/res/trainers/trainer_swimmer_dillon.json b/res/trainers/data/swimmer_dillon.json similarity index 100% rename from res/trainers/trainer_swimmer_dillon.json rename to res/trainers/data/swimmer_dillon.json diff --git a/res/trainers/trainer_swimmer_erica.json b/res/trainers/data/swimmer_erica.json similarity index 100% rename from res/trainers/trainer_swimmer_erica.json rename to res/trainers/data/swimmer_erica.json diff --git a/res/trainers/trainer_swimmer_erik.json b/res/trainers/data/swimmer_erik.json similarity index 100% rename from res/trainers/trainer_swimmer_erik.json rename to res/trainers/data/swimmer_erik.json diff --git a/res/trainers/trainer_swimmer_evan.json b/res/trainers/data/swimmer_evan.json similarity index 100% rename from res/trainers/trainer_swimmer_evan.json rename to res/trainers/data/swimmer_evan.json diff --git a/res/trainers/trainer_swimmer_francisco.json b/res/trainers/data/swimmer_francisco.json similarity index 100% rename from res/trainers/trainer_swimmer_francisco.json rename to res/trainers/data/swimmer_francisco.json diff --git a/res/trainers/trainer_swimmer_francisco_rematch.json b/res/trainers/data/swimmer_francisco_rematch.json similarity index 100% rename from res/trainers/trainer_swimmer_francisco_rematch.json rename to res/trainers/data/swimmer_francisco_rematch.json diff --git a/res/trainers/trainer_swimmer_gabrielle.json b/res/trainers/data/swimmer_gabrielle.json similarity index 100% rename from res/trainers/trainer_swimmer_gabrielle.json rename to res/trainers/data/swimmer_gabrielle.json diff --git a/res/trainers/trainer_swimmer_glenn.json b/res/trainers/data/swimmer_glenn.json similarity index 100% rename from res/trainers/trainer_swimmer_glenn.json rename to res/trainers/data/swimmer_glenn.json diff --git a/res/trainers/trainer_swimmer_glenn_rematch.json b/res/trainers/data/swimmer_glenn_rematch.json similarity index 100% rename from res/trainers/trainer_swimmer_glenn_rematch.json rename to res/trainers/data/swimmer_glenn_rematch.json diff --git a/res/trainers/trainer_swimmer_haley.json b/res/trainers/data/swimmer_haley.json similarity index 100% rename from res/trainers/trainer_swimmer_haley.json rename to res/trainers/data/swimmer_haley.json diff --git a/res/trainers/trainer_swimmer_jessica.json b/res/trainers/data/swimmer_jessica.json similarity index 100% rename from res/trainers/trainer_swimmer_jessica.json rename to res/trainers/data/swimmer_jessica.json diff --git a/res/trainers/trainer_swimmer_joanna.json b/res/trainers/data/swimmer_joanna.json similarity index 100% rename from res/trainers/trainer_swimmer_joanna.json rename to res/trainers/data/swimmer_joanna.json diff --git a/res/trainers/trainer_swimmer_joanna_rematch.json b/res/trainers/data/swimmer_joanna_rematch.json similarity index 100% rename from res/trainers/trainer_swimmer_joanna_rematch.json rename to res/trainers/data/swimmer_joanna_rematch.json diff --git a/res/trainers/trainer_swimmer_katelyn.json b/res/trainers/data/swimmer_katelyn.json similarity index 100% rename from res/trainers/trainer_swimmer_katelyn.json rename to res/trainers/data/swimmer_katelyn.json diff --git a/res/trainers/trainer_swimmer_kurt.json b/res/trainers/data/swimmer_kurt.json similarity index 100% rename from res/trainers/trainer_swimmer_kurt.json rename to res/trainers/data/swimmer_kurt.json diff --git a/res/trainers/trainer_swimmer_lydia.json b/res/trainers/data/swimmer_lydia.json similarity index 100% rename from res/trainers/trainer_swimmer_lydia.json rename to res/trainers/data/swimmer_lydia.json diff --git a/res/trainers/trainer_swimmer_mallory.json b/res/trainers/data/swimmer_mallory.json similarity index 100% rename from res/trainers/trainer_swimmer_mallory.json rename to res/trainers/data/swimmer_mallory.json diff --git a/res/trainers/trainer_swimmer_mary.json b/res/trainers/data/swimmer_mary.json similarity index 100% rename from res/trainers/trainer_swimmer_mary.json rename to res/trainers/data/swimmer_mary.json diff --git a/res/trainers/trainer_swimmer_miranda.json b/res/trainers/data/swimmer_miranda.json similarity index 100% rename from res/trainers/trainer_swimmer_miranda.json rename to res/trainers/data/swimmer_miranda.json diff --git a/res/trainers/trainer_swimmer_miranda_rematch.json b/res/trainers/data/swimmer_miranda_rematch.json similarity index 100% rename from res/trainers/trainer_swimmer_miranda_rematch.json rename to res/trainers/data/swimmer_miranda_rematch.json diff --git a/res/trainers/trainer_swimmer_oscar.json b/res/trainers/data/swimmer_oscar.json similarity index 100% rename from res/trainers/trainer_swimmer_oscar.json rename to res/trainers/data/swimmer_oscar.json diff --git a/res/trainers/trainer_swimmer_paige.json b/res/trainers/data/swimmer_paige.json similarity index 100% rename from res/trainers/trainer_swimmer_paige.json rename to res/trainers/data/swimmer_paige.json diff --git a/res/trainers/trainer_swimmer_ricardo.json b/res/trainers/data/swimmer_ricardo.json similarity index 100% rename from res/trainers/trainer_swimmer_ricardo.json rename to res/trainers/data/swimmer_ricardo.json diff --git a/res/trainers/trainer_swimmer_sam.json b/res/trainers/data/swimmer_sam.json similarity index 100% rename from res/trainers/trainer_swimmer_sam.json rename to res/trainers/data/swimmer_sam.json diff --git a/res/trainers/trainer_swimmer_sheltin.json b/res/trainers/data/swimmer_sheltin.json similarity index 100% rename from res/trainers/trainer_swimmer_sheltin.json rename to res/trainers/data/swimmer_sheltin.json diff --git a/res/trainers/trainer_swimmer_sophia.json b/res/trainers/data/swimmer_sophia.json similarity index 100% rename from res/trainers/trainer_swimmer_sophia.json rename to res/trainers/data/swimmer_sophia.json diff --git a/res/trainers/trainer_swimmer_troy.json b/res/trainers/data/swimmer_troy.json similarity index 100% rename from res/trainers/trainer_swimmer_troy.json rename to res/trainers/data/swimmer_troy.json diff --git a/res/trainers/trainer_swimmer_vanessa.json b/res/trainers/data/swimmer_vanessa.json similarity index 100% rename from res/trainers/trainer_swimmer_vanessa.json rename to res/trainers/data/swimmer_vanessa.json diff --git a/res/trainers/trainer_swimmer_vincent.json b/res/trainers/data/swimmer_vincent.json similarity index 100% rename from res/trainers/trainer_swimmer_vincent.json rename to res/trainers/data/swimmer_vincent.json diff --git a/res/trainers/trainer_swimmer_wade.json b/res/trainers/data/swimmer_wade.json similarity index 100% rename from res/trainers/trainer_swimmer_wade.json rename to res/trainers/data/swimmer_wade.json diff --git a/res/trainers/trainer_swimmer_wesley.json b/res/trainers/data/swimmer_wesley.json similarity index 100% rename from res/trainers/trainer_swimmer_wesley.json rename to res/trainers/data/swimmer_wesley.json diff --git a/res/trainers/trainer_swimmer_wesley_rematch.json b/res/trainers/data/swimmer_wesley_rematch.json similarity index 100% rename from res/trainers/trainer_swimmer_wesley_rematch.json rename to res/trainers/data/swimmer_wesley_rematch.json diff --git a/res/trainers/trainer_tuber_caitlyn.json b/res/trainers/data/tuber_caitlyn.json similarity index 100% rename from res/trainers/trainer_tuber_caitlyn.json rename to res/trainers/data/tuber_caitlyn.json diff --git a/res/trainers/trainer_tuber_chelsea.json b/res/trainers/data/tuber_chelsea.json similarity index 100% rename from res/trainers/trainer_tuber_chelsea.json rename to res/trainers/data/tuber_chelsea.json diff --git a/res/trainers/trainer_tuber_chelsea_rematch_1.json b/res/trainers/data/tuber_chelsea_rematch_1.json similarity index 100% rename from res/trainers/trainer_tuber_chelsea_rematch_1.json rename to res/trainers/data/tuber_chelsea_rematch_1.json diff --git a/res/trainers/trainer_tuber_chelsea_rematch_2.json b/res/trainers/data/tuber_chelsea_rematch_2.json similarity index 100% rename from res/trainers/trainer_tuber_chelsea_rematch_2.json rename to res/trainers/data/tuber_chelsea_rematch_2.json diff --git a/res/trainers/trainer_tuber_conner.json b/res/trainers/data/tuber_conner.json similarity index 100% rename from res/trainers/trainer_tuber_conner.json rename to res/trainers/data/tuber_conner.json diff --git a/res/trainers/trainer_tuber_holly.json b/res/trainers/data/tuber_holly.json similarity index 100% rename from res/trainers/trainer_tuber_holly.json rename to res/trainers/data/tuber_holly.json diff --git a/res/trainers/trainer_tuber_jacky.json b/res/trainers/data/tuber_jacky.json similarity index 100% rename from res/trainers/trainer_tuber_jacky.json rename to res/trainers/data/tuber_jacky.json diff --git a/res/trainers/trainer_tuber_jared.json b/res/trainers/data/tuber_jared.json similarity index 100% rename from res/trainers/trainer_tuber_jared.json rename to res/trainers/data/tuber_jared.json diff --git a/res/trainers/trainer_tuber_jared_rematch_1.json b/res/trainers/data/tuber_jared_rematch_1.json similarity index 100% rename from res/trainers/trainer_tuber_jared_rematch_1.json rename to res/trainers/data/tuber_jared_rematch_1.json diff --git a/res/trainers/trainer_tuber_jared_rematch_2.json b/res/trainers/data/tuber_jared_rematch_2.json similarity index 100% rename from res/trainers/trainer_tuber_jared_rematch_2.json rename to res/trainers/data/tuber_jared_rematch_2.json diff --git a/res/trainers/trainer_tuber_mariel.json b/res/trainers/data/tuber_mariel.json similarity index 100% rename from res/trainers/trainer_tuber_mariel.json rename to res/trainers/data/tuber_mariel.json diff --git a/res/trainers/trainer_tuber_trenton.json b/res/trainers/data/tuber_trenton.json similarity index 100% rename from res/trainers/trainer_tuber_trenton.json rename to res/trainers/data/tuber_trenton.json diff --git a/res/trainers/trainer_twins_emma_and_lil.json b/res/trainers/data/twins_emma_and_lil.json similarity index 100% rename from res/trainers/trainer_twins_emma_and_lil.json rename to res/trainers/data/twins_emma_and_lil.json diff --git a/res/trainers/trainer_twins_liv_and_liz.json b/res/trainers/data/twins_liv_and_liz.json similarity index 100% rename from res/trainers/trainer_twins_liv_and_liz.json rename to res/trainers/data/twins_liv_and_liz.json diff --git a/res/trainers/trainer_twins_teri_and_tia.json b/res/trainers/data/twins_teri_and_tia.json similarity index 100% rename from res/trainers/trainer_twins_teri_and_tia.json rename to res/trainers/data/twins_teri_and_tia.json diff --git a/res/trainers/trainer_twins_teri_and_tia_rematch_1.json b/res/trainers/data/twins_teri_and_tia_rematch_1.json similarity index 100% rename from res/trainers/trainer_twins_teri_and_tia_rematch_1.json rename to res/trainers/data/twins_teri_and_tia_rematch_1.json diff --git a/res/trainers/trainer_twins_teri_and_tia_rematch_2.json b/res/trainers/data/twins_teri_and_tia_rematch_2.json similarity index 100% rename from res/trainers/trainer_twins_teri_and_tia_rematch_2.json rename to res/trainers/data/twins_teri_and_tia_rematch_2.json diff --git a/res/trainers/trainer_unknown_005.json b/res/trainers/data/unknown_005.json similarity index 100% rename from res/trainers/trainer_unknown_005.json rename to res/trainers/data/unknown_005.json diff --git a/res/trainers/trainer_unknown_006.json b/res/trainers/data/unknown_006.json similarity index 100% rename from res/trainers/trainer_unknown_006.json rename to res/trainers/data/unknown_006.json diff --git a/res/trainers/trainer_unknown_007.json b/res/trainers/data/unknown_007.json similarity index 100% rename from res/trainers/trainer_unknown_007.json rename to res/trainers/data/unknown_007.json diff --git a/res/trainers/trainer_unknown_008.json b/res/trainers/data/unknown_008.json similarity index 100% rename from res/trainers/trainer_unknown_008.json rename to res/trainers/data/unknown_008.json diff --git a/res/trainers/trainer_unknown_009.json b/res/trainers/data/unknown_009.json similarity index 100% rename from res/trainers/trainer_unknown_009.json rename to res/trainers/data/unknown_009.json diff --git a/res/trainers/trainer_unknown_050.json b/res/trainers/data/unknown_050.json similarity index 100% rename from res/trainers/trainer_unknown_050.json rename to res/trainers/data/unknown_050.json diff --git a/res/trainers/trainer_unknown_051.json b/res/trainers/data/unknown_051.json similarity index 100% rename from res/trainers/trainer_unknown_051.json rename to res/trainers/data/unknown_051.json diff --git a/res/trainers/trainer_unknown_052.json b/res/trainers/data/unknown_052.json similarity index 100% rename from res/trainers/trainer_unknown_052.json rename to res/trainers/data/unknown_052.json diff --git a/res/trainers/trainer_unknown_054.json b/res/trainers/data/unknown_054.json similarity index 100% rename from res/trainers/trainer_unknown_054.json rename to res/trainers/data/unknown_054.json diff --git a/res/trainers/trainer_unknown_058.json b/res/trainers/data/unknown_058.json similarity index 100% rename from res/trainers/trainer_unknown_058.json rename to res/trainers/data/unknown_058.json diff --git a/res/trainers/trainer_unknown_059.json b/res/trainers/data/unknown_059.json similarity index 100% rename from res/trainers/trainer_unknown_059.json rename to res/trainers/data/unknown_059.json diff --git a/res/trainers/trainer_unknown_060.json b/res/trainers/data/unknown_060.json similarity index 100% rename from res/trainers/trainer_unknown_060.json rename to res/trainers/data/unknown_060.json diff --git a/res/trainers/trainer_unknown_061.json b/res/trainers/data/unknown_061.json similarity index 100% rename from res/trainers/trainer_unknown_061.json rename to res/trainers/data/unknown_061.json diff --git a/res/trainers/trainer_unknown_062.json b/res/trainers/data/unknown_062.json similarity index 100% rename from res/trainers/trainer_unknown_062.json rename to res/trainers/data/unknown_062.json diff --git a/res/trainers/trainer_unknown_063.json b/res/trainers/data/unknown_063.json similarity index 100% rename from res/trainers/trainer_unknown_063.json rename to res/trainers/data/unknown_063.json diff --git a/res/trainers/trainer_unknown_064.json b/res/trainers/data/unknown_064.json similarity index 100% rename from res/trainers/trainer_unknown_064.json rename to res/trainers/data/unknown_064.json diff --git a/res/trainers/trainer_unknown_077.json b/res/trainers/data/unknown_077.json similarity index 100% rename from res/trainers/trainer_unknown_077.json rename to res/trainers/data/unknown_077.json diff --git a/res/trainers/trainer_unknown_086.json b/res/trainers/data/unknown_086.json similarity index 100% rename from res/trainers/trainer_unknown_086.json rename to res/trainers/data/unknown_086.json diff --git a/res/trainers/trainer_unknown_087.json b/res/trainers/data/unknown_087.json similarity index 100% rename from res/trainers/trainer_unknown_087.json rename to res/trainers/data/unknown_087.json diff --git a/res/trainers/trainer_unknown_097.json b/res/trainers/data/unknown_097.json similarity index 100% rename from res/trainers/trainer_unknown_097.json rename to res/trainers/data/unknown_097.json diff --git a/res/trainers/trainer_unknown_098.json b/res/trainers/data/unknown_098.json similarity index 100% rename from res/trainers/trainer_unknown_098.json rename to res/trainers/data/unknown_098.json diff --git a/res/trainers/trainer_unknown_100.json b/res/trainers/data/unknown_100.json similarity index 100% rename from res/trainers/trainer_unknown_100.json rename to res/trainers/data/unknown_100.json diff --git a/res/trainers/trainer_unknown_101.json b/res/trainers/data/unknown_101.json similarity index 100% rename from res/trainers/trainer_unknown_101.json rename to res/trainers/data/unknown_101.json diff --git a/res/trainers/trainer_unknown_109.json b/res/trainers/data/unknown_109.json similarity index 100% rename from res/trainers/trainer_unknown_109.json rename to res/trainers/data/unknown_109.json diff --git a/res/trainers/trainer_unknown_112.json b/res/trainers/data/unknown_112.json similarity index 100% rename from res/trainers/trainer_unknown_112.json rename to res/trainers/data/unknown_112.json diff --git a/res/trainers/trainer_unknown_115.json b/res/trainers/data/unknown_115.json similarity index 100% rename from res/trainers/trainer_unknown_115.json rename to res/trainers/data/unknown_115.json diff --git a/res/trainers/trainer_unknown_116.json b/res/trainers/data/unknown_116.json similarity index 100% rename from res/trainers/trainer_unknown_116.json rename to res/trainers/data/unknown_116.json diff --git a/res/trainers/trainer_unknown_117.json b/res/trainers/data/unknown_117.json similarity index 100% rename from res/trainers/trainer_unknown_117.json rename to res/trainers/data/unknown_117.json diff --git a/res/trainers/trainer_unknown_118.json b/res/trainers/data/unknown_118.json similarity index 100% rename from res/trainers/trainer_unknown_118.json rename to res/trainers/data/unknown_118.json diff --git a/res/trainers/trainer_unknown_122.json b/res/trainers/data/unknown_122.json similarity index 100% rename from res/trainers/trainer_unknown_122.json rename to res/trainers/data/unknown_122.json diff --git a/res/trainers/trainer_unknown_123.json b/res/trainers/data/unknown_123.json similarity index 100% rename from res/trainers/trainer_unknown_123.json rename to res/trainers/data/unknown_123.json diff --git a/res/trainers/trainer_unknown_124.json b/res/trainers/data/unknown_124.json similarity index 100% rename from res/trainers/trainer_unknown_124.json rename to res/trainers/data/unknown_124.json diff --git a/res/trainers/trainer_unknown_125.json b/res/trainers/data/unknown_125.json similarity index 100% rename from res/trainers/trainer_unknown_125.json rename to res/trainers/data/unknown_125.json diff --git a/res/trainers/trainer_unknown_126.json b/res/trainers/data/unknown_126.json similarity index 100% rename from res/trainers/trainer_unknown_126.json rename to res/trainers/data/unknown_126.json diff --git a/res/trainers/trainer_unknown_131.json b/res/trainers/data/unknown_131.json similarity index 100% rename from res/trainers/trainer_unknown_131.json rename to res/trainers/data/unknown_131.json diff --git a/res/trainers/trainer_unknown_149.json b/res/trainers/data/unknown_149.json similarity index 100% rename from res/trainers/trainer_unknown_149.json rename to res/trainers/data/unknown_149.json diff --git a/res/trainers/trainer_unknown_150.json b/res/trainers/data/unknown_150.json similarity index 100% rename from res/trainers/trainer_unknown_150.json rename to res/trainers/data/unknown_150.json diff --git a/res/trainers/trainer_unknown_151.json b/res/trainers/data/unknown_151.json similarity index 100% rename from res/trainers/trainer_unknown_151.json rename to res/trainers/data/unknown_151.json diff --git a/res/trainers/trainer_unknown_152.json b/res/trainers/data/unknown_152.json similarity index 100% rename from res/trainers/trainer_unknown_152.json rename to res/trainers/data/unknown_152.json diff --git a/res/trainers/trainer_unknown_155.json b/res/trainers/data/unknown_155.json similarity index 100% rename from res/trainers/trainer_unknown_155.json rename to res/trainers/data/unknown_155.json diff --git a/res/trainers/trainer_unknown_156.json b/res/trainers/data/unknown_156.json similarity index 100% rename from res/trainers/trainer_unknown_156.json rename to res/trainers/data/unknown_156.json diff --git a/res/trainers/trainer_unknown_157.json b/res/trainers/data/unknown_157.json similarity index 100% rename from res/trainers/trainer_unknown_157.json rename to res/trainers/data/unknown_157.json diff --git a/res/trainers/trainer_unknown_158.json b/res/trainers/data/unknown_158.json similarity index 100% rename from res/trainers/trainer_unknown_158.json rename to res/trainers/data/unknown_158.json diff --git a/res/trainers/trainer_unknown_165.json b/res/trainers/data/unknown_165.json similarity index 100% rename from res/trainers/trainer_unknown_165.json rename to res/trainers/data/unknown_165.json diff --git a/res/trainers/trainer_unknown_169.json b/res/trainers/data/unknown_169.json similarity index 100% rename from res/trainers/trainer_unknown_169.json rename to res/trainers/data/unknown_169.json diff --git a/res/trainers/trainer_unknown_176.json b/res/trainers/data/unknown_176.json similarity index 100% rename from res/trainers/trainer_unknown_176.json rename to res/trainers/data/unknown_176.json diff --git a/res/trainers/trainer_unknown_177.json b/res/trainers/data/unknown_177.json similarity index 100% rename from res/trainers/trainer_unknown_177.json rename to res/trainers/data/unknown_177.json diff --git a/res/trainers/trainer_unknown_178.json b/res/trainers/data/unknown_178.json similarity index 100% rename from res/trainers/trainer_unknown_178.json rename to res/trainers/data/unknown_178.json diff --git a/res/trainers/trainer_unknown_179.json b/res/trainers/data/unknown_179.json similarity index 100% rename from res/trainers/trainer_unknown_179.json rename to res/trainers/data/unknown_179.json diff --git a/res/trainers/trainer_unknown_181.json b/res/trainers/data/unknown_181.json similarity index 100% rename from res/trainers/trainer_unknown_181.json rename to res/trainers/data/unknown_181.json diff --git a/res/trainers/trainer_unknown_182.json b/res/trainers/data/unknown_182.json similarity index 100% rename from res/trainers/trainer_unknown_182.json rename to res/trainers/data/unknown_182.json diff --git a/res/trainers/trainer_unknown_197.json b/res/trainers/data/unknown_197.json similarity index 100% rename from res/trainers/trainer_unknown_197.json rename to res/trainers/data/unknown_197.json diff --git a/res/trainers/trainer_unknown_198.json b/res/trainers/data/unknown_198.json similarity index 100% rename from res/trainers/trainer_unknown_198.json rename to res/trainers/data/unknown_198.json diff --git a/res/trainers/trainer_unknown_199.json b/res/trainers/data/unknown_199.json similarity index 100% rename from res/trainers/trainer_unknown_199.json rename to res/trainers/data/unknown_199.json diff --git a/res/trainers/trainer_unknown_200.json b/res/trainers/data/unknown_200.json similarity index 100% rename from res/trainers/trainer_unknown_200.json rename to res/trainers/data/unknown_200.json diff --git a/res/trainers/trainer_unknown_207.json b/res/trainers/data/unknown_207.json similarity index 100% rename from res/trainers/trainer_unknown_207.json rename to res/trainers/data/unknown_207.json diff --git a/res/trainers/trainer_unknown_208.json b/res/trainers/data/unknown_208.json similarity index 100% rename from res/trainers/trainer_unknown_208.json rename to res/trainers/data/unknown_208.json diff --git a/res/trainers/trainer_unknown_209.json b/res/trainers/data/unknown_209.json similarity index 100% rename from res/trainers/trainer_unknown_209.json rename to res/trainers/data/unknown_209.json diff --git a/res/trainers/trainer_unknown_210.json b/res/trainers/data/unknown_210.json similarity index 100% rename from res/trainers/trainer_unknown_210.json rename to res/trainers/data/unknown_210.json diff --git a/res/trainers/trainer_unknown_211.json b/res/trainers/data/unknown_211.json similarity index 100% rename from res/trainers/trainer_unknown_211.json rename to res/trainers/data/unknown_211.json diff --git a/res/trainers/trainer_unknown_212.json b/res/trainers/data/unknown_212.json similarity index 100% rename from res/trainers/trainer_unknown_212.json rename to res/trainers/data/unknown_212.json diff --git a/res/trainers/trainer_unknown_213.json b/res/trainers/data/unknown_213.json similarity index 100% rename from res/trainers/trainer_unknown_213.json rename to res/trainers/data/unknown_213.json diff --git a/res/trainers/trainer_unknown_214.json b/res/trainers/data/unknown_214.json similarity index 100% rename from res/trainers/trainer_unknown_214.json rename to res/trainers/data/unknown_214.json diff --git a/res/trainers/trainer_unknown_215.json b/res/trainers/data/unknown_215.json similarity index 100% rename from res/trainers/trainer_unknown_215.json rename to res/trainers/data/unknown_215.json diff --git a/res/trainers/trainer_unknown_216.json b/res/trainers/data/unknown_216.json similarity index 100% rename from res/trainers/trainer_unknown_216.json rename to res/trainers/data/unknown_216.json diff --git a/res/trainers/trainer_unknown_217.json b/res/trainers/data/unknown_217.json similarity index 100% rename from res/trainers/trainer_unknown_217.json rename to res/trainers/data/unknown_217.json diff --git a/res/trainers/trainer_unknown_218.json b/res/trainers/data/unknown_218.json similarity index 100% rename from res/trainers/trainer_unknown_218.json rename to res/trainers/data/unknown_218.json diff --git a/res/trainers/trainer_unknown_219.json b/res/trainers/data/unknown_219.json similarity index 100% rename from res/trainers/trainer_unknown_219.json rename to res/trainers/data/unknown_219.json diff --git a/res/trainers/trainer_unknown_220.json b/res/trainers/data/unknown_220.json similarity index 100% rename from res/trainers/trainer_unknown_220.json rename to res/trainers/data/unknown_220.json diff --git a/res/trainers/trainer_unknown_221.json b/res/trainers/data/unknown_221.json similarity index 100% rename from res/trainers/trainer_unknown_221.json rename to res/trainers/data/unknown_221.json diff --git a/res/trainers/trainer_unknown_222.json b/res/trainers/data/unknown_222.json similarity index 100% rename from res/trainers/trainer_unknown_222.json rename to res/trainers/data/unknown_222.json diff --git a/res/trainers/trainer_unknown_223.json b/res/trainers/data/unknown_223.json similarity index 100% rename from res/trainers/trainer_unknown_223.json rename to res/trainers/data/unknown_223.json diff --git a/res/trainers/trainer_unknown_238.json b/res/trainers/data/unknown_238.json similarity index 100% rename from res/trainers/trainer_unknown_238.json rename to res/trainers/data/unknown_238.json diff --git a/res/trainers/trainer_unknown_239.json b/res/trainers/data/unknown_239.json similarity index 100% rename from res/trainers/trainer_unknown_239.json rename to res/trainers/data/unknown_239.json diff --git a/res/trainers/trainer_unknown_241.json b/res/trainers/data/unknown_241.json similarity index 100% rename from res/trainers/trainer_unknown_241.json rename to res/trainers/data/unknown_241.json diff --git a/res/trainers/trainer_unknown_242.json b/res/trainers/data/unknown_242.json similarity index 100% rename from res/trainers/trainer_unknown_242.json rename to res/trainers/data/unknown_242.json diff --git a/res/trainers/trainer_unknown_243.json b/res/trainers/data/unknown_243.json similarity index 100% rename from res/trainers/trainer_unknown_243.json rename to res/trainers/data/unknown_243.json diff --git a/res/trainers/trainer_unknown_251.json b/res/trainers/data/unknown_251.json similarity index 100% rename from res/trainers/trainer_unknown_251.json rename to res/trainers/data/unknown_251.json diff --git a/res/trainers/trainer_unknown_252.json b/res/trainers/data/unknown_252.json similarity index 100% rename from res/trainers/trainer_unknown_252.json rename to res/trainers/data/unknown_252.json diff --git a/res/trainers/trainer_unknown_253.json b/res/trainers/data/unknown_253.json similarity index 100% rename from res/trainers/trainer_unknown_253.json rename to res/trainers/data/unknown_253.json diff --git a/res/trainers/trainer_unknown_254.json b/res/trainers/data/unknown_254.json similarity index 100% rename from res/trainers/trainer_unknown_254.json rename to res/trainers/data/unknown_254.json diff --git a/res/trainers/trainer_unknown_255.json b/res/trainers/data/unknown_255.json similarity index 100% rename from res/trainers/trainer_unknown_255.json rename to res/trainers/data/unknown_255.json diff --git a/res/trainers/trainer_unknown_291.json b/res/trainers/data/unknown_291.json similarity index 100% rename from res/trainers/trainer_unknown_291.json rename to res/trainers/data/unknown_291.json diff --git a/res/trainers/trainer_unknown_321.json b/res/trainers/data/unknown_321.json similarity index 100% rename from res/trainers/trainer_unknown_321.json rename to res/trainers/data/unknown_321.json diff --git a/res/trainers/trainer_unknown_334.json b/res/trainers/data/unknown_334.json similarity index 100% rename from res/trainers/trainer_unknown_334.json rename to res/trainers/data/unknown_334.json diff --git a/res/trainers/trainer_unknown_336.json b/res/trainers/data/unknown_336.json similarity index 100% rename from res/trainers/trainer_unknown_336.json rename to res/trainers/data/unknown_336.json diff --git a/res/trainers/trainer_unknown_347.json b/res/trainers/data/unknown_347.json similarity index 100% rename from res/trainers/trainer_unknown_347.json rename to res/trainers/data/unknown_347.json diff --git a/res/trainers/trainer_unknown_349.json b/res/trainers/data/unknown_349.json similarity index 100% rename from res/trainers/trainer_unknown_349.json rename to res/trainers/data/unknown_349.json diff --git a/res/trainers/trainer_unknown_350.json b/res/trainers/data/unknown_350.json similarity index 100% rename from res/trainers/trainer_unknown_350.json rename to res/trainers/data/unknown_350.json diff --git a/res/trainers/trainer_unknown_351.json b/res/trainers/data/unknown_351.json similarity index 100% rename from res/trainers/trainer_unknown_351.json rename to res/trainers/data/unknown_351.json diff --git a/res/trainers/trainer_unknown_352.json b/res/trainers/data/unknown_352.json similarity index 100% rename from res/trainers/trainer_unknown_352.json rename to res/trainers/data/unknown_352.json diff --git a/res/trainers/trainer_unknown_353.json b/res/trainers/data/unknown_353.json similarity index 100% rename from res/trainers/trainer_unknown_353.json rename to res/trainers/data/unknown_353.json diff --git a/res/trainers/trainer_unknown_354.json b/res/trainers/data/unknown_354.json similarity index 100% rename from res/trainers/trainer_unknown_354.json rename to res/trainers/data/unknown_354.json diff --git a/res/trainers/trainer_unknown_363.json b/res/trainers/data/unknown_363.json similarity index 100% rename from res/trainers/trainer_unknown_363.json rename to res/trainers/data/unknown_363.json diff --git a/res/trainers/trainer_unknown_364.json b/res/trainers/data/unknown_364.json similarity index 100% rename from res/trainers/trainer_unknown_364.json rename to res/trainers/data/unknown_364.json diff --git a/res/trainers/trainer_unknown_365.json b/res/trainers/data/unknown_365.json similarity index 100% rename from res/trainers/trainer_unknown_365.json rename to res/trainers/data/unknown_365.json diff --git a/res/trainers/trainer_unknown_368.json b/res/trainers/data/unknown_368.json similarity index 100% rename from res/trainers/trainer_unknown_368.json rename to res/trainers/data/unknown_368.json diff --git a/res/trainers/trainer_unknown_369.json b/res/trainers/data/unknown_369.json similarity index 100% rename from res/trainers/trainer_unknown_369.json rename to res/trainers/data/unknown_369.json diff --git a/res/trainers/trainer_unknown_370.json b/res/trainers/data/unknown_370.json similarity index 100% rename from res/trainers/trainer_unknown_370.json rename to res/trainers/data/unknown_370.json diff --git a/res/trainers/trainer_unknown_371.json b/res/trainers/data/unknown_371.json similarity index 100% rename from res/trainers/trainer_unknown_371.json rename to res/trainers/data/unknown_371.json diff --git a/res/trainers/trainer_unknown_374.json b/res/trainers/data/unknown_374.json similarity index 100% rename from res/trainers/trainer_unknown_374.json rename to res/trainers/data/unknown_374.json diff --git a/res/trainers/trainer_unknown_375.json b/res/trainers/data/unknown_375.json similarity index 100% rename from res/trainers/trainer_unknown_375.json rename to res/trainers/data/unknown_375.json diff --git a/res/trainers/trainer_unknown_376.json b/res/trainers/data/unknown_376.json similarity index 100% rename from res/trainers/trainer_unknown_376.json rename to res/trainers/data/unknown_376.json diff --git a/res/trainers/trainer_unknown_384.json b/res/trainers/data/unknown_384.json similarity index 100% rename from res/trainers/trainer_unknown_384.json rename to res/trainers/data/unknown_384.json diff --git a/res/trainers/trainer_unknown_385.json b/res/trainers/data/unknown_385.json similarity index 100% rename from res/trainers/trainer_unknown_385.json rename to res/trainers/data/unknown_385.json diff --git a/res/trainers/trainer_unknown_387.json b/res/trainers/data/unknown_387.json similarity index 100% rename from res/trainers/trainer_unknown_387.json rename to res/trainers/data/unknown_387.json diff --git a/res/trainers/trainer_unknown_391.json b/res/trainers/data/unknown_391.json similarity index 100% rename from res/trainers/trainer_unknown_391.json rename to res/trainers/data/unknown_391.json diff --git a/res/trainers/trainer_unknown_402.json b/res/trainers/data/unknown_402.json similarity index 100% rename from res/trainers/trainer_unknown_402.json rename to res/trainers/data/unknown_402.json diff --git a/res/trainers/trainer_unknown_411.json b/res/trainers/data/unknown_411.json similarity index 100% rename from res/trainers/trainer_unknown_411.json rename to res/trainers/data/unknown_411.json diff --git a/res/trainers/trainer_unknown_413.json b/res/trainers/data/unknown_413.json similarity index 100% rename from res/trainers/trainer_unknown_413.json rename to res/trainers/data/unknown_413.json diff --git a/res/trainers/trainer_unknown_424.json b/res/trainers/data/unknown_424.json similarity index 100% rename from res/trainers/trainer_unknown_424.json rename to res/trainers/data/unknown_424.json diff --git a/res/trainers/trainer_unknown_429.json b/res/trainers/data/unknown_429.json similarity index 100% rename from res/trainers/trainer_unknown_429.json rename to res/trainers/data/unknown_429.json diff --git a/res/trainers/trainer_unknown_431.json b/res/trainers/data/unknown_431.json similarity index 100% rename from res/trainers/trainer_unknown_431.json rename to res/trainers/data/unknown_431.json diff --git a/res/trainers/trainer_unknown_432.json b/res/trainers/data/unknown_432.json similarity index 100% rename from res/trainers/trainer_unknown_432.json rename to res/trainers/data/unknown_432.json diff --git a/res/trainers/trainer_unknown_433.json b/res/trainers/data/unknown_433.json similarity index 100% rename from res/trainers/trainer_unknown_433.json rename to res/trainers/data/unknown_433.json diff --git a/res/trainers/trainer_unknown_434.json b/res/trainers/data/unknown_434.json similarity index 100% rename from res/trainers/trainer_unknown_434.json rename to res/trainers/data/unknown_434.json diff --git a/res/trainers/trainer_unknown_435.json b/res/trainers/data/unknown_435.json similarity index 100% rename from res/trainers/trainer_unknown_435.json rename to res/trainers/data/unknown_435.json diff --git a/res/trainers/trainer_unknown_436.json b/res/trainers/data/unknown_436.json similarity index 100% rename from res/trainers/trainer_unknown_436.json rename to res/trainers/data/unknown_436.json diff --git a/res/trainers/trainer_unknown_437.json b/res/trainers/data/unknown_437.json similarity index 100% rename from res/trainers/trainer_unknown_437.json rename to res/trainers/data/unknown_437.json diff --git a/res/trainers/trainer_unknown_438.json b/res/trainers/data/unknown_438.json similarity index 100% rename from res/trainers/trainer_unknown_438.json rename to res/trainers/data/unknown_438.json diff --git a/res/trainers/trainer_unknown_439.json b/res/trainers/data/unknown_439.json similarity index 100% rename from res/trainers/trainer_unknown_439.json rename to res/trainers/data/unknown_439.json diff --git a/res/trainers/trainer_unknown_440.json b/res/trainers/data/unknown_440.json similarity index 100% rename from res/trainers/trainer_unknown_440.json rename to res/trainers/data/unknown_440.json diff --git a/res/trainers/trainer_unknown_441.json b/res/trainers/data/unknown_441.json similarity index 100% rename from res/trainers/trainer_unknown_441.json rename to res/trainers/data/unknown_441.json diff --git a/res/trainers/trainer_unknown_448.json b/res/trainers/data/unknown_448.json similarity index 100% rename from res/trainers/trainer_unknown_448.json rename to res/trainers/data/unknown_448.json diff --git a/res/trainers/trainer_unknown_449.json b/res/trainers/data/unknown_449.json similarity index 100% rename from res/trainers/trainer_unknown_449.json rename to res/trainers/data/unknown_449.json diff --git a/res/trainers/trainer_unknown_460.json b/res/trainers/data/unknown_460.json similarity index 100% rename from res/trainers/trainer_unknown_460.json rename to res/trainers/data/unknown_460.json diff --git a/res/trainers/trainer_unknown_461.json b/res/trainers/data/unknown_461.json similarity index 100% rename from res/trainers/trainer_unknown_461.json rename to res/trainers/data/unknown_461.json diff --git a/res/trainers/trainer_unknown_462.json b/res/trainers/data/unknown_462.json similarity index 100% rename from res/trainers/trainer_unknown_462.json rename to res/trainers/data/unknown_462.json diff --git a/res/trainers/trainer_unknown_463.json b/res/trainers/data/unknown_463.json similarity index 100% rename from res/trainers/trainer_unknown_463.json rename to res/trainers/data/unknown_463.json diff --git a/res/trainers/trainer_unknown_464.json b/res/trainers/data/unknown_464.json similarity index 100% rename from res/trainers/trainer_unknown_464.json rename to res/trainers/data/unknown_464.json diff --git a/res/trainers/trainer_unknown_465.json b/res/trainers/data/unknown_465.json similarity index 100% rename from res/trainers/trainer_unknown_465.json rename to res/trainers/data/unknown_465.json diff --git a/res/trainers/trainer_unknown_466.json b/res/trainers/data/unknown_466.json similarity index 100% rename from res/trainers/trainer_unknown_466.json rename to res/trainers/data/unknown_466.json diff --git a/res/trainers/trainer_unknown_467.json b/res/trainers/data/unknown_467.json similarity index 100% rename from res/trainers/trainer_unknown_467.json rename to res/trainers/data/unknown_467.json diff --git a/res/trainers/trainer_unknown_468.json b/res/trainers/data/unknown_468.json similarity index 100% rename from res/trainers/trainer_unknown_468.json rename to res/trainers/data/unknown_468.json diff --git a/res/trainers/trainer_unknown_469.json b/res/trainers/data/unknown_469.json similarity index 100% rename from res/trainers/trainer_unknown_469.json rename to res/trainers/data/unknown_469.json diff --git a/res/trainers/trainer_unknown_484.json b/res/trainers/data/unknown_484.json similarity index 100% rename from res/trainers/trainer_unknown_484.json rename to res/trainers/data/unknown_484.json diff --git a/res/trainers/trainer_unknown_485.json b/res/trainers/data/unknown_485.json similarity index 100% rename from res/trainers/trainer_unknown_485.json rename to res/trainers/data/unknown_485.json diff --git a/res/trainers/trainer_unknown_487.json b/res/trainers/data/unknown_487.json similarity index 100% rename from res/trainers/trainer_unknown_487.json rename to res/trainers/data/unknown_487.json diff --git a/res/trainers/trainer_unknown_493.json b/res/trainers/data/unknown_493.json similarity index 100% rename from res/trainers/trainer_unknown_493.json rename to res/trainers/data/unknown_493.json diff --git a/res/trainers/trainer_unknown_495.json b/res/trainers/data/unknown_495.json similarity index 100% rename from res/trainers/trainer_unknown_495.json rename to res/trainers/data/unknown_495.json diff --git a/res/trainers/trainer_unknown_501.json b/res/trainers/data/unknown_501.json similarity index 100% rename from res/trainers/trainer_unknown_501.json rename to res/trainers/data/unknown_501.json diff --git a/res/trainers/trainer_unknown_502.json b/res/trainers/data/unknown_502.json similarity index 100% rename from res/trainers/trainer_unknown_502.json rename to res/trainers/data/unknown_502.json diff --git a/res/trainers/trainer_unknown_511.json b/res/trainers/data/unknown_511.json similarity index 100% rename from res/trainers/trainer_unknown_511.json rename to res/trainers/data/unknown_511.json diff --git a/res/trainers/trainer_unknown_605.json b/res/trainers/data/unknown_605.json similarity index 100% rename from res/trainers/trainer_unknown_605.json rename to res/trainers/data/unknown_605.json diff --git a/res/trainers/trainer_unknown_651.json b/res/trainers/data/unknown_651.json similarity index 100% rename from res/trainers/trainer_unknown_651.json rename to res/trainers/data/unknown_651.json diff --git a/res/trainers/trainer_unknown_652.json b/res/trainers/data/unknown_652.json similarity index 100% rename from res/trainers/trainer_unknown_652.json rename to res/trainers/data/unknown_652.json diff --git a/res/trainers/trainer_unknown_778.json b/res/trainers/data/unknown_778.json similarity index 100% rename from res/trainers/trainer_unknown_778.json rename to res/trainers/data/unknown_778.json diff --git a/res/trainers/trainer_unknown_779.json b/res/trainers/data/unknown_779.json similarity index 100% rename from res/trainers/trainer_unknown_779.json rename to res/trainers/data/unknown_779.json diff --git a/res/trainers/trainer_unknown_780.json b/res/trainers/data/unknown_780.json similarity index 100% rename from res/trainers/trainer_unknown_780.json rename to res/trainers/data/unknown_780.json diff --git a/res/trainers/trainer_unknown_781.json b/res/trainers/data/unknown_781.json similarity index 100% rename from res/trainers/trainer_unknown_781.json rename to res/trainers/data/unknown_781.json diff --git a/res/trainers/trainer_unknown_782.json b/res/trainers/data/unknown_782.json similarity index 100% rename from res/trainers/trainer_unknown_782.json rename to res/trainers/data/unknown_782.json diff --git a/res/trainers/trainer_unknown_783.json b/res/trainers/data/unknown_783.json similarity index 100% rename from res/trainers/trainer_unknown_783.json rename to res/trainers/data/unknown_783.json diff --git a/res/trainers/trainer_unknown_784.json b/res/trainers/data/unknown_784.json similarity index 100% rename from res/trainers/trainer_unknown_784.json rename to res/trainers/data/unknown_784.json diff --git a/res/trainers/trainer_unknown_785.json b/res/trainers/data/unknown_785.json similarity index 100% rename from res/trainers/trainer_unknown_785.json rename to res/trainers/data/unknown_785.json diff --git a/res/trainers/trainer_unknown_786.json b/res/trainers/data/unknown_786.json similarity index 100% rename from res/trainers/trainer_unknown_786.json rename to res/trainers/data/unknown_786.json diff --git a/res/trainers/trainer_unknown_787.json b/res/trainers/data/unknown_787.json similarity index 100% rename from res/trainers/trainer_unknown_787.json rename to res/trainers/data/unknown_787.json diff --git a/res/trainers/trainer_unknown_788.json b/res/trainers/data/unknown_788.json similarity index 100% rename from res/trainers/trainer_unknown_788.json rename to res/trainers/data/unknown_788.json diff --git a/res/trainers/trainer_unknown_789.json b/res/trainers/data/unknown_789.json similarity index 100% rename from res/trainers/trainer_unknown_789.json rename to res/trainers/data/unknown_789.json diff --git a/res/trainers/trainer_unknown_790.json b/res/trainers/data/unknown_790.json similarity index 100% rename from res/trainers/trainer_unknown_790.json rename to res/trainers/data/unknown_790.json diff --git a/res/trainers/trainer_unknown_791.json b/res/trainers/data/unknown_791.json similarity index 100% rename from res/trainers/trainer_unknown_791.json rename to res/trainers/data/unknown_791.json diff --git a/res/trainers/trainer_unknown_792.json b/res/trainers/data/unknown_792.json similarity index 100% rename from res/trainers/trainer_unknown_792.json rename to res/trainers/data/unknown_792.json diff --git a/res/trainers/trainer_unknown_793.json b/res/trainers/data/unknown_793.json similarity index 100% rename from res/trainers/trainer_unknown_793.json rename to res/trainers/data/unknown_793.json diff --git a/res/trainers/trainer_unknown_794.json b/res/trainers/data/unknown_794.json similarity index 100% rename from res/trainers/trainer_unknown_794.json rename to res/trainers/data/unknown_794.json diff --git a/res/trainers/trainer_unknown_795.json b/res/trainers/data/unknown_795.json similarity index 100% rename from res/trainers/trainer_unknown_795.json rename to res/trainers/data/unknown_795.json diff --git a/res/trainers/trainer_unknown_796.json b/res/trainers/data/unknown_796.json similarity index 100% rename from res/trainers/trainer_unknown_796.json rename to res/trainers/data/unknown_796.json diff --git a/res/trainers/trainer_unknown_797.json b/res/trainers/data/unknown_797.json similarity index 100% rename from res/trainers/trainer_unknown_797.json rename to res/trainers/data/unknown_797.json diff --git a/res/trainers/trainer_unknown_798.json b/res/trainers/data/unknown_798.json similarity index 100% rename from res/trainers/trainer_unknown_798.json rename to res/trainers/data/unknown_798.json diff --git a/res/trainers/trainer_unknown_799.json b/res/trainers/data/unknown_799.json similarity index 100% rename from res/trainers/trainer_unknown_799.json rename to res/trainers/data/unknown_799.json diff --git a/res/trainers/trainer_unknown_800.json b/res/trainers/data/unknown_800.json similarity index 100% rename from res/trainers/trainer_unknown_800.json rename to res/trainers/data/unknown_800.json diff --git a/res/trainers/trainer_unknown_801.json b/res/trainers/data/unknown_801.json similarity index 100% rename from res/trainers/trainer_unknown_801.json rename to res/trainers/data/unknown_801.json diff --git a/res/trainers/trainer_unknown_802.json b/res/trainers/data/unknown_802.json similarity index 100% rename from res/trainers/trainer_unknown_802.json rename to res/trainers/data/unknown_802.json diff --git a/res/trainers/trainer_unknown_803.json b/res/trainers/data/unknown_803.json similarity index 100% rename from res/trainers/trainer_unknown_803.json rename to res/trainers/data/unknown_803.json diff --git a/res/trainers/trainer_unknown_804.json b/res/trainers/data/unknown_804.json similarity index 100% rename from res/trainers/trainer_unknown_804.json rename to res/trainers/data/unknown_804.json diff --git a/res/trainers/trainer_unknown_805.json b/res/trainers/data/unknown_805.json similarity index 100% rename from res/trainers/trainer_unknown_805.json rename to res/trainers/data/unknown_805.json diff --git a/res/trainers/trainer_unknown_806.json b/res/trainers/data/unknown_806.json similarity index 100% rename from res/trainers/trainer_unknown_806.json rename to res/trainers/data/unknown_806.json diff --git a/res/trainers/trainer_unknown_807.json b/res/trainers/data/unknown_807.json similarity index 100% rename from res/trainers/trainer_unknown_807.json rename to res/trainers/data/unknown_807.json diff --git a/res/trainers/trainer_unknown_808.json b/res/trainers/data/unknown_808.json similarity index 100% rename from res/trainers/trainer_unknown_808.json rename to res/trainers/data/unknown_808.json diff --git a/res/trainers/trainer_unknown_809.json b/res/trainers/data/unknown_809.json similarity index 100% rename from res/trainers/trainer_unknown_809.json rename to res/trainers/data/unknown_809.json diff --git a/res/trainers/trainer_unknown_810.json b/res/trainers/data/unknown_810.json similarity index 100% rename from res/trainers/trainer_unknown_810.json rename to res/trainers/data/unknown_810.json diff --git a/res/trainers/trainer_unknown_811.json b/res/trainers/data/unknown_811.json similarity index 100% rename from res/trainers/trainer_unknown_811.json rename to res/trainers/data/unknown_811.json diff --git a/res/trainers/trainer_unknown_812.json b/res/trainers/data/unknown_812.json similarity index 100% rename from res/trainers/trainer_unknown_812.json rename to res/trainers/data/unknown_812.json diff --git a/res/trainers/trainer_unknown_813.json b/res/trainers/data/unknown_813.json similarity index 100% rename from res/trainers/trainer_unknown_813.json rename to res/trainers/data/unknown_813.json diff --git a/res/trainers/trainer_unknown_814.json b/res/trainers/data/unknown_814.json similarity index 100% rename from res/trainers/trainer_unknown_814.json rename to res/trainers/data/unknown_814.json diff --git a/res/trainers/trainer_unknown_815.json b/res/trainers/data/unknown_815.json similarity index 100% rename from res/trainers/trainer_unknown_815.json rename to res/trainers/data/unknown_815.json diff --git a/res/trainers/trainer_unknown_816.json b/res/trainers/data/unknown_816.json similarity index 100% rename from res/trainers/trainer_unknown_816.json rename to res/trainers/data/unknown_816.json diff --git a/res/trainers/trainer_unknown_817.json b/res/trainers/data/unknown_817.json similarity index 100% rename from res/trainers/trainer_unknown_817.json rename to res/trainers/data/unknown_817.json diff --git a/res/trainers/trainer_unknown_818.json b/res/trainers/data/unknown_818.json similarity index 100% rename from res/trainers/trainer_unknown_818.json rename to res/trainers/data/unknown_818.json diff --git a/res/trainers/trainer_unknown_819.json b/res/trainers/data/unknown_819.json similarity index 100% rename from res/trainers/trainer_unknown_819.json rename to res/trainers/data/unknown_819.json diff --git a/res/trainers/trainer_unknown_820.json b/res/trainers/data/unknown_820.json similarity index 100% rename from res/trainers/trainer_unknown_820.json rename to res/trainers/data/unknown_820.json diff --git a/res/trainers/trainer_unknown_821.json b/res/trainers/data/unknown_821.json similarity index 100% rename from res/trainers/trainer_unknown_821.json rename to res/trainers/data/unknown_821.json diff --git a/res/trainers/trainer_unknown_822.json b/res/trainers/data/unknown_822.json similarity index 100% rename from res/trainers/trainer_unknown_822.json rename to res/trainers/data/unknown_822.json diff --git a/res/trainers/trainer_unknown_823.json b/res/trainers/data/unknown_823.json similarity index 100% rename from res/trainers/trainer_unknown_823.json rename to res/trainers/data/unknown_823.json diff --git a/res/trainers/trainer_unknown_824.json b/res/trainers/data/unknown_824.json similarity index 100% rename from res/trainers/trainer_unknown_824.json rename to res/trainers/data/unknown_824.json diff --git a/res/trainers/trainer_unknown_825.json b/res/trainers/data/unknown_825.json similarity index 100% rename from res/trainers/trainer_unknown_825.json rename to res/trainers/data/unknown_825.json diff --git a/res/trainers/trainer_unknown_828.json b/res/trainers/data/unknown_828.json similarity index 100% rename from res/trainers/trainer_unknown_828.json rename to res/trainers/data/unknown_828.json diff --git a/res/trainers/trainer_unknown_833.json b/res/trainers/data/unknown_833.json similarity index 100% rename from res/trainers/trainer_unknown_833.json rename to res/trainers/data/unknown_833.json diff --git a/res/trainers/trainer_unknown_834.json b/res/trainers/data/unknown_834.json similarity index 100% rename from res/trainers/trainer_unknown_834.json rename to res/trainers/data/unknown_834.json diff --git a/res/trainers/trainer_unknown_840.json b/res/trainers/data/unknown_840.json similarity index 100% rename from res/trainers/trainer_unknown_840.json rename to res/trainers/data/unknown_840.json diff --git a/res/trainers/trainer_unknown_841.json b/res/trainers/data/unknown_841.json similarity index 100% rename from res/trainers/trainer_unknown_841.json rename to res/trainers/data/unknown_841.json diff --git a/res/trainers/trainer_unknown_842.json b/res/trainers/data/unknown_842.json similarity index 100% rename from res/trainers/trainer_unknown_842.json rename to res/trainers/data/unknown_842.json diff --git a/res/trainers/trainer_unknown_902.json b/res/trainers/data/unknown_902.json similarity index 100% rename from res/trainers/trainer_unknown_902.json rename to res/trainers/data/unknown_902.json diff --git a/res/trainers/trainer_unknown_903.json b/res/trainers/data/unknown_903.json similarity index 100% rename from res/trainers/trainer_unknown_903.json rename to res/trainers/data/unknown_903.json diff --git a/res/trainers/trainer_unknown_904.json b/res/trainers/data/unknown_904.json similarity index 100% rename from res/trainers/trainer_unknown_904.json rename to res/trainers/data/unknown_904.json diff --git a/res/trainers/trainer_unknown_905.json b/res/trainers/data/unknown_905.json similarity index 100% rename from res/trainers/trainer_unknown_905.json rename to res/trainers/data/unknown_905.json diff --git a/res/trainers/trainer_veteran_armando.json b/res/trainers/data/veteran_armando.json similarity index 100% rename from res/trainers/trainer_veteran_armando.json rename to res/trainers/data/veteran_armando.json diff --git a/res/trainers/trainer_veteran_armando_rematch.json b/res/trainers/data/veteran_armando_rematch.json similarity index 100% rename from res/trainers/trainer_veteran_armando_rematch.json rename to res/trainers/data/veteran_armando_rematch.json diff --git a/res/trainers/trainer_veteran_brenden.json b/res/trainers/data/veteran_brenden.json similarity index 100% rename from res/trainers/trainer_veteran_brenden.json rename to res/trainers/data/veteran_brenden.json diff --git a/res/trainers/trainer_veteran_brian.json b/res/trainers/data/veteran_brian.json similarity index 100% rename from res/trainers/trainer_veteran_brian.json rename to res/trainers/data/veteran_brian.json diff --git a/res/trainers/trainer_veteran_brian_rematch_1.json b/res/trainers/data/veteran_brian_rematch_1.json similarity index 100% rename from res/trainers/trainer_veteran_brian_rematch_1.json rename to res/trainers/data/veteran_brian_rematch_1.json diff --git a/res/trainers/trainer_veteran_brian_rematch_2.json b/res/trainers/data/veteran_brian_rematch_2.json similarity index 100% rename from res/trainers/trainer_veteran_brian_rematch_2.json rename to res/trainers/data/veteran_brian_rematch_2.json diff --git a/res/trainers/trainer_veteran_clayton.json b/res/trainers/data/veteran_clayton.json similarity index 100% rename from res/trainers/trainer_veteran_clayton.json rename to res/trainers/data/veteran_clayton.json diff --git a/res/trainers/trainer_veteran_edgar.json b/res/trainers/data/veteran_edgar.json similarity index 100% rename from res/trainers/trainer_veteran_edgar.json rename to res/trainers/data/veteran_edgar.json diff --git a/res/trainers/trainer_veteran_emanuel.json b/res/trainers/data/veteran_emanuel.json similarity index 100% rename from res/trainers/trainer_veteran_emanuel.json rename to res/trainers/data/veteran_emanuel.json diff --git a/res/trainers/trainer_veteran_grant.json b/res/trainers/data/veteran_grant.json similarity index 100% rename from res/trainers/trainer_veteran_grant.json rename to res/trainers/data/veteran_grant.json diff --git a/res/trainers/trainer_veteran_harlan.json b/res/trainers/data/veteran_harlan.json similarity index 100% rename from res/trainers/trainer_veteran_harlan.json rename to res/trainers/data/veteran_harlan.json diff --git a/res/trainers/trainer_veteran_terrell.json b/res/trainers/data/veteran_terrell.json similarity index 100% rename from res/trainers/trainer_veteran_terrell.json rename to res/trainers/data/veteran_terrell.json diff --git a/res/trainers/trainer_waitress_kati.json b/res/trainers/data/waitress_kati.json similarity index 100% rename from res/trainers/trainer_waitress_kati.json rename to res/trainers/data/waitress_kati.json diff --git a/res/trainers/trainer_worker_braden.json b/res/trainers/data/worker_braden.json similarity index 100% rename from res/trainers/trainer_worker_braden.json rename to res/trainers/data/worker_braden.json diff --git a/res/trainers/trainer_worker_brendon.json b/res/trainers/data/worker_brendon.json similarity index 100% rename from res/trainers/trainer_worker_brendon.json rename to res/trainers/data/worker_brendon.json diff --git a/res/trainers/trainer_worker_colin.json b/res/trainers/data/worker_colin.json similarity index 100% rename from res/trainers/trainer_worker_colin.json rename to res/trainers/data/worker_colin.json diff --git a/res/trainers/trainer_worker_conrad.json b/res/trainers/data/worker_conrad.json similarity index 100% rename from res/trainers/trainer_worker_conrad.json rename to res/trainers/data/worker_conrad.json diff --git a/res/trainers/trainer_worker_dillan.json b/res/trainers/data/worker_dillan.json similarity index 100% rename from res/trainers/trainer_worker_dillan.json rename to res/trainers/data/worker_dillan.json diff --git a/res/trainers/trainer_worker_gary.json b/res/trainers/data/worker_gary.json similarity index 100% rename from res/trainers/trainer_worker_gary.json rename to res/trainers/data/worker_gary.json diff --git a/res/trainers/trainer_worker_gerardo.json b/res/trainers/data/worker_gerardo.json similarity index 100% rename from res/trainers/trainer_worker_gerardo.json rename to res/trainers/data/worker_gerardo.json diff --git a/res/trainers/trainer_worker_holden.json b/res/trainers/data/worker_holden.json similarity index 100% rename from res/trainers/trainer_worker_holden.json rename to res/trainers/data/worker_holden.json diff --git a/res/trainers/trainer_worker_jackson.json b/res/trainers/data/worker_jackson.json similarity index 100% rename from res/trainers/trainer_worker_jackson.json rename to res/trainers/data/worker_jackson.json diff --git a/res/trainers/trainer_worker_mason.json b/res/trainers/data/worker_mason.json similarity index 100% rename from res/trainers/trainer_worker_mason.json rename to res/trainers/data/worker_mason.json diff --git a/res/trainers/trainer_worker_noel.json b/res/trainers/data/worker_noel.json similarity index 100% rename from res/trainers/trainer_worker_noel.json rename to res/trainers/data/worker_noel.json diff --git a/res/trainers/trainer_worker_quentin.json b/res/trainers/data/worker_quentin.json similarity index 100% rename from res/trainers/trainer_worker_quentin.json rename to res/trainers/data/worker_quentin.json diff --git a/res/trainers/trainer_young_couple_mike_and_nat.json b/res/trainers/data/young_couple_mike_and_nat.json similarity index 100% rename from res/trainers/trainer_young_couple_mike_and_nat.json rename to res/trainers/data/young_couple_mike_and_nat.json diff --git a/res/trainers/trainer_young_couple_ty_and_sue.json b/res/trainers/data/young_couple_ty_and_sue.json similarity index 100% rename from res/trainers/trainer_young_couple_ty_and_sue.json rename to res/trainers/data/young_couple_ty_and_sue.json diff --git a/res/trainers/trainer_youngster_austin.json b/res/trainers/data/youngster_austin.json similarity index 100% rename from res/trainers/trainer_youngster_austin.json rename to res/trainers/data/youngster_austin.json diff --git a/res/trainers/trainer_youngster_dallas.json b/res/trainers/data/youngster_dallas.json similarity index 100% rename from res/trainers/trainer_youngster_dallas.json rename to res/trainers/data/youngster_dallas.json diff --git a/res/trainers/trainer_youngster_dallas_rematch_1.json b/res/trainers/data/youngster_dallas_rematch_1.json similarity index 100% rename from res/trainers/trainer_youngster_dallas_rematch_1.json rename to res/trainers/data/youngster_dallas_rematch_1.json diff --git a/res/trainers/trainer_youngster_dallas_rematch_2.json b/res/trainers/data/youngster_dallas_rematch_2.json similarity index 100% rename from res/trainers/trainer_youngster_dallas_rematch_2.json rename to res/trainers/data/youngster_dallas_rematch_2.json diff --git a/res/trainers/trainer_youngster_dallas_rematch_3.json b/res/trainers/data/youngster_dallas_rematch_3.json similarity index 100% rename from res/trainers/trainer_youngster_dallas_rematch_3.json rename to res/trainers/data/youngster_dallas_rematch_3.json diff --git a/res/trainers/trainer_youngster_darius.json b/res/trainers/data/youngster_darius.json similarity index 100% rename from res/trainers/trainer_youngster_darius.json rename to res/trainers/data/youngster_darius.json diff --git a/res/trainers/trainer_youngster_donny.json b/res/trainers/data/youngster_donny.json similarity index 100% rename from res/trainers/trainer_youngster_donny.json rename to res/trainers/data/youngster_donny.json diff --git a/res/trainers/trainer_youngster_jonathon.json b/res/trainers/data/youngster_jonathon.json similarity index 100% rename from res/trainers/trainer_youngster_jonathon.json rename to res/trainers/data/youngster_jonathon.json diff --git a/res/trainers/trainer_youngster_logan.json b/res/trainers/data/youngster_logan.json similarity index 100% rename from res/trainers/trainer_youngster_logan.json rename to res/trainers/data/youngster_logan.json diff --git a/res/trainers/trainer_youngster_michael.json b/res/trainers/data/youngster_michael.json similarity index 100% rename from res/trainers/trainer_youngster_michael.json rename to res/trainers/data/youngster_michael.json diff --git a/res/trainers/trainer_youngster_oliver.json b/res/trainers/data/youngster_oliver.json similarity index 100% rename from res/trainers/trainer_youngster_oliver.json rename to res/trainers/data/youngster_oliver.json diff --git a/res/trainers/trainer_youngster_sebastian.json b/res/trainers/data/youngster_sebastian.json similarity index 100% rename from res/trainers/trainer_youngster_sebastian.json rename to res/trainers/data/youngster_sebastian.json diff --git a/res/trainers/trainer_youngster_tristan.json b/res/trainers/data/youngster_tristan.json similarity index 100% rename from res/trainers/trainer_youngster_tristan.json rename to res/trainers/data/youngster_tristan.json diff --git a/res/trainers/trainer_youngster_tristan_rematch_1.json b/res/trainers/data/youngster_tristan_rematch_1.json similarity index 100% rename from res/trainers/trainer_youngster_tristan_rematch_1.json rename to res/trainers/data/youngster_tristan_rematch_1.json diff --git a/res/trainers/trainer_youngster_tristan_rematch_2.json b/res/trainers/data/youngster_tristan_rematch_2.json similarity index 100% rename from res/trainers/trainer_youngster_tristan_rematch_2.json rename to res/trainers/data/youngster_tristan_rematch_2.json diff --git a/res/trainers/trainer_youngster_tristan_rematch_3.json b/res/trainers/data/youngster_tristan_rematch_3.json similarity index 100% rename from res/trainers/trainer_youngster_tristan_rematch_3.json rename to res/trainers/data/youngster_tristan_rematch_3.json diff --git a/res/trainers/trainer_youngster_tyler.json b/res/trainers/data/youngster_tyler.json similarity index 100% rename from res/trainers/trainer_youngster_tyler.json rename to res/trainers/data/youngster_tyler.json diff --git a/res/trainers/trainer_youngster_wayne.json b/res/trainers/data/youngster_wayne.json similarity index 100% rename from res/trainers/trainer_youngster_wayne.json rename to res/trainers/data/youngster_wayne.json diff --git a/res/trainers/meson.build b/res/trainers/meson.build index 6c4dd3cad7..7520d7d3c3 100644 --- a/res/trainers/meson.build +++ b/res/trainers/meson.build @@ -1,975 +1,32 @@ -trainer_data_files = [ - 'trainer_none.json', - 'trainer_youngster_tristan.json', - 'trainer_youngster_logan.json', - 'trainer_lass_natalie.json', - 'trainer_youngster_michael.json', - 'trainer_unknown_005.json', - 'trainer_unknown_006.json', - 'trainer_unknown_007.json', - 'trainer_unknown_008.json', - 'trainer_unknown_009.json', - 'trainer_youngster_tyler.json', - 'trainer_lass_samantha.json', - 'trainer_lass_sarah.json', - 'trainer_bug_catcher_brandon.json', - 'trainer_aroma_lady_taylor.json', - 'trainer_twins_liv_and_liz.json', - 'trainer_camper_jacob.json', - 'trainer_picnicker_siena.json', - 'trainer_hiker_daniel.json', - 'trainer_hiker_nicholas.json', - 'trainer_battle_girl_kelsey.json', - 'trainer_aroma_lady_elizabeth.json', - 'trainer_fisherman_andrew.json', - 'trainer_fisherman_joseph.json', - 'trainer_fisherman_zachary.json', - 'trainer_cyclist_axel.json', - 'trainer_cyclist_james.json', - 'trainer_cyclist_john.json', - 'trainer_cyclist_ryan.json', - 'trainer_cyclist_megan.json', - 'trainer_cyclist_nicole.json', - 'trainer_cyclist_kayla.json', - 'trainer_cyclist_rachel.json', - 'trainer_youngster_austin.json', - 'trainer_camper_anthony.json', - 'trainer_picnicker_lauren.json', - 'trainer_hiker_kevin.json', - 'trainer_hiker_justin.json', - 'trainer_battle_girl_helen.json', - 'trainer_hiker_robert.json', - 'trainer_hiker_alexander.json', - 'trainer_hiker_jonathan.json', - 'trainer_black_belt_kyle.json', - 'trainer_fisherman_cody.json', - 'trainer_aroma_lady_hannah.json', - 'trainer_artist_william.json', - 'trainer_breeder_albert.json', - 'trainer_breeder_jennifer.json', - 'trainer_cowgirl_shelley.json', - 'trainer_jogger_richard.json', - 'trainer_unknown_050.json', - 'trainer_unknown_051.json', - 'trainer_unknown_052.json', - 'trainer_poke_kid_danielle.json', - 'trainer_unknown_054.json', - 'trainer_young_couple_ty_and_sue.json', - 'trainer_breeder_kahlil.json', - 'trainer_breeder_amber.json', - 'trainer_unknown_058.json', - 'trainer_unknown_059.json', - 'trainer_unknown_060.json', - 'trainer_unknown_061.json', - 'trainer_unknown_062.json', - 'trainer_unknown_063.json', - 'trainer_unknown_064.json', - 'trainer_twins_teri_and_tia.json', - 'trainer_ace_trainer_ernest.json', - 'trainer_ace_trainer_alyssa.json', - 'trainer_veteran_brian.json', - 'trainer_black_belt_adam.json', - 'trainer_ninja_boy_joel.json', - 'trainer_ninja_boy_nathan.json', - 'trainer_ninja_boy_davido.json', - 'trainer_dragon_tamer_patrick.json', - 'trainer_bird_keeper_brianna.json', - 'trainer_double_team_zac_and_jen.json', - 'trainer_bird_keeper_alexandra.json', - 'trainer_unknown_077.json', - 'trainer_ninja_boy_zach.json', - 'trainer_black_belt_sean.json', - 'trainer_ninja_boy_nick.json', - 'trainer_bird_keeper_katherine.json', - 'trainer_rich_boy_jason.json', - 'trainer_lady_melissa.json', - 'trainer_gentleman_jeremy.json', - 'trainer_socialite_reina.json', - 'trainer_unknown_086.json', - 'trainer_unknown_087.json', - 'trainer_policeman_bobby.json', - 'trainer_policeman_alex.json', - 'trainer_policeman_dylan.json', - 'trainer_fisherman_juan.json', - 'trainer_fisherman_josh.json', - 'trainer_fisherman_travis.json', - 'trainer_ranger_taylor.json', - 'trainer_ranger_jeffrey.json', - 'trainer_ranger_allison.json', - 'trainer_unknown_097.json', - 'trainer_unknown_098.json', - 'trainer_scientist_stefano.json', - 'trainer_unknown_100.json', - 'trainer_unknown_101.json', - 'trainer_policeman_caleb.json', - 'trainer_swimmer_sheltin.json', - 'trainer_swimmer_evan.json', - 'trainer_swimmer_haley.json', - 'trainer_swimmer_mary.json', - 'trainer_tuber_jared.json', - 'trainer_tuber_chelsea.json', - 'trainer_unknown_109.json', - 'trainer_sailor_paul.json', - 'trainer_fisherman_kenneth.json', - 'trainer_unknown_112.json', - 'trainer_ruin_maniac_bryan.json', - 'trainer_ruin_maniac_ronald.json', - 'trainer_unknown_115.json', - 'trainer_unknown_116.json', - 'trainer_unknown_117.json', - 'trainer_unknown_118.json', - 'trainer_psychic_mitchell.json', - 'trainer_psychic_abigail.json', - 'trainer_pi_carlos.json', - 'trainer_unknown_122.json', - 'trainer_unknown_123.json', - 'trainer_unknown_124.json', - 'trainer_unknown_125.json', - 'trainer_unknown_126.json', - 'trainer_black_belt_gregory.json', - 'trainer_black_belt_derek.json', - 'trainer_black_belt_nathaniel.json', - 'trainer_jogger_scott.json', - 'trainer_unknown_131.json', - 'trainer_ace_trainer_blake.json', - 'trainer_ace_trainer_garrett.json', - 'trainer_ace_trainer_laura.json', - 'trainer_ace_trainer_maria.json', - 'trainer_skier_bradley.json', - 'trainer_skier_edward.json', - 'trainer_skier_kaitlyn.json', - 'trainer_skier_andrea.json', - 'trainer_ace_trainer_dalton.json', - 'trainer_ace_trainer_olivia.json', - 'trainer_skier_shawn.json', - 'trainer_skier_bjorn.json', - 'trainer_skier_lexie.json', - 'trainer_skier_madison.json', - 'trainer_ninja_boy_matthew.json', - 'trainer_ninja_boy_ethan.json', - 'trainer_black_belt_luke.json', - 'trainer_unknown_149.json', - 'trainer_unknown_150.json', - 'trainer_unknown_151.json', - 'trainer_unknown_152.json', - 'trainer_fisherman_miguel.json', - 'trainer_fisherman_luc.json', - 'trainer_unknown_155.json', - 'trainer_unknown_156.json', - 'trainer_unknown_157.json', - 'trainer_unknown_158.json', - 'trainer_swimmer_adrian.json', - 'trainer_swimmer_erik.json', - 'trainer_swimmer_vincent.json', - 'trainer_swimmer_jessica.json', - 'trainer_swimmer_erica.json', - 'trainer_swimmer_katelyn.json', - 'trainer_unknown_165.json', - 'trainer_swimmer_dillon.json', - 'trainer_swimmer_vanessa.json', - 'trainer_fisherman_cory.json', - 'trainer_unknown_169.json', - 'trainer_ace_trainer_jake.json', - 'trainer_ace_trainer_shannon.json', - 'trainer_fisherman_brett.json', - 'trainer_fisherman_alec.json', - 'trainer_fisherman_george.json', - 'trainer_fisherman_cole.json', - 'trainer_unknown_176.json', - 'trainer_unknown_177.json', - 'trainer_unknown_178.json', - 'trainer_unknown_179.json', - 'trainer_sailor_luther.json', - 'trainer_unknown_181.json', - 'trainer_unknown_182.json', - 'trainer_swimmer_wesley.json', - 'trainer_swimmer_ricardo.json', - 'trainer_swimmer_francisco.json', - 'trainer_swimmer_colton.json', - 'trainer_swimmer_troy.json', - 'trainer_swimmer_oscar.json', - 'trainer_swimmer_miranda.json', - 'trainer_swimmer_aubree.json', - 'trainer_swimmer_paige.json', - 'trainer_swimmer_crystal.json', - 'trainer_swimmer_cassandra.json', - 'trainer_swimmer_gabrielle.json', - 'trainer_worker_colin.json', - 'trainer_worker_mason.json', - 'trainer_unknown_197.json', - 'trainer_unknown_198.json', - 'trainer_unknown_199.json', - 'trainer_unknown_200.json', - 'trainer_bug_catcher_jack.json', - 'trainer_bug_catcher_phillip.json', - 'trainer_bug_catcher_donald.json', - 'trainer_lass_briana.json', - 'trainer_psychic_elijah.json', - 'trainer_psychic_lindsey.json', - 'trainer_unknown_207.json', - 'trainer_unknown_208.json', - 'trainer_unknown_209.json', - 'trainer_unknown_210.json', - 'trainer_unknown_211.json', - 'trainer_unknown_212.json', - 'trainer_unknown_213.json', - 'trainer_unknown_214.json', - 'trainer_unknown_215.json', - 'trainer_unknown_216.json', - 'trainer_unknown_217.json', - 'trainer_unknown_218.json', - 'trainer_unknown_219.json', - 'trainer_unknown_220.json', - 'trainer_unknown_221.json', - 'trainer_unknown_222.json', - 'trainer_unknown_223.json', - 'trainer_ace_trainer_omar.json', - 'trainer_ace_trainer_henry.json', - 'trainer_ace_trainer_mariah.json', - 'trainer_ace_trainer_sydney.json', - 'trainer_veteran_edgar.json', - 'trainer_veteran_clayton.json', - 'trainer_dragon_tamer_ondrej.json', - 'trainer_dragon_tamer_clinton.json', - 'trainer_black_belt_david.json', - 'trainer_bird_keeper_hana.json', - 'trainer_psychic_bryce.json', - 'trainer_psychic_valencia.json', - 'trainer_double_team_jo_and_pat.json', - 'trainer_double_team_al_and_kay.json', - 'trainer_unknown_238.json', - 'trainer_unknown_239.json', - 'trainer_veteran_grant.json', - 'trainer_unknown_241.json', - 'trainer_unknown_242.json', - 'trainer_unknown_243.json', - 'trainer_youngster_jonathon.json', - 'trainer_youngster_darius.json', - 'trainer_leader_roark.json', - 'trainer_rival_route_203_piplup.json', - 'trainer_rival_route_203_turtwig.json', - 'trainer_rival_route_203_chimchar.json', - 'trainer_leader_byron.json', - 'trainer_unknown_251.json', - 'trainer_unknown_252.json', - 'trainer_unknown_253.json', - 'trainer_unknown_254.json', - 'trainer_unknown_255.json', - 'trainer_worker_jackson.json', - 'trainer_worker_gary.json', - 'trainer_black_belt_philip.json', - 'trainer_aroma_lady_jenna.json', - 'trainer_aroma_lady_angela.json', - 'trainer_elite_four_aaron.json', - 'trainer_elite_four_bertha.json', - 'trainer_elite_four_flint.json', - 'trainer_elite_four_lucian.json', - 'trainer_camper_curtis.json', - 'trainer_camper_drew.json', - 'trainer_champion_cynthia.json', - 'trainer_ace_trainer_sergio.json', - 'trainer_ace_trainer_isaiah.json', - 'trainer_ace_trainer_savannah.json', - 'trainer_ace_trainer_alicia.json', - 'trainer_collector_douglas.json', - 'trainer_collector_brady.json', - 'trainer_collector_ivan.json', - 'trainer_collector_fernando.json', - 'trainer_collector_edwin.json', - 'trainer_dragon_tamer_hayden.json', - 'trainer_ace_trainer_dennis.json', - 'trainer_ace_trainer_cesar.json', - 'trainer_ace_trainer_allen.json', - 'trainer_ace_trainer_zachery.json', - 'trainer_ace_trainer_ruben.json', - 'trainer_ace_trainer_breanna.json', - 'trainer_ace_trainer_catherine.json', - 'trainer_ace_trainer_destiny.json', - 'trainer_ace_trainer_jamie.json', - 'trainer_ace_trainer_maya.json', - 'trainer_psychic_maxwell.json', - 'trainer_psychic_brittney.json', - 'trainer_belle_and_pa_ava_and_matt.json', - 'trainer_unknown_291.json', - 'trainer_rancher_marco.json', - 'trainer_fisherman_erick.json', - 'trainer_twins_emma_and_lil.json', - 'trainer_commander_mars_valley_windworks.json', - 'trainer_galactic_grunt_floaroma_meadow_1.json', - 'trainer_galactic_grunt_floaroma_meadow_2.json', - 'trainer_galactic_grunt_valley_windworks_2.json', - 'trainer_galactic_grunt_valley_windworks_3.json', - 'trainer_guitarist_tony.json', - 'trainer_guitarist_jerry.json', - 'trainer_guitarist_preston.json', - 'trainer_guitarist_lonnie.json', - 'trainer_ruin_maniac_calvin.json', - 'trainer_ruin_maniac_larry.json', - 'trainer_jogger_wyatt.json', - 'trainer_jogger_craig.json', - 'trainer_jogger_raul.json', - 'trainer_black_belt_colby.json', - 'trainer_black_belt_darren.json', - 'trainer_black_belt_rafael.json', - 'trainer_black_belt_jeffery.json', - 'trainer_black_belt_carl.json', - 'trainer_black_belt_ricky.json', - 'trainer_leader_gardenia.json', - 'trainer_leader_wake.json', - 'trainer_leader_maylene.json', - 'trainer_leader_fantina.json', - 'trainer_leader_candice.json', - 'trainer_leader_volkner.json', - 'trainer_unknown_321.json', - 'trainer_lass_madeline.json', - 'trainer_lass_kaitlin.json', - 'trainer_lass_caroline.json', - 'trainer_lass_molly.json', - 'trainer_hiker_louis.json', - 'trainer_parasol_lady_alexa.json', - 'trainer_parasol_lady_sabrina.json', - 'trainer_picnicker_diana.json', - 'trainer_picnicker_cheyenne.json', - 'trainer_poke_kid_meghan.json', - 'trainer_policeman_danny.json', - 'trainer_policeman_thomas.json', - 'trainer_unknown_334.json', - 'trainer_rich_boy_trey.json', - 'trainer_unknown_336.json', - 'trainer_sailor_marc.json', - 'trainer_sailor_skyler.json', - 'trainer_sailor_damian.json', - 'trainer_school_kid_chance.json', - 'trainer_school_kid_forrest.json', - 'trainer_school_kid_harrison.json', - 'trainer_school_kid_mackenzie.json', - 'trainer_school_kid_tiera.json', - 'trainer_school_kid_christine.json', - 'trainer_beauty_cyndy.json', - 'trainer_unknown_347.json', - 'trainer_beauty_lindsay.json', - 'trainer_unknown_349.json', - 'trainer_unknown_350.json', - 'trainer_unknown_351.json', - 'trainer_unknown_352.json', - 'trainer_unknown_353.json', - 'trainer_unknown_354.json', - 'trainer_youngster_dallas.json', - 'trainer_youngster_sebastian.json', - 'trainer_youngster_donny.json', - 'trainer_tuber_trenton.json', - 'trainer_tuber_conner.json', - 'trainer_tuber_mariel.json', - 'trainer_tuber_holly.json', - 'trainer_veteran_armando.json', - 'trainer_unknown_363.json', - 'trainer_unknown_364.json', - 'trainer_unknown_365.json', - 'trainer_waitress_kati.json', - 'trainer_worker_gerardo.json', - 'trainer_unknown_368.json', - 'trainer_unknown_369.json', - 'trainer_unknown_370.json', - 'trainer_unknown_371.json', - 'trainer_battle_girl_tyler.json', - 'trainer_bird_keeper_autumn.json', - 'trainer_unknown_374.json', - 'trainer_unknown_375.json', - 'trainer_unknown_376.json', - 'trainer_camper_zackary.json', - 'trainer_camper_lawrence.json', - 'trainer_camper_diego.json', - 'trainer_camper_parker.json', - 'trainer_collector_dean.json', - 'trainer_collector_jamal.json', - 'trainer_collector_terry.json', - 'trainer_unknown_384.json', - 'trainer_unknown_385.json', - 'trainer_dragon_tamer_joe.json', - 'trainer_unknown_387.json', - 'trainer_ace_trainer_jonah.json', - 'trainer_ace_trainer_micah.json', - 'trainer_ace_trainer_arthur.json', - 'trainer_unknown_391.json', - 'trainer_ace_trainer_brenda.json', - 'trainer_ace_trainer_brandi.json', - 'trainer_ace_trainer_clarice.json', - 'trainer_psychic_kody.json', - 'trainer_psychic_landon.json', - 'trainer_psychic_deandre.json', - 'trainer_psychic_rachael.json', - 'trainer_psychic_desiree.json', - 'trainer_psychic_kendra.json', - 'trainer_fisherman_walter.json', - 'trainer_unknown_402.json', - 'trainer_galactic_boss_cyrus_galactic_hq.json', - 'trainer_galactic_boss_cyrus_distortion_world.json', - 'trainer_commander_mars_lake_verity.json', - 'trainer_commander_jupiter_team_galactic_eterna_building.json', - 'trainer_commander_jupiter_spear_pillar.json', - 'trainer_commander_saturn_valor_cavern.json', - 'trainer_commander_saturn_galactic_hq.json', - 'trainer_galactic_grunt_team_galactic_eterna_building_1f_1.json', - 'trainer_unknown_411.json', - 'trainer_galactic_grunt_team_galactic_eterna_building_2f_1.json', - 'trainer_unknown_413.json', - 'trainer_galactic_grunt_jubilife_city_1.json', - 'trainer_galactic_grunt_jubilife_city_2.json', - 'trainer_galactic_grunt_celestic_town.json', - 'trainer_galactic_grunt_lake_valor_1.json', - 'trainer_galactic_grunt_lake_valor_2.json', - 'trainer_galactic_grunt_lake_verity_1.json', - 'trainer_galactic_grunt_lake_verity_3.json', - 'trainer_galactic_grunt_team_galactic_eterna_building_1f_2.json', - 'trainer_galactic_grunt_team_galactic_eterna_building_2f_2.json', - 'trainer_galactic_grunt_team_galactic_eterna_building_3f.json', - 'trainer_unknown_424.json', - 'trainer_galactic_grunt_lake_valor_3.json', - 'trainer_galactic_grunt_lake_verity_2.json', - 'trainer_galactic_grunt_lake_verity_4.json', - 'trainer_galactic_grunt_galactic_hq_1f.json', - 'trainer_unknown_429.json', - 'trainer_galactic_grunt_galactic_hq_2f_3.json', - 'trainer_unknown_431.json', - 'trainer_unknown_432.json', - 'trainer_unknown_433.json', - 'trainer_unknown_434.json', - 'trainer_unknown_435.json', - 'trainer_unknown_436.json', - 'trainer_unknown_437.json', - 'trainer_unknown_438.json', - 'trainer_unknown_439.json', - 'trainer_unknown_440.json', - 'trainer_unknown_441.json', - 'trainer_ruin_maniac_harry.json', - 'trainer_ruin_maniac_gerald.json', - 'trainer_black_belt_miles.json', - 'trainer_black_belt_kendal.json', - 'trainer_black_belt_eddie.json', - 'trainer_black_belt_willie.json', - 'trainer_unknown_448.json', - 'trainer_unknown_449.json', - 'trainer_lass_cassidy.json', - 'trainer_hiker_theodore.json', - 'trainer_hiker_damon.json', - 'trainer_hiker_maurice.json', - 'trainer_hiker_reginald.json', - 'trainer_hiker_lorenzo.json', - 'trainer_picnicker_karina.json', - 'trainer_picnicker_summer.json', - 'trainer_picnicker_tori.json', - 'trainer_picnicker_ana.json', - 'trainer_unknown_460.json', - 'trainer_unknown_461.json', - 'trainer_unknown_462.json', - 'trainer_unknown_463.json', - 'trainer_unknown_464.json', - 'trainer_unknown_465.json', - 'trainer_unknown_466.json', - 'trainer_unknown_467.json', - 'trainer_unknown_468.json', - 'trainer_unknown_469.json', - 'trainer_rival_route_209_piplup.json', - 'trainer_rival_route_209_turtwig.json', - 'trainer_rival_route_209_chimchar.json', - 'trainer_rival_pastoria_city_piplup.json', - 'trainer_rival_pastoria_city_turtwig.json', - 'trainer_rival_pastoria_city_chimchar.json', - 'trainer_rival_canalave_city_piplup.json', - 'trainer_rival_canalave_city_turtwig.json', - 'trainer_rival_canalave_city_chimchar.json', - 'trainer_rival_pokemon_league_piplup.json', - 'trainer_rival_pokemon_league_turtwig.json', - 'trainer_rival_pokemon_league_chimchar.json', - 'trainer_sailor_zachariah.json', - 'trainer_sailor_samson.json', - 'trainer_unknown_484.json', - 'trainer_unknown_485.json', - 'trainer_scientist_shaun.json', - 'trainer_unknown_487.json', - 'trainer_ninja_boy_fabian.json', - 'trainer_ninja_boy_brennan.json', - 'trainer_ninja_boy_bruce.json', - 'trainer_beauty_devon.json', - 'trainer_beauty_nicola.json', - 'trainer_unknown_493.json', - 'trainer_swimmer_claire.json', - 'trainer_unknown_495.json', - 'trainer_youngster_wayne.json', - 'trainer_tuber_jacky.json', - 'trainer_tuber_caitlyn.json', - 'trainer_veteran_terrell.json', - 'trainer_veteran_brenden.json', - 'trainer_unknown_501.json', - 'trainer_unknown_502.json', - 'trainer_worker_noel.json', - 'trainer_worker_braden.json', - 'trainer_worker_brendon.json', - 'trainer_worker_quentin.json', - 'trainer_galactic_grunt_galactic_hq_b2f_1.json', - 'trainer_galactic_grunt_galactic_hq_b2f_2.json', - 'trainer_galactic_grunt_galactic_hq_3f_1.json', - 'trainer_galactic_grunt_galactic_hq_2f_1.json', - 'trainer_unknown_511.json', - 'trainer_galactic_grunt_galactic_hq_3f_2.json', - 'trainer_galactic_grunt_galactic_hq_2f_2.json', - 'trainer_galactic_grunt_galactic_hq_3f_3.json', - 'trainer_galactic_grunt_mt_coronet_3f_1.json', - 'trainer_galactic_grunt_mt_coronet_4f_1.json', - 'trainer_galactic_grunt_mt_coronet_4f_2.json', - 'trainer_galactic_grunt_mt_coronet_tunnel_room_1.json', - 'trainer_galactic_grunt_mt_coronet_tunnel_room_2.json', - 'trainer_galactic_grunt_mt_coronet_5f_1.json', - 'trainer_galactic_grunt_spear_pillar_1.json', - 'trainer_galactic_grunt_galactic_hq_3f_4.json', - 'trainer_galactic_grunt_mt_coronet__3f_1.json', - 'trainer_galactic_grunt_mt_coronet_tunnel_room_3.json', - 'trainer_galactic_grunt_mt_coronet_5f_2.json', - 'trainer_galactic_grunt_mt_coronet_6f.json', - 'trainer_galactic_grunt_spear_pillar_2.json', - 'trainer_commander_mars_spear_pillar.json', - 'trainer_roughneck_kirby.json', - 'trainer_pokefan_leonard.json', - 'trainer_pokefan_rebekah.json', - 'trainer_youngster_oliver.json', - 'trainer_belle_and_pa_beth_and_bob.json', - 'trainer_young_couple_mike_and_nat.json', - 'trainer_aroma_lady_alison.json', - 'trainer_artist_ismael.json', - 'trainer_breeder_kaylee.json', - 'trainer_cameraman_darryl.json', - 'trainer_collector_eugene.json', - 'trainer_pokefan_meredith.json', - 'trainer_pi_kendrick.json', - 'trainer_gentleman_leonardo.json', - 'trainer_socialite_rebecca.json', - 'trainer_lass_blythe.json', - 'trainer_rich_boy_roman.json', - 'trainer_lady_kylie.json', - 'trainer_reporters_valerie.json', - 'trainer_school_kid_esteban.json', - 'trainer_scientist_emilio.json', - 'trainer_beauty_gabriella.json', - 'trainer_beauty_harley.json', - 'trainer_veteran_emanuel.json', - 'trainer_ruin_maniac_karl.json', - 'trainer_bird_keeper_audrey.json', - 'trainer_bird_keeper_geneva.json', - 'trainer_bird_keeper_krystal.json', - 'trainer_dragon_tamer_geoffrey.json', - 'trainer_dragon_tamer_darien.json', - 'trainer_dragon_tamer_keegan.json', - 'trainer_dragon_tamer_stanley.json', - 'trainer_dragon_tamer_drake.json', - 'trainer_dragon_tamer_kenny.json', - 'trainer_ace_trainer_rodolfo.json', - 'trainer_ace_trainer_saul.json', - 'trainer_ace_trainer_jose.json', - 'trainer_ace_trainer_felix.json', - 'trainer_ace_trainer_quinn.json', - 'trainer_ace_trainer_graham.json', - 'trainer_ace_trainer_keenan.json', - 'trainer_ace_trainer_stefan.json', - 'trainer_ace_trainer_skylar.json', - 'trainer_ace_trainer_abel.json', - 'trainer_ace_trainer_deanna.json', - 'trainer_ace_trainer_moira.json', - 'trainer_ace_trainer_dana.json', - 'trainer_ace_trainer_mikayla.json', - 'trainer_ace_trainer_meagan.json', - 'trainer_ace_trainer_sandra.json', - 'trainer_ace_trainer_kassandra.json', - 'trainer_ace_trainer_jasmin.json', - 'trainer_ace_trainer_natasha.json', - 'trainer_ace_trainer_monique.json', - 'trainer_psychic_corbin.json', - 'trainer_psychic_sterling.json', - 'trainer_psychic_daisy.json', - 'trainer_psychic_chelsey.json', - 'trainer_black_belt_davon.json', - 'trainer_black_belt_griffin.json', - 'trainer_black_belt_ray.json', - 'trainer_black_belt_jarrett.json', - 'trainer_ranger_kyler.json', - 'trainer_ranger_deshawn.json', - 'trainer_ranger_dwayne.json', - 'trainer_ranger_ashlee.json', - 'trainer_ranger_felicia.json', - 'trainer_ranger_krista.json', - 'trainer_swimmer_glenn.json', - 'trainer_swimmer_kurt.json', - 'trainer_swimmer_sam.json', - 'trainer_swimmer_wade.json', - 'trainer_swimmer_joanna.json', - 'trainer_swimmer_sophia.json', - 'trainer_swimmer_mallory.json', - 'trainer_swimmer_lydia.json', - 'trainer_unknown_605.json', - 'trainer_veteran_harlan.json', - 'trainer_rival_spear_pillar_piplup.json', - 'trainer_cheryl_eterna_forest.json', - 'trainer_riley_iron_island.json', - 'trainer_marley_victory_road.json', - 'trainer_buck_stark_mountain.json', - 'trainer_mira_wayward_cave.json', - 'trainer_lucas_jubilife_city_chimchar.json', - 'trainer_lucas_jubilife_city_piplup.json', - 'trainer_lucas_jubilife_city_turtwig.json', - 'trainer_dawn_jubilife_city_chimchar.json', - 'trainer_dawn_jubilife_city_piplup.json', - 'trainer_dawn_jubilife_city_turtwig.json', - 'trainer_rival_spear_pillar_turtwig.json', - 'trainer_rival_spear_pillar_chimchar.json', - 'trainer_lucas_veilstone_city_chimchar.json', - 'trainer_lucas_veilstone_city_piplup.json', - 'trainer_lucas_veilstone_city_turtwig.json', - 'trainer_dawn_veilstone_city_chimchar.json', - 'trainer_dawn_veilstone_city_piplup.json', - 'trainer_dawn_veilstone_city_turtwig.json', - 'trainer_aroma_lady_elizabeth_rematch_1.json', - 'trainer_aroma_lady_elizabeth_rematch_2.json', - 'trainer_aroma_lady_elizabeth_rematch_3.json', - 'trainer_artist_william_rematch_1.json', - 'trainer_artist_william_rematch_2.json', - 'trainer_artist_william_rematch_3.json', - 'trainer_battle_girl_helen_rematch_1.json', - 'trainer_battle_girl_helen_rematch_2.json', - 'trainer_battle_girl_helen_rematch_3.json', - 'trainer_bird_keeper_brianna_rematch_1.json', - 'trainer_bird_keeper_brianna_rematch_2.json', - 'trainer_bird_keeper_audrey_rematch.json', - 'trainer_breeder_albert_rematch_1.json', - 'trainer_breeder_albert_rematch_2.json', - 'trainer_breeder_albert_rematch_3.json', - 'trainer_breeder_jennifer_rematch_1.json', - 'trainer_breeder_jennifer_rematch_2.json', - 'trainer_breeder_jennifer_rematch_3.json', - 'trainer_camper_zackary_rematch_1.json', - 'trainer_camper_zackary_rematch_2.json', - 'trainer_camper_zackary_rematch_3.json', - 'trainer_ace_trainer_dalton_rematch.json', - 'trainer_ace_trainer_olivia_rematch.json', - 'trainer_collector_ivan_rematch.json', - 'trainer_unknown_651.json', - 'trainer_unknown_652.json', - 'trainer_cyclist_john_rematch_1.json', - 'trainer_cyclist_john_rematch_2.json', - 'trainer_cyclist_john_rematch_3.json', - 'trainer_cyclist_kayla_rematch_1.json', - 'trainer_cyclist_kayla_rematch_2.json', - 'trainer_cyclist_kayla_rematch_3.json', - 'trainer_dragon_tamer_patrick_rematch_1.json', - 'trainer_dragon_tamer_patrick_rematch_2.json', - 'trainer_dragon_tamer_hayden_rematch.json', - 'trainer_dragon_tamer_geoffrey_rematch.json', - 'trainer_ace_trainer_jake_rematch.json', - 'trainer_ace_trainer_dennis_rematch_1.json', - 'trainer_ace_trainer_dennis_rematch_2.json', - 'trainer_ace_trainer_rodolfo_rematch.json', - 'trainer_ace_trainer_saul_rematch.json', - 'trainer_ace_trainer_shannon_rematch.json', - 'trainer_ace_trainer_maya_rematch_1.json', - 'trainer_ace_trainer_maya_rematch_2.json', - 'trainer_ace_trainer_deanna_rematch.json', - 'trainer_ace_trainer_moira_rematch.json', - 'trainer_psychic_mitchell_rematch_1.json', - 'trainer_psychic_mitchell_rematch_2.json', - 'trainer_psychic_maxwell_rematch.json', - 'trainer_psychic_corbin_rematch.json', - 'trainer_psychic_abigail_rematch_1.json', - 'trainer_psychic_abigail_rematch_2.json', - 'trainer_psychic_brittney_rematch.json', - 'trainer_psychic_daisy_rematch.json', - 'trainer_rancher_marco_rematch_1.json', - 'trainer_rancher_marco_rematch_2.json', - 'trainer_fisherman_joseph_rematch_1.json', - 'trainer_fisherman_joseph_rematch_2.json', - 'trainer_fisherman_miguel_rematch.json', - 'trainer_fisherman_alec_rematch.json', - 'trainer_twins_teri_and_tia_rematch_1.json', - 'trainer_twins_teri_and_tia_rematch_2.json', - 'trainer_pi_carlos_rematch_1.json', - 'trainer_pi_carlos_rematch_2.json', - 'trainer_gentleman_jeremy_rematch_1.json', - 'trainer_gentleman_jeremy_rematch_2.json', - 'trainer_gentleman_jeremy_rematch_3.json', - 'trainer_guitarist_tony_rematch.json', - 'trainer_ruin_maniac_harry_rematch_1.json', - 'trainer_ruin_maniac_harry_rematch_2.json', - 'trainer_jogger_craig_rematch_1.json', - 'trainer_jogger_craig_rematch_2.json', - 'trainer_black_belt_philip_rematch.json', - 'trainer_black_belt_davon_rematch.json', - 'trainer_socialite_reina_rematch_1.json', - 'trainer_socialite_reina_rematch_2.json', - 'trainer_lass_samantha_rematch_1.json', - 'trainer_lass_samantha_rematch_2.json', - 'trainer_lass_samantha_rematch_3.json', - 'trainer_lass_madeline_rematch_1.json', - 'trainer_lass_madeline_rematch_2.json', - 'trainer_lass_madeline_rematch_3.json', - 'trainer_hiker_theodore_rematch_1.json', - 'trainer_hiker_theodore_rematch_2.json', - 'trainer_hiker_theodore_rematch_3.json', - 'trainer_bug_catcher_brandon_rematch_1.json', - 'trainer_bug_catcher_brandon_rematch_2.json', - 'trainer_bug_catcher_brandon_rematch_3.json', - 'trainer_parasol_lady_alexa_rematch_1.json', - 'trainer_parasol_lady_alexa_rematch_2.json', - 'trainer_parasol_lady_alexa_rematch_3.json', - 'trainer_picnicker_karina_rematch_1.json', - 'trainer_picnicker_karina_rematch_2.json', - 'trainer_picnicker_karina_rematch_3.json', - 'trainer_poke_kid_danielle_rematch_1.json', - 'trainer_poke_kid_danielle_rematch_2.json', - 'trainer_poke_kid_danielle_rematch_3.json', - 'trainer_policeman_danny_rematch_1.json', - 'trainer_policeman_danny_rematch_2.json', - 'trainer_policeman_danny_rematch_3.json', - 'trainer_rich_boy_trey_rematch_1.json', - 'trainer_rich_boy_trey_rematch_2.json', - 'trainer_lady_melissa_rematch_1.json', - 'trainer_lady_melissa_rematch_2.json', - 'trainer_lady_melissa_rematch_3.json', - 'trainer_ranger_taylor_rematch_1.json', - 'trainer_ranger_taylor_rematch_2.json', - 'trainer_ranger_taylor_rematch_3.json', - 'trainer_ranger_kyler_rematch.json', - 'trainer_ranger_allison_rematch_1.json', - 'trainer_ranger_allison_rematch_2.json', - 'trainer_ranger_allison_rematch_3.json', - 'trainer_ranger_ashlee_rematch.json', - 'trainer_sailor_marc_rematch_1.json', - 'trainer_sailor_marc_rematch_2.json', - 'trainer_sailor_zachariah_rematch.json', - 'trainer_scientist_shaun_rematch_1.json', - 'trainer_scientist_shaun_rematch_2.json', - 'trainer_scientist_shaun_rematch_3.json', - 'trainer_ninja_boy_zach_rematch_1.json', - 'trainer_ninja_boy_zach_rematch_2.json', - 'trainer_ninja_boy_zach_rematch_3.json', - 'trainer_beauty_cyndy_rematch_1.json', - 'trainer_beauty_cyndy_rematch_2.json', - 'trainer_skier_edward_rematch_1.json', - 'trainer_skier_edward_rematch_2.json', - 'trainer_skier_bjorn_rematch_1.json', - 'trainer_skier_bjorn_rematch_2.json', - 'trainer_skier_andrea_rematch_1.json', - 'trainer_skier_andrea_rematch_2.json', - 'trainer_skier_madison_rematch_1.json', - 'trainer_skier_madison_rematch_2.json', - 'trainer_swimmer_wesley_rematch.json', - 'trainer_swimmer_francisco_rematch.json', - 'trainer_swimmer_glenn_rematch.json', - 'trainer_swimmer_miranda_rematch.json', - 'trainer_swimmer_crystal_rematch.json', - 'trainer_swimmer_joanna_rematch.json', - 'trainer_youngster_tristan_rematch_1.json', - 'trainer_youngster_tristan_rematch_2.json', - 'trainer_youngster_tristan_rematch_3.json', - 'trainer_youngster_dallas_rematch_1.json', - 'trainer_youngster_dallas_rematch_2.json', - 'trainer_youngster_dallas_rematch_3.json', - 'trainer_tuber_jared_rematch_1.json', - 'trainer_tuber_jared_rematch_2.json', - 'trainer_tuber_chelsea_rematch_1.json', - 'trainer_veteran_brian_rematch_1.json', - 'trainer_tuber_chelsea_rematch_2.json', - 'trainer_veteran_brian_rematch_2.json', - 'trainer_veteran_armando_rematch.json', - 'trainer_unknown_778.json', - 'trainer_unknown_779.json', - 'trainer_unknown_780.json', - 'trainer_unknown_781.json', - 'trainer_unknown_782.json', - 'trainer_unknown_783.json', - 'trainer_unknown_784.json', - 'trainer_unknown_785.json', - 'trainer_unknown_786.json', - 'trainer_unknown_787.json', - 'trainer_unknown_788.json', - 'trainer_unknown_789.json', - 'trainer_unknown_790.json', - 'trainer_unknown_791.json', - 'trainer_unknown_792.json', - 'trainer_unknown_793.json', - 'trainer_unknown_794.json', - 'trainer_unknown_795.json', - 'trainer_unknown_796.json', - 'trainer_unknown_797.json', - 'trainer_unknown_798.json', - 'trainer_unknown_799.json', - 'trainer_unknown_800.json', - 'trainer_unknown_801.json', - 'trainer_unknown_802.json', - 'trainer_unknown_803.json', - 'trainer_unknown_804.json', - 'trainer_unknown_805.json', - 'trainer_unknown_806.json', - 'trainer_unknown_807.json', - 'trainer_unknown_808.json', - 'trainer_unknown_809.json', - 'trainer_unknown_810.json', - 'trainer_unknown_811.json', - 'trainer_unknown_812.json', - 'trainer_unknown_813.json', - 'trainer_unknown_814.json', - 'trainer_unknown_815.json', - 'trainer_unknown_816.json', - 'trainer_unknown_817.json', - 'trainer_unknown_818.json', - 'trainer_unknown_819.json', - 'trainer_unknown_820.json', - 'trainer_unknown_821.json', - 'trainer_unknown_822.json', - 'trainer_unknown_823.json', - 'trainer_unknown_824.json', - 'trainer_unknown_825.json', - 'trainer_unknown_828.json', - 'trainer_ace_trainer_anton.json', - 'trainer_ace_trainer_brenna.json', - 'trainer_scientist_darrius.json', - 'trainer_scientist_fredrick.json', - 'trainer_scientist_travon.json', - 'trainer_poke_kid_janet.json', - 'trainer_unknown_833.json', - 'trainer_unknown_834.json', - 'trainer_galactic_grunt_iron_island_1.json', - 'trainer_galactic_grunt_iron_island_2.json', - 'trainer_rival_survival_area_1_piplup.json', - 'trainer_rival_survival_area_1_turtwig.json', - 'trainer_rival_survival_area_1_chimchar.json', - 'trainer_unknown_840.json', - 'trainer_unknown_841.json', - 'trainer_unknown_842.json', - 'trainer_galactic_grunt_valley_windworks_1.json', - 'trainer_worker_dillan.json', - 'trainer_worker_holden.json', - 'trainer_worker_conrad.json', - 'trainer_galactic_grunt_valor_lakefront.json', - 'trainer_galactic_grunt_veilstone_city_1.json', - 'trainer_galactic_grunt_veilstone_city_2.json', - 'trainer_rival_route_201_piplup.json', - 'trainer_rival_route_201_turtwig.json', - 'trainer_rival_route_201_chimchar.json', - 'trainer_leader_candice_rematch.json', - 'trainer_leader_maylene_rematch.json', - 'trainer_leader_volkner_rematch.json', - 'trainer_leader_byron_rematch.json', - 'trainer_leader_gardenia_rematch.json', - 'trainer_leader_roark_rematch.json', - 'trainer_leader_wake_rematch.json', - 'trainer_leader_fantina_rematch.json', - 'trainer_riley_battleground.json', - 'trainer_buck_battleground.json', - 'trainer_marley_battleground.json', - 'trainer_mira_battleground.json', - 'trainer_cheryl_battleground.json', - 'trainer_elite_four_aaron_rematch.json', - 'trainer_elite_four_bertha_rematch.json', - 'trainer_elite_four_flint_rematch.json', - 'trainer_elite_four_lucian_rematch.json', - 'trainer_champion_cynthia_rematch.json', - 'trainer_rival_survival_area_2_piplup.json', - 'trainer_rival_survival_area_2_turtwig.json', - 'trainer_rival_survival_area_2_chimchar.json', - 'trainer_cameraman_tevin.json', - 'trainer_cameraman_tevin_rematch_1.json', - 'trainer_cameraman_tevin_rematch_2.json', - 'trainer_guitarist_arturo.json', - 'trainer_guitarist_arturo_rematch_1.json', - 'trainer_guitarist_arturo_rematch_2.json', - 'trainer_idol_grace.json', - 'trainer_idol_grace_rematch_1.json', - 'trainer_idol_grace_rematch_2.json', - 'trainer_interviewers_roxy_and_oli.json', - 'trainer_interviewers_roxy_and_oli_rematch_1.json', - 'trainer_interviewers_roxy_and_oli_rematch_2.json', - 'trainer_clown_lee.json', - 'trainer_clown_lee_rematch_1.json', - 'trainer_clown_lee_rematch_2.json', - 'trainer_poke_kid_ariel.json', - 'trainer_poke_kid_ariel_rematch_1.json', - 'trainer_poke_kid_ariel_rematch_2.json', - 'trainer_rich_boy_liam.json', - 'trainer_lady_celeste.json', - 'trainer_reporters_kinsey.json', - 'trainer_reporters_kinsey_rematch_1.json', - 'trainer_reporters_kinsey_rematch_2.json', - 'trainer_maid_belinda.json', - 'trainer_maid_sophie.json', - 'trainer_maid_emily.json', - 'trainer_maid_elena.json', - 'trainer_maid_clare.json', - 'trainer_unknown_902.json', - 'trainer_unknown_903.json', - 'trainer_unknown_904.json', - 'trainer_unknown_905.json', - 'trainer_cameraman_tevin_rematch_3.json', - 'trainer_guitarist_arturo_rematch_3.json', - 'trainer_idol_grace_rematch_3.json', - 'trainer_interviewers_roxy_and_oli_rematch_3.json', - 'trainer_clown_lee_rematch_3.json', - 'trainer_poke_kid_ariel_rematch_3.json', - 'trainer_reporters_kinsey_rematch_3.json', - 'trainer_galactic_boss_cyrus_celestic_town_ruins.json', - 'trainer_cameraman_tevin_rematch_4.json', - 'trainer_guitarist_arturo_rematch_4.json', - 'trainer_idol_grace_rematch_4.json', - 'trainer_interviewers_roxy_and_oli_rematch_4.json', - 'trainer_clown_lee_rematch_4.json', - 'trainer_poke_kid_ariel_rematch_4.json', - 'trainer_reporters_kinsey_rematch_4.json', - 'trainer_leader_volkner_fight_area.json', - 'trainer_elite_four_flint_fight_area.json', - 'trainer_rival_fight_area_piplup.json', - 'trainer_rival_fight_area_turtwig.json', - 'trainer_rival_fight_area_chimchar.json', - 'trainer_commander_mars_stark_mountain.json', - 'trainer_commander_jupiter_stark_mountain.json', -] +trainer_data_dir = meson.current_source_dir() / 'data' -trainer_data_gen = generator( - trainer_data_py, - arguments: [ '@INPUT@', '@OUTPUT@', ], - output: '@BASENAME@', - depends: [ py_consts_generators ], -) - -trainer_party_gen = generator( - trainer_party_py, - arguments: [ '@INPUT@', '@OUTPUT@', ], - output: '@BASENAME@', - depends: [ py_consts_generators ], -) +trainer_consts = fs.read(trainers_txt).splitlines() +trainer_stems = [] +trainer_data_files = [] +foreach trainer : trainer_consts + # `substring` here strips the `TRAINER_` prefix + trainer_stem = trainer.substring(8).to_lower() + trainer_stems += trainer_stem + trainer_data_files += files(trainer_data_dir / (trainer_stem + '.json')) +endforeach -trainers_order = files('trainers.order') +trainer_env = environment() +trainer_env.append('TRAINERS', trainer_stems, separator: ';') -trdata_narc = custom_target('trdata.narc', - output: 'trdata.narc', - input: trainer_data_gen.process(trainer_data_files, env: json2bin_env), - depends: [ py_consts_generators ], - command: [ - narc_exe, - 'create', - '--order', trainers_order, - '--output', '@OUTPUT0@', - '@PRIVATE_DIR@', +datagen_trainer_out = custom_target('datagen_trainer_out', + output: [ + 'trdata.narc', + 'trpoke.narc', ], -) - -# Do not generate an NAIX for `trpoke.narc`; it would go wholly unused -trpoke_narc = custom_target('trpoke.narc', - output: 'trpoke.narc', - input: trainer_party_gen.process(trainer_data_files, env: json2bin_env), - depends: [ py_consts_generators ], command: [ - narc_exe, 'create', - '--order', trainers_order, - '--output', '@OUTPUT@', - '@PRIVATE_DIR@', - ] + datagen_trainer_exe, + meson.current_build_dir(), + trainer_data_dir, + ], + env: trainer_env, + depend_files: [ + trainer_data_files, + ], ) -nitrofs_files += trdata_narc -nitrofs_files += trpoke_narc +nitrofs_files += datagen_trainer_out diff --git a/src/trainer_data.c b/src/trainer_data.c index 60542ce83b..baf0973f96 100644 --- a/src/trainer_data.c +++ b/src/trainer_data.c @@ -201,7 +201,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) TrainerMonBase *trmon = (TrainerMonBase *)buf; for (i = 0; i < dto->trainer[battler].header.partySize; i++) { u16 species = trmon[i].species & 0x3FF; - u8 form = (trmon[i].species & 0xFC00) >> 10; + u8 form = (trmon[i].species & 0xFC00) >> TRAINER_MON_FORM_SHIFT; rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); @@ -226,7 +226,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) TrainerMonWithMoves *trmon = (TrainerMonWithMoves *)buf; for (i = 0; i < dto->trainer[battler].header.partySize; i++) { u16 species = trmon[i].species & 0x3FF; - u8 form = (trmon[i].species & 0xFC00) >> 10; + u8 form = (trmon[i].species & 0xFC00) >> TRAINER_MON_FORM_SHIFT; rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); @@ -256,7 +256,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) TrainerMonWithItem *trmon = (TrainerMonWithItem *)buf; for (i = 0; i < dto->trainer[battler].header.partySize; i++) { u16 species = trmon[i].species & 0x3FF; - u8 form = (trmon[i].species & 0xFC00) >> 10; + u8 form = (trmon[i].species & 0xFC00) >> TRAINER_MON_FORM_SHIFT; rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); @@ -282,7 +282,7 @@ static void TrainerData_BuildParty(FieldBattleDTO *dto, int battler, int heapID) TrainerMonWithMovesAndItem *trmon = (TrainerMonWithMovesAndItem *)buf; for (i = 0; i < dto->trainer[battler].header.partySize; i++) { u16 species = trmon[i].species & 0x3FF; - u8 form = (trmon[i].species & 0xFC00) >> 10; + u8 form = (trmon[i].species & 0xFC00) >> TRAINER_MON_FORM_SHIFT; rnd = trmon[i].dv + trmon[i].level + species + dto->trainerIDs[battler]; LCRNG_SetSeed(rnd); diff --git a/tools/datagen/datagen_trainer.cpp b/tools/datagen/datagen_trainer.cpp new file mode 100644 index 0000000000..7aaa1b0463 --- /dev/null +++ b/tools/datagen/datagen_trainer.cpp @@ -0,0 +1,233 @@ +/* + * datagen-trainer + * + * Usage: datagen-species + * + * This program is responsible for generating data archives from trainer data + * files (res/trainers/data/*.json). The file-names to be polled for data are + * drawn from an environment var TRAINERS, which should be a semicolon-delimited + * list of file-stems. + * + * The following files are generated by this program: + * - trdata.narc + * - trpoke.narc + */ +#include +#include +#include +#include + +#include "datagen.h" + +#define POKEPLATINUM_GENERATED_LOOKUP +#define POKEPLATINUM_GENERATED_LOOKUP_IMPL + +// C++ does not like the math expressions used in this enum, +// so use the preprocessor version instead. +#include "generated/ai_flags.h" + +#define POKEPLATINUM_GENERATED_ENUM + +#include "constants/battle.h" +#include "generated/items.h" +#include "generated/moves.h" +#include "generated/species.h" +#include "generated/trainer_classes.h" + +#include "struct_defs/trainer_data.h" + +static void PackImmediately(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp); +static void ParseMovesAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp); +static void ParseItemAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp); +static void ParseMovesAndItemAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp); + +typedef std::function TrainerMonSubparser; + +struct TrainerDataTypeTable { + TrainerMonSubparser subparser; + std::size_t monSize; +}; + +static TrainerDataTypeTable sTrainerDataTypeTable[] = { + { PackImmediately, sizeof(TrainerMonBase) }, + { ParseMovesAndPack, sizeof(TrainerMonWithMoves) }, + { ParseItemAndPack, sizeof(TrainerMonWithItem) }, + { ParseMovesAndItemAndPack, sizeof(TrainerMonWithMovesAndItem) }, +}; + +static void Usage(std::ostream &ostr) +{ + ostr << "Usage: datagen-species OUT_DIR ROOT_DIR" << std::endl; + ostr << std::endl; + ostr << "Generates data archives from trainer data files (res/trainers/data/*.json)" << std::endl; + ostr << "Trainer data files to be polled for packing are drawn from the environment var\n" + << "TRAINERS, which must be a semicolon-delimited list of file-stems to be polled\n" + << "at execution." << std::endl; +} + +static inline bool AnyMemberHasValue(const rapidjson::Value &party, const char *key) +{ + for (const auto &member : party.GetArray()) { + if (!member[key].IsNull()) { + return true; + } + } + + return false; +} + +static TrainerHeader ParseTrainerData(const rapidjson::Document &doc) +{ + TrainerHeader trdata = {}; + + trdata.trainerType = LookupConst(doc["class"].GetString(), TrainerClass); + trdata.battleType = doc["double_battle"].GetBool() ? BATTLE_TYPE_DOUBLES : 0; + + int i = 0; + for (const auto &itemVal : doc["items"].GetArray()) { + trdata.items[i++] = LookupConst(itemVal.GetString(), Item); + } + + for (const auto &aiFlagsVal : doc["ai_flags"].GetArray()) { + trdata.aiMask |= LookupConst(aiFlagsVal.GetString(), AIFlag); + } + + const rapidjson::Value &party = doc["party"]; + trdata.partySize = party.GetArray().Size(); + + bool partyItems = AnyMemberHasValue(party, "item"); + bool partyMoves = AnyMemberHasValue(party, "moves"); + if (partyItems) { + if (partyMoves) { + trdata.monDataType = TRDATATYPE_WITH_MOVES_AND_ITEM; + } else { + trdata.monDataType = TRDATATYPE_WITH_ITEM; + } + } else if (partyMoves) { + trdata.monDataType = TRDATATYPE_WITH_MOVES; + } else { + trdata.monDataType = TRDATATYPE_BASE; + } + + return trdata; +} + +static void PackImmediately(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp) +{ + memcpy(bufp, &base, sizeof(base)); +} + +static void ParseMovesAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp) +{ + TrainerMonWithMoves withMoves = {}; + withMoves.dv = base.dv; + withMoves.level = base.level; + withMoves.species = base.species; + withMoves.cbSeal = base.cbSeal; + + int i = 0; + for (const auto &move : member["moves"].GetArray()) { + withMoves.moves[i++] = LookupConst(move.GetString(), Move); + } + + memcpy(bufp, &withMoves, sizeof(withMoves)); +} + +static void ParseItemAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp) +{ + TrainerMonWithItem withItem = {}; + withItem.dv = base.dv; + withItem.level = base.level; + withItem.species = base.species; + withItem.cbSeal = base.cbSeal; + + withItem.item = LookupConst(member["item"].GetString(), Item); + + memcpy(bufp, &withItem, sizeof(withItem)); +} + +static void ParseMovesAndItemAndPack(const rapidjson::Value &member, TrainerMonBase &base, unsigned char *bufp) +{ + TrainerMonWithMovesAndItem withMovesAndItem = {}; + withMovesAndItem.dv = base.dv; + withMovesAndItem.level = base.level; + withMovesAndItem.species = base.species; + withMovesAndItem.cbSeal = base.cbSeal; + + int i = 0; + for (const auto &move : member["moves"].GetArray()) { + withMovesAndItem.moves[i++] = LookupConst(move.GetString(), Move); + } + + withMovesAndItem.item = LookupConst(member["item"].GetString(), Item); + + memcpy(bufp, &withMovesAndItem, sizeof(withMovesAndItem)); +} + +static void ParseAndPackParty(const rapidjson::Document &doc, TrainerDataType monDataType, std::size_t partySize, vfs_pack_ctx *trpokeVFS) +{ + if (partySize == 0) { + unsigned char *buf = (unsigned char *)calloc(8, 1); + narc_pack_file(trpokeVFS, buf, 8); + return; + } + + TrainerMonSubparser subparser = sTrainerDataTypeTable[monDataType].subparser; + std::size_t monSize = sTrainerDataTypeTable[monDataType].monSize; + std::size_t bufSize = monSize * partySize; + bufSize = bufSize + (-bufSize & 3); // align to 4-byte boundary + + unsigned char *partyBuf = (unsigned char *)calloc(bufSize, 1); + unsigned char *partyBufp = partyBuf; + + for (const auto &member : doc["party"].GetArray()) { + TrainerMonBase base = {}; + base.dv = member["power"].GetUint(); + base.level = member["level"].GetUint(); + base.species = LookupConst(member["species"].GetString(), Species); + base.species |= (member["form"].GetUint() << TRAINER_MON_FORM_SHIFT); + base.cbSeal = member["ball_seal"].GetUint(); + + subparser(member, base, partyBufp); + partyBufp += monSize; + } + + narc_pack_file(trpokeVFS, partyBuf, bufSize); +} + +int main(int argc, char **argv) +{ + if (argc == 1) { + Usage(std::cout); + return EXIT_SUCCESS; + } + + fs::path outputRoot = argv[1]; + fs::path dataRoot = argv[2]; + + std::vector trainerRegistry = ReadRegistryEnvVar("TRAINERS"); + + vfs_pack_ctx *trdataVFS = narc_pack_start(); + vfs_pack_ctx *trpokeVFS = narc_pack_start(); + + rapidjson::Document doc; + for (auto &trainerStem : trainerRegistry) { + try { + fs::path trainerDataPath = dataRoot / (trainerStem + ".json"); + std::string json = ReadWholeFile(trainerDataPath); + doc.Parse(json.c_str(), json.length()); + + TrainerHeader trdata = ParseTrainerData(doc); + narc_pack_file_copy(trdataVFS, reinterpret_cast(&trdata), sizeof(trdata)); + ParseAndPackParty(doc, static_cast(trdata.monDataType), trdata.partySize, trpokeVFS); + } catch (std::exception &e) { + std::cerr << "exception parsing data file for " + trainerStem << std::endl; + std::cerr << e.what() << std::endl; + std::exit(EXIT_FAILURE); + } + } + + PackNarc(trdataVFS, outputRoot / "trdata.narc"); + PackNarc(trpokeVFS, outputRoot / "trpoke.narc"); + return EXIT_SUCCESS; +} diff --git a/tools/datagen/meson.build b/tools/datagen/meson.build index d9f62e08e0..d5e1dd1fac 100644 --- a/tools/datagen/meson.build +++ b/tools/datagen/meson.build @@ -16,6 +16,7 @@ libnarc_dep = dependency('libnarc') datagen_cpp_args = [ '-std=c++17', '-Wno-deprecated-declarations', # rapidjson 1.1.0 makes use of std::iterator + '-Wno-shift-count-overflow', # datagen-trainer references AI flags, which warn of a shift-count overflow on an unused field '-O3', ] @@ -37,3 +38,22 @@ datagen_species_exe = executable( ], native: true, ) + +datagen_trainer_exe = executable( + 'datagen-trainer', + sources: [ + files('datagen_trainer.cpp'), + c_consts_generators, + ], + cpp_args: datagen_cpp_args, + implicit_include_directories: true, + include_directories: [ + public_includes, + toplevel_includes, + ], + dependencies: [ + libnarc_dep, + rapidjson_dep, + ], + native: true, +) diff --git a/tools/json2bin/meson.build b/tools/json2bin/meson.build index 31cb186424..5859573297 100644 --- a/tools/json2bin/meson.build +++ b/tools/json2bin/meson.build @@ -7,8 +7,6 @@ movedata_py = find_program('movedata.py', native: true) # New single-file-parser scripts encounter_py = find_program('encounter.py', native: true) event_py = find_program('event.py', native: true) -trainer_data_py = find_program('trainer_data.py', native: true) -trainer_party_py = find_program('trainer_party.py', native: true) encdata_ex_elusive_rod_py = find_program('encdata_ex_elusive_rod.py', native: true) encdata_ex_honey_trees_py = find_program('encdata_ex_honey_trees.py', native: true) encdata_ex_trophy_garden_py = find_program('encdata_ex_trophy_garden.py', native: true) diff --git a/tools/json2bin/trainer_data.py b/tools/json2bin/trainer_data.py deleted file mode 100644 index 5c05d644a1..0000000000 --- a/tools/json2bin/trainer_data.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python3 -import functools -import json -import pathlib -import sys - -from generated import items -from convert import ( - TrainerDataFlags, - derive_data_flags, - from_trainer_class, - pad, - u8, - u16, - u32, - from_item, - from_trainer_ai_flag, -) - - -def parse_trainer_items(item_list: list[str]) -> bytes: - item_list += [items.Item.ITEM_NONE.name] * (4 - len(item_list)) - return b"".join([u16(from_item(item_str)) for item_str in item_list]) - - -def pack_data_flags(flags: TrainerDataFlags) -> bytes: - return u8(int(flags.has_moves) | (int(flags.has_items) << 1)) - - -def parse_ai_flags(flags: list[str]) -> bytes: - return u32( - functools.reduce( - lambda x, y: x | y, - [from_trainer_ai_flag(s) for s in flags], - 0, - ) - ) - - -input_path = pathlib.Path(sys.argv[1]) -output_path = pathlib.Path(sys.argv[2]) - -data = {} -with open(input_path, "r", encoding="utf-8") as input_file: - data = json.load(input_file) - -packed = b"".join( - [ - pack_data_flags(derive_data_flags(data["party"])), - u8(from_trainer_class(data["class"])), - pad(1), - u8(len(data["party"])), - parse_trainer_items(data["items"]), - parse_ai_flags(data["ai_flags"]), - u8(2 if data["double_battle"] else 0), - pad(3), - ] -) - -with open(output_path, "wb") as output_file: - output_file.write(packed) diff --git a/tools/json2bin/trainer_party.py b/tools/json2bin/trainer_party.py deleted file mode 100644 index 325c16caab..0000000000 --- a/tools/json2bin/trainer_party.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env python3 -import json -import pathlib -import sys - -from generated import moves -from convert import derive_data_flags, pad, u16, u32, from_item, from_move, from_species - - -def parse_poke_moves(move_list: list[str]) -> bytes: - move_list += [moves.Move.MOVE_NONE.name] * (4 - len(move_list)) - return b"".join([u16(from_move(move_str)) for move_str in move_list]) - - -def parse_party_mon(mon: dict, has_moves: bool, has_items: bool) -> bytes: - return b"".join( - [ - u16(mon["power"]), - u16(mon["level"]), - u16((from_species(mon["species"]) & 0x3FF) | (mon["form"] << 10)), - u16(from_item(mon["item"])) if has_items else b"", - *[parse_poke_moves(mon["moves"]) if has_moves else b""], - u16(mon["ball_seal"]), - ] - ) - - -input_path = pathlib.Path(sys.argv[1]) -output_path = pathlib.Path(sys.argv[2]) - -data = {} -with open(input_path, "r", encoding="utf-8") as input_file: - data = json.load(input_file) - -party = data["party"] -if len(party) == 0: - packed = pad(8) -else: - data_flags = derive_data_flags(party) - packed = bytearray( - b"".join( - [ - parse_party_mon(mon, data_flags.has_moves, data_flags.has_items) - for mon in party - ] - ) - ) - - # word-align - if len(packed) % 4 > 0: - packed.extend(pad(4 - (len(packed) % 4))) - packed = bytes(packed) - -with open(output_path, "wb") as output_file: - output_file.write(packed)