From 5154c8be3e627999c891686167617ac759146972 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 29 Jun 2024 15:45:38 -0400 Subject: [PATCH] change OOSPROG sram, interferes with LW/DW flag --- Overworld/overworld.asm | 4 ++-- Sprites/NPCs/followers.asm | 5 ----- Sprites/NPCs/impa.asm | 4 ++-- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Overworld/overworld.asm b/Overworld/overworld.asm index 41d4284..05ec8f5 100644 --- a/Overworld/overworld.asm +++ b/Overworld/overworld.asm @@ -64,7 +64,7 @@ LoadDarkWorldIntro: { LDA.l $7EF3C5 : CMP.b #$02 : BNE .continue ; Check for maku tree progress flag - LDA.l $7EF3CB : CMP.b #$04 : BCS .has_pearl + LDA.l $7EF3D6 : CMP.b #$04 : BCS .has_pearl STZ.w $1B LDA.b #$40 : STA.l $7EF3CA RTL @@ -86,7 +86,7 @@ org $0281E2 ; Check for hall of secrets spawn pt flag org $0281CD - LDA.l $7EF3CB : CMP.b #$02 + LDA.l $7EF3D6 : CMP.b #$02 pullpc diff --git a/Sprites/NPCs/followers.asm b/Sprites/NPCs/followers.asm index c338f84..2be7917 100644 --- a/Sprites/NPCs/followers.asm +++ b/Sprites/NPCs/followers.asm @@ -33,11 +33,6 @@ org $1BBD3C org $02D98B CMP.w #$02 -; Module05_LoadFile -; Check for goldstar instead of mirror for mountain spawn option -org $0281E2 - LDA.l $7EF342 : CMP.b #$02 - org $1EE8F1 SpritePrep_OldMan: { diff --git a/Sprites/NPCs/impa.asm b/Sprites/NPCs/impa.asm index d49eb88..30477a8 100644 --- a/Sprites/NPCs/impa.asm +++ b/Sprites/NPCs/impa.asm @@ -21,13 +21,13 @@ SPAWNPT = $7EF3C8 ; .... m.h. ; h - hall of secrets ; m - maku tree -OOSPROG = $7EF3CB +OOSPROG = $7EF3D6 ; set spawn point flag for hall of secrets by impa Impa_SetSpawnPointFlag: { STA.l $7EF372 - LDA.l $7EF3CB : ORA.b #$02 : STA.l $7EF3CB + LDA.l $7EF3D6 : ORA.b #$02 : STA.l $7EF3D6 RTL }