From 00487370b3dcda0c00d4e8d7e7c84bbeb57997e0 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sun, 24 Nov 2024 14:37:23 -0600
Subject: [PATCH] Zoom on carry, slip on sword, crystal switch changes

---
 LTTP_RND_GeneralBugfixes.asm |   2 ++
 data/customitems.4bpp        | Bin 5120 -> 5120 bytes
 rewind.asm                   |  17 -----------
 switches.asm                 |  56 +++++++++++++++++++++++++++++++++++
 swordswap.asm                |  25 ++++++++--------
 zoom_on_carry.asm            |  13 ++++++++
 6 files changed, 84 insertions(+), 29 deletions(-)
 create mode 100644 switches.asm
 create mode 100644 zoom_on_carry.asm

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 4ef4d81..ef8e0fc 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -160,6 +160,8 @@ incsrc textrenderer.asm
 incsrc rewind.asm
 incsrc lift.asm
 incsrc mothula.asm
+incsrc switches.asm
+incsrc zoom_on_carry.asm
 warnpc $A58000
 
 org $A28000
diff --git a/data/customitems.4bpp b/data/customitems.4bpp
index cbffdce0fb3f5ff91032e2284334fae26e43c431..83e41beaa0396faa72598f825451e28402244cd8 100644
GIT binary patch
delta 144
zcmZqBXwcZu#AC<6V9(%SZ^$PIh73Re<TDsD2!bJq-@xF|&;VjE$bd;8A1DR_G7Os!
z@El;Y7vvM>5$7=GakR4siwiOcF^Di2F*pLv0s%XQJq-UC?lIIg%mMS27}hW(G28-T
LFn{xYK1Wsnv&$Aj

delta 144
zcmZqBXwcZu#AC<EAjPO69iyxuFTt)M&cMLPAkApcT+eLJEYD)k&cM*X5YeD=!|Djj
z4~YjNFF^bo4Sx>&JMibg4~0JuHXq<Qz-S+!uOKhO3^GMoMuwT0p`IV8n*nSJgFFK>
l1J@Up9~K8drW~=bIB<aB-v^*>2Cyj%KNt>d-p}XA3IK#zFxdbA

diff --git a/rewind.asm b/rewind.asm
index 29ce58a..84c3b9d 100644
--- a/rewind.asm
+++ b/rewind.asm
@@ -6,23 +6,6 @@ pushpc
 	+
 pullpc
 
-; pushpc
-; 	org $87A46E
-; 	JSL CheckBookTriggerSave
-; pullpc
-
-CheckBookTriggerSave:
-	LDA.b $10
-	CMP.b #$07
-	BNE +
-
-	JSL SaveRewind
-
-	; what we wrote over
-+	LDA.b $3A
-	AND.b #$BF
-RTL
-
 CheckLoadRewind:
 	; what we wrote over
 	STZ.w $011A
diff --git a/switches.asm b/switches.asm
new file mode 100644
index 0000000..e8c12d7
--- /dev/null
+++ b/switches.asm
@@ -0,0 +1,56 @@
+pushpc
+
+org $87A46E
+JSL CheckBookTriggerSwitch
+BCS +
+skip 15
++
+
+org $8296A8
+JSL FinishPegChange
+
+org $86B93F
+BRA + : NOP #8 : +
+LDA.b #$19
+STA.b $11
+LDA.b #$33
+JSL $8DBB7C
+
+pullpc
+
+FinishPegChange:
+	LDA.b #$20
+	TRB.w $037A
+
+	STZ.b $B0
+	STZ.b $11
+RTL
+
+CheckBookTriggerSwitch:
+	LDA.b $10
+	CMP.b #$07
+	BNE +
+
+	LDA.l $7EC172
+	EOR.b #$01
+	STA.l $7EC172
+
+	LDA.b #$16
+	STA.b $11
+
+	LDA.b #$20
+	TSB.w $037A
+
+	LDA.b #$25
+	JSL $8DBB8A
+
+	SEC
+	BRA .done
+
++	CLC
+.done
+	; what we wrote over
+	LDA.b $3A
+	AND.b #$BF
+	STA.b $3A
+RTL
diff --git a/swordswap.asm b/swordswap.asm
index a977fad..1b2c74c 100644
--- a/swordswap.asm
+++ b/swordswap.asm
@@ -64,22 +64,23 @@ LoadModifiedMagicLevel:
 RTL
 ;================================================================================
 ; $7E0348 - Ice Value
-LoadModifiedIceFloorValue_a11:
-	LDA.b RoomIndex : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
-	LDA.b LinkState : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
-	LDA.b LinkSpeed : CMP.b #$02 : BEQ +  
-	LDA.b LinkSlipping : BNE +  
-		LDA.w TileActIce : ORA.l IceModifier : AND.b #$11 : RTL  
-	+ : LDA.w TileActIce : AND.b #$11  
-RTL  
-LoadModifiedIceFloorValue_a01:  
+
+LoadModifiedIceFloorValue:
 	LDA.b RoomIndex : CMP.b #$91 : BEQ + : CMP.b #$92 : BEQ + : CMP.b #$93 : BEQ + ; mire basement currently broken - not sure why
 	LDA.b LinkState : CMP.b #$01 : BEQ + : CMP.b #$17 : BEQ + : CMP.b #$1C : BEQ +
 	LDA.b LinkSpeed : CMP.b #$02 : BEQ +
 	LDA.b LinkSlipping : BNE +
-		LDA.w TileActIce : ORA.l IceModifier : AND.b #$01 : RTL
-	+ : LDA.w TileActIce : AND.b #$01
-RTL
+	LDA.b $3C : AND.b #$0F : CMP.b #$09 : BNE ++
+	LDA.w $0372 : BNE ++
+	.yes
+	LDA.w TileActIce : ORA.l IceModifier : ORA.b #$10 : RTS
+	++ : LDA.w TileActIce : ORA.l IceModifier : RTS
+	+ : LDA.w TileActIce
+RTS
+LoadModifiedIceFloorValue_a11:
+	JSR LoadModifiedIceFloorValue : AND.b #$11 : RTL
+LoadModifiedIceFloorValue_a01:
+	JSR LoadModifiedIceFloorValue : AND.b #$01 : RTL
 ;================================================================================
 CheckTabletSword:
 	LDA.l AllowHammerTablets : BEQ +
diff --git a/zoom_on_carry.asm b/zoom_on_carry.asm
new file mode 100644
index 0000000..c12811e
--- /dev/null
+++ b/zoom_on_carry.asm
@@ -0,0 +1,13 @@
+pushpc
+
+org $87E294
+JSL.l CheckSpeed
+
+pullpc
+
+CheckSpeed:
+	LDA.w $0308 : BIT.b #$80 : BNE .zoom
+	LDA.b $5E : STA.b $00 ; what we wrote over
+RTL
+.zoom
+	LDA.b #$10 : STA.b $00 : RTL