Submersible Battleships

USS Argonaut was a minelaying submarine, though she had 2 6" guns.

Narwal and Nautilus were the ones you were thinking about.

The Japanese in WWII also had subs that carried small aircraft in airtight deck hangars: Type B1 submarine - Wikipedia

Yes, now that you mention it, that sounds better. See, I said I was probably full of it:D