Parcourir la source

Paar Fixes, wie OWs, Scripts etc.

DragonflySotS il y a 7 ans
Parent
révision
7873f31722

+ 1
- 1
data/overworld/overworld_data.s Voir le fichier

@@ -2754,7 +2754,7 @@ ow_data_poke_0088:
2754 2754
 
2755 2755
 .align 2
2756 2756
 ow_data_poke_0089:
2757
-.hword 0xFFFF, 0xC159, 0x1102, 0x200, 0x20, 0x20, 0x0, 0x0
2757
+.hword 0xFFFF, 0xC159, 0x1102, 0x800, 0x40, 0x40, 0x0, 0x0
2758 2758
 .word 0x83A3718, 0x83A37F0, 0x83A3368, ow_frames_poke_0089, 0x8231CFC
2759 2759
 
2760 2760
 .align 2

+ 18
- 18
data/overworld/overworld_frames.s Voir le fichier

@@ -10031,32 +10031,32 @@ ow_frames_poke_0088:
10031 10031
 
10032 10032
 .align 2 
10033 10033
 ow_frames_poke_0089:
10034
-.word ow_poke_0089Tiles+(0*0x200)
10035
-.hword 0x200
10034
+.word ow_poke_0089Tiles+(0*0x800)
10035
+.hword 0x800
10036 10036
 .hword 0x0
10037
-.word ow_poke_0089Tiles+(1*0x200)
10038
-.hword 0x200
10037
+.word ow_poke_0089Tiles+(1*0x800)
10038
+.hword 0x800
10039 10039
 .hword 0x0
10040
-.word ow_poke_0089Tiles+(2*0x200)
10041
-.hword 0x200
10040
+.word ow_poke_0089Tiles+(2*0x800)
10041
+.hword 0x800
10042 10042
 .hword 0x0
10043
-.word ow_poke_0089Tiles+(3*0x200)
10044
-.hword 0x200
10043
+.word ow_poke_0089Tiles+(3*0x800)
10044
+.hword 0x800
10045 10045
 .hword 0x0
10046
-.word ow_poke_0089Tiles+(4*0x200)
10047
-.hword 0x200
10046
+.word ow_poke_0089Tiles+(4*0x800)
10047
+.hword 0x800
10048 10048
 .hword 0x0
10049
-.word ow_poke_0089Tiles+(5*0x200)
10050
-.hword 0x200
10049
+.word ow_poke_0089Tiles+(5*0x800)
10050
+.hword 0x800
10051 10051
 .hword 0x0
10052
-.word ow_poke_0089Tiles+(6*0x200)
10053
-.hword 0x200
10052
+.word ow_poke_0089Tiles+(6*0x800)
10053
+.hword 0x800
10054 10054
 .hword 0x0
10055
-.word ow_poke_0089Tiles+(7*0x200)
10056
-.hword 0x200
10055
+.word ow_poke_0089Tiles+(7*0x800)
10056
+.hword 0x800
10057 10057
 .hword 0x0
10058
-.word ow_poke_0089Tiles+(8*0x200)
10059
-.hword 0x200
10058
+.word ow_poke_0089Tiles+(8*0x800)
10059
+.hword 0x800
10060 10060
 .hword 0x0
10061 10061
 
10062 10062
 .align 2 

+ 1
- 1
data/pkmn_tables/pokemon_stats.s Voir le fichier

@@ -3351,7 +3351,7 @@ pokemon_base_stats:
3351 3351
 .hword 0, 259
3352 3352
 .byte 127, 40, 70, 1, 14, 14, 0, 43, 0, 7, 0, 0
3353 3353
 
3354
-.byte 75, 110, 125, 85, 100, 105, 16, 1, 45, 270, 192, 0
3354
+.byte 75, 110, 125, 85, 100, 105, 16, 1, 45, 255, 192, 0
3355 3355
 .hword 259, 0
3356 3356
 .byte 127, 40, 70, 1, 14, 14, 0, 43, 0, 7, 0, 0
3357 3357
 

+ 105
- 102
data/trainer/trainer_pkmn_data.s Voir le fichier

@@ -1,120 +1,195 @@
1 1
 .align 2
