summaryrefslogtreecommitdiff
path: root/src/data
diff options
context:
space:
mode:
Diffstat (limited to 'src/data')
-rw-r--r--src/data/battle_frontier/trainer_hill.h324
1 files changed, 12 insertions, 312 deletions
diff --git a/src/data/battle_frontier/trainer_hill.h b/src/data/battle_frontier/trainer_hill.h
index 1aa552448..2b1f59933 100644
--- a/src/data/battle_frontier/trainer_hill.h
+++ b/src/data/battle_frontier/trainer_hill.h
@@ -38,7 +38,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x80,
.nickname = __("ジグザグマ$$$$$$"),
@@ -63,7 +62,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x0,
.nickname = __("キノココ$$$$$$$"),
@@ -88,87 +86,14 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x80,
.nickname = __("サンド$$$$$$$$"),
.friendship = 255
},
- [3] = {
- .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
- },
- [4] = {
- .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
- },
- [5] = {
- .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
- },
+ [3] = NULL_BATTLE_TOWER_POKEMON,
+ [4] = NULL_BATTLE_TOWER_POKEMON,
+ [5] = NULL_BATTLE_TOWER_POKEMON
}
},
[1] = {
@@ -180,81 +105,9 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speechLose = { EC_WORD_OH_QUES, EC_MOVE(EARTHQUAKE), EC_WORD_EXISTS, EC_WORD_OF, EC_WORD_WITHOUT, EC_WORD_EXCL },
.speechAfter = { EC_WORD_YOU_RE, EC_WORD_PROBABLY, EC_WORD_END, EC_WORD_UNTIL, EC_WORD_GOING, EC_WORD_ANYWHERE },
.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_WINGULL,
.heldItem = ITEM_CHERI_BERRY,
@@ -274,7 +127,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x0,
.nickname = __("キャモメ$$$$$$$"),
@@ -299,7 +151,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x96,
.nickname = __("ドンメル$$$$$$$"),
@@ -324,7 +175,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x0,
.nickname = __("アメタマ$$$$$$$"),
@@ -371,7 +221,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 1,
.personality = 0x0,
.nickname = __("ラクライ$$$$$$$"),
@@ -396,7 +245,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 1,
.personality = 0x96,
.nickname = __("ヘイガニ$$$$$$$"),
@@ -421,87 +269,14 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x96,
.nickname = __("ヤジロン$$$$$$$"),
.friendship = 255
},
- [3] = {
- .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
- },
- [4] = {
- .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
- },
- [5] = {
- .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
- },
+ [3] = NULL_BATTLE_TOWER_POKEMON,
+ [4] = NULL_BATTLE_TOWER_POKEMON,
+ [5] = NULL_BATTLE_TOWER_POKEMON,
}
},
[1] = {
@@ -513,81 +288,9 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speechLose = { EC_WORD_AWFUL, EC_WORD_GWAH, EC_WORD_HOPELESS, EC_WORD_CAN_T_WIN, EC_WORD_IS, EC_WORD_NONE },
.speechAfter = { EC_WORD_AWW, 0xFFFF, 0xFFFF, EC_WORD_ALMOST, EC_WORD_GOOD, EC_WORD_ANYWHERE },
.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_SPHEAL,
.heldItem = ITEM_FOCUS_BAND,
@@ -607,7 +310,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x80,
.nickname = __("タマザラシ$$$$$$"),
@@ -632,7 +334,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 1,
.personality = 0xf,
.nickname = __("バネブー$$$$$$$"),
@@ -657,7 +358,6 @@ static const struct TrHillTag_Half gUnknown_0862609C = {
.speedIV = 5,
.spAttackIV = 5,
.spDefenseIV = 5,
- .gap = 0,
.abilityNum = 0,
.personality = 0x96,
.nickname = __("ポチエナ$$$$$$$"),
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-24 15:00:57 +0000