izzy/Ghostship
0
0
Fork 0
mirror of https://github.com/izzy2lost/Ghostship.git synced 2026-06-19 01:17:03 -07:00
Code Issues Packages Projects Releases Wiki Activity

HMC collision, macros, and trajectories added.

Browse Source
This commit is contained in:
Malkierian
2024-06-10 17:20:12 -06:00
committed by Lywx
parent 78881d07ab
commit 6a05a30da4
54 changed files with 731 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
assets/ymls/jp/levels/bbh.yml
+5
View File
@@ -3521,3 +3521,8 @@ bbh_seg7_collision_coffin:
type: SM64:COLLISION
offset: 0x26D18
symbol: bbh_seg7_collision_coffin
bbh_seg7_macro_objs:
type: SM64:MACRO
offset: 0x268C4
symbol: bbh_seg7_macro_objs
assets/ymls/jp/levels/bitdw.yml
+5
View File
@@ -1412,3 +1412,8 @@ bitdw_seg7_collision_0700FD9C:
offset: 0xFD9C
symbol: bitdw_seg7_collision_0700FD9C
bitdw_seg7_macro_objs:
type: SM64:MACRO
offset: 0xF438
symbol: bitdw_seg7_macro_objs
assets/ymls/jp/levels/bitfs.yml
+10
View File
@@ -1897,3 +1897,13 @@ bitfs_seg7_collision_07015928:
offset: 0x15928
symbol: bitfs_seg7_collision_07015928
bitfs_seg7_trajectory_070159AC:
type: SM64:TRAJECTORY
offset: 0x159AC
symbol: bitfs_seg7_trajectory_070159AC
bitfs_seg7_macro_objs:
type: SM64:MACRO
offset: 0x14F90
symbol: bitfs_seg7_macro_objs
assets/ymls/jp/levels/bits.yml
+5
View File
@@ -2260,3 +2260,8 @@ bits_seg7_collision_0701B734:
offset: 0x1B734
symbol: bits_seg7_collision_0701B734
bits_seg7_macro_objs:
type: SM64:MACRO
offset: 0x1A76C
symbol: bits_seg7_macro_objs
assets/ymls/jp/levels/bob.yml
+20
View File
@@ -1253,3 +1253,23 @@ bob_seg7_collision_gate:
offset: 0x11474
symbol: bob_seg7_collision_gate
bob_seg7_metal_ball_path0:
type: SM64:TRAJECTORY
offset: 0x11530
symbol: bob_seg7_metal_ball_path0
bob_seg7_metal_ball_path1:
type: SM64:TRAJECTORY
offset: 0x115C4
symbol: bob_seg7_metal_ball_path1
bob_seg7_trajectory_koopa:
type: SM64:TRAJECTORY
offset: 0x116A0
symbol: bob_seg7_trajectory_koopa
bob_seg7_macro_objs:
type: SM64:MACRO
offset: 0x1104C
symbol: bob_seg7_macro_objs
assets/ymls/jp/levels/castle_courtyard.yml
+5
View File
@@ -570,3 +570,8 @@ castle_courtyard_seg7_collision_level:
offset: 0x59A8
symbol: castle_courtyard_seg7_collision_level
castle_courtyard_seg7_macro_objs:
type: SM64:MACRO
offset: 0x6E20
symbol: castle_courtyard_seg7_macro_objs
assets/ymls/jp/levels/castle_grounds.yml
+5
View File
@@ -1266,3 +1266,8 @@ castle_grounds_seg7_cannon_grill:
offset: 0x10E10
symbol: castle_grounds_seg7_cannon_grill
castle_grounds_seg7_macro_objs:
type: SM64:MACRO
offset: 0x10D08
symbol: castle_grounds_seg7_macro_objs
assets/ymls/jp/levels/castle_inside.yml
+72
View File
@@ -8121,3 +8121,75 @@ inside_castle_seg7_collision_water_level_pillar:
offset: 0x78E80
symbol: inside_castle_seg7_collision_water_level_pillar
inside_castle_seg7_trajectory_mips_0:
type: SM64:TRAJECTORY
offset: 0x78EF8
symbol: inside_castle_seg7_trajectory_mips_0
inside_castle_seg7_trajectory_mips_1:
type: SM64:TRAJECTORY
offset: 0x78F2C
symbol: inside_castle_seg7_trajectory_mips_1
inside_castle_seg7_trajectory_mips_2:
type: SM64:TRAJECTORY
offset: 0x78F68
symbol: inside_castle_seg7_trajectory_mips_2
inside_castle_seg7_trajectory_mips_3:
type: SM64:TRAJECTORY
offset: 0x78F7C
symbol: inside_castle_seg7_trajectory_mips_3
inside_castle_seg7_trajectory_mips_4:
type: SM64:TRAJECTORY
offset: 0x78FA8
symbol: inside_castle_seg7_trajectory_mips_4
inside_castle_seg7_trajectory_mips_5:
type: SM64:TRAJECTORY
offset: 0x78FD4
symbol: inside_castle_seg7_trajectory_mips_5
inside_castle_seg7_trajectory_mips_6:
type: SM64:TRAJECTORY
offset: 0x78FE8
symbol: inside_castle_seg7_trajectory_mips_6
inside_castle_seg7_trajectory_mips_7:
type: SM64:TRAJECTORY
offset: 0x79004
symbol: inside_castle_seg7_trajectory_mips_7
inside_castle_seg7_trajectory_mips_8:
type: SM64:TRAJECTORY
offset: 0x79020
symbol: inside_castle_seg7_trajectory_mips_8
inside_castle_seg7_trajectory_mips_9:
type: SM64:TRAJECTORY
offset: 0x79044
symbol: inside_castle_seg7_trajectory_mips_9
inside_castle_seg7_trajectory_mips:
type: ASSET_ARRAY
assetType: Trajectory
factoryType: SM64:TRAJECTORY
count: 10
offset: 0x79068
symbol: inside_castle_seg7_trajectory_mips
inside_castle_seg7_area_1_macro_objs:
type: SM64:MACRO
offset: 0x77764
symbol: inside_castle_seg7_area_1_macro_objs
inside_castle_seg7_area_2_macro_objs:
type: SM64:MACRO
offset: 0x777E0
symbol: inside_castle_seg7_area_2_macro_objs
inside_castle_seg7_area_3_macro_objs:
type: SM64:MACRO
offset: 0x777EC
symbol: inside_castle_seg7_area_3_macro_objs
assets/ymls/jp/levels/ccm.yml
+24
View File
@@ -2693,3 +2693,27 @@ ccm_seg7_area_2_collision:
offset: 0x20880
symbol: ccm_seg7_area_2_collision
ccm_seg7_trajectory_snowman:
type: SM64:TRAJECTORY
offset: 0x165A8
symbol: ccm_seg7_trajectory_snowman
ccm_seg7_trajectory_0701669C:
type: SM64:TRAJECTORY
offset: 0x1669C
symbol: ccm_seg7_trajectory_0701669C
ccm_seg7_trajectory_penguin_race:
type: SM64:TRAJECTORY
offset: 0x23604
symbol: ccm_seg7_trajectory_penguin_race
ccm_seg7_area_1_macro_objs:
type: SM64:MACRO
offset: 0x16284
symbol: ccm_seg7_area_1_macro_objs
ccm_seg7_area_2_macro_objs:
type: SM64:MACRO
offset: 0x23468
symbol: ccm_seg7_area_2_macro_objs
assets/ymls/jp/levels/cotmc.yml
+4
View File
@@ -755,3 +755,7 @@ cotmc_seg7_collision_level:
offset: 0xA508
symbol: cotmc_seg7_collision_level
cotmc_seg7_macro_objs:
type: SM64:MACRO
offset: 0xBD38
symbol: cotmc_seg7_macro_objs
assets/ymls/jp/levels/ddd.yml
+9
View File
@@ -1189,3 +1189,12 @@ ddd_seg7_collision_bowser_sub_door:
offset: 0xFC48
symbol: ddd_seg7_collision_bowser_sub_door
ddd_seg7_area_1_macro_objs:
type: SM64:MACRO
offset: 0xEEF4
symbol: ddd_seg7_area_1_macro_objs
ddd_seg7_area_2_macro_objs:
type: SM64:MACRO
offset: 0xEFAC
symbol: ddd_seg7_area_2_macro_objs
assets/ymls/jp/levels/hmc.yml
+35
View File
@@ -3260,3 +3260,38 @@ hmc_seg7_painting_dl_070254E0:
type: GFX
offset: 0x254E0
symbol: hmc_seg7_painting_dl_070254E0
hmc_seg7_collision_level:
type: SM64:COLLISION
offset: 0x25594
symbol: hmc_seg7_collision_level
hmc_seg7_collision_elevator:
type: SM64:COLLISION
offset: 0x2B5E4
symbol: hmc_seg7_collision_elevator
hmc_seg7_collision_0702B65C:
type: SM64:COLLISION
offset: 0x2B65C
symbol: hmc_seg7_collision_0702B65C
hmc_seg7_collision_controllable_platform:
type: SM64:COLLISION
offset: 0x2B6E0
symbol: hmc_seg7_collision_controllable_platform
hmc_seg7_collision_controllable_platform_sub:
type: SM64:COLLISION
offset: 0x2B7F4
symbol: hmc_seg7_collision_controllable_platform_sub
hmc_seg7_trajectory_0702B86C:
type: SM64:TRAJECTORY
offset: 0x2B86C
symbol: hmc_seg7_trajectory_0702B86C
hmc_seg7_macro_objs:
type: SM64:MACRO
offset: 0x2AA78
symbol: hmc_seg7_macro_objs
assets/ymls/jp/levels/jrb.yml
+19
View File
@@ -1510,3 +1510,22 @@ jrb_seg7_area_2_collision:
offset: 0x105B8
symbol: jrb_seg7_area_2_collision
jrb_seg7_trajectory_unagi_1:
type: SM64:TRAJECTORY
offset: 0xD20C
symbol: jrb_seg7_trajectory_unagi_1
jrb_seg7_trajectory_unagi_2:
type: SM64:TRAJECTORY
offset: 0xD240
symbol: jrb_seg7_trajectory_unagi_2
jrb_seg7_area_1_macro_objs:
type: SM64:MACRO
offset: 0xC4E8
symbol: jrb_seg7_area_1_macro_objs
jrb_seg7_area_2_macro_objs:
type: SM64:MACRO
offset: 0x11370
symbol: jrb_seg7_area_2_macro_objs
assets/ymls/jp/levels/lll.yml
+19
View File
@@ -2624,3 +2624,22 @@ lll_seg7_collision_falling_wall:
offset: 0x284DC
symbol: lll_seg7_collision_falling_wall
lll_seg7_trajectory_0702856C:
type: SM64:TRAJECTORY
offset: 0x2856C
symbol: lll_seg7_trajectory_0702856C
lll_seg7_trajectory_07028660:
type: SM64:TRAJECTORY
offset: 0x28660
symbol: lll_seg7_trajectory_07028660
lll_seg7_area_1_macro_objs:
type: SM64:MACRO
offset: 0x1CE18
symbol: lll_seg7_area_1_macro_objs
lll_seg7_area_2_macro_objs:
type: SM64:MACRO
offset: 0x283D4
symbol: lll_seg7_area_2_macro_objs
assets/ymls/jp/levels/pss.yml
+4
View File
@@ -1155,3 +1155,7 @@ pss_seg7_collision:
offset: 0xE490
symbol: pss_seg7_collision
pss_seg7_macro_objs:
type: SM64:MACRO
offset: 0x10F00
symbol: pss_seg7_macro_objs
assets/ymls/jp/levels/rr.yml
+24
View File
@@ -3853,3 +3853,27 @@ rr_seg7_collision_level:
offset: 0x2A9A8
symbol: rr_seg7_collision_level
rr_seg7_trajectory_0702EC3C:
type: SM64:TRAJECTORY
offset: 0x2EC3C
symbol: rr_seg7_trajectory_0702EC3C
rr_seg7_trajectory_0702ECC0:
type: SM64:TRAJECTORY
offset: 0x2ECC0
symbol: rr_seg7_trajectory_0702ECC0
rr_seg7_trajectory_0702ED9C:
type: SM64:TRAJECTORY
offset: 0x2ED9C
symbol: rr_seg7_trajectory_0702ED9C
rr_seg7_trajectory_0702EEE0:
type: SM64:TRAJECTORY
offset: 0x2EEE0
symbol: rr_seg7_trajectory_0702EEE0
rr_seg7_macro_objs:
type: SM64:MACRO
offset: 0x2E9D8
symbol: rr_seg7_macro_objs
assets/ymls/jp/levels/sa.yml
+4
View File
@@ -280,3 +280,7 @@ sa_seg7_collision:
offset: 0x3000
symbol: bbh_seg7_collision
sa_seg7_macro_objs:
type: SM64:MACRO
offset: 0x3284
symbol: sa_seg7_macro_objs
assets/ymls/jp/levels/sl.yml
+9
View File
@@ -1203,3 +1203,12 @@ sl_seg7_area_2_collision:
offset: 0xEFFC
symbol: sl_seg7_area_2_collision
sl_seg7_area_1_macro_objs:
type: SM64:MACRO
offset: 0xED94
symbol: sl_seg7_area_1_macro_objs
sl_seg7_area_2_macro_objs:
type: SM64:MACRO
offset: 0xF978
symbol: sl_seg7_area_2_macro_objs
assets/ymls/jp/levels/ssl.yml
+14
View File
@@ -2587,3 +2587,17 @@ ssl_seg7_collision_070284B0:
offset: 0x284B0
symbol: ssl_seg7_collision_070284B0
ssl_seg7_area_1_macro_objs:
type: SM64:MACRO
offset: 0x12424
symbol: ssl_seg7_area_1_macro_objs
ssl_seg7_area_2_macro_objs:
type: SM64:MACRO
offset: 0x27CD4
symbol: ssl_seg7_area_2_macro_objs
ssl_seg7_area_3_macro_objs:
type: SM64:MACRO
offset: 0x27ECC
symbol: ssl_seg7_area_3_macro_objs
assets/ymls/jp/levels/thi.yml
+19
View File
@@ -1130,3 +1130,22 @@ thi_seg7_collision_top_trap:
offset: 0xE228
symbol: thi_seg7_collision_top_trap
thi_seg7_trajectory_koopa:
type: SM64:TRAJECTORY
offset: 0xE258
symbol: thi_seg7_trajectory_koopa
thi_seg7_area_1_macro_objs:
type: SM64:MACRO
offset: 0xDD50
symbol: thi_seg7_area_1_macro_objs
thi_seg7_area_2_macro_objs:
type: SM64:MACRO
offset: 0xDEE4
symbol: thi_seg7_area_2_macro_objs
thi_seg7_area_3_macro_objs:
type: SM64:MACRO
offset: 0xE190
symbol: thi_seg7_area_3_macro_objs

Some files were not shown because too many files have changed in this diff Show More