Merge with master

1 files changed, 16 insertions, 0 deletions

diff --git a/include/battle_main.h b/include/battle_main.h
index 5a61b5ef0..18bdde2f1 100644
--- a/include/battle_main.h
+++ b/include/battle_main.h
@@ -7,6 +7,20 @@ struct TrainerMoney
     u8 value;
 };
 
+struct UnknownPokemonStruct4
+{
+    /*0x00*/ u16 species;
+    /*0x02*/ u16 heldItem;
+    /*0x04*/ u8 nickname[POKEMON_NAME_LENGTH + 1];
+    /*0x0F*/ u8 level;
+    /*0x10*/ u16 hp;
+    /*0x12*/ u16 maxhp;
+    /*0x14*/ u32 status;
+    /*0x18*/ u32 personality;
+    /*0x1C*/ u8 gender;
+    /*0x1D*/ u8 language;
+};
+
 #define TYPE_NAME_LENGTH 6
 #define ABILITY_NAME_LENGTH 12
 
@@ -70,6 +84,8 @@ void RunBattleScriptCommands_PopCallbacksStack(void);
 void RunBattleScriptCommands(void);
 bool8 TryRunFromBattle(u8 battlerId);
 
+extern struct UnknownPokemonStruct4 gUnknown_02022FF8[3];
+
 extern const u8 gTypeEffectiveness[336];
 extern const u8 gTypeNames[][TYPE_NAME_LENGTH + 1];
 extern const struct TrainerMoney gTrainerMoneyTable[];