mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-14 03:44:34 +00:00
Use macros for oGfxCtx accesses (#465)
* fix colliderinit typo * fix initchain * reloc * add defines * add defines * missed some on merge * rename gfxCtx and add comment * remove space
This commit is contained in:
fig02
GitHub
parent
92bb1fb210
commit
3c5fe66dcd
195 changed files with 2236 additions and 2229 deletions
158
src/code/z_rcp.c
158
src/code/z_rcp.c
|
|
@ -858,7 +858,7 @@ Gfx* func_80093808(Gfx* gfx) {
|
|||
void func_80093848(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1293);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3A]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x3A]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1297);
|
||||
}
|
||||
|
|
@ -866,7 +866,7 @@ void func_80093848(GraphicsContext* gfxCtx) {
|
|||
void func_800938B4(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1309);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x39]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x39]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1313);
|
||||
}
|
||||
|
|
@ -874,7 +874,7 @@ void func_800938B4(GraphicsContext* gfxCtx) {
|
|||
void func_80093920(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1325);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x32]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x32]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1329);
|
||||
}
|
||||
|
|
@ -882,7 +882,7 @@ void func_80093920(GraphicsContext* gfxCtx) {
|
|||
void func_8009398C(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1341);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x33]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x33]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1345);
|
||||
}
|
||||
|
|
@ -890,7 +890,7 @@ void func_8009398C(GraphicsContext* gfxCtx) {
|
|||
void func_800939F8(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1357);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x34]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x34]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1361);
|
||||
}
|
||||
|
|
@ -898,7 +898,7 @@ void func_800939F8(GraphicsContext* gfxCtx) {
|
|||
void func_80093A64(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1373);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x35]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x35]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1377);
|
||||
}
|
||||
|
|
@ -906,7 +906,7 @@ void func_80093A64(GraphicsContext* gfxCtx) {
|
|||
void func_80093AD0(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1389);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x36]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x36]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1393);
|
||||
}
|
||||
|
|
@ -914,7 +914,7 @@ void func_80093AD0(GraphicsContext* gfxCtx) {
|
|||
void func_80093B3C(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1405);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x37]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x37]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1409);
|
||||
}
|
||||
|
|
@ -922,7 +922,7 @@ void func_80093B3C(GraphicsContext* gfxCtx) {
|
|||
void func_80093BA8(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1421);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1A]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x1A]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1425);
|
||||
}
|
||||
|
|
@ -930,7 +930,7 @@ void func_80093BA8(GraphicsContext* gfxCtx) {
|
|||
void func_80093C14(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1439);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x19]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1443);
|
||||
}
|
||||
|
|
@ -943,7 +943,7 @@ void func_80093C80(GlobalContext* globalCtx) {
|
|||
if (globalCtx->roomCtx.curRoom.unk_03 == 3) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1460);
|
||||
|
||||
gDPSetColorDither(oGfxCtx->polyOpa.p++, G_CD_DISABLE);
|
||||
gDPSetColorDither(POLY_OPA_DISP++, G_CD_DISABLE);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1462);
|
||||
}
|
||||
|
|
@ -952,7 +952,7 @@ void func_80093C80(GlobalContext* globalCtx) {
|
|||
void func_80093D18(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1475);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x19]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x19]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1479);
|
||||
}
|
||||
|
|
@ -960,7 +960,7 @@ void func_80093D18(GraphicsContext* gfxCtx) {
|
|||
void func_80093D84(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1491);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x19]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x19]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1495);
|
||||
}
|
||||
|
|
@ -968,7 +968,7 @@ void func_80093D84(GraphicsContext* gfxCtx) {
|
|||
void func_80093DF0(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1507);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1F]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x1F]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1511);
|
||||
}
|
||||
|
|
@ -976,7 +976,7 @@ void func_80093DF0(GraphicsContext* gfxCtx) {
|
|||
void func_80093E5C(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1523);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x20]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x20]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1527);
|
||||
}
|
||||
|
|
@ -984,7 +984,7 @@ void func_80093E5C(GraphicsContext* gfxCtx) {
|
|||
void func_80093EC8(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1539);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x21]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x21]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1543);
|
||||
}
|
||||
|
|
@ -1002,7 +1002,7 @@ Gfx* func_80093F58(Gfx* gfx) {
|
|||
void func_80093F7C(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1569);
|
||||
|
||||
oGfxCtx->polyOpa.p = func_80093F58(oGfxCtx->polyOpa.p);
|
||||
POLY_OPA_DISP = func_80093F58(POLY_OPA_DISP);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1573);
|
||||
}
|
||||
|
|
@ -1010,7 +1010,7 @@ void func_80093F7C(GraphicsContext* gfxCtx) {
|
|||
void func_80093FD8(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1585);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x23]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x23]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1589);
|
||||
}
|
||||
|
|
@ -1018,7 +1018,7 @@ void func_80093FD8(GraphicsContext* gfxCtx) {
|
|||
void func_80094044(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1601);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2C]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x2C]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1605);
|
||||
}
|
||||
|
|
@ -1026,7 +1026,7 @@ void func_80094044(GraphicsContext* gfxCtx) {
|
|||
void func_800940B0(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1617);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x24]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x24]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1621);
|
||||
}
|
||||
|
|
@ -1039,7 +1039,7 @@ Gfx* func_8009411C(Gfx* gfx) {
|
|||
void func_80094140(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1640);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x1C]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x1C]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1644);
|
||||
}
|
||||
|
|
@ -1047,7 +1047,7 @@ void func_80094140(GraphicsContext* gfxCtx) {
|
|||
void func_800941AC(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1651);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2B]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x2B]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1655);
|
||||
}
|
||||
|
|
@ -1055,7 +1055,7 @@ void func_800941AC(GraphicsContext* gfxCtx) {
|
|||
void func_80094218(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1670);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2D]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x2D]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1674);
|
||||
}
|
||||
|
|
@ -1063,7 +1063,7 @@ void func_80094218(GraphicsContext* gfxCtx) {
|
|||
void func_80094284(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1681);
|
||||
|
||||
gSPDisplayList(oGfxCtx->overlay.p++, &sSetupDL[6 * 0x2E]);
|
||||
gSPDisplayList(OVERLAY_DISP++, &sSetupDL[6 * 0x2E]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1685);
|
||||
}
|
||||
|
|
@ -1071,7 +1071,7 @@ void func_80094284(GraphicsContext* gfxCtx) {
|
|||
void func_800942F0(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1700);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x26]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x26]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1704);
|
||||
}
|
||||
|
|
@ -1079,7 +1079,7 @@ void func_800942F0(GraphicsContext* gfxCtx) {
|
|||
void func_8009435C(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1722);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x04]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x04]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1726);
|
||||
}
|
||||
|
|
@ -1087,7 +1087,7 @@ void func_8009435C(GraphicsContext* gfxCtx) {
|
|||
void func_800943C8(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1758);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x25]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x25]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1762);
|
||||
}
|
||||
|
|
@ -1095,7 +1095,7 @@ void func_800943C8(GraphicsContext* gfxCtx) {
|
|||
void func_80094434(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1775);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x02]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x02]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1779);
|
||||
}
|
||||
|
|
@ -1108,7 +1108,7 @@ Gfx* func_800944A0(Gfx* gfx) {
|
|||
void func_800944C4(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1799);
|
||||
|
||||
oGfxCtx->polyOpa.p = func_800944A0(oGfxCtx->polyOpa.p);
|
||||
POLY_OPA_DISP = func_800944A0(POLY_OPA_DISP);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1801);
|
||||
}
|
||||
|
|
@ -1116,7 +1116,7 @@ void func_800944C4(GraphicsContext* gfxCtx) {
|
|||
void func_80094520(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1809);
|
||||
|
||||
oGfxCtx->overlay.p = func_800944A0(oGfxCtx->overlay.p);
|
||||
OVERLAY_DISP = func_800944A0(OVERLAY_DISP);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1811);
|
||||
}
|
||||
|
|
@ -1130,7 +1130,7 @@ void func_8009457C(Gfx** gfxp) {
|
|||
void func_800945A0(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1837);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x28]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x28]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1841);
|
||||
}
|
||||
|
|
@ -1138,7 +1138,7 @@ void func_800945A0(GraphicsContext* gfxCtx) {
|
|||
void func_8009460C(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1853);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x29]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x29]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1857);
|
||||
}
|
||||
|
|
@ -1146,7 +1146,7 @@ void func_8009460C(GraphicsContext* gfxCtx) {
|
|||
void func_80094678(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1869);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x2F]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x2F]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1873);
|
||||
}
|
||||
|
|
@ -1210,7 +1210,7 @@ Gfx* func_80094968(Gfx* gfx) {
|
|||
void func_800949A8(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1953);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x2A]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x2A]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1957);
|
||||
}
|
||||
|
|
@ -1218,7 +1218,7 @@ void func_800949A8(GraphicsContext* gfxCtx) {
|
|||
void func_80094A14(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1964);
|
||||
|
||||
gSPDisplayList(oGfxCtx->overlay.p++, &sSetupDL[6 * 0x2A]);
|
||||
gSPDisplayList(OVERLAY_DISP++, &sSetupDL[6 * 0x2A]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1968);
|
||||
}
|
||||
|
|
@ -1226,7 +1226,7 @@ void func_80094A14(GraphicsContext* gfxCtx) {
|
|||
void func_80094A80(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 1992);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x30]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x30]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1996);
|
||||
}
|
||||
|
|
@ -1234,7 +1234,7 @@ void func_80094A80(GraphicsContext* gfxCtx) {
|
|||
void func_80094AEC(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 2008);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x31]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x31]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2012);
|
||||
}
|
||||
|
|
@ -1242,7 +1242,7 @@ void func_80094AEC(GraphicsContext* gfxCtx) {
|
|||
void func_80094B58(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 2024);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x1B]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x1B]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2028);
|
||||
}
|
||||
|
|
@ -1250,8 +1250,8 @@ void func_80094B58(GraphicsContext* gfxCtx) {
|
|||
void func_80094BC4(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 2040);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3C]);
|
||||
gDPSetColorDither(oGfxCtx->polyXlu.p++, G_CD_DISABLE);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x3C]);
|
||||
gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2043);
|
||||
}
|
||||
|
|
@ -1259,7 +1259,7 @@ void func_80094BC4(GraphicsContext* gfxCtx) {
|
|||
void func_80094C50(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 2056);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, &sSetupDL[6 * 0x3D]);
|
||||
gSPDisplayList(POLY_XLU_DISP++, &sSetupDL[6 * 0x3D]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2058);
|
||||
}
|
||||
|
|
@ -1267,7 +1267,7 @@ void func_80094C50(GraphicsContext* gfxCtx) {
|
|||
void func_80094CBC(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 2086);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x38]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x38]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2090);
|
||||
}
|
||||
|
|
@ -1283,7 +1283,7 @@ void func_80094D28(Gfx** gfxp) {
|
|||
void func_80094D4C(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 2112);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, &sSetupDL[6 * 0x3B]);
|
||||
gSPDisplayList(POLY_OPA_DISP++, &sSetupDL[6 * 0x3B]);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2116);
|
||||
}
|
||||
|
|
@ -1368,22 +1368,22 @@ Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a) {
|
|||
void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 2386);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, sFillSetupDL);
|
||||
gSPDisplayList(oGfxCtx->polyXlu.p++, sFillSetupDL);
|
||||
gSPDisplayList(oGfxCtx->overlay.p++, sFillSetupDL);
|
||||
gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL);
|
||||
gSPDisplayList(POLY_XLU_DISP++, sFillSetupDL);
|
||||
gSPDisplayList(OVERLAY_DISP++, sFillSetupDL);
|
||||
|
||||
gDPSetScissorFrac(oGfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f);
|
||||
gDPSetScissorFrac(oGfxCtx->polyXlu.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f);
|
||||
gDPSetScissorFrac(oGfxCtx->overlay.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f);
|
||||
gDPSetScissorFrac(POLY_OPA_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f);
|
||||
gDPSetScissorFrac(POLY_XLU_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f);
|
||||
gDPSetScissorFrac(OVERLAY_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f);
|
||||
|
||||
gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetColorImage(oGfxCtx->polyXlu.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetColorImage(oGfxCtx->overlay.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetColorImage(POLY_XLU_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetColorImage(OVERLAY_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
|
||||
gDPSetDepthImage(oGfxCtx->polyOpa.p++, gZBuffer);
|
||||
gDPSetDepthImage(oGfxCtx->polyXlu.p++, gZBuffer);
|
||||
gDPSetDepthImage(oGfxCtx->overlay.p++, gZBuffer);
|
||||
gDPSetDepthImage(POLY_OPA_DISP++, gZBuffer);
|
||||
gDPSetDepthImage(POLY_XLU_DISP++, gZBuffer);
|
||||
gDPSetDepthImage(OVERLAY_DISP++, gZBuffer);
|
||||
|
||||
if ((R_PAUSE_MENU_MODE < 2) && (gTrnsnUnkState < 2)) {
|
||||
s32 ret = ShrinkWindow_GetCurrentVal();
|
||||
|
|
@ -1428,29 +1428,29 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
|
|||
}
|
||||
}
|
||||
|
||||
gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gZBuffer);
|
||||
gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_FILL);
|
||||
gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2);
|
||||
gDPSetFillColor(oGfxCtx->polyOpa.p++,
|
||||
gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gZBuffer);
|
||||
gDPSetCycleType(POLY_OPA_DISP++, G_CYC_FILL);
|
||||
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_NOOP, G_RM_NOOP2);
|
||||
gDPSetFillColor(POLY_OPA_DISP++,
|
||||
(GPACK_RGBA5551(255, 255, 240, 0) << 16) | GPACK_RGBA5551(255, 255, 240, 0));
|
||||
gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1);
|
||||
gDPPipeSync(oGfxCtx->polyOpa.p++);
|
||||
gDPFillRectangle(POLY_OPA_DISP++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1);
|
||||
gDPPipeSync(POLY_OPA_DISP++);
|
||||
|
||||
gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetCycleType(oGfxCtx->polyOpa.p++, G_CYC_FILL);
|
||||
gDPSetRenderMode(oGfxCtx->polyOpa.p++, G_RM_NOOP, G_RM_NOOP2);
|
||||
gDPSetFillColor(oGfxCtx->polyOpa.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1));
|
||||
gDPFillRectangle(oGfxCtx->polyOpa.p++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1);
|
||||
gDPPipeSync(oGfxCtx->polyOpa.p++);
|
||||
gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gDPSetCycleType(POLY_OPA_DISP++, G_CYC_FILL);
|
||||
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_NOOP, G_RM_NOOP2);
|
||||
gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1));
|
||||
gDPFillRectangle(POLY_OPA_DISP++, 0, ret, gScreenWidth - 1, gScreenHeight - ret - 1);
|
||||
gDPPipeSync(POLY_OPA_DISP++);
|
||||
|
||||
if (ret > 0) {
|
||||
gDPPipeSync(oGfxCtx->overlay.p++);
|
||||
gDPSetCycleType(oGfxCtx->overlay.p++, G_CYC_FILL);
|
||||
gDPSetRenderMode(oGfxCtx->overlay.p++, G_RM_NOOP, G_RM_NOOP2);
|
||||
gDPSetFillColor(oGfxCtx->overlay.p++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1));
|
||||
gDPFillRectangle(oGfxCtx->overlay.p++, 0, 0, gScreenWidth - 1, ret - 1);
|
||||
gDPFillRectangle(oGfxCtx->overlay.p++, 0, gScreenHeight - ret, gScreenWidth - 1, gScreenHeight - 1);
|
||||
gDPPipeSync(oGfxCtx->overlay.p++);
|
||||
gDPPipeSync(OVERLAY_DISP++);
|
||||
gDPSetCycleType(OVERLAY_DISP++, G_CYC_FILL);
|
||||
gDPSetRenderMode(OVERLAY_DISP++, G_RM_NOOP, G_RM_NOOP2);
|
||||
gDPSetFillColor(OVERLAY_DISP++, (GPACK_RGBA5551(r, g, b, 1) << 16) | GPACK_RGBA5551(r, g, b, 1));
|
||||
gDPFillRectangle(OVERLAY_DISP++, 0, 0, gScreenWidth - 1, ret - 1);
|
||||
gDPFillRectangle(OVERLAY_DISP++, 0, gScreenHeight - ret, gScreenWidth - 1, gScreenHeight - 1);
|
||||
gDPPipeSync(OVERLAY_DISP++);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1460,10 +1460,10 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) {
|
|||
void func_80095974(GraphicsContext* gfxCtx) {
|
||||
OPEN_DISPS(gfxCtx, "../z_rcp.c", 2503);
|
||||
|
||||
gSPDisplayList(oGfxCtx->polyOpa.p++, sFillSetupDL);
|
||||
gDPSetScissorFrac(oGfxCtx->polyOpa.p++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f);
|
||||
gDPSetDepthImage(oGfxCtx->polyOpa.p++, gZBuffer);
|
||||
gDPSetColorImage(oGfxCtx->polyOpa.p++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL);
|
||||
gDPSetScissorFrac(POLY_OPA_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth * 4.0f, gScreenHeight * 4.0f);
|
||||
gDPSetDepthImage(POLY_OPA_DISP++, gZBuffer);
|
||||
gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2513);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue