3 files changed, 40 insertions, 24 deletions
diff --git a/include/international_string_util.h b/include/international_string_util.h
index 343c5453c..2d5b1c871 100644
--- a/include/international_string_util.h
+++ b/include/international_string_util.h
@@ -2,22 +2,23 @@
 #define GUARD_INTERNATIONAL_STRING_UTIL_H
 
 #include "menu.h"
+#include "list_menu.h"
 
-void sub_81DB52C(const u8 *src);
-void TVShowConvertInternationalString(u8 *dest, const u8 *src, u8 language);
-s32 GetStringCenterAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth);
-s32 GetStringRightAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth);
-s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing);
-s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing);
-s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1);
-s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2);
-// sub_81DB41C
-// CopyMonCategoryText
-// sub_81DB494
-void PadNameString(u8 *dst, u8 padWith);
+void sub_81DB52C(u8 *src);
+void TVShowConvertInternationalString(u8 *dest, const u8 *src, int language);
+int GetStringCenterAlignXOffset(int fontId, const u8 *str, int totalWidth);
+int GetStringRightAlignXOffset(int fontId, const u8 *str, int totalWidth);
+int GetStringCenterAlignXOffsetWithLetterSpacing(int fontId, const u8 *str, int totalWidth, int letterSpacing);
+int GetStringWidthDifference(int fontId, const u8 *str, int totalWidth, int letterSpacing);
+int GetMaxWidthInMenuTable(const struct MenuAction *str, int arg1);
+int sub_81DB3D8(const struct MenuAction *str, const u8* arg1, int arg2);
+int sub_81DB41C(const struct ListMenuTemplate *listMenu);
+void CopyMonCategoryText(int dexNum, u8 *dest);
+u8 *sub_81DB494(u8 *str, int fontId, u8 *str2, int totalStringWidth);
+void PadNameString(u8 *dest, u8 padChar);
 void sub_81DB554(u8 *, u8);
 void sub_81DB5AC(u8 *);
-u32 sub_81DB604(const u8 *);
-// sub_81DB620
+int sub_81DB604(u8 *);
+void sub_81DB620(int windowId, int columnStart, int rowStart, int numFillTiles, int numRows);
 
 #endif // GUARD_INTERNATIONAL_STRING_UTIL_H
diff --git a/include/pokedex.h b/include/pokedex.h
index 11e39997c..3f90e9508 100644
--- a/include/pokedex.h
+++ b/include/pokedex.h
@@ -4,13 +4,6 @@
 extern u8 gUnknown_030060B0;
 extern void (*gUnknown_030060B4)(void);
 
-void ResetPokedex(void);
-void CopyMonCategoryText(u32 species, u8 *dst);
-u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
-u16 GetNationalPokedexCount(u8);
-u16 GetHoennPokedexCount(u8);
-u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality);
-
 enum
 {
     FLAG_GET_SEEN,
@@ -19,6 +12,24 @@ enum
     FLAG_SET_CAUGHT
 };
 
+struct PokedexEntry
+{
+    /*0x00*/ u8 categoryName[12];
+    /*0x0C*/ u16 height; //in decimeters
+    /*0x0E*/ u16 weight; //in hectograms
+    /*0x10*/ const u8 *description;
+    /*0x14*/ u16 unused;
+    /*0x16*/ u16 pokemonScale;
+    /*0x18*/ u16 pokemonOffset;
+    /*0x1A*/ u16 trainerScale;
+    /*0x1C*/ u16 trainerOffset;
+};  /*size = 0x20*/
+
+void ResetPokedex(void);
+u16 GetPokedexHeightWeight(u16 dexNum, u8 data);
+u16 GetNationalPokedexCount(u8);
+u16 GetHoennPokedexCount(u8);
+u8 CreateDexDisplayMonDataTask(u16 dexNum, u32 trainerId, u32 personality);
 s8 GetSetPokedexFlag(u16 nationalNum, u8 caseId);
 u16 sub_80C0E9C(u16, s16, s16, u16);
 
diff --git a/include/text.h b/include/text.h
index 27a6364bb..69cbb87ed 100644
--- a/include/text.h
+++ b/include/text.h
@@ -89,6 +89,13 @@
 #define EXT_CTRL_CODE_COLOR     0x1
 #define EXT_CTRL_CODE_HIGHLIGHT 0x2
 #define EXT_CTRL_CODE_SHADOW    0x3
+//
+#define EXT_CTRL_CODE_UNKNOWN_7 0x7
+//
+#define EXT_CTRL_CODE_CLEAR     0x11
+//
+#define EXT_CTRL_CODE_JPN       0x15
+#define EXT_CTRL_CODE_ENG       0x16
 
 #define TEXT_COLOR_TRANSPARENT  0x0
 #define TEXT_COLOR_WHITE        0x1
@@ -102,9 +109,6 @@
 
 // battle placeholders are located in battle_message.h
 
-#define EXT_CTRL_CODE_JPN   0x15
-#define EXT_CTRL_CODE_ENG   0x16
-
 #define NUM_TEXT_PRINTERS 32
 
 #define TEXT_SPEED_FF 0xFF