diff options
Diffstat (limited to 'src')
-rwxr-xr-x[-rw-r--r--] | src/field_map_obj.c | 4 | ||||
-rwxr-xr-x | src/field_specials.c | 13 |
2 files changed, 15 insertions, 2 deletions
diff --git a/src/field_map_obj.c b/src/field_map_obj.c index ade72923d..bedb8db9c 100644..100755 --- a/src/field_map_obj.c +++ b/src/field_map_obj.c @@ -1265,13 +1265,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(); } } diff --git a/src/field_specials.c b/src/field_specials.c index ae73c0e25..610d421a1 100755 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -1729,3 +1729,16 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) DestroyVerticalScrollIndicator(1); } } + +void SpawnCameraDummy(void) +{ + u8 mapObjectId = SpawnSpecialFieldObjectParametrized(7, 8, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); + gMapObjects[mapObjectId].mapobj_bit_13 = 1; + CameraObjectSetFollowedObjectId(gMapObjects[mapObjectId].spriteId); +} + +void RemoveCameraDummy(void) +{ + CameraObjectSetFollowedObjectId(GetPlayerAvatarObjectId()); + RemoveFieldObjectByLocalIdAndMap(0x7f, gSaveBlock1.location.mapNum, gSaveBlock1.location.mapGroup); +} |