diff options
| author | yenatch <yenatch@gmail.com> | 2018-02-03 13:35:38 -0500 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2018-02-03 13:35:38 -0500 |
| commit | 204d3e45f0c0843ada1243897d36e873059efde1 (patch) | |
| tree | b4c3fae28387695175f007357848286afbb0a494 /src/rom_8077ABC.c | |
| parent | 3ed97d94be70bee91b581517311c01cf20c917de (diff) | |
| parent | f1584e69c307427516d2c180ab92e28bc3786326 (diff) | |
Merge remote-tracking branch 'origin/master' into battle-1
Diffstat (limited to 'src/rom_8077ABC.c')
| -rw-r--r-- | src/rom_8077ABC.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c index 11a71155d..b84c431f7 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; |