Karathan
/
source_of_the_sovereign
mirror of https://github.com/SBird1337/source_of_the_sovereign
Watch 1
Star 0
Fork 0
Code Issues Releases 0 Wiki Activity
Browse Source

Trainerdata fix, Mugshot fix

DragonflySotS 7 years ago
parent
5315ec8acf
commit
db116ecbe1
6 changed files with 136 additions and 169 deletions
Split View Show Diff Stats
  1. BIN
      assets/mug/mug_08.png
  2. BIN
      assets/mug/mug_09.PNG
  3. 1
    1
      data/trainer/trainer_pkmn_data.s
  4. 22
    55
      src/include/assets/mug/mug_09.c
  5. 5
    5
      src/include/assets/mug/mug_09.h
  6. 108
    108
      string/de/trainers/trainer_data.txt

BIN
assets/mug/mug_08.png View File


BIN
assets/mug/mug_09.PNG 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

+ 22
- 55
src/include/assets/mug/mug_09.c View File 

@@ -4,11 +4,11 @@
4 4 
 //======================================================================
5 5 
 //
6 6 
 //	mug_09, 32x32@4,
7 
-//	+ palette 256 entries, not compressed
7 
+//	+ palette 16 entries, not compressed
8 8 
 //	+ 16 tiles lz77 compressed
9 
-//	Total size: 512 + 468 = 980
9 
+//	Total size: 32 + 468 = 500
10 10 
 //
11 
-//	Time-stamp: 2017-08-24, 21:18:29
11 
+//	Time-stamp: 2017-08-24, 21:53:46
12 12 
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13 
 //	( http://www.coranac.com/projects/#grit )
14 14 
 //

@@ -16,61 +16,28 @@
16 16
17 17 
 const unsigned int mug_09Tiles[117] __attribute__((aligned(4)))=
18 18 
 {
19 
-	0x00020010,0xE011112A,0x1300A101,0x2806008A,0x220A00A0,0x4AAA1130,0x0288D2A1,0x22DD8AA8,
20 
-	0x03008822,0x03208382,0xD8222228,0x001F302D,0xA44A0044,0xA4A811AA,0x8200A288,0x22D2224A,
21 
-	0x16222A48,0x0024A222,0x1F602428,0xA91A6750,0x00AD7000,0x08008D74,0x7D10148D,0x63008A6D,
22 
-	0x00840310,0x416F106B,0x41227700,0xA2730088,0x47008211,0x108D6CD8,0xD8040070,0x01207D00,
23 
-	0x4A0022AA,0x30440004,0x000A7773,0x2260F773,0x2282A482,0xDD44A200,0x2A034ADD,0x393400A2,
24 
-	0x9C9304A0,0xCC009303,0xCCC9339C,0x00C77779,0x8D50F7CC,0x28111142,0x22030082,0xAA11110A,
25 
-	0x15100310,0x00041111,0x7B00A077,0x508C00A7,0x415E00A1,0x28DA0310,0x24001182,0xA0118DDD,
26 
-	0x14112222,0x00A22A01,0x8B00AA21,0x930002AA,0x9702F003,0x007AFA09,0xB7C99C37,0xE7CCCC7B,
27 
-
28 
-	0x99CC0E00,0x3CC9700A,0x3744004A,0x7744AA99,0xCC00C593,0xCCC96003,0x00CC6A03,0xCC3999CC,
29 
-	0xCC793CCC,0x03939C00,0x40393FF5,0x03930033,0x407399A4,0x4A08A02A,0x00701111,0x1427B003,
30 
-	0x20EE1100,0xA2001114,0x8720A810,0x2287004A,0x2A41FF20,0xA4111911,0x00060022,0x00DD8877,
31 
-	0x11220099,0x11A40771,0x4300CC97,0x49CCC971,0x0037A822,0x342D2233,0x3428D833,0xA2283300,
32 
-	0x4A223330,0x2A930473,0x0099370A,0x002299EC,0x07934A22,0x0382A440,0x22A44400,0x2A440033,
33 
-	0x07390A93,0xF80037A0,0x99040079,0x93739900,0x37399993,0x11480022,0x110DD811,0x10E48211,
34 
-	0x00EC01F7,0x017C11FE,0x1017CCF4,0x01931111,0x0101000B,
19 
+	0x00020010,0xE000002A,0x13001001,0x35060051,0x330A00A0,0x21111130,0x02554310,0x33445115,
20 
+	0x03005533,0x03208353,0x45333335,0x001F3034,0x12210044,0x12150011,0x53001355,0x33433321,
21 
+	0x16333125,0x00321333,0x1F603228,0xA9016750,0x00147000,0x08005474,0x7D100254,0x6300516D,
22 
+	0x00520310,0x206F106B,0x20227700,0x13730055,0x47005300,0x10546C45,0x45040070,0x01207D00,
23 
+	0x21003311,0x67227772,0x0071AAA6,0x33B7BAA6,0x33531253,0x44221300,0x31762144,0x68620013,
24 
+	0x89867217,0x99008676,0x99986689,0x009AAAA8,0x54C7BA99,0x35000023,0x33030082,0x11000071,
25 
+	0x15070310,0x00720000,0x7B001777,0x508C001A,0x205E0010,0x35410310,0x32000053,0x17005444,
26 
+	0x14003333,0x00133170,0x8B001121,0x86007311,0x8A73B776,0x00A1B1D8,0xEA98896A,0xFA9999AE,
27 
+
28 
+	0x88997F00,0x6998A771,0x6A220021,0xAA221188,0x99009C86,0x9998B776,0x0099B1D6,0x99688899,
29 
+	0x99A86999,0x76868900,0x27686BBC,0x76860066,0x27A68812,0x21081731,0x00A70000,0x023AE703,
30 
+	0x37FF0000,0x13770002,0x8720A807,0x33870021,0x3120FF20,0x12001900,0x00060033,0x00445577,
31 
+	0x00330099,0x00127AA0,0x2600998A,0x289998A0,0x006A1533,0x62343366,0x62354566,0x13356600,
32 
+	0x21336667,0x318604A6,0x00886A71,0x003388EC,0x7A862133,0x76531227,0x33122200,0x31227766,
33 
+	0x7A680A86,0xF8006A17,0x880400A8,0x86A68800,0x6A688886,0x00250033,0x00744500,0x10E45300,
34 
+	0x00EC01F7,0x01A900FE,0x100A99F4,0x00860000,0x0000000C,
35 35 
 };
36 36
37 
-const unsigned short mug_09Pal[256] __attribute__((aligned(4)))=
37 
+const unsigned short mug_09Pal[16] __attribute__((aligned(4)))=
38 38 
 {
39 
-	0x0000,0x7FE0,0x5167,0x25B5,0x1863,0x6292,0x7B58,0x1D0C,
40 
-	0x61CA,0x363A,0x28C3,0x28FA,0x5B3E,0x6E2B,0x1C71,0x7FFF,
41 
-	0x4525,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
42 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
43 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
44 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
45 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
46 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
47 
-
48 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
49 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
50 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
51 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
52 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
53 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
54 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
55 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
56 
-
57 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
58 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
59 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
60 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
61 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
62 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
63 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
64 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
65 
-
66 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
67 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
68 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
69 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
70 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
71 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
72 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
73 
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
39 
+	0x7FE0,0x28C3,0x1863,0x5167,0x6E2B,0x61CA,0x25B5,0x0000,
40 
+	0x363A,0x5B3E,0x1D0C,0x7FBD,0x6292,0x4525,0x28FA,0x1C71,
74 41 
 };
75 42
76 43 
 //}}BLOCK(mug_09)

+ 5
- 5
src/include/assets/mug/mug_09.h View File 

@@ -4,11 +4,11 @@
4 4 
 //======================================================================
5 5 
 //
6 6 
 //	mug_09, 32x32@4,
7 
-//	+ palette 256 entries, not compressed
7 
+//	+ palette 16 entries, not compressed
8 8 
 //	+ 16 tiles lz77 compressed
9 
-//	Total size: 512 + 468 = 980
9 
+//	Total size: 32 + 468 = 500
10 10 
 //
11 
-//	Time-stamp: 2017-08-24, 21:18:29
11 
+//	Time-stamp: 2017-08-24, 21:53:46
12 12 
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
13 13 
 //	( http://www.coranac.com/projects/#grit )
14 14 
 //

@@ -20,8 +20,8 @@
20 20 
 #define mug_09TilesLen 468
