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

OnePointDemo OK (#719)

Browse source 
* matches

* more matches

* progress?

* it's time

* so close

* organize declarations

* docs

* more fixes

* more fixes

* fix stage 1

* more fixes

* first try

* demo ids in decimal

* final cleanup

* one more thing

* fixes

* more cleanup

* onepointcs

* OnePointCutscene

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
This commit is contained in:
petrie911 2021-03-31 11:18:31 -05:00 • committed by GitHub
parent 28cfd82a4f
commit 9b4482314a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
233 changed files with 3949 additions and 7571 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/overlays/actors/ovl_En_Kakasi3/z_en_kakasi3.c
View file

@ -213,12 +213,10 @@ void func_80A91284(EnKakasi3* this, GlobalContext* globalCtx) {
void func_80A91348(EnKakasi3* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
s16 angleTowardsLink;
s16 absAngleTowardsLink;
func_80A90E28(this);
SkelAnime_Update(&this->skelAnime);
this->camId = -1;
this->camId = SUBCAM_NONE;
if (func_8002F194(&this->actor, globalCtx)) {
if (!this->unk_194) {
if (this->unk_1A8 == 0) {
@ -229,46 +227,46 @@ void func_80A91348(EnKakasi3* this, GlobalContext* globalCtx) {
} else {
this->actionFunc = func_80A91284;
}
return;
}
} else {
s16 angleTowardsLink = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
angleTowardsLink = this->actor.yawTowardsPlayer - this->actor.shape.rot.y;
if (!(this->actor.xzDistToPlayer > 120.0f)) {
absAngleTowardsLink = ABS(angleTowardsLink);
if (!(this->actor.xzDistToPlayer > 120.0f)) {
s16 absAngleTowardsLink = ABS(angleTowardsLink);
if (absAngleTowardsLink < 0x4300) {
if (!this->unk_194) {
if (absAngleTowardsLink < 0x4300) {
if (!this->unk_194) {
if (player->stateFlags2 & 0x1000000) {
this->camId = func_800800F8(globalCtx, 0x8D4, -0x63, &this->actor, 0);
globalCtx->msgCtx.msgMode = 0x37;
this->dialogState = 5;
this->unk_1B8 = 0.0f;
func_8010B680(globalCtx, 0x40A4, NULL);
player->stateFlags2 |= 0x800000;
this->actionFunc = func_80A915B8;
return;
}
if (this->actor.xzDistToPlayer < 80.0f) {
player->stateFlags2 |= 0x800000;
}
} else if (gSaveContext.scarecrowSpawnSongSet && !this->unk_195) {
if (player->stateFlags2 & 0x1000000) {
this->camId = OnePointCutscene_Init(globalCtx, 2260, -99, &this->actor, MAIN_CAM);
globalCtx->msgCtx.msgMode = 0x37;
this->dialogState = 5;
this->unk_1B8 = 0.0f;
func_8010B680(globalCtx, 0x40A4, NULL);
player->stateFlags2 |= 0x800000;
this->actionFunc = func_80A915B8;
return;
}
if (this->actor.xzDistToPlayer < 80.0f) {
player->stateFlags2 |= 0x800000;
}
} else if (gSaveContext.scarecrowSpawnSongSet && !this->unk_195) {
if (player->stateFlags2 & 0x1000000) {
this->camId = func_800800F8(globalCtx, 0x8D4, -0x63, &this->actor, 0);
globalCtx->msgCtx.msgMode = 0x37;
this->dialogState = 5;
this->unk_1B8 = 0.0f;
func_8010B680(globalCtx, 0x40A8, NULL);
player->stateFlags2 |= 0x800000;
this->actionFunc = func_80A9187C;
return;
}
if (this->actor.xzDistToPlayer < 80.0f) {
player->stateFlags2 |= 0x800000;
if (player->stateFlags2 & 0x1000000) {
this->camId = OnePointCutscene_Init(globalCtx, 2260, -99, &this->actor, MAIN_CAM);
globalCtx->msgCtx.msgMode = 0x37;
this->dialogState = 5;
this->unk_1B8 = 0.0f;
func_8010B680(globalCtx, 0x40A8, NULL);
player->stateFlags2 |= 0x800000;
this->actionFunc = func_80A9187C;
return;
}
if (this->actor.xzDistToPlayer < 80.0f) {
player->stateFlags2 |= 0x800000;
}
}
func_8002F2CC(&this->actor, globalCtx, 100.0f);
}
func_8002F2CC(&this->actor, globalCtx, 100.0f);
}
}
}
@ -288,11 +286,11 @@ void func_80A91620(EnKakasi3* this, GlobalContext* globalCtx) {
if ((globalCtx->msgCtx.unk_E3EE == 4 || (globalCtx->msgCtx.unk_E3EE >= 5 && globalCtx->msgCtx.unk_E3EE < 11)) &&
(globalCtx->msgCtx.msgMode == 0)) {
func_800803F0(globalCtx, this->camId);
OnePointCutscene_EndCutscene(globalCtx, this->camId);
if (globalCtx->cameraPtrs[this->camId] == NULL) {
this->camId = -1;
this->camId = SUBCAM_NONE;
}
if (this->camId != -1) {
if (this->camId != SUBCAM_NONE) {
func_8005B1A4(globalCtx->cameraPtrs[this->camId]);
}
this->actionFunc = func_80A911F0;
@ -321,7 +319,7 @@ void func_80A91760(EnKakasi3* this, GlobalContext* globalCtx) {
globalCtx->msgCtx.msgMode = 0x37;
func_8010BD58(globalCtx, 0x2D);
this->actionFunc = func_80A917FC;
this->camId = func_800800F8(globalCtx, 0x8E8, -0x63, &this->actor, 0);
this->camId = OnePointCutscene_Init(globalCtx, 2280, -99, &this->actor, MAIN_CAM);
}
}
@ -332,7 +330,7 @@ void func_80A917FC(EnKakasi3* this, GlobalContext* globalCtx) {
} else {
globalCtx->msgCtx.unk_E3EE = 4;
func_80106CCC(globalCtx);
func_800803F0(globalCtx, this->camId);
OnePointCutscene_EndCutscene(globalCtx, this->camId);
this->actionFunc = func_80A911F0;
}
}
@ -358,8 +356,8 @@ void func_80A918E4(EnKakasi3* this, GlobalContext* globalCtx) {
func_8010B680(globalCtx, 0x40A6, NULL);
this->dialogState = 5;
func_800803F0(globalCtx, this->camId);
this->camId = -1;
OnePointCutscene_EndCutscene(globalCtx, this->camId);
this->camId = SUBCAM_NONE;
func_8002DF54(globalCtx, NULL, 8);
this->actionFunc = func_80A91A90;
return;
@ -399,9 +397,9 @@ void func_80A91A90(EnKakasi3* this, GlobalContext* globalCtx) {
}
}
if (globalCtx->cameraPtrs[this->camId] == NULL) {
this->camId = -1;
this->camId = SUBCAM_NONE;
}
if (this->camId != -1) {
if (this->camId != SUBCAM_NONE) {
func_8005B1A4(globalCtx->cameraPtrs[this->camId]);
}
func_80106CCC(globalCtx);