Update Hyrule Castle basement supertile to show platform

LTTP_RND_GeneralBugfixes.asm

@@ -203,19 +203,22 @@ incsrc menu/hudalpha.asm
 warnpc $A38000
 
 org $B98000
-incsrc crystalswitchbook.asm
+incsrc gk/crystalswitchbook.asm
-incsrc mimicdash.asm
+incsrc gk/mimicdash.asm
-incsrc gloom.asm
+incsrc gk/gloom.asm
-incsrc special_weapons.asm
+incsrc gk/special_weapons.asm
-incsrc variable_ganon_vulnerability.asm
+incsrc gk/variable_ganon_vulnerability.asm
-incsrc pseudoflute.asm
+incsrc gk/pseudoflute.asm
-incsrc dungeon_map/main.asm
+incsrc gk/fast_junk.asm
+incsrc gk/dungeon_maps.asm
 print "End of B9: ", pc
 
-warnpc $B9E000 ; $E000 - EFFF reserved for custom door rando map data
+warnpc $B9EE00
+org $B9EE00
+incsrc gk_meta.asm
 
 org $B9F000
-incsrc dungeon_map/settings.asm
+incsrc gk/settings.asm
 
 org $A38000
 incsrc stats/credits.asm ; Statically mapped

bugfixes.asm

@@ -278,76 +278,3 @@ ParadoxCaveGfxFix:
     LDX.w #$00C0 : STX.w DAS0L
     BRA .uploadLine
 ;--------------------------------------------------------------------------------
-SetItemRiseTimer:
-	LDA.w ItemReceiptMethod : CMP.b #$01 : BNE .not_from_chest
-		LDA.b #$38 : STA.w AncillaTimer, X
-		RTL
-
-	.not_from_chest
-	JSL.l ItemIsJunk
-	BEQ .default
-
-	.junk
-	LDA.l JunkItemTimer : AND.b #$3F : STA.w AncillaTimer, X
-	RTL
-
-	.default
-	TYA : STA.w AncillaTimer, X ; What we wrote over
-	RTL
-;--------------------------------------------------------------------------------
-ItemIsJunk:
-	PHX
-	LDA.l JunkItemTimer : BIT.b #$3F : BEQ .not_junk
-	BIT.b #$80 : BNE .check
-	LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BNE .check
-	LDA.l !MULTIWORLD_RECEIVING_ITEM : BNE .check
-	BRA .not_junk
-
-.check
-	LDA.l JunkItemTimer : AND.b #$40
-	BEQ +
-		LDA.b #JunkItems_triforce_end-JunkItems_end
-	+
-	CLC : ADC.b #JunkItems_end-JunkItems-1
-	LDA.w AncillaGet, X
-	TAX
-	-
-		CMP.l JunkItems, X : BEQ .junk
-		DEX : BPL -
-.not_junk
-	PLX
-	LDA.b #$00
-	RTL
-.junk
-	PLX
-	LDA.b #$01
-	RTL
-RTL
-
-JunkItems:
-	db $27 ; Bomb
-	db $28 ; 3 bombs
-	db $31 ; 10 bombs
-	db $34 ; 1 rupee
-	db $35 ; 5 rupees
-	db $36 ; 20 rupees
-	db $40 ; 100 rupees
-	db $41 ; 50 rupees
-	db $42 ; Heart
-	db $43 ; Arrow
-	db $44 ; 10 arrows
-	db $45 ; Small magic
-	db $46 ; 300 rupees
-	db $47 ; 20 rupees green
-	db $59 ; Rupoor
-	db $D1 ; Apples
-	db $D2 ; Fairy
-	db $D3 ; Chicken
-	db $D4 ; Big Magic
-	db $D5 ; 5 Arrows
-	db $D6 ; Good Bee
-.end
-	db $6B ; Power Star
-	db $6C ; Triforce Piece
-.triforce_end
-;--------------------------------------------------------------------------------

doorrando/hudadditions.asm

@@ -125,101 +125,102 @@ dw $0000, $0000, $0000, $0000, $000a, $000a, $000a, $0014, $000a, $0014, $0000,
 
 DrHudDungeonItemsAdditions:
 {
-    jsl DrawHUDDungeonItems
+	jsl DrawHUDDungeonItems
-    lda.l DRMode : cmp.b #$02 : beq + : rtl : +
+	lda.l DRMode : cmp.b #$02 : beq + : rtl : +
 
-    phx : phy : php
+	phx : phy : php
-    rep #$30
+	rep #$30
 
-    lda.w #$24f5 : sta.w $1606 : sta.w $1610 : sta.w $161a : sta.w $1624
+	lda.w #$24f5 : sta.w $1606 : sta.w $1610 : sta.w $161a : sta.w $1624
-    sta.w $1644 : sta.w $164a : sta.w $1652 : sta.w $1662 : sta.w $1684 : sta.w $16c4
+	sta.w $1644 : sta.w $164a : sta.w $1652 : sta.w $1662 : sta.w $1684 : sta.w $16c4
-    ldx.w #$0000
+	ldx.w #$0000
-    - sta.w $1704, x : sta.w $170e, x : sta.w $1718, x
+	- sta.w $1704, x : sta.w $170e, x : sta.w $1718, x
-    inx #2 : cpx.w #$0008 : !BLT -
+	inx #2 : cpx.w #$0008 : !BLT -
 
-    lda.l HudFlag : and.w #$0020 : beq + : JMP ++ : +
+	lda.l HudFlag : and.w #$0020 : beq + : JMP ++ : +
-    lda.l HUDDungeonItems : and.w #$0007 : bne + : JMP ++ : +
+	lda.l HUDDungeonItems : and.w #$001F : bne + : JMP ++ : +
-    	; bk symbols
+		; bk symbols
 		lda.w #$2811 : sta.w $1606 : sta.w $1610 : sta.w $161a : sta.w $1624
 		; sm symbols
 		lda.w #$2810 : sta.w $160a : sta.w $1614 : sta.w $161e : sta.w $16e4
-    	; blank out stuff
+		; blank out stuff
-    	lda.w #$24f5 : sta.w $1724
+		lda.w #$24f5 : sta.w $1724
 
-        ldx.w #$0002
+		ldx.w #$0002
-        	- lda.w #$0000 : !ADD.l RowOffsets,x : !ADD.l ColumnOffsets, x : tay
+			- lda.w #$0000 : !ADD.l RowOffsets,x : !ADD.l ColumnOffsets, x : tay
-        	lda.l DungeonReminderTable, x : sta.w $1644, y : iny #2
+			JSR BossStatus : STA.w $1644, Y
-        	lda.w #$24f5 : sta.w $1644, y
+			INY #2
-        	lda.l MapField : and.l DungeonMask, x : beq + ; must have map
+			lda.w #$24f5 : sta.w $1644, y
-        		jsr BkStatus : sta.w $1644, y : bra .smallKey ; big key status
+			lda.l MapField : and.l DungeonMask, x : beq + ; must have map
-        	+ lda.l BigKeyField : and.l DungeonMask, x : beq .smallKey
+				jsr BkStatus : sta.w $1644, y : bra .smallKey ; big key status
-        		lda.w #$2826 : sta.w $1644, y
+			+ lda.l BigKeyField : and.l DungeonMask, x : beq .smallKey
-        	.smallKey
+				lda.w #$2826 : sta.w $1644, y
-        	+ iny #2
+			.smallKey
+			+ iny #2
 			cpx.w #$001a : bne +
 				tya : !ADD.w #$003c : tay
-        	+ stx.b Scrap00
+			+ stx.b Scrap00
-        		txa : lsr : tax
+				txa : lsr : tax
-        		lda.w #$24f5 : sta.w $1644, y
+				lda.w #$24f5 : sta.w $1644, y
-        		lda.l GenericKeys : and.w #$00FF : bne +
+				lda.l GenericKeys : and.w #$00FF : bne +
-        		lda.l DungeonKeys, x : and.w #$00FF : beq +
+				lda.l DungeonKeys, x : and.w #$00FF : beq +
-        			jsr ConvertToDisplay2 : sta.w $1644, y
+					jsr ConvertToDisplay2 : sta.w $1644, y
-        		+ iny #2 : lda.w #$24f5 : sta.w $1644, y
+				+ iny #2 : lda.w #$24f5 : sta.w $1644, y
-        		phx : ldx.b Scrap00
+				phx : ldx.b Scrap00
 						LDA.l CompassMode : BIT.w #$0002 : BNE .skip_map_check
 					 	LDA.l MapField : AND.l DungeonMask, x : BEQ .key_info_done ; must have map
 					.skip_map_check
 						plx : sep #$30 : lda.l ChestKeys, x : sta.b Scrap02
-        		lda.l GenericKeys : bne +++
+				lda.l GenericKeys : bne +++
-        			lda.b Scrap02 : !SUB.l DungeonCollectedKeys, x : sta.b Scrap02
+					lda.b Scrap02 : !SUB.l DungeonCollectedKeys, x : sta.b Scrap02
-        		+++ lda.b Scrap02
+				+++ lda.b Scrap02
-        		rep #$30
+				rep #$30
-        		jsr ConvertToDisplay2 : sta.w $1644, y ; small key totals
+				jsr ConvertToDisplay2 : sta.w $1644, y ; small key totals
-        		bra .skipStack
+				bra .skipStack
 					.key_info_done
-        		 plx
+				 plx
-        	.skipStack iny #2
+			.skipStack iny #2
-        		cpx.w #$000d : beq +
+				cpx.w #$000d : beq +
-        			lda.w #$24f5 : sta.w $1644, y
+					lda.w #$24f5 : sta.w $1644, y
-        		+
+				+
-        	ldx.b Scrap00
+			ldx.b Scrap00
-            + inx #2 : cpx.w #$001b : bcs ++ : JMP -
+			+ inx #2 : cpx.w #$001b : bcs ++ : JMP -
-    ++
+	++
-    lda.l HudFlag : and.w #$0020 : bne + : JMP ++ : +
+	lda.l HudFlag : and.w #$0020 : bne + : JMP ++ : +
-        ; map symbols
+		; map symbols
-        lda.w #$2821 : sta.w $1606 : sta.w $1610 : sta.w $161a
+		lda.w #$2821 : sta.w $1606 : sta.w $1610 : sta.w $161a
-        ; compass symbols
+		; compass symbols
-        lda.w #$2c20 : sta.w $160a : sta.w $1614 : sta.w $161e : sta.w $16e4
+		lda.w #$2c20 : sta.w $160a : sta.w $1614 : sta.w $161e : sta.w $16e4
-        ; blank out a couple thing from old hud
+		; blank out a couple thing from old hud
-        lda.w #$24f5 : sta.w $1624 : sta.w $1724
+		lda.w #$24f5 : sta.w $1624 : sta.w $1724
-        ldx.w #$0002
+		ldx.w #$0002
-        	- lda.w #$0000 ; start of hud area
+			- lda.w #$0000 ; start of hud area
-        	!ADD.l RowOffsets, x : !ADD.l ColumnOffsets, x : tay
+			!ADD.l RowOffsets, x : !ADD.l ColumnOffsets, x : tay
-        	lda.l DungeonReminderTable, x : sta.w $1644, y
+			JSR BossStatus : STA.w $1644, Y
-        	iny #2
+			INY #2
-        	lda.w #$24f5 : sta.w $1644, y ; blank out map spot
+			lda.w #$24f5 : sta.w $1644, y ; blank out map spot
-        	lda.l MapField : ora.l MapCountDisplay : ora.l MapOverlay
+			lda.l MapField : ora.l MapCountDisplay : ora.l MapOverlay
-        	and.l DungeonMask, x : beq + ; must have map
+			and.l DungeonMask, x : beq + ; must have map
-        		JSR MapIndicatorShort : STA.w $1644, Y
+				JSR MapIndicatorShort : STA.w $1644, Y
 			+ iny #2
-            cpx.w #$001a : bne +
+			cpx.w #$001a : bne +
 				tya : !ADD.w #$003c : tay
 			+ lda.l CompassField : ora.l CompassCountDisplay
 			and.l DungeonMask, x : beq + ; must have compass
-                phx ; total chest counts
+				phx ; total chest counts
-                    LDA.l CompassTotalsWRAM, x : !SUB.l DungeonLocationsChecked, x
+					LDA.l CompassTotalsWRAM, x : !SUB.l DungeonLocationsChecked, x
-                    SEP #$30 : JSR HudHexToDec2DigitCopy : REP #$30
+					SEP #$30 : JSR HudHexToDec2DigitCopy : REP #$30
-                    lda.b Scrap06 : jsr ConvertToDisplay2 : sta.w $1644, y : iny #2
+					lda.b Scrap06 : jsr ConvertToDisplay2 : sta.w $1644, y : iny #2
-                    lda.b Scrap07 : jsr ConvertToDisplay2 : sta.w $1644, y
+					lda.b Scrap07 : jsr ConvertToDisplay2 : sta.w $1644, y
-                plx
+				plx
-                bra .skipBlanks
+				bra .skipBlanks
 			+ lda.w #$24f5 : sta.w $1644, y : iny #2 : sta.w $1644, y
-            .skipBlanks iny #2
+			.skipBlanks iny #2
-            cpx.w #$001a : beq +
+			cpx.w #$001a : beq +
 				lda.w #$24f5 : sta.w $1644, y ; blank out spot
-            + inx #2 : cpx.w #$001b : !BGE ++ : JMP -
+			+ inx #2 : cpx.w #$001b : !BGE ++ : JMP -
-    ++
+	++
-    plp : ply : plx : rtl
+	plp : ply : plx : rtl
 }
 
 MapIndicatorLong:
