From f08417263e00f12b70ab293616156cf1a1a1d802 Mon Sep 17 00:00:00 2001 From: Alex Gentilucci Date: Tue, 2 Jun 2020 19:58:10 -0600 Subject: [PATCH] Updated binary files and grit settings --- art/characters/schnoz_f1.grit | 2 +- art/characters/schnoz_f2.grit | 2 +- art/hub/hub_map.grit | 2 +- art/hub/hub_tilemap.grit | 1 + graphics/hub.img.bin | Bin 0 -> 552 bytes graphics/{hub_map.map.bin => hub.map.bin} | Bin 556 -> 556 bytes graphics/{hub_map.pal.bin => hub.pal.bin} | Bin 160 -> 160 bytes graphics/hub_map.img.bin | Bin 388 -> 0 bytes graphics/schnoz.pal.bin | Bin 16 -> 16 bytes graphics/schnoz_f1.img.bin | Bin 140 -> 120 bytes graphics/schnoz_f2.img.bin | Bin 148 -> 148 bytes include/hub.h | 19 +++++++++++++ include/hub_map.h | 32 ---------------------- include/schnoz.h | 4 +-- include/schnoz_f1.h | 10 +++---- include/schnoz_f2.h | 4 +-- 16 files changed, 32 insertions(+), 44 deletions(-) create mode 100644 art/hub/hub_tilemap.grit create mode 100644 graphics/hub.img.bin rename graphics/{hub_map.map.bin => hub.map.bin} (91%) rename graphics/{hub_map.pal.bin => hub.pal.bin} (80%) delete mode 100644 graphics/hub_map.img.bin create mode 100644 include/hub.h delete mode 100644 include/hub_map.h 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 0000000000000000000000000000000000000000..45c02ca077d6d901f4d373ac1bd922be92b3184c GIT binary patch literal 552 zcmZutF>4h;5dP*ag?6)>NU(DE_77a{8ih0#J`f^#AgNNMN+T92QzT5ZkdW&6H*E5H zJ9{;d!onuK2>UMS6vo+m3L!YN%*=i}^L@L^xDT_oN1GZT`KqlzXq$$TbKukvYR`R- zzHiLn;i^E0-nuwCSh{z@oLq>B4NOd&BHr?Z6Cz{PpJK1*A`UG=UimCnLSv23miFN+zBaOBkK-)GXHw&A+JzP1N$nAKYG_y1tjqG@ zN;>>o=YOlO?fOC%@+0d)NLu`CNw6s#Uh;0%pgd+f%+__G)4iq8?=n=tAa5kp??~$q zyE2qM(j-+6LQRsO?`50mAh>FhbuiaKK8gLpudEv*r51e28KgR=qi@xCHSG%fpqGP& z^=eKb&M80ol4;g^SIT*`*JrxzdV7D4Q`X>`b#KET!ICDN0QiWJUZ4 zV!=+?n2n`m!-9CGCM@{8(dnGdIh{Iq)c_L!zNq70=C?t>3+bd2Fks0nyCU^WVI+N#ZENI1#QguW@3*@?=fV wRJqC}=DBF$vu<~TKj%R|zNa3tU%4e!Ws7^ae8nr_))rsYL2)zcE3eoLe~PDwAOHXW diff --git a/graphics/schnoz.pal.bin b/graphics/schnoz.pal.bin index ee2063b6a0cf2b022049986b740b362a5a5092b5..52178ff6a999cf4a51f7bdc660af6b277e02dfeb 100644 GIT binary patch literal 16 TcmWgOU;u&t^_!!#G=U5N7VZM~ literal 16 UcmWgOU;u&t^_!!#H0v1{02pfnb^rhX diff --git a/graphics/schnoz_f1.img.bin b/graphics/schnoz_f1.img.bin index c629be2a598031b9416f84169475f8a282792bcf..732077ad59efb0cac3d95e11f35c69b11fb66481 100644 GIT binary patch literal 120 zcmXBKF%Cgd5CzaXxfXEe`3o?kqL7LFQbMWxOVMcwoq|nhtUzfAmSPDca@r#pR=~&p z3=JEul+!JH)UNc9fZP<3a)ie_GM6}CUs@xWGQaT_E3qjUk?)Rw4br1G@m<26l$U26F_897;3)7$ j;P`(7PKPZY*cY%X%urNORASWn@!|ak_JjO_NrDvs=GZ5* diff --git a/graphics/schnoz_f2.img.bin b/graphics/schnoz_f2.img.bin index 9dc1c1c080b60687b1dee21650fb7ebcbbbf8008..143276b6b8b4afa8eec90d38c2d55d5fdb9e1a62 100644 GIT binary patch literal 148 zcmWm0!3{xC5CzaXX3w3+LfDuqA+dV-E0Ld&u$JiH*FXaj6=*;WmI_di5|FbwgrNmK z_V;uK7^#$+8(fSKhC44npvr!GU!5bQuo8M%L>24<%0i`aBVx)qmj&x`NH}FPM-EIz cZgIjG?F(na5nlTd@#rpD>ZC5%;2sFW7uBH?IRF3v literal 148 zcmYMmp%wu_6b9gbW)HWmdlZ^0Iob#t2wX{H+X}+AmA!zXDbobSgIH&RcTwjJhUR?b zV_2+!X#U>OJUYf0&WtUrF~D(O1rK2PJEoABY*7k(L76!-!W+$iS& 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 ) //