added back ttm rolling log

Author: stalechilibeans

data/behavior_data.c

@@ -34,6 +34,7 @@
 #include "levels/ccm/header.h"
 #include "levels/ttc/header.h"
 #include "levels/bitdw/header.h"
+#include "levels/ttm/header.h"
 
 #include "make_const_nonconst.h"
 #include "behavior_data.h"
@@ -2761,6 +2762,19 @@ const BehaviorScript bhvStar[] = {
     END_LOOP(),
 };
 
+const BehaviorScript bhvTTMRollingLog[] = {
+    BEGIN(OBJ_LIST_SURFACE),
+    OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
+    LOAD_COLLISION_DATA(ttm_seg7_collision_pitoune_2),
+    SET_HOME(),
+    SET_FLOAT(oCollisionDistance, 2000),
+    CALL_NATIVE(bhv_ttm_rolling_log_init),
+    BEGIN_LOOP(),
+        CALL_NATIVE(bhv_rolling_log_loop),
+        CALL_NATIVE(load_object_collision_model),
+    END_LOOP(),
+};
+
 const BehaviorScript bhvSmallPiranhaFlame[] = {
     BEGIN(OBJ_LIST_GENACTOR),
     OR_INT(oFlags, (OBJ_FLAG_COMPUTE_ANGLE_TO_MARIO | OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)),

include/behavior_data.h

@@ -163,6 +163,7 @@ extern const BehaviorScript bhvBoo[];
 extern const BehaviorScript bhvGhostHuntBoo[]; // we can cock about with this later
 extern const BehaviorScript bhvInsideCannon[];
 extern const BehaviorScript bhvStar[];
+extern const BehaviorScript bhvTTMRollingLog[];
 extern const BehaviorScript bhvStaticObject[];
 extern const BehaviorScript bhvCastleFloorTrap[];
 extern const BehaviorScript bhvFloorTrapInCastle[];

levels/ttm/script.c

@@ -15,6 +15,11 @@
 #include "make_const_nonconst.h"
 #include "levels/ttm/header.h"
 
+static const LevelScript script_func_local_1[] = {
+    OBJECT(/*model*/ MODEL_TTM_ROLLING_LOG,    /*pos*/  4360, -1722,  4001, /*angle*/ 0,  48, 0, /*bhvParam*/ 0, /*bhv*/ bhvTTMRollingLog),
+    RETURN(),
+};
+
 const LevelScript level_ttm_entry[] = {
     INIT_LEVEL(),
     LOAD_MIO0        (/*seg*/ 0x07, _ttm_segment_7SegmentRomStart, _ttm_segment_7SegmentRomEnd),
@@ -67,7 +72,7 @@ const LevelScript level_ttm_entry[] = {
         WARP_NODE(/*id*/ WARP_NODE_16, /*destLevel*/ LEVEL_TTM, /*destArea*/ 1, /*destNode*/ WARP_NODE_15, /*flags*/ WARP_NO_CHECKPOINT),
         WARP_NODE(/*id*/ WARP_NODE_SUCCESS,    /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 2, /*destNode*/ WARP_NODE_34, /*flags*/ WARP_NO_CHECKPOINT),
         WARP_NODE(/*id*/ WARP_NODE_DEATH,      /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 2, /*destNode*/ WARP_NODE_66, /*flags*/ WARP_NO_CHECKPOINT),
-
+        JUMP_LINK(script_func_local_1),
         TERRAIN(/*terrainData*/ ttm_collision),
         //MACRO_OBJECTS(/*objList*/ ttm_seg7_area_1_macro_objs),
         SET_BACKGROUND_MUSIC(/*settingsPreset*/ 0x0000, /*seq*/ SEQ_LEVEL_GRASS),

src/game/behavior_actions.h

@@ -314,6 +314,8 @@ void bhv_red_coin_loop(void);
 void bhv_hidden_star_init(void);
 void bhv_hidden_star_loop(void);
 void bhv_hidden_star_trigger_loop(void);
+void bhv_rolling_log_loop(void);
+void bhv_ttm_rolling_log_init(void);
 void bhv_1up_common_init(void);
 void bhv_1up_walking_loop(void);
 void bhv_1up_running_away_loop(void);

src/game/behaviors/rolling_log.inc.c

@@ -6,6 +6,92 @@
 // hypothesis is that the object in the middle here used to be
 // a rolling log of another variation.
 
+void bhv_ttm_rolling_log_init(void) {
+    o->oPitouneUnkF8 = 3970.0f;
+    o->oPitouneUnkFC = 3654.0f;
+    o->oPitouneUnkF4 = 271037.0f;
+
+    o->oMoveAngleYaw = 8810;
+    o->oForwardVel = 0.0f;
+    o->oVelX = 0.0f;
+    o->oVelZ = 0.0f;
+    o->oFaceAnglePitch = 0;
+    o->oAngleVelPitch = 0;
+}
+
+void rolling_log_roll_log(void) {
+    if (gMarioObject->platform == o) {
+        f32 sp24 = (gMarioObject->header.gfx.pos[2] - o->oPosZ) * coss(-1*o->oMoveAngleYaw)
+                   - (gMarioObject->header.gfx.pos[0] - o->oPosX) * sins(-1*o->oMoveAngleYaw);
+        if (sp24 > 0) {
+            o->oAngleVelPitch += 0x10;
+        } else {
+            o->oAngleVelPitch -= 0x10;
+        }
+
+        if (o->oAngleVelPitch > 0x200) {
+            o->oAngleVelPitch = 0x200;
+        }
+
+        if (o->oAngleVelPitch < -0x200) {
+            o->oAngleVelPitch = -0x200;
+        }
+    } else {
+        if (is_point_close_to_object(o, o->oHomeX, o->oHomeY, o->oHomeZ, 100)) {
+            if (o->oAngleVelPitch != 0) {
+                if (o->oAngleVelPitch > 0) {
+                    o->oAngleVelPitch -= 0x10;
+                } else {
+                    o->oAngleVelPitch += 0x10;
+                }
+
+                if (o->oAngleVelPitch < 0x10 && o->oAngleVelPitch > -0x10) {
+                    o->oAngleVelPitch = 0;
+                }
+            }
+        } else {
+            if (o->oAngleVelPitch != 0x100) {
+                if (o->oAngleVelPitch > 0x100) {
+                    o->oAngleVelPitch -= 0x10;
+                } else {
+                    o->oAngleVelPitch += 0x10;
+                }
+
+                if (o->oAngleVelPitch < 0x110 && o->oAngleVelPitch > 0xF0) {
+                    o->oAngleVelPitch = 0x100;
+                }
+            }
+        }
+    }
+}
+
+void bhv_rolling_log_loop(void) {
+    f32 prevX = o->oPosX;
+    f32 prevZ = o->oPosZ;
+
+    rolling_log_roll_log();
+
+    o->oForwardVel = o->oAngleVelPitch / 0x40;
+    o->oVelX = o->oForwardVel * sins(o->oMoveAngleYaw);
+    o->oVelZ = o->oForwardVel * coss(o->oMoveAngleYaw);
+
+    o->oPosX += o->oVelX;
+    o->oPosZ += o->oVelZ;
+
+    if (o->oPitouneUnkF4 < sqr(o->oPosX - o->oPitouneUnkF8) + sqr(o->oPosZ - o->oPitouneUnkFC)) {
+        o->oForwardVel = 0.0f;
+        o->oPosX = prevX;
+        o->oPosZ = prevZ;
+        o->oVelX = 0.0f;
+        o->oVelZ = 0.0f;
+    }
+
+    o->oFaceAnglePitch += o->oAngleVelPitch;
+    if (absf_2(o->oFaceAnglePitch & 0x1FFF) < 528.0f && o->oAngleVelPitch != 0) {
+        cur_obj_play_sound_2(SOUND_GENERAL_UNKNOWN1_2);
+    }
+}
+
 void volcano_act_1(void) {
     o->oRollingLogUnkF4 += 4.0f;
     o->oAngleVelPitch += o->oRollingLogUnkF4;

src/game/obj_behaviors.c

@@ -789,6 +789,7 @@ UNUSED s8 debug_sequence_tracker(s16 debugInputSequence[]) {
 #include "behaviors/celebration_star.inc.c"
 #include "behaviors/drawbridge.inc.c"
 #include "behaviors/bomp.inc.c"
+#include "behaviors/rolling_log.inc.c"
 #include "behaviors/sliding_platform.inc.c"
 #include "behaviors/sound_birds.inc.c"
 #include "behaviors/sound_ambient.inc.c"