diff --git a/dungeondrops.asm b/dungeondrops.asm index f02a519..5a4d741 100644 --- a/dungeondrops.asm +++ b/dungeondrops.asm @@ -450,3 +450,15 @@ ClearMultiworldText: + PLX : PLP RTL + +MaybeSkipCrystalCutsceneFollowerReset: +PHA + ; skip if prizes are shuffled outside of normal boss drops + LDA.l InventoryTable_properties+($37*2) : AND.b #$01 : BEQ .continue +.skip +PLA : PLA : PLA : PLA +JML CrystalCutscene_SpawnMaiden_PostFollowerGfx +.continue +PLA +STA.l FollowerIndicator ; what we wrote over +RTL diff --git a/hooks.asm b/hooks.asm index 4a54e76..4aadf44 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1820,6 +1820,9 @@ JML MaidenCrystalScript org $9ECCEB ; <- F4CEB - sprite_crystal_maiden.asm : 25 ; skip all palette nonsense BRA CrystalCutscene_Initialize_skip_palette ;-------------------------------------------------------------------------------- +org $9ECD97 +JSL MaybeSkipCrystalCutsceneFollowerReset +;-------------------------------------------------------------------------------- org $88C3FD ; <- 443FD - ancilla_receive_item.asm : 89 BRA + : NOP #4 : + ;-------------------------------------------------------------------------------- diff --git a/vanillalabels.asm b/vanillalabels.asm index 43d5238..39a9ef3 100644 --- a/vanillalabels.asm +++ b/vanillalabels.asm @@ -228,6 +228,7 @@ CopyDecompressedCharToTransferBuffer = $8EF5BC CopyDecompressedToFullBuffer = $8EF6A8 Trinexx_FinalPhase = $9DADB5 Trinexx_PreFinalPhase = $9DB0D2 +CrystalCutscene_SpawnMaiden_PostFollowerGfx = $9ECDA7 CrystalMaiden_KickOutOfDungeon = $9ECF35 GoldBee_Dormant_exit = $9EDE89 GoldBee_SpawnSelf = $9EDE8A