From 9ea4e2423aba7ef417600a69bf1871d76a451526 Mon Sep 17 00:00:00 2001 From: Baoulettes Date: Sun, 26 Jun 2022 23:28:36 +0200 Subject: [PATCH] more overlay --- .../overlays/actors/ovl_Demo_Du/z_demo_du.c | 4 +- .../overlays/actors/ovl_Demo_Gt/z_demo_gt.c | 42 +++++++++---------- .../overlays/actors/ovl_Demo_Ik/z_demo_ik.c | 16 +++---- .../overlays/actors/ovl_Demo_Im/z_demo_im.c | 4 +- .../overlays/actors/ovl_Demo_Sa/z_demo_sa.c | 4 +- soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c | 6 +-- .../overlays/actors/ovl_En_Guest/z_en_guest.c | 12 +++--- soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c | 36 ++++++++-------- soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c | 12 +++--- soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c | 4 +- soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c | 4 +- soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c | 6 +-- soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c | 18 ++++---- soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c | 18 ++++---- .../ovl_Obj_Warp2block/z_obj_warp2block.c | 8 ++-- 15 files changed, 97 insertions(+), 97 deletions(-) diff --git a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c index 253b564d5..687634c47 100644 --- a/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c +++ b/soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c @@ -805,7 +805,7 @@ void DemoDu_Draw_02(Actor* thisx, GlobalContext* globalCtx2) { void* mouthTexture = sMouthTextures[mouthTexIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_du_inKenjyanomaDemo02.c", 275); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -820,7 +820,7 @@ void DemoDu_Draw_02(Actor* thisx, GlobalContext* globalCtx2) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, 0, 0, 0, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_du_inKenjyanomaDemo02.c", 304); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void DemoDu_InitCs_Credits(DemoDu* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c index f23c7e651..22bf64bc0 100644 --- a/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c +++ b/soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c @@ -853,7 +853,7 @@ void DemoGt_Draw2(DemoGt* this, GlobalContext* globalCtx) { s32* unk178; s32 pad; - OPEN_DISPS(gfxCtx, "../z_demo_gt_part2.c", 470); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(gfxCtx); unk198 = this->unk_198; @@ -861,12 +861,12 @@ void DemoGt_Draw2(DemoGt* this, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScrollEnvColor(gfxCtx, 0, 0, unk198[0], 0x20, 0x40, 1, 0, unk198[1], 0x20, 0x40, unk178[0], unk178[1], unk178[2], 128)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part2.c", 485), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureInnerDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, "../z_demo_gt_part2.c", 489); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_80980110_Init2(DemoGt* this, GlobalContext* globalCtx) { @@ -1168,15 +1168,15 @@ void DemoGt_Update10(DemoGt* this, GlobalContext* globalCtx) { void DemoGt_Draw3(DemoGt* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, "../z_demo_gt_part3.c", 1026); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part3.c", 1028), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureOuterDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, "../z_demo_gt_part3.c", 1032); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_80980F00_Init5(DemoGt* this, GlobalContext* globalCtx) { @@ -1271,7 +1271,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx2) { sp60 = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp44 = 1.0f - Math_CosS(sp76); - OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_1.c", 217); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); sp54.x = Math_CosS(sp68); sp54.y = 0.0f; @@ -1285,7 +1285,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx2) { Matrix_RotateAxis(sp70, &sp54, MTXMODE_APPLY); Matrix_Translate(sp48.x, sp48.y, sp48.z, MTXMODE_APPLY); - Matrix_ToMtx(sp60, "../z_demo_gt_part4_1.c", 232); + Matrix_ToMtx(sp60, __FILE__, __LINE__); if (!FrameAdvance_IsEnabled(globalCtx)) { func_80980F8C(this, globalCtx); @@ -1298,7 +1298,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx2) { gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_1.c", 246); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } } @@ -1390,7 +1390,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) { sp60 = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp44 = 1 - Math_CosS(sp76); - OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_2.c", 212); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); sp54.x = Math_CosS(sp68); sp54.y = 0.0f; @@ -1404,7 +1404,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) { Matrix_RotateAxis(sp70, &sp54, MTXMODE_APPLY); Matrix_Translate(sp48.x, sp48.y, sp48.z, MTXMODE_APPLY); - Matrix_ToMtx(sp60, "../z_demo_gt_part4_2.c", 227); + Matrix_ToMtx(sp60, __FILE__, __LINE__); if (!FrameAdvance_IsEnabled(globalCtx)) { func_80981458(this, globalCtx); @@ -1417,7 +1417,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_2.c", 241); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_809818A4_Init7(DemoGt* this, GlobalContext* globalCtx) { @@ -1486,7 +1486,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) { sp64 = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp48 = 1.0f - Math_CosS(sp78); - OPEN_DISPS(gfxCtx, "../z_demo_gt_part4_3.c", 276); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); sp58.x = Math_CosS(sp6C); sp58.y = 0.0f; @@ -1500,7 +1500,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) { Matrix_RotateAxis(sp74, &sp58, MTXMODE_APPLY); Matrix_Translate(sp4C.x, sp4C.y, sp4C.z, MTXMODE_APPLY); - Matrix_ToMtx(sp64, "../z_demo_gt_part4_3.c", 291); + Matrix_ToMtx(sp64, __FILE__, __LINE__); Matrix_Pop(); @@ -1509,7 +1509,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) { gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); - CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_3.c", 307); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_80981C94_Init23(DemoGt* this, GlobalContext* globalCtx) { @@ -1578,7 +1578,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) { sp5C = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp40 = 1.0f - Math_CosS(sp6E); - OPEN_DISPS(gfxCtx, "../z_demo_gt_part5.c", 136); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); sp50.x = Math_CosS(sp60); sp50.y = 0.0f; @@ -1592,7 +1592,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) { Matrix_RotateAxis(sp68, &sp50, MTXMODE_APPLY); Matrix_Translate(sp44.x, sp44.y, sp44.z, MTXMODE_APPLY); - Matrix_ToMtx(sp5C, "../z_demo_gt_part5.c", 152); + Matrix_ToMtx(sp5C, __FILE__, __LINE__); Matrix_Pop(); @@ -1600,7 +1600,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsWalkwayDL); - CLOSE_DISPS(gfxCtx, "../z_demo_gt_part5.c", 160); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_80982054_Init24(DemoGt* this, GlobalContext* globalCtx) { @@ -1669,7 +1669,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) { sp5C = Graph_Alloc(gfxCtx, sizeof(Mtx)); sp40 = 1.0f - Math_CosS(sp6E); - OPEN_DISPS(gfxCtx, "../z_demo_gt_part6.c", 137); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); sp50.x = Math_CosS(sp60); sp50.y = 0.0f; @@ -1683,7 +1683,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) { Matrix_RotateAxis(sp68, &sp50, MTXMODE_APPLY); Matrix_Translate(sp44.x, sp44.y, sp44.z, MTXMODE_APPLY); - Matrix_ToMtx(sp5C, "../z_demo_gt_part6.c", 153); + Matrix_ToMtx(sp5C, __FILE__, __LINE__); Matrix_Pop(); @@ -1691,7 +1691,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) { gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsAlternativeWalkwayDL); - CLOSE_DISPS(gfxCtx, "../z_demo_gt_part6.c", 163); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } static DemoGtUpdateFunc sUpdateFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c b/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c index bca933385..df0e85c7c 100644 --- a/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c +++ b/soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c @@ -417,32 +417,32 @@ void DemoIk_Type2PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; f32 frame = DemoIk_GetCurFrame(this); - OPEN_DISPS(gfxCtx, "../z_demo_ik_inFace.c", 268); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); if (limbIndex == 1 && (frame >= 30.0f)) { switch (this->actor.params) { case 3: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 274), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_017028); break; case 4: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 280), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_017170); break; case 5: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 286), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0); break; default: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inFace.c", 292), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8); break; } } - CLOSE_DISPS(gfxCtx, "../z_demo_ik_inFace.c", 300); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx) { @@ -450,7 +450,7 @@ void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(gfxCtx, "../z_demo_ik_inFace.c", 318); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_8002EBCC(&this->actor, globalCtx, 0); func_80093D18(gfxCtx); func_80093D84(gfxCtx); @@ -459,7 +459,7 @@ void DemoIk_Type2Draw(DemoIk* this, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x0A, DemoIk_SetColors(gfxCtx, 255, 255, 255, 20, 40, 30)); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, DemoIk_Type2OverrideLimbDraw, DemoIk_Type2PostLimbDraw, this); - CLOSE_DISPS(gfxCtx, "../z_demo_ik_inFace.c", 341); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } static DemoIkActionFunc sActionFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c index b0cfad494..355855273 100644 --- a/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c +++ b/soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c @@ -1187,7 +1187,7 @@ void DemoIm_DrawSolid(DemoIm* this, GlobalContext* globalCtx) { void* eyeTexture = sEyeTextures[eyeIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_im.c", 904); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -1199,7 +1199,7 @@ void DemoIm_DrawSolid(DemoIm* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, DemoIm_OverrideLimbDraw, DemoIm_PostLimbDraw, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_im.c", 925); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void DemoIm_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c index 8fe2e5cd3..7454abbfa 100644 --- a/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c +++ b/soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c @@ -802,7 +802,7 @@ void DemoSa_DrawOpa(DemoSa* this, GlobalContext* globalCtx) { void* mouthTex = sMouthTextures[mouthIndex]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_sa.c", 602); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -815,7 +815,7 @@ void DemoSa_DrawOpa(DemoSa* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, DemoSa_OverrideLimbDraw, NULL, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_sa.c", 626); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void DemoSa_Draw(Actor* thisx, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c index ba8c005a7..49f76f792 100644 --- a/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c +++ b/soh/src/overlays/actors/ovl_En_Go2/z_en_go2.c @@ -223,7 +223,7 @@ void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { s16 index; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_go2_eff.c", 111); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); firstDone = false; func_80093D84(globalCtx->state.gfxCtx); @@ -244,7 +244,7 @@ void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { Matrix_Translate(dustEffect->pos.x, dustEffect->pos.y, dustEffect->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(dustEffect->scale, dustEffect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_go2_eff.c", 137), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); index = dustEffect->timer * (8.0f / dustEffect->initialTimer); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sDustTex[index])); @@ -252,7 +252,7 @@ void EnGo2_DrawDust(EnGo2* this, GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_go2_eff.c", 151); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } s32 EnGo2_SpawnDust(EnGo2* this, u8 initialTimer, f32 scale, f32 scaleStep, s32 numDustEffects, f32 radius, diff --git a/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c b/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c index 2374c913d..a82f80f8a 100644 --- a/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c +++ b/soh/src/overlays/actors/ovl_En_Guest/z_en_guest.c @@ -60,9 +60,9 @@ void EnGuest_Init(Actor* thisx, GlobalContext* globalCtx) { if (this->osAnimeBankIndex < 0) { osSyncPrintf(VT_COL(RED, WHITE)); // "No such bank!!" - osSyncPrintf("%s[%d] : バンクが無いよ！！\n", "../z_en_guest.c", __LINE__); + osSyncPrintf("%s[%d] : バンクが無いよ！！\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); - ASSERT(0, "0", "../z_en_guest.c", __LINE__); + ASSERT(0, "0", __FILE__, __LINE__); } } } @@ -184,7 +184,7 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis EnGuest* this = (EnGuest*)thisx; Vec3s sp3C; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (limbIndex == 15) { *dList = object_boj_DL_0059B0; @@ -206,7 +206,7 @@ s32 EnGuest_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis rot->z += Math_CosS(this->unk_2EC[limbIndex]) * 200.0f; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); return false; } @@ -220,7 +220,7 @@ void EnGuest_Draw(Actor* thisx, GlobalContext* globalCtx) { EnGuest* this = (EnGuest*)thisx; s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); @@ -231,5 +231,5 @@ void EnGuest_Draw(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnGuest_OverrideLimbDraw, NULL, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_guest.c", __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } diff --git a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c index 57d0bf580..9d2affdd6 100644 --- a/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c +++ b/soh/src/overlays/actors/ovl_En_Ik/z_en_ik.c @@ -853,13 +853,13 @@ void EnIk_PostLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve Vec3f spE8; EnIk* this = (EnIk*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1201); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); if (this->unk_2FB & 1) { BodyBreak_SetInfo(&this->bodyBreak, limbIndex, 26, 27, 28, dList, BODYBREAK_OBJECT_DEFAULT); } if (limbIndex == 12) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1217), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); if (this->actor.params != 0) { gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_019E08); @@ -898,38 +898,38 @@ void EnIk_PostLimbDraw3(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve switch (limbIndex) { case 22: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1270), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88); break; case 24: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1275), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8); break; case 26: if (!(this->unk_2FA & 1)) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1281), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0); } break; case 27: if (!(this->unk_2FA & 1)) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1288), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8); } break; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1294); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80A76798(Actor* thisx, GlobalContext* globalCtx) { EnIk* this = (EnIk*)thisx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1309); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -954,7 +954,7 @@ void func_80A76798(Actor* thisx, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, EnIk_OverrideLimbDraw3, EnIk_PostLimbDraw3, this); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ik_inFight.c", 1351); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnIk_StartMusic(void) { @@ -1164,25 +1164,25 @@ s32 EnIk_OverrideLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, "../z_en_ik_inAwake.c", 207); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); switch (limbIndex) { case 13: { EnIk* this = (EnIk*)thisx; if (EnIk_curFrame(&this->actor) < 30.0f) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 267), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016D88); } } break; case 22: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 274), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88); break; case 24: - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 280), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016EE8); break; @@ -1190,7 +1190,7 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve EnIk* this = (EnIk*)thisx; if (EnIk_curFrame(&this->actor) < 30.0f) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 288), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0); } @@ -1199,13 +1199,13 @@ void EnIk_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve EnIk* this = (EnIk*)thisx; if (EnIk_curFrame(&this->actor) < 30.0f) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_ik_inAwake.c", 297), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016CD8); } } break; } - CLOSE_DISPS(gfxCtx, "../z_en_ik_inAwake.c", 304); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_80A77844(EnIk* this, GlobalContext* globalCtx) { @@ -1213,7 +1213,7 @@ void func_80A77844(EnIk* this, GlobalContext* globalCtx) { SkelAnime* skelAnime = &this->skelAnime; s32 pad[2]; - OPEN_DISPS(gfxCtx, "../z_en_ik_inAwake.c", 322); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_8002EBCC(&this->actor, globalCtx, 0); func_80093D18(gfxCtx); @@ -1224,7 +1224,7 @@ void func_80A77844(EnIk* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnIk_OverrideLimbDraw2, EnIk_PostLimbDraw2, this); - CLOSE_DISPS(gfxCtx, "../z_en_ik_inAwake.c", 345); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_80A779DC(EnIk* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c index 291e4c26b..19d77e777 100644 --- a/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c +++ b/soh/src/overlays/actors/ovl_En_Nb/z_en_nb.c @@ -547,7 +547,7 @@ void EnNb_DrawTransparency(EnNb* this, GlobalContext* globalCtx) { void* eyeTex = sEyeTextures[eyeSegIdx]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_nb_inKenjyanomaDemo02.c", 263); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTex)); @@ -557,7 +557,7 @@ void EnNb_DrawTransparency(EnNb* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_nb_inKenjyanomaDemo02.c", 290); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnNb_InitKidnap(EnNb* this, GlobalContext* globalCtx) { @@ -955,7 +955,7 @@ void func_80AB2E70(EnNb* this, GlobalContext* globalCtx) { s32 pad; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_nb_inConfrontion.c", 572); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gNabooruEyeWideTex)); @@ -965,7 +965,7 @@ void func_80AB2E70(EnNb* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_nb_inConfrontion.c", 593); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } s32 func_80AB2FC0(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { @@ -985,7 +985,7 @@ void func_80AB2FE4(EnNb* this, GlobalContext* globalCtx) { void* eyeTexture = sEyeTextures[eyeIdx]; s32 pad1; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_nb_inConfrontion.c", 623); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); @@ -995,7 +995,7 @@ void func_80AB2FE4(EnNb* this, GlobalContext* globalCtx) { SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, func_80AB2FC0, NULL, &this->actor); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_nb_inConfrontion.c", 644); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnNb_SetupCreditsSpawn(EnNb* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c index 7c1be749e..aa35a2bb8 100644 --- a/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c +++ b/soh/src/overlays/actors/ovl_En_Rl/z_en_rl.c @@ -301,7 +301,7 @@ void func_80AE7D94(EnRl* this, GlobalContext* globalCtx) { void* tex = D_80AE81A0[temp]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_rl_inKenjyanomaDemo02.c", 304); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -313,7 +313,7 @@ void func_80AE7D94(EnRl* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_rl_inKenjyanomaDemo02.c", 331); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } static EnRlActionFunc sActionFuncs[] = { diff --git a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c index e2e03d9a1..938792654 100644 --- a/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c +++ b/soh/src/overlays/actors/ovl_En_Ru2/z_en_ru2.c @@ -472,7 +472,7 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { void* tex = sEyeTextures[temp]; SkelAnime* skelAnime = &this->skelAnime; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 264); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D84(globalCtx->state.gfxCtx); @@ -484,7 +484,7 @@ void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c index 1b4131da2..25173a668 100644 --- a/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c +++ b/soh/src/overlays/actors/ovl_En_Tk/z_en_tk.c @@ -92,7 +92,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { s16 alpha; s16 i; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 114); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); gfxSetup = 0; @@ -116,7 +116,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(eff->size, eff->size, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 140), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); imageIdx = eff->timeLeft * ((f32)ARRAY_COUNT(dustTextures) / eff->timeTotal); @@ -127,7 +127,7 @@ void EnTkEff_Draw(EnTk* this, GlobalContext* globalCtx) { eff++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_tk_eff.c", 154); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } s32 EnTkEff_CreateDflt(EnTk* this, Vec3f* pos, u8 duration, f32 size, f32 growth, f32 yAccelMax) { diff --git a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c index af6180ddd..83f4f1d49 100644 --- a/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c +++ b/soh/src/overlays/actors/ovl_En_Xc/z_en_xc.c @@ -1078,7 +1078,7 @@ void EnXc_DrawPullingOutHarp(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad2; - OPEN_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1444); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 20, 0); @@ -1088,7 +1088,7 @@ void EnXc_DrawPullingOutHarp(Actor* thisx, GlobalContext* globalCtx) { func_8002EBCC(&this->actor, globalCtx, 0); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnXc_PullingOutHarpOverrideLimbDraw, NULL, this); - CLOSE_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1497); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void EnXc_DrawHarp(Actor* thisx, GlobalContext* globalCtx) { @@ -1100,7 +1100,7 @@ void EnXc_DrawHarp(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad2; - OPEN_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1511); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); @@ -1111,7 +1111,7 @@ void EnXc_DrawHarp(Actor* thisx, GlobalContext* globalCtx) { func_8002EBCC(&this->actor, globalCtx, 0); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnXc_HarpOverrideLimbDraw, NULL, this); - CLOSE_DISPS(gfxCtx, "../z_en_oA2_inSpot05.c", 1564); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_80B3EBF0(EnXc* this, GlobalContext* globalCtx) { @@ -1713,7 +1713,7 @@ void EnXc_DrawTriforce(Actor* thisx, GlobalContext* globalCtx) { GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad2; - OPEN_DISPS(gfxCtx, "../z_en_oA2_inMetamol.c", 565); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); if (this->unk_2BC != 0) { Mtx* mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); s32* primColor = this->triforcePrimColor; @@ -1724,7 +1724,7 @@ void EnXc_DrawTriforce(Actor* thisx, GlobalContext* globalCtx) { Matrix_Translate(kREG(16) + 100.0f, kREG(17) + 4460.0f, kREG(18) + 1190.0f, MTXMODE_APPLY); Matrix_RotateZYX(kREG(22), kREG(23), this->triforceAngle, MTXMODE_APPLY); Matrix_Scale(scale[0], scale[1], scale[2], MTXMODE_APPLY); - Matrix_ToMtx(mtx, "../z_en_oA2_inMetamol.c", 602); + Matrix_ToMtx(mtx, __FILE__, __LINE__); Matrix_Pop(); func_80093D84(gfxCtx); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, primColor[2], primColor[3]); @@ -1739,7 +1739,7 @@ void EnXc_DrawTriforce(Actor* thisx, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(eyeTexture)); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, EnXc_TriforceOverrideLimbDraw, EnXc_TriforcePostLimbDraw, this); - CLOSE_DISPS(gfxCtx, "../z_en_oA2_inMetamol.c", 668); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void func_80B40590(EnXc* this, GlobalContext* globalCtx) { @@ -2135,13 +2135,13 @@ void EnXc_DrawSquintingEyes(Actor* thisx, GlobalContext* globalCtx) { SkelAnime* skelAnime = &this->skelAnime; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, "../z_en_oA2_inStalker.c", 839); + OPEN_DISPS(gfxCtx, __FILE__, __LINE__); func_80093D18(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gSheikEyeSquintingTex)); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(gSheikEyeSquintingTex)); SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, NULL); - CLOSE_DISPS(gfxCtx, "../z_en_oA2_inStalker.c", 854); + CLOSE_DISPS(gfxCtx, __FILE__, __LINE__); } void EnXc_InitTempleOfTime(EnXc* this, GlobalContext* globalCtx) { diff --git a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c index 159a343cf..172ed7534 100644 --- a/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c +++ b/soh/src/overlays/actors/ovl_En_Zo/z_en_zo.c @@ -180,7 +180,7 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) { u8 setup; effect = this->effects; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 217); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); setup = false; func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(this->effects); i++) { @@ -197,14 +197,14 @@ void EnZo_DrawRipples(EnZo* this, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, effect->color.a); Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 242), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gZoraRipplesModelDL); FrameInterpolation_RecordCloseChild(); } effect++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 248); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { @@ -212,7 +212,7 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { s16 i; u8 setup; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 260); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); setup = false; func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(this->effects); i++) { @@ -232,14 +232,14 @@ void EnZo_DrawBubbles(EnZo* this, GlobalContext* globalCtx) { Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 281), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gZoraBubblesModelDL); FrameInterpolation_RecordCloseChild(); } effect++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 286); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { @@ -248,7 +248,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { u8 setup; effect = this->effects; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 298); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); setup = false; func_80093D84(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(this->effects); i++) { @@ -266,7 +266,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 325), + gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gZoraSplashesModelDL); @@ -274,7 +274,7 @@ void EnZo_DrawSplashes(EnZo* this, GlobalContext* globalCtx) { } effect++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_zo_eff.c", 331); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); } void EnZo_TreadWaterRipples(EnZo* this, f32 scale, f32 targetScale, u8 alpha) { diff --git a/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c b/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c index 02999ac5b..cd2d68e3b 100644 --- a/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c +++ b/soh/src/overlays/actors/ovl_Obj_Warp2block/z_obj_warp2block.c @@ -265,7 +265,7 @@ void func_80BA24F8(ObjWarp2block* this, GlobalContext* globalCtx) { this->unk_174++; if (this->unk_174 > 60) { osSyncPrintf(VT_COL(RED, WHITE)); - osSyncPrintf("Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n", "../z_obj_warp2block.c", __LINE__); + osSyncPrintf("Error : 時のブロック(ワープ２)が対でセットされていません(%s %d)\n", __FILE__, __LINE__); osSyncPrintf(VT_RST); Actor_Kill(&this->dyna.actor); } @@ -308,13 +308,13 @@ void ObjWarp2block_Draw(Actor* thisx, GlobalContext* globalCtx) { sp44 = &sColors[thisx->home.rot.z & 7]; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", __LINE__); + OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", __LINE__), + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, sp44->r, sp44->g, sp44->b, 255); gSPDisplayList(POLY_OPA_DISP++, gSongOfTimeBlockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_obj_warp2block.c", __LINE__); + CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__); }