start working on battle 7

include/battle.h

@@ -944,6 +944,12 @@ struct BattleAnimationInfo
     u8 field_9_x20 : 1;
     u8 field_9_x40 : 1;
     u8 field_9_x80 : 1;
+    u8 field_A;
+    u8 field_B;
+    u8 field_C;
+    u8 field_D;
+    u8 field_E;
+    u8 field_F;
 };
 
 struct BattleHealthboxInfo

include/battle_script_commands.h

@@ -57,6 +57,6 @@ void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags);
 bool8 UproarWakeUpCheck(u8 bank);
 
 extern void (* const gBattleScriptingCommandsTable[])(void);
-extern const u8 gUnknown_0831C494[];
+extern const u8 gUnknown_0831C494[][4];
 
 #endif // GUARD_BATTLE_SCRIPT_COMMANDS_H

include/malloc.h

@@ -5,6 +5,12 @@
 #define calloc(ct, sz) AllocZeroed((ct) * (sz))
 #define free Free
 
+#define FREE_AND_SET_NULL(ptr)          \
+{                                       \
+    free(ptr);                          \
+    ptr = NULL;                         \
+}
+
 extern u8 gHeap[];
 void *Alloc(u32 size);
 void *AllocZeroed(u32 size);