Merge origin/master into pikalaxalt/link

This commit is contained in:
PikalaxALT
2017-11-16 08:36:51 -05:00
2913 changed files with 158852 additions and 19880 deletions

View File

@@ -5,7 +5,7 @@
// Exported RAM declarations
extern u16 gScriptItemId;
extern u16 gSpecialVar_ItemId;
// Exported ROM declarations
void sub_81AAC50(void);