Browse Source

fixes regarding overworlds, cutscenes, camera movement

SBird1337 7 years ago
parent
commit
c1f851916a

+ 1
- 1
assets.makefile View File

78
 $(C_MET_SKY): $(PNG_MET_SKY)
78
 $(C_MET_SKY): $(PNG_MET_SKY)
79
 	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp1 -mRtpf -p -pu16 -pzl -ftc -o $@
79
 	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp1 -mRtpf -p -pu16 -pzl -ftc -o $@
80
 
80
 
81
-$(C_MET_RG): $(PNG_MET_RG)
81
+$(C_MET_FG): $(PNG_MET_FG)
82
 	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp3 -mRtpf -p -pu16 -pzl -ftc -o $@
82
 	$(GRIT) $< -gu32 -gzl -gB 4 -gt -m -mu16 -mzl -mp3 -mRtpf -p -pu16 -pzl -ftc -o $@
83
 
83
 
84
 $(C_MET_CLOUDS): $(PNG_MET_CLOUDS)
84
 $(C_MET_CLOUDS): $(PNG_MET_CLOUDS)

+ 22
- 8
data/text_lookup/text_lookup_array.s View File

5
 .global get_text_pointer_from_lookup
5
 .global get_text_pointer_from_lookup
6
 get_text_pointer_from_lookup:
6
 get_text_pointer_from_lookup:
7
 push {r4-r5, lr}
7
 push {r4-r5, lr}
8
+ldr r0, =str_invalid_text
9
+b valid_text_two
10
+@delete those two lines to activate the system
11
+
8
 ldr r0, =sav_one
12
 ldr r0, =sav_one
9
 ldr r0, [r0]
13
 ldr r0, [r0]