21 21 
 extern const unsigned int mug_09Tiles[117];
22 22
23 
-#define mug_09PalLen 512
24 
-extern const unsigned short mug_09Pal[256];
23 
+#define mug_09PalLen 32
24 
+extern const unsigned short mug_09Pal[16];
25 25
26 26 
 #endif // GRIT_MUG_09_H
27 27

+ 108
- 108
string/de/trainers/trainer_data.txt View File 

@@ -6,524 +6,524 @@ 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 12 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
13 13 
 @word pokemon_von_id_1
14 14
15 
-@byte 0, 88, 0, 135
15 
+@byte 0, 88, 0, 135
16 16 
 str_trainer_name_2=Noah
17 17 
 @hword 0, 0, 0, 0
18 18 
 @byte 0, 0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0
19 19 
 @word pokemon_von_id_2
20 20
21 
-@byte 2, 88, 0, 135
21 
+@byte 2, 88, 0, 135
22 22 
 str_trainer_name_3=Noah
23 23 
 @hword 0, 0, 0, 0
24 24 
 @byte 0, 0, 0, 0, 0, 14, 0, 0, 1, 0, 0, 0
25 25 
 @word pokemon_von_id_3
26 26
27 
-@byte 0, 88, 0, 135
27 
+@byte 0, 88, 0, 135
28 28 
 str_trainer_name_4=Noah
29 29 
 @hword 0, 0, 0, 0
30 30 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
31 31 
 @word pokemon_von_id_4
32 32
33 
-@byte 0, 88, 0, 135
33 
+@byte 0, 88, 0, 135
34 34 
 str_trainer_name_5=Noah
35 35 
 @hword 0, 0, 0, 0
36 36 
 @byte 0, 0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0
37 37 
 @word pokemon_von_id_5
38 38
39 
-@byte 2, 88, 0, 135
39 
+@byte 2, 88, 0, 135
40 40 
 str_trainer_name_6=Noah
41 41 
 @hword 0, 0, 0, 0
42 42 
 @byte 0, 0, 0, 0, 0, 14, 0, 0, 1, 0, 0, 0
43 43 
 @word pokemon_von_id_6
44 44
45 
-@byte 0, 88, 128, 136
45 
+@byte 0, 88, 128, 136
46 46 
 str_trainer_name_7=Emma
47 47 
 @hword 0, 0, 0, 0
48 48 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
49 49 
 @word pokemon_von_id_7
50 50
51 
-@byte 0, 88, 128, 136
51 
+@byte 0, 88, 128, 136
52 52 
 str_trainer_name_8=Emma
53 53 
 @hword 0, 0, 0, 0
54 54 
 @byte 0, 0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0
55 55 
 @word pokemon_von_id_8
56 56
57 
-@byte 2, 88, 128, 136
57 
+@byte 2, 88, 128, 136
58 58 
 str_trainer_name_9=Emma
59 59 
 @hword 0, 0, 0, 0
60 60 
 @byte 0, 0, 0, 0, 0, 14, 0, 0, 1, 0, 0, 0
61 61 
 @word pokemon_von_id_9
62 62
63 
-@byte 0, 88, 128, 136
63 
+@byte 0, 88, 128, 136
64 64 
 str_trainer_name_10=Emma
65 65 
 @hword 0, 0, 0, 0
66 66 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
67 67 
 @word pokemon_von_id_10
68 68
69 
-@byte 0, 88, 128, 136
69 
+@byte 0, 88, 128, 136
70 70 
 str_trainer_name_11=Emma
71 71 
 @hword 0, 0, 0, 0
72 72 
 @byte 0, 0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0
73 73 
 @word pokemon_von_id_11
74 74
75 
-@byte 2, 88, 128, 136
75 
+@byte 2, 88, 128, 136
76 76 
 str_trainer_name_12=Emma
77 77 
 @hword 0, 0, 0, 0
78 78 
 @byte 0, 0, 0, 0, 0, 14, 0, 0, 1, 0, 0, 0
79 79 
 @word pokemon_von_id_12
80 80
81 
-@byte 0, 5, 1, 7
81 
+@byte 0, 5, 1, 7
82 82 
 str_trainer_name_13=Lars
83 83 
 @hword 0, 0, 0, 0
84 84 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
85 85 
 @word pokemon_von_id_13
86 86
87 
-@byte 0, 5, 1, 7
87 
+@byte 0, 5, 1, 7
88 88 
 str_trainer_name_14=Lars
89 89 
 @hword 0, 0, 0, 0
90 90 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
91 91 
 @word pokemon_von_id_14
92 92
93 
-@byte 0, 5, 1, 7
93 
+@byte 0, 5, 1, 7
94 94 
 str_trainer_name_15=Lars
95 95 
 @hword 0, 0, 0, 0
96 96 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
97 97 
 @word pokemon_von_id_15
98 98
99 
-@byte 0, 48, 1, 56
99 
+@byte 0, 48, 1, 56
100 100 
 str_trainer_name_16=Alex
101 101 
 @hword 0, 0, 0, 0
102 102 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
103 103 
 @word pokemon_von_id_16
104 104
105 
-@byte 0, 48, 1, 56
105 
+@byte 0, 48, 1, 56
106 106 
 str_trainer_name_17=Alex
107 107 
 @hword 0, 0, 0, 0
108 108 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 0, 0
109 109 
 @word pokemon_von_id_17
110 110
111 
-@byte 0, 48, 1, 56
111 
+@byte 0, 48, 1, 56
112 112 
 str_trainer_name_18=Alex
113 113 
 @hword 0, 0, 0, 0
114 114 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 3, 0, 0, 0
115 115 
 @word pokemon_von_id_18
116 116
117 
-@byte 0, 48, 1, 56
117 
+@byte 0, 48, 1, 56
118 118 
 str_trainer_name_19=Steven
119 119 
 @hword 0, 0, 0, 0
120 120 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
121 121 
 @word pokemon_von_id_19
122 122
123 
-@byte 0, 48, 1, 56
123 
+@byte 0, 48, 1, 56
124 124 
 str_trainer_name_20=Steven
125 125 
 @hword 0, 0, 0, 0
126 126 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 0, 0
127 127 
 @word pokemon_von_id_20
128 128
129 
-@byte 0, 48, 1, 56
129 
+@byte 0, 48, 1, 56
130 130 
 str_trainer_name_21=Steven
131 131 
 @hword 0, 0, 0, 0
132 132 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 4, 0, 0, 0
133 133 
 @word pokemon_von_id_21
134 134
135 
-@byte 0, 1, 1, 2
135 
+@byte 0, 1, 1, 2
136 136 
 str_trainer_name_22=Elias
137 137 
 @hword 0, 0, 0, 0
138 138 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
139 139 
 @word pokemon_von_id_22
140 140
141 
-@byte 0, 1, 1, 2
141 
+@byte 0, 1, 1, 2
142 142 
 str_trainer_name_23=Elias
143 143 
 @hword 0, 0, 0, 0
144 144 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
145 145 
 @word pokemon_von_id_23
146 146
147 
-@byte 0, 1, 1, 2
147 
+@byte 0, 1, 1, 2
148 148 
 str_trainer_name_24=Elias
149 149 
 @hword 0, 0, 0, 0
150 150 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 3, 0, 0, 0
151 151 
 @word pokemon_von_id_24
152 152
153 
-@byte 0, 5, 1, 7
153 
+@byte 0, 5, 1, 7
154 154 
 str_trainer_name_25=Marcel
155 155 
 @hword 0, 0, 0, 0
156 156 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
157 157 
 @word pokemon_von_id_25
158 158
159 
-@byte 0, 5, 1, 7
159 
+@byte 0, 5, 1, 7
160 160 
 str_trainer_name_26=Marcel
161 161 
 @hword 0, 0, 0, 0
162 162 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0
163 163 
 @word pokemon_von_id_26
164 164
165 
-@byte 0, 5, 1, 7
165 
+@byte 0, 5, 1, 7
166 166 
 str_trainer_name_27=Marcel
167 167 
 @hword 0, 0, 0, 0
168 168 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
169 169 
 @word pokemon_von_id_27
170 170
171 
-@byte 0, 1, 1, 2
171 
+@byte 0, 1, 1, 2
172 172 
 str_trainer_name_28=Nico
173 173 
 @hword 0, 0, 0, 0
174 174 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
175 175 
 @word pokemon_von_id_28
176 176
177 
-@byte 1, 1, 1, 2
177 
+@byte 1, 1, 1, 2
178 178 
 str_trainer_name_29=Nico
179 179 
 @hword 0, 0, 0, 0
180 180 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
181 181 
 @word pokemon_von_id_29
182 182
183 
-@byte 1, 1, 1, 2
183 
+@byte 1, 1, 1, 2
184 184 
 str_trainer_name_30=Nico
185 185 
 @hword 0, 0, 0, 0
186 186 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
187 187 
 @word pokemon_von_id_30
188 188
189 
-@byte 0, 48, 1, 56
189 
+@byte 0, 48, 1, 56
190 190 
 str_trainer_name_31=Marvin
191 191 
 @hword 0, 0, 0, 0
192 192 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0
193 193 
 @word pokemon_von_id_31
194 194
195 
-@byte 1, 48, 1, 56
195 
+@byte 1, 48, 1, 56
196 196 
 str_trainer_name_32=Marvin
197 197 
 @hword 0, 0, 0, 0
198 198 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 4, 0, 0, 0
199 199 
 @word pokemon_von_id_32
200 200
201 
-@byte 1, 48, 1, 56
201 
+@byte 1, 48, 1, 56
202 202 
 str_trainer_name_33=Marvin
203 203 
 @hword 0, 0, 0, 0
204 204 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 5, 0, 0, 0
205 205 
 @word pokemon_von_id_33
206 206
207 
-@byte 0, 31, 1, 37
207 
+@byte 0, 31, 1, 37
208 208 
 str_trainer_name_34=Kevin
209 209 
 @hword 0, 0, 0, 0
210 210 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
211 211 
 @word pokemon_von_id_34
212 212
213 
-@byte 1, 31, 1, 37
213 
+@byte 1, 31, 1, 37
214 214 
 str_trainer_name_35=Kevin
215 215 
 @hword 0, 0, 0, 0
216 216 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
217 217 
 @word pokemon_von_id_35
218 218
219 
-@byte 1, 31, 1, 37
219 
+@byte 1, 31, 1, 37
220 220 
 str_trainer_name_36=Kevin
221 221 
 @hword 0, 0, 0, 0
222 222 
 @byte 0, 0, 0, 0, 0, 23, 0, 0, 2, 0, 0, 0
223 223 
 @word pokemon_von_id_36
224 224
225 
-@byte 0, 6, 128, 8
225 
+@byte 0, 6, 128, 8
226 226 
 str_trainer_name_37=Julia
227 227 
 @hword 0, 0, 0, 0
228 228 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
229 229 
 @word pokemon_von_id_37
230 230
231 
-@byte 0, 6, 128, 8
231 
+@byte 0, 6, 128, 8
232 232 
 str_trainer_name_38=Julia
233 233 
 @hword 0, 0, 0, 0
234 234 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
235 235 
 @word pokemon_von_id_38
236 236
237 
-@byte 0, 6, 128, 8
237 
+@byte 0, 6, 128, 8
238 238 
 str_trainer_name_39=Julia
239 239 
 @hword 0, 0, 0, 0
240 240 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
241 241 
 @word pokemon_von_id_39
242 242
243 
-@byte 0, 0, 128, 1
243 
+@byte 0, 0, 128, 1
244 244 
 str_trainer_name_40=Hanah
245 245 
 @hword 0, 0, 0, 0
246 246 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
247 247 
 @word pokemon_von_id_40
248 248
249 
-@byte 0, 0, 128, 1
249 
+@byte 0, 0, 128, 1
250 250 
 str_trainer_name_41=Hanah
251 251 
 @hword 0, 0, 0, 0
252 252 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 0, 0
253 253 
 @word pokemon_von_id_41
254 254
255 
-@byte 0, 0, 128, 1
255 
+@byte 0, 0, 128, 1
256 256 
 str_trainer_name_42=Hanah
257 257 
 @hword 0, 0, 0, 0
258 258 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 3, 0, 0, 0
259 259 
 @word pokemon_von_id_42
260 260
261 
-@byte 0, 48, 1, 56
261 
+@byte 0, 48, 1, 56
262 262 
 str_trainer_name_43=Jörg
263 263 
 @hword 0, 0, 0, 0
264 264 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0
265 265 
 @word pokemon_von_id_43
