diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-04 23:06:04 -0500 |
| commit | ecfdc57e1cff1fa34ff7edcf7524aeadbc265b69 (patch) | |
| tree | 123155f492599caf4597b6fc812a0a064d3962bd /src/rom_8077ABC.c | |
| parent | 9776f51f0643a8d988fcd5fc2ac404a7ea285235 (diff) | |
| parent | f1f6c7337f4f2f002b456468b0ccc327fc494d02 (diff) | |
Merge branch 'master' into fix_nonmatching
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; |