Pokémon eh? Oda did love his Pokémon style matchups back in the day. rubber vs lightning, smoke vs fire, wax vs poison, fire vs darkness, etc
I wouldn't be surprised If he did evolve. Especially considering all the other anime references he has in his work