Use designated initializers (C99 feat)

1 files changed, 612 insertions, 612 deletions

diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index e0e51a48e..e24abfb29 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -45,647 +45,647 @@ static u16 gUnknown_030012F2;
 static u16 gUnknown_030012F4;
 
 static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
-    {
-        __("マキエ$$$$$"),
-        FACILITY_CLASS_HEX_MANIAC,
-        0x1,
-        { EC_WORD_PREPOSTEROUS, EC_WORD_CASE, EC_WORD_THERE, EC_WORD_TO_HER, EC_WORD_CHALLENGE, EC_WORD_JOKING },
-        { EC_WORD_HERS, EC_WORD_TRUMP_CARD, EC_MOVE2(SECRET_POWER), EC_WORD_USING, EC_WORD_WON, EC_WORD_EXCL_EXCL },
-        { EC_WORD_TO_HER, EC_WORD_WIN, EC_WORD_JOKING, EC_WORD_HIGHS, EC_WORD_SCARY, EC_WORD_ELLIPSIS_EXCL },
-        { EC_WORD_IGNORANT, EC_WORD_SO, EC_WORD_TODAY, EC_WORD_NIGHTTIME, EC_WORD_YOU_RE, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS },
-        {
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+    [0] = {
+        .name = __("マキエ$$$$$   "),
+        .facilityClass = FACILITY_CLASS_HEX_MANIAC,
+        .unused = 0x1,
+        .speechBefore = { EC_WORD_PREPOSTEROUS, EC_WORD_CASE, EC_WORD_THERE, EC_WORD_TO_HER, EC_WORD_CHALLENGE, EC_WORD_JOKING },
+        .speechWin = { EC_WORD_HERS, EC_WORD_TRUMP_CARD, EC_MOVE2(SECRET_POWER), EC_WORD_USING, EC_WORD_WON, EC_WORD_EXCL_EXCL },
+        .speechLose = { EC_WORD_TO_HER, EC_WORD_WIN, EC_WORD_JOKING, EC_WORD_HIGHS, EC_WORD_SCARY, EC_WORD_ELLIPSIS_EXCL },
+        .speechAfter = { EC_WORD_IGNORANT, EC_WORD_SO, EC_WORD_TODAY, EC_WORD_NIGHTTIME, EC_WORD_YOU_RE, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS },
+        .mons = {
+            [0] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+            [1] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+            [2] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_SWALOT,
-                ITEM_SHELL_BELL,
-                { MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT, MOVE_YAWN },
-                0,
-                0x0,
-                55,
-                255,
-                100,
-                0,
-                0,
-                100,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                1,
-                0x80,
-                __("マルノーム$$$$$$"),
-                255
+            [3] = {
+                .species = SPECIES_SWALOT,
+                .heldItem = ITEM_SHELL_BELL,
+                .moves = { MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_PAIN_SPLIT, MOVE_YAWN },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 55,
+                .attackEV = 255,
+                .defenseEV = 100,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 100,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 1,
+                .personality = 0x80,
+                .nickname = __("マルノーム$$$$$$"),
+                .friendship = 255
             },
-            {
-                SPECIES_DUSTOX,
-                ITEM_BRIGHT_POWDER,
-                { MOVE_SILVER_WIND, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_GIGA_DRAIN },
-                0,
-                0x0,
-                0,
-                255,
-                0,
-                0,
-                255,
-                0,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x6,
-                __("ドクケイル$$$$$$"),
-                255
+            [4] = {
+                .species = SPECIES_DUSTOX,
+                .heldItem = ITEM_BRIGHT_POWDER,
+                .moves = { MOVE_SILVER_WIND, MOVE_SLUDGE_BOMB, MOVE_SHADOW_BALL, MOVE_GIGA_DRAIN },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 255,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 255,
+                .spDefenseEV = 0,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x6,
+                .nickname = __("ドクケイル$$$$$$"),
+                .friendship = 255
             },
-            {
-                SPECIES_RELICANTH,
-                ITEM_QUICK_CLAW,
-                { MOVE_ANCIENT_POWER, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_AMNESIA },
-                0,
-                0x0,
-                100,
-                0,
-                0,
-                0,
-                155,
-                255,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x2f,
-                __("ジーランス$$$$$$"),
-                255
+            [5] = {
+                .species = SPECIES_RELICANTH,
+                .heldItem = ITEM_QUICK_CLAW,
+                .moves = { MOVE_ANCIENT_POWER, MOVE_SURF, MOVE_EARTHQUAKE, MOVE_AMNESIA },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 100,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 155,
+                .spDefenseEV = 255,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x2f,
+                .nickname = __("ジーランス$$$$$$"),
+                .friendship = 255
             },
         }
     },
-    {
-        __("ハルヒト$$$$"),
-        FACILITY_CLASS_CAMPER,
-        0x1,
-        { EC_MOVE2(BOUNCE), EC_WORD_AS_MUCH_AS, 0xFFFF, EC_WORD_THEY_RE, EC_WORD_STRONG, EC_WORD_EXCL },
-        { EC_MOVE(FLY), EC_WORD_AS_MUCH_AS, 0xFFFF, EC_WORD_THEY_RE, EC_WORD_HAPPY, EC_WORD_EXCL },
-        { EC_MOVE2(MINIMIZE), EC_WORD_AS_MUCH_AS, 0xFFFF, EC_WORD_THEY_RE, EC_WORD_SAD, EC_WORD_EXCL },
-        { EC_MOVE(BITE), EC_WORD_AS_MUCH_AS, 0xFFFF, EC_WORD_THEY_RE, EC_WORD_ANGRY, EC_WORD_EXCL },
-        {
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+    [1] = {
+        .name = __("ハルヒト$$$$   "),
+        .facilityClass = FACILITY_CLASS_CAMPER,
+        .unused = 0x1,
+        .speechBefore = { EC_MOVE2(BOUNCE), EC_WORD_AS_MUCH_AS, 0xFFFF, EC_WORD_THEY_RE, EC_WORD_STRONG, EC_WORD_EXCL },
+        .speechWin = { EC_MOVE(FLY), EC_WORD_AS_MUCH_AS, 0xFFFF, EC_WORD_THEY_RE, EC_WORD_HAPPY, EC_WORD_EXCL },
+        .speechLose = { EC_MOVE2(MINIMIZE), EC_WORD_AS_MUCH_AS, 0xFFFF, EC_WORD_THEY_RE, EC_WORD_SAD, EC_WORD_EXCL },
+        .speechAfter = { EC_MOVE(BITE), EC_WORD_AS_MUCH_AS, 0xFFFF, EC_WORD_THEY_RE, EC_WORD_ANGRY, EC_WORD_EXCL },
+        .mons = {
+            [0] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+            [1] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+            [2] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_CACTURNE,
-                ITEM_QUICK_CLAW,
-                { MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_THUNDER_PUNCH, MOVE_GROWTH },
-                0,
-                0x0,
-                55,
-                0,
-                100,
-                0,
-                255,
-                100,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x8c,
-                __("ノクタス$$$$$$$"),
-                255
+            [3] = {
+                .species = SPECIES_CACTURNE,
+                .heldItem = ITEM_QUICK_CLAW,
+                .moves = { MOVE_GIGA_DRAIN, MOVE_FAINT_ATTACK, MOVE_THUNDER_PUNCH, MOVE_GROWTH },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 55,
+                .attackEV = 0,
+                .defenseEV = 100,
+                .speedEV = 0,
+                .spAttackEV = 255,
+                .spDefenseEV = 100,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x8c,
+                .nickname = __("ノクタス$$$$$$$"),
+                .friendship = 255
             },
-            {
-                SPECIES_SWELLOW,
-                ITEM_BRIGHT_POWDER,
-                { MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM },
-                0,
-                0x0,
-                255,
-                255,
-                0,
-                0,
-                0,
-                0,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x80,
-                __("オオスバメ$$$$$$"),
-                255
+            [4] = {
+                .species = SPECIES_SWELLOW,
+                .heldItem = ITEM_BRIGHT_POWDER,
+                .moves = { MOVE_FACADE, MOVE_AERIAL_ACE, MOVE_QUICK_ATTACK, MOVE_DOUBLE_TEAM },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 255,
+                .attackEV = 255,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x80,
+                .nickname = __("オオスバメ$$$$$$"),
+                .friendship = 255
             },
-            {
-                SPECIES_WHISCASH,
-                ITEM_CHESTO_BERRY,
-                { MOVE_SURF, MOVE_EARTHQUAKE, MOVE_AMNESIA, MOVE_REST },
-                0,
-                0x0,
-                0,
-                255,
-                0,
-                0,
-                255,
-                0,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x0,
-                __("ナマズン$$$$$$$"),
-                255
+            [5] = {
+                .species = SPECIES_WHISCASH,
+                .heldItem = ITEM_CHESTO_BERRY,
+                .moves = { MOVE_SURF, MOVE_EARTHQUAKE, MOVE_AMNESIA, MOVE_REST },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 255,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 255,
+                .spDefenseEV = 0,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("ナマズン$$$$$$$"),
+                .friendship = 255
             },
         }
     },
-    {
-        __("メイコ$$$$$"),
-        FACILITY_CLASS_SCHOOL_KID_F,
-        0x1,
-        { EC_WORD_SHINE, EC_WORD_POKEMON, EC_WORD_RELEASE, EC_WORD_WAS, EC_MOVE2(FRUSTRATION), EC_WORD_WITHOUT },
-        { EC_WORD_SHINE, EC_WORD_POKEMON, EC_WORD_TO_HER, EC_MOVE2(PRESENT), EC_WORD_KNOWS, EC_WORD_WITHOUT },
-        { EC_WORD_THAT, EC_WORD_ABOVE, EC_WORD_LOST, EC_WORD_STORES, EC_WORD_JOKING, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS },
-        { EC_WORD_ENTERTAINING, EC_WORD_NONE, EC_WORD_HEY_QUES, EC_WORD_ALMOST, EC_WORD_EXCL, 0xFFFF },
-        {
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+    [2] = {
+        .name = __("メイコ$$$$$   "),
+        .facilityClass = FACILITY_CLASS_SCHOOL_KID_F,
+        .unused = 0x1,
+        .speechBefore = { EC_WORD_SHINE, EC_WORD_POKEMON, EC_WORD_RELEASE, EC_WORD_WAS, EC_MOVE2(FRUSTRATION), EC_WORD_WITHOUT },
+        .speechWin = { EC_WORD_SHINE, EC_WORD_POKEMON, EC_WORD_TO_HER, EC_MOVE2(PRESENT), EC_WORD_KNOWS, EC_WORD_WITHOUT },
+        .speechLose = { EC_WORD_THAT, EC_WORD_ABOVE, EC_WORD_LOST, EC_WORD_STORES, EC_WORD_JOKING, EC_WORD_ELLIPSIS_ELLIPSIS_ELLIPSIS },
+        .speechAfter = { EC_WORD_ENTERTAINING, EC_WORD_NONE, EC_WORD_HEY_QUES, EC_WORD_ALMOST, EC_WORD_EXCL, 0xFFFF },
+        .mons = {
+            [0] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+            [1] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+            [2] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_DELCATTY,
-                ITEM_LUM_BERRY,
-                { MOVE_SING, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_IRON_TAIL },
-                0,
-                0x0,
-                0,
-                255,
-                0,
-                255,
-                0,
-                0,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x3,
-                __("エネコロロ$$$$$$"),
-                255
+            [3] = {
+                .species = SPECIES_DELCATTY,
+                .heldItem = ITEM_LUM_BERRY,
+                .moves = { MOVE_SING, MOVE_BODY_SLAM, MOVE_SHADOW_BALL, MOVE_IRON_TAIL },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 255,
+                .defenseEV = 0,
+                .speedEV = 255,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x3,
+                .nickname = __("エネコロロ$$$$$$"),
+                .friendship = 255
             },
-            {
-                SPECIES_ROSELIA,
-                ITEM_LEFTOVERS,
-                { MOVE_GIGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_TOXIC, MOVE_LEECH_SEED },
-                0,
-                0x0,
-                255,
-                0,
-                0,
-                0,
-                255,
-                0,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                1,
-                0x6,
-                __("ロゼリア$$$$$$$"),
-                255
+            [4] = {
+                .species = SPECIES_ROSELIA,
+                .heldItem = ITEM_LEFTOVERS,
+                .moves = { MOVE_GIGA_DRAIN, MOVE_GRASS_WHISTLE, MOVE_TOXIC, MOVE_LEECH_SEED },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 255,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 255,
+                .spDefenseEV = 0,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 1,
+                .personality = 0x6,
+                .nickname = __("ロゼリア$$$$$$$"),
+                .friendship = 255
             },
-            {
-                SPECIES_BEAUTIFLY,
-                ITEM_BRIGHT_POWDER,
-                { MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_PSYCHIC },
-                0,
-                0x0,
-                100,
-                200,
-                0,
-                0,
-                200,
-                0,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x6,
-                __("アゲハント$$$$$$"),
-                255
+            [5] = {
+                .species = SPECIES_BEAUTIFLY,
+                .heldItem = ITEM_BRIGHT_POWDER,
+                .moves = { MOVE_SILVER_WIND, MOVE_AERIAL_ACE, MOVE_ATTRACT, MOVE_PSYCHIC },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 100,
+                .attackEV = 200,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 200,
+                .spDefenseEV = 0,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x6,
+                .nickname = __("アゲハント$$$$$$"),
+                .friendship = 255
             },
         }
     },
-    {
-        __("ピエール$$$$"),
-        FACILITY_CLASS_GENTLEMAN,
-        0x1,
-        { EC_WORD_SHE_WAS, EC_WORD_NO_1, EC_WORD_STRONG, EC_WORD_UNCLE, EC_WORD_THERE, EC_WORD_EXCL },
-        { EC_WORD_HAHAHA, EC_WORD_TEACHER, EC_WORD_BECOMES, EC_WORD_GIVE, EC_WORD_IS_IT_QUES, 0xFFFF },
-        { EC_WORD_OUTSIDE, EC_WORD_UNCLE, EC_WORD_SURPRISE, EC_WORD_THESE, EC_WORD_HEY_QUES, EC_WORD_ELLIPSIS_EXCL },
-        { EC_WORD_HE_S, EC_WORD_NO_1, EC_WORD_STRONG, EC_WORD_CHILDREN, EC_WORD_CAN_T, EC_WORD_EXCL_EXCL },
-        {
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+    [3] = {
+        .name = __("ピエール$$$$   "),
+        .facilityClass = FACILITY_CLASS_GENTLEMAN,
+        .unused = 0x1,
+        .speechBefore = { EC_WORD_SHE_WAS, EC_WORD_NO_1, EC_WORD_STRONG, EC_WORD_UNCLE, EC_WORD_THERE, EC_WORD_EXCL },
+        .speechWin = { EC_WORD_HAHAHA, EC_WORD_TEACHER, EC_WORD_BECOMES, EC_WORD_GIVE, EC_WORD_IS_IT_QUES, 0xFFFF },
+        .speechLose = { EC_WORD_OUTSIDE, EC_WORD_UNCLE, EC_WORD_SURPRISE, EC_WORD_THESE, EC_WORD_HEY_QUES, EC_WORD_ELLIPSIS_EXCL },
+        .speechAfter = { EC_WORD_HE_S, EC_WORD_NO_1, EC_WORD_STRONG, EC_WORD_CHILDREN, EC_WORD_CAN_T, EC_WORD_EXCL_EXCL },
+        .mons = {
+            [0] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+            [1] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_NONE,
-                ITEM_NONE,
-                { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0,
-                0x0,
-                __("$$$$$$$$$$$"),
-                0
+            [2] = {
+                .species = SPECIES_NONE,
+                .heldItem = ITEM_NONE,
+                .moves = { MOVE_NONE, MOVE_NONE, MOVE_NONE, MOVE_NONE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 0,
+                .spDefenseEV = 0,
+                .otId = 0x0,
+                .hpIV = 0,
+                .attackIV = 0,
+                .defenseIV = 0,
+                .speedIV = 0,
+                .spAttackIV = 0,
+                .spDefenseIV = 0,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x0,
+                .nickname = __("$$$$$$$$$$$"),
+                .friendship = 0
             },
-            {
-                SPECIES_MAWILE,
-                ITEM_BRIGHT_POWDER,
-                { MOVE_CRUNCH, MOVE_FLAMETHROWER, MOVE_THUNDER_PUNCH, MOVE_COMET_PUNCH },
-                0,
-                0x0,
-                0,
-                0,
-                100,
-                0,
-                255,
-                155,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                1,
-                0x0,
-                __("クチート$$$$$$$"),
-                255
+            [3] = {
+                .species = SPECIES_MAWILE,
+                .heldItem = ITEM_BRIGHT_POWDER,
+                .moves = { MOVE_CRUNCH, MOVE_FLAMETHROWER, MOVE_THUNDER_PUNCH, MOVE_COMET_PUNCH },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 0,
+                .attackEV = 0,
+                .defenseEV = 100,
+                .speedEV = 0,
+                .spAttackEV = 255,
+                .spDefenseEV = 155,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 1,
+                .personality = 0x0,
+                .nickname = __("クチート$$$$$$$"),
+                .friendship = 255
             },
-            {
-                SPECIES_SHARPEDO,
-                ITEM_SCOPE_LENS,
-                { MOVE_SURF, MOVE_CRUNCH, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE },
-                0,
-                0x0,
-                255,
-                0,
-                0,
-                0,
-                255,
-                0,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x96,
-                __("サメハダー$$$$$$"),
-                255
+            [4] = {
+                .species = SPECIES_SHARPEDO,
+                .heldItem = ITEM_SCOPE_LENS,
+                .moves = { MOVE_SURF, MOVE_CRUNCH, MOVE_DOUBLE_EDGE, MOVE_EARTHQUAKE },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 255,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 255,
+                .spDefenseEV = 0,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x96,
+                .nickname = __("サメハダー$$$$$$"),
+                .friendship = 255
             },
-            {
-                SPECIES_BANETTE,
-                ITEM_LUM_BERRY,
-                { MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_WILL_O_WISP },
-                0,
-                0x0,
-                255,
-                0,
-                0,
-                0,
-                255,
-                0,
-                0x10000000,
-                5,
-                5,
-                5,
-                5,
-                5,
-                5,
-                0,
-                0,
-                0x96,
-                __("ジュペッタ$$$$$$"),
-                255
+            [5] = {
+                .species = SPECIES_BANETTE,
+                .heldItem = ITEM_LUM_BERRY,
+                .moves = { MOVE_PSYCHIC, MOVE_SHADOW_BALL, MOVE_THUNDERBOLT, MOVE_WILL_O_WISP },
+                .level = 0,
+                .ppBonuses = 0x0,
+                .hpEV = 255,
+                .attackEV = 0,
+                .defenseEV = 0,
+                .speedEV = 0,
+                .spAttackEV = 255,
+                .spDefenseEV = 0,
+                .otId = 0x10000000,
+                .hpIV = 5,
+                .attackIV = 5,
+                .defenseIV = 5,
+                .speedIV = 5,
+                .spAttackIV = 5,
+                .spDefenseIV = 5,
+                .gap = 0,
+                .abilityNum = 0,
+                .personality = 0x96,
+                .nickname = __("ジュペッタ$$$$$$"),
+                .friendship = 255
             },
         }
     },