Fix pyramid/castle hole (except aga tower eye symbol)

This commit is contained in:
Kevin Cathcart
2018-09-08 14:39:30 -04:00
parent f914f8d718
commit 8321a3c69b
3 changed files with 22 additions and 3 deletions

View File

@@ -244,12 +244,16 @@ org $02D9B9 ; <- 159B9 - Bank02.asm : 11089 (LDA $7EF3C8)
JSL AllowStartFromSingleEntranceCave JSL AllowStartFromSingleEntranceCave
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $1bc2a7 ; <- DC2A7 - Bank1B.asm : 1143 (Overworld_CreatePyramidHole:) org $1bc2a7 ; <- DC2A7 - Bank1B.asm : 1143 (Overworld_CreatePyramidHole:)
JSL.l Overworld_DrawPyramidHoleModified JSL.l Overworld_CreatePyramidHoleModified
RTL RTL
C9DE_LONG: C9DE_LONG:
JSR $C9DE ; surprisingly same address as US JSR $C9DE ; surprisingly same address as US
RTL RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
org $07ff5f ; <- 3ff5f - Bank0E.asm : 5252 (LDA.w #$0E3F : STA $23BC)
JSL.l Draw_PyramidOverlay
RTS
;--------------------------------------------------------------------------------
;================================================================================ ;================================================================================
; Hash Key Display ; Hash Key Display

View File

@@ -2,7 +2,7 @@
; Does tile modification for... the pyramid of power hole ; Does tile modification for... the pyramid of power hole
; after Ganon slams into it in bat form? ; after Ganon slams into it in bat form?
Overworld_DrawPyramidHoleModified: Overworld_CreatePyramidHoleModified:
LDA.l InvertedMode : BNE + LDA.l InvertedMode : BNE +
BRL .originalBehaviour BRL .originalBehaviour
+ +
@@ -78,3 +78,18 @@ Overworld_DrawPyramidHoleModified:
LDA.b #$01 : STA $14 LDA.b #$01 : STA $14
RTL 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

View File

@@ -173,7 +173,7 @@ LDA #$04BB : STA $302C
STA $302E STA $302E
; CHECK IF AGAHNIM 2 IS DEAD AND WE HAVE ALREADY LANDED ; 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 #$046D : STA $243E
LDA #$0E3A : STA $24BC LDA #$0E3A : STA $24BC
LDA #$0E3B : STA $24BE LDA #$0E3B : STA $24BE