Merge 'Improve after collapse cutscene skip' (#2322)

Cutscenes.py

@@ -463,8 +463,16 @@ def patch_cutscenes(rom: Rom, songs_as_items: bool, settings: Settings) -> None:
     patch_cutscene_destination_and_length(rom, 0x33FB328, 1)
 
     # After tower collapse
-    # Jump from csState 1 to csState 4, 100 frames before giving back control. Next state only starts when Link gets near Ganon.
+    # Delete a bunch of camera instructions to avoid sudden movement when getting control back.
+    # Put subCamId at 0 in csState 0
+    rom.write_byte(0xE82DE9, 0x00)
+    # Jump from csState 1 to csState 4.
     rom.write_byte(0xE82E0F, 0x04)
+    # Remove all main camera changes in csState 4.
+    for byte in range(0, 80):
+        rom.write_byte(0xE8343C + byte, 0x00)
+    # Reduce the 100 frames wait in state 4 to 1. Next cutscene state only starts when Link gets close to Ganon.
+    rom.write_int16(0xE8341A, 0x0001)
     # Ganon intro
     # Jump from state 14 to 15 instantly instead of waiting 60 frames.
     rom.write_int32(0xE83B5C, 0x00000000)

README.md

@@ -120,22 +120,24 @@ issue. You should always Hard Reset to avoid this issue entirely.
 * New option `Market Big Poes` for the `Misc. Hints` setting.
 
 #### Bug fixes
-
 * Ocarina buttons required to play the Song of Time are now part of the `path of time` goal.
 * The `Frogs Ocarina Game` misc. hint text box has been moved slightly so it no longer requires reloading the area to reread.
 * Fix key rings being hinted as small keys when keys are in their own dungeons.
 * Fix a crash when pressing down on the D-pad on the inventory screen in some settings combinations.
 * Fix a possible void out at the Forest Temple boss door.
 * Fix importing settings from older versions on web.
 
+#### New Speedups
+* The first text box from each carpenter in the Thieves' Hideout is skipped.
+* The cutscene that plays when Morpha is defeated has been shortened from around 30 seconds to around 5 seconds.
+* The cutscene introducing the arena where Ganon is fought is shortened by 5 seconds and the camera angle after it is improved.
+
 #### Other Changes
 * Now supports custom music written for the Majora's Mask Randomizer.
 * New Magic Meter item model to allow magic drops to be shuffled in the future.
-* The first text box from each carpenter in the Thieves' Hideout is skipped.
 * Seeds rolled on ootrandomizer.com display their ID in the top left corner of the file select screen.
 * The `Other` tab of the generator has been rearranged for better grouping of settings, and the `One Major Item per Dungeon` setting has been moved there since it was causing frequent failures with `Randomize Main Rule Settings`.
 * Biggoron's text after turning in the Eyedrops has been changed to avoid potential confusion.
-* The cutscene that plays when Morpha is defeated has been shortened from around 30 seconds to around 5 seconds.
 * Clarified the hint text for `HF Inside Fence Grotto`.
 
 ### 8.2

version.py

@@ -1,4 +1,4 @@
-__version__ = '8.2.29'
+__version__ = '8.2.30'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0