Skip to content

Commit ca8bd3e

Browse files
ttm tweaks
- earlier spawn placement - removed rolling log sfx sorry bros no power build yet #livewithit
1 parent 67cc18b commit ca8bd3e

2 files changed

Lines changed: 2 additions & 12 deletions

File tree

levels/ttm/script.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ const LevelScript level_ttm_entry[] = {
7272
END_AREA(),
7373

7474
FREE_LEVEL_POOL(),
75-
MARIO_POS(/*area*/ 1, /*yaw*/ 45, /*pos*/ 102, -4332, 5734),
75+
MARIO_POS(/*area*/ 1, /*yaw*/ 45, /*pos*/ 102, -4332, 5734),
7676
CALL(/*arg*/ 0, /*func*/ lvl_init_or_update),
7777
CALL_LOOP(/*arg*/ 1, /*func*/ lvl_init_or_update),
7878
CLEAR_LEVEL(),

src/game/behaviors/rolling_log.inc.c

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,7 @@ void bhv_rolling_log_loop(void) {
8787
}
8888

8989
o->oFaceAnglePitch += o->oAngleVelPitch;
90-
if (absf_2(o->oFaceAnglePitch & 0x1FFF) < 528.0f && o->oAngleVelPitch != 0) {
91-
cur_obj_play_sound_2(SOUND_GENERAL_UNKNOWN1_2);
92-
}
90+
9391
}
9492

9593
void volcano_act_1(void) {
@@ -102,7 +100,6 @@ void volcano_act_1(void) {
102100
o->oAngleVelPitch = 0;
103101
o->oRollingLogUnkF4 = 0;
104102
o->oAction = 2;
105-
cur_obj_play_sound_2(SOUND_GENERAL_BIG_POUND);
106103
set_camera_shake_from_point(SHAKE_POS_LARGE, o->oPosX, o->oPosY, o->oPosZ);
107104
}
108105
}
@@ -122,13 +119,6 @@ void volcano_act_3(void) {
122119

123120
void bhv_volcano_trap_loop(void) {
124121
switch (o->oAction) {
125-
case 0:
126-
if (is_point_within_radius_of_mario(o->oPosX, o->oPosY, o->oPosZ, 1000)) {
127-
o->oAction = 1;
128-
cur_obj_play_sound_2(SOUND_GENERAL_QUIET_POUND2);
129-
}
130-
break;
131-
132122
case 1:
133123
volcano_act_1();
134124
break;

0 commit comments

Comments
 (0)