diff --git a/events.asm b/events.asm index cad6942..c225943 100644 --- a/events.asm +++ b/events.asm @@ -154,13 +154,19 @@ OnNewFile: LDA.b #$80 : STA $7EF093 ; open skull woods curtain + - LDA.l PreopenPyramid : BEQ + - LDA.b #$20 : STA $7EF2DB ; pyramid hole already open - + + LDX.b #$7f : - ; copy over starting overworld event data + LDA StartingOverworldEvents, X : STA $7EF280, X + DEX + BPL - - LDA.l PreopenGanonsTower : BEQ + - LDA.b #$20 : STA $7EF2C3 ; Ganons Tower already open - + + ; below (indented) is obsoleted by StartingOverworldEvents table copy above + LDA.l PreopenPyramid : BEQ + + LDA.b #$20 : STA $7EF2DB ; pyramid hole already open + + + + LDA.l PreopenGanonsTower : BEQ + + LDA.b #$20 : STA $7EF2C3 ; Ganons Tower already open + + LDA StartingSword : STA $7EF359 ; set starting sword type diff --git a/tables.asm b/tables.asm index c521d22..28341d2 100644 --- a/tables.asm +++ b/tables.asm @@ -1623,6 +1623,17 @@ dw $0000, $0000, $0000, $0000, $0000, $0000, $1818, $FF00 dw $0000, $0000, $0000, $0000, $F800, $0000, $0000, $0000 dw $0000, $0000, $0000, $0000, $0000, $0000, $0000, $0000 dw $0000, $0000 + +org $30B080 ; PC 0x183080 - 0x1830FF +StartingOverworldEvents: +db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 +db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 +db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 +db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 +db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 +db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 +db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 +db $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00, $00 ;-------------------------------------------------------------------------------- ; 0x182355 - 183FFF (unused) ;================================================================================