diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/berry_powder.h | 6 | ||||
| -rw-r--r-- | include/constants/fanfares.h | 22 | ||||
| -rw-r--r-- | include/item_menu.h | 3 | ||||
| -rw-r--r-- | include/item_use.h | 2 | ||||
| -rw-r--r-- | include/strings.h | 5 |
5 files changed, 36 insertions, 2 deletions
diff --git a/include/berry_powder.h b/include/berry_powder.h new file mode 100644 index 000000000..89582aacc --- /dev/null +++ b/include/berry_powder.h @@ -0,0 +1,6 @@ +#ifndef GUARD_BERRY_POWDER_H +#define GUARD_BERRY_POWDER_H + +u32 GetBerryPowder(void); + +#endif //GUARD_BERRY_POWDER_H diff --git a/include/constants/fanfares.h b/include/constants/fanfares.h new file mode 100644 index 000000000..21d3af79c --- /dev/null +++ b/include/constants/fanfares.h @@ -0,0 +1,22 @@ +#ifndef GUARD_CONSTANTS_FANFARES_H +#define GUARD_CONSTANTS_FANFARES_H + +enum Fanfares +{ + FANFARE_00, + FANFARE_01, + FANFARE_02, + FANFARE_03, + FANFARE_04, + FANFARE_05, + FANFARE_06, + FANFARE_07, + FANFARE_08, + FANFARE_09, + FANFARE_10, + FANFARE_POKEFLUTE, + FANFARE_KEY_ITEM, + FANFARE_DEX_EVAL +}; + +#endif //GUARD_CONSTANTS_FANFARES_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 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); diff --git a/include/strings.h b/include/strings.h index 8b98abb20..23562d4b9 100644 --- a/include/strings.h +++ b/include/strings.h @@ -163,6 +163,11 @@ extern const u8 gText_ReturnToPC[]; extern const u8 gUnknown_8416425[]; extern const u8 gUnknown_8416451[]; +extern const u8 gUnknown_8416537[]; +extern const u8 gUnknown_8416644[]; +extern const u8 gUnknown_841665C[]; +extern const u8 gUnknown_8416690[]; +extern const u8 gUnknown_84166A7[]; extern const u8 gUnknown_84162BD[]; |