From 0bbf69ad222d5d996d9bc1cc185bfe5ab35628b4 Mon Sep 17 00:00:00 2001
From: Karkat <north@tinymagnet.com>
Date: Mon, 25 Sep 2017 21:41:04 -0400
Subject: [PATCH] fixing stuff

---
 LTTP_RND_GeneralBugfixes.asm |   4 +-
 events.asm                   |   8 +--
 newitems.asm                 | 106 +++++++++++++++++------------------
 utilities.asm                |  26 ++++-----
 4 files changed, 72 insertions(+), 72 deletions(-)

diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 95fbad1..a87b0b5 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -177,8 +177,8 @@ warnpc $31A800
 
 org $31A800
 GFX_New_Items:
-;incbin newitems.gfx
-incbin eventitems.gfx ; *EVENT*
+incbin newitems.gfx
+;incbin eventitems.gfx ; *EVENT*
 warnpc $31B000
 
 org $31B000
diff --git a/events.asm b/events.asm
index c2951d4..b4c4dbe 100644
--- a/events.asm
+++ b/events.asm
@@ -92,10 +92,10 @@ RTL
 PostItemAnimation:
 	LDA.b #$00 : STA !ITEM_BUSY ; mark item as finished
 	
-	LDA $7F50A0 : BEQ +
-		JSL.l Main_ShowTextMessage
-		LDA.b #$00 : STA $7F50A0
-	+
+	;LDA $7F50A0 : BEQ +
+	;	JSL.l Main_ShowTextMessage
+	;	LDA.b #$00 : STA $7F50A0
+	;+
 	
     STZ $02E9 : LDA $0C5E, X ; thing we wrote over to get here
 RTL
diff --git a/newitems.asm b/newitems.asm
index 07b8a46..e5ee887 100755
--- a/newitems.asm
+++ b/newitems.asm
@@ -133,45 +133,45 @@ endmacro
 ;--------------------------------------------------------------------------------
 ;carry clear if pass
 ;carry set if caught
-incsrc eventdata.asm
-ProcessEventItems:
-	LDA $00 : PHA
-	LDA $01 : PHA
-	LDA $02 : PHA
-	PHY : PHP
-		LDA $02D8
-		CMP.b #$70 : !BLT + : CMP.b #$E0 : !BGE + ; Free Item Block
-			!SUB #$70
-			
-			REP #$30 ; set 16-bit accumulator & index registers
-			AND.w #$00FF : ASL : TAX
-			LDA.l EventDataOffsets, X : !ADD.w #EventDataTable : STA $00
-			
-			SEP #$20 ; set 8-bit accumulator
-			PHK : PLA : STA $02
-			
-			JSL.l LoadDialogAddressIndirect
-			
-			SEP #$10 ; set 8-bit index registers
-			LDX.b #$01 : BRA .done
-		+
-		LDX.b #$00
-	.done
-	PLP : PLY
-	PLA : STA $02
-	PLA : STA $01
-	PLA : STA $00
-RTS
+;incsrc eventdata.asm
+;ProcessEventItems:
+;	LDA $00 : PHA
+;	LDA $01 : PHA
+;	LDA $02 : PHA
+;	PHY : PHP
+;		LDA $02D8
+;		CMP.b #$70 : !BLT + : CMP.b #$E0 : !BGE + ; Free Item Block
+;			!SUB #$70
+;			
+;			REP #$30 ; set 16-bit accumulator & index registers
+;			AND.w #$00FF : ASL : TAX
+;			LDA.l EventDataOffsets, X : !ADD.w #EventDataTable : STA $00
+;			
+;			SEP #$20 ; set 8-bit accumulator
+;			PHK : PLA : STA $02
+;			
+;			JSL.l LoadDialogAddressIndirect
+;			
+;			SEP #$10 ; set 8-bit index registers
+;			LDX.b #$01 : BRA .done
+;		+
+;		LDX.b #$00
+;	.done
+;	PLP : PLY
+;	PLA : STA $02
+;	PLA : STA $01
+;	PLA : STA $00
+;RTS
 ;--------------------------------------------------------------------------------
 AddReceivedItemExpandedGetItem:
 	PHX
 	
