Merge branch 'master' into event_object_movement

2020-03-13 00:32:04 -07:00
parent 339c2914af 6af8c04d8f
commit 99e4de062a
3241 changed files with 80742 additions and 133435 deletions
@@ -35,6 +35,8 @@

 #define QUEST_LOG_SCENE_COUNT 4

+#define NUM_TOWER_CHALLENGE_TYPES 4
+
 #define MALE   0
 #define FEMALE 1
 #define GENDER_COUNT 2