they definitely made their battle over the cocaine a plot arc on purpose in the brett films. it's kind of hilarious that they deliberately set out to make them slashier - they decided to have watson living with holmes the whole time, and not have him get married at all, with the reason given that it was "simpler" or something like that, i think. XD and in the written version of the devil's foot holmes definitely doesn't give it up! whereas the film of it is rather dramatic.
no subject