Of course expressions like !(A && B) can be rewritten as !A || !B, but I guess that's a matter of taste. It was mainly the if (!(VAR(questionVarNo) == 121)) that gave me a bit of a start.

Yeah I'm just doing if (!(expected stuff)) for each of them, where (expected stuff) come as-is from the original script. It's written this way to match the comment above it, too.

Since the workaround is in o5_endCutscene(), I think these are the interactions that primarily need to be tested:

1. Not buying the sword. (Guybrush puts it back.)
2. Asking for the price of the shovel (twice).
3. Buying the shovel.
4. Not buying the shovel. (Guybrush puts it back.)
5. Asking about the sword master. There are several cases here:
   1. Guybrush doesn't know about the sword master. ("Well, if you're looking for a good fight...")
   2. Guybrush knows about the sword master from the pirate leaders. ("The Sword Master of Mêlée Island? Hmmm...")
   3. Guybrush has asked before. ("Look, I told you, she doesn't want to see you.")
   4. Guybrush tried to steal during the shopkeeper's absence. There are different reactions depending on how many times you tried it. The last one, just when he leaves, should be "This is really getting boring."
6. Asking the shopkeeper for credit. ("All right. I'll get one of my notes and we'll fill it out.")
7. Telling the shopkeeper you're a pirate. ("Foul-smelling, yes... Grog-swilling, maybe...")
8. Telling the shopkeeper you're waiting tables. This is the one that the workaround addresses. ("...and I'm the Queen of England.")
9. Telling the shopkeeper you work at the circus. ("You're one of the Fettucini brothers?")
10. Telling the shopkeeper you have no job. There seems to be two different cases here:
    1. "To be honest, sir, I am not employed." (before he fetches the note)
    2. "To be honest, sir, I'm between jobs." (after he fetches the note)
11. Buying a breath mint. ("Here take one... please. Take a whole roll!")
12. Say you're just browsing. Prints one of several messages, picked at random:
    1. "Hey, this ain't no boutique."
    2. "Okay, but don't put your lips on anything."
    3. "Whatever."
    4. "Okay. Wake me up if you need anything."
    5. "Be my guest, fancy pants."

Did I miss any? (Telling the shopkeeper you work for Stan is not a cutscene, apparently.)

workaroundMonkey1StorekeeperWaitTablesLine() should probably return false if VAR(VAR_OVERRIDE) is set, because then the player has pressed Esc, trying to skip the cutscene.

Actually, that may apply to some of the other wait-for-message fixes as well?

I think I've now triggered all of the cases in my list above in the VGA CD version, without noticing any problems. The workaround was only triggered in the one case where it should, and then it worked as expected. (I had made my proposed modification but that shouldn't affect when the workaround is used.)

OK thanks for the test! athrxx also worked on testing the FM-TOWNS port.

workaroundMonkey1StorekeeperWaitTablesLine() should probably return false if VAR(VAR_OVERRIDE) is set, because then the player has pressed Esc, trying to skip the cutscene.
[...]

Good point. I don't know much about this, though. I don't have a good understanding of how cutscenes and the various VAR_* stuff works, yet.

I think these are the interactions that primarily need to be tested:
[...]

I agree with the list. I've done a test on one v5 release (didn't note which one it was) with a debug line when the workaround is fully applied, and I only saw it once, so it looked good. I didn't test all actions, though.

I'm not sure I have the time/patience to test all storekeeper interactions in all releases, though. I may do a full play of the Sega CD release soon, but I think that's it. Since I doubt we'll release 2.10.0 soon, I think a good-enough number of checks/tests was done, and then if issues show up, we can wait for user reports, since Monkey1 is often played. (Hoping this approach is not too confident…)

(As for the style of the if checks, mentioned earlier, I can also change it, if others find it a bit unnatural too.)

I'm far from certain myself, but from what I understand VAR(VAR_OVERRIDE) is only set when you escape out of a cutscene. (Usually used by scripts to clean up, I believe, though MI1 uses it to make Cobb spout more advertising if you try to interrupt his little Loom speech.)

This needs to be updated now to use the new helpers, but you knew that already of course.

Yes, sure, I've updated it.

I've also added the VAR_OVERRIDE you suggested earlier. Thanks for that; indeed it seems necessary here.

@dwatteau The older Amiga and Atari versions are quite exotic, but since every other version works, I don't see why these two won't be working.

If there aren't any objections, this looks good to be merged

Thanks. Yes I thought some ScummVM users over Discord would test this on their Amiga/Atari versions, but so far it didn't happen.

I agree it should work there anyway

Thanks for your feedback. This is good to be merged. Nice work!