Karathan
/
source_of_the_sovereign
mirror of https://github.com/SBird1337/source_of_the_sovereign
Watch 1
Star 0
Fork 0
Code Issues Releases 0 Wiki Activity
Browse Source

fixed mugshot compile rulez

SBird1337 7 years ago
parent
14b1c0199e
commit
5315ec8acf
3 changed files with 110 additions and 1 deletions
Split View Show Diff Stats
  1. 6
    1
      assets.makefile
  2. 76
    0
      src/include/assets/mug/mug_09.c
  3. 28
    0
      src/include/assets/mug/mug_09.h

+ 6
- 1
assets.makefile View File 

@@ -30,6 +30,7 @@ PNG_MUG_05    := assets/mug/mug_05.png
30 30 
 PNG_MUG_06    := assets/mug/mug_06.png
31 31 
 PNG_MUG_07    := assets/mug/mug_07.png
32 32 
 PNG_MUG_08    := assets/mug/mug_08.png
33 
+PNG_MUG_09    := assets/mug/mug_09.png
33 34
34 35 
 C_MUG_00      := src/include/assets/mug/mug_00.c
35 36 
 C_MUG_01      := src/include/assets/mug/mug_01.c

@@ -40,6 +41,7 @@ C_MUG_05      := src/include/assets/mug/mug_05.c
40 41 
 C_MUG_06      := src/include/assets/mug/mug_06.c
41 42 
 C_MUG_07      := src/include/assets/mug/mug_07.c
42 43 
 C_MUG_08      := src/include/assets/mug/mug_08.c
44 
+C_MUG_09      := src/include/assets/mug/mug_09.c
43 45
44 46 
 PNG_EMOT      := assets/interface/emoticons.png
45 47 
 PNG_TB        := assets/interface/text_box.png

@@ -52,7 +54,7 @@ B_MB          := src/include/assets/interface/menu_box.img.bin
52 54 
 B_ARR         := src/include/assets/interface/arrows.img.bin
53 55
54 56 
 .PHONY: all
55 
-all: $(C_MET_BG) $(C_MET_SKY) $(C_MET_FG) $(C_MET_CLOUDS) $(C_MET_METEOR) $(C_AS_T) $(C_MUG_00) $(C_MUG_01) $(C_MUG_02) $(C_MUG_03) $(C_MUG_04) $(C_MUG_05) $(C_MUG_06) $(C_MUG_07) $(C_MUG_08) $(B_EMOT) $(B_TB) $(B_MB) $(B_ARR)
57 
+all: $(C_MET_BG) $(C_MET_SKY) $(C_MET_FG) $(C_MET_CLOUDS) $(C_MET_METEOR) $(C_AS_T) $(C_MUG_00) $(C_MUG_01) $(C_MUG_02) $(C_MUG_03) $(C_MUG_04) $(C_MUG_05) $(C_MUG_06) $(C_MUG_07) $(C_MUG_08) $(C_MUG_09) $(B_EMOT) $(B_TB) $(B_MB) $(B_ARR)
56 58
57 59
58 60 
 # generate object files

@@ -117,6 +119,9 @@ $(C_MUG_07): $(PNG_MUG_07)
117 119 
 $(C_MUG_08): $(PNG_MUG_08)
118 120 
 	$(GRIT) $< -gu32 -gzl -gB 4 -gt -p -pu16 -pz! -m! -ftc -o $@
119 121
122 
+$(C_MUG_09): $(PNG_MUG_09)
123 
+	$(GRIT) $< -gu32 -gzl -gB 4 -gt -p -pu16 -pz! -m! -ftc -o $@
124 
+
120 125
121 126 
 $(B_EMOT): $(PNG_EMOT)
122 127 
 	$(GRIT) $< -gu32 -gz! -gB 4 -gt -p! -m! -ftb -o $@

+ 76
- 0
src/include/assets/mug/mug_09.c View File 

@@ -0,0 +1,76 @@
1 
+
2 
+//{{BLOCK(mug_09)
3 
+
4 
+//======================================================================
5 
+//
6 
+//	mug_09, 32x32@4,
7 
+//	+ palette 256 entries, not compressed
8 
+//	+ 16 tiles lz77 compressed
9 
+//	Total size: 512 + 468 = 980
10 
+//
11 
+//	Time-stamp: 2017-08-24, 21:18:29
12 
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 
+//	( http://www.coranac.com/projects/#grit )
14 
+//
15 
+//======================================================================
16 
+
17 
+const unsigned int mug_09Tiles[117] __attribute__((aligned(4)))=
18 
+{
19 
+	0x00020010,0xE011112A,0x1300A101,0x2806008A,0x220A00A0,0x4AAA1130,0x0288D2A1,0x22DD8AA8,
20 
+	0x03008822,0x03208382,0xD8222228,0x001F302D,0xA44A0044,0xA4A811AA,0x8200A288,0x22D2224A,
21 
+	0x16222A48,0x0024A222,0x1F602428,0xA91A6750,0x00AD7000,0x08008D74,0x7D10148D,0x63008A6D,
22 
+	0x00840310,0x416F106B,0x41227700,0xA2730088,0x47008211,0x108D6CD8,0xD8040070,0x01207D00,
23 
+	0x4A0022AA,0x30440004,0x000A7773,0x2260F773,0x2282A482,0xDD44A200,0x2A034ADD,0x393400A2,
24 
+	0x9C9304A0,0xCC009303,0xCCC9339C,0x00C77779,0x8D50F7CC,0x28111142,0x22030082,0xAA11110A,
25 
+	0x15100310,0x00041111,0x7B00A077,0x508C00A7,0x415E00A1,0x28DA0310,0x24001182,0xA0118DDD,
26 
+	0x14112222,0x00A22A01,0x8B00AA21,0x930002AA,0x9702F003,0x007AFA09,0xB7C99C37,0xE7CCCC7B,
27 
+
28 
+	0x99CC0E00,0x3CC9700A,0x3744004A,0x7744AA99,0xCC00C593,0xCCC96003,0x00CC6A03,0xCC3999CC,
29 
+	0xCC793CCC,0x03939C00,0x40393FF5,0x03930033,0x407399A4,0x4A08A02A,0x00701111,0x1427B003,
30 
+	0x20EE1100,0xA2001114,0x8720A810,0x2287004A,0x2A41FF20,0xA4111911,0x00060022,0x00DD8877,
31 
+	0x11220099,0x11A40771,0x4300CC97,0x49CCC971,0x0037A822,0x342D2233,0x3428D833,0xA2283300,
32 
+	0x4A223330,0x2A930473,0x0099370A,0x002299EC,0x07934A22,0x0382A440,0x22A44400,0x2A440033,
33 
+	0x07390A93,0xF80037A0,0x99040079,0x93739900,0x37399993,0x11480022,0x110DD811,0x10E48211,
34 
+	0x00EC01F7,0x017C11FE,0x1017CCF4,0x01931111,0x0101000B,
35 
+};
36 
+
37 
+const unsigned short mug_09Pal[256] __attribute__((aligned(4)))=
38 
+{
39 
+	0x0000,0x7FE0,0x5167,0x25B5,0x1863,0x6292,0x7B58,0x1D0C,
40 
+	0x61CA,0x363A,0x28C3,0x28FA,0x5B3E,0x6E2B,0x1C71,0x7FFF,
41 
+	0x4525,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
42 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
43 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
44 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
45 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
46 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
47 
+
48 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
49 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
50 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
51 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
52 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
53 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
54 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
55 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
56 
+
57 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
58 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
59 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
60 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
61 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
62 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
63 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
64 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
65 
+
66 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
67 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
68 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
69 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
70 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
71 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
72 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
73 
+	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
74 
+};
75 
+
76 
+//}}BLOCK(mug_09)

+ 28
- 0
src/include/assets/mug/mug_09.h View File 

@@ -0,0 +1,28 @@
1 
+
2 
+//{{BLOCK(mug_09)
3 
+
4 
+//======================================================================
5 
+//
6 
+//	mug_09, 32x32@4,
7 
+//	+ palette 256 entries, not compressed
8 
+//	+ 16 tiles lz77 compressed
9 
+//	Total size: 512 + 468 = 980
10 
+//
11 
+//	Time-stamp: 2017-08-24, 21:18:29
12 
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 
+//	( http://www.coranac.com/projects/#grit )
14 
+//
15 
+//======================================================================
16 
+
17 
+#ifndef GRIT_MUG_09_H
18 
+#define GRIT_MUG_09_H
19 
+
20 
+#define mug_09TilesLen 468
21 
+extern const unsigned int mug_09Tiles[117];
22 
+
23 
+#define mug_09PalLen 512
24 
+extern const unsigned short mug_09Pal[256];
25 
+
26 
+#endif // GRIT_MUG_09_H
27 
+
28 
+//}}BLOCK(mug_09)