diff options
| author | garak <garakmon@gmail.com> | 2018-12-16 20:05:31 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-16 20:05:31 -0500 |
| commit | e292d0ca8375a8c54907d6bcf404e2e084344156 (patch) | |
| tree | b9c59449d47bf73d98d3e38fa26804a163d871ab /src/item_icon.c | |
| parent | 10237e8d13b35474ea999b4e9139f9a48a80c53d (diff) | |
| parent | d1e6e705ccf05f93933ae4494b1d388550d81d26 (diff) | |
Merge branch 'master' into fldeff
Diffstat (limited to 'src/item_icon.c')
| -rw-r--r-- | src/item_icon.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/item_icon.c b/src/item_icon.c index 68ec1daf0..d037782bd 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 "alloc.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 = { |