Yep. In a comic, he found and reactivated the smaller Titan-like robot, so when Makuta came they were partially ready. Most of the Toa had actually hitchhiked onboard Makuta's body and met up with the gladiators on the desert world (I forget the name since it was so damn long ago). Together they destroyed makutas forces while Mata-Nui crushed Makutas head with two worlds he was pulling toward the desert one. With that, he used the last bit of power from the Mask of Life and his own soul to restore the world to a lush green world. Which doesn't make a lot of sense since they're all robots but hey! Bioncle was awesome