Merge remote-tracking branch 'origin/master' into doc_field_effect_templates

4 files changed, 43 insertions, 4 deletions

diff --git a/include/cereader_tool.h b/include/cereader_tool.h
index dd1866fb3..5dd0a7589 100644
--- a/include/cereader_tool.h
+++ b/include/cereader_tool.h
@@ -8,7 +8,7 @@ struct TrainerTowerTrainer
 {
     /* 0x000 */ u8 name[11];
     /* 0x00B */ u8 facilityClass;
-    /* 0x00C */ u8 gender;
+    /* 0x00C */ u8 textColor;
     /* 0x00E */ u16 speechBefore[6];
     /* 0x01A */ u16 speechWin[6];
     /* 0x026 */ u16 speechLose[6];
@@ -18,7 +18,7 @@ struct TrainerTowerTrainer
 
 struct TrainerTowerFloor
 {
-    /* 0x000 */ u8 unk_000;
+    /* 0x000 */ u8 id;
     /* 0x001 */ u8 floorIdx;
     /* 0x002 */ u8 challengeType;
     /* 0x003 */ u8 prize;
diff --git a/include/constants/trainer_tower.h b/include/constants/trainer_tower.h
index 6372a30e8..ea0039ea1 100644
--- a/include/constants/trainer_tower.h
+++ b/include/constants/trainer_tower.h
@@ -4,12 +4,29 @@
 #define CHALLENGE_TYPE_SINGLE     0
 #define CHALLENGE_TYPE_DOUBLE     1
 #define CHALLENGE_TYPE_KNOCKOUT   2
+#define CHALLENGE_TYPE_MIXED      3
 // Mixed challenges use one of the above 3 for each floor
 
 #define CHALLENGE_STATUS_LOST     0
 #define CHALLENGE_STATUS_UNK      1  // Never set, possibly e-Card related
 #define CHALLENGE_STATUS_NORMAL   2  // Not started or ongoing
 
+#define TTPRIZE_HP_UP               0
+#define TTPRIZE_PROTEIN             1
+#define TTPRIZE_IRON                2
+#define TTPRIZE_CARBOS              3
+#define TTPRIZE_CALCIUM             4
+#define TTPRIZE_ZINC                5
+#define TTPRIZE_BRIGHT_POWDER       6
+#define TTPRIZE_WHITE_HERB          7
+#define TTPRIZE_MENTAL_HERB         8
+#define TTPRIZE_CHOICE_BAND         9
+#define TTPRIZE_KINGS_ROCK         10
+#define TTPRIZE_SCOPE_LENS         11
+#define TTPRIZE_METAL_COAT         12
+#define TTPRIZE_DRAGON_SCALE       13
+#define TTPRIZE_UP_GRADE           14
+
 #define MAX_TRAINER_TOWER_FLOORS 8
 
 #define MAX_TRAINERS_PER_FLOOR  3
diff --git a/include/easy_chat.h b/include/easy_chat.h
index 11711cbbc..9c6400fd1 100644
--- a/include/easy_chat.h
+++ b/include/easy_chat.h
@@ -31,7 +31,7 @@ struct EasyChatWordsByLetter
 };
 
 u8 *CopyEasyChatWord(u8 *dest, u16 word);
-u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 length1, u16 length2);
+u8 *ConvertEasyChatWordsToString(u8 *dest, const u16 *src, u16 columns, u16 rows);
 bool8 EC_DoesEasyChatStringFitOnLine(const u16 *easyChatWords, u8 columns, u8 rows, u16 maxLength);
 void EC_ResetMEventProfileMaybe(void);
 void InitEasyChatPhrases(void);
diff --git a/include/list_menu.h b/include/list_menu.h
index 24c614e39..df204b247 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -28,6 +28,28 @@ struct ListMenuItem
 
 struct ListMenu;
 
+// For ListMenuGet/SetTemplateField
+enum ListMenuFields
+{
+    LISTFIELD_MOVECURSORFUNC = 0,
+    LISTFIELD_MOVECURSORFUNC2,
+    LISTFIELD_TOTALITEMS,
+    LISTFIELD_MAXSHOWED,
+    LISTFIELD_WINDOWID,
+    LISTFIELD_HEADERX,
+    LISTFIELD_ITEMX,
+    LISTFIELD_CURSORX,
+    LISTFIELD_UPTEXTY,
+    LISTFIELD_CURSORPAL,
+    LISTFIELD_FILLVALUE,
+    LISTFIELD_CURSORSHADOWPAL,
+    LISTFIELD_LETTERSPACING,
+    LISTFIELD_ITEMVERTICALPADDING,
+    LISTFIELD_SCROLLMULTIPLE,
+    LISTFIELD_FONTID,
+    LISTFIELD_CURSORKIND,
+};
+
 struct ListMenuTemplate
 {
     /*0x00*/ const struct ListMenuItem *items;
@@ -82,6 +104,6 @@ void ListMenuGetScrollAndRow(u8 listTaskId, u16 *cursorPos, u16 *itemsAbove);
 u16 ListMenuGetYCoordForPrintingArrowCursor(u8 listTaskId);
 void ListMenuOverrideSetColors(u8 cursorPal, u8 fillValue, u8 cursorShadowPal);
 void ListMenuDefaultCursorMoveFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list);
-void ListMenuSetUnkIndicatorsStructField(u8 taskId, u8 field, s32 value);
+void ListMenuSetTemplateField(u8 taskId, u8 field, s32 value);
 
 #endif //GUARD_LIST_MENU_H