yes I did mix them up, sorry!
The best walkthrough I found. https://www.patreon.com/posts/eternum-for-v0-4-61992255
And you likely did not go to the Festival of the Dead trip or did not offer to give her a massage in the trip.
