mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-21 22:41:14 +00:00
parent
092f602638
commit
2cb4ff4fd3
66 changed files with 737 additions and 734 deletions
|
@ -558,7 +558,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
|
|||
this->actor.shape.rot.y = 0;
|
||||
|
||||
Cutscene_StartManual(play, &play->csCtx);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_8);
|
||||
this->csCamIndex = Play_CreateSubCamera(play);
|
||||
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT);
|
||||
Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
|
||||
|
@ -600,7 +600,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
|
|||
BossGanon_SetIntroCsCamera(this, 1);
|
||||
|
||||
if (this->csTimer == 10) {
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_5);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_5);
|
||||
}
|
||||
|
||||
if (this->csTimer == 13) {
|
||||
|
@ -633,7 +633,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
|
|||
break;
|
||||
}
|
||||
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_8);
|
||||
this->csState = 4;
|
||||
BossGanon_SetIntroCsCamera(this, 2);
|
||||
this->csTimer = 0;
|
||||
|
@ -665,7 +665,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
|
|||
}
|
||||
|
||||
if (this->csTimer == 10) {
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_75);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_75);
|
||||
}
|
||||
|
||||
if (this->csTimer == 70) {
|
||||
|
@ -731,7 +731,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
|
|||
|
||||
this->csState = 9;
|
||||
this->csTimer = 0;
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_8);
|
||||
sZelda->unk_3C8 = 0;
|
||||
this->triforceType = GDF_TRIFORCE_ZELDA;
|
||||
this->fwork[GDF_TRIFORCE_SCALE] = 10.0f;
|
||||
|
@ -785,7 +785,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
|
|||
player->actor.world.pos.z = 20.0f;
|
||||
|
||||
if (this->csTimer == 20) {
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_23);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_23);
|
||||
Interface_ChangeHudVisibilityMode(HUD_VISIBILITY_HEARTS);
|
||||
}
|
||||
|
||||
|
@ -1005,7 +1005,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
|
|||
}
|
||||
|
||||
if (this->csTimer == 30) {
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_74);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_74);
|
||||
}
|
||||
|
||||
if (this->csTimer <= 50) {
|
||||
|
@ -1128,7 +1128,7 @@ void BossGanon_IntroCutscene(BossGanon* this, PlayState* play) {
|
|||
Play_ReturnToMainCam(play, this->csCamIndex, 0);
|
||||
this->csState = this->csCamIndex = 0;
|
||||
Cutscene_StopManual(play, &play->csCtx);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_7);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_7);
|
||||
BossGanon_SetupWait(this, play);
|
||||
}
|
||||
|
||||
|
@ -1234,7 +1234,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
|
|||
switch (this->csState) {
|
||||
case 0:
|
||||
Cutscene_StartManual(play, &play->csCtx);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_8);
|
||||
this->csCamIndex = Play_CreateSubCamera(play);
|
||||
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT);
|
||||
Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
|
||||
|
@ -1469,7 +1469,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
|
|||
Actor_PlaySfx(&this->actor, NA_SE_EN_GANON_BODY_SPARK - SFX_FLAG);
|
||||
|
||||
if (this->csTimer == 2) {
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_57);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_57);
|
||||
}
|
||||
|
||||
if (this->csTimer > 50) {
|
||||
|
@ -1505,7 +1505,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
|
|||
|
||||
case 100:
|
||||
Cutscene_StartManual(play, &play->csCtx);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_8);
|
||||
this->csCamIndex = Play_CreateSubCamera(play);
|
||||
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT);
|
||||
Play_ChangeCameraStatus(play, this->csCamIndex, CAM_STAT_ACTIVE);
|
||||
|
@ -1594,11 +1594,11 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
|
|||
this->csCamAt.z = -135.0f;
|
||||
|
||||
if (this->csTimer == 5) {
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_76);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_76);
|
||||
}
|
||||
|
||||
if (this->csTimer == 70) {
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_77);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_77);
|
||||
}
|
||||
|
||||
if (this->csTimer == 90) {
|
||||
|
@ -1683,7 +1683,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
|
|||
|
||||
if (this->csTimer == 20) {
|
||||
sZelda->unk_3C8 = 5;
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_57);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_57);
|
||||
}
|
||||
|
||||
if (this->csTimer == 40) {
|
||||
|
@ -1750,7 +1750,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
|
|||
this->csState = 107;
|
||||
this->csTimer = 0;
|
||||
Message_StartTextbox(play, 0x70D2, NULL);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_57);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_57);
|
||||
}
|
||||
break;
|
||||
|
||||
|
@ -1792,7 +1792,7 @@ void BossGanon_DeathAndTowerCutscene(BossGanon* this, PlayState* play) {
|
|||
this->csState = 109;
|
||||
this->csCamIndex = 0;
|
||||
Cutscene_StopManual(play, &play->csCtx);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSMODE_7);
|
||||
func_8002DF54(play, &this->actor, PLAYER_CSACTION_7);
|
||||
Flags_SetSwitch(play, 0x37);
|
||||
}
|
||||
break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue