print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Small fix

Browse Source
This commit is contained in:
Arceveti
2021-09-20 17:25:24 -07:00
parent eedca61a73
commit 022679b8b7
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/game/behaviors/lll_octagonal_rotating_mesh.inc.c
View File

@@ -50,7 +50,7 @@ s32 lll_octagonal_mesh_move(struct LllOctagonalMeshAction *actionTable, s32 acti
o->oMoveAngleYaw = action->moveAngle;
o->oForwardVel = action->forwardVel / 100.0f;
if (cur_obj_is_mario_on_platform()) {
actionOffset += 4;
actionOffset++;
o->oTimer = 0;
}
break;
@@ -58,14 +58,14 @@ s32 lll_octagonal_mesh_move(struct LllOctagonalMeshAction *actionTable, s32 acti
o->oMoveAngleYaw = action->moveAngle;
o->oForwardVel = action->forwardVel / 100.0f;
if (o->oTimer > action->time) {
actionOffset += 4;
actionOffset++;
o->oTimer = 0;
}
break;
case LLL_OCTMESH_CHANGE_DIR:
approach_f32_signed(&o->oForwardVel, action->moveAngle / 100.0f, action->forwardVel / 100.0f);
if (o->oTimer > action->time) {
actionOffset += 4;
actionOffset++;
o->oTimer = 0;
}
break;

4
src/game/mario.c
View File

@@ -1691,7 +1691,7 @@ UNUSED static void debug_update_mario_cap(u16 button, s32 flags, u16 capTimer, u
}
#if ENABLE_RUMBLE
void func_sh_8025574C(void) {
void queue_rumble_particles(void) {
if (gMarioState->particleFlags & PARTICLE_HORIZONTAL_STAR) {
queue_rumble_data(5, 80);
} else if (gMarioState->particleFlags & PARTICLE_VERTICAL_STAR) {
@@ -1787,7 +1787,7 @@ s32 execute_mario_action(UNUSED struct Object *o) {
play_infinite_stairs_music();
gMarioState->marioObj->oInteractStatus = 0;
#if ENABLE_RUMBLE
func_sh_8025574C();
queue_rumble_particles();
#endif
return gMarioState->particleFlags;