@@ -259,6 +260,40 @@ BkStatus:
     + lda.w #$24f5 : rts ; black otherwise
     +++ lda.w #$2826 : rts ; check mark
 
+BossStatus:
+	LDA.l HUDDungeonItems : BIT.w #$0010 : BEQ .normal
+	PHX
+	LDA.l DungeonMapBossRooms, X
+	CMP.w #$000F
+	BEQ .no_boss
+	ASL A
+	TAX
+	LDA.l SaveDataWRAM, X
+	PLX
+	BIT.w #$0800
+	BEQ .boss_alive
+
+.boss_dead
+	LDA.l HudFlag : BIT.w #$0020 : BNE .skull
+	; palette 3 - white
+	LDA.l DungeonReminderTable, X : AND.w #$E3FF : ORA.w #$0C00 : RTS
+
+.skull
+	LDA.w #$280F : RTS
+
+.no_boss
+	PLX
+	; palette 0 - light gray
+	LDA.l DungeonReminderTable, X : AND.w #$E3FF : RTS
+
+.boss_alive
+	; palette 4 - gray
+	LDA.l DungeonReminderTable, X : AND.w #$E3FF : ORA.w #$1000 : RTS
+
+.normal
+	; default palette 3 - white
+	LDA.l DungeonReminderTable, X : RTS
+
 ConvertToDisplay:
     and.w #$00ff : cmp.w #$000a : !BLT +
         !ADD.w #$2519 : rts

dungeon_map/mappable_doors.asm

@@ -1,474 +0,0 @@
-MapDrawingData:
-.floor_data_offset
-	dw $0000, $0000
-	dw $0019, $000C
-	dw $0032, $0018
-	dw $004B, $0024
-	dw $0064, $0030
-	dw $007D, $003C
-	dw $0096, $0048
-	dw $00AF, $0054
-	dw $00C8, $0060
-
-.row_data_offset
-	dw $0000, $0000
-	dw $0005, $0004
-	dw $000A, $0008
-	dw $000F, $000C
-	dw $0014, $0010
-
-.corner_tile_address
-	dw $00E2, $0160
-	dw $00F8, $0178
-	dw $03A2, $03A0
-	dw $03B8, $03B8
-
-.row_tile_address
-	dw $00E4, $0162
-	dw $03A4, $03A2
-
-.row_tile_length
-	dw $0014, $0016
-
-.column_tile_address
-	dw $0122, $01A0
-	dw $0138, $01B8
-
-.column_tile_length
-	dw $0280, $0200
-
-.floor_label_address
-	dw $035E, $035C
-
-.row_start_address
-	dw $0124, $01A2
-	dw $01A4, $0262
-	dw $0224, $0322
-	dw $02A4, $03D2
-	dw $0324, $04A2
-
-.column_count
-	dw $0005, $0004
-
-.column_spacing
-	dw $0004, $0006
-
-.row_count
-	dw $0005, $0003
-
-.bg1_grid_start
-	dw $1091, $10D1
-
-.sprite_offset_x_base
-	dw $0090, $0088
-
-.sprite_offset_y_base
-	dw $001F, $002F
-	dw $007F, $008F
-
-.entrance_sprite_offset_y_base
-	dw $0087, $0097
-
-.supertile_pixel_spacing
-	dw $0010, $0018
-
-.floor_pixel_column_wrap
-	dw $0040, $0048
-
-.floor_pixel_row_wrap
-	dw $0040, $0030
-
-CustomMapDrawingData:
-.column_wrap
-	dw $0003
-.column_count
-	dw $0004
-.row_wrap
-	dw $0002
-
-.floor_connection_data_offset
-	dw $0000
-	dw $0011
-	dw $0022
-	dw $0033
-	dw $0044
-	dw $0055
-	dw $0066
-	dw $0077
-	dw $0088
-
-.row_connection_data_offset
-	dw $0000
-	dw $0007
-	dw $000E
-	dw $0015
-
-macro LDA_MapMode()
-	LDA.l DungeonMapMode
-	ASL A
-endmacro
-
-macro LDX_MapMode()
-	%LDA_MapMode()
-	TAX
-endmacro
-
-macro LDY_MapMode()
-	%LDA_MapMode()
-	TAY
-endmacro
-
-macro ADD_MapMode()
-	CLC : ADC.l DungeonMapMode
-	ASL A
-	TAX
-endmacro
-
-macro Map_LDA(addr, label)
-	pushpc
-	org <addr>
-	JSR LDA_<label>
-	pullpc
-
-	if not(defined("LDA_<label>"))
-		!LDA_<label> = 1
-		LDA_<label>:
-			PHX
-			%LDX_MapMode()
-			LDA.l MapDrawingData_<label>, X
-			PLX
-			RTS
-	endif
-endmacro
-
-macro Map_LDAY(addr, label)
-	pushpc
-	org <addr>
-	JSR LDA_Y_<label>
-	pullpc
-
-	if not(defined("LDA_Y_<label>"))
-		!LDA_Y_<label> = 1
-		LDA_Y_<label>:
-			PHX
-			TYA
-			%ADD_MapMode()
-			LDA.l MapDrawingData_<label>, X
-			PLX
-			RTS
-	endif
-endmacro
-
-macro Map_LDAX(addr, label)
-	pushpc
-	org <addr>
-	JSR LDA_X_<label>
-	pullpc
-
-	if not(defined("LDA_X_<label>"))
-		!LDA_X_<label> = 1
-		LDA_X_<label>:
-			PHX
-			TXA
-			%ADD_MapMode()
-			LDA.l MapDrawingData_<label>, X
-			PLX
-			RTS
-	endif
-endmacro
-
-macro Map_CMP(addr, label)
-	pushpc
-	org <addr>
-	JSR CMP_<label>
-	pullpc
-
-	if not(defined("CMP_<label>"))
-		!CMP_<label> = 1
-		CMP_<label>:
-			PHX
-			PHA
-			%LDX_MapMode()
-			PLA
-			CMP.l MapDrawingData_<label>, X
-			BEQ .z_flag_set
-		.z_flag_clear
-			PLX
-			REP #$02
-			RTS
-		.z_flag_set
-			PLX
-			SEP #$02
-			RTS
-	endif
-endmacro
-
-macro Map_ADD(addr, label)
-	pushpc
-	org <addr>
-	JSR ADD_<label>
-	pullpc
-
-	if not(defined("ADD_<label>"))
-		!ADD_<label> = 1
-		ADD_<label>:
-			PHX
-			PHA
-			%LDX_MapMode()
-			PLA
-			CLC : ADC.l MapDrawingData_<label>, X
-			PLX
-			RTS
-	endif
-endmacro
-
-macro Map_ADDY(addr, label)
-	pushpc
-	org <addr>
-	JSR ADD_Y_<label>
-	pullpc
-
-	if not(defined("ADD_Y_<label>"))
-		!ADD_Y_<label> = 1
-		ADD_Y_<label>:
-			PHX
-			PHA
-			TYA
-			%ADD_MapMode()
-			PLA
-			CLC : ADC.l MapDrawingData_<label>, X
-			PLX
-			RTS
-	endif
-endmacro
-
-pushpc
-
-org $8AE5DA
-	ADC.b $02 ; swap position of load and add for ease
-
-org $8AE652 ; steal some space from the old map-drawing code we're no longer using
-
-LoadDungeonMapRoomPointer_0A:
-	JSL LoadDungeonMapRoomPointer
-	RTS
-
-%Map_LDAY($8AE45F, corner_tile_address)
-%Map_LDAY($8AE489, row_tile_address)
-%Map_CMP($8AE4B0, row_tile_length)
-%Map_LDAY($8AE4C1, column_tile_address)
-%Map_CMP($8AE4EA, column_tile_length)
-%Map_LDA($8AE54A, floor_label_address)
-%Map_LDAX($8AE5D7, row_data_offset)
-%Map_LDAY($8AE5F7, floor_data_offset)
-%Map_CMP($8AE5A2, row_count)
-%Map_CMP($8AE7FA, column_count)
-%Map_ADD($8AE896, sprite_offset_x_base)
-%Map_ADDY($8AE8B5, sprite_offset_y_base)
-%Map_ADD($8AE952, sprite_offset_y_base)
-%Map_ADDY($8AEBDB, sprite_offset_y_base)
-
-warnpc $8AE7F6
-padbyte $EA
-pad $8AE7F6
-
-pullpc
-
-incsrc data/doors_connections.asm
-
-LoadDungeonMapRoomPointer:
-	LDA.l DungeonMapMode
-	BEQ .normal
-	LDA.w #bank(CustomMapPointers)
-	STA.b $74
-	LDA.l CustomMapPointers, X
-	RTL
-
-.normal
-	LDA.w #bank(DungeonMapRoomPointers)
-	STA.b $74
-	LDA.l DungeonMapRoomPointers, X
-	RTL
-
-PrepDrawRow:
-	%ADD_MapMode()
-	LDA.l MapDrawingData_row_start_address, X
-	CLC : ADC.b $06
-	AND.w #$0FFF
-	TAX
-
-	LDA.l DungeonMapMode
-	BEQ .done
-
-	JSR DrawRowOfRoomConnections
-
-.done
-	RTL
-
-ClearAdjacentConnections:
-	; Left
-	LDA.b $02
-	BEQ +
-	LDA.b $0E
-	BIT.w #$000A
-	BNE +
-	LDA.w #$0F00
-	STA.l $7F0000-$02, X
-	STA.l $7F0040-$02, X
-+
-
-	; Top
-	LDA.b $00
-	BEQ +
-	LDA.b $0E
-	BIT.w #$000C
-	BNE +
-	LDA.w #$0F00
-	STA.l $7F0000-$40, X
-	STA.l $7F0002-$40, X
-+
-
-	; Right
-	LDA.b $02
-	CMP.l CustomMapDrawingData_column_wrap
-	BCS +
-	LDA.b $0E
-	BIT.w #$0005
-	BNE +
-	LDA.w #$0F00
-	STA.l $7F0000+$04, X
-	STA.l $7F0040+$04, X
-+
-
-	; Bottom
-	LDA.b $00
-	CMP.l CustomMapDrawingData_row_wrap
-	BCS +
-	LDA.b $0E
-	BIT.w #$0003
-	BNE +
-	LDA.w #$0F00
-	STA.l $7F0000+$80, X
-	STA.l $7F0002+$80, X
-+
-	RTL
-
-DrawRowOfRoomConnections:
-	PHB : PHK : PLB
-	PHX
-
-	LDX.w DungeonID
-	LDA.l DoorConnectionPointers, X
-	STA.b $04
-
-	LDA.l DungeonMapFloorCountData, X
-	AND.w #$000F
-	CLC : ADC.w DungeonMapCurrentFloor
-	AND.w #$00FF
-	ASL A
-	TAX
-	LDA.l CustomMapDrawingData_floor_connection_data_offset, X
-	CLC : ADC.b $04
-	STA.b $04
-
-	LDA.b $00
-	ASL A
-	TAX
-	LDA.l CustomMapDrawingData_row_connection_data_offset, X
-	CLC : ADC.b $04
-	STA.b $04
-
-	STZ.b $02
-
-	PLX : PHX
-	LDY.w #$0000
-
-.next_horizontal
-	LDA.b ($04), Y
-	AND.w #$00FF
-	JSR DrawHorizontalConnector
-	INY
-	INX #6
-
-	INC.b $02
-	LDA.b $02
-	CMP.l CustomMapDrawingData_column_wrap
-	BCC .next_horizontal
-
-	LDA.b $00
-	CMP.l CustomMapDrawingData_row_wrap
-	BCS .done
-
-	PLX : PHX
-
-	STZ.b $02
-
-.next_vertical
-	LDA.b ($04), Y
-	AND.w #$00FF
-	JSR DrawVerticalConnector
-	INY
-	INX #6
-
-	INC.b $02
-	LDA.b $02
-	CMP.l CustomMapDrawingData_column_count
-	BCC .next_vertical
-
-.done
-	PLX
-	PLB
-	RTS
-
-; A = connector index
-; X = address
-DrawHorizontalConnector:
-	PHY
-	ASL A : ASL A
-	TAY
-
-	LDA.w DoorConnectionTiles+0, Y
-	BEQ +
-	ORA.w #$1404
-	STA.l $7F0004, X
-+
-
-	LDA.w DoorConnectionTiles+2, Y
-	BEQ +
-	ORA.w #$1404
-	STA.l $7F0044, X
-+
-
-	PLY
-	RTS
-
-; A = connector index
-; X = address
-DrawVerticalConnector:
-	PHY
-	ASL A : ASL A
-	TAY
-
-	LDA.w DoorConnectionTiles+0, Y
-	BEQ +
-	ORA.w #$1400
-	STA.l $7F0080, X
-+
-
-	LDA.w DoorConnectionTiles+2, Y
-	BEQ +
-	ORA.w #$1400
-	STA.l $7F0082, X
-+
-
-	PLY
-	RTS
-
-GetLocationMarkerLeft:
-	LDA.b LinkQuadrantH
-	BEQ +
-	LDA.b #$F8
-+
-	CLC : ADC.w $0215
-	AND.b #$F8
-	RTL

