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/script_pokemon_util_80F87D8.c | |
| parent | ecf2097abb1481109578b7b8260fd40606f27abe (diff) | |
| parent | 1f4c88c95243e8d75f25d5b7868c837c47aa578d (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/script_pokemon_util_80F87D8.c')
| -rwxr-xr-x | src/script_pokemon_util_80F87D8.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/script_pokemon_util_80F87D8.c b/src/script_pokemon_util_80F87D8.c index 2c7a9c775..51bd73b1c 100755 --- a/src/script_pokemon_util_80F87D8.c +++ b/src/script_pokemon_util_80F87D8.c @@ -551,7 +551,7 @@ u8 ScriptGiveMon(u16 species, u8 level, u16 item, u32 unused1, u32 unused2, u8 u u8 heldItem[2]; struct Pokemon mon; - CreateMon(&mon, species, level, 32, 0, 0, 0, 0); + CreateMon(&mon, species, level, 32, 0, 0, OT_ID_PLAYER_ID, 0); heldItem[0] = item; heldItem[1] = item >> 8; SetMonData(&mon, MON_DATA_HELD_ITEM, heldItem); @@ -624,7 +624,7 @@ void CreateScriptedWildMon(u16 species, u8 level, u16 item) u8 heldItem[2]; ZeroEnemyPartyMons(); - CreateMon(&gEnemyParty[0], species, level, 0x20, 0, 0, 0, 0); + CreateMon(&gEnemyParty[0], species, level, 0x20, 0, 0, OT_ID_PLAYER_ID, 0); if (item) { heldItem[0] = item; |