2
+
2 3
 .text
4
+
3 5
 .thumb
4 6
 
5
-.align 2
6 7
 .global pokemon_von_id_1
8
+.global pokemon_von_id_2
9
+.global pokemon_von_id_3
10
+.global pokemon_von_id_4
11
+.global pokemon_von_id_5
12
+.global pokemon_von_id_6
13
+.global pokemon_von_id_7
14
+.global pokemon_von_id_8
15
+.global pokemon_von_id_9
16
+.global pokemon_von_id_10
17
+.global pokemon_von_id_11
18
+.global pokemon_von_id_12
19
+.global pokemon_von_id_13
20
+.global pokemon_von_id_14
21
+.global pokemon_von_id_15
22
+.global pokemon_von_id_16
23
+.global pokemon_von_id_17
24
+.global pokemon_von_id_18
25
+.global pokemon_von_id_19
26
+.global pokemon_von_id_20
27
+.global pokemon_von_id_21
28
+.global pokemon_von_id_22
29
+.global pokemon_von_id_23
30
+.global pokemon_von_id_24
31
+.global pokemon_von_id_25
32
+.global pokemon_von_id_26
33
+.global pokemon_von_id_27
34
+.global pokemon_von_id_28
35
+.global pokemon_von_id_29
36
+.global pokemon_von_id_30
37
+.global pokemon_von_id_31
38
+.global pokemon_von_id_32
39
+.global pokemon_von_id_33
40
+.global pokemon_von_id_34
41
+.global pokemon_von_id_35
42
+.global pokemon_von_id_36
43
+.global pokemon_von_id_37
44
+.global pokemon_von_id_38
45
+.global pokemon_von_id_39
46
+.global pokemon_von_id_40
47
+.global pokemon_von_id_41
48
+.global pokemon_von_id_42
49
+.global pokemon_von_id_43
50
+.global pokemon_von_id_44
51
+.global pokemon_von_id_45
52
+.global pokemon_von_id_46
53
+.global pokemon_von_id_47
54
+.global pokemon_von_id_48
55
+.global pokemon_von_id_49
56
+.global pokemon_von_id_50
57
+.global pokemon_von_id_51
58
+.global pokemon_von_id_52
59
+.global pokemon_von_id_53
60
+.global pokemon_von_id_54
61
+.global pokemon_von_id_55
62
+.global pokemon_von_id_56
63
+.global pokemon_von_id_57
64
+.global pokemon_von_id_58
65
+.global pokemon_von_id_59
66
+.global pokemon_von_id_60
67
+.global pokemon_von_id_61
68
+.global pokemon_von_id_62
69
+.global pokemon_von_id_63
70
+.global pokemon_von_id_64
71
+.global pokemon_von_id_65
72
+.global pokemon_von_id_66
73
+.global pokemon_von_id_67
74
+.global pokemon_von_id_68
75
+.global pokemon_von_id_69
76
+.global pokemon_von_id_70
77
+.global pokemon_von_id_71
78
+.global pokemon_von_id_72
79
+.global pokemon_von_id_73
80
+.global pokemon_von_id_74
81
+.global pokemon_von_id_75
82
+.global pokemon_von_id_76
83
+.global pokemon_von_id_77
84
+.global pokemon_von_id_78
85
+.global pokemon_von_id_79
86
+.global pokemon_von_id_80
87
+.global pokemon_von_id_81
88
+.global pokemon_von_id_82
89
+.global pokemon_von_id_83
90
+.global pokemon_von_id_84
91
+.global pokemon_von_id_85
92
+.global pokemon_von_id_86
93
+.global pokemon_von_id_87
94
+.global pokemon_von_id_88
95
+.global pokemon_von_id_89
96
+.global pokemon_von_id_90
97
+.global pokemon_von_id_91
98
+.global pokemon_von_id_92
99
+.global pokemon_von_id_93
100
+
101
+.align 2
7 102
 pokemon_von_id_1:
8 103
 .hword 0, 4, 895, 0
9 104
 
10 105
 .align 2
11
-.global pokemon_von_id_2
12 106
 pokemon_von_id_2:
