Merge branch 'master' into reverts

2020-10-26 12:16:36 -03:00
parent fe40c0c466 585f313c64
commit 1c3d75f673
382 changed files with 22866 additions and 22447 deletions
--- a/src/battle_ai_script_commands.c
+++ b/src/battle_ai_script_commands.c
@@ -14,7 +14,6 @@
 #include "constants/battle_ai.h"
 #include "constants/battle_move_effects.h"
 #include "constants/moves.h"
-#include "constants/species.h"

 #define AI_ACTION_DONE          0x0001
 #define AI_ACTION_FLEE          0x0002