From c60cbbc869e398731b91baaafe9279475b8a25a4 Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Sun, 20 Jun 2021 12:38:56 +0200
Subject: [PATCH 01/16] Utilities: Fix progressive bow sprite replacement

---
 utilities.asm | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/utilities.asm b/utilities.asm
index a9209f3..fa059fa 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -89,8 +89,12 @@ RTL
 		+ ; Everything Else
 			LDA.b #$2E : RTL
 	++ : CMP.b #$F8 : BNE ++ ; Progressive Bow
-		LDA $7EF340
-		CMP.b #$00 : BNE + ; No Bow
+		LDA $7EF340 : INC : LSR
+		CMP.l ProgressiveBowLimit : !BLT +
+			LDA.l ProgressiveBowReplacement
+			JSL.l GetSpriteID
+			RTL
+		+ : CMP.b #$00 : BNE + ; No Bow
 			LDA.b #$29 : RTL
 		+ ; Any Bow
 			LDA.b #$2A : RTL
@@ -225,7 +229,12 @@ RTL
 		+ ; Everything Else
 			LDA.b #$08 : RTL
 	++ : CMP.b #$F8 : BNE ++ ; Progressive Bow
-		LDA $7EF354 : BNE + ; No Bow
+		LDA $7EF340 : INC : LSR
+		CMP.l ProgressiveBowLimit : !BLT +
+			LDA.l ProgressiveBowReplacement
+			JSL.l GetSpritePalette
+			RTL
+		+ : CMP.b #$00 : BNE + ; No Bow
 			LDA.b #$08 : RTL
 		+ ; Any Bow
 			LDA.b #$02 : RTL

From 4b6d70a61b0113c98f42841518a4e844b6e8a68c Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Sun, 20 Jun 2021 12:41:12 +0200
Subject: [PATCH 02/16] Quickswap: Fix consecutive special swaps

---
 inventory.asm |  2 +-
 quickswap.asm | 44 +++++++++++++++-----------------------------
 2 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/inventory.asm b/inventory.asm
index 7226629..08944f7 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -23,7 +23,7 @@
 ; -
 ; -
 ; -
-; -
+; q = quickswap lock
 ;--------------------------------------------------------------------------------
 ; ProcessMenuButtons:
 ; out:	Carry - 0 = No Button, 1 = Yes Button
diff --git a/quickswap.asm b/quickswap.asm
index 96f5d0d..e73938c 100644
--- a/quickswap.asm
+++ b/quickswap.asm
@@ -28,6 +28,7 @@ QuickSwap:
 	BRA .store
 
 	.special_swap
+	LDA !INVENTORY_SWAP_2 : ORA #$01 : STA !INVENTORY_SWAP_2
 	CPX.b #$02 : BEQ + ; boomerang
 	CPX.b #$01 : BEQ + ; bow
 	CPX.b #$05 : BEQ + ; powder
@@ -47,22 +48,14 @@ QuickSwap:
 	LDA.b $F6 : AND.b #$40 ;what we wrote over
 RTL
 RCode:
-	LDA.w $0202 : TAX
+	LDX.w $0202
+	LDA.b $F2 : BIT #$20 : BNE ++ ; Still holding L from a previous frame
+		LDA !INVENTORY_SWAP_2 : AND #$FE : STA !INVENTORY_SWAP_2
+		BRA +
+	++
+	LDA !INVENTORY_SWAP_2 : BIT #$01 : BEQ +
+	RTS
 	-
-;		CPX.b #$0F : BNE + ; incrementing into bottle
-;			LDX.b #$00 : BRA ++
-;		+ CPX.b #$10 : BNE + ; incrementing bottle
-;			LDA.l $7EF34F : TAX
-;			-- : ++
-;				CPX.b #$04 : BEQ .noMoreBottles
-;				INX
-;				LDA.l $7EF35B,X : BEQ --
-;			TXA : STA.l $7EF34F
-;			LDX #$10
-;			RTS
-;			.noMoreBottles
-;			LDX #$11
-;			BRA .nextItem
 		+ CPX.b #$14 : BNE + : LDX.b #$00 ;will wrap around to 1
 		+ INX
 	.nextItem
@@ -70,21 +63,14 @@ RCode:
 RTS
 
 LCode:
-	LDA.w $0202 : TAX
+	LDX.w $0202
+	LDA.b $F2 : BIT #$10 : BNE ++ ; Still holding R from a previous frame
+		LDA !INVENTORY_SWAP_2 : AND #$FE : STA !INVENTORY_SWAP_2
+		BRA +
+	++
+	LDA !INVENTORY_SWAP_2 : BIT #$01 : BEQ +
+	RTS
 	-
-;		CPX.b #$11 : BNE + ; decrementing into bottle
-;			LDX.b #$05 : BRA ++
-;		+ CPX.b #$10 : BNE +	; decrementing bottle
-;			LDA.l $7EF34F : TAX
-;			-- : ++
-;				CPX.b #$01 : BEQ .noMoreBottles
-;				DEX
-;				LDA.l $7EF35B,X : BEQ --
-;			TXA : STA.l $7EF34F
-;			LDX.b #$10
-;			RTS
-;			.noMoreBottles
-;			LDX.b #$0F : BRA .nextItem
 		+ CPX.b #$01 : BNE + : LDX.b #$15 ; will wrap around to $14
 		+ DEX
 	.nextItem

From b16f7b4994b598af942eaeec89a70491f6f8dc05 Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Sun, 20 Jun 2021 15:15:55 +0200
Subject: [PATCH 03/16] Stats: Fix bonk counter

---
 LTTP_RND_GeneralBugfixes.asm | 3 +++
 stats.asm                    | 7 ++-----
 tables.asm                   | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index ff6eac4..51e4c31 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -570,6 +570,9 @@ AddDashTremor:
 org $099D04
 AddAncillaLong:
 
+org $099D1A
+Ancilla_CheckIfAlreadyExistsLong:
+
 org $09AE64
 Sprite_SetSpawnedCoords:
 
diff --git a/stats.asm b/stats.asm
index 0b0f433..ba0f786 100644
--- a/stats.asm
+++ b/stats.asm
@@ -142,17 +142,14 @@
 !LOCK_STATS = "$7EF443"
 ;--------------------------------------------------------------------------------
 !BONK_COUNTER = "$7EF420"
-!BONK_REPEAT = "$7F503F"
-!LOOP_FRAMES_LOW = "$7EF42E"
 StatBonkCounter:
 	PHA
+	JSL Ancilla_CheckIfAlreadyExistsLong : BCS +
 		LDA !LOCK_STATS : BNE +
-		LDA !LOOP_FRAMES_LOW : !SUB !BONK_REPEAT : CMP #30 : !BLT +
-			LDA !LOOP_FRAMES_LOW : STA !BONK_REPEAT
 			LDA !BONK_COUNTER : INC
 			CMP.b #100 : BEQ + ; decimal 100
 				STA !BONK_COUNTER
-		+
+	+
 	PLA
 	JSL.l AddDashTremor ; thing we wrote over
 RTL
diff --git a/tables.asm b/tables.asm
index 8095852..9192213 100644
--- a/tables.asm
+++ b/tables.asm
@@ -1471,7 +1471,7 @@ dw #9999 ; Rupee Limit
 ; $7F503C - Stats Rupee Total
 ; $7F503D - Stats Rupee Total
 ; $7F503E - Stats Item Total
-; $7F503F - Bonk Repeat
+; $7F503F - Unused
 ; $7F5040 - Free Item Dialog Temporary
 ; $7F5041 - Epilepsy Safety Timer
 ; $7F5042 - Tile Upload Offset Override (Low)

From 49afe7ca9b434f9410c9d6a3bbf07abfca83d85a Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Sun, 20 Jun 2021 10:09:04 -0400
Subject: [PATCH 04/16] onemind

---
 LTTP_RND_GeneralBugfixes.asm         |  5 +-
 dpadinvert.asm => controllerjank.asm | 89 +++++++++++++++++++++++++---
 hooks.asm                            |  6 +-
 init.asm                             |  7 ++-
 tables.asm                           | 15 ++++-
 5 files changed, 109 insertions(+), 13 deletions(-)
 rename dpadinvert.asm => controllerjank.asm (58%)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index ff6eac4..6d773f2 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -91,6 +91,9 @@ db #$20, #$19, #$08, #$31 ; year/month/day
 ;!REG_MUSIC_CONTROL = $012C
 !REG_MUSIC_CONTROL_REQUEST = $012C
 
+!ONEMIND_ID = $7F5072
+!ONEMIND_TIMER = $7F5073
+
 ;================================================================================
 
 incsrc hooks.asm
@@ -182,7 +185,7 @@ incsrc endingsequence.asm
 incsrc cuccostorm.asm
 incsrc compression.asm
 incsrc retro.asm
-incsrc dpadinvert.asm
+incsrc controllerjank.asm
 incsrc boots.asm
 incsrc events.asm
 incsrc fileselect.asm
diff --git a/dpadinvert.asm b/controllerjank.asm
similarity index 58%
rename from dpadinvert.asm
rename to controllerjank.asm
index e030526..b3ecf79 100644
--- a/dpadinvert.asm
+++ b/controllerjank.asm
@@ -5,9 +5,31 @@
 ; Filtered Joypad 1 Register: [AXLR | ????]
 ; Filtered Joypad 1 Register: [BYST | udlr] [AXLR | ????]
 !INVERT_DPAD = "$7F50CB"
