mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-05-30 00:46:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

[ntsc-1.2] Match z_file_choose.c and z_boss_tw.c (#2146)

Browse Source 
* Match z_file_choose.c

* Match z_boss_tw.c

* Format

* end: -> close_disps:
This commit is contained in:
cadmic
2024-09-06 21:12:12 -07:00
committed by GitHub
parent ed870e051d
commit 8a3ba35070
7 changed files with 90 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/z_eff_blure.c
+2 -2
View File
@@ -399,7 +399,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement*
if (vtx == NULL) {
PRINTF(T("z_eff_blure.c::SQ_NoInterpolate_disp() 頂点確保できず。\n",
"z_eff_blure.c::SQ_NoInterpolate_disp() Vertices cannot be secured.\n"));
goto end;
goto close_disps;
}
vtx[0].v = baseVtx;
@@ -470,7 +470,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement*
gSPVertex(POLY_XLU_DISP++, vtx, 4, 0);
gSP2Triangles(POLY_XLU_DISP++, 0, 1, 2, 0, 0, 2, 3, 0);
end:
close_disps:
CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 932);
}
src/code/z_eff_spark.c
+3 -3
View File
@@ -174,7 +174,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
if (vertices == NULL) {
PRINTF(T("EffectSparkInfo_disp():メモリー確保失敗 graph_malloc\n",
"EffectSparkInfo_disp(): Memory Allocation Failure graph_malloc\n"));
goto end;
goto close_disps;
}
j = 0;
@@ -262,7 +262,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
mtx = SkinMatrix_MtxFToNewMtx(gfxCtx, &sp12C);
if (mtx == NULL) {
goto end;
goto close_disps;
}
gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@@ -273,6 +273,6 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) {
gDPPipeSync(POLY_XLU_DISP++);
}
end:
close_disps:
CLOSE_DISPS(gfxCtx, "../z_eff_spark.c", 498);
}