Merge branch 'master' into doc-ttower

2020-02-15 20:44:57 -05:00
parent 34deceb136 fee980decd
commit a4cd331634
327 changed files with 14966 additions and 18895 deletions
@@ -40,6 +40,10 @@
 #define FEMALE 1
 #define GENDER_COUNT 2

+#define BARD_SONG_LENGTH       6
+#define NUM_STORYTELLER_TALES  4
+#define NUM_TRADER_ITEMS       4
+
 #define OPTIONS_BUTTON_MODE_HELP         0
 #define OPTIONS_BUTTON_MODE_LR           1
 #define OPTIONS_BUTTON_MODE_L_EQUALS_A   2
@@ -64,6 +68,7 @@

 #define MAX_MON_MOVES 4

+#define TRAINER_ID_LENGTH 4
 #define PARTY_SIZE 6
 #define MULTI_PARTY_SIZE (PARTY_SIZE / 2)