Merge branch 'master' into battle

This commit is contained in:
jiangzhengwenjz committed 2019-11-19 10:26:40 +08:00
commit 1d3ae2fe78
188 files changed
+15683 -8215

No files matched your search

+1
View File
@@ -45,6 +45,7 @@ extern u8 gUnknown_203B0C0;
extern u8 gUnknown_203B0C1;
extern u8 gUnknown_203B0DC[3];
extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func);
extern u8 gSelectedOrderFromParty[3];
bool8 FieldCallback_PrepareFadeInFromMenu(void);
bool8 MonKnowsMove(struct Pokemon *, u16);