diff options
Diffstat (limited to 'src/code')
| -rw-r--r-- | src/code/z_actor.c | 3 | ||||
| -rw-r--r-- | src/code/z_play.c | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/code/z_actor.c b/src/code/z_actor.c index 114afb8ef..4fc55d7a8 100644 --- a/src/code/z_actor.c +++ b/src/code/z_actor.c @@ -2186,7 +2186,8 @@ void Actor_DrawFaroresWindPointer(PlayState* play) { if (D_8015BC18 == 0.0f) { gSaveContext.respawn[RESPAWN_MODE_TOP] = gSaveContext.respawn[RESPAWN_MODE_DOWN]; - gSaveContext.respawn[RESPAWN_MODE_TOP].playerParams = 0x06FF; + gSaveContext.respawn[RESPAWN_MODE_TOP].playerParams = + PLAYER_PARAMS(PLAYER_START_MODE_FARORES_WIND, PLAYER_START_BG_CAM_DEFAULT); gSaveContext.respawn[RESPAWN_MODE_TOP].data = 40; } diff --git a/src/code/z_play.c b/src/code/z_play.c index dc37ab27a..068bc6ee8 100644 --- a/src/code/z_play.c +++ b/src/code/z_play.c @@ -483,8 +483,9 @@ void Play_Init(GameState* thisx) { Camera_InitDataUsingPlayer(&this->mainCamera, player); Camera_RequestMode(&this->mainCamera, CAM_MODE_NORMAL); - playerStartBgCamIndex = PARAMS_GET_U(player->actor.params, 0, 8); - if (playerStartBgCamIndex != 0xFF) { + playerStartBgCamIndex = PLAYER_GET_START_BG_CAM_INDEX(&player->actor); + + if (playerStartBgCamIndex != PLAYER_START_BG_CAM_DEFAULT) { PRINTF("player has start camera ID (" VT_FGCOL(BLUE) "%d" VT_RST ")\n", playerStartBgCamIndex); Camera_RequestBgCam(&this->mainCamera, playerStartBgCamIndex); } @@ -1901,7 +1902,7 @@ void Play_LoadToLastEntrance(PlayState* this) { } void Play_TriggerRespawn(PlayState* this) { - Play_SetupRespawnPoint(this, RESPAWN_MODE_DOWN, 0xDFF); + Play_SetupRespawnPoint(this, RESPAWN_MODE_DOWN, PLAYER_PARAMS(PLAYER_START_MODE_IDLE, PLAYER_START_BG_CAM_DEFAULT)); Play_LoadToLastEntrance(this); } |