ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

NULL_BATTLE_TOWER_POKEMON define

Browse Source
This commit is contained in:
PikalaxALT 2019-09-04 15:11:57 -04:00 committed by huderlem
parent e2fbce996e
commit 904bba9e16
4 changed files with 28 additions and 625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@ -121,7 +121,8 @@ else
NODEP := 1
endif
C_SRCS := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
C_SRCS_IN := $(wildcard $(C_SUBDIR)/*.c $(C_SUBDIR)/*/*.c $(C_SUBDIR)/*/*/*.c)
C_SRCS := $(foreach src,$(C_SRCS_IN),$(if $(findstring .inc.c,$(src)),,$(src)))
C_OBJS := $(patsubst $(C_SUBDIR)/%.c,$(C_BUILDDIR)/%.o,$(C_SRCS))
C_ASM_SRCS += $(wildcard $(C_SUBDIR)/*.s $(C_SUBDIR)/*/*.s $(C_SUBDIR)/*/*/*.s)

2
include/global.h
View File

@ -257,6 +257,8 @@ struct BattleTowerPokemon
u8 friendship;
};
#define NULL_BATTLE_TOWER_POKEMON { .nickname = __("$$$$$$$$$$$") }
struct EmeraldBattleTowerRecord
{
/*0x00*/ u8 lvlMode; // 0 = level 50, 1 = level 100

324
src/data/battle_frontier/trainer_hill.h
View File

@ -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 = __("ポチエナ$$$$$$$"),

324
src/ereader_helpers.c
View File

@ -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 = __("ジュペッタ$$$$$$"),