atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Give rivals and Maxie battles better names

Browse source 
Name describes where the battle is and for rivals, which starter the player chose.
This commit is contained in:
AJ Fontaine 2019-12-23 10:42:06 -05:00 committed by GitHub
parent 026e1108b2
commit b80fa767ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 33 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/data/trainer_parties.h
View file

@ -6781,7 +6781,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wally1[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan1[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Mudkip[] = {//Brendan1
{
.iv = 0,
.lvl = 5,
@ -6789,7 +6789,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan1[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan2[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Mudkip[] = {//Brendan2
{
.iv = 50,
.lvl = 18,
@ -6807,7 +6807,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan2[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan3[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Mudkip[] = {//Brendan3
{
.iv = 100,
.lvl = 29,
@ -6825,7 +6825,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan3[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan4[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Treecko[] = {//Brendan4
{
.iv = 0,
.lvl = 5,
@ -6833,7 +6833,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan4[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan5[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Treecko[] = {//Brendan5
{
.iv = 50,
.lvl = 18,
@ -6851,7 +6851,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan5[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan6[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Treecko[] = {//Brendan6
{
.iv = 100,
.lvl = 29,
@ -6869,7 +6869,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan6[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan7[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute103Torchic[] = {//Brendan7
{
.iv = 0,
.lvl = 5,
@ -6877,7 +6877,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan7[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan8[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute110Torchic[] = {//Brendan8
{
.iv = 50,
.lvl = 18,
@ -6895,7 +6895,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan8[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan9[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRoute119Torchic[] = {//Brendan9
{
.iv = 100,
.lvl = 29,
@ -6913,7 +6913,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan9[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May1[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Mudkip[] = {//May1
{
.iv = 0,
.lvl = 5,
@ -6921,7 +6921,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May1[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May2[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Mudkip[] = {//May2
{
.iv = 50,
.lvl = 18,
@ -6939,7 +6939,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May2[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May3[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Mudkip[] = {//May3
{
.iv = 100,
.lvl = 29,
@ -6957,7 +6957,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May3[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May4[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Treecko[] = {//May4
{
.iv = 0,
.lvl = 5,
@ -6965,7 +6965,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May4[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May5[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Treecko[] = {//May5
{
.iv = 50,
.lvl = 18,
@ -6983,7 +6983,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May5[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May6[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Treecko[] = {//May6
{
.iv = 100,
.lvl = 29,
@ -7001,7 +7001,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May6[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May7[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute103Torchic[] = {//May7
{
.iv = 0,
.lvl = 5,
@ -7009,7 +7009,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May7[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May8[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute110Torchic[] = {//May8
{
.iv = 50,
.lvl = 18,
@ -7027,7 +7027,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May8[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May9[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRoute119Torchic[] = {//May9
{
.iv = 100,
.lvl = 29,
@ -7833,7 +7833,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Macey[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan10[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTreecko[] = {//Brendan10
{
.iv = 25,
.lvl = 13,
@ -7846,7 +7846,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan10[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan11[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroMudkip[] = {//Brendan11
{
.iv = 25,
.lvl = 13,
@ -7929,7 +7929,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Jonathan[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan12[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanRustboroTorchic[] = {//Brendan12
{
.iv = 25,
.lvl = 13,
@ -7942,7 +7942,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan12[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May10[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroMudkip[] = {//May10
{
.iv = 25,
.lvl = 13,
@ -7955,7 +7955,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May10[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Maxie1[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMagmaHideout[] = {//Maxie1
{
.iv = 150,
.lvl = 37,
@ -7973,7 +7973,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Maxie1[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Maxie2[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMtChimney[] = {//Maxie2
{
.iv = 150,
.lvl = 24,
@ -8883,7 +8883,7 @@ static const struct TrainerMonNoItemCustomMoves sParty_Wally6[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan13[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveMudkip[] = {//Brendan13
{
.iv = 150,
.lvl = 31,
@ -8906,7 +8906,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan13[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan14[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTreecko[] = {//Brendan14
{
.iv = 150,
.lvl = 31,
@ -8929,7 +8929,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan14[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Brendan15[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_BrendanLilycoveTorchic[] = {//Brendan15
{
.iv = 150,
.lvl = 31,
@ -8952,7 +8952,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Brendan15[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May11[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveMudkip[] = {//May11
{
.iv = 150,
.lvl = 31,
@ -8975,7 +8975,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May11[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May12[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTreecko[] = {//May12
{
.iv = 150,
.lvl = 31,
@ -8998,7 +8998,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May12[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May13[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayLilycoveTorchic[] = {//May13
{
.iv = 150,
.lvl = 31,
@ -9819,7 +9819,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Darcy[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_Maxie3[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MaxieMossdeep[] = {//Maxie3
{
.iv = 150,
.lvl = 42,
@ -10272,7 +10272,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_Cristin1[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May14[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTreecko[] = {//May14
{
.iv = 25,
.lvl = 13,
@ -10285,7 +10285,7 @@ static const struct TrainerMonNoItemDefaultMoves sParty_May14[] = {
}
};
static const struct TrainerMonNoItemDefaultMoves sParty_May15[] = {
static const struct TrainerMonNoItemDefaultMoves sParty_MayRustboroTorchic[] = {//May15
{
.iv = 25,
.lvl = 13,