Trainerdata fix, Mugshot fix

data/trainer/trainer_pkmn_data.s

@@ -549,4 +549,4 @@ pokemon_von_id_87:
 .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
+.hword 100, 16, 91, 258, 182, 41, 350

src/include/assets/mug/mug_09.c

@@ -4,11 +4,11 @@
 //======================================================================
 //
 //	mug_09, 32x32@4, 
-//	+ palette 256 entries, not compressed
+//	+ palette 16 entries, not compressed
 //	+ 16 tiles lz77 compressed
-//	Total size: 512 + 468 = 980
+//	Total size: 32 + 468 = 500
 //
-//	Time-stamp: 2017-08-24, 21:18:29
+//	Time-stamp: 2017-08-24, 21:53:46
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -16,61 +16,28 @@
 
 const unsigned int mug_09Tiles[117] __attribute__((aligned(4)))=
 {
-	0x00020010,0xE011112A,0x1300A101,0x2806008A,0x220A00A0,0x4AAA1130,0x0288D2A1,0x22DD8AA8,
-	0x03008822,0x03208382,0xD8222228,0x001F302D,0xA44A0044,0xA4A811AA,0x8200A288,0x22D2224A,
-	0x16222A48,0x0024A222,0x1F602428,0xA91A6750,0x00AD7000,0x08008D74,0x7D10148D,0x63008A6D,
-	0x00840310,0x416F106B,0x41227700,0xA2730088,0x47008211,0x108D6CD8,0xD8040070,0x01207D00,
-	0x4A0022AA,0x30440004,0x000A7773,0x2260F773,0x2282A482,0xDD44A200,0x2A034ADD,0x393400A2,
-	0x9C9304A0,0xCC009303,0xCCC9339C,0x00C77779,0x8D50F7CC,0x28111142,0x22030082,0xAA11110A,
-	0x15100310,0x00041111,0x7B00A077,0x508C00A7,0x415E00A1,0x28DA0310,0x24001182,0xA0118DDD,
-	0x14112222,0x00A22A01,0x8B00AA21,0x930002AA,0x9702F003,0x007AFA09,0xB7C99C37,0xE7CCCC7B,
-
-	0x99CC0E00,0x3CC9700A,0x3744004A,0x7744AA99,0xCC00C593,0xCCC96003,0x00CC6A03,0xCC3999CC,
-	0xCC793CCC,0x03939C00,0x40393FF5,0x03930033,0x407399A4,0x4A08A02A,0x00701111,0x1427B003,
-	0x20EE1100,0xA2001114,0x8720A810,0x2287004A,0x2A41FF20,0xA4111911,0x00060022,0x00DD8877,
-	0x11220099,0x11A40771,0x4300CC97,0x49CCC971,0x0037A822,0x342D2233,0x3428D833,0xA2283300,
-	0x4A223330,0x2A930473,0x0099370A,0x002299EC,0x07934A22,0x0382A440,0x22A44400,0x2A440033,
-	0x07390A93,0xF80037A0,0x99040079,0x93739900,0x37399993,0x11480022,0x110DD811,0x10E48211,
-	0x00EC01F7,0x017C11FE,0x1017CCF4,0x01931111,0x0101000B,
+	0x00020010,0xE000002A,0x13001001,0x35060051,0x330A00A0,0x21111130,0x02554310,0x33445115,
+	0x03005533,0x03208353,0x45333335,0x001F3034,0x12210044,0x12150011,0x53001355,0x33433321,
+	0x16333125,0x00321333,0x1F603228,0xA9016750,0x00147000,0x08005474,0x7D100254,0x6300516D,
+	0x00520310,0x206F106B,0x20227700,0x13730055,0x47005300,0x10546C45,0x45040070,0x01207D00,
+	0x21003311,0x67227772,0x0071AAA6,0x33B7BAA6,0x33531253,0x44221300,0x31762144,0x68620013,
+	0x89867217,0x99008676,0x99986689,0x009AAAA8,0x54C7BA99,0x35000023,0x33030082,0x11000071,
+	0x15070310,0x00720000,0x7B001777,0x508C001A,0x205E0010,0x35410310,0x32000053,0x17005444,
+	0x14003333,0x00133170,0x8B001121,0x86007311,0x8A73B776,0x00A1B1D8,0xEA98896A,0xFA9999AE,
+
+	0x88997F00,0x6998A771,0x6A220021,0xAA221188,0x99009C86,0x9998B776,0x0099B1D6,0x99688899,
+	0x99A86999,0x76868900,0x27686BBC,0x76860066,0x27A68812,0x21081731,0x00A70000,0x023AE703,
+	0x37FF0000,0x13770002,0x8720A807,0x33870021,0x3120FF20,0x12001900,0x00060033,0x00445577,
+	0x00330099,0x00127AA0,0x2600998A,0x289998A0,0x006A1533,0x62343366,0x62354566,0x13356600,
+	0x21336667,0x318604A6,0x00886A71,0x003388EC,0x7A862133,0x76531227,0x33122200,0x31227766,
+	0x7A680A86,0xF8006A17,0x880400A8,0x86A68800,0x6A688886,0x00250033,0x00744500,0x10E45300,
+	0x00EC01F7,0x01A900FE,0x100A99F4,0x00860000,0x0000000C,
 };
 
-const unsigned short mug_09Pal[256] __attribute__((aligned(4)))=
+const unsigned short mug_09Pal[16] __attribute__((aligned(4)))=
 {
-	0x0000,0x7FE0,0x5167,0x25B5,0x1863,0x6292,0x7B58,0x1D0C,
-	0x61CA,0x363A,0x28C3,0x28FA,0x5B3E,0x6E2B,0x1C71,0x7FFF,
-	0x4525,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
-	0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,0x0000,
+	0x7FE0,0x28C3,0x1863,0x5167,0x6E2B,0x61CA,0x25B5,0x0000,
+	0x363A,0x5B3E,0x1D0C,0x7FBD,0x6292,0x4525,0x28FA,0x1C71,
 };
 
 //}}BLOCK(mug_09)

src/include/assets/mug/mug_09.h

@@ -4,11 +4,11 @@
 //======================================================================
 //
 //	mug_09, 32x32@4, 
-//	+ palette 256 entries, not compressed
+//	+ palette 16 entries, not compressed
 //	+ 16 tiles lz77 compressed
-//	Total size: 512 + 468 = 980
+//	Total size: 32 + 468 = 500
 //
-//	Time-stamp: 2017-08-24, 21:18:29
+//	Time-stamp: 2017-08-24, 21:53:46
 //	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
 //	( http://www.coranac.com/projects/#grit )
 //
@@ -20,8 +20,8 @@
 #define mug_09TilesLen 468
 extern const unsigned int mug_09Tiles[117];
 
-#define mug_09PalLen 512
-extern const unsigned short mug_09Pal[256];
+#define mug_09PalLen 32
+extern const unsigned short mug_09Pal[16];
 
 #endif // GRIT_MUG_09_H
 

string/de/trainers/trainer_data.txt

@@ -6,524 +6,524 @@ str_trainer_name_0=
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 @word 0
 
-@byte 0, 88, 0, 135
+@byte 0, 88, 0, 135 
 str_trainer_name_1=Noah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_1
 
-@byte 0, 88, 0, 135
+@byte 0, 88, 0, 135 
 str_trainer_name_2=Noah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_2
 
-@byte 2, 88, 0, 135
+@byte 2, 88, 0, 135 
 str_trainer_name_3=Noah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 14, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_3
 
-@byte 0, 88, 0, 135
+@byte 0, 88, 0, 135 
 str_trainer_name_4=Noah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_4
 
-@byte 0, 88, 0, 135
+@byte 0, 88, 0, 135 
 str_trainer_name_5=Noah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_5
 
-@byte 2, 88, 0, 135
+@byte 2, 88, 0, 135 
 str_trainer_name_6=Noah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 14, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_6
 
-@byte 0, 88, 128, 136
+@byte 0, 88, 128, 136 
 str_trainer_name_7=Emma
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_7
 
-@byte 0, 88, 128, 136
+@byte 0, 88, 128, 136 
 str_trainer_name_8=Emma
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_8
 
-@byte 2, 88, 128, 136
+@byte 2, 88, 128, 136 
 str_trainer_name_9=Emma
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 14, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_9
 
-@byte 0, 88, 128, 136
+@byte 0, 88, 128, 136 
 str_trainer_name_10=Emma
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_10
 
-@byte 0, 88, 128, 136
+@byte 0, 88, 128, 136 
 str_trainer_name_11=Emma
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 6, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_11
 
-@byte 2, 88, 128, 136
+@byte 2, 88, 128, 136 
 str_trainer_name_12=Emma
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 14, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_12
 
-@byte 0, 5, 1, 7
+@byte 0, 5, 1, 7 
 str_trainer_name_13=Lars
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_13
 
-@byte 0, 5, 1, 7
+@byte 0, 5, 1, 7 
 str_trainer_name_14=Lars
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_14
 
-@byte 0, 5, 1, 7
+@byte 0, 5, 1, 7 
 str_trainer_name_15=Lars
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_15
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_16=Alex
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_16
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_17=Alex
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_17
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_18=Alex
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_18
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_19=Steven
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_19
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_20=Steven
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_20
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_21=Steven
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 4, 0, 0, 0
 @word pokemon_von_id_21
 
-@byte 0, 1, 1, 2
+@byte 0, 1, 1, 2 
 str_trainer_name_22=Elias
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_22
 
-@byte 0, 1, 1, 2
+@byte 0, 1, 1, 2 
 str_trainer_name_23=Elias
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_23
 
-@byte 0, 1, 1, 2
+@byte 0, 1, 1, 2 
 str_trainer_name_24=Elias
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_24
 
-@byte 0, 5, 1, 7
+@byte 0, 5, 1, 7 
 str_trainer_name_25=Marcel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_25
 
-@byte 0, 5, 1, 7
+@byte 0, 5, 1, 7 
 str_trainer_name_26=Marcel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_26
 
-@byte 0, 5, 1, 7
+@byte 0, 5, 1, 7 
 str_trainer_name_27=Marcel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_27
 
-@byte 0, 1, 1, 2
+@byte 0, 1, 1, 2 
 str_trainer_name_28=Nico
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_28
 
-@byte 1, 1, 1, 2
+@byte 1, 1, 1, 2 
 str_trainer_name_29=Nico
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_29
 
-@byte 1, 1, 1, 2
+@byte 1, 1, 1, 2 
 str_trainer_name_30=Nico
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_30
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_31=Marvin
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0
 @word pokemon_von_id_31
 
-@byte 1, 48, 1, 56
+@byte 1, 48, 1, 56 
 str_trainer_name_32=Marvin
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 4, 0, 0, 0
 @word pokemon_von_id_32
 
-@byte 1, 48, 1, 56
+@byte 1, 48, 1, 56 
 str_trainer_name_33=Marvin
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 5, 0, 0, 0
 @word pokemon_von_id_33
 
-@byte 0, 31, 1, 37
+@byte 0, 31, 1, 37 
 str_trainer_name_34=Kevin
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_34
 
-@byte 1, 31, 1, 37
+@byte 1, 31, 1, 37 
 str_trainer_name_35=Kevin
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_35
 
-@byte 1, 31, 1, 37
+@byte 1, 31, 1, 37 
 str_trainer_name_36=Kevin
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 23, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_36
 
-@byte 0, 6, 128, 8
+@byte 0, 6, 128, 8 
 str_trainer_name_37=Julia
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_37
 
-@byte 0, 6, 128, 8
+@byte 0, 6, 128, 8 
 str_trainer_name_38=Julia
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_38
 
-@byte 0, 6, 128, 8
+@byte 0, 6, 128, 8 
 str_trainer_name_39=Julia
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_39
 
-@byte 0, 0, 128, 1
+@byte 0, 0, 128, 1 
 str_trainer_name_40=Hanah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_40
 
-@byte 0, 0, 128, 1
+@byte 0, 0, 128, 1 
 str_trainer_name_41=Hanah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_41
 
-@byte 0, 0, 128, 1
+@byte 0, 0, 128, 1 
 str_trainer_name_42=Hanah
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_42
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_43=Jörg
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0
 @word pokemon_von_id_43
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_44=Jörg
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_44
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_45=Jörg
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_45
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_46=Piet
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 4, 0, 0, 0
 @word pokemon_von_id_46
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_47=Piet
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_47
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_48=Piet
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_48
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_49=Marco
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_49
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_50=Marco
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_50
 
-@byte 0, 48, 1, 56
+@byte 0, 48, 1, 56 
 str_trainer_name_51=Marco
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_51
 
-@byte 0, 6, 128, 8
+@byte 0, 6, 128, 8 
 str_trainer_name_52=Isabelle
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_52
 
-@byte 0, 6, 128, 8
+@byte 0, 6, 128, 8 
 str_trainer_name_53=Isabelle
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_53
 
-@byte 0, 6, 128, 8
+@byte 0, 6, 128, 8 
 str_trainer_name_54=Isabelle
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 1, 0, 0, 0
 @word pokemon_von_id_54
 
-@byte 0, 21, 1, 24
+@byte 0, 21, 1, 24 
 str_trainer_name_55=Klaus
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_55
 
-@byte 0, 21, 1, 24
+@byte 0, 21, 1, 24 
 str_trainer_name_56=Klaus
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 3, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_56
 
-@byte 0, 21, 1, 24
+@byte 0, 21, 1, 24 
 str_trainer_name_57=Klaus
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 7, 0, 0, 2, 0, 0, 0
 @word pokemon_von_id_57
 
-@byte 0, 0, 0, 131
+@byte 0, 0, 0, 131 
 str_trainer_name_58=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_58
 
-@byte 0, 0, 0, 131
+@byte 0, 0, 0, 131 
 str_trainer_name_59=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_59
 
-@byte 0, 0, 0, 131
+@byte 0, 0, 0, 131 
 str_trainer_name_60=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
 @word pokemon_von_id_60
 
-@byte 0, 0, 0, 131
+@byte 0, 0, 0, 131 
 str_trainer_name_61=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_61
 
-@byte 0, 0, 0, 131
+@byte 0, 0, 0, 131 
 str_trainer_name_62=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_62
 
-@byte 0, 0, 0, 131
+@byte 0, 0, 0, 131 
 str_trainer_name_63=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
 @word pokemon_von_id_63
 
-@byte 0, 0, 128, 132
+@byte 0, 0, 128, 132 
 str_trainer_name_64=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_64
 
-@byte 0, 0, 128, 132
+@byte 0, 0, 128, 132 
 str_trainer_name_65=Rüpel
 @hword 0, 0, 0, 0
 @byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
 @word pokemon_von_id_65
 
-@byte 0, 0, 128, 132
+@byte 0, 0, 128, 132 
 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
 
-@byte 0, 0, 0, 131
+@byte 0, 0, 0, 131 
 str_trainer_name_67=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 0, 131 
 str_trainer_name_68=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 0, 131 
 str_trainer_name_69=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_70=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_71=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_72=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 0, 131 
 str_trainer_name_73=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 0, 131 
 str_trainer_name_74=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 0, 131 
 str_trainer_name_75=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_76=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_77=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_78=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 0, 131 
 str_trainer_name_79=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 0, 131 
 str_trainer_name_80=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 0, 131 
 str_trainer_name_81=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_82=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_83=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 0, 128, 132 
 str_trainer_name_84=Rüpel
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 112, 0, 133 
 str_trainer_name_85=Markus
-@hword0, 0, 0, 0
+@hword 0, 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
+@byte 0, 112, 0, 133 
 str_trainer_name_86=Markus
-@hword13, 0, 0, 0
+@hword 13, 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
+@byte 1, 112, 0, 133 
 str_trainer_name_87=Markus
-@hword13, 13, 0, 0
+@hword 13, 13, 0, 0
 @byte 0, 0, 0, 0, 0, 383, 0, 0, 6, 0, 0, 0
 @word pokemon_von_id_87