Merge pull request #380 from GriffinRichards/sync-scaninc

Sync tools with pokeemerald

1 files changed, 17 insertions, 0 deletions

diff --git a/tools/gbagfx/gfx.h b/tools/gbagfx/gfx.h
index 5355ced85..edb9e62c4 100644
--- a/tools/gbagfx/gfx.h
+++ b/tools/gbagfx/gfx.h
@@ -17,6 +17,21 @@ struct Palette {
 	int numColors;
 };
 
+struct NonAffineTile {
+    unsigned short index:10;
+    unsigned short hflip:1;
+    unsigned short vflip:1;
+    unsigned short palno:4;
+} __attribute__((packed));
+
+struct Tilemap {
+    union {
+        struct NonAffineTile *non_affine;
+        unsigned char *affine;
+    } data;
+    int size;
+};
+
 struct Image {
 	int width;
 	int height;
@@ -25,6 +40,8 @@ struct Image {
 	bool hasPalette;
 	struct Palette palette;
 	bool hasTransparency;
+	struct Tilemap tilemap;
+	bool isAffine;
 };
 
 void ReadImage(char *path, int tilesWidth, int bitDepth, int metatileWidth, int metatileHeight, struct Image *image, bool invertColors);