Rename Item PC symbols

14 files changed, 40 insertions, 31 deletions

diff --git a/include/graphics.h b/include/graphics.h
index 96a39ae7c..01ae84add 100644
--- a/include/graphics.h
+++ b/include/graphics.h
@@ -197,8 +197,8 @@ extern const u8 gBerryFixWindow_Pal[];
 
 // item_pc
 
-extern const u8 gUnknown_8E85090[];
-extern const u8 gUnknown_8E85408[];
-extern const u8 gUnknown_8E85458[];
+extern const u8 gItemPcTiles[];
+extern const u8 gItemPcBgPals[];
+extern const u8 gItemPcTilemap[];
 
 #endif //GUARD_GRAPHICS_H
diff --git a/include/item.h b/include/item.h
index 08133ef31..f5a8db699 100644
--- a/include/item.h
+++ b/include/item.h
@@ -73,7 +73,7 @@ bool8 itemid_is_unique(u16 itemId);
 void sub_809A584(struct ItemSlot * slots, u8 capacity);
 u16 GetBagItemId(u16 *);
 
-void sub_809A4E8(void);
-void sub_809A460(u16 itemId, u16 quantity);
+void ItemPcCompaction(void);
+void RemoveItemFromPC(u16 itemId, u16 quantity);
 
 #endif // ITEM_H
diff --git a/include/item_menu.h b/include/item_menu.h
index 840c357d0..2d4be4fd7 100644
--- a/include/item_menu.h
+++ b/include/item_menu.h
@@ -27,6 +27,6 @@ void sub_81AAC70(void);
 void sub_8108CF0(void);
 void sub_810B108(u8);
 void UseFameCheckerFromMenu(void);
-void sub_8108D60(struct ItemSlot * slots, int pos1, int pos2);
+void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2);
 
 #endif //GUARD_ITEM_MENU_H
diff --git a/include/item_menu_icons.h b/include/item_menu_icons.h
index 980016573..ce61c38ac 100644
--- a/include/item_menu_icons.h
+++ b/include/item_menu_icons.h
@@ -3,11 +3,11 @@
 
 #include "global.h"
 
-void sub_80984D8(void);
+void ResetItemMenuIconState(void);
 void sub_80985E4(void);
 u8 sub_80D511C(u8 a0, u8 a1, u8 a2, u8 a3);
-void sub_8098940(bool8 a0);
-void sub_80988E8(u16 itemId, bool8 a0);
+void DestroyItemMenuIcon(bool8 a0);
+void CreateItemMenuIcon(u16 itemId, bool8 a0);
 void sub_80986A8(s16 x, u16 y);
 void sub_8098660(u8);
 
diff --git a/include/item_pc.h b/include/item_pc.h
new file mode 100644
index 000000000..2fecf69a8
--- /dev/null
+++ b/include/item_pc.h
@@ -0,0 +1,7 @@
+#ifndef GUARD_ITEM_PC_H
+#define GUARD_ITEM_PC_H
+
+void ItemPc_Init(u8 a0, MainCallback callback);
+void ItemPc_SetInitializedFlag(u8);
+
+#endif //GUARD_ITEM_PC_H
diff --git a/include/item_use.h b/include/item_use.h
index 5ec5f2b33..04e61ab59 100644
--- a/include/item_use.h
+++ b/include/item_use.h
@@ -4,6 +4,6 @@
 #include "global.h"
 
 void sub_80A1E0C(u8);
-void sub_80A2294(u8, u8, u16, u16);
+void ItemUse_SetQuestLogEvent(u8, struct Pokemon *, u16, u16);
 
 #endif //GUARD_ITEM_USE_H
diff --git a/include/menu.h b/include/menu.h
index 74c4025b8..fa8552484 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -36,7 +36,7 @@ void do_scheduled_bg_tilemap_copies_to_vram(void);
 void clear_scheduled_bg_copies_to_vram(void);
 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 ClearMenuWindow(u8 windowId, bool8 copyToVram);
 void *sub_80F68F0(u8 bgId, const void *src, u32 size, u16 offset, u8 mode);
 void CreateWindow_SnapRight_StdPal(u8, u8, u8, u8, u16);
 void Menu_PrintHelpSystemUIHeader(const u8 *, const u8 *, u8, u32, u8);
@@ -49,7 +49,7 @@ void CreateYesNoMenu(const struct WindowTemplate *, u8, u8, u8, u16, u8, u8);
 void StartBlendTask(u8 eva_start, u8 evb_start, u8 eva_end, u8 evb_end, u8 ev_step, u8 priority);
 bool8 IsBlendTaskActive(void);
 void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 letterSpacing, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, const u8 *a8);
-void sub_810F260(u8 windowId, u8 a1);
+void ClearMenuWindow_BorderThickness2(u8 windowId, u8 a1);
 void PrintTextArray(u8, u8, u8, u8, u8, u8, const struct MenuAction *);
 
 #endif // GUARD_MENU_H
diff --git a/include/menu_helpers.h b/include/menu_helpers.h
index a42b3c76b..25ef3252e 100644
--- a/include/menu_helpers.h
+++ b/include/menu_helpers.h
@@ -21,7 +21,7 @@ void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);
 bool8 sub_81221AC(void);
 bool16 sub_80BF518(u8 textPrinterId);
 bool8 sub_80BF72C(void);
-bool8 sub_80BF708(void);
+bool8 MenuHelpers_LinkSomething(void);
 void VblankHblankHandlerSetZero(void);
 void InitBgReg(void);
 u8 sub_80BF8E4(void);
