From fa2fc6e663ada75e891889a643f0fee986a9f1a2 Mon Sep 17 00:00:00 2001
From: grintoul1 <liam.rintoul@outlook.com>
Date: Fri, 6 Feb 2026 22:26:17 +0000
Subject: [PATCH] Trainer struct adjustments to remove previous impact to ROM

---
 include/data.h | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/include/data.h b/include/data.h
index 57ce61b68d..3c86fcabd0 100644
--- a/include/data.h
+++ b/include/data.h
@@ -125,18 +125,19 @@ struct Trainer
     enum Item items[MAX_TRAINER_ITEMS];
     struct StartingStatuses startingStatus; // this trainer starts a battle with a given status. see include/constants/battle.h for values
     u8 trainerClass;
-    u8 encounterMusic:7;
-    u8 gender:1;
+    u16 encounterMusic:4;
+    u16 multiTeamSize:1;
+    u16 gender:1;
+    u16 battleType:2;
+    u16 mugshotColor:3;
+    u16 partySize:3;
+    u16 padding:2;
     enum TrainerPicID trainerPic;
     u8 trainerName[TRAINER_NAME_LENGTH + 1];
-    u8 battleType:2;
-    u8 mugshotColor:6;
-    u8 partySize;
     u8 poolSize;
     u8 poolRuleIndex;
     u8 poolPickIndex;
     u8 poolPruneIndex;
-    u8 multiTeamSize;
     u16 overrideTrainer;
     enum TrainerPicID trainerBackPic;
 };