Document some frontier util funcs

3 files changed, 36 insertions, 4 deletions

diff --git a/include/constants/frontier_util.h b/include/constants/frontier_util.h
new file mode 100644
index 000000000..52bde509f
--- /dev/null
+++ b/include/constants/frontier_util.h
@@ -0,0 +1,32 @@
+#ifndef GUARD_CONSTANTS_FRONTIER_UTIL_H
+#define GUARD_CONSTANTS_FRONTIER_UTIL_H
+
+#define FRONTIER_BEFORE_TEXT      0
+#define FRONTIER_PLAYER_LOST_TEXT 1
+#define FRONTIER_PLAYER_WON_TEXT  2
+
+#define FRONTIER_UTIL_FUNC_0                      0
+#define FRONTIER_UTIL_FUNC_1                      1
+#define FRONTIER_UTIL_FUNC_2                      2
+#define FRONTIER_UTIL_FUNC_LOAD_SELECTED_PARTY    3
+#define FRONTIER_UTIL_FUNC_SOFT_RESET             4
+#define FRONTIER_UTIL_FUNC_SET_FRONTIER_TRAINERS  5
+#define FRONTIER_UTIL_FUNC_6                      6
+#define FRONTIER_UTIL_FUNC_RESULTS_WINDOW         7
+#define FRONTIER_UTIL_FUNC_8                      8
+#define FRONTIER_UTIL_FUNC_9                      9
+#define FRONTIER_UTIL_FUNC_IS_FRONTIER_BRAIN      10
+#define FRONTIER_UTIL_FUNC_11                     11
+#define FRONTIER_UTIL_FUNC_GET_FACILITY_SYMBOLS   12
+#define FRONTIER_UTIL_FUNC_GIVE_FACILITY_SYMBOL   13
+#define FRONTIER_UTIL_FUNC_CHECK_BATTLE_TYPE      14
+#define FRONTIER_UTIL_FUNC_15                     15
+#define FRONTIER_UTIL_FUNC_CHECK_VISIT_TRAINER    16
+#define FRONTIER_UTIL_FUNC_17                     17
+#define FRONTIER_UTIL_FUNC_18                     18
+#define FRONTIER_UTIL_FUNC_19                     19
+#define FRONTIER_UTIL_FUNC_BUFFER_TRAINER_NAME    20
+#define FRONTIER_UTIL_FUNC_21                     21
+#define FRONTIER_UTIL_FUNC_SET_BRAIN_OBJECT       22
+
+#endif // GUARD_CONSTANTS_FRONTIER_UTIL_H
diff --git a/include/constants/items.h b/include/constants/items.h
index 3664f6dd2..b4e4798fb 100644
--- a/include/constants/items.h
+++ b/include/constants/items.h
@@ -471,10 +471,14 @@
 #define LAST_BERRY_MASTER_BERRY       ITEM_NOMEL_BERRY
 #define FIRST_BERRY_MASTER_WIFE_BERRY ITEM_CHERI_BERRY
 #define LAST_BERRY_MASTER_WIFE_BERRY  ITEM_SITRUS_BERRY
+#define FIRST_KIRI_BERRY              ITEM_POMEG_BERRY
+#define LAST_KIRI_BERRY               ITEM_NOMEL_BERRY
 
 #define NUM_BERRY_MASTER_BERRIES         LAST_BERRY_MASTER_BERRY - FIRST_BERRY_MASTER_BERRY + 1
 #define NUM_BERRY_MASTER_BERRIES_SKIPPED FIRST_BERRY_MASTER_BERRY - FIRST_BERRY_INDEX
 #define NUM_BERRY_MASTER_WIFE_BERRIES    LAST_BERRY_MASTER_WIFE_BERRY - FIRST_BERRY_MASTER_WIFE_BERRY + 1
+#define NUM_KIRI_BERRIES                 LAST_KIRI_BERRY - FIRST_KIRI_BERRY + 1
+#define NUM_KIRI_BERRIES_SKIPPED         FIRST_KIRI_BERRY - FIRST_BERRY_INDEX
 
 #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
 
diff --git a/include/frontier_util.h b/include/frontier_util.h
index 9464ba91c..627b5bef5 100644
--- a/include/frontier_util.h
+++ b/include/frontier_util.h
@@ -1,10 +1,6 @@
 #ifndef GUARD_FRONTIER_UTIL_H
 #define GUARD_FRONTIER_UTIL_H
 
-#define FRONTIER_BEFORE_TEXT 0
-#define FRONTIER_PLAYER_LOST_TEXT 1
-#define FRONTIER_PLAYER_WON_TEXT 2
-
 void CallFrontierUtilFunc(void);
 u8 sub_81A3610(void);
 void CopyFrontierTrainerText(u8 whichText, u16 trainerId);