We derive algebraic equations for the folding angle relationships in completely general degree-4 rigid-foldable origami vertices, including both Euclidean (developable) and non-Euclidean cases. These equations in turn lead to elegant equations for the general developable degree-4 case. We compare our equations to previous results in the literature and provide two examples of how the equations can be used: in analyzing a family of square twist pouches with discrete configuration spaces, and for proving that a folding table design made with hyperbolic vertices has a single folding mode.