gk/blink_loot.asm

@@ -22,8 +22,6 @@ StartDoubleWrite:
 	; what we wrote over
 	LDA.l DRMode
 	BEQ .draw
-	LDA.l DungeonMapMode
-	BNE .draw
 
 	INC.w $020D ; next subsubmode
 	PLA : PLA : PLA ; pull our jump to here off the stack

gk/check_loot.asm

@@ -247,6 +247,7 @@ CheckPots:
 	LDA.b [$04], Y
 	CMP.w #$FFFF : BEQ .done
 	INX : INY : INY
+	BIT.w #$4000 : BNE .multi_item ; marked as multi item
 	BIT.w #$8000 : BNE .major_item ; marked as major item
 	LDA.b [$04], Y
 	AND.w #$00FF
@@ -266,8 +267,19 @@ CheckPots:
 	INY
 	BRA .mask_set
 
+.multi_item
+	LDA.b [$04], Y
+	PHX
+	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l PotMultiWorldTable, X
+	PLX
+	BRA .item_id_set
+
 .major_item
 	LDA.b [$04], Y
+.item_id_set
 	PHA
 	PHX
 	INY

gk/data/junk_items.asm

@@ -0,0 +1,261 @@
+db $00 ; 00 - Fighter Sword and Shield
+db $00 ; 01 - Master Sword
+db $00 ; 02 - Tempered Sword
+db $00 ; 03 - Butter Sword
+db $00 ; 04 - Fighter Shield
+db $00 ; 05 - Fire Shield
+db $00 ; 06 - Mirror Shield
+db $00 ; 07 - Fire Rod
+db $00 ; 08 - Ice Rod
+db $00 ; 09 - Hammer
+db $00 ; 0A - Hookshot
+db $00 ; 0B - Bow
+db $00 ; 0C - Boomerang
+db $00 ; 0D - Powder
+db $00 ; 0E - Bottle Refill (bee)
+db $00 ; 0F - Bombos
+db $00 ; 10 - Ether
+db $00 ; 11 - Quake
+db $00 ; 12 - Lamp
+db $00 ; 13 - Shovel
+db $00 ; 14 - Flute
+db $00 ; 15 - Somaria
+db $00 ; 16 - Bottle
+db $00 ; 17 - Heartpiece
+db $00 ; 18 - Byrna
+db $00 ; 19 - Cape
+db $00 ; 1A - Mirror
+db $00 ; 1B - Glove
+db $00 ; 1C - Mitts
+db $00 ; 1D - Book
+db $00 ; 1E - Flippers
+db $00 ; 1F - Pearl
+db $00 ; 20 - Crystal
+db $00 ; 21 - Net
+db $00 ; 22 - Blue Mail
+db $00 ; 23 - Red Mail
+db $00 ; 24 - Small Key
+db $00 ; 25 - Compass
+db $00 ; 26 - Heart Container from 4/4
+db $01 ; 27 - Bomb
+db $01 ; 28 - 3 bombs
+db $00 ; 29 - Mushroom
+db $00 ; 2A - Red boomerang
+db $00 ; 2B - Full bottle (red)
+db $00 ; 2C - Full bottle (green)
+db $00 ; 2D - Full bottle (blue)
+db $00 ; 2E - Potion refill (red)
+db $00 ; 2F - Potion refill (green)
+db $00 ; 30 - Potion refill (blue)
+db $01 ; 31 - 10 bombs
+db $00 ; 32 - Big key
+db $00 ; 33 - Map
+db $01 ; 34 - 1 rupee
+db $01 ; 35 - 5 rupees
+db $01 ; 36 - 20 rupees
+db $00 ; 37 - Green pendant
+db $00 ; 38 - Blue pendant
+db $00 ; 39 - Red pendant
+db $00 ; 3A - Tossed bow
+db $00 ; 3B - Silvers
+db $00 ; 3C - Full bottle (bee)
+db $00 ; 3D - Full bottle (fairy)
+db $00 ; 3E - Boss heart
+db $00 ; 3F - Sanc heart
+db $01 ; 40 - 100 rupees
+db $01 ; 41 - 50 rupees
+db $01 ; 42 - Heart
+db $01 ; 43 - Arrow
+db $01 ; 44 - 10 arrows
+db $01 ; 45 - Small magic
+db $01 ; 46 - 300 rupees
+db $01 ; 47 - 20 rupees green
+db $00 ; 48 - Full bottle (good bee)
+db $00 ; 49 - Tossed fighter sword
+db $00 ; 4A - Active Flute
+db $00 ; 4B - Boots
+
+db $00 ; 4C - Bomb capacity (50)
+db $00 ; 4D - Arrow capacity (70)
+db $00 ; 4E - 1/2 magic
+db $00 ; 4F - 1/4 magic
+db $00 ; 50 - Safe master sword
+db $00 ; 51 - Bomb capacity (+5)
+db $00 ; 52 - Bomb capacity (+10)
+db $00 ; 53 - Arrow capacity (+5)
+db $00 ; 54 - Arrow capacity (+10)
+db $00 ; 55 - Programmable item 1
+db $00 ; 56 - Programmable item 2
+db $00 ; 57 - Programmable item 3
+db $00 ; 58 - Upgrade-only silver arrows
+db $01 ; 59 - Rupoor
+db $01 ; 5A - Nothing
+db $00 ; 5B - Red clock
+db $00 ; 5C - Blue clock
+db $00 ; 5D - Green clock
+db $00 ; 5E - Progressive sword
+db $00 ; 5F - Progressive shield
+db $00 ; 60 - Progressive armor
+db $00 ; 61 - Progressive glove
+db $00 ; 62 - RNG pool item (single)
+db $00 ; 63 - RNG pool item (multi)
+db $00 ; 64 - Progressive bow
+db $00 ; 65 - Progressive bow
+db $00 ; 66 -
+db $00 ; 67 -
+db $00 ; 68 -
+db $00 ; 69 -
+db $00 ; 6A - Triforce
+db $01 ; 6B - Power star
+db $01 ; 6C - Triforce Piece
+db $00 ; 6D - Server request item
+db $00 ; 6E - Server request item (dungeon drop)
+db $00 ; 6F -
+
+db $00 ; 70 - Map of Light World
+db $00 ; 71 - Map of Dark World
+db $00 ; 72 - Map of Ganon's Tower
+db $00 ; 73 - Map of Turtle Rock
+db $00 ; 74 - Map of Thieves' Town
+db $00 ; 75 - Map of Tower of Hera
+db $00 ; 76 - Map of Ice Palace
+db $00 ; 77 - Map of Skull Woods
+db $00 ; 78 - Map of Misery Mire
+db $00 ; 79 - Map of Dark Palace
+db $00 ; 7A - Map of Swamp Palace
+db $00 ; 7B - Map of Agahnim's Tower
+db $00 ; 7C - Map of Desert Palace
+db $00 ; 7D - Map of Eastern Palace
+db $00 ; 7E - Map of Hyrule Castle
+db $00 ; 7F - Map of Sewers
+
+db $00 ; 80 - Compass of Light World
+db $00 ; 81 - Compass of Dark World
+db $00 ; 82 - Compass of Ganon's Tower
+db $00 ; 83 - Compass of Turtle Rock
+db $00 ; 84 - Compass of Thieves' Town
+db $00 ; 85 - Compass of Tower of Hera
+db $00 ; 86 - Compass of Ice Palace
+db $00 ; 87 - Compass of Skull Woods
+db $00 ; 88 - Compass of Misery Mire
+db $00 ; 89 - Compass of Dark Palace
+db $00 ; 8A - Compass of Swamp Palace
+db $00 ; 8B - Compass of Agahnim's Tower
+db $00 ; 8C - Compass of Desert Palace
+db $00 ; 8D - Compass of Eastern Palace
+db $00 ; 8E - Compass of Hyrule Castle
+db $00 ; 8F - Compass of Sewers
+
+db $00 ; 90 - Skull key
+db $00 ; 91 - Reserved
+db $00 ; 92 - Big key of Ganon's Tower
+db $00 ; 93 - Big key of Turtle Rock
+db $00 ; 94 - Big key of Thieves' Town
+db $00 ; 95 - Big key of Tower of Hera
+db $00 ; 96 - Big key of Ice Palace
+db $00 ; 97 - Big key of Skull Woods
+db $00 ; 98 - Big key of Misery Mire
+db $00 ; 99 - Big key of Dark Palace
+db $00 ; 9A - Big key of Swamp Palace
+db $00 ; 9B - Big key of Agahnim's Tower
+db $00 ; 9C - Big key of Desert Palace
+db $00 ; 9D - Big key of Eastern Palace
+db $00 ; 9E - Big key of Hyrule Castle
+db $00 ; 9F - Big key of Sewers
+
+db $00 ; A0 - Small key of Sewers
+db $00 ; A1 - Small key of Hyrule Castle
+db $00 ; A2 - Small key of Eastern Palace
+db $00 ; A3 - Small key of Desert Palace
+db $00 ; A4 - Small key of Agahnim's Tower
+db $00 ; A5 - Small key of Swamp Palace
+db $00 ; A6 - Small key of Dark Palace
+db $00 ; A7 - Small key of Misery Mire
+db $00 ; A8 - Small key of Skull Woods
+db $00 ; A9 - Small key of Ice Palace
+db $00 ; AA - Small key of Tower of Hera
+db $00 ; AB - Small key of Thieves' Town
+db $00 ; AC - Small key of Turtle Rock
+db $00 ; AD - Small key of Ganon's Tower
+db $00 ; AE - Reserved
+db $00 ; AF - Generic small key
+db $00 ; B0 - Crystal 6
+db $00 ; B1 - Crystal 1
+db $00 ; B2 - Crystal 5
+db $00 ; B3 - Crystal 7
+db $00 ; B4 - Crystal 2
+db $00 ; B5 - Crystal 4
+db $00 ; B6 - Crystal 3
+db $00 ; B7 - Reserved
+db $00 ; B8 -
+db $00 ; B9 -
+db $00 ; BA -
+db $00 ; BB -
+db $00 ; BC -
+db $00 ; BD -
+db $00 ; BE -
+db $00 ; BF -
+db $00 ; C0 -
+db $00 ; C1 -
+db $00 ; C2 -
+db $00 ; C3 -
+db $00 ; C4 -
+db $00 ; C5 -
+db $00 ; C6 -
+db $00 ; C7 -
+db $00 ; C8 -
+db $00 ; C9 -
+db $00 ; CA -
+db $00 ; CB -
+db $00 ; CC -
+db $00 ; CD -
+db $00 ; CE -
+db $00 ; CF -
+db $01 ; D0 - Bee trap
+db $01 ; D1 - Apples
+db $01 ; D2 - Fairy
+db $01 ; D3 - Chicken
+db $01 ; D4 - Big Magic
+db $01 ; D5 - 5 Arrows
+db $01 ; D6 - Good Bee
+db $00 ; D7 -
+db $00 ; D8 -
+db $00 ; D9 -
+db $00 ; DA -
+db $00 ; DB -
+db $00 ; DC -
+db $00 ; DD -
+db $00 ; DE -
+db $00 ; DF -
+db $00 ; E0 -
+db $00 ; E1 -
+db $00 ; E2 -
+db $00 ; E3 -
+db $00 ; E4 -
+db $00 ; E5 -
+db $00 ; E6 -
+db $00 ; E7 -
+db $00 ; E8 -
+db $00 ; E9 -
+db $00 ; EA -
+db $00 ; EB -
+db $00 ; EC -
+db $00 ; ED -
+db $00 ; EE -
+db $00 ; EF -
+db $00 ; F0 -
+db $00 ; F1 -
+db $00 ; F2 -
+db $00 ; F3 -
+db $00 ; F4 -
+db $00 ; F5 -
+db $00 ; F6 -
+db $00 ; F7 -
+db $00 ; F8 -
+db $00 ; F9 -
+db $00 ; FA -
+db $00 ; FB -
+db $00 ; FC -
+db $00 ; FD -
+db $00 ; FE - Server request (async)
+db $00 ; FF -

gk/data/spiral_stairs.asm

@@ -26,7 +26,7 @@ db $01, $00, $05 ; ($0A) Single Staircase at Top of Bottom Left Quadrant
 db $01, $00, $04 ; ($0D) Moldorm
 db $02, $01, $00, $00, $02 ; ($10) Pod Basement
 db $03, $01, $0A, $02, $01, $00, $0B ; ($15) GT Entrance
-db $02, $00, $03, $01, $04 ; ($1C) Hera Below Moldorm
+db $02, $01, $03, $00, $04 ; ($1C) Hera Below Moldorm
 db $02, $00, $01, $01, $0B ; ($21) PoD Bridge
 db $01, $00, $08 ; ($26) GT Ice Armos
 db $03, $00, $01, $01, $0B, $02, $09 ; ($29) Swamp Statue

gk/data/split_room.asm

@@ -39,7 +39,7 @@ SplitRooms:
 %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
 %d(.no) : %d(.no) : %d(.6a) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no)
 
-%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.75) : %d(.no) : %d(.no)
+%d(.no) : %d(.no) : %d(.no) : %d(.no) : %d(.74) : %d(.75) : %d(.no) : %d(.no)
 %d(.no) : %d(.no) : %d(.no) : %d(.7b) : %d(.7c) : %d(.7d) : %d(.no) : %d(.no)
 
 ;  0/8       1/9       2/A       3/B       4/C       5/D       6/E       7/F

gk/data/supertile_shapes.asm

@@ -112,7 +112,7 @@ dw $FFFF, $838E, $FFFF, $FFFF ; 6E
 dw $FFFF, $FFFF, $FFFF, $FFFF ; 6F - unused
 dw $43BA, $FFFF, $FFFF, $FFFF ; 70
 dw $039A, $FFFF, $4365, $438D ; 71
-dw $437A, $037A, $8386, $0342 ; 72 - slight cheating I guess...
+dw $437A, $037A, $03C1, $0342 ; 72 - slight cheating I guess...
 dw $038F, $038F, $839B, $0366 ; 73
 dw $43B2, $03B2, $43A8, $03A8 ; 74
 dw $038F, $83B4, $0365, $03B5 ; 75

gk/doors_dungeon_map.asm

@@ -541,7 +541,9 @@ DrawStairs:
 	LDA.w SpiralProps, Y
 	AND.w #$00FF
 	STA.b $06
-	BEQ .done
+	BNE +
+	JMP .done
++
 
 	STZ.b $02
 	INY
@@ -578,11 +580,14 @@ DrawStairs:
 	STA.b $CA
 
 	JSR GetSpecificRoomVisibility
+	AND.w #$00FF
 	BNE +
 	LDA.b $0E
 	AND.w #$000F
-	BNE +
+	BEQ .ply_skip
-	BRA .ply_skip
+	LDA.b $0B
+	AND.w #$00FF
+	BEQ .ply_skip
 +
 
 	TYX
@@ -619,32 +624,70 @@ GetCurrentRoomVisibility:
 
 GetSpecificRoomVisibility:
 	PHX
-	LDA.l ShowRooms_default
+
+	; figure out if room is dark without lamp
+	LDA.b $CA
 	AND.w #$00FF
+	ASL A
+	TAX
+	LDA.l RoomHeaderPointers, X
+	TAX
+	LDA.l bank(RoomHeaders)<<16, X
+	AND.w #$0001
+	BEQ .not_dark
+
+	SEP #$20
+	JSL LampCheck
+	REP #$20
+	BNE .not_dark
+
+	LDA.l LampCone
+	BIT.w #$0020 ; all rooms are lit
+	BNE .not_dark
+
+	LDA.l ShowRooms_dark_room_cap
+	AND.w #$00FF
+	CMP.w #$0006
+	BCS .not_dark
+
+	XBA
+	STA.b $0A
+	BRA .check_visibility
+
+.not_dark
+	LDA.w #$0600
 	STA.b $0A
 
+.check_visibility
+	SEP #$20
+	LDA.l ShowRooms_default
+	STA.b $0A
+
+	REP #$20
 	LDX.w DungeonID
 	LDA.l MapField
 	AND.l DungeonMask, X
 	BEQ +
+	SEP #$20
 	LDA.l ShowRooms_have_map
-	AND.w #$00FF
 	CMP.b $0A
 	BCC +
 	STA.b $0A
 +
 
+	REP #$20
 	LDX.w DungeonID
 	LDA.l CompassField
 	AND.l DungeonMask, X
 	BEQ +
+	SEP #$20
 	LDA.l ShowRooms_have_compass
-	AND.w #$00FF
 	CMP.b $0A
 	BCC +
 	STA.b $0A
 +
 
+	REP #$20
 	LDA.b $CA
 	AND.w #$00FF
 	ASL A
@@ -653,13 +696,20 @@ GetSpecificRoomVisibility:
 	AND.w #$000F
 	STA.b $0E
 	BEQ +
+	SEP #$20
 	LDA.l ShowRooms_visited_tile
-	AND.w #$00FF
 	CMP.b $0A
 	BCC +
+	CMP.b $0B
+	BCS .too_dark
+	STA.b $0A
+	BRA +
+.too_dark
+	LDA.b $0B
 	STA.b $0A
 +
 
+	REP #$20
 	PLX
 	LDA.b $0A
 	RTS
@@ -705,6 +755,7 @@ DrawDropOrWarp:
 	STA.b $CA
 
 	JSR GetSpecificRoomVisibility
+	AND.w #$00FF
 	BNE +
 	LDA.b $0E
 	AND.w #$000F
@@ -1491,8 +1542,9 @@ DoorsMapNextEntrance:
 	STA.b $CA
 
 	JSR GetSpecificRoomVisibility
+	AND.w #$00FF
 	BNE .acceptable
-	BEQ .done
+	JMP .done
 
 +
 	TYX
@@ -1509,6 +1561,7 @@ DoorsMapNextEntrance:
 	STA.b $CA
 
 	JSR GetSpecificRoomVisibility
+	AND.w #$00FF
 	BNE .acceptable
 
 	LDA.w #$0001
@@ -1538,6 +1591,9 @@ DoorsMapNextEntrance:
 	LDA.b $00
 	AND.b $0E
 	BEQ .check_next
+	LDA.b $0B
+	AND.w #$00FF
+	BEQ .check_next
 
 .acceptable
 	PHX
@@ -1597,6 +1653,7 @@ FindFirstEntrance:
 	STA.b $CA
 
 	JSR GetSpecificRoomVisibility
+	AND.w #$00FF
 	BNE .acceptable
 
 	LDA.w #$0001
@@ -1626,6 +1683,9 @@ FindFirstEntrance:
 	LDA.b $00
 	AND.b $0E
 	BEQ .check_next
+	LDA.b $0B
+	AND.w #$00FF
+	BEQ .check_next
 
 .acceptable
 	PLP
@@ -1867,6 +1927,7 @@ DrawDoorsEntrances:
 	BMI .check_dropdown
 
 	JSR GetSpecificRoomVisibility
+	AND.w #$00FF
 	BNE .draw_entrance
 
 	PHX
@@ -1876,6 +1937,9 @@ DrawDoorsEntrances:
 	PLX
 	AND.b $0E
 	BEQ .check_dropdown
+	LDA.b $0B
+	AND.w #$00FF
+	BEQ .check_dropdown
 
 .draw_entrance
 	SEP #$30
@@ -1906,6 +1970,7 @@ DrawDoorsEntrances:
 	BMI .next_room
 
 	JSR GetSpecificRoomVisibility
+	AND.w #$00FF
 	BNE .draw_dropdown
 
 	PHX
@@ -1914,7 +1979,13 @@ DrawDoorsEntrances:
 	LDA.l DropdownQuadrantMasks, X
 	PLX
 	AND.b $0E
-	BEQ .next_room
+	BEQ .goto_next_room
+	LDA.b $0B
+	AND.w #$00FF
+	BNE .draw_dropdown
+
+.goto_next_room
+	JMP .next_room
 
 .draw_dropdown
 	SEP #$30
@@ -1964,7 +2035,6 @@ DrawDoorsStairs:
 	INX : INX
 	LDA.l SpiralProps, X
 
-
 	PHX
 	ASL A
 	TAX
@@ -1996,6 +2066,10 @@ DrawDoorsStairs:
 	AND.b $0E
 	BEQ .skip
 
+	LDA.b $0B
+	CMP.b #$04
+	BCC .skip
+
 .draw
 	LDY.b $00
 	LDA.b #$00

gk/draw_loot.asm

@@ -30,18 +30,15 @@ DrawLoot:
 	STA.w $021B
 
 	LDA.l DRMode
-	BEQ +
+	BNE .skip
-	LDA.l DungeonMapMode
+
-	BNE +
-	BRA .skip
-+
 	REP #$30
 	PHX : PHY
 
 	STZ.b $0E
 
 	LDX.w DungeonID
-	JSL LoadDungeonMapRoomPointer
+	LDA.l DungeonMapRoomPointers, X
 	STA.b $72
 
 	SEP #$20
@@ -73,65 +70,52 @@ DrawLoot:
 DrawSingleFloorLoot:
 	REP #$20
 	AND.w #$00FF
-	INC A
 	ASL A
-	%ADD_MapMode()
+	TAX
 
-	LDA.l MapDrawingData_floor_data_offset, X
+	LDA.l DungeonMapFloorToDataOffset, X
-	DEC A
+	CLC : ADC.w #$0018 ; get to end of floor
 	TAY
 
-	%LDX_MapMode()
-
 	SEP #$20
-	LDA.l MapDrawingData_column_count, X
+	LDA.b #$04
-	DEC A
 	STA.b $06
 
-	LDA.l MapDrawingData_row_count, X
+	LDA.b #$04
-	DEC A
 	STA.b $07
 
 .next_row
 	REP #$20
 	LDA.w GFXStripes
 	TAX
-	CLC : ADC.w #$0034
+	CLC : ADC.w #$0030
 	STA.w GFXStripes
 
-	PHX
-	%LDX_MapMode()
-
 	SEP #$20
 	LDA.b $07
-	CPX.w #$0002
-	BNE +
-	ASL A
-+
 	CLC : ADC.b $07
 	REP #$20
 	AND.w #$00FF
 	ASL #5
 
-	CLC : ADC.l MapDrawingData_bg1_grid_start, X
+	CLC : ADC.w #$1092
 	ADC.b $0E
 	XBA
-	PLX
 	STA.w GFXStripes+$02, X
 	CLC : ADC.w #$2000
+	STA.w GFXStripes+$1A, X
+
+	LDA.w #$1300
+	STA.w GFXStripes+$04, X
 	STA.w GFXStripes+$1C, X
 
-	LDA.w #$1500
-	STA.w GFXStripes+$04, X
-	STA.w GFXStripes+$1E, X
-
 	TXA
-	CLC : ADC.w #$0018
+	CLC : ADC.w #$0016
 	TAX
 
 .next_room
 	REP #$20
-	LDA.b [$72], Y ; get room id
+	LDA.b ($72), Y ; get room id
 	PHY
 
 	AND.w #$00FF
@@ -153,49 +137,24 @@ DrawSingleFloorLoot:
 	LDA.l LootTypeIcons+2, X
 	STA.w GFXStripes+$02, Y
 	LDA.l LootTypeIcons+4, X
-	STA.w GFXStripes+$1A, Y
+	STA.w GFXStripes+$18, Y
 	LDA.l LootTypeIcons+6, X
-	STA.w GFXStripes+$1C, Y
+	STA.w GFXStripes+$1A, Y
 
 	TYX
 	PLY
 	DEY : DEX #4
 
-	LDA.l DungeonMapMode
-	BEQ +
-	LDA.b $06
-	AND.w #$00FF
-	BEQ +
-
-	; skip a column if in 4x3 mode and it's not the last column
-	LDA.w #$0300
-	STA.w GFXStripes+$02, X
-	STA.w GFXStripes+$1C, X
-	DEX : DEX
-+
-
 	SEP #$20
 	DEC.b $06
 	BPL .next_room
 
-	LDA.l DungeonMapMode
-	BNE +
-	; draw an extra empty tile at the end to make up for width differences between modes
-	LDA.b #$03
-	STZ.w GFXStripes+$02, X
-	STA.w GFXStripes+$03, X
-	STZ.w GFXStripes+$1C, X
-	STA.w GFXStripes+$1D, X
-+
-
 	DEC.b $07
 	BMI .done
 
 	LDA.b #$00
 	XBA
-	%LDX_MapMode()
+	LDA.b #$04
-	LDA.l MapDrawingData_column_count, X
-	DEC A
 	STA.b $06
 
 	JMP .next_row

gk/draw_rooms.asm

@@ -5,18 +5,49 @@ DrawNonexistentRoom:
 	STA.l $7F0002, X
 	STA.l $7F0040, X
 	STA.l $7F0042, X
+	JML $8AE7F2
 
-FinishRoom:
+GetVisibilityProps:
 	PHX
-	%LDX_MapMode()
+	ASL A : ASL A
-	PLA
-	CLC : ADC.l MapDrawingData_column_spacing, X
 	TAX
-	JML $8AE7F6
+	LDA.b $0C
+	AND.l .visibility_props, X
+	ORA.l .visibility_props+2, X
+	STA.b $0C
+	PLX
+	RTS
+
+.visibility_props:
+	dw $0000, $0F00
+	dw $C000, $174F
+	dw $C000, $174F
+	dw $0000, $1400
+	dw $0000, $1000
+	dw $0000, $0C00
+	dw $0000, $0800
+
+; A = room shape
+; $0C = visibility props
+GetQuadrantTile:
+	PHA
+
+	LDA.b $0C
+	AND.w #$03FF
+	BNE .square
+
+	PLA
+	ORA.b $0C
+	RTS
+
+.square
+	PLA
+	LDA.b $0C
+	RTS
 
 NormalDrawDungeonMapRoom:
 	JSL DrawDungeonMapRoom
-	JMP FinishRoom
+	JML $8AE7F2
 
 ; $CA has room_id
 ; $0E has quadrant flags
@@ -26,62 +57,7 @@ DrawDungeonMapRoom:
 	PHB : PHK : PLB ; need to keep this in same bank as data, or else specify bank
 	LDA.b $0A : PHA
 
