Fixes

19 files changed, 70 insertions, 0 deletions

diff --git a/include/battle_frontier_2.h b/include/battle_frontier_2.h
index 801c3f3ec..638ff692e 100644
--- a/include/battle_frontier_2.h
+++ b/include/battle_frontier_2.h
@@ -6,5 +6,6 @@ void sub_81A895C(void);
 u16 sub_81A89A0(u8);
 void sub_81A8AF8(void);
 bool8 InBattlePike(void);
+void sub_819FA50(void);
 
 #endif // GUARD_BATTLE_FRONTIER_2_H
diff --git a/include/field_map_obj_helpers.h b/include/field_map_obj_helpers.h
index 031c7a8ab..ae96b67d8 100644
--- a/include/field_map_obj_helpers.h
+++ b/include/field_map_obj_helpers.h
@@ -27,5 +27,6 @@ void sub_8098044(u8);
 void UnfreezeMapObjects(void);
 void FreezeMapObjectsExceptOne(u8 mapObjectId);
 void sub_8097B78(u8, u8);
+void FreezeMapObjects(void);
 
 #endif //GUARD_FIELD_MAP_OBJ_HELPERS_H
diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h
index af602245b..5b9a632fa 100644
--- a/include/field_player_avatar.h
+++ b/include/field_player_avatar.h
@@ -31,6 +31,8 @@ u8 CheckForFieldObjectCollision(struct MapObject *a, s16 b, s16 c, u8 d, u8 e);
 u8 PlayerGetZCoord(void);
 void SetPlayerAvatarTransitionFlags(u16 a);
 void sub_808BCE8(void);
+void sub_808B864(void);
+void sub_808BCF4(void);
 
 void sub_808D074(u8);
 void GetXYCoordsOneStepInFrontOfPlayer(s16 *xPtr, s16 *yPtr);
diff --git a/include/field_specials.h b/include/field_specials.h
index dd72bdd13..c1f70a399 100644
--- a/include/field_specials.h
+++ b/include/field_specials.h
@@ -4,5 +4,6 @@
 u8 GetLeadMonIndex(void);
 u8 sub_813B260(void);
 u16 get_unknown_box_id(void);
+bool8 InMultiBattleRoom(void);
 
 #endif // GUARD_FIELD_SPECIALS_H
diff --git a/include/graphics.h b/include/graphics.h
index 39662c8c1..8ed54bcfb 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -2719,4 +2719,10 @@ extern const u16 gFireRedMenuElements2_Pal[16];
 extern const u16 gFireRedMenuElements3_Pal[16];
 extern const u8 gFireRedMenuElements_Gfx[];
 
+//item menu graphics
+extern const u8 gBagScreen_Gfx[];
+extern u16 gBagScreenFemale_Pal[];
+extern u16 gBagScreenMale_Pal[];
+extern u8 gBagMenuHMIcon_Gfx[];
+
 #endif //GUARD_GRAPHICS_H
diff --git a/include/item.h b/include/item.h
index 06eb08046..d81a3de33 100644
--- a/include/item.h
+++ b/include/item.h
@@ -61,5 +61,8 @@ ItemUseFunc ItemId_GetBattleFunc(u16 itemId);
 u8 ItemId_GetSecondaryId(u16 itemId);
 u16 itemid_get_market_price(u16 itemId);
 u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 pocketPos);
+void sub_80D6FB4(struct BagPocket*);
+void sub_80D6F64(struct BagPocket*);
+void sub_80D702C(struct ItemSlot*, s16, u16);
 
 #endif // ITEM_H
diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h
index c3932390c..56e012421 100644
--- a/include/item_menu_icons.h
+++ b/include/item_menu_icons.h
@@ -8,5 +8,9 @@ u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3);
 u8 CreateBerryTagSprite(u8 id, s16 x, s16 y);
 void FreeBerryTagSpritePalette(void);
 u8 CreateBerryFlavorCircleSprite(s16 x);
+void sub_80D4FAC(void);
+void RemoveBagItemIconObject(u8);
+void sub_80D4FEC(u8);
+void sub_80D4FC8(u8);
 
 #endif // GUARD_ITEM_MENU_ICONS
