2 files changed, 25 insertions, 51 deletions

diff --git a/include/global.h b/include/global.h
index 26ce4a8cc..8e85b3123 100644
--- a/include/global.h
+++ b/include/global.h
@@ -241,33 +241,6 @@ struct LinkBattleRecords
     u8 languages[LINK_B_RECORDS_COUNT];
 };
 
-struct BattleTowerPokemon
-{
-    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;
-};
-
 struct UnknownSaveBlock2Struct
 {
     u8 field_0;
diff --git a/include/pokemon.h b/include/pokemon.h
index 6a9b85e71..f1f04c9eb 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -310,31 +310,31 @@ struct PokemonStorage
     /*0x83C2*/ u8 boxWallpapers[14];
 };
 
-struct UnknownPokemonStruct
+struct BattleTowerPokemon
 {
-    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;
+             u32 attackIV:5;
+             u32 defenseIV:5;
+             u32 speedIV:5;
+             u32 spAttackIV:5;
+             u32 spDefenseIV:5;
+             u32 gap:1;
+             u32 altAbility:1;
+    /*0x1C*/ u32 personality;
+    /*0x20*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+    /*0x2B*/ u8 friendship;
 };
 
 #define BATTLE_STATS_NO 8
@@ -672,5 +672,6 @@ void BattleAnimateBackSprite(struct Sprite* sprite, u16 species);
 
 void PlayMapChosenOrBattleBGM(u16 songId);
 u8 GetMonsStateToDoubles(void);
+void sub_803E0A4(struct Pokemon *mon, struct BattleTowerPokemon *src);
 
 #endif // GUARD_POKEMON_H