Merge branch 'master' into link

2017-11-27 20:05:51 -05:00
parent 73b0f9eb53 18c6b8efc2
commit cbd2718b5e
106 changed files with 13373 additions and 14129 deletions
@@ -239,7 +239,9 @@ struct SaveBlock2
    /*0xCA9*/ u8 field_CA9_d : 1;   // 0x20
    /*0xCA9*/ u8 field_CA9_e : 1;   // 0x40
    /*0xCA9*/ u8 field_CA9_f : 1;   // 0x80
-    /*0xCAA*/ u16 field_CAA[0x2e];
+    /*0xCAA*/ u16 field_CAA[4];
+    /*0xCB2*/ u16 battlePyramidWildHeaderId;
+    /*0xCB4*/ u8 field_CB4[82];
    /*0xD06*/ u8 field_D06;
    /*0xD07*/ u8 field_D07;
    /*0xD08*/ u8 filler_D08[0x112];