Browse Source

resolve merge conflict

SBird1337 7 years ago
parent
commit
f0bfcc9733

+ 4
- 4
data/overworld/overworld_data.S View File

@@ -4544,11 +4544,11 @@ ow_data_538:
4544 4544
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_539, 0x8231CFC
4545 4545
 
4546 4546
 .align 2
4547
-ow_data_539: 
4547
+ow_data_539:
4548 4548
 .hword 0xFFFF
4549
-.byte 0x1B, 0x13, 0xFF, 0x11 
4550
-.hword 0x80, 0x10, 0x10, 0x0, 0 
4551
-.word 0x83A36F0, 0x83A3748, 0x83A3314, ow_frames_540, 0x8231CFC
4549
+.byte 0x1B, 0x13,0xFF, 0x11
4550
+.hword 0x800, 0x40, 0x40, 0x0, 0
4551
+.word 0x83A3720, 0x83A38D0, 0x83A3368, ow_frames_540, 0x8231CFC
4552 4552
 
4553 4553
 .align 2
4554 4554
 ow_data_540: 

+ 21
- 165
data/overworld/overworld_frames.S View File

@@ -15104,215 +15104,71 @@ ow_frames_533:
15104 15104
 .word ow_00000Tiles+(0*0x80)
15105 15105
 .hword 0x200
15106 15106
 .hword 0x0
15107
-.word
15108
-.hword 0x200
15109
-.hword 0x0
15110
-.word
15111
-.hword 0x200
15112
-.hword 0x0
15113
-.word
15114
-.hword 0x200
15115
-.hword 0x0
15116
-.word
15117
-.hword 0x200
15118
-.hword 0x0
15119
-.word
15120
-.hword 0x200
15121
-.hword 0x0
15122
-.word
15123
-.hword 0x200
15124
-.hword 0x0
15125
-.word
15126
-.hword 0x200
15127
-.hword 0x0
15128
-.word
15129
-.hword 0x200
15130
-.hword 0x0
15131 15107
 
15132 15108
 .align 2
15133 15109
 ow_frames_534:
15134 15110
 .word ow_00000Tiles+(0*0x80)
15135 15111
 .hword 0x200
15136 15112
 .hword 0x0
15137
-.word
15138
-.hword 0x200
15139
-.hword 0x0
15140
-.word
15141
-.hword 0x200
15142
-.hword 0x0
15143
-.word
15144
-.hword 0x200
15145
-.hword 0x0
15146
-.word
15147
-.hword 0x200
15148
-.hword 0x0
15149
-.word
15150
-.hword 0x200
15151
-.hword 0x0
15152
-.word
15153
-.hword 0x200
15154
-.hword 0x0
15155
-.word
15156
-.hword 0x200
15157
-.hword 0x0
15158
-.word
15159
-.hword 0x200
15160
-.hword 0x0
15161 15113
 
15162 15114
 .align 2
15163 15115
 ow_frames_535:
15164 15116
 .word ow_00000Tiles+(0*0x80)
15165 15117
 .hword 0x200
15166 15118
 .hword 0x0
15167
-.word
15168
-.hword 0x200
15169
-.hword 0x0
15170
-.word
15171
-.hword 0x200
15172
-.hword 0x0
15173
-.word
15174
-.hword 0x200
15175
-.hword 0x0
15176
-.word
15177
-.hword 0x200
15178
-.hword 0x0
15179
-.word
15180
-.hword 0x200
15181
-.hword 0x0
15182
-.word
15183
-.hword 0x200
15184
-.hword 0x0
15185
-.word
15186
-.hword 0x200
15187
-.hword 0x0
15188
-.word
15189
-.hword 0x200
15190
-.hword 0x0
15191 15119
 
15192 15120
 .align 2
15193 15121
 ow_frames_536:
15194 15122
 .word ow_00000Tiles+(0*0x80)
15195 15123
 .hword 0x200
15196 15124
 .hword 0x0
15197
-.word
15198
-.hword 0x200
15199
-.hword 0x0
15200
-.word
15201
-.hword 0x200
15202
-.hword 0x0
15203
-.word
15204
-.hword 0x200
15205
-.hword 0x0
15206
-.word
15207
-.hword 0x200
15208
-.hword 0x0
15209
-.word
15210
-.hword 0x200
15211
-.hword 0x0
15212
-.word
15213
-.hword 0x200
15214
-.hword 0x0
15215
-.word
15216
-.hword 0x200
15217
-.hword 0x0
15218
-.word
15219
-.hword 0x200
15220
-.hword 0x0
15221 15125
 
15222 15126
 .align 2
15223 15127
 ow_frames_537:
15224 15128
 .word ow_00000Tiles+(0*0x80)
15225 15129
 .hword 0x200
15226 15130
 .hword 0x0
15227
-.word
15228
-.hword 0x200
15229
-.hword 0x0
15230
-.word
15231
-.hword 0x200
15232
-.hword 0x0
15233
-.word
15234
-.hword 0x200
15235
-.hword 0x0
15236
-.word
15237
-.hword 0x200
15238
-.hword 0x0
15239
-.word
15240
-.hword 0x200
15241
-.hword 0x0
15242
-.word
15243
-.hword 0x200
15244
-.hword 0x0
15245
-.word
15246
-.hword 0x200
15247
-.hword 0x0
15248
-.word
15249
-.hword 0x200
15250
-.hword 0x0
15251 15131
 
