Merge branch 'master' into NewMinecart

2025-02-11 18:37:42 -07:00
parent 3b12b9f596 a1c9c8c8d5
commit dcc7e6fe08
98 changed files with 4641 additions and 3961 deletions
--- a/Sprites/NPCs/followers.asm
+++ b/Sprites/NPCs/followers.asm
@@ -1020,12 +1020,42 @@ LinkState_Minecart:
  db -1,   0,   0,   0
 }

+
+TileBehavior_TL_Long:
+{
+  LDA.w !MinecartDirection : CMP.b #East : BNE +
+
+  +
+  CMP.b #West
+
+  RTL
+}
+
+TileBehavior_StopLeft_Long:
+{
+  ; Transition back to sprite, put link in state default
+  LDA.w !LinkInCart : BEQ +
+    JSL MinecartFollower_TransitionToSprite
+    STZ.w LinkState
+    STZ.w !LinkInCart
+  +
+  RTL
+}
+
 pushpc

 org $07A5F7
  JSL LinkState_Minecart
  RTS

+TileBehavior_TL:
+  JSL TileBehavior_TL_Long
+  RTS
+
+TileBehavior_StopLeft:
+  JSL TileBehavior_StopLeft_Long
+  RTS
+
 assert pc() <= $07A64B

 ; Minecart Track tile types