Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Small quality of life changes" 

This reverts commit 05dd235cd0.
This commit is contained in:
Sunk 2023-02-11 15:18:01 -05:00
parent f40e714cb8
commit b229d2d79d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/sm74/main.lua
View File

@ -29,7 +29,7 @@ gBehaviorValues.dialogs.KoopaQuickThiWinDialog = DIALOG_031
-- force server settings -- -- force server settings --
--------------------------- ---------------------------
gServerSettings.skipIntro = 1 gLevelValues.fixCollisionBugs = 1
-------------- --------------
-- movtexs -- -- movtexs --

4
src/game/mario_actions_automatic.c
View File

@ -1047,7 +1047,9 @@ s32 act_bubbled(struct MarioState* m) {
m->health = 0x100; m->health = 0x100;
m->marioObj->oIntangibleTimer = 0; m->marioObj->oIntangibleTimer = 0;
m->peakHeight = m->pos[1]; m->peakHeight = m->pos[1];
mario_set_forward_vel(m, 0.0f); m->vel[0] = 0;
m->vel[1] = 0;
m->vel[2] = 0;
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE; m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
if (m->playerIndex == 0) { if (m->playerIndex == 0) {
soft_reset_camera(m->area->camera); soft_reset_camera(m->area->camera);