13 107
 .hword 20, 5, 895, 0
14 108
 
15 109
 .align 2
16
-.global pokemon_von_id_3
17 110
 pokemon_von_id_3:
18 111
 .hword 50, 5, 895, 139
19 112
 
20 113
 .align 2
21
-.global pokemon_von_id_4
22 114
 pokemon_von_id_4:
23 115
 .hword 0, 4, 892, 0
24 116
 
25 117
 .align 2
26
-.global pokemon_von_id_5
27 118
 pokemon_von_id_5:
28 119
 .hword 20, 5, 892, 0
29 120
 
30 121
 .align 2
31
-.global pokemon_von_id_6
32 122
 pokemon_von_id_6:
33 123
 .hword 50, 5, 892, 139
34 124
 
35 125
 .align 2
36
-.global pokemon_von_id_7
37 126
 pokemon_von_id_7:
38 127
 .hword 0, 4, 895, 0
39 128
 
40 129
 .align 2
41
-.global pokemon_von_id_8
42 130
 pokemon_von_id_8:
43 131
 .hword 20, 5, 895, 0
44 132
 
45 133
 .align 2
46
-.global pokemon_von_id_9
47 134
 pokemon_von_id_9:
48 135
 .hword 50, 5, 895, 139
49 136
 
50 137
 .align 2
51
-.global pokemon_von_id_10
52 138
 pokemon_von_id_10:
53 139
 .hword 0, 4, 892, 0
54 140
 
55 141
 .align 2
56
-.global pokemon_von_id_11
57 142
 pokemon_von_id_11:
58 143
 .hword 20, 5, 892, 0
59 144
 
60 145
 .align 2
61
-.global pokemon_von_id_12
62 146
 pokemon_von_id_12:
63 147
 .hword 50, 5, 892, 139
64 148
 
65 149
 .align 2
66
-.global pokemon_von_id_13
67 150
 pokemon_von_id_13:
68 151
 .hword 0, 3, 789, 0
69 152
 
70 153
 .align 2
71
-.global pokemon_von_id_14
72 154
 pokemon_von_id_14:
73 155
 .hword 20, 3, 789, 0
74 156
 .hword 20, 4, 787, 0
75 157
 
76 158
 .align 2
77
-.global pokemon_von_id_15
78 159
 pokemon_von_id_15:
79 160
 .hword 50, 3, 789, 0
80 161
 .hword 50, 4, 787, 0
81 162
 
82 163
 .align 2
83
-.global pokemon_von_id_16
84 164
 pokemon_von_id_16:
85 165
 .hword 0, 4, 13, 0
86 166
 .hword 0, 5, 10, 0
87 167
 
88 168
 .align 2
89
-.global pokemon_von_id_17
90 169
 pokemon_von_id_17:
91 170
 .hword 20, 4, 13, 0
92 171
 .hword 20, 5, 10, 0
93 172
 .hword 20, 5, 290, 0
94 173
 
95 174
 .align 2
96
-.global pokemon_von_id_18
97 175
 pokemon_von_id_18:
98 176
 .hword 50, 4, 13, 0
99 177
 .hword 50, 5, 10, 0
100 178
 .hword 50, 5, 290, 0
101 179
 
102 180
 .align 2
103
-.global pokemon_von_id_19
104 181
 pokemon_von_id_19:
105 182
 .hword 0, 4, 46, 0
106 183
 .hword 0, 5, 795, 0
107 184
 .hword 0, 5, 291, 0
108 185
 
109 186
 .align 2
110
-.global pokemon_von_id_20
111 187
 pokemon_von_id_20:
112 188
 .hword 20, 4, 46, 0
113 189
 .hword 20, 5, 795, 0
114 190
 .hword 20, 5, 291, 0
115 191
 
116 192
 .align 2
117
-.global pokemon_von_id_21
118 193
 pokemon_von_id_21:
119 194
 .hword 50, 4, 46, 0
120 195
 .hword 50, 5, 795, 0
@@ -122,60 +197,50 @@ pokemon_von_id_21:
122 197
 .hword 50, 6, 293, 0
123 198
 
124 199
 .align 2
