diff --git a/invertedmaps.asm b/invertedmaps.asm index d60cdcc..9098183 100644 --- a/invertedmaps.asm +++ b/invertedmaps.asm @@ -202,23 +202,6 @@ RTS map027: ;Castle map { -LDA #$0485 : STA $2424 -STA $2426 -LDA #$0454 : STA $24A4 -STA $24A6 -LDA #$0476 : STA $2522 -LDA #$0460 : STA $2524 -STA $2526 -LDA #$04D7 : STA $2528 -LDA #$04DD : STA $2624 -LDA #$04DE : STA $2626 -LDA #$04E0 : STA $26A4 -LDA #$04E1 : STA $26A6 -LDA #$04E4 : STA $2724 -LDA #$04E5 : STA $2726 -LDA #$0034 : STA $27A4 -STA $27A6 - ;Eye removed LDA #$046D : STA $243E STA $24BC @@ -282,58 +265,75 @@ LDA #$00DA : STA $302E LDA #$00E2 : STA $3030 +;removing original castle ledge drop +;LDA #$0485 : STA $2424 +;STA $2426 +;LDA #$0454 : STA $24A4 +;STA $24A6 +;LDA #$0476 : STA $2522 +;LDA #$0460 : STA $2524 +;STA $2526 +;LDA #$04D7 : STA $2528 -LDA #$0485 : STA $2424 -STA $2426 -LDA #$0454 : STA $24A4 -STA $24A6 -LDA #$0476 : STA $2522 -LDA #$0460 : STA $2524 -STA $2526 -LDA #$04D7 : STA $2528 -LDA #$04DD : STA $2624 -LDA #$04DE : STA $2626 -LDA #$04E0 : STA $26A4 -LDA #$04E1 : STA $26A6 -LDA #$04E4 : STA $2724 -LDA #$04E5 : STA $2726 -LDA #$0034 : STA $27A4 -STA $27A6 +;new Inverted Pyramid Entrance (Ganon Fall) +;LDA #$04DD : STA $2624 +;LDA #$04DE : STA $2626 +;LDA #$04E0 : STA $26A4 +;LDA #$04E1 : STA $26A6 +;LDA #$04E4 : STA $2724 +;LDA #$04E5 : STA $2726 +;LDA #$0034 : STA $27A4 +;STA $27A6 -LDA #$0486 : STA $26B0 -LDA #$0487 : STA $26B2 -LDA #$0454 : STA $272C -STA $272E -LDA #$048E : STA $2730 -LDA #$048F : STA $2732 -LDA #$04CA : STA $27AC -LDA #$045E : STA $27AE -LDA #$0494 : STA $27B0 -LDA #$0495 : STA $27B2 -LDA #$049E : STA $27B4 -LDA #$0499 : STA $282C -LDA #$0451 : STA $2830 -LDA #$0034 : STA $28AC -STA $28AE -STA $28B0 -LDA #$0454 : STA $274E -STA $2750 -LDA #$0608 : STA $2752 -LDA #$0459 : STA $27CE -STA $27D0 -LDA #$045E : STA $27D2 -LDA #$0451 : STA $284E -STA $2850 -STA $2852 -STA $282E -LDA #$0034 : STA $28CE -STA $28D0 -STA $28D2 +;adding new castle ledge drop +;LDA #$0486 : STA $26B0 +;LDA #$0487 : STA $26B2 +;LDA #$0454 : STA $272C +;STA $272E +;LDA #$048E : STA $2730 +;LDA #$048F : STA $2732 +;LDA #$04CA : STA $27AC +;LDA #$045E : STA $27AE +;LDA #$0494 : STA $27B0 +;LDA #$0495 : STA $27B2 +;LDA #$049E : STA $27B4 +;LDA #$0499 : STA $282C +;LDA #$0451 : STA $2830 +;LDA #$0034 : STA $28AC +;STA $28AE +;STA $28B0 +;removed right pillar to match removed left one +;LDA #$0454 : STA $274E +;STA $2750 +;LDA #$0608 : STA $2752 +;LDA #$0459 : STA $27CE +;STA $27D0 +;LDA #$045E : STA $27D2 +;LDA #$0451 : STA $284E +;STA $2850 +;STA $2852 +;STA $282E +;LDA #$0034 : STA $28CE +;STA $28D0 +;STA $28D2 + +;new HC door +LDA #$044F : STA $201C +LDA #$044F : STA $201E +LDA #$0455 : STA $209C +LDA #$0455 : STA $209E +LDA #$045A : STA $211A +LDA #$045B : STA $211C +LDA #$045C : STA $211E +LDA #$045D : STA $2120 +LDA #$0463 : STA $219A +LDA #$0464 : STA $219C +LDA #$0465 : STA $219E +LDA #$0466 : STA $21A0 ; CHECK IF AGAHNIM 2 IS DEAD AND WE HAVE ALREADY LANDED LDA $7EF2DB : AND #$0020 : BEQ .agahnim2Alive -LDA #$046D : STA $243E LDA #$0E3A : STA $24BC LDA #$0E3B : STA $24BE LDA #$0E3E : STA $253C diff --git a/sandbox.asm b/sandbox.asm index 29b3c37..e1fc576 100644 --- a/sandbox.asm +++ b/sandbox.asm @@ -340,22 +340,22 @@ org $1BD1DD : db #$A4, #$06, #$82, #$9E, #$06, #$82, #$FF, #$FF ;new data for ma ;;move pyramid exit overworld door org $1BB96F+$35+$35 : dw $001b -org $1BBA71+$35+$35 : dw $06a4 +org $1BBA71+$35+$35 : dw $011c org $1BBB73+$35 : db $36 org $02DAEE+$37+$37 : dw $0010 org $02DB8C+$37 : db $1B -org $02DBDB+$37+$37 : dw $0418 -org $02DC79+$37+$37 : dw $0679 -org $02DD17+$37+$37 : dw $06b4 -org $02DDB5+$37+$37 : dw $06c6 -org $02DE53+$37+$37 : dw $0728 -org $02DEF1+$37+$37 : dw $06e6 -org $02DF8F+$37+$37 : dw $0733 -org $02E02D+$37 : db $07 -org $02E07C+$37 : db $f9 +org $02DBDB+$37+$37 : dw $000e +org $02DC79+$37+$37 : dw $0600 +org $02DD17+$37+$37 : dw $0676 +org $02DDB5+$37+$37 : dw $0604 +org $02DE53+$37+$37 : dw $06e8 +org $02DEF1+$37+$37 : dw $066d +org $02DF8F+$37+$37 : dw $06f3 +org $02E02D+$37 : db $00 +org $02E07C+$37 : db $0a org $02E0CB+$37+$37 : dw $0000 -org $02E169+$37+$37 : dw $0000 +org $02E169+$37+$37 : dw $811c ;org $02E849 ; Fly 1 to Sanctuary