scawful/oracle-of-secrets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Minecart Track tile type behavior to followers.asm

Browse Source
This commit is contained in:
scawful
2024-12-10 20:15:27 -05:00
parent c5c8edb8dc
commit cbfe459820
2 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Dungeons/Objects/object_handler.asm
View File

@@ -5,23 +5,6 @@ TileBehavior_Nothing = $07DC54
TileBehavior_Pit = $07DC8B TileBehavior_Pit = $07DC8B
TileBehavior_Door = $07DD0A TileBehavior_Door = $07DD0A
; Minecart Track tile types
org $07D938
dw TileBehavior_Nothing ; 0xB0 UW LR
dw TileBehavior_Nothing ; 0xB1 UW UD
dw TileBehavior_Nothing ; 0xB2 UW TL
dw TileBehavior_Nothing ; 0xB3 UW BL
dw TileBehavior_Nothing ; 0xB4 UW TR
dw TileBehavior_Nothing ; 0xB5 UW BR
dw TileBehavior_Nothing ; 0xB6 UW Any
dw TileBehavior_Nothing ; 0xB7 UW Stop Top
dw TileBehavior_Nothing ; 0xB8 UW Stop Bottom
dw TileBehavior_Nothing ; 0xB9 UW Stop Left
dw TileBehavior_Nothing ; 0xBA UW Stop Right
dw TileBehavior_Pit ; 0xBB UW Pit LR
dw TileBehavior_Pit ; 0xBC UW Pit UD
dw TileBehavior_Pit ; 0xBD UW Any
org $018262 ; Object ID 0x31 org $018262 ; Object ID 0x31
dw ExpandedObject dw ExpandedObject

19
Sprites/NPCs/followers.asm
View File

@@ -939,7 +939,7 @@ CheckForFollowerIntraroomTransition:
RTL RTL
} }
; 0x08 ; 0x09
LinkState_Minecart: LinkState_Minecart:
{ {
PHB : PHK : PLB PHB : PHK : PLB
@@ -1009,6 +1009,23 @@ org $07A5F7
assert pc() <= $07A64B assert pc() <= $07A64B
; Minecart Track tile types
org $07D938
dw TileBehavior_Nothing ; 0xB0 UW LR
dw TileBehavior_Nothing ; 0xB1 UW UD
dw TileBehavior_Nothing ; 0xB2 UW TL
dw TileBehavior_Nothing ; 0xB3 UW BL
dw TileBehavior_Nothing ; 0xB4 UW TR
dw TileBehavior_Nothing ; 0xB5 UW BR
dw TileBehavior_Nothing ; 0xB6 UW Any
dw TileBehavior_Nothing ; 0xB7 UW Stop Top
dw TileBehavior_Nothing ; 0xB8 UW Stop Bottom
dw TileBehavior_Nothing ; 0xB9 UW Stop Left
dw TileBehavior_Nothing ; 0xBA UW Stop Right
dw TileBehavior_Nothing ; TileBehavior_Pit ; 0xBB UW Pit LR
dw TileBehavior_Nothing ; TileBehavior_Pit ; 0xBC UW Pit UD
dw TileBehavior_Nothing ; TileBehavior_Pit ; 0xBD UW Any
; Follower_OldManUnused ; Follower_OldManUnused
org $09A41F org $09A41F
JSL CheckForMinecartFollowerDraw JSL CheckForMinecartFollowerDraw