125
-.global pokemon_von_id_22
126 200
 pokemon_von_id_22:
127 201
 .hword 0, 5, 84, 0
128 202
 .hword 0, 5, 456, 0
129 203
 
130 204
 .align 2
131
-.global pokemon_von_id_23
132 205
 pokemon_von_id_23:
133 206
 .hword 20, 5, 84, 0
134 207
 .hword 20, 5, 456, 0
135 208
 
136 209
 .align 2
137
-.global pokemon_von_id_24
138 210
 pokemon_von_id_24:
139 211
 .hword 50, 5, 84, 0
140 212
 .hword 50, 5, 456, 0
141 213
 .hword 50, 6, 564, 0
142 214
 
143 215
 .align 2
144
-.global pokemon_von_id_25
145 216
 pokemon_von_id_25:
146 217
 .hword 0, 6, 566, 0
147 218
 
148 219
 .align 2
149
-.global pokemon_von_id_26
150 220
 pokemon_von_id_26:
151 221
 .hword 20, 6, 566, 0
152 222
 
153 223
 .align 2
154
-.global pokemon_von_id_27
155 224
 pokemon_von_id_27:
156 225
 .hword 50, 6, 566, 0
157 226
 .hword 50, 6, 568, 0
158 227
 
159 228
 .align 2
160
-.global pokemon_von_id_28
161 229
 pokemon_von_id_28:
162 230
 .hword 0, 5, 301, 0
163 231
 .hword 0, 6, 11, 0
164 232
 
165 233
 .align 2
166
-.global pokemon_von_id_29
167 234
 pokemon_von_id_29:
168 235
 .hword 20, 5, 301, 10, 106, 71, 0
169 236
 .hword 20, 6, 11, 10, 81, 106, 0
170 237
 
171 238
 .align 2
172
-.global pokemon_von_id_30
173 239
 pokemon_von_id_30:
174 240
 .hword 50, 5, 301, 10, 106, 71, 0
175 241
 .hword 50, 6, 11, 10, 81, 106, 0
176 242
 
177 243
 .align 2
178
-.global pokemon_von_id_31
179 244
 pokemon_von_id_31:
180 245
 .hword 0, 4, 165, 0
181 246
 .hword 0, 4, 14, 0
@@ -183,179 +248,150 @@ pokemon_von_id_31:
183 248
 .hword 0, 5, 293, 0
184 249
 
185 250
 .align 2
186
-.global pokemon_von_id_32
187 251
 pokemon_von_id_32:
188
-.hword 20, 4, 165, 0
189
-.hword 20, 4, 14, 0
190
-.hword 20, 5, 11, 0
191
-.hword 20, 5, 293, 0
252
+.hword 20, 4, 165, 33, 48, 0, 0
253
+.hword 20, 4, 14, 33, 81, 106, 0
254
+.hword 20, 5, 11, 33, 81, 106, 0
255
+.hword 20, 5, 293, 33, 81, 106, 0
192 256
 
193 257
 .align 2
194
-.global pokemon_von_id_33
195 258
 pokemon_von_id_33:
196
-.hword 50, 4, 165, 0
197
-.hword 50, 4, 14, 0
198
-.hword 50, 5, 11, 0
199
-.hword 50, 5, 293, 0
200
-.hword 50, 5, 291, 0
259
+.hword 50, 4, 165, 33, 48, 0, 0
260
+.hword 50, 4, 14, 33, 81, 106, 0
261
+.hword 50, 5, 11, 33, 81, 106, 0
262
+.hword 50, 5, 293, 33, 81, 106, 0
263
+.hword 50, 5, 291, 33, 81, 106, 0
201 264
 
202 265
 .align 2
203
-.global pokemon_von_id_34
204 266
 pokemon_von_id_34:
205 267
 .hword 0, 5, 109, 0
206 268
 .hword 0, 6, 506, 0
207 269
 
208 270
 .align 2
209
-.global pokemon_von_id_35
210 271
 pokemon_von_id_35:
211 272
 .hword 20, 5, 109, 0
212 273
 .hword 20, 6, 506, 0
213 274
 
214 275
 .align 2
215
-.global pokemon_von_id_36
216 276
 pokemon_von_id_36:
217 277
 .hword 50, 5, 109, 0
218 278
 .hword 50, 6, 506, 0
219 279
 
220 280
 .align 2
221
-.global pokemon_von_id_37
222 281
 pokemon_von_id_37:
223 282
 .hword 0, 5, 784, 0
224 283
 .hword 0, 6, 797, 0
225 284
 
226 285
 .align 2
227
-.global pokemon_von_id_38
228 286
 pokemon_von_id_38:
229 287
 .hword 20, 5, 784, 0
230 288
 .hword 20, 6, 797, 0
231 289
 
232 290
 .align 2
233
-.global pokemon_von_id_39
234 291
 pokemon_von_id_39:
235 292
 .hword 50, 5, 784, 0
236 293
 .hword 50, 6, 797, 0
237 294
 
238 295
 .align 2
239
-.global pokemon_von_id_40
240 296
 pokemon_von_id_40:
241 297
 .hword 0, 4, 459, 0
242 298
 .hword 0, 5, 306, 0
243 299
 .hword 0, 6, 452, 0
244 300
 
245 301
 .align 2
246
-.global pokemon_von_id_41
247 302
 pokemon_von_id_41:
248 303
 .hword 20, 4, 459, 0
249 304
 .hword 20, 5, 306, 0
250 305
 .hword 20, 6, 452, 0
251 306
 
252 307
 .align 2
253
-.global pokemon_von_id_42
254 308
 pokemon_von_id_42:
255 309
 .hword 50, 4, 459, 0
256 310
 .hword 50, 5, 306, 0
257 311
 .hword 50, 6, 452, 0
258 312
 
259 313
 .align 2
260
-.global pokemon_von_id_43
261 314
 pokemon_von_id_43:
262 315
 .hword 0, 7, 291, 0
263 316
 
264 317
 .align 2
265
-.global pokemon_von_id_44
266 318
 pokemon_von_id_44:
267 319
 .hword 20, 7, 291, 0
268 320
 
269 321
 .align 2
270
-.global pokemon_von_id_45
271 322
 pokemon_von_id_45:
272 323
 .hword 50, 8, 291, 0
273 324
 
274 325
 .align 2
275
-.global pokemon_von_id_46
276 326
 pokemon_von_id_46:
277 327
 .hword 0, 6, 167, 0
278 328
 .hword 0, 7, 386, 0
279 329
 
280 330
 .align 2
281
-.global pokemon_von_id_47
282 331
 pokemon_von_id_47:
283 332
 .hword 20, 6, 167, 0
284 333
 .hword 20, 7, 386, 0
285 334
 
286 335
 .align 2
287
-.global pokemon_von_id_48
288 336
 pokemon_von_id_48:
289 337
 .hword 50, 6, 167, 0
290 338
 .hword 50, 7, 386, 0
291 339
 
292 340
 .align 2
293
-.global pokemon_von_id_49
294 341
 pokemon_von_id_49:
295 342
 .hword 0, 6, 48, 0
296 343
 .hword 0, 7, 717, 0
297 344
 
298 345
 .align 2
299
-.global pokemon_von_id_50
300 346
 pokemon_von_id_50:
301 347
 .hword 20, 6, 48, 0
302 348
 .hword 20, 7, 717, 0
303 349
 
304 350
 .align 2
305
-.global pokemon_von_id_51
306 351
 pokemon_von_id_51:
307 352
 .hword 50, 6, 48, 0
308 353
 .hword 50, 7, 717, 0
309 354
 
310 355
 .align 2
311
-.global pokemon_von_id_52
312 356
 pokemon_von_id_52:
313 357
 .hword 0, 7, 293, 0
314 358
 
315 359
 .align 2
316
-.global pokemon_von_id_53
317 360
 pokemon_von_id_53:
318 361
 .hword 20, 7, 293, 0
319 362
 
320 363
 .align 2
321
-.global pokemon_von_id_54
322 364
 pokemon_von_id_54:
323 365
 .hword 50, 8, 293, 0
324 366
 
325 367
 .align 2
326
-.global pokemon_von_id_55
327 368
 pokemon_von_id_55:
