From f6a2e70835d549685d6a6ebf6b861c7582234878 Mon Sep 17 00:00:00 2001
From: PikalaxALT <pikalaxalt@gmail.com>
Date: Wed, 2 Sep 2020 10:33:08 -0400
Subject: Move trainer names to trdata.json

---
 files/msgdata/msg/.gitignore           |    1 +
 files/msgdata/msg/narc_0559.txt        |  850 -----------
 files/poketool/trainer/trdata.json     | 2547 +++++++++++++++++++++-----------
 files/poketool/trainer/trdata.json.txt |    1 +
 files/poketool/trainer/trpoke.json.txt |   16 +-
 5 files changed, 1708 insertions(+), 1707 deletions(-)
 delete mode 100644 files/msgdata/msg/narc_0559.txt

(limited to 'files')

diff --git a/files/msgdata/msg/.gitignore b/files/msgdata/msg/.gitignore
index a8a0dcec..74ed169b 100644
--- a/files/msgdata/msg/.gitignore
+++ b/files/msgdata/msg/.gitignore
@@ -1 +1,2 @@
 *.bin
+narc_0559.txt
diff --git a/files/msgdata/msg/narc_0559.txt b/files/msgdata/msg/narc_0559.txt
deleted file mode 100644
index aaa781cf..00000000
--- a/files/msgdata/msg/narc_0559.txt
+++ /dev/null
@@ -1,850 +0,0 @@
-{TRNAME} -
-{TRNAME}Tristan
-{TRNAME}Logan
-{TRNAME}Natalie
-{TRNAME}Michael
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Tyler
-{TRNAME}Samantha
-{TRNAME}Sarah
-{TRNAME}Brandon
-{TRNAME}Taylor
-{TRNAME}Liv & Liz
-{TRNAME}Jacob
-{TRNAME}Siena
-{TRNAME}Daniel
-{TRNAME}Nicholas
-{TRNAME}Kelsey
-{TRNAME}Elizabeth
-{TRNAME}Andrew
-{TRNAME}Joseph
-{TRNAME}Zachary
-{TRNAME}Axel
-{TRNAME}James
-{TRNAME}John
-{TRNAME}Ryan
-{TRNAME}Megan
-{TRNAME}Nicole
-{TRNAME}Kayla
-{TRNAME}Rachel
-{TRNAME}Austin
-{TRNAME}Anthony
-{TRNAME}Lauren
-{TRNAME}Kevin
-{TRNAME}Justin
-{TRNAME}Helen
-{TRNAME}Robert
-{TRNAME}Alexander
-{TRNAME}Jonathan
-{TRNAME}Kyle
-{TRNAME}Cody
-{TRNAME}Hannah
-{TRNAME}William
-{TRNAME}Albert
-{TRNAME}Jennifer
-{TRNAME}Shelley
-{TRNAME}Richard
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Danielle
-{TRNAME}Mickey
-{TRNAME}Ty & Sue
-{TRNAME}Kahlil
-{TRNAME}Amber
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Teri & Tia
-{TRNAME}Ernest
-{TRNAME}Alyssa
-{TRNAME}Brian
-{TRNAME}Adam
-{TRNAME}Joel
-{TRNAME}Nathan
-{TRNAME}Davido
-{TRNAME}Patrick
-{TRNAME}Brianna
-{TRNAME}Zac & Jen
-{TRNAME}Alexandra
-{TRNAME}Angelica
-{TRNAME}Zach
-{TRNAME}Sean
-{TRNAME}Nick
-{TRNAME}Katherine
-{TRNAME}Jason
-{TRNAME}Melissa
-{TRNAME}Jeremy
-{TRNAME}Reina
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Bobby
-{TRNAME}Alex
-{TRNAME}Dylan
-{TRNAME}Juan
-{TRNAME}Cameron
-{TRNAME}Travis
-{TRNAME}Taylor
-{TRNAME}Jeffrey
-{TRNAME}Allison
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Stefano
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Caleb
-{TRNAME}Sheltin
-{TRNAME}Evan
-{TRNAME}Haley
-{TRNAME}Mary
-{TRNAME}Jared
-{TRNAME}Chelsea
-{TRNAME}Angelica
-{TRNAME}Paul
-{TRNAME}Kenneth
-{TRNAME}Tara & Tim
-{TRNAME}Bryan
-{TRNAME}Hunter
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Mitchell
-{TRNAME}Abigail
-{TRNAME}Carlos
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Gregory
-{TRNAME}Derek
-{TRNAME}Nathaniel
-{TRNAME}Scott
-{TRNAME}Angelica
-{TRNAME}Blake
-{TRNAME}Garrett
-{TRNAME}Laura
-{TRNAME}Maria
-{TRNAME}Bradley
-{TRNAME}Edward
-{TRNAME}Kaitlyn
-{TRNAME}Andrea
-{TRNAME}Dalton
-{TRNAME}Olivia
-{TRNAME}Shawn
-{TRNAME}Bjorn
-{TRNAME}Lexie
-{TRNAME}Madison
-{TRNAME}Antonio
-{TRNAME}Ethan
-{TRNAME}Luke
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Miguel
-{TRNAME}Luc
-{TRNAME}Tara & Tim
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Adrian
-{TRNAME}Erik
-{TRNAME}Vincent
-{TRNAME}Jessica
-{TRNAME}Erica
-{TRNAME}Katelyn
-{TRNAME}Tara & Tim
-{TRNAME}Dillon
-{TRNAME}Vanessa
-{TRNAME}Cory
-{TRNAME}Mickey
-{TRNAME}Jake
-{TRNAME}Shannon
-{TRNAME}Brett
-{TRNAME}Alec
-{TRNAME}George
-{TRNAME}Cole
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Luther
-{TRNAME}Mickey
-{TRNAME}Tara & Tim
-{TRNAME}Wesley
-{TRNAME}Ricardo
-{TRNAME}Francisco
-{TRNAME}Colton
-{TRNAME}Troy
-{TRNAME}Oscar
-{TRNAME}Miranda
-{TRNAME}Aubree
-{TRNAME}Paige
-{TRNAME}Crystal
-{TRNAME}Cassandra
-{TRNAME}Gabrielle
-{TRNAME}Colin
-{TRNAME}Mason
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Jack
-{TRNAME}Phillip
-{TRNAME}Donald
-{TRNAME}Briana
-{TRNAME}Elijah
-{TRNAME}Lindsey
-{TRNAME}Tara & Tim
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Tara & Tim
-{TRNAME}Omar
-{TRNAME}Henry
-{TRNAME}Mariah
-{TRNAME}Sydney
-{TRNAME}Edgar
-{TRNAME}Clayton
-{TRNAME}Ondrej
-{TRNAME}Clinton
-{TRNAME}David
-{TRNAME}Hana
-{TRNAME}Bryce
-{TRNAME}Valencia
-{TRNAME}Jo & Pat
-{TRNAME}Al & Kay
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Grant
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Jonathon
-{TRNAME}Darius
-{TRNAME}Roark
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Byron
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Jackson
-{TRNAME}Gary
-{TRNAME}Philip
-{TRNAME}Jenna
-{TRNAME}Angela
-{TRNAME}Aaron
-{TRNAME}Bertha
-{TRNAME}Flint
-{TRNAME}Lucian
-{TRNAME}Curtis
-{TRNAME}Drew
-{TRNAME}Cynthia
-{TRNAME}Sergio
-{TRNAME}Isaiah
-{TRNAME}Savannah
-{TRNAME}Alicia
-{TRNAME}Douglas
-{TRNAME}Brady
-{TRNAME}Ivan
-{TRNAME}Fernando
-{TRNAME}Edwin
-{TRNAME}Hayden
-{TRNAME}Dennis
-{TRNAME}Cesar
-{TRNAME}Allen
-{TRNAME}Zachery
-{TRNAME}Ruben
-{TRNAME}Breanna
-{TRNAME}Catherine
-{TRNAME}Destiny
-{TRNAME}Jamie
-{TRNAME}Maya
-{TRNAME}Maxwell
-{TRNAME}Brittney
-{TRNAME}Ava & Matt
-{TRNAME}Mickey
-{TRNAME}Marco
-{TRNAME}Erick
-{TRNAME}Emma & Lil
-{TRNAME}Mars
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Tony
-{TRNAME}Jerry
-{TRNAME}Preston
-{TRNAME}Lonnie
-{TRNAME}Calvin
-{TRNAME}Larry
-{TRNAME}Wyatt
-{TRNAME}Craig
-{TRNAME}Raul
-{TRNAME}Colby
-{TRNAME}Darren
-{TRNAME}Rafael
-{TRNAME}Jeffery
-{TRNAME}Carl
-{TRNAME}Ricky
-{TRNAME}Gardenia
-{TRNAME}Wake
-{TRNAME}Maylene
-{TRNAME}Fantina
-{TRNAME}Candice
-{TRNAME}Volkner
-{TRNAME}Angelica
-{TRNAME}Madeline
-{TRNAME}Kaitlin
-{TRNAME}Caroline
-{TRNAME}Molly
-{TRNAME}Louis
-{TRNAME}Alexa
-{TRNAME}Sabrina
-{TRNAME}Diana
-{TRNAME}Cheyenne
-{TRNAME}Meghan
-{TRNAME}Danny
-{TRNAME}Thomas
-{TRNAME}Mickey
-{TRNAME}Trey
-{TRNAME}Angelica
-{TRNAME}Marc
-{TRNAME}Skyler
-{TRNAME}Damian
-{TRNAME}Chance
-{TRNAME}Forrest
-{TRNAME}Harrison
-{TRNAME}Mackenzie
-{TRNAME}Tiera
-{TRNAME}Christine
-{TRNAME}Cyndy
-{TRNAME}Angelica
-{TRNAME}Lindsay
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Dallas
-{TRNAME}Sebastian
-{TRNAME}Donny
-{TRNAME}Trenton
-{TRNAME}Conner
-{TRNAME}Mariel
-{TRNAME}Holly
-{TRNAME}Armando
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Kati
-{TRNAME}Gerardo
-{TRNAME}Roxy & Oli
-{TRNAME}Tevin
-{TRNAME}Kinsey
-{TRNAME}Grace
-{TRNAME}Tyler
-{TRNAME}Autumn
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Zackary
-{TRNAME}Lawrence
-{TRNAME}Diego
-{TRNAME}Parker
-{TRNAME}Dominique
-{TRNAME}Jamal
-{TRNAME}Terry
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Joe
-{TRNAME}Mickey
-{TRNAME}Jonah
-{TRNAME}Micah
-{TRNAME}Arthur
-{TRNAME}Angelica
-{TRNAME}Brenda
-{TRNAME}Brandi
-{TRNAME}Clarice
-{TRNAME}Kody
-{TRNAME}Landon
-{TRNAME}Deandre
-{TRNAME}Rachael
-{TRNAME}Desiree
-{TRNAME}Kendra
-{TRNAME}Walter
-{TRNAME}Mickey
-{TRNAME}Cyrus
-{TRNAME}Cyrus
-{TRNAME}Mars
-{TRNAME}Jupiter
-{TRNAME}Jupiter
-{TRNAME}Saturn
-{TRNAME}Saturn
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Arturo
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Harry
-{TRNAME}Gerald
-{TRNAME}Miles
-{TRNAME}Kendal
-{TRNAME}Eddie
-{TRNAME}Willie
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Cassidy
-{TRNAME}Theodore
-{TRNAME}Damon
-{TRNAME}Maurice
-{TRNAME}Reginald
-{TRNAME}Lorenzo
-{TRNAME}Karina
-{TRNAME}Summer
-{TRNAME}Tori
-{TRNAME}Ana
-{TRNAME}Lee
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Ariel
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Zachariah
-{TRNAME}Samson
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Shaun
-{TRNAME}Mickey
-{TRNAME}Fabian
-{TRNAME}Brennan
-{TRNAME}Bruce
-{TRNAME}Devon
-{TRNAME}Nicola
-{TRNAME}Mickey
-{TRNAME}Claire
-{TRNAME}Mickey
-{TRNAME}Wayne
-{TRNAME}Jacky
-{TRNAME}Caitlyn
-{TRNAME}Terrell
-{TRNAME}Brenden
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Willy
-{TRNAME}Braden
-{TRNAME}Brendon
-{TRNAME}Quentin
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Mars
-{TRNAME}Kirby
-{TRNAME}Leonard
-{TRNAME}Rebekah
-{TRNAME}Oliver
-{TRNAME}Beth & Bob
-{TRNAME}Mike & Nat
-{TRNAME}Alison
-{TRNAME}Ismael
-{TRNAME}Kaylee
-{TRNAME}Darryl
-{TRNAME}Eugene
-{TRNAME}Meredith
-{TRNAME}Kendrick
-{TRNAME}Leonardo
-{TRNAME}Rebecca
-{TRNAME}Blythe
-{TRNAME}Roman
-{TRNAME}Kylie
-{TRNAME}Valerie
-{TRNAME}Esteban
-{TRNAME}Emilio
-{TRNAME}Gabriella
-{TRNAME}Harley
-{TRNAME}Emanuel
-{TRNAME}Karl
-{TRNAME}Audrey
-{TRNAME}Geneva
-{TRNAME}Krystal
-{TRNAME}Geoffrey
-{TRNAME}Darien
-{TRNAME}Keegan
-{TRNAME}Stanley
-{TRNAME}Drake
-{TRNAME}Kenny
-{TRNAME}Rodolfo
-{TRNAME}Saul
-{TRNAME}Jose
-{TRNAME}Felix
-{TRNAME}Quinn
-{TRNAME}Graham
-{TRNAME}Keenan
-{TRNAME}Stefan
-{TRNAME}Skylar
-{TRNAME}Abel
-{TRNAME}Deanna
-{TRNAME}Ariana
-{TRNAME}Dana
-{TRNAME}Mikayla
-{TRNAME}Meagan
-{TRNAME}Sandra
-{TRNAME}Kassandra
-{TRNAME}Jasmin
-{TRNAME}Natasha
-{TRNAME}Monique
-{TRNAME}Corbin
-{TRNAME}Sterling
-{TRNAME}Daisy
-{TRNAME}Chelsey
-{TRNAME}Davon
-{TRNAME}Griffin
-{TRNAME}Ray
-{TRNAME}Jarrett
-{TRNAME}Kyler
-{TRNAME}Deshawn
-{TRNAME}Dwayne
-{TRNAME}Ashlee
-{TRNAME}Felicia
-{TRNAME}Krista
-{TRNAME}Glenn
-{TRNAME}Kurt
-{TRNAME}Sam
-{TRNAME}Wade
-{TRNAME}Joanna
-{TRNAME}Sophia
-{TRNAME}Mallory
-{TRNAME}Lydia
-{TRNAME}Mickey
-{TRNAME}Harlan
-{TRNAME}Cedric
-{TRNAME}Cheryl
-{TRNAME}Riley
-{TRNAME}Marley
-{TRNAME}Buck
-{TRNAME}Mira
-{TRNAME}Lucas
-{TRNAME}Lucas
-{TRNAME}Lucas
-{TRNAME}Dawn
-{TRNAME}Dawn
-{TRNAME}Dawn
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Lucas
-{TRNAME}Lucas
-{TRNAME}Lucas
-{TRNAME}Dawn
-{TRNAME}Dawn
-{TRNAME}Dawn
-{TRNAME}Elizabeth
-{TRNAME}Elizabeth
-{TRNAME}Elizabeth
-{TRNAME}Kevin
-{TRNAME}Kevin
-{TRNAME}Kevin
-{TRNAME}Helen
-{TRNAME}Helen
-{TRNAME}Helen
-{TRNAME}Brianna
-{TRNAME}Brianna
-{TRNAME}Audrey
-{TRNAME}Albert
-{TRNAME}Albert
-{TRNAME}Albert
-{TRNAME}Jennifer
-{TRNAME}Jennifer
-{TRNAME}Jennifer
-{TRNAME}Zackary
-{TRNAME}Zackary
-{TRNAME}Zackary
-{TRNAME}Dalton
-{TRNAME}Olivia
-{TRNAME}Ivan
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}John
-{TRNAME}John
-{TRNAME}John
-{TRNAME}Kayla
-{TRNAME}Kayla
-{TRNAME}Kayla
-{TRNAME}Patrick
-{TRNAME}Patrick
-{TRNAME}Hayden
-{TRNAME}Geoffrey
-{TRNAME}Jake
-{TRNAME}Dennis
-{TRNAME}Dennis
-{TRNAME}Rodolfo
-{TRNAME}Saul
-{TRNAME}Shannon
-{TRNAME}Maya
-{TRNAME}Maya
-{TRNAME}Deanna
-{TRNAME}Ariana
-{TRNAME}Mitchell
-{TRNAME}Mitchell
-{TRNAME}Maxwell
-{TRNAME}Corbin
-{TRNAME}Abigail
-{TRNAME}Abigail
-{TRNAME}Brittney
-{TRNAME}Daisy
-{TRNAME}Marco
-{TRNAME}Marco
-{TRNAME}Joseph
-{TRNAME}Joseph
-{TRNAME}Miguel
-{TRNAME}Alec
-{TRNAME}Teri & Tia
-{TRNAME}Teri & Tia
-{TRNAME}Carlos
-{TRNAME}Carlos
-{TRNAME}Jeremy
-{TRNAME}Jeremy
-{TRNAME}Jeremy
-{TRNAME}Tony
-{TRNAME}Harry
-{TRNAME}Harry
-{TRNAME}Craig
-{TRNAME}Craig
-{TRNAME}Philip
-{TRNAME}Davon
-{TRNAME}Reina
-{TRNAME}Reina
-{TRNAME}Samantha
-{TRNAME}Samantha
-{TRNAME}Samantha
-{TRNAME}Madeline
-{TRNAME}Madeline
-{TRNAME}Madeline
-{TRNAME}Theodore
-{TRNAME}Theodore
-{TRNAME}Theodore
-{TRNAME}Brandon
-{TRNAME}Brandon
-{TRNAME}Brandon
-{TRNAME}Alexa
-{TRNAME}Alexa
-{TRNAME}Alexa
-{TRNAME}Karina
-{TRNAME}Karina
-{TRNAME}Karina
-{TRNAME}Danielle
-{TRNAME}Danielle
-{TRNAME}Danielle
-{TRNAME}Danny
-{TRNAME}Danny
-{TRNAME}Danny
-{TRNAME}Trey
-{TRNAME}Trey
-{TRNAME}Melissa
-{TRNAME}Melissa
-{TRNAME}Melissa
-{TRNAME}Taylor
-{TRNAME}Taylor
-{TRNAME}Taylor
-{TRNAME}Kyler
-{TRNAME}Allison
-{TRNAME}Allison
-{TRNAME}Allison
-{TRNAME}Ashlee
-{TRNAME}Marc
-{TRNAME}Marc
-{TRNAME}Zachariah
-{TRNAME}Shaun
-{TRNAME}Shaun
-{TRNAME}Shaun
-{TRNAME}Zach
-{TRNAME}Zach
-{TRNAME}Zach
-{TRNAME}Cyndy
-{TRNAME}Cyndy
-{TRNAME}Edward
-{TRNAME}Edward
-{TRNAME}Bjorn
-{TRNAME}Bjorn
-{TRNAME}Andrea
-{TRNAME}Andrea
-{TRNAME}Madison
-{TRNAME}Madison
-{TRNAME}Wesley
-{TRNAME}Francisco
-{TRNAME}Glenn
-{TRNAME}Miranda
-{TRNAME}Crystal
-{TRNAME}Joanna
-{TRNAME}Tristan
-{TRNAME}Tristan
-{TRNAME}Tristan
-{TRNAME}Dallas
-{TRNAME}Dallas
-{TRNAME}Dallas
-{TRNAME}Jared
-{TRNAME}Jared
-{TRNAME}Chelsea
-{TRNAME}Brian
-{TRNAME}Chelsea
-{TRNAME}Brian
-{TRNAME}Armando
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Arturo
-{TRNAME}Arturo
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Tara & Tim
-{TRNAME}Tara & Tim
-{TRNAME}Tara & Tim
-{TRNAME}Tara & Tim
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Angelica
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Mickey
-{TRNAME}Roland
-{TRNAME}Carrie
-{TRNAME}Norman
-{TRNAME}Roland
-{TRNAME}Carrie
-{TRNAME}Norman
-{TRNAME}Roland
-{TRNAME}Carrie
-{TRNAME}Norman
-{TRNAME}Palmer
-{TRNAME}Anton
-{TRNAME}Brenna
-{TRNAME}Darrius
-{TRNAME}Fredrick
-{TRNAME}Travon
-{TRNAME}Janet
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Cedric
-{TRNAME}Grunt
-{TRNAME}Dillan
-{TRNAME}Holden
-{TRNAME}Conrad
-{TRNAME}Grunt
-{TRNAME}Grunt
-{TRNAME}Grunt
diff --git a/files/poketool/trainer/trdata.json b/files/poketool/trainer/trdata.json
index e666bb53..336f8469 100644
--- a/files/poketool/trainer/trdata.json
+++ b/files/poketool/trainer/trdata.json
@@ -2,8 +2,9 @@
   "trdata": [
     {
       "index": 1,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Tristan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18,8 +19,9 @@
     },
     {
       "index": 2,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Logan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -34,8 +36,9 @@
     },
     {
       "index": 3,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Natalie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -55,8 +58,9 @@
     },
     {
       "index": 4,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Michael",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -76,8 +80,9 @@
     },
     {
       "index": 5,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -92,8 +97,9 @@
     },
     {
       "index": 6,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -108,8 +114,9 @@
     },
     {
       "index": 7,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -124,8 +131,9 @@
     },
     {
       "index": 8,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -140,8 +148,9 @@
     },
     {
       "index": 9,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -156,8 +165,9 @@
     },
     {
       "index": 10,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Tyler",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -177,8 +187,9 @@
     },
     {
       "index": 11,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Samantha",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -193,8 +204,9 @@
     },
     {
       "index": 12,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Sarah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -209,8 +221,9 @@
     },
     {
       "index": 13,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BUG_CATCHER",
+      "name": "Brandon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -230,8 +243,9 @@
     },
     {
       "index": 14,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Taylor",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -251,8 +265,9 @@
     },
     {
       "index": 15,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TWINS",
+      "name": "Liv & Liz",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -272,8 +287,9 @@
     },
     {
       "index": 16,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Jacob",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -292,8 +308,9 @@
     },
     {
       "index": 17,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Siena",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -322,8 +339,9 @@
     },
     {
       "index": 18,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Daniel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -353,8 +371,9 @@
     },
     {
       "index": 19,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Nicholas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -369,8 +388,9 @@
     },
     {
       "index": 20,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BATTLE_GIRL",
+      "name": "Kelsey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -385,8 +405,9 @@
     },
     {
       "index": 21,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Elizabeth",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -401,8 +422,9 @@
     },
     {
       "index": 22,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Andrew",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -442,8 +464,9 @@
     },
     {
       "index": 23,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Joseph",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -458,8 +481,9 @@
     },
     {
       "index": 24,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Zachary",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -484,8 +508,9 @@
     },
     {
       "index": 25,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_M",
+      "name": "Axel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -500,8 +525,9 @@
     },
     {
       "index": 26,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_M",
+      "name": "James",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -516,8 +542,9 @@
     },
     {
       "index": 27,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_M",
+      "name": "John",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -537,8 +564,9 @@
     },
     {
       "index": 28,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_M",
+      "name": "Ryan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -553,8 +581,9 @@
     },
     {
       "index": 29,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_F",
+      "name": "Megan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -569,8 +598,9 @@
     },
     {
       "index": 30,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_F",
+      "name": "Nicole",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -590,8 +620,9 @@
     },
     {
       "index": 31,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_F",
+      "name": "Kayla",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -606,8 +637,9 @@
     },
     {
       "index": 32,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_F",
+      "name": "Rachel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -627,8 +659,9 @@
     },
     {
       "index": 33,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Austin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -653,8 +686,9 @@
     },
     {
       "index": 34,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Anthony",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -674,8 +708,9 @@
     },
     {
       "index": 35,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Lauren",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -695,8 +730,9 @@
     },
     {
       "index": 36,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Kevin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -726,8 +762,9 @@
     },
     {
       "index": 37,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Justin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -747,8 +784,9 @@
     },
     {
       "index": 38,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BATTLE_GIRL",
+      "name": "Helen",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -768,8 +806,9 @@
     },
     {
       "index": 39,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Robert",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -789,8 +828,9 @@
     },
     {
       "index": 40,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Alexander",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -815,8 +855,9 @@
     },
     {
       "index": 41,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Jonathan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -831,8 +872,9 @@
     },
     {
       "index": 42,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Kyle",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -847,8 +889,9 @@
     },
     {
       "index": 43,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Cody",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -868,8 +911,9 @@
     },
     {
       "index": 44,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Hannah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -889,8 +933,9 @@
     },
     {
       "index": 45,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ARTIST",
+      "name": "William",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -910,8 +955,9 @@
     },
     {
       "index": 46,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_M",
+      "name": "Albert",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -936,8 +982,9 @@
     },
     {
       "index": 47,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_F",
+      "name": "Jennifer",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -962,8 +1009,9 @@
     },
     {
       "index": 48,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COWGIRL",
+      "name": "Shelley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -998,8 +1046,9 @@
     },
     {
       "index": 49,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_JOGGER",
+      "name": "Richard",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1014,8 +1063,9 @@
     },
     {
       "index": 50,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1030,8 +1080,9 @@
     },
     {
       "index": 51,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1046,8 +1097,9 @@
     },
     {
       "index": 52,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1062,8 +1114,9 @@
     },
     {
       "index": 53,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Danielle",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1078,8 +1131,9 @@
     },
     {
       "index": 54,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1094,8 +1148,9 @@
     },
     {
       "index": 55,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNG_COUPLE",
+      "name": "Ty & Sue",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1115,8 +1170,9 @@
     },
     {
       "index": 56,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_M",
+      "name": "Kahlil",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1141,8 +1197,9 @@
     },
     {
       "index": 57,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_F",
+      "name": "Amber",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1167,8 +1224,9 @@
     },
     {
       "index": 58,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COWGIRL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1183,8 +1241,9 @@
     },
     {
       "index": 59,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_JOGGER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1199,8 +1258,9 @@
     },
     {
       "index": 60,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1215,8 +1275,9 @@
     },
     {
       "index": 61,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1231,8 +1292,9 @@
     },
     {
       "index": 62,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1247,8 +1309,9 @@
     },
     {
       "index": 63,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1263,8 +1326,9 @@
     },
     {
       "index": 64,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WAITRESS",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1279,8 +1343,9 @@
     },
     {
       "index": 65,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TWINS",
+      "name": "Teri & Tia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1300,8 +1365,9 @@
     },
     {
       "index": 66,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Ernest",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1342,8 +1408,9 @@
     },
     {
       "index": 67,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Alyssa",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1373,8 +1440,9 @@
     },
     {
       "index": 68,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Brian",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1416,8 +1484,9 @@
     },
     {
       "index": 69,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Adam",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1432,8 +1501,9 @@
     },
     {
       "index": 70,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Joel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1463,8 +1533,9 @@
     },
     {
       "index": 71,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Nathan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1484,8 +1555,9 @@
     },
     {
       "index": 72,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Davido",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1500,8 +1572,9 @@
     },
     {
       "index": 73,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Patrick",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1516,8 +1589,9 @@
     },
     {
       "index": 74,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Brianna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1537,8 +1611,9 @@
     },
     {
       "index": 75,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DOUBLE_TEAM",
+      "name": "Zac & Jen",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1558,8 +1633,9 @@
     },
     {
       "index": 76,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Alexandra",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1574,8 +1650,9 @@
     },
     {
       "index": 77,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BATTLE_GIRL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1590,8 +1667,9 @@
     },
     {
       "index": 78,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Zach",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1616,8 +1694,9 @@
     },
     {
       "index": 79,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Sean",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1642,8 +1721,9 @@
     },
     {
       "index": 80,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Nick",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1663,8 +1743,9 @@
     },
     {
       "index": 81,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Katherine",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1679,8 +1760,9 @@
     },
     {
       "index": 82,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RICH_BOY",
+      "name": "Jason",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -1697,8 +1779,9 @@
     },
     {
       "index": 83,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LADY",
+      "name": "Melissa",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -1715,8 +1798,9 @@
     },
     {
       "index": 84,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GENTLEMAN",
+      "name": "Jeremy",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -1733,8 +1817,9 @@
     },
     {
       "index": 85,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SOCIALITE",
+      "name": "Reina",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -1751,8 +1836,9 @@
     },
     {
       "index": 86,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1767,8 +1853,9 @@
     },
     {
       "index": 87,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1783,8 +1870,9 @@
     },
     {
       "index": 88,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Bobby",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1804,8 +1892,9 @@
     },
     {
       "index": 89,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Alex",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1825,8 +1914,9 @@
     },
     {
       "index": 90,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Dylan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1846,8 +1936,9 @@
     },
     {
       "index": 91,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Juan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1862,8 +1953,9 @@
     },
     {
       "index": 92,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Cameron",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1883,8 +1975,9 @@
     },
     {
       "index": 93,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Travis",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1914,8 +2007,9 @@
     },
     {
       "index": 94,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Taylor",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1935,8 +2029,9 @@
     },
     {
       "index": 95,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Jeffrey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1956,8 +2051,9 @@
     },
     {
       "index": 96,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Allison",
       "unk2": 0,
       "items": [],
       "unkC": 0,
@@ -1977,8 +2073,9 @@
     },
     {
       "index": 97,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -1993,8 +2090,9 @@
     },
     {
       "index": 98,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2009,8 +2107,9 @@
     },
     {
       "index": 99,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Stefano",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2031,8 +2130,9 @@
     },
     {
       "index": 100,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2047,8 +2147,9 @@
     },
     {
       "index": 101,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2063,8 +2164,9 @@
     },
     {
       "index": 102,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Caleb",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2084,8 +2186,9 @@
     },
     {
       "index": 103,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Sheltin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2110,8 +2213,9 @@
     },
     {
       "index": 104,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Evan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2131,8 +2235,9 @@
     },
     {
       "index": 105,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Haley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2152,8 +2257,9 @@
     },
     {
       "index": 106,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Mary",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2173,8 +2279,9 @@
     },
     {
       "index": 107,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TUBER_M",
+      "name": "Jared",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2199,8 +2306,9 @@
     },
     {
       "index": 108,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_TUBER_F",
+      "name": "Chelsea",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2221,8 +2329,9 @@
     },
     {
       "index": 109,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BATTLE_GIRL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2237,8 +2346,9 @@
     },
     {
       "index": 110,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Paul",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2258,8 +2368,9 @@
     },
     {
       "index": 111,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Kenneth",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2284,8 +2395,9 @@
     },
     {
       "index": 112,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SIS_AND_BRO",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2305,8 +2417,9 @@
     },
     {
       "index": 113,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Bryan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2331,8 +2444,9 @@
     },
     {
       "index": 114,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Hunter",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2347,8 +2461,9 @@
     },
     {
       "index": 115,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2363,8 +2478,9 @@
     },
     {
       "index": 116,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2379,8 +2495,9 @@
     },
     {
       "index": 117,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2395,8 +2512,9 @@
     },
     {
       "index": 118,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2411,8 +2529,9 @@
     },
     {
       "index": 119,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Mitchell",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2432,8 +2551,9 @@
     },
     {
       "index": 120,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Abigail",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2458,8 +2578,9 @@
     },
     {
       "index": 121,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PI",
+      "name": "Carlos",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2496,8 +2617,9 @@
     },
     {
       "index": 122,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2512,8 +2634,9 @@
     },
     {
       "index": 123,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PI",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2528,8 +2651,9 @@
     },
     {
       "index": 124,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2544,8 +2668,9 @@
     },
     {
       "index": 125,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2560,8 +2685,9 @@
     },
     {
       "index": 126,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2576,8 +2702,9 @@
     },
     {
       "index": 127,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Gregory",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2602,8 +2729,9 @@
     },
     {
       "index": 128,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Derek",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2618,8 +2746,9 @@
     },
     {
       "index": 129,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Nathaniel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2644,8 +2773,9 @@
     },
     {
       "index": 130,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_JOGGER",
+      "name": "Scott",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2660,8 +2790,9 @@
     },
     {
       "index": 131,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2676,8 +2807,9 @@
     },
     {
       "index": 132,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Blake",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2709,8 +2841,9 @@
     },
     {
       "index": 133,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Garrett",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2753,8 +2886,9 @@
     },
     {
       "index": 134,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Laura",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2775,8 +2909,9 @@
     },
     {
       "index": 135,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Maria",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2819,8 +2954,9 @@
     },
     {
       "index": 136,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Bradley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2845,8 +2981,9 @@
     },
     {
       "index": 137,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Edward",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2861,8 +2998,9 @@
     },
     {
       "index": 138,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Kaitlyn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2882,8 +3020,9 @@
     },
     {
       "index": 139,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Andrea",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2898,8 +3037,9 @@
     },
     {
       "index": 140,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Dalton",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2942,8 +3082,9 @@
     },
     {
       "index": 141,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Olivia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -2975,8 +3116,9 @@
     },
     {
       "index": 142,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Shawn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3006,8 +3148,9 @@
     },
     {
       "index": 143,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Bjorn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3027,8 +3170,9 @@
     },
     {
       "index": 144,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Lexie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3048,8 +3192,9 @@
     },
     {
       "index": 145,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Madison",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3064,8 +3209,9 @@
     },
     {
       "index": 146,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Antonio",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3095,8 +3241,9 @@
     },
     {
       "index": 147,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Ethan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3116,8 +3263,9 @@
     },
     {
       "index": 148,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Luke",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3142,8 +3290,9 @@
     },
     {
       "index": 149,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3158,8 +3307,9 @@
     },
     {
       "index": 150,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3174,8 +3324,9 @@
     },
     {
       "index": 151,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3190,8 +3341,9 @@
     },
     {
       "index": 152,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3206,8 +3358,9 @@
     },
     {
       "index": 153,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Miguel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3227,8 +3380,9 @@
     },
     {
       "index": 154,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Luc",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3263,8 +3417,9 @@
     },
     {
       "index": 155,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SIS_AND_BRO",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3284,8 +3439,9 @@
     },
     {
       "index": 156,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3300,8 +3456,9 @@
     },
     {
       "index": 157,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3316,8 +3473,9 @@
     },
     {
       "index": 158,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3332,8 +3490,9 @@
     },
     {
       "index": 159,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Adrian",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3358,8 +3517,9 @@
     },
     {
       "index": 160,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Erik",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3374,8 +3534,9 @@
     },
     {
       "index": 161,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Vincent",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3395,8 +3556,9 @@
     },
     {
       "index": 162,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Jessica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3426,8 +3588,9 @@
     },
     {
       "index": 163,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Erica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3447,8 +3610,9 @@
     },
     {
       "index": 164,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Katelyn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3491,8 +3655,9 @@
     },
     {
       "index": 165,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SIS_AND_BRO",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3512,8 +3677,9 @@
     },
     {
       "index": 166,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Dillon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3533,8 +3699,9 @@
     },
     {
       "index": 167,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Vanessa",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3549,8 +3716,9 @@
     },
     {
       "index": 168,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Cory",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3575,8 +3743,9 @@
     },
     {
       "index": 169,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3591,8 +3760,9 @@
     },
     {
       "index": 170,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Jake",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3623,8 +3793,9 @@
     },
     {
       "index": 171,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Shannon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3664,8 +3835,9 @@
     },
     {
       "index": 172,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Brett",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3690,8 +3862,9 @@
     },
     {
       "index": 173,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Alec",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3711,8 +3884,9 @@
     },
     {
       "index": 174,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "George",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3742,8 +3916,9 @@
     },
     {
       "index": 175,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Cole",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3768,8 +3943,9 @@
     },
     {
       "index": 176,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ROUGHNECK",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3784,8 +3960,9 @@
     },
     {
       "index": 177,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ROUGHNECK",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3800,8 +3977,9 @@
     },
     {
       "index": 178,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3816,8 +3994,9 @@
     },
     {
       "index": 179,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3832,8 +4011,9 @@
     },
     {
       "index": 180,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Luther",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3858,8 +4038,9 @@
     },
     {
       "index": 181,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ARTIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3874,8 +4055,9 @@
     },
     {
       "index": 182,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNG_COUPLE",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3895,8 +4077,9 @@
     },
     {
       "index": 183,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Wesley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3916,8 +4099,9 @@
     },
     {
       "index": 184,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Ricardo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3932,8 +4116,9 @@
     },
     {
       "index": 185,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Francisco",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3953,8 +4138,9 @@
     },
     {
       "index": 186,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Colton",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3979,8 +4165,9 @@
     },
     {
       "index": 187,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Troy",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -3995,8 +4182,9 @@
     },
     {
       "index": 188,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Oscar",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4021,8 +4209,9 @@
     },
     {
       "index": 189,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Miranda",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4037,8 +4226,9 @@
     },
     {
       "index": 190,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Aubree",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4058,8 +4248,9 @@
     },
     {
       "index": 191,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Paige",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4084,8 +4275,9 @@
     },
     {
       "index": 192,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Crystal",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4105,8 +4297,9 @@
     },
     {
       "index": 193,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Cassandra",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4126,8 +4319,9 @@
     },
     {
       "index": 194,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Gabrielle",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4142,8 +4336,9 @@
     },
     {
       "index": 195,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Colin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4173,8 +4368,9 @@
     },
     {
       "index": 196,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Mason",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4193,8 +4389,9 @@
     },
     {
       "index": 197,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4209,8 +4406,9 @@
     },
     {
       "index": 198,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4225,8 +4423,9 @@
     },
     {
       "index": 199,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4241,8 +4440,9 @@
     },
     {
       "index": 200,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4257,8 +4457,9 @@
     },
     {
       "index": 201,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BUG_CATCHER",
+      "name": "Jack",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4283,8 +4484,9 @@
     },
     {
       "index": 202,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BUG_CATCHER",
+      "name": "Phillip",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4309,8 +4511,9 @@
     },
     {
       "index": 203,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BUG_CATCHER",
+      "name": "Donald",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4330,8 +4533,9 @@
     },
     {
       "index": 204,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Briana",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4346,8 +4550,9 @@
     },
     {
       "index": 205,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Elijah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4365,8 +4570,9 @@
     },
     {
       "index": 206,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Lindsey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4384,8 +4590,9 @@
     },
     {
       "index": 207,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNG_COUPLE",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4405,8 +4612,9 @@
     },
     {
       "index": 208,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4421,8 +4629,9 @@
     },
     {
       "index": 209,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4437,8 +4646,9 @@
     },
     {
       "index": 210,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4453,8 +4663,9 @@
     },
     {
       "index": 211,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4469,8 +4680,9 @@
     },
     {
       "index": 212,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4485,8 +4697,9 @@
     },
     {
       "index": 213,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4501,8 +4714,9 @@
     },
     {
       "index": 214,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4517,8 +4731,9 @@
     },
     {
       "index": 215,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4533,8 +4748,9 @@
     },
     {
       "index": 216,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4549,8 +4765,9 @@
     },
     {
       "index": 217,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4565,8 +4782,9 @@
     },
     {
       "index": 218,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4581,8 +4799,9 @@
     },
     {
       "index": 219,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4597,8 +4816,9 @@
     },
     {
       "index": 220,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4613,8 +4833,9 @@
     },
     {
       "index": 221,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCHOOL_KID_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4629,8 +4850,9 @@
     },
     {
       "index": 222,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCHOOL_KID_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4645,8 +4867,9 @@
     },
     {
       "index": 223,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNG_COUPLE",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4666,8 +4889,9 @@
     },
     {
       "index": 224,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Omar",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4710,8 +4934,9 @@
     },
     {
       "index": 225,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Henry",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4732,8 +4957,9 @@
     },
     {
       "index": 226,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Mariah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4765,8 +4991,9 @@
     },
     {
       "index": 227,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Sydney",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4798,8 +5025,9 @@
     },
     {
       "index": 228,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Edgar",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4842,8 +5070,9 @@
     },
     {
       "index": 229,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Clayton",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4875,8 +5104,9 @@
     },
     {
       "index": 230,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Ondrej",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4891,8 +5121,9 @@
     },
     {
       "index": 231,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Clinton",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4917,8 +5148,9 @@
     },
     {
       "index": 232,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "David",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4950,8 +5182,9 @@
     },
     {
       "index": 233,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Hana",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4971,8 +5204,9 @@
     },
     {
       "index": 234,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Bryce",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -4997,8 +5231,9 @@
     },
     {
       "index": 235,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Valencia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5018,8 +5253,9 @@
     },
     {
       "index": 236,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DOUBLE_TEAM",
+      "name": "Jo & Pat",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5039,8 +5275,9 @@
     },
     {
       "index": 237,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DOUBLE_TEAM",
+      "name": "Al & Kay",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5060,8 +5297,9 @@
     },
     {
       "index": 238,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5076,8 +5314,9 @@
     },
     {
       "index": 239,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5092,8 +5331,9 @@
     },
     {
       "index": 240,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Grant",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5136,8 +5376,9 @@
     },
     {
       "index": 241,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5152,8 +5393,9 @@
     },
     {
       "index": 242,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5168,8 +5410,9 @@
     },
     {
       "index": 243,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5184,8 +5427,9 @@
     },
     {
       "index": 244,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Jonathon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5204,8 +5448,9 @@
     },
     {
       "index": 245,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Darius",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5234,8 +5479,9 @@
     },
     {
       "index": 246,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_LEADER_ROARK",
+      "name": "Roark",
       "unk2": 0,
       "items": [
         "ITEM_POTION",
@@ -5277,8 +5523,9 @@
     },
     {
       "index": 247,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5306,8 +5553,9 @@
     },
     {
       "index": 248,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5335,8 +5583,9 @@
     },
     {
       "index": 249,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5364,8 +5613,9 @@
     },
     {
       "index": 250,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_LEADER_BYRON",
+      "name": "Byron",
       "unk2": 0,
       "items": [
         "ITEM_HYPER_POTION",
@@ -5414,8 +5664,9 @@
     },
     {
       "index": 251,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5430,8 +5681,9 @@
     },
     {
       "index": 252,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5446,8 +5698,9 @@
     },
     {
       "index": 253,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5462,8 +5715,9 @@
     },
     {
       "index": 254,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5478,8 +5732,9 @@
     },
     {
       "index": 255,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5494,8 +5749,9 @@
     },
     {
       "index": 256,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Jackson",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5535,8 +5791,9 @@
     },
     {
       "index": 257,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Gary",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5556,8 +5813,9 @@
     },
     {
       "index": 258,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Philip",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5572,8 +5830,9 @@
     },
     {
       "index": 259,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Jenna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5613,8 +5872,9 @@
     },
     {
       "index": 260,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Angela",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5633,8 +5893,9 @@
     },
     {
       "index": 261,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_ELITE_FOUR_AARON",
+      "name": "Aaron",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE",
@@ -5707,8 +5968,9 @@
     },
     {
       "index": 262,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_ELITE_FOUR_BERTHA",
+      "name": "Bertha",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE",
@@ -5781,8 +6043,9 @@
     },
     {
       "index": 263,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_ELITE_FOUR_FLINT",
+      "name": "Flint",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE",
@@ -5855,8 +6118,9 @@
     },
     {
       "index": 264,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_ELITE_FOUR_LUCIEN",
+      "name": "Lucian",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE",
@@ -5929,8 +6193,9 @@
     },
     {
       "index": 265,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Curtis",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5945,8 +6210,9 @@
     },
     {
       "index": 266,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Drew",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -5986,8 +6252,9 @@
     },
     {
       "index": 267,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_CHAMPION",
+      "name": "Cynthia",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE",
@@ -6074,8 +6341,9 @@
     },
     {
       "index": 268,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Sergio",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6107,8 +6375,9 @@
     },
     {
       "index": 269,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Isaiah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6129,8 +6398,9 @@
     },
     {
       "index": 270,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Savannah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6173,8 +6443,9 @@
     },
     {
       "index": 271,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Alicia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6205,8 +6476,9 @@
     },
     {
       "index": 272,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Douglas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6231,8 +6503,9 @@
     },
     {
       "index": 273,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Brady",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6257,8 +6530,9 @@
     },
     {
       "index": 274,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Ivan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6283,8 +6557,9 @@
     },
     {
       "index": 275,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Fernando",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6309,8 +6584,9 @@
     },
     {
       "index": 276,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Edwin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6335,8 +6611,9 @@
     },
     {
       "index": 277,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Hayden",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6356,8 +6633,9 @@
     },
     {
       "index": 278,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Dennis",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6387,8 +6665,9 @@
     },
     {
       "index": 279,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Cesar",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6420,8 +6699,9 @@
     },
     {
       "index": 280,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Allen",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6464,8 +6744,9 @@
     },
     {
       "index": 281,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Zachery",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6496,8 +6777,9 @@
     },
     {
       "index": 282,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Ruben",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6528,8 +6810,9 @@
     },
     {
       "index": 283,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Breanna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6550,8 +6833,9 @@
     },
     {
       "index": 284,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Catherine",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6583,8 +6867,9 @@
     },
     {
       "index": 285,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Destiny",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6616,8 +6901,9 @@
     },
     {
       "index": 286,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Jamie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6638,8 +6924,9 @@
     },
     {
       "index": 287,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Maya",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6670,8 +6957,9 @@
     },
     {
       "index": 288,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Maxwell",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6691,8 +6979,9 @@
     },
     {
       "index": 289,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Brittney",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6712,8 +7001,9 @@
     },
     {
       "index": 290,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BELLE__PA",
+      "name": "Ava & Matt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6733,8 +7023,9 @@
     },
     {
       "index": 291,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RANCHER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6749,8 +7040,9 @@
     },
     {
       "index": 292,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RANCHER",
+      "name": "Marco",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6775,8 +7067,9 @@
     },
     {
       "index": 293,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Erick",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6816,8 +7109,9 @@
     },
     {
       "index": 294,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TWINS",
+      "name": "Emma & Lil",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6837,8 +7131,9 @@
     },
     {
       "index": 295,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_COMMANDER_MARS",
+      "name": "Mars",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6870,8 +7165,9 @@
     },
     {
       "index": 296,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6899,8 +7195,9 @@
     },
     {
       "index": 297,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6919,8 +7216,9 @@
     },
     {
       "index": 298,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6940,8 +7238,9 @@
     },
     {
       "index": 299,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6961,8 +7260,9 @@
     },
     {
       "index": 300,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Tony",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6977,8 +7277,9 @@
     },
     {
       "index": 301,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Jerry",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -6998,8 +7299,9 @@
     },
     {
       "index": 302,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Preston",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7030,8 +7332,9 @@
     },
     {
       "index": 303,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Lonnie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7052,8 +7355,9 @@
     },
     {
       "index": 304,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Calvin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7073,8 +7377,9 @@
     },
     {
       "index": 305,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Larry",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7089,8 +7394,9 @@
     },
     {
       "index": 306,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_JOGGER",
+      "name": "Wyatt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7105,8 +7411,9 @@
     },
     {
       "index": 307,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_JOGGER",
+      "name": "Craig",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7131,8 +7438,9 @@
     },
     {
       "index": 308,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_JOGGER",
+      "name": "Raul",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7147,8 +7455,9 @@
     },
     {
       "index": 309,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Colby",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7185,8 +7494,9 @@
     },
     {
       "index": 310,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Darren",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7223,8 +7533,9 @@
     },
     {
       "index": 311,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Rafael",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7245,8 +7556,9 @@
     },
     {
       "index": 312,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Jeffery",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7276,8 +7588,9 @@
     },
     {
       "index": 313,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Carl",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7297,8 +7610,9 @@
     },
     {
       "index": 314,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Ricky",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7319,8 +7633,9 @@
     },
     {
       "index": 315,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_LEADER_GARDENIA",
+      "name": "Gardenia",
       "unk2": 0,
       "items": [
         "ITEM_SUPER_POTION",
@@ -7369,8 +7684,9 @@
     },
     {
       "index": 316,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_LEADER_WAKE",
+      "name": "Wake",
       "unk2": 0,
       "items": [
         "ITEM_SUPER_POTION",
@@ -7419,8 +7735,9 @@
     },
     {
       "index": 317,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_LEADER_MAYLENE",
+      "name": "Maylene",
       "unk2": 0,
       "items": [
         "ITEM_HYPER_POTION",
@@ -7469,8 +7786,9 @@
     },
     {
       "index": 318,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_LEADER_FANTINA",
+      "name": "Fantina",
       "unk2": 0,
       "items": [
         "ITEM_HYPER_POTION",
@@ -7519,8 +7837,9 @@
     },
     {
       "index": 319,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_LEADER_CANDICE",
+      "name": "Candice",
       "unk2": 0,
       "items": [
         "ITEM_HYPER_POTION",
@@ -7581,8 +7900,9 @@
     },
     {
       "index": 320,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_LEADER_VOLKNER",
+      "name": "Volkner",
       "unk2": 0,
       "items": [
         "ITEM_HYPER_POTION",
@@ -7643,8 +7963,9 @@
     },
     {
       "index": 321,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7659,8 +7980,9 @@
     },
     {
       "index": 322,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Madeline",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7680,8 +8002,9 @@
     },
     {
       "index": 323,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Kaitlin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7706,8 +8029,9 @@
     },
     {
       "index": 324,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Caroline",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7736,8 +8060,9 @@
     },
     {
       "index": 325,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Molly",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7757,8 +8082,9 @@
     },
     {
       "index": 326,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Louis",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7778,8 +8104,9 @@
     },
     {
       "index": 327,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PARASOL_LADY",
+      "name": "Alexa",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7799,8 +8126,9 @@
     },
     {
       "index": 328,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PARASOL_LADY",
+      "name": "Sabrina",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7815,8 +8143,9 @@
     },
     {
       "index": 329,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Diana",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7845,8 +8174,9 @@
     },
     {
       "index": 330,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Cheyenne",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7876,8 +8206,9 @@
     },
     {
       "index": 331,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Meghan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7907,8 +8238,9 @@
     },
     {
       "index": 332,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Danny",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7928,8 +8260,9 @@
     },
     {
       "index": 333,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Thomas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7949,8 +8282,9 @@
     },
     {
       "index": 334,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RICH_BOY",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7965,8 +8299,9 @@
     },
     {
       "index": 335,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RICH_BOY",
+      "name": "Trey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7981,8 +8316,9 @@
     },
     {
       "index": 336,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LADY",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -7997,8 +8333,9 @@
     },
     {
       "index": 337,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Marc",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8013,8 +8350,9 @@
     },
     {
       "index": 338,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Skyler",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8034,8 +8372,9 @@
     },
     {
       "index": 339,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Damian",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8065,8 +8404,9 @@
     },
     {
       "index": 340,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCHOOL_KID_M",
+      "name": "Chance",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8087,8 +8427,9 @@
     },
     {
       "index": 341,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCHOOL_KID_M",
+      "name": "Forrest",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8109,8 +8450,9 @@
     },
     {
       "index": 342,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCHOOL_KID_M",
+      "name": "Harrison",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8128,8 +8470,9 @@
     },
     {
       "index": 343,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCHOOL_KID_F",
+      "name": "Mackenzie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8160,8 +8503,9 @@
     },
     {
       "index": 344,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCHOOL_KID_F",
+      "name": "Tiera",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8182,8 +8526,9 @@
     },
     {
       "index": 345,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCHOOL_KID_F",
+      "name": "Christine",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8201,8 +8546,9 @@
     },
     {
       "index": 346,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Cyndy",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8217,8 +8563,9 @@
     },
     {
       "index": 347,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8233,8 +8580,9 @@
     },
     {
       "index": 348,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Lindsay",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8254,8 +8602,9 @@
     },
     {
       "index": 349,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8270,8 +8619,9 @@
     },
     {
       "index": 350,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8286,8 +8636,9 @@
     },
     {
       "index": 351,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8302,8 +8653,9 @@
     },
     {
       "index": 352,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8318,8 +8670,9 @@
     },
     {
       "index": 353,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8334,8 +8687,9 @@
     },
     {
       "index": 354,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8350,8 +8704,9 @@
     },
     {
       "index": 355,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Dallas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8366,8 +8721,9 @@
     },
     {
       "index": 356,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Sebastian",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8386,8 +8742,9 @@
     },
     {
       "index": 357,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Donny",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8419,8 +8776,9 @@
     },
     {
       "index": 358,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TUBER_M",
+      "name": "Trenton",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8440,8 +8798,9 @@
     },
     {
       "index": 359,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TUBER_M",
+      "name": "Conner",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8456,8 +8815,9 @@
     },
     {
       "index": 360,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TUBER_F",
+      "name": "Mariel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8477,8 +8837,9 @@
     },
     {
       "index": 361,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TUBER_F",
+      "name": "Holly",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8493,8 +8854,9 @@
     },
     {
       "index": 362,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Armando",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8537,8 +8899,9 @@
     },
     {
       "index": 363,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WAITER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8553,8 +8916,9 @@
     },
     {
       "index": 364,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WAITER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8569,8 +8933,9 @@
     },
     {
       "index": 365,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WAITER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8585,8 +8950,9 @@
     },
     {
       "index": 366,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WAITRESS",
+      "name": "Kati",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8601,8 +8967,9 @@
     },
     {
       "index": 367,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Gerardo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8632,8 +8999,9 @@
     },
     {
       "index": 368,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_INTERVIEWERS",
+      "name": "Roxy & Oli",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8653,8 +9021,9 @@
     },
     {
       "index": 369,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMERAMAN",
+      "name": "Tevin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8669,8 +9038,9 @@
     },
     {
       "index": 370,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_REPORTER",
+      "name": "Kinsey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8685,8 +9055,9 @@
     },
     {
       "index": 371,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Grace",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8706,8 +9077,9 @@
     },
     {
       "index": 372,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BATTLE_GIRL",
+      "name": "Tyler",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8722,8 +9094,9 @@
     },
     {
       "index": 373,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Autumn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8743,8 +9116,9 @@
     },
     {
       "index": 374,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8759,8 +9133,9 @@
     },
     {
       "index": 375,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8775,8 +9150,9 @@
     },
     {
       "index": 376,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMERAMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8791,8 +9167,9 @@
     },
     {
       "index": 377,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Zackary",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8811,8 +9188,9 @@
     },
     {
       "index": 378,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Lawrence",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8843,8 +9221,9 @@
     },
     {
       "index": 379,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Diego",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8873,8 +9252,9 @@
     },
     {
       "index": 380,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Parker",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8903,8 +9283,9 @@
     },
     {
       "index": 381,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Dominique",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8929,8 +9310,9 @@
     },
     {
       "index": 382,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Jamal",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8955,8 +9337,9 @@
     },
     {
       "index": 383,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Terry",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8981,8 +9364,9 @@
     },
     {
       "index": 384,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -8997,8 +9381,9 @@
     },
     {
       "index": 385,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9013,8 +9398,9 @@
     },
     {
       "index": 386,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Joe",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9034,8 +9420,9 @@
     },
     {
       "index": 387,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9050,8 +9437,9 @@
     },
     {
       "index": 388,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Jonah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9094,8 +9482,9 @@
     },
     {
       "index": 389,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Micah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9138,8 +9527,9 @@
     },
     {
       "index": 390,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Arthur",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9171,8 +9561,9 @@
     },
     {
       "index": 391,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9187,8 +9578,9 @@
     },
     {
       "index": 392,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Brenda",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9220,8 +9612,9 @@
     },
     {
       "index": 393,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Brandi",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9264,8 +9657,9 @@
     },
     {
       "index": 394,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Clarice",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9308,8 +9702,9 @@
     },
     {
       "index": 395,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Kody",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9324,8 +9719,9 @@
     },
     {
       "index": 396,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Landon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9340,8 +9736,9 @@
     },
     {
       "index": 397,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Deandre",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9356,8 +9753,9 @@
     },
     {
       "index": 398,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Rachael",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9377,8 +9775,9 @@
     },
     {
       "index": 399,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Desiree",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9398,8 +9797,9 @@
     },
     {
       "index": 400,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Kendra",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9419,8 +9819,9 @@
     },
     {
       "index": 401,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Walter",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9440,8 +9841,9 @@
     },
     {
       "index": 402,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GENTLEMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9456,8 +9858,9 @@
     },
     {
       "index": 403,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_GALACTIC_BOSS",
+      "name": "Cyrus",
       "unk2": 0,
       "items": [
         "ITEM_SUPER_POTION",
@@ -9506,8 +9909,9 @@
     },
     {
       "index": 404,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_GALACTIC_BOSS",
+      "name": "Cyrus",
       "unk2": 0,
       "items": [
         "ITEM_SUPER_POTION",
@@ -9568,8 +9972,9 @@
     },
     {
       "index": 405,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_COMMANDER_MARS",
+      "name": "Mars",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9615,8 +10020,9 @@
     },
     {
       "index": 406,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_COMMANDER_JUPITER",
+      "name": "Jupiter",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9649,8 +10055,9 @@
     },
     {
       "index": 407,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_COMMANDER_JUPITER",
+      "name": "Jupiter",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9696,8 +10103,9 @@
     },
     {
       "index": 408,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_COMMANDER_SATURN",
+      "name": "Saturn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9743,8 +10151,9 @@
     },
     {
       "index": 409,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_COMMANDER_SATURN",
+      "name": "Saturn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9790,8 +10199,9 @@
     },
     {
       "index": 410,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9821,8 +10231,9 @@
     },
     {
       "index": 411,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9837,8 +10248,9 @@
     },
     {
       "index": 412,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9867,8 +10279,9 @@
     },
     {
       "index": 413,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9883,8 +10296,9 @@
     },
     {
       "index": 414,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9903,8 +10317,9 @@
     },
     {
       "index": 415,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9919,8 +10334,9 @@
     },
     {
       "index": 416,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9940,8 +10356,9 @@
     },
     {
       "index": 417,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9961,8 +10378,9 @@
     },
     {
       "index": 418,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -9987,8 +10405,9 @@
     },
     {
       "index": 419,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10003,8 +10422,9 @@
     },
     {
       "index": 420,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10024,8 +10444,9 @@
     },
     {
       "index": 421,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10045,8 +10466,9 @@
     },
     {
       "index": 422,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10066,8 +10488,9 @@
     },
     {
       "index": 423,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10106,8 +10529,9 @@
     },
     {
       "index": 424,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10122,8 +10546,9 @@
     },
     {
       "index": 425,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10143,8 +10568,9 @@
     },
     {
       "index": 426,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10186,8 +10612,9 @@
     },
     {
       "index": 427,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10207,8 +10634,9 @@
     },
     {
       "index": 428,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10223,8 +10651,9 @@
     },
     {
       "index": 429,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10239,8 +10668,9 @@
     },
     {
       "index": 430,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10260,8 +10690,9 @@
     },
     {
       "index": 431,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Arturo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10281,8 +10712,9 @@
     },
     {
       "index": 432,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10297,8 +10729,9 @@
     },
     {
       "index": 433,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10313,8 +10746,9 @@
     },
     {
       "index": 434,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10329,8 +10763,9 @@
     },
     {
       "index": 435,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10345,8 +10780,9 @@
     },
     {
       "index": 436,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10361,8 +10797,9 @@
     },
     {
       "index": 437,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10377,8 +10814,9 @@
     },
     {
       "index": 438,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10393,8 +10831,9 @@
     },
     {
       "index": 439,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10409,8 +10848,9 @@
     },
     {
       "index": 440,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10425,8 +10865,9 @@
     },
     {
       "index": 441,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10441,8 +10882,9 @@
     },
     {
       "index": 442,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Harry",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10457,8 +10899,9 @@
     },
     {
       "index": 443,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Gerald",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10478,8 +10921,9 @@
     },
     {
       "index": 444,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Miles",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10494,8 +10938,9 @@
     },
     {
       "index": 445,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Kendal",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10510,8 +10955,9 @@
     },
     {
       "index": 446,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Eddie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10531,8 +10977,9 @@
     },
     {
       "index": 447,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Willie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10552,8 +10999,9 @@
     },
     {
       "index": 448,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SOCIALITE",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10568,8 +11016,9 @@
     },
     {
       "index": 449,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10584,8 +11033,9 @@
     },
     {
       "index": 450,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Cassidy",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10600,8 +11050,9 @@
     },
     {
       "index": 451,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Theodore",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10621,8 +11072,9 @@
     },
     {
       "index": 452,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Damon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10647,8 +11099,9 @@
     },
     {
       "index": 453,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Maurice",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10668,8 +11121,9 @@
     },
     {
       "index": 454,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Reginald",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10689,8 +11143,9 @@
     },
     {
       "index": 455,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Lorenzo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10705,8 +11160,9 @@
     },
     {
       "index": 456,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Karina",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10725,8 +11181,9 @@
     },
     {
       "index": 457,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Summer",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10757,8 +11214,9 @@
     },
     {
       "index": 458,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Tori",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10787,8 +11245,9 @@
     },
     {
       "index": 459,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Ana",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10807,8 +11266,9 @@
     },
     {
       "index": 460,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Lee",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10823,8 +11283,9 @@
     },
     {
       "index": 461,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10839,8 +11300,9 @@
     },
     {
       "index": 462,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10855,8 +11317,9 @@
     },
     {
       "index": 463,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10871,8 +11334,9 @@
     },
     {
       "index": 464,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10887,8 +11351,9 @@
     },
     {
       "index": 465,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Ariel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10908,8 +11373,9 @@
     },
     {
       "index": 466,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10924,8 +11390,9 @@
     },
     {
       "index": 467,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RICH_BOY",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10940,8 +11407,9 @@
     },
     {
       "index": 468,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RICH_BOY",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10956,8 +11424,9 @@
     },
     {
       "index": 469,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LADY",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -10972,8 +11441,9 @@
     },
     {
       "index": 470,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11027,8 +11497,9 @@
     },
     {
       "index": 471,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11082,8 +11553,9 @@
     },
     {
       "index": 472,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11137,8 +11609,9 @@
     },
     {
       "index": 473,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11192,8 +11665,9 @@
     },
     {
       "index": 474,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11247,8 +11721,9 @@
     },
     {
       "index": 475,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11302,8 +11777,9 @@
     },
     {
       "index": 476,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11368,8 +11844,9 @@
     },
     {
       "index": 477,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11434,8 +11911,9 @@
     },
     {
       "index": 478,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11500,8 +11978,9 @@
     },
     {
       "index": 479,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11577,8 +12056,9 @@
     },
     {
       "index": 480,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11654,8 +12134,9 @@
     },
     {
       "index": 481,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11731,8 +12212,9 @@
     },
     {
       "index": 482,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Zachariah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11757,8 +12239,9 @@
     },
     {
       "index": 483,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Samson",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11798,8 +12281,9 @@
     },
     {
       "index": 484,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCHOOL_KID_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11814,8 +12298,9 @@
     },
     {
       "index": 485,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCHOOL_KID_F",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11830,8 +12315,9 @@
     },
     {
       "index": 486,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Shaun",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11860,8 +12346,9 @@
     },
     {
       "index": 487,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11876,8 +12363,9 @@
     },
     {
       "index": 488,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Fabian",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11902,8 +12390,9 @@
     },
     {
       "index": 489,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Brennan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11923,8 +12412,9 @@
     },
     {
       "index": 490,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Bruce",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11939,8 +12429,9 @@
     },
     {
       "index": 491,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Devon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11955,8 +12446,9 @@
     },
     {
       "index": 492,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Nicola",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11971,8 +12463,9 @@
     },
     {
       "index": 493,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -11987,8 +12480,9 @@
     },
     {
       "index": 494,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Claire",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12003,8 +12497,9 @@
     },
     {
       "index": 495,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12019,8 +12514,9 @@
     },
     {
       "index": 496,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Wayne",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12045,8 +12541,9 @@
     },
     {
       "index": 497,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_TUBER_M",
+      "name": "Jacky",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12067,8 +12564,9 @@
     },
     {
       "index": 498,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_TUBER_F",
+      "name": "Caitlyn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12099,8 +12597,9 @@
     },
     {
       "index": 499,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Terrell",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12143,8 +12642,9 @@
     },
     {
       "index": 500,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Brenden",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12187,8 +12687,9 @@
     },
     {
       "index": 501,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WAITER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12203,8 +12704,9 @@
     },
     {
       "index": 502,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12219,8 +12721,9 @@
     },
     {
       "index": 503,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Willy",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12240,8 +12743,9 @@
     },
     {
       "index": 504,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Braden",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12256,8 +12760,9 @@
     },
     {
       "index": 505,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Brendon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12277,8 +12782,9 @@
     },
     {
       "index": 506,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Quentin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12303,8 +12809,9 @@
     },
     {
       "index": 507,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12319,8 +12826,9 @@
     },
     {
       "index": 508,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12340,8 +12848,9 @@
     },
     {
       "index": 509,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12356,8 +12865,9 @@
     },
     {
       "index": 510,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12382,8 +12892,9 @@
     },
     {
       "index": 511,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12398,8 +12909,9 @@
     },
     {
       "index": 512,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12419,8 +12931,9 @@
     },
     {
       "index": 513,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12440,8 +12953,9 @@
     },
     {
       "index": 514,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12461,8 +12975,9 @@
     },
     {
       "index": 515,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12477,8 +12992,9 @@
     },
     {
       "index": 516,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12503,8 +13019,9 @@
     },
     {
       "index": 517,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12524,8 +13041,9 @@
     },
     {
       "index": 518,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12550,8 +13068,9 @@
     },
     {
       "index": 519,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12566,8 +13085,9 @@
     },
     {
       "index": 520,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12587,8 +13107,9 @@
     },
     {
       "index": 521,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12608,8 +13129,9 @@
     },
     {
       "index": 522,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12634,8 +13156,9 @@
     },
     {
       "index": 523,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12650,8 +13173,9 @@
     },
     {
       "index": 524,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12676,8 +13200,9 @@
     },
     {
       "index": 525,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12697,8 +13222,9 @@
     },
     {
       "index": 526,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12723,8 +13249,9 @@
     },
     {
       "index": 527,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC_F",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12744,8 +13271,9 @@
     },
     {
       "index": 528,
-      "type": 3,
+      "type": "TRTYPE_MON_ITEM_MOVES",
       "class": "TRAINER_CLASS_COMMANDER_MARS",
+      "name": "Mars",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12791,8 +13319,9 @@
     },
     {
       "index": 529,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ROUGHNECK",
+      "name": "Kirby",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12807,8 +13336,9 @@
     },
     {
       "index": 530,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_M",
+      "name": "Leonard",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12833,8 +13363,9 @@
     },
     {
       "index": 531,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_F",
+      "name": "Rebekah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12849,8 +13380,9 @@
     },
     {
       "index": 532,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Oliver",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12875,8 +13407,9 @@
     },
     {
       "index": 533,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BELLE__PA",
+      "name": "Beth & Bob",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12896,8 +13429,9 @@
     },
     {
       "index": 534,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNG_COUPLE",
+      "name": "Mike & Nat",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12917,8 +13451,9 @@
     },
     {
       "index": 535,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Alison",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12933,8 +13468,9 @@
     },
     {
       "index": 536,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ARTIST",
+      "name": "Ismael",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12949,8 +13485,9 @@
     },
     {
       "index": 537,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_F",
+      "name": "Kaylee",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12970,8 +13507,9 @@
     },
     {
       "index": 538,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMERAMAN",
+      "name": "Darryl",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -12991,8 +13529,9 @@
     },
     {
       "index": 539,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Eugene",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13017,8 +13556,9 @@
     },
     {
       "index": 540,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKEFAN_F",
+      "name": "Meredith",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13038,8 +13578,9 @@
     },
     {
       "index": 541,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PI",
+      "name": "Kendrick",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13067,8 +13608,9 @@
     },
     {
       "index": 542,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GENTLEMAN",
+      "name": "Leonardo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13088,8 +13630,9 @@
     },
     {
       "index": 543,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SOCIALITE",
+      "name": "Rebecca",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -13111,8 +13654,9 @@
     },
     {
       "index": 544,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Blythe",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13132,8 +13676,9 @@
     },
     {
       "index": 545,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RICH_BOY",
+      "name": "Roman",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13148,8 +13693,9 @@
     },
     {
       "index": 546,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LADY",
+      "name": "Kylie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13169,8 +13715,9 @@
     },
     {
       "index": 547,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_REPORTER",
+      "name": "Valerie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13185,8 +13732,9 @@
     },
     {
       "index": 548,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCHOOL_KID_M",
+      "name": "Esteban",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13207,8 +13755,9 @@
     },
     {
       "index": 549,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Emilio",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13223,8 +13772,9 @@
     },
     {
       "index": 550,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Gabriella",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13239,8 +13789,9 @@
     },
     {
       "index": 551,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Harley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13255,8 +13806,9 @@
     },
     {
       "index": 552,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Emanuel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13286,8 +13838,9 @@
     },
     {
       "index": 553,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Karl",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13312,8 +13865,9 @@
     },
     {
       "index": 554,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Audrey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13333,8 +13887,9 @@
     },
     {
       "index": 555,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Geneva",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13354,8 +13909,9 @@
     },
     {
       "index": 556,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Krystal",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13380,8 +13936,9 @@
     },
     {
       "index": 557,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Geoffrey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13401,8 +13958,9 @@
     },
     {
       "index": 558,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Darien",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13417,8 +13975,9 @@
     },
     {
       "index": 559,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Keegan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13433,8 +13992,9 @@
     },
     {
       "index": 560,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Stanley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13454,8 +14014,9 @@
     },
     {
       "index": 561,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Drake",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13480,8 +14041,9 @@
     },
     {
       "index": 562,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Kenny",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13501,8 +14063,9 @@
     },
     {
       "index": 563,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Rodolfo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13534,8 +14097,9 @@
     },
     {
       "index": 564,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Saul",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13556,8 +14120,9 @@
     },
     {
       "index": 565,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Jose",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13589,8 +14154,9 @@
     },
     {
       "index": 566,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Felix",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13622,8 +14188,9 @@
     },
     {
       "index": 567,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Quinn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13655,8 +14222,9 @@
     },
     {
       "index": 568,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Graham",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13677,8 +14245,9 @@
     },
     {
       "index": 569,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Keenan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13710,8 +14279,9 @@
     },
     {
       "index": 570,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Stefan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13743,8 +14313,9 @@
     },
     {
       "index": 571,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Skylar",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13776,8 +14347,9 @@
     },
     {
       "index": 572,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Abel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13798,8 +14370,9 @@
     },
     {
       "index": 573,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Deanna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13831,8 +14404,9 @@
     },
     {
       "index": 574,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Ariana",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13875,8 +14449,9 @@
     },
     {
       "index": 575,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Dana",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13908,8 +14483,9 @@
     },
     {
       "index": 576,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Mikayla",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13952,8 +14528,9 @@
     },
     {
       "index": 577,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Meagan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -13985,8 +14562,9 @@
     },
     {
       "index": 578,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Sandra",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14007,8 +14585,9 @@
     },
     {
       "index": 579,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Kassandra",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14040,8 +14619,9 @@
     },
     {
       "index": 580,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Jasmin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14062,8 +14642,9 @@
     },
     {
       "index": 581,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Natasha",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14106,8 +14687,9 @@
     },
     {
       "index": 582,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Monique",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14139,8 +14721,9 @@
     },
     {
       "index": 583,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Corbin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14160,8 +14743,9 @@
     },
     {
       "index": 584,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Sterling",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14181,8 +14765,9 @@
     },
     {
       "index": 585,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Daisy",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14202,8 +14787,9 @@
     },
     {
       "index": 586,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Chelsey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14223,8 +14809,9 @@
     },
     {
       "index": 587,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Davon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14249,8 +14836,9 @@
     },
     {
       "index": 588,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Griffin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14270,8 +14858,9 @@
     },
     {
       "index": 589,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Ray",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14296,8 +14885,9 @@
     },
     {
       "index": 590,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Jarrett",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14312,8 +14902,9 @@
     },
     {
       "index": 591,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Kyler",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14333,8 +14924,9 @@
     },
     {
       "index": 592,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Deshawn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14354,8 +14946,9 @@
     },
     {
       "index": 593,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Dwayne",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14370,8 +14963,9 @@
     },
     {
       "index": 594,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Ashlee",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14391,8 +14985,9 @@
     },
     {
       "index": 595,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Felicia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14412,8 +15007,9 @@
     },
     {
       "index": 596,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Krista",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14433,8 +15029,9 @@
     },
     {
       "index": 597,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Glenn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14454,8 +15051,9 @@
     },
     {
       "index": 598,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Kurt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14470,8 +15068,9 @@
     },
     {
       "index": 599,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Sam",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14491,8 +15090,9 @@
     },
     {
       "index": 600,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Wade",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14517,8 +15117,9 @@
     },
     {
       "index": 601,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Joanna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14538,8 +15139,9 @@
     },
     {
       "index": 602,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Sophia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14559,8 +15161,9 @@
     },
     {
       "index": 603,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Mallory",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14580,8 +15183,9 @@
     },
     {
       "index": 604,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Lydia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14606,8 +15210,9 @@
     },
     {
       "index": 605,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14622,8 +15227,9 @@
     },
     {
       "index": 606,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Harlan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14666,8 +15272,9 @@
     },
     {
       "index": 607,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14743,8 +15350,9 @@
     },
     {
       "index": 608,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_AROMA_LADY",
+      "name": "Cheryl",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14764,8 +15372,9 @@
     },
     {
       "index": 609,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_RICH_BOY",
+      "name": "Riley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14786,8 +15395,9 @@
     },
     {
       "index": 610,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_PICNICKER",
+      "name": "Marley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14808,8 +15418,9 @@
     },
     {
       "index": 611,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_CAMPER",
+      "name": "Buck",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14830,8 +15441,9 @@
     },
     {
       "index": 612,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_POKEKID",
+      "name": "Mira",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14852,8 +15464,9 @@
     },
     {
       "index": 613,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS",
+      "name": "Lucas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14872,8 +15485,9 @@
     },
     {
       "index": 614,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS",
+      "name": "Lucas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14892,8 +15506,9 @@
     },
     {
       "index": 615,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS",
+      "name": "Lucas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14912,8 +15527,9 @@
     },
     {
       "index": 616,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN",
+      "name": "Dawn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14932,8 +15548,9 @@
     },
     {
       "index": 617,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN",
+      "name": "Dawn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14952,8 +15569,9 @@
     },
     {
       "index": 618,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN",
+      "name": "Dawn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -14972,8 +15590,9 @@
     },
     {
       "index": 619,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15049,8 +15668,9 @@
     },
     {
       "index": 620,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15126,8 +15746,9 @@
     },
     {
       "index": 621,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS",
+      "name": "Lucas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15170,8 +15791,9 @@
     },
     {
       "index": 622,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS",
+      "name": "Lucas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15214,8 +15836,9 @@
     },
     {
       "index": 623,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_LUCAS",
+      "name": "Lucas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15258,8 +15881,9 @@
     },
     {
       "index": 624,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN",
+      "name": "Dawn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15302,8 +15926,9 @@
     },
     {
       "index": 625,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN",
+      "name": "Dawn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15346,8 +15971,9 @@
     },
     {
       "index": 626,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_DAWN",
+      "name": "Dawn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15390,8 +16016,9 @@
     },
     {
       "index": 627,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Elizabeth",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15406,8 +16033,9 @@
     },
     {
       "index": 628,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Elizabeth",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15422,8 +16050,9 @@
     },
     {
       "index": 629,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_AROMA_LADY",
+      "name": "Elizabeth",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15438,8 +16067,9 @@
     },
     {
       "index": 630,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ARTIST",
+      "name": "Kevin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15459,8 +16089,9 @@
     },
     {
       "index": 631,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ARTIST",
+      "name": "Kevin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15480,8 +16111,9 @@
     },
     {
       "index": 632,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_ARTIST",
+      "name": "Kevin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15501,8 +16133,9 @@
     },
     {
       "index": 633,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BATTLE_GIRL",
+      "name": "Helen",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15522,8 +16155,9 @@
     },
     {
       "index": 634,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BATTLE_GIRL",
+      "name": "Helen",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15543,8 +16177,9 @@
     },
     {
       "index": 635,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BATTLE_GIRL",
+      "name": "Helen",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15564,8 +16199,9 @@
     },
     {
       "index": 636,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Brianna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15585,8 +16221,9 @@
     },
     {
       "index": 637,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Brianna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15606,8 +16243,9 @@
     },
     {
       "index": 638,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BIRD_KEEPER",
+      "name": "Audrey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15627,8 +16265,9 @@
     },
     {
       "index": 639,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_M",
+      "name": "Albert",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15653,8 +16292,9 @@
     },
     {
       "index": 640,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_M",
+      "name": "Albert",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15679,8 +16319,9 @@
     },
     {
       "index": 641,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_M",
+      "name": "Albert",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15705,8 +16346,9 @@
     },
     {
       "index": 642,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_F",
+      "name": "Jennifer",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15731,8 +16373,9 @@
     },
     {
       "index": 643,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_F",
+      "name": "Jennifer",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15757,8 +16400,9 @@
     },
     {
       "index": 644,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_BREEDER_F",
+      "name": "Jennifer",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15783,8 +16427,9 @@
     },
     {
       "index": 645,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Zackary",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15805,8 +16450,9 @@
     },
     {
       "index": 646,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Zackary",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15827,8 +16473,9 @@
     },
     {
       "index": 647,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_CAMPER",
+      "name": "Zackary",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15849,8 +16496,9 @@
     },
     {
       "index": 648,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Dalton",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15893,8 +16541,9 @@
     },
     {
       "index": 649,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Olivia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15926,8 +16575,9 @@
     },
     {
       "index": 650,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COLLECTOR",
+      "name": "Ivan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15952,8 +16602,9 @@
     },
     {
       "index": 651,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COWGIRL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15968,8 +16619,9 @@
     },
     {
       "index": 652,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_COWGIRL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -15984,8 +16636,9 @@
     },
     {
       "index": 653,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_M",
+      "name": "John",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16005,8 +16658,9 @@
     },
     {
       "index": 654,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_M",
+      "name": "John",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16026,8 +16680,9 @@
     },
     {
       "index": 655,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_M",
+      "name": "John",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16047,8 +16702,9 @@
     },
     {
       "index": 656,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_F",
+      "name": "Kayla",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16063,8 +16719,9 @@
     },
     {
       "index": 657,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_F",
+      "name": "Kayla",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16079,8 +16736,9 @@
     },
     {
       "index": 658,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CYCLIST_F",
+      "name": "Kayla",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16095,8 +16753,9 @@
     },
     {
       "index": 659,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Patrick",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16111,8 +16770,9 @@
     },
     {
       "index": 660,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Patrick",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16127,8 +16787,9 @@
     },
     {
       "index": 661,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Hayden",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16148,8 +16809,9 @@
     },
     {
       "index": 662,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_DRAGON_TAMER",
+      "name": "Geoffrey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16169,8 +16831,9 @@
     },
     {
       "index": 663,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Jake",
       "unk2": 0,
       "items": [],
       "unkC": 0,
@@ -16202,8 +16865,9 @@
     },
     {
       "index": 664,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Dennis",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16246,8 +16910,9 @@
     },
     {
       "index": 665,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Dennis",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16290,8 +16955,9 @@
     },
     {
       "index": 666,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Rodolfo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16323,8 +16989,9 @@
     },
     {
       "index": 667,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_M",
+      "name": "Saul",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16345,8 +17012,9 @@
     },
     {
       "index": 668,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Shannon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16389,8 +17057,9 @@
     },
     {
       "index": 669,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Maya",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16422,8 +17091,9 @@
     },
     {
       "index": 670,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Maya",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16455,8 +17125,9 @@
     },
     {
       "index": 671,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Deanna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16488,8 +17159,9 @@
     },
     {
       "index": 672,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_F",
+      "name": "Ariana",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16532,8 +17204,9 @@
     },
     {
       "index": 673,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Mitchell",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16553,8 +17226,9 @@
     },
     {
       "index": 674,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Mitchell",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16574,8 +17248,9 @@
     },
     {
       "index": 675,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Maxwell",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16595,8 +17270,9 @@
     },
     {
       "index": 676,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_M",
+      "name": "Corbin",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16616,8 +17292,9 @@
     },
     {
       "index": 677,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Abigail",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16642,8 +17319,9 @@
     },
     {
       "index": 678,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Abigail",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16668,8 +17346,9 @@
     },
     {
       "index": 679,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Brittney",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16689,8 +17368,9 @@
     },
     {
       "index": 680,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PSYCHIC_F",
+      "name": "Daisy",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16710,8 +17390,9 @@
     },
     {
       "index": 681,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RANCHER",
+      "name": "Marco",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16736,8 +17417,9 @@
     },
     {
       "index": 682,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RANCHER",
+      "name": "Marco",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16762,8 +17444,9 @@
     },
     {
       "index": 683,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Joseph",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16778,8 +17461,9 @@
     },
     {
       "index": 684,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Joseph",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16794,8 +17478,9 @@
     },
     {
       "index": 685,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Miguel",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16815,8 +17500,9 @@
     },
     {
       "index": 686,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_FISHERMAN",
+      "name": "Alec",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16836,8 +17522,9 @@
     },
     {
       "index": 687,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TWINS",
+      "name": "Teri & Tia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16857,8 +17544,9 @@
     },
     {
       "index": 688,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TWINS",
+      "name": "Teri & Tia",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16878,8 +17566,9 @@
     },
     {
       "index": 689,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PI",
+      "name": "Carlos",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16916,8 +17605,9 @@
     },
     {
       "index": 690,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PI",
+      "name": "Carlos",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -16954,8 +17644,9 @@
     },
     {
       "index": 691,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GENTLEMAN",
+      "name": "Jeremy",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -16972,8 +17663,9 @@
     },
     {
       "index": 692,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GENTLEMAN",
+      "name": "Jeremy",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -16990,8 +17682,9 @@
     },
     {
       "index": 693,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GENTLEMAN",
+      "name": "Jeremy",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -17008,8 +17701,9 @@
     },
     {
       "index": 694,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Tony",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17024,8 +17718,9 @@
     },
     {
       "index": 695,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Harry",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17040,8 +17735,9 @@
     },
     {
       "index": 696,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RUIN_MANIAC",
+      "name": "Harry",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17056,8 +17752,9 @@
     },
     {
       "index": 697,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_JOGGER",
+      "name": "Craig",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17082,8 +17779,9 @@
     },
     {
       "index": 698,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_JOGGER",
+      "name": "Craig",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17108,8 +17806,9 @@
     },
     {
       "index": 699,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Philip",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17124,8 +17823,9 @@
     },
     {
       "index": 700,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BLACK_BELT",
+      "name": "Davon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17150,8 +17850,9 @@
     },
     {
       "index": 701,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SOCIALITE",
+      "name": "Reina",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -17168,8 +17869,9 @@
     },
     {
       "index": 702,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SOCIALITE",
+      "name": "Reina",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -17186,8 +17888,9 @@
     },
     {
       "index": 703,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Samantha",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17202,8 +17905,9 @@
     },
     {
       "index": 704,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Samantha",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17218,8 +17922,9 @@
     },
     {
       "index": 705,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Samantha",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17234,8 +17939,9 @@
     },
     {
       "index": 706,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Madeline",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17255,8 +17961,9 @@
     },
     {
       "index": 707,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Madeline",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17276,8 +17983,9 @@
     },
     {
       "index": 708,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Madeline",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17297,8 +18005,9 @@
     },
     {
       "index": 709,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Theodore",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17318,8 +18027,9 @@
     },
     {
       "index": 710,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Theodore",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17339,8 +18049,9 @@
     },
     {
       "index": 711,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_HIKER",
+      "name": "Theodore",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17360,8 +18071,9 @@
     },
     {
       "index": 712,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BUG_CATCHER",
+      "name": "Brandon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17381,8 +18093,9 @@
     },
     {
       "index": 713,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BUG_CATCHER",
+      "name": "Brandon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17402,8 +18115,9 @@
     },
     {
       "index": 714,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BUG_CATCHER",
+      "name": "Brandon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17423,8 +18137,9 @@
     },
     {
       "index": 715,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PARASOL_LADY",
+      "name": "Alexa",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17444,8 +18159,9 @@
     },
     {
       "index": 716,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PARASOL_LADY",
+      "name": "Alexa",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17465,8 +18181,9 @@
     },
     {
       "index": 717,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PARASOL_LADY",
+      "name": "Alexa",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17486,8 +18203,9 @@
     },
     {
       "index": 718,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Karina",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17508,8 +18226,9 @@
     },
     {
       "index": 719,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Karina",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17530,8 +18249,9 @@
     },
     {
       "index": 720,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PICNICKER",
+      "name": "Karina",
       "unk2": 0,
       "items": [],
       "unkC": 0,
@@ -17552,8 +18272,9 @@
     },
     {
       "index": 721,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Danielle",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17568,8 +18289,9 @@
     },
     {
       "index": 722,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Danielle",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17584,8 +18306,9 @@
     },
     {
       "index": 723,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Danielle",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17600,8 +18323,9 @@
     },
     {
       "index": 724,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Danny",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17621,8 +18345,9 @@
     },
     {
       "index": 725,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Danny",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17642,8 +18367,9 @@
     },
     {
       "index": 726,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Danny",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17663,8 +18389,9 @@
     },
     {
       "index": 727,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RICH_BOY",
+      "name": "Trey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17679,8 +18406,9 @@
     },
     {
       "index": 728,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_RICH_BOY",
+      "name": "Trey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17695,8 +18423,9 @@
     },
     {
       "index": 729,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LADY",
+      "name": "Melissa",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -17713,8 +18442,9 @@
     },
     {
       "index": 730,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LADY",
+      "name": "Melissa",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -17731,8 +18461,9 @@
     },
     {
       "index": 731,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LADY",
+      "name": "Melissa",
       "unk2": 0,
       "items": [
         "ITEM_FULL_RESTORE"
@@ -17749,8 +18480,9 @@
     },
     {
       "index": 732,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Taylor",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17770,8 +18502,9 @@
     },
     {
       "index": 733,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Taylor",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17791,8 +18524,9 @@
     },
     {
       "index": 734,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Taylor",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17812,8 +18546,9 @@
     },
     {
       "index": 735,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_M",
+      "name": "Kyler",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17833,8 +18568,9 @@
     },
     {
       "index": 736,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Allison",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17854,8 +18590,9 @@
     },
     {
       "index": 737,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Allison",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17875,8 +18612,9 @@
     },
     {
       "index": 738,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Allison",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17896,8 +18634,9 @@
     },
     {
       "index": 739,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_PKMN_RANGER_F",
+      "name": "Ashlee",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17917,8 +18656,9 @@
     },
     {
       "index": 740,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Marc",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17938,8 +18678,9 @@
     },
     {
       "index": 741,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Marc",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17959,8 +18700,9 @@
     },
     {
       "index": 742,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SAILOR",
+      "name": "Zachariah",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -17985,8 +18727,9 @@
     },
     {
       "index": 743,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Shaun",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18006,8 +18749,9 @@
     },
     {
       "index": 744,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Shaun",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18027,8 +18771,9 @@
     },
     {
       "index": 745,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Shaun",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18048,8 +18793,9 @@
     },
     {
       "index": 746,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Zach",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18074,8 +18820,9 @@
     },
     {
       "index": 747,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Zach",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18100,8 +18847,9 @@
     },
     {
       "index": 748,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_NINJA_BOY",
+      "name": "Zach",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18126,8 +18874,9 @@
     },
     {
       "index": 749,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Cyndy",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18142,8 +18891,9 @@
     },
     {
       "index": 750,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_BEAUTY",
+      "name": "Cyndy",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18158,8 +18908,9 @@
     },
     {
       "index": 751,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Edward",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18174,8 +18925,9 @@
     },
     {
       "index": 752,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Edward",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18190,8 +18942,9 @@
     },
     {
       "index": 753,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Bjorn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18211,8 +18964,9 @@
     },
     {
       "index": 754,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_M",
+      "name": "Bjorn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18232,8 +18986,9 @@
     },
     {
       "index": 755,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Andrea",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18248,8 +19003,9 @@
     },
     {
       "index": 756,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Andrea",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18264,8 +19020,9 @@
     },
     {
       "index": 757,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Madison",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18280,8 +19037,9 @@
     },
     {
       "index": 758,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SKIER_F",
+      "name": "Madison",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18296,8 +19054,9 @@
     },
     {
       "index": 759,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Wesley",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18317,8 +19076,9 @@
     },
     {
       "index": 760,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Francisco",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18338,8 +19098,9 @@
     },
     {
       "index": 761,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Glenn",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18359,8 +19120,9 @@
     },
     {
       "index": 762,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Miranda",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18375,8 +19137,9 @@
     },
     {
       "index": 763,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Crystal",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18396,8 +19159,9 @@
     },
     {
       "index": 764,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_F",
+      "name": "Joanna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18417,8 +19181,9 @@
     },
     {
       "index": 765,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Tristan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18433,8 +19198,9 @@
     },
     {
       "index": 766,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Tristan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18449,8 +19215,9 @@
     },
     {
       "index": 767,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Tristan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18465,8 +19232,9 @@
     },
     {
       "index": 768,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Dallas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18481,8 +19249,9 @@
     },
     {
       "index": 769,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Dallas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18497,8 +19266,9 @@
     },
     {
       "index": 770,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Dallas",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18513,8 +19283,9 @@
     },
     {
       "index": 771,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TUBER_M",
+      "name": "Jared",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18539,8 +19310,9 @@
     },
     {
       "index": 772,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TUBER_M",
+      "name": "Jared",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18565,8 +19337,9 @@
     },
     {
       "index": 773,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_TUBER_F",
+      "name": "Chelsea",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18587,8 +19360,9 @@
     },
     {
       "index": 774,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Brian",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18631,8 +19405,9 @@
     },
     {
       "index": 775,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_TUBER_F",
+      "name": "Chelsea",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18653,8 +19428,9 @@
     },
     {
       "index": 776,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Brian",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18697,8 +19473,9 @@
     },
     {
       "index": 777,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Armando",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18741,8 +19518,9 @@
     },
     {
       "index": 778,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_VETERAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18757,8 +19535,9 @@
     },
     {
       "index": 779,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMERAMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18773,8 +19552,9 @@
     },
     {
       "index": 780,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMERAMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18789,8 +19569,9 @@
     },
     {
       "index": 781,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMERAMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18805,8 +19586,9 @@
     },
     {
       "index": 782,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMERAMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18821,8 +19603,9 @@
     },
     {
       "index": 783,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CAMERAMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18837,8 +19620,9 @@
     },
     {
       "index": 784,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18853,8 +19637,9 @@
     },
     {
       "index": 785,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Arturo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18869,8 +19654,9 @@
     },
     {
       "index": 786,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Arturo",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18885,8 +19671,9 @@
     },
     {
       "index": 787,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18901,8 +19688,9 @@
     },
     {
       "index": 788,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18917,8 +19705,9 @@
     },
     {
       "index": 789,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GUITARIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18933,8 +19722,9 @@
     },
     {
       "index": 790,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18949,8 +19739,9 @@
     },
     {
       "index": 791,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18965,8 +19756,9 @@
     },
     {
       "index": 792,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18981,8 +19773,9 @@
     },
     {
       "index": 793,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -18997,8 +19790,9 @@
     },
     {
       "index": 794,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_IDOL",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19013,8 +19807,9 @@
     },
     {
       "index": 795,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_INTERVIEWERS",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19034,8 +19829,9 @@
     },
     {
       "index": 796,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_INTERVIEWERS",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19055,8 +19851,9 @@
     },
     {
       "index": 797,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_INTERVIEWERS",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19076,8 +19873,9 @@
     },
     {
       "index": 798,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_INTERVIEWERS",
+      "name": "Tara & Tim",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19097,8 +19895,9 @@
     },
     {
       "index": 799,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19113,8 +19912,9 @@
     },
     {
       "index": 800,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19129,8 +19929,9 @@
     },
     {
       "index": 801,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19145,8 +19946,9 @@
     },
     {
       "index": 802,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19161,8 +19963,9 @@
     },
     {
       "index": 803,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_CLOWN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19177,8 +19980,9 @@
     },
     {
       "index": 804,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19193,8 +19997,9 @@
     },
     {
       "index": 805,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19209,8 +20014,9 @@
     },
     {
       "index": 806,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19225,8 +20031,9 @@
     },
     {
       "index": 807,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19241,8 +20048,9 @@
     },
     {
       "index": 808,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POLICEMAN",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19257,8 +20065,9 @@
     },
     {
       "index": 809,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_REPORTER",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19273,8 +20082,9 @@
     },
     {
       "index": 810,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_REPORTER",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19289,8 +20099,9 @@
     },
     {
       "index": 811,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_REPORTER",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19305,8 +20116,9 @@
     },
     {
       "index": 812,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_REPORTER",
+      "name": "Angelica",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19321,8 +20133,9 @@
     },
     {
       "index": 813,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19337,8 +20150,9 @@
     },
     {
       "index": 814,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_SWIMMER_M",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19353,8 +20167,9 @@
     },
     {
       "index": 815,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WAITER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19369,8 +20184,9 @@
     },
     {
       "index": 816,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Mickey",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19385,8 +20201,9 @@
     },
     {
       "index": 817,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Roland",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19406,8 +20223,9 @@
     },
     {
       "index": 818,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Carrie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19436,8 +20254,9 @@
     },
     {
       "index": 819,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Norman",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19457,8 +20276,9 @@
     },
     {
       "index": 820,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Roland",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19478,8 +20298,9 @@
     },
     {
       "index": 821,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Carrie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19511,8 +20332,9 @@
     },
     {
       "index": 822,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Norman",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19532,8 +20354,9 @@
     },
     {
       "index": 823,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Roland",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19553,8 +20376,9 @@
     },
     {
       "index": 824,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_LASS",
+      "name": "Carrie",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19574,8 +20398,9 @@
     },
     {
       "index": 825,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_YOUNGSTER",
+      "name": "Norman",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19607,8 +20432,9 @@
     },
     {
       "index": 826,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_TOWER_TYCOON",
+      "name": "Palmer",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19623,8 +20449,9 @@
     },
     {
       "index": 827,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_M",
+      "name": "Anton",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19644,8 +20471,9 @@
     },
     {
       "index": 828,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_ACE_TRAINER_SNOW_F",
+      "name": "Brenna",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19665,8 +20493,9 @@
     },
     {
       "index": 829,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Darrius",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19686,8 +20515,9 @@
     },
     {
       "index": 830,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Fredrick",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19719,8 +20549,9 @@
     },
     {
       "index": 831,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_SCIENTIST",
+      "name": "Travon",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19739,8 +20570,9 @@
     },
     {
       "index": 832,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_POKE_KID",
+      "name": "Janet",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19760,8 +20592,9 @@
     },
     {
       "index": 833,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19803,8 +20636,9 @@
     },
     {
       "index": 834,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19829,8 +20663,9 @@
     },
     {
       "index": 835,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19855,8 +20690,9 @@
     },
     {
       "index": 836,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19881,8 +20717,9 @@
     },
     {
       "index": 837,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -19958,8 +20795,9 @@
     },
     {
       "index": 838,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20035,8 +20873,9 @@
     },
     {
       "index": 839,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20112,8 +20951,9 @@
     },
     {
       "index": 840,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20189,8 +21029,9 @@
     },
     {
       "index": 841,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20266,8 +21107,9 @@
     },
     {
       "index": 842,
-      "type": 1,
+      "type": "TRTYPE_MON_MOVES",
       "class": "TRAINER_CLASS_PKMN_TRAINER_BARRY",
+      "name": "Cedric",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20343,8 +21185,9 @@
     },
     {
       "index": 843,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20359,8 +21202,9 @@
     },
     {
       "index": 844,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Dillan",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20380,8 +21224,9 @@
     },
     {
       "index": 845,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Holden",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20396,8 +21241,9 @@
     },
     {
       "index": 846,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_WORKER",
+      "name": "Conrad",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20412,8 +21258,9 @@
     },
     {
       "index": 847,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20428,8 +21275,9 @@
     },
     {
       "index": 848,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
@@ -20449,8 +21297,9 @@
     },
     {
       "index": 849,
-      "type": 0,
+      "type": "TRTYPE_MON",
       "class": "TRAINER_CLASS_GALACTIC",
+      "name": "Grunt",
       "unk2": 0,
       "items": [],
       "unkC": 1,
diff --git a/files/poketool/trainer/trdata.json.txt b/files/poketool/trainer/trdata.json.txt
index 9c02c7db..1c1c0bf8 100644
--- a/files/poketool/trainer/trdata.json.txt
+++ b/files/poketool/trainer/trdata.json.txt
@@ -11,6 +11,7 @@ const struct TrainerData __data[] = {
     {},
 ## for trainer in trdata
     {
+        // Trainer #{{trainer.index}}, {{ trainer.class }} {{ trainer.name }}
         {{ trainer.type }},
         {{ trainer.class }},
         {{ trainer.unk2 }},
diff --git a/files/poketool/trainer/trpoke.json.txt b/files/poketool/trainer/trpoke.json.txt
index 09fa70b3..b4e5c1cf 100644
--- a/files/poketool/trainer/trpoke.json.txt
+++ b/files/poketool/trainer/trpoke.json.txt
@@ -10,20 +10,20 @@
 
 u32 __size[] = { 8,
 ## for trainer in trdata
-    (max({{ length(trainer.party) }} * {% if trainer.type == 0 %}6{% else if trainer.type == 1 %}14{% else if trainer.type == 2 %}8{% else %}16{% endif %}, 8) + 3) & ~3,
+    (max({{ length(trainer.party) }} * {% if trainer.type == "TRTYPE_MON" %}6{% else if trainer.type == "TRTYPE_MON_MOVES" %}14{% else if trainer.type == "TRTYPE_MONE_ITEM" %}8{% else %}16{% endif %}, 8) + 3) & ~3,
 ## endfor
 };
 
 const u16 __data[] = { 0, 0, 0, 0,
 ## for trainer in trdata
-    // Trainer #{{ trainer.index }}
-##   if trainer.type == 0
+    // Trainer #{{ trainer.index }}, {{ trainer.class }} {{ trainer.name }}
+##   if trainer.type == "TRTYPE_MON"
 ##     set mon_length = 3
-##   else if trainer.type == 1
+##   else if trainer.type == "TRTYPE_MON_MOVES"
 ##     set mon_length = 7
-##   else if trainer.type == 2
+##   else if trainer.type == "TRTYPE_MON_ITEM"
 ##     set mon_length = 4
-##   else if trainer.type == 3
+##   else if trainer.type == "TRTYPE_MON_ITEM_MOVES"
 ##     set mon_length = 8
 ##   endif
 ##   set total_length = mon_length * length(trainer.party)
@@ -31,10 +31,10 @@ const u16 __data[] = { 0, 0, 0, 0,
     {{ mon.difficulty }}, // Difficulty 0-255
     {{ mon.level }}, // Level
     {{ mon.species }}, // Species
-##     if trainer.type == 2 or trainer.type == 3
+##     if trainer.type == "TRTYPE_MON_ITEM" or trainer.type == "TRTYPE_MON_ITEM_MOVES"
     {{ mon.item }}, // Held item
 ##     endif
-##     if trainer.type == 1 or trainer.type == 3
+##     if trainer.type == "TRTYPE_MON_MOVES" or trainer.type == "TRTYPE_MON_ITEM_MOVES"
     // Moveset
 ##       for i in range(4)
 ##         if i < length(mon.moves)
-- 
cgit v1.2.3