Merge branch 'DRUnstable' into DRVolatile

# Conflicts:
#	doorrando/bugfix/kholdstare_shell_collision.asm
This commit is contained in:
aerinon
2023-08-04 11:32:19 -06:00
5 changed files with 91 additions and 32 deletions

View File

@@ -614,14 +614,17 @@ Ancilla_ReceiveItem:
org $08C505
Ancilla_ReceiveItem_objectFinished:
org $08CE93
Ancilla_BreakTowerSeal_draw_single_crystal:
org $08CE2E
GTCutscene_AnimateCrystals_NoRotate:
org $08CEB6
GTCutscene_DrawSingleCrystal_SkipCrystal:
org $08CEC3
Ancilla_BreakTowerSeal_stop_spawning_sparkles:
GTCutscene_DrawSingleCrystal_SkipSparkle:
org $08CF59
BreakTowerSeal_ExecuteSparkles:
GTCutscene_SparkleALot:
org $08F710
Ancilla_SetOam_XY_Long: