mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-11 01:10:33 +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

14
src/overlays/actors/ovl_En_Zl4/z_en_zl4.c
View file

@ -183,7 +183,7 @@ static struct_80034EC0_Entry sAnimationEntries[] = {
void EnZl4_SetCsCameraAngle(GlobalContext* globalCtx, s16 index) {
Camera* activeCam = ACTIVE_CAM;
Camera_ChangeSetting(activeCam, 0x21);
Camera_ChangeSetting(activeCam, CAM_SET_FREE0);
activeCam->at = sCsCameraAngle[index].at;
activeCam->eye = activeCam->eyeNext = sCsCameraAngle[index].eye;
activeCam->roll = sCsCameraAngle[index].roll;
@ -194,7 +194,7 @@ void EnZl4_SetCsCameraMove(GlobalContext* globalCtx, s16 index) {
Camera* activeCam = ACTIVE_CAM;
Player* player = PLAYER;
Camera_ChangeSetting(activeCam, 0x25);
Camera_ChangeSetting(activeCam, CAM_SET_DEMO0);
Camera_ResetAnim(activeCam);
Camera_SetCSParams(activeCam, sCsCameraMove[index].atPoints, sCsCameraMove[index].eyePoints, player,
sCsCameraMove[index].relativeToPlayer);
@ -896,9 +896,9 @@ s32 EnZl4_CsLookWindow(EnZl4* this, GlobalContext* globalCtx) {
this->talkState++;
break;
case 1:
if (globalCtx->csCtx.state != 0) {
if (globalCtx->csCtx.state != CS_STATE_IDLE) {
if (globalCtx->csCtx.frames == 90) {
globalCtx->csCtx.state = 3;
globalCtx->csCtx.state = CS_STATE_UNSKIPPABLE_INIT;
}
} else {
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(gZeldasCourtyardGanonCs);
@ -908,9 +908,9 @@ s32 EnZl4_CsLookWindow(EnZl4* this, GlobalContext* globalCtx) {
}
break;
case 2:
if (globalCtx->csCtx.state != 0) {
if (globalCtx->csCtx.state != CS_STATE_IDLE) {
if (globalCtx->csCtx.frames == 209) {
globalCtx->csCtx.state = 3;
globalCtx->csCtx.state = CS_STATE_UNSKIPPABLE_INIT;
}
} else {
func_800AA000(0.0f, 0xA0, 0xA, 0x28);
@ -1098,7 +1098,7 @@ s32 EnZl4_CsMakePlan(EnZl4* this, GlobalContext* globalCtx) {
if (!((func_8010BDBC(&globalCtx->msgCtx) == 5) && func_80106BC8(globalCtx))) {
break;
} else {
Camera_ChangeSetting(globalCtx->cameraPtrs[globalCtx->activeCamera], 1);
Camera_ChangeSetting(ACTIVE_CAM, 1);
this->talkState = 7;
globalCtx->talkWithPlayer(globalCtx, &this->actor);
func_8002F434(&this->actor, globalCtx, GI_LETTER_ZELDA, fabsf(this->actor.xzDistToPlayer) + 1.0f,