328 369
 .hword 0, 5, 79, 0
329 370
 .hword 0, 6, 804, 0
330 371
 
331 372
 .align 2
332
-.global pokemon_von_id_56
333 373
 pokemon_von_id_56:
334 374
 .hword 20, 5, 79, 0
335 375
 .hword 20, 6, 804, 0
336 376
 
337 377
 .align 2
338
-.global pokemon_von_id_57
339 378
 pokemon_von_id_57:
340 379
 .hword 50, 5, 79, 0
341 380
 .hword 50, 6, 804, 0
342 381
 
343 382
 .align 2
344
-.global pokemon_von_id_58
345 383
 pokemon_von_id_58:
346 384
 .hword 0, 6, 512, 0
347 385
 .hword 0, 6, 765, 0
348 386
 .hword 60, 7, 220, 0
349 387
 
350 388
 .align 2
351
-.global pokemon_von_id_59
352 389
 pokemon_von_id_59:
353 390
 .hword 30, 7, 512, 0
354 391
 .hword 30, 7, 765, 0
355 392
 .hword 60, 8, 220, 0
356 393
 
357 394
 .align 2
358
-.global pokemon_von_id_60
359 395
 pokemon_von_id_60:
360 396
 .hword 60, 8, 512, 0
361 397
 .hword 60, 8, 765, 0
@@ -363,21 +399,18 @@ pokemon_von_id_60:
363 399
 .hword 60, 10, 215, 0
364 400
 
365 401
 .align 2
366
-.global pokemon_von_id_61
367 402
 pokemon_von_id_61:
368 403
 .hword 0, 7, 346, 0
369 404
 .hword 0, 7, 220, 0
370 405
 .hword 0, 8, 934, 0
371 406
 
372 407
 .align 2
373
-.global pokemon_von_id_62
374 408
 pokemon_von_id_62:
375 409
 .hword 30, 7, 346, 0
376 410
 .hword 30, 7, 220, 0
377 411
 .hword 30, 8, 934, 0
378 412
 
379 413
 .align 2
380
-.global pokemon_von_id_63
381 414
 pokemon_von_id_63:
382 415
 .hword 60, 8, 346, 0
383 416
 .hword 60, 8, 220, 0
@@ -385,21 +418,18 @@ pokemon_von_id_63:
385 418
 .hword 60, 9, 512, 0
386 419
 
387 420
 .align 2
388
-.global pokemon_von_id_64
389 421
 pokemon_von_id_64:
390 422
 .hword 0, 7, 341, 0
391 423
 .hword 0, 7, 635, 0
392 424
 .hword 0, 8, 936, 0
393 425
 
394 426
 .align 2
395
-.global pokemon_von_id_65
396 427
 pokemon_von_id_65:
397 428
 .hword 30, 7, 341, 0
398 429
 .hword 30, 7, 635, 0
399 430
 .hword 30, 8, 936, 0
400 431
 
401 432
 .align 2
402
-.global pokemon_von_id_66
403 433
 pokemon_von_id_66:
404 434
 .hword 60, 8, 341, 0
405 435
 .hword 60, 8, 635, 0
@@ -407,97 +437,82 @@ pokemon_von_id_66:
407 437
 .hword 60, 9, 215, 0
408 438
 
409 439
 .align 2
410
-.global pokemon_von_id_67
411 440
 pokemon_von_id_67:
412 441
 .hword 0, 9, 934, 0
413 442
 .hword 0, 10, 635, 0
414 443
 
415 444
 .align 2
416
-.global pokemon_von_id_68
417 445
 pokemon_von_id_68:
418 446
 .hword 30, 9, 934, 0
419 447
 .hword 30, 10, 635, 0
420 448
 
421 449
 .align 2
422
-.global pokemon_von_id_69
423 450
 pokemon_von_id_69:
424 451
 .hword 60, 9, 934, 0
425 452
 .hword 60, 10, 635, 0
426 453
 .hword 60, 10, 512, 0
427 454
 
428 455
 .align 2
429
-.global pokemon_von_id_70
430 456
 pokemon_von_id_70:
431 457
 .hword 0, 9, 936, 0
432 458
 .hword 0, 10, 765, 0
433 459
 
434 460
 .align 2
435
-.global pokemon_von_id_71
436 461
 pokemon_von_id_71:
437 462
 .hword 30, 9, 936, 0
438 463
 .hword 30, 10, 765, 0
439 464
 
440 465
 .align 2
441
-.global pokemon_von_id_72
442 466
 pokemon_von_id_72:
443 467
 .hword 60, 9, 936, 0
444 468
 .hword 60, 10, 765, 0
445 469
 .hword 60, 10, 215, 0
446 470
 
447 471
 .align 2
448
-.global pokemon_von_id_73
449 472
 pokemon_von_id_73:
450 473
 .hword 0, 10, 346, 0
451 474
 .hword 0, 10, 341, 0
452 475
 
453 476
 .align 2
454
-.global pokemon_von_id_74
455 477
 pokemon_von_id_74:
456 478
 .hword 30, 10, 346, 0
457 479
 .hword 30, 10, 341, 0
458 480
 
459 481
 .align 2
460
-.global pokemon_von_id_75
461 482
 pokemon_von_id_75:
462 483
 .hword 60, 10, 346, 0
463 484
 .hword 60, 10, 341, 0
464 485
 .hword 60, 11, 934, 0
465 486
 
466 487
 .align 2
467
-.global pokemon_von_id_76
468 488
 pokemon_von_id_76:
469 489
 .hword 0, 10, 86, 0
470 490
 .hword 0, 11, 666, 0
471 491
 
472 492
 .align 2
473
-.global pokemon_von_id_77
474 493
 pokemon_von_id_77:
475 494
 .hword 30, 10, 86, 0
476 495
 .hword 30, 11, 666, 0
477 496
 
478 497
 .align 2
479
-.global pokemon_von_id_78
480 498
 pokemon_von_id_78:
481 499
 .hword 60, 10, 86, 0
482 500
 .hword 60, 11, 666, 0
483 501
 .hword 60, 11, 936, 0
484 502
 
485 503
 .align 2
486
-.global pokemon_von_id_79
487 504
 pokemon_von_id_79:
488 505
 .hword 0, 9, 220, 0
489 506
 .hword 0, 10, 792, 0
490 507
 .hword 0, 10, 512, 0
491 508
 
492 509
 .align 2
493
-.global pokemon_von_id_80
494 510
 pokemon_von_id_80:
495 511
 .hword 30, 9, 220, 0
496 512
 .hword 30, 10, 792, 0
497 513
 .hword 30, 10, 512, 0
498 514
 
499 515
 .align 2
500
-.global pokemon_von_id_81
501 516
 pokemon_von_id_81:
502 517
 .hword 60, 9, 220, 0
503 518
 .hword 60, 10, 792, 0
@@ -505,21 +520,18 @@ pokemon_von_id_81:
505 520
 .hword 60, 11, 635, 0
506 521
 
507 522
 .align 2
508
-.global pokemon_von_id_82
509 523
 pokemon_von_id_82:
510 524
 .hword 0, 9, 238, 0
511 525
 .hword 0, 10, 936, 0
512 526
 .hword 0, 10, 346, 0
513 527
 
514 528
 .align 2
515
-.global pokemon_von_id_83
516 529
 pokemon_von_id_83:
517 530
 .hword 30, 9, 238, 0
518 531
 .hword 30, 10, 936, 0
519 532
 .hword 30, 10, 346, 0
520 533
 
521 534
 .align 2
522
-.global pokemon_von_id_84
523 535
 pokemon_von_id_84:
524 536
 .hword 60, 9, 238, 0
525 537
 .hword 60, 10, 936, 0
@@ -527,7 +539,6 @@ pokemon_von_id_84:
527 539
 .hword 60, 11, 666, 0
528 540
 
529 541
 .align 2
530
-.global pokemon_von_id_85
531 542
 pokemon_von_id_85:
532 543
 .hword 30, 10, 225, 0
533 544
 .hword 30, 11, 220, 0
@@ -536,7 +547,6 @@ pokemon_von_id_85:
536 547
 .hword 30, 14, 385, 0
537 548
 
