mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-15 04:14:34 +00:00
Code Issues Projects Releases Wiki Activity

Document non-limb display lists

Browse source
This commit is contained in:
feacur 2024-11-10 03:41:08 +01:00
parent a71747bfb2
commit b3b6b28477
3 changed files with 14 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
assets/xml/objects/object_oF1d_map.xml
View file

@ -14,13 +14,6 @@
<Animation Name="gGoronAnim_004930" Offset="0x4930"/> <Animation Name="gGoronAnim_004930" Offset="0x4930"/>
<Animation Name="gGoronAnim_010590" Offset="0x10590"/> <Animation Name="gGoronAnim_010590" Offset="0x10590"/>
<!-- display lists -->
<DList Name="gGoronDL_00BD80" Offset="0xBD80"/>
<DList Name="gGoronDL_00C140" Offset="0xC140"/>
<DList Name="gGoronDL_00FD40" Offset="0xFD40"/>
<DList Name="gGoronDL_00FD50" Offset="0xFD50"/>
<!-- skeleton, limb none --> <!-- skeleton, limb none -->
<Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/> <Skeleton Name="gGoronSkel" Type="Flex" LimbType="Standard" Offset="0xFEF0"/>
@ -60,6 +53,12 @@
<DList Name="gGoronRightHandDL" Offset="0x7FF0"/> <DList Name="gGoronRightHandDL" Offset="0x7FF0"/>
<DList Name="gGoronHeadDL" Offset="0x7458"/> <DList Name="gGoronHeadDL" Offset="0x7458"/>
<!-- states display lists -->
<DList Name="gGoronCurledUpDL" Offset="0xBD80"/>
<DList Name="gGoronRollingDL" Offset="0xC140"/>
<DList Name="gGoronParticleMaterialDL" Offset="0xFD40"/>
<DList Name="gGoronParticleDL" Offset="0xFD50"/>
<!-- palettes --> <!-- palettes -->
<Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/> <Texture Name="object_oF1d_map_TLUT_00C640" OutName="tlut_0000C640" Format="rgba16" Width="16" Height="16" Offset="0xC640"/>

8
src/overlays/actors/ovl_En_Go/z_en_go.c
View file

@ -1059,7 +1059,7 @@ void EnGo_DrawCurledUp(EnGo* this, PlayState* play) {
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_go.c", 2326); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_go.c", 2326);
gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00BD80); gSPDisplayList(POLY_OPA_DISP++, gGoronCurledUpDL);
Matrix_MultVec3f(&D_80A41BB4, &this->actor.focus.pos); Matrix_MultVec3f(&D_80A41BB4, &this->actor.focus.pos);
Matrix_Pop(); Matrix_Pop();
@ -1077,7 +1077,7 @@ void EnGo_DrawRolling(EnGo* this, PlayState* play) {
Matrix_RotateZYX((s16)(play->state.frames * ((s16)this->actor.speed * 1400)), 0, this->actor.shape.rot.z, Matrix_RotateZYX((s16)(play->state.frames * ((s16)this->actor.speed * 1400)), 0, this->actor.shape.rot.z,
MTXMODE_APPLY); MTXMODE_APPLY);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_go.c", 2368); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_go.c", 2368);
gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00C140); gSPDisplayList(POLY_OPA_DISP++, gGoronRollingDL);
Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos); Matrix_MultVec3f(&D_80A41BC0, &this->actor.focus.pos);
Matrix_Pop(); Matrix_Pop();
@ -1213,7 +1213,7 @@ void EnGo_DrawEffects(EnGo* this, PlayState* play) {
if (!materialFlag) { if (!materialFlag) {
POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_0); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_0);
gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD40); gSPDisplayList(POLY_XLU_DISP++, gGoronParticleMaterialDL);
gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0); gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0);
materialFlag = true; materialFlag = true;
} }
@ -1228,7 +1228,7 @@ void EnGo_DrawEffects(EnGo* this, PlayState* play) {
index = dustEffect->timer * (8.0f / dustEffect->initialTimer); index = dustEffect->timer * (8.0f / dustEffect->initialTimer);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[index])); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[index]));
gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50); gSPDisplayList(POLY_XLU_DISP++, gGoronParticleDL);
} }
CLOSE_DISPS(play->state.gfxCtx, "../z_en_go.c", 2678); CLOSE_DISPS(play->state.gfxCtx, "../z_en_go.c", 2678);

8
src/overlays/actors/ovl_En_Go2/z_en_go2.c
View file

@ -223,7 +223,7 @@ void EnGo2_DrawEffects(EnGo2* this, PlayState* play) {
if (!materialFlag) { if (!materialFlag) {
POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_0); POLY_XLU_DISP = Gfx_SetupDL(POLY_XLU_DISP, SETUPDL_0);
gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD40); gSPDisplayList(POLY_XLU_DISP++, gGoronParticleMaterialDL);
gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0); gDPSetEnvColor(POLY_XLU_DISP++, 100, 60, 20, 0);
materialFlag = true; materialFlag = true;
} }
@ -237,7 +237,7 @@ void EnGo2_DrawEffects(EnGo2* this, PlayState* play) {
MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_en_go2_eff.c", 137); MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx, "../z_en_go2_eff.c", 137);
index = dustEffect->timer * (8.0f / dustEffect->initialTimer); index = dustEffect->timer * (8.0f / dustEffect->initialTimer);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sDustTex[index])); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sDustTex[index]));
gSPDisplayList(POLY_XLU_DISP++, gGoronDL_00FD50); gSPDisplayList(POLY_XLU_DISP++, gGoronParticleDL);
} }
CLOSE_DISPS(play->state.gfxCtx, "../z_en_go2_eff.c", 151); CLOSE_DISPS(play->state.gfxCtx, "../z_en_go2_eff.c", 151);
@ -2008,7 +2008,7 @@ s32 EnGo2_DrawCurledUp(EnGo2* this, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx, "../z_en_go2.c", 2881); OPEN_DISPS(play->state.gfxCtx, "../z_en_go2.c", 2881);
Gfx_SetupDL_25Opa(play->state.gfxCtx); Gfx_SetupDL_25Opa(play->state.gfxCtx);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_go2.c", 2884); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_go2.c", 2884);
gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00BD80); gSPDisplayList(POLY_OPA_DISP++, gGoronCurledUpDL);
CLOSE_DISPS(play->state.gfxCtx, "../z_en_go2.c", 2889); CLOSE_DISPS(play->state.gfxCtx, "../z_en_go2.c", 2889);
Matrix_MultVec3f(&D_80A48554, &this->actor.focus.pos); Matrix_MultVec3f(&D_80A48554, &this->actor.focus.pos);
@ -2025,7 +2025,7 @@ s32 EnGo2_DrawRolling(EnGo2* this, PlayState* play) {
speedXZ = this->actionFunc == EnGo2_ReverseRolling ? 0.0f : this->actor.speed; speedXZ = this->actionFunc == EnGo2_ReverseRolling ? 0.0f : this->actor.speed;
Matrix_RotateZYX((play->state.frames * ((s16)speedXZ * 1400)), 0, this->actor.shape.rot.z, MTXMODE_APPLY); Matrix_RotateZYX((play->state.frames * ((s16)speedXZ * 1400)), 0, this->actor.shape.rot.z, MTXMODE_APPLY);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_go2.c", 2926); MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_go2.c", 2926);
gSPDisplayList(POLY_OPA_DISP++, gGoronDL_00C140); gSPDisplayList(POLY_OPA_DISP++, gGoronRollingDL);
CLOSE_DISPS(play->state.gfxCtx, "../z_en_go2.c", 2930); CLOSE_DISPS(play->state.gfxCtx, "../z_en_go2.c", 2930);
Matrix_MultVec3f(&D_80A48560, &this->actor.focus.pos); Matrix_MultVec3f(&D_80A48560, &this->actor.focus.pos);
return 1; return 1;