-	LDA.l ShowRooms_default
+	JSR GetSpecificRoomVisibility
-	AND.w #$00FF
-	STA.b $0A
-
-	PHX
-
-	LDX.w DungeonID
-	LDA.l MapField
-	AND.l DungeonMask, X
-	BEQ +
-	LDA.l ShowRooms_have_map
-	AND.w #$00FF
-	CMP.b $0A
-	BCC +
-	STA.b $0A
-+
-
-	LDX.w DungeonID
-	LDA.l CompassField
-	AND.l DungeonMask, X
-	BEQ +
-	LDA.l ShowRooms_have_compass
-	AND.w #$00FF
-	CMP.b $0A
-	BCC +
-	STA.b $0A
-+
-
-	LDA.b $0E
-	AND.w #$000F
-	BEQ +
-	LDA.l ShowRooms_visited_tile
-	AND.w #$00FF
-	CMP.b $0A
-	BCC +
-	STA.b $0A
-+
-
-	PLX
-
-	LDA.l DungeonMapMode
-	BEQ +
-	LDA.b $0A
-	CMP.w #$0003
-	BCS +
-	JSL ClearAdjacentConnections
-+
-
-	LDA.b $0A : BNE + : LDA.w #$0F00 : BRA ++
-+	DEC A     : BNE + : LDA.w #$174F : BRA ++
-+	DEC A     : BNE + : LDA.w #$174F : BRA ++
-+	DEC A     : BNE + : LDA.w #$1400 : BRA ++
-+	DEC A     : BNE + : LDA.w #$1000 : BRA ++
-+	DEC A     : BNE + : LDA.w #$0C00 : BRA ++
-+	LDA.w #$0800
-++	STA.b $0C
 
 	LDA.b $CA
 	AND.w #$00FF
@@ -89,49 +65,44 @@ DrawDungeonMapRoom:
 	TAY
 
 	macro DrawQuadrant(quadrant, writeOffset)
-		?DrawQuadrant:
+		.draw_quadrant_<quadrant>:
-		LDA.w SupertileRoomShapes+(2*<quadrant>), Y
+			LDA.w #(3-<quadrant>)<<14
-		CMP.w #$FFFF : BEQ ?.empty
+			STA.b $0C
-		PHA
-		LDA.b $0E
-		AND.w #1<<(3-<quadrant>)
-		BNE ?.visited
 
-		?.unvisited
+			LDA.b $0E
-		LDA.b $0A
+			BIT.w #1<<(3-<quadrant>)
-		CMP.w #$0003
+			BNE ..visited
-		BCS ?.shape
 
-		?.square
+			LDA.b $0A
-		PLA
+			BRA ..continue
-		LDA.b $0C
-		EOR.w #(3-<quadrant>)<<14
-		BRA ?.write
 
-		?.shape
+		..visited
-		PLA
+			LDA.b $0B
-		ORA.b $0C
-		BRA ?.write
 
-		?.visited
+		..continue
-		PLA
+			AND.w #$00FF
-		ORA.w #$0800
+			JSR GetVisibilityProps
-		BRA ?.write
 
-		?.empty
+			LDA.w SupertileRoomShapes+(2*<quadrant>), Y
-		LDA.b $0A
+			CMP.w #$FFFF : BNE ..get_quadrant
-		CMP.w #$0001
+			LDA.b $0A
-		BEQ ?.full_square
+			AND.w #$00FF
-		LDA.w #$0F00
+			CMP.w #$0001
-		BRA ?.write
+			BNE ..empty
 
-		?.full_square
+		..full_square
-		LDA.w #$174F
+			LDA.b $0C
-		EOR.w #(3-<quadrant>)<<14
+			BRA ..write
 
-		?.write
+		..get_quadrant
-		STA.l $7F0000+<writeOffset>, X
+			JSR GetQuadrantTile
-		?.done
+			BRA ..write
+
+		..empty
+			LDA.w #$0F00
+
+		..write
+			STA.l $7F0000+<writeOffset>, X
 	endmacro
 
 	%DrawQuadrant(0, $00)
@@ -150,7 +121,7 @@ DrawEntrances:
 	LDA.b $06 : PHA
 
 	LDX.w DungeonID
-	JSL LoadDungeonMapRoomPointer
+	LDA.l DungeonMapRoomPointers, X
 	STA.b $72
 
 	SEP #$20
@@ -181,23 +152,18 @@ DrawSingleFloorEntrances:
 	ASL A
 	TAX
 
-	%ADD_MapMode()
+	LDA.l DungeonMapFloorToDataOffset, X
-	LDA.l MapDrawingData_floor_data_offset, X
 	TAY
 	STZ.b $06
 
-	%LDX_MapMode()
-
 .next_room
 	REP #$20
-	LDA.b [$72], Y ; get room id
+	LDA.b ($72), Y ; get room id
 	AND.w #$00FF
 	CMP.w #$000F ; $0F = empty room
 
 	BEQ +
-	PHX
 	JSR DrawSingleRoomEntrances
-	PLX
 +
 
 	INY
@@ -205,13 +171,13 @@ DrawSingleFloorEntrances:
 	SEP #$20
 	INC.b $06
 	LDA.b $06
-	CMP.l MapDrawingData_column_count, X
+	CMP.b #$05
 	BCC .next_room
 
 	STZ.b $06
 -	INC.b $07
 	LDA.b $07
-	CMP.l MapDrawingData_row_count, X
+	CMP.b #$05
 	BCC .next_room
 
 .done
@@ -233,8 +199,7 @@ macro DrawSingleEntrance(offset)
 ?+
 	CLC : ADC.b $06
 	ASL #3
-	CLC : ADC.b #<offset>
+	CLC : ADC.b #$90+<offset>
-	CLC : ADC.l MapDrawingData_sprite_offset_x_base, X
 	STA.w OAMBuffer+0, Y
 
 	PHX
@@ -245,13 +210,10 @@ macro DrawSingleEntrance(offset)
 ?+
 	CLC : ADC.b $07
 	ASL #3
-	PHA
 
-	LDA.b $02
+	LDX.b $02
-	%ADD_MapMode()
 
-	PLA
+	CLC : ADC.l DungeonMapRoomMarkerYBase, X
-	CLC : ADC.l MapDrawingData_sprite_offset_y_base, X
 	PLX
 	CLC : ADC.b #$08
 	CLC : ADC.w $0213
@@ -271,8 +233,6 @@ DrawSingleRoomEntrances:
 	STA.b $0E
 	PHY
 
-	%LDY_MapMode()
-
 	SEP #$10
 
 	LDX.b #$FE

gk/dungeon_map_hooks.asm

@@ -14,24 +14,14 @@ org $8AE12B
 LDA.b #$20
 
 ; dungeon map sheets
-org $80DD97
+org $80DDD3 ; slot $8F
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
-db $61, $56, $57, $62
 db $61, $56, $57, $62
 
+; always use $8F in dungeon map
+org $8AE122
+NOP #4
+LDA.b #$8F
+
 ; unused chest data
 org $81E9A5
 dw $000F ; freezor room, second chest (only one chest in supertile)
@@ -177,61 +167,16 @@ org $8AE21C
 	JSL DrawMountain
 	BRA + : NOP #9 : +
 
-;================================================================================
-; Custom Door Rando Maps
-;--------------------------------------------------------------------------------
-org $8AE590
-	JSL PrepDrawRow
-	BRA + : NOP #5 : +
-
-org $8AE5F2
-	JSR LoadDungeonMapRoomPointer_0A
-	STA.b $72
-
-org $8AE600
-	LDA.b [$72], Y
-
-org $8AE634
-	JSR LoadDungeonMapRoomPointer_0A
-	STA.b $72
-
-org $8AE63B
-	LDA.b [$72], Y
-
-org $8AE867
-	JSR LoadDungeonMapRoomPointer_0A
-	STA.b $72
-
-org $8AE872
-	LDA.b [$72], Y
-
-org $8AE8DD
-	JSR LoadDungeonMapRoomPointer_0A
-
-org $8AE8E4
-	STA.b $72
-
-org $8AE8F9
-	LDA.b [$72], Y
-
-org $8AEBC6
-	JSL GetLocationMarkerLeft
-	NOP
-
 ;================================================================================
 ; Draw Wacky Door Rando Layouts
 ;--------------------------------------------------------------------------------
 org $8AE3D7
-	LDA.l DungeonMapMode
-	BNE .normal
 	LDA.l DRMode
-	BEQ .normal
+	BEQ +
-
+		JSL DrawWackyDoorRandoStuff
-	JSL DrawWackyDoorRandoStuff
+		JMP.w $8AE422
-	JMP.w $8AE422
+		NOP
-	NOP
+	+
-
-	.normal
 warnpc $8AE3EB
 
 org $8AE439

gk/dungeon_maps.asm

@@ -1,5 +1,5 @@
 pushpc
-incsrc hooks.asm
+incsrc dungeon_map_hooks.asm
 
 macro WriteGFXSheetPointer(sheet, location)
 	pushpc
@@ -26,8 +26,7 @@ endmacro
 
 pullpc
 
-incsrc mappable_doors.asm
+incsrc doors_dungeon_map.asm
-incsrc current_room_map.asm
 incsrc draw_rooms.asm
 incsrc map_bg3.asm
 incsrc dungeon_switch.asm
@@ -38,3 +37,4 @@ incsrc data/doors_display.asm
 incsrc data/spiral_stairs.asm
 incsrc data/fall_warps.asm
 incsrc data/split_room.asm
+incsrc data/doors_connections.asm

gk/dungeon_switch.asm

@@ -1,8 +1,6 @@
 CheckSwitchMap:
 	LDA.l DRMode
 	BEQ .not_fancy_door_map
-	LDA.l DungeonMapMode
-	BNE .not_fancy_door_map
 
 	; fancy door map
 	SEP #$20
@@ -160,10 +158,6 @@ SkipMapSprites:
 
 	LDA.l DRMode
 	BEQ +
-	LDA.l DungeonMapMode
-	BEQ .no_vanilla_draw
-		JML $8AEADE
-	.no_vanilla_draw
 		JSL DrawDoorsMapSprites
 		JML $8AEAFC
 +
@@ -265,10 +259,7 @@ DrawDungeonLabel:
 	TAY
 
 	LDA.l DRMode
-	BEQ .not_doors
+	BNE .doors
-	LDA.l DungeonMapMode
-	BEQ .doors
-.not_doors
 	JMP .skip_doors
 
 .doors
@@ -347,30 +338,25 @@ StartCurrentRoomSearch:
 	RTL
 
 FindCurrentRoom:
-	PHX
+	LDA.w DungeonMapFloorToDataOffset, Y
-	TYA
-	%ADD_MapMode()
-	LDA.l MapDrawingData_floor_data_offset, X
 	STA.b $0C
 	LDY.w #$0000
-
-	%LDX_MapMode()
-
 	SEP #$20
 
 .next_room_check
 	CPY.b $0C
 	BCS .not_found
 
