diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-11-06 20:24:04 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-06 20:24:04 -0600 |
| commit | 1507a290d51760c9b36b4b8bc828cfe5b973c7d7 (patch) | |
| tree | 5f48809915af5d02c2f75efc790bd598ed9f3975 /src/field_effect.c | |
| parent | 93ff71fcfdf8b71a7b4899f271a5214503bcd510 (diff) | |
| parent | 18839a4872057fde33be45c5d2c4ecf4274bcc8d (diff) | |
Merge pull request #378 from Diegoisawesome/script_menu
[WIP] Decompile/port script_menu
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 e7ecca183..467acb367 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -553,18 +553,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\ |