From fd8b63200c803b898b8275376f1e6f276a2ff5c7 Mon Sep 17 00:00:00 2001
From: Karkat <north@tinymagnet.com>
Date: Mon, 8 Jan 2018 21:16:46 -0500
Subject: [PATCH] timestamp lock-in fixes

---
 inventory.asm | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/inventory.asm b/inventory.asm
index 99155b7..60abf0e 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -545,22 +545,31 @@ RTS
 
 .stampBoots
 	REP #$20 ; set 16-bit accumulator
-	LDA !NMI_TIME : STA !BOOTS_TIME
-	LDA !NMI_TIME+2 : STA !BOOTS_TIME+2
+	LDA !BOOTS_TIME : BNE +
+	LDA !BOOTS_TIME+2 : BNE +
+		LDA !NMI_TIME : STA !BOOTS_TIME
+		LDA !NMI_TIME+2 : STA !BOOTS_TIME+2
+	+
 	SEP #$20 ; set 8-bit accumulator
 RTS
 
 .stampFlute
 	REP #$20 ; set 16-bit accumulator
-	LDA !NMI_TIME : STA !FLUTE_TIME
-	LDA !NMI_TIME+2 : STA !FLUTE_TIME+2
+	LDA !FLUTE_TIME : BNE +
+	LDA !FLUTE_TIME+2 : BNE +
+		LDA !NMI_TIME : STA !FLUTE_TIME
+		LDA !NMI_TIME+2 : STA !FLUTE_TIME+2
+	+
 	SEP #$20 ; set 8-bit accumulator
 RTS
 
 .stampMirror
 	REP #$20 ; set 16-bit accumulator
-	LDA !NMI_TIME : STA !MIRROR_TIME
-	LDA !NMI_TIME+2 : STA !MIRROR_TIME+2
+	LDA !MIRROR_TIME : BNE +
+	LDA !MIRROR_TIME+2 : BNE +
+		LDA !NMI_TIME : STA !MIRROR_TIME
+		LDA !NMI_TIME+2 : STA !MIRROR_TIME+2
+	+
 	SEP #$20 ; set 8-bit accumulator
 RTS