diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2019-09-03 22:22:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-03 22:22:14 -0400 |
| commit | 6b04ea0727973e66227b31caa2ccdcb6f2b4891f (patch) | |
| tree | 4d5e4e5d1b6e480bd195d8a9a29703e6475cc2e9 /src/trade.c | |
| parent | ecf2097abb1481109578b7b8260fd40606f27abe (diff) | |
| parent | 1f4c88c95243e8d75f25d5b7868c837c47aa578d (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/trade.c')
| -rw-r--r-- | src/trade.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/trade.c b/src/trade.c index 94accc43c..d95e4ebf5 100644 --- a/src/trade.c +++ b/src/trade.c @@ -1551,7 +1551,7 @@ static void sub_80773D0(void) for (i = 0; i < PARTY_SIZE; i++) { - CreateMon(&gEnemyParty[i], SPECIES_NONE, 0, 0x20, FALSE, 0, 0, 0); + CreateMon(&gEnemyParty[i], SPECIES_NONE, 0, 0x20, FALSE, 0, OT_ID_PLAYER_ID, 0); } sub_807A19C(0); @@ -5832,7 +5832,7 @@ static void _CreateInGameTradePokemon(u8 whichPlayerMon, u8 whichInGameTrade) u8 isMail; struct Pokemon *pokemon = &gEnemyParty[0]; - CreateMon(pokemon, inGameTrade->species, level, 32, TRUE, inGameTrade->personality, TRUE, inGameTrade->otId); + CreateMon(pokemon, inGameTrade->species, level, 32, TRUE, inGameTrade->personality, OT_ID_PRESET, inGameTrade->otId); SetMonData(pokemon, MON_DATA_HP_IV, &inGameTrade->ivs[0]); SetMonData(pokemon, MON_DATA_ATK_IV, &inGameTrade->ivs[1]); |