From 3944dadcab4902056d80a051fe8bc8690c264870 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Thu, 8 Jul 2021 18:25:04 -0700
Subject: [PATCH 1/5] Change default for locked aga tower to no longer be
 inverted

---
 tables.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tables.asm b/tables.asm
index 3400732..d5a6a32 100644
--- a/tables.asm
+++ b/tables.asm
@@ -837,7 +837,7 @@ db #$08 ; #$08 = 1 Heart (default) - #$02 = 1/4 Heart
 ;================================================================================
 org $308169 ; PC 0x180169
 AgahnimDoorStyle:
-db #$02 ; #00 = Never Locked - #$01 = Locked During Escape (default) - #$02 = Locked Without 7 Crystals
+db #$01 ; #00 = Never Locked - #$01 = Locked During Escape (default) - #$02 = Locked Without 7 Crystals
 ;================================================================================
 org $30816A ; PC 0x18016A
 FreeItemText:

From e7d4f09871384e40587e7fbe2143c7e1123fc9cc Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sat, 10 Jul 2021 11:27:34 -0700
Subject: [PATCH 2/5] Fix junk graphic appearing during GAME OVER screen

---
 newhud.asm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/newhud.asm b/newhud.asm
index 884d967..a8d0e3c 100644
--- a/newhud.asm
+++ b/newhud.asm
@@ -150,6 +150,8 @@ SEP #$30
 	CPX #$04 : !BLT .noprize
 	CPX #$08 : BEQ .noprize
 
+	LDA $10 : CMP #$12 : BEQ .noprize
+
 	REP #$20
 
 	LDA.l MapMode

From 12bc26bd5af9ba69f5f580a8b9ebd00b9936ac08 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Sun, 11 Jul 2021 02:14:01 -0700
Subject: [PATCH 3/5] Fix extra space in credits

---
 stats/creditsnew.asm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm
index dae6d8b..a7c8adf 100644
--- a/stats/creditsnew.asm
+++ b/stats/creditsnew.asm
@@ -419,7 +419,7 @@ CreditsLineBlank:
 
 %blankline()
 
-%bigcredits("AERINON             COMPILING")
+%bigcredits("AERINON            COMPILING")
 
 %blankline()
 %blankline()

From a2547e9810dabe09fcec3e93b2db7e837fde9825 Mon Sep 17 00:00:00 2001
From: Kara Alexandra <ardnaxelarak@gmail.com>
Date: Fri, 16 Jul 2021 15:29:01 -0700
Subject: [PATCH 4/5] Minor credits fixes

---
 stats/creditsnew.asm | 2 ++
 stats/main.asm       | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm
index dae6d8b..88167f8 100644
--- a/stats/creditsnew.asm
+++ b/stats/creditsnew.asm
@@ -1,11 +1,13 @@
 ;===================================================================================================
 ; LEAVE THIS HERE FOR PHP WRITES
 ;===================================================================================================
+table "creditscharmapbighi.txt"
 YourSpriteCreditsHi:
 db 2
 db 55
 db "                            " ; $238002
 
+table "creditscharmapbiglo.txt"
 YourSpriteCreditsLo:
 db 2
 db 55
diff --git a/stats/main.asm b/stats/main.asm
index 314de0e..975eb3b 100755
--- a/stats/main.asm
+++ b/stats/main.asm
@@ -218,7 +218,7 @@ endmacro
 
 !ColonOffset = $83
 !PeriodOffset = $80
-!BlankTile = $883D
+!BlankTile = #$883D
 
 RenderCreditsStatCounter:
     PHB

From f0a00aea0dae3f6f696e29721909b3bdfef3c70b Mon Sep 17 00:00:00 2001
From: spannerisms <32842036+spannerisms@users.noreply.github.com>
Date: Sat, 17 Jul 2021 05:46:02 -0400
Subject: [PATCH 5/5] fix

---
 entrances.asm | 14 +++++++++++++-
 hooks.asm     |  3 +++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/entrances.asm b/entrances.asm
index 2b2f171..35db47e 100644
--- a/entrances.asm
+++ b/entrances.asm
@@ -24,11 +24,12 @@ LockAgahnimDoors:
 
 		LDA $7EF2C3 : AND.w #$0020 : BNE .unlock ; Check if GT overlay is already on or not
 		LDA $0308 : AND.w #$0080 : BEQ ++ ;If we are holding an item
+
+	.locked
 			LDA #$0001 : RTL ;Keep the door locked
 		++
 		SEP #$30
 		JSL $099B6F ;Add tower break seal
-		LDA $7EF2C3 : ORA #$20 : STA $7EF2C3 ; activate GT overlay
 		REP #$30
 		LDA #$0001 ;Prevent door from opening that frame otherwise it glitchy
 		RTL
@@ -39,6 +40,17 @@ LockAgahnimDoors:
 	LDA.w #$0000 ; fallback to never locked
 
 RTL
+;---------------------------------------------------------------------------------
+FlagAgahnimDoor:
+	LDA.l InvertedMode : BEQ .vanilla
+
+	LDA $7EF2C3 : ORA #$20 : STA $7EF2C3 ; activate GT overlay
+
+.vanilla
+	LDA.b #$28 : STA.b $72
+	RTL
+
+
 ;--------------------------------------------------------------------------------
 LockAgahnimDoorsCore:
 	LDA $22 : CMP.w #1992 : !BLT + ; door too far left, skip
diff --git a/hooks.asm b/hooks.asm
index 4c70433..5f1636a 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -1026,6 +1026,9 @@ JSL.l InitializeBottles
 ;================================================================================
 ; Agahnim Doors Fix
 ;--------------------------------------------------------------------------------
+org $099BBA
+JSL FlagAgahnimDoor
+
 org $1BBC94 ; <- DBC94 - Bank1B.asm : 201 (LDA $7EF3C5 : AND.w #$000F : CMP.w #$0003 : BCS BRANCH_EPSILON)
 JSL.l LockAgahnimDoors : BNE Overworld_Entrance_BRANCH_EPSILON : NOP #6