Skip to content

Commit b1f49ef

Browse files
stalechilibeansstalechilibeans
committed
bbh objects tweak
1 parent a84674b commit b1f49ef

2 files changed

Lines changed: 15 additions & 12 deletions

File tree

‎levels/bbh/areas/1/macro.inc.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
// 0x070268C4 - 0x07026A1A
22
const MacroObject bbh_seg7_macro_objs[] = {
3+
MACRO_OBJECT(/*preset*/ macro_yellow_coin_1, /*yaw*/ 0, /*pos*/-1760, 110, -770), // cannon coin right
4+
MACRO_OBJECT(/*preset*/ macro_yellow_coin_1, /*yaw*/ 0, /*pos*/-1760, 110, -440), // cannon coin middle
5+
MACRO_OBJECT(/*preset*/ macro_yellow_coin_1, /*yaw*/ 0, /*pos*/-1760, 110, -110), // cannon coin left
36
MACRO_OBJECT_END(),
47
};

‎levels/bbh/script.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ static const LevelScript script_func_local_1[] = {
2222
};
2323

2424
static const LevelScript script_func_local_2[] = {
25-
OBJECT(/*model*/ MODEL_MR_I, /*pos*/ 1705, -13, -1650, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvMrI),
26-
OBJECT(/*model*/ MODEL_MR_I, /*pos*/ -524, 0, -794, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvMrI),
25+
OBJECT(/*model*/ MODEL_MR_I, /*pos*/ 1705, 0, -1650, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvMrI),
26+
OBJECT(/*model*/ MODEL_MR_I, /*pos*/ -524, 0, -805, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvMrI),
2727
OBJECT(/*model*/ MODEL_MR_I, /*pos*/ -610, 0, -571, 0, -125, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvMrI),
2828
OBJECT(/*model*/ MODEL_MR_I, /*pos*/ -710, 0, -366, 0, -90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvMrI),
2929
OBJECT(/*model*/ MODEL_MR_I, /*pos*/ -288, 0, -191, 0, -50, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvMrI),
@@ -32,15 +32,15 @@ static const LevelScript script_func_local_2[] = {
3232
};
3333

3434
static const LevelScript script_func_local_3[] = {
35-
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 2049, 0, 680, 0, -180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
36-
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 2185, 0, 120, 0, -180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
37-
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 1675, 0, 341, 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
35+
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 2248, 50, 465, 0, -140, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
36+
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 1845, 50, -40, 0, -180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
37+
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 1453, 50, 716, 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
3838
OBJECT(/*model*/ MODEL_BOO, /*pos*/ -1244, 0, 874, 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
39-
OBJECT(/*model*/ MODEL_BOO, /*pos*/ -676, 0, 1742, 0, -180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
40-
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 699, 0, -2125, 0, -180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
41-
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 699, 0, -1118, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
42-
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 2299, 0, -2118, 0, 135, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
43-
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 1099, 0, -1118, 0, -55, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
39+
OBJECT(/*model*/ MODEL_BOO, /*pos*/ -676, 0, 1742, 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
40+
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 660, 50, -2090, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
41+
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 660, 50, -1210, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
42+
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 2299, 50, -2118, 0, 135, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
43+
OBJECT(/*model*/ MODEL_BOO, /*pos*/ 1099, 50, -1118, 0, -55, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBoo),
4444
RETURN(),
4545
};
4646

@@ -77,15 +77,15 @@ const LevelScript level_bbh_entry[] = {
7777
LOAD_MODEL_FROM_GEO(MODEL_BBH_WOODEN_TOMB, geo_bbh_000658),*/
7878

7979
AREA(/*index*/ 1, Bbh_area_1),
80-
JUMP_LINK(script_func_local_1),
80+
//JUMP_LINK(script_func_local_1),
8181
JUMP_LINK(script_func_local_2),
8282
JUMP_LINK(script_func_local_3),
8383
JUMP_LINK(script_func_local_4),
8484
OBJECT(/*model*/ MODEL_NONE, /*pos*/ -700, 0, -1650, /*angle*/ 0, 90, 0, /*bhvParam*/ BPARAM2(WARP_NODE_0A), /*bhv*/ bhvSpinAirborneWarp),
8585
OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ 1727, 0, -939, 0, -180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvDoor),
8686
OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ -935, 0, -517, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvDoor),
8787
OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ -583, 0, 939, 0, -180, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvDoor),
88-
OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ 939, 0, 517, 0, -95, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvDoor),
88+
OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ 939, 0, 517, 0, -90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvDoor),
8989
OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ 939, 0, 1573, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvDoor),
9090
OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ 931, 0, -1683, 0, 90, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvDoor),
9191
OBJECT(/*model*/ MODEL_CASTLE_DOOR, /*pos*/ -1287, 0, 59, 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvDoor),

0 commit comments

Comments
 (0)