3 files changed, 38 insertions, 27 deletions
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 8a820353f..b59adedd5 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -1080,6 +1080,7 @@ u8 sub_80EB868(u8);
 void sub_80EB890(u8);
 u8 sub_80EB8C0(void);
 u16 sub_80EB8EC(void);
+u8 *sub_80EB544(u8 *dst, u16 *words, u16 arg2, u16 arg3);
 
 #if GERMAN
 u32 de_sub_80EB748(u32, u32);
diff --git a/include/global.h b/include/global.h
index 11611dc41..1431bf772 100644
--- a/include/global.h
+++ b/include/global.h
@@ -766,8 +766,11 @@ struct BattleTowerRecord // record mixing
     /*0x01*/u8 trainerClass;
     /*0x02*/u16 var_2;
     /*0x04*/u8 name[8];
-    /*0x0C*/u8 var_C[5];
-    u8 filler[0x93];
+    /*0x0C*/u8 var_C[4];
+    /*0x10*/struct {
+        u16 easyChat[6];
+    } greeting;
+    /*0x1C*/u8 filler[0x87];
 };
 
 struct BattleTowerEReaderTrainer
@@ -775,8 +778,14 @@ struct BattleTowerEReaderTrainer
     /*0x00*/u8 unk0;
     /*0x01*/u8 trainerClass;
     /*0x02*/u16 filler_2;
-    /*0x04*/u8 name[8];
-    /*0x0B*/u8 ereaderTrainer[0xB0];
+    /*0x04*/u8 name[7];
+    /*0x0B*/u8 filler_B[0x5];
+    /*0x10*/struct {
+        u16 easyChat[6];
+    } greeting;
+    /*0x1C*/u8 filler_1C[0x18];
+    /*0x34*/struct UnknownPokemonStruct party[3];
+    /*0xB8*/u32 unk_B0;
 };
 
 struct SaveBlock2_Sub
@@ -788,6 +797,7 @@ struct SaveBlock2_Sub
     /*0x03DC, 0x0484*/ u8 filler_3DC[0x14];
     /*0x03F0, 0x0498*/ struct BattleTowerEReaderTrainer ereaderTrainer;
     /*0x04AC, 0x0554*/ u8 battleTowerLevelType:1; // 0 = level 50; 1 = level 100
+    /*0x04AC, 0x0554*/ u8 unk_554:1;
     /*0x04AD, 0x0555*/ u8 var_4AD; // used by tv, but ultimately does nothing, since both code paths are identical
     /*0x04AE, 0x0556*/ u8 var_4AE[2];
     /*0x04B0, 0x0558*/ u16 var_4B0[2];
diff --git a/include/pokemon.h b/include/pokemon.h
index 4c3e27609..554d18aa6 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -288,29 +288,29 @@ struct Pokemon
 
 struct UnknownPokemonStruct
 {
-    u16 species;
-    u16 heldItem;
-    u16 moves[4];
-    u8 level;
-    u8 ppBonuses;
-    u8 hpEV;
-    u8 attackEV;
-    u8 defenseEV;
-    u8 speedEV;
-    u8 spAttackEV;
-    u8 spDefenseEV;
-    u32 otId;
-    u32 hpIV:5;
-    u32 attackIV:5;
-    u32 defenseIV:5;
-    u32 speedIV:5;
-    u32 spAttackIV:5;
-    u32 spDefenseIV:5;
-    u32 gap:1;
-    u32 altAbility:1;
-    u32 personality;
-    u8 nickname[POKEMON_NAME_LENGTH + 1];
-    u8 friendship;
+    /*0x00*/u16 species;
+    /*0x02*/u16 heldItem;
+    /*0x04*/u16 moves[4];
+    /*0x0C*/u8 level;
+    /*0x0D*/u8 ppBonuses;
+    /*0x0E*/u8 hpEV;
+    /*0x0F*/u8 attackEV;
+    /*0x10*/u8 defenseEV;
+    /*0x11*/u8 speedEV;
+    /*0x12*/u8 spAttackEV;
+    /*0x13*/u8 spDefenseEV;
+    /*0x14*/u32 otId;
+    /*0x18*/u32 hpIV:5;
+    /*0x18*/u32 attackIV:5;
+    /*0x19*/u32 defenseIV:5;
+    /*0x19*/u32 speedIV:5;
+    /*0x1A*/u32 spAttackIV:5;
+    /*0x1A*/u32 spDefenseIV:5;
+    /*0x1B*/u32 gap:1;
+    /*0x1B*/u32 altAbility:1;
+    /*0x1C*/u32 personality;
+    /*0x20*/u8 nickname[POKEMON_NAME_LENGTH + 1];
+    /*0x2B*/u8 friendship;
 };
 
 struct BattlePokemon