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_use.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/item_use.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 -- 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_use.h | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) (limited to 'include/item_use.h') diff --git a/include/item_use.h b/include/item_use.h index 04e61ab59..a34090af1 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -6,4 +6,37 @@ void sub_80A1E0C(u8); void ItemUse_SetQuestLogEvent(u8, struct Pokemon *, u16, u16); +void sub_80A11E8(u8 taskId); +void sub_80A122C(u8 taskId); +void sub_80A1338(u8 taskId); +void sub_80A1460(u8 taskId); +void sub_80A14E8(u8 taskId); +void sub_80A156C(u8 taskId); +void sub_80A16E0(u8 taskId); +void sub_80A16FC(u8 taskId); +void sub_80A1718(u8 taskId); +void sub_80A1734(u8 taskId); +void sub_80A1750(u8 taskId); +void sub_80A176C(u8 taskId); +void sub_80A1788(u8 taskId); +void sub_80A1820(u8 taskId); +void sub_80A18B8(u8 taskId); +void sub_80A18EC(u8 taskId); +void sub_80A1998(u8 taskId); +void sub_80A1A94(u8 taskId); +void sub_80A1C60(u8 taskId); +void sub_80A1CF8(u8 taskId); +void sub_80A1D9C(u8 taskId); +void sub_80A1E1C(u8 taskId); +void sub_80A1E64(u8 taskId); +void sub_80A1E7C(u8 taskId); +void sub_80A1FBC(u8 taskId); +void sub_80A1FF4(u8 taskId); +void sub_80A2010(u8 taskId); +void sub_80A2238(u8 taskId); +void ItemUseOutOfBattle_EscapeRope(u8 taskId); +void ItemUseOutOfBattle_EnigmaBerry(u8 taskId); +void ItemUseInBattle_EnigmaBerry(u8 taskId); +void ItemUseOutOfBattle_Itemfinder(u8 taskId); + #endif //GUARD_ITEM_USE_H -- cgit v1.2.3 From 164dd43a62f212132f02f1965c51a2ac52c49e4f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 20 Jun 2019 10:30:41 -0400 Subject: Rename item use funcs, first pass --- include/item_use.h | 56 +++++++++++++++++++++++++++--------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) (limited to 'include/item_use.h') diff --git a/include/item_use.h b/include/item_use.h index a34090af1..ca22a56d0 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -6,34 +6,34 @@ void sub_80A1E0C(u8); void ItemUse_SetQuestLogEvent(u8, struct Pokemon *, u16, u16); -void sub_80A11E8(u8 taskId); -void sub_80A122C(u8 taskId); -void sub_80A1338(u8 taskId); -void sub_80A1460(u8 taskId); -void sub_80A14E8(u8 taskId); -void sub_80A156C(u8 taskId); -void sub_80A16E0(u8 taskId); -void sub_80A16FC(u8 taskId); -void sub_80A1718(u8 taskId); -void sub_80A1734(u8 taskId); -void sub_80A1750(u8 taskId); -void sub_80A176C(u8 taskId); -void sub_80A1788(u8 taskId); -void sub_80A1820(u8 taskId); -void sub_80A18B8(u8 taskId); -void sub_80A18EC(u8 taskId); -void sub_80A1998(u8 taskId); -void sub_80A1A94(u8 taskId); -void sub_80A1C60(u8 taskId); -void sub_80A1CF8(u8 taskId); -void sub_80A1D9C(u8 taskId); -void sub_80A1E1C(u8 taskId); -void sub_80A1E64(u8 taskId); -void sub_80A1E7C(u8 taskId); -void sub_80A1FBC(u8 taskId); -void sub_80A1FF4(u8 taskId); -void sub_80A2010(u8 taskId); -void sub_80A2238(u8 taskId); +void FieldUseFunc_OrangeMail(u8 taskId); +void FieldUseFunc_MachBike(u8 taskId); +void FieldUseFunc_OldRod(u8 taskId); +void FieldUseFunc_CoinCase(u8 taskId); +void FieldUseFunc_PowderJar(u8 taskId); +void FieldUseFunc_PokeFlute(u8 taskId); +void FieldUseFunc_OpenPartyMenu(u8 taskId); +void FieldUseFunc_Ether(u8 taskId); +void FieldUseFunc_PpUp(u8 taskId); +void FieldUseFunc_RareCandy(u8 taskId); +void FieldUseFunc_SunStone(u8 taskId); +void FieldUseFunc_SacredAsh(u8 taskId); +void FieldUseFunc_TmCase(u8 taskId); +void FieldUseFunc_BerryPouch(u8 taskId); +void BattleUseFunc_BerryPouch(u8 taskId); +void FieldUseFunc_TeachyTv(u8 taskId); +void FieldUseFunc_SuperRepel(u8 taskId); +void FieldUseFunc_BlackFlute(u8 taskId); +void FieldUseFunc_TownMap(u8 taskId); +void FieldUseFunc_FameChecker(u8 taskId); +void FieldUseFunc_VsSeeker(u8 taskId); +void BattleUseFunc_MasterBall(u8 taskId); +void BattleUseFunc_PokeFlute(u8 taskId); +void BattleUseFunc_GuardSpec(u8 taskId); +void BattleUseFunc_OpenPartyMenu(u8 taskId); +void BattleUseFunc_Ether(u8 taskId); +void BattleUseFunc_PokeDoll(u8 taskId); +void FieldUseFunc_OakStopsYou(u8 taskId); void ItemUseOutOfBattle_EscapeRope(u8 taskId); void ItemUseOutOfBattle_EnigmaBerry(u8 taskId); void ItemUseInBattle_EnigmaBerry(u8 taskId); -- 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_use.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/item_use.h') diff --git a/include/item_use.h b/include/item_use.h index ca22a56d0..d8356d7c1 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -16,7 +16,7 @@ void FieldUseFunc_OpenPartyMenu(u8 taskId); void FieldUseFunc_Ether(u8 taskId); void FieldUseFunc_PpUp(u8 taskId); void FieldUseFunc_RareCandy(u8 taskId); -void FieldUseFunc_SunStone(u8 taskId); +void FieldUseFunc_EvoItem(u8 taskId); void FieldUseFunc_SacredAsh(u8 taskId); void FieldUseFunc_TmCase(u8 taskId); void FieldUseFunc_BerryPouch(u8 taskId); -- 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_use.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'include/item_use.h') diff --git a/include/item_use.h b/include/item_use.h index d8356d7c1..0a45762f7 100644 --- a/include/item_use.h +++ b/include/item_use.h @@ -12,7 +12,7 @@ void FieldUseFunc_OldRod(u8 taskId); void FieldUseFunc_CoinCase(u8 taskId); void FieldUseFunc_PowderJar(u8 taskId); void FieldUseFunc_PokeFlute(u8 taskId); -void FieldUseFunc_OpenPartyMenu(u8 taskId); +void FieldUseFunc_Medicine(u8 taskId); void FieldUseFunc_Ether(u8 taskId); void FieldUseFunc_PpUp(u8 taskId); void FieldUseFunc_RareCandy(u8 taskId); @@ -27,10 +27,10 @@ void FieldUseFunc_BlackFlute(u8 taskId); void FieldUseFunc_TownMap(u8 taskId); void FieldUseFunc_FameChecker(u8 taskId); void FieldUseFunc_VsSeeker(u8 taskId); -void BattleUseFunc_MasterBall(u8 taskId); +void BattleUseFunc_PokeBallEtc(u8 taskId); void BattleUseFunc_PokeFlute(u8 taskId); void BattleUseFunc_GuardSpec(u8 taskId); -void BattleUseFunc_OpenPartyMenu(u8 taskId); +void BattleUseFunc_Medicine(u8 taskId); void BattleUseFunc_Ether(u8 taskId); void BattleUseFunc_PokeDoll(u8 taskId); void FieldUseFunc_OakStopsYou(u8 taskId); -- cgit v1.2.3