From 6e327c951fa51393ddea059a2c71ad7f978df23d Mon Sep 17 00:00:00 2001
From: aerinon <randall.rupper@gmail.com>
Date: Fri, 14 Jun 2024 17:04:30 -0600
Subject: [PATCH] feat: couple nice to haves for mirror scroll & fake boots

---
 fileselect.asm        | 10 +++++++++-
 hooks.asm             |  6 ++++++
 inventory.asm         |  2 +-
 pendantcrystalhud.asm |  9 +++++++++
 4 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/fileselect.asm b/fileselect.asm
index 5b1f1cd..91ec75d 100644
--- a/fileselect.asm
+++ b/fileselect.asm
@@ -299,7 +299,13 @@ DrawPlayerFileShared:
 	%fs_drawItemBasic(EquipmentSRAM+$12,9,18,FileSelectItems_cape)
 
 	; Mirror
-	%fs_drawItemBasic(EquipmentSRAM+$13,9,20,FileSelectItems_mirror)
+	LDA.l EquipmentSRAM+$13 : AND.w #$00FF : BEQ +
+		CMP.w #$0001 : BNE +
+			%fs_drawItem(9,20,FileSelectItems_mirrorScroll)
+			BRA ++
+	+
+		%fs_drawItemBasic(EquipmentSRAM+$13,9,20,FileSelectItems_mirror)
+	++
 
 	; Bottles
 	%fs_drawBottle(EquipmentSRAM+$1C,3,23)
@@ -543,6 +549,8 @@ FileSelectItems:
 	dw #$0288|!FS_COLOR_RED, #$0289|!FS_COLOR_RED, #$0298|!FS_COLOR_RED, #$0299|!FS_COLOR_RED
 	.mirror
 	dw #$028A|!FS_COLOR_BLUE, #$028B|!FS_COLOR_BLUE, #$029A|!FS_COLOR_BLUE, #$029B|!FS_COLOR_BLUE
+	.mirrorScroll
+	dw #$02C2|!FS_COLOR_YELLOW, #$02C3|!FS_COLOR_YELLOW, #$02D2|!FS_COLOR_YELLOW, #$02d3|!FS_COLOR_YELLOW
 
 	.flippers
 	dw #$024E|!FS_COLOR_BLUE, #$024F|!FS_COLOR_BLUE, #$025F|!FS_COLOR_BLUE|!FS_HFLIP, #$025F|!FS_COLOR_BLUE
diff --git a/hooks.asm b/hooks.asm
index 4265949..91b60b8 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -750,11 +750,17 @@ org $8DE7B9 ; <- 6E7B9 - equipment.asm : 1548 (LDA.w #$16D0 : STA $00)
 JSL DrawGlovesInMenuLocation : NOP
 org $8DE7CF ; <- 6E7CF - equipment.asm : 1554 (LDA.w #$16C8 : STA $00)
 JSL DrawBootsInMenuLocation : NOP
+org $8DE7DD
+JSL ChangeBootsColorForFakeBoots : NOP
 org $8DE7E5 ; <- 6E7E5 - equipment.asm : 1560 (LDA.w #$16D8 : STA $00)
 JSL DrawFlippersInMenuLocation : NOP
 org $8DECEB ; <- 6ECEB - equipment.asm : 1946 (LDA.w #$16E0 : STA $00)
 JSL DrawMoonPearlInMenuLocation : NOP
 
+; Fake boots icon
+org $8DF851
+dw $2C29, $2C2A, $2C2B, $2C2C
+
 ;================================================================================
 ; Zelda S&Q Mirror Fix
 ;--------------------------------------------------------------------------------
diff --git a/inventory.asm b/inventory.asm
index 93113aa..9275e1a 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -168,7 +168,7 @@ AddInventory:
                                 LDA.l BootsEquipment : AND.w #$00FF : BNE +
                                         TYA : STA.l PreBootsLocations
                                 +
-                                LDA.l MirrorEquipment : AND.w #$00FF : BNE +
+                                LDA.l MirrorEquipment : AND.w #$00FE : BNE +  ; FE to ignore mirror scroll
                                         TYA : STA.l PreMirrorLocations
                                 +
                                 LDA.l FluteEquipment : AND.w #$00FF : BNE +
diff --git a/pendantcrystalhud.asm b/pendantcrystalhud.asm
index ca55503..fbcdeb5 100644
--- a/pendantcrystalhud.asm
+++ b/pendantcrystalhud.asm
@@ -165,6 +165,15 @@ DrawBootsInMenuLocation:
 	LDA.w #$1588 : STA.b Scrap00
 RTL
 ;--------------------------------------------------------------------------------
+ChangeBootsColorForFakeBoots:
+	LDA.l FakeBoots : AND.w #$00FF : BEQ +
+	LDA.l EquipmentSRAM+$15 : AND.w #$00FF : BNE +
+		LDA.w #$F851	; address of ItemMenu_ItemIcons_usused_nothing, which has the fake boots now
+		BRA ++
+	+ LDA.w #$F821  ; address of ItemMenu_ItemIcons_boots
+	++ STA.b Scrap04
+RTL
+;--------------------------------------------------------------------------------
 DrawGlovesInMenuLocation:
 	LDA.l HUDDungeonItems : BNE +
 		LDA.w #$1610 : STA.b Scrap00