fix for merge

6 files changed, 33 insertions, 9 deletions

diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 590b54ce3..d67fc476c 100644
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -48,7 +48,7 @@ void SpawnFieldObjectsInView(s16, s16);
 u8 sprite_new(u8, u8, s16, s16, u8, u8);
 u8 AddPseudoEventObject(u16, void (*)(struct Sprite *), s16, s16, u8);
 u8 show_sprite(u8, u8, u8);
-u8 SpawnSpecialFieldObjectParametrized(u8, u8, u8, s16, s16, u8);
+u8 SpawnSpecialFieldObjectParameterized(u8, u8, u8, s16, s16, u8);
 u8 SpawnSpecialFieldObject(struct MapObjectTemplate *);
 void sub_8093038(s16, s16, s16 *, s16 *);
 void CameraObjectReset1(void);
diff --git a/include/list_menu.h b/include/list_menu.h
index 1aae55c82..fe42651b6 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -9,8 +9,8 @@
 
 struct ListMenuItem
 {
-    const u8 *name;
-    s32 id;
+    const u8 *unk_00;
+    s32 unk_04;
 };
 
 struct ListMenu;
diff --git a/include/menu.h b/include/menu.h
index 40c7ffc12..08112c891 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -15,7 +15,7 @@ struct MenuAction
     } func;
 };
 
-void box_print(u8, u8, u8, u8, const void *, s8, const u8 *);
+void AddTextPrinterParameterized3(u8, u8, u8, u8, const void *, s8, const u8 *);
 void sub_8198070(u8 windowId, bool8 copyToVram);
 void SetWindowTemplateFields(struct WindowTemplate* template, u8 priority, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palNum, u16 baseBlock);
 void SetWindowBorderStyle(u8 windowId, bool8 copyToVram, u16 tileStart, u8 palette);
@@ -34,7 +34,7 @@ u64 sub_8198A50(struct WindowTemplate*, u8, u8, u8, u8, u8, u8, u16); // returns
 s8 Menu_ProcessInputNoWrapClearOnChoose(void);
 void do_scheduled_bg_tilemap_copies_to_vram(void);
 void clear_scheduled_bg_copies_to_vram(void);
-void AddTextPrinterParametrized2(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
+void AddTextPrinterParameterized4(u8 windowId, u8 fontId, u8 x, u8 y, u8 letterSpacing, u8 lineSpacing, const struct TextColor *color, s8 speed, const u8 *str);
 void sub_8197B1C(u8 windowId, bool8 copyToVram, u16 a2, u16 a3);
 void sub_810F4D8(u8 windowId, bool32 someBool);
 void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
diff --git a/include/menu_indicators.h b/include/menu_indicators.h
index f65e3f2ac..8c669aeef 100644
--- a/include/menu_indicators.h
+++ b/include/menu_indicators.h
@@ -7,7 +7,7 @@
 
 // Exported RAM declarations
 
-struct ScrollArrowsTemplate
+struct ScrollIndicatorArrowPairTemplate
 {
     u8 unk_00;
     u8 unk_01;
@@ -24,8 +24,8 @@ struct ScrollArrowsTemplate
 };
 
 // Exported ROM declarations
-u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *);
-u8 AddScrollIndicatorArrowPair(const struct ScrollArrowsTemplate * template, u16 * a1);
+u8 AddScrollIndicatorArrowPairParameterized(u8, u8, u8, u8, s32, u16, u16, u16 *);
+u8 AddScrollIndicatorArrowPair(const struct ScrollIndicatorArrowPairTemplate * template, u16 * a1);
 void RemoveScrollIndicatorArrowPair(u8);
 
 #endif //GUARD_MENU_INDICATORS_H
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index b3daf43c6..929147c0c 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -9,7 +9,7 @@ void sub_81973A4(void);
 void sub_81973C4(u8, u8);
 void sub_819746C(u8 windowId, bool8 copyToVram);
 void sub_81973FC(u8, u8);
-u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
+u16 AddTextPrinterParameterized2(u8 windowId, u8 fontId, const u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor);
 void DisplayItemMessageOnField(u8 taskId, u8 bgId, const u8 *src, TaskFunc callback);
 void sub_8197434(u8 a0, u8 a1);
 void SetStandardWindowBorderStyle(u8 a0, u8 a1);
diff --git a/include/party_menu.h b/include/party_menu.h
index 34b375e42..01cd0ef57 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -13,6 +13,23 @@ enum {
     AILMENT_BRN
 };
 
+struct Struct203B0A0
+{
+    MainCallback exitCallback;
+    TaskFunc unk4;
+    u8 unk8_0:4;
+    u8 mode:2;
+    u8 unk8_2:2;
+    s8 unk9;
+    s8 unkA;
+    u8 unkB;
+    u16 unkC;
+    s16 unkE;
+    s16 unk10;
+};
+
+extern struct Struct203B0A0 gUnknown_203B0A0;
+
 extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func);
 
 bool8 FieldCallback_PrepareFadeInFromMenu(void);
@@ -27,5 +44,12 @@ void sub_8126EDC(void);
 void c2_8123744(void);
 u8 GetCursorSelectionMonId(void);
 void sub_8128370(void);
+void sub_811F818(u8 monId, u8 a1);
+void sub_8121D0C(u8);
+void sub_811FB28(u8 taskId);
+void sub_8120760(u8 taskId, u8 a1, s8 a2, s16 amount, TaskFunc followupFunc);
+void GetMonNickname(const struct Pokemon * mon, u8 * dest);
+void sub_81202F8(const u8 * src, u8 a1);
+bool8 sub_8120370(void);
 
 #endif // GUARD_PARTY_MENU_H