Fingers crossed, this should be the way to go. Hitting R to talk to your partner forces the protag/partner team combination.
NOTE: This also disbands any companions you have with you. So make sure your team is all what it should be before you head into the dungeon.
>>53799128I'll mark it as a Known Issue, but I'm probably not going to bother trying to fix it.
The hole causes a more significant issue in Special Episodes 1 and 2, but the shortcut is too useful to remove just for this.
>>53799238Probably going to be fixed (just like the last 6 times) with the upcoming version, as webm related should turn partner death into a nonissue