Match LG in-game trades

This commit is contained in:
PikalaxALT 2019-12-20 11:24:29 -05:00
parent 5f2865f026
commit 9046fa900d

View File

@ -28,6 +28,7 @@ static const struct InGameTrade sInGameTrades[] = {
.sheen = 10,
.requestedSpecies = SPECIES_POLIWHIRL
}, {
#if defined(FIRERED)
.nickname = _("MS. NIDO"),
.species = SPECIES_NIDORAN_F,
.ivs = {22, 18, 25, 19, 15, 22},
@ -41,6 +42,21 @@ static const struct InGameTrade sInGameTrades[] = {
.otGender = FEMALE,
.sheen = 10,
.requestedSpecies = SPECIES_NIDORAN_M
#elif defined(LEAFGREEN)
.nickname = _("MR. NIDO"),
.species = SPECIES_NIDORAN_M,
.ivs = {19, 25, 18, 22, 22, 15},
.abilityNum = 0,
.otId = 63184,
.conditions = {30, 5, 5, 5, 5},
.personality = 0x4c970b9e,
.heldItem = ITEM_TINY_MUSHROOM,
.mailNum = 255,
.otName = _("SAIGE"),
.otGender = FEMALE,
.sheen = 10,
.requestedSpecies = SPECIES_NIDORAN_F
#endif
}, {
.nickname = _("CH'DING"),
.species = SPECIES_FARFETCHD,
@ -56,6 +72,7 @@ static const struct InGameTrade sInGameTrades[] = {
.sheen = 10,
.requestedSpecies = SPECIES_SPEAROW
}, {
#if defined(FIRERED)
.nickname = _("NINA"),
.species = SPECIES_NIDORINA,
.ivs = {22, 25, 18, 19, 22, 15},
@ -69,6 +86,21 @@ static const struct InGameTrade sInGameTrades[] = {
.otGender = MALE,
.sheen = 10,
.requestedSpecies = SPECIES_NIDORINO
#elif defined(LEAFGREEN)
.nickname = _("NINO"),
.species = SPECIES_NIDORINO,
.ivs = {19, 18, 25, 22, 15, 22},
.abilityNum = 0,
.otId = 13637,
.conditions = {5, 5, 5, 5, 30},
.personality = 0x00eeca19,
.heldItem = ITEM_NONE,
.mailNum = 255,
.otName = _("TURNER"),
.otGender = MALE,
.sheen = 10,
.requestedSpecies = SPECIES_NIDORINA
#endif
}, {
.nickname = _("MARC"),
.species = SPECIES_LICKITUNG,
@ -82,7 +114,11 @@ static const struct InGameTrade sInGameTrades[] = {
.otName = _("HADEN"),
.otGender = MALE,
.sheen = 10,
#if defined(FIRERED)
.requestedSpecies = SPECIES_GOLDUCK
#elif defined(LEAFGREEN)
.requestedSpecies = SPECIES_SLOWBRO
#endif
}, {
.nickname = _("ESPHERE"),
.species = SPECIES_ELECTRODE,