Merge branch 'master' of https://github.com/pret/pokefirered into porymap-6

src/event_object_movement.c

@@ -2453,7 +2453,12 @@ u8 CameraObjectGetFollowedObjectId(void)
 
 void CameraObjectReset2(void)
 {
-    FindCameraObject()->data[1] = 2;
+    struct Sprite *cameraObject = FindCameraObject();
+#ifdef UBFIX
+    if (cameraObject == NULL)
+        return;
+#endif
+    cameraObject->data[1] = 2;
 }
 
 u8 CopySprite(struct Sprite *sprite, s16 x, s16 y, u8 subpriority)