Merge branch 'main' into kara

This commit is contained in:
2021-12-29 18:56:36 -08:00

View File

@@ -127,12 +127,12 @@ RTS
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
;Fix for SQ jumping causing accidental Exploration Glitch ; Fix for SQ jumping causing accidental Exploration Glitch
SQEGFix: SQEGFix:
LDA Bugfix_PodEG : BNE .done LDA.l Bugfix_PodEG : BEQ ++
STZ $047A ;disarm exploration glitch STZ.w $047A ; disarm exploration glitch
.done ++ RTL
RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
; Fix crystal not spawning when using somaria vs boss ; Fix crystal not spawning when using somaria vs boss
TryToSpawnCrystalUntilSuccess: TryToSpawnCrystalUntilSuccess: