resolve merge conflict

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_00.c

@@ -1,41 +0,0 @@
-
-//{{BLOCK(mug_00)
-
-//======================================================================
-//
-//	mug_00, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 400 = 432
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_00Tiles[100] __attribute__((aligned(4)))=
-{
-	0x00020010,0xF0000034,0x10078001,0x11111370,0x44110000,0x42441041,0x42410021,0x22412442,
-	0x21482422,0x11000300,0x00321900,0x12240000,0x41220011,0x22040314,0x22311142,0x22220400,
-	0x2244441D,0x53F00400,0x00010B30,0x30345512,0x1D004116,0x226A0021,0x302903B0,0x41030024,
-	0x24426300,0x22005000,0x42124224,0x00344241,0x34441342,0x13315514,0x75666100,0x79385177,
-	0x242222AA,0x42211B00,0x11900044,0x44134400,0x11133314,0x35550041,0x66571111,0x86041333,
-	0x31113593,0x43149F00,0x41BA0090,0x31BE0034,0x50144100,0x01C90031,0x0003CD00,0x036A3111,
-	0x9D00D820,0x30A10013,0x0100A5F0,0xA8335100,0x004171AA,0xA7AA2003,0xA7640320,0x0010AAAA,
-	0x10555A75,0x21777751,0x77561400,0x15158337,0x5784041A,0x10AAAA67,0x00656703,0x33677AAA,
-
-	0x003677A7,0x13677700,0x14236703,0x33312F03,0x01313901,0x006A003D,0xA001F006,0x00600B30,
-	0x0000C612,0x0000D6B0,0x00DBBB00,0x00CBEEB0,0xBFEEE300,0xBFFEE300,0x4F012140,0x22212241,
-	0x21004443,0x21441C4C,0x0013BD44,0xEBCD4414,0xE3CD3333,0xCDEB6600,0x23BCDD63,0x73018042,
-	0x440BB144,0x00BCCB14,0xCCDCB144,0x3CDD6B31,0xCDCB3300,0xBDDBEEF3,0xDBEE0AEF,0x6A90FF3D,
-	0xBB77000B,0x000400C2,0xFEEE0059,0x00032003,
-};
-
-const unsigned short mug_00Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x0C62,0x2928,0x0000,0x1CC5,0x2DD7,0x20CB,0x3E9B,
-	0x7FDE,0x76F5,0x5B5F,0x0848,0x15B6,0x1A9A,0x18D8,0x1090,
-};
-
-//}}BLOCK(mug_00)

src/include/assets/mug/mug_00.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_00)
-
-//======================================================================
-//
-//	mug_00, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 400 = 432
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_00_H
-#define GRIT_MUG_00_H
-
-#define mug_00TilesLen 400
-extern const unsigned int mug_00Tiles[100];
-
-#define mug_00PalLen 32
-extern const unsigned short mug_00Pal[16];
-
-#endif // GRIT_MUG_00_H
-
-//}}BLOCK(mug_00)

src/include/assets/mug/mug_01.c

