From 1d052879b8b7cb953380683705f5390afc36a7b5 Mon Sep 17 00:00:00 2001 From: Arceveti <73617174+Arceveti@users.noreply.github.com> Date: Sat, 18 Sep 2021 19:31:25 -0700 Subject: [PATCH] More objects use OBJ_FLAG_UCODE_LARGE --- data/behavior_data.c | 108 ++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 69 deletions(-) diff --git a/data/behavior_data.c b/data/behavior_data.c index 4f8f5a058..b5a473cee 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -399,7 +399,7 @@ const BehaviorScript bhvPurpleParticle[] = { const BehaviorScript bhvGiantPole[] = { 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*/ 2100), SET_HOME(), @@ -698,7 +698,7 @@ const BehaviorScript bhvUnused05A8[] = { const BehaviorScript bhvRotatingPlatform[] = { 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_DONT_CALC_COLL_DIST)), SET_HOME(), BEGIN_LOOP(), CALL_NATIVE(bhv_rotating_platform_loop), @@ -708,7 +708,7 @@ const BehaviorScript bhvRotatingPlatform[] = { const BehaviorScript bhvTower[] = { 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_tower), SET_FLOAT(oCollisionDistance, 3000), SET_FLOAT(oDrawingDistance, 20000), @@ -748,7 +748,7 @@ const BehaviorScript bhvWfBreakableWallLeft[] = { const BehaviorScript bhvKickableBoard[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_COMPUTE_ANGLE_TO_MARIO | OBJ_FLAG_ACTIVE_FROM_AFAR | OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_ANGLE_TO_MARIO | OBJ_FLAG_ACTIVE_FROM_AFAR | OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(wf_seg7_collision_kickable_board), SET_HITBOX(/*Radius*/ 100, /*Height*/ 1200), SET_HURTBOX(/*Radius*/ 1, /*Height*/ 1), @@ -1210,7 +1210,7 @@ const BehaviorScript bhvRrElevatorPlatform[] = { const BehaviorScript bhvHmcElevatorPlatform[] = { 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)), LOAD_COLLISION_DATA(hmc_seg7_collision_elevator), SET_HOME(), CALL_NATIVE(bhv_elevator_init), @@ -1286,7 +1286,6 @@ const BehaviorScript bhvMistCircParticleSpawner[] = { }; const BehaviorScript bhvDirtParticleSpawner[] = { - BEGIN(OBJ_LIST_DEFAULT), BEGIN(OBJ_LIST_DEFAULT), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), CALL_NATIVE(bhv_ground_sand_init), @@ -1380,7 +1379,7 @@ const BehaviorScript bhvUkikiCage[] = { const BehaviorScript bhvBitfsSinkingPlatforms[] = { 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_platform), SET_HOME(), BEGIN_LOOP(), @@ -1427,7 +1426,7 @@ const BehaviorScript bhvBitfsTiltingInvertedPyramid[] = { const BehaviorScript bhvSquishablePlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(bitfs_seg7_collision_squishable_platform), SET_FLOAT(oCollisionDistance, 10000), CALL_NATIVE(bhv_platform_normals_init), @@ -1544,7 +1543,7 @@ const BehaviorScript bhvBlackSmokeMario[] = { BEGIN(OBJ_LIST_UNIMPORTANT), OR_INT(oFlags, (OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_MOVE_XZ_USING_FVEL | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), BILLBOARD(), - SET_INT(oAnimState, 4), + SET_INT(oAnimState, 4), //! burn_smoke_geo has no GEO_SWITCH_ANIM_STATE. SET_FLOAT(oGraphYOffset, 50), BEGIN_REPEAT(8), CALL_NATIVE(bhv_black_smoke_mario_loop), @@ -1776,7 +1775,7 @@ const BehaviorScript bhvHeaveHo[] = { SET_OBJ_PHYSICS(/*Wall hitbox radius*/ 200, /*Gravity*/ -400, /*Bounciness*/ -50, /*Drag strength*/ 1000, /*Friction*/ 1000, /*Buoyancy*/ 600, /*Unused*/ 0, 0), SPAWN_OBJ(/*Model*/ MODEL_NONE, /*Behavior*/ bhvHeaveHoThrowMario), SET_INT(oInteractType, INTERACT_GRABBABLE), - SET_INT(oInteractionSubtype, INT_SUBTYPE_NOT_GRABBABLE | INT_SUBTYPE_GRABS_MARIO), + SET_INT(oInteractionSubtype, (INT_SUBTYPE_NOT_GRABBABLE | INT_SUBTYPE_GRABS_MARIO)), SET_HITBOX(/*Radius*/ 120, /*Height*/ 100), SET_HOME(), SET_INT(oIntangibleTimer, 0), @@ -2003,7 +2002,7 @@ const BehaviorScript bhvBowserFlameSpawn[] = { const BehaviorScript bhvTiltingBowserLavaPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_ANGLE_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_ANGLE_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_DONT_CALC_COLL_DIST | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(bowser_2_seg7_collision_tilting_platform), SET_FLOAT(oDrawingDistance, 20000), SET_FLOAT(oCollisionDistance, 20000), @@ -2017,7 +2016,7 @@ const BehaviorScript bhvTiltingBowserLavaPlatform[] = { const BehaviorScript bhvFallingBowserPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_DONT_CALC_COLL_DIST | OBJ_FLAG_UCODE_LARGE)), SET_FLOAT(oDrawingDistance, 20000), SET_FLOAT(oCollisionDistance, 20000), SET_HOME(), @@ -2190,7 +2189,7 @@ const BehaviorScript bhvWaterLevelPillar[] = { const BehaviorScript bhvDddWarp[] = { BEGIN(OBJ_LIST_SURFACE), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_INT(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), SET_FLOAT(oCollisionDistance, 30000), BEGIN_LOOP(), CALL_NATIVE(bhv_ddd_warp_loop), @@ -2348,7 +2347,7 @@ const BehaviorScript bhvVolcanoFlames[] = { const BehaviorScript bhvLllRotatingHexagonalRing[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(lll_seg7_collision_rotating_platform), BEGIN_LOOP(), CALL_NATIVE(bhv_lll_rotating_hexagonal_ring_loop), @@ -2358,7 +2357,7 @@ const BehaviorScript bhvLllRotatingHexagonalRing[] = { const BehaviorScript bhvLllSinkingRectangularPlatform[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(lll_seg7_collision_slow_tilting_platform), SET_FLOAT(oCollisionDistance, 2000), SET_HOME(), @@ -2370,7 +2369,7 @@ const BehaviorScript bhvLllSinkingRectangularPlatform[] = { const BehaviorScript bhvLllSinkingSquarePlatforms[] = { BEGIN(OBJ_LIST_SURFACE), - OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), + OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_SET_FACE_YAW_TO_MOVE_YAW | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(lll_seg7_collision_sinking_pyramids), ADD_FLOAT(oPosY, 5), SET_FLOAT(oCollisionDistance, 2000), @@ -2462,7 +2461,7 @@ const BehaviorScript bhvLllHexagonalMesh[] = { const BehaviorScript bhvLllBowserPuzzlePiece[] = { 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_DONT_CALC_COLL_DIST)), LOAD_COLLISION_DATA(lll_seg7_collision_puzzle_piece), SET_HOME(), SET_FLOAT(oCollisionDistance, 3000), @@ -2707,7 +2706,7 @@ const BehaviorScript bhvJrbSlidingBox[] = { const BehaviorScript bhvShipPart3[] = { BEGIN(OBJ_LIST_DEFAULT), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), SET_HOME(), BEGIN_LOOP(), CALL_NATIVE(bhv_ship_part_3_loop), @@ -2716,7 +2715,7 @@ const BehaviorScript bhvShipPart3[] = { const BehaviorScript bhvInSunkenShip3[] = { BEGIN(OBJ_LIST_SURFACE), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(jrb_seg7_collision_in_sunken_ship_3), SET_HOME(), SET_FLOAT(oCollisionDistance, 4000), @@ -2763,7 +2762,7 @@ const BehaviorScript bhvInSunkenShip2[] = { BEGIN(OBJ_LIST_SURFACE), LOAD_COLLISION_DATA(jrb_seg7_collision_in_sunken_ship_2), // Sunken ship - common: - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), SET_FLOAT(oCollisionDistance, 4000), CALL(bhvSunkenShipSetRotation), BEGIN_LOOP(), @@ -3154,7 +3153,7 @@ UNUSED static const BehaviorScript unused_1[] = { const BehaviorScript bhvStaticObject[] = { BEGIN(OBJ_LIST_DEFAULT), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), BREAK(), }; @@ -3310,11 +3309,9 @@ const BehaviorScript bhvWaterDroplet[] = { const BehaviorScript bhvWaterDropletSplash[] = { BEGIN(OBJ_LIST_DEFAULT), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), -#ifndef VERSION_JP SET_INT(oFaceAnglePitch, 0), SET_INT(oFaceAngleYaw, 0), SET_INT(oFaceAngleRoll, 0), -#endif CALL_NATIVE(bhv_water_droplet_splash_init), ADD_FLOAT(oPosY, 5), SET_INT(oAnimState, -1), @@ -3328,16 +3325,9 @@ const BehaviorScript bhvWaterDropletSplash[] = { const BehaviorScript bhvBubbleSplash[] = { BEGIN(OBJ_LIST_DEFAULT), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), -#ifdef VERSION_JP - SET_FLOAT(oFaceAnglePitch, 0), - SET_FLOAT(oFaceAngleYaw, 0), - SET_FLOAT(oFaceAngleRoll, 0), -#endif -#ifndef VERSION_JP SET_INT(oFaceAnglePitch, 0), SET_INT(oFaceAngleYaw, 0), SET_INT(oFaceAngleRoll, 0), -#endif SET_INT(oAnimState, -1), CALL_NATIVE(bhv_bubble_splash_init), BEGIN_REPEAT(6), @@ -3350,18 +3340,9 @@ const BehaviorScript bhvBubbleSplash[] = { const BehaviorScript bhvIdleWaterWave[] = { BEGIN(OBJ_LIST_DEFAULT), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), -#ifdef VERSION_JP - SET_FLOAT(oFaceAnglePitch, 0), - SET_FLOAT(oFaceAngleYaw, 0), - SET_FLOAT(oFaceAngleRoll, 0), -#endif -#ifndef VERSION_JP SET_INT(oFaceAnglePitch, 0), SET_INT(oFaceAngleYaw, 0), SET_INT(oFaceAngleRoll, 0), -#endif - SET_INT(oAnimState, -1), - ADD_INT(oAnimState, 1), BEGIN_LOOP(), CALL_NATIVE(bhv_idle_water_wave_loop), ADD_INT(oAnimState, 1), @@ -3377,16 +3358,9 @@ const BehaviorScript bhvIdleWaterWave[] = { const BehaviorScript bhvObjectWaterSplash[] = { BEGIN(OBJ_LIST_UNIMPORTANT), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), -#ifdef VERSION_JP - SET_FLOAT(oFaceAnglePitch, 0), - SET_FLOAT(oFaceAngleYaw, 0), - SET_FLOAT(oFaceAngleRoll, 0), -#endif -#ifndef VERSION_JP SET_INT(oFaceAnglePitch, 0), SET_INT(oFaceAngleYaw, 0), SET_INT(oFaceAngleRoll, 0), -#endif SET_INT(oAnimState, -1), BEGIN_REPEAT(6), ADD_INT(oAnimState, 1), @@ -3437,9 +3411,9 @@ const BehaviorScript bhvWaveTrail[] = { OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), PARENT_BIT_CLEAR(oActiveParticleFlags, ACTIVE_PARTICLE_WAVE_TRAIL), // Wave trail - common: - SET_FLOAT(oFaceAnglePitch, 0), - SET_FLOAT(oFaceAngleYaw, 0), - SET_FLOAT(oFaceAngleRoll, 0), + SET_INT(oFaceAnglePitch, 0), + SET_INT(oFaceAngleYaw, 0), + SET_INT(oFaceAngleRoll, 0), SET_INT(oAnimState, -1), BEGIN_REPEAT(8), ADD_INT(oAnimState, 1), @@ -3463,7 +3437,7 @@ const BehaviorScript bhvTinyStrongWindParticle[] = { // Strong wind particles generated by the Snowman and Fwoosh that blow Mario back and knock his cap off. const BehaviorScript bhvStrongWindParticle[] = { - BEGIN(OBJ_LIST_POLELIKE), + BEGIN(OBJ_LIST_POLELIKE), //? OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), BILLBOARD(), BEGIN_LOOP(), @@ -3613,7 +3587,7 @@ const BehaviorScript bhvRandomAnimatedTexture[] = { const BehaviorScript bhvYellowBackgroundInMenu[] = { BEGIN(OBJ_LIST_LEVEL), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), CALL_NATIVE(beh_yellow_background_menu_init), BEGIN_LOOP(), SET_INT(oIntangibleTimer, 0), @@ -3963,12 +3937,10 @@ const BehaviorScript bhvObjectBubble[] = { const BehaviorScript bhvObjectWaterWave[] = { BEGIN(OBJ_LIST_UNIMPORTANT), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), - SET_FLOAT(oFaceAnglePitch, 0), - SET_FLOAT(oFaceAngleYaw, 0), - SET_FLOAT(oFaceAngleRoll, 0), - SET_INT(oAnimState, -1), + SET_INT(oFaceAnglePitch, 0), + SET_INT(oFaceAngleYaw, 0), + SET_INT(oFaceAngleRoll, 0), CALL_NATIVE(bhv_object_water_wave_init), - ADD_INT(oAnimState, 1), DELAY(6), BEGIN_LOOP(), CALL_NATIVE(bhv_object_water_wave_loop), @@ -4367,7 +4339,7 @@ const BehaviorScript bhvThiBowlingBallSpawner[] = { const BehaviorScript bhvRrCruiserWing[] = { BEGIN(OBJ_LIST_DEFAULT), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), CALL_NATIVE(bhv_rr_cruiser_wing_init), BEGIN_LOOP(), CALL_NATIVE(bhv_rr_cruiser_wing_loop), @@ -4398,7 +4370,7 @@ const BehaviorScript bhvSslMovingPyramidWall[] = { const BehaviorScript bhvPyramidElevator[] = { BEGIN(OBJ_LIST_SURFACE), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(ssl_seg7_collision_pyramid_elevator), SET_HOME(), SET_FLOAT(oCollisionDistance, 20000), @@ -4420,7 +4392,7 @@ const BehaviorScript bhvPyramidElevatorTrajectoryMarkerBall[] = { const BehaviorScript bhvPyramidTop[] = { BEGIN(OBJ_LIST_SURFACE), - OR_LONG(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE), + OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), LOAD_COLLISION_DATA(ssl_seg7_collision_pyramid_top), SET_HOME(), SET_FLOAT(oCollisionDistance, 20000), @@ -4676,7 +4648,7 @@ const BehaviorScript bhvHiddenStarTrigger[] = { const BehaviorScript bhvTtmRollingLog[] = { 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(ttm_seg7_collision_pitoune_2), SET_HOME(), SET_FLOAT(oCollisionDistance, 2000), @@ -4700,7 +4672,7 @@ const BehaviorScript bhvLllVolcanoFallingTrap[] = { const BehaviorScript bhvLllRollingLog[] = { 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(lll_seg7_collision_pitoune), SET_HOME(), SET_FLOAT(oCollisionDistance, 2000), @@ -5238,7 +5210,7 @@ const BehaviorScript bhvWoodenPost[] = { const BehaviorScript bhvChainChompGate[] = { BEGIN(OBJ_LIST_SURFACE), LOAD_COLLISION_DATA(bob_seg7_collision_chain_chomp_gate), - 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)), CALL_NATIVE(bhv_chain_chomp_gate_init), BEGIN_LOOP(), CALL_NATIVE(bhv_chain_chomp_gate_update), @@ -5431,7 +5403,7 @@ const BehaviorScript bhvWaterBombSpawner[] = { const BehaviorScript bhvWaterBomb[] = { BEGIN(OBJ_LIST_GENACTOR), - OR_LONG(oFlags, (OBJ_FLAG_COMPUTE_ANGLE_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_UCODE_LARGE)), + OR_INT(oFlags, (OBJ_FLAG_COMPUTE_ANGLE_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), SET_OBJ_PHYSICS(/*Wall hitbox radius*/ 120, /*Gravity*/ -400, /*Bounciness*/ 0, /*Drag strength*/ 1000, /*Friction*/ 1000, /*Buoyancy*/ 200, /*Unused*/ 0, 0), BEGIN_LOOP(), CALL_NATIVE(bhv_water_bomb_update), @@ -5543,7 +5515,7 @@ const BehaviorScript bhvTTCElevator[] = { const BehaviorScript bhvTTC2DRotator[] = { BEGIN(OBJ_LIST_SURFACE), LOAD_COLLISION_DATA(ttc_seg7_collision_clock_main_rotation), - 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_FLOAT(oCollisionDistance, 1800), CALL_NATIVE(bhv_ttc_2d_rotator_init), BEGIN_LOOP(), @@ -5605,7 +5577,7 @@ const BehaviorScript bhvSlidingPlatform2[] = { const BehaviorScript bhvOctagonalPlatformRotating[] = { 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), CALL_NATIVE(bhv_rotating_octagonal_plat_init), BEGIN_LOOP(), CALL_NATIVE(bhv_rotating_octagonal_plat_loop), @@ -5985,7 +5957,7 @@ const BehaviorScript bhvSkeeterWave[] = { const BehaviorScript bhvSwingPlatform[] = { BEGIN(OBJ_LIST_SURFACE), LOAD_COLLISION_DATA(rr_seg7_collision_pendulum), - 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_FLOAT(oCollisionDistance, 2000), CALL_NATIVE(bhv_swing_platform_init), BEGIN_LOOP(), @@ -6070,7 +6042,7 @@ const BehaviorScript bhvBeginningLakitu[] = { OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), LOAD_ANIMATIONS(oAnimations, lakitu_seg6_anims_060058F8), ANIMATE(0), - SET_FLOAT(oOpacity, 0), + SET_INT(oOpacity, 0), BEGIN_LOOP(), CALL_NATIVE(bhv_intro_lakitu_loop), END_LOOP(), @@ -6113,5 +6085,3 @@ const BehaviorScript bhvIntroScene[] = { CALL_NATIVE(bhv_intro_scene_loop), END_LOOP(), }; - -