Merge branch 'Dev' into dev-fenhl

# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	ASM/src/config.asm
#	data/generated/rom_patch.txt
#	data/generated/symbols.json

ASM/src/config.asm

@@ -261,11 +261,11 @@ CFG_RANDO_VERSION_SUPPLEMENTARY:
 CFG_BIGOCTO_OVERRIDE_KEY:
 .word 0
 .word 0
-REWARDS_AS_ITEMS:
-.byte 0x00
 .area 6, 0x00
 PASSWORD:
 .endarea
+REWARDS_AS_ITEMS:
+.byte 0x00
 .align 4
 
 ; These configuration values are given fixed addresses to aid auto-trackers.

LocationList.py

@@ -57,6 +57,8 @@ def shop_address(shop_id: int, shelf_id: int) -> int:
 # Actor ID - The position of the actor in the actor table.
 # The default variable can also be a list of such tuples in the case that multiple scene setups contain the same locations to be shuffled together.
 
+# For cutscene/song/boss locations, the Scene is set to 0xFF. This matches the behavior of the push_delayed_item C function.
+
 # Note: for ActorOverride locations, the "Addresses" variable is in the form ([addresses], [bytes]) where addresses is a list of memory locations in ROM to be updated, and bytes is the data that will be written to that location
 
 # Location: Type Scene Default Addresses Vanilla Item Categories

README.md

@@ -78,7 +78,6 @@ Differences between `dev-fenhl` and [`Dev-R`](https://github.com/Roman971/OoT-Ra
  * The Lens of Truth can be in a foolish area if Treasure Chest Game keys are shuffled and all relevant “lensless” tricks are enabled.
 * Bug fixes:
  * Missing info on randomized settings in spoilers is fixed ([#2256](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2256))
- * Jumping over a blue warp no longer causes it to fail to activate ([#2251](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2251))
  * The randomizer no longer silently ignores the `Decompress` program failing ([#2229](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2229))
  * Areas where all locations are already hinted can once again no longer be hinted Barren ([#2220](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2220))
  * A trade item obtained from a skipped location is no longer lost upon obtaining a different item from the same trade quest ([#2217](https://github.com/OoTRandomizer/OoT-Randomizer/pull/2217))

version.py

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