summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2019-12-20 11:24:29 -0500
committerPikalaxALT <pikalaxalt@gmail.com>2019-12-20 11:24:29 -0500
commit9046fa900db4602a0db70a60cff4477cb39ca9cd (patch)
treec24dba1b7f117479aff984fbd47d268d894d2146
parent5f2865f0266ac1e1219cb584736d476d73dc7494 (diff)
Match LG in-game trades
-rw-r--r--src/data/ingame_trades.h36
1 files changed, 36 insertions, 0 deletions
diff --git a/src/data/ingame_trades.h b/src/data/ingame_trades.h
index 25a5afbe3..4834839f1 100644
--- a/src/data/ingame_trades.h
+++ b/src/data/ingame_trades.h
@@ -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,