From 50918c11cc580e0fe489f1d558e3090e420a2707 Mon Sep 17 00:00:00 2001 From: scawful Date: Sat, 29 Jun 2024 10:12:24 -0400 Subject: [PATCH] move Module05_LoadFile hooks to overworld.asm --- Overworld/overworld.asm | 10 ++++++++++ Sprites/NPCs/impa.asm | 5 ----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Overworld/overworld.asm b/Overworld/overworld.asm index 642bf3c..ecbe3e1 100644 --- a/Overworld/overworld.asm +++ b/Overworld/overworld.asm @@ -75,9 +75,19 @@ LoadDarkWorldIntro: } pushpc +; Module05_LoadFile org $028192 JSL LoadDarkWorldIntro +; Module05_LoadFile +; Check for goldstar instead of mirror for mountain spawn option +org $0281E2 + LDA.l $7EF342 : CMP.b #$02 + +; Check for hall of secrets spawn pt flag +org $0281CD + LDA.l $7EF3CB : CMP.b #$02 + pullpc LoadOverworldPitAreas: diff --git a/Sprites/NPCs/impa.asm b/Sprites/NPCs/impa.asm index 846b983..b233e0b 100644 --- a/Sprites/NPCs/impa.asm +++ b/Sprites/NPCs/impa.asm @@ -32,11 +32,6 @@ Impa_SetSpawnPointFlag: pushpc -; Check for hall of secrets spawn pt flag -org $0281CD - LDA.l $7EF3CB - CMP.b #$02 - ; Zelda_AtSanctuary org $05EE46 JSL Impa_SetSpawnPointFlag