From de0d09500c48ce2ec2a85773b342f9b3d011d189 Mon Sep 17 00:00:00 2001 From: Arceveti <73617174+Arceveti@users.noreply.github.com> Date: Sun, 19 Sep 2021 00:29:16 -0700 Subject: [PATCH] More OBJ_FLAG_UCODE_LARGE usage --- data/behavior_data.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/data/behavior_data.c b/data/behavior_data.c index b5a473ce..fe9cde10 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -698,7 +698,7 @@ const BehaviorScript bhvUnused05A8[] = { const BehaviorScript bhvRotatingPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_DONT_CALC_COLL_DIST)), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_DONT_CALC_COLL_DIST | OBJ_FLAG_UCODE_LARGE)), SET_HOME(), BEGIN_LOOP(), CALL_NATIVE(bhv_rotating_platform_loop), @@ -778,7 +778,7 @@ const BehaviorScript bhvRotatingCounterClockwise[] = { const BehaviorScript bhvWfRotatingWoodenPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(wf_seg7_collision_clocklike_rotation), BEGIN_LOOP(), CALL_NATIVE(bhv_wf_rotating_wooden_platform_loop), @@ -1390,7 +1390,7 @@ const BehaviorScript bhvBitfsSinkingPlatforms[] = { const BehaviorScript bhvBitfsSinkingCagePlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(bitfs_seg7_collision_sinking_cage_platform), SET_HOME(), SPAWN_CHILD(/*Model*/ MODEL_BITFS_BLUE_POLE, /*Behavior*/ bhvDddMovingPole), @@ -1402,7 +1402,7 @@ const BehaviorScript bhvBitfsSinkingCagePlatform[] = { const BehaviorScript bhvDddMovingPole[] = { BEGIN(OBJ_LIST_POLELIKE), - OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), SET_INT(oInteractType, INTERACT_POLE), SET_HITBOX(/*Radius*/ 80, /*Height*/ 710), SET_INT(oIntangibleTimer, 0), @@ -2461,7 +2461,7 @@ const BehaviorScript bhvLllHexagonalMesh[] = { const BehaviorScript bhvLllBowserPuzzlePiece[] = { BEGIN(OBJ_LIST_SURFACE), - OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_DONT_CALC_COLL_DIST)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_DONT_CALC_COLL_DIST | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(lll_seg7_collision_puzzle_piece), SET_HOME(), SET_FLOAT(oCollisionDistance, 3000), @@ -4240,7 +4240,7 @@ const BehaviorScript bhvLargeBomp[] = { const BehaviorScript bhvWfSlidingPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_MOVE_XZ_USING_FVEL | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_MOVE_XZ_USING_FVEL | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(wf_seg7_collision_sliding_brick_platform), CALL_NATIVE(bhv_wf_sliding_platform_init), BEGIN_LOOP(), @@ -4854,7 +4854,7 @@ const BehaviorScript bhvSnowMoundSpawn[] = { const BehaviorScript bhvWdwSquareFloatingPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(wdw_seg7_collision_square_floating_platform), SET_FLOAT(oFloatingPlatformUnkFC, 64), SET_HOME(), @@ -4866,7 +4866,7 @@ const BehaviorScript bhvWdwSquareFloatingPlatform[] = { const BehaviorScript bhvWdwRectangularFloatingPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(wdw_seg7_collision_rect_floating_platform), SET_FLOAT(oFloatingPlatformUnkFC, 64), SET_HOME(), @@ -4878,7 +4878,7 @@ const BehaviorScript bhvWdwRectangularFloatingPlatform[] = { const BehaviorScript bhvJrbFloatingPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(jrb_seg7_collision_floating_platform), SET_FLOAT(oFloatingPlatformUnkFC, 64), SET_HOME(), @@ -5421,7 +5421,7 @@ const BehaviorScript bhvWaterBombShadow[] = { const BehaviorScript bhvTTCRotatingSolid[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), SET_HOME(), SET_FLOAT(oCollisionDistance, 450), CALL_NATIVE(bhv_ttc_rotating_solid_init), @@ -5566,7 +5566,7 @@ const BehaviorScript bhvMrBlizzardSnowball[] = { const BehaviorScript bhvSlidingPlatform2[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), SET_HOME(), CALL_NATIVE(bhv_sliding_plat_2_init), BEGIN_LOOP(),