5 files changed, 7 insertions, 5 deletions
diff --git a/files/data/.gitignore b/files/data/.gitignore
index e405595a..af81751d 100644
--- a/files/data/.gitignore
+++ b/files/data/.gitignore
@@ -1,2 +1,4 @@
 cell0.NCGR
 cell0.NCLR
+dp_areawindow.NCGR
+dp_areawindow.NCLR
diff --git a/files/data/dp_areawindow.NCGR b/files/data/dp_areawindow.NCGR
deleted file mode 100644
index 40e1b885..00000000
--- a/files/data/dp_areawindow.NCGR
+++ /dev/null
diff --git a/files/data/dp_areawindow.NCLR b/files/data/dp_areawindow.NCLR
deleted file mode 100644
index cb93762b..00000000
--- a/files/data/dp_areawindow.NCLR
+++ /dev/null
diff --git a/files/data/dp_areawindow.png b/files/data/dp_areawindow.png
new file mode 100644
index 00000000..a4514abd
--- /dev/null
+++ b/files/data/dp_areawindow.png
diff --git a/files/poketool/trainer/trdata.json b/files/poketool/trainer/trdata.json
index 336f8469..24fa3a6d 100644
--- a/files/poketool/trainer/trdata.json
+++ b/files/poketool/trainer/trdata.json
@@ -15351,7 +15351,7 @@
     {
       "index": 608,
       "type": "TRTYPE_MON_MOVES",
-      "class": "TRAINER_CLASS_PKMN_TRAINER_AROMA_LADY",
+      "class": "TRAINER_CLASS_PKMN_TRAINER_CHERYL",
       "name": "Cheryl",
       "unk2": 0,
       "items": [],
@@ -15373,7 +15373,7 @@
     {
       "index": 609,
       "type": "TRTYPE_MON_MOVES",
-      "class": "TRAINER_CLASS_PKMN_TRAINER_RICH_BOY",
+      "class": "TRAINER_CLASS_PKMN_TRAINER_RILEY",
       "name": "Riley",
       "unk2": 0,
       "items": [],
@@ -15396,7 +15396,7 @@
     {
       "index": 610,
       "type": "TRTYPE_MON_MOVES",
-      "class": "TRAINER_CLASS_PKMN_TRAINER_PICNICKER",
+      "class": "TRAINER_CLASS_PKMN_TRAINER_MARLEY",
       "name": "Marley",
       "unk2": 0,
       "items": [],
@@ -15419,7 +15419,7 @@
     {
       "index": 611,
       "type": "TRTYPE_MON_MOVES",
-      "class": "TRAINER_CLASS_PKMN_TRAINER_CAMPER",
+      "class": "TRAINER_CLASS_PKMN_TRAINER_BUCK",
       "name": "Buck",
       "unk2": 0,
       "items": [],
@@ -15442,7 +15442,7 @@
     {
       "index": 612,
       "type": "TRTYPE_MON_MOVES",
-      "class": "TRAINER_CLASS_PKMN_TRAINER_POKEKID",
+      "class": "TRAINER_CLASS_PKMN_TRAINER_MIRA",
       "name": "Mira",
       "unk2": 0,
       "items": [],