-	LDA.b [$72], Y
+	LDA.b ($04), Y
 	INY
 	CMP.b $0E
 	BEQ .found
 
 	LDA.b $00
-	CMP.l MapDrawingData_floor_pixel_column_wrap, X
+	CMP.b #$40
 	BCS .next_row
-	CLC : ADC.l MapDrawingData_supertile_pixel_spacing, X
+
+	CLC : ADC.b #$10
 	STA.b $00
 	BRA .next_room_check
 
@@ -378,9 +364,9 @@ FindCurrentRoom:
 	STZ.b $00
 
 	LDA.b $02
-	CMP.l MapDrawingData_floor_pixel_row_wrap, X
+	CMP.b #$40
 	BCS .next_floor
-	CLC : ADC.l MapDrawingData_supertile_pixel_spacing, X
+	CLC : ADC.b #$10
 	STA.b $02
 	BRA .next_room_check
 
@@ -389,9 +375,7 @@ FindCurrentRoom:
 	BRA .next_room_check
 
 .found
-	PLX
 	JML $8AE891
 
 .not_found
-	PLX
 	JML $8AE8CD

gk/fast_junk.asm

@@ -0,0 +1,67 @@
+;--------------------------------------------------------------------------------
+SetItemRiseTimer:
+	LDA.w ItemReceiptMethod : CMP.b #$01 : BNE .not_from_chest
+		LDA.b #$38 : STA.w AncillaTimer, X
+		RTL
+
+	.not_from_chest
+	JSL ItemIsJunk
+	BEQ .default
+
+	.junk
+	LDA.l JunkItemTimer : AND.b #$3F : STA.w AncillaTimer, X
+	RTL
+
+	.default
+	TYA : STA.w AncillaTimer, X ; What we wrote over
+	RTL
+;--------------------------------------------------------------------------------
+ItemIsJunk:
+	PHX
+	LDA.l JunkItemTimer : BIT.b #$3F : BEQ .not_junk
+	BIT.b #$80 : BNE .check
+	LDA.l !MULTIWORLD_ITEM_PLAYER_ID : BNE .check
+	LDA.l !MULTIWORLD_RECEIVING_ITEM : BNE .check
+	BRA .not_junk
+
+.check
+	LDA.w AncillaGet, X
+	TAX
+	LDA.l JunkTable, X
+	PLX
+	CMP.b #$00
+	RTL
+
+.not_junk
+	PLX
+	LDA.b #$00
+	RTL
+
+;--------------------------------------------------------------------------------
+; A = item id being collected
+ItemGetAlternateSFX:
+	PEA.w $C567 ; SNES to RTS to in bank 08
+	LDA.w AncillaGet, X : CMP.b #$4A : BNE +
+		; collecting pre-activated flute
+		LDA.b #$13 : JML Ancilla_SFX2_Near
+	+
+	JSL ItemIsJunk : BEQ .normal
+		LDA.b #$3B : JML Ancilla_SFX3_Near
+	.normal
+		LDA.b #$0F : JML Ancilla_SFX3_Near
+;--------------------------------------------------------------------------------
+; A = item id being collected
+ItemGetOverworldAlternateSFX:
+	CPY.b #$4A : BNE +
+		; pre-activated flute
+		JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$13 : STA.w SFX2
+		RTL
+	+
+	JSL ItemIsJunk : BEQ .normal
+	.junk
+		JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$3B : STA.w SFX3
+		RTL
+	.normal
+		JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$0F : STA.w SFX3
+		RTL
+;--------------------------------------------------------------------------------

gk/map_bg3.asm

@@ -11,8 +11,6 @@ LoadStripes:
 	RTL
 
 .dungeon_map
-	LDA.l DungeonMapMode
-	BNE .4x3
 	LDA.l DRMode
 	BNE .6x6
 
@@ -25,15 +23,6 @@ LoadStripes:
 	STA.b $02
 	RTL
 
-.4x3
-	LDA.b #BG3DungeonMap4x3Stripes>>0
-	STA.b $00
-	LDA.b #BG3DungeonMap4x3Stripes>>8
-	STA.b $01
-	LDA.b #BG3DungeonMap4x3Stripes>>16
-	STA.b $02
-	RTL
-
 .6x6
 	LDA.b #BG3DungeonMap6x6Stripes>>0
 	STA.b $00
@@ -57,33 +46,30 @@ LoadLastHUDPalette:
 	SEP #$20
 	RTL
 
-macro VanillaCommonMapStripes()
-	dw $4260, $0100, $2100
-	dw $4360, $0E40, $2101
-	dw $4B60, $0100, $6100
-	dw $6260, $2EC0, $2110
-	dw $6B60, $2EC0, $6110
-	dw $6263, $0100, $A100
-	dw $6363, $0E40, $A101
-	dw $6B63, $0100, $E100
-	dw $8460, $0B00, $2102, $2103, $2104, $2105, $2106, $2107
-	dw $A460, $0B00, $2112, $2113, $2114, $2115, $2116, $2117
-	dw $5D60, $0100, $6100
-	dw $7D60, $2EC0, $6110
-	dw $7D63, $0100, $E100
-	dw $0060, $7E40, $2111
-	dw $8063, $3E41, $2111
-	dw $0060, $3EC0, $2111
-	dw $0160, $3EC0, $2111
-	dw $0C60, $3EC0, $2111
-	dw $0D60, $3EC0, $2111
-	dw $1E60, $3EC0, $2111
-	dw $1F60, $3EC0, $2111
-endmacro
-
-
 BG3DungeonMap5x5Stripes:
-%VanillaCommonMapStripes()
+; vanilla stuff
+dw $4260, $0100, $2100
+dw $4360, $0E40, $2101
+dw $4B60, $0100, $6100
+dw $6260, $2EC0, $2110
+dw $6B60, $2EC0, $6110
+dw $6263, $0100, $A100
+dw $6363, $0E40, $A101
+dw $6B63, $0100, $E100
+dw $8460, $0B00, $2102, $2103, $2104, $2105, $2106, $2107
+dw $A460, $0B00, $2112, $2113, $2114, $2115, $2116, $2117
+dw $5D60, $0100, $6100
+dw $7D60, $2EC0, $6110
+dw $7D63, $0100, $E100
+dw $0060, $7E40, $2111
+dw $8063, $3E41, $2111
+dw $0060, $3EC0, $2111
+dw $0160, $3EC0, $2111
+dw $0C60, $3EC0, $2111
+dw $0D60, $3EC0, $2111
+dw $1E60, $3EC0, $2111
+dw $1F60, $3EC0, $2111
+
 ; left edge of map border, from vanilla
 dw $4E60, $0100, $2100
 dw $4F60, $1A40, $2101
@@ -133,59 +119,6 @@ endmacro
 
 db $FF
 
-BG3DungeonMap4x3Stripes:
-%VanillaCommonMapStripes()
-; left edge of map border, adjusted from vanilla
-dw $4D60, $0100, $2100
-dw $4E60, $1C40, $2101
-dw $6D60, $2EC0, $2110
-dw $6D63, $0100, $A100
-dw $6E63, $1C40, $A101
-
-; horizontal borders
-dw $B160, $1440, $1D11
-dw $1161, $1440, $1D11
-dw $7161, $1440, $1D11
-dw $D161, $1440, $1D11
-dw $3162, $1440, $1D11
-dw $9162, $1440, $1D11
-dw $F162, $1440, $1D11
-dw $5163, $1440, $1D11
-
-; vertical borders
-dw $B060, $12C0, $1D11
-dw $BC60, $12C0, $1D11
-dw $3062, $12C0, $1D11
-dw $3C62, $12C0, $1D11
-
-macro TopOfDoorSquares(start)
-	; silly Big Endian
-	db <start>>>8, <start>, $00, $15
-	dw $5D4C, $1D4C, $1D11, $5D4C, $1D4C, $1D11, $5D4C, $1D4C, $1D11, $5D4C, $1D4C
-endmacro
-
-macro BottomOfDoorSquares(start)
-	; silly Big Endian
-	db <start>>>8, <start>, $00, $15
-	dw $DD4C, $9D4C, $1D11, $DD4C, $9D4C, $1D11, $DD4C, $9D4C, $1D11, $DD4C, $9D4C
-endmacro
-
-macro FullDoorRow(start)
-	%TopOfDoorSquares(<start>)
-	%BottomOfDoorSquares(<start>+$20)
-endmacro
-
-; top grid
-%FullDoorRow($60D1)
-%FullDoorRow($6131)
-%FullDoorRow($6191)
-
-%FullDoorRow($6251)
-%FullDoorRow($62B1)
-%FullDoorRow($6311)
-
-db $FF
-
 BG3DungeonMap6x6Stripes:
 ; vanilla
 dw $4260, $0100, $2100

gk/pseudoflute.asm

@@ -115,7 +115,9 @@ RTL
 CheckTransitionOverworld:
 	STA.b $8A
 	STA.w $040A ; what we wrote over
-	JML MaybeMarkFluteSpotVisited
+	JSL MaybeMarkFluteSpotVisited
+	LDA.b $8A
+	RTL
 
 CheckFlute:
 	LDA.l FluteBitfield

gk/settings.asm

@@ -1,4 +1,4 @@
-; $B9F000
+org $B9F000
 SupertileRoomShapes:
 incsrc data/supertile_shapes.asm
 warnpc $B9F800
@@ -62,7 +62,7 @@ dw $29ED, $69ED, $29FD, $69FD ; 0B - important inventory item - big chest
 dw $29CC, $29CD, $29DC, $69DC ; 0C - pendant
 dw $2DC9, $69C9, $A9C9, $EDC9 ; 0D - crystal
 dw $29E9, $69E9, $29F9, $69F9 ; 0E - triforce piece
-dw $29EA, $69EA, $29EB, $69EB ; 0F - triforce
+dw $29EA, $69EA, $29FA, $69FA ; 0F - triforce
 
 warnpc $B9F900
 org $B9F900
@@ -147,8 +147,12 @@ dw $25A4, $25A4 ; Reserved
 
 ; $B9FB40
 
-warnpc $B9FF00
+warnpc $B9FE00
+org $B9FE00
+JunkTable:
+incsrc data/junk_items.asm
 
+warnpc $B9FF00
 org $B9FF00
 ; $00 - do not show anything
 ; $01 - show presence of supertile as dark square
@@ -167,7 +171,9 @@ ShowRooms:
 .visited_tile
 	db $04
 .reserved
-	skip 4
+	skip 3
+.dark_room_cap
+	db $01
 warnpc $B9FF08
 
 org $B9FF08
@@ -200,9 +206,3 @@ ItemSources:
 ; $B9FF11
 AlwaysShowCompass:
 	db $01
