diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-29 17:17:35 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-29 17:17:35 -0400 |
| commit | a62fbd6ec1d34ccba25e117e0db60fd4100bfd8d (patch) | |
| tree | d28f0320009ff4cf4955e84b4555519a1ab55b69 /src/field_map_obj.c | |
| parent | b73b15dc9c10ace5145e3d4b339ca833413a1522 (diff) | |
| parent | 8d82578d3a101b06f9d2ced31738021007c4e533 (diff) | |
Merge branch 'master' into 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(); } } |