Fix regression in dehardcoding magic numbers - fixes F-Zero X
geometry