Merge branch 'master' into contest-ai-cleanup

This commit is contained in:
Phlosioneer
2019-04-07 20:20:22 -04:00
732 changed files with 38218 additions and 41300 deletions
+1 -1
View File
@@ -139,7 +139,7 @@ void sub_8022960(struct BerryCrushGame *);
void sub_8022524(struct BerryCrushGame_138 *, u16);
void sub_8022B28(struct Sprite *);
extern struct BerryCrushGame *gUnknown_02022C90;
static EWRAM_DATA struct BerryCrushGame *gUnknown_02022C90 = NULL;
extern const struct BgTemplate gUnknown_082F32C8[4];
extern const u8 gBerryCrushGrinderTopTilemap[];