Merge branch 'master' of https://github.com/pret/pokeemerald into dump_maps

2017-11-15 00:47:34 -06:00
parent 6e6e11205d 3fb2a488f9
commit ce0e5cbfe4
121 changed files with 6022 additions and 11283 deletions
--- a/include/contest.h
+++ b/include/contest.h
@@ -20,6 +20,12 @@ struct ContestStruct_field_18
 {
    // unknown size
    u16 field_0;
+    u16 field_2;
+    u16 field_4;
+    u16 field_6;
+    u32 field_8;
+    u32 field_C;
+    u32 field_10;
 };

 struct ContestResources