Fix pottery to retain gfx during map check

2023-04-16 04:34:55 -05:00
parent bd2ebd7827
commit 3d9b76eda0
3 changed files with 15 additions and 0 deletions
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -500,6 +500,9 @@ Attract_DecompressStoryGfx:
 org $00E529
 LoadSelectScreenGfx:

+org $00E784
+LoadCommonSprites_in_file_select:
+
 org $00F945
 PrepDungeonExit:

--- a/doorrando/drhooks.asm
+++ b/doorrando/drhooks.asm
@@ -222,3 +222,7 @@ JSL AlwaysPushThroughFDoors
 ; JSL FixOvalFadeOutMirror : NOP #2 ; LDA $7EF3CA : BNE $05AFDF
 ; org $85AFDF
 ; Sprite_6C_MirrorPortal_missing_mirror:
+
+org $80E766
+JML ConditionalLoadCommonSprites_Do3To4Low : NOP #2
+LoadCommonSprites_Prep3To4Low:
--- a/keydrop/standing_items.asm
+++ b/keydrop/standing_items.asm
@@ -618,6 +618,14 @@ SetTheSceneFix:
 	JSL LoadCommonSprites_long
 RTL

+ConditionalLoadCommonSprites_Do3To4Low:
+	LDA.b $10 : CMP.b #$01 : BEQ + ; what we wrote over
+	CMP.b #$0E : BEQ ++
+		JML LoadCommonSprites_Prep3To4Low
+	+ JML LoadCommonSprites_in_file_select
++ LDA.b #$50 : STA.w $2117 ; skip over some DMA bytes
+JML Sound_LoadLightWorldSongBank-1 ; just some RTS in Bank 00
+
 incsrc dynamic_si_vram.asm

 ;===================================================================================================