From e139f2a8d5f3f95e73062074214696c9a17a966f Mon Sep 17 00:00:00 2001 From: scawful Date: Thu, 4 Jul 2024 13:43:13 -0400 Subject: [PATCH] add minecart tracks with pit behavior --- .../Collision/CollisionTablesExpanded.asm | 8 +++--- Dungeons/Objects/object_handler.asm | 28 +++++++++---------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/Dungeons/Collision/CollisionTablesExpanded.asm b/Dungeons/Collision/CollisionTablesExpanded.asm index f120068..b0d5765 100644 --- a/Dungeons/Collision/CollisionTablesExpanded.asm +++ b/Dungeons/Collision/CollisionTablesExpanded.asm @@ -149,10 +149,10 @@ group04: ; 00 01 02 03 04 05 06 07 08 09 0A 0B 0C 0D 0E 0F ; 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 ; ----------------------------------------------------------------------------------- - db $00, $00, $02, $02, $B6, $B6, $02, $02, $02, $02, $02, $01, $01, $01, $01, $01 - db $00, $00, $02, $02, $00, $00, $00, $00, $B0, $B0, $02, $01, $01, $01, $01, $01 - db $00, $00, $00, $00, $00, $00, $00, $00, $B0, $B0, $02, $02, $02, $02, $02, $02 - db $00, $00, $22, $00, $B1, $B1, $B1, $B1, $B1, $B1, $02, $02, $02, $02, $02, $02 + db $00, $00, $02, $02, $B6, $BD, $02, $02, $02, $02, $02, $01, $01, $01, $01, $01 + db $00, $00, $02, $02, $00, $00, $00, $00, $BB, $BB, $02, $01, $01, $01, $01, $01 + db $00, $00, $00, $00, $00, $00, $00, $00, $BB, $BB, $02, $02, $02, $02, $02, $02 + db $00, $00, $22, $00, $B1, $B1, $BC, $BC, $BC, $BC, $02, $02, $02, $02, $02, $02 db $01, $01, $01, $01, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 db $01, $01, $01, $01, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02, $02 diff --git a/Dungeons/Objects/object_handler.asm b/Dungeons/Objects/object_handler.asm index 24a2ba7..899aa70 100644 --- a/Dungeons/Objects/object_handler.asm +++ b/Dungeons/Objects/object_handler.asm @@ -19,20 +19,20 @@ TileBehavior_Pit = $07DA6A ; Minecart Track tile types org $07D938 -#_07D938: dw TileBehavior_Nothing ; 0xB0 UW -#_07D93A: dw TileBehavior_Nothing ; 0xB1 UW -#_07D93C: dw TileBehavior_Nothing ; 0xB2 UW -#_07D93E: dw TileBehavior_Nothing ; 0xB3 UW -#_07D940: dw TileBehavior_Nothing ; 0xB4 UW -#_07D942: dw TileBehavior_Nothing ; 0xB5 UW -#_07D944: dw TileBehavior_Nothing ; 0xB6 UW -#_07D946: dw TileBehavior_Nothing ; 0xB7 UW -#_07D948: dw TileBehavior_Nothing ; 0xB8 UW -#_07D94A: dw TileBehavior_Nothing ; 0xB9 UW -#_07D94C: dw TileBehavior_Nothing ; 0xBA UW -#_07D94E: dw TileBehavior_Nothing ; 0xBB UW -#_07D950: dw TileBehavior_Nothing ; 0xBC UW -#_07D952: dw TileBehavior_Nothing +#_07D938: dw TileBehavior_Nothing ; 0xB0 UW LR +#_07D93A: dw TileBehavior_Nothing ; 0xB1 UW UD +#_07D93C: dw TileBehavior_Nothing ; 0xB2 UW TL +#_07D93E: dw TileBehavior_Nothing ; 0xB3 UW BL +#_07D940: dw TileBehavior_Nothing ; 0xB4 UW TR +#_07D942: dw TileBehavior_Nothing ; 0xB5 UW BR +#_07D944: dw TileBehavior_Nothing ; 0xB6 UW Any +#_07D946: dw TileBehavior_Nothing ; 0xB7 UW Stop Top +#_07D948: dw TileBehavior_Nothing ; 0xB8 UW Stop Bottom +#_07D94A: dw TileBehavior_Nothing ; 0xB9 UW Stop Left +#_07D94C: dw TileBehavior_Nothing ; 0xBA UW Stop Right +#_07D94E: dw TileBehavior_Pit ; 0xBB UW Pit LR +#_07D950: dw TileBehavior_Pit ; 0xBC UW Pit UD +#_07D952: dw TileBehavior_Pit ; 0xBD UW Any ; Bank01 Free Space org $01B53C