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

test data

Philipp Auer 7 years ago
parent
391cb3c922
commit
6130b4642d
5 changed files with 117 additions and 48 deletions
Split View Show Diff Stats
  1. 9
    9
      data/overworld/overworld_frames.S
  2. 1
    4
      src/include/assets/interface/arrows.img.h
  3. 82
    33
      src/test/alabastia.S
  4. 23
    1
      src/test/test_scripts.S
  5. 2
    1
      string/de/debugging.txt

+ 9
- 9
data/overworld/overworld_frames.S View File 

@@ -15143,31 +15143,31 @@ ow_frames_539:
15143 15143
15144 15144 
 .align 2
15145 15145 
 ow_frames_540:
15146 
-.word ow_0539Tiles+(0*0x800)
15146 
+.word ow_00000Tiles+(0*0x800)
15147 15147 
 .hword 0x800
15148 15148 
 .hword 0x0
15149 
-.word ow_0539Tiles+(1*0x800)
15149 
+.word ow_00000Tiles+(1*0x800)
15150 15150 
 .hword 0x800
15151 15151 
 .hword 0x0
15152 
-.word ow_0539Tiles+(2*0x800)
15152 
+.word ow_00000Tiles+(2*0x800)
15153 15153 
 .hword 0x800
15154 15154 
 .hword 0x0
15155 
-.word ow_0539Tiles+(0*0x800)
15155 
+.word ow_00000Tiles+(0*0x800)
15156 15156 
 .hword 0x800
15157 15157 
 .hword 0x0
15158 
-.word ow_0539Tiles+(0*0x800)
15158 
+.word ow_00000Tiles+(0*0x800)
15159 15159 
 .hword 0x800
15160 15160 
 .hword 0x0
15161 
-.word ow_0539Tiles+(0*0x800)
15161 
+.word ow_00000Tiles+(0*0x800)
15162 15162 
 .hword 0x800
15163 15163 
 .hword 0x0
15164 
-.word ow_0539Tiles+(0*0x800)
15164 
+.word ow_00000Tiles+(0*0x800)
15165 15165 
 .hword 0x800
15166 15166 
 .hword 0x0
15167 
-.word ow_0539Tiles+(0*0x800)
15167 
+.word ow_00000Tiles+(0*0x800)
15168 15168 
 .hword 0x800
15169 15169 
 .hword 0x0
15170 
-.word ow_0539Tiles+(0*0x800)
15170 
+.word ow_00000Tiles+(0*0x800)
15171 15171 
 .hword 0x800
15172 15172 
 .hword 0x0
15173 15173

+ 1
- 4
src/include/assets/interface/arrows.img.h View File 

@@ -7,10 +7,7 @@
7 7 
 //	+ 24 tiles not compressed
8 8 
 //	Total size: 768 = 768
9 9 
 //
10 
-<<<<<<< HEAD
11 
-//	Time-stamp: 2017-05-24, 23:53:39
12 
-=======
13 
->>>>>>> 287c7ea0c11e046fe6fb8f2f68178aeca2fa326b
10 
+//	Time-stamp: 2017-05-29, 22:25:28
14 11 
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
15 12 
 //	( http://www.coranac.com/projects/#grit )
16 13 
 //

+ 82
- 33
src/test/alabastia.S View File 

@@ -1,11 +1,11 @@
1 
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
2 
-@                                                                                 @
3 
-@           file: C:\Users\Philipp\Desktop\sots tilesets\alabastia.tmx            @
4 
-@                            converted using tiled2agb                            @
5 
-@                             converted on 29.05.2017                             @
6 
-@                          program created by Sturmvogel                          @
7 
-@                                                                                 @
8 
-@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
1 
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
2 
+@                                                                    @
3 
+@           file: E:\OneDrive\sots tilesets\alabastia.tmx            @
4 
+@                     converted using tiled2agb                      @
5 
+@                      converted on 31.05.2017                       @
6 
+@                   program created by Sturmvogel                    @
7 
+@                                                                    @
8 
+@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@
9 9
10 10 
 @@@  SECTION: MAPHEADER  @@@
11 11 
 

@@ -20,7 +20,7 @@ mapheader_alabastia:
20 20 
 	.hword 0x004E @index
21 21 
 	.byte 0x58 @name
22 22 
 	.byte 0x00 @cave
23 
-	.byte 0x07 @weather
23 
+	.byte 0x02 @weather
24 24 
 	.byte 0x01 @light
25 25 
 	.byte 0x01 @unknown
26 26 
 	.hword 0x0006 @showName

@@ -45,8 +45,8 @@ mapfooter_alabastia:
45 45
46 46 
 .global mapblocks_alabastia
47 47 
 mapblocks_alabastia:
48 
-	.hword 0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041F,0x32A6,0x32A7,0x041E,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041E,0x041F
49 
-	.hword 0x0414,0x0415,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0427,0x32AE,0x32AF,0x0426,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0416,0x0417
48 
+	.hword 0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x32A6,0x32A7,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041C,0x041D,0x041E,0x041F
49 
+	.hword 0x0414,0x0415,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x32AE,0x32AF,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0424,0x0425,0x0416,0x0417
50 50 
 	.hword 0x041C,0x041D,0x32A6,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x3285,0x3286,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328E,0x328F,0x041E,0x041F
51 51 
 	.hword 0x0414,0x0415,0x32AE,0x3296,0x3296,0x3281,0x3282,0x3282,0x3282,0x3283,0x3296,0x3296,0x3296,0x3296,0x3281,0x3282,0x3282,0x3282,0x3283,0x3296,0x3296,0x3297,0x0416,0x0417
52 52 
 	.hword 0x041C,0x041D,0x32AE,0x32C7,0x329E,0x0689,0x068A,0x068A,0x068A,0x068B,0x329E,0x329E,0x329E,0x329E,0x0689,0x068A,0x068A,0x068A,0x068B,0x32C6,0x3296,0x3297,0x041E,0x041F

@@ -72,51 +72,100 @@ mapblocks_alabastia:
72 72 
 mapborderblocks_alabastia:
73 73 
 	.hword 0x001C,0x001D
74 74 
 	.hword 0x0014,0x0015
75 
-@@@  SECTION: MAPFOOTER  @@@
75 
+@@@  SECTION: MAPEVENTS  @@@
76 76
77 77 
 .align 2
78 78 
 .global mapevents_alabastia
79 79 
 mapevents_alabastia:
80 
-.byte	0x02, 0x00, 0x00, 0x00
80 
+.byte	0x02, 0x03, 0x02, 0x00
81 81 
 .word 	mapevents_persons_alabastia
82 
-.word 	00000000
83 
-.word 	00000000
82 
+.word 	mapevents_warps_alabastia
83 
+.word 	mapevents_triggers_alabastia
84 84 
 .word 	00000000
85 85
86 86 
 @@@ SECTION: PERSON EVENTS @@@
87 87 
 .align 2
88 88 
 mapevents_persons_alabastia:
89 
-@//new structure
90 
-	.byte 0x01
91 
-	.byte 0x1E
92 
-	.byte 0x00
89 
+@PERSON ID: 0
90 
+
91 
+	.byte 0x09
92 
+	.byte 0x14
93 93 
 	.byte 0x00
94 
-	.hword 0x0014
95 
-	.hword 0x0003
96 94 
 	.byte 0x00
95 
+	.hword 0x000A
96 
+	.hword 0x0004
97 97 
 	.byte 0x00
98 
+	.byte 0x01
98 99 
 	.byte 0x40
99 100 
 	.byte 0x00
100 
-	.byte 0x01
101 101 
 	.byte 0x00
102 
-	.hword 0x0004
103 
-	.word scr_trainer_test
102 
+	.byte 0x00
103 
+	.hword 0x0000
104 
+	.word scr_map_test
104 105 
 	.hword 0x0500
105 106 
 	.hword 0x0000
106 
-@//new structure
107 
-	.byte 0x00
108 
-	.byte 0x20
109 
-	.byte 0x00
107 
+@PERSON ID: 1
108 
+
109 
+	.byte 0x07
110 
+	.byte 0x0A
110 111 
 	.byte 0x00
111 
-	.hword 0x000A
112 
-	.hword 0x0005
113 112 
 	.byte 0x00
113 
+	.hword 0x000E
114 
+	.hword 0x0002
114 115 
 	.byte 0x00
116 
+	.byte 0x03
115 117 
 	.byte 0x40
116 118 
 	.byte 0x00
119 
+	.byte 0x01
117 120 
 	.byte 0x00
118 
-	.byte 0x00
119 
-	.hword 0x0000
120 
-	.word scr_map_test
121 
+	.hword 0x0004
122 
+	.word 0x00000000
121 123 
 	.hword 0x0501
122 124 
 	.hword 0x0000
125 
+@@@ SECTION: WARP EVENTS @@@
126 
+.align 2
127 
+mapevents_warps_alabastia:
128 
+@WARP ID: 0
129 
+	.hword 6
130 
+	.hword 7
131 
+	.byte 0
132 
+	.byte 1
133 
+	.byte 0
134 
+	.byte 4
135 
+@WARP ID: 1
136 
+	.hword 15
137 
+	.hword 7
138 
+	.byte 0
139 
+	.byte 0
140 
+	.byte 2
141 
+	.byte 4
142 
+@WARP ID: 2
143 
+	.hword 16
144 
+	.hword 13
145 
+	.byte 0
146 
+	.byte 0
147 
+	.byte 3
148 
+	.byte 4
149 
+@@@ SECTION: TRIGGER EVENTS @@@
150 
+.align 2
151 
+mapevents_triggers_alabastia:
152 
+@WARP ID: 0
153 
+	.hword 12
154 
+	.hword 1
155 
+	.byte 0
156 
+	.byte 0
157 
+	.hword 20497
158 
+	.hword 0
159 
+	.byte 0
160 
+	.byte 0
161 
+	.word scr_trigger_test_two
162 
+@WARP ID: 1
163 
+	.hword 13
164 
+	.hword 1
165 
+	.byte 0
166 
+	.byte 0
167 
+	.hword 20498
168 
+	.hword 0
169 
+	.byte 0
170 
+	.byte 0
171 
+	.word scr_trigger_test

+ 23
- 1
src/test/test_scripts.S View File 

@@ -13,4 +13,26 @@ end
13 13
14 14 
 .global scr_trainer_test
15 15 
 scr_trainer_test:
16 
-trainerbattle 0 5 0 str_test_text str_test_text
16 
+trainerbattle 0 5 0 str_test_text str_test_text
17 
+
18 
+.global scr_trigger_test
19 
+scr_trigger_test:
20 
+lockall
21 
+msgbox str_test_text 6
22 
+applymovement 0xFF move_data
23 
+waitmovement 0x0
24 
+releaseall
25 
+end
26 
+
27 
+.global scr_trigger_test_two
28 
+scr_trigger_test_two:
29 
+lockall
30 
+msgbox str_test_text_two 6
31 
+applymovement 0xFF move_data
32 
+waitmovement 0x0
33 
+setvar 0x5011
34 
+releaseall
35 
+end
36 
+
37 
+move_data:
38 
+.byte APPLYMOVE_JUMP_ONE_DOWN, APPLYMOVE_END

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

@@ -1 +1,2 @@
1 
-str_test_text=Tremble, before the majesty\nof the emperor!
1 
+str_test_text=Tremble, before the majesty\nof the emperor!
2 
+str_test_text_two=Maybe next time...