-
-; $B9FF12
-; $0000 - vanilla 5x5 maps
-; $0001 - special DR 4x3 maps
-DungeonMapMode:
-	dw $0000

gk_meta.asm

@@ -0,0 +1,22 @@
+org $B9EE00
+
+;================================================================================
+warnpc $B9EEE0
+org $B9EEE0
+;--------------------------------------------------------------------------------
+B9Source:
+; $01 = GK Baserom
+; $FF = GK Adjuster Patch
+db $01
+;--------------------------------------------------------------------------------
+GKMajorVersion:
+; $01 = Dungeon Maps
+db $01
+;--------------------------------------------------------------------------------
+GKMinorVersion:
+; $01 = Dark rooms don't show on map from visition
+db $01
+;--------------------------------------------------------------------------------
+GKBuild:
+db $00
+;--------------------------------------------------------------------------------

goalitem.asm

@@ -40,14 +40,14 @@ RTL
 	dw .crystals
 	dw .pendant_bosses
 	dw .crystal_bosses
-	dw .bosses
+	dw .prize_bosses
 	dw .agahnim_defeated
 	dw .agahnim2_defeated
 	dw .goal_item
 	dw .collection_rate
 	dw .custom_goal
 	dw .bingo
-	dw .success
+	dw .all_bosses
 	dw .success
 	dw .success
 	dw .success
@@ -70,19 +70,24 @@ RTL
 		CMP.b #$07 : RTS
 .pendant_bosses
 	PHP
-	LDA.b #$02
+	LDA.b #$20
 	JSR CheckForBossesDefeated : PLP : BCC +
 		CMP.b #$03 : RTS
 .crystal_bosses
 	PHP
-	LDA.b #$01
+	LDA.b #$10
 	JSR CheckForBossesDefeated : PLP : BCC +
 		CMP.b #$07 : RTS
-.bosses
+.all_bosses
+	PHP
+	LDA.b #$30
+	JSR CheckForBossesDefeated : PLP : BCC +
+		CMP.b #$10 : RTS
+.prize_bosses
 	PHP
 	LDA.b #$00
 	JSR CheckForBossesDefeated : PLP : BCC +
-		CMP.b #$10 : RTS
+		CMP.b #$0A : RTS
 	+ CMP.b [Scrap00], Y : INY : RTS
 .agahnim_defeated
 	LDA.l ProgressIndicator : CMP.b #$03 : RTS
@@ -346,7 +351,7 @@ CheckTowerOpen:
 ;---------------------------------------------------------------------------------------------------
 CheckAgaForPed:
         REP #$20
-		; seems light_speed option to force blue balls is unused for now
+        ; seems light_speed option to force blue balls is unused for now
         BRA .vanilla
 
 .light_speed
@@ -368,12 +373,38 @@ CheckAgaForPed:
         RTL
 
 ;---------------------------------------------------------------------------------------------------
+BossPrizeFlags:
+	; $00 = all prize bosses
+	db $00
+	db $01, $01, $01, $01, $01, $01, $01 ; crystals
+	db $01, $01, $01 ; pendants
+	db $00, $00, $00, $00, $00 ; padding
+	; $10 = all crystal bosses
+	db $00
+	db $01, $01, $01, $01, $01, $01, $01 ; crystals
+	db $00, $00, $00 ; pendants
+	db $00, $00, $00, $00, $00 ; padding
+	; $20 = all pendant bosses
+	db $00
+	db $00, $00, $00, $00, $00, $00, $00 ; crystals
+	db $01, $01, $01 ; pendants
+	db $00, $00, $00, $00, $00 ; padding
+	; $30 = all bosses
+	db $01 ; agas
+	db $01, $01, $01, $01, $01, $01, $01 ; crystals
+	db $01, $01, $01 ; pendants
+	db $00, $00, $00, $00, $00 ; padding
+
 CheckForBossesDefeated:
 	PHB : PHX : PHY
 
-	STA.b Scrap04 ; 0 = check all, 1 = check crystals, 2 = check pendants
+	; $00 = check prize bosses
+	; $10 = check crystal bosses
+	; $20 = check pendant bosses
+	; $30 = check all bosses
+	STA.b Scrap04
 	
-	LDA.b #CrystalPendantFlags_3>>16
+	LDA.b #bank(CrystalPendantFlags_3)
 	PHA : PLB
 
 	STZ.b Scrap03 ; count of number of bosses killed
@@ -381,22 +412,22 @@ CheckForBossesDefeated:
 
 	REP #$30
 
-	LDY.w #10
+	LDY.w #11
 
 .next_check
-	LDA.w CrystalPendantFlags_3+2,Y : AND.w #$00FF : BEQ .skip
+	SEP #$30
-	CMP.w #$0008 ; C set = pendant, C clear = crystal
+	LDA.w CrystalPendantFlags_3+2, Y
-	LDA.b Scrap04 : BEQ .proceed
+	CLC : ADC.b Scrap04
-		PHP : ROR : BCC +
+	TAX
-			PLP : BCS .skip : BRA .proceed
+	LDA.l BossPrizeFlags, X
-		+ PLP : BCC .skip
+	REP #$30
+	BEQ .skip
 
-	.proceed
+	TYA : ASL A : TAX
-	TYA : ASL : TAX
 
-	LDA.l DungeonMapBossRooms+4,X
+	LDA.l DungeonMapBossRooms+4, X
-	ASL : TAX
+	ASL A : TAX
-	LDA.l RoomDataWRAM.l,X
+	LDA.l RoomDataWRAM.l, X
 
 	AND.w #$0800 : BEQ .skip
 		INC.b Scrap03

inventory.asm

@@ -792,45 +792,13 @@ RTL
 }
 ;--------------------------------------------------------------------------------
 MaybePlaySelectSFX:
-        LDA.w DungeonID : BMI .not_dungeon
+	LDA.w DungeonID : BMI .not_dungeon
-                .play
+.play
-		LDA.b #$20 : STA.w SFX3 ; menu select sound
+	LDA.b #$20 : STA.w SFX3 ; menu select sound
-                RTL
-        .not_dungeon
-        LDA.l HUDDungeonItems : BIT.b #$13 : BEQ .dont_play
-                                BIT.b #$0C : BEQ .dont_play
-                BRA .play
-        .dont_play
-RTL
-;--------------------------------------------------------------------------------
-; A = item id being collected
-ItemGetAlternateSFX:
-PEA.w $C567 ; SNES to RTS to in bank 08
-LDA.w AncillaGet, X : CMP.b #$4A : BNE +
-	; collecting pre-activated flute
-	LDA.b #$13 : JML Ancilla_SFX2_Near
-+ ; not pre-activated flute
-	JSL.l ItemIsJunk : BEQ .normal
-
-.junk
-LDA.b #$3B : JML Ancilla_SFX3_Near ; what we wrote over
-
-.normal
-LDA.b #$0F : JML Ancilla_SFX3_Near ; what we wrote over
-
-; A = item id being collected
-ItemGetOverworldAlternateSFX:
-CPY.b #$4A : BNE +
-	JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$13 : STA.w SFX2
 	RTL
-+ ; normal itemget sfx
+.not_dungeon
-	JSL.l ItemIsJunk : BEQ .normal
+	LDA.l HUDDungeonItems : BIT.b #$13 : BEQ .dont_play
-
+                            BIT.b #$0C : BEQ .dont_play
-.junk
+	BRA .play
-JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$3B : STA.w SFX3
+.dont_play
 RTL
-
-.normal
-JSL Sound_SetSfxPanWithPlayerCoords : ORA.b #$0F : STA.w SFX3 ; what we wrote over
-RTL
-;--------------------------------------------------------------------------------

lampmantlecone.asm

@@ -43,7 +43,6 @@ RTL
 ;================================================================================
 SetOverlayIfLamp:
 	JSL LampCheck
-	CMP.b #$00
 	BEQ +
 	LDA.b #$01
 +

tables.asm

@@ -464,10 +464,9 @@ db $00 ; #$00 = Original Behavior (default) - #$01 = Book can flip crystal switc
 ; 0x1800A7 - 0x1800AE (unused)
 ;--------------------------------------------------------------------------------
 ; 0x1800AF
-; mtff ffff
+; m-ff ffff
 ;
 ;  m - 0 = only shorten timer on multiworld items, 1 = shorten all items
-;  t - 0 = triforce pieces considered important, 1 = triforce pieces considered junk
 ;  f - number of frames to show items
 ;--------------------------------------------------------------------------------
 org $B080AF ; PC 0x1800AF
@@ -1585,6 +1584,7 @@ dw $0000
 ; STAIRS3
 ; STAIRS4
 ;--------------------------------------------------------------------------------
+org $B0DA00
 RoomHeaders:
 org $B0DA00 : RoomHeader_0000: ; pc 0x185A00
 db $41, $21, $13, $22, $07, $3D, $00, $00, $00, $10, $C0, $00, $00, $04
@@ -2664,7 +2664,7 @@ db #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00, #$00,
 ;--------------------------------------------------------------------------------
 org $B0EFE0 ; PC 0x186FE0-0x186FEF
 CrystalPendantFlags_3:
-    db $00 ; Sewers
+	db $00 ; Sewers
 	db $00 ; Hyrule Castle
 	db $08 ; Eastern Palace
 	db $09 ; Desert Palace
@@ -2672,7 +2672,7 @@ CrystalPendantFlags_3:
 	db $02 ; Swamp Palace
 	db $01 ; Palace of Darkness
 	db $06 ; Misery Mire
-    db $03 ; Skull Woods
+	db $03 ; Skull Woods
 	db $05 ; Ice Palace
 	db $0A ; Tower of Hera
 	db $04 ; Thieves' Town

vanillalabels.asm

@@ -288,6 +288,7 @@ EntranceData_layer                                         = $82D2F9
 EntranceData_song                                          = $82D592
 SpawnPointData_room_id                                     = $82D8D2
 Overworld_CheckForSpecialOverworldTrigger_Direction        = $84E879
+RoomHeaderPointers                                         = $84F1E2
 Sprite_ShowSolicitedMessage_Direction                      = $85E1A3
 FluteMenuNumbers_bits                                      = $8AB7A3
 WorldMap_RedXChars                                         = $8ABF70
@@ -295,6 +296,7 @@ WorldMap_CalculateOAMCoordinates                           = $8AC3B1
 WorldMap_HandleSpriteBlink                                 = $8AC52E
 WorldMapIcon_AdjustCoordinate                              = $8AC59B
 WorldMap_DarkWorldTilemap                                  = $8AD739
+DungeonMapRoomMarkerYBase                                  = $8AE803
 DungeonMapBossRooms                                        = $8AE817
 DungeonMapFloorCountData                                   = $8AF5E9
 DungeonMapFloorToDataOffset                                = $8AF605