Merge branch 'master' into sram

2022-01-20 11:16:31 -05:00
parent 6c4acb1e5b 02ed70442d
commit b91ac58b47
7 changed files with 41 additions and 9 deletions
--- a/entrances.asm
+++ b/entrances.asm
@@ -80,8 +80,8 @@ AllowStartFromSingleEntranceCave:
 	LDA StartingEntrance : AND.w #$00FF ; What we wrote over
 	PHA
 		TAX
-
 		LDA.l StartingAreaExitOffset, X
+                AND.w #$00FF

 		BNE +
 			JMP .done
@@ -124,10 +124,10 @@ AllowStartFromSingleEntranceCave:
 		STZ $0699 ;zero out door overlays in case starting overworld door is not set

 		SEP #$20 ; set 8-bit accumulator
-		LDX $00
+		LDA $7EF3C8 : TAX
 		LDA.l StartingAreaOverworldDoor, X : STA.l $7F5099 ;Load overworld door
-
 		REP #$20 ; reset 16-bit accumulator
+                JSL.l CacheDoorFrameData

 		.done
 	PLA