538 549
 .align 2
539
-.global pokemon_von_id_86
540 550
 pokemon_von_id_86:
541 551
 .hword 60, 10, 225, 0
542 552
 .hword 60, 11, 220, 0
@@ -545,7 +555,6 @@ pokemon_von_id_86:
545 555
 .hword 60, 14, 385, 0
546 556
 
547 557
 .align 2
548
-.global pokemon_von_id_87
549 558
 pokemon_von_id_87:
550 559
 .hword 100, 11, 225, 258, 217, 420, 252
551 560
 .hword 100, 12, 220, 258, 189, 246, 333
@@ -555,38 +564,32 @@ pokemon_von_id_87:
555 564
 .hword 100, 15, 91, 258, 182, 41, 350
556 565
 
557 566
 .align 2
558
-.global pokemon_von_id_88
559 567
 pokemon_von_id_88:
560 568
 .hword 0, 10, 635, 0
561 569
 .hword 0, 11, 341, 0
562 570
 
563 571
 .align 2
564
-.global pokemon_von_id_89
565 572
 pokemon_von_id_89:
566 573
 .hword 30, 10, 635, 0
567 574
 .hword 30, 11, 341, 0
568 575
 
569 576
 .align 2
570
-.global pokemon_von_id_90
571 577
 pokemon_von_id_90:
572 578
 .hword 60, 10, 635, 0
573 579
 .hword 60, 11, 341, 0
574 580
 .hword 60, 11, 751, 0
575 581
 
576 582
 .align 2
577
-.global pokemon_von_id_91
578 583
 pokemon_von_id_91:
579 584
 .hword 0, 10, 220, 0
580 585
 .hword 0, 11, 238, 0
581 586
 
582 587
 .align 2
583
-.global pokemon_von_id_92
584 588
 pokemon_von_id_92:
585 589
 .hword 30, 10, 220, 0
586 590
 .hword 30, 11, 238, 0
587 591
 
588 592
 .align 2
589
-.global pokemon_von_id_93
590 593
 pokemon_von_id_93:
591 594
 .hword 60, 10, 220, 0
592 595
 .hword 60, 11, 238, 0

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit 6c9c96e663aaaca5f1602d7bcf3442e0f42fbe76
1
+Subproject commit 24dcc0d5ff2d694b7e8a2d252ca79005c2d5924f

+ 1810
- 0
src/include/script_constant.h
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier


+ 11
- 1
src/include/script_language.h Voir le fichier

@@ -5,6 +5,7 @@
5 5
 #include <applymovements.h>
6 6
 #include <mugssprites.h>
7 7
 #include <battlescreen.h>
8
+#include <script_constant.h>
8 9
 
9 10
 @@ Costum Specials
10 11
 .equ SP_BATCHMAPTILE, 0x7
@@ -64,7 +65,7 @@
64 65
 
65 66
 @@ Custom commands
66 67
 
67
-.macro batchmaptile batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
68
+.macro batchmaptilefromto batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
68 69
 setvar 0x8000 \batchmaptile_tiles_from
69 70
 setvar 0x8001 \batchmaptile_tiles_to
70 71
 setvar 0x8002 \batchmaptile_kollision_from
@@ -73,6 +74,15 @@ setvar 0x5006 SP_BATCHMAPTILE
73 74
 special 0x68
74 75
 .endm
75 76
 
77
+.macro batchmaptiletofrom batchmaptile_tiles_from:req batchmaptile_tiles_to:req batchmaptile_kollision_from:req batchmaptile_kollision_to:req
78
+setvar 0x8001 \batchmaptile_tiles_from
79
+setvar 0x8002 \batchmaptile_tiles_to
80
+setvar 0x8003 \batchmaptile_kollision_from
81
+setvar 0x8002 \batchmaptile_kollision_to
82
+setvar 0x5006 SP_BATCHMAPTILE
83
+special 0x68
84
+.endm
85
+
76 86
 .macro sethiddenflags
77 87
 call sethiddenflagsall
78 88
 .endm

+ 372
- 372
string/de/trainers/trainer_data.txt
Fichier diff supprimé car celui-ci est trop grand
Voir le fichier