Browse Source

new trainer

dragonfly 7 years ago
parent
commit
a25d40b236
2 changed files with 85 additions and 16 deletions
  1. 29
    14
      data/trainer/trainer_pkmn_data.s
  2. 56
    2
      string/de/trainers/trainer_data.txt

+ 29
- 14
data/trainer/trainer_pkmn_data.s View File

@@ -3,10 +3,6 @@
3 3
 .thumb
4 4
 
5 5
 .align 2
6
-.global trainer_pokemon_data
7
-trainer_pokemon_data:
8
-
9
-.align 2
10 6
 .global pokemon_von_id_1
11 7
 pokemon_von_id_1:
12 8
 .hword 0, 5, 895, 0
@@ -347,42 +343,61 @@ pokemon_von_id_57:
347 343
 .align 2
348 344
 .global pokemon_von_id_58
349 345
 pokemon_von_id_58:
346
+.hword 0, 9, 512, 0
347
+.hword 0, 10, 765, 0
348
+
349
+.align 2
350
+.global pokemon_von_id_59
351
+pokemon_von_id_59:
352
+.hword 30, 9, 512, 0
353
+.hword 30, 10, 765, 0
354
+
355
+.align 2
356
+.global pokemon_von_id_60
357
+pokemon_von_id_60:
358
+.hword 60, 9, 512, 0
359
+.hword 60, 10, 765, 0
360
+.hword 60, 10, 220, 0
361
+
362
+.align 2
363
+.global pokemon_von_id_61
364
+pokemon_von_id_61:
350 365
 .hword 0, 9, 346, 0
351 366
 .hword 0, 10, 220, 0
352 367
 .hword 0, 10, 934, 0
353 368
 
354 369
 .align 2
355
-.global pokemon_von_id_59
356
-pokemon_von_id_59:
370
+.global pokemon_von_id_62
371
+pokemon_von_id_62:
357 372
 .hword 30, 9, 346, 0
358 373
 .hword 30, 10, 220, 0
359 374
 .hword 30, 10, 934, 0
360 375
 
361 376
 .align 2
362
-.global pokemon_von_id_60
363
-pokemon_von_id_60:
377
+.global pokemon_von_id_63
378
+pokemon_von_id_63:
364 379
 .hword 60, 9, 346, 0
365 380
 .hword 60, 10, 220, 0
366 381
 .hword 60, 10, 934, 0
367 382
 .hword 60, 11, 512, 0
368 383
 
369 384
 .align 2
370
-.global pokemon_von_id_61
371
-pokemon_von_id_61:
385
+.global pokemon_von_id_64
386
+pokemon_von_id_64:
372 387
 .hword 0, 9, 341, 0
373 388
 .hword 0, 10, 635, 0
374 389
 .hword 0, 10, 936, 0
375 390
 
376 391
 .align 2
377
-.global pokemon_von_id_62
378
-pokemon_von_id_62:
392
+.global pokemon_von_id_65
393
+pokemon_von_id_65:
379 394
 .hword 30, 9, 341, 0
380 395
 .hword 30, 10, 635, 0
381 396
 .hword 30, 10, 936, 0
382 397
 
383 398
 .align 2
384
-.global pokemon_von_id_63
385
-pokemon_von_id_63:
399
+.global pokemon_von_id_66
400
+pokemon_von_id_66:
386 401
 .hword 60, 9, 341, 0
387 402
 .hword 60, 10, 635, 0
388 403
 .hword 60, 10, 936, 0

+ 56
- 2
string/de/trainers/trainer_data.txt View File

@@ -1,4 +1,4 @@
1
-@string_len=12
1
+@string_len=12
2 2
 
3 3
 @byte 0, 0, 0, 0
4 4
 str_trainer_name_0=          
@@ -346,4 +346,58 @@ str_trainer_name_56=Klaus
346 346
 str_trainer_name_57=Klaus
347 347
 @hword 0, 0, 0, 0
348 348
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
349
-@word pokemon_von_id_57
349
+@word pokemon_von_id_57
350
+
351
+@byte 0, 0, 0, 131
352
+str_trainer_name_58=Rüpel
353
+@hword 0, 0, 0, 0
354
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
355
+@word pokemon_von_id_58
356
+
357
+@byte 0, 0, 0, 131
358
+str_trainer_name_59=Rüpel
359
+@hword 0, 0, 0, 0
360
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
361
+@word pokemon_von_id_59
362
+
363
+@byte 0, 0, 0, 131
364
+str_trainer_name_60=Rüpel
365
+@hword 0, 0, 0, 0
366
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
367
+@word pokemon_von_id_60
368
+
369
+@byte 0, 0, 0, 131
370
+str_trainer_name_61=Rüpel
371
+@hword 0, 0, 0, 0
372
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
373
+@word pokemon_von_id_61
374
+
375
+@byte 0, 0, 0, 131
376
+str_trainer_name_62=Rüpel
377
+@hword 0, 0, 0, 0
378
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
379
+@word pokemon_von_id_62
380
+
381
+@byte 0, 0, 0, 131
382
+str_trainer_name_63=Rüpel
383
+@hword 0, 0, 0, 0
384
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
385
+@word pokemon_von_id_63
386
+
387
+@byte 0, 0, 128, 132
388
+str_trainer_name_64=Rüpel
389
+@hword 0, 0, 0, 0
390
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
391
+@word pokemon_von_id_64
392
+
393
+@byte 0, 0, 128, 132
394
+str_trainer_name_65=Rüpel
395
+@hword 0, 0, 0, 0
396
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
397
+@word pokemon_von_id_65
398
+
399
+@byte 0, 0, 128, 132
400
+str_trainer_name_66=Rüpel
401
+@hword 0, 0, 0, 0
402
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
403
+@word pokemon_von_id_66