@@ -1,42 +0,0 @@
-
-//{{BLOCK(mug_01)
-
-//======================================================================
-//
-//	mug_01, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 428 = 460
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_01Tiles[107] __attribute__((aligned(4)))=
-{
-	0x00020010,0xF0000036,0x200B4001,0x1A400340,0x00110010,0x20222120,0x24004432,0x42433422,
-	0x04334442,0x44444433,0x22375044,0x00110011,0x12322211,0x33074444,0x43334424,0x1E100210,
-	0x50AA1F60,0x6800015F,0x246C0012,0x6A240800,0x003A3011,0x6E00427B,0x33720043,0x34490085,
-	0x00320000,0x1700320F,0x30143122,0x42442445,0x00140320,0x12442142,0x52221242,0x11122100,
-	0x42211652,0x30676C76,0x42891065,0x01100320,0x41004421,0x21221144,0x10122444,0x00444411,
-	0x0142446C,0x44442800,0x30120310,0x00124203,0x10224233,0x217A1003,0x00EA0024,0x00106503,
-	0x00031087,0x10034021,0x1800F410,0x185775A9,0x02676591,0x77669348,0x03006658,0x77750476,
-	0x00677682,0x00777703,0x55676822,0x44134A91,0x15891100,0x55593442,0x66770041,0x67772155,
-
-	0x00801585,0x66778803,0x56662225,0x21211802,0x40012222,0x12081403,0x01144222,0x42111420,
-	0x12124400,0x22122222,0x14422021,0x22205811,0x00421000,0x00200233,0x22211441,0xBB221000,
-	0xDCB21232,0xD1240042,0xDC1220DD,0x820032DD,0x23326666,0x00325582,0x32224334,0x32133444,
-	0x2DD100A8,0x00DDD500,0x12CCCD43,0x85661100,0x28551442,0x58340022,0x55322218,0x42202218,
-	0xEE540081,0xFE221448,0x21448F00,0xC228EEFF,0x00216422,0x21010067,0x12874012,0xB1000012,
-	0xD200011B,0x000001BC,0x0001CDDD,
-};
-
-const unsigned short mug_01Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x0000,0x0C62,0x2928,0x1CC5,0x2DD7,0x4ABC,0x5B5F,
-	0x20CB,0x7FFF,0x76F5,0x0848,0x1090,0x18D8,0x15B6,0x1A9A,
-};
-
-//}}BLOCK(mug_01)

src/include/assets/mug/mug_01.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_01)
-
-//======================================================================
-//
-//	mug_01, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 428 = 460
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_01_H
-#define GRIT_MUG_01_H
-
-#define mug_01TilesLen 428
-extern const unsigned int mug_01Tiles[107];
-
-#define mug_01PalLen 32
-extern const unsigned short mug_01Pal[16];
-
-#endif // GRIT_MUG_01_H
-
-//}}BLOCK(mug_01)

src/include/assets/mug/mug_02.c

@@ -1,43 +0,0 @@
-
-//{{BLOCK(mug_02)
-
-//======================================================================
-//
-//	mug_02, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 460 = 492
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_02Tiles[115] __attribute__((aligned(4)))=
-{
-	0x00020010,0xE000002A,0x13001001,0x53170051,0x000A00E0,0x100F0003,0x43104311,0x41344405,
-	0x01A04444,0x000F0045,0x00221111,0x21443333,0x43311303,0x00433434,0xEA031020,0x0F002750,
-	0x00025F50,0x6C002368,0x0800A534,0x34080034,0x430B0063,0x103A1510,0x00720054,0x20031027,
-	0x00222F00,0x12000043,0x31000041,0x10003205,0x63101234,0x54770055,0x54043054,0x00348200,
-	0x01441302,0x11881134,0x10988733,0x9810906F,0x14003134,0x81333327,0x43312800,0x33328888,
-	0x12890099,0x28777923,0x43043471,0x44330006,0x34430330,0x44002100,0x12006133,0x02130043,
-	0x06133311,0x142A3311,0x21630006,0x00217E00,0x0000237A,0x00134320,0x14344160,0x00320000,
-	0x870016B7,0xA7003120,0xB89998B2,0x00999866,0x999932B7,0x99999882,0x89997204,0x07002199,
-
-	0xC9008623,0x886123DD,0x00A2B788,0xB6688287,0xB3297898,0x99789802,0x30879999,0x26008903,
-	0x11688999,0x00127888,0x14311711,0x14312806,0x41280200,0x41270064,0x7B008063,0x34110021,
-	0x0B320006,0x32000214,0x00000301,0x50030070,0x33070031,0x0013F700,0xE3403600,0x00D10E00,
-	0x00C23312,0xD2131601,0x77261123,0x26006301,0x7DE21112,0x00CDDDEE,0xFFCCCD8D,0xFFFCCCCF,
-	0xFDDCFF00,0xC6DDFFFF,0x77CF00FF,0x73111662,0x21001616,0x21EEE677,0x00DDDE88,0xDCFCDDDD,
-	0xCCFFFFCC,0xCE031080,0xD6DCCFFF,0x01D06431,0x116B0149,0x21EE6F01,0xDC000000,0xCC00021E,
-	0x10000616,0x00616DCC,0x00061103,
-};
-
-const unsigned short mug_02Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x1086,0x0844,0x18C9,0x294D,0x3E14,0x0000,0x2595,
-	0x3239,0x571E,0x6B5A,0x7FFF,0x3D5B,0x2090,0x0C47,0x4E1F,
-};
-
-//}}BLOCK(mug_02)

src/include/assets/mug/mug_02.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_02)
-
-//======================================================================
-//
-//	mug_02, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 460 = 492
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_02_H
-#define GRIT_MUG_02_H
-
-#define mug_02TilesLen 460
-extern const unsigned int mug_02Tiles[115];
-
-#define mug_02PalLen 32
-extern const unsigned short mug_02Pal[16];
-
-#endif // GRIT_MUG_02_H
-
-//}}BLOCK(mug_02)

src/include/assets/mug/mug_03.c

@@ -1,44 +0,0 @@
-
-//{{BLOCK(mug_03)
-
-//======================================================================
-//
-//	mug_03, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 512 = 544
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_03Tiles[128] __attribute__((aligned(4)))=
-{
-	0x00020010,0x6000002A,0x0B001001,0x44060041,0x11060080,0x62110000,0x21002000,0x32110076,
-	0x00441133,0x44551221,0x55544444,0x11555510,0x41220400,0x77001144,0x88632142,0x00776327,
-	0x00002222,0x00215444,0x44554400,0x44455522,0x00454014,0x44122227,0x06277614,0x78882113,
-	0x70470026,0x00AA0261,0x7000216C,0x11080011,0x40120800,0x207D0031,0x20008791,0x03009062,
-	0x03004579,0x79000067,0x0300A842,0x690000B8,0x08510300,0x77888888,0x88880300,0x78780087,
-	0x77754488,0x8600B345,0x87C36888,0xA0DC7888,0x10781910,0x8812671A,0x13006888,0x63787547,
-	0x00788764,0x787AB371,0x787BC379,0x8BDC6700,0x88776797,0x12760095,0x21000214,0x00800344,
-	0x26002103,0x27003444,0x03104140,0x42270214,0x16420344,0x00000300,0x89008792,0x00001075,
-
-	0x41FB0022,0x80200022,0x14202400,0x23300014,0x1B019814,0x63208832,0x54577F00,0x02118087,
-	0x16887414,0x00114423,0x14231141,0x12DDDC44,0x78881400,0x58887654,0x88340044,0x77221447,
-	0x23001415,0x21321444,0x00CD3414,0xDE331111,0xDE39321C,0x00133320,0x44411167,0x41001124,
-	0x42113414,0x10113111,0x01321112,0x33210052,0x00006800,0xD07E117C,0x00BD8301,0xBEDD00D0,
-	0xFBCFFD00,0xCA00BBC0,0x3BBBBCDA,0x00BBA3E3,0xABB3EEFA,0xDEFEEDEF,0xAB322200,0xEF969CDE,
-	0x6763003E,0x7779C3DE,0x6C00CC3C,0xCCDC3367,0x00DCC3CC,0xDDC3DD3D,0xC969DD3D,0x66CFEF00,
-	0x96CABFC9,0xCBBE00FC,0xCBADE3C9,0x3C0033CC,0xEEECDDCA,0x02AACD33,0xFACDAFEF,0xDF11FEDF,
-	0x000D00DD,0x0CDFFF00,0xBB02BA00,0xABBB00CF,0xAB0700FF,0xBBBB0C00,0xBBBA03BB,0x000300FA,
-};
-
-const unsigned short mug_03Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x0885,0x0442,0x0000,0x112B,0x1DD1,0x29D6,0x429D,
-	0x677F,0x1D0D,0x6B5A,0x7FFF,0x1463,0x24E7,0x45CD,0x56B5,
-};
-
-//}}BLOCK(mug_03)

src/include/assets/mug/mug_03.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_03)
-
-//======================================================================
-//
-//	mug_03, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 512 = 544
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_03_H
-#define GRIT_MUG_03_H
-
-#define mug_03TilesLen 512
-extern const unsigned int mug_03Tiles[128];
-
-#define mug_03PalLen 32
-extern const unsigned short mug_03Pal[16];
-
-#endif // GRIT_MUG_03_H
-
-//}}BLOCK(mug_03)

src/include/assets/mug/mug_04.c

@@ -1,42 +0,0 @@
-
-//{{BLOCK(mug_04)
-
-//======================================================================
-//
-//	mug_04, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 444 = 476
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_04Tiles[111] __attribute__((aligned(4)))=
-{
-	0x00020010,0xE000002A,0x13002001,0x32170012,0x310A00A0,0x00111F00,0x8A333110,0x41330200,
-	0x34030033,0x80440400,0x44430800,0x22133322,0x21110044,0x13330002,0x33420221,0x33330400,
-	0x22002211,0x2600AA13,0x112E0033,0x90232E00,0x00AE025F,0x0340216C,0x100C0011,0x336E0003,
-	0x130340B2,0x1E007A00,0x93002220,0x03508068,0x43312213,0x00333121,0x22211211,0x65522222,
-	0x61136600,0x32A97777,0x2A570076,0x1A777762,0x77007773,0x12211444,0x00122222,0x11225531,
-	0x22566633,0x31161300,0x92A32125,0x26220025,0x175255A2,0x712D56A3,0x31740031,0x89108500,
-	0xAB031023,0x00218000,0x8C002284,0x207F2085,0x01505A6B,0x03408007,0x01B01251,0x6600CB1B,
-	0x77777777,0x50777767,0x75030076,0x67680B00,0x52007655,0x2C777776,0x00666665,0x555558AA,
-
-	0x73566677,0x56677708,0x52030065,0x25006777,0x25667722,0x00566600,0x285502B2,0x22280DBB,
-	0x852BCB17,0x40256001,0x1001F0FB,0xACD0000E,0xAABDD000,0xCD00BD00,0xADCBD0AA,0x00ABB0AA,
-	0xABADD22D,0xABA2ADBB,0xC2AADB00,0xAAACDBBC,0x288800DB,0xCDBCDBCA,0xBA00BDCA,0xDACDBCA2,
-	0x002DBCD2,0x2BDBEEE2,0x2C2BDEFE,0x2BADFF00,0xB2AADF2A,0x2CAB202B,0xCADA2600,0x00CAAADB,
-	0xAAAAC2AA,0xAAAAAD22,0x2DAB2C00,0xCAAC2C22,0xAADB02BD,0x0DDDDBAA,0x00DCC400,0xCAAD0000,
-	0xBAAD000D,0xCD00DB00,0xBD00BCAB,0x0DBA00AC,0x02BAAABB,0xBC00AABB,0x004A0002,
-};
-
-const unsigned short mug_04Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x0CA6,0x0021,0x192A,0x25AE,0x29B6,0x3E9B,0x5F5F,
-	0x1CCA,0x7B58,0x7FFF,0x5A2E,0x76F5,0x24E7,0x4166,0x622C,
-};
-
-//}}BLOCK(mug_04)

src/include/assets/mug/mug_04.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_04)
-
-//======================================================================
-//
-//	mug_04, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 444 = 476
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_04_H
-#define GRIT_MUG_04_H
-
-#define mug_04TilesLen 444
-extern const unsigned int mug_04Tiles[111];
-
-#define mug_04PalLen 32
-extern const unsigned short mug_04Pal[16];
-
-#endif // GRIT_MUG_04_H
-
-//}}BLOCK(mug_04)

src/include/assets/mug/mug_05.c

@@ -1,44 +0,0 @@
-
-//{{BLOCK(mug_05)
-
-//======================================================================
-//
-//	mug_05, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 492 = 524
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_05Tiles[123] __attribute__((aligned(4)))=
-{
-	0x00020010,0xE0000020,0x00001201,0x00A85120,0x0A005503,0x101F3053,0x10000021,0x22222331,
-	0x00551233,0x53552135,0x33555533,0x00515324,0x20352103,0x0022223F,0x41331200,0x04133500,
-	0x21550000,0x33330222,0x35210515,0x00533333,0x5FF01502,0x02000015,0x00211200,0x08104216,
-	0x33122000,0x35112000,0x21320000,0x15320031,0x34000051,0x14001213,0x01004153,0x00112540,
-	0x00222140,0x00124D4B,0x3033214A,0x1257204F,0x44005C00,0x66155512,0x04244442,0x11215335,
-	0x21230012,0x21110012,0x21111144,0x12002221,0x11415311,0x00144211,0x21221112,0x04111127,
-	0x35000000,0x51000023,0x00020033,0x00211121,0x44084211,0x00415200,0x000025E4,0x10551129,
-	0xA3002489,0xF3004624,0xF700C654,0x87AD0086,0x0062B100,0x75300000,0x2A930000,0x88860051,
-
-	0x6B65A956,0xB8009D45,0xBBB8C8BB,0xE0BB8BBB,0x03200400,0x76B60600,0x00118867,0xA9526822,
-	0x9D518687,0x51866700,0x15186668,0x3116008B,0x33268B45,0x76008852,0x7668E452,0x2221E522,
-	0x73000251,0x00120004,0x00C04487,0x110D118B,0xA4000005,0x0005003A,0x005AAE4E,0x99005000,
-	0x395000A3,0x0010009A,0x400099EE,0xCC009993,0xC0999500,0xD499E1FD,0xEE4D00FF,0x54CFFFD4,
-	0x88008862,0x68863988,0x003A9936,0xEA99AA33,0xAE99999A,0xA9999900,0xEE9999A3,0x999A00E5,
-	0x9AEE541E,0x15005766,0xAAEE55E1,0x0093A95E,0x3A99EA99,0xE999A999,0x03009A40,0xEA99E99E,
-	0xA9004EE3,0x5AD4145E,0x0005A3EE,0x5A95E4AA,0x393EE4AE,0x5EE1E500,0x5E4C11E9,0xCDD400E9,
-	0xDFFDEA54,0xFF00EE91,0x00EEA91F,
-};
-
-const unsigned short mug_05Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x1884,0x0C42,0x398A,0x0000,0x2906,0x25B5,0x1D0C,
-	0x3E9B,0x7FFF,0x7B58,0x5F5F,0x20A4,0x4565,0x6292,0x61E8,
-};
-
-//}}BLOCK(mug_05)

src/include/assets/mug/mug_05.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_05)
-
-//======================================================================
-//
-//	mug_05, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 492 = 524
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_05_H
-#define GRIT_MUG_05_H
-
-#define mug_05TilesLen 492
-extern const unsigned int mug_05Tiles[123];
-
-#define mug_05PalLen 32
-extern const unsigned short mug_05Pal[16];
-
-#endif // GRIT_MUG_05_H
-
-//}}BLOCK(mug_05)

src/include/assets/mug/mug_06.c

@@ -1,43 +0,0 @@
-
-//{{BLOCK(mug_06)
-
-//======================================================================
-//
-//	mug_06, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 476 = 508
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_06Tiles[119] __attribute__((aligned(4)))=
-{
-	0x00020010,0xE000002A,0x13001001,0x44060041,0x1100000A,0x111F4034,0x00330B00,0x33331110,
-	0x33333131,0x33433305,0x06001333,0x81070013,0x00221C20,0x21333300,0x33280300,0x231D0002,
-	0x33431B00,0x41333A31,0x3F502900,0x000204A0,0x00A02112,0x1A205316,0x10003432,0x00440031,
-	0x00413320,0x22001320,0x21231200,0x90133200,0x12120300,0x23920300,0x33003443,0x34443121,
-	0x00333162,0x33127644,0x33167833,0x27763300,0x69923331,0x2A330012,0x31111261,0x14004313,
-	0x33441433,0xC0313441,0x03507200,0x33213323,0x21001151,0x33315111,0x50000005,0x12030031,
-	0x13236C00,0x53000002,0x51000511,0x48002331,0x23AF0051,0x32850011,0x00206212,0x21031012,
-	0x21200065,0x83002154,0x128B0052,0x11340330,0x566B5500,0x678ADC31,0x88660015,0x88885677,
-
-	0x86006777,0x82777778,0x00888888,0x86998651,0x48886531,0x23312300,0x12121133,0x12110011,
-	0x15151115,0x56003115,0x68311215,0x00332115,0x43511566,0x44515E34,0x63001245,0x00511115,
-	0x07000203,0x1500050D,0x018B0051,0x97002400,0x9B002360,0x0012FE00,0x00151331,0x31234310,
-	0x11513441,0x15134108,0xF5B80021,0x51001125,0xC55520DC,0x001BB3DD,0xBBE4A431,0xEAAEAAAE,
-	0xABAAAA00,0xBEAAAAAB,0xBAAA00BE,0x34BBE3E2,0xEE00352C,0x552FCD2E,0x0054BA22,0xEBAA3321,
-	0xEBAA1325,0xBA231200,0x2E513322,0x51132044,0x31153E01,0x05331552,0x13331121,0x23FB1021,
-	0x10800301,0x00325103,0x03AAE511,0xABFC5100,0xE5DDF234,0xCDC500AA,0x0052BAE5,
-};
-
-const unsigned short mug_06Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x1884,0x0C42,0x2906,0x3DAB,0x0000,0x25B5,0x5F5F,
-	0x3E9B,0x1D0C,0x7FFF,0x7B58,0x4565,0x61E8,0x6292,0x20A4,
-};
-
-//}}BLOCK(mug_06)

src/include/assets/mug/mug_06.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_06)
-
-//======================================================================
-//
-//	mug_06, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 476 = 508
-//
-//	Time-stamp: 2017-05-08, 11:18:01
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_06_H
-#define GRIT_MUG_06_H
-
-#define mug_06TilesLen 476
-extern const unsigned int mug_06Tiles[119];
-
-#define mug_06PalLen 32
-extern const unsigned short mug_06Pal[16];
-
-#endif // GRIT_MUG_06_H
-
-//}}BLOCK(mug_06)

src/include/assets/mug/mug_07.c

@@ -1,44 +0,0 @@
-
-//{{BLOCK(mug_07)
-
-//======================================================================
-//
-//	mug_07, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 484 = 516
-//
-//	Time-stamp: 2017-05-08, 11:18:02
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_07Tiles[121] __attribute__((aligned(4)))=
-{
-	0x00020010,0xF0000035,0x200F0001,0x00121300,0x30324017,0x0021101B,0x00133110,0x23333110,
-	0x23333331,0x33333300,0x13333311,0x0600C412,0x22002310,0x112C0022,0x31000522,0x00021133,
-	0x1F00411B,0x2300134C,0x10001133,0x00005BF0,0x12000454,0x11160041,0x20000810,0x41003160,
-	0x52122700,0x00132000,0x53200075,0x63100077,0x32007700,0x32008961,0x13A90076,0x51565551,
-	0x75008775,0x78777795,0x00877787,0x46995795,0xA6AA4844,0xBB6A6608,0xAA0100A6,0x1100556B,
-	0x65873111,0x00771111,0x78111697,0x96166987,0x68885900,0x8778644A,0x794600BA,0x846AAA77,
-	0x00A81377,0x03101168,0x04031021,0x00821100,0x21121674,0x14002600,0x18108025,0x00B87632,
-	0x00B67614,0xAA841400,0x99612000,0x41400000,0x44000096,0x00000898,0xB9008860,0x00AAAB84,
-
-	0x66A6CAAC,0x74CAEDDB,0xCFEEB800,0xDFEED744,0xEED70031,0xEEDDEEEF,0xEC00EEDF,0xDDDDF9EE,
-	0x00ACCCEE,0x6BCE994A,0x74B556A6,0xCE74C800,0xDE74C744,0x94C70031,0x56CDDEEE,0x6D01DEEE,
-	0x4CDCDE89,0x7C006888,0x10167720,0x87002103,0x00000414,0x00042498,0x2A004269,0x04014900,
-	0x461A3144,0xC0952101,0x73006F00,0x22005862,0x20008561,0x14751331,0x00961333,0x62213334,
-	0x877CDD69,0xDDDF5600,0xDDF585DD,0x587700DD,0x58775555,0x77107789,0x09017898,0x85997777,
-	0xC9777700,0xDD4896DD,0x649600FC,0x966556FC,0x87018566,0x77785895,0x21009798,0x25008754,
-	0x96100158,0x06896C01,0x88000008,0x49030069,0x89000002,0x95002149,0x04041114,0x41133146,
-	0x00AB0114,
-};
-
-const unsigned short mug_07Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x4565,0x20A4,0x5E07,0x0000,0x3DAB,0x1884,0x7FFF,
-	0x7B58,0x6292,0x0C42,0x2906,0x25B5,0x363A,0x5B3E,0x1D0C,
-};
-
-//}}BLOCK(mug_07)

src/include/assets/mug/mug_07.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_07)
-
-//======================================================================
-//
-//	mug_07, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 484 = 516
-//
-//	Time-stamp: 2017-05-08, 11:18:02
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_07_H
-#define GRIT_MUG_07_H
-
-#define mug_07TilesLen 484
-extern const unsigned int mug_07Tiles[121];
-
-#define mug_07PalLen 32
-extern const unsigned short mug_07Pal[16];
-
-#endif // GRIT_MUG_07_H
-
-//}}BLOCK(mug_07)

src/include/assets/mug/mug_08.c

@@ -1,44 +0,0 @@
-
-//{{BLOCK(mug_08)
-
-//======================================================================
-//
-//	mug_08, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 504 = 536
-//
-//	Time-stamp: 2017-08-26, 17:30:27
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_08Tiles[126] __attribute__((aligned(4)))=
-{
-	0x00020010,0x20000020,0x00002201,0x00143320,0x03003200,0x110B0021,0x07008032,0x32100033,
-	0x00111133,0x21121111,0x22333322,0x04001144,0x00322123,0x92333304,0x55230110,0x11770200,
-	0x00113C10,0x22220001,0x23330411,0x32412200,0x21222233,0x22220022,0x21265565,0x67357958,
-	0x605F402A,0x70000406,0x91701042,0x12220800,0x33207D00,0x006A0033,0x33310033,0x23320023,
-	0x33101105,0x03006233,0x00070052,0x33324056,0x77523396,0x76237700,0x95627777,0x76990077,
-	0x79889987,0x4A008597,0xA6468777,0x00548977,0xBA4877B5,0x777799CB,0x7959A900,0x98686777,
-	0x4A670079,0x66998A44,0x8400466B,0x4BA55A55,0x02BAACAA,0xBFCEDDA6,0x6C0022AB,0x0122092A,
-	0x7000A700,0x03002A77,0x00122600,0x0042A698,0x42A8016A,0x42498400,0x00630000,0x33240076,
-
-	0x2240007A,0xFB007A40,0x2400006A,0x002800A2,0x40030010,0x69149D10,0xA94700AA,0x8744A487,
-	0x3201A497,0xEA6497E7,0x030069DD,0xA55A8800,0x66A89ADC,0x4994008B,0xACDEECBA,0xDD00A847,
-	0xDD6944CD,0x006932ED,0xACEECDDD,0x4AECDDDD,0xCECEDD00,0xBCEC774B,0xCEEE0084,0x4994666A,
-	0x84000041,0x54000148,0x05000446,0x00004A84,0xA800018A,0x486A7401,0x7F010B41,0xA0034040,
-	0x02A17700,0x42310000,0x0B011000,0x03208024,0x5589A412,0x006A86E6,0x9679A899,0x78798777,
-	0x78577700,0x7A897777,0x98770079,0x95977884,0x89009841,0x866ACE86,0x00566A98,0x99967788,
-	0x77797795,0x77778904,0x22009777,0x00819877,0x77795808,0x01A66897,0x0A9705E0,0x00770000,
-	0x74007774,0x04489700,0x012A8900,0x24880000,0x21480042,0x00000042,
-};
-
-const unsigned short mug_08Pal[16] __attribute__((aligned(4)))=
-{
-	0x7FE0,0x20A4,0x4565,0x5E07,0x0000,0x3DAB,0x2906,0x7FFF,
-	0x6292,0x7B58,0x1884,0x0C42,0x25B5,0x5B3E,0x363A,0x1D0C,
-};
-
-//}}BLOCK(mug_08)

