Merge branch 'Dev' into dev-fenhl

# Conflicts:
#	data/generated/rom_patch.txt

.github/workflows/python.yml

@@ -16,9 +16,9 @@ jobs:
         python-version: ["3.8"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run checks
@@ -33,9 +33,9 @@ jobs:
         python-version: ["3.x"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run checks
@@ -49,9 +49,9 @@ jobs:
         python-version: ["3.x"]
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
       - name: Run checks

ASM/src/config.asm

@@ -344,7 +344,7 @@ TRIFORCE_PIECES_REQUIRED:
 SPECIAL_DEAL_COUNTS:
 .endarea
 
-.area 9 * 0x17, 0x20
+.area 9 * 0x17, 0x00
 CFG_DUNGEON_REWARD_AREAS:
 .endarea
 

README.md

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

version.py

@@ -1,7 +1,7 @@
-__version__ = '8.2.19'
+__version__ = '8.2.22'
 
 # This is a supplemental version number for branches based off of main dev.
-supplementary_version = 2
+supplementary_version = 1
 
 # Pick a unique identifier byte for your fork if you are intending to have a long-lasting branch.
 # This will be 0x00 for main releases and 0x01 for main dev.