diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-06 10:05:26 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-06 10:05:26 -0700 |
| commit | f14d2765da6f01eccb08967fd6b22c3bdef2be98 (patch) | |
| tree | c10e1ee358275b62b8fa660e376913bd0112d3db /src | |
| parent | 83ea8d0cd9f8141181d09718c79b8916df945752 (diff) | |
| parent | 7f2329253f8e2739db0e25fd37aeb6582ba04d26 (diff) | |
Merge pull request #240 from Slawter666/master
Move gItems to c
Diffstat (limited to 'src')
| -rw-r--r-- | src/item_icon.c | 2 | ||||
| -rw-r--r-- | src/item_menu_icons.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/item_icon.c b/src/item_icon.c index 4aaad9c31..d6fedf892 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -4,13 +4,13 @@ #include "sprite.h" #include "decompress.h" #include "constants/items.h" +#include "data/item_icon_table.h" // EWRAM vars EWRAM_DATA void *gItemIconDecompressionBuffer = NULL; EWRAM_DATA void *gItemIcon4x4Buffer = NULL; // const rom data -extern const void *const gItemIconTable[][2]; // todo: move to C file static const struct OamData sOamData_ItemIcon = { diff --git a/src/item_menu_icons.c b/src/item_menu_icons.c index 1d9dbb106..f12bb454e 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) { |