merge with master and move to C

include/berry.h

@@ -53,4 +53,11 @@ void ResetBerryTreeSparkleFlags(void);
 
 extern const struct Berry gBerries[];
 
+struct UnkStruct_0858AB24 {
+    u8 unk0;
+    u16 unk1;
+};
+
+extern const struct UnkStruct_0858AB24 gUnknown_0858AB24[];
+
 #endif // GUARD_BERRY_H

include/gba/defines.h

@@ -50,6 +50,8 @@
 #define OAM      0x7000000
 #define OAM_SIZE 0x400
 
+#define ROM_HEADER_SIZE   0xC0
+
 #define DISPLAY_WIDTH  240
 #define DISPLAY_HEIGHT 160