266 266
267 
-@byte 0, 48, 1, 56
267 
+@byte 0, 48, 1, 56
268 268 
 str_trainer_name_44=Jörg
269 269 
 @hword 0, 0, 0, 0
270 270 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0
271 271 
 @word pokemon_von_id_44
272 272
273 
-@byte 0, 48, 1, 56
273 
+@byte 0, 48, 1, 56
274 274 
 str_trainer_name_45=Jörg
275 275 
 @hword 0, 0, 0, 0
276 276 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 1, 0, 0, 0
277 277 
 @word pokemon_von_id_45
278 278
279 
-@byte 0, 48, 1, 56
279 
+@byte 0, 48, 1, 56
280 280 
 str_trainer_name_46=Piet
281 281 
 @hword 0, 0, 0, 0
282 282 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0
283 283 
 @word pokemon_von_id_46
284 284
285 
-@byte 0, 48, 1, 56
285 
+@byte 0, 48, 1, 56
286 286 
 str_trainer_name_47=Piet
287 287 
 @hword 0, 0, 0, 0
288 288 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
289 289 
 @word pokemon_von_id_47
290 290
291 
-@byte 0, 48, 1, 56
291 
+@byte 0, 48, 1, 56
292 292 
 str_trainer_name_48=Piet
293 293 
 @hword 0, 0, 0, 0
294 294 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
295 295 
 @word pokemon_von_id_48
296 296
297 
-@byte 0, 48, 1, 56
297 
+@byte 0, 48, 1, 56
298 298 
 str_trainer_name_49=Marco
299 299 
 @hword 0, 0, 0, 0
300 300 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
301 301 
 @word pokemon_von_id_49
302 302
303 
-@byte 0, 48, 1, 56
303 
+@byte 0, 48, 1, 56
304 304 
 str_trainer_name_50=Marco
305 305 
 @hword 0, 0, 0, 0
306 306 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
307 307 
 @word pokemon_von_id_50
308 308
309 
-@byte 0, 48, 1, 56
309 
+@byte 0, 48, 1, 56
310 310 
 str_trainer_name_51=Marco
311 311 
 @hword 0, 0, 0, 0
312 312 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
313 313 
 @word pokemon_von_id_51
314 314
315 
-@byte 0, 6, 128, 8
315 
+@byte 0, 6, 128, 8
316 316 
 str_trainer_name_52=Isabelle
317 317 
 @hword 0, 0, 0, 0
318 318 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
319 319 
 @word pokemon_von_id_52
320 320
321 
-@byte 0, 6, 128, 8
321 
+@byte 0, 6, 128, 8
322 322 
 str_trainer_name_53=Isabelle
323 323 
 @hword 0, 0, 0, 0
324 324 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0
325 325 
 @word pokemon_von_id_53
326 326
327 
-@byte 0, 6, 128, 8
327 
+@byte 0, 6, 128, 8
328 328 
 str_trainer_name_54=Isabelle
329 329 
 @hword 0, 0, 0, 0
330 330 
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 1, 0, 0, 0
331 331 
 @word pokemon_von_id_54
332 332
333 
-@byte 0, 21, 1, 24
333 
+@byte 0, 21, 1, 24
334 334 
 str_trainer_name_55=Klaus
335 335 
 @hword 0, 0, 0, 0
336 336 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
337 337 
 @word pokemon_von_id_55
338 338
339 
-@byte 0, 21, 1, 24
339 
+@byte 0, 21, 1, 24
340 340 
 str_trainer_name_56=Klaus
341 341 
 @hword 0, 0, 0, 0
342 342 
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
343 343 
 @word pokemon_von_id_56
344 344
345 
-@byte 0, 21, 1, 24
345 
+@byte 0, 21, 1, 24
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 349 
 @word pokemon_von_id_57
350 350
351 
-@byte 0, 0, 0, 131
351 
+@byte 0, 0, 0, 131
352 352 
 str_trainer_name_58=Rüpel
353 353 
 @hword 0, 0, 0, 0
354 354 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
355 355 
 @word pokemon_von_id_58
356 356
357 
-@byte 0, 0, 0, 131
357 
+@byte 0, 0, 0, 131
358 358 
 str_trainer_name_59=Rüpel
359 359 
 @hword 0, 0, 0, 0
360 360 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
361 361 
 @word pokemon_von_id_59
362 362
363 
-@byte 0, 0, 0, 131
363 
+@byte 0, 0, 0, 131
364 364 
 str_trainer_name_60=Rüpel
365 365 
 @hword 0, 0, 0, 0
366 366 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
367 367 
 @word pokemon_von_id_60
368 368
369 
-@byte 0, 0, 0, 131
369 
+@byte 0, 0, 0, 131
370 370 
 str_trainer_name_61=Rüpel
371 371 
 @hword 0, 0, 0, 0
372 372 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
373 373 
 @word pokemon_von_id_61
374 374
375 
-@byte 0, 0, 0, 131
375 
+@byte 0, 0, 0, 131
376 376 
 str_trainer_name_62=Rüpel
377 377 
 @hword 0, 0, 0, 0
378 378 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
379 379 
 @word pokemon_von_id_62
380 380
381 
-@byte 0, 0, 0, 131
381 
+@byte 0, 0, 0, 131
382 382 
 str_trainer_name_63=Rüpel
383 383 
 @hword 0, 0, 0, 0
384 384 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
385 385 
 @word pokemon_von_id_63
386 386
387 
-@byte 0, 0, 128, 132
387 
+@byte 0, 0, 128, 132
388 388 
 str_trainer_name_64=Rüpel
389 389 
 @hword 0, 0, 0, 0
390 390 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
391 391 
 @word pokemon_von_id_64
392 392
393 
-@byte 0, 0, 128, 132
393 
+@byte 0, 0, 128, 132
394 394 
 str_trainer_name_65=Rüpel
395 395 
 @hword 0, 0, 0, 0
396 396 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
397 397 
 @word pokemon_von_id_65
398 398
399 
-@byte 0, 0, 128, 132
399 
+@byte 0, 0, 128, 132
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 403 
 @word pokemon_von_id_66
404 404
405 
-@byte 0, 0, 0, 131
405 
+@byte 0, 0, 0, 131
406 406 
 str_trainer_name_67=Rüpel
407 
-@hword0, 0, 0, 0
407 
+@hword 0, 0, 0, 0
408 408 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
409 409 
 @word pokemon_von_id_67
410 410
411 
-@byte 0, 0, 0, 131
411 
+@byte 0, 0, 0, 131
412 412 
 str_trainer_name_68=Rüpel
413 
-@hword0, 0, 0, 0
413 
+@hword 0, 0, 0, 0
414 414 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
415 415 
 @word pokemon_von_id_68
416 416
417 
-@byte 0, 0, 0, 131
417 
+@byte 0, 0, 0, 131
418 418 
 str_trainer_name_69=Rüpel
419 
-@hword0, 0, 0, 0
419 
+@hword 0, 0, 0, 0
420 420 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
421 421 
 @word pokemon_von_id_69
422 422
423 
-@byte 0, 0, 128, 132
423 
+@byte 0, 0, 128, 132
424 424 
 str_trainer_name_70=Rüpel
425 
-@hword0, 0, 0, 0
425 
+@hword 0, 0, 0, 0
426 426 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
427 427 
 @word pokemon_von_id_70
428 428
429 
-@byte 0, 0, 128, 132
429 
+@byte 0, 0, 128, 132
430 430 
 str_trainer_name_71=Rüpel
431 
-@hword0, 0, 0, 0
431 
+@hword 0, 0, 0, 0
432 432 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
433 433 
 @word pokemon_von_id_71
434 434
435 
-@byte 0, 0, 128, 132
435 
+@byte 0, 0, 128, 132
436 436 
 str_trainer_name_72=Rüpel
437 
-@hword0, 0, 0, 0
437 
+@hword 0, 0, 0, 0
438 438 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
439 439 
 @word pokemon_von_id_72
440 440
441 
-@byte 0, 0, 0, 131
441 
+@byte 0, 0, 0, 131
442 442 
 str_trainer_name_73=Rüpel
443 
-@hword0, 0, 0, 0
443 
+@hword 0, 0, 0, 0
444 444 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
445 445 
 @word pokemon_von_id_73
446 446
447 
-@byte 0, 0, 0, 131
447 
+@byte 0, 0, 0, 131
448 448 
 str_trainer_name_74=Rüpel
