Updated functions to match the SRB2 2.1.9 update