From 0b9854938824c6f6f5014c0a66fab8fa807968d7 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 29 Jun 2024 17:42:23 -0400 Subject: [PATCH] swap maku tree and hall of secrets progress bits --- Overworld/overworld.asm | 4 ++-- Sprites/NPCs/impa.asm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Overworld/overworld.asm b/Overworld/overworld.asm index 05ec8f5..1aa1925 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 $7EF3D6 : CMP.b #$04 : BCS .has_pearl + LDA.l $7EF3D6 : CMP.b #$02 : 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 $7EF3D6 : CMP.b #$02 + LDA.l $7EF3D6 : CMP.b #$04 pullpc diff --git a/Sprites/NPCs/impa.asm b/Sprites/NPCs/impa.asm index 30477a8..6b41ef0 100644 --- a/Sprites/NPCs/impa.asm +++ b/Sprites/NPCs/impa.asm @@ -18,7 +18,7 @@ PROGLITE = $7EF3C6 ; 0x06 - Old man home SPAWNPT = $7EF3C8 -; .... m.h. +; .... h.m. ; h - hall of secrets ; m - maku tree OOSPROG = $7EF3D6 @@ -27,7 +27,7 @@ OOSPROG = $7EF3D6 Impa_SetSpawnPointFlag: { STA.l $7EF372 - LDA.l $7EF3D6 : ORA.b #$02 : STA.l $7EF3D6 + LDA.l $7EF3D6 : ORA.b #$04 : STA.l $7EF3D6 RTL }