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/doorrando/dr_lobby.asm
+++ b/doorrando/dr_lobby.asm
@@ -13,6 +13,9 @@ PHP

 SetDefaultWorld:
 PHP : SEP #$20
+LDA.l FollowerIndicator : CMP #$04 : BNE .default
+	LDA.l OldManRetrievalWorld : BRA +
+.default
 LDA.l InvertedMode : BEQ +
 	LDA.b #$40
 + STA CurrentWorld