From c95740ab85fbec74cbfb844f33e56bf879fee8c9 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Apr 2019 19:11:11 -0400 Subject: tm_case sub_8132F60 --- include/item_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/item_menu.h') diff --git a/include/item_menu.h b/include/item_menu.h index a6128b9fb..9ebe3918a 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -12,6 +12,7 @@ extern u16 gSpecialVar_ItemId; // Exported ROM declarations void sub_81AAC50(void); void sub_81AAC70(void); +void sub_8108CF0(void); void UseFameCheckerFromMenu(void); #endif //GUARD_ITEM_MENU_H -- cgit v1.2.3 From 3ecda6265051d15c920bd185ea88cad579523b73 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 29 Apr 2019 12:27:50 -0400 Subject: Decompile bag.s --- include/item_menu.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'include/item_menu.h') diff --git a/include/item_menu.h b/include/item_menu.h index 9ebe3918a..efd0066ed 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -7,6 +7,18 @@ // Exported RAM declarations +struct BagStruct +{ + void (*bagCallback)(void); + u8 location; + u8 pocket; + u16 unk6; + u8 cursorPosition[6]; + u8 scrollPosition[6]; +}; + +extern struct BagStruct gUnknown_203ACFC; + extern u16 gSpecialVar_ItemId; // Exported ROM declarations -- cgit v1.2.3 From 12191612cd7a050283e37278fac1c02a2ef3776d Mon Sep 17 00:00:00 2001 From: jiangzhengwenjz Date: Mon, 10 Jun 2019 09:03:39 +0800 Subject: TeachyTvLoadMapPalette and fixes --- include/item_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/item_menu.h') diff --git a/include/item_menu.h b/include/item_menu.h index efd0066ed..2801a5001 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -25,6 +25,7 @@ extern u16 gSpecialVar_ItemId; void sub_81AAC50(void); void sub_81AAC70(void); void sub_8108CF0(void); +void sub_810B108(u8); void UseFameCheckerFromMenu(void); #endif //GUARD_ITEM_MENU_H -- cgit v1.2.3 From d681d7f727e01f1e5b167f5042e9edd1542ae6c6 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Jun 2019 18:12:11 -0400 Subject: item_pc: through sub_810E200 --- include/item_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/item_menu.h') diff --git a/include/item_menu.h b/include/item_menu.h index 2801a5001..840c357d0 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -27,5 +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); #endif //GUARD_ITEM_MENU_H -- cgit v1.2.3 From 2b750cf44491aee3b2fe8265afb4ac6620500afa Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 17 Jun 2019 10:21:32 -0400 Subject: Rename Item PC symbols --- include/item_menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/item_menu.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 -- cgit v1.2.3 From 7eeba327bd6dc235a33f06a7779e3b3c52f04475 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 19 Jun 2019 18:03:24 -0400 Subject: Dump items and start decomp item_use --- include/item_menu.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'include/item_menu.h') diff --git a/include/item_menu.h b/include/item_menu.h index 2d4be4fd7..b4815d164 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -28,5 +28,10 @@ void sub_8108CF0(void); void sub_810B108(u8); void UseFameCheckerFromMenu(void); void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2); +void sub_8108B50(u8 taskId); +void sub_8108CB4(void); +void sub_8108EE0(void (*)(void)); +void sub_8108E70(u8, u8, const u8 *, void (*)(u8)); +void sub_810A1F8(u8 taskId); #endif //GUARD_ITEM_MENU_H -- cgit v1.2.3 From 12f3ceb0f7fb0ed580fa75bbba634307ca463d52 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 11:02:09 -0400 Subject: item_use: through sub_80A16D0 --- include/item_menu.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'include/item_menu.h') diff --git a/include/item_menu.h b/include/item_menu.h index b4815d164..e8ccfcbd9 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -2,6 +2,7 @@ #define GUARD_ITEM_MENU_H #include "global.h" +#include "task.h" // Exported type declarations @@ -31,7 +32,7 @@ void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1 void sub_8108B50(u8 taskId); void sub_8108CB4(void); void sub_8108EE0(void (*)(void)); -void sub_8108E70(u8, u8, const u8 *, void (*)(u8)); +void DisplayItemMessageInBag(u8 taskId, u8 bgId, const u8 * string, TaskFunc followUpFunc); void sub_810A1F8(u8 taskId); #endif //GUARD_ITEM_MENU_H -- cgit v1.2.3 From 7abbe42763835f43dc2b08f8292a4ef83c50c5e1 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 20:00:13 -0400 Subject: Finish item_use --- include/item_menu.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/item_menu.h') diff --git a/include/item_menu.h b/include/item_menu.h index e8ccfcbd9..cfe55769d 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -27,12 +27,15 @@ void sub_81AAC50(void); void sub_81AAC70(void); void sub_8108CF0(void); void sub_810B108(u8); -void UseFameCheckerFromMenu(void); +void ReturnToBagFromKeyItem(void); void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2); void sub_8108B50(u8 taskId); void sub_8108CB4(void); void sub_8108EE0(void (*)(void)); void DisplayItemMessageInBag(u8 taskId, u8 bgId, const u8 * string, TaskFunc followUpFunc); void sub_810A1F8(u8 taskId); +void sub_8107ECC(void); +void sub_8108DC8(u8 pocketId); +void sub_81089F4(u8 pocketId); #endif //GUARD_ITEM_MENU_H -- cgit v1.2.3 From a4f1de801550d35314b5ce51d54f30e4bdb8e767 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Jun 2019 10:44:25 -0400 Subject: Some renaming --- include/item_menu.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/item_menu.h') diff --git a/include/item_menu.h b/include/item_menu.h index cfe55769d..2e83ed1f4 100644 --- a/include/item_menu.h +++ b/include/item_menu.h @@ -29,9 +29,9 @@ void sub_8108CF0(void); void sub_810B108(u8); void ReturnToBagFromKeyItem(void); void ItemMenu_MoveItemSlotToNewPositionInArray(struct ItemSlot * slots, int pos1, int pos2); -void sub_8108B50(u8 taskId); +void ItemMenu_StartFadeToExitCallback(u8 taskId); void sub_8108CB4(void); -void sub_8108EE0(void (*)(void)); +void ItemMenu_SetExitCallback(void (*)(void)); void DisplayItemMessageInBag(u8 taskId, u8 bgId, const u8 * string, TaskFunc followUpFunc); void sub_810A1F8(u8 taskId); void sub_8107ECC(void); -- cgit v1.2.3