mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-06-29 19:52:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

LOG_xxxx __FILE__ , __LINE__ cleaned

Browse Source
This commit is contained in:
Baoulettes
2022-06-27 17:12:34 +02:00
parent 9e06677f46
commit 1cdaf454c2
31 changed files with 128 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/src/code/graph.c
+1 -1
View File
@@ -134,7 +134,7 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) {
return &gGameStateOverlayTable[5];
}
LOG_ADDRESS("game_init_func", gameStateInitFunc, __FILE__, __LINE__);
LOG_ADDRESS("game_init_func", gameStateInitFunc);
return NULL;
}
soh/src/code/padmgr.c
+5 -5
View File
@@ -154,7 +154,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) {
} else if (var4 == 11) {
padMgr->pakType[i] = 2;
} else if (var4 == 4) {
LOG_NUM("++errcnt", ++errcnt, __FILE__, __LINE__);
LOG_NUM("++errcnt", ++errcnt);
osSyncPrintf(VT_FGCOL(YELLOW));
// "Controller pack communication error"
osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "コントローラパックの通信エラー");
@@ -237,7 +237,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
break;
case 4:
input->cur = input->prev;
LOG_NUM("this->Key_switch[i]", padMgr->ctrlrIsConnected[i], __FILE__, __LINE__);
LOG_NUM("this->Key_switch[i]", padMgr->ctrlrIsConnected[i]);
osSyncPrintf(VT_FGCOL(YELLOW));
// "Overrun error occurred"
osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "オーバーランエラーが発生");
@@ -259,7 +259,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) {
}
break;
default:
LOG_HEX("padnow1->errno", padnow1->err_no, __FILE__, __LINE__);
LOG_HEX("padnow1->errno", padnow1->err_no);
Fault_AddHungupAndCrash(__FILE__, __LINE__);
}
@@ -325,7 +325,7 @@ void PadMgr_HandleRetraceMsg(PadMgr* padMgr) {
if (padMgr->padStatus[i].type == CONT_TYPE_NORMAL) {
mask |= 1 << i;
} else {
//LOG_HEX("this->pad_status[i].type", padMgr->padStatus[i].type, __FILE__, __LINE__);
//LOG_HEX("this->pad_status[i].type", padMgr->padStatus[i].type);
// "An unknown type of controller is connected"
//osSyncPrintf("知らない種類のコントローラが接続されています\n");
}
@@ -400,7 +400,7 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) {
}
osRecvMesg(&padMgr->interruptMsgQ, (OSMesg*)&mesg, OS_MESG_BLOCK);
//LogUtils_CheckNullPointer("msg", mesg, __FILE__, __LINE__);
//LogUtils_CheckNullPointer("msg", mesg);
PadMgr_HandleRetraceMsg(padMgr);
break;
soh/src/code/sched.c
+3 -3
View File
@@ -77,18 +77,18 @@ void Sched_HandleReset(SchedContext* sc) {
if (sc->curRSPTask->framebuffer == NULL) {
LOG_TIME("(((u64)(now - audio_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))",
OS_CYCLES_TO_USEC(now - sRSPAudioStartTime), __FILE__, __LINE__);
OS_CYCLES_TO_USEC(now - sRSPAudioStartTime));
} else if (OS_CYCLES_TO_USEC(now - sRSPGFXStartTime) > 1000000 ||
OS_CYCLES_TO_USEC(now - sRDPStartTime) > 1000000) {
func_800FBFD8();
if (sc->curRSPTask != NULL) {
LOG_TIME("(((u64)(now - graph_rsp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))",
OS_CYCLES_TO_USEC(now - sRSPGFXStartTime), __FILE__, __LINE__);
OS_CYCLES_TO_USEC(now - sRSPGFXStartTime));
osSendMesg32(&sc->interruptQ, RSP_DONE_MSG, OS_MESG_NOBLOCK);
}
if (sc->curRDPTask != NULL) {
LOG_TIME("(((u64)(now - rdp_start_time)*(1000000LL/15625LL))/((62500000LL*3/4)/15625LL))",
OS_CYCLES_TO_USEC(now - sRDPStartTime), __FILE__, __LINE__);
OS_CYCLES_TO_USEC(now - sRDPStartTime));
osSendMesg32(&sc->interruptQ, RDP_DONE_MSG, OS_MESG_NOBLOCK);
}
}
soh/src/code/speed_meter.c
+1 -1
View File
@@ -120,7 +120,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC
if (this->maxval == 0) {
osSyncPrintf(VT_FGCOL(RED));
LOG_NUM("this->maxval", this->maxval, __FILE__, __LINE__);
LOG_NUM("this->maxval", this->maxval);
osSyncPrintf(VT_RST);
} else {
OPEN_DISPS(gfxCtx);
soh/src/code/z_elf_message.c
+2 -2
View File
@@ -58,7 +58,7 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) {
}
}
LOG_STRING("企画外 条件", __FILE__, __LINE__); // "Unplanned conditions"
LOG_STRING("企画外 条件"); // "Unplanned conditions"
ASSERT(0, "0", __FILE__, __LINE__);
return false;
@@ -141,7 +141,7 @@ u16 ElfMessage_GetTextFromMsgs(ElfMessage* msg) {
case (ELF_MSG_TYPE_END << 5):
return msg->byte2 | 0x100;
default:
LOG_STRING("企画外 条件", __FILE__, __LINE__); // "Unplanned conditions"
LOG_STRING("企画外 条件"); // "Unplanned conditions"
ASSERT(0, "0", __FILE__, __LINE__);
}
msg++;
soh/src/code/z_fbdemo.c
+2 -3
View File
@@ -89,9 +89,8 @@ void TransitionUnk_InitGraphics(TransitionUnk* this) {
gDPPipeSync(gfx++);
gSPEndDisplayList(gfx++);
LOG_NUM("this->col * (1 + this->row * (1 + 7 + 1)) + 1 + 1", this->col * (1 + this->row * 9) + 2, __FILE__,
__LINE__);
LOG_NUM("gp - this->gfxtbl", gfx - this->gfx, __FILE__, __LINE__);
LOG_NUM("this->col * (1 + this->row * (1 + 7 + 1)) + 1 + 1", this->col * (1 + this->row * 9) + 2);
LOG_NUM("gp - this->gfxtbl", gfx - this->gfx);
}
void TransitionUnk_InitData(TransitionUnk* this) {
soh/src/code/z_kaleido_scope_call.c
+4 -4
View File
@@ -37,10 +37,10 @@ void KaleidoScopeCall_Init(GlobalContext* globalCtx) {
sKaleidoScopeUpdateFunc = KaleidoManager_GetRamAddr(KaleidoScope_Update);
sKaleidoScopeDrawFunc = KaleidoManager_GetRamAddr(KaleidoScope_Draw);
LOG_ADDRESS("kaleido_scope_move", KaleidoScope_Update, __FILE__, __LINE__);
LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc, __FILE__, __LINE__);
LOG_ADDRESS("kaleido_scope_draw", KaleidoScope_Draw, __FILE__, __LINE__);
LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc, __FILE__, __LINE__);
LOG_ADDRESS("kaleido_scope_move", KaleidoScope_Update);
LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc);
LOG_ADDRESS("kaleido_scope_draw", KaleidoScope_Draw);
LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc);
KaleidoSetup_Init(globalCtx);
}
soh/src/code/z_play.c
+42 -42
View File
@@ -728,7 +728,7 @@ void Gameplay_Update(GlobalContext* globalCtx) {
globalCtx->envCtx.sandstormPrimA = 255;
globalCtx->envCtx.sandstormEnvA = 255;
// "It's here!!!!!!!!!"
LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", __FILE__, __LINE__);
LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!");
globalCtx->transitionMode = 15;
} else {
globalCtx->transitionMode = 12;
@@ -773,12 +773,12 @@ void Gameplay_Update(GlobalContext* globalCtx) {
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if (1 && (gTrnsnUnkState != 3)) {
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if ((gSaveContext.gameMode == 0) && (globalCtx->msgCtx.msgMode == MSGMODE_NONE) &&
@@ -787,30 +787,30 @@ void Gameplay_Update(GlobalContext* globalCtx) {
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
sp80 = (globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
AnimationContext_Reset(&globalCtx->animationCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
Object_UpdateBank(&globalCtx->objectCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if ((sp80 == 0) && (IREG(72) == 0)) {
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
globalCtx->gameplayFrames++;
@@ -830,37 +830,37 @@ void Gameplay_Update(GlobalContext* globalCtx) {
}
} else {
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
func_800973FC(globalCtx, &globalCtx->roomCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
CollisionCheck_AT(globalCtx, &globalCtx->colChkCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
CollisionCheck_OC(globalCtx, &globalCtx->colChkCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
CollisionCheck_Damage(globalCtx, &globalCtx->colChkCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
CollisionCheck_ClearContext(globalCtx, &globalCtx->colChkCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if (globalCtx->unk_11DE9 == 0) {
@@ -868,31 +868,31 @@ void Gameplay_Update(GlobalContext* globalCtx) {
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
func_80064558(globalCtx, &globalCtx->csCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
func_800645A0(globalCtx, &globalCtx->csCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
Effect_UpdateAll(globalCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
EffectSs_UpdateAll(globalCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
}
} else {
@@ -900,19 +900,19 @@ void Gameplay_Update(GlobalContext* globalCtx) {
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
func_80095AA0(globalCtx, &globalCtx->roomCtx.curRoom, &input[1], 0);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
func_80095AA0(globalCtx, &globalCtx->roomCtx.prevRoom, &input[1], 1);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if (globalCtx->unk_1242B != 0) {
@@ -933,65 +933,65 @@ void Gameplay_Update(GlobalContext* globalCtx) {
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
SkyboxDraw_Update(&globalCtx->skyboxCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0)) {
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
KaleidoScopeCall_Update(globalCtx);
} else if (globalCtx->gameOverCtx.state != GAMEOVER_INACTIVE) {
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
GameOver_Update(globalCtx);
} else {
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
Message_Update(globalCtx);
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
Interface_Update(globalCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
AnimationContext_Update(globalCtx, &globalCtx->animationCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
SoundSource_UpdateAll(globalCtx);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
ShrinkWindow_Update(R_UPDATE_RATE);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
TransitionFade_Update(&globalCtx->transitionFade, R_UPDATE_RATE);
@@ -1001,12 +1001,12 @@ void Gameplay_Update(GlobalContext* globalCtx) {
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
skip:
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if ((sp80 == 0) || (gDbgCamEnabled)) {
@@ -1016,13 +1016,13 @@ skip:
globalCtx->nextCamera = globalCtx->activeCamera;
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
for (i = 0; i < NUM_CAMS; i++) {
if ((i != globalCtx->nextCamera) && (globalCtx->cameraPtrs[i] != NULL)) {
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
Camera_Update(globalCtx->cameraPtrs[i]);
@@ -1032,12 +1032,12 @@ skip:
Camera_Update(globalCtx->cameraPtrs[globalCtx->nextCamera]);
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
Environment_Update(globalCtx, &globalCtx->envCtx, &globalCtx->lightCtx, &globalCtx->pauseCtx, &globalCtx->msgCtx,
@@ -1352,7 +1352,7 @@ void Gameplay_Main(GameState* thisx) {
DebugDisplay_Init();
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
if ((HREG(80) == 10) && (HREG(94) != 10)) {
@@ -1377,7 +1377,7 @@ void Gameplay_Main(GameState* thisx) {
}
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
FrameInterpolation_StartRecord();
@@ -1385,7 +1385,7 @@ void Gameplay_Main(GameState* thisx) {
FrameInterpolation_StopRecord();
if (1 && HREG(63)) {
LOG_NUM("1", 1, __FILE__, __LINE__);
LOG_NUM("1", 1);
}
}
soh/src/code/z_room.c
+1 -1
View File
@@ -530,7 +530,7 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) {
RomFile* roomList = globalCtx->roomList;
TransitionActorEntry* transitionActor = &globalCtx->transiActorCtx.list[0];
LOG_NUM("game_play->room_rom_address.num", globalCtx->numRooms, __FILE__, __LINE__);
LOG_NUM("game_play->room_rom_address.num", globalCtx->numRooms);
for (j = 0; j < globalCtx->transiActorCtx.numActors; j++) {
frontRoom = transitionActor->sides[0].room;
soh/src/code/z_skelanime.c
+4 -4
View File
@@ -476,10 +476,10 @@ void SkelAnime_GetFrameData(AnimationHeader* animation, s32 frame, s32 limbCount
for (i = 0; i < limbCount; i++, frameTable++, jointIndices++) {
if ((frameTable == NULL) || (jointIndices == NULL) || (dynamicData == NULL) || (staticData == NULL)) {
LOG_ADDRESS("out", frameTable, __FILE__, __LINE__);
LOG_ADDRESS("ref_tbl", jointIndices, __FILE__, __LINE__);
LOG_ADDRESS("frame_tbl", dynamicData, __FILE__, __LINE__);
LOG_ADDRESS("tbl", staticData, __FILE__, __LINE__);
LOG_ADDRESS("out", frameTable);
LOG_ADDRESS("ref_tbl", jointIndices);
LOG_ADDRESS("frame_tbl", dynamicData);
LOG_ADDRESS("tbl", staticData);
}
frameTable->x =
soh/src/code/z_vimode.c
+19 -19
View File
@@ -1,25 +1,25 @@
#include "global.h"
void ViMode_LogPrint(OSViMode* osViMode) {
LOG_ADDRESS("osvimodep", osViMode, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->comRegs.ctrl", osViMode->comRegs.ctrl, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->comRegs.width", osViMode->comRegs.width, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->comRegs.burst", osViMode->comRegs.burst, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->comRegs.vSync", osViMode->comRegs.vSync, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->comRegs.hSync", osViMode->comRegs.hSync, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->comRegs.leap", osViMode->comRegs.leap, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->comRegs.hStart", osViMode->comRegs.hStart, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->comRegs.xScale", osViMode->comRegs.xScale, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[0].vStart", osViMode->fldRegs[0].vStart, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[0].vBurst", osViMode->fldRegs[0].vBurst, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[0].origin", osViMode->fldRegs[0].origin, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[0].yScale", osViMode->fldRegs[0].yScale, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[0].vIntr", osViMode->fldRegs[0].vIntr, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[1].vStart", osViMode->fldRegs[1].vStart, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[1].vBurst", osViMode->fldRegs[1].vBurst, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[1].origin", osViMode->fldRegs[1].origin, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[1].yScale", osViMode->fldRegs[1].yScale, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep->fldRegs[1].vIntr", osViMode->fldRegs[1].vIntr, __FILE__, __LINE__);
LOG_ADDRESS("osvimodep", osViMode);
LOG_ADDRESS("osvimodep->comRegs.ctrl", osViMode->comRegs.ctrl);
LOG_ADDRESS("osvimodep->comRegs.width", osViMode->comRegs.width);
LOG_ADDRESS("osvimodep->comRegs.burst", osViMode->comRegs.burst);
LOG_ADDRESS("osvimodep->comRegs.vSync", osViMode->comRegs.vSync);
LOG_ADDRESS("osvimodep->comRegs.hSync", osViMode->comRegs.hSync);
LOG_ADDRESS("osvimodep->comRegs.leap", osViMode->comRegs.leap);
LOG_ADDRESS("osvimodep->comRegs.hStart", osViMode->comRegs.hStart);
LOG_ADDRESS("osvimodep->comRegs.xScale", osViMode->comRegs.xScale);
LOG_ADDRESS("osvimodep->fldRegs[0].vStart", osViMode->fldRegs[0].vStart);
LOG_ADDRESS("osvimodep->fldRegs[0].vBurst", osViMode->fldRegs[0].vBurst);
LOG_ADDRESS("osvimodep->fldRegs[0].origin", osViMode->fldRegs[0].origin);
LOG_ADDRESS("osvimodep->fldRegs[0].yScale", osViMode->fldRegs[0].yScale);
LOG_ADDRESS("osvimodep->fldRegs[0].vIntr", osViMode->fldRegs[0].vIntr);
LOG_ADDRESS("osvimodep->fldRegs[1].vStart", osViMode->fldRegs[1].vStart);
LOG_ADDRESS("osvimodep->fldRegs[1].vBurst", osViMode->fldRegs[1].vBurst);
LOG_ADDRESS("osvimodep->fldRegs[1].origin", osViMode->fldRegs[1].origin);
LOG_ADDRESS("osvimodep->fldRegs[1].yScale", osViMode->fldRegs[1].yScale);
LOG_ADDRESS("osvimodep->fldRegs[1].vIntr", osViMode->fldRegs[1].vIntr);
}
// This function configures the custom VI mode (`viMode.customViMode`) based on the other flags in `viMode`.
soh/src/code/z_vismono.c
+4 -4
View File
@@ -96,10 +96,10 @@ void VisMono_Draw(VisMono* this, Gfx** gfxp) {
glistpEnd = VisMono_DrawTexture(this, monoDL);
if (!(glistpEnd <= monoDL + DLSIZE)) {
LOG_ADDRESS("glistp_end", glistpEnd, __FILE__, __LINE__);
LOG_ADDRESS("mono_dl", monoDL, __FILE__, __LINE__);
LOG_ADDRESS("mono_dl + (1+3+1+1+80*(7+2+2+3)+1)", monoDL + DLSIZE, __FILE__, __LINE__);
LOG_ADDRESS("(1+3+1+1+80*(7+2+2+3)+1)", DLSIZE, __FILE__, __LINE__);
LOG_ADDRESS("glistp_end", glistpEnd);
LOG_ADDRESS("mono_dl", monoDL);
LOG_ADDRESS("mono_dl + (1+3+1+1+80*(7+2+2+3)+1)", monoDL + DLSIZE);
LOG_ADDRESS("(1+3+1+1+80*(7+2+2+3)+1)", DLSIZE);
}
ASSERT(glistpEnd <= monoDL + DLSIZE, "glistp_end <= mono_dl + DLSIZE", __FILE__, __LINE__);
}