mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00
Code Issues Projects Releases Wiki Activity

Actor Cleanups (#177)

Browse source 
* rename init chains, colchkinfo, colider inits, damage tables

* actor cleanups

* fix collider init script names

* small fixes

* ichain arg name

* change dynapoly types and names

* revert enru1 data name

* and the type

* pr suggestions
This commit is contained in:
fig02 2020-05-31 05:55:48 -04:00 • committed by GitHub
parent 13a94482e5
commit 78d0883f04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
108 changed files with 786 additions and 869 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -101,15 +101,15 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params == 1) {
gSPDisplayList(gfxCtx->polyXlu.p++, textureDl1);
gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL1);
} else {
gSPDisplayList(gfxCtx->polyXlu.p++, textureDl0);
gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL0);
}
gSPDisplayList(gfxCtx->polyXlu.p++, textureDl2);
gSPDisplayList(gfxCtx->polyXlu.p++, sTextureDL2);
gSPDisplayList(gfxCtx->polyXlu.p++, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * (-2), 32, 64,
1, scroll * (-1), scroll, 32, 32));
gSPDisplayList(gfxCtx->polyXlu.p++, frustrumDl);
gSPDisplayList(gfxCtx->polyXlu.p++, sFrustrumDl);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 344);
}

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

@ -76,7 +76,7 @@ static Vtx vertices[] = {
VTX(143, -46, 0, 410, 1024, 0xFF, 0xFF, 0xFF, 0x00), VTX(243, -176, 1000, 307, 0, 0xFF, 0xFF, 0xFF, 0xFF),
};
static Gfx textureDl0[] = {
static Gfx sTextureDL0[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@ -87,7 +87,7 @@ static Gfx textureDl0[] = {
gsSPEndDisplayList(),
};
static Gfx textureDl1[] = {
static Gfx sTextureDL1[] = {
gsDPPipeSync(),
gsDPSetTextureLUT(G_TT_NONE),
gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON),
@ -98,7 +98,7 @@ static Gfx textureDl1[] = {
gsSPEndDisplayList(),
};
static Gfx textureDl2[] = {
static Gfx sTextureDL2[] = {
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),
@ -111,7 +111,7 @@ static Gfx textureDl2[] = {
//! @bug : gsSPEndDisplayList() is missing so the next dlist will execute as well
};
static Gfx frustrumDl[] = {
static Gfx sFrustrumDl[] = {
gsSPVertex(vertices, 22, 0),
gsSP2Triangles(0, 1, 2, 0, 1, 3, 2, 0),
gsSP2Triangles(4, 5, 0, 0, 5, 1, 0, 0),