+
 InvertDPad:
-	LDA !INVERT_DPAD : BNE + : JMP .normal : +
-	DEC : BEQ .dpadOnly
+	LDA.l OneMindPlayerCount : BEQ .crowd_control
+
+	LDA.l !ONEMIND_ID
+	AND.b #$03
+	TAX
+	LDA.l .onemind_controller_offset, X
+	TAX
+
+	LDA.w $4218,X : STA.w $00
+	LDA.w $4219,X : STA.w $01
+
+	LDA #$80 : STA $4201 ; reset this so latch can read it, otherwise RNG breaks
+
+	JML.l InvertDPadReturn
+
+.crowd_control
+	LDA !INVERT_DPAD : BNE +
+
+	LDA $4218 : STA $00
+	LDA $4219 : STA $01
+	JML.l InvertDPadReturn
+
++	DEC : BEQ .dpadOnly
 	DEC : BEQ .buttonsOnly
 	DEC : BEQ .invertBoth
 	.swapSides
@@ -45,8 +67,61 @@ JML.l InvertDPadReturn
 		BIT.b #$03 : BEQ + : EOR.b #$03 : + ; swap left/right
 	STA $01
 JML.l InvertDPadReturn
-	.normal
-	LDA $4218 : STA $00
-	LDA $4219 : STA $01
-JML.l InvertDPadReturn
-;--------------------------------------------------------------------------------
\ No newline at end of file
+
+.onemind_controller_offset
+	db 0 ; player 0 - $4218 - joy1d1
+	db 0 ; player 1 - $4218 - joy1d1
+	db 2 ; player 2 - $421A - joy2d1
+	db 6 ; player 3 - $421E - joy2d2
+	db 2 ; player 4 - $421A - joy2d1
+	db 6 ; player 5 - $421E - joy2d2
+
+
+
+;--------------------------------------------------------------------------------
+
+HandleOneMindController:
+	LDA.l OneMindPlayerCount
+	BEQ .no_onemind
+
+	REP #$20
+
+	LDA.l !ONEMIND_TIMER
+	DEC
+	BPL .no_switch
+
+	SEP #$20
+	LDA.l !ONEMIND_ID
+	INC
+	CMP.l OneMindPlayerCount
+	BCC .no_wrap
+
+	LDA.b #$01 ; reset to player 1
+
+.no_wrap
+	STA.l !ONEMIND_ID
+
+	REP #$20
+	LDA.l OneMindTimer
+
+.no_switch
+	STA.l !ONEMIND_TIMER
+
+	SEP #$20
+	LDA.l !ONEMIND_ID
+
+	CMP.b #$04 ; is it player 4 or 5?
+	BCC .no_multitap_switch
+
+	STZ.w $4201
+
+.no_multitap_switch
+
+.no_onemind
+	STZ.b $12
+
+	JML $008034 ; reset frame loop
+
+
+
+
diff --git a/hooks.asm b/hooks.asm
index 6bc8153..19e5532 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -14,6 +14,8 @@ dl Init_PostRAMClear
 org $008056 ; <- 56 - Bank00.asm : 77
 JSL.l FrameHookAction
 ;--------------------------------------------------------------------------------
+org $00805D
+JML HandleOneMindController
 
 ;================================================================================
 ; NMI Hook
@@ -48,8 +50,8 @@ ReturnCheckZSNES:
 ;--------------------------------------------------------------------------------
 ;org $0083D9 ; <- 3D9 - Bank00.asm : 611 (LDA $4219 : STA $01)
 ;JSL.l InvertDPad : NOP
-org $0083D4 ; <- 3D4 - Bank00.asm : 610 (LDA $4218 : STA $00)
-JML.l InvertDPad : SKIP 6
+org $0083D1 ; <- 3D1 - Bank00.asm (STZ.w JOYPAD - useless instruction here)
+JML.l InvertDPad : SKIP 9
 InvertDPadReturn:
 ;--------------------------------------------------------------------------------
 
diff --git a/init.asm b/init.asm
index 47a5726..340c4a9 100644
--- a/init.asm
+++ b/init.asm
@@ -40,8 +40,13 @@ Init_Primary:
 			INX
 			CPX #$15 : !BLT -
 	.done
-	
+
+	REP #$20
+	LDA.l OneMindTimer : STA.l !ONEMIND_TIMER
+	SEP #$20
+
 	LDA.b #$01 : STA $420D ; enable fastrom access on upper banks
+	STA.l !ONEMIND_ID
 	
 	LDA.b #$10 : STA $BC ; set default player sprite bank
 	
diff --git a/tables.asm b/tables.asm
index 8095852..ead8c70 100644
--- a/tables.asm
+++ b/tables.asm
@@ -412,7 +412,16 @@ db #$02 ; #$02 - 2 Bows (default)
 ProgressiveBowReplacement:
 db #$47 ; #$47 - 20 Rupees (default)
 ;--------------------------------------------------------------------------------
-; 0x18009A - 0x18009F (unused)
+; 0x18009A - 0x18009C one mind
+;--------------------------------------------------------------------------------
+org $30809A ; PC 0x18009A
+OneMindPlayerCount:
+db 0
+org $30809B ;  PC 0x18009B - 0x18009C
+OneMindTimer:
+dw 0
+;--------------------------------------------------------------------------------
+; 0x18009D - 0x18009F (unused)
 ;--------------------------------------------------------------------------------
 org $3080A0 ; PC 0x1800A0 - 0x1800A4
 Bugfix_MirrorlessSQToLW:
@@ -1481,7 +1490,9 @@ dw #9999 ; Rupee Limit
 ; $7F5050 - $7F506F - Shop Block
 ; $7F5070 - Reserved for OneMind
 ; $7F5071 - Reserved for OneMind
-; $7F5072 - $7F507D - Unused
+; $7F5072 - OneMind player ID
+; $7F5073 - $7F5074 - OneMind timer
+; $7F5075 - $7F507D - Unused
 ; $7F507E - Clock Status
 ; $7F507F - Always Zero
 ; $7F5080 - $7F5083 - Clock Hours

From 76878def989ce260ef500d0b4ff921cf1d9d6f55 Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Sun, 20 Jun 2021 16:41:35 +0200
Subject: [PATCH 05/16] Stats: amend incorrect comment in CountChestKey

---
 stats.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stats.asm b/stats.asm
index 0b0f433..4c3a307 100644
--- a/stats.asm
+++ b/stats.asm
@@ -267,7 +267,7 @@ CountChestKey: ; called by neighbor functions
 		CPY #$24 : BEQ +  ; small key for this dungeon - use $040C
 			CPY #$A0 : !BLT .end ; Ignore most items
 			CPY #$AE : !BGE .end ; Ignore reserved key and generic key
-			TYA : AND.B #$0F : BNE ++ ; If this is a sewers key, instead count it as an HC key
+			TYA : AND.B #$0F : BNE ++ ; If this is an HC key, instead count it as a sewers key
 				INC
 			++ TAX : BRA .count  ; use Key id instead of $040C (Keysanity)
 		+ LDA $040C : LSR

From cc12372627f6b8684edc9acb1f86bf990c1c508d Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Tue, 22 Jun 2021 02:31:52 +0200
Subject: [PATCH 06/16] Stats: Track chest turns

---
 LTTP_RND_GeneralBugfixes.asm |  2 +-
 events.asm                   |  5 +++++
 stats.asm                    | 13 ++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index ff6eac4..333ac6a 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -55,7 +55,7 @@ db #$20, #$19, #$08, #$31 ; year/month/day
 !SRAM_SINK = "$7EF41E" ; <- change this (conflicts with Programmable item 3)
 ;$7EF418 - Goal Item Counter
 ;$7EF419 - Service Sequence
-;$7EF420 - $7EF466 - Stat Tracking Bank 1 (overlaps with RNG Item Flags)
+;$7EF420 - $7EF468 - Stat Tracking Bank 1 (overlaps with RNG Item Flags)
 ;$7EF450 - $7EF45F - RNG Item (Single) Flags
 ;$7EF4A0 - $7EF4A7 - Service Request Block
 !FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file
diff --git a/events.asm b/events.asm
index bf17db1..d4849fc 100644
--- a/events.asm
+++ b/events.asm
@@ -234,6 +234,11 @@ PostItemAnimation:
 		LDA.b #$00 : STA $7F509F
 	+
 
+	LDA.w $02E9 : CMP.b #$01 : BNE +
+		LDA.b $2F : BEQ +
+			JSL.l IncrementChestTurnCounter
+	+
+
     STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
 RTL
 ;--------------------------------------------------------------------------------
diff --git a/stats.asm b/stats.asm
index 0b0f433..4a4fdd3 100644
--- a/stats.asm
+++ b/stats.asm
@@ -1,7 +1,7 @@
 ;================================================================================
 ; Stat Tracking
 ;================================================================================
-; $7EF420 - $7EF466 - Stat Tracking
+; $7EF420 - $7EF468 - Stat Tracking
 ;--------------------------------------------------------------------------------
 ; $7EF420 - bonk counter
 ;--------------------------------------------------------------------------------
