After realizing the CAT trio scene is actually from the Train Graveyard and not the Wall Market sequence, I am guessing that the Tifa pull-up mini-game is probably from after the Plate drops and the party goes through Wall Market to get to Shinra HQ (I had forgotten that they do return to Wall Market post-plate drop). So I guess Tifa isn't joining Cloud and Aerith for the Miss Cloud outfit mini-quest sequence. The trailer just has some very clever editing. The only actual Wall Market scenes I guess were the Aerith dress shot and Don Corneo introduction parts.
@Vyzzuvazzadth even noticed that that scene with Tifa alone seems to take place near the pillar in Shinra HQ and that the same pillar is right next to the famous car the party is leaving in. So they are hiding Red for sure. I mean, they just showed us all the Turks and two summons, they have to keep some secrets for later.
Is it confirmed that the scene with Tifa and Cloud in the room with the bed is from their cell in Shinra HQ? I couldn't tell, and I thought it looked kinda grungy for the Shinra HQ building. Could it be a room in the slums/7th Heaven?
It doesnt look like the cell. It has wooden floor, some boxes and other personal stuff and - I'm not sure about that yet - a TV on the wall. So just seems like a room in 7th heaven. Wich is good, coz I always wondered where they all sleep.