Browse Source

Wilde-Pokémon Erweitert, Trainerdaten gefixt

DragonflySotS 7 years ago
parent
commit
7fdf8e02cf

+ 919
- 1477
data/overworld/wild_pokemon_data.S
File diff suppressed because it is too large
View File


+ 1
- 1
data/trainer/trainer_pkmn_data.s View File

@@ -549,4 +549,4 @@ pokemon_von_id_87:
549 549
 .hword 100, 15, 934, 258, 301, 174, 232
550 550
 .hword 100, 15, 936, 258, 204, 50, 109
551 551
 .hword 100, 15, 385, 258, 181, 52, 55
552
-.hword 100, 16, 91, 258, 182, 41, 350
552
+.hword 100, 16, 91, 258, 182, 41, 350

+ 2
- 2
src/include/assets/mug/mug_08.c View File

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 504 = 536
10 10
 //
11
-//	Time-stamp: 2017-05-08, 11:18:02
11
+//	Time-stamp: 2017-08-24, 22:19:43
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //
@@ -32,7 +32,7 @@ const unsigned int mug_08Tiles[126] __attribute__((aligned(4)))=
32 32
 	0x02A17700,0x42310000,0x0B011000,0x03208024,0x5589A412,0x006A86E6,0x9679A899,0x78798777,
33 33
 	0x78577700,0x7A897777,0x98770079,0x95977884,0x89009841,0x866ACE86,0x00566A98,0x99967788,
34 34
 	0x77797795,0x77778904,0x22009777,0x00819877,0x77795808,0x01A66897,0x0A9705E0,0x00770000,
35
-	0x74007774,0x04489700,0x012A8900,0x24880000,0x21480042,0x00590042,
35
+	0x74007774,0x04489700,0x012A8900,0x24880000,0x21480042,0x00000042,
36 36
 };
37 37
 
38 38
 const unsigned short mug_08Pal[16] __attribute__((aligned(4)))=

+ 1
- 1
src/include/assets/mug/mug_08.h View File

@@ -8,7 +8,7 @@
8 8
 //	+ 16 tiles lz77 compressed
9 9
 //	Total size: 32 + 504 = 536
10 10
 //
11
-//	Time-stamp: 2017-05-08, 11:18:02
11
+//	Time-stamp: 2017-08-24, 22:19:43
12 12
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13
 //	( http://www.coranac.com/projects/#grit )
14 14
 //

+ 348
- 174
string/de/trainers/trainer_data.txt View File

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