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

Create debug macros for common functions (#1597)

Browse source 
* Create debug macros for common functions

* Revert NDEBUG change

* MALLOCR -> MALLOC_R

* DEBUG -> OOT_DEBUG

* Use the same name for debug and non-debug matrix functions

* Fix file/line argument order

* Revert g[s]DPNoOp[Tag]

* Use SystemArena_MallocDebug directly in GameAlloc_MallocDebug

* MTXF_TO_MTX -> MATRIX_TO_MTX
This commit is contained in:
cadmic 2024-01-09 04:59:03 -08:00 • committed by GitHub
parent e146d7bc26
commit cd917b0cb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
314 changed files with 1352 additions and 1294 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/overlays/actors/ovl_En_Zl2/z_en_zl2.c
View file

@ -443,7 +443,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
s16* unk_1DC = this->unk_1DC;
if (limbIndex == 14) {
sp74 = Graph_Alloc(play->state.gfxCtx, sizeof(Mtx) * 7);
sp74 = GRAPH_ALLOC(play->state.gfxCtx, sizeof(Mtx) * 7);
gSPSegment((*gfx)++, 0x0C, sp74);
Matrix_Push();
@ -460,7 +460,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
}
Matrix_RotateZYX(unk_1DC[0] + kREG(31), unk_1DC[1] + kREG(32), unk_1DC[2] + kREG(33), MTXMODE_APPLY);
Matrix_Translate(-188.0f, -184.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[0], "../z_en_zl2.c", 1056);
MATRIX_TO_MTX(&sp74[0], "../z_en_zl2.c", 1056);
Matrix_Get(&sp34);
Matrix_MtxFToYXZRotS(&sp34, &sp2C, 0);
if (!FrameAdvance_IsEnabled(play)) {
@ -469,7 +469,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
}
Matrix_RotateZYX(unk_1DC[3] + kREG(34), unk_1DC[4] + kREG(35), unk_1DC[5] + kREG(36), MTXMODE_APPLY);
Matrix_Translate(-410.0f, -184.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[1], "../z_en_zl2.c", 1100);
MATRIX_TO_MTX(&sp74[1], "../z_en_zl2.c", 1100);
Matrix_Get(&sp34);
Matrix_MtxFToYXZRotS(&sp34, &sp2C, 0);
if (!FrameAdvance_IsEnabled(play)) {
@ -478,7 +478,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
}
Matrix_RotateZYX(unk_1DC[6] + kREG(37), unk_1DC[7] + kREG(38), unk_1DC[8] + kREG(39), MTXMODE_APPLY);
Matrix_Translate(-1019.0f, -26.0f, 0.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[2], "../z_en_zl2.c", 1120);
MATRIX_TO_MTX(&sp74[2], "../z_en_zl2.c", 1120);
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, 389.0f, MTXMODE_APPLY);
@ -491,7 +491,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
}
Matrix_RotateZYX(unk_1DC[9] + kREG(40), unk_1DC[10] + kREG(41), unk_1DC[11] + kREG(42), MTXMODE_APPLY);
Matrix_Translate(-427.0f, -1.0f, -3.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[3], "../z_en_zl2.c", 1145);
MATRIX_TO_MTX(&sp74[3], "../z_en_zl2.c", 1145);
Matrix_Get(&sp34);
Matrix_MtxFToYXZRotS(&sp34, &sp2C, 0);
if (!FrameAdvance_IsEnabled(play)) {
@ -501,7 +501,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
}
Matrix_RotateZYX(unk_1DC[12] + kREG(43), unk_1DC[13] + kREG(44), unk_1DC[14] + kREG(45), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, 84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[4], "../z_en_zl2.c", 1164);
MATRIX_TO_MTX(&sp74[4], "../z_en_zl2.c", 1164);
Matrix_Pop();
Matrix_Push();
Matrix_Translate(467.0f, 265.0f, -389.0f, MTXMODE_APPLY);
@ -514,7 +514,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
}
Matrix_RotateZYX(unk_1DC[15] + kREG(46), unk_1DC[16] + kREG(47), unk_1DC[17] + kREG(48), MTXMODE_APPLY);
Matrix_Translate(-427.0f, -1.0f, 3.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[5], "../z_en_zl2.c", 1189);
MATRIX_TO_MTX(&sp74[5], "../z_en_zl2.c", 1189);
Matrix_Get(&sp34);
Matrix_MtxFToYXZRotS(&sp34, &sp2C, 0);
if (!FrameAdvance_IsEnabled(play)) {
@ -524,7 +524,7 @@ s32 func_80B4F45C(PlayState* play, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s
}
Matrix_RotateZYX(unk_1DC[18] + kREG(49), unk_1DC[19] + kREG(50), unk_1DC[20] + kREG(51), MTXMODE_APPLY);
Matrix_Translate(-446.0f, -52.0f, -84.0f, MTXMODE_APPLY);
Matrix_ToMtx(&sp74[6], "../z_en_zl2.c", 1208);
MATRIX_TO_MTX(&sp74[6], "../z_en_zl2.c", 1208);
Matrix_Pop();
Matrix_Pop();
this->unk_24C = 1;
@ -549,7 +549,7 @@ void EnZl2_PostLimbDraw(PlayState* play, s32 limbIndex, Gfx** dList, Vec3s* rot,
Matrix_Translate(180.0f, 979.0f, -375.0f, MTXMODE_APPLY);
Matrix_RotateZYX(-0x5DE7, -0x53E9, 0x3333, MTXMODE_APPLY);
Matrix_Scale(1.2f, 1.2f, 1.2f, MTXMODE_APPLY);
gSPMatrix((*gfx)++, Matrix_NewMtx(play->state.gfxCtx, "../z_en_zl2.c", 1253),
gSPMatrix((*gfx)++, MATRIX_NEW(play->state.gfxCtx, "../z_en_zl2.c", 1253),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList((*gfx)++, gZelda2OcarinaDL);
}