diff options
| author | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-07 00:40:17 -0500 |
|---|---|---|
| committer | ProjectRevoTPP <projectrevotpp@hotmail.com> | 2018-02-07 00:40:17 -0500 |
| commit | 0e448936b5f77561f8bb55f3e0d27e7ed5a64c99 (patch) | |
| tree | 7c529306c92bcc3e482ef4e0ac89ec941bdc4097 /src/rom_8077ABC.c | |
| parent | 51ade392bf16ae4c87a18f8965b8e650fe983d03 (diff) | |
| parent | a395cd7e53ed33634eef4df22814da4ba96a3357 (diff) | |
Merge branch 'master' of https://github.com/pret/pokeruby
Diffstat (limited to 'src/rom_8077ABC.c')
| -rw-r--r-- | src/rom_8077ABC.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 11a71155d..4a580eb41 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -1970,7 +1970,7 @@ void sub_807A0F4(struct Sprite *sprite) DestroySpriteAndFreeResources(sprite); } -int sub_807A100(u8 slot, u8 a2) +s16 sub_807A100(u8 slot, u8 a2) { u16 species; u32 personality; @@ -2138,7 +2138,7 @@ void sub_807A3FC(u8 slot, bool8 a2, s16 *a3, s16 *a4) *a4 = (v4 + v6) / 2; } -u8 sub_807A4A0(int a1, u8 sprite, int a3) +u8 sub_807A4A0(int bank, u8 sprite, int species) { u8 new_sprite = CreateInvisibleSpriteWithCallback(SpriteCallbackDummy); gSprites[new_sprite] = gSprites[sprite]; |