Merge branch 'master' into sprite-tags

This commit is contained in:
garak authored and GitHub committed 2018-10-21 15:12:18 -04:00
commit 7a9c7e5f06
73 files changed
+8366 -8378

No files matched your search

-3
View File
@@ -33,9 +33,6 @@ struct BattleAnimBackground
#define ANIM_ARGS_COUNT 8
#define PAN_SIDE_PLAYER -64
#define PAN_SIDE_OPPONENT 63
extern void (*gAnimScriptCallback)(void);
extern bool8 gAnimScriptActive;
extern u8 gAnimVisualTaskCount;