Merge branch 'art' into next

art/characters/schnoz_f1.grit

@@ -1 +1 @@
--g -al0 -aw16 -p -pS -Oschnoz -ftb -oschnoz_f1 -Zl
+-g -gB4 -al0 -aw16 -m! -p -pS -Oschnoz -ftb -oschnoz_f1 -Zl

art/characters/schnoz_f2.grit

@@ -1 +1 @@
--g -al16 -aw16 -p -pS -Oschnoz -ftb -oschnoz_f2 -Zl
+-g -gB4 -al16 -aw16 -m! -p -pS -Oschnoz -ftb -oschnoz_f2 -Zl

art/hub/hub_map.grit

@@ -1 +1 @@
--g -m -mR4 -p -ftb -Zl
+-g! -m -mR4 -p! -ftb -Zl -ohub -fxhub.img.bin

art/hub/hub_tilemap.grit

@@ -0,0 +1 @@
+-g -gB4 -m! -p -Mh2 -Mw2 -MRp -ftb -Zl -ohub

include/hub.h

@@ -0,0 +1,19 @@
+
+//{{BLOCK(hubShared)
+
+//======================================================================
+//
+//	hubShared, 0x0@8, 
+//
+//	Time-stamp: 2020-06-02, 19:56:40
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.15
+//	( http://www.coranac.com/projects/#grit )
+//
+//======================================================================
+
+#ifndef GRIT_HUBSHARED_H
+#define GRIT_HUBSHARED_H
+
+#endif // GRIT_HUBSHARED_H
+
+//}}BLOCK(hubShared)

include/hub_map.h

@@ -1,32 +0,0 @@
-
-//{{BLOCK(hub_map)
-
-//======================================================================
-//
-//	hub_map, 512x256@8, 
-//	+ palette 80 entries, lz77 compressed
-//	+ 19 tiles (t|f|p reduced) lz77 compressed
-//	+ regular map (flat), lz77 compressed, 64x32 
-//	Total size: 160 + 388 + 556 = 1104
-//
-//	Time-stamp: 2020-06-02, 17:00:12
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.15
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_HUB_MAP_H
-#define GRIT_HUB_MAP_H
-
-#define hub_mapTilesLen 388
-extern const unsigned int hub_mapTiles[97];
-
-#define hub_mapMapLen 556
-extern const unsigned short hub_mapMap[278];
-
-#define hub_mapPalLen 160
-extern const unsigned short hub_mapPal[80];
-
-#endif // GRIT_HUB_MAP_H
-
-//}}BLOCK(hub_map)

include/schnoz.h

@@ -3,11 +3,11 @@
 
 //======================================================================
 //
-//	schnoz, 16x16@8, 
+//	schnoz, 16x16@4, 
 //	+ palette 8 entries, lz77 compressed
 //	Total size: 16 = 16
 //
-//	Time-stamp: 2020-06-02, 17:15:58
+//	Time-stamp: 2020-06-02, 19:52:02
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.15
 //	( http://www.coranac.com/projects/#grit )
 //

include/schnoz_f1.h

@@ -3,11 +3,11 @@
 
 //======================================================================
 //
-//	schnoz_f1, 16x32@8, 
+//	schnoz_f1, 16x32@4, 
 //	+ 8 tiles lz77 compressed
-//	Total size: 140 = 140
+//	Total size: 120 = 120
 //
-//	Time-stamp: 2020-06-02, 17:15:56
+//	Time-stamp: 2020-06-02, 19:51:58
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.15
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -16,8 +16,8 @@
 #ifndef GRIT_SCHNOZ_F1_H
 #define GRIT_SCHNOZ_F1_H
 
-#define schnoz_f1TilesLen 140
-extern const unsigned int schnoz_f1Tiles[35];
+#define schnoz_f1TilesLen 120
+extern const unsigned int schnoz_f1Tiles[30];
 
 #endif // GRIT_SCHNOZ_F1_H
 

include/schnoz_f2.h

@@ -3,11 +3,11 @@
 
 //======================================================================
 //
-//	schnoz_f2, 16x32@8, 
+//	schnoz_f2, 16x32@4, 
 //	+ 8 tiles lz77 compressed
 //	Total size: 148 = 148
 //
-//	Time-stamp: 2020-06-02, 17:15:58
+//	Time-stamp: 2020-06-02, 19:52:02
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.15
 //	( http://www.coranac.com/projects/#grit )
 //