diff --git a/art/characters/schnoz_f1.grit b/art/characters/schnoz_f1.grit index 9e95876..ea6a23e 100644 --- a/art/characters/schnoz_f1.grit +++ b/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 diff --git a/art/characters/schnoz_f2.grit b/art/characters/schnoz_f2.grit index 3bc292c..ec8c179 100644 --- a/art/characters/schnoz_f2.grit +++ b/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 diff --git a/art/hub/hub_map.grit b/art/hub/hub_map.grit index c4cef40..cbe2230 100644 --- a/art/hub/hub_map.grit +++ b/art/hub/hub_map.grit @@ -1 +1 @@ --g -m -mR4 -p -ftb -Zl +-g! -m -mR4 -p! -ftb -Zl -ohub -fxhub.img.bin diff --git a/art/hub/hub_tilemap.grit b/art/hub/hub_tilemap.grit new file mode 100644 index 0000000..940a923 --- /dev/null +++ b/art/hub/hub_tilemap.grit @@ -0,0 +1 @@ +-g -gB4 -m! -p -Mh2 -Mw2 -MRp -ftb -Zl -ohub diff --git a/graphics/hub.img.bin b/graphics/hub.img.bin new file mode 100644 index 0000000..45c02ca Binary files /dev/null and b/graphics/hub.img.bin differ diff --git a/graphics/hub_map.map.bin b/graphics/hub.map.bin similarity index 91% rename from graphics/hub_map.map.bin rename to graphics/hub.map.bin index 01a7fa7..5c14e28 100644 Binary files a/graphics/hub_map.map.bin and b/graphics/hub.map.bin differ diff --git a/graphics/hub_map.pal.bin b/graphics/hub.pal.bin similarity index 80% rename from graphics/hub_map.pal.bin rename to graphics/hub.pal.bin index 5a8fc5f..d7023cd 100644 Binary files a/graphics/hub_map.pal.bin and b/graphics/hub.pal.bin differ diff --git a/graphics/hub_map.img.bin b/graphics/hub_map.img.bin deleted file mode 100644 index 751570c..0000000 Binary files a/graphics/hub_map.img.bin and /dev/null differ diff --git a/graphics/schnoz.pal.bin b/graphics/schnoz.pal.bin index ee2063b..52178ff 100644 Binary files a/graphics/schnoz.pal.bin and b/graphics/schnoz.pal.bin differ diff --git a/graphics/schnoz_f1.img.bin b/graphics/schnoz_f1.img.bin index c629be2..732077a 100644 Binary files a/graphics/schnoz_f1.img.bin and b/graphics/schnoz_f1.img.bin differ diff --git a/graphics/schnoz_f2.img.bin b/graphics/schnoz_f2.img.bin index 9dc1c1c..143276b 100644 Binary files a/graphics/schnoz_f2.img.bin and b/graphics/schnoz_f2.img.bin differ diff --git a/include/hub.h b/include/hub.h new file mode 100644 index 0000000..a443b49 --- /dev/null +++ b/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) diff --git a/include/hub_map.h b/include/hub_map.h deleted file mode 100644 index eeae964..0000000 --- a/include/hub_map.h +++ /dev/null @@ -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) diff --git a/include/schnoz.h b/include/schnoz.h index aa0ca77..c31e7b1 100644 --- a/include/schnoz.h +++ b/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 ) // diff --git a/include/schnoz_f1.h b/include/schnoz_f1.h index 565d338..f35b55e 100644 --- a/include/schnoz_f1.h +++ b/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 diff --git a/include/schnoz_f2.h b/include/schnoz_f2.h index 2dc5181..d246cbe 100644 --- a/include/schnoz_f2.h +++ b/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 ) //