NULL_BATTLE_TOWER_POKEMON define

1 files changed, 12 insertions, 312 deletions

diff --git a/src/ereader_helpers.c b/src/ereader_helpers.c
index e24abfb29..f680e32e0 100755
--- a/src/ereader_helpers.c
+++ b/src/ereader_helpers.c
@@ -54,81 +54,9 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
         .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
-            },
-            [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
-            },
-            [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
-            },
+            [0] = NULL_BATTLE_TOWER_POKEMON,
+            [1] = NULL_BATTLE_TOWER_POKEMON,
+            [2] = NULL_BATTLE_TOWER_POKEMON,
             [3] = {
                 .species = SPECIES_SWALOT,
                 .heldItem = ITEM_SHELL_BELL,
@@ -148,7 +76,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 1,
                 .personality = 0x80,
                 .nickname = __("マルノーム$$$$$$"),
@@ -173,7 +100,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x6,
                 .nickname = __("ドクケイル$$$$$$"),
@@ -198,7 +124,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x2f,
                 .nickname = __("ジーランス$$$$$$"),
@@ -215,81 +140,9 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
         .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
-            },
-            [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
-            },
-            [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
-            },
+            [0] = NULL_BATTLE_TOWER_POKEMON,
+            [1] = NULL_BATTLE_TOWER_POKEMON,
+            [2] = NULL_BATTLE_TOWER_POKEMON,
             [3] = {
                 .species = SPECIES_CACTURNE,
                 .heldItem = ITEM_QUICK_CLAW,
@@ -309,7 +162,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x8c,
                 .nickname = __("ノクタス$$$$$$$"),
@@ -334,7 +186,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x80,
                 .nickname = __("オオスバメ$$$$$$"),
@@ -359,7 +210,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x0,
                 .nickname = __("ナマズン$$$$$$$"),
@@ -376,81 +226,9 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
         .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
-            },
-            [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
-            },
-            [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
-            },
+            [0] = NULL_BATTLE_TOWER_POKEMON,
+            [1] = NULL_BATTLE_TOWER_POKEMON,
+            [2] = NULL_BATTLE_TOWER_POKEMON,
             [3] = {
                 .species = SPECIES_DELCATTY,
                 .heldItem = ITEM_LUM_BERRY,
@@ -470,7 +248,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x3,
                 .nickname = __("エネコロロ$$$$$$"),
@@ -495,7 +272,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 1,
                 .personality = 0x6,
                 .nickname = __("ロゼリア$$$$$$$"),
@@ -520,7 +296,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x6,
                 .nickname = __("アゲハント$$$$$$"),
@@ -537,81 +312,9 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
         .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
-            },
-            [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
-            },
-            [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
-            },
+            [0] = NULL_BATTLE_TOWER_POKEMON,
+            [1] = NULL_BATTLE_TOWER_POKEMON,
+            [2] = NULL_BATTLE_TOWER_POKEMON,
             [3] = {
                 .species = SPECIES_MAWILE,
                 .heldItem = ITEM_BRIGHT_POWDER,
@@ -631,7 +334,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 1,
                 .personality = 0x0,
                 .nickname = __("クチート$$$$$$$"),
@@ -656,7 +358,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x96,
                 .nickname = __("サメハダー$$$$$$"),
@@ -681,7 +382,6 @@ static const struct TrainerHillTrainer sTrainerHillTrainerTemplates_JP[] = {
                 .speedIV = 5,
                 .spAttackIV = 5,
                 .spDefenseIV = 5,
-                .gap = 0,
                 .abilityNum = 0,
                 .personality = 0x96,
                 .nickname = __("ジュペッタ$$$$$$"),