Merge branch 'master' into decompile_battle_tent

2018-06-30 14:43:41 +02:00
parent 5434db2fc6 91ee3221b3
commit 15fe5a031b
2916 changed files with 9504 additions and 10000 deletions
@@ -785,7 +785,7 @@ struct SaveBlock1
    /*0x2E*/ u8 weather;
    /*0x2F*/ u8 filler_2F;
    /*0x30*/ u8 flashLevel;
-    /*0x32*/ u16 mapDataId;
+    /*0x32*/ u16 mapLayoutId;
    /*0x34*/ u16 mapView[0x100];
    /*0x234*/ u8 playerPartyCount;
    /*0x238*/ struct Pokemon playerParty[PARTY_SIZE];