diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-04-25 01:41:04 +0100 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-04-25 01:41:04 +0100 |
| commit | a49f80d552a9adff15a097171898e113cfa412b9 (patch) | |
| tree | 21dd8cbb90e9f7b43d0d0f29282585ad5573f70d /src | |
| parent | a9d65ae6b66405d9470951e932a4d3b4b2f794df (diff) | |
Convert item_descriptions.inc to .h
OK
Diffstat (limited to 'src')
| -rw-r--r-- | src/item.c | 11 | ||||
| -rw-r--r-- | src/item_menu_icons.c | 6 |
2 files changed, 6 insertions, 11 deletions
diff --git a/src/item.c b/src/item.c index 9e521db77..a17599db9 100644 --- a/src/item.c +++ b/src/item.c @@ -25,17 +25,6 @@ enum KEYITEMS_POCKET }; -enum -{ - POCKET_ITEMS = 1, - POCKET_POKE_BALLS, - POCKET_TM_HM, - POCKET_BERRIES, - POCKET_KEY_ITEMS, -}; -#include "item_use.h" -#include "data/text/item_descriptions.h" -#include "data/items.h" u16 GetBagItemQuantity(u16* quantity) { return gSaveBlock2Ptr->encryptionKey ^ *quantity; diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 1d9dbb106..828722192 100644 --- a/src/item_menu_icons.c +++ b/src/item_menu_icons.c @@ -9,6 +9,9 @@ #include "berry.h" #include "graphics.h" #include "constants/items.h" +#include "item.h" +#include "item_use.h" +#include "constants/hold_effects.h" struct CompressedTilesPal { @@ -466,6 +469,9 @@ const struct SpriteTemplate gUnknown_0857FE88 = .callback = sub_80D5B48, }; +#include "data/text/item_descriptions.h" +//#include "data/items.h" + // code void RemoveBagSprite(u8 id) { |