Merge pull request #154 from cassidoxa/starting_area_exit

Fix reading starting area offset to prevent indexing out of bounds
2022-01-20 02:33:52 -06:00
parent df27e07221 1d378211ba
commit 02ed70442d
1 changed files with 3 additions and 3 deletions
--- a/entrances.asm
+++ b/entrances.asm
@@ -80,8 +80,8 @@ AllowStartFromSingleEntranceCave:
 	LDA $7EF3C8 : 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