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_icon.c | |
| parent | 18124740a4d75ae95948f95ca6f63c320e51501c (diff) | |
| parent | 6df2042b3b3ea8e7bf61cfd95bd24ee06e7b4b32 (diff) | |
fixing merge conflicts
Diffstat (limited to 'src/item_icon.c')
| -rw-r--r-- | src/item_icon.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/item_icon.c b/src/item_icon.c index 68ec1daf0..41c6589f5 100644 --- a/src/item_icon.c +++ b/src/item_icon.c @@ -1,16 +1,17 @@ #include "global.h" +#include "decompress.h" +#include "graphics.h" #include "item_icon.h" #include "malloc.h" #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 +#include "data/item_icon_table.h" static const struct OamData sOamData_ItemIcon = { |