Merge branch 'master' of https://github.com/SBird1337/source_of_the_sovereign

data/trainer/trainer_pkmn_data.s

@@ -401,4 +401,152 @@ pokemon_von_id_66:
 .hword 60, 9, 341, 0
 .hword 60, 10, 635, 0
 .hword 60, 10, 936, 0
-.hword 60, 11, 215, 0
+.hword 60, 11, 215, 0
+
+.align 2
+.global pokemon_von_id_67
+pokemon_von_id_67:
+.hword 0, 12, 934, 0
+.hword 0, 12, 635, 0
+
+.align 2
+.global pokemon_von_id_68
+pokemon_von_id_68:
+.hword 30, 12, 934, 0
+.hword 30, 12, 635, 0
+
+.align 2
+.global pokemon_von_id_69
+pokemon_von_id_69:
+.hword 60, 12, 934, 0
+.hword 60, 12, 635, 0
+.hword 60, 13, 512, 0
+
+.align 2
+.global pokemon_von_id_70
+pokemon_von_id_70:
+.hword 0, 12, 936, 0
+.hword 0, 12, 765, 0
+
+.align 2
+.global pokemon_von_id_71
+pokemon_von_id_71:
+.hword 30, 12, 936, 0
+.hword 30, 12, 765, 0
+
+.align 2
+.global pokemon_von_id_72
+pokemon_von_id_72:
+.hword 60, 12, 936, 0
+.hword 60, 12, 765, 0
+.hword 60, 13, 215, 0
+
+.align 2
+.global pokemon_von_id_73
+pokemon_von_id_73:
+.hword 0, 13, 346, 0
+.hword 0, 14, 341, 0
+
+.align 2
+.global pokemon_von_id_74
+pokemon_von_id_74:
+.hword 30, 13, 346, 0
+.hword 30, 14, 341, 0
+
+.align 2
+.global pokemon_von_id_75
+pokemon_von_id_75:
+.hword 60, 13, 346, 0
+.hword 60, 14, 341, 0
+.hword 60, 14, 934, 0
+
+.align 2
+.global pokemon_von_id_76
+pokemon_von_id_76:
+.hword 0, 13, 86, 0
+.hword 0, 14, 666, 0
+
+.align 2
+.global pokemon_von_id_77
+pokemon_von_id_77:
+.hword 30, 13, 86, 0
+.hword 30, 14, 666, 0
+
+.align 2
+.global pokemon_von_id_78
+pokemon_von_id_78:
+.hword 60, 13, 86, 0
+.hword 60, 14, 666, 0
+.hword 60, 14, 936, 0
+
+.align 2
+.global pokemon_von_id_79
+pokemon_von_id_79:
+.hword 0, 13, 220, 0
+.hword 0, 14, 792, 0
+.hword 0, 14, 512, 0
+
+.align 2
+.global pokemon_von_id_80
+pokemon_von_id_80:
+.hword 30, 13, 220, 0
+.hword 30, 14, 792, 0
+.hword 30, 14, 512, 0
+
+.align 2
+.global pokemon_von_id_81
+pokemon_von_id_81:
+.hword 60, 13, 220, 0
+.hword 60, 14, 792, 0
+.hword 60, 14, 512, 0
+.hword 60, 15, 635, 0
+
+.align 2
+.global pokemon_von_id_82
+pokemon_von_id_82:
+.hword 0, 13, 238, 0
+.hword 0, 14, 936, 0
+.hword 0, 14, 346, 0
+
+.align 2
+.global pokemon_von_id_83
+pokemon_von_id_83:
+.hword 30, 13, 238, 0
+.hword 30, 14, 936, 0
+.hword 30, 14, 346, 0
+
+.align 2
+.global pokemon_von_id_84
+pokemon_von_id_84:
+.hword 60, 13, 238, 0
+.hword 60, 14, 936, 0
+.hword 60, 14, 346, 0
+.hword 60, 15, 666, 0
+
+.align 2
+.global pokemon_von_id_85
+pokemon_von_id_85:
+.hword 30, 14, 225, 0
+.hword 30, 14, 220, 0
+.hword 30, 15, 934, 0
+.hword 30, 15, 936, 0
+.hword 30, 15, 385, 0
+
+.align 2
+.global pokemon_von_id_86
+pokemon_von_id_86:
+.hword 60, 14, 225, 0
+.hword 60, 14, 220, 0
+.hword 60, 15, 934, 0
+.hword 60, 15, 936, 0
+.hword 60, 15, 385, 0
+
+.align 2
+.global pokemon_von_id_87
+pokemon_von_id_87:
+.hword 100, 14, 225, 258, 217, 420, 252
+.hword 100, 14, 220, 258, 189, 246, 333
+.hword 100, 15, 934, 258, 301, 174, 232
+.hword 100, 15, 936, 258, 204, 50, 109
+.hword 100, 15, 385, 258, 181, 52, 55
+.hword 100, 16, 91, 258, 182, 41, 350

src/interface/mugshot_table.s

@@ -30,6 +30,8 @@ mugshot_table_int:
 .word mug_08Tiles
 .word mug_08Pal
 
+.word mug_09Tiles
+.word mug_09Pal
 
 .global mugshots
 mugshots:

string/de/trainers/trainer_data.txt

@@ -400,4 +400,130 @@ str_trainer_name_65=Rüpel
 str_trainer_name_66=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
-@word pokemon_von_id_66
+@word pokemon_von_id_66
+
+@byte 0, 0, 0, 131
+str_trainer_name_67=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
+@word pokemon_von_id_67
+
+@byte 0, 0, 0, 131
+str_trainer_name_68=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
+@word pokemon_von_id_68
+
+@byte 0, 0, 0, 131
+str_trainer_name_69=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
+@word pokemon_von_id_69
+
+@byte 0, 0, 128, 132
+str_trainer_name_70=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
+@word pokemon_von_id_70
+
+@byte 0, 0, 128, 132
+str_trainer_name_71=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
+@word pokemon_von_id_71
+
+@byte 0, 0, 128, 132
+str_trainer_name_72=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
+@word pokemon_von_id_72
+
+@byte 0, 0, 0, 131
+str_trainer_name_73=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
+@word pokemon_von_id_73
+
+@byte 0, 0, 0, 131
+str_trainer_name_74=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
+@word pokemon_von_id_74
+
+@byte 0, 0, 0, 131
+str_trainer_name_75=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
+@word pokemon_von_id_75
+
+@byte 0, 0, 128, 132
+str_trainer_name_76=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
+@word pokemon_von_id_76
+
+@byte 0, 0, 128, 132
+str_trainer_name_77=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
+@word pokemon_von_id_77
+
+@byte 0, 0, 128, 132
+str_trainer_name_78=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
+@word pokemon_von_id_78
+
+@byte 0, 0, 0, 131
+str_trainer_name_79=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
+@word pokemon_von_id_79
+
+@byte 0, 0, 0, 131
+str_trainer_name_80=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
+@word pokemon_von_id_80
+
+@byte 0, 0, 0, 131
+str_trainer_name_81=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
+@word pokemon_von_id_81
+
+@byte 0, 0, 128, 132
+str_trainer_name_82=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
+@word pokemon_von_id_82
+
+@byte 0, 0, 128, 132
+str_trainer_name_83=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
+@word pokemon_von_id_83
+
+@byte 0, 0, 128, 132
+str_trainer_name_84=Rüpel
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
+@word pokemon_von_id_84
+
+@byte 0, 112, 0, 133
+str_trainer_name_85=Markus
+@hword0, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0
+@word pokemon_von_id_85
+
+@byte 0, 112, 0, 133
+str_trainer_name_86=Markus
+@hword13, 0, 0, 0
+@byte 0, 0, 0, 0, 0, 15, 0, 0, 5, 0, 0, 0
+@word pokemon_von_id_86
+
+@byte 1, 112, 0, 133
+str_trainer_name_87=Markus
+@hword13, 13, 0, 0
+@byte 0, 0, 0, 0, 0, 383, 0, 0, 6, 0, 0, 0
+@word pokemon_von_id_87