diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-29 23:09:31 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-06-29 23:09:31 -0400 |
| commit | 5adf807274aa36dc8f65a120f61debf5a0c1d360 (patch) | |
| tree | c7ea8d26ae569724e24f93687bd0e7d3bf22f95b /src/field_map_obj.c | |
| parent | 06f5a396016aee2406749633b627bb9d729744ff (diff) | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
Merge remote-tracking branch 'origin/master' into use_pokeblock
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(); } } |