Merge branch 'DRUnstable' into DRVolatile

# Conflicts: # doorrando/bugfix/kholdstare_shell_collision.asm
2023-08-04 11:32:19 -06:00
parent 75545cf568 653f66e57a
commit 6a22218727
5 changed files with 91 additions and 32 deletions
--- a/doorrando/spiral.asm
+++ b/doorrando/spiral.asm
@@ -101,6 +101,11 @@ StairCleanup: {
    rts
 }

+LookupSpiralOffset_long:
+    PHB : PHK : PLB
+    JSR LookupSpiralOffset
+    PLB : RTL
+
 ;Sets the offset in A
 LookupSpiralOffset: {
    ;where link currently is in $a2: quad in a8 & #$03