Merge 'Make the frogs ocarina minigame misc hint easier to re-read' (O…

…oTRandomizer#2316)

Cutscenes.py

@@ -473,7 +473,7 @@ def patch_cutscenes(rom: Rom, songs_as_items: bool, settings: Settings) -> None:
     # Remove the Navi textbox at the start of state 28 ("This time, we fight together!).
     rom.write_int16(0xE84C80, 0x1000)
 
-def patch_wondertalk2(rom: Rom) -> None:
+def patch_wondertalk2(rom: Rom, settings: Settings) -> None:
     # Wonder_talk2 is an actor that displays a textbox when near a certain spot, either automatically or by pressing A (button turns to Check).
     # We remove them by moving their Y coordinate far below their normal spot.
     wonder_talk2_y_coordinates = [
@@ -497,3 +497,9 @@ def patch_wondertalk2(rom: Rom) -> None:
     ]
     for address in wonder_talk2_y_coordinates:
         rom.write_byte(address, 0xFB)
+
+    if 'frogs2' in settings.misc_hints:
+        # Prevent setting the replaced textbox flag so that the hint is easily repeatible by walking over the spot again.
+        # And move the hint spot down the log so that it doesn't pop every time a song is played, and let some room to do ocarina item glitch.
+        rom.write_int16s(0x2059412, [0x03C0, 0x00E2, 0xFAA6]) # Move coordinates. Original value : 1000, 205, -1202. New value : 960, 226, -1370.
+        rom.write_byte(0x205941F, 0xBF) # Never set the flag.

Patches.py

@@ -453,7 +453,7 @@ def make_bytes(txt: str, size: int) -> list[int]:
         rom.write_byte(rom.sym('OCARINAS_SHUFFLED'), 0x01)
 
     patch_cutscenes(rom, songs_as_items, world.settings)
-    patch_wondertalk2(rom)
+    patch_wondertalk2(rom, world.settings)
 
     # Speed Pushing of All Pushable Objects (other than armos statues, which are handled in ASM)
     rom.write_bytes(0xDD2B86, [0x40, 0x80])  # block speed

README.md

@@ -122,6 +122,7 @@ issue. You should always Hard Reset to avoid this issue entirely.
 #### 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.
 
 #### Other Changes
 * Now supports custom music written for the Majora's Mask Randomizer.

version.py

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