The 2000 Charlie's Angels film had a few totally different scripts, and when a final script was chosen, it still underwent numerous rewrites, as you can see from this August 11, 1999 early draft. Some of the craziest changes were Lucy Liu as Vivian Wu instead of Alex Munday, gay Bosley, Thin Man speaking, the original Angels' cameo, etc. The mechanical bull scene was carried over to the film's sequel, "Full Throttle". Here's the link so you can read this entire script if you like: https://imsdb.com/scripts/Charlie's-Angels.html

Floorplans of the rooms from "Lost un translation" by Sofía Coppola (2003), twenty years ago...

For the filming of this movie they used the Diplomat Suite of the Park Hyatt Tokyo hotel (See the last drawing) as the main set.

The sleeping area of this suite it became Charlotte and John's standard room and was barely altered for the filming.

The living area of the suite It was converted into Bob Harris' suite by removing the dining zoom and piano and placing a bed next to the large window.

The Diplomat Suite's bathroom doesn' have a shower by the window so the scene of Bill Murray showering was filmed by sticking a fake shower in the bathtub or perhaps in another room.