1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-08 07:20:16 +00:00

Use macros for oGfxCtx accesses (#465)

* fix colliderinit typo

* fix initchain

* reloc

* add defines

* add defines

* missed some on merge

* rename gfxCtx and add comment

* remove space
This commit is contained in:
fig02 2020-10-29 17:31:09 -04:00 committed by GitHub
parent 92bb1fb210
commit 3c5fe66dcd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
195 changed files with 2236 additions and 2229 deletions

View file

@ -144,9 +144,9 @@ void func_809C2324(GlobalContext* globalCtx, Gfx* dList, s32 alpha) {
segment = D_809C25A0;
}
gSPSegment(oGfxCtx->polyXlu.p++, 0x08, segment);
gDPSetEnvColor(oGfxCtx->polyXlu.p++, 0, 0, 0, alpha);
gSPDisplayList(oGfxCtx->polyXlu.p++, dList);
gSPSegment(POLY_XLU_DISP++, 0x08, segment);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, alpha);
gSPDisplayList(POLY_XLU_DISP++, dList);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 330);
}
@ -163,9 +163,9 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) {
gameplayFrames = globalCtx->gameplayFrames % 128;
gSPSegment(oGfxCtx->polyXlu.p++, 0x0D,
gSPSegment(POLY_XLU_DISP++, 0x0D,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames, 0, 32, 32, 1, gameplayFrames, 0, 32, 32));
gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 363),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 363),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->unk_164 != 0) {