From 8321a3c69b28f4cefe4c0122523fafd69695383e Mon Sep 17 00:00:00 2001
From: Kevin Cathcart <kevincathcart@gmail.com>
Date: Sat, 8 Sep 2018 14:39:30 -0400
Subject: [PATCH] Fix pyramid/castle hole (except aga tower eye symbol)

---
 hooks.asm        |  6 +++++-
 inverted.asm     | 17 ++++++++++++++++-
 invertedmaps.asm |  2 +-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/hooks.asm b/hooks.asm
index 7b3b917..e366483 100755
--- a/hooks.asm
+++ b/hooks.asm
@@ -244,12 +244,16 @@ org $02D9B9 ; <- 159B9 - Bank02.asm : 11089  (LDA $7EF3C8)
 JSL AllowStartFromSingleEntranceCave
 ;--------------------------------------------------------------------------------
 org $1bc2a7 ; <- DC2A7 - Bank1B.asm : 1143 (Overworld_CreatePyramidHole:)
-JSL.l Overworld_DrawPyramidHoleModified
+JSL.l Overworld_CreatePyramidHoleModified
 RTL
 C9DE_LONG:
 JSR $C9DE ; surprisingly same address as US
 RTL
 ;--------------------------------------------------------------------------------
+org $07ff5f ; <- 3ff5f - Bank0E.asm : 5252 (LDA.w #$0E3F : STA $23BC)
+JSL.l Draw_PyramidOverlay
+RTS
+;--------------------------------------------------------------------------------
 
 ;================================================================================
 ; Hash Key Display
diff --git a/inverted.asm b/inverted.asm
index ef41676..d588acf 100644
--- a/inverted.asm
+++ b/inverted.asm
@@ -2,7 +2,7 @@
 
 ; Does tile modification for... the pyramid of power hole
 ; after Ganon slams into it in bat form?
-Overworld_DrawPyramidHoleModified:
+Overworld_CreatePyramidHoleModified:
 	LDA.l InvertedMode : BNE +
 		BRL .originalBehaviour
 +
@@ -78,3 +78,18 @@ Overworld_DrawPyramidHoleModified:
 	LDA.b #$01 : STA $14
 
 RTL
+;------------------------------------------------------------------------------
+Draw_PyramidOverlay:
+	LDA.l InvertedMode : BNE .done
+.normal
+	LDA.w #$0E39 : STA $23BC
+	INC A        : STA $23BE
+	INC A        : STA $23C0
+	INC A        : STA $243C
+	INC A        : STA $243E
+	INC A        : STA $2440
+	INC A        : STA $24BC
+	INC A        : STA $24BE
+	INC A        : STA $24C0
+.done
+RTL
diff --git a/invertedmaps.asm b/invertedmaps.asm
index b674b18..fefdde2 100644
--- a/invertedmaps.asm
+++ b/invertedmaps.asm
@@ -173,7 +173,7 @@ LDA #$04BB : STA $302C
 STA $302E
 
 ; CHECK IF AGAHNIM 2 IS DEAD AND WE HAVE ALREADY LANDED
-LDA $7EF01A : AND #$0800 : BEQ .agahnim2Alive
+LDA $7EF2DB : AND #$0020 : BEQ .agahnim2Alive
 LDA #$046D : STA $243E
 LDA #$0E3A : STA $24BC
 LDA #$0E3B : STA $24BE