Merge branch 'master' into DRMain

# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
#	music.asm
This commit is contained in:
aerinon
2022-02-09 09:59:56 -07:00
9 changed files with 519 additions and 7 deletions

View File

@@ -214,3 +214,10 @@ FixJingleGlitch:
.exit
RTL
;--------------------------------------------------------------------------------
SetOverworldTransitionFlags:
LDA #$01
STA $0ABF ; used by witch
STA $021B ; used by race game
RTL