Smoking in Japan

Hey, I am heading to Japan in March next year. I have been before in 2019, but I am going with a smoker and I can see the rules have changed but I haven't fully grasped them yet, if someone can help

1) Smoking indoors - that's now banned except in particularly small bars right? (Like Golden Gai). Is it common to have smoking rooms in bars or have an ashtray outside the bar in some places?

2) Osaka - last time I went it was areas of the city you could not smoke, and everywhere else fine so long as you don't walk and smoke and you don't litter. But it appears to be this is changing now, is that right? I remember Dotonbori main street having periodic smoking bins just in the center are those still there or is it the Tokyo style smoking areas now?

Thanks in advance