mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-21 14:31:17 +00:00
Cleanup gSPMatrix, rename Matrix_New
-> Matrix_Finalize
, add MATRIX_FINALIZE_AND_LOAD
(#1983)
* clean up gSPMatrix usage * add weird hybrid macro gSPMATRIX_SET_NEW * Matrix_NewMtx, MATRIX_NEW -> Matrix_Finalize, MATRIX_FINALIZE * gSPMATRIX_SET_NEW -> MATRIX_FINALIZE_AND_LOAD * format
This commit is contained in:
parent
2e79b83bb8
commit
5441559b30
268 changed files with 702 additions and 1272 deletions
|
@ -509,8 +509,7 @@ void EnBa_Draw(Actor* thisx, PlayState* play) {
|
|||
MATRIX_TO_MTX(mtx, "../z_en_ba.c", 970);
|
||||
}
|
||||
Matrix_Pop();
|
||||
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_en_ba.c", 973),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_ba.c", 973);
|
||||
gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_000890);
|
||||
} else {
|
||||
gSPSegment(POLY_OPA_DISP++, 0x08,
|
||||
|
@ -518,8 +517,7 @@ void EnBa_Draw(Actor* thisx, PlayState* play) {
|
|||
(play->gameplayFrames * 2) % 128, 32, 32, 1, (play->gameplayFrames * -5) % 128,
|
||||
(play->gameplayFrames * -5) % 128, 32, 32));
|
||||
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 125, 100, 255);
|
||||
gSPMatrix(POLY_OPA_DISP++, MATRIX_NEW(play->state.gfxCtx, "../z_en_ba.c", 991),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
MATRIX_FINALIZE_AND_LOAD(POLY_OPA_DISP++, play->state.gfxCtx, "../z_en_ba.c", 991);
|
||||
gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_001D80);
|
||||
}
|
||||
CLOSE_DISPS(play->state.gfxCtx, "../z_en_ba.c", 995);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue