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

Match retail demo actors (#1745)

Browse source 
* Match GetCue functions

* Match retail demo actors

* Add redundant parentheses around kREG(X) == Y in z_demo_gt.c

* Remove goto in DemoEffect_DrawLightEffect

* Rename "dl"

* Comment on possible array

* Use the word "fake"

* Remove redundant return
This commit is contained in:
cadmic 2024-02-20 12:15:52 -08:00 • committed by GitHub
parent 5c3a722aca
commit 33d8044e45
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
18 changed files with 161 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -209,9 +209,12 @@ s32 func_8097CDB0(DemoGo* this, PlayState* play, u16 cueId) {
CutsceneContext* csCtx = &play->csCtx;
s32 cueChannel = DemoGo_GetCueChannel(this);
if ((csCtx->state != CS_STATE_IDLE) && (csCtx->actorCues[cueChannel] != NULL) &&
(csCtx->actorCues[cueChannel]->id == cueId)) {
return true;
if (csCtx->state != CS_STATE_IDLE) {
CsCmdActorCue* cue = csCtx->actorCues[cueChannel];
if (cue != NULL && cue->id == cueId) {
return true;
}
}
return false;
@ -341,13 +344,13 @@ void func_8097D29C(DemoGo* this, PlayState* play) {
s16 eyeTexIdx = this->unk_190;
SkelAnime* skelAnime = &this->skelAnime;
void* eyeTexture = sEyeTextures[eyeTexIdx];
void* mouthTexture = gGoronCsMouthSmileTex;
s32 pad2;
OPEN_DISPS(play->state.gfxCtx, "../z_demo_go.c", 732);
Gfx_SetupDL_25Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(mouthTexture));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gGoronCsMouthSmileTex));
SkelAnime_DrawFlexOpa(play, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, this);