diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-18 20:19:10 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-11-18 20:19:10 +0100 |
| commit | 27ee7d567e34b76c737c4920cfeccc36e6221543 (patch) | |
| tree | 8df67f69c86109bb42e060100e2390ed20b33c61 /src/item.c | |
| parent | 1b0cfb075723af7b457ec118eca2888df449bf9e (diff) | |
| parent | 0bbe03f17030c8009508714fc2b41703f1a1310a (diff) | |
fix merge conflict and use EVENT_OBJECT_TEMPLATES_COUNT
Diffstat (limited to 'src/item.c')
| -rw-r--r-- | src/item.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/item.c b/src/item.c index b4a2fd6f0..b2c009be6 100644 --- a/src/item.c +++ b/src/item.c @@ -10,9 +10,9 @@ #include "item_menu.h" #include "strings.h" #include "load_save.h" +#include "battle_pyramid.h" #include "battle_pyramid_bag.h" -extern bool8 InBattlePyramid(void); extern u16 gUnknown_0203CF30[]; extern const struct Item gItems[]; |