Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz committed 2019-10-25 09:22:50 +08:00
commit 2f87855072
136 files changed
+3963 -6605

No files matched your search

+2 -1
View File
@@ -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;