10
 ldrb r4, [r0, #4] @r4 = bank
14
 ldrb r4, [r0, #4] @r4 = bank
30
 lsl r0, #2
34
 lsl r0, #2
31
 add r1, r0, r4
35
 add r1, r0, r4
32
 ldr r0, [r1, #0] @load specific ID
36
 ldr r0, [r1, #0] @load specific ID
37
+lsr r1, r0, #0x18
38
+cmp r1, #8
39
+beq valid_text_two
40
+cmp r1, #9
41
+beq valid_text_two
42
+ldr r0, =str_invalid_text
43
+valid_text_two:
33
 ldr r1, lp_offset
44
 ldr r1, lp_offset
34
 str r0, [r1]
45
 str r0, [r1]
35
-mov r0, #0
36
-ldr r1, =0x500C
37
-ldr r2, =var_set
38
-bl bxr2
39
 pop {r4-r5}
46
 pop {r4-r5}
40
 pop {r1}
47
 pop {r1}
41
 bx r1
48
 bx r1
43
 .global get_map_pointer_from_lookup
50
 .global get_map_pointer_from_lookup
44
 get_map_pointer_from_lookup:
51
 get_map_pointer_from_lookup:
45
 push {r4-r5, lr}
52
 push {r4-r5, lr}
53
+ldr r0, =str_invalid_text
54
+b valid_text_one
55
+@delete those two lines to activate the system
56
+
46
 ldr r0, =sav_one
57
 ldr r0, =sav_one
47
 ldr r0, [r0]
58
 ldr r0, [r0]
48
 ldrb r4, [r0, #4] @r4 = bank
59
 ldrb r4, [r0, #4] @r4 = bank
61
 lsl r0, #2
72
 lsl r0, #2
62
 add r1, r0, r4
73
 add r1, r0, r4
63
 ldr r0, [r1, #0] @load specific ID
74
 ldr r0, [r1, #0] @load specific ID
75
+lsr r1, r0, #0x18
76
+cmp r1, #8
77
+beq valid_text_one
78
+cmp r1, #9
79
+beq valid_text_one
80
+ldr r0, =str_invalid_text
81
+valid_text_one:
64
 ldr r1, lp_offset
82
 ldr r1, lp_offset
65
 str r0, [r1]
83
 str r0, [r1]
66
-mov r0, #0
67
-ldr r1, =0x500C
68
-ldr r2, =var_set
69
-bl bxr2
70
 pop {r4-r5}
84
 pop {r4-r5}
71
 pop {r1}
85
 pop {r1}
72
 bx r1
86
 bx r1

+ 1
- 1
main.asm View File

32
 .include "patches/pokemon_data/pokemon_icons.asm"
32
 .include "patches/pokemon_data/pokemon_icons.asm"
33
 .include "patches/pokemon_data/pokemon_habitats.asm"
33
 .include "patches/pokemon_data/pokemon_habitats.asm"
34
 
34
 
35
-.include "patches/dns/core.asm"
35
+//.include "patches/dns/core.asm"
36
 
36
 
37
 .include "patches/overworlds/overworld.asm"
37
 .include "patches/overworlds/overworld.asm"
38
 
38
 

+ 0
- 3
nbproject/configurations.xml View File

143
           <in>custom_specials.c</in>
143
           <in>custom_specials.c</in>
144
           <in>cutscene_meteor.c</in>
144
           <in>cutscene_meteor.c</in>
145
           <in>load_text_special.c</in>
145
           <in>load_text_special.c</in>
146
-          <in>script_overrides.c</in>
147
         </df>
146
         </df>
148
       </df>
147
       </df>
149
       <df name="string">
148
       <df name="string">
645
       </item>
644
       </item>
646
       <item path="src/specials/load_text_special.c" ex="false" tool="0" flavor2="0">
645
       <item path="src/specials/load_text_special.c" ex="false" tool="0" flavor2="0">
647
       </item>
646
       </item>
648
-      <item path="src/specials/script_overrides.c" ex="false" tool="0" flavor2="0">
649
-      </item>
650
       <item path="string/de/story_text/tundra_hq/globals.txt"
647
       <item path="string/de/story_text/tundra_hq/globals.txt"
651
             ex="false"
648
             ex="false"
652
             tool="3"
649
             tool="3"

+ 0
- 1209
nbproject/private/configurations.xml
File diff suppressed because it is too large
View File


+ 3
- 3
patches/dns/core.asm View File

19
     .pool
19
     .pool
20
 
20
 
21
 .org 0x08056578
21
 .org 0x08056578
22
-    ldr r0, =dns_cb_overworld_hacked+1
23
-    bx r0
24
-    .pool
22
+    //ldr r0, =dns_cb_overworld_hacked+1
23
+    //bx r0
24
+    //.pool

+ 2
- 2
patches/hooks.asm View File

28
   .org 0x081DD0F4
28
   .org 0x081DD0F4
29
     LDR R1, =music_override|1
29
     LDR R1, =music_override|1
30
     BX R1
30
     BX R1
31
-  .pool
31
+   .pool
32
 
32
 
33
 
33
 
34
 
34
 
151
 .org 0x080D9EDC
151
 .org 0x080D9EDC
152
     ldr r0, =load_hijack|1
152
     ldr r0, =load_hijack|1
153
     bx r0
153
     bx r0
154
-	.pool
154
+    .pool
155
 
155
 
156
 .org 0x080d991E
156
 .org 0x080d991E
157
     bx r7
157
     bx r7

+ 2
- 2
patches/special.asm View File

7
 .org 0x0815FD60 + (4*0x6A)
7
 .org 0x0815FD60 + (4*0x6A)
8
 .word get_map_pointer_from_lookup|1
8
 .word get_map_pointer_from_lookup|1
9
 
9
 
10
-.org 0x0815F9B0 + (4*0x2)   //end cmd
11
-.word s02_end|1
10
+.org 0x0815FD60 + (4*0x6B)
11
+.word sp_clear_variables|1

+ 7
- 7
src/assets/meteor/met_background.c View File

10
 //	+ regular map (flat), lz77 compressed, 32x20 
10
 //	+ regular map (flat), lz77 compressed, 32x20 
11
 //	Total size: 12 + 20 + 164 = 196
11
 //	Total size: 12 + 20 + 164 = 196
12
 //
12
 //
13
-//	Time-stamp: 2016-05-29, 04:14:05
14
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
15
 //	( http://www.coranac.com/projects/#grit )
16
 //
16
 //
17
 //======================================================================
17
 //======================================================================
18
 
18
 
19
-const unsigned int met_backgroundTiles[5] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
19
+const unsigned int met_backgroundTiles[5] __attribute__((aligned(4)))=
20
 {
20
 {
21
-	0x00004010,0xF0000033,0x11059001,0x9001F011,0x00000005,
21
+	0x00004010,0xF0000033,0x11059001,0x9001F011,0xF001F005,
22
 };
22
 };
23
 
23
 
24
-const unsigned short met_backgroundMap[82] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
24
+const unsigned short met_backgroundMap[82] __attribute__((aligned(4)))=
25
 {
25
 {
26
 	0x0010,0x0005,0x013F,0xF000,0xF001,0xF001,0xF001,0xF001,
26
 	0x0010,0x0005,0x013F,0xF000,0xF001,0xF001,0xF001,0xF001,
27
 	0xF001,0xFB01,0x01F0,0x01F0,0x01F0,0x01F0,0x0770,0xF000,
27
 	0xF001,0xFB01,0x01F0,0x01F0,0x01F0,0x01F0,0x0770,0xF000,
37
 	0x003F,0x0000,
37
 	0x003F,0x0000,
38
 };
38
 };
39
 
39
 
40
-const unsigned short met_backgroundPal[6] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
40
+const unsigned short met_backgroundPal[6] __attribute__((aligned(4)))=
41
 {
41
 {
42
-	0x2010,0x0000,0x0030,0xF000,0x9001,0x1101,
42
+	0x2010,0x0000,0x0030,0xF000,0x9001,0x0001,
43
 };
43
 };
44
 
44
 
45
 //}}BLOCK(met_background)
45
 //}}BLOCK(met_background)

+ 2
- 2
src/assets/meteor/met_background.h View File

10
 //	+ regular map (flat), lz77 compressed, 32x20 
10
 //	+ regular map (flat), lz77 compressed, 32x20 
11
 //	Total size: 12 + 20 + 164 = 196
11
 //	Total size: 12 + 20 + 164 = 196
12
 //
12
 //
13
-//	Time-stamp: 2016-05-29, 04:14:05
14
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
15
 //	( http://www.coranac.com/projects/#grit )
16
 //
16
 //
17
 //======================================================================
17
 //======================================================================

+ 6
- 6
src/assets/meteor/met_clouds.c View File

9
 //	+ regular map (flat), lz77 compressed, 32x20 
9
 //	+ regular map (flat), lz77 compressed, 32x20 
10
 //	Total size: 28 + 448 + 256 = 732
10
 //	Total size: 28 + 448 + 256 = 732
11
 //
11
 //
12
-//	Time-stamp: 2016-05-29, 04:14:05
13
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
14
 //	( http://www.coranac.com/projects/#grit )
15
 //
15
 //
16
 //======================================================================
16
 //======================================================================
17
 
17
 
18
-const unsigned int met_cloudsTiles[112] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
18
+const unsigned int met_cloudsTiles[112] __attribute__((aligned(4)))=
19
 {
19
 {
20
 	0x0005C010,0xF0000033,0x6003B001,0x7013F066,0x66661707,0x601F1066,0x1F7019F0,0x60722320,
20
 	0x0005C010,0xF0000033,0x6003B001,0x7013F066,0x66661707,0x601F1066,0x1F7019F0,0x60722320,
21
 	0x1FF02720,0x06661E40,0xD1064320,0x41301FF0,0x063F0060,0x43E00606,0x105F50F8,0x805DF042,
21
 	0x1FF02720,0x06661E40,0xD1064320,0x41301FF0,0x063F0060,0x43E00606,0x105F50F8,0x805DF042,
34
 	0x3FF10722,0x99F0FFB0,0x7420C821,0xC4FF1AF0,0xC49BF0BF,0xF01044BF,0x442E741F,0x003F9231,
34
 	0x3FF10722,0x99F0FFB0,0x7420C821,0xC4FF1AF0,0xC49BF0BF,0xF01044BF,0x442E741F,0x003F9231,
35
 };
35
 };
36
 
36
 
37
-const unsigned short met_cloudsMap[128] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
37
+const unsigned short met_cloudsMap[128] __attribute__((aligned(4)))=
38
 {
38
 {
39
 	0x0010,0x0005,0x003F,0xF020,0xF001,0xF001,0xF001,0xF001,
39
 	0x0010,0x0005,0x003F,0xF020,0xF001,0xF001,0xF001,0xF001,
40
 	0xF001,0xF801,0x01F0,0x01F0,0x01F0,0x01F0,0x0590,0x2001,
40
 	0xF001,0xF801,0x01F0,0x01F0,0x01F0,0x01F0,0x0590,0x2001,
55
 	0x01F0,0x01F0,0xF0F8,0xF001,0xF001,0xF001,0x8001,0x0005,
55
 	0x01F0,0x01F0,0xF0F8,0xF001,0xF001,0xF001,0x8001,0x0005,
56
 };
56
 };
57
 
57
 
58
-const unsigned short met_cloudsPal[14] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
58
+const unsigned short met_cloudsPal[14] __attribute__((aligned(4)))=
59
 {
59
 {
60
 	0x2010,0x0000,0x0000,0x9602,0x747F,0x517F,0x007F,0x7FFE,
60
 	0x2010,0x0000,0x0000,0x9602,0x747F,0x517F,0x007F,0x7FFE,
61
-	0x7F9C,0x7F7A,0x0000,0xD080,0x0001,0x0000,
61
+	0x7F9C,0x7F7A,0x0000,0xD080,0x0101,0x01F0,
62
 };
62
 };
63
 
63
 
64
 //}}BLOCK(met_clouds)
64
 //}}BLOCK(met_clouds)

+ 2
- 2
src/assets/meteor/met_clouds.h View File

9
 //	+ regular map (flat), lz77 compressed, 32x20 
9
 //	+ regular map (flat), lz77 compressed, 32x20 
10
 //	Total size: 28 + 448 + 256 = 732
10
 //	Total size: 28 + 448 + 256 = 732
11
 //
11
 //
12
-//	Time-stamp: 2016-05-29, 04:14:05
13
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
14
 //	( http://www.coranac.com/projects/#grit )
15
 //
15
 //
16
 //======================================================================
16
 //======================================================================

+ 6
- 6
src/assets/meteor/met_foreground.c View File

9
 //	+ regular map (flat), lz77 compressed, 32x20 
9
 //	+ regular map (flat), lz77 compressed, 32x20 
10
 //	Total size: 36 + 2356 + 464 = 2856
10
 //	Total size: 36 + 2356 + 464 = 2856
11
 //
11
 //
12
-//	Time-stamp: 2016-05-29, 04:14:05
13
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
14
 //	( http://www.coranac.com/projects/#grit )
15
 //
15
 //
16
 //======================================================================
16
 //======================================================================
17
 
17
 
18
-const unsigned int met_foregroundTiles[589] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
18
+const unsigned int met_foregroundTiles[589] __attribute__((aligned(4)))=
19
 {
19
 {
20
 	0x00118010,0xF000003D,0xF001F001,0x990F0001,0xBB600200,0x1C4017F0,0xBB999999,0xF0BB63BB,
20
 	0x00118010,0xF000003D,0xF001F001,0x990F0001,0xBB600200,0x1C4017F0,0xBB999999,0xF0BB63BB,
21
 	0xAA1F901F,0x19F0AAAA,0x095C0B30,0x109A1200,0x1001F004,0x0300440E,0x00114000,0x03001400,
21
 	0xAA1F901F,0x19F0AAAA,0x095C0B30,0x109A1200,0x1001F004,0x0300440E,0x00114000,0x03001400,
102
 	0x2142212F,0x400C787F,0xC0517F21,0xB0C0BFF1,0x001F9003,
102
 	0x2142212F,0x400C787F,0xC0517F21,0xB0C0BFF1,0x001F9003,
103
 };
103
 };
104
 
104
 
105
-const unsigned short met_foregroundMap[232] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
105
+const unsigned short met_foregroundMap[232] __attribute__((aligned(4)))=
106
 {
106
 {
107
 	0x0010,0x0005,0x003F,0xF030,0xF001,0xF001,0xF001,0xF001,
107
 	0x0010,0x0005,0x003F,0xF030,0xF001,0xF001,0xF001,0xF001,
108
 	0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
108
 	0xF001,0xFF01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
135
 	0x7E30,0x7F30,0x8030,0x0030,0x3081,0x3082,0x3083,0x3084,
135
 	0x7E30,0x7F30,0x8030,0x0030,0x3081,0x3082,0x3083,0x3084,
136
 	0x8500,0x8630,0x8730,0x8630,0x0034,0x3088,0x3089,0x308A,
136
 	0x8500,0x8630,0x8730,0x8630,0x0034,0x3088,0x3089,0x308A,
137
 	0x308B,0x8A7F,0x4F01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
137
 	0x308B,0x8A7F,0x4F01,0x01F0,0x01F0,0x01F0,0x01F0,0x01F0,
138
-	0x01F0,0xF0F8,0xF001,0xF001,0xF001,0xB001,0x0003,0x008F,
138
+	0x01F0,0xF0F8,0xF001,0xF001,0xF001,0xB001,0x3003,0x0000,
139
 };
139
 };
140
 
140
 
141
-const unsigned short met_foregroundPal[18] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
141
+const unsigned short met_foregroundPal[18] __attribute__((aligned(4)))=
142
 {
142
 {
143
 	0x2010,0x0000,0x0000,0x0E7E,0xCB3B,0x8932,0x002A,0x21E0,
143
 	0x2010,0x0000,0x0000,0x0E7E,0xCB3B,0x8932,0x002A,0x21E0,
144
 	0x5F19,0x4E97,0x4634,0xF200,0x493D,0xF825,0xB619,0x2015,
144
 	0x5F19,0x4E97,0x4634,0xF200,0x493D,0xF825,0xB619,0x2015,

+ 2
- 2
src/assets/meteor/met_foreground.h View File

9
 //	+ regular map (flat), lz77 compressed, 32x20 
9
 //	+ regular map (flat), lz77 compressed, 32x20 
10
 //	Total size: 36 + 2356 + 464 = 2856
10
 //	Total size: 36 + 2356 + 464 = 2856
11
 //
11
 //
12
-//	Time-stamp: 2016-05-29, 04:14:05
13
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
14
 //	( http://www.coranac.com/projects/#grit )
15
 //
15
 //
16
 //======================================================================
16
 //======================================================================

+ 4
- 4
src/assets/meteor/met_meteor.c View File

8
 //	+ 48 tiles lz77 compressed
8
 //	+ 48 tiles lz77 compressed
9
 //	Total size: 32 + 1168 = 1200
9
 //	Total size: 32 + 1168 = 1200
10
 //
10
 //
11
-//	Time-stamp: 2016-05-29, 04:14:05
12
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
13
 //	( http://www.coranac.com/projects/#grit )
14
 //
14
 //
15
 //======================================================================
15
 //======================================================================
16
 
16
 
17
-const unsigned int met_meteorTiles[292] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
17
+const unsigned int met_meteorTiles[292] __attribute__((aligned(4)))=
18
 {
18
 {
19
 	0x00060010,0xF000003A,0x2001F001,0x1300100D,0x00001013,0x221A0020,0x02100032,0x11000031,
19
 	0x00060010,0xF000003A,0x2001F001,0x1300100D,0x00001013,0x221A0020,0x02100032,0x11000031,
20
 	0x27801103,0x10334002,0x00401134,0x00300001,0x11300000,0x10442230,0x3740246C,0x20023E30,
20
 	0x27801103,0x10334002,0x00401134,0x00300001,0x11300000,0x10442230,0x3740246C,0x20023E30,
59
 	0x57451634,0x10B0F754,0x13F40667,0x00FF0160,
59
 	0x57451634,0x10B0F754,0x13F40667,0x00FF0160,
60
 };
60
 };
61
 
61
 
62
-const unsigned short met_meteorPal[16] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
62
+const unsigned short met_meteorPal[16] __attribute__((aligned(4)))=
63
 {
63
 {
64
 	0x2108,0x211B,0x223E,0x2117,0x22BE,0x4BDE,0x375E,0x5FDE,
64
 	0x2108,0x211B,0x223E,0x2117,0x22BE,0x4BDE,0x375E,0x5FDE,
65
 	0x7BDE,0x21BE,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
65
 	0x7BDE,0x21BE,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,

+ 2
- 2
src/assets/meteor/met_meteor.h View File

8
 //	+ 48 tiles lz77 compressed
8
 //	+ 48 tiles lz77 compressed
9
 //	Total size: 32 + 1168 = 1200
9
 //	Total size: 32 + 1168 = 1200
10
 //
10
 //
11
-//	Time-stamp: 2016-05-29, 04:14:05
12
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
13
 //	( http://www.coranac.com/projects/#grit )
14
 //
14
 //
15
 //======================================================================
15
 //======================================================================

+ 7
- 7
src/assets/meteor/met_sky.c View File

9
 //	+ regular map (flat), lz77 compressed, 32x20 
9
 //	+ regular map (flat), lz77 compressed, 32x20 
10
 //	Total size: 28 + 204 + 240 = 472
10
 //	Total size: 28 + 204 + 240 = 472
11
 //
11
 //
12
-//	Time-stamp: 2016-05-29, 04:14:05
13
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
14
 //	( http://www.coranac.com/projects/#grit )
15
 //
15
 //
16
 //======================================================================
16
 //======================================================================
17
 
17
 
18
-const unsigned int met_skyTiles[51] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
18
+const unsigned int met_skyTiles[51] __attribute__((aligned(4)))=
19
 {
19
 {
20
 	0x00032010,0xF0000033,0x33059001,0x2001F033,0x3332010D,0x23232333,0xBD19F023,0xF0321E60,
20
 	0x00032010,0xF0000033,0x33059001,0x2001F033,0x3332010D,0x23232333,0xBD19F023,0xF0321E60,
21
 	0xF040B01F,0x325E801F,0xF0E03FF0,0x601EF07F,0x23332308,0x30E13232,0x90471001,0x22232207,
21
 	0xF040B01F,0x325E801F,0xF0E03FF0,0x601EF07F,0x23332308,0x30E13232,0x90471001,0x22232207,
26
 	0x11789C10,0x01F04300,0x01F001F0,
26
 	0x11789C10,0x01F04300,0x01F001F0,
27
 };
27
 };
28
 
28
 
29
-const unsigned short met_skyMap[120] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
29
+const unsigned short met_skyMap[120] __attribute__((aligned(4)))=
30
 {
30
 {
31
 	0x0010,0x0005,0x003F,0xF010,0xF001,0xF001,0xF001,0xF001,
31
 	0x0010,0x0005,0x003F,0xF010,0xF001,0xF001,0xF001,0xF001,
32
 	0xF001,0xF801,0x01F0,0x01F0,0x01F0,0x01F0,0x0770,0x1001,
32
 	0xF001,0xF801,0x01F0,0x01F0,0x01F0,0x01F0,0x0770,0x1001,
43
 	0x3FF0,0x01F0,0x01F0,0x3FF0,0x01F0,0x01F0,0xF0FF,0xF001,
43
 	0x3FF0,0x01F0,0x01F0,0x3FF0,0x01F0,0x01F0,0xF0FF,0xF001,
44
 	0xF03F,0xF001,0xF001,0xF03F,0xF015,0xF001,0xFF01,0x3FF0,
44
 	0xF03F,0xF001,0xF001,0xF03F,0xF015,0xF001,0xFF01,0x3FF0,
45
 	0x01F0,0x01F0,0x3FF0,0x01F0,0x01F0,0x01F0,0x01F0,0xF0FE,
45
 	0x01F0,0x01F0,0x3FF0,0x01F0,0x01F0,0x01F0,0x01F0,0xF0FE,
46
-	0xF001,0xF001,0xF001,0xF001,0xF001,0xB001,0x0003,0x0000,
46
+	0xF001,0xF001,0xF001,0xF001,0xF001,0xB001,0x1003,0x0000,
47
 };
47
 };
48
 
48
 
49
-const unsigned short met_skyPal[14] __attribute__((aligned(4))) __attribute__((visibility("hidden")))=
49
+const unsigned short met_skyPal[14] __attribute__((aligned(4)))=
50
 {
50
 {
51
 	0x2010,0x0000,0x0000,0x9602,0x747F,0x517F,0x007F,0x7FFE,
51
 	0x2010,0x0000,0x0000,0x9602,0x747F,0x517F,0x007F,0x7FFE,
52
-	0x7F9C,0x7F7A,0x0000,0xD080,0x0001,0x0000,
52
+	0x7F9C,0x7F7A,0x0000,0xD080,0x1101,0x1111,
53
 };
53
 };
54
 
54
 
55
 //}}BLOCK(met_sky)
55
 //}}BLOCK(met_sky)

+ 2
- 2
src/assets/meteor/met_sky.h View File

9
 //	+ regular map (flat), lz77 compressed, 32x20 
9
 //	+ regular map (flat), lz77 compressed, 32x20 
10
 //	Total size: 28 + 204 + 240 = 472
10
 //	Total size: 28 + 204 + 240 = 472
11
 //
11
 //
12
-//	Time-stamp: 2016-05-29, 04:14:05
13
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.13
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 )
14
 //	( http://www.coranac.com/projects/#grit )
15
 //
15
 //
16
 //======================================================================
16
 //======================================================================

+ 18
- 0
src/specials/custom_specials.c View File

55
  */
55
  */
56
 void sp_special_casm();
56
 void sp_special_casm();
57
 
57
 
58
+/**
59
+ * @brief clears some variables at the end of a script
60
+ */
61
+void sp_clear_variables();
62
+
63
+
58
 void get_text_pointer_from_lookup();
64
 void get_text_pointer_from_lookup();
59
 
65
 
60
 /* === STATICS === */
66
 /* === STATICS === */
90
     u16* var_special = var_access(CALLASM_VAR);
96
     u16* var_special = var_access(CALLASM_VAR);
91
     special_routines[*var_special]();
97
     special_routines[*var_special]();
92
 }
98
 }
99
+
100
+void sp_clear_variables()
101
+{
102
+    (void) var_set(MUGHSOT_1_TABLE, 0);
103
+    (void) var_set(MUGHSOT_2_TABLE, 0);
104
+    (void) var_set(MUGSHOT_1_X, 0);
105
+    (void) var_set(MUGSHOT_2_X, 0);
106
+    (void) var_set(MUGSHOT_1_Y, 0);
107
+    (void) var_set(MUGSHOT_2_Y, 0);
108
+    (void) var_set(TEXT_VAR, 0);
109
+    return;
110
+}

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

270
 
270
 
271
 void met_setup_palettes()
271
 void met_setup_palettes()
272
 {
272
 {
273
-	wram_decompress((void*)met_skyPal, palette_unfaded_buffer + PALETTE_SKY*32);
274
-	wram_decompress((void*)met_cloudsPal, palette_unfaded_buffer + PALETTE_CLOUD*32);
275
-	wram_decompress((void*)met_foregroundPal, palette_unfaded_buffer + PALETTE_FG*32);
276
-	wram_decompress((void*)met_backgroundPal, palette_unfaded_buffer + PALETTE_BG*32);
273
+	wram_decompress((void*)met_skyPal, palette_unfaded_buffer + PALETTE_SKY*16);
274
+	wram_decompress((void*)met_cloudsPal, palette_unfaded_buffer + PALETTE_CLOUD*16);
275
+	wram_decompress((void*)met_foregroundPal, palette_unfaded_buffer + PALETTE_FG*16);
276
+	wram_decompress((void*)met_backgroundPal, palette_unfaded_buffer + PALETTE_BG*16);
277
 }
277
 }
278
 
278
 
279
 void met_setup_vram()
279
 void met_setup_vram()

+ 0
- 64
src/specials/script_overrides.c View File

1
-/****************************************************************************
2
- * Copyright (C) 2015-2016 by the SotS Team                                 *
3
- *                                                                          *
4
- * This file is part of Sovereign of the Skies.                             *
5
- *                                                                          *
6
- *   Sovereign of the Skies is free software: you can redistribute it       *
7
- *   and/or modify it                                                       *
8
- *   under the terms of the GNU Lesser General Public License as published  *
9
- *   by the Free Software Foundation, either version 3 of the License, or   *
10
- *   (at your option) any later version provided you include a copy of the  *
11
- *   licence and this header.                                               *
12
- *                                                                          *
13
- *   Sovereign of the Skies is distributed in the hope that it will be      *
14
- *   useful, but WITHOUT ANY WARRANTY; without even the implied warranty of *
15
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
16
- *   GNU Lesser General Public License for more details.                    *
17
- *                                                                          *
18
- *   You should have received a copy of the GNU Lesser General Public       *
19
- *   License along with Sovereign of the Skies.                             *
20
- *   If not, see <http://www.gnu.org/licenses/>.                            *
21
- ****************************************************************************/
22
-
23
-/**
24
- * @file script_overrides.c
25
- * @author Sturmvogel
26
- * @date 01 Jan 2016
27
- * @brief Override some internal script commands e.g. end
28
- *
29
- */
30
-
31
-
32
-/* === INCLUDE === */
33
-
34
-#include <game_engine.h>
35
-#include <types.h>
36
-#include <config.h>
37
-
38
-/* === PROTOTYPES === */
39
-
40
-/**
41
- * @brief set the script environment to end_of_script
42
- */
43
-extern void script_mode_set_stopped();
44
-
45
-/**
46
- * @brief command to end a script
47
- * @return always false (for the script environment)
48
- */
49
-u8 s02_end();
50
-
51
-/* === IMPLEMENTATIONS === */
52
-
53
-u8 s02_end()
54
-{
55
-    var_set(MUGHSOT_1_TABLE, 0);
56
-    var_set(MUGHSOT_2_TABLE, 0);
57
-    var_set(MUGSHOT_1_X, 0);
58
-    var_set(MUGSHOT_2_X, 0);
59
-    var_set(MUGSHOT_1_Y, 0);
60
-    var_set(MUGSHOT_2_Y, 0);
61
-    var_set(TEXT_VAR, 0);
62
-    script_mode_set_stopped();
63
-    return false;
64
-}

+ 2
- 1
string/de/text.txt View File

1
 str_person_test=Dies ist ein Test\num die Funktionalität\lzu testen!
1
 str_person_test=Dies ist ein Test\num die Funktionalität\lzu testen!
2
-str_person_zero=Falscher Text!
2
+str_person_zero=Falscher Text!
3
+str_invalid_text=Dies ist ein Dummy Text!