pokemon2 get mon data troubles

include/battle.h

@@ -33,9 +33,13 @@
 #define BATTLE_TYPE_RAYQUAZA        0x40000000
 
 #define STEVEN_PARTNER_ID           0xC03
+#define SECRET_BASE_OPPONENT        0x400
 
 #define BATTLE_TYPE_FRONTIER        (BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID)
 
+#define SIDE_PLAYER     0x0
+#define SIDE_OPPONENT   0x1
+
 #define BATTLE_WON                  0x1
 #define BATTLE_LOST                 0x2
 #define BATTLE_DREW                 0x3
@@ -513,12 +517,15 @@ struct BattleScripting
 
 extern struct BattleScripting gBattleScripting;
 
-struct BattleDecompressedSprites
+#include "sprite.h"
+
+struct BattleSpritesGfx
 {
     void* firstDecompressed; // ptr to the decompressed sprite of the first pokemon
     void* sprites[4];
+    struct SpriteTemplate templates[4];
 };
 
-extern struct BattleDecompressedSprites* gBattleDecompressedSprites;
+extern struct BattleSpritesGfx* gBattleSpritesGfx;
 
 #endif // GUARD_BATTLE_H

include/pokemon.h

@@ -89,7 +89,7 @@
 #define MON_DATA_DEF2              85
 #define MON_DATA_SPD2              86
 #define MON_DATA_SPATK2            87
-#define MON_DATA_SPDEF2 88
+#define MON_DATA_SPDEF2            88
 
 #define OT_ID_RANDOM_NO_SHINY 2
 #define OT_ID_PRESET 1
@@ -279,7 +279,7 @@ struct Pokemon
     struct BoxPokemon box;
     u32 status;
     u8 level;
-    u8 pokerus;
+    u8 mail;
     u16 hp;
     u16 maxHP;
     u16 attack;
@@ -495,6 +495,10 @@ extern struct PokemonStorage* gPokemonStoragePtr;
 extern const u32 gExperienceTables[][MAX_MON_LEVEL + 1];
 extern const u16 *const gLevelUpLearnsets[];
 
+#define BATTLE_ALIVE_EXCEPT_ACTIVE  0
+#define BATTLE_ALIVE_ATK_SIDE       1
+#define BATTLE_ALIVE_DEF_SIDE       2
+
 void ZeroBoxMonData(struct BoxPokemon *boxMon);
 void ZeroMonData(struct Pokemon *mon);
 void ZeroPlayerPartyMons(void);