Only remove the offset when it\'s not a door warp (#164)

This commit is contained in:
wRadion 2022-08-26 02:37:30 +02:00 committed by GitHub
parent 101d6f6e8d
commit 0cbcdf508b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -438,7 +438,7 @@ void init_mario_after_warp(void) {
set_mario_initial_action(gMarioState, marioSpawnType, sWarpDest.arg); set_mario_initial_action(gMarioState, marioSpawnType, sWarpDest.arg);
// remove offset from local mario during warps // remove offset from local mario during warps
if (sWarpDest.type == WARP_TYPE_SAME_AREA) { if (sWarpDest.type == WARP_TYPE_SAME_AREA && marioSpawnType != MARIO_SPAWN_DOOR_WARP) {
gMarioState[0].pos[0] = (s16)spawnNode->object->oPosX; gMarioState[0].pos[0] = (s16)spawnNode->object->oPosX;
gMarioState[0].pos[1] = (s16)spawnNode->object->oPosY; gMarioState[0].pos[1] = (s16)spawnNode->object->oPosY;
gMarioState[0].pos[2] = (s16)spawnNode->object->oPosZ; gMarioState[0].pos[2] = (s16)spawnNode->object->oPosZ;