Browse Source

sots-privat: Overworlds sortiert, aber 4. Table noch nicht hinzugefügt, Sbird kümmert sich drum, make baut daher noch nicht, bitte gedulden. Zusätzlich Trainerdaten sowie Wilde Pokémon Daten gefixt, aber noch nicht getestet

DragonflySotS 7 years ago
parent
commit
72197d5538

+ 1
- 1
battle_engine

@@ -1 +1 @@
1
-Subproject commit 4a4fb7ac2ac3def1d4270796bdd2c04e8231d382
1
+Subproject commit a201b518834f0208efdb82ac95b08675f5279950

+ 5226
- 3178
data/overworld/overworld_data.s
File diff suppressed because it is too large
View File


+ 7755
- 7426
data/overworld/overworld_frames.s
File diff suppressed because it is too large
View File


+ 1042
- 530
data/overworld/overworld_pal_table.s
File diff suppressed because it is too large
View File


+ 1033
- 769
data/overworld/overworld_tables.s
File diff suppressed because it is too large
View File


+ 21
- 21
data/overworld/wild_pokemon_data.s View File

@@ -9,47 +9,47 @@ wild_pokemon_data:
9 9
 .word 0x0, water_data_1, 0x0, fishing_data_1
10 10
 .byte 0x1, 0x0, 0x0, 0x0
11 11
 .word grass_data_2, water_data_2, 0x0, fishing_data_2
12
-.byte 0x1, 0x2, 0x0, 0x0
12
+.byte 0x1, 0x1, 0x0, 0x0
13 13
 .word grass_data_3, water_data_3, 0x0, fishing_data_3
14
-.byte 0x1, 0x4, 0x0, 0x0
14
+.byte 0x1, 0x2, 0x0, 0x0
15 15
 .word grass_data_4, water_data_4, 0x0, fishing_data_4
16
-.byte 0x4, 0x1, 0x0, 0x0
16
+.byte 0x1, 0x4, 0x0, 0x0
17 17
 .word grass_data_5, water_data_5, 0x0, fishing_data_5
18
-.byte 0x4, 0x2, 0x0, 0x0
18
+.byte 0x4, 0x1, 0x0, 0x0
19 19
 .word grass_data_6, water_data_6, 0x0, fishing_data_6
20
-.byte 0x4, 0x3, 0x0, 0x0
20
+.byte 0x4, 0x2, 0x0, 0x0
21 21
 .word 0x0, water_data_7, 0x0, fishing_data_7
22
-.byte 0x4, 0x4, 0x0, 0x0
22
+.byte 0x4, 0x3, 0x0, 0x0
23 23
 .word grass_data_8, water_data_8, 0x0, fishing_data_8
24
-.byte 0x4, 0x5, 0x0, 0x0
24
+.byte 0x4, 0x4, 0x0, 0x0
25 25
 .word grass_data_9, 0x0, 0x0, 0x0
26
-.byte 0x4, 0x6, 0x0, 0x0
26
+.byte 0x4, 0x5, 0x0, 0x0
27 27
 .word 0x0, water_data_10, 0x0, fishing_data_10
28
-.byte 0x4, 0x7, 0x0, 0x0
28
+.byte 0x4, 0x6, 0x0, 0x0
29 29
 .word grass_data_11, water_data_11, 0x0, fishing_data_11
30
-.byte 0x4, 0x10, 0x0, 0x0
30
+.byte 0x4, 0x7, 0x0, 0x0
31 31
 .word grass_data_12, 0x0, 0x0, 0x0
32
-.byte 0x4, 0x11, 0x0, 0x0
32
+.byte 0x4, 0x8, 0x0, 0x0
33 33
 .word grass_data_13, water_data_13, 0x0, fishing_data_13
34
-.byte 0x6, 0x0, 0x0, 0x0
34
+.byte 0x4, 0x9, 0x0, 0x0
35 35
 .word grass_data_14, water_data_14, 0x0, fishing_data_14
36
-.byte 0x6, 0x1, 0x0, 0x0
36
+.byte 0x4, 0xE, 0x0, 0x0
37 37
 .word grass_data_15, 0x0, 0x0, 0x0
38
-.byte 0x6, 0x2, 0x0, 0x0
38
+.byte 0x4, 0xF, 0x0, 0x0
39 39
 .word grass_data_16, 0x0, 0x0, 0x0
40
-.byte 0x6, 0x3, 0x0, 0x0
40
+.byte 0x4, 0x10, 0x0, 0x0
41 41
 .word grass_data_17, water_data_17, 0x0, fishing_data_17
42
-.byte 0x6, 0x4, 0x0, 0x0
42
+.byte 0x4, 0x11, 0x0, 0x0
43 43
 .word grass_data_18, 0x0, 0x0, 0x0
44
-.byte 0x4, 0x8, 0x0, 0x0
44
+.byte 0x6, 0x0, 0x0, 0x0
45 45
 .word grass_data_19, 0x0, 0x0, 0x0
46
-.byte 0x4, 0x9, 0x0, 0x0
46
+.byte 0x6, 0x1, 0x0, 0x0
47 47
 .word grass_data_20, 0x0, 0x0, 0x0
48
-.byte 0x4, 0xE, 0x0, 0x0
48
+.byte 0x6, 0x2, 0x0, 0x0
49 49
 .word grass_data_21, 0x0, 0x0, 0x0
50
-.byte 0x4, 0xF, 0x0, 0x0
50
+.byte 0x6, 0x3, 0x0, 0x0
51 51
 .word grass_data_22, 0x0, 0x0, 0x0
52
-.byte 0x1, 0x1, 0x0, 0x0
52
+.byte 0x6, 0x4, 0x0, 0x0
53 53
 .word grass_data_23, 0x0, 0x0, 0x0
54 54
 .byte 0x6, 0x5, 0x0, 0x0
55 55
 .word grass_data_24, 0x0, 0x0, 0x0

+ 4
- 4
data/pkmn_tables/pokemon_moveset_table.s View File

@@ -31208,9 +31208,9 @@ moveset_891:
31208 31208
 
31209 31209
 .align 2
31210 31210
 moveset_892:
31211
-.hword 0x15A 
31211
+.hword 0x2B
31212 31212
 .byte 0x1
31213
-.hword 0x10E 
31213
+.hword 0x23
31214 31214
 .byte 0x1
31215 31215
 .hword 0x95 
31216 31216
 .byte 0x5
@@ -31337,9 +31337,9 @@ moveset_894:
31337 31337
 
31338 31338
 .align 2
31339 31339
 moveset_895:
31340
-.hword 0xB6 
31340
+.hword 0x2D
31341 31341
 .byte 0x1
31342
-.hword 0x10E 
31342
+.hword 0x21
31343 31343
 .byte 0x1
31344 31344
 .hword 0x95 
31345 31345
 .byte 0x5

+ 130
- 0
data/trainer/trainer_pkmn_data.s View File

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

+ 1
- 1
sots-private

@@ -1 +1 @@
1
-Subproject commit d4558f3477b4d6bf47fb733a18f6f1af8933b513
1
+Subproject commit deea4a395ec7adf578c06a49929c8fabcc642b58

+ 397
- 349
string/de/trainers/trainer_data.txt
File diff suppressed because it is too large
View File