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

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

46
src/overlays/actors/ovl_En_Ru1/z_en_ru1.c
View file

@ -2358,22 +2358,23 @@ void func_80AF0400(EnRu1* this, GlobalContext* globalCtx) {
s16 temp2 = this->unk_260;
SkelAnime* skelAnime = &this->skelAnime;
s32 addr2 = D_80AF0870[temp2];
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
s32 pad1;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ru1.c", 1282);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1282);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(gfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2));
gDPSetEnvColor(gfxCtx->polyOpa.p++, 0, 0, 0, 255);
gSPSegment(gfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]);
gSPSegment(oGfxCtx->polyOpa.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(oGfxCtx->polyOpa.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2));
gDPSetEnvColor(oGfxCtx->polyOpa.p++, 0, 0, 0, 255);
gSPSegment(oGfxCtx->polyOpa.p++, 0x0C, &D_80116280[2]);
gfxCtx->polyOpa.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
EnRu1_OverrideLimbDraw, EnRu1_PostLimbDraw, &this->actor, gfxCtx->polyOpa.p);
oGfxCtx->polyOpa.p =
SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
EnRu1_OverrideLimbDraw, EnRu1_PostLimbDraw, &this->actor, oGfxCtx->polyOpa.p);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1309);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ru1.c", 1309);
}
void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx) {
@ -2383,22 +2384,23 @@ void func_80AF05D4(EnRu1* this, GlobalContext* globalCtx) {
s16 temp2 = this->unk_260;
SkelAnime* skelAnime = &this->skelAnime;
s32 addr2 = D_80AF0870[temp2];
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* dispRefs[5];
s32 pad1;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ru1.c", 1324);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1324);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(gfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(gfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2));
gDPSetEnvColor(gfxCtx->polyXlu.p++, 0, 0, 0, this->unk_2A8);
gSPSegment(gfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]);
gSPSegment(oGfxCtx->polyXlu.p++, 0x08, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr1));
gSPSegment(oGfxCtx->polyXlu.p++, 0x09, SEGMENTED_TO_VIRTUAL(addr2));
gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, this->unk_2A8);
gSPSegment(oGfxCtx->polyXlu.p++, 0x0C, &D_80116280[0]);
gfxCtx->polyXlu.p = SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
EnRu1_OverrideLimbDraw, NULL, &this->actor, gfxCtx->polyXlu.p);
oGfxCtx->polyXlu.p =
SkelAnime_DrawSV2(globalCtx, skelAnime->skeleton, skelAnime->limbDrawTbl, skelAnime->dListCount,
EnRu1_OverrideLimbDraw, NULL, &this->actor, oGfxCtx->polyXlu.p);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_ru1.c", 1353);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ru1.c", 1353);
}
void EnRu1_Draw(Actor* thisx, GlobalContext* globalCtx) {