Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow bubbled players to go through vanish cap walls

This commit is contained in:
MysterD 2020-09-24 18:54:30 -07:00
parent 3762c68fef
commit 9a91dfa453
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/mario.c
View File

@ -397,6 +397,8 @@ void mario_set_bubbled(struct MarioState* m) {
gCamera->cutscene = 0; gCamera->cutscene = 0;
m->statusForCamera->action = m->action; m->statusForCamera->action = m->action;
m->statusForCamera->cameraEvent = 0; m->statusForCamera->cameraEvent = 0;
m->marioObj->activeFlags |= ACTIVE_FLAG_MOVE_THROUGH_GRATE;
extern s16 gCutsceneTimer; extern s16 gCutsceneTimer;
gCutsceneTimer = 0; gCutsceneTimer = 0;

1
src/game/mario_actions_automatic.c
View File

@ -942,6 +942,7 @@ s32 act_bubbled(struct MarioState* m) {
// pop bubble // pop bubble
if (m->playerIndex == 0 && distanceToPlayer < 120 && is_player_active(targetMarioState) && m->numLives != -1) { if (m->playerIndex == 0 && distanceToPlayer < 120 && is_player_active(targetMarioState) && m->numLives != -1) {
m->marioObj->activeFlags &= ~ACTIVE_FLAG_MOVE_THROUGH_GRATE;
m->hurtCounter = 0; m->hurtCounter = 0;
m->healCounter = 31; m->healCounter = 31;
m->health = 0x100; m->health = 0x100;