@@ -137,6 +137,8 @@
 ;--------------------------------------------------------------------------------
 ; $7EF466w[2] - mirror timestamp (high)
 ;--------------------------------------------------------------------------------
+; $7EF468 - chest turn counter
+;--------------------------------------------------------------------------------
 
 ;--------------------------------------------------------------------------------
 !LOCK_STATS = "$7EF443"
@@ -324,6 +326,15 @@ IncrementFairyRevivalCounter:
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
+!CHESTTURN_COUNTER = "$7EF468"
+IncrementChestTurnCounter:
+	PHA
+		LDA !LOCK_STATS : BNE +
+			LDA !CHESTTURN_COUNTER : INC : STA !CHESTTURN_COUNTER
+		+
+	PLA
+RTL
+;--------------------------------------------------------------------------------
 !CHEST_COUNTER = "$7EF442"
 IncrementChestCounter:
 	LDA.b #$01 : STA $02E9 ; thing we wrote over

From 1531f7a8e24ad395ad04348a8736ebb63df4d8a8 Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Sun, 20 Jun 2021 23:03:55 +0200
Subject: [PATCH 07/16] Credits: Display chest turns

---
 stats/creditsnew.asm | 21 ++++++++++++---------
 stats/statConfig.asm |  3 ++-
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm
index 228dae3..b99402a 100644
--- a/stats/creditsnew.asm
+++ b/stats/creditsnew.asm
@@ -642,6 +642,10 @@ endif
 
 %blankline()
 
+%bigcreditsleft("CHEST TURNS")
+
+%blankline()
+
 %bigcreditsleft("BONKS")
 
 %blankline()
@@ -682,9 +686,6 @@ endif
 
 %blankline()
 
-%emptyline()
-%emptyline()
-%emptyline()
 %emptyline()
 %emptyline()
 %bigcreditsleft("COLLECTION RATE         /216")
@@ -724,18 +725,20 @@ endif
 !GOLD_SWORD_Y = 339
 !GT_BIG_KEY_X = 23
 !GT_BIG_KEY_Y = 346
+!CHEST_TURNS_X = 26
+!CHEST_TURNS_Y = 349
 !BONKS_X = 26
-!BONKS_Y = 349
+!BONKS_Y = 352
 !SAVE_AND_QUITS_X = 26
-!SAVE_AND_QUITS_Y = 352
+!SAVE_AND_QUITS_Y = 355
 !DEATHS_X = 26
-!DEATHS_Y = 355
+!DEATHS_Y = 358
 !FAERIE_REVIVALS_X = 26
-!FAERIE_REVIVALS_Y = 358
+!FAERIE_REVIVALS_Y = 361
 !TOTAL_MENU_TIME_X = 19
-!TOTAL_MENU_TIME_Y = 361
+!TOTAL_MENU_TIME_Y = 364
 !TOTAL_LAG_TIME_X = 19
-!TOTAL_LAG_TIME_Y = 364
+!TOTAL_LAG_TIME_Y = 367
 !COLLECTION_RATE_X = 22
 !COLLECTION_RATE_Y = 380
 !TOTAL_TIME_X = 19
diff --git a/stats/statConfig.asm b/stats/statConfig.asm
index c2602ae..8fa3194 100755
--- a/stats/statConfig.asm
+++ b/stats/statConfig.asm
@@ -10,6 +10,7 @@
 %AddStat($7EF426, 0, 4, 04, 2, !TEMPERED_SWORD_X, !TEMPERED_SWORD_Y)
 %AddStat($7EF426, 0, 0, 04, 2, !GOLD_SWORD_X, !GOLD_SWORD_Y)
 %AddStat($7EF42A, 0, 0, 05, 2, !GT_BIG_KEY_X, !GT_BIG_KEY_Y)
+%AddStat($7EF468, 0, 0, 08, 3, !CHEST_TURNS_X, !CHEST_TURNS_Y)
 %AddStat($7EF420, 0, 0, 08, 3, !BONKS_X, !BONKS_Y)
 %AddStat($7EF42D, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y)
 %AddStat($7EF449, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)
@@ -17,4 +18,4 @@
 %AddStat($7EF444, 1, 8, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y)
 %AddStat($7F5038, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y)
 %AddStat($7EF423, 0, 0, 08, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y)
-%AddStat($7EF43E, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)
\ No newline at end of file
+%AddStat($7EF43E, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)

From be0389ffbb369116898a04cc5a6d66855ad880d8 Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Thu, 24 Jun 2021 08:36:04 -0400
Subject: [PATCH 08/16] stats

---
 hooks.asm |  8 ++++++++
 stats.asm | 39 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+)

diff --git a/hooks.asm b/hooks.asm
index 19e5532..f057e2d 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2646,3 +2646,11 @@ JSL FastCreditsCutsceneTimer
 
 org $0EE773
 JSL FastTextScroll : NOP
+
+;================================================================================
+org $01FFEE : JSL IncrementDamageTakenCounter_Eight ; overworld pit
+org $079506 : JSL IncrementDamageTakenCounter_Eight ; underworld pit
+
+org $0780C6 : JSL IncrementDamageTakenCounter_Arb
+
+org $07B0B1 : JSL IncrementMagicUseCounter
\ No newline at end of file
diff --git a/stats.asm b/stats.asm
index 0b0f433..637dfe2 100644
--- a/stats.asm
+++ b/stats.asm
@@ -360,6 +360,45 @@ IncrementBigChestCounter:
 		+
 	PLA
 RTL
+;--------------------------------------------------------------------------------
+IncrementDamageTakenCounter_Eight:
+	STA.l $7EF36D
+	PHA : PHP
+	LDA !LOCK_STATS : BNE +
+	REP #$21
+	LDA.l !DAMAGE_COUNTER
+	ADC.w #$0008
+	STA.l !DAMAGECOUNTER
++	PLP
+	PLA
+RTL
+
+IncrementDamageTakenCounter_Arb:
+	PHP
+	LDA !LOCK_STATS : BNE +
+	REP #$21
+	LDA.b $00
+	AND.b #$00FF
+	ADC.l !DAMAGE_COUNTER
+	STA.l !DAMAGE_COUNTER
++	PLP
+
+	LDA.l $7EF36D
+RTL
+
+IncrementMagicUseCounter:
+	STA.l $7EF36E
+	PHA : PHP
+	LDA !LOCK_STATS : BNE +
+	REP #$21
+	LDA.b $00
+	AND.b #$00FF
+	ADC.l !MAGIC_COUNTER
+	STA.l !MAGIC_COUNTER
++	PLP : PLA
+
+RTL
+
 ;--------------------------------------------------------------------------------
 !OW_MIRROR_COUNTER = "$7EF43A"
 IncrementOWMirror:

From d3db31b05ee4988900a34ca043858c4cf32db962 Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Sun, 20 Jun 2021 12:40:09 +0200
Subject: [PATCH 09/16] Events: Fix unusable infinite bombs with empty
 inventory

---
 events.asm | 5 ++++-
 hooks.asm  | 9 +++++++++
 retro.asm  | 6 ++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/events.asm b/events.asm
index bf17db1..11785e9 100644
--- a/events.asm
+++ b/events.asm
@@ -55,13 +55,16 @@ OnQuit:
 RTL
 ;--------------------------------------------------------------------------------
 OnUncleItemGet:
-	JSL Link_ReceiveItem
+	PHA
 
 	LDA.l EscapeAssist
 	BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : +
 	BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : +
 	BIT.b #$01 : BEQ + : STA !INFINITE_ARROWS : +
 
+	PLA
+	JSL Link_ReceiveItem
+
 	LDA.l UncleRefill : BIT.b #$04 : BEQ + : LDA.b #$80 : STA $7EF373 : + ; refill magic
 	LDA.l UncleRefill : BIT.b #$02 : BEQ + : LDA.b #50 : STA $7EF375 : + ; refill bombs
 	LDA.l UncleRefill : BIT.b #$01 : BEQ + ; refill arrows
diff --git a/hooks.asm b/hooks.asm
index 9014a7b..9fe09d2 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -319,6 +319,15 @@ JSL.l LoadBombCount16
 org $0DDEB3 ; <- 6DEB3 - equipment.asm : 328 (LDA $7EF33F, X)
 JSL.l IsItemAvailable
 ;--------------------------------------------------------------------------------
+org $0DDDE8 ; <- 6DDE8 - equipment.asm : 148 (LDA $7EF340)
+JSL.l SearchForEquippedItem
+;--------------------------------------------------------------------------------
+org $0DDE70 ; <- 6DE70 - equipment.asm : 273 (LDA $7EF340)
+JSL.l SearchForEquippedItem
+;--------------------------------------------------------------------------------
+org $0DE39D ; <- 6E39D - equipment.asm : 1109 (LDA $7EF340)
+JSL.l SearchForEquippedItem
+;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Inverted Mode
diff --git a/retro.asm b/retro.asm
index 2278dff..d073cc4 100644
--- a/retro.asm
+++ b/retro.asm
@@ -26,6 +26,12 @@ StoreBombCount:
 	.finite
 		PLA : STA $7EF343
 RTL
+SearchForEquippedItem:
+	LDA !INFINITE_BOMBS : BEQ +
+		LDA.b #$01 : LDX.b #$00 : RTL
+	+
+	LDA $7EF340 ; thing we wrote over
+RTL
 
 !INFINITE_ARROWS = "$7F50C8"
 DecrementArrows:

From 01537a7f2fbea6c2af5b16c1f29150ec7c565b12 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Mon, 28 Jun 2021 15:01:01 -0700
Subject: [PATCH 10/16] Temporary fix for broken missing defines

---
 stats.asm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/stats.asm b/stats.asm
index 37d75e7..4bd3699 100644
--- a/stats.asm
+++ b/stats.asm
@@ -369,6 +369,8 @@ IncrementBigChestCounter:
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
+!DAMAGE_COUNTER = "$FFFFFF"
+!MAGIC_COUNTER = "$FFFFFF"
 IncrementDamageTakenCounter_Eight:
 	STA.l $7EF36D
 	PHA : PHP
@@ -376,7 +378,7 @@ IncrementDamageTakenCounter_Eight:
 	REP #$21
 	LDA.l !DAMAGE_COUNTER
 	ADC.w #$0008
-	STA.l !DAMAGECOUNTER
+	STA.l !DAMAGE_COUNTER
 +	PLP
 	PLA
 RTL
@@ -386,7 +388,7 @@ IncrementDamageTakenCounter_Arb:
 	LDA !LOCK_STATS : BNE +
 	REP #$21
 	LDA.b $00
-	AND.b #$00FF
+	AND.w #$00FF
 	ADC.l !DAMAGE_COUNTER
 	STA.l !DAMAGE_COUNTER
 +	PLP
@@ -400,7 +402,7 @@ IncrementMagicUseCounter:
 	LDA !LOCK_STATS : BNE +
 	REP #$21
 	LDA.b $00
-	AND.b #$00FF
+	AND.w #$00FF
 	ADC.l !MAGIC_COUNTER
 	STA.l !MAGIC_COUNTER
 +	PLP : PLA

From f403ca10da9e009599a531be8cdcd20a61b4801c Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Wed, 30 Jun 2021 07:15:37 -0400
Subject: [PATCH 11/16] boss icons

---
 LTTP_RND_GeneralBugfixes.asm |   7 ++
 bossicons.4bpp               | Bin 0 -> 1536 bytes
 dungeonmap.asm               | 150 +++++++++++++++++++++++++++++++++++
 hooks.asm                    |  18 ++++-
 stats/creditsnew.asm         |   2 +-
 tables.asm                   |  11 ++-
 6 files changed, 185 insertions(+), 3 deletions(-)
 create mode 100644 bossicons.4bpp
 create mode 100644 dungeonmap.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 9635e8f..7eeeb24 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -94,6 +94,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
@@ -206,6 +208,7 @@ incsrc toast.asm
 incsrc darkroomitems.asm
 incsrc fastcredits.asm
 incsrc msu.asm
+incsrc dungeonmap.asm
 warnpc $A58000
 
 ;org $228000 ; contrib area
@@ -289,6 +292,10 @@ org $339000
 incbin sheet178.gfx
 warnpc $339600
 
+org $339600
+BossMapIconGFX:
+incbin bossicons.4bpp
+
 org $328000
 Extra_Text_Table:
 incsrc itemtext.asm
diff --git a/bossicons.4bpp b/bossicons.4bpp
new file mode 100644
index 0000000000000000000000000000000000000000..d377f120cdf4efd2fdd597e64c0a596e083ebf1b
GIT binary patch
literal 1536
zcmXw34NMbf7=GGb+oKdIQlSWzqpL~~p)yoZq!mRVLq!Ea7|^Ie)PauaWC%hS*^HV=
zV9Qj{HH4_E%rWN=Lk5*B6U}~{bJ8&w4QvhtZ8c&6TW+sQmdjo8<oUjP@A<ip!zL7K
zDzrt)_BAgP`{!|Z2f4^b86IN{qhN3w@2)<}bgFU-{<vC6_$RazTYxSs0FQjlV4*u@
zI%+U^iaVgxqX>3P!;Nbg#BS(uH?E?NZ|Cdm?R@(E^DcDKp8u~ya6yC_@L@RFA<Z_A
z8_IzU5xfyh`*LxJ)|p{}u1aOFrj4~0H*aLjDhnK#z<IohKAQ6Y&aftBWA3nKVD|xb
z34$;{yPD{BA_MV+d!ue?##1lERHsi1up0Q0xUZ2|-JV$f{woZDSjbA%0#+;)dP*1p
zAchCy$I7IPh?Po2It$mYEi=~D$@ehDOdYE;m=wo2xl!m4oDnukTzWxLOnpVudr6Cy
zD;B8Lh!-TvE{QLR6FfrHA%u%g6&qbBRCXvjY=u=-5Ko<P^mCyf%N@#*S6B*9M(4eN
z$w1%AiyUv1LQd-Sq`re3Y=8}SIJx5<XGTu-eukIWpd;5@#IL|h{0_U$o?*{U*XKq=
zd3j4Dr0)^ApG*F{4i8A+lsnDN>@ZjRzSLHS(MZ}eDY<qm!w;y1ktW3po-%E#(%385
zQ2m0_Biz>^H{}@OT2tRX@~hm1@~Y$9obDrvFK}d~opB+$$6F`v6UKQ(eYD{X-4k6w
z*pB%RBd`1X75Gh(6F-yhS-1o9YSS8(EtBRyNH5s#zb}_PXFWY+r*?(m6prFIjd-g{
z`iS%gO2dO=)p;xOmX|S)Nq-<BDY-o4qvAjPR$KH$V`*7OS$}qTyW9pVo}-)^I7KS@
z;ARI?Dx=~=-i$xyK!#qN#d`9_laN2*Ps7~RQ(5|M=gd6$TQE^CDyTJA@DR_)0TaEa
zKlIBiUee`ra`R`=e8666*8uhFPjbmkZOy}S<@jvg=stXM*JL<<Vg|MII%eS@v0e18
z=DddZW7!p+`JvjtK!Jb~nZUQ?{vJeQHUyYkW-Zrccix#&YOPkvy8&uSb{SqEoP4T6
z3?c&JXQ`#}9+3fRsa`>t^s8w_EIn5cKcX8kI4l#~h>o7bkI)1M+K6$W6gk>_-7(`q
za!my<a`PbNTjg8IDC8=smr#n!$<I|=DaBUmjg9`M4%~yVHqM|hDr}s^LiwkmR@k;S
zqG#vTb1~)+=p)h+>m*<Ka8b!IA1*%ZA`d4Wb4sG?{nq{ylu-lMK3TVi%`3U4Wn<8A
zi%-3_(fD~n0-LCQKhl)9o=dGo{mkaJ#B*7jOf+!)Ep4pilZ0+XQ|XQ8;<9H<lm~7l
z&poaAd-iQHeeN?6yoA2;g)`UrE|q&nhs21e|4L}E7b#eUB>Li3LyzuWXh~0t&JkV{
zMCSoQp`}yfF1j%UKQ-%JBAQm*EOgJSl+D0g@}V5ZaT32^KdmY(RXEmJD%oMbuI<xl
zd(ljMJf0GN6c=eqFt)LsXv8qfQ+F<`Bpg(ApsI2>$jSDGJ;|KF_n{R}VyAD0@`_RA
zxOoEiDOCZjwPVzfIn*2C+}xS&=JG@0S#Plvy!>&FeGC6urFN-@Oe)1_jeS=|SQj%@
zQ?78BY~Xd*`kbfu@20h5wP`jR<rbn!SX?M7Qe4&CUbKS^1Q%@3Coe4(T~0Z%L-y2)
z8dXAzzoip94Vw;+3$0)#gf8E)V9Ua~fCpPXXfSLzZ)V1^1eu|Fun4y0oAeeQ^Hqs4
gO9_uMZj`Vcl>07a92A(8OiG%9wyRti3JNFuFUaQv+yDRo

literal 0
HcmV?d00001

diff --git a/dungeonmap.asm b/dungeonmap.asm
new file mode 100644
index 0000000..6dabf89
--- /dev/null
+++ b/dungeonmap.asm
@@ -0,0 +1,150 @@
+DoDungeonMapBossIcon:
+	LDA.b $14
+	CMP.b #$09
+	BEQ .dungeonmap
+
+.cave
+	CMP.b #$01
+	RTL
+
+.dungeonmap
+
+	LDX.w $040C
+	BMI .cave
+
+;	LDA.l DungeonMapIcons
+;	AND.b #$01
+;	BNE ++
+;
+;	INC ; so it's not equal to $01
+;	BRA .cave
+
+	; get dungeon boss room
+++	REP #$30
+	LDA.l $8AE817,X
+	ASL
+	TAX
+
+	; get sprite pointer for room
+	LDA.l $89D62E,X
+	INC ; to skip the "sort"
+	TAX
+
+	; get first byte to make sure it isn't an empty room
+	SEP #$20
+	LDA.l $890000,X
+	CMP.b #$FF
+	BNE ++
+
+	SEP #$30
+	BRA .cave
+
+	; check first sprite
+++	LDA.l $890002,X
+	SEP #$10
+
+	; match boss id
+	LDX.b #$0B
+
+--	CMP.l .boss_id,X
+	BEQ .match
+
+	DEX
+	BPL --
+
+	TXA
+	BRA .cave
+
+.match
+	LDA.b #$80
+	STA.w $2121
+
+	REP #$30
+
+	TXA
+	ASL ; x32 for palette data
+	ASL
+	ASL
+	ASL
+	ASL
+
+	TAX
+
+	; prep dma
+	ASL ; x128 for graphics
+	ASL
+	ADC.w #BossMapIconGFX
+	STA.w $4312
+
+	PHY
+	LDY.w #32
+
+	SEP #$20
+--	LDA.l .boss_palettes,X
+	STA.w $2122
+	INX
+	DEY
+	BNE --
+
+	PLY
+
+
+	; GFX DMA
+	REP #$20
+	SEP #$10
+
+	LDA.w #$1801
+	STA.w $4310
+
+	LDX.b #BossMapIconGFX>>16
+	STX.w $4314
+
+	LDA.w #$A060>>1
+	STA.w $2116
+	LDA.w #$0040
+	STA.w $4315
+
+	LDX.b #$02
+	STX.w $420B
+
+	LDA.w #$A260>>1
+	STA.w $2116
+	LDA.w #$0040
+	STA.w $4315
+
+	STX.w $420B
+
+	; done
+	SEP #$32
+	RTL
+
+.boss_id
+	db $53 ; armos
+	db $54 ; lanmolas
+	db $09 ; moldorm
+
+	db $7A ; agahnim
+
+	db $92 ; helma king
+	db $8C ; arrghus
+	db $88 ; mothula
+	db $CE ; blind
+	db $A3 ; khold shell
+	db $BD ; vitreous
+	db $CB ; trinexx
+
+	db $D6 ; ganon
+
+.boss_palettes
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($D86060), hexto555($5070C8), hexto555($B090F8), hexto555($282828), hexto555($F0A068), hexto555($B06028), hexto555($B88820), hexto555($E8A800), hexto555($F8F8F8), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($50C090), hexto555($408858), hexto555($305830), hexto555($282828), hexto555($D8A800), hexto555($E06018), hexto555($787040), hexto555($585030), hexto555($484018), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($903018), hexto555($D85800), hexto555($F8A828), hexto555($282828), hexto555($E88068), hexto555($B04038), hexto555($F8D018), hexto555($C8B818), hexto555($A89818), hexto555($806818), hexto555($503818), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($C04080), hexto555($B08828), hexto555($E8C070), hexto555($282828), hexto555($90D038), hexto555($688020), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($4848B0), hexto555($7870E8), hexto555($A8A8F8), hexto555($282828), hexto555($F8F8F8), hexto555($181818), hexto555($A00028), hexto555($D03828), hexto555($E88820), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($903018), hexto555($D85800), hexto555($F8A828), hexto555($282828), hexto555($E88068), hexto555($B04038), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($4848B0), hexto555($7870E8), hexto555($A8A8F8), hexto555($282828), hexto555($F8A840), hexto555($D85820), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($903018), hexto555($D85800), hexto555($F8A828), hexto555($282828), hexto555($E88068), hexto555($B04038), hexto555($88D0F8), hexto555($7890F8), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($4828C8), hexto555($4828F0), hexto555($8070F8), hexto555($282828), hexto555($F8C8F8), hexto555($E088B0), hexto555($7098C0), hexto555($58B0E8), hexto555($D0F8F8), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($50C090), hexto555($408858), hexto555($305830), hexto555($282828), hexto555($D8A800), hexto555($E06018), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($4848B0), hexto555($7870E8), hexto555($A8A8F8), hexto555($282828), hexto555($989868), hexto555($78C0A8), hexto555($A00028), hexto555($D03828), hexto555($E88820), hexto555($503860), hexto555($505060), hexto555($788890), hexto555($484868), hexto555($707068)
+	dw hexto555($000000), hexto555($F8F8F8), hexto555($B090F8), hexto555($C0A028), hexto555($886008), hexto555($282828), hexto555($B83010), hexto555($E86040), hexto555($385088), hexto555($5088A8), hexto555($88C8A0), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000), hexto555($000000)
diff --git a/hooks.asm b/hooks.asm
index 6a48892..4c70433 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -2662,4 +2662,20 @@ org $079506 : JSL IncrementDamageTakenCounter_Eight ; underworld pit
 
 org $0780C6 : JSL IncrementDamageTakenCounter_Arb
 
-org $07B0B1 : JSL IncrementMagicUseCounter
\ No newline at end of file
+org $07B0B1 : JSL IncrementMagicUseCounter
+
+;================================================================================
+; Boss icons
+org $0AEEDF : db $02 ; big icon
+org $0AEAFF : db $48 ; X position
+
+org $0AEED4 ; disable flashing
+	BRA ++ : NOP #6 : ++
+
+org $0AEEF2
+	SBC.b #$03 : STA.w $0801,X
+	LDA.b #$03 : STA.w $0802,X
+	LDA.b #$31 : STA.w $0803,X
+
+org $008BE5 ; hijack stripes for boss GFX transfer
+	JSL DoDungeonMapBossIcon
diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm
index 1706d45..a8e8ef0 100644
--- a/stats/creditsnew.asm
+++ b/stats/creditsnew.asm
@@ -563,7 +563,7 @@ CreditsLineBlank:
 
 ;===================================================================================================
 
-print "Line number: !CLINE | Expected: 302"
+print "Credits line number: !CLINE | Expected: 302"
 
 if !CLINE > 302
 	error "Too many credits lines. !CLINE > 302"
diff --git a/tables.asm b/tables.asm
index b26436f..9c54411 100644
--- a/tables.asm
+++ b/tables.asm
@@ -421,7 +421,16 @@ org $30809B ;  PC 0x18009B - 0x18009C
 OneMindTimer:
 dw 0
 ;--------------------------------------------------------------------------------
-; 0x18009D - 0x18009F (unused)
+; 0x18009D - Dungeon map icons
+; .... ...b
+;
+;  b - boss icon
+;--------------------------------------------------------------------------------
+org $30809D
+DungeonMapIcons:
+db $01
+;--------------------------------------------------------------------------------
+; 0x18009E - 0x18009F (unused)
 ;--------------------------------------------------------------------------------
 org $3080A0 ; PC 0x1800A0 - 0x1800A4
 Bugfix_MirrorlessSQToLW:

From bdd16bc20f54ca28c75be1846378155283dc3fa8 Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Sat, 3 Jul 2021 09:06:17 -0400
Subject: [PATCH 12/16] dungeon prizes

---
 compasses.asm  |  4 ++--
 dungeonmap.asm |  5 ++---
 newhud.asm     | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
 3 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/compasses.asm b/compasses.asm
index 5c1acb5..37295c2 100644
--- a/compasses.asm
+++ b/compasses.asm
@@ -17,7 +17,7 @@ DrawDungeonCompassCounts:
 	LDX $040C : CPX.b #$FF : BEQ .done ; Skip if not in a dungeon
 
 	CMP.w #$0002 : BEQ ++ ; if CompassMode==2, we don't check for the compass
-		LDA $7EF364 : AND.l .item_masks, X ; Load compass values to A, mask with dungeon item masks
+		LDA $7EF364 : AND.l DungeonItemMasks, X ; Load compass values to A, mask with dungeon item masks
 		BEQ .done ; skip if we don't have compass
 	++
 	
@@ -35,7 +35,7 @@ DrawDungeonCompassCounts:
 	.done
 RTL
 
-.item_masks ; these are dungeon correlations to $7EF364 - $7EF369 so it knows where to store compasses, etc
+DungeonItemMasks: ; these are dungeon correlations to $7EF364 - $7EF369 so it knows where to store compasses, etc
     dw $8000, $4000, $2000, $1000, $0800, $0400, $0200, $0100
     dw $0080, $0040, $0020, $0010, $0008, $0004
 	
diff --git a/dungeonmap.asm b/dungeonmap.asm
index 6dabf89..39b4624 100644
--- a/dungeonmap.asm
+++ b/dungeonmap.asm
@@ -107,15 +107,14 @@ DoDungeonMapBossIcon:
 	LDX.b #$02
 	STX.w $420B
 
+	STA.w $4315
 	LDA.w #$A260>>1
 	STA.w $2116
-	LDA.w #$0040
-	STA.w $4315
 
 	STX.w $420B
 
 	; done
-	SEP #$32
+	SEP #$30
 	RTL
 
 .boss_id
diff --git a/newhud.asm b/newhud.asm
index f41ed75..35c562f 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -131,9 +131,51 @@ SEP #$30
 	STA !KEY_ICON_ADDRESS
 	
 	.done_keys
-	
-	
-	
+
+
+
+
+;--------------------------------------------------------------------------------
+; Draw pendant/crystal icon
+;--------------------------------------------------------------------------------
+!PRIZE_ICON = $7EC742
+!P_ICON = $296C
+!C_ICON = $295F
+
+	SEP #$20
+	LDA.b $1B : BEQ .noprize
+
+
+
+	LDX.w $040C : BMI .noprize
+
+	REP #$20
+
+	LDA.l MapMode
+	BEQ .drawprize
+
+	LDA.l $7EF368
+	AND.l DungeonItemMasks,X
+	BEQ .doneprize
+
+.drawprize
+	LDA.l CrystalPendantFlags_2, X
+	AND.w #$0040 : BNE .is_crystal
+
+	LDA.w #!P_ICON
+	BRA .doneprize
+
+.is_crystal
+	LDA.w #!C_ICON
+	BRA .doneprize
+
+.noprize
+	REP #$20
+	LDA.w #$207F
+
+.doneprize
+	STA.l !PRIZE_ICON
+
 ;--------------------------------------------------------------------------------
 ; Draw Magic Meter
 !INFINITE_MAGIC = "$7F50CA"
@@ -261,4 +303,4 @@ HudHexToDec2Digit:
 		DEC : BNE -
 	+
 	STY $07	; Store 1s digit
-RTS
\ No newline at end of file
+RTS

From 00c59c791fb804f218c94d01dda0e59a9b927ff7 Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Sat, 3 Jul 2021 09:25:33 -0400
Subject: [PATCH 13/16] damage/magic stats

---
 LTTP_RND_GeneralBugfixes.asm |  2 +-
 stats.asm                    | 16 +++++++++++-----
 stats/creditsnew.asm         | 12 ++++++------
 stats/main.asm               |  1 +
 stats/statConfig.asm         |  4 ++--
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 7eeeb24..d2b7ca5 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -55,7 +55,7 @@ db #$20, #$19, #$08, #$31 ; year/month/day
 !SRAM_SINK = "$7EF41E" ; <- change this (conflicts with Programmable item 3)
 ;$7EF418 - Goal Item Counter
 ;$7EF419 - Service Sequence
-;$7EF420 - $7EF468 - Stat Tracking Bank 1 (overlaps with RNG Item Flags)
+;$7EF420 - $7EF46D - Stat Tracking Bank 1 (overlaps with RNG Item Flags)
 ;$7EF450 - $7EF45F - RNG Item (Single) Flags
 ;$7EF4A0 - $7EF4A7 - Service Request Block
 !FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file
diff --git a/stats.asm b/stats.asm
index 4bd3699..f76b0e1 100644
--- a/stats.asm
+++ b/stats.asm
@@ -369,8 +369,8 @@ IncrementBigChestCounter:
 	PLA
 RTL
 ;--------------------------------------------------------------------------------
-!DAMAGE_COUNTER = "$FFFFFF"
-!MAGIC_COUNTER = "$FFFFFF"
+!DAMAGE_COUNTER = $7EF46A
+!MAGIC_COUNTER = $7EF46C
 IncrementDamageTakenCounter_Eight:
 	STA.l $7EF36D
 	PHA : PHP
@@ -378,7 +378,9 @@ IncrementDamageTakenCounter_Eight:
 	REP #$21
 	LDA.l !DAMAGE_COUNTER
 	ADC.w #$0008
-	STA.l !DAMAGE_COUNTER
+	BCC ++
+	LDA.w #$FFFF
+++	STA.l !DAMAGE_COUNTER
 +	PLP
 	PLA
 RTL
@@ -390,7 +392,9 @@ IncrementDamageTakenCounter_Arb:
 	LDA.b $00
 	AND.w #$00FF
 	ADC.l !DAMAGE_COUNTER
-	STA.l !DAMAGE_COUNTER
+	BCC ++
+	LDA.w #$FFFF
+++	STA.l !DAMAGE_COUNTER
 +	PLP
 
 	LDA.l $7EF36D
@@ -404,7 +408,9 @@ IncrementMagicUseCounter:
 	LDA.b $00
 	AND.w #$00FF
 	ADC.l !MAGIC_COUNTER
-	STA.l !MAGIC_COUNTER
+	BCC ++
+	LDA.w #$FFFF
+++	STA.l !MAGIC_COUNTER
 +	PLP : PLA
 
 RTL
diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm
index a8e8ef0..dae6d8b 100644
--- a/stats/creditsnew.asm
+++ b/stats/creditsnew.asm
@@ -639,11 +639,11 @@ endif
 %blankline()
 %blankline()
 
-%bigcreditsleft("GT BIG KEY               /22")
+%bigcreditsleft("DAMAGE TAKEN")
 
 %blankline()
 
-%bigcreditsleft("CHEST TURNS")
+%bigcreditsleft("MAGIC USED")
 
 %blankline()
 
@@ -724,10 +724,10 @@ endif
 !TEMPERED_SWORD_Y = 336
 !GOLD_SWORD_X = 23
 !GOLD_SWORD_Y = 339
-!GT_BIG_KEY_X = 23
-!GT_BIG_KEY_Y = 346
-!CHEST_TURNS_X = 26
-!CHEST_TURNS_Y = 349
+!DAMAGETAKEN_X = 26
+!DAMAGETAKEN_Y = 346
+!MAGICUSED_X = 26
+!MAGICUSED_Y = 349
 !BONKS_X = 26
 !BONKS_Y = 352
 !SAVE_AND_QUITS_X = 26
diff --git a/stats/main.asm b/stats/main.asm
index 0a666ad..314de0e 100755
--- a/stats/main.asm
+++ b/stats/main.asm
@@ -60,6 +60,7 @@ ValueCaps:
     dw 99
     dw 999
     dw 9999
+    dw 9999 ; TODO - 5 digits need to be fixed at a later date
 
 BitMasks:
     dw $FFFF
diff --git a/stats/statConfig.asm b/stats/statConfig.asm
index 8fa3194..d921b94 100755
--- a/stats/statConfig.asm
+++ b/stats/statConfig.asm
@@ -9,8 +9,8 @@
 %AddStat($7EF425, 0, 0, 04, 2, !MASTER_SWORD_X, !MASTER_SWORD_Y)
 %AddStat($7EF426, 0, 4, 04, 2, !TEMPERED_SWORD_X, !TEMPERED_SWORD_Y)
 %AddStat($7EF426, 0, 0, 04, 2, !GOLD_SWORD_X, !GOLD_SWORD_Y)
-%AddStat($7EF42A, 0, 0, 05, 2, !GT_BIG_KEY_X, !GT_BIG_KEY_Y)
-%AddStat($7EF468, 0, 0, 08, 3, !CHEST_TURNS_X, !CHEST_TURNS_Y)
+%AddStat($7EF46A, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y)
+%AddStat($7EF46C, 0, 0, 16, 5, !MAGICUSED_X, !MAGICUSED_Y)
 %AddStat($7EF420, 0, 0, 08, 3, !BONKS_X, !BONKS_Y)
 %AddStat($7EF42D, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y)
 %AddStat($7EF449, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)

From 270f0685ff878275a6f146d8753dc9487f582460 Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Sun, 4 Jul 2021 05:21:48 -0400
Subject: [PATCH 14/16] add byrna/cape magic tracking

---
 hardmode.asm |  5 ++---
 stats.asm    | 19 ++++++++++++++++---
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/hardmode.asm b/hardmode.asm
index 0bda634..1b7fe8b 100644
--- a/hardmode.asm
+++ b/hardmode.asm
@@ -33,7 +33,7 @@ CalculateByrnaUsage:
 		PLX
 	++
 	LDA $7EF36E ; thing we wrote over
-RTL
+	JML IncrementMagicUseCounterByrna
 ;--------------------------------------------------------------------------------
 CalculateCapeUsage:
 	LDA $1B : BEQ ++
@@ -51,8 +51,7 @@ CalculateCapeUsage:
 		LDA.l HardModeExclusionCapeUsage, X : STA $4C ; set cape decrement timer
 		PLX
 	++
-	LDA $7EF36E ; thing we wrote over
-RTL
+	JML IncrementMagicUseCounterOne
 ;--------------------------------------------------------------------------------
 ActivateInvulnerabilityOrDont:
 	LDA $1B : BEQ .nowhere_special
diff --git a/stats.asm b/stats.asm
index f76b0e1..4263c5d 100644
--- a/stats.asm
+++ b/stats.asm
@@ -383,7 +383,7 @@ IncrementDamageTakenCounter_Eight:
 ++	STA.l !DAMAGE_COUNTER
 +	PLP
 	PLA
-RTL
+	RTL
 
 IncrementDamageTakenCounter_Arb:
 	PHP
@@ -398,10 +398,12 @@ IncrementDamageTakenCounter_Arb:
 +	PLP
 
 	LDA.l $7EF36D
-RTL
+	RTL
 
 IncrementMagicUseCounter:
 	STA.l $7EF36E
+
+IncrementMagicUseCounterByrna:
 	PHA : PHP
 	LDA !LOCK_STATS : BNE +
 	REP #$21
@@ -413,7 +415,18 @@ IncrementMagicUseCounter:
 ++	STA.l !MAGIC_COUNTER
 +	PLP : PLA
 
-RTL
+	RTL
+
+IncrementMagicUseCounterOne:
+	LDA !LOCK_STATS : BNE +
+	REP #$20
+	LDA.l !MAGIC_COUNTER
+	INC
+	BEQ ++
+	STA.l !MAGIC_COUNTER
+++	SEP #$20
++	LDA.l $7EF36E
+	RTL
 
 ;--------------------------------------------------------------------------------
 !OW_MIRROR_COUNTER = "$7EF43A"

From 27cb1b545900756f7ffdea59342e9ff6b1d731f2 Mon Sep 17 00:00:00 2001
From: Bonta <40473493+Bonta0@users.noreply.github.com>
Date: Mon, 5 Jul 2021 20:30:18 +0200
Subject: [PATCH 15/16] Implement Fakeboots

---
 LTTP_RND_GeneralBugfixes.asm |  3 ++
 boots.asm                    | 80 ++++++++++++++++++++++++++++++++----
 hooks.asm                    | 48 ++++++++++++++++++++--
 stats.asm                    | 14 +++----
 tables.asm                   |  6 ++-
 5 files changed, 129 insertions(+), 22 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 9635e8f..af8cc20 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -501,6 +501,9 @@ Sprite_ShowMessageUnconditional:
 org $05EC96
 Sprite_ZeldaLong:
 
+org $0680FA
+Player_ApplyRumbleToSprites:
+
 org $0683E6
 Utility_CheckIfHitBoxesOverlapLong:
 
diff --git a/boots.asm b/boots.asm
index 7589b3d..555fcb8 100644
--- a/boots.asm
+++ b/boots.asm
@@ -3,13 +3,75 @@
 ;--------------------------------------------------------------------------------
 !BOOTS_MODIFIER = "$7F50CE"
 ModifyBoots:
-	PHA
-		LDA !BOOTS_MODIFIER : CMP.b #$01 : BNE +
-			PLA : AND $7EF379 : ORA.b #$04 : RTL ; yes boots
-		+ : CMP #$02 : BNE +
-			PLA : AND $7EF379 : AND.b #$FB : RTL ; no boots
-		+
-	PLA
-	AND $7EF379 ; regular boots
+    PHA
+        LDA !BOOTS_MODIFIER : CMP.b #$01 : BNE +
+            PLA : AND $7EF379 : ORA.b #$04 : RTL ; yes boots
+        + : CMP.b #$02 : BNE +
+            PLA : AND $7EF379 : AND.b #$FB : RTL ; no boots
+        + : LDA FakeBoots : CMP.b #$01 : BNE +
+            LDA $5B : BEQ ++ : LDA $59 : BNE + ; hover check
+                ++ : PLA : AND $7EF379 : ORA.b #$04 : RTL ; yes boots, not hovering
+        +
+    PLA
+    AND $7EF379 ; regular boots
+RTL
+;--------------------------------------------------------------------------------
+AddBonkTremors:
+    PHA
+        LDA $46 : BNE + ; Check for incapacitated Link
+            JSL.l IncrementBonkCounter
+        +
+        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+        LDA $7EF355 : BNE + ; Check for Boots
+            PLA : RTL
+        +
+    PLA
+    JSL.l AddDashTremor : JSL.l Player_ApplyRumbleToSprites ; things we wrote over
+RTL
+;--------------------------------------------------------------------------------
+BonkBreakableWall:
+    PHX : PHP
+        SEP #$30 ; set 8-bit accumulator and index registers
+        LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+        LDA $7EF355 : BNE + ; Check for Boots
+            PLP : PLX : LDA.w #$0000 : RTL
+        +
+    PLP : PLX
+    LDA $0372 : AND.w #$00FF ; things we wrote over
+RTL
+;--------------------------------------------------------------------------------
+BonkRockPile:
+    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA $7EF355 : BNE + ; Check for Boots
+        LDA.b #$00 : RTL
+    +
+    LDA $02EF : AND.b #$70 ; things we wrote over
+RTL
+;--------------------------------------------------------------------------------
+GravestoneHook:
+    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA $7EF355 : BEQ .done ; Check for Boots
+    +
+    LDA $0372 : BEQ .done ; things we wrote over
+        JML.l moveGravestone
+    .done
+    JML.l GravestoneHook_continue
+;--------------------------------------------------------------------------------
+JumpDownLedge:
+    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA $7EF355 : BNE + ; Check for Boots
+        ; Disarm Waterwalk
+        LDA $5B : CMP.b #$01 : BNE +
+            STZ $5B
+    +
+    LDA $1B : BNE .done : LDA.b #$02 : STA $EE ; things we wrote over
+    .done
+RTL
+;--------------------------------------------------------------------------------
+BonkRecoil:
+    LDA !BOOTS_MODIFIER : CMP.b #$01 : BEQ +
+    LDA $7EF355 : BNE + ; Check for Boots
+        LDA.b #$16 : STA $29 : RTL
+    +
+    LDA.b #$24 : STA $29 ; things we wrote over
 RTL
-;--------------------------------------------------------------------------------
\ No newline at end of file
diff --git a/hooks.asm b/hooks.asm
index 6a48892..1ddd019 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -62,6 +62,51 @@ org $079C22 ; <- 39222 - Bank07.asm : 4494 (AND $7EF379 : BEQ .cantDoAction)
 JSL.l ModifyBoots
 ;--------------------------------------------------------------------------------
 
+;================================================================================
+; Enable/Disable Bonk Tremors
+;--------------------------------------------------------------------------------
+org $079202 ; 39202 <- Bank07.asm : 2859 (JSL AddDashTremor : JSL Player_ApplyRumbleToSprites)
+JSL.l AddBonkTremors : NOP #4
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Bonk Breakable Walls
+;--------------------------------------------------------------------------------
+org $01CF8E ; CF8E <- Bank01.asm : 11641 (LDA $0372 : AND.w #$00FF)
+JSL.l BonkBreakableWall : NOP #2
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Bonk Rock Pile
+;--------------------------------------------------------------------------------
+org $07C196 ; 3C196 <- Bank07.asm : 10310 (LDA $02EF : AND.b #$70)
+JSL.l BonkRockPile : NOP
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Move Gravestone
+;--------------------------------------------------------------------------------
+org $07C0FD ; 3C0FD <- Bank07.asm : 10197 (LDA $0372 : BNE .moveGravestone)
+JML.l GravestoneHook : NOP
+GravestoneHook_continue:
+org $07C106
+moveGravestone:
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Jump Down Ledge
+;--------------------------------------------------------------------------------
+org $078966 ; 38966 <- Bank07.asm : 1618 (LDA $1B : BNE .indoors : LDA.b #$02 : STA $EE)
+JSL.l JumpDownLedge : NOP #4
+;--------------------------------------------------------------------------------
+
+;================================================================================
+; Bonk Recoil
+;--------------------------------------------------------------------------------
+org $07922C ; 3922C <- Bank07.asm : 2869 (LDA.b #$24 : STA $29)
+JSL.l BonkRecoil
+;--------------------------------------------------------------------------------
+
 ;================================================================================
 ; Dungeon Exit Hook
 ;--------------------------------------------------------------------------------
@@ -486,9 +531,6 @@ JSL.l CheckGanonHammerDamage : NOP
 ;================================================================================
 ; Stat Hooks
 ;--------------------------------------------------------------------------------
-org $079202 ; 39202 <- Bank07.asm : 2859 (JSL AddDashTremor)
-JSL.l StatBonkCounter
-;--------------------------------------------------------------------------------
 org $02B797 ; <- 13797 - Bank02.asm : 8712 (LDA.b #$19 : STA $10)
 JSL.l StatsFinalPrep
 ;--------------------------------------------------------------------------------
diff --git a/stats.asm b/stats.asm
index 4bd3699..a853fc1 100644
--- a/stats.asm
+++ b/stats.asm
@@ -144,16 +144,12 @@
 !LOCK_STATS = "$7EF443"
 ;--------------------------------------------------------------------------------
 !BONK_COUNTER = "$7EF420"
-StatBonkCounter:
-	PHA
-	JSL Ancilla_CheckIfAlreadyExistsLong : BCS +
-		LDA !LOCK_STATS : BNE +
-			LDA !BONK_COUNTER : INC
-			CMP.b #100 : BEQ + ; decimal 100
-				STA !BONK_COUNTER
+IncrementBonkCounter:
+	LDA !LOCK_STATS : BNE +
+		LDA !BONK_COUNTER : INC
+		CMP.b #100 : BEQ + ; decimal 100
+			STA !BONK_COUNTER
 	+
-	PLA
-	JSL.l AddDashTremor ; thing we wrote over
 RTL
 ;--------------------------------------------------------------------------------
 !SAVE_COUNTER = "$7EF42D"
diff --git a/tables.asm b/tables.asm
index b26436f..a376a84 100644
--- a/tables.asm
+++ b/tables.asm
@@ -388,7 +388,11 @@ org $30808D ; PC 0x18008D
 InstantPostAgaWorldState:
 db $00 ; #$00 = Off (default) - #$01 = On
 ;--------------------------------------------------------------------------------
-; 0x18008E - 0x18008F (unused)
+org $30808E ; PC 0x18008E
+FakeBoots:
+db $00 ; #$00 = Off (default) - #$01 = On
+;--------------------------------------------------------------------------------
+; 0x18008F (unused)
 ;--------------------------------------------------------------------------------
 org $308090 ; PC 0x180090 - 0x180097
 ProgressiveSwordLimit:

From 3548a0bbf535163c50d6aa7479858e55b5d90169 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Thu, 24 Jun 2021 12:23:55 -0700
Subject: [PATCH 16/16] Implement always-allowed medallions

---
 roomloading.asm |   8 ++--
 swordswap.asm   | 120 ++++++++++++++++++++++++++++--------------------
 tables.asm      |   2 +-
 3 files changed, 74 insertions(+), 56 deletions(-)

diff --git a/roomloading.asm b/roomloading.asm
index 29f584d..d545b29 100644
--- a/roomloading.asm
+++ b/roomloading.asm
@@ -71,15 +71,15 @@ macro DrawBombosPlatform(roomX, roomY, quadX, quadY)
 endMacro
 
 IcePalaceBombosSE:
-	LDA AllowSwordlessMedallionUse : BNE + : RTL : +
+    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 1, 1)
     RTL
 IcePalaceBombosSW:
-	LDA AllowSwordlessMedallionUse : BNE + : RTL : +
+    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 0, 1)
     RTL
 IcePalaceBombosNE:
-	LDA AllowSwordlessMedallionUse : BNE + : RTL : +
+    LDA AllowSwordlessMedallionUse : CMP #$01 : BEQ + : RTL : +
     %DrawBombosPlatform(14, 18, 1, 0)
     RTL
 
@@ -165,4 +165,4 @@ RoomCallbackTable:
     db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 0Fx
     db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 10x
     db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 11x
-    db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 12x
\ No newline at end of file
+    db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; 12x
diff --git a/swordswap.asm b/swordswap.asm
index bfea58f..7dbd635 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -6,11 +6,11 @@
 ;GetFairySword:
 ;	CMP.b #$49 : BNE + : LDA.b #$00 : + ; convert single fighter sword to low id one
 ;	CMP.b #$50 : BNE + : LDA.b #$01 : + ; convert safe master sword to normal one
-;    CMP #$04 : !BLT + : JML.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
-;    JSL ItemCheck_FairySword : BEQ + : JML.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
+;	CMP #$04 : !BLT + : JML.l PyramidFairy_BRANCH_IOTA : + ; for any sword, incl newer
+;	JSL ItemCheck_FairySword : BEQ + : JML.l PyramidFairy_BRANCH_IOTA : + ; skip if we already flagged getting this
 ;	JSL ItemSet_FairySword ; mark as got
-;    LDA FairySword : STA $0DC0, X ; whichever sword
-;    LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
+;	LDA FairySword : STA $0DC0, X ; whichever sword
+;	LDA.b #$05 : STA $0EB0, X ; something we overwrote, documentation unclear on purpose
 ;
 ;JML.l PyramidFairy_BRANCH_GAMMA
 ;================================================================================
@@ -146,16 +146,16 @@ GetSmithSword:
 	REP #$20 : LDA $7EF360 : CMP #$000A : SEP #$20 : !BGE .buy
 	.cant_afford
 		REP #$10
-	    LDA.b #$7A
-	    LDY.b #$01
-	    JSL.l Sprite_ShowMessageUnconditional
+		LDA.b #$7A
+		LDY.b #$01
+		JSL.l Sprite_ShowMessageUnconditional
 		LDA.b #$3C : STA $012E ; error sound
 		SEP #$10
 		BRA .done
 
 	.buy
-	    LDA.l SmithItem : TAY
-	    STZ $02E9 ; Item from NPC
+		LDA.l SmithItem : TAY
+		STZ $02E9 ; Item from NPC
 		PHX : JSL Link_ReceiveItem : PLX
 
 		REP #$20 : LDA $7EF360 : !SUB.w #$000A : STA $7EF360 : SEP #$20 ; Take 10 rupees
@@ -165,50 +165,68 @@ GetSmithSword:
 		JML.l Smithy_AlreadyGotSword
 ;================================================================================
 CheckMedallionSword:
-	PHB : PHX : PHY
-		LDA.l AllowSwordlessMedallionUse : BNE +++ : JMP + : +++
-			LDA $1B : BEQ .outdoors
-			.indoors
-				REP #$20 ; set 16-bit accumulator
-				LDA $A0 ; load room ID
-				CMP.w #$000E : BNE ++ : .freezor1
-					LDA $22 : AND.w #$01FF : CMP.w #368-8 : !BLT .normal : CMP.w #368+32-8 : !BGE .normal ; check x-coord
-					LDA $20 : AND.w #$01FF : CMP.w #400-22 : !BLT .normal : CMP.w #400+32-22 : !BGE .normal ; check y-coord
-					JMP .permit
-				++ : CMP.w #$007E : BNE ++ : .freezor2
-					LDA $22 : AND.w #$01FF : CMP.w #112-8 : !BLT .normal : CMP.w #112+32-8 : !BGE .normal ; check x-coord
-					LDA $20 : AND.w #$01FF : CMP.w #400-22 : !BLT .normal : CMP.w #400+32-22 : !BGE .normal ; check y-coord
-					JMP .permit
-				++ : CMP.w #$00DE : BNE ++ : .kholdstare
-					LDA $22 : AND.w #$01FF : CMP.w #368-8 : !BLT .normal : CMP.w #368+32-8 : !BGE .normal ; check x-coord
-					LDA $20 : AND.w #$01FF : CMP.w #144-22 : !BLT .normal : CMP.w #144+32-22 : !BGE .normal ; check y-coord
-					BRA .permit
-				++ : .normal
-				SEP #$20 ; set 8-bit accumulator
+	LDA.l AllowSwordlessMedallionUse : BEQ .check_sword
+	CMP #$01 : BEQ .check_pad
+		LDA.b #$02 ; Pretend we have master sword
+		RTL
+	.check_sword
+		LDA $7EF359
+		RTL
+	.check_pad
+		PHB : PHX : PHY
+		LDA $1B : BEQ .outdoors
+		.indoors
+			REP #$20 ; set 16-bit accumulator
+			LDA $A0 ; load room ID
+			CMP.w #$000E : BNE + ; freezor1
+				LDA $22 : AND.w #$01FF ; check x-coord
+					CMP.w #368-8 : !BLT .normal
+					CMP.w #368+32-8 : !BGE .normal
+				LDA $20 : AND.w #$01FF ; check y-coord
+					CMP.w #400-22 : !BLT .normal
+					CMP.w #400+32-22 : !BGE .normal
+				JMP .permit
+			+ : CMP.w #$007E : BNE + ; freezor2
+				LDA $22 : AND.w #$01FF ; check x-coord
+					CMP.w #112-8 : !BLT .normal
+					CMP.w #112+32-8 : !BGE .normal
+				LDA $20 : AND.w #$01FF ; check y-coord
+					CMP.w #400-22 : !BLT .normal
+					CMP.w #400+32-22 : !BGE .normal
+				JMP .permit
+			+ : CMP.w #$00DE : BNE + ; kholdstare
+				LDA $22 : AND.w #$01FF ; check x-coord
+					CMP.w #368-8 : !BLT .normal
+					CMP.w #368+32-8 : !BGE .normal
+				LDA $20 : AND.w #$01FF ; check y-coord
+					CMP.w #144-22 : !BLT .normal
+					CMP.w #144+32-22 : !BGE .normal
+				BRA .permit
+			+ : .normal
+			SEP #$20 ; set 8-bit accumulator
+			BRA .done
+		.outdoors
+			LDA $8A : CMP.b #$70 : BNE +
+				LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE .done
+				LDA $7EF2F0 : AND.b #$20 : BNE .done
+				LDA.b #$08 : PHA : PLB ; set data bank to $08
+				LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; misery mire
 				BRA .done
-			.outdoors
-				LDA $8A : CMP.b #$70 : BNE ++
-					LDA.l MireRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE +
-					LDA $7EF2F0 : AND.b #$20 : BNE +
-					LDA.b #$08 : PHA : PLB ; set data bank to $08
-					LDY.b #$02 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; misery mire
-					BRA +
-				++ : CMP.b #$47 : BNE ++
-					LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE +
-					LDA $7EF2C7 : AND.b #$20 : BNE +
-					LDA.b #$08 : PHA : PLB ; set data bank to $08
-					LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; turtle rock
-				++
-			.done
-		+
-	PLY : PLX : PLB
-	LDA $7EF359
-RTL
+			+ : CMP.b #$47 : BNE +
+				LDA.l TRockRequiredMedallion : TAX : LDA.l .medallion_type, X : CMP $0303 : BNE .done
+				LDA $7EF2C7 : AND.b #$20 : BNE .done
+				LDA.b #$08 : PHA : PLB ; set data bank to $08
+				LDY.b #$03 : JSL.l Ancilla_CheckIfEntranceTriggered : BCS .permit ; turtle rock
+			+
+	.done
+		PLY : PLX : PLB
+		LDA $7EF359
+		RTL
 	.permit
-	SEP #$20 ; set 8-bit accumulator
-	PLY : PLX : PLB
-	LDA.b #$02 ; Pretend we have master sword
-RTL
+		SEP #$20 ; set 8-bit accumulator
+		PLY : PLX : PLB
+		LDA.b #$02 ; Pretend we have master sword
+		RTL
 .medallion_type
 db #$0F, #$10, #$11
 ;================================================================================
diff --git a/tables.asm b/tables.asm
index b26436f..cb45301 100644
--- a/tables.asm
+++ b/tables.asm
@@ -167,7 +167,7 @@ db #$00 ; #$00 = Off (default) - #$01 = On
 ;--------------------------------------------------------------------------------
 org $308041 ; PC 0x180041
 AllowSwordlessMedallionUse:
-db #$00 ; #$00 = Off (default) - #$01 = Medallion Pads - #$02 = Always (Not Implemented)
+db #$00 ; #$00 = Off (default) - #$01 = Medallion Pads - #$02 = Always
 ;--------------------------------------------------------------------------------
 org $308042 ; PC 0x180042
 PermitSQFromBosses: