Merge commit 'f403ca10da9e009599a531be8cdcd20a61b4801c' of github.com:spannerisms/z3randomizer into kara

LTTP_RND_GeneralBugfixes.asm

@@ -95,6 +95,8 @@ db #$20, #$19, #$08, #$31 ; year/month/day
 !ONEMIND_ID = $7F5072
 !ONEMIND_TIMER = $7F5073
 
+function hexto555(h) = ((((h&$FF)/8)<<10)|(((h>>8&$FF)/8)<<5)|(((h>>16&$FF)/8)<<0))
+
 ;================================================================================
 
 incsrc hooks.asm
@@ -207,6 +209,7 @@ incsrc toast.asm
 incsrc darkroomitems.asm
 incsrc fastcredits.asm
 incsrc msu.asm
+incsrc dungeonmap.asm
 incsrc special_bombs.asm
 incsrc variable_ganon_vulnerability.asm
 warnpc $A58000
@@ -297,6 +300,10 @@ org $339000
 incbin sheet178.gfx
 warnpc $339600
 
+org $339600
+BossMapIconGFX:
+incbin bossicons.4bpp
+
 org $328000
 Extra_Text_Table:
 incsrc itemtext.asm