diff --git a/include/new_menu_helpers.h b/include/new_menu_helpers.h
index 929147c0c..ed933089f 100644
--- a/include/new_menu_helpers.h
+++ b/include/new_menu_helpers.h
@@ -29,7 +29,7 @@ void ResetBg0(void);
 void Menu_LoadStdPalAt(u16);
 void * malloc_and_decompress(const void * src, u32 * size);
 u16 sub_80F796C(void);
-void sub_80F6B08(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
+void SetBgRectPal(u8 bgId, u8 left, u8 top, u8 width, u8 height, u8 palette);
 void DecompressAndLoadBgGfxUsingHeap(u8 bgId, const void * gfx, u32 size, u16 a3, u8 a4);
 void ClearStdWindowAndFrame(u8 taskId, bool8 copyNow);
 
diff --git a/include/party_menu.h b/include/party_menu.h
index 144e735de..527147296 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -51,6 +51,6 @@ 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);
-void sub_811EA44(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
+void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback);
 
 #endif // GUARD_PARTY_MENU_H
diff --git a/include/strings.h b/include/strings.h
index fbdfeec2d..08dd25174 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -151,14 +151,14 @@ extern const u8 gString_HelpSystem_ClearTo8[];
 
 extern const u8 gOtherText_Give[];
 extern const u8 gFameCheckerText_Cancel[];
-extern const u8 gUnknown_84162FF[];
-extern const u8 gUnknown_841633F[];
-extern const u8 gUnknown_8416655[];
-extern const u8 gUnknown_841778A[];
-extern const u8 gUnknown_84177AC[];
-extern const u8 gUnknown_84177C5[];
-extern const u8 gUnknown_84178A7[];
-extern const u8 gUnknown_84178B5[];
-extern const u8 gUnknown_84178BE[];
+extern const u8 gOtherText_StrVar1[];
+extern const u8 gOtherText_WhereShouldTheStrVar1BePlaced[];
+extern const u8 gOtherText_Powder[];
+extern const u8 gText_NoMoreRoomInBag[];
+extern const u8 gText_WithdrawHowMany[];
+extern const u8 gText_WithdrewQuantItem[];
+extern const u8 gText_WithdrawItem[];
+extern const u8 gText_Withdraw[];
+extern const u8 gText_ReturnToPC[];
 
 #endif //GUARD_STRINGS_H
diff --git a/include/text_window.h b/include/text_window.h
index c384ca1bb..cc1de56ae 100644
--- a/include/text_window.h
+++ b/include/text_window.h
@@ -20,9 +20,9 @@ void rbox_fill_rectangle(u8 windowId);
 const u16* stdpal_get(u8 id);
 const u16* GetOverworldTextboxPalettePtr(void);
 void sub_8098C6C(u8 bg, u16 destOffset, u8 palOffset);
-void sub_814FEAC(u8 windowId, u16 tileStart, u8 palette);
-void sub_814FF2C(u8 windowId, u16 tileStart, u8 palette);
-void sub_815001C(u8 windowId, u16 tileStart, u8 palette);
+void TextWindow_SetBubbleFrame_841F1C8(u8 windowId, u16 tileStart, u8 palette);
+void TextWindow_SetStdFrame0_WithPal(u8 windowId, u16 tileStart, u8 palette);
+void TextWindow_SetUserSelectedFrame(u8 windowId, u16 tileStart, u8 palette);
 void LoadUserWindowBorderGfx(u8 windowId, u16 tileStart, u8 palette);
 void sub_814FDA0(u8 windowId, u16 tileStart, u8 palette);
 void DrawTextBorderOuter(u8 windowId, u16 tileStart, u8 palette);
diff --git a/include/text_window_graphics.h b/include/text_window_graphics.h
index 5fa78d955..17e919705 100644
--- a/include/text_window_graphics.h
+++ b/include/text_window_graphics.h
@@ -8,11 +8,11 @@ struct TextWindowGraphics
 };
 
 extern const u16 gUnknown_8470B0C[];
-extern const u16 gUnknown_8471A4C[];
-extern const u16 gUnknown_8471B6C[];
+extern const u16 gStdFrame0[];
+extern const u16 gStdFrame1[];
 extern const u16 gUnknown_8471DEC[][16];
 
-extern const struct TextWindowGraphics gUnknown_8471E8C[];
+extern const struct TextWindowGraphics gUserFrames[];
 
 const struct TextWindowGraphics * sub_8069788(u8 idx);
 
diff --git a/include/window.h b/include/window.h
index eb35e94d2..30e73dd32 100644
--- a/include/window.h
+++ b/include/window.h
@@ -47,6 +47,8 @@ struct Window
     u8 *tileData;
 };
 
+typedef void (*WindowFunc)(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum);
+
 bool16 InitWindows(const struct WindowTemplate *templates);
 u16 AddWindow(const struct WindowTemplate *template);
 int AddWindowWithoutTileMap(const struct WindowTemplate *template);
@@ -64,7 +66,7 @@ void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16
 void CopyToWindowPixelBuffer(u8 windowId, const u8 *src, u16 size, u16 tileOffset);
 void FillWindowPixelBuffer(u8 windowId, u8 fillValue);
 void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue);
-void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8));
+void CallWindowFunction(u8 windowId, WindowFunc func);
 bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value);
 u32 GetWindowAttribute(u8 windowId, u8 attributeId);
 u16 AddWindow8Bit(struct WindowTemplate *template);