almost all matching

include/battle.h

@@ -520,12 +520,12 @@ enum
 
 struct BattleSpriteInfo
 {
-    u16 invisible : 1; // 0x1
-    u16 lowHpSong : 1; // 0x2
-    u16 behindSubstitute : 1; // 0x4
-    u16 flag_x8 : 1; // 0x8
-    u16 hpNumbersNoBars : 1; // 0x10
-    u16 transformSpecies;
+    /*0x0*/ u16 invisible : 1; // 0x1
+            u16 lowHpSong : 1; // 0x2
+            u16 behindSubstitute : 1; // 0x4
+            u16 flag_x8 : 1; // 0x8
+            u16 hpNumbersNoBars : 1; // 0x10
+    /*0x2*/ u16 transformSpecies;
 };
 
 struct BattleAnimationInfo

include/pokeball.h

@@ -20,6 +20,8 @@ enum
     POKEBALL_COUNT
 };
 
+extern const struct SpriteTemplate gBallSpriteTemplates[];
+
 #define POKEBALL_PLAYER_SENDOUT     0xFF
 #define POKEBALL_OPPONENT_SENDOUT   0xFE
 

include/sprite.h

@@ -210,7 +210,7 @@ struct Sprite
     /*0x2D*/ u8 animLoopCounter;
 
     // general purpose data fields
-    /*0x2E*/ s16 data[8];	//2e, 30, 32, 34, 36,
+    /*0x2E*/ s16 data[8];	//2e, 30, 32, 34, 36, 38, 3a, 3c
 
     /*0x3E*/ u16 inUse:1;               //1
              u16 coordOffsetEnabled:1;  //2