mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

Introduce Player csMode enum (#1462)

Browse source 
* player csmode enum

* cleanup

* missed one, player2

* spell out enum name

* use CSMODE_MAX for data
This commit is contained in:
engineer124 2022-12-12 22:22:56 -05:00 • committed by GitHub
parent 0aff024c01
commit aa48c66e10
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
63 changed files with 655 additions and 535 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_fHG/z_en_fhg.c
View file

@ -151,7 +151,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
break;
}
func_80064520(play, &play->csCtx);
func_8002DF54(play, &this->actor, 8);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
@ -192,7 +192,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
Audio_PlayActorSfx2(&this->actor, NA_SE_EV_GANON_HORSE_GROAN);
}
if (this->timers[0] == 20) {
func_8002DF54(play, &this->actor, 9);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_9);
}
if (this->timers[0] == 1) {
SEQCMD_PLAY_SEQUENCE(SEQ_PLAYER_BGM_MAIN, 0, 0, NA_BGM_OPENING_GANON);
@ -354,7 +354,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
this->bossGndSignal = FHG_FINISH;
}
if (this->timers[0] == 170) {
func_8002DF54(play, &this->actor, 8);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
Audio_PlayActorSfx2(&this->actor, NA_SE_EN_FANTOM_MASIC2);
}
Math_ApproachF(&this->subCamEye.z, this->subCamPanZ + (GND_BOSSROOM_CENTER_Z + 100.0f), 0.1f,
@ -400,7 +400,7 @@ void EnfHG_Intro(EnfHG* this, PlayState* play) {
func_800C08AC(play, this->subCamId, 0);
this->subCamId = SUB_CAM_ID_DONE;
func_80064534(play, &play->csCtx);
func_8002DF54(play, &this->actor, 7);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_7);
this->actionFunc = EnfHG_Retreat;
}
break;