diff options
| author | Diegoisawesome <diego@domoreaweso.me> | 2018-07-05 20:32:12 -0700 |
|---|---|---|
| committer | Diegoisawesome <diego@domoreaweso.me> | 2018-07-05 20:32:12 -0700 |
| commit | 5189442bcc1122fe10013d497dc132d0e410fc66 (patch) | |
| tree | 15cdd1e67b483ceed3a3fad99b4aad7934695f5d /src/field_effect.c | |
| parent | efebc51972b23ddffa2700b1dd6895d4728646a3 (diff) | |
| parent | cdacc2771426a8e4ec5ccc5d7ba0d8d7c4224c36 (diff) | |
Merge branch 'decompile_cut' of git://github.com/DizzyEggg/pokeemerald into DizzyEggg-decompile_cut
Diffstat (limited to 'src/field_effect.c')
| -rw-r--r-- | src/field_effect.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_effect.c b/src/field_effect.c index 00814192e..f047c78a3 100644 --- a/src/field_effect.c +++ b/src/field_effect.c @@ -561,7 +561,7 @@ u8 CreateMonSprite_PicBox(u16 species, s16 x, s16 y) PreservePaletteInWeather(IndexOfSpritePaletteTag(gMonPaletteTable[species].tag) + 0x10); if (spriteId == 0xFFFF) return 0x40; - + return spriteId; } #else @@ -623,7 +623,7 @@ u8 CreateMonSprite_FieldMove(u16 species, u32 d, u32 g, s16 x, s16 y, u8 subprio PreservePaletteInWeather(IndexOfSpritePaletteTag(spritePalette->tag) + 0x10); if (spriteId == 0xFFFF) return 0x40; - + return spriteId; } |