diff --git a/assets/ymls/jp/actors/blue_coin_switch.yml b/assets/ymls/jp/actors/blue_coin_switch.yml index 1c14a530..4060e4fa 100644 --- a/assets/ymls/jp/actors/blue_coin_switch.yml +++ b/assets/ymls/jp/actors/blue_coin_switch.yml @@ -55,3 +55,8 @@ blue_coin_switch_seg8_dl_08000E08: offset: 0xE08 symbol: blue_coin_switch_seg8_dl_08000E08 +blue_coin_switch_seg8_collision_08000E98: + type: SM64:COLLISION + offset: 0xE98 + symbol: blue_coin_switch_seg8_collision_08000E98 + diff --git a/assets/ymls/jp/actors/breakable_box.yml b/assets/ymls/jp/actors/breakable_box.yml index 9dcf96a0..12fd1e31 100644 --- a/assets/ymls/jp/actors/breakable_box.yml +++ b/assets/ymls/jp/actors/breakable_box.yml @@ -60,3 +60,8 @@ breakable_box_seg8_dl_08012D48: offset: 0x12D48 symbol: breakable_box_seg8_dl_08012D48 +breakable_box_seg8_collision_08012D70: + type: SM64:COLLISION + offset: 0x12D70 + symbol: breakable_box_seg8_collision_08012D70 + diff --git a/assets/ymls/jp/actors/cannon_lid.yml b/assets/ymls/jp/actors/cannon_lid.yml index d35a210a..6ad76c5b 100644 --- a/assets/ymls/jp/actors/cannon_lid.yml +++ b/assets/ymls/jp/actors/cannon_lid.yml @@ -36,3 +36,8 @@ cannon_lid_seg8_dl_080048E0: offset: 0x48E0 symbol: cannon_lid_seg8_dl_080048E0 +cannon_lid_seg8_collision_08004950: + type: SM64:COLLISION + offset: 0x4950 + symbol: cannon_lid_seg8_collision_08004950 + diff --git a/assets/ymls/jp/actors/capswitch.yml b/assets/ymls/jp/actors/capswitch.yml index 9c377411..8e9b9717 100644 --- a/assets/ymls/jp/actors/capswitch.yml +++ b/assets/ymls/jp/actors/capswitch.yml @@ -127,3 +127,13 @@ capswitch_seg5_dl_050033B0: offset: 0x33B0 symbol: capswitch_seg5_dl_050033B0 +capswitch_collision_050033D0: + type: SM64:COLLISION + offset: 0x33D0 + symbol: capswitch_collision_050033D0 + +capswitch_collision_05003448: + type: SM64:COLLISION + offset: 0x3448 + symbol: capswitch_collision_05003448 + diff --git a/assets/ymls/jp/actors/checkerboard_platform.yml b/assets/ymls/jp/actors/checkerboard_platform.yml index bd2e97aa..33654985 100644 --- a/assets/ymls/jp/actors/checkerboard_platform.yml +++ b/assets/ymls/jp/actors/checkerboard_platform.yml @@ -55,3 +55,8 @@ checkerboard_platform_seg8_dl_0800D680: offset: 0xD680 symbol: checkerboard_platform_seg8_dl_0800D680 +checkerboard_platform_seg8_collision_0800D710: + type: SM64:COLLISION + offset: 0xD710 + symbol: checkerboard_platform_seg8_collision_0800D710 + diff --git a/assets/ymls/jp/actors/dorrie.yml b/assets/ymls/jp/actors/dorrie.yml index 6f6a7764..c8757a56 100644 --- a/assets/ymls/jp/actors/dorrie.yml +++ b/assets/ymls/jp/actors/dorrie.yml @@ -387,3 +387,14 @@ dorrie_seg6_dl_0600DFA8: type: GFX offset: 0xDFA8 symbol: dorrie_seg6_dl_0600DFA8 + +dorrie_seg6_collision_0600F644: + type: SM64:COLLISION + offset: 0xF644 + symbol: dorrie_seg6_collision_0600F644 + +dorrie_seg6_collision_0600FBB8: + type: SM64:COLLISION + offset: 0xFBB8 + symbol: dorrie_seg6_collision_0600FBB8 + diff --git a/assets/ymls/jp/actors/exclamation_box_outline.yml b/assets/ymls/jp/actors/exclamation_box_outline.yml index eed3ba0f..2bf7aac8 100644 --- a/assets/ymls/jp/actors/exclamation_box_outline.yml +++ b/assets/ymls/jp/actors/exclamation_box_outline.yml @@ -136,3 +136,8 @@ exclamation_box_outline_seg8_dl_08025F08: type: GFX offset: 0x25F08 symbol: exclamation_box_outline_seg8_dl_08025F08 + +exclamation_box_outline_seg8_collision_08025F78: + type: SM64:COLLISION + offset: 0x25F78 + symbol: exclamation_box_outline_seg8_collision_08025F78 diff --git a/assets/ymls/jp/actors/metal_box.yml b/assets/ymls/jp/actors/metal_box.yml index 323515ce..5b9be29b 100644 --- a/assets/ymls/jp/actors/metal_box.yml +++ b/assets/ymls/jp/actors/metal_box.yml @@ -42,3 +42,8 @@ metal_box_dl: offset: 0x24BB8 symbol: metal_box_dl +metal_box_seg8_collision_08024C28: + type: SM64:COLLISION + offset: 0x24C28 + symbol: metal_box_seg8_collision_08024C28 + diff --git a/assets/ymls/jp/actors/penguin.yml b/assets/ymls/jp/actors/penguin.yml index 9232f34f..464a44b4 100644 --- a/assets/ymls/jp/actors/penguin.yml +++ b/assets/ymls/jp/actors/penguin.yml @@ -308,3 +308,8 @@ penguin_seg5_dl_05007540: offset: 0x7540 symbol: penguin_seg5_dl_05007540 +penguin_seg5_collision_05008B88: + type: SM64:COLLISION + offset: 0x8B88 + symbol: penguin_seg5_collision_05008B88 + diff --git a/assets/ymls/jp/actors/poundable_pole.yml b/assets/ymls/jp/actors/poundable_pole.yml index f849b0e0..5d0a71d6 100644 --- a/assets/ymls/jp/actors/poundable_pole.yml +++ b/assets/ymls/jp/actors/poundable_pole.yml @@ -67,3 +67,8 @@ poundable_pole_seg6_dl_06002410: offset: 0x2410 symbol: poundable_pole_seg6_dl_06002410 +poundable_pole_collision_06002490: + type: SM64:COLLISION + offset: 0x2490 + symbol: poundable_pole_collision_06002490 + diff --git a/assets/ymls/jp/actors/purple_switch.yml b/assets/ymls/jp/actors/purple_switch.yml index ba8e596e..dc0c9ab7 100644 --- a/assets/ymls/jp/actors/purple_switch.yml +++ b/assets/ymls/jp/actors/purple_switch.yml @@ -55,3 +55,8 @@ purple_switch_seg8_dl_0800C718: offset: 0xC718 symbol: purple_switch_seg8_dl_0800C718 +purple_switch_seg8_collision_0800C7A8: + type: SM64:COLLISION + offset: 0xC7A8 + symbol: purple_switch_seg8_collision_0800C7A8 + diff --git a/assets/ymls/jp/actors/springboard.yml b/assets/ymls/jp/actors/springboard.yml index f7b6d7a7..29ff7211 100644 --- a/assets/ymls/jp/actors/springboard.yml +++ b/assets/ymls/jp/actors/springboard.yml @@ -91,3 +91,8 @@ springboard_checkerboard_seg5_dl_05001900: offset: 0x1900 symbol: springboard_checkerboard_seg5_dl_05001900 +springboard_collision_05001A28: + type: SM64:COLLISION + offset: 0x1A28 + symbol: springboard_collision_05001A28 + diff --git a/assets/ymls/jp/actors/test_platform.yml b/assets/ymls/jp/actors/test_platform.yml index fcf5cfdf..3aa7ed91 100644 --- a/assets/ymls/jp/actors/test_platform.yml +++ b/assets/ymls/jp/actors/test_platform.yml @@ -34,3 +34,8 @@ unknown_seg8_dl_08026260: offset: 0x26260 symbol: unknown_seg8_dl_08026260 +unknown_seg8_collision_080262F8: + type: SM64:COLLISION + offset: 0x262F8 + symbol: unknown_seg8_collision_080262F8 + diff --git a/assets/ymls/jp/actors/thwomp.yml b/assets/ymls/jp/actors/thwomp.yml index e9ed4fb6..f7ccfa60 100644 --- a/assets/ymls/jp/actors/thwomp.yml +++ b/assets/ymls/jp/actors/thwomp.yml @@ -79,3 +79,13 @@ thwomp_seg5_dl_0500B750: offset: 0xB750 symbol: thwomp_seg5_dl_0500B750 +thwomp_seg5_collision_0500B7D0: + type: SM64:COLLISION + offset: 0xB7D0 + symbol: thwomp_seg5_collision_0500B7D0 + +thwomp_seg5_collision_0500B92C: + type: SM64:COLLISION + offset: 0xB92C + symbol: thwomp_seg5_collision_0500B92C + diff --git a/assets/ymls/jp/actors/warp_collision.yml b/assets/ymls/jp/actors/warp_collision.yml new file mode 100644 index 00000000..1379e03e --- /dev/null +++ b/assets/ymls/jp/actors/warp_collision.yml @@ -0,0 +1,17 @@ +:config: + autopads: false + compression: + offset: 0x1FF740 + segments: + - [0x03, 0x1FF740] + +door_seg3_collision_0301CE78: + type: SM64:COLLISION + offset: 0x1CE78 + symbol: door_seg3_collision_0301CE78 + +lll_hexagonal_mesh_seg3_collision_0301CECC: + type: SM64:COLLISION + offset: 0x1CECC + symbol: lll_hexagonal_mesh_seg3_collision_0301CECC + diff --git a/assets/ymls/jp/actors/warp_pipe.yml b/assets/ymls/jp/actors/warp_pipe.yml index f533cd95..fff125cb 100644 --- a/assets/ymls/jp/actors/warp_pipe.yml +++ b/assets/ymls/jp/actors/warp_pipe.yml @@ -107,3 +107,8 @@ warp_pipe_seg3_dl_03009A50: offset: 0x9A50 symbol: warp_pipe_seg3_dl_03009A50 +warp_pipe_seg3_collision_03009AC8: + type: SM64:COLLISION + offset: 0x9AC8 + symbol: warp_pipe_seg3_collision_03009AC8 + diff --git a/assets/ymls/jp/actors/whomp.yml b/assets/ymls/jp/actors/whomp.yml index 07e53995..a2733ee3 100644 --- a/assets/ymls/jp/actors/whomp.yml +++ b/assets/ymls/jp/actors/whomp.yml @@ -214,3 +214,8 @@ whomp_seg6_dl_06020038: offset: 0x20038 symbol: whomp_seg6_dl_06020038 +whomp_seg6_collision_06020A0C: + type: SM64:COLLISION + offset: 0x20A0C + symbol: whomp_seg6_collision_06020A0C + diff --git a/assets/ymls/jp/actors/wooden_signpost.yml b/assets/ymls/jp/actors/wooden_signpost.yml index 5e933875..54dd8b64 100644 --- a/assets/ymls/jp/actors/wooden_signpost.yml +++ b/assets/ymls/jp/actors/wooden_signpost.yml @@ -83,3 +83,8 @@ wooden_signpost_seg3_dl_0302DD08: offset: 0x2DD08 symbol: wooden_signpost_seg3_dl_0302DD08 +wooden_signpost_seg3_collision_0302DD80: + type: SM64:COLLISION + offset: 0x2DD80 + symbol: wooden_signpost_seg3_collision_0302DD80 + diff --git a/assets/ymls/us/actors/blue_coin_switch.yml b/assets/ymls/us/actors/blue_coin_switch.yml index 638f78e8..a7491bd3 100644 --- a/assets/ymls/us/actors/blue_coin_switch.yml +++ b/assets/ymls/us/actors/blue_coin_switch.yml @@ -55,3 +55,8 @@ blue_coin_switch_seg8_dl_08000E08: offset: 0xE08 symbol: blue_coin_switch_seg8_dl_08000E08 +blue_coin_switch_seg8_collision_08000E98: + type: SM64:COLLISION + offset: 0xE98 + symbol: blue_coin_switch_seg8_collision_08000E98 + diff --git a/assets/ymls/us/actors/breakable_box.yml b/assets/ymls/us/actors/breakable_box.yml index 49195305..25633a63 100644 --- a/assets/ymls/us/actors/breakable_box.yml +++ b/assets/ymls/us/actors/breakable_box.yml @@ -60,3 +60,8 @@ breakable_box_seg8_dl_08012D48: offset: 0x12D48 symbol: breakable_box_seg8_dl_08012D48 +breakable_box_seg8_collision_08012D70: + type: SM64:COLLISION + offset: 0x12D70 + symbol: breakable_box_seg8_collision_08012D70 + diff --git a/assets/ymls/us/actors/cannon_lid.yml b/assets/ymls/us/actors/cannon_lid.yml index 570f18ba..72ac9c60 100644 --- a/assets/ymls/us/actors/cannon_lid.yml +++ b/assets/ymls/us/actors/cannon_lid.yml @@ -36,3 +36,8 @@ cannon_lid_seg8_dl_080048E0: offset: 0x48E0 symbol: cannon_lid_seg8_dl_080048E0 +cannon_lid_seg8_collision_08004950: + type: SM64:COLLISION + offset: 0x4950 + symbol: cannon_lid_seg8_collision_08004950 + diff --git a/assets/ymls/us/actors/capswitch.yml b/assets/ymls/us/actors/capswitch.yml index 53d5c2ff..7f732430 100644 --- a/assets/ymls/us/actors/capswitch.yml +++ b/assets/ymls/us/actors/capswitch.yml @@ -127,3 +127,14 @@ capswitch_seg5_dl_050033B0: offset: 0x33B0 symbol: capswitch_seg5_dl_050033B0 +capswitch_collision_050033D0: + type: SM64:COLLISION + offset: 0x33D0 + symbol: capswitch_collision_050033D0 + +capswitch_collision_05003448: + type: SM64:COLLISION + offset: 0x3448 + symbol: capswitch_collision_05003448 + + diff --git a/assets/ymls/us/actors/checkerboard_platform.yml b/assets/ymls/us/actors/checkerboard_platform.yml index 40b4aa38..4fabfd82 100644 --- a/assets/ymls/us/actors/checkerboard_platform.yml +++ b/assets/ymls/us/actors/checkerboard_platform.yml @@ -55,3 +55,8 @@ checkerboard_platform_seg8_dl_0800D680: offset: 0xD680 symbol: checkerboard_platform_seg8_dl_0800D680 +checkerboard_platform_seg8_collision_0800D710: + type: SM64:COLLISION + offset: 0xD710 + symbol: checkerboard_platform_seg8_collision_0800D710 + diff --git a/assets/ymls/us/actors/dorrie.yml b/assets/ymls/us/actors/dorrie.yml index bf5e5b02..c845c55a 100644 --- a/assets/ymls/us/actors/dorrie.yml +++ b/assets/ymls/us/actors/dorrie.yml @@ -388,3 +388,13 @@ dorrie_seg6_dl_0600DFA8: offset: 0xDFA8 symbol: dorrie_seg6_dl_0600DFA8 +dorrie_seg6_collision_0600F644: + type: SM64:COLLISION + offset: 0xF644 + symbol: dorrie_seg6_collision_0600F644 + +dorrie_seg6_collision_0600FBB8: + type: SM64:COLLISION + offset: 0xFBB8 + symbol: dorrie_seg6_collision_0600FBB8 + diff --git a/assets/ymls/us/actors/exclamation_box_outline.yml b/assets/ymls/us/actors/exclamation_box_outline.yml index 447bdbc8..a0b546a4 100644 --- a/assets/ymls/us/actors/exclamation_box_outline.yml +++ b/assets/ymls/us/actors/exclamation_box_outline.yml @@ -137,3 +137,8 @@ exclamation_box_outline_seg8_dl_08025F08: offset: 0x25F08 symbol: exclamation_box_outline_seg8_dl_08025F08 +exclamation_box_outline_seg8_collision_08025F78: + type: SM64:COLLISION + offset: 0x25F78 + symbol: exclamation_box_outline_seg8_collision_08025F78 + diff --git a/assets/ymls/us/actors/metal_box.yml b/assets/ymls/us/actors/metal_box.yml index c80a87b8..6401f4dd 100644 --- a/assets/ymls/us/actors/metal_box.yml +++ b/assets/ymls/us/actors/metal_box.yml @@ -41,3 +41,8 @@ metal_box_dl: offset: 0x24BB8 symbol: metal_box_dl +metal_box_seg8_collision_08024C28: + type: SM64:COLLISION + offset: 0x24C28 + symbol: metal_box_seg8_collision_08024C28 + diff --git a/assets/ymls/us/actors/penguin.yml b/assets/ymls/us/actors/penguin.yml index b7591677..d1d4f86f 100644 --- a/assets/ymls/us/actors/penguin.yml +++ b/assets/ymls/us/actors/penguin.yml @@ -308,3 +308,8 @@ penguin_seg5_dl_05007540: offset: 0x7540 symbol: penguin_seg5_dl_05007540 +penguin_seg5_collision_05008B88: + type: SM64:COLLISION + offset: 0x8B88 + symbol: penguin_seg5_collision_05008B88 + diff --git a/assets/ymls/us/actors/poundable_pole.yml b/assets/ymls/us/actors/poundable_pole.yml index 7e6b0c94..e8392f96 100644 --- a/assets/ymls/us/actors/poundable_pole.yml +++ b/assets/ymls/us/actors/poundable_pole.yml @@ -67,3 +67,8 @@ poundable_pole_seg6_dl_06002410: offset: 0x2410 symbol: poundable_pole_seg6_dl_06002410 +poundable_pole_collision_06002490: + type: SM64:COLLISION + offset: 0x2490 + symbol: poundable_pole_collision_06002490 + diff --git a/assets/ymls/us/actors/purple_switch.yml b/assets/ymls/us/actors/purple_switch.yml index 3df8ce46..ebc6a395 100644 --- a/assets/ymls/us/actors/purple_switch.yml +++ b/assets/ymls/us/actors/purple_switch.yml @@ -55,3 +55,8 @@ purple_switch_seg8_dl_0800C718: offset: 0xC718 symbol: purple_switch_seg8_dl_0800C718 +purple_switch_seg8_collision_0800C7A8: + type: SM64:COLLISION + offset: 0xC7A8 + symbol: purple_switch_seg8_collision_0800C7A8 + diff --git a/assets/ymls/us/actors/springboard.yml b/assets/ymls/us/actors/springboard.yml index ad69a5ea..71321846 100644 --- a/assets/ymls/us/actors/springboard.yml +++ b/assets/ymls/us/actors/springboard.yml @@ -91,3 +91,8 @@ springboard_checkerboard_seg5_dl_05001900: offset: 0x1900 symbol: springboard_checkerboard_seg5_dl_05001900 +springboard_collision_05001A28: + type: SM64:COLLISION + offset: 0x1A28 + symbol: springboard_collision_05001A28 + diff --git a/assets/ymls/us/actors/test_platform.yml b/assets/ymls/us/actors/test_platform.yml index 63c03b0e..804a4f97 100644 --- a/assets/ymls/us/actors/test_platform.yml +++ b/assets/ymls/us/actors/test_platform.yml @@ -34,3 +34,8 @@ unknown_seg8_dl_08026260: offset: 0x26260 symbol: unknown_seg8_dl_08026260 +unknown_seg8_collision_080262F8: + type: SM64:COLLISION + offset: 0x262F8 + symbol: unknown_seg8_collision_080262F8 + diff --git a/assets/ymls/us/actors/thwomp.yml b/assets/ymls/us/actors/thwomp.yml index 472d8974..a4e41e8f 100644 --- a/assets/ymls/us/actors/thwomp.yml +++ b/assets/ymls/us/actors/thwomp.yml @@ -79,3 +79,13 @@ thwomp_seg5_dl_0500B750: offset: 0xB750 symbol: thwomp_seg5_dl_0500B750 +thwomp_seg5_collision_0500B7D0: + type: SM64:COLLISION + offset: 0xB7D0 + symbol: thwomp_seg5_collision_0500B7D0 + +thwomp_seg5_collision_0500B92C: + type: SM64:COLLISION + offset: 0xB92C + symbol: thwomp_seg5_collision_0500B92C + diff --git a/assets/ymls/us/actors/warp_collision.yml b/assets/ymls/us/actors/warp_collision.yml new file mode 100644 index 00000000..d0a3da2f --- /dev/null +++ b/assets/ymls/us/actors/warp_collision.yml @@ -0,0 +1,17 @@ +:config: + autopads: false + compression: + offset: 0x201410 + segments: + - [0x03, 0x201410] + +door_seg3_collision_0301CE78: + type: SM64:COLLISION + offset: 0x1CE78 + symbol: door_seg3_collision_0301CE78 + +lll_hexagonal_mesh_seg3_collision_0301CECC: + type: SM64:COLLISION + offset: 0x1CECC + symbol: lll_hexagonal_mesh_seg3_collision_0301CECC + diff --git a/assets/ymls/us/actors/warp_pipe.yml b/assets/ymls/us/actors/warp_pipe.yml index 49d0a036..31086d58 100644 --- a/assets/ymls/us/actors/warp_pipe.yml +++ b/assets/ymls/us/actors/warp_pipe.yml @@ -107,3 +107,8 @@ warp_pipe_seg3_dl_03009A50: offset: 0x9A50 symbol: warp_pipe_seg3_dl_03009A50 +warp_pipe_seg3_collision_03009AC8: + type: SM64:COLLISION + offset: 0x9AC8 + symbol: warp_pipe_seg3_collision_03009AC8 + diff --git a/assets/ymls/us/actors/whomp.yml b/assets/ymls/us/actors/whomp.yml index 3471a161..1ce0f302 100644 --- a/assets/ymls/us/actors/whomp.yml +++ b/assets/ymls/us/actors/whomp.yml @@ -217,3 +217,8 @@ whomp_seg6_dl_06020038: offset: 0x20038 symbol: whomp_seg6_dl_06020038 +whomp_seg6_collision_06020A0C: + type: SM64:COLLISION + offset: 0x20A0C + symbol: whomp_seg6_collision_06020A0C + diff --git a/assets/ymls/us/actors/wooden_signpost.yml b/assets/ymls/us/actors/wooden_signpost.yml index 05b72204..caf60731 100644 --- a/assets/ymls/us/actors/wooden_signpost.yml +++ b/assets/ymls/us/actors/wooden_signpost.yml @@ -83,3 +83,8 @@ wooden_signpost_seg3_dl_0302DD08: offset: 0x2DD08 symbol: wooden_signpost_seg3_dl_0302DD08 +wooden_signpost_seg3_collision_0302DD80: + type: SM64:COLLISION + offset: 0x2DD80 + symbol: wooden_signpost_seg3_collision_0302DD80 +