diff options
| author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2018-01-11 13:51:45 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-11 13:51:45 -0600 |
| commit | 2b56f43fce75871f2be993d43b483ceefd0bfc0f (patch) | |
| tree | 6fefa6a95a940c731ce7e551d1bc5c00a2626db0 /src/rom_8077ABC.c | |
| parent | a51b95150ba86a3982f613886471626f742aeacd (diff) | |
| parent | e7672a1aeb5e42d6f4e416ede9f6220122d11743 (diff) | |
Merge branch 'master' into assert
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 2691da859..2b5a3c036 100644 --- a/src/rom_8077ABC.c +++ b/src/rom_8077ABC.c @@ -786,7 +786,7 @@ void oamt_add_pos2_onto_pos1(struct Sprite *sprite) sprite->pos2.y = 0; } -void sub_8078764(struct Sprite *sprite, u8 a2) +void sub_8078764(struct Sprite *sprite, bool8 a2) { if (!a2) { @@ -2105,7 +2105,7 @@ int sub_807A100(u8 slot, u8 a2) } } -void sub_807A3FC(u8 slot, u8 a2, s16 *a3, s16 *a4) +void sub_807A3FC(u8 slot, bool8 a2, s16 *a3, s16 *a4) { u8 v1, v2; s16 v3, v4; |