mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-30 00:42:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

gSetupActorDLs (#1893)

Browse Source 
* D_801AEFA0 -> gActorEmtpyDL

* gActorSetupOpaDL

* gActorSetupXluDL
This commit is contained in:
Derek Hensley
2026-08-28 04:15:23 -07:00
committed by GitHub
parent 5464daad84
commit 7ddfb60b04
24 changed files with 43 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/z64actor.h
+2 -2
View File
@@ -761,8 +761,8 @@ typedef struct NpcInteractInfo {
extern AttentionRangeParams gAttentionRanges[ATTENTION_RANGE_MAX];
extern s16 D_801AED48[8];
extern Gfx D_801AEF88[];
extern Gfx D_801AEFA0[];
extern Gfx gActorSetupXluDL[];
extern Gfx gActorSetupOpaDL[];
extern Actor* gCameraDriftActor;
src/code/z_actor.c
+3 -6
View File
@@ -4724,16 +4724,13 @@ void Npc_TrackPoint(Actor* actor, NpcInteractInfo* interactInfo, s16 presetIndex
rotLimits.rotateYaw);
}
Gfx D_801AEF88[] = {
gsDPSetRenderMode(AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL |
G_RM_FOG_SHADE_A,
AA_EN | Z_CMP | Z_UPD | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL |
GBL_c2(G_BL_CLR_IN, G_BL_A_IN, G_BL_CLR_MEM, G_BL_1MA)),
Gfx gActorSetupXluDL[] = {
gsDPSetRenderMode(G_RM_FOG_SHADE_A, G_RM_AA_ZB_XLU_SURF2 | Z_UPD),
gsDPSetAlphaCompare(G_AC_THRESHOLD),
gsSPEndDisplayList(),
};
Gfx D_801AEFA0[] = {
Gfx gActorSetupOpaDL[] = {
gsSPEndDisplayList(),
};
src/overlays/actors/ovl_Bg_Dblue_Waterfall/z_bg_dblue_waterfall.c
+2 -2
View File
@@ -600,13 +600,13 @@ void BgDblueWaterfall_Draw(Actor* thisx, PlayState* play) {
if (this->unk_19F > 0) {
if (this->unk_19F < 255) {
gSPSegment(POLY_XLU_DISP++, 0x09, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x09, gActorSetupXluDL);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x9B, 255, 255, 255, this->unk_19F);
gSPDisplayList(POLY_XLU_DISP++, gGreatBayTempleObjectIceStalactiteDL);
} else {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x09, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x09, gActorSetupOpaDL);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x9B, 255, 255, 255, 255);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, gGreatBayTempleObjectIceStalactiteDL);
src/overlays/actors/ovl_En_Bigpo/z_en_bigpo.c
+2 -2
View File
@@ -1301,7 +1301,7 @@ void EnBigpo_DrawMainBigpo(Actor* thisx, PlayState* play) {
// fully visible OR fully transparent
gfx = POLY_OPA_DISP;
gSPDisplayList(gfx, gSetupDLs[SETUPDL_25]);
gSPSegment(&gfx[1], 0x0C, D_801AEFA0); // empty display list for no transparency
gSPSegment(&gfx[1], 0x0C, gActorSetupOpaDL);
gSPSegment(&gfx[2], 0x08,
Gfx_EnvColor(play->state.gfxCtx, this->mainColor.r, this->mainColor.g, this->mainColor.b,
this->mainColor.a));
@@ -1311,7 +1311,7 @@ void EnBigpo_DrawMainBigpo(Actor* thisx, PlayState* play) {
} else {
gfx = POLY_XLU_DISP;
gSPDisplayList(gfx, gSetupDLs[SETUPDL_25]);
gSPSegment(&gfx[1], 0x0C, D_801AEF88); // transparency display list
gSPSegment(&gfx[1], 0x0C, gActorSetupXluDL);
gSPSegment(&gfx[2], 0x08,
Gfx_EnvColor(play->state.gfxCtx, this->mainColor.r, this->mainColor.g, this->mainColor.b,
this->mainColor.a));
src/overlays/actors/ovl_En_Ishi/z_en_ishi.c
+2 -2
View File
@@ -779,7 +779,7 @@ void EnIshi_DrawGameplayKeepBoulder(EnIshi* this, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0); // empty displaylist
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
gSPDisplayList(POLY_OPA_DISP++, gFieldSilverBoulderDL);
@@ -791,7 +791,7 @@ void EnIshi_DrawGameplayKeepBoulder(EnIshi* this, PlayState* play) {
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88); // in z_actor, transparency dl I think
gSPSegment(POLY_XLU_DISP++, 0x08, gActorSetupXluDL);
MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s32)alpha);
gSPDisplayList(POLY_XLU_DISP++, gFieldSilverBoulderDL);
src/overlays/actors/ovl_En_Jso/z_en_jso.c
+1 -1
View File
@@ -1662,7 +1662,7 @@ void EnJso_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x0C, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x0C, gActorSetupOpaDL);
SkelAnime_DrawFlexOpa(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnJso_OverrideLimbDraw, EnJso_PostLimbDraw, &this->actor);
src/overlays/actors/ovl_En_Mkk/z_en_mkk.c
+1 -1
View File
@@ -524,7 +524,7 @@ void EnMkk_Draw(Actor* thisx, PlayState* play) {
gfx = POLY_OPA_DISP;
gSPDisplayList(&gfx[0], gSetupDLs[SETUPDL_25]);
gDPSetPrimColor(&gfx[1], 0, 0xFF, primColors->r, primColors->g, primColors->b, primColors->a);
gSPSegment(&gfx[2], 0x08, D_801AEFA0);
gSPSegment(&gfx[2], 0x08, gActorSetupOpaDL);
MATRIX_FINALIZE_AND_LOAD(&gfx[3], play->state.gfxCtx);
gSPDisplayList(&gfx[4], modelInfo->eyesDL);
src/overlays/actors/ovl_En_Okuta/z_en_okuta.c
+1 -1
View File
@@ -1107,7 +1107,7 @@ void EnOkuta_Draw(Actor* thisx, PlayState* play) {
if (EN_OKUTA_GET_TYPE(&this->actor) < EN_OKUTA_TYPE_PROJECTILE_BASE) {
if (EN_OKUTA_GET_TYPE(&this->actor) == EN_OKUTA_TYPE_RED_OCTOROK) {
gSPSegment(&gfx[1], 0x08, D_801AEFA0);
gSPSegment(&gfx[1], 0x08, gActorSetupOpaDL);
} else {
gSPSegment(&gfx[1], 0x08, gOctorokBlueMaterialDL);
}
src/overlays/actors/ovl_En_Po_Composer/z_en_po_composer.c
+2 -2
View File
@@ -691,7 +691,7 @@ void EnPoComposer_Draw(Actor* thisx, PlayState* play) {
gSPSegment(POLY_OPA_DISP++, 0x0B,
Gfx_EnvColor(play->state.gfxCtx, clothingColor2->r, clothingColor2->g, clothingColor2->b,
this->mainAlpha.a));
gSPSegment(POLY_OPA_DISP++, 0x0C, D_801AEFA0); // empty DL
gSPSegment(POLY_OPA_DISP++, 0x0C, gActorSetupOpaDL);
POLY_OPA_DISP =
SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
@@ -709,7 +709,7 @@ void EnPoComposer_Draw(Actor* thisx, PlayState* play) {
gSPSegment(POLY_XLU_DISP++, 0x0B,
Gfx_EnvColor(play->state.gfxCtx, clothingColor2->r, clothingColor2->g, clothingColor2->b,
this->mainAlpha.a));
gSPSegment(POLY_XLU_DISP++, 0x0C, D_801AEF88); // transparency DL
gSPSegment(POLY_XLU_DISP++, 0x0C, gActorSetupXluDL);
POLY_XLU_DISP =
SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.c
+2 -2
View File
@@ -1207,13 +1207,13 @@ void EnPoSisters_Draw(Actor* thisx, PlayState* play) {
if ((this->color.a == 255) || (this->color.a == 0)) {
gDPSetEnvColor(POLY_OPA_DISP++, this->color.r, this->color.g, this->color.b, this->color.a);
gSPSegment(POLY_OPA_DISP++, 0x09, D_801AEFA0); // Empty DL
gSPSegment(POLY_OPA_DISP++, 0x09, gActorSetupOpaDL);
POLY_OPA_DISP =
SkelAnime_Draw(play, this->skelAnime.skeleton, this->skelAnime.jointTable, EnPoSisters_OverrideLimbDraw,
EnPoSisters_PostLimbDraw, &this->actor, POLY_OPA_DISP);
} else {
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->color.a);
gSPSegment(POLY_XLU_DISP++, 0x09, D_801AEF88); // XLU only DL
gSPSegment(POLY_XLU_DISP++, 0x09, gActorSetupXluDL);
POLY_XLU_DISP =
SkelAnime_Draw(play, this->skelAnime.skeleton, this->skelAnime.jointTable, EnPoSisters_OverrideLimbDraw,
EnPoSisters_PostLimbDraw, &this->actor, POLY_XLU_DISP);
src/overlays/actors/ovl_En_Poh/z_en_poh.c
+2 -2
View File
@@ -950,7 +950,7 @@ void EnPoh_Draw(Actor* thisx, PlayState* play) {
gSPDisplayList(&gfx[0], gSetupDLs[SETUPDL_25]);
gDPSetEnvColor(&gfx[1], this->unk_194, this->unk_195, this->unk_196, this->unk_197);
gSPSegment(&gfx[2], 0x08, D_801AEFA0);
gSPSegment(&gfx[2], 0x08, gActorSetupOpaDL);
gfx = SkelAnime_Draw(play, this->skelAnime.skeleton, this->skelAnime.jointTable, EnPoh_OverrideLimbDraw,
EnPoh_PostLimbDraw, &this->actor, &gfx[3]);
@@ -961,7 +961,7 @@ void EnPoh_Draw(Actor* thisx, PlayState* play) {
gSPDisplayList(&gfx[0], gSetupDLs[SETUPDL_25]);
gDPSetEnvColor(&gfx[1], 255, 255, 255, this->unk_197);
gSPSegment(&gfx[2], 0x08, D_801AEF88);
gSPSegment(&gfx[2], 0x08, gActorSetupXluDL);
POLY_XLU_DISP = SkelAnime_Draw(play, this->skelAnime.skeleton, this->skelAnime.jointTable,
EnPoh_OverrideLimbDraw, EnPoh_PostLimbDraw, &this->actor, &gfx[3]);
src/overlays/actors/ovl_En_Railgibud/z_en_railgibud.c
+2 -2
View File
@@ -1082,7 +1082,7 @@ void EnRailgibud_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->actor.shape.shadowAlpha);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
POLY_OPA_DISP =
SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
@@ -1091,7 +1091,7 @@ void EnRailgibud_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->actor.shape.shadowAlpha);
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x08, gActorSetupXluDL);
POLY_XLU_DISP =
SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
src/overlays/actors/ovl_En_Rd/z_en_rd.c
+2 -2
View File
@@ -1347,7 +1347,7 @@ void EnRd_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->alpha);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
POLY_OPA_DISP =
SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
@@ -1358,7 +1358,7 @@ void EnRd_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->alpha);
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x08, gActorSetupXluDL);
POLY_XLU_DISP =
SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
src/overlays/actors/ovl_En_Slime/z_en_slime.c
+1 -1
View File
@@ -1174,7 +1174,7 @@ void EnSlime_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
func_800B8118(&this->actor, play, 0);
if (this->iceBlockTimer != ICE_BLOCK_UNUSED) {
gSPSegment(POLY_XLU_DISP++, 0x0A, D_801AEFA0);
gSPSegment(POLY_XLU_DISP++, 0x0A, gActorSetupOpaDL);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 170, 255, 255, 255, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 150, 255, 255, this->iceBlockTimer);
} else {
src/overlays/actors/ovl_En_Syateki_Okuta/z_en_syateki_okuta.c
+1 -1
View File
@@ -559,7 +559,7 @@ void EnSyatekiOkuta_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
if (this->type == SG_OCTO_TYPE_RED) {
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
} else {
gSPSegment(POLY_OPA_DISP++, 0x08, gShootingGalleryOctorokBlueMaterialDL);
}
src/overlays/actors/ovl_En_Talk_Gibud/z_en_talk_gibud.c
+2 -2
View File
@@ -1203,7 +1203,7 @@ void EnTalkGibud_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->actor.shape.shadowAlpha);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
POLY_OPA_DISP =
SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
@@ -1212,7 +1212,7 @@ void EnTalkGibud_Draw(Actor* thisx, PlayState* play) {
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, this->actor.shape.shadowAlpha);
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x08, gActorSetupXluDL);
POLY_XLU_DISP =
SkelAnime_DrawFlex(play, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
+2 -2
View File
@@ -489,7 +489,7 @@ void func_8093A608(Actor* thisx, PlayState* play) {
((this->unk_203 & 1) && (this->actor.projectedPos.z < 2300.0f))) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x9B, 255, 255, 255, 255);
gSPDisplayList(POLY_OPA_DISP++, object_bombiwa_DL_004560);
@@ -502,7 +502,7 @@ void func_8093A608(Actor* thisx, PlayState* play) {
sp38 = (2300.0f - this->actor.projectedPos.z) * 2.55f;
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x08, gActorSetupXluDL);
MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x9B, 255, 255, 255, (s32)sp38);
gSPDisplayList(POLY_XLU_DISP++, object_bombiwa_DL_004560);
src/overlays/actors/ovl_Obj_Hamishi/z_obj_hamishi.c
+2 -2
View File
@@ -267,7 +267,7 @@ void ObjHamishi_Draw(Actor* thisx, PlayState* play) {
thisx->shape.shadowAlpha = 160;
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 170, 130, 255);
gSPDisplayList(POLY_OPA_DISP++, gFieldSilverBoulderDL);
@@ -277,7 +277,7 @@ void ObjHamishi_Draw(Actor* thisx, PlayState* play) {
thisx->shape.shadowAlpha = sp20 * 0.627451f;
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x08, gActorSetupXluDL);
MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 170, 130, (s32)sp20);
gSPDisplayList(POLY_XLU_DISP++, gFieldSilverBoulderDL);
src/overlays/actors/ovl_Obj_Hugebombiwa/z_obj_hugebombiwa.c
+2 -2
View File
@@ -639,7 +639,7 @@ void ObjHugebombiwa_Draw(Actor* thisx, PlayState* play) {
if (this->actor.projectedPos.z <= 4300.0f) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0xFF, 255, 255, 255, 255);
gSPDisplayList(POLY_OPA_DISP++, object_bombiwa_DL_002F60);
@@ -653,7 +653,7 @@ void ObjHugebombiwa_Draw(Actor* thisx, PlayState* play) {
sp38 = (4500.0f - this->actor.projectedPos.z) * 1.275f;
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x08, gActorSetupXluDL);
MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0xFF, 255, 255, 255, (s32)sp38);
gSPDisplayList(POLY_XLU_DISP++, object_bombiwa_DL_002F60);
src/overlays/actors/ovl_Obj_Lightblock/z_obj_lightblock.c
+2 -2
View File
@@ -192,13 +192,13 @@ void ObjLightblock_Draw(Actor* thisx, PlayState* play) {
if (this->alpha < 255) {
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x08, gActorSetupXluDL);
MATRIX_FINALIZE_AND_LOAD(POLY_XLU_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, this->alpha);
gSPDisplayList(POLY_XLU_DISP++, gSunBlockDL);
} else {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x08, gActorSetupOpaDL);
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, 255, 255, 255, 255);
gSPDisplayList(POLY_OPA_DISP++, gSunBlockDL);
src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.c
+2 -2
View File
@@ -371,7 +371,7 @@ void ObjLightSwitch_DrawOpa(ObjLightswitch* this, PlayState* play) {
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gDPSetEnvColor(POLY_OPA_DISP++, (u8)(this->colorR >> 6), (u8)(this->colorG >> 6),
((void)0, (u8)(this->colorB >> 6)), (u8)(this->colorAlpha >> 6));
gSPSegment(POLY_OPA_DISP++, 0x09, D_801AEFA0);
gSPSegment(POLY_OPA_DISP++, 0x09, gActorSetupOpaDL);
tempPos.x = this->actor.world.pos.x;
tempPos.y = this->actor.world.pos.y + (this->actor.shape.yOffset * this->actor.scale.y);
@@ -407,7 +407,7 @@ void ObjLightSwitch_DrawXlu(ObjLightswitch* this, PlayState* play) {
Gfx_SetupDL25_Xlu(play->state.gfxCtx);
gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->colorR >> 6), (u8)(this->colorG >> 6),
((void)0, (u8)(this->colorB >> 6)), (u8)(this->colorAlpha >> 6));
gSPSegment(POLY_XLU_DISP++, 0x09, D_801AEF88);
gSPSegment(POLY_XLU_DISP++, 0x09, gActorSetupXluDL);
tempPos.x = this->actor.world.pos.x;
tempPos.y = this->actor.world.pos.y + (this->actor.shape.yOffset * this->actor.scale.y);
tools/ZAPDConfigs/MM/SymbolMap_MM.txt
+1 -1
View File
@@ -1,2 +1,2 @@
801D1DE0 gIdentityMtx
801AEFA0 D_801AEFA0
801AEFA0 gActorSetupOpaDL
tools/disasm/n64-us/variables.txt
+2 -2
View File
@@ -188,8 +188,8 @@ D_801AED8C = 0x801AED8C; // size:0x24
sArrowDmgFlags = 0x801AEDB0; // size:0x24
sDoorLocksInfo = 0x801AEDD4; // size:0x64
sNpcTrackingPresets = 0x801AEE38; // size:0x150
D_801AEF88 = 0x801AEF88; // size:0x18
D_801AEFA0 = 0x801AEFA0; // size:0x8
gActorSetupXluDL = 0x801AEF88; // size:0x18
gActorSetupOpaDL = 0x801AEFA0; // size:0x8
sElectricSparkTextures = 0x801AEFA8; // size:0x28
gActorOverlayTable = 0x801AEFD0; // size:0x5640 type:ActorOverlay
gMaxActorId = 0x801B4610; // size:0x10
tools/namefixer.py
+2
View File
@@ -1362,6 +1362,8 @@ wordReplace = {
"D_801D1DE0": "gIdentityMtx",
"D_801D1E20": "gIdentityMtxF",
"sSetupDL": "gSetupDLs",
"D_801AEFA0": "gActorSetupOpaDL",
"D_801AEF88": "gActorSetupXluDL",
"gFaultStruct": "gFaultMgr",