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

@ -347,10 +347,10 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->planeAlpha != 0) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_holl.c", 805);
if (this->planeAlpha == 255) {
gfxP = oGfxCtx->polyOpa.p;
gfxP = POLY_OPA_DISP;
setupDLIdx = 37;
} else {
gfxP = oGfxCtx->polyXlu.p;
gfxP = POLY_XLU_DISP;
setupDLIdx = 0;
}
gfxP = Gfx_CallSetupDL(gfxP, setupDLIdx);
@ -364,9 +364,9 @@ void EnHoll_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(gfxP++, sPlaneDlist);
if (this->planeAlpha == 255) {
oGfxCtx->polyOpa.p = gfxP;
POLY_OPA_DISP = gfxP;
} else {
oGfxCtx->polyXlu.p = gfxP;
POLY_XLU_DISP = gfxP;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_holl.c", 831);
}