The stuff about Shiki was mentioned in the manga, and the actual fight was shown in a tangent manga mini-arc, although really the whole thing was pretty much thrown in by Oda to support the movie he helped write.