You've already forked Microtransactions64
mirror of
https://github.com/Print-and-Panic/Microtransactions64.git
synced 2026-01-21 10:17:19 -08:00
Name object fields
This commit is contained in:
Arceveti
@@ -508,8 +508,8 @@ const BehaviorScript bhvBetaChestLid[] = {
|
||||
const BehaviorScript bhvBubbleParticleSpawner[] = {
|
||||
BEGIN(OBJ_LIST_DEFAULT),
|
||||
DISABLE_RENDERING(),
|
||||
SET_RANDOM_INT(oWaterObjUnkF4, /*Minimum*/ 2, /*Range*/ 9),
|
||||
DELAY_VAR(oWaterObjUnkF4),
|
||||
SET_RANDOM_INT(oWaterObjScaleXAngle, /*Minimum*/ 2, /*Range*/ 9),
|
||||
DELAY_VAR(oWaterObjScaleXAngle),
|
||||
SPAWN_CHILD(/*Model*/ MODEL_BUBBLE, /*Behavior*/ bhvSmallWaterWave),
|
||||
PARENT_BIT_CLEAR(oActiveParticleFlags, ACTIVE_PARTICLE_BUBBLE),
|
||||
DEACTIVATE(),
|
||||
@@ -520,12 +520,12 @@ const BehaviorScript bhvBubbleMaybe[] = {
|
||||
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
|
||||
BILLBOARD(),
|
||||
CALL_NATIVE(bhv_bubble_wave_init),
|
||||
SET_RANDOM_FLOAT(oWaterObjUnkF4, /*Minimum*/ -75, /*Range*/ 150),
|
||||
SET_RANDOM_FLOAT(oWaterObjUnkF8, /*Minimum*/ -75, /*Range*/ 150),
|
||||
SET_RANDOM_FLOAT(oWaterObjUnkFC, /*Minimum*/ -75, /*Range*/ 150),
|
||||
SUM_FLOAT(/*Dest*/ oPosX, /*Value 1*/ oPosX, /*Value 2*/ oWaterObjUnkF4),
|
||||
SUM_FLOAT(/*Dest*/ oPosZ, /*Value 1*/ oPosZ, /*Value 2*/ oWaterObjUnkF8),
|
||||
SUM_FLOAT(/*Dest*/ oPosY, /*Value 1*/ oPosY, /*Value 2*/ oWaterObjUnkFC),
|
||||
SET_RANDOM_FLOAT(oWaterObjScaleXAngle, /*Minimum*/ -75, /*Range*/ 150),
|
||||
SET_RANDOM_FLOAT(oWaterObjScaleYAngle, /*Minimum*/ -75, /*Range*/ 150),
|
||||
SET_RANDOM_FLOAT(oWaterObjScaleXAngleVel, /*Minimum*/ -75, /*Range*/ 150),
|
||||
SUM_FLOAT(/*Dest*/ oPosX, /*Value 1*/ oPosX, /*Value 2*/ oWaterObjScaleXAngle),
|
||||
SUM_FLOAT(/*Dest*/ oPosZ, /*Value 1*/ oPosZ, /*Value 2*/ oWaterObjScaleYAngle),
|
||||
SUM_FLOAT(/*Dest*/ oPosY, /*Value 1*/ oPosY, /*Value 2*/ oWaterObjScaleXAngleVel),
|
||||
SET_INT(oAnimState, -1),
|
||||
BEGIN_REPEAT(60),
|
||||
ADD_INT(oAnimState, 1),
|
||||
@@ -539,12 +539,12 @@ const BehaviorScript bhvSmallWaterWave[] = {
|
||||
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
|
||||
BILLBOARD(),
|
||||
CALL_NATIVE(bhv_bubble_wave_init),
|
||||
SET_RANDOM_FLOAT(oWaterObjUnkF4, /*Minimum*/ -50, /*Range*/ 100),
|
||||
SET_RANDOM_FLOAT(oWaterObjUnkF8, /*Minimum*/ -50, /*Range*/ 100),
|
||||
SUM_FLOAT(/*Dest*/ oPosX, /*Value 1*/ oPosX, /*Value 2*/ oWaterObjUnkF4),
|
||||
SUM_FLOAT(/*Dest*/ oPosZ, /*Value 1*/ oPosZ, /*Value 2*/ oWaterObjUnkF8),
|
||||
SET_RANDOM_FLOAT(oWaterObjUnkFC, /*Minimum*/ 0, /*Range*/ 50),
|
||||
SUM_FLOAT(/*Dest*/ oPosY, /*Value 1*/ oPosY, /*Value 2*/ oWaterObjUnkFC),
|
||||
SET_RANDOM_FLOAT(oWaterObjScaleXAngle, /*Minimum*/ -50, /*Range*/ 100),
|
||||
SET_RANDOM_FLOAT(oWaterObjScaleYAngle, /*Minimum*/ -50, /*Range*/ 100),
|
||||
SUM_FLOAT(/*Dest*/ oPosX, /*Value 1*/ oPosX, /*Value 2*/ oWaterObjScaleXAngle),
|
||||
SUM_FLOAT(/*Dest*/ oPosZ, /*Value 1*/ oPosZ, /*Value 2*/ oWaterObjScaleYAngle),
|
||||
SET_RANDOM_FLOAT(oWaterObjScaleXAngleVel, /*Minimum*/ 0, /*Range*/ 50),
|
||||
SUM_FLOAT(/*Dest*/ oPosY, /*Value 1*/ oPosY, /*Value 2*/ oWaterObjScaleXAngleVel),
|
||||
SET_INT(oAnimState, -1),
|
||||
CALL(bhvSmallWaterWave398),
|
||||
BEGIN_REPEAT(60),
|
||||
@@ -557,10 +557,10 @@ const BehaviorScript bhvSmallWaterWave[] = {
|
||||
const BehaviorScript bhvSmallWaterWave398[] = {
|
||||
ADD_INT(oAnimState, 1),
|
||||
ADD_FLOAT(oPosY, 7),
|
||||
SET_RANDOM_FLOAT(oWaterObjUnkF4, /*Minimum*/ -2, /*Range*/ 5),
|
||||
SET_RANDOM_FLOAT(oWaterObjUnkF8, /*Minimum*/ -2, /*Range*/ 5),
|
||||
SUM_FLOAT(/*Dest*/ oPosX, /*Value 1*/ oPosX, /*Value 2*/ oWaterObjUnkF4),
|
||||
SUM_FLOAT(/*Dest*/ oPosZ, /*Value 1*/ oPosZ, /*Value 2*/ oWaterObjUnkF8),
|
||||
SET_RANDOM_FLOAT(oWaterObjScaleXAngle, /*Minimum*/ -2, /*Range*/ 5),
|
||||
SET_RANDOM_FLOAT(oWaterObjScaleYAngle, /*Minimum*/ -2, /*Range*/ 5),
|
||||
SUM_FLOAT(/*Dest*/ oPosX, /*Value 1*/ oPosX, /*Value 2*/ oWaterObjScaleXAngle),
|
||||
SUM_FLOAT(/*Dest*/ oPosZ, /*Value 1*/ oPosZ, /*Value 2*/ oWaterObjScaleYAngle),
|
||||
RETURN(),
|
||||
};
|
||||
|
||||
@@ -782,7 +782,7 @@ const BehaviorScript bhvWfRotatingWoodenPlatform[] = {
|
||||
|
||||
const BehaviorScript bhvKoopaShellUnderwater[] = {
|
||||
BEGIN(OBJ_LIST_GENACTOR),
|
||||
OR_INT(oFlags, (OBJ_FLAG_HOLDABLE | OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)),
|
||||
OR_LONG(oFlags, (OBJ_FLAG_HOLDABLE | OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_SILHOUETTE)),
|
||||
BEGIN_LOOP(),
|
||||
CALL_NATIVE(bhv_koopa_shell_underwater_loop),
|
||||
END_LOOP(),
|
||||
@@ -871,7 +871,7 @@ const BehaviorScript bhvMrIBlueCoin[] = {
|
||||
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
|
||||
BILLBOARD(),
|
||||
SET_INT(oIntangibleTimer, 0),
|
||||
SET_FLOAT(oMrIUnk110, 20),
|
||||
SET_FLOAT(oMrIBlinking, 20),
|
||||
SET_INT(oAnimState, -1),
|
||||
SET_OBJ_PHYSICS(/*Wall hitbox radius*/ 30, /*Gravity*/ -400, /*Bounciness*/ -70, /*Drag strength*/ 1000, /*Friction*/ 1000, /*Buoyancy*/ 200, /*Unused*/ 0, 0),
|
||||
CALL_NATIVE(bhv_coin_init),
|
||||
@@ -2371,7 +2371,7 @@ const BehaviorScript bhvLllTiltingInvertedPyramid[] = {
|
||||
|
||||
const BehaviorScript bhvKoopaShell[] = {
|
||||
BEGIN(OBJ_LIST_LEVEL),
|
||||
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
|
||||
OR_LONG(oFlags, (OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE | OBJ_FLAG_SILHOUETTE)), //! Silhouette doesn't show up in-game
|
||||
SET_OBJ_PHYSICS(/*Wall hitbox radius*/ 30, /*Gravity*/ -400, /*Bounciness*/ -50, /*Drag strength*/ 1000, /*Friction*/ 1000, /*Buoyancy*/ 200, /*Unused*/ 0, 0),
|
||||
BEGIN_LOOP(),
|
||||
CALL_NATIVE(bhv_koopa_shell_loop),
|
||||
@@ -2547,7 +2547,7 @@ const BehaviorScript bhvWdwExpressElevatorPlatform[] = {
|
||||
|
||||
const BehaviorScript bhvChirpChirp[] = {
|
||||
BEGIN(OBJ_LIST_DEFAULT),
|
||||
SET_INT(oBirdChirpChirpUnkF4, 1),
|
||||
SET_INT(oCheepCheepSpawnerSpawnAmount, 1),
|
||||
GOTO(bhvChirpChirpUnused),
|
||||
};
|
||||
|
||||
@@ -4787,7 +4787,7 @@ const BehaviorScript bhvWdwSquareFloatingPlatform[] = {
|
||||
BEGIN(OBJ_LIST_SURFACE),
|
||||
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_FLOAT(oFloatingPlatformHeightOffset, 64),
|
||||
SET_HOME(),
|
||||
BEGIN_LOOP(),
|
||||
CALL_NATIVE(bhv_floating_platform_loop),
|
||||
@@ -4799,7 +4799,7 @@ const BehaviorScript bhvWdwRectangularFloatingPlatform[] = {
|
||||
BEGIN(OBJ_LIST_SURFACE),
|
||||
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_FLOAT(oFloatingPlatformHeightOffset, 64),
|
||||
SET_HOME(),
|
||||
BEGIN_LOOP(),
|
||||
CALL_NATIVE(bhv_floating_platform_loop),
|
||||
@@ -4811,7 +4811,7 @@ const BehaviorScript bhvJrbFloatingPlatform[] = {
|
||||
BEGIN(OBJ_LIST_SURFACE),
|
||||
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_FLOAT(oFloatingPlatformHeightOffset, 64),
|
||||
SET_HOME(),
|
||||
BEGIN_LOOP(),
|
||||
CALL_NATIVE(bhv_floating_platform_loop),
|
||||
@@ -4823,7 +4823,6 @@ const BehaviorScript bhvArrowLift[] = {
|
||||
BEGIN(OBJ_LIST_SURFACE),
|
||||
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
|
||||
LOAD_COLLISION_DATA(wdw_seg7_collision_arrow_lift),
|
||||
SET_INT_RAND_RSHIFT(oArrowLiftUnk100, /*Minimum*/ 1, /*Right shift*/ 32),
|
||||
SET_HOME(),
|
||||
BEGIN_LOOP(),
|
||||
CALL_NATIVE(bhv_arrow_lift_loop),
|
||||
|
||||
Reference in New Issue
Block a user