From 4e0992934ec97fabfad882e5a902b3d23ecc71ed Mon Sep 17 00:00:00 2001
From: Karkat <north@tinymagnet.com>
Date: Tue, 8 Aug 2017 21:35:18 -0400
Subject: [PATCH] comment updates

---
 LTTP_RND_GeneralBugfixes.asm |  8 ++++----
 inventory.asm                | 13 +++++++------
 utilities.asm                |  2 +-
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 5520ce7..a33818d 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -50,7 +50,7 @@ dl #$20170726
 !SRAM_SINK = "$7EF41E" ; <- change this
 !FRESH_FILE_MARKER = "$7EF4F0" ; zero if fresh file
 ;$7EF41A[w] - Programmable Item #1
-;$7EF41C[w] - Programmable Item #3
+;$7EF41C[w] - Programmable Item #2
 ;$7EF41E[w] - Programmable Item #3
 ;$7EF420 - $7EF44F - Stat Tracking Bank 1
 ;$7EF450 - $7EF45F - RNG Item (Single) Flags
@@ -217,18 +217,18 @@ warnpc $AF8401
 ;bank $3F reserved for internal debugging
 ;$7F5700 - $7F57FF reserved for downstream use
 ;================================================================================
-org $0080DC ; <- 0xDC - Bank00.asm:179 - Kill Music
+;org $0080DC ; <- 0xDC - Bank00.asm:179 - Kill Music
 ;db #$A9, #$00, #$EA
 ;LDA.b #$00 : NOP
 ;================================================================================
-org $0AC53E ; <- 5453E - Bank0A.asm:1103 - (LDA $0AC51F, X) - i have no idea what this is for anymore
+;org $0AC53E ; <- 5453E - Bank0A.asm:1103 - (LDA $0AC51F, X) - i have no idea what this is for anymore
 ;LDA.b #$7F
 ;NOP #2
 ;================================================================================
 ;org $05DF8B ; <- 2DF8B - Bank05.asm : 2483
 ;AND.w #$0100 ; allow Sprite_DrawMultiple to access lower half of sprite tiles
 ;================================================================================
-;org $0DF8F1 ; this is required for the X-indicator in the HUD
+;org $0DF8F1 ; this is required for the X-indicator in the HUD except not anymore obviously
 ;
 ;;red pendant
 ;db $2B, $31, $2C, $31, $3D, $31, $2E, $31
diff --git a/inventory.asm b/inventory.asm
index 8f43822..de42ef4 100644
--- a/inventory.asm
+++ b/inventory.asm
@@ -242,7 +242,7 @@ AddInventory:
 			CMP.w #271 : BNE + : BRL .shop : + ; villiage of outcasts shop, lumberjack shop, lake hylia shop, dark world magic shop
 			CMP.w #272 : BNE + : BRL .shop : + ; red shield shop
 			CMP.w #284 : BNE + : BRL .shop : + ; bomb shop
-			;CMP.w #265 : BNE + : BRL .shop : + ; potion shop - commented this out because it's easier to just block potion refills
+			;CMP.w #265 : BNE + : BRL .shop : + ; potion shop - commented this out because it's easier to just block potion refills because this one interferes with the powder item being counted
 			;CMP.w #271 : BNE + : BRL .shop : + ; lake hylia shop
 			CMP.w #287 : BNE + : BRL .shop : + ; kakariko shop
 			CMP.w #255 : BNE + : BRL .shop : + ; light world death mountain shop
@@ -257,12 +257,12 @@ AddInventory:
 	LDA $1B : BNE + : BRL .fullItemCounts : +
 	; ==BEGIN INDOOR-ONLY SECTION
 	
-	REP #$20 ; Set 16-bit Accumulator
-	LDA $A0 ; load room ID
-	CMP.w #$0010 : BNE + ; Ganon Fall Room
+	;REP #$20 ; Set 16-bit Accumulator
+	;LDA $A0 ; load room ID
+	;CMP.w #$0010 : BNE + ; Ganon Fall Room - I think this got taken out
 		;!SHAME_CHEST = "$7EF416" ; ---s ----
-		LDA !SHAME_CHEST : ORA.w #$0010 : STA !SHAME_CHEST
-	+
+		;LDA !SHAME_CHEST : ORA.w #$0010 : STA !SHAME_CHEST
+	;+
 	SEP #$20 ; Set 8-bit Accumulator
 	
 	LDA $040C ; get dungeon id
@@ -738,6 +738,7 @@ RTL
 ; GetWitchLootOAMTableIndex
 ; in:	A - Loot ID
 ; out:	A - Loot OAM Table Index
+; check if this is even still referenced anywhere
 ;--------------------------------------------------------------------------------
 GetWitchLootOAMTableIndex:
 	PHX
diff --git a/utilities.asm b/utilities.asm
index d8d1651..0b012e0 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -282,7 +282,7 @@ RTS
 ; in:	A - Loot ID
 ; out:  A - OAM Slots Taken
 ;--------------------------------------------------------------------------------
-; This wastes two OAM slots if you don't want a shadow - fix later
+; This wastes two OAM slots if you don't want a shadow - fix later - I wrote "fix later" over a year ago and it's still not fixed (Aug 6, 2017)
 ;-------------------------------------------------------------------------------- 2084B8
 !SPRITE_OAM = "$7EC025"
 !SKIP_EOR = "$7F5008"