SBird1337 7 anos atrás
pai
commit
14b1c0199e

BIN
assets/mug/mug_09.PNG Ver arquivo


+ 149
- 1
data/trainer/trainer_pkmn_data.s Ver arquivo

@@ -401,4 +401,152 @@ pokemon_von_id_66:
401 401
 .hword 60, 9, 341, 0
402 402
 .hword 60, 10, 635, 0
403 403
 .hword 60, 10, 936, 0
404
-.hword 60, 11, 215, 0
404
+.hword 60, 11, 215, 0
405
+
406
+.align 2
407
+.global pokemon_von_id_67
408
+pokemon_von_id_67:
409
+.hword 0, 12, 934, 0
410
+.hword 0, 12, 635, 0
411
+
412
+.align 2
413
+.global pokemon_von_id_68
414
+pokemon_von_id_68:
415
+.hword 30, 12, 934, 0
416
+.hword 30, 12, 635, 0
417
+
418
+.align 2
419
+.global pokemon_von_id_69
420
+pokemon_von_id_69:
421
+.hword 60, 12, 934, 0
422
+.hword 60, 12, 635, 0
423
+.hword 60, 13, 512, 0
424
+
425
+.align 2
426
+.global pokemon_von_id_70
427
+pokemon_von_id_70:
428
+.hword 0, 12, 936, 0
429
+.hword 0, 12, 765, 0
430
+
431
+.align 2
432
+.global pokemon_von_id_71
433
+pokemon_von_id_71:
434
+.hword 30, 12, 936, 0
435
+.hword 30, 12, 765, 0
436
+
437
+.align 2
438
+.global pokemon_von_id_72
439
+pokemon_von_id_72:
440
+.hword 60, 12, 936, 0
441
+.hword 60, 12, 765, 0
442
+.hword 60, 13, 215, 0
443
+
444
+.align 2
445
+.global pokemon_von_id_73
446
+pokemon_von_id_73:
447
+.hword 0, 13, 346, 0
448
+.hword 0, 14, 341, 0
449
+
450
+.align 2
451
+.global pokemon_von_id_74
452
+pokemon_von_id_74:
453
+.hword 30, 13, 346, 0
454
+.hword 30, 14, 341, 0
455
+
456
+.align 2
457
+.global pokemon_von_id_75
458
+pokemon_von_id_75:
459
+.hword 60, 13, 346, 0
460
+.hword 60, 14, 341, 0
461
+.hword 60, 14, 934, 0
462
+
463
+.align 2
464
+.global pokemon_von_id_76
465
+pokemon_von_id_76:
466
+.hword 0, 13, 86, 0
467
+.hword 0, 14, 666, 0
468
+
469
+.align 2
470
+.global pokemon_von_id_77
471
+pokemon_von_id_77:
472
+.hword 30, 13, 86, 0
473
+.hword 30, 14, 666, 0
474
+
475
+.align 2
476
+.global pokemon_von_id_78
477
+pokemon_von_id_78:
478
+.hword 60, 13, 86, 0
479
+.hword 60, 14, 666, 0
480
+.hword 60, 14, 936, 0
481
+
482
+.align 2
483
+.global pokemon_von_id_79
484
+pokemon_von_id_79:
485
+.hword 0, 13, 220, 0
486
+.hword 0, 14, 792, 0
487
+.hword 0, 14, 512, 0
488
+
489
+.align 2
490
+.global pokemon_von_id_80
491
+pokemon_von_id_80:
492
+.hword 30, 13, 220, 0
493
+.hword 30, 14, 792, 0
494
+.hword 30, 14, 512, 0
495
+
496
+.align 2
497
+.global pokemon_von_id_81
498
+pokemon_von_id_81:
499
+.hword 60, 13, 220, 0
500
+.hword 60, 14, 792, 0
501
+.hword 60, 14, 512, 0
502
+.hword 60, 15, 635, 0
503
+
504
+.align 2
505
+.global pokemon_von_id_82
506
+pokemon_von_id_82:
507
+.hword 0, 13, 238, 0
508
+.hword 0, 14, 936, 0
509
+.hword 0, 14, 346, 0
510
+
511
+.align 2
512
+.global pokemon_von_id_83
513
+pokemon_von_id_83:
514
+.hword 30, 13, 238, 0
515
+.hword 30, 14, 936, 0
516
+.hword 30, 14, 346, 0
517
+
518
+.align 2
519
+.global pokemon_von_id_84
520
+pokemon_von_id_84:
521
+.hword 60, 13, 238, 0
522
+.hword 60, 14, 936, 0
523
+.hword 60, 14, 346, 0
524
+.hword 60, 15, 666, 0
525
+
526
+.align 2
527
+.global pokemon_von_id_85
528
+pokemon_von_id_85:
529
+.hword 30, 14, 225, 0
530
+.hword 30, 14, 220, 0
531
+.hword 30, 15, 934, 0
532
+.hword 30, 15, 936, 0
533
+.hword 30, 15, 385, 0
534
+
535
+.align 2
536
+.global pokemon_von_id_86
537
+pokemon_von_id_86:
538
+.hword 60, 14, 225, 0
539
+.hword 60, 14, 220, 0
540
+.hword 60, 15, 934, 0
541
+.hword 60, 15, 936, 0
542
+.hword 60, 15, 385, 0
543
+
544
+.align 2
545
+.global pokemon_von_id_87
546
+pokemon_von_id_87:
547
+.hword 100, 14, 225, 258, 217, 420, 252
548
+.hword 100, 14, 220, 258, 189, 246, 333
549
+.hword 100, 15, 934, 258, 301, 174, 232
550
+.hword 100, 15, 936, 258, 204, 50, 109
551
+.hword 100, 15, 385, 258, 181, 52, 55
552
+.hword 100, 16, 91, 258, 182, 41, 350

+ 2
- 0
src/interface/mugshot_table.s Ver arquivo

@@ -30,6 +30,8 @@ mugshot_table_int:
30 30
 .word mug_08Tiles
31 31
 .word mug_08Pal
32 32
 
33
+.word mug_09Tiles
34
+.word mug_09Pal
33 35
 
34 36
 .global mugshots
35 37
 mugshots:

+ 127
- 1
string/de/trainers/trainer_data.txt Ver arquivo

@@ -400,4 +400,130 @@ str_trainer_name_65=Rüpel
400 400
 str_trainer_name_66=Rüpel
401 401
 @hword 0, 0, 0, 0
402 402
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
403
-@word pokemon_von_id_66
403
+@word pokemon_von_id_66
404
+
405
+@byte 0, 0, 0, 131
406
+str_trainer_name_67=Rüpel
407
+@hword0, 0, 0, 0
408
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
409
+@word pokemon_von_id_67
410
+
411
+@byte 0, 0, 0, 131
412
+str_trainer_name_68=Rüpel
413
+@hword0, 0, 0, 0
414
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
415
+@word pokemon_von_id_68
416
+
417
+@byte 0, 0, 0, 131
418
+str_trainer_name_69=Rüpel
419
+@hword0, 0, 0, 0
420
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
421
+@word pokemon_von_id_69
422
+
423
+@byte 0, 0, 128, 132
424
+str_trainer_name_70=Rüpel
425
+@hword0, 0, 0, 0
426
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
427
+@word pokemon_von_id_70
428
+
429
+@byte 0, 0, 128, 132
430
+str_trainer_name_71=Rüpel
431
+@hword0, 0, 0, 0
432
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
433
+@word pokemon_von_id_71
434
+
435
+@byte 0, 0, 128, 132
436
+str_trainer_name_72=Rüpel
437
+@hword0, 0, 0, 0
438
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
439
+@word pokemon_von_id_72
440
+
441
+@byte 0, 0, 0, 131
442
+str_trainer_name_73=Rüpel
443
+@hword0, 0, 0, 0
444
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
445
+@word pokemon_von_id_73
446
+
447
+@byte 0, 0, 0, 131
448
+str_trainer_name_74=Rüpel
449
+@hword0, 0, 0, 0
450
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
451
+@word pokemon_von_id_74
452
+
453
+@byte 0, 0, 0, 131
454
+str_trainer_name_75=Rüpel
455
+@hword0, 0, 0, 0
456
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
457
+@word pokemon_von_id_75
458
+
459
+@byte 0, 0, 128, 132
460
+str_trainer_name_76=Rüpel
461
+@hword0, 0, 0, 0
462
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
463
+@word pokemon_von_id_76
464
+
465
+@byte 0, 0, 128, 132
466
+str_trainer_name_77=Rüpel
467
+@hword0, 0, 0, 0
468
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
469
+@word pokemon_von_id_77
470
+
471
+@byte 0, 0, 128, 132
472
+str_trainer_name_78=Rüpel
473
+@hword0, 0, 0, 0
474
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
475
+@word pokemon_von_id_78
476
+
477
+@byte 0, 0, 0, 131
478
+str_trainer_name_79=Rüpel
479
+@hword0, 0, 0, 0
480
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
481
+@word pokemon_von_id_79
482
+
483
+@byte 0, 0, 0, 131
484
+str_trainer_name_80=Rüpel
485
+@hword0, 0, 0, 0
486
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
487
+@word pokemon_von_id_80
488
+
489
+@byte 0, 0, 0, 131
490
+str_trainer_name_81=Rüpel
491
+@hword0, 0, 0, 0
492
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
493
+@word pokemon_von_id_81
494
+
495
+@byte 0, 0, 128, 132
496
+str_trainer_name_82=Rüpel
497
+@hword0, 0, 0, 0
498
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
499
+@word pokemon_von_id_82
500
+
501
+@byte 0, 0, 128, 132
502
+str_trainer_name_83=Rüpel
503
+@hword0, 0, 0, 0
504
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
505
+@word pokemon_von_id_83
506
+
507
+@byte 0, 0, 128, 132
508
+str_trainer_name_84=Rüpel
509
+@hword0, 0, 0, 0
510
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
511
+@word pokemon_von_id_84
512
+
513
+@byte 0, 112, 0, 133
514
+str_trainer_name_85=Markus
515
+@hword0, 0, 0, 0
516
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0
517
+@word pokemon_von_id_85
518
+
519
+@byte 0, 112, 0, 133
520
+str_trainer_name_86=Markus
521
+@hword13, 0, 0, 0
522
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 5, 0, 0, 0
523
+@word pokemon_von_id_86
524
+
525
+@byte 1, 112, 0, 133
526
+str_trainer_name_87=Markus
527
+@hword13, 13, 0, 0
528
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 6, 0, 0, 0
529
+@word pokemon_von_id_87