Visit Japan Form - ADHD Meds

Hi - I'm wondering if somebody would be able to help me, please.

I am currently filling in the Visit Japan Disembarkation form, to enter Japan when I travel there in a weeks time.

I take Elvanse (Vyvanse) for ADHD, and I have got my pre-approval from the Japanese authorities, including my import and export forms all ready to go.

I am just querying the answers to a couple of the questions, and wanted to sense check it with some people who have travelled under the same circumstances before I hit submit.

The first question, on the first page is:

Do you presently have in your possession narcotics, marijuana, opium, stimulants, or other controlled substances, firearms, crossbow, swords, explosives or other such items?

For this, I have ticked 'yes' - I will have a controlled substance in my possession, and it's a stimulant.

On the next page, the question I am wondering about is:

Are you bringing the following into Japan?

(1) Prohibited items(s) from being brought into Japan (e.g. Narcotic drugs, Firearms, and Explosives)

PROHIBITED ARTICLES (EXAMPLE)

(1) Narcotic drugs, stimulants, marihuana, psychotropic substances, MDMA, designated drugs.

(2) Firearms such as pistols, revolvers and machine guns and bullets or parts thereof.

(3) Explosives, gunpowder, materials for chemical weapons, germs such as anthrax.

(4) Counterfeit, altered, or imitated coins, bank notes or securities and forget credit cards.

(5) Obscene or immoral materials, and child pornography.

(6) Articles which infringe upon intellectual property rights (patient, utility model, design, trademark, copyright, neighboring right etc)

For this, I have ticked 'no' - the substance I have is controlled, but not prohibited, and I have all of the approval documentation to allow my entry to Japan with it.

Please could someone confirm whether this is correct?

Thank you so much!!