Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz
2019-10-25 09:22:50 +08:00
136 changed files with 3963 additions and 6605 deletions
+1
View File
@@ -35,6 +35,7 @@ extern struct UCoords32 gDirectionToVectors[];
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
extern MainCallback gFieldCallback;
extern struct WarpData gUnknown_2031DB4;
extern struct WarpData gUnknown_2031DBC;
extern u8 gUnknown_2031DE0;