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

Introduce OPEN_DISPS/CLOSE_DISPS macros (#360)

Browse source
This commit is contained in:
Roman971 2020-08-30 01:00:17 +02:00 • committed by GitHub
parent 1f1b5e39f5
commit 2a2fdf7f3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
134 changed files with 3133 additions and 3775 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -291,7 +291,7 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) {
if (globalCtx) {};
globalCtx->envCtx.unk_8C[1][0] = globalCtx->envCtx.unk_8C[1][1] = globalCtx->envCtx.unk_8C[1][2] = 0xFA;
globalCtx->envCtx.unk_8C[0][0] = globalCtx->envCtx.unk_8C[0][1] = globalCtx->envCtx.unk_8C[0][2] = 0xFA;
func_8005AA1C(&globalCtx->cameras[0], 2, 0xB, 8);
func_8005AA1C(&globalCtx->mainCamera, 2, 0xB, 8);
thisx->params = BOMB_EXPLOSION;
this->timer = 10;
thisx->flags |= 0x20;
@ -328,30 +328,28 @@ void EnBom_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnBom* this = THIS;
GraphicsContext* gfxCtx;
Gfx* dispRefs[4];
if (1) {}
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_bom.c", 913);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bom.c", 913);
if (thisx->params == BOMB_BODY) {
func_80093D18(globalCtx->state.gfxCtx);
func_800D1FD4(&globalCtx->mf_11DA0);
func_8002EBCC(thisx, globalCtx, 0);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 928),
gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 928),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, D_04007A50);
gSPDisplayList(oGfxCtx->polyOpa.p++, D_04007A50);
Matrix_RotateRPY(0x4000, 0, 0, MTXMODE_APPLY);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 934),
gSPMatrix(oGfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 934),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(gfxCtx->polyOpa.p++);
gDPSetEnvColor(gfxCtx->polyOpa.p++, (s16)this->flashIntensity, 0, 40, 255);
gDPSetPrimColor(gfxCtx->polyOpa.p++, 0, 0, (s16)this->flashIntensity, 0, 40, 255);
gSPDisplayList(gfxCtx->polyOpa.p++, D_04007860);
gDPPipeSync(oGfxCtx->polyOpa.p++);
gDPSetEnvColor(oGfxCtx->polyOpa.p++, (s16)this->flashIntensity, 0, 40, 255);
gDPSetPrimColor(oGfxCtx->polyOpa.p++, 0, 0, (s16)this->flashIntensity, 0, 40, 255);
gSPDisplayList(oGfxCtx->polyOpa.p++, D_04007860);
func_800628A4(0, &this->explosionCollider);
}
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_bom.c", 951);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bom.c", 951);
}