Merge 'Fix crash in D-down menu with World.dungeon_rewards_hinted off' (#2321)

fenhl · fenhl · commit aebaf1d35286 · 2024-10-24T21:35:31.000Z
diff --git a/ASM/src/config.asm b/ASM/src/config.asm
@@ -322,7 +322,7 @@ TRIFORCE_PIECES_REQUIRED:
 SPECIAL_DEAL_COUNTS:
 .endarea
 
-.area 9 * 0x17, 0x20
+.area 9 * 0x17, 0x00
 CFG_DUNGEON_REWARD_AREAS:
 .endarea
 
diff --git a/README.md b/README.md
@@ -124,6 +124,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.
diff --git a/data/generated/rom_patch.txt b/data/generated/rom_patch.txt
diff --git a/version.py b/version.py
@@ -1,4 +1,4 @@
-__version__ = '8.2.20'
+__version__ = '8.2.21'
 
 # This is a supplemental version number for branches based off of main dev.
 supplementary_version = 0

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-__version__ = '8.2.20'`
	`1`	`+__version__ = '8.2.21'`
`2`	`2`
`3`	`3`	`# This is a supplemental version number for branches based off of main dev.`
`4`	`4`	`supplementary_version = 0`