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

Fixes in PR #50 (3)

Browse source 
- Rename Graph_OpenDisp/Graph_CloseDisp to Graph_OpenDisps/Graph_CloseDisps
- Rename gfxArr to dispRefs
This commit is contained in:
Random 2020-04-05 19:29:30 +02:00
parent 62c6549eec
commit 43acba22a9
667 changed files with 1928 additions and 1928 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/overlays/actors/ovl_En_Tk/z_en_tk.c
View file

@ -105,15 +105,15 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
s16 i;
s16 alpha;
s16 imageIdx;
Gfx* pgdl[4];
Gfx* dispRefs[4];
/*
* This assignment always occurs before a call to Graph_OpenDisp which
* This assignment always occurs before a call to Graph_OpenDisps which
* makes me suspect that they're inside a macro where the function call
* is present only for debug builds. Same for Graph_CloseDisp most likely.
* is present only for debug builds. Same for Graph_CloseDisps most likely.
*/
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114);
gfxSetup = 0;
@ -154,7 +154,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) {
eff++;
}
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154);
}
s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) {
@ -694,14 +694,14 @@ void EnTk_Update(EnTk* this, GlobalContext* globalCtx) {
void func_80B1D200(GlobalContext* globalCtx) {
GraphicsContext* gfxCtx;
Gfx* pgdl[4];
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1188);
gSPDisplayList(gfxCtx->polyOpa.p++, D_0600ACE0);
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1190);
}
s32 func_80B1D278(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, Actor* actor) {
@ -748,14 +748,14 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) {
EnTk* thisAgain = this;
GraphicsContext* gfxCtx;
Gfx* pgdl[4];
Gfx* dispRefs[4];
Matrix_Push();
EnTkEff_Draw(thisAgain, globalCtx);
Matrix_Pull();
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294);
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1294);
func_80093D18(globalCtx->state.gfxCtx);
@ -764,5 +764,5 @@ void EnTk_Draw(EnTk* this, GlobalContext* globalCtx) {
SkelAnime_DrawSV(globalCtx, thisAgain->skelAnim.skeleton, thisAgain->skelAnim.actorDrawTbl,
thisAgain->skelAnim.dListCount, func_80B1D278, func_80B1D2E4, &thisAgain->actor);
Graph_CloseDisp(pgdl, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312);
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tk.c", 1312);
}