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

Classic mode bugfix

Browse Source 
oopsiedaisy
This commit is contained in:
Fazana
2021-08-04 15:20:35 +01:00
parent 0a816814a5
commit 8be1e09124
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/mario.c
View File

@@ -1400,6 +1400,12 @@ void update_mario_inputs(struct MarioState *m) {
m->collidedObjInteractTypes = m->marioObj->collidedObjInteractTypes;
m->flags &= 0xFFFFFF;
if (gPuppyCam.mode3Flags & PUPPYCAM_MODE3_ENTER_FIRST_PERSON)
{
m->input = INPUT_FIRST_PERSON;
return;
}
update_mario_button_inputs(m);
update_mario_joystick_inputs(m);
update_mario_geometry_inputs(m);
@@ -1417,7 +1423,7 @@ void update_mario_inputs(struct MarioState *m) {
if (!(m->input & (INPUT_NONZERO_ANALOG | INPUT_A_PRESSED))) {
m->input |= INPUT_UNKNOWN_5;
}
// These 3 flags are defined by Bowser stomping attacks
if (m->marioObj->oInteractStatus
& (INT_STATUS_MARIO_STUNNED | INT_STATUS_MARIO_KNOCKBACK_DMG | INT_STATUS_MARIO_SHOCKWAVE)) {