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

z_demo documentation (#1327)

Browse source 
* commit old stuff

* progress

* progress

* progress

* progress

* more progress, renaming cues next

* small changes

* enum values added for all actions

* hardcoded values removed when possible

* commands renamed

* first pass of action -> cue

* fix some matches

* some more cleanup

* scriptPtr

* forgot one

* remove cue rot union

* more changes

* some more stuff

* more stuff

* fix matching issues

* some more things

* progress, starting to rename destinations

* small changes

* name some destinations

* more names

* need to switch branch

* progress

* first pass of destination names

* usages fixed

* use destination enum

* fix csdis

* format

* command descriptions

* revert accidental zap changes

* forgot some things

* use a single macro for CutsceneCameraPoint (idk why i didnt think of this sooner)

* typo

* review1

* clarify ruby/sapphire comment

* remove endframe for commands that dont use it

* some more review

* most review, but not all

* scriptPtr -> script, and another small change

* ocarina action

* remove +1 from light settings command, change comment

* actionIndex -> cueIdTemp (i guess)

* _SetCueX -> _SetXFromCue

* format

* tweak fade out seq arg names

* use spline terminology

* more dragorn and engineer review

* misc start/end frame note

* cleanup StartPosRotFromCue vs PosRotFromCue

* cleanup spline terminology

* sPrevCamId -> sReturnToCamId

* comment on debug cs data address

* Cutscene_Init -> Cutscene_InitContext

* single point types are not a list

* remove todo comment

* some more review

* rumble struct names

* some review

* more review

* missed one

* reword pointer comment

* even more review

* match transition terminology with z_play

* change condition and format

* frame count

* command specific structs with alignment

* anon review

* remove unneeded arg from time macro

* yeet `CsCmdGeneric`

* remove unused from single point types

* typo

* compromise attempt -- name endFrame everywhere

* fixes

* fix again

* copied the wrong note

* cutscene data note

* review, format

* compat defines

* idk whats going on man

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
This commit is contained in:
fig02 2022-12-24 13:55:17 -05:00 • committed by GitHub
parent 92e03cf747
commit 7927e7b330
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
130 changed files with 6392 additions and 5954 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -52,7 +52,7 @@ void func_80A01FE0(EnElf* this, PlayState* play);
void func_80A04414(EnElf* this, PlayState* play);
void func_80A0461C(EnElf* this, PlayState* play);
void EnElf_SpawnSparkles(EnElf* this, PlayState* play, s32 sparkleLife);
void EnElf_GetCutsceneNextPos(Vec3f* vec, PlayState* play, s32 action);
void EnElf_GetCuePos(Vec3f* dest, PlayState* play, s32 cueChannel);
ActorInit En_Elf_InitVars = {
ACTOR_EN_ELF,
@ -846,10 +846,10 @@ void func_80A03CF8(EnElf* this, PlayState* play) {
xScale = 0.0f;
if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.npcActions[8] != NULL)) {
EnElf_GetCutsceneNextPos(&nextPos, play, 8);
if ((play->csCtx.state != CS_STATE_IDLE) && (play->csCtx.actorCues[8] != NULL)) {
EnElf_GetCuePos(&nextPos, play, 8);
if (play->csCtx.npcActions[8]->action == 5) {
if (play->csCtx.actorCues[8]->id == 5) {
if (1) {}
EnElf_SpawnSparkles(this, play, 16);
}
@ -865,7 +865,7 @@ void func_80A03CF8(EnElf* this, PlayState* play) {
if ((play->sceneId == SCENE_LINKS_HOUSE) && (gSaveContext.sceneLayer == 4)) {
// play dash sound effect as Navi enters Links house in the intro
if (1) {}
if (play->csCtx.frames == 55) {
if (play->csCtx.curFrame == 55) {
Actor_PlaySfx(&this->actor, NA_SE_EV_FAIRY_DASH);
}
@ -1059,8 +1059,8 @@ void func_80A0461C(EnElf* this, PlayState* play) {
Player* player = GET_PLAYER(play);
if (play->csCtx.state != CS_STATE_IDLE) {
if (play->csCtx.npcActions[8] != NULL) {
switch (play->csCtx.npcActions[8]->action) {
if (play->csCtx.actorCues[8] != NULL) {
switch (play->csCtx.actorCues[8]->id) {
case 4:
temp = 9;
break;
@ -1544,23 +1544,23 @@ void EnElf_Draw(Actor* thisx, PlayState* play) {
}
}
void EnElf_GetCutsceneNextPos(Vec3f* vec, PlayState* play, s32 action) {
void EnElf_GetCuePos(Vec3f* dest, PlayState* play, s32 cueChannel) {
Vec3f startPos;
Vec3f endPos;
CsCmdActorAction* npcAction = play->csCtx.npcActions[action];
CsCmdActorCue* cue = play->csCtx.actorCues[cueChannel];
f32 lerp;
startPos.x = npcAction->startPos.x;
startPos.y = npcAction->startPos.y;
startPos.z = npcAction->startPos.z;
startPos.x = cue->startPos.x;
startPos.y = cue->startPos.y;
startPos.z = cue->startPos.z;
endPos.x = npcAction->endPos.x;
endPos.y = npcAction->endPos.y;
endPos.z = npcAction->endPos.z;
endPos.x = cue->endPos.x;
endPos.y = cue->endPos.y;
endPos.z = cue->endPos.z;
lerp = Environment_LerpWeight(npcAction->endFrame, npcAction->startFrame, play->csCtx.frames);
lerp = Environment_LerpWeight(cue->endFrame, cue->startFrame, play->csCtx.curFrame);
vec->x = ((endPos.x - startPos.x) * lerp) + startPos.x;
vec->y = ((endPos.y - startPos.y) * lerp) + startPos.y;
vec->z = ((endPos.z - startPos.z) * lerp) + startPos.z;
dest->x = ((endPos.x - startPos.x) * lerp) + startPos.x;
dest->y = ((endPos.y - startPos.y) * lerp) + startPos.y;
dest->z = ((endPos.z - startPos.z) * lerp) + startPos.z;
}