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

56
src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -196,7 +196,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
objectIdx = Object_GetIndex(&play->objectCtx, OBJECT_GANON_ANIME3);
if (Object_IsLoaded(&play->objectCtx, objectIdx)) {
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);
@ -267,11 +267,11 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
}
if (this->unk_398 == 40) {
sZelda->unk_3C8 = 1;
func_8002DF54(play, &this->actor, 0x4E);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_78);
}
if (this->unk_398 == 85) {
sZelda->unk_3C8 = 2;
func_8002DF54(play, &this->actor, 0x4F);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_79);
}
this->subCamEye.x = 930.0f;
this->subCamEye.y = 1129.0f;
@ -300,14 +300,14 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
}
if (this->unk_398 == 20) {
sZelda->unk_3C8 = 3;
func_8002DF54(play, &this->actor, 0x50);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_80);
}
if (this->unk_398 == 55) {
this->unk_39C = 4;
this->unk_398 = 0;
this->unk_410.x = 0.0f;
sZelda->unk_3C8 = 4;
func_8002DF54(play, &this->actor, 0x50);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_80);
}
break;
case 4:
@ -324,7 +324,7 @@ void func_808FD5F4(BossGanon2* 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->unk_39C = 5;
this->unk_398 = 0;
}
@ -371,7 +371,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
}
if (this->unk_398 == 30) {
sZelda->unk_3C8 = 5;
func_8002DF54(play, &this->actor, 0x51);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_81);
}
if (this->unk_398 == 50) {
this->unk_398 = 0;
@ -402,7 +402,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
func_80078884(NA_SE_EV_STONE_BOUND);
}
if (this->unk_398 == 30) {
func_8002DF54(play, &this->actor, 0x52);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_82);
}
if (this->unk_398 == 50) {
this->unk_398 = 0;
@ -469,7 +469,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->subCamAt.y = player->actor.world.pos.y;
this->subCamAt.z = player->actor.world.pos.z - 200.0f;
if (this->unk_398 == 20) {
func_8002DF54(play, &this->actor, 0x1E);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_30);
}
if (this->unk_398 == 60) {
this->subCamEye.x = (this->actor.world.pos.x + 200.0f) - 154.0f;
@ -558,7 +558,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
SkelAnime_Free(&this->skelAnime, play);
SkelAnime_InitFlex(play, &this->skelAnime, &gGanonSkel, NULL, NULL, NULL, 0);
BossGanon2_SetObjectSegment(this, play, OBJECT_GANON_ANIME3, false);
func_8002DF54(play, &this->actor, 0x54);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_84);
this->unk_314 = 3;
}
// fake, tricks the compiler into using stack the way we need it to
@ -614,7 +614,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->actor.world.pos.x += 250;
this->actor.world.pos.y = 1886.0f;
this->unk_394 = 0.0f;
func_8002DF54(play, &this->actor, 0x53);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_83);
this->unk_30C = 5.0f;
this->unk_228 = 1.0f;
}
@ -699,7 +699,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
if (this->unk_398 == 215) {
this->unk_39C = 23;
this->unk_224 = 0.0f;
func_8002DF54(play, &this->actor, 0x55);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_85);
}
break;
case 23:
@ -719,7 +719,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
this->subCamAt.z = player->actor.world.pos.z;
if (this->unk_398 == 228) {
func_80078884(NA_SE_IT_SHIELD_REFLECT_SW);
func_8002DF54(play, &this->actor, 0x56);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_86);
Rumble_Override(0.0f, 255, 10, 50);
}
if (this->unk_398 >= 229) {
@ -756,7 +756,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
func_80078884(NA_SE_IT_SWORD_SWING);
}
if (this->unk_398 == 25) {
func_8002DF54(play, &this->actor, 0x57);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_87);
this->unk_39C = 25;
this->unk_398 = 0;
}
@ -804,7 +804,7 @@ void func_808FD5F4(BossGanon2* this, PlayState* play) {
case 27:
this->subCamUp.z = 0.0f;
if (this->unk_398 == 4) {
func_8002DF54(play, &this->actor, 0x58);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_88);
}
this->subCamEye.x = player->actor.world.pos.x - 20.0f;
this->subCamEye.y = player->actor.world.pos.y + 50.0f;
@ -877,7 +877,7 @@ void func_808FD5F4(BossGanon2* 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->unk_39C = 0;
this->unk_337 = 1;
func_808FFDB0(this, play);
@ -1299,7 +1299,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
func_8002DF54(play, &this->actor, 8);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
this->unk_39C = 1;
this->subCamEye = mainCam1->eye;
this->subCamAt = mainCam1->at;
@ -1348,7 +1348,7 @@ void func_80900890(BossGanon2* 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->unk_39C = 3;
}
break;
@ -1359,7 +1359,7 @@ void func_80900890(BossGanon2* this, PlayState* play) {
Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
this->unk_39C = 11;
this->unk_334 = 1;
func_8002DF54(play, &this->actor, 0x60);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_96);
this->unk_398 = 0;
FALLTHROUGH;
case 11:
@ -1381,7 +1381,7 @@ void func_80900890(BossGanon2* 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);
}
break;
}
@ -1485,7 +1485,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->subCamId = Play_CreateSubCamera(play);
Play_ChangeCameraStatus(play, CAM_ID_MAIN, CAM_STAT_WAIT);
Play_ChangeCameraStatus(play, this->subCamId, CAM_STAT_ACTIVE);
func_8002DF54(play, &this->actor, 8);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_8);
this->unk_39C = 1;
this->unk_398 = 0;
sZelda->unk_3C8 = 9;
@ -1522,7 +1522,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->skelAnime.playSpeed = 3.0f;
}
if (this->unk_398 == 120) {
func_8002DF54(play, &this->actor, 0x63);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_99);
}
this->actor.world.rot.y = 0x4000;
this->actor.world.pos.x = this->actor.world.pos.z = 0.0f;
@ -1590,7 +1590,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->unk_39C = 5;
this->unk_398 = 40;
this->skelAnime.playSpeed = 1.0f;
func_8002DF54(play, &this->actor, 0x64);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_100);
}
break;
case 5:
@ -1604,10 +1604,10 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
Math_ApproachZeroF(&this->unk_38C, 1.0f, 8.0f);
}
if (this->unk_398 == 70) {
func_8002DF54(play, &this->actor, 0x65);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_101);
}
if (this->unk_398 == 150) {
func_8002DF54(play, &this->actor, 0x66);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_102);
}
this->unk_30C = 10.0f;
player->actor.world.pos.x = 250.0f;
@ -1626,7 +1626,7 @@ void func_8090120C(BossGanon2* 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->unk_39C = 6;
}
break;
@ -1645,7 +1645,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
this->unk_398 = 0;
Animation_MorphToPlayOnce(&this->skelAnime, &gGanonFinalBlowAnim, 0.0f);
this->unk_194 = Animation_GetLastFrame(&gGanonFinalBlowAnim);
play->startPlayerCutscene(play, &this->actor, 0x61);
play->startPlayerCutscene(play, &this->actor, PLAYER_CSMODE_97);
} else {
break;
}
@ -1712,7 +1712,7 @@ void func_8090120C(BossGanon2* this, PlayState* play) {
if (this->unk_398 == 55) {
Animation_MorphToPlayOnce(&this->skelAnime, &gGanonDeadStartAnim, 0.0f);
this->unk_194 = Animation_GetLastFrame(&gGanonDeadStartAnim);
func_8002DF54(play, &this->actor, 0x62);
func_8002DF54(play, &this->actor, PLAYER_CSMODE_98);
this->unk_39C = 8;
this->unk_398 = 1000;
}