mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-07 14:50:15 +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

22
src/overlays/actors/ovl_kaleido_scope/z_kaleido_scope_PAL.c
View file

@ -44,21 +44,19 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
Input* input = &globalCtx->state.input[0];
PauseContext* pauseCtx = &globalCtx->pauseCtx;
InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[4];
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3188);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3188);
pauseCtx->inputX = input->rel.in.x;
pauseCtx->inputY = input->rel.in.y;
gSPSegment(gfxCtx->polyOpa.p++, 0x02, interfaceCtx->parameterSegment);
gSPSegment(gfxCtx->polyOpa.p++, 0x07, pauseCtx->unk_13C);
gSPSegment(gfxCtx->polyOpa.p++, 0x08, pauseCtx->unk_128);
gSPSegment(gfxCtx->polyOpa.p++, 0x09, pauseCtx->unk_12C);
gSPSegment(gfxCtx->polyOpa.p++, 0x0A, pauseCtx->unk_138);
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, pauseCtx->unk_130);
gSPSegment(gfxCtx->polyOpa.p++, 0x0D, pauseCtx->unk_134);
gSPSegment(oGfxCtx->polyOpa.p++, 0x02, interfaceCtx->parameterSegment);
gSPSegment(oGfxCtx->polyOpa.p++, 0x07, pauseCtx->unk_13C);
gSPSegment(oGfxCtx->polyOpa.p++, 0x08, pauseCtx->unk_128);
gSPSegment(oGfxCtx->polyOpa.p++, 0x09, pauseCtx->unk_12C);
gSPSegment(oGfxCtx->polyOpa.p++, 0x0A, pauseCtx->unk_138);
gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, pauseCtx->unk_130);
gSPSegment(oGfxCtx->polyOpa.p++, 0x0D, pauseCtx->unk_134);
if (pauseCtx->flag == 0) {
func_80823994(pauseCtx, pauseCtx->eye.x, pauseCtx->eye.y, pauseCtx->eye.z);
@ -67,7 +65,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
func_80820434(globalCtx, globalCtx->state.gfxCtx);
func_800949A8(globalCtx->state.gfxCtx);
gDPSetCombineLERP(gfxCtx->polyOpa.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
gDPSetCombineLERP(oGfxCtx->polyOpa.p++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0,
PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
func_80823994(pauseCtx, 0.0f, 0.0f, 64.0f);
@ -82,7 +80,7 @@ void KaleidoScope_Draw(GlobalContext* globalCtx) {
func_808161AC(globalCtx);
}
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3254);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kaleido_scope_PAL.c", 3254);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_kaleido_scope/func_8082650C.s")