Merge branch 'master' into DRMain

# Conflicts:
#	tables.asm
This commit is contained in:
aerinon
2022-01-05 14:26:48 -07:00
11 changed files with 180 additions and 212 deletions

View File

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