diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 768272055..0c9d0f25b 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1605,9 +1605,9 @@ void InitSaveEditor() { SohImGui::LoadResource(entry.second.nameFaded, entry.second.texturePath, ImVec4(1, 1, 1, 0.3f)); } for (const auto& entry : songMapping) { - SohImGui::LoadResource(entry.name, dgSongNoteTex, entry.color); + SohImGui::LoadResource(entry.name, gSongNoteTex, entry.color); ImVec4 fadedCol = entry.color; fadedCol.w = 0.3f; - SohImGui::LoadResource(entry.nameFaded, dgSongNoteTex, fadedCol); + SohImGui::LoadResource(entry.nameFaded, gSongNoteTex, fadedCol); } } diff --git a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c index 57166fe09..8e616b1ec 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c +++ b/soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c @@ -236,11 +236,11 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) { Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 666), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 255 - (stateFrames * 2) % 256, 0, 64, 32, 1, 255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64)); - gSPDisplayList(POLY_XLU_DISP++, dsModelDL); + gSPDisplayList(POLY_XLU_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682); } diff --git a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c index 8a824b44b..0033caa7a 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c +++ b/soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c @@ -235,11 +235,11 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 660), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 128, 32, 1, 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16)); - gSPDisplayList(POLY_XLU_DISP++, dsModelDL); + gSPDisplayList(POLY_XLU_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676); } diff --git a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c index edd781488..a98f8b958 100644 --- a/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c +++ b/soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c @@ -233,11 +233,11 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY); gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_light.c", 648), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 511 - (stateFrames * 5) % 512, 0, 4, 32, 1, 511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16)); - gSPDisplayList(POLY_XLU_DISP++, dsModelDL); + gSPDisplayList(POLY_XLU_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_light.c", 664); } diff --git a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c index 4d8bd536b..d921c81db 100644 --- a/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c +++ b/soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c @@ -600,7 +600,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) { G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPDisplayList(POLY_XLU_DISP++, dsShadowDL); + gSPDisplayList(POLY_XLU_DISP++, sShadowDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 1006); } diff --git a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c index 8f914744d..8b3d008fe 100644 --- a/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c +++ b/soh/src/overlays/actors/ovl_En_Jsjutan/z_en_jsjutan.c @@ -43,7 +43,7 @@ void EnJsjutan_Init(Actor* thisx, GlobalContext* globalCtx) { this->dyna.actor.flags &= ~ACTOR_FLAG_0; DynaPolyActor_Init(&this->dyna, DPM_UNK); - CollisionHeader_GetVirtual(&dsCol, &header); + CollisionHeader_GetVirtual(&sCol, &header); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, thisx, header); Actor_SetScale(thisx, 0.02f); this->unk_164 = true; @@ -430,7 +430,7 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { } else { gSPSegment(POLY_OPA_DISP++, 0x0C, sShadowEvenVtx); } - gSPDisplayList(POLY_OPA_DISP++, dsModelDL); + gSPDisplayList(POLY_OPA_DISP++, sModelDL); func_80093D18(globalCtx->state.gfxCtx); Matrix_Translate(thisx->world.pos.x, this->unk_168 + 3.0f, thisx->world.pos.z, MTXMODE_NEW); @@ -449,7 +449,7 @@ void EnJsjutan_Draw(Actor* thisx, GlobalContext* globalCtx2) { } else { gSPSegment(POLY_OPA_DISP++, 0x0C, sCarpetEvenVtx); } - gSPDisplayList(POLY_OPA_DISP++, dsModelDL); + gSPDisplayList(POLY_OPA_DISP++, sModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_jsjutan.c", 823); } diff --git a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c index e1dc4a3d0..21ed9f585 100644 --- a/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c +++ b/soh/src/overlays/actors/ovl_Magic_Fire/z_magic_fire.c @@ -236,12 +236,12 @@ void MagicFire_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gSPTexture(POLY_XLU_DISP++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON); gDPSetTextureLUT(POLY_XLU_DISP++, G_TT_NONE); - gDPLoadTextureBlock(POLY_XLU_DISP++, dsTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, + gDPLoadTextureBlock(POLY_XLU_DISP++, sTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 6, 15, G_TX_NOLOD); gDPSetTile(POLY_XLU_DISP++, G_IM_FMT_I, G_IM_SIZ_8b, 8, 0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, 14, G_TX_NOMIRROR | G_TX_WRAP, 6, 14); gDPSetTileSize(POLY_XLU_DISP++, 1, 0, 0, 252, 252); - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 512, 511 - ((gameplayFrames * 5) % 512), 64, 64, 1, (gameplayFrames * 2) % 256, diff --git a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c index 2a9dfcc0f..c14397c3e 100644 --- a/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c +++ b/soh/src/overlays/actors/ovl_Magic_Wind/z_magic_wind.c @@ -78,7 +78,7 @@ void MagicWind_Destroy(Actor* thisx, GlobalContext* globalCtx) { void MagicWind_UpdateAlpha(f32 alpha) { s32 i; - Vtx* vtx = ResourceMgr_LoadVtxByName(dsCylinderVtx); + Vtx* vtx = ResourceMgr_LoadVtxByName(sCylinderVtx); for (i = 0; i < ARRAY_COUNT(sAlphaUpdVals); i++) { vtx[sAlphaUpdVals[i]].n.a = alpha * 255.0f; diff --git a/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c b/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c index d814b4801..9f588f190 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c +++ b/soh/src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c @@ -156,10 +156,10 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx) { gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 469), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_XLU_DISP++, dsCylinderMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sCylinderMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 32, 1, 0, scroll * (-8), 32, 32)); - gSPDisplayList(POLY_XLU_DISP++, dsCylinderModelDL); + gSPDisplayList(POLY_XLU_DISP++, sCylinderModelDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 485); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c index 820ddff18..b5dee5019 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c +++ b/soh/src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c @@ -137,7 +137,7 @@ void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) { gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); gDPSetColorDither(POLY_XLU_DISP++, G_CD_NOISE); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 150, this->primColorAlpha); - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 8, scroll * 4, 64, 64, 1, scroll * 4, scroll * 4, 64, 64)); gSPWideTextureRectangle(POLY_XLU_DISP++, OTRGetRectDimensionFromLeftEdge(0) << 2, 0, diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c b/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c index 8abd7f6fc..2dae0149b 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c @@ -97,7 +97,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { } for (i = 0; i < 20; i++) { - vtxPtr = ResourceMgr_LoadVtxByName(dsFrustumVtx); + vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx); vtxPtr[i * 2 + 0].v.cn[3] = alphaTable[(sAlphaIndices[i] & 0xF0) >> 4]; vtxPtr[i * 2 + 1].v.cn[3] = alphaTable[sAlphaIndices[i] & 0xF]; } @@ -120,10 +120,10 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 100, 0, 255, 128); } - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 - scroll, scroll * (-2), 32, 32, 1, 0 - scroll, scroll * (-2), 32, 32)); - gSPDisplayList(POLY_XLU_DISP++, dsFrustumDL); + gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 398); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c b/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c index 3274501ad..4f80b4b8c 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c @@ -77,7 +77,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { z = 1330; } - vtxPtr = ResourceMgr_LoadVtxByName(dsFrustumVtx); + vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx); if (this->timer >= 80) { alpha = 12 * (100 - this->timer); } else { @@ -102,7 +102,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 100, 0, 128); - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 6, scroll * (-6), 64, 64, 1, scroll * (-6), 0, 64, 64)); gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c b/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c index 895b51a17..ed1012078 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c @@ -78,7 +78,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { z = 1330; } - vtxPtr = ResourceMgr_LoadVtxByName(dsFrustumVtx); + vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx); if (this->counter >= 80) { alpha = 12 * (100 - this->counter); } else { @@ -103,10 +103,10 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 255); gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 128); - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 12, scroll * (-12), 64, 64, 1, scroll * 8, scroll * (-8), 64, 64)); - gSPDisplayList(POLY_XLU_DISP++, dsFrustumDL); + gSPDisplayList(POLY_XLU_DISP++, sFrustumDL); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 370); } diff --git a/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c b/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c index 4a219dc8e..500933a26 100644 --- a/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c +++ b/soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c @@ -73,7 +73,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { z = 1330.0f; } - vtxPtr = ResourceMgr_LoadVtxByName(dsFrustumVtx); + vtxPtr = ResourceMgr_LoadVtxByName(sFrustumVtx); if (this->timer >= 30) { alpha = 12 * (50 - this->timer); } else { @@ -99,7 +99,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) { if (this->actor.params == OCEFF_WIPE4_UNUSED) { gSPDisplayList(POLY_XLU_DISP++, sUnusedMaterialDL); } else { - gSPDisplayList(POLY_XLU_DISP++, dsMaterialDL); + gSPDisplayList(POLY_XLU_DISP++, sMaterialDL); } gSPDisplayList(POLY_XLU_DISP++, sMaterial2DL);