mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Minor gfx cleanups in some actors (#706)

Browse source 
* Minor gfx cleanups in some actors

* Fix frustum names
This commit is contained in:
Roman971 2021-02-18 01:06:07 +01:00 committed by GitHub
parent f57e0467d2
commit 55ae8ad741
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 78 additions and 77 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/overlays/actors/ovl_En_Dekunuts/z_en_dekunuts.c
View file

@ -225,7 +225,8 @@ void EnDekunuts_SetupBeStunned(EnDekunuts* this) {
this->actionFunc = EnDekunuts_BeStunned;
this->actor.speedXZ = 0.0f;
Audio_PlayActorSound2(&this->actor, NA_SE_EN_GOMA_JR_FREEZE);
Actor_SetColorFilter(&this->actor, 0, 0xFF, 0, Animation_GetLastFrame(&gDekuNutsDamageAnim) * this->animFlagAndTimer);
Actor_SetColorFilter(&this->actor, 0, 0xFF, 0,
Animation_GetLastFrame(&gDekuNutsDamageAnim) * this->animFlagAndTimer);
}
void EnDekunuts_SetupDie(EnDekunuts* this) {

6
src/overlays/actors/ovl_End_Title/z_end_title.c
View file

@ -93,19 +93,19 @@ void EndTitle_Draw(Actor* thisx, GlobalContext* globalCtx) {
COMBINED, 0, 0, 0, COMBINED);
gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->endAlpha);
gDPLoadTextureTile(OVERLAY_DISP++, D_80B670E0, G_IM_FMT_IA, G_IM_SIZ_8b, 80, 24, 0, 0, 80, 24, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, 0, 0);
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
gSPTextureRectangle(OVERLAY_DISP++, (120 << 2), (90 << 2), (200 << 2), (113 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5),
(32 << 5));
gDPPipeSync(OVERLAY_DISP++);
gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->tlozAlpha);
gDPLoadTextureTile(OVERLAY_DISP++, D_80B65EA0, G_IM_FMT_IA, G_IM_SIZ_8b, 120, 24, 0, 0, 120, 24, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, 0, 0);
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
gSPTextureRectangle(OVERLAY_DISP++, (100 << 2), (160 << 2), (220 << 2), (183 << 2), G_TX_RENDERTILE, 0, 0,
(32 << 5), (32 << 5));
gDPPipeSync(OVERLAY_DISP++);
gDPSetPrimColor(OVERLAY_DISP++, 0x00, 0x80, 0, 0, 0, this->ootAlpha);
gDPLoadTextureTile(OVERLAY_DISP++, D_80B669E0, G_IM_FMT_IA, G_IM_SIZ_8b, 112, 16, 0, 0, 112, 16, 0,
G_TX_NOMIRROR | G_TX_NOMIRROR, G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, 0, 0);
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0);
gSPTextureRectangle(OVERLAY_DISP++, (104 << 2), (177 << 2), (216 << 2), (192 << 2), G_TX_RENDERTILE, 0, 0,
(32 << 5), (32 << 5));

4
src/overlays/actors/ovl_End_Title/z_end_title_gfx.c
View file

@ -446,8 +446,8 @@ static Gfx dList_80B69720[] = {
gsDPSetCombineLERP(PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, COMBINED, 0, 0, 0,
COMBINED),
gsDPSetEnvColor(200, 230, 225, 255),
gsDPLoadTextureTile(D_80B67860, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 48, 0, 0, 63, 47, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 0, 0, 0, 0),
gsDPLoadTextureTile(D_80B67860, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 48, 0, 0, 63, 47, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 0, 0, 0, 0),
gsSPTextureRectangle((97 << 2), (90 << 2), (160 << 2), (137 << 2), G_TX_RENDERTILE, 0, 0, (32 << 5), (32 << 5)),
gsDPLoadTextureTile(D_80B68460, G_IM_FMT_IA, G_IM_SIZ_8b, 64, 48, 0, 0, 63, 47, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD),

2
src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot.c
View file

@ -159,7 +159,7 @@ void OceffSpot_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sTextureDL);
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++, sCylinderDl);
gSPDisplayList(POLY_XLU_DISP++, sCylinderDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_spot.c", 485);
}

16
src/overlays/actors/ovl_Oceff_Spot/z_oceff_spot_gfx.c
View file

@ -1,6 +1,6 @@
#include "z_oceff_spot.h"
static u32 texture[] = {
static u32 sTexture[] = {
0x354D5AAC, 0xA5561C01, 0x124688B5, 0x74583231, 0x313D71D6, 0x9F5B3507, 0x104089AD, 0x748F440C, 0x408176AC,
0xB4661301, 0x2261C0BE, 0x49392533, 0x2C497FC4, 0x80451D06, 0x2466BBD0, 0x9CB85411, 0x40A09DA3, 0xB37F210B,
0x3D8AEAC7, 0x3F241930, 0x2F5591A7, 0x6441080F, 0x4191E8DB, 0xB7A76B18, 0x4094BAA0, 0x76532D22, 0x60BAFEE8,
@ -32,7 +32,7 @@ static u32 texture[] = {
0x422B6EE0, 0xBB85480B, 0x04256799, 0x716D6D21,
};
static Vtx vertices[] = {
static Vtx sCylinderVtx[] = {
VTX(35, 0, -35, 1280, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(35, 150, -35, 1280, 512, 0xFF, 0xFF, 0xFF, 0x7E),
VTX(50, 150, 0, 1024, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(50, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00),
VTX(35, 500, -35, 1280, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(50, 500, 0, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF),
@ -53,11 +53,11 @@ static Gfx sTextureDL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPLoadTextureBlock(texture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 0),
gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 15,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 0),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, 15, G_TX_NOMIRROR | G_TX_WRAP, 5,
0),
gsDPSetTileSize(1, 0, 0, (31 << 2), (31 << 2)),
gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE,
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
@ -70,8 +70,8 @@ static Gfx sTextureDL[] = {
gsSPEndDisplayList(),
};
static Gfx sCylinderDl[] = {
gsSPVertex(vertices, 27, 0),
static Gfx sCylinderDL[] = {
gsSPVertex(sCylinderVtx, 27, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0),

6
src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm.c
View file

@ -150,7 +150,7 @@ void OceffStorm_Draw2(Actor* thisx, GlobalContext* globalCtx) {
void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) {
u32 scroll = globalCtx->state.frames & 0xFFF;
OceffStorm* this = THIS;
Vtx* vtxPtr = vertices;
Vtx* vtxPtr = sCylinderVtx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 486);
@ -167,10 +167,10 @@ void OceffStorm_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 498),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sCylinderTexDl);
gSPDisplayList(POLY_XLU_DISP++, sCylinderTexDL);
gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 4, (0 - scroll) * 8, 32, 32,
1, scroll * 8, (0 - scroll) * 12, 32, 32));
gSPDisplayList(POLY_XLU_DISP++, sCylinderDl);
gSPDisplayList(POLY_XLU_DISP++, sCylinderDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_storm.c", 512);

26
src/overlays/actors/ovl_Oceff_Storm/z_oceff_storm_gfx.c
View file

@ -1,7 +1,7 @@
#include "z_oceff_storm.h"
#include "objects/gameplay_keep/gameplay_keep.h"
static u32 tex0[] = {
static u32 sTexture[] = {
0x2F6E6F59, 0x6197B3CC, 0xC8AD8E6C, 0x5333170A, 0x17366173, 0x86ABC7C6, 0xA9928C7E, 0x55496341, 0x40705B59,
0x79A5DAE8, 0xC9A5927F, 0x6F50270D, 0x17304F6C, 0x8BAAC3B9, 0x9189A0A5, 0x854A2F1F, 0x33808E74, 0x709BB7CC,
0xC6B18E69, 0x4627100D, 0x21406880, 0x9BC2DAC1, 0x92808378, 0x514B7350, 0x386E6768, 0x80AAE1E4, 0xC6A0866D,
@ -127,14 +127,14 @@ static Gfx sTextureDL[] = {
gsSPClearGeometryMode(G_TEXTURE_ENABLE | G_CULL_BACK | G_FOG | G_LIGHTING | G_TEXTURE_GEN | G_TEXTURE_GEN_LINEAR),
gsDPSetCombineLERP(TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, TEXEL1, TEXEL0, PRIM_LOD_FRAC, TEXEL0, PRIMITIVE,
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, PRIMITIVE, 0),
gsDPLoadTextureBlock(tex0, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 6, 3, 1),
gsDPLoadMultiBlock(tex0, 0x0, 1, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 6, 2, 0),
gsDPLoadTextureBlock(sTexture, 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, 3, 1),
gsDPLoadMultiBlock(sTexture, 0x0, 1, 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, 2, 0),
gsSPEndDisplayList(),
};
static Vtx vertices[] = {
static Vtx sCylinderVtx[] = {
VTX(-35, 150, -35, 1792, 512, 0xFF, 0xFF, 0xFF, 0x7E), VTX(-35, 500, -35, 1792, 0, 0xFF, 0xFF, 0xFF, 0x00),
VTX(0, 500, -50, 1536, 0, 0xFF, 0xFF, 0xFF, 0x00), VTX(35, 0, -35, 1280, 1024, 0xFF, 0xFF, 0xFF, 0x00),
VTX(50, 150, 0, 1024, 512, 0xFF, 0xFF, 0xFF, 0x00), VTX(50, 0, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00),
@ -151,14 +151,14 @@ static Vtx vertices[] = {
VTX(35, 500, 35, 768, 0, 0xFF, 0xFF, 0xFF, 0x00),
};
static Gfx sCylinderTexDl[] = {
static Gfx sCylinderTexDL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPLoadTextureBlock(gEffUnknown10Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 2, 13),
gsDPLoadMultiBlock(gEffUnknown11Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 12),
gsDPLoadTextureBlock(gEffUnknown10Tex, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 2, 13),
gsDPLoadMultiBlock(gEffUnknown11Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 12),
gsDPSetCombineLERP(TEXEL1, TEXEL0, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT,
COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
gsDPSetRenderMode(AA_EN | Z_CMP | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_XLU | FORCE_BL |
@ -168,8 +168,8 @@ static Gfx sCylinderTexDl[] = {
gsSPEndDisplayList(),
};
static Gfx sCylinderDl[] = {
gsSPVertex(vertices, 27, 0),
static Gfx sCylinderDL[] = {
gsSPVertex(sCylinderVtx, 27, 0),
gsSP2Triangles(0, 1, 2, 0, 3, 4, 5, 0),
gsSP2Triangles(6, 7, 8, 0, 6, 8, 4, 0),
gsSP2Triangles(9, 10, 6, 0, 9, 6, 3, 0),

10
src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe.c
View file

@ -73,7 +73,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
u8 alphaTable[3];
s32 i;
Vec3f eye;
Vtx(*vtxPtr)[2];
Vtx* vtxPtr;
Vec3f vec;
eye = ACTIVE_CAM->eye;
@ -98,9 +98,9 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
for (i = 0; i < 20; i++) {
vtxPtr = (Vtx(*)[2])vertices;
vtxPtr[i][0].v.cn[3] = alphaTable[((sOceffWipeAlphaIndices[i] & 0xF0) >> 4)];
vtxPtr[i][1].v.cn[3] = alphaTable[sOceffWipeAlphaIndices[i] & 0xF];
vtxPtr = sFrustumVtx;
vtxPtr[i * 2 + 0].v.cn[3] = alphaTable[((sOceffWipeAlphaIndices[i] & 0xF0) >> 4)];
vtxPtr[i * 2 + 1].v.cn[3] = alphaTable[sOceffWipeAlphaIndices[i] & 0xF];
}
func_80093D84(globalCtx->state.gfxCtx);
@ -124,7 +124,7 @@ void OceffWipe_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sTextureDL);
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++, sFrustrumDl);
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe.c", 398);
}

18
src/overlays/actors/ovl_Oceff_Wipe/z_oceff_wipe_gfx.c
View file

@ -1,6 +1,6 @@
#include "z_oceff_wipe.h"
static u32 tex0[] = {
static u32 sTexture[] = {
0x354D5AAC, 0xA5561C01, 0x124688B5, 0x74583231, 0x313D71D6, 0x9F5B3507, 0x104089AD, 0x748F440C, 0x408176AC,
0xB4661301, 0x2261C0BE, 0x49392533, 0x2C497FC4, 0x80451D06, 0x2466BBD0, 0x9CB85411, 0x40A09DA3, 0xB37F210B,
0x3D8AEAC7, 0x3F241930, 0x2F5591A7, 0x6441080F, 0x4191E8DB, 0xB7A76B18, 0x4094BAA0, 0x76532D22, 0x60BAFEE8,
@ -32,7 +32,7 @@ static u32 tex0[] = {
0x422B6EE0, 0xBB85480B, 0x04256799, 0x716D6D21,
};
static Vtx vertices[] = {
static Vtx sFrustumVtx[] = {
VTX(-165, 227, 0, 1229, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(-206, 283, 300, 1229, 512, 0xFF, 0xFF, 0xFF, 0xA0),
VTX(0, 350, 300, 1024, 512, 0xFF, 0xFF, 0xFF, 0xA0), VTX(0, 280, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00),
VTX(-294, 405, 1000, 1229, 0, 0xFF, 0xFF, 0xFF, 0xFF), VTX(0, 500, 1000, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF),
@ -59,11 +59,11 @@ static Gfx sTextureDL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPLoadTextureBlock(tex0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 0),
gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 0),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 15,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 0),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 4, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 5, 15, G_TX_NOMIRROR | G_TX_WRAP, 5,
0),
gsDPSetTileSize(1, 0, 0, (31 << 2), (31 << 2)),
gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, TEXEL0, ENVIRONMENT, TEXEL0, PRIMITIVE,
ENVIRONMENT, COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
@ -74,8 +74,8 @@ static Gfx sTextureDL[] = {
gsSPEndDisplayList(),
};
static Gfx sFrustrumDl[] = {
gsSPVertex(vertices, 32, 0),
static Gfx sFrustumDL[] = {
gsSPVertex(sFrustumVtx, 32, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSP2Triangles(1, 4, 5, 0, 1, 5, 2, 0),
gsSP2Triangles(6, 7, 1, 0, 6, 1, 0, 0),
@ -93,7 +93,7 @@ static Gfx sFrustrumDl[] = {
gsSP2Triangles(27, 28, 25, 0, 27, 25, 24, 0),
gsSP2Triangles(28, 29, 26, 0, 28, 26, 25, 0),
gsSP2Triangles(30, 31, 28, 0, 30, 28, 27, 0),
gsSPVertex(vertices + 32, 8, 0),
gsSPVertex(sFrustumVtx + 32, 8, 0),
gsSP2Triangles(0, 1, 2, 0, 0, 2, 3, 0),
gsSP2Triangles(4, 5, 0, 0, 4, 0, 6, 0),
gsSP2Triangles(5, 7, 1, 0, 5, 1, 0, 0),

4
src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2.c
View file

@ -76,7 +76,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) {
z = 1330;
}
vtxPtr = vertices;
vtxPtr = sFrustumVtx;
if (this->counter >= 80) {
alpha = 12 * (100 - this->counter);
} else {
@ -104,7 +104,7 @@ void OceffWipe2_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sTextureDL);
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++, sFrustrumDl);
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe2.c", 417);
}

16
src/overlays/actors/ovl_Oceff_Wipe2/z_oceff_wipe2_gfx.c
View file

@ -1,6 +1,6 @@
#include "z_oceff_wipe2.h"
static u32 tex0[] = {
static u32 sTexture[] = {
0x55211122, 0x22223333, 0x34444444, 0x44555566, 0x66666666, 0x66665555, 0x55554446, 0x99864323, 0x54211222,
0x22223333, 0x44444444, 0x45555566, 0x66666666, 0x66666666, 0x66555458, 0xa9742224, 0x63212222, 0x22233334,
0x44444445, 0x55555566, 0x66666666, 0x66666666, 0x66665569, 0xb9532225, 0x53222222, 0x22333344, 0x44445555,
@ -120,7 +120,7 @@ static u32 tex1[] = {
0x86444687, 0x55579866, 0x66666666, 0x77777777, 0x76666666, 0x66555555, 0x55579644, 0x46864446,
};
static Vtx vertices[] = {
static Vtx sFrustumVtx[] = {
VTX(88, 121, 0, 1638, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, 176, 1000, 1434, 0, 0xFF, 0xFF, 0xFF, 0xFF),
VTX(143, 46, 0, 1229, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(300, 0, 1000, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF),
VTX(0, 150, 0, 2048, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, 285, 1000, 1843, 0, 0xFF, 0xFF, 0xFF, 0xFF),
@ -138,10 +138,10 @@ static Gfx sTextureDL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPLoadTextureBlock_4b(tex0, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, G_TX_NOMIRROR | G_TX_NOMIRROR,
6, 6, 14, 14),
gsDPLoadMultiBlock_4b(tex1, 0x100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 6, 1, 14),
gsDPLoadTextureBlock_4b(sTexture, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, 6, 6,
14, 14),
gsDPLoadMultiBlock_4b(tex1, 0x100, 1, G_IM_FMT_I, 64, 64, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP,
6, 6, 1, 14),
gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT,
COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL |
@ -151,8 +151,8 @@ static Gfx sTextureDL[] = {
gsSPEndDisplayList(),
};
static Gfx sFrustrumDl[] = {
gsSPVertex(&vertices, 22, 0),
static Gfx sFrustumDL[] = {
gsSPVertex(&sFrustumVtx, 22, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
gsSP2Triangles(4, 5, 0, 0, 5, 1, 0, 0),
gsSP2Triangles(6, 7, 4, 0, 7, 5, 4, 0),

4
src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
View file

@ -77,7 +77,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
z = 1330;
}
vtxPtr = vertices;
vtxPtr = sFrustumVtx;
if (this->counter >= 80) {
alpha = 12 * (100 - this->counter);
} else {
@ -105,7 +105,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sTextureDL);
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++, sFrustrumDl);
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 370);
}

16
src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3_gfx.c
View file

@ -1,6 +1,6 @@
#include "z_oceff_wipe3.h"
static u32 tex0[] = {
static u32 sTexture[] = {
0x91A69C82, 0x9CAC7448, 0x4246484B, 0x4D505153, 0x53545454, 0x54545556, 0x57585859, 0x59595857, 0x56545350,
0x4F4E4C4C, 0x4C4B4A49, 0x49474544, 0x42403E3C, 0x3D549BB3, 0xB4B4B3B3, 0xB2AD966F, 0xAEB3B2A8, 0x98B19B62,
0x4F4B4C4F, 0x51535556, 0x56565656, 0x56565656, 0x57585859, 0x59595857, 0x56545350, 0x4F4E4D4C, 0x4C4B4B4A,
@ -117,7 +117,7 @@ static u32 tex0[] = {
0x4E4C4B4A, 0x49484846, 0x45444241, 0x3F3E3C3B, 0x4681AFB4, 0xAEB0B3B3, 0xB3B19A68,
};
static Vtx vertices[] = {
static Vtx sFrustumVtx[] = {
VTX(88, 121, 0, 1638, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, 176, 1000, 1434, 0, 0xFF, 0xFF, 0xFF, 0xFF),
VTX(143, 46, 0, 1229, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(300, 0, 1000, 1024, 0, 0xFF, 0xFF, 0xFF, 0xFF),
VTX(0, 150, 0, 2048, 2048, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, 285, 1000, 1843, 0, 0xFF, 0xFF, 0xFF, 0xFF),
@ -135,11 +135,11 @@ static Gfx sTextureDL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPLoadTextureBlock(tex0, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 6, 14, 14),
gsDPLoadTextureBlock(sTexture, 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, 14, 14),
gsDPTileSync(),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 8, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 14,
G_TX_NOMIRROR | G_TX_NOMIRROR, 6, 14),
gsDPSetTile(G_IM_FMT_I, G_IM_SIZ_8b, 8, 0x0, 1, 0, G_TX_NOMIRROR | G_TX_WRAP, 6, 14, G_TX_NOMIRROR | G_TX_WRAP, 6,
14),
gsDPSetTileSize(1, 0, 0, (63 << 2), (63 << 2)),
gsDPSetCombineLERP(TEXEL1, PRIMITIVE, ENV_ALPHA, TEXEL0, TEXEL1, 0, ENVIRONMENT, TEXEL0, PRIMITIVE, ENVIRONMENT,
COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
@ -150,8 +150,8 @@ static Gfx sTextureDL[] = {
gsSPEndDisplayList(),
};
static Gfx sFrustrumDl[] = {
gsSPVertex(vertices, 22, 0),
static Gfx sFrustumDL[] = {
gsSPVertex(sFrustumVtx, 22, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
gsSP2Triangles(4, 5, 0, 0, 5, 1, 0, 0),
gsSP2Triangles(6, 7, 4, 0, 7, 5, 4, 0),

4
src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
View file

@ -74,7 +74,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
z = 1330;
}
vtxPtr = vertices;
vtxPtr = sFrustumVtx;
if (this->counter >= 30) {
alpha = 12 * (50 - this->counter);
} else {
@ -106,7 +106,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sTexture2DL);
gSPDisplayList(POLY_XLU_DISP++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 64, 1,
scroll * (-1), scroll, 32, 32));
gSPDisplayList(POLY_XLU_DISP++, sFrustrumDl);
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 344);
}

20
src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4_gfx.c
View file

@ -1,7 +1,7 @@
#include "z_oceff_wipe4.h"
#include "objects/gameplay_keep/gameplay_keep.h"
static u32 tex0[] = {
static u32 sTexture[] = {
0x00061507, 0x00000000, 0x295a2b08, 0x10030f03, 0x0d070006, 0x00031625, 0x3f230012, 0x79590000, 0x00102c2a,
0x254a1b0e, 0xaff66600, 0x00467e29, 0x08020000, 0x03383e0b, 0x0501000a, 0x31211c05, 0x00031c27, 0x4ca92f13,
0xb2ef5500, 0x057ebf37, 0x00000000, 0x0e493f13, 0x00000002, 0x335c3e03, 0x00000e07, 0x3c761200, 0x447e2200,
@ -61,7 +61,7 @@ static u32 tex0[] = {
0x00000000, 0x00000008, 0x14030015, 0x5d2c0000, 0x00000115, 0x08000027, 0x724f0f0a, 0x353d0600,
};
static Vtx vertices[] = {
static Vtx sFrustumVtx[] = {
VTX(88, 121, 0, 819, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, 176, 1000, 717, 0, 0xFF, 0xFF, 0xFF, 0xFF),
VTX(143, 46, 0, 614, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(300, 0, 1000, 512, 0, 0xFF, 0xFF, 0xFF, 0xFF),
VTX(0, 150, 0, 1024, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(93, 285, 1000, 922, 0, 0xFF, 0xFF, 0xFF, 0xFF),
@ -79,8 +79,8 @@ static Gfx sTexture0DL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPLoadMultiBlock(gEffUnknown12Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 15),
gsDPLoadMultiBlock(gEffUnknown12Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 15),
gsDPSetPrimColor(0x00, 0x00, 170, 255, 255, 255),
gsDPSetEnvColor(0, 150, 0, 128),
gsSPEndDisplayList(),
@ -90,8 +90,8 @@ static Gfx sTexture1DL[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
gsDPLoadMultiBlock(gEffUnknown12Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 5, 1, 0),
gsDPLoadMultiBlock(gEffUnknown12Tex, 0x100, 1, G_IM_FMT_I, G_IM_SIZ_8b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 5, 1, 0),
gsDPSetPrimColor(0x00, 0x00, 255, 170, 255, 255),
gsDPSetEnvColor(120, 0, 100, 128),
gsSPEndDisplayList(),
@ -99,8 +99,8 @@ static Gfx sTexture1DL[] = {
static Gfx sTexture2DL[] = {
gsDPPipeSync(),
gsDPLoadTextureBlock(tex0, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_NOMIRROR,
G_TX_NOMIRROR | G_TX_NOMIRROR, 5, 6, 14, 1),
gsDPLoadTextureBlock(sTexture, G_IM_FMT_I, G_IM_SIZ_8b, 32, 64, 0, G_TX_NOMIRROR | G_TX_WRAP,
G_TX_NOMIRROR | G_TX_WRAP, 5, 6, 14, 1),
gsDPSetCombineLERP(TEXEL0, PRIMITIVE, ENV_ALPHA, TEXEL1, TEXEL0, 0, ENVIRONMENT, TEXEL1, PRIMITIVE, ENVIRONMENT,
COMBINED, ENVIRONMENT, COMBINED, 0, SHADE, 0),
gsDPSetRenderMode(AA_EN | IM_RD | CLR_ON_CVG | CVG_DST_WRAP | ZMODE_OPA | FORCE_BL |
@ -110,8 +110,8 @@ static Gfx sTexture2DL[] = {
//! @bug : gsSPEndDisplayList() is missing so the next dlist will execute as well
};
static Gfx sFrustrumDl[] = {
gsSPVertex(vertices, 22, 0),
static Gfx sFrustumDL[] = {
gsSPVertex(sFrustumVtx, 22, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
gsSP2Triangles(4, 5, 0, 0, 5, 1, 0, 0),
gsSP2Triangles(6, 7, 4, 0, 7, 5, 4, 0),