Merge branch 'unstable' of github.com:sm64ex-coop-dev/sm64ex-coop into unstable

This commit is contained in:
MysterD 2022-02-20 20:20:16 -08:00
commit 3ea8ff960c

View file

@ -1083,7 +1083,7 @@ s32 act_first_person(struct MarioState *m) {
s16 sp1A = m->statusForCamera->headRotation[0]; s16 sp1A = m->statusForCamera->headRotation[0];
s16 sp18 = ((m->statusForCamera->headRotation[1] * 4) / 3) + m->faceAngle[1]; s16 sp18 = ((m->statusForCamera->headRotation[1] * 4) / 3) + m->faceAngle[1];
if (sp1A == -0x1800 && (sp18 < -0x6FFF || sp18 >= 0x7000)) { if (sp1A == -0x1800 && (sp18 < -0x6FFF || sp18 >= 0x7000)) {
level_trigger_warp(m, WARP_OP_UNKNOWN_01); level_trigger_warp(m, WARP_OP_LOOK_UP);
} }
} }