15252 15132
 .align 2
15253 15133
 ow_frames_538:
15254 15134
 .word ow_00000Tiles+(0*0x80)
15255 15135
 .hword 0x200
15256 15136
 .hword 0x0
15257
-.word
15258
-.hword 0x200
15259
-.hword 0x0
15260
-.word
15261
-.hword 0x200
15262
-.hword 0x0
15263
-.word
15264
-.hword 0x200
15265
-.hword 0x0
15266
-.word
15267
-.hword 0x200
15268
-.hword 0x0
15269
-.word
15270
-.hword 0x200
15271
-.hword 0x0
15272
-.word
15273
-.hword 0x200
15274
-.hword 0x0
15275
-.word
15276
-.hword 0x200
15277
-.hword 0x0
15278
-.word
15279
-.hword 0x200
15280
-.hword 0x0
15281 15137
 
15282 15138
 .align 2
15283 15139
 ow_frames_539:
15284 15140
 .word ow_00000Tiles+(0*0x80)
15285 15141
 .hword 0x200
15286 15142
 .hword 0x0
15287
-.word
15288
-.hword 0x200
15143
+
15144
+.align 2
15145
+ow_frames_540:
15146
+.word ow_0539Tiles+(0*0x800)
15147
+.hword 0x800
15289 15148
 .hword 0x0
15290
-.word
15291
-.hword 0x200
15149
+.word ow_0539Tiles+(1*0x800)
15150
+.hword 0x800
15292 15151
 .hword 0x0
15293
-.word
15294
-.hword 0x200
15152
+.word ow_0539Tiles+(2*0x800)
15153
+.hword 0x800
15295 15154
 .hword 0x0
15296
-.word
15297
-.hword 0x200
15155
+.word ow_0539Tiles+(0*0x800)
15156
+.hword 0x800
15298 15157
 .hword 0x0
15299
-.word
15300
-.hword 0x200
15158
+.word ow_0539Tiles+(0*0x800)
15159
+.hword 0x800
15301 15160
 .hword 0x0
15302
-.word
15303
-.hword 0x200
15161
+.word ow_0539Tiles+(0*0x800)
15162
+.hword 0x800
15304 15163
 .hword 0x0
15305
-.word
15306
-.hword 0x200
15164
+.word ow_0539Tiles+(0*0x800)
15165
+.hword 0x800
15307 15166
 .hword 0x0
15308
-.word
15309
-.hword 0x200
15167
+.word ow_0539Tiles+(0*0x800)
15168
+.hword 0x800
15310 15169
 .hword 0x0
15311
-
15312
-.align 2
15313
-ow_frames_540:
15314
-.word ow_00000Tiles+(0*0x80)
15315
-.hword 0x80
15170
+.word ow_0539Tiles+(0*0x800)
15171
+.hword 0x800
15316 15172
 .hword 0x0
15317 15173
 
15318 15174
 .align 2

+ 35
- 26
data/text_lookup/text_multichoice.s View File

@@ -1,27 +1,36 @@
1
-.text
2
-.align 2
3
-
4
-.thumb
5
-
6
-.global multichoice_array
7
-multichoice_array:
8
-    .word smc_yes_no
9
-    .word 2
10
-
11
-    .word smc_difficulty
12
-    .word 3
13
-
14
-
15
-smc_yes_no:
16
-    .word str_yes
17
-    .word 0
18
-    .word str_no
19
-    .word 0
20
-
21
-smc_difficulty:
22
-    .word str_beginner
23
-    .word 0
24
-    .word str_intermediate
25
-    .word 0
26
-    .word str_expert
1
+.text
2
+.align 2
3
+
4
+.thumb
5
+
6
+.global multichoice_array
7
+multichoice_array:
8
+    .word smc_yes_no
9
+    .word 2
10
+
11
+    .word smc_difficulty
12
+    .word 3
13
+
14
+    .word smc_left_right
15
+    .word 2
16
+
17
+
18
+smc_yes_no:
19
+    .word str_yes
20
+    .word 0
21
+    .word str_no
22
+    .word 0
23
+
24
+smc_difficulty:
25
+    .word str_beginner
26
+    .word 0
27
+    .word str_intermediate
28
+    .word 0
29
+    .word str_expert
30
+    .word 0
31
+
32
+smc_left_right:
33
+    .word str_left
34
+    .word 0
35
+    .word str_right
27 36
     .word 0

+ 3
- 0
src/include/assets/interface/arrows.img.h View File

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

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

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

+ 11
- 5
string/de/text_multichoices.txt View File

@@ -1,5 +1,11 @@
1
-str_yes=Ja
2
-str_no=Nein
3
-str_beginner=Anfänger
4
-str_intermediate=Fortgeschritten
5
-str_expert=Experte
1
+str_yes=Ja
2
+
3
+str_no=Nein
4
+
5
+str_beginner=Anfänger
6
+
7
+str_intermediate=Fortgeschritten
8
+
9
+str_expert=Experte
10
+str_left=Links
11
+str_right=Rechts