Merge master into ObjEvent rename

This commit is contained in:
GriffinR
2019-11-27 12:51:10 -05:00
25 changed files with 631 additions and 590 deletions

View File

@@ -1,7 +1,9 @@
#include "constants/global.h"
#include "constants/apprentice.h"
#include "constants/battle.h"
#include "constants/battle_arena.h"
#include "constants/battle_frontier.h"
#include "constants/battle_palace.h"
#include "constants/battle_pike.h"
#include "constants/battle_pyramid.h"
#include "constants/battle_setup.h"