diff --git a/include/item_use.h b/include/item_use.h
index ee7939824..6f84a63df 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -50,5 +50,6 @@ void ItemUseOutOfBattle_EnigmaBerry(u8);
 void ItemUseInBattle_EnigmaBerry(u8);
 void ItemUseOutOfBattle_CannotUse(u8);
 u8 CheckIfItemIsTMHMOrEvolutionStone(u16 itemId);
+void sub_80FDD10(u8);
 
 #endif // GUARD_ITEM_USE_H
diff --git a/include/list_menu.h b/include/list_menu.h
index 8b793c0e4..77d00bf97 100644
--- a/include/list_menu.h
+++ b/include/list_menu.h
@@ -57,5 +57,6 @@ u8 ListMenuInit(struct ListMenuTemplate *template, u16 cursorPage, u16 cursorPos
 s32 ListMenuHandleInputGetItemId(u8 listTaskId);
 void sub_81AE860(u8 listTaskId, u16 *a1, u16 *a2);
 void sub_81AE6C8(u8 listTaskId, u16 *a1, u16 *a2);
+u8 ListMenuGetYCoordForPrintingArrowCursor(u8);
 
 #endif //GUARD_LIST_MENU_H
diff --git a/include/menu.h b/include/menu.h
index 2046f7d2b..f6efdbf03 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -59,5 +59,10 @@ u16 sub_8198AA4(u8, u8, u8, u8, u8, u8, u16);
 void *malloc_and_decompress(const void *src, int *sizeOut);
 u16 copy_decompressed_tile_data_to_vram(u8 bgId, const void *src, u16 size, u16 offset, u8 mode);
 void AddTextPrinterForMessage(bool8 allowSkippingDelayWithButtonPress);
+void AddItemMenuActionTextPrinters (u8, u8, u8, u8, u8, u8, u8, const struct MenuAction*, const u8*);
+void sub_8198DBC(u8, u8, u8, u8, u8, u8, u8, const struct MenuAction*, const u8*);
+u8 sub_8199944(u8, u8, u8, u8, u8);
+u8 sub_8199134(s8, s8);
+void sub_819A2BC(u8, u8);
 
 #endif // GUARD_MENU_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index 048a4aa43..e744c293c 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -32,5 +32,10 @@ void DisplayMessageAndContinueTask(u8 taskId, u8 arg1, u16 arg2, u8 arg3, u8 arg
 void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
 u8 GetLRKeysState(void);
 u8 sub_812210C(void);
+bool8 sub_81221EC(void);
+bool8 sub_81221AC(void);
+bool8 sub_8122148(u16);
+bool8 AdjustQuantityAccordingToDPadInput(s16*, u16);
+bool8 itemid_80BF6D8_mail_related(u16);
 
 #endif //GUARD_MENU_HELPERS_H
diff --git a/include/menu_indicators.h b/include/menu_indicators.h
index d0baac810..794ecf777 100644
--- a/include/menu_indicators.h
+++ b/include/menu_indicators.h
@@ -8,5 +8,7 @@
 // Exported ROM declarations
 u8 AddScrollIndicatorArrowPairParametrized(u8, u8, u8, u8, s32, u16, u16, u16 *);
 void RemoveScrollIndicatorArrowPair(u8);
+u8 AddScrollIndicatorArrowPair(void*, void*);
+void sub_81AF15C(u8, u8, u8);
 
 #endif //GUARD_MENU_INDICATORS_H
diff --git a/include/overworld.h b/include/overworld.h
index 974f8f091..8c507b321 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -72,6 +72,8 @@ void copy_saved_warp2_bank_and_enter_x_to_warp1(u8 unused);
 void mapldr_default(void);
 u8 get_map_light_from_warp0(void);
 bool8 is_light_level_1_2_3_5_or_6(u8 a1);
+void sub_8086194(void);
+void sub_80861B0(void);
 
 void IncrementGameStat(u8);
 u32 GetGameStat(u8);
diff --git a/include/party_menu.h b/include/party_menu.h
index 1d1661cee..14aacce88 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -18,5 +18,6 @@ u8 pokemon_ailments_get_primary(u32 status);
 u8 *GetMonNickname(struct Pokemon *mon, u8 *dst);
 u8 GetCursorSelectionMonId(void);
 bool8 FieldCallback_Teleport(void);
+void sub_81B7F60(void);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/player_pc.h b/include/player_pc.h
index b14d1ede3..cc2e85b2b 100644
--- a/include/player_pc.h
+++ b/include/player_pc.h
@@ -8,5 +8,6 @@
 // Exported ROM declarations
 
 void sub_816B060(u8 taskId);
+void sub_816B31C(void);
 
 #endif //GUARD_PLAYER_PC_H
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
new file mode 100755
index 000000000..a4e46dd6e
--- /dev/null
+++ b/include/pokemon_summary_screen.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_POKEMON_SUMMARY_SCREEN_H
+#define GUARD_POKEMON_SUMMARY_SCREEN_H
+
+void sub_81C4F98(u8, void(*)(void));
+
+#endif // GUARD_POKEMON_SUMMARY_SCREEN_H
\ No newline at end of file
diff --git a/include/shop.h b/include/shop.h
index d3e86408c..9b14a672e 100644
--- a/include/shop.h
+++ b/include/shop.h
@@ -6,5 +6,6 @@ extern EWRAM_DATA struct ItemSlot gUnknown_02039F80[3];
 void CreatePokemartMenu(const u16 *);
 void CreateDecorationShop1Menu(const u16 *);
 void CreateDecorationShop2Menu(const u16 *);
+void CB2_ExitSellMenu(void);
 
 #endif // GUARD_SHOP_H
diff --git a/include/strings.h b/include/strings.h
index 6d569e57a..4e96dc528 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -239,4 +239,30 @@ extern const u8 gText_Var1DotVar2[];
 extern const u8 gText_ThreeMarks[];
 extern const u8 gText_FirmSlash[];
 
+//item menu screen text
+extern u8 gText_CloseBag[];
+extern u8 gText_ClearTo11Var1Clear5Var2[];
+extern u8 gText_UnkF908Var1Clear7Var2[];
+extern u8 gText_xVar1[];
+extern u8 gText_ReturnToVar1[];
+extern u8 gText_SelectorArrow2[];
+extern u8 gText_MoveVar1Where[];
+extern u8 gText_Var1IsSelected[];
+extern u8 gText_TossHowManyVar1s[];
+extern u8 gText_ConfirmTossItems[];
+extern u8 gText_ThrewAwayVar2Var1s[];
+extern u8 gText_CantWriteMail[];
+extern u8 gText_NoPokemon[];
+extern u8 gText_Var1CantBeHeld[];
+extern u8 gText_Var1CantBeHeldHere[];
+extern u8 gText_CantBuyKeyItem[];
+extern u8 gText_HowManyToSell[];
+extern u8 gText_ICanPayVar1[];
+extern u8 gText_TurnedOverVar1ForVar2[];
+extern u8 gText_DepositHowManyVar1[];
+extern u8 gText_CantStoreImportantItems[];
+extern u8 gText_DepositedVar2Var1s[];
+extern u8 gText_NoRoomForItems[];
+extern u8 gText_ThreeDashes[];
+
 #endif //GUARD_STRINGS_H
diff --git a/include/text.h b/include/text.h
index e073c3762..81c066426 100644
--- a/include/text.h
+++ b/include/text.h
@@ -208,6 +208,7 @@ void DecompressGlyphTile(const u16 *src, u16 *dest);
 u8 GetLastTextColor(u8 colorType);
 void CopyGlyphToWindow(struct TextPrinter *x);
 void ClearTextSpan(struct TextPrinter *textPrinter, u32 width);
+u8 GetMenuCursorDimensionByFont(u8, u8);
 
 u16 Font0Func(struct TextPrinter *textPrinter);
 u16 Font1Func(struct TextPrinter *textPrinter);