Browse Source

New Include Files, New Scripts (Changes), (Bug) Sbird fixt es und so

DragonflySotS 6 years ago
parent
commit
97a59b327a
33 changed files with 829 additions and 28 deletions
  1. BIN
      build/pkmn_sots_01.png
  2. 32
    0
      generated_image/bootscreen/boot_tileset.h
  3. 28
    0
      generated_image/char/bag/hero_bag.h
  4. 28
    0
      generated_image/char/bag/heroine_bag.h
  5. 28
    0
      generated_image/char/throw_out/hero_backsprite.h
  6. 28
    0
      generated_image/char/throw_out/heroine_backsprite.h
  7. 33
    0
      generated_image/cutscene_meteor/met_background.h
  8. 32
    0
      generated_image/cutscene_meteor/met_clouds.h
  9. 32
    0
      generated_image/cutscene_meteor/met_foreground.h
  10. 28
    0
      generated_image/cutscene_meteor/met_foreground_red.h
  11. 28
    0
      generated_image/cutscene_meteor/met_meteor.h
  12. 32
    0
      generated_image/cutscene_meteor/met_sky.h
  13. 28
    0
      generated_image/cutscene_meteor/met_sky_red.h
  14. 24
    0
      generated_image/emoticons/emot_arrows.h
  15. 28
    0
      generated_image/mugshots/mug_00.h
  16. 28
    0
      generated_image/mugshots/mug_01.h
  17. 28
    0
      generated_image/mugshots/mug_02.h
  18. 28
    0
      generated_image/mugshots/mug_03.h
  19. 28
    0
      generated_image/mugshots/mug_04.h
  20. 28
    0
      generated_image/mugshots/mug_05.h
  21. 28
    0
      generated_image/mugshots/mug_06.h
  22. 28
    0
      generated_image/mugshots/mug_07.h
  23. 28
    0
      generated_image/mugshots/mug_08.h
  24. 28
    0
      generated_image/mugshots/mug_09.h
  25. 28
    0
      generated_image/titlescreen/title_sprite_sky.h
  26. 28
    0
      generated_image/titlescreen/title_tileset_background.h
  27. 28
    0
      generated_image/titlescreen/title_tileset_latias_latios_deoxys.h
  28. 28
    0
      generated_image/titlescreen/title_tileset_logo_name.h
  29. 28
    0
      generated_image/titlescreen/title_tileset_press_start.h
  30. 1
    1
      sots-private
  31. 5
    0
      src/include/hiddenflags.h
  32. 15
    0
      src/include/mugssprites.h
  33. 7
    27
      src/include/script_language.h

BIN
build/pkmn_sots_01.png View File


+ 32
- 0
generated_image/bootscreen/boot_tileset.h View File

@@ -0,0 +1,32 @@
1
+
2
+//{{BLOCK(boot_tileset)
3
+
4
+//======================================================================
5
+//
6
+//	boot_tileset, 256x160@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 68 tiles (t|f|p reduced) lz77 compressed
9
+//	+ regular map (flat), lz77 compressed, 32x20 
10
+//	Total size: 32 + 672 + 412 = 1116
11
+//
12
+//	Time-stamp: 2017-08-29, 15:28:28
13
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
14
+//	( http://www.coranac.com/projects/#grit )
15
+//
16
+//======================================================================
17
+
18
+#ifndef GRIT_BOOT_TILESET_H
19
+#define GRIT_BOOT_TILESET_H
20
+
21
+#define boot_tilesetTilesLen 672
22
+extern const unsigned int boot_tilesetTiles[168];
23
+
24
+#define boot_tilesetMapLen 412
25
+extern const unsigned short boot_tilesetMap[206];
26
+
27
+#define boot_tilesetPalLen 32
28
+extern const unsigned short boot_tilesetPal[16];
29
+
30
+#endif // GRIT_BOOT_TILESET_H
31
+
32
+//}}BLOCK(boot_tileset)

+ 28
- 0
generated_image/char/bag/hero_bag.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(hero_bag)
3
+
4
+//======================================================================
5
+//
6
+//	hero_bag, 64x384@4, 
7
+//	+ palette 20 entries, lz77 compressed
8
+//	+ 384 tiles lz77 compressed
9
+//	Total size: 40 + 3564 = 3604
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:32
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_HERO_BAG_H
18
+#define GRIT_HERO_BAG_H
19
+
20
+#define hero_bagTilesLen 3564
21
+extern const unsigned int hero_bagTiles[891];
22
+
23
+#define hero_bagPalLen 40
24
+extern const unsigned short hero_bagPal[20];
25
+
26
+#endif // GRIT_HERO_BAG_H
27
+
28
+//}}BLOCK(hero_bag)

+ 28
- 0
generated_image/char/bag/heroine_bag.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(heroine_bag)
3
+
4
+//======================================================================
5
+//
6
+//	heroine_bag, 64x384@4, 
7
+//	+ palette 20 entries, lz77 compressed
8
+//	+ 384 tiles lz77 compressed
9
+//	Total size: 40 + 4044 = 4084
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:32
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_HEROINE_BAG_H
18
+#define GRIT_HEROINE_BAG_H
19
+
20
+#define heroine_bagTilesLen 4044
21
+extern const unsigned int heroine_bagTiles[1011];
22
+
23
+#define heroine_bagPalLen 40
24
+extern const unsigned short heroine_bagPal[20];
25
+
26
+#endif // GRIT_HEROINE_BAG_H
27
+
28
+//}}BLOCK(heroine_bag)

+ 28
- 0
generated_image/char/throw_out/hero_backsprite.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(hero_backsprite)
3
+
4
+//======================================================================
5
+//
6
+//	hero_backsprite, 64x320@4, 
7
+//	+ palette 20 entries, lz77 compressed
8
+//	+ 320 tiles not compressed
9
+//	Total size: 40 + 10240 = 10280
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:32
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_HERO_BACKSPRITE_H
18
+#define GRIT_HERO_BACKSPRITE_H
19
+
20
+#define hero_backspriteTilesLen 10240
21
+extern const unsigned int hero_backspriteTiles[2560];
22
+
23
+#define hero_backspritePalLen 40
24
+extern const unsigned short hero_backspritePal[20];
25
+
26
+#endif // GRIT_HERO_BACKSPRITE_H
27
+
28
+//}}BLOCK(hero_backsprite)

+ 28
- 0
generated_image/char/throw_out/heroine_backsprite.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(heroine_backsprite)
3
+
4
+//======================================================================
5
+//
6
+//	heroine_backsprite, 64x320@4, 
7
+//	+ palette 20 entries, lz77 compressed
8
+//	+ 320 tiles not compressed
9
+//	Total size: 40 + 10240 = 10280
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:33
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_HEROINE_BACKSPRITE_H
18
+#define GRIT_HEROINE_BACKSPRITE_H
19
+
20
+#define heroine_backspriteTilesLen 10240
21
+extern const unsigned int heroine_backspriteTiles[2560];
22
+
23
+#define heroine_backspritePalLen 40
24
+extern const unsigned short heroine_backspritePal[20];
25
+
26
+#endif // GRIT_HEROINE_BACKSPRITE_H
27
+
28
+//}}BLOCK(heroine_backsprite)

+ 33
- 0
generated_image/cutscene_meteor/met_background.h View File

@@ -0,0 +1,33 @@
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-08-29, 15:28:30
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)

+ 32
- 0
generated_image/cutscene_meteor/met_clouds.h View File

@@ -0,0 +1,32 @@
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-08-29, 15:28:31
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)

+ 32
- 0
generated_image/cutscene_meteor/met_foreground.h View File

@@ -0,0 +1,32 @@
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-08-29, 15:28:30
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)

+ 28
- 0
generated_image/cutscene_meteor/met_foreground_red.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(met_foreground_red)
3
+
4
+//======================================================================
5
+//
6
+//	met_foreground_red, 256x160@8, 
7
+//	+ palette 256 entries, not compressed
8
+//	+ 640 tiles not compressed
9
+//	Total size: 512 + 40960 = 41472
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:30
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_FOREGROUND_RED_H
18
+#define GRIT_MET_FOREGROUND_RED_H
19
+
20
+#define met_foreground_redTilesLen 40960
21
+extern const unsigned int met_foreground_redTiles[10240];
22
+
23
+#define met_foreground_redPalLen 512
24
+extern const unsigned short met_foreground_redPal[256];
25
+
26
+#endif // GRIT_MET_FOREGROUND_RED_H
27
+
28
+//}}BLOCK(met_foreground_red)

+ 28
- 0
generated_image/cutscene_meteor/met_meteor.h View File

@@ -0,0 +1,28 @@
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-08-29, 15:28:31
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)

+ 32
- 0
generated_image/cutscene_meteor/met_sky.h View File

@@ -0,0 +1,32 @@
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-08-29, 15:28:31
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)

+ 28
- 0
generated_image/cutscene_meteor/met_sky_red.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(met_sky_red)
3
+
4
+//======================================================================
5
+//
6
+//	met_sky_red, 256x160@8, 
7
+//	+ palette 256 entries, not compressed
8
+//	+ 640 tiles not compressed
9
+//	Total size: 512 + 40960 = 41472
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:30
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_SKY_RED_H
18
+#define GRIT_MET_SKY_RED_H
19
+
20
+#define met_sky_redTilesLen 40960
21
+extern const unsigned int met_sky_redTiles[10240];
22
+
23
+#define met_sky_redPalLen 512
24
+extern const unsigned short met_sky_redPal[256];
25
+
26
+#endif // GRIT_MET_SKY_RED_H
27
+
28
+//}}BLOCK(met_sky_red)

+ 24
- 0
generated_image/emoticons/emot_arrows.h View File

@@ -0,0 +1,24 @@
1
+
2
+//{{BLOCK(emot_arrows)
3
+
4
+//======================================================================
5
+//
6
+//	emot_arrows, 16x96@4, 
7
+//	+ 24 tiles not compressed
8
+//	Total size: 768 = 768
9
+//
10
+//	Time-stamp: 2017-08-29, 15:28:29
11
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
12
+//	( http://www.coranac.com/projects/#grit )
13
+//
14
+//======================================================================
15
+
16
+#ifndef GRIT_EMOT_ARROWS_H
17
+#define GRIT_EMOT_ARROWS_H
18
+
19
+#define emot_arrowsTilesLen 768
20
+extern const unsigned int emot_arrowsTiles[192];
21
+
22
+#endif // GRIT_EMOT_ARROWS_H
23
+
24
+//}}BLOCK(emot_arrows)

+ 28
- 0
generated_image/mugshots/mug_00.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_00)
3
+
4
+//======================================================================
5
+//
6
+//	mug_00, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 400 = 432
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:34
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_00_H
18
+#define GRIT_MUG_00_H
19
+
20
+#define mug_00TilesLen 400
21
+extern const unsigned int mug_00Tiles[100];
22
+
23
+#define mug_00PalLen 32
24
+extern const unsigned short mug_00Pal[16];
25
+
26
+#endif // GRIT_MUG_00_H
27
+
28
+//}}BLOCK(mug_00)

+ 28
- 0
generated_image/mugshots/mug_01.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_01)
3
+
4
+//======================================================================
5
+//
6
+//	mug_01, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 428 = 460
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:35
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_01_H
18
+#define GRIT_MUG_01_H
19
+
20
+#define mug_01TilesLen 428
21
+extern const unsigned int mug_01Tiles[107];
22
+
23
+#define mug_01PalLen 32
24
+extern const unsigned short mug_01Pal[16];
25
+
26
+#endif // GRIT_MUG_01_H
27
+
28
+//}}BLOCK(mug_01)

+ 28
- 0
generated_image/mugshots/mug_02.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_02)
3
+
4
+//======================================================================
5
+//
6
+//	mug_02, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 460 = 492
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:34
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_02_H
18
+#define GRIT_MUG_02_H
19
+
20
+#define mug_02TilesLen 460
21
+extern const unsigned int mug_02Tiles[115];
22
+
23
+#define mug_02PalLen 32
24
+extern const unsigned short mug_02Pal[16];
25
+
26
+#endif // GRIT_MUG_02_H
27
+
28
+//}}BLOCK(mug_02)

+ 28
- 0
generated_image/mugshots/mug_03.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_03)
3
+
4
+//======================================================================
5
+//
6
+//	mug_03, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 512 = 544
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:33
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_03_H
18
+#define GRIT_MUG_03_H
19
+
20
+#define mug_03TilesLen 512
21
+extern const unsigned int mug_03Tiles[128];
22
+
23
+#define mug_03PalLen 32
24
+extern const unsigned short mug_03Pal[16];
25
+
26
+#endif // GRIT_MUG_03_H
27
+
28
+//}}BLOCK(mug_03)

+ 28
- 0
generated_image/mugshots/mug_04.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_04)
3
+
4
+//======================================================================
5
+//
6
+//	mug_04, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 444 = 476
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:33
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_04_H
18
+#define GRIT_MUG_04_H
19
+
20
+#define mug_04TilesLen 444
21
+extern const unsigned int mug_04Tiles[111];
22
+
23
+#define mug_04PalLen 32
24
+extern const unsigned short mug_04Pal[16];
25
+
26
+#endif // GRIT_MUG_04_H
27
+
28
+//}}BLOCK(mug_04)

+ 28
- 0
generated_image/mugshots/mug_05.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_05)
3
+
4
+//======================================================================
5
+//
6
+//	mug_05, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 492 = 524
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:35
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_05_H
18
+#define GRIT_MUG_05_H
19
+
20
+#define mug_05TilesLen 492
21
+extern const unsigned int mug_05Tiles[123];
22
+
23
+#define mug_05PalLen 32
24
+extern const unsigned short mug_05Pal[16];
25
+
26
+#endif // GRIT_MUG_05_H
27
+
28
+//}}BLOCK(mug_05)

+ 28
- 0
generated_image/mugshots/mug_06.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_06)
3
+
4
+//======================================================================
5
+//
6
+//	mug_06, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 476 = 508
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:34
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_06_H
18
+#define GRIT_MUG_06_H
19
+
20
+#define mug_06TilesLen 476
21
+extern const unsigned int mug_06Tiles[119];
22
+
23
+#define mug_06PalLen 32
24
+extern const unsigned short mug_06Pal[16];
25
+
26
+#endif // GRIT_MUG_06_H
27
+
28
+//}}BLOCK(mug_06)

+ 28
- 0
generated_image/mugshots/mug_07.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_07)
3
+
4
+//======================================================================
5
+//
6
+//	mug_07, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 484 = 516
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:33
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_07_H
18
+#define GRIT_MUG_07_H
19
+
20
+#define mug_07TilesLen 484
21
+extern const unsigned int mug_07Tiles[121];
22
+
23
+#define mug_07PalLen 32
24
+extern const unsigned short mug_07Pal[16];
25
+
26
+#endif // GRIT_MUG_07_H
27
+
28
+//}}BLOCK(mug_07)

+ 28
- 0
generated_image/mugshots/mug_08.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_08)
3
+
4
+//======================================================================
5
+//
6
+//	mug_08, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 504 = 536
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:34
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_08_H
18
+#define GRIT_MUG_08_H
19
+
20
+#define mug_08TilesLen 504
21
+extern const unsigned int mug_08Tiles[126];
22
+
23
+#define mug_08PalLen 32
24
+extern const unsigned short mug_08Pal[16];
25
+
26
+#endif // GRIT_MUG_08_H
27
+
28
+//}}BLOCK(mug_08)

+ 28
- 0
generated_image/mugshots/mug_09.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(mug_09)
3
+
4
+//======================================================================
5
+//
6
+//	mug_09, 32x32@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 16 tiles lz77 compressed
9
+//	Total size: 32 + 468 = 500
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:34
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 32
24
+extern const unsigned short mug_09Pal[16];
25
+
26
+#endif // GRIT_MUG_09_H
27
+
28
+//}}BLOCK(mug_09)

+ 28
- 0
generated_image/titlescreen/title_sprite_sky.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(title_sprite_sky)
3
+
4
+//======================================================================
5
+//
6
+//	title_sprite_sky, 16x160@4, 
7
+//	+ palette 16 entries, not compressed
8
+//	+ 40 tiles lz77 compressed
9
+//	Total size: 32 + 780 = 812
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:32
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_TITLE_SPRITE_SKY_H
18
+#define GRIT_TITLE_SPRITE_SKY_H
19
+
20
+#define title_sprite_skyTilesLen 780
21
+extern const unsigned int title_sprite_skyTiles[195];
22
+
23
+#define title_sprite_skyPalLen 32
24
+extern const unsigned short title_sprite_skyPal[16];
25
+
26
+#endif // GRIT_TITLE_SPRITE_SKY_H
27
+
28
+//}}BLOCK(title_sprite_sky)

+ 28
- 0
generated_image/titlescreen/title_tileset_background.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(title_tileset_background)
3
+
4
+//======================================================================
5
+//
6
+//	title_tileset_background, 256x160@4, 
7
+//	+ 255 tiles (t|f reduced) lz77 compressed
8
+//	+ regular map (flat), lz77 compressed, 32x20 
9
+//	Total size: 2456 + 736 = 3192
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:31
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_TITLE_TILESET_BACKGROUND_H
18
+#define GRIT_TITLE_TILESET_BACKGROUND_H
19
+
20
+#define title_tileset_backgroundTilesLen 2456
21
+extern const unsigned int title_tileset_backgroundTiles[614];
22
+
23
+#define title_tileset_backgroundMapLen 736
24
+extern const unsigned short title_tileset_backgroundMap[368];
25
+
26
+#endif // GRIT_TITLE_TILESET_BACKGROUND_H
27
+
28
+//}}BLOCK(title_tileset_background)

+ 28
- 0
generated_image/titlescreen/title_tileset_latias_latios_deoxys.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(title_tileset_latias_latios_deoxys)
3
+
4
+//======================================================================
5
+//
6
+//	title_tileset_latias_latios_deoxys, 256x160@4, 
7
+//	+ 296 tiles (t|f reduced) lz77 compressed
8
+//	+ regular map (flat), lz77 compressed, 32x20 
9
+//	Total size: 5656 + 784 = 6440
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:31
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_TITLE_TILESET_LATIAS_LATIOS_DEOXYS_H
18
+#define GRIT_TITLE_TILESET_LATIAS_LATIOS_DEOXYS_H
19
+
20
+#define title_tileset_latias_latios_deoxysTilesLen 5656
21
+extern const unsigned int title_tileset_latias_latios_deoxysTiles[1414];
22
+
23
+#define title_tileset_latias_latios_deoxysMapLen 784
24
+extern const unsigned short title_tileset_latias_latios_deoxysMap[392];
25
+
26
+#endif // GRIT_TITLE_TILESET_LATIAS_LATIOS_DEOXYS_H
27
+
28
+//}}BLOCK(title_tileset_latias_latios_deoxys)

+ 28
- 0
generated_image/titlescreen/title_tileset_logo_name.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(title_tileset_logo_name)
3
+
4
+//======================================================================
5
+//
6
+//	title_tileset_logo_name, 256x160@8, 
7
+//	+ 168 tiles (t|f reduced) lz77 compressed
8
+//	+ regular map (flat), lz77 compressed, 32x20 
9
+//	Total size: 3616 + 500 = 4116
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:32
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_TITLE_TILESET_LOGO_NAME_H
18
+#define GRIT_TITLE_TILESET_LOGO_NAME_H
19
+
20
+#define title_tileset_logo_nameTilesLen 3616
21
+extern const unsigned int title_tileset_logo_nameTiles[904];
22
+
23
+#define title_tileset_logo_nameMapLen 500
24
+extern const unsigned short title_tileset_logo_nameMap[250];
25
+
26
+#endif // GRIT_TITLE_TILESET_LOGO_NAME_H
27
+
28
+//}}BLOCK(title_tileset_logo_name)

+ 28
- 0
generated_image/titlescreen/title_tileset_press_start.h View File

@@ -0,0 +1,28 @@
1
+
2
+//{{BLOCK(title_tileset_press_start)
3
+
4
+//======================================================================
5
+//
6
+//	title_tileset_press_start, 256x160@4, 
7
+//	+ 35 tiles (t|f reduced) lz77 compressed
8
+//	+ regular map (flat), lz77 compressed, 32x20 
9
+//	Total size: 676 + 240 = 916
10
+//
11
+//	Time-stamp: 2017-08-29, 15:28:31
12
+//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13
+//	( http://www.coranac.com/projects/#grit )
14
+//
15
+//======================================================================
16
+
17
+#ifndef GRIT_TITLE_TILESET_PRESS_START_H
18
+#define GRIT_TITLE_TILESET_PRESS_START_H
19
+
20
+#define title_tileset_press_startTilesLen 676
21
+extern const unsigned int title_tileset_press_startTiles[169];
22
+
23
+#define title_tileset_press_startMapLen 240
24
+extern const unsigned short title_tileset_press_startMap[120];
25
+
26
+#endif // GRIT_TITLE_TILESET_PRESS_START_H
27
+
28
+//}}BLOCK(title_tileset_press_start)

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 8cc9cb9f32d2b30d2ac317a03f6e9a4ca1ebf80c
1
+Subproject commit 2350d219de04999276e9d09e2805d0146f30211b

+ 5
- 0
src/include/hiddenflags.h View File

@@ -0,0 +1,5 @@
1
+#include <script_language.h>
2
+
3
+.macro sethiddenflags
4
+setflag 0x501
5
+endm

+ 15
- 0
src/include/mugssprites.h View File

@@ -0,0 +1,15 @@
1
+#ifndef MUG_IDS
2
+#define MUG_IDS
3
+
4
+#define MUG_NOAH 0x1
5
+#define MUG_EMMA 0x2
6
+#define MUG_LINDA 0x3
7
+#define MUG_IDAN 0x4
8
+#define MUG_ACHIM 0x5
9
+#define MUG_NORMAN 0x6
10
+#define MUG_JANA 0x7
11
+#define MUG_VORSTAND 0x8
12
+#define MUG_VORSTANDIN 0x9
13
+#define MUG_DIANA 0xA
14
+
15
+#endif /* MUG_IDS_H */

+ 7
- 27
src/include/script_language.h View File

@@ -1,5 +1,7 @@
1 1
 #include <config.h>
2 2
 #include <applymovements.h>
3
+#include <hiddenflags.h>
4
+#include <mugssprites.h>
3 5
 
4 6
 @@ Compare operands
5 7
 .equ B_LT, 0x0
@@ -56,19 +58,19 @@ special 0x137
56 58
 waitstate
57 59
 .endm
58 60
 
59
-.macro msgmugr msgmugr_textpointer:req msgmugr_callstd:req msgmugr_sprite:req
60
-setvar MUGHSOT_1_TABLE \msgmugr_sprite
61
+.macro mugmsgr mugmsgr_textpointer:req mugmsgr_callstd:req mugmsgr_sprite:req
62
+setvar MUGHSOT_1_TABLE \msgmugr_sprite | 0x8000
61 63
 setvar MUGSHOT_1_X 0xD0
62 64
 setvar MUGSHOT_1_Y 0x60
63
-msgbox \msgmugr_textpointer \msgmugr_callstd
65
+msgbox \mugmsgr_textpointer \mugmsgr_callstd
64 66
 setvar MUGHSOT_1_TABLE 0x0
65 67
 .endm
66 68
 
67
-.macro msgmugl msgmugl_textpointer:req msgmugl_callstd:req msgmugl_sprite:req
69
+.macro mugmsgl mugmsgl_textpointer:req mugmsgl_callstd:req mugmsgl_sprite:req
68 70
 setvar MUGHSOT_1_TABLE \msgmugl_sprite
69 71
 setvar MUGSHOT_1_X 0x16
70 72
 setvar MUGSHOT_1_Y 0x60
71
-msgbox \msgmugl_textpointer \msgmugl_callstd
73
+msgbox \mugmsgl_textpointer \mugmsgl_callstd
72 74
 setvar MUGHSOT_1_TABLE 0x0
73 75
 .endm
74 76
 
@@ -104,24 +106,6 @@ setflag FLAG_WALK_SCRIPT
104 106
 clearflag FLAG_WALK_SCRIPT
105 107
 .endm
106 108
 
107
-.macro writemusikto1 writemusikto1_from:req writemusikto1_to:req
108
-setflag FLAG_ENABLE_MUSIC_OVERRIDES
109
-setvar VAR_FROM_1 \writemusikto1_from
110
-setvar VAR_TO_1 \writemusikto1_to
111
-.endm
112
-
113
-.macro writemusikto2 writemusikto2_from:req writemusikto2_to:req
114
-setflag FLAG_ENABLE_MUSIC_OVERRIDES
115
-setvar VAR_FROM_2 \writemusikto2_from
116
-setvar VAR_TO_2 \writemusikto2_to
117
-.endm
118
-
119
-.macro writemusikto3 writemusikto3_from:req writemusikto3_to:req
120
-setflag FLAG_ENABLE_MUSIC_OVERRIDES
121
-setvar VAR_FROM_3 \writemusikto3_from
122
-setvar VAR_TO_3 \writemusikto3_to
123
-.endm
124
-
125 109
 .macro writemusikwithmapmusik writemusikwithmapmusik_mapmusik:req
126 110
 setflag FLAG_ENABLE_MUSIC_OVERRIDES
127 111
 setvar VAR_FROM_1 \writemusikwithmapmusik_mapmusik
@@ -132,10 +116,6 @@ setvar VAR_TO_1 MUS_SKIP_PLAY
132 116
 clearflag FLAG_ENABLE_MUSIC_OVERRIDES
133 117
 .endm
134 118
 
135
-
136
-
137
-
138
-
139 119
 @@ Index commands
140 120
 
141 121
 .macro nop