Merge branch 'master' into easy_chat

2017-09-26 18:24:39 -04:00
parent 0e75d957d6 3c8091393c
commit d160ca4679
123 changed files with 9835 additions and 4539 deletions
--- a/include/berry.h
+++ b/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
--- a/include/gba/defines.h
+++ b/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