Browse Source

Struktur Update, Fix Bugs

DragonflySotS 7 years ago
parent
commit
d1b0959ac7
3 changed files with 405 additions and 562 deletions
  1. 210
    275
      data/overworld/wild_pokemon_data.s
  2. 194
    286
      data/trainer/trainer_pkmn_data.s
  3. 1
    1
      sots-private

+ 210
- 275
data/overworld/wild_pokemon_data.s
File diff suppressed because it is too large
View File


+ 194
- 286
data/trainer/trainer_pkmn_data.s View File

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

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit efdb02e8e952551a1580cc4cd42bae44ba88e344
1
+Subproject commit 6c9c96e663aaaca5f1602d7bcf3442e0f42fbe76