-	JSR.w ProcessEventItems : CPX.b #$00 : BEQ ++
-		;JSL.l Main_ShowTextMessage
-		LDA !GOAL_COUNTER : INC : STA !GOAL_COUNTER
-		LDA.b #$01 : STA $7F50A0
-		BRL .done
-	++
+	;JSR.w ProcessEventItems : CPX.b #$00 : BEQ ++
+	;	;JSL.l Main_ShowTextMessage
+	;	LDA !GOAL_COUNTER : INC : STA !GOAL_COUNTER
+	;	LDA.b #$01 : STA $7F50A0
+	;	BRL .done
+	;++
 
 	LDA $02D8 ; check inventory
 	CMP.b #$4C : BNE + ; 50 bombs
@@ -493,8 +493,8 @@ AddReceivedItemExpanded:
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Free Map
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Free Compass
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Free Big Key
-	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; *EVENT*
-	;db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Small Key
+	;db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; *EVENT*
+	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Small Key
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Unused
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Unused
 	db  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ; Unused
@@ -529,14 +529,14 @@ AddReceivedItemExpanded:
 	db $FF, $FF, $FF, $FF, $FF, $FF ; Unused
 	db $49, $4A, $49 ; Goal Item Single, Multi & Alt Multi
 	db $FF, $FF, $FF ; Unused
-	;db $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21 ; Free Map
-	;db $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16 ; Free Compass
-	;db $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22 ; Free Big Key
-	;db $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F ; Free Small Key
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
+	db $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21 ; Free Map
+	db $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16 ; Free Compass
+	db $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22 ; Free Big Key
+	db $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F ; Free Small Key
+	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
+	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
+	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
+	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
 	
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
@@ -575,8 +575,8 @@ AddReceivedItemExpanded:
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Free Map
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Free Compass
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Free Big Key
-	;db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; Free Small Key
-	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; *EVENT*
+	db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ; Free Small Key
+	;db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; *EVENT*
 	
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Unused
 	db $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 ; Unused
@@ -609,14 +609,14 @@ AddReceivedItemExpanded:
 	db  4, 4, 4 ; Goal Item Single, Multi & Alt Multi
 	db  0, 0, 0 ; Unused
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Map
-	;db  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 ; Free Compass
-	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; *EVENT*
+	db  2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2 ; Free Compass
+	;db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; *EVENT*
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Big Key
 	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Free Small Key
-	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; *EVENT*
-	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; *EVENT*
-	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; *EVENT*
-	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; *EVENT*
+	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
+	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
+	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
+	db  4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4 ; Unused
 
 ; \item Target SRAM addresses for items you receive
 .item_target_addr
diff --git a/utilities.asm b/utilities.asm
index 3960305..43e10bc 100644
--- a/utilities.asm
+++ b/utilities.asm
@@ -115,20 +115,20 @@ RTL
 	db $FF, $FF, $FF ; Unused
 	
 	;7x
-	;db $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21 ; Free Map
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
+	db $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21, $21 ; Free Map
+	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
 	
 	;8x
-	;db $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16 ; Free Compass
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
+	db $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16, $16 ; Free Compass
+	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
 	
 	;9x
-	;db $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22 ; Free Big Key
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
+	db $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22, $22 ; Free Big Key
+	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
 	
 	;Ax
-	;db $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F ; Free Small Key
-	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
+	db $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F, $0F ; Free Small Key
+	;db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; *EVENT*
 	
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
 	db $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49, $49 ; Unused
@@ -246,8 +246,8 @@ RTL
 	db $08, $08, $08 ; Goal Item Single, Multi & Alt Multi
 	db $00, $00, $00 ; Unused
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Free Map
-	;db $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04 ; Free Compass
-	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; *EVENT*
+	db $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04, $04 ; Free Compass
+	;db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; *EVENT*
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Free Big Key
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Free Small Key
 	db $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08, $08 ; Unused
@@ -336,9 +336,9 @@ RTL
 	.smallSprites
 	db $04, $07, $08, $09, $0A, $0B, $0C, $13
 	db $15, $18, $24, $2A, $31, $34, $35, $36
-	db $42, $43, $45, $59, $FF, $FF, $FF, $FF ; *EVENT* $A0, $A1, $A2, $A3
-	;db $A4, $A5, $A6, $A7, $A8, $A9, $AA, $AB
-	;db $AC, $AD, $AE, $AF, $FF, $FF, $FF, $FF
+	db $42, $43, $45, $59, $A0, $A1, $A2, $A3
+	db $A4, $A5, $A6, $A7, $A8, $A9, $AA, $AB
+	db $AC, $AD, $AE, $AF, $FF, $FF, $FF, $FF
 }
 ;--------------------------------------------------------------------------------