Merge branch 'master' into sprite-tags

2018-10-21 15:12:18 -04:00
parent 2bb286ab4e 804d0a4b6a
commit 7a9c7e5f06
73 changed files with 8366 additions and 8378 deletions
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -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;