You've already forked Microtransactions64
mirror of
https://github.com/Print-and-Panic/Microtransactions64.git
synced 2026-01-21 10:17:19 -08:00
Remove duplicate function
This commit is contained in:
@@ -1648,7 +1648,7 @@ index 0000000..97cba2a
|
|||||||
+ if ((o->oTimer & 1) == 0 && o->oTimer < 14) {
|
+ if ((o->oTimer & 1) == 0 && o->oTimer < 14) {
|
||||||
+ sp22 = D_8032F698[o->oBehParams2ndByte].unk3 + (gDebugInfo[4][1] << 8);
|
+ sp22 = D_8032F698[o->oBehParams2ndByte].unk3 + (gDebugInfo[4][1] << 8);
|
||||||
+ sp1C = -(o->oTimer / 2) * 290 + 1740;
|
+ sp1C = -(o->oTimer / 2) * 290 + 1740;
|
||||||
+ vec3f_copy_2(sp24, &o->oPosX);
|
+ vec3f_copy(sp24, &o->oPosX);
|
||||||
+ o->oPosX = D_8032F698[o->oBehParams2ndByte].unk1 + sins(sp22 + 5296) * sp1C;
|
+ o->oPosX = D_8032F698[o->oBehParams2ndByte].unk1 + sins(sp22 + 5296) * sp1C;
|
||||||
+ o->oPosZ = D_8032F698[o->oBehParams2ndByte].unk2 + coss(sp22 + 5296) * sp1C;
|
+ o->oPosZ = D_8032F698[o->oBehParams2ndByte].unk2 + coss(sp22 + 5296) * sp1C;
|
||||||
+ o->oPosY = 307.0f;
|
+ o->oPosY = 307.0f;
|
||||||
@@ -1656,7 +1656,7 @@ index 0000000..97cba2a
|
|||||||
+ o->oPosX = D_8032F698[o->oBehParams2ndByte].unk1 + sins(sp22 - 5296) * sp1C;
|
+ o->oPosX = D_8032F698[o->oBehParams2ndByte].unk1 + sins(sp22 - 5296) * sp1C;
|
||||||
+ o->oPosZ = D_8032F698[o->oBehParams2ndByte].unk2 + coss(sp22 - 5296) * sp1C;
|
+ o->oPosZ = D_8032F698[o->oBehParams2ndByte].unk2 + coss(sp22 - 5296) * sp1C;
|
||||||
+ spawn_mist_particles_variable(4, 0, 100);
|
+ spawn_mist_particles_variable(4, 0, 100);
|
||||||
+ vec3f_copy_2(&o->oPosX, sp24);
|
+ vec3f_copy(&o->oPosX, sp24);
|
||||||
+ }
|
+ }
|
||||||
+ cur_obj_move_using_fvel_and_gravity();
|
+ cur_obj_move_using_fvel_and_gravity();
|
||||||
+ if (o->oTimer > 300)
|
+ if (o->oTimer > 300)
|
||||||
|
|||||||
@@ -203,15 +203,6 @@ void spawn_sparkle_particles(s32 n, s32 radius, s32 height, s32 r) {
|
|||||||
#include "behaviors/bowser_falling_platform.inc.c"
|
#include "behaviors/bowser_falling_platform.inc.c"
|
||||||
#include "behaviors/bowser_flame.inc.c"
|
#include "behaviors/bowser_flame.inc.c"
|
||||||
#include "behaviors/blue_fish.inc.c"
|
#include "behaviors/blue_fish.inc.c"
|
||||||
|
|
||||||
// Not in behavior file, duplicate of vec3f_copy except without bad return.
|
|
||||||
// Used in a few behavior files.
|
|
||||||
void vec3f_copy_2(Vec3f dest, Vec3f src) {
|
|
||||||
dest[0] = src[0];
|
|
||||||
dest[1] = src[1];
|
|
||||||
dest[2] = src[2];
|
|
||||||
}
|
|
||||||
|
|
||||||
#include "behaviors/checkerboard_platform.inc.c"
|
#include "behaviors/checkerboard_platform.inc.c"
|
||||||
#include "behaviors/ddd_warp.inc.c"
|
#include "behaviors/ddd_warp.inc.c"
|
||||||
#include "behaviors/water_pillar.inc.c"
|
#include "behaviors/water_pillar.inc.c"
|
||||||
|
|||||||
@@ -11,7 +11,6 @@ void clear_particle_flags(u32 flags);
|
|||||||
void spawn_wind_particles(s16 pitch, s16 yaw);
|
void spawn_wind_particles(s16 pitch, s16 yaw);
|
||||||
s32 check_if_moving_over_floor(f32 a0, f32 a1);
|
s32 check_if_moving_over_floor(f32 a0, f32 a1);
|
||||||
s32 arc_to_goal_pos(Vec3f a0, Vec3f a1, f32 yVel, f32 gravity);
|
s32 arc_to_goal_pos(Vec3f a0, Vec3f a1, f32 yVel, f32 gravity);
|
||||||
void vec3f_copy_2(Vec3f dest, Vec3f src);
|
|
||||||
void tox_box_move(f32 forwardVel, f32 a1, s16 deltaPitch, s16 deltaRoll);
|
void tox_box_move(f32 forwardVel, f32 a1, s16 deltaPitch, s16 deltaRoll);
|
||||||
void play_penguin_walking_sound(s32 walk);
|
void play_penguin_walking_sound(s32 walk);
|
||||||
s32 update_angle_from_move_flags(s32 *angle);
|
s32 update_angle_from_move_flags(s32 *angle);
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ void falling_bowser_plat_act_fall(void) {
|
|||||||
if ((o->oTimer & 1) == 0 && o->oTimer < 14) {
|
if ((o->oTimer & 1) == 0 && o->oTimer < 14) {
|
||||||
angle = sBowserFallingPlatform[o->oBehParams2ndByte].angle + (gDebugInfo[4][1] << 8);
|
angle = sBowserFallingPlatform[o->oBehParams2ndByte].angle + (gDebugInfo[4][1] << 8);
|
||||||
val = -(o->oTimer / 2) * 290 + 1740;
|
val = -(o->oTimer / 2) * 290 + 1740;
|
||||||
vec3f_copy_2(pos, &o->oPosX);
|
vec3f_copy(pos, &o->oPosX);
|
||||||
o->oPosX = sBowserFallingPlatform[o->oBehParams2ndByte].posX + sins(angle + 0x14B0) * val;
|
o->oPosX = sBowserFallingPlatform[o->oBehParams2ndByte].posX + sins(angle + 0x14B0) * val;
|
||||||
o->oPosZ = sBowserFallingPlatform[o->oBehParams2ndByte].posZ + coss(angle + 0x14B0) * val;
|
o->oPosZ = sBowserFallingPlatform[o->oBehParams2ndByte].posZ + coss(angle + 0x14B0) * val;
|
||||||
o->oPosY = 307.0f;
|
o->oPosY = 307.0f;
|
||||||
@@ -70,7 +70,7 @@ void falling_bowser_plat_act_fall(void) {
|
|||||||
o->oPosX = sBowserFallingPlatform[o->oBehParams2ndByte].posX + sins(angle - 0x14B0) * val;
|
o->oPosX = sBowserFallingPlatform[o->oBehParams2ndByte].posX + sins(angle - 0x14B0) * val;
|
||||||
o->oPosZ = sBowserFallingPlatform[o->oBehParams2ndByte].posZ + coss(angle - 0x14B0) * val;
|
o->oPosZ = sBowserFallingPlatform[o->oBehParams2ndByte].posZ + coss(angle - 0x14B0) * val;
|
||||||
spawn_mist_particles_variable(4, 0, 100);
|
spawn_mist_particles_variable(4, 0, 100);
|
||||||
vec3f_copy_2(&o->oPosX, pos);
|
vec3f_copy(&o->oPosX, pos);
|
||||||
}
|
}
|
||||||
cur_obj_move_using_fvel_and_gravity();
|
cur_obj_move_using_fvel_and_gravity();
|
||||||
if (o->oTimer > 300) {
|
if (o->oTimer > 300) {
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ void bhv_checkerboard_elevator_group_init(void) {
|
|||||||
platformObj = spawn_object_relative(i, 0, i * relativePosY, relativePosZ, o, MODEL_CHECKERBOARD_PLATFORM,
|
platformObj = spawn_object_relative(i, 0, i * relativePosY, relativePosZ, o, MODEL_CHECKERBOARD_PLATFORM,
|
||||||
bhvCheckerboardPlatformSub);
|
bhvCheckerboardPlatformSub);
|
||||||
platformObj->oCheckerBoardPlatformRadius = sCheckerBoardPlatformInitPositions[type].radius;
|
platformObj->oCheckerBoardPlatformRadius = sCheckerBoardPlatformInitPositions[type].radius;
|
||||||
vec3f_copy_2(platformObj->header.gfx.scale, sCheckerBoardPlatformInitPositions[type].scale);
|
vec3f_copy(platformObj->header.gfx.scale, sCheckerBoardPlatformInitPositions[type].scale);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,11 +12,11 @@ void bhv_sl_snowman_wind_loop(void) {
|
|||||||
o->oDistanceToMario = 0;
|
o->oDistanceToMario = 0;
|
||||||
|
|
||||||
// Check if Mario is within 1000 units of the center of the bridge, and ready to speak.
|
// Check if Mario is within 1000 units of the center of the bridge, and ready to speak.
|
||||||
vec3f_copy_2(tempPos, &o->oPosX);
|
vec3f_copy(tempPos, &o->oPosX);
|
||||||
obj_set_pos(o, 1100, 3328, 1164); // Position is in the middle of the ice bridge
|
obj_set_pos(o, 1100, 3328, 1164); // Position is in the middle of the ice bridge
|
||||||
if (cur_obj_can_mario_activate_textbox(1000.0f, 30.0f, 0x7FFF))
|
if (cur_obj_can_mario_activate_textbox(1000.0f, 30.0f, 0x7FFF))
|
||||||
o->oSubAction++;
|
o->oSubAction++;
|
||||||
vec3f_copy_2(&o->oPosX, tempPos);
|
vec3f_copy(&o->oPosX, tempPos);
|
||||||
|
|
||||||
// Mario has come close, begin dialog.
|
// Mario has come close, begin dialog.
|
||||||
} else if (o->oSubAction == SL_SNOWMAN_WIND_ACT_TALKING) {
|
} else if (o->oSubAction == SL_SNOWMAN_WIND_ACT_TALKING) {
|
||||||
|
|||||||
@@ -146,12 +146,12 @@ void king_whomp_on_ground(void) {
|
|||||||
if (o->oHealth == 0)
|
if (o->oHealth == 0)
|
||||||
o->oAction = 8;
|
o->oAction = 8;
|
||||||
else {
|
else {
|
||||||
vec3f_copy_2(pos, &o->oPosX);
|
vec3f_copy(pos, &o->oPosX);
|
||||||
vec3f_copy_2(&o->oPosX, &gMarioObject->oPosX);
|
vec3f_copy(&o->oPosX, &gMarioObject->oPosX);
|
||||||
spawn_mist_particles_variable(0, 0, 100.0f);
|
spawn_mist_particles_variable(0, 0, 100.0f);
|
||||||
spawn_triangle_break_particles(20, MODEL_DIRT_ANIMATION, 3.0f, 4);
|
spawn_triangle_break_particles(20, MODEL_DIRT_ANIMATION, 3.0f, 4);
|
||||||
cur_obj_shake_screen(SHAKE_POS_SMALL);
|
cur_obj_shake_screen(SHAKE_POS_SMALL);
|
||||||
vec3f_copy_2(&o->oPosX, pos);
|
vec3f_copy(&o->oPosX, pos);
|
||||||
}
|
}
|
||||||
o->oSubAction++;
|
o->oSubAction++;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user