It was rough at first, but by the end, he was matching Katakuri blow for blow with that foresight. Armament Haki got its upgrade in Wano, thanks to Hyogoro in Udon Prison. Luffy learned Ryuo, a trick ...