mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-29 08:16:11 +00:00
Code Issues Projects Releases Wiki Activity

DISP macros for Bg_Haka_Water (#482)

Browse source
This commit is contained in:
Tharo 2020-11-16 07:18:52 +00:00 committed by GitHub
parent 888db95a4c
commit 3d21a38f08
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
View file

@ -114,11 +114,8 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
f32 temp; f32 temp;
s32 pad2; s32 pad2;
GraphicsContext* gfxCtx;
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx; OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 287);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 287);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
if (this->isLowered) { if (this->isLowered) {
@ -127,15 +124,15 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
temp = this->actor.posRot.pos.y - (this->actor.initPosRot.pos.y - 200.0f); temp = this->actor.posRot.pos.y - (this->actor.initPosRot.pos.y - 200.0f);
} }
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (u8)(0.765f * temp)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)(0.765f * temp));
gSPSegment(gfxCtx->polyXlu.p++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128,
globalCtx->gameplayFrames % 128, 32, 32, 1, 0, (0 - globalCtx->gameplayFrames) % 128, globalCtx->gameplayFrames % 128, 32, 32, 1, 0, (0 - globalCtx->gameplayFrames) % 128,
32, 32)); 32, 32));
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 312), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 312),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyXlu.p++, D_06001E50); gSPDisplayList(POLY_XLU_DISP++, D_06001E50);
Matrix_Translate(0.0f, 92.0f, -1680.0f, MTXMODE_NEW); Matrix_Translate(0.0f, 92.0f, -1680.0f, MTXMODE_NEW);
Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY); Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
@ -144,11 +141,11 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
temp = 0.0f; temp = 0.0f;
} }
gDPPipeSync(gfxCtx->polyXlu.p++); gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(gfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, (u8)(5.1f * temp)); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)(5.1f * temp));
gSPMatrix(gfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 328), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 328),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyXlu.p++, D_06002010); gSPDisplayList(POLY_XLU_DISP++, D_06002010);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 332); CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 332);
} }