mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-22 23:11:20 +00:00
Code Issues Projects Releases Wiki Activity

Use macros for oGfxCtx accesses (#465)

Browse source 
* 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
Download patch file Download diff file Expand all files Collapse all files

12
src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
View file

@ -227,19 +227,19 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx);
if (thisx->params & 0x8000) {
gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 100, 100, R_NAVI_MSG_REGION_ALPHA);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 100, 100, R_NAVI_MSG_REGION_ALPHA);
} else {
gDPSetPrimColor(oGfxCtx->polyXlu.p++, 0, 0, 255, 255, 255, R_NAVI_MSG_REGION_ALPHA);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, R_NAVI_MSG_REGION_ALPHA);
}
gSPMatrix(oGfxCtx->polyXlu.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg.c", 448),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg.c", 448),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(oGfxCtx->polyXlu.p++, D_809AD278);
gSPDisplayList(POLY_XLU_DISP++, D_809AD278);
if (thisx->params & 0x4000) {
gSPDisplayList(oGfxCtx->polyXlu.p++, D_809AD4B8);
gSPDisplayList(POLY_XLU_DISP++, D_809AD4B8);
} else {
gSPDisplayList(oGfxCtx->polyXlu.p++, D_809AD3B8);
gSPDisplayList(POLY_XLU_DISP++, D_809AD3B8);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 457);