Merge branch 'master' into battle

2019-10-25 09:22:50 +08:00
parent 6ca932e5e9 7579fc65c1
commit 2f87855072
136 changed files with 3963 additions and 6605 deletions
@@ -105,7 +105,8 @@ union BgUnion
    u8 *script;

    // hidden item type probably
-    struct HiddenItemStruct hiddenItem;
+    struct HiddenItemStruct hiddenItemStr;
+    u32 hiddenItem;

    // secret base type
    u32 secretBaseId;