The shallow water tiles are in Weapons/Misc, so you can select them yourself. As for the diving tiles, I think that problem is only for people who aren't using bs zelda animation (Like me.) And now I know that the hammer problem is only for people that use bs animation (Like the Puretileset, because I've never had that animation problem.)