src/include/assets/mug/mug_08.h

@@ -1,28 +0,0 @@
-
-//{{BLOCK(mug_08)
-
-//======================================================================
-//
-//	mug_08, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 504 = 536
-//
-//	Time-stamp: 2017-08-26, 17:30:27
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-#ifndef GRIT_MUG_08_H
-#define GRIT_MUG_08_H
-
-#define mug_08TilesLen 504
-extern const unsigned int mug_08Tiles[126];
-
-#define mug_08PalLen 32
-extern const unsigned short mug_08Pal[16];
-
-#endif // GRIT_MUG_08_H
-
-//}}BLOCK(mug_08)

src/include/assets/mug/mug_09.c

@@ -1,43 +0,0 @@
-
-//{{BLOCK(mug_09)
-
-//======================================================================
-//
-//	mug_09, 32x32@4, 
-//	+ palette 16 entries, not compressed
-//	+ 16 tiles lz77 compressed
-//	Total size: 32 + 468 = 500
-//
-//	Time-stamp: 2017-08-24, 21:53:46
-//	Exported by Cearn's GBA Image Transmogrifier, v0.8.6
-//	( http://www.coranac.com/projects/#grit )
-//
-//======================================================================
-
-const unsigned int mug_09Tiles[117] __attribute__((aligned(4)))=
-{
-	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[16] __attribute__((aligned(4)))=
-{
-	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

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

string/de/trainers/trainer_data.txt

@@ -6,524 +6,698 @@ 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 6, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 14, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 6, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 14, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 6, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 14, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 6, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 14, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 23, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 3, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 7, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 15, 0, 0, 2, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 383, 0, 0, 3, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 15, 0, 0, 3, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 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
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 383, 0, 0, 4, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 4, 0, 0, 0
 @word pokemon_von_id_84
 
-@byte 0, 112, 0, 133 
+@byte 0, 112, 0, 133
 str_trainer_name_85=Markus
 @hword 0, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 0, 0, 0, 5, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 0, 0
+@byte 5, 0, 0, 0
 @word pokemon_von_id_85
 
-@byte 0, 112, 0, 133 
+@byte 0, 112, 0, 133
 str_trainer_name_86=Markus
 @hword 13, 0, 0, 0
-@byte 0, 0, 0, 0, 0, 15, 0, 0, 5, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 15, 0
+@byte 5, 0, 0, 0
 @word pokemon_von_id_86
 
-@byte 1, 112, 0, 133 
+@byte 1, 112, 0, 133
 str_trainer_name_87=Markus
 @hword 13, 13, 0, 0
-@byte 0, 0, 0, 0, 0, 383, 0, 0, 6, 0, 0, 0
+@byte 0, 0, 0, 0
+@hword 383, 0
+@byte 6, 0, 0, 0
 @word pokemon_von_id_87