diff options
| author | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
|---|---|---|
| committer | golem galvanize <golemgalvanize@github.com> | 2018-12-07 14:47:20 -0500 |
| commit | 53fac4417b53fcee2cc9e46d72ad598b016cc967 (patch) | |
| tree | 07e69072826569c7c31230cb4671a5d321e5f972 /src/item.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/item.c')
| -rw-r--r-- | src/item.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/item.c b/src/item.c index b4a2fd6f0..6d2dbd561 100644 --- a/src/item.c +++ b/src/item.c @@ -1,7 +1,6 @@ #include "global.h" #include "item.h" #include "berry.h" -#include "constants/items.h" #include "string_util.h" #include "text.h" #include "event_data.h" @@ -10,11 +9,13 @@ #include "item_menu.h" #include "strings.h" #include "load_save.h" +#include "item_use.h" +#include "battle_pyramid.h" #include "battle_pyramid_bag.h" +#include "constants/items.h" +#include "constants/hold_effects.h" -extern bool8 InBattlePyramid(void); extern u16 gUnknown_0203CF30[]; -extern const struct Item gItems[]; // this file's functions static bool8 CheckPyramidBagHasItem(u16 itemId, u16 count); @@ -23,6 +24,10 @@ static bool8 CheckPyramidBagHasSpace(u16 itemId, u16 count); // EWRAM variables EWRAM_DATA struct BagPocket gBagPockets[POCKETS_COUNT] = {0}; +// rodata +#include "data/text/item_descriptions.h" +#include "data/items.h" + // code static u16 GetBagItemQuantity(u16 *quantity) { |