Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara

2021-10-02 20:46:14 -07:00
parent 0816bb7cab a30e459dbb
commit 6d9cbc85b7
14 changed files with 394 additions and 503 deletions
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -114,8 +114,12 @@ function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<
 !MULTIWORLD_SPRITEITEM_PLAYER_ID = "$7EC099"
 !MULTIWORLD_HUD_TIMER = "$7EC09A"
 !MULTIWORLD_HUD_DELAY = "#120"
+!MULTIWORLD_ITEM_ID = "$7EC09B" ; for lua scripts?
 !Dungeon_ChestData = "$01E96C"

+!FLAG_OW_MIXED = $04
+!FLAG_OW_CROSSED = $02
+
 incsrc hooks.asm
 incsrc treekid.asm
 incsrc spriteswap.asm