diff options
| author | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
|---|---|---|
| committer | Slawter666 <38655737+Slawter666@users.noreply.github.com> | 2018-11-12 14:14:50 +0000 |
| commit | 1b895ff52c011d51a9516791148cd5088ba411b5 (patch) | |
| tree | 3f1dee86f96098d38131426e11a0f9c39a1244fe /src/field_effect.c | |
| parent | be33878b94cc38913447682d3e34e674df68619f (diff) | |
| parent | 65f053fd89e09b13e407ac53488043b728660e6e (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 5db9b9f36..594d75c95 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -554,18 +554,18 @@ u8 AddNewGameBirchObject(s16 x, s16 y, u8 subpriority) } #ifdef NONMATCHING -u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y) +u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority) { u16 spriteId = CreateMonPicSprite_HandleDeoxys(species, 0, 0x8000, 1, x, y, 0, gMonPaletteTable[species].tag); PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); if (spriteId == 0xFFFF) - return 0x40; + return MAX_SPRITES; return spriteId; } #else NAKED -u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y) +u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y, u8 subpriority) { asm_unified("push {r4,r5,lr}\n\ sub sp, 0x10\n\ |