diff options
author | yenatch <yenatch@gmail.com> | 2017-06-28 18:47:35 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-06-28 18:47:35 -0400 |
commit | 8d82578d3a101b06f9d2ced31738021007c4e533 (patch) | |
tree | 7b3567978b63ee6548a7b945e075ea8ba37bef51 /src/field_map_obj.c | |
parent | 06b6cada0ddedc62063171703ba6607019751a9a (diff) | |
parent | 8cbd95c2024ddc762db0f085b409ef3633d7f1d8 (diff) |
Merge pull request #338 from PikalaxALT/field_specials
Field specials
Diffstat (limited to 'src/field_map_obj.c')
-rwxr-xr-x | src/field_map_obj.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index dc5ee6afb..d94c97ff3 100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -3104,13 +3104,13 @@ void CameraObjectReset1(void) } } -void CameraObjectSetFollowedObjectId(u8 state) +void CameraObjectSetFollowedObjectId(u8 spriteId) { struct Sprite *cameraSprite = FindCameraObject(); if (cameraSprite != NULL) { - cameraSprite->data0 = state; + cameraSprite->data0 = spriteId; CameraObjectReset1(); } } |