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

move meteor cutscene to private

SBird1337 7 years ago
parent
7f458b95f9
commit
24ea58ef54
19 changed files with 18 additions and 596 deletions
Split View Show Diff Stats
  1. 3
    2
      .vscode/c_cpp_properties.json
  2. 6
    1
      .vscode/settings.json
  3. 1
    47
      assets.makefile
  4. 0
    0
      built/.gitignore
  5. BIN
      built/dynamic_overworld.o
  6. 2
    2
      makefile
  7. 1
    1
      sots-private
  8. 0
    1
      sprites.makefile
  9. 0
    45
      src/assets/meteor/met_background.c
  10. 0
    33
      src/assets/meteor/met_background.h
  11. 0
    64
      src/assets/meteor/met_clouds.c
  12. 0
    32
      src/assets/meteor/met_clouds.h
  13. 0
    148
      src/assets/meteor/met_foreground.c
  14. 0
    32
      src/assets/meteor/met_foreground.h
  15. 0
    68
      src/assets/meteor/met_meteor.c
  16. 0
    28
      src/assets/meteor/met_meteor.h
  17. 0
    55
      src/assets/meteor/met_sky.c
  18. 0
    32
      src/assets/meteor/met_sky.h
  19. 5
    5
      src/specials/cutscene_meteor.c

+ 3
- 2
.vscode/c_cpp_properties.json View File 

@@ -34,8 +34,9 @@
34 34 
                 "path": [
35 35 
                     "/usr/include",
36 36 
                     "/usr/local/include",
37 
-                    "src/include",
38 
-                    "$(workspaceRoot}/g3headers/include"
37 
+                    "$(workspaceRoot)/src/include",
38 
+                    "$(workspaceRoot}/g3headers/include",
39 
+                    "$(workspaceRoot}/generated_image"
39 40 
                 ],
40 41 
                 "limitSymbolsToIncludedHeaders": true,
41 42 
                 "databaseFilename": ""

+ 6
- 1
.vscode/settings.json View File 

@@ -155,6 +155,11 @@
155 155 
         "stat.h": "c",
156 156 
         "pokedex.h": "c",
157 157 
         "config.h": "c",
158 
-        "agb_debug.h": "c"
158 
+        "agb_debug.h": "c",
159 
+        "met_background.h": "c",
160 
+        "met_clouds.h": "c",
161 
+        "met_sky.h": "c",
162 
+        "met_meteor.h": "c",
163 
+        "met_foreground.h": "c"
159 164 
     }
160 165 
 }

+ 1
- 47
assets.makefile View File 

@@ -7,20 +7,6 @@ CFLAGS := -mthumb -mno-thumb-interwork -mcpu=arm7tdmi -mlong-calls -march=armv4t
7 7 
 ASSET_ROOT := sots-private/assets
8 8 
 GFX_BUILD := gfx_build
9 9
10 
-PNG_MET_BG     := assets/meteor/bg0.png
11 
-PNG_MET_SKY    := assets/meteor/bg1.png
12 
-PNG_MET_FG     := assets/meteor/bg2.png
13 
-PNG_MET_CLOUDS := assets/meteor/clouds.png
14 
-PNG_MET_METEOR := assets/meteor/oam.png
15 
-PNG_AS_T       := assets/render/ascii.png
16 
-
17 
-C_MET_BG     := src/assets/meteor/met_background.c
18 
-C_MET_SKY    := src/assets/meteor/met_sky.c
19 
-C_MET_FG     := src/assets/meteor/met_foreground.c
20 
-C_MET_CLOUDS := src/assets/meteor/met_clouds.c
21 
-C_MET_METEOR := src/assets/meteor/met_meteor.c
22 
-C_AS_T       := src/include/assets/ascii.c
23 
-
24 10 
 PNG_EMOT      := assets/interface/emoticons.png
25 11 
 PNG_TB        := assets/interface/text_box.png
26 12 
 PNG_MB        := assets/interface/menu_box.png

@@ -32,40 +18,8 @@ B_MB          := src/include/assets/interface/menu_box.img.bin
32 18 
 B_ARR         := src/include/assets/interface/arrows.img.bin
33 19
34 20 
 .PHONY: all
35 
-all: $(C_MET_BG) $(C_MET_SKY) $(C_MET_FG) $(C_MET_CLOUDS) $(C_MET_METEOR) $(C_AS_T) $(B_EMOT) $(B_TB) $(B_MB) $(B_ARR)
36 
-
37 
-
38 
-# generate object files
39 
-#$(O_MET_BG): $(C_MET_BG)
40 
-#	$(CC) $(CFLAGS) -c -o $@ $<
41 
-#
42 
-#$(O_MET_SKY): $(C_MET_SKY)
43 
-#	$(CC) $(CFLAGS) -c -o $@ $<
44 
-#
45 
-#$(O_MET_FG): $(C_MET_FG)
46 
-#	$(CC) $(CFLAGS) -c -o $@ $<
47 
-#
48 
-#$(O_MET_CLOUDS): $(C_MET_CLOUDS)
49 
-#	$(CC) $(CFLAGS) -c -o $@ $<
50 
-#
51 
-#$(O_MET_METEOR): $(C_MET_METEOR)
52 
-#	$(CC) $(CFLAGS) -c -o $@ $<
53 
-
54 
-# generate C files
55 
-$(C_MET_BG): $(PNG_MET_BG)
56 
-	$(GRIT) $< -gu32 -gT00FF00 -gzl -gB 4 -gt -m -mu16 -mzl -mp0 -mRtpf -p -pu16 -pzl -ftc -o $@
57 
-
58 
-$(C_MET_SKY): $(PNG_MET_SKY)
59 
-	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp1 -mRtpf -p -pu16 -pzl -ftc -o $@
60 
-
61 
-$(C_MET_FG): $(PNG_MET_FG)
62 
-	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp3 -mRtpf -p -pu16 -pzl -ftc -o $@
63 
-
64 
-$(C_MET_CLOUDS): $(PNG_MET_CLOUDS)
65 
-	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp2 -mRtpf -p -pu16 -pzl -ftc -o $@
21 
+all: $(C_AS_T) $(B_EMOT) $(B_TB) $(B_MB) $(B_ARR)
66 22
67 
-$(C_MET_METEOR): $(PNG_MET_METEOR)
68 
-	$(GRIT) $< -gu32 -gzl -gB 4 -gt -p -pu16 -pz! -ftc -o $@
69 23
70 24 
 $(C_AS_T): $(PNG_AS_T)
71 25 
 	$(GRIT) $< -gu32 -gzl -gB 4 -gt -p -pu16 -pz! -m! -ftc -o $@

+ 0
- 0
built/.gitignore View File


BIN
built/dynamic_overworld.o View File


+ 2
- 2
makefile View File 

@@ -23,7 +23,7 @@ CHARMAP := charmap.txt
23 23
24 24 
 DEFINES   := -DBPRE -DSOFTWARE_VERSION=0
25 25 
 ASFLAGS   := -mthumb
26 
-CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -fdiagnostics-color $(DEFINES)
26 
+CFLAGS    := -mthumb -mthumb-interwork -g -mcpu=arm7tdmi -fno-inline -mlong-calls -march=armv4t -Og -std=c11 -Wall -Wextra -Wunreachable-code -I$(PAGB_INCLUDE) -Isrc/include -Igenerated_image -fdiagnostics-color $(DEFINES)
27 27 
 GRITFLAGS := -ftc -fa
28 28 
 LDFLAGS   := -z muldefs
29 29 
 BLDPATH   := object
 
@@ -60,7 +60,7 @@ STRING_OBJ	:= $(STRING_SRC:%.s=$(BLDPATH)/%.o)
60 60 
 ASM_OBJ     := $(ASM_SRC:%.s=$(BLDPATH)/%.o)
61 61 
 C_OBJ       := $(C_SRC:%.c=$(BLDPATH)/%.o)
62 62 
 DATA_OBJ    := $(DATA_SRC:%.s=$(BLDPATH)/%.o)
63 
-ALL_OBJ     := $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(GEN_OBJ) $(STRING_OBJ)
63 
+ALL_OBJ     := $(GEN_OBJ) $(C_OBJ) $(ASM_OBJ) $(DATA_OBJ) $(STRING_OBJ)
64 64
65 65 
 $(STRINGDIR)/%.s: $(STRINGDIR)/%.txt
66 66 
 	@echo -e "\e[93mGenerating strings $<\e[0m"

+ 1
- 1
sots-private 

@@ -1 +1 @@
1 
-Subproject commit 46812f578eb73c9a8a2397680c112877637e337a
1 
+Subproject commit a8af53bfd4847685c354c39734519694485a91c1

+ 0
- 1
sprites.makefile View File 

@@ -48,7 +48,6 @@ clean:
48 48 
 	rm -f $(GFX_BUILD_DIR)/sprites/back_sprites/*
49 49 
 	rm -f $(GFX_BUILD_DIR)/overworlds/*
50 50 
 	rm -f $(GFX_BUILD_DIR)/item/*
51 
-	rm -f $(GFX_BUILD_DIR)/title_screen/*
52 51 
 	rm -f $(GFX_BUILD_DIR)/trainer_sprites/*
53 52
54 53

+ 0
- 45
src/assets/meteor/met_background.c View File 

@@ -1,45 +0,0 @@
1 
-
2 
-//{{BLOCK(met_background)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_background, 256x160@4,
7 
-//	Transparent color : 00,FF,00
8 
-//	+ palette 6 entries, lz77 compressed
9 
-//	+ 2 tiles (t|f reduced) lz77 compressed
10 
-//	+ regular map (flat), lz77 compressed, 32x20
11 
-//	Total size: 12 + 20 + 164 = 196
12 
-//
13 
-//	Time-stamp: 2017-01-01, 21:27:37
14 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
15 
-//	( http://www.coranac.com/projects/#grit )
16 
-//
17 
-//======================================================================
18 
-
19 
-const unsigned int met_backgroundTiles[5] __attribute__((aligned(4)))=
20 
-{
21 
-	0x00004010,0xF0000033,0x11059001,0x9001F011,0xF001F005,
22 
-};
23 
-
24 
-const unsigned short met_backgroundMap[82] __attribute__((aligned(4)))=
25 
-{
26 
-	0x0010,0x0005,0x013F,0xF000,0xF001,0xF001,0xF001,0xF001,
27 
-	0xF001,0xFB01,0x01F0,0x01F0,0x01F0,0x01F0,0x0770,0xF000,
28 
-	0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
29 
-	0x01F0,0x01F0,0xF0FF,0xF001,0xF001,0xF001,0xF001,0xF001,
30 
-	0xF001,0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
31 
-	0x01F0,0x01F0,0x01F0,0xF0FF,0xF001,0xF001,0xF001,0xF001,
32 
-	0xF001,0xF001,0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,
33 
-	0x01F0,0x01F0,0x01F0,0x01F0,0xF0FF,0xF001,0xF001,0xF001,
34 
-
35 
-	0xF001,0xF001,0xF001,0xA001,0xFF05,0x91F3,0x01F0,0x01F0,
36 
-	0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0xF0E0,0xF001,0x9401,
37 
-	0x003F,0x0000,
38 
-};
39 
-
40 
-const unsigned short met_backgroundPal[6] __attribute__((aligned(4)))=
41 
-{
42 
-	0x2010,0x0000,0x0030,0xF000,0x9001,0x0001,
43 
-};
44 
-
45 
-//}}BLOCK(met_background)

+ 0
- 33
src/assets/meteor/met_background.h View File 

@@ -1,33 +0,0 @@
1 
-
2 
-//{{BLOCK(met_background)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_background, 256x160@4,
7 
-//	Transparent color : 00,FF,00
8 
-//	+ palette 6 entries, lz77 compressed
9 
-//	+ 2 tiles (t|f reduced) lz77 compressed
10 
-//	+ regular map (flat), lz77 compressed, 32x20
11 
-//	Total size: 12 + 20 + 164 = 196
12 
-//
13 
-//	Time-stamp: 2017-01-01, 21:27:37
14 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
15 
-//	( http://www.coranac.com/projects/#grit )
16 
-//
17 
-//======================================================================
18 
-
19 
-#ifndef GRIT_MET_BACKGROUND_H
20 
-#define GRIT_MET_BACKGROUND_H
21 
-
22 
-#define met_backgroundTilesLen 20
23 
-extern const unsigned int met_backgroundTiles[5];
24 
-
25 
-#define met_backgroundMapLen 164
26 
-extern const unsigned short met_backgroundMap[82];
27 
-
28 
-#define met_backgroundPalLen 12
29 
-extern const unsigned short met_backgroundPal[6];
30 
-
31 
-#endif // GRIT_MET_BACKGROUND_H
32 
-
33 
-//}}BLOCK(met_background)

+ 0
- 64
src/assets/meteor/met_clouds.c View File 

@@ -1,64 +0,0 @@
1 
-
2 
-//{{BLOCK(met_clouds)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_clouds, 256x160@4,
7 
-//	+ palette 14 entries, lz77 compressed
8 
-//	+ 46 tiles (t|f reduced) lz77 compressed
9 
-//	+ regular map (flat), lz77 compressed, 32x20
10 
-//	Total size: 28 + 448 + 256 = 732
11 
-//
12 
-//	Time-stamp: 2017-01-01, 21:29:18
13 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
14 
-//	( http://www.coranac.com/projects/#grit )
15 
-//
16 
-//======================================================================
17 
-
18 
-const unsigned int met_cloudsTiles[112] __attribute__((aligned(4)))=
19 
-{
20 
-	0x0005C010,0xF0000033,0x6003B001,0x7013F066,0x66661707,0x601F1066,0x1F7019F0,0x60722320,
21 
-	0x1FF02720,0x06661E40,0xD1064320,0x41301FF0,0x063F0060,0x43E00606,0x105F50F8,0x805DF042,
22 
-	0x501AE05F,0x00240054,0x55030045,0x509B2055,0x50650455,0x10554444,0x03444503,0x44555554,
23 
-	0x01505555,0x060AC320,0x01056665,0xF100550B,0x00657255,0x000C0003,0x00550003,0x60FA662A,
24 
-	0x8018002A,0x00F20001,0x4860451A,0x4B50F656,0xEC101441,0x00056540,0x064B016D,0x404F11F6,
25 
-	0xB10B0003,0xDDF0550D,0xF7051950,0x43004710,0x01F09000,0x7012F050,0xB69F00FF,0x1044E910,
26 
-	0x55FFF088,0x0871DE10,0x56663B65,0xFF200C11,0x80060330,0xFF2A61DE,0x1E02F361,0x9710D710,
27 
-	0xCF206501,0x03202D12,0xE1E901F9,0x019FF0EC,0x55AE51A3,0xD79FF005,0xA8725510,0x55C40105,
28 
-
29 
-	0x4D210200,0x01801211,0x444000B0,0x44440054,0x6045443B,0x01DB7103,0xE55165B7,0x547B0421,
30 
-	0xB061AC21,0x1D21ED00,0x000F0244,0x1F10FC7A,0x0B21ECA0,0xC7117E31,0x06558341,0x023112FF,
31 
-	0xF0EB2034,0xF1B32001,0x014760CB,0xC6F1F7CB,0x8BF3C741,0x02008502,0x223F1257,0x2613FFA7,
32 
-	0x6B313BF0,0x8F4018F0,0xCF329B33,0x72FB7FC0,0x527BF0FF,0xE018F094,0xC0115601,0xC0CF6750,
33 
-	0x551F42BE,0xF0651306,0xF08CB4BE,0x3823BF12,0x23F90166,0x9067D47C,0x2173F2BF,0x9713FF3F,
34 
-	0x3FF10722,0x99F0FFB0,0x7420C821,0xC4FF1AF0,0xC49BF0BF,0xF01044BF,0x442E741F,0x003F9231,
35 
-};
36 
-
37 
-const unsigned short met_cloudsMap[128] __attribute__((aligned(4)))=
38 
-{
39 
-	0x0010,0x0005,0x003F,0xF020,0xF001,0xF001,0xF001,0xF001,
40 
-	0xF001,0xF801,0x01F0,0x01F0,0x01F0,0x01F0,0x0590,0x2001,
41 
-	0x0002,0x0320,0x0420,0x0520,0x0620,0x2000,0x2007,0x2008,
42 
-	0x2009,0x080A,0x0B20,0x0C20,0x2920,0x200D,0x800E,0x3120,
43 
-	0x200F,0x2010,0x2011,0x0012,0x1320,0x1420,0x1520,0x1620,
44 
-	0x2000,0x2017,0x2018,0x2019,0x881A,0x4D00,0x201B,0x001C,
45 
-	0x1D53,0x1E20,0x2020,0x001F,0x200B,0x2120,0x2220,0x2088,
46 
-	0x2335,0x2420,0x6B60,0x2025,0x3026,0x2720,0x1700,0x2710,
47 
-
48 
-	0x2028,0x2029,0x2A01,0x2B20,0x2C20,0x2D20,0x8BF0,0xF0FF,
49 
-	0xF001,0xF001,0xF001,0xF001,0xF001,0xF001,0xF001,0xFF01,
50 
-	0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
51 
-	0xF0FF,0xF001,0xF001,0xF001,0xF001,0xF001,0xF001,0xF001,
52 
-	0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
53 
-	0x01F0,0xF0FF,0xF001,0xF001,0xF001,0xF001,0xF001,0xF001,
54 
-	0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
55 
-	0x01F0,0x01F0,0xF0F8,0xF001,0xF001,0xF001,0x8001,0x0005,
56 
-};
57 
-
58 
-const unsigned short met_cloudsPal[14] __attribute__((aligned(4)))=
59 
-{
60 
-	0x2010,0x0000,0x0000,0x9602,0x747F,0x517F,0x007F,0x7FFE,
61 
-	0x7F9C,0x7F7A,0x0000,0xD080,0x0101,0x01F0,
62 
-};
63 
-
64 
-//}}BLOCK(met_clouds)

+ 0
- 32
src/assets/meteor/met_clouds.h View File 

@@ -1,32 +0,0 @@
1 
-
2 
-//{{BLOCK(met_clouds)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_clouds, 256x160@4,
7 
-//	+ palette 14 entries, lz77 compressed
8 
-//	+ 46 tiles (t|f reduced) lz77 compressed
9 
-//	+ regular map (flat), lz77 compressed, 32x20
10 
-//	Total size: 28 + 448 + 256 = 732
11 
-//
12 
-//	Time-stamp: 2017-01-01, 21:29:18
13 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
14 
-//	( http://www.coranac.com/projects/#grit )
15 
-//
16 
-//======================================================================
17 
-
18 
-#ifndef GRIT_MET_CLOUDS_H
19 
-#define GRIT_MET_CLOUDS_H
20 
-
21 
-#define met_cloudsTilesLen 448
22 
-extern const unsigned int met_cloudsTiles[112];
23 
-
24 
-#define met_cloudsMapLen 256
25 
-extern const unsigned short met_cloudsMap[128];
26 
-
27 
-#define met_cloudsPalLen 28
28 
-extern const unsigned short met_cloudsPal[14];
29 
-
30 
-#endif // GRIT_MET_CLOUDS_H
31 
-
32 
-//}}BLOCK(met_clouds)

+ 0
- 148
src/assets/meteor/met_foreground.c View File 

@@ -1,148 +0,0 @@
1 
-
2 
-//{{BLOCK(met_foreground)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_foreground, 256x160@4,
7 
-//	+ palette 18 entries, lz77 compressed
8 
-//	+ 140 tiles (t|f reduced) lz77 compressed
9 
-//	+ regular map (flat), lz77 compressed, 32x20
10 
-//	Total size: 36 + 2356 + 464 = 2856
11 
-//
12 
-//	Time-stamp: 2017-01-01, 21:29:18
13 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
14 
-//	( http://www.coranac.com/projects/#grit )
15 
-//
16 
-//======================================================================
17 
-
18 
-const unsigned int met_foregroundTiles[589] __attribute__((aligned(4)))=
19 
-{
20 
-	0x00118010,0xF000003D,0xF001F001,0x990F0001,0xBB600200,0x1C4017F0,0xBB999999,0xF0BB63BB,
21 
-	0xAA1F901F,0x19F0AAAA,0x095C0B30,0x109A1200,0x1001F004,0x0300440E,0x00114000,0x03001400,
22 
-	0x040018C0,0x41110000,0x2F110004,0x03004111,0xF00D0011,0x10446001,0x01F0CE2C,0x11445F40,
23 
-	0x5FE00200,0xB8400B40,0x30141300,0x0018C083,0x44111499,0x007B20DE,0x3BF0417F,0xC6002B90,
24 
-	0xB0901630,0x00B91D00,0xA92F0106,0xAF9000AA,0x01901701,0x3F31B93B,0x4F114B51,0x20EC3201,
25 
-	0x710F5002,0x1300AB6B,0x88AA1D50,0x8AAABB00,0x6AAAAB78,0xA821C878,0x9AAA4C01,0x99AA0300,
26 
-	0xAAAA0499,0x0088BBBA,0x03A8873E,0xA68766AA,0x67508AAA,0xBB606E00,0x5B106440,0x666666AA,
27 
-	0x88880B66,0x77408888,0x501750AB,0x6666017F,0x8888AAA6,0x92706068,0x66660870,0x66AA3C10,
28 
-
29 
-	0x576AA910,0x097730A6,0x109A7B00,0x007F0003,0x0320813B,0xAAAA555A,0x63114885,0x21224000,
30 
-	0x11222411,0x22221112,0x22070012,0x03004A22,0x24444500,0x41111422,0x43118024,0x21211111,
31 
-	0x70121121,0x001E0021,0x1202701D,0x80211222,0x4240EE01,0x22240000,0x22400004,0x32404222,
32 
-	0x44004222,0x33421223,0x02122233,0x11223332,0x14009322,0x5200A000,0x42560004,0x42322222,
33 
-	0x22232207,0x01403333,0x9591A312,0x430D12AF,0x0233A601,0xD0031043,0xF5C3F21F,0x5F713E30,
34 
-	0x5F01E730,0x095F0109,0x01E25F01,0x0233A275,0x00244437,0x2000AA00,0x03201124,0x11111240,
35 
-	0xA802CE14,0x12210220,0x0300E500,0x7622F000,0x90EB3011,0x42AD129B,0xCE00F902,0x11221040,
36 
-	0x42320142,0x87400022,0x12240303,0x0B014012,0x3F213B01,0x4424218F,0xBE022244,0x5C20C102,
37 
-
38 
-	0x10B95810,0x40A12154,0x81126500,0x91000422,0x43014248,0x7E010422,0x19223444,0x00333421,
39 
-	0x2143011C,0xB1141032,0x01223B31,0x323D013A,0x3FF13222,0x123B31FE,0x013B21CD,0xF1031044,
40 
-	0x0903E43F,0xAAEA02B9,0xEA020310,0x777A0E04,0x02810310,0x6888467B,0x00441466,0xEF628703,
41 
-	0x47A4444B,0x2E511042,0x11442301,0xAA788902,0x6A03008A,0xA4780266,0x42777777,0x00110300,
42 
-	0x11888884,0x22666641,0x68884108,0x87870287,0x0098A866,0x00AAA603,0x4403101E,0x48008888,
43 
-	0x14666612,0x34486611,0xE3121111,0x04BAEB12,0x2B44448C,0x3201AAAA,0xB46F02BB,0x1F107732,
44 
-	0xEB226873,0xDB1477D3,0x8F136664,0x22F4E302,0x03F702D0,0x4BA74335,0xAA24FB04,0x124AAA00,
45 
-	0x1445AAAA,0x24AA0666,0x004A6611,0xBBE801AB,0x2211140F,0x01980244,0x01E401AA,0x6740F5FC,
46 
-
47 
-	0xBA02D6C0,0x01141F30,0x0E1242B1,0x102412D2,0xE4014191,0x3D024422,0x03425422,0xC3012110,
48 
-	0xA91903A9,0x92220011,0x922221AB,0x222022BB,0x910330B9,0x9224BBAA,0xBA2D44AD,0x04AB6805,
49 
-	0xBAC5131F,0xA4AC0330,0x1504AB2D,0x101804BA,0x60BBBB17,0x3403108B,0x8A88AA26,0x00059888,
50 
-	0x4098888B,0x40390B04,0x20985C03,0x1D047703,0x73550300,0x04084333,0x13332300,0x3294236B,
51 
-	0x399C0280,0x39411223,0x11532223,0xF1A9DF91,0x030914DF,0x3B0310F0,0xB212149A,0xF3330504,
52 
-	0x43E36142,0xB912F5F1,0x2704BD42,0x1412E712,0x0D843118,0x121C04B0,0x5D21E022,0x13422221,
53 
-	0x4E14114A,0x0C034442,0x11440112,0x2103408F,0x4B042444,0x84117B11,0x13F57CC1,0x207F137B,
54 
-	0x444F0305,0x01217204,0x0D32B1B3,0x009B0314,0x44422179,0x118A8F20,0x9222128A,0x03926704,
55 
-
56 
-	0x0490B9B1,0x2122B99D,0x24BB9283,0xBAA90712,0xA1A92242,0x55783160,0x7112EA4D,0x9F819FF1,
57 
-	0x8A1E078B,0x5E096405,0x8B0300BA,0x03107701,0x03209315,0x20877078,0x04C73603,0x004433B3,
58 
-	0x23320833,0xE3042904,0x31122329,0xFD049821,0x21120300,0x0BC40664,0x21442241,0x0142C910,
59 
-	0xAF6C041F,0x0442D812,0x6F04146B,0xE3004313,0x11EB2904,0x137F213C,0x8B042456,0x008F0414,
60 
-	0x68442F0C,0x12648D04,0x159F056F,0x65AA159E,0x05911224,0x0066119F,0x48004444,0x314A21FF,
61 
-	0x14A08553,0x144E21C6,0xB46E11D6,0xF005A27F,0x41430341,0xB702BB44,0x04B85484,0x032078D3,
62 
-	0x41031022,0x0405B478,0x03431374,0x0310224E,0x48018877,0x14487721,0xBF017721,0x32224717,
63 
-	0xB4333306,0x320232D0,0x0732FF0A,0x01F02B12,0x71152942,0x6372A420,0x20E04012,0x02463203,
64 
-
65 
-	0xAAAAB940,0xAB28B914,0xABA200AA,0xB4410310,0x21BA00BB,0x23BABB42,0xAA08A422,0x21422233,
66 
-	0xAAABBABA,0x615993EF,0x8A5A33E0,0x47078B17,0x4F074B17,0x68888B1C,0x76040320,0x88664007,
67 
-	0xC701776C,0x408603B0,0x661B1003,0x7405C898,0x39880310,0x22330310,0x33981688,0x33030023,
68 
-	0x03108E03,0x2F94E043,0xEA90F860,0x11333114,0x33343444,0xCF150E03,0x22032034,0x0300A022,
69 
-	0x12810612,0x11133341,0x10072464,0x33140350,0x42233506,0x24390780,0x22421322,0xB7FF1332,
70 
-	0x07855371,0xF0934390,0x16F73101,0x00D616BF,0xAAAB9242,0xAABB9142,0x01B44238,0x050300E7,
71 
-	0x2211AB5E,0x31ABB416,0x11313B01,0xAA7B0444,0x140C03F6,0x241D4392,0xCF08BAA1,0xDC881A43,
72 
-	0x87085F01,0x7103408B,0x685A0147,0x04786188,0x86038088,0x90687778,0x3731F903,0x48013F01,
73 
-
74 
-	0x37313B21,0x48018633,0x450310FC,0x18BAA086,0x041D2269,0x0011425F,0x44211324,0x24211322,
75 
-	0x004F08C0,0x32411203,0x47231133,0x42030024,0x11003132,0x2832D902,0x236C0AB4,0x5C688F04,
76 
-	0x227F0823,0x28336B22,0x31CB07B5,0x01338C04,0xC37C686C,0x88082100,0x31122122,0x66006D01,
77 
-	0x43331101,0x43333211,0x10FA9C08,0x07BD0803,0x02D1086D,0x8A0713E3,0x00127533,0x0807103D,
78 
-	0x230933C3,0xFD2E0532,0xC0242316,0x5790E704,0x37257B60,0xEF1B2033,0x84701FB0,0x90314217,
79 
-	0x20BA40B6,0x856C197C,0x1233E312,0x6903A422,0x590700B4,0xB40308B4,0x67066809,0x8007BB41,
80 
-	0x3C26A479,0xFD82C001,0x66883FC6,0x06BF0310,0x0340682C,0xA801B834,0xE752FD12,0x7872F782,
81 
-	0x1B100340,0x34986506,0xA9337206,0x40196E06,0xF9049803,0x4D008798,0xF15510EB,0x29BF31BF,
82 
-
83 
-	0x16194009,0x76E4351F,0x3107F121,0x234408A5,0xBA21760A,0x6701FD11,0x250ABD51,0x6F114639,
84 
-	0x01244B0A,0x0720F5DA,0x8207D301,0x05227C17,0xBA19213F,0xC15A00EE,0x327B215F,0xF801B726,
85 
-	0x94131402,0x33337BF1,0x01234809,0x1733A4E6,0x03422123,0x07204287,0x63016B39,0x0AB41229,
86 
-	0x1C36410B,0x3766ABBA,0x681FF6AF,0x068B881B,0x33031010,0x4C9D070C,0x86031068,0x430FE378,
87 
-	0x2178872F,0x03107877,0x49888886,0x395C0300,0x10984E06,0x278E2403,0x078886DA,0x88866887,
88 
-	0x211B9212,0xECD72214,0x3F178327,0x0214690B,0x11BB00AE,0x740BD741,0x0B42271A,0xBB1034A9,
89 
-	0x9D97FD10,0x31D21AB8,0x7304C60B,0x1111D102,0x8F21FE34,0xC1342E64,0x17297B25,0x6F265A21,
90 
-	0x32422822,0x07329B06,0x432132CE,0x3132220E,0x30580343,0x13292903,0x04D50ADD,0x872112A8,
91 
-
92 
-	0x5B116723,0xFF7F5323,0x7B705F80,0x0B560B52,0x5E3C3928,0x7F207C60,0x184070F8,0x93262217,
93 
-	0x43840AC4,0x049B1222,0x033111C9,0x314F02FE,0xBF43D733,0xFF151156,0x420306B4,0x0310FF05,
94 
-	0x88841022,0x88030078,0x90666422,0x68660310,0x66680106,0x667E7886,0xBE0A0300,0xE3570220,
95 
-	0x1340831D,0x0340C787,0x66881FE0,0x102A0B86,0xED4A0603,0x2B103A00,0x04983F90,0x332E0692,
96 
-	0x33103B06,0x37062988,0x88333298,0x99630DAF,0x0D196C0D,0x818B3151,0xFFE40BE0,0x0F273F49,
97 
-	0x470DDFF1,0xA01A4909,0xDFA1909D,0x13DB219F,0x02CC0411,0x3C5030F7,0xE66361D2,0xBF19F15C,
98 
-	0x12245B1C,0xD109CB0C,0x0C115F22,0xE1041171,0xA80D6D03,0x3A08D80C,0x276401ED,0x11DB31E9,
99 
-	0x8A222605,0xFFCC0C32,0xA9576A0A,0x3700CF27,0x73236765,0x7C905CD2,0x021F0ADE,0x430A128E,
100 
-
101 
-	0x2114E711,0xCA23DC61,0xEF1C9C05,0x4B0FB412,0x227F0642,0x308BB42C,0x73044203,0x86660320,
102 
-	0x2142212F,0x400C787F,0xC0517F21,0xB0C0BFF1,0x001F9003,
103 
-};
104 
-
105 
-const unsigned short met_foregroundMap[232] __attribute__((aligned(4)))=
106 
-{
107 
-	0x0010,0x0005,0x003F,0xF030,0xF001,0xF001,0xF001,0xF001,
108 
-	0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
109 
-	0x01F0,0x01F0,0xF0FF,0xF001,0xF001,0xF001,0xF001,0xF001,
110 
-	0xF001,0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
111 
-	0x01F0,0x01F0,0x01F0,0xF0FF,0xF001,0xF001,0xF001,0xF001,
112 
-	0xF001,0xF001,0xF001,0xC001,0x01F0,0x0950,0x3001,0x3002,
113 
-	0x3003,0x0405,0x0530,0x0630,0x1D00,0xE007,0x0021,0x3008,
114 
-	0x3408,0x3000,0x3009,0x0A50,0x3B00,0x800B,0x0C3F,0x0D30,
115 
-
116 
-	0x0030,0x300E,0x300F,0x3010,0x3011,0x1200,0x1330,0x1430,
117 
-	0x1530,0x0130,0x3016,0x3017,0x3018,0x6019,0x001D,0x301A,
118 
-	0x301B,0x301C,0x341C,0x1D00,0x1E30,0x1F30,0x2030,0x0430,
119 
-	0x3021,0x3022,0x4023,0x2483,0x0030,0x3025,0x3026,0x3027,
120 
-	0x3028,0x2900,0x2A30,0x2B30,0x2C30,0x0030,0x302D,0x302E,
121 
-	0x302F,0x3030,0x3104,0x3230,0x3330,0x1D40,0x3034,0x3500,
122 
-	0x3630,0x3730,0x3830,0x0030,0x3039,0x303A,0x303B,0x303C,
123 
-	0x3D10,0x3E30,0xC520,0x303F,0x3040,0x4100,0x4230,0x4330,
124 
-
125 
-	0x4430,0x0030,0x3045,0x3046,0x3047,0x3048,0x4900,0x4A30,
126 
-	0x4B30,0x4C30,0x4030,0x604D,0x4E1D,0x4F30,0x5030,0x0030,
127 
-	0x3051,0x3052,0x3451,0x3053,0x5401,0x5530,0x5630,0x5730,
128 
-	0x0521,0x5800,0x5830,0x5934,0x5A30,0x0030,0x305B,0x305C,
129 
-	0x305D,0x305E,0x5F00,0x6030,0x6130,0x6230,0x0130,0x3063,
130 
-	0x3064,0x3065,0x4066,0x001D,0x3067,0x3068,0x3069,0x306A,
131 
-	0x6B00,0x6A30,0x6C34,0x6D30,0x0430,0x306E,0x306F,0x2170,
132 
-	0x7145,0x0030,0x3471,0x3072,0x3073,0x3074,0x7500,0x7630,
133 
-
134 
-	0x7730,0x7830,0x0030,0x3079,0x307A,0x307B,0x307C,0x7D00,
135 
-	0x7E30,0x7F30,0x8030,0x0030,0x3081,0x3082,0x3083,0x3084,
136 
-	0x8500,0x8630,0x8730,0x8630,0x0034,0x3088,0x3089,0x308A,
137 
-	0x308B,0x8A7F,0x4F01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
138 
-	0x01F0,0xF0F8,0xF001,0xF001,0xF001,0xB001,0x3003,0x0000,
139 
-};
140 
-
141 
-const unsigned short met_foregroundPal[18] __attribute__((aligned(4)))=
142 
-{
143 
-	0x2010,0x0000,0x0000,0x0E7E,0xCB3B,0x8932,0x002A,0x21E0,
144 
-	0x5F19,0x4E97,0x4634,0xF200,0x493D,0xF825,0xB619,0x2015,
145 
-	0x0000,0x0130,
146 
-};
147 
-
148 
-//}}BLOCK(met_foreground)

+ 0
- 32
src/assets/meteor/met_foreground.h View File 

@@ -1,32 +0,0 @@
1 
-
2 
-//{{BLOCK(met_foreground)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_foreground, 256x160@4,
7 
-//	+ palette 18 entries, lz77 compressed
8 
-//	+ 140 tiles (t|f reduced) lz77 compressed
9 
-//	+ regular map (flat), lz77 compressed, 32x20
10 
-//	Total size: 36 + 2356 + 464 = 2856
11 
-//
12 
-//	Time-stamp: 2017-01-01, 21:29:18
13 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
14 
-//	( http://www.coranac.com/projects/#grit )
15 
-//
16 
-//======================================================================
17 
-
18 
-#ifndef GRIT_MET_FOREGROUND_H
19 
-#define GRIT_MET_FOREGROUND_H
20 
-
21 
-#define met_foregroundTilesLen 2356
22 
-extern const unsigned int met_foregroundTiles[589];
23 
-
24 
-#define met_foregroundMapLen 464
25 
-extern const unsigned short met_foregroundMap[232];
26 
-
27 
-#define met_foregroundPalLen 36
28 
-extern const unsigned short met_foregroundPal[18];
29 
-
30 
-#endif // GRIT_MET_FOREGROUND_H
31 
-
32 
-//}}BLOCK(met_foreground)

+ 0
- 68
src/assets/meteor/met_meteor.c View File 

@@ -1,68 +0,0 @@
1 
-
2 
-//{{BLOCK(met_meteor)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_meteor, 32x96@4,
7 
-//	+ palette 16 entries, not compressed
8 
-//	+ 48 tiles lz77 compressed
9 
-//	Total size: 32 + 1168 = 1200
10 
-//
11 
-//	Time-stamp: 2017-01-01, 21:29:18
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 met_meteorTiles[292] __attribute__((aligned(4)))=
18 
-{
19 
-	0x00060010,0xF000003A,0x2001F001,0x1300100D,0x00001013,0x221A0020,0x02100032,0x11000031,
20 
-	0x27801103,0x10334002,0x00401134,0x00300001,0x11300000,0x10442230,0x3740246C,0x20023E30,
21 
-	0x10480002,0x00037400,0x40410060,0x0E003066,0x00001243,0x00214230,0x00421430,0x64213000,
22 
-	0x76441300,0x64210000,0x21213077,0x22130022,0x62216464,0x42005756,0x66247756,0x00665775,
23 
-	0x65657755,0x64246577,0x56465700,0x44254465,0x46550012,0x44663124,0x44002211,0x44446424,
24 
-	0x00016664,0x33242655,0x03144666,0x3124440C,0x10671010,0x760322CB,0x20BC1030,0x01C81077,
25 
-	0x7910B010,0x75560042,0x87556413,0x75006413,0x87562388,0x00562178,0x86427778,0x65428775,
26 
-	0x41888700,0x46777855,0x77750066,0x57777778,0x55017788,0x65557766,0x04005746,0x77878800,
27 
-
28 
-	0x76788757,0x68880055,0x46576575,0x75004444,0x55246557,0x00122465,0x33322466,0x00124246,
29 
-	0x31266500,0x11244631,0x34653F21,0x2E012701,0x8750EB10,0xF710E910,0x23975080,0x13888876,
30 
-	0x78008772,0x66755130,0x04576130,0x46130078,0x42FF0055,0x33002000,0x57305B11,0x40466765,
31 
-	0x755C0067,0x77244667,0x12461067,0x44EB0066,0x08311224,0x33031221,0x11218211,0x33030211,
32 
-	0x01000333,0xFF038E01,0xA4115401,0x01F0F350,0x01F001F0,0x068001F0,0x12D801D0,0x07020303,
33 
-	0x11303010,0x0F101170,0xDB01C131,0x14421241,0x24664404,0xF5016400,0x11051102,0x34222100,
34 
-	0x01107E51,0x1113596F,0x422020F6,0x01218031,0x20903E40,0x00133045,0x00302156,0x10120021,
35 
-	0x30231430,0x62002120,0x24422423,0x00223213,0x46642333,0x44662213,0x44624400,0x52614565,
36 
-
37 
-	0x61660066,0x26655642,0x46007564,0x64675642,0x04134442,0x31311211,0x42FE0123,0x01224024,
38 
-	0x466666FD,0x00457756,0x64556422,0x46665524,0x02226400,0x11440001,0x26000032,0x24000440,
39 
-	0x00020342,0x00031214,0x32A80231,0x04DB00A0,0x5643DF00,0x00636442,0x61564425,0x24756644,
40 
-	0x77556208,0x44070214,0x78008656,0x77865642,0x10776541,0x00775675,0x6646654E,0x65451077,
41 
-	0x66FF0144,0x00565777,0x74656756,0x57577576,0x78885500,0x44656565,0x46440264,0x64646656,
42 
-	0x00569702,0x66344657,0x65221266,0x11331400,0x33421466,0x34310F66,0xF4020600,0x3C112451,
43 
-	0x51817752,0x7865435A,0x00661088,0x68440003,0x56413075,0x13140075,0xFF026664,0x00FF4144,
44 
-	0x65770088,0x65577866,0x57005765,0x65576556,0x13566655,0x00256566,0x02424404,0x049E11DC,
45 
-
46 
-	0x00034126,0x24D30044,0x00300D32,0xDB000142,0x0323DF00,0x8B23FF9A,0x01F001F0,0x01F001F0,
47 
-	0xF7130D20,0x225A16B0,0x60904633,0x9900142C,0x8001E503,0x13000320,0x00901131,0x00994D90,
48 
-	0x70099913,0x90087024,0x40560931,0x04141A00,0x34044130,0x5023F700,0x64660462,0x00424D02,
49 
-	0x44002613,0x33226656,0x00416452,0x66444412,0x45655622,0x64546600,0x22465522,0x22560464,
50 
-	0x03777564,0x0021579A,0x61922222,0x44314466,0x00145600,0x00124556,0x11660075,0x14465700,
51 
-	0x640A6502,0x00665555,0x9D000202,0x7814B492,0x00804009,0x9504606D,0x00101246,0x04043600,
52 
-	0x66426130,0x54421000,0x76461375,0x46630087,0x62618876,0x21007875,0x21558876,0x00585876,
53 
-	0x78856543,0x66566775,0x46578800,0x87888866,0x67880078,0x55788875,0x04805656,0x5777457F,
54 
-
55 
-	0x58886666,0x55655500,0x46166556,0x11460065,0x31244565,0x14006657,0x44457701,0x00556431,
56 
-	0x64240436,0x44645465,0x14712216,0x4421E804,0x0597936F,0x430340A4,0x86105900,0x58440300,
57 
-	0x41305505,0xFF015666,0x90FF2476,0x8833FF33,0x5555F711,0x55105546,0x6C044465,0x21666522,
58 
-	0x12466600,0x64224442,0x13110034,0x64033311,0x55002456,0x66644222,0x03442442,0x22226466,
59 
-	0x57451634,0x10B0F754,0x13F40667,0x00FF0160,
60 
-};
61 
-
62 
-const unsigned short met_meteorPal[16] __attribute__((aligned(4)))=
63 
-{
64 
-	0x2108,0x211B,0x223E,0x2117,0x22BE,0x4BDE,0x375E,0x5FDE,
65 
-	0x7BDE,0x21BE,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
66 
-};
67 
-
68 
-//}}BLOCK(met_meteor)

+ 0
- 28
src/assets/meteor/met_meteor.h View File 

@@ -1,28 +0,0 @@
1 
-
2 
-//{{BLOCK(met_meteor)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_meteor, 32x96@4,
7 
-//	+ palette 16 entries, not compressed
8 
-//	+ 48 tiles lz77 compressed
9 
-//	Total size: 32 + 1168 = 1200
10 
-//
11 
-//	Time-stamp: 2017-01-01, 21:29:18
12 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 
-//	( http://www.coranac.com/projects/#grit )
14 
-//
15 
-//======================================================================
16 
-
17 
-#ifndef GRIT_MET_METEOR_H
18 
-#define GRIT_MET_METEOR_H
19 
-
20 
-#define met_meteorTilesLen 1168
21 
-extern const unsigned int met_meteorTiles[292];
22 
-
23 
-#define met_meteorPalLen 32
24 
-extern const unsigned short met_meteorPal[16];
25 
-
26 
-#endif // GRIT_MET_METEOR_H
27 
-
28 
-//}}BLOCK(met_meteor)

+ 0
- 55
src/assets/meteor/met_sky.c View File 

@@ -1,55 +0,0 @@
1 
-
2 
-//{{BLOCK(met_sky)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_sky, 256x160@4,
7 
-//	+ palette 14 entries, lz77 compressed
8 
-//	+ 25 tiles (t|f reduced) lz77 compressed
9 
-//	+ regular map (flat), lz77 compressed, 32x20
10 
-//	Total size: 28 + 204 + 240 = 472
11 
-//
12 
-//	Time-stamp: 2017-01-01, 21:27:37
13 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
14 
-//	( http://www.coranac.com/projects/#grit )
15 
-//
16 
-//======================================================================
17 
-
18 
-const unsigned int met_skyTiles[51] __attribute__((aligned(4)))=
19 
-{
20 
-	0x00032010,0xF0000033,0x33059001,0x2001F033,0x3332010D,0x23232333,0xBD19F023,0xF0321E60,
21 
-	0xF040B01F,0x325E801F,0xF0E03FF0,0x601EF07F,0x23332308,0x30E13232,0x90471001,0x22232207,
22 
-	0xDF015022,0x0F001FF0,0xF0217022,0x803F001F,0xDF1FF040,0x3FA00F10,0x90A71022,0xF07F9007,
23 
-	0x7B3D003B,0x70010032,0x8001F0A2,0x01002106,0x50880730,0x1122220F,0x11210F30,0x12123712,
24 
-	0x276031F0,0xF01E0021,0x0757601F,0x12122212,0xF0565021,0x363A0001,0x01302121,0x40116710,
25 
-	0x210FF007,0xF06720FC,0xF00F5007,0x20079015,0x3F121157,0x01F01111,0x31200D20,0x1F801FF0,
26 
-	0x11789C10,0x01F04300,0x01F001F0,
27 
-};
28 
-
29 
-const unsigned short met_skyMap[120] __attribute__((aligned(4)))=
30 
-{
31 
-	0x0010,0x0005,0x003F,0xF010,0xF001,0xF001,0xF001,0xF001,
32 
-	0xF001,0xF801,0x01F0,0x01F0,0x01F0,0x01F0,0x0770,0x1001,
33 
-	0x3402,0x0310,0x05F0,0x05A0,0x0004,0x0515,0x0210,0x1402,
34 
-	0x1401,0x1403,0x0570,0x8306,0x4D20,0x1007,0x1008,0xF009,
35 
-	0xA005,0x4005,0x000A,0x0B15,0x0810,0x0714,0x2B14,0x1409,
36 
-	0x0570,0x200C,0x0D8D,0x01F0,0x01F0,0xF0E3,0x2001,0x100D,
37 
-	0x0ECD,0x0F10,0x01F0,0x0B40,0x101C,0x1110,0x01F0,0x0780,
38 
-	0x0D11,0x1012,0x1361,0x01F0,0x0B40,0x1014,0x1413,0x01F0,
39 
-
40 
-	0x70C6,0x1107,0x154D,0x1610,0x01F0,0x0B40,0x1D17,0x1610,
41 
-	0xF014,0x7001,0x1107,0x188D,0x01F0,0xF0FF,0xF001,0x2001,
42 
-	0xF00D,0xF03F,0xF001,0xF001,0xF03F,0xFF01,0x01F0,0x01F0,
43 
-	0x3FF0,0x01F0,0x01F0,0x3FF0,0x01F0,0x01F0,0xF0FF,0xF001,
44 
-	0xF03F,0xF001,0xF001,0xF03F,0xF015,0xF001,0xFF01,0x3FF0,
45 
-	0x01F0,0x01F0,0x3FF0,0x01F0,0x01F0,0x01F0,0x01F0,0xF0FE,
46 
-	0xF001,0xF001,0xF001,0xF001,0xF001,0xB001,0x1003,0x0000,
47 
-};
48 
-
49 
-const unsigned short met_skyPal[14] __attribute__((aligned(4)))=
50 
-{
51 
-	0x2010,0x0000,0x0000,0x9602,0x747F,0x517F,0x007F,0x7FFE,
52 
-	0x7F9C,0x7F7A,0x0000,0xD080,0x1101,0x1111,
53 
-};
54 
-
55 
-//}}BLOCK(met_sky)

+ 0
- 32
src/assets/meteor/met_sky.h View File 

@@ -1,32 +0,0 @@
1 
-
2 
-//{{BLOCK(met_sky)
3 
-
4 
-//======================================================================
5 
-//
6 
-//	met_sky, 256x160@4,
7 
-//	+ palette 14 entries, lz77 compressed
8 
-//	+ 25 tiles (t|f reduced) lz77 compressed
9 
-//	+ regular map (flat), lz77 compressed, 32x20
10 
-//	Total size: 28 + 204 + 240 = 472
11 
-//
12 
-//	Time-stamp: 2017-01-01, 21:27:37
13 
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
14 
-//	( http://www.coranac.com/projects/#grit )
15 
-//
16 
-//======================================================================
17 
-
18 
-#ifndef GRIT_MET_SKY_H
19 
-#define GRIT_MET_SKY_H
20 
-
21 
-#define met_skyTilesLen 204
22 
-extern const unsigned int met_skyTiles[51];
23 
-
24 
-#define met_skyMapLen 240
25 
-extern const unsigned short met_skyMap[120];
26 
-
27 
-#define met_skyPalLen 28
28 
-extern const unsigned short met_skyPal[14];
29 
-
30 
-#endif // GRIT_MET_SKY_H
31 
-
32 
-//}}BLOCK(met_sky)

+ 5
- 5
src/specials/cutscene_meteor.c View File 

@@ -31,11 +31,11 @@
31 31
32 32 
 /* === INCLUDES === */
33 33
34 
-#include "../assets/meteor/met_background.h"
35 
-#include "../assets/meteor/met_foreground.h"
36 
-#include "../assets/meteor/met_sky.h"
37 
-#include "../assets/meteor/met_meteor.h"
38 
-#include "../assets/meteor/met_clouds.h"
34 
+#include <cutscene_meteor/met_background.h>
35 
+#include <cutscene_meteor/met_clouds.h>
36 
+#include <cutscene_meteor/met_foreground.h>
37 
+#include <cutscene_meteor/met_sky.h>
38 
+#include <cutscene_meteor/met_meteor.h>
39 39
40 40 
 #include <callback.h>
41 41 
 #include <lcd.h>