449 
-@hword0, 0, 0, 0
449 
+@hword 0, 0, 0, 0
450 450 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
451 451 
 @word pokemon_von_id_74
452 452
453 
-@byte 0, 0, 0, 131
453 
+@byte 0, 0, 0, 131
454 454 
 str_trainer_name_75=Rüpel
455 
-@hword0, 0, 0, 0
455 
+@hword 0, 0, 0, 0
456 456 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
457 457 
 @word pokemon_von_id_75
458 458
459 
-@byte 0, 0, 128, 132
459 
+@byte 0, 0, 128, 132
460 460 
 str_trainer_name_76=Rüpel
461 
-@hword0, 0, 0, 0
461 
+@hword 0, 0, 0, 0
462 462 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
463 463 
 @word pokemon_von_id_76
464 464
465 
-@byte 0, 0, 128, 132
465 
+@byte 0, 0, 128, 132
466 466 
 str_trainer_name_77=Rüpel
467 
-@hword0, 0, 0, 0
467 
+@hword 0, 0, 0, 0
468 468 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
469 469 
 @word pokemon_von_id_77
470 470
471 
-@byte 0, 0, 128, 132
471 
+@byte 0, 0, 128, 132
472 472 
 str_trainer_name_78=Rüpel
473 
-@hword0, 0, 0, 0
473 
+@hword 0, 0, 0, 0
474 474 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
475 475 
 @word pokemon_von_id_78
476 476
477 
-@byte 0, 0, 0, 131
477 
+@byte 0, 0, 0, 131
478 478 
 str_trainer_name_79=Rüpel
479 
-@hword0, 0, 0, 0
479 
+@hword 0, 0, 0, 0
480 480 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
481 481 
 @word pokemon_von_id_79
482 482
483 
-@byte 0, 0, 0, 131
483 
+@byte 0, 0, 0, 131
484 484 
 str_trainer_name_80=Rüpel
485 
-@hword0, 0, 0, 0
485 
+@hword 0, 0, 0, 0
486 486 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
487 487 
 @word pokemon_von_id_80
488 488
489 
-@byte 0, 0, 0, 131
489 
+@byte 0, 0, 0, 131
490 490 
 str_trainer_name_81=Rüpel
491 
-@hword0, 0, 0, 0
491 
+@hword 0, 0, 0, 0
492 492 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
493 493 
 @word pokemon_von_id_81
494 494
495 
-@byte 0, 0, 128, 132
495 
+@byte 0, 0, 128, 132
496 496 
 str_trainer_name_82=Rüpel
497 
-@hword0, 0, 0, 0
497 
+@hword 0, 0, 0, 0
498 498 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
499 499 
 @word pokemon_von_id_82
500 500
501 
-@byte 0, 0, 128, 132
501 
+@byte 0, 0, 128, 132
502 502 
 str_trainer_name_83=Rüpel
503 
-@hword0, 0, 0, 0
503 
+@hword 0, 0, 0, 0
504 504 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
505 505 
 @word pokemon_von_id_83
506 506
507 
-@byte 0, 0, 128, 132
507 
+@byte 0, 0, 128, 132
508 508 
 str_trainer_name_84=Rüpel
509 
-@hword0, 0, 0, 0
509 
+@hword 0, 0, 0, 0
510 510 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
511 511 
 @word pokemon_von_id_84
512 512
513 
-@byte 0, 112, 0, 133
513 
+@byte 0, 112, 0, 133
514 514 
 str_trainer_name_85=Markus
515 
-@hword0, 0, 0, 0
515 
+@hword 0, 0, 0, 0
516 516 
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0
517 517 
 @word pokemon_von_id_85
518 518
519 
-@byte 0, 112, 0, 133
519 
+@byte 0, 112, 0, 133
520 520 
 str_trainer_name_86=Markus
521 
-@hword13, 0, 0, 0
521 
+@hword 13, 0, 0, 0
522 522 
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 5, 0, 0, 0
523 523 
 @word pokemon_von_id_86
524 524
525 
-@byte 1, 112, 0, 133
525 
+@byte 1, 112, 0, 133
526 526 
 str_trainer_name_87=Markus
527 
-@hword13, 13, 0, 0
527 
+@hword 13, 13, 0, 0
528 528 
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 6, 0, 0, 0
529 529 
 @word pokemon_von_id_87