From fdd7b1033cb32f02eb861ca87fa92b9886bdfe37 Mon Sep 17 00:00:00 2001 From: scnorton Date: Sun, 6 Jan 2019 16:00:27 -0500 Subject: Through ScrCmd_pokemart --- include/party_menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/party_menu.h') diff --git a/include/party_menu.h b/include/party_menu.h index 19e1f7d4e..2e83c1496 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -12,7 +12,7 @@ enum { AILMENT_BRN }; -bool8 pokemon_has_move(struct Pokemon *, u16); +bool8 MonKnowsMove(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); u8 pokemon_ailments_get_primary(u32 status); -- cgit v1.2.3 From 584bdbe5b57b28fbb06c1e49235f12f7de8c79ed Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Apr 2019 18:42:50 -0400 Subject: tm_case through sub_8132F20 --- include/party_menu.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include/party_menu.h') diff --git a/include/party_menu.h b/include/party_menu.h index 2e83c1496..5f7a3a68e 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -12,10 +12,16 @@ enum { AILMENT_BRN }; +extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func); + bool8 MonKnowsMove(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); u8 pokemon_ailments_get_primary(u32 status); u16 ItemIdToBattleMoveId(u16 itemId); +void sub_8125B40(u8 taskId, TaskFunc func); +void sub_8124C8C(void); +void sub_8126EDC(void); +void c2_8123744(void); #endif // GUARD_PARTY_MENU_H -- cgit v1.2.3 From d74dda011ad0fc50d3ffb1a98213308e114933cf Mon Sep 17 00:00:00 2001 From: ultima-soul Date: Wed, 17 Apr 2019 14:09:54 -0700 Subject: Port fldeff_teleport --- include/party_menu.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include/party_menu.h') diff --git a/include/party_menu.h b/include/party_menu.h index 5f7a3a68e..09b160954 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -1,7 +1,8 @@ #ifndef GUARD_PARTY_MENU_H #define GUARD_PARTY_MENU_H -#include "global.h" +#include "main.h" +#include "task.h" enum { AILMENT_NONE, @@ -14,6 +15,7 @@ enum { extern void (*gUnknown_3005E98)(u8 taskId, TaskFunc func); +bool8 FieldCallback_PrepareFadeInFromMenu(void); bool8 MonKnowsMove(struct Pokemon *, u16); void sub_81B58A8(void); void DoWallyTutorialBagMenu(void); @@ -23,5 +25,6 @@ void sub_8125B40(u8 taskId, TaskFunc func); void sub_8124C8C(void); void sub_8126EDC(void); void c2_8123744(void); +u8 GetCursorSelectionMonId(void); #endif // GUARD_PARTY_MENU_H -- cgit v1.2.3 From a37da53f206a190ef54fa9477e16f3e24b541f38 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 5 May 2019 14:56:59 -0400 Subject: Daycare --- include/party_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/party_menu.h') diff --git a/include/party_menu.h b/include/party_menu.h index 09b160954..34b375e42 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -26,5 +26,6 @@ void sub_8124C8C(void); void sub_8126EDC(void); void c2_8123744(void); u8 GetCursorSelectionMonId(void); +void sub_8128370(void); #endif // GUARD_PARTY_MENU_H -- cgit v1.2.3 From 5bcafd74ec9978e260dc8dc53e57a89964a8c5cc Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sat, 1 Jun 2019 14:18:27 -0400 Subject: fldeff_softboiled --- include/party_menu.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'include/party_menu.h') 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 -- cgit v1.2.3 From 632a7e8c08158470cbe5120fc8c8ec0141fe7303 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 16 Jun 2019 21:14:16 -0400 Subject: finish item_pc --- include/party_menu.h | 1 + 1 file changed, 1 insertion(+) (limited to 'include/party_menu.h') diff --git a/include/party_menu.h b/include/party_menu.h index 01cd0ef57..144e735de 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -51,5 +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); #endif // GUARD_PARTY_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/party_menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/party_menu.h') 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 -- 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/party_menu.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/party_menu.h') diff --git a/include/party_menu.h b/include/party_menu.h index 527147296..5b40a945a 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -52,5 +52,14 @@ void GetMonNickname(const struct Pokemon * mon, u8 * dest); void sub_81202F8(const u8 * src, u8 a1); bool8 sub_8120370(void); void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback); +void sub_81252D0(u8 taskId, TaskFunc followUpFunc); +void sub_81256F8(u8 taskId, TaskFunc followUpFunc); +void dp05_pp_up(u8 taskId, TaskFunc followUpFunc); +void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc); +void sub_8126B60(u8 taskId, TaskFunc followUpFunc); +void sub_8126894(u8 taskId, TaskFunc followUpFunc); +void sub_81279E0(void); +void ItemUseCB_Medicine(u8 taskId, TaskFunc followUpFunc); +u8 GetItemEffectType(u16 itemId); #endif // GUARD_PARTY_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/party_menu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/party_menu.h') diff --git a/include/party_menu.h b/include/party_menu.h index 5b40a945a..3b620c3b0 100644 --- a/include/party_menu.h +++ b/include/party_menu.h @@ -53,7 +53,7 @@ void sub_81202F8(const u8 * src, u8 a1); bool8 sub_8120370(void); void PartyMenuInit(u8 a, u8 b, u8 c, u8 d, u8 messageId, TaskFunc task, MainCallback callback); void sub_81252D0(u8 taskId, TaskFunc followUpFunc); -void sub_81256F8(u8 taskId, TaskFunc followUpFunc); +void ItemUseCB_PpRestore(u8 taskId, TaskFunc followUpFunc); void dp05_pp_up(u8 taskId, TaskFunc followUpFunc); void dp05_rare_candy(u8 taskId, TaskFunc followUpFunc); void sub_8126B60(u8 taskId, TaskFunc followUpFunc); -- cgit v1.2.3