mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-16 12:54:40 +00:00
Replace most osSyncPrintf calls with PRINTF macro (#1598)
* Replace most osSyncPrintf calls with PRINTF macro * DEBUG -> OOT_DEBUG
This commit is contained in:
cadmic
GitHub
parent
6eb3bf401c
commit
324db1d578
297 changed files with 2642 additions and 2679 deletions
|
|
@ -85,11 +85,11 @@ u16 sSurfaceMaterialToSfxOffset[SURFACE_MATERIAL_MAX] = {
|
|||
s32 BgCheck_PosErrorCheck(Vec3f* pos, char* file, s32 line) {
|
||||
if (pos->x >= BGCHECK_XYZ_ABSMAX || pos->x <= -BGCHECK_XYZ_ABSMAX || pos->y >= BGCHECK_XYZ_ABSMAX ||
|
||||
pos->y <= -BGCHECK_XYZ_ABSMAX || pos->z >= BGCHECK_XYZ_ABSMAX || pos->z <= -BGCHECK_XYZ_ABSMAX) {
|
||||
osSyncPrintf(VT_FGCOL(RED));
|
||||
PRINTF(VT_FGCOL(RED));
|
||||
// "Position is invalid."
|
||||
osSyncPrintf("T_BGCheck_PosErrorCheck():位置が妥当ではありません。pos (%f,%f,%f) file:%s line:%d\n", pos->x,
|
||||
pos->y, pos->z, file, line);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF("T_BGCheck_PosErrorCheck():位置が妥当ではありません。pos (%f,%f,%f) file:%s line:%d\n", pos->x, pos->y,
|
||||
pos->z, file, line);
|
||||
PRINTF(VT_RST);
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
|
|
@ -308,11 +308,11 @@ void CollisionPoly_GetVerticesByBgId(CollisionPoly* poly, s32 bgId, CollisionCon
|
|||
Vec3s* vtxList;
|
||||
|
||||
if (poly == NULL || bgId > BG_ACTOR_MAX || dest == NULL) {
|
||||
osSyncPrintf(VT_COL(RED, WHITE));
|
||||
PRINTF(VT_COL(RED, WHITE));
|
||||
// "Argument not appropriate. Processing terminated."
|
||||
osSyncPrintf("T_Polygon_GetVertex_bg_ai(): Error %d %d %d 引数が適切ではありません。処理を終了します。\n",
|
||||
poly == NULL, bgId > BG_ACTOR_MAX, dest == NULL);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF("T_Polygon_GetVertex_bg_ai(): Error %d %d %d 引数が適切ではありません。処理を終了します。\n",
|
||||
poly == NULL, bgId > BG_ACTOR_MAX, dest == NULL);
|
||||
PRINTF(VT_RST);
|
||||
|
||||
if (dest != NULL) {
|
||||
//! @bug: dest[2] x and y are not set to 0
|
||||
|
|
@ -1552,18 +1552,18 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader
|
|||
customNodeListMax = -1;
|
||||
|
||||
// "/*---------------- BGCheck Buffer Memory Size -------------*/\n"
|
||||
osSyncPrintf("/*---------------- BGCheck バッファーメモリサイズ -------------*/\n");
|
||||
PRINTF("/*---------------- BGCheck バッファーメモリサイズ -------------*/\n");
|
||||
|
||||
if ((R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_SHOP_VIEWPOINT) ||
|
||||
(R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_TOGGLE_VIEWPOINT) || (R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED) ||
|
||||
(R_SCENE_CAM_TYPE == SCENE_CAM_TYPE_FIXED_MARKET)) {
|
||||
if (play->sceneId == SCENE_STABLE) {
|
||||
// "/* BGCheck LonLon Size %dbyte */\n"
|
||||
osSyncPrintf("/* BGCheck LonLonサイズ %dbyte */\n", 0x3520);
|
||||
PRINTF("/* BGCheck LonLonサイズ %dbyte */\n", 0x3520);
|
||||
colCtx->memSize = 0x3520;
|
||||
} else {
|
||||
// "/* BGCheck Mini Size %dbyte */\n"
|
||||
osSyncPrintf("/* BGCheck ミニサイズ %dbyte */\n", 0x4E20);
|
||||
PRINTF("/* BGCheck ミニサイズ %dbyte */\n", 0x4E20);
|
||||
colCtx->memSize = 0x4E20;
|
||||
}
|
||||
colCtx->dyna.polyNodesMax = 500;
|
||||
|
|
@ -1575,7 +1575,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader
|
|||
} else if (BgCheck_IsSpotScene(play) == true) {
|
||||
colCtx->memSize = 0xF000;
|
||||
// "/* BGCheck Spot Size %dbyte */\n"
|
||||
osSyncPrintf("/* BGCheck Spot用サイズ %dbyte */\n", 0xF000);
|
||||
PRINTF("/* BGCheck Spot用サイズ %dbyte */\n", 0xF000);
|
||||
colCtx->dyna.polyNodesMax = 1000;
|
||||
colCtx->dyna.polyListMax = 512;
|
||||
colCtx->dyna.vtxListMax = 512;
|
||||
|
|
@ -1589,7 +1589,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader
|
|||
colCtx->memSize = 0x1CC00;
|
||||
}
|
||||
// "/* BGCheck Normal Size %dbyte */\n"
|
||||
osSyncPrintf("/* BGCheck ノーマルサイズ %dbyte */\n", colCtx->memSize);
|
||||
PRINTF("/* BGCheck ノーマルサイズ %dbyte */\n", colCtx->memSize);
|
||||
colCtx->dyna.polyNodesMax = 1000;
|
||||
colCtx->dyna.polyListMax = 512;
|
||||
colCtx->dyna.vtxListMax = 512;
|
||||
|
|
@ -1648,9 +1648,9 @@ void BgCheck_Allocate(CollisionContext* colCtx, PlayState* play, CollisionHeader
|
|||
SSNodeList_Alloc(play, &colCtx->polyNodes, tblMax, colCtx->colHeader->numPolygons);
|
||||
|
||||
lookupTblMemSize = BgCheck_InitializeStaticLookup(colCtx, play, colCtx->lookupTbl);
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
osSyncPrintf("/*---結局 BG使用サイズ %dbyte---*/\n", memSize + lookupTblMemSize);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN));
|
||||
PRINTF("/*---結局 BG使用サイズ %dbyte---*/\n", memSize + lookupTblMemSize);
|
||||
PRINTF(VT_RST);
|
||||
|
||||
DynaPoly_Init(play, &colCtx->dyna);
|
||||
DynaPoly_Alloc(play, &colCtx->dyna);
|
||||
|
|
@ -1668,9 +1668,9 @@ CollisionHeader* BgCheck_GetCollisionHeader(CollisionContext* colCtx, s32 bgId)
|
|||
return NULL;
|
||||
}
|
||||
if (!(colCtx->dyna.bgActorFlags[bgId] & BGACTOR_IN_USE)) {
|
||||
osSyncPrintf(VT_COL(YELLOW, BLACK));
|
||||
osSyncPrintf("T_BGCheck_getBGDataInfo():そのbg_actor_indexは使われておりません。index=%d\n");
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_COL(YELLOW, BLACK));
|
||||
PRINTF("T_BGCheck_getBGDataInfo():そのbg_actor_indexは使われておりません。index=%d\n");
|
||||
PRINTF(VT_RST);
|
||||
return NULL;
|
||||
}
|
||||
return colCtx->dyna.bgActors[bgId].colHeader;
|
||||
|
|
@ -1719,7 +1719,7 @@ f32 BgCheck_RaycastDownImpl(PlayState* play, CollisionContext* colCtx, u16 xpFla
|
|||
}
|
||||
if (BgCheck_PosErrorCheck(&checkPos, "../z_bgcheck.c", 4410)) {
|
||||
if (actor != NULL) {
|
||||
osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id);
|
||||
PRINTF("こいつ,pself_actor->name %d\n", actor->id);
|
||||
}
|
||||
}
|
||||
lookup = BgCheck_GetStaticLookup(colCtx, lookupTbl, &checkPos);
|
||||
|
|
@ -1969,7 +1969,7 @@ s32 BgCheck_CheckWallImpl(CollisionContext* colCtx, u16 xpFlags, Vec3f* posResul
|
|||
if (BgCheck_PosErrorCheck(posNext, "../z_bgcheck.c", 4831) == true ||
|
||||
BgCheck_PosErrorCheck(posPrev, "../z_bgcheck.c", 4832) == true) {
|
||||
if (actor != NULL) {
|
||||
osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id);
|
||||
PRINTF("こいつ,pself_actor->name %d\n", actor->id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2157,7 +2157,7 @@ s32 BgCheck_CheckCeilingImpl(CollisionContext* colCtx, u16 xpFlags, f32* outY, V
|
|||
*outY = pos->y;
|
||||
if (BgCheck_PosErrorCheck(pos, "../z_bgcheck.c", 5206) == true) {
|
||||
if (actor != NULL) {
|
||||
osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id);
|
||||
PRINTF("こいつ,pself_actor->name %d\n", actor->id);
|
||||
}
|
||||
}
|
||||
lookupTbl = colCtx->lookupTbl;
|
||||
|
|
@ -2232,9 +2232,9 @@ s32 BgCheck_CheckLineImpl(CollisionContext* colCtx, u16 xpFlags1, u16 xpFlags2,
|
|||
if (BgCheck_PosErrorCheck(posA, "../z_bgcheck.c", 5334) == true ||
|
||||
BgCheck_PosErrorCheck(posB, "../z_bgcheck.c", 5335) == true) {
|
||||
if (actor != NULL) {
|
||||
osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id);
|
||||
PRINTF("こいつ,pself_actor->name %d\n", actor->id);
|
||||
} else {
|
||||
osSyncPrintf("pself_actor == NULLで犯人不明\n");
|
||||
PRINTF("pself_actor == NULLで犯人不明\n");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2445,7 +2445,7 @@ s32 BgCheck_SphVsFirstPolyImpl(CollisionContext* colCtx, u16 xpFlags, CollisionP
|
|||
*outBgId = BGCHECK_SCENE;
|
||||
if (BgCheck_PosErrorCheck(center, "../z_bgcheck.c", 5852) == true) {
|
||||
if (actor != NULL) {
|
||||
osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id);
|
||||
PRINTF("こいつ,pself_actor->name %d\n", actor->id);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -2717,9 +2717,9 @@ s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* acto
|
|||
}
|
||||
|
||||
if (!foundSlot) {
|
||||
osSyncPrintf(VT_FGCOL(RED));
|
||||
osSyncPrintf("DynaPolyInfo_setActor():ダイナミックポリゴン 空きインデックスはありません\n");
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_FGCOL(RED));
|
||||
PRINTF("DynaPolyInfo_setActor():ダイナミックポリゴン 空きインデックスはありません\n");
|
||||
PRINTF(VT_RST);
|
||||
return BG_ACTOR_MAX;
|
||||
}
|
||||
|
||||
|
|
@ -2727,9 +2727,9 @@ s32 DynaPoly_SetBgActor(PlayState* play, DynaCollisionContext* dyna, Actor* acto
|
|||
dyna->bitFlag |= DYNAPOLY_INVALIDATE_LOOKUP;
|
||||
|
||||
dyna->bgActorFlags[bgId] &= ~BGACTOR_1;
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
osSyncPrintf("DynaPolyInfo_setActor():index %d\n", bgId);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN));
|
||||
PRINTF("DynaPolyInfo_setActor():index %d\n", bgId);
|
||||
PRINTF(VT_RST);
|
||||
return bgId;
|
||||
}
|
||||
|
||||
|
|
@ -2779,25 +2779,24 @@ void DynaPoly_EnableCeilingCollision(PlayState* play, DynaCollisionContext* dyna
|
|||
void DynaPoly_DeleteBgActor(PlayState* play, DynaCollisionContext* dyna, s32 bgId) {
|
||||
DynaPolyActor* actor;
|
||||
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
osSyncPrintf("DynaPolyInfo_delReserve():index %d\n", bgId);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN));
|
||||
PRINTF("DynaPolyInfo_delReserve():index %d\n", bgId);
|
||||
PRINTF(VT_RST);
|
||||
if (!DynaPoly_IsBgIdBgActor(bgId)) {
|
||||
|
||||
if (bgId == -1) {
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
PRINTF(VT_FGCOL(GREEN));
|
||||
// "The index that should have been deleted(? ) was(== -1), processing aborted."
|
||||
osSyncPrintf(
|
||||
"DynaPolyInfo_delReserve():削除されているはずの(?)\nインデックス(== -1)のため,処理を中止します。\n");
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF("DynaPolyInfo_delReserve():削除されているはずの(?)\nインデックス(== -1)のため,処理を中止します。\n");
|
||||
PRINTF(VT_RST);
|
||||
return;
|
||||
} else {
|
||||
osSyncPrintf(VT_FGCOL(RED));
|
||||
PRINTF(VT_FGCOL(RED));
|
||||
// "Unable to deallocate index / index unallocated, processing aborted."
|
||||
osSyncPrintf("DynaPolyInfo_delReserve():"
|
||||
"確保していない／出来なかったインデックスの解放のため、処理を中止します。index == %d\n",
|
||||
bgId);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF("DynaPolyInfo_delReserve():"
|
||||
"確保していない／出来なかったインデックスの解放のため、処理を中止します。index == %d\n",
|
||||
bgId);
|
||||
PRINTF(VT_RST);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
@ -2853,17 +2852,17 @@ void DynaPoly_AddBgActorToLookup(PlayState* play, DynaCollisionContext* dyna, s3
|
|||
}
|
||||
|
||||
if (!(dyna->polyListMax >= *polyStartIndex + pbgdata->numPolygons)) {
|
||||
osSyncPrintf(VT_FGCOL(RED));
|
||||
PRINTF(VT_FGCOL(RED));
|
||||
// "do not use if %d exceeds %d"
|
||||
osSyncPrintf("DynaPolyInfo_expandSRT():polygon over %dが%dを越えるとダメ\n",
|
||||
*polyStartIndex + pbgdata->numPolygons, dyna->polyListMax);
|
||||
PRINTF("DynaPolyInfo_expandSRT():polygon over %dが%dを越えるとダメ\n", *polyStartIndex + pbgdata->numPolygons,
|
||||
dyna->polyListMax);
|
||||
}
|
||||
|
||||
if (!(dyna->vtxListMax >= *vtxStartIndex + pbgdata->numVertices)) {
|
||||
osSyncPrintf(VT_FGCOL(RED));
|
||||
PRINTF(VT_FGCOL(RED));
|
||||
// "do not use if %d exceeds %d"
|
||||
osSyncPrintf("DynaPolyInfo_expandSRT():vertex over %dが%dを越えるとダメ\n",
|
||||
*vtxStartIndex + pbgdata->numVertices, dyna->vtxListMax);
|
||||
PRINTF("DynaPolyInfo_expandSRT():vertex over %dが%dを越えるとダメ\n", *vtxStartIndex + pbgdata->numVertices,
|
||||
dyna->vtxListMax);
|
||||
}
|
||||
|
||||
ASSERT(dyna->polyListMax >= *polyStartIndex + pbgdata->numPolygons,
|
||||
|
|
@ -3039,9 +3038,9 @@ void DynaPoly_UpdateContext(PlayState* play, DynaCollisionContext* dyna) {
|
|||
for (i = 0; i < BG_ACTOR_MAX; i++) {
|
||||
if (dyna->bgActorFlags[i] & BGACTOR_1) {
|
||||
// Initialize BgActor
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
osSyncPrintf("DynaPolyInfo_setup():削除 index=%d\n", i);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN));
|
||||
PRINTF("DynaPolyInfo_setup():削除 index=%d\n", i);
|
||||
PRINTF(VT_RST);
|
||||
|
||||
dyna->bgActorFlags[i] = 0;
|
||||
BgActor_Initialize(play, &dyna->bgActors[i]);
|
||||
|
|
@ -3049,9 +3048,9 @@ void DynaPoly_UpdateContext(PlayState* play, DynaCollisionContext* dyna) {
|
|||
}
|
||||
if (dyna->bgActors[i].actor != NULL && dyna->bgActors[i].actor->update == NULL) {
|
||||
// Delete BgActor
|
||||
osSyncPrintf(VT_FGCOL(GREEN));
|
||||
osSyncPrintf("DynaPolyInfo_setup():削除 index=%d\n", i);
|
||||
osSyncPrintf(VT_RST);
|
||||
PRINTF(VT_FGCOL(GREEN));
|
||||
PRINTF("DynaPolyInfo_setup():削除 index=%d\n", i);
|
||||
PRINTF(VT_RST);
|
||||
actor = DynaPoly_GetActor(&play->colCtx, i);
|
||||
if (actor == NULL) {
|
||||
return;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue