Submitting a final tax return before leaving Japan

I have additional income than what was withheld by my employer and will be leaving Japan before the end of the year. I prefer to get my affairs sorted now rather than appoint a tax agent, so I will be going to the tax office to file a final tax return in the next week or so. I was hoping to gather all my documents and fill the form out in advance of my visit, but on the NTA website the latest tax return form that I can find is for R6/2024.

Could anyone who has done this process advise which form I'm supposed to complete? Would they accept the R6 form with double lines through the year and R7 written above it? Or do they have a special form for this case which is only available at the tax office?

Thanks in advance!