From 6cba8392ab56bb1e35f7da5fb43fefb8f3cee5ca Mon Sep 17 00:00:00 2001
From: "Brandon M. M. Green" <bmmgreen@gmail.com>
Date: Thu, 9 Jul 2026 16:47:20 +0000
Subject: [PATCH] Reconciling the trainers folder

---
 wla/data/trainers/ai_pointers_reconcile.asm   | 52 ++++++++++++++++++
 .../trainers/encounter_types_reconcile.asm    | 22 ++++++++
 wla/data/trainers/move_choices_reconcile.asm  | 55 +++++++++++++++++++
 wla/data/trainers/names_reconcile.asm         | 53 ++++++++++++++++++
 4 files changed, 182 insertions(+)
 create mode 100644 wla/data/trainers/ai_pointers_reconcile.asm
 create mode 100644 wla/data/trainers/encounter_types_reconcile.asm
 create mode 100644 wla/data/trainers/move_choices_reconcile.asm
 create mode 100644 wla/data/trainers/names_reconcile.asm

diff --git a/wla/data/trainers/ai_pointers_reconcile.asm b/wla/data/trainers/ai_pointers_reconcile.asm
new file mode 100644
index 000000000..61ea595fd
--- /dev/null
+++ b/wla/data/trainers/ai_pointers_reconcile.asm
@@ -0,0 +1,52 @@
+; Reconciled from master RGBDS source: data/trainers/ai_pointers.asm
+
+
+TrainerAIPointers:
+
+.DW 3, GenericAI ; YOUNGSTER
+.DW 3, GenericAI ; BUG_CATCHER
+.DW 3, GenericAI ; LASS
+.DW 3, GenericAI ; SAILOR
+.DW 3, GenericAI ; JR_TRAINER_M
+.DW 3, GenericAI ; JR_TRAINER_F
+.DW 3, GenericAI ; POKEMANIAC
+.DW 3, GenericAI ; SUPER_NERD
+.DW 3, GenericAI ; HIKER
+.DW 3, GenericAI ; BIKER
+.DW 3, GenericAI ; BURGLAR
+.DW 3, GenericAI ; ENGINEER
+.DW 3, JugglerAI ; UNUSED_JUGGLER
+.DW 3, GenericAI ; FISHER
+.DW 3, GenericAI ; SWIMMER
+.DW 3, GenericAI ; CUE_BALL
+.DW 3, GenericAI ; GAMBLER
+.DW 3, GenericAI ; BEAUTY
+.DW 3, GenericAI ; PSYCHIC_TR
+.DW 3, GenericAI ; ROCKER
+.DW 3, JugglerAI ; JUGGLER
+.DW 3, GenericAI ; TAMER
+.DW 3, GenericAI ; BIRD_KEEPER
+.DW 2, BlackbeltAI ; BLACKBELT
+.DW 3, GenericAI ; RIVAL1
+.DW 3, GenericAI ; PROF_OAK
+.DW 1, GenericAI ; CHIEF
+.DW 3, GenericAI ; SCIENTIST
+.DW 1, GiovanniAI ; GIOVANNI
+.DW 3, GenericAI ; ROCKET
+.DW 2, CooltrainerMAI ; COOLTRAINER_M
+.DW 1, CooltrainerFAI ; COOLTRAINER_F
+.DW 2, BrunoAI ; BRUNO
+.DW 5, BrockAI ; BROCK
+.DW 1, MistyAI ; MISTY
+.DW 1, LtSurgeAI ; LT_SURGE
+.DW 1, ErikaAI ; ERIKA
+.DW 2, KogaAI ; KOGA
+.DW 2, BlaineAI ; BLAINE
+.DW 1, SabrinaAI ; SABRINA
+.DW 3, GenericAI ; GENTLEMAN
+.DW 1, Rival2AI ; RIVAL2
+.DW 1, Rival3AI ; RIVAL3
+.DW 2, LoreleiAI ; LORELEI
+.DW 3, GenericAI ; CHANNELER
+.DW 2, AgathaAI ; AGATHA
+.DW 1, LanceAI ; LANCE
diff --git a/wla/data/trainers/encounter_types_reconcile.asm b/wla/data/trainers/encounter_types_reconcile.asm
new file mode 100644
index 000000000..b8f641f39
--- /dev/null
+++ b/wla/data/trainers/encounter_types_reconcile.asm
@@ -0,0 +1,22 @@
+; Reconciled from master RGBDS source: data/trainers/encounter_types.asm
+
+
+FemaleTrainerList:
+
+.DB OPP_LASS
+.DB OPP_JR_TRAINER_F
+.DB OPP_BEAUTY
+.DB OPP_COOLTRAINER_F
+.DB -1 ; end
+
+EvilTrainerList:
+
+.DB OPP_UNUSED_JUGGLER
+.DB OPP_GAMBLER
+.DB OPP_ROCKER
+.DB OPP_JUGGLER
+.DB OPP_CHIEF
+.DB OPP_SCIENTIST
+.DB OPP_GIOVANNI
+.DB OPP_ROCKET
+.DB -1 ; end
diff --git a/wla/data/trainers/move_choices_reconcile.asm b/wla/data/trainers/move_choices_reconcile.asm
new file mode 100644
index 000000000..86074e8ee
--- /dev/null
+++ b/wla/data/trainers/move_choices_reconcile.asm
@@ -0,0 +1,55 @@
+; Reconciled from master RGBDS source: data/trainers/move_choices.asm
+; The MACRO mon_cry generates 3-byte entries but cannot be directly converted
+; without knowing CRY_SFX_START value. Documenting structure here.
+
+
+
+TrainerClassMoveChoiceModifications:
+
+.DB 0 ; end
+.DB 1       ; BUG_CATCHER
+.DB 1       ; LASS
+.DB 1, 3    ; SAILOR
+.DB 1       ; JR_TRAINER_M
+.DB 1       ; JR_TRAINER_F
+.DB 1, 2, 3 ; POKEMANIAC
+.DB 1, 2    ; SUPER_NERD
+.DB 1       ; HIKER
+.DB 1       ; BIKER
+.DB 1, 3    ; BURGLAR
+.DB 1       ; ENGINEER
+.DB 1, 2    ; UNUSED_JUGGLER
+.DB 1, 3    ; FISHER
+.DB 1, 3    ; SWIMMER
+.DB 0 ; end
+.DB 1       ; GAMBLER
+.DB 1, 3    ; BEAUTY
+.DB 1, 2    ; PSYCHIC_TR
+.DB 1, 3    ; ROCKER
+.DB 1       ; JUGGLER
+.DB 1       ; TAMER
+.DB 1       ; BIRD_KEEPER
+.DB 1       ; BLACKBELT
+.DB 1       ; RIVAL1
+.DB 1, 3    ; PROF_OAK
+.DB 1, 2    ; CHIEF
+.DB 1, 2    ; SCIENTIST
+.DB 1, 3    ; GIOVANNI
+.DB 1       ; ROCKET
+.DB 1, 3    ; COOLTRAINER_M
+.DB 1, 3    ; COOLTRAINER_F
+.DB 1       ; BRUNO
+.DB 1       ; BROCK
+.DB 1, 3    ; MISTY
+.DB 1, 3    ; LT_SURGE
+.DB 1, 3    ; ERIKA
+.DB 1, 3    ; KOGA
+.DB 1, 3    ; BLAINE
+.DB 1, 3    ; SABRINA
+.DB 1, 2    ; GENTLEMAN
+.DB 1, 3    ; RIVAL2
+.DB 1, 3    ; RIVAL3
+.DB 1, 2, 3 ; LORELEI
+.DB 1       ; CHANNELER
+.DB 1       ; AGATHA
+.DB 1, 3    ; LANCE
diff --git a/wla/data/trainers/names_reconcile.asm b/wla/data/trainers/names_reconcile.asm
new file mode 100644
index 000000000..3ea7bf4b7
--- /dev/null
+++ b/wla/data/trainers/names_reconcile.asm
@@ -0,0 +1,53 @@
+; Reconciled from master RGBDS source: data/trainers/names.asm
+; Converted .list_start/.li → explicit .DB per entry
+
+
+TrainerNames:
+
+.DB "YOUNGSTER"
+.DB "BUG CATCHER"
+.DB "LASS"
+.DB "SAILOR"
+.DB "JR.TRAINER♂"
+.DB "JR.TRAINER♀"
+.DB "POKéMANIAC"
+.DB "SUPER NERD"
+.DB "HIKER"
+.DB "BIKER"
+.DB "BURGLAR"
+.DB "ENGINEER"
+.DB "JUGGLER"
+.DB "FISHERMAN"
+.DB "SWIMMER"
+.DB "CUE BALL"
+.DB "GAMBLER"
+.DB "BEAUTY"
+.DB "PSYCHIC"
+.DB "ROCKER"
+.DB "JUGGLER"
+.DB "TAMER"
+.DB "BIRD KEEPER"
+.DB "BLACKBELT"
+.DB "RIVAL1"
+.DB "PROF.OAK"
+.DB "CHIEF"
+.DB "SCIENTIST"
+.DB "GIOVANNI"
+.DB "ROCKET"
+.DB "COOLTRAINER♂"
+.DB "COOLTRAINER♀"
+.DB "BRUNO"
+.DB "BROCK"
+.DB "MISTY"
+.DB "LT.SURGE"
+.DB "ERIKA"
+.DB "KOGA"
+.DB "BLAINE"
+.DB "SABRINA"
+.DB "GENTLEMAN"
+.DB "RIVAL2"
+.DB "RIVAL3"
+.DB "LORELEI"
+.DB "CHANNELER"
+.DB "AGATHA"
+.DB "LANCE"