8 files changed, 176 insertions, 11 deletions
diff --git a/include/bag.h b/include/bag.h
index 14735443..a785afc6 100644
--- a/include/bag.h
+++ b/include/bag.h
@@ -1,6 +1,7 @@
 #ifndef POKEDIAMOND_BAG_H
 #define POKEDIAMOND_BAG_H
 
+#include "bag_view.h"
 #include "itemtool.h"
 #include "save_block_2.h"
 
@@ -17,13 +18,6 @@ struct Bag
     u32 registeredItem;
 };
 
-struct BagView
-{
-    struct ItemSlot * slots;
-    u32 count;
-    u8 pocket;
-};
-
 struct UnkStruct_0206F164
 {
     u8 unk_00[8];
diff --git a/include/bag_view.h b/include/bag_view.h
new file mode 100644
index 00000000..423d2677
--- /dev/null
+++ b/include/bag_view.h
@@ -0,0 +1,56 @@
+#ifndef POKEDIAMOND_BAG_VIEW_H
+#define POKEDIAMOND_BAG_VIEW_H
+
+#include "player_data.h"
+#include "save_block_2.h"
+
+struct UnkStruct_0206F164;
+
+struct BagView_UnkSub
+{
+    struct ItemSlot *slot;
+    u8 padding[0x4];
+    u8 pocket;
+    u8 padding2[0x3];
+}; // total size = 0xC
+
+struct BagView
+{
+    struct SaveBlock2 *sav2;
+    struct BagView_UnkSub slots[8];
+    u8 padding;
+    u8 unk65;
+    u16 unk66;
+    u16 unk68;
+    u8 padding2[0x2];
+    struct UnkStruct_0206F164 *unk6C;
+    u32 unk70;
+    u8 unk74;
+    u8 unk75;
+    u16 unk76 : 1;
+    u16 unk76_2 : 15;
+}; // total size = 0x78
+
+struct BagView *BagView_New(u8 heap_id);
+u32 BagView_sizeof();
+void FUN_0206E30C(struct BagView *bag_view, u8 r1);
+void FUN_0206E314(
+    struct BagView *bag_view, struct SaveBlock2 *sav2, u8 r2, struct UnkStruct_0206F164 *r3);
+void BagView_SetItem(struct BagView *bag_view, struct ItemSlot *slot, u8 pocket, u8 idx);
+void FUN_0206E340(struct BagView *bag_view);
+void FUN_0206E354(struct BagView *bag_view, u32 r1);
+void FUN_0206E358(struct BagView *bag_view, u8 r1);
+void FUN_0206E360(struct BagView *bag_view, u16 r1);
+u16 FUN_0206E37C(struct BagView *bag_view);
+u16 FUN_0206E384(struct BagView *bag_view);
+u8 FUN_0206E38C(struct BagView *bag_view);
+u8 FUN_0206E394(struct BagView *bag_view);
+u32 FUN_0206E39C(struct SaveBlock2 *sav2);
+u32 FUN_0206E3A8(struct SaveBlock2 *sav2);
+u32 FUN_0206E3C8(struct SaveBlock2 *sav2);
+u32 FUN_0206E3D8(struct SaveBlock2 *sav2);
+u32 FUN_0206E3E8(struct SaveBlock2 *sav2);
+BOOL FUN_0206E3F8(struct SaveBlock2 *sav2, struct String *dest, u32 item_id, u32 heap_id);
+void FUN_0206E51C(struct PlayerData *playerData, struct String *dest, u32 r2, u32 r3, u32 heap_id);
+
+#endif // POKEDIAMOND_BAG_VIEW_H
diff --git a/include/render_text.h b/include/render_text.h
new file mode 100644
index 00000000..e3e0f4c8
--- /dev/null
+++ b/include/render_text.h
@@ -0,0 +1,48 @@
+#ifndef POKEDIAMOND_RENDER_TEXT_H
+#define POKEDIAMOND_RENDER_TEXT_H
+
+#include "global.h"
+#include "text.h"
+
+typedef struct
+{
+    u8 canABSpeedUpPrint : 1;
+    u8 useAlternateDownArrow : 1;
+    u8 autoScroll : 1;
+    u8 forceMidTextSpeed : 1;
+    u8 unk0_4 : 1;
+    u8 unk0_5 : 1;
+    u8 unk0_6 : 1;
+    u8 unk0_7 : 1;
+    u8 unk1;
+} TextFlags;
+
+struct TextPrinterSubStruct
+{
+    u8 glyphId : 4; // 0x14
+    u8 hasPrintBeenSpedUp : 1;
+    u8 unk : 3;
+    u8 downArrowDelay : 5;
+    u8 downArrowYPosIdx : 2;
+    u8 hasGlyphIdBeenSet : 1;
+    u8 autoScrollDelay : 8;
+};
+
+u32 RenderText(struct TextPrinter *printer);
+void FUN_02002840(u16 flag);
+void TextPrinterInitDownArrowCounters(struct TextPrinter *printer);
+void TextPrinterDrawDownArrow(struct TextPrinter *printer);
+void TextPrinterClearDownArrow(struct TextPrinter *printer);
+BOOL TextPrinterContinue(struct TextPrinter *printer);
+BOOL TextPrinterWaitAutoMode(struct TextPrinter *printer);
+BOOL TextPrinterWaitWithDownArrow(struct TextPrinter *printer);
+u8 TextPrinterWait(struct TextPrinter *printer);
+void TextFlags_SetCanABSpeedUpPrint(BOOL param0);
+void FUN_02002B7C(s32 param0);
+void FUN_02002BB8(u32 param0);
+u8 FUN_02002BD4();
+void FUN_02002BE4();
+u8 FUN_02002BF4();
+void FUN_02002C04();
+
+#endif // POKEDIAMOND_RENDER_TEXT_H
diff --git a/include/scrcmd.h b/include/scrcmd.h
index 91cb306c..826b74d3 100644
--- a/include/scrcmd.h
+++ b/include/scrcmd.h
@@ -249,6 +249,42 @@ BOOL ScrCmd_Unk01AD(struct ScriptContext* ctx);
 
 //scrcmd_18.c
 BOOL ScrCmd_GiveMon(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonSpecies(struct ScriptContext* ctx);
+BOOL ScrCmd_CheckPartyMonOTID(struct ScriptContext* ctx);
+BOOL ScrCmd_GiveEgg(struct ScriptContext* ctx);
+BOOL ScrCmd_SetPartyMonMove(struct ScriptContext* ctx);
+BOOL ScrCmd_PartyMonHasMove(struct ScriptContext* ctx);
+BOOL ScrCmd_FindPartyMonWithMove(struct ScriptContext* ctx);
+BOOL ScrCmd_SurvivePsn(struct ScriptContext* ctx);
+BOOL ScrCmd_CountPartyMonsAtOrBelowLevel(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonLevel(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonNature(struct ScriptContext* ctx);
+BOOL ScrCmd_FindPartyMonWithNature(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonFriendship(struct ScriptContext* ctx);
+BOOL ScrCmd_AddPartyMonFriendship(struct ScriptContext* ctx);
+BOOL ScrCmd_SubtractPartyMonFriendship(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonContestCondition(struct ScriptContext* ctx);
+BOOL ScrCmd_GetLeadingPartyMonSlot(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonTypes(struct ScriptContext* ctx);
+BOOL ScrCmd_CountPartyMons(struct ScriptContext* ctx);
+BOOL ScrCmd_CountPartyMons_OmitEggs(struct ScriptContext* ctx);
+BOOL ScrCmd_CountAvailablePartyMons_IgnoreSlot(struct ScriptContext* ctx);
+BOOL ScrCmd_CountAvailablePartyAndPCMons(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyEggCount(struct ScriptContext* ctx);
+BOOL ScrCmd_CheckPartyForPokerus(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonGender(struct ScriptContext* ctx);
+BOOL ScrCmd_CountPartyMonMoves(struct ScriptContext* ctx);
+BOOL ScrCmd_ForgetPartyMonMove(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonMove(struct ScriptContext* ctx);
+BOOL ScrCmd_GetPartyMonHeldItem(struct ScriptContext* ctx);
+BOOL ScrCmd_ResetPartyMonHeldItem(struct ScriptContext* ctx);
+BOOL ScrCmd_CheckPartyForSpecies(struct ScriptContext* ctx);
+BOOL ScrCmd_CountPartyMonRibbons(struct ScriptContext* ctx);
+BOOL ScrCmd_CountTotalPartyRibbons(struct ScriptContext* ctx);
+BOOL ScrCmd_PartyMonHasRibbon(struct ScriptContext* ctx);
+BOOL ScrCmd_GivePartyMonRibbon(struct ScriptContext* ctx);
+BOOL ScrCmd_CheckPartyForBadEgg(struct ScriptContext* ctx);
+BOOL ScrCmd_Unk00A0(struct ScriptContext* ctx);
 
 //scrcmd_fossils.c
 BOOL ScrCmd_CountFossils(struct ScriptContext* ctx);
diff --git a/include/text_02054590.h b/include/text_02054590.h
index b2f4898b..4d05260a 100644
--- a/include/text_02054590.h
+++ b/include/text_02054590.h
@@ -12,7 +12,7 @@ void FUN_020545B8(struct BgConfig *param0, struct Window *param1, u32 param2);
 void FUN_02054608(struct Window *param0, struct Options *options);
 void FUN_0205464C(struct Window *param0);
 u16 FUN_02054658(struct Window * window, struct String *str, struct Options *options, u8 param3);
-u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, u32 a5);
+u16 DrawFieldMessage(struct Window * window, struct String *str, u8 fontId, u32 speed, u8 a4, s32 a5);
 u8 FUN_020546C8(u32 param0);
 void FUN_020546E0(struct BgConfig *param0, struct Window *param1, u32 param2, u32 param3);
 void FUN_02054744(struct Window *param0, u32 param1, u32 param2);
diff --git a/include/unk_0201B8B8.h b/include/unk_0201B8B8.h
index 13bc217b..26dd8017 100644
--- a/include/unk_0201B8B8.h
+++ b/include/unk_0201B8B8.h
@@ -2,8 +2,8 @@
 #define POKEDIAMOND_UNK_0201B8B88_H
 
 const u16 * MsgArray_SkipControlCode(const u16 * r4);
-u16 MsgArray_GetControlCode(const u16 * r4);
+u32 MsgArray_GetControlCode(const u16 * r4);
 BOOL MsgArray_ControlCodeIsStrVar(const u16 * r4);
-u16 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4);
+u32 MsgArray_ControlCodeGetField(const u16 * r5, u32 r4);
 
 #endif //POKEDIAMOND_UNK_0201B8B88_H
diff --git a/include/unk_020851B8.h b/include/unk_020851B8.h
index ca47a91c..334ba4c8 100644
--- a/include/unk_020851B8.h
+++ b/include/unk_020851B8.h
@@ -10,7 +10,7 @@ struct UnkStruct_020851B8 {
 };
 
 struct UnkStruct_020851B8 *FUN_020851B8(u32 heap_id);
-void FUN_020851DC(struct UnkStruct_020851B8 *param0, u32 param1, BOOL param2);
+void FUN_020851DC(struct UnkStruct_020851B8 *param0, u16 param1, BOOL param2);
 void FUN_020851F8(struct UnkStruct_020851B8 *param0, u8 param1, u8 param2, u8 param3);
 void FUN_02085200(struct UnkStruct_020851B8 *param0, u16 param1);
 u8 FUN_02085224(struct UnkStruct_020851B8 *param0, u16 param1);
diff --git a/include/unk_02088AAC.h b/include/unk_02088AAC.h
new file mode 100644
index 00000000..d4d7cf3e
--- /dev/null
+++ b/include/unk_02088AAC.h
@@ -0,0 +1,31 @@
+#ifndef POKEDIAMOND_UNK_02088AAC_H
+#define POKEDIAMOND_UNK_02088AAC_H
+
+#include "bag.h"
+#include "main.h"
+#include "unk_0208890C.h"
+
+struct UnkStruct_02088AAC
+{
+    u32 heap_id;
+    u16 unk04;
+    u16 unk06;
+    u32 item;
+    struct UnkStruct_0206F164 *unk0C;
+    struct UnkStruct_0208890C *unk10;
+    u32 unk14;
+    void *ovly_param;
+    struct UnkStruct_02006234 *ovly_data;
+    u32 unk20;
+};
+
+u32 FUN_02088AAC(struct UnkStruct_02088AAC *r0, u32 *r1);
+u32 FUN_02088AFC(struct UnkStruct_02088AAC *r0);
+u32 FUN_02088B28(struct UnkStruct_02088AAC *r0);
+u32 FUN_02088B48(void);
+u32 FUN_02088B4C(struct UnkStruct_02088AAC *r0);
+u32 FUN_02088BA8(struct UnkStruct_02088AAC *r0);
+u32 FUN_02088C3C(struct UnkStruct_02088AAC *r0);
+u32 FUN_02088CDC(struct UnkStruct_02088AAC *r0);
+
+#endif // POKEDIAMOND_UNK_02088AAC_H