Merge branch 'OWMain' into overworld_kara

2024-02-28 16:29:01 -06:00
parent 63f0f8002f 3b3a153ebe
commit dacae98439
11 changed files with 332 additions and 264 deletions
--- a/darkworldspawn.asm
+++ b/darkworldspawn.asm
@@ -110,6 +110,15 @@ FakeWorldFix:
 	+
 RTL
 ;--------------------------------------------------------------------------------
+GetCurrentWorldForLoad:
+LDA FollowerIndicator : CMP #$04 : BNE .default
+	LDA InvertedMode : BEQ +
+		LDA #$40
+	+ RTL 
+.default
+LDA CurrentWorld
+RTL 
+;--------------------------------------------------------------------------------
 MasterSwordFollowerClear:
 	LDA FollowerIndicator
 	CMP #$0E : BNE .exit ; clear master sword follower