From a448168d372113e6251afba25153f2065a4caabf Mon Sep 17 00:00:00 2001 From: engineer124 <47598039+engineer124@users.noreply.github.com> Date: Sat, 23 Nov 2024 12:04:34 +1100 Subject: Player Docs: Rename Init Mode to Start Mode (#1744) * rename to start mode * cleanup * rm declarations --- src/code/z_player_lib.c | 2 +- src/code/z_scene.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/code') diff --git a/src/code/z_player_lib.c b/src/code/z_player_lib.c index 55f89a3eb..ce3ba3c87 100644 --- a/src/code/z_player_lib.c +++ b/src/code/z_player_lib.c @@ -80,7 +80,7 @@ void func_80127B64(struct_801F58B0 arg0[], s32 count, Vec3f* arg2); s32 func_801226E0(PlayState* play, s32 arg1) { if (arg1 == 0) { - Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, PLAYER_PARAMS(0xFF, PLAYER_INITMODE_B)); + Play_SetupRespawnPoint(play, RESPAWN_MODE_DOWN, PLAYER_PARAMS(0xFF, PLAYER_START_MODE_B)); if (play->sceneId == SCENE_KAKUSIANA) { return 1; } diff --git a/src/code/z_scene.c b/src/code/z_scene.c index 624916357..921031bf0 100644 --- a/src/code/z_scene.c +++ b/src/code/z_scene.c @@ -162,9 +162,9 @@ void Scene_CommandSpawnList(PlayState* play, SceneCmd* cmd) { play->linkActorEntry = (ActorEntry*)Lib_SegmentedToVirtual(cmd->spawnList.segment) + play->setupEntranceList[play->curSpawn].spawn; - if ((PLAYER_GET_INITMODE(play->linkActorEntry) == PLAYER_INITMODE_TELESCOPE) || - ((gSaveContext.respawnFlag == 2) && - (gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams == PLAYER_PARAMS(0xFF, PLAYER_INITMODE_TELESCOPE)))) { + if ((PLAYER_GET_START_MODE(play->linkActorEntry) == PLAYER_START_MODE_TELESCOPE) || + ((gSaveContext.respawnFlag == 2) && (gSaveContext.respawn[RESPAWN_MODE_RETURN].playerParams == + PLAYER_PARAMS(0xFF, PLAYER_START_MODE_TELESCOPE)))) { // Skull Kid Object Object_SpawnPersistent(&play->objectCtx, OBJECT_STK); return; -- cgit v1.2.3