diff options
Diffstat (limited to 'soh/src/code')
80 files changed, 979 insertions, 1122 deletions
diff --git a/soh/src/code/PreRender.c b/soh/src/code/PreRender.c index 0f29ca8dd..0458601f1 100644 --- a/soh/src/code/PreRender.c +++ b/soh/src/code/PreRender.c @@ -41,10 +41,10 @@ void func_800C0F28(PreRender* this, Gfx** gfxp, void* buf, void* bufSave) { s32 x2; s32 dx; - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 215); - LogUtils_CheckNullPointer("glistpp", gfxp, "../PreRender.c", 216); + LOG_CHECK_NULL_POINTER("this", this); + LOG_CHECK_NULL_POINTER("glistpp", gfxp); gfx = *gfxp; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 218); + LOG_CHECK_NULL_POINTER("glistp", gfx); gDPPipeSync(gfx++); gDPSetOtherMode(gfx++, @@ -89,10 +89,10 @@ void func_800C1258(PreRender* this, Gfx** gfxp) { s32 y2; s32 dy; - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 278); - LogUtils_CheckNullPointer("glistpp", gfxp, "../PreRender.c", 279); + LOG_CHECK_NULL_POINTER("this", this); + LOG_CHECK_NULL_POINTER("glistpp", gfxp); gfx = *gfxp; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 281); + LOG_CHECK_NULL_POINTER("glistp", gfx); gDPPipeSync(gfx++); gDPSetOtherMode(gfx++, @@ -139,10 +139,10 @@ void func_800C170C(PreRender* this, Gfx** gfxp, void* fbuf, void* fbufSave, u32 s32 x2; s32 dx; - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 343); - LogUtils_CheckNullPointer("glistpp", gfxp, "../PreRender.c", 344); + LOG_CHECK_NULL_POINTER("this", this); + LOG_CHECK_NULL_POINTER("glistpp", gfxp); gfx = *gfxp; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 346); + LOG_CHECK_NULL_POINTER("glistp", gfx); gDPPipeSync(gfx++); gDPSetOtherMode(gfx++, @@ -195,10 +195,10 @@ void func_800C1B24(PreRender* this, Gfx** gfxp, void* fbuf, void* cvgSave) { s32 x2; s32 dx; - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 422); - LogUtils_CheckNullPointer("glistpp", gfxp, "../PreRender.c", 423); + LOG_CHECK_NULL_POINTER("this", this); + LOG_CHECK_NULL_POINTER("glistpp", gfxp); gfx = *gfxp; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 425); + LOG_CHECK_NULL_POINTER("glistp", gfx); gDPPipeSync(gfx++); gDPSetOtherMode(gfx++, @@ -239,8 +239,8 @@ void func_800C1B24(PreRender* this, Gfx** gfxp, void* fbuf, void* cvgSave) { } void func_800C1E9C(PreRender* this, Gfx** gfxp) { - LogUtils_CheckNullPointer("this->zbuf_save", this->zbufSave, "../PreRender.c", 481); - LogUtils_CheckNullPointer("this->zbuf", this->zbuf, "../PreRender.c", 482); + LOG_CHECK_NULL_POINTER("this->zbuf_save", this->zbufSave); + LOG_CHECK_NULL_POINTER("this->zbuf", this->zbuf); if ((this->zbufSave != NULL) && (this->zbuf != NULL)) { func_800C0F28(this, gfxp, this->zbuf, this->zbufSave); @@ -248,8 +248,8 @@ void func_800C1E9C(PreRender* this, Gfx** gfxp) { } void func_800C1F20(PreRender* this, Gfx** gfxp) { - LogUtils_CheckNullPointer("this->fbuf_save", this->fbufSave, "../PreRender.c", 495); - LogUtils_CheckNullPointer("this->fbuf", this->fbuf, "../PreRender.c", 496); + LOG_CHECK_NULL_POINTER("this->fbuf_save", this->fbufSave); + LOG_CHECK_NULL_POINTER("this->fbuf", this->fbuf); if ((this->fbufSave != NULL) && (this->fbuf != NULL)) { func_800C1AE8(this, gfxp, this->fbuf, this->fbufSave); @@ -275,7 +275,7 @@ void func_800C1FA4(PreRender* this, Gfx** gfxp) { void func_800C20B4(PreRender* this, Gfx** gfxp) { func_800C1FA4(this, gfxp); - LogUtils_CheckNullPointer("this->cvg_save", this->cvgSave, "../PreRender.c", 532); + LOG_CHECK_NULL_POINTER("this->cvg_save", this->cvgSave); if (this->cvgSave != NULL) { func_800C1B24(this, gfxp, this->fbuf, this->cvgSave); } @@ -293,10 +293,10 @@ void func_800C213C(PreRender* this, Gfx** gfxp) { s32 rtile = 1; if (this->cvgSave != NULL) { - LogUtils_CheckNullPointer("this", this, "../PreRender.c", 563); - LogUtils_CheckNullPointer("glistpp", gfxp, "../PreRender.c", 564); + LOG_CHECK_NULL_POINTER("this", this); + LOG_CHECK_NULL_POINTER("glistpp", gfxp); gfx = *gfxp; - LogUtils_CheckNullPointer("glistp", gfx, "../PreRender.c", 566); + LOG_CHECK_NULL_POINTER("glistp", gfx); gDPPipeSync(gfx++); gDPSetEnvColor(gfx++, 255, 255, 255, 32); @@ -435,7 +435,6 @@ void func_800C2500(PreRender* this, s32 x, s32 y) { } } } - if (1) {} if (pxR2 > buffR[i]) { for (j = 1; j < 15; j += 2) { if ((i != j) && (buffR[j] <= buffR[i]) && (buffA[j] == 7)) { diff --git a/soh/src/code/audio_load.c b/soh/src/code/audio_load.c index 8c15fcd0f..aced2fe94 100644 --- a/soh/src/code/audio_load.c +++ b/soh/src/code/audio_load.c @@ -922,7 +922,6 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo #define BASE_OFFSET(x) (void*)((u32)(x) + (u32)(mem)) reloc2 = ptrs[0]; - if (1) {} if ((reloc2 != 0 || !gUseLegacySD) && (numDrums != 0)) { ptrs[0] = BASE_OFFSET(reloc2); @@ -963,7 +962,6 @@ void AudioLoad_RelocateFont(s32 fontId, SoundFontData* mem, RelocInfo* relocInfo } reloc2 = ptrs[1]; - if (1) {} if ((reloc2 != 0 || !gUseLegacySD) && (numSfx != 0)) { ptrs[1] = BASE_OFFSET(reloc2); for (i = 0; i < numSfx; i++) { @@ -1805,7 +1803,6 @@ void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) { u32 sampleBankId2; RelocInfo relocInfo; - if (1) {} switch (ASYNC_TBLTYPE(retMsg)) { case SEQUENCE_TABLE: AudioLoad_SetSeqLoadStatus(ASYNC_ID(retMsg), ASYNC_STATUS(retMsg)); @@ -1829,7 +1826,6 @@ void AudioLoad_FinishAsyncLoad(AudioAsyncLoad* asyncLoad) { } doneMsg.data32 = asyncLoad->retMsg; - if (1) {} asyncLoad->status = LOAD_STATUS_WAITING; osSendMesg(asyncLoad->retQueue, doneMsg, OS_MESG_NOBLOCK); } @@ -2139,7 +2135,6 @@ s32 AudioLoad_GetSamplesForFont(s32 fontId, SoundFontSample** sampleSet) { for (i = 0; i < numDrums; i++) { Drum* drum = Audio_GetDrum(fontId, i); - if (1) {} if (drum != NULL) { numSamples = AudioLoad_AddToSampleSet(drum->sound.sample, numSamples, sampleSet); } diff --git a/soh/src/code/audio_playback.c b/soh/src/code/audio_playback.c index b9f868bd3..85811f68e 100644 --- a/soh/src/code/audio_playback.c +++ b/soh/src/code/audio_playback.c @@ -205,7 +205,6 @@ void Audio_ProcessNotes(void) { out: if (playbackState->priority != 0) { - if (1) {} noteSubEu = ¬e->noteSubEu; if (playbackState->unk_04 >= 1 || noteSubEu->bitField0.finished) { if (playbackState->adsr.action.s.state == ADSR_STATE_DISABLED || noteSubEu->bitField0.finished) { diff --git a/soh/src/code/audio_synthesis.c b/soh/src/code/audio_synthesis.c index a50927b21..67f7033ea 100644 --- a/soh/src/code/audio_synthesis.c +++ b/soh/src/code/audio_synthesis.c @@ -786,9 +786,6 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS gAudioContext.curLoadedBook = audioFontSample->book->book; break; } - if (1) {} - if (1) {} - if (1) {} nEntries = 16 * audioFontSample->book->order * audioFontSample->book->npredictors; aLoadADPCM(cmd++, nEntries, gAudioContext.curLoadedBook); } @@ -901,7 +898,6 @@ Acmd* AudioSynth_ProcessNote(s32 noteIndex, NoteSubEu* noteSubEu, NoteSynthesisS nSamplesInThisIteration = nSamplesToDecode + nSamplesInFirstFrame - nTrailingSamplesToIgnore; if (nSamplesProcessed == 0) { - if (1) {} skipBytes = nFirstFrameSamplesToIgnore * 2; } else { phi_s4 = ALIGN16(s5 + 16); diff --git a/soh/src/code/code_800A9F30.c b/soh/src/code/code_800A9F30.c index b8f4e1ce8..6ba9c9783 100644 --- a/soh/src/code/code_800A9F30.c +++ b/soh/src/code/code_800A9F30.c @@ -60,7 +60,6 @@ void func_800AA0B4(void) { gPadMgr.retraceCallback = func_800A9F30; gPadMgr.retraceCallbackValue = 0; - if (1) {} } void func_800AA0F0(void) { diff --git a/soh/src/code/code_800E4FE0.c b/soh/src/code/code_800E4FE0.c index 865e8ee29..6eb3ae369 100644 --- a/soh/src/code/code_800E4FE0.c +++ b/soh/src/code/code_800E4FE0.c @@ -187,9 +187,6 @@ AudioTask* func_800E5000(void) { if (gAudioContext.resetStatus == 0) { // msg = 0000RREE R = read pos, E = End Pos while (osRecvMesg(gAudioContext.cmdProcQueueP, &sp4C, OS_MESG_NOBLOCK) != -1) { - if (1) {} - if (1) {} - if (1) {} Audio_ProcessCmds(sp4C.data32); j++; } @@ -218,7 +215,6 @@ AudioTask* func_800E5000(void) { task->dram_stack_size = 0; task->output_buff = NULL; task->output_buff_size = NULL; - if (1) {} task->data_ptr = (u64*)gAudioContext.abiCmdBufs[index]; task->data_size = abiCmdCnt * sizeof(Acmd); task->yield_data_ptr = NULL; diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index 8e1694b7c..c5d150984 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -1558,7 +1558,6 @@ void func_800ED458(s32 arg0) { if ((D_8016BA10 == 0) || ((D_8016BA10 & sOcarinaAllowedBtnMask) != (sCurOcarinaBtnPress & sOcarinaAllowedBtnMask))) { D_8016BA10 = 0; - if (1) {} sCurOcarinaBtnVal = 0xFF; sCurOcarinaBtnIdx = 0xFF; phi_v1_2 = (sCurOcarinaBtnPress & sOcarinaAllowedBtnMask) & (sPrevOcarinaBtnPress & sOcarinaAllowedBtnMask); @@ -1802,7 +1801,6 @@ void func_800EDD68(u8 arg0) { lastNote = song[i].noteIdx; } - if (1) {} if (sRecordSongPos != (i + 1)) { sRecordSongPos = i + 2; @@ -2030,7 +2028,6 @@ s32 Audio_OcaMemoryGameGenNote(void) { sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos].unk_02 = 0; sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos + 1].noteIdx = 0xFF; sOcarinaSongs[OCARINA_SONG_MEMORY_GAME][sOcaMinigameAppendPos + 1].unk_02 = 0; - if (1) {} return 0; } @@ -3014,14 +3011,12 @@ void AudioDebug_ProcessInput_SndCont(void) { if (CHECK_BTN_ANY(sDebugPadPress, BTN_CDOWN)) { if (sAudioSndContSel == 0) { - if (1) {} func_800F595C(sAudioSndContWork[sAudioSndContSel]); } } if (CHECK_BTN_ANY(sDebugPadPress, BTN_CRIGHT)) { if (sAudioSndContSel == 0) { - if (1) {} func_800F5ACC(sAudioSndContWork[sAudioSndContSel]); } } diff --git a/soh/src/code/code_800FC620.c b/soh/src/code/code_800FC620.c index 75a6081e5..a25465e2e 100644 --- a/soh/src/code/code_800FC620.c +++ b/soh/src/code/code_800FC620.c @@ -164,7 +164,6 @@ void func_800FCA18(void* blk, u32 nBlk, u32 blkSize, arg3_800FCA18 arg3, s32 arg while (pos > end) { pos -= masked_arg2; arg3((void*)pos, 2); - if (1) {} } if (!masked_arg2) {} diff --git a/soh/src/code/db_camera.c b/soh/src/code/db_camera.c index 53d5c41bf..d663b4191 100644 --- a/soh/src/code/db_camera.c +++ b/soh/src/code/db_camera.c @@ -1517,18 +1517,18 @@ char DbCamera_InitCut(s32 idx, DbCameraSub* sub) { D_80161250[0x3F + sDbCameraCuts[idx].letter] = 'O'; i = sub->nPoints * sizeof(CutsceneCameraPoint); - sDbCameraCuts[idx].lookAt = DebugArena_MallocDebug(i, "../db_camera.c", 2748); + sDbCameraCuts[idx].lookAt = DEBUG_ARENA_MALLOC_DEBUG(i); if (sDbCameraCuts[idx].lookAt == NULL) { // "Debug camera memory allocation failure" - osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2751); + osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", __FILE__, __LINE__); return '?'; } - sDbCameraCuts[idx].position = DebugArena_MallocDebug(i, "../db_camera.c", 2754); + sDbCameraCuts[idx].position = DEBUG_ARENA_MALLOC_DEBUG(i); if (sDbCameraCuts[idx].position == NULL) { // "Debug camera memory allocation failure" - osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2757); - DebugArena_FreeDebug(sDbCameraCuts[idx].lookAt, "../db_camera.c", 2758); + osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", __FILE__, __LINE__); + DEBUG_ARENA_FREE_DEBUG(sDbCameraCuts[idx].lookAt); sDbCameraCuts[idx].lookAt = NULL; return '?'; } @@ -1551,8 +1551,8 @@ void DbCamera_ResetCut(s32 idx, s32 shouldFree) { } if (shouldFree) { - DebugArena_FreeDebug(sDbCameraCuts[idx].lookAt, "../db_camera.c", 2784); - DebugArena_FreeDebug(sDbCameraCuts[idx].position, "../db_camera.c", 2785); + DEBUG_ARENA_FREE_DEBUG(sDbCameraCuts[idx].lookAt); + DEBUG_ARENA_FREE_DEBUG(sDbCameraCuts[idx].position); } sDbCameraCuts[idx].letter = '?'; @@ -1602,10 +1602,10 @@ s32 DbCamera_LoadCallback(char* c) { if (sDbCameraCuts[i].letter != '?') { size = sDbCameraCuts[i].nPoints * sizeof(CutsceneCameraPoint); - sDbCameraCuts[i].lookAt = DebugArena_MallocDebug(ALIGN32(size), "../db_camera.c", 2844); + sDbCameraCuts[i].lookAt = DEBUG_ARENA_MALLOC_DEBUG(ALIGN32(size)); if (sDbCameraCuts[i].lookAt == NULL) { // "Debug camera memory allocation failure" - osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2847); + osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", __FILE__, __LINE__); return false; } if (!Mempak_Read(2, *c, sDbCameraCuts[i].lookAt, off, ALIGN32(size))) { @@ -1613,10 +1613,10 @@ s32 DbCamera_LoadCallback(char* c) { } off += ALIGN32(size); - sDbCameraCuts[i].position = DebugArena_MallocDebug(ALIGN32(size), "../db_camera.c", 2855); + sDbCameraCuts[i].position = DEBUG_ARENA_MALLOC_DEBUG(ALIGN32(size)); if (sDbCameraCuts[i].position == NULL) { // "Debug camera memory allocation failure" - osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", "../db_camera.c", 2858); + osSyncPrintf("%s: %d: デバッグカメラ メモリ確保失敗！！\n", __FILE__, __LINE__); return false; } if (!Mempak_Read(2, *c, sDbCameraCuts[i].position, off, ALIGN32(size))) { @@ -2156,7 +2156,6 @@ s32 DbCamera_UpdateDemoControl(DbCamera* dbCamera, Camera* cam) { sLastFileIdx = sCurFileIdx; D_801612EA = sDbCameraCuts[idx1].letter; } - if (1) {} } else if (!CHECK_BTN_ALL(sGlobalCtx->state.input[2].cur.button, BTN_L)) { if (sLastFileIdx != -1) { switch (sp74[sCurFileIdx]) { diff --git a/soh/src/code/fault.c b/soh/src/code/fault.c index c4d6d746e..c55a63a00 100644 --- a/soh/src/code/fault.c +++ b/soh/src/code/fault.c @@ -577,9 +577,6 @@ void Fault_WaitForButtonCombo() u32 kDown; u32 kCur; - if (1) {} - if (1) {} - osSyncPrintf( VT_FGCOL(WHITE) "KeyWaitB (ＬＲＺ " VT_FGCOL(WHITE) "上" VT_FGCOL(YELLOW) "下 " VT_FGCOL(YELLOW) "上" VT_FGCOL(WHITE) "下 " VT_FGCOL(WHITE) "左" VT_FGCOL( YELLOW) "左 " VT_FGCOL(YELLOW) "右" VT_FGCOL(WHITE) "右 " VT_FGCOL(GREEN) "Ｂ" VT_FGCOL(BLUE) "Ａ" VT_FGCOL(RED) "START" VT_FGCOL(WHITE) ")" VT_RST diff --git a/soh/src/code/flg_set.c b/soh/src/code/flg_set.c index 55850d5b0..54bbd21e8 100644 --- a/soh/src/code/flg_set.c +++ b/soh/src/code/flg_set.c @@ -40,7 +40,7 @@ void FlagSet_Update(GlobalContext* globalCtx) { Gfx* gfx; Gfx* polyOpa; - OPEN_DISPS(gfxCtx, "../flg_set.c", 131); + OPEN_DISPS(gfxCtx); { GfxPrint printer; @@ -148,5 +148,5 @@ void FlagSet_Update(GlobalContext* globalCtx) { globalCtx->pauseCtx.debugState = 0; } - CLOSE_DISPS(gfxCtx, "../flg_set.c", 241); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/code/game.c b/soh/src/code/game.c index 69b7c0ef7..306b292bc 100644 --- a/soh/src/code/game.c +++ b/soh/src/code/game.c @@ -143,7 +143,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { Gfx* newDList; Gfx* polyOpaP; - OPEN_DISPS(gfxCtx, "../game.c", 746); + OPEN_DISPS(gfxCtx); newDList = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP); gSPDisplayList(OVERLAY_DISP++, newDList); @@ -182,9 +182,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { Graph_BranchDlist(polyOpaP, newDList); POLY_OPA_DISP = newDList; - if (1) {} - - CLOSE_DISPS(gfxCtx, "../game.c", 800); + CLOSE_DISPS(gfxCtx); func_80063D7C(gfxCtx); @@ -195,7 +193,7 @@ void GameState_Draw(GameState* gameState, GraphicsContext* gfxCtx) { } void GameState_SetFrameBuffer(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../game.c", 814); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0, 0); gSPSegment(POLY_OPA_DISP++, 0xF, gfxCtx->curFrameBuffer); @@ -207,14 +205,14 @@ void GameState_SetFrameBuffer(GraphicsContext* gfxCtx) { gSPSegment(OVERLAY_DISP++, 0xF, gfxCtx->curFrameBuffer); gSPSegment(OVERLAY_DISP++, 0xE, gZBuffer); - CLOSE_DISPS(gfxCtx, "../game.c", 838); + CLOSE_DISPS(gfxCtx); } void func_800C49F4(GraphicsContext* gfxCtx) { Gfx* newDlist; Gfx* polyOpaP; - OPEN_DISPS(gfxCtx, "../game.c", 846); + OPEN_DISPS(gfxCtx); newDlist = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP); gSPDisplayList(OVERLAY_DISP++, newDlist); @@ -223,9 +221,7 @@ void func_800C49F4(GraphicsContext* gfxCtx) { Graph_BranchDlist(polyOpaP, newDlist); POLY_OPA_DISP = newDlist; - if (1) {} - - CLOSE_DISPS(gfxCtx, "../game.c", 865); + CLOSE_DISPS(gfxCtx); } void PadMgr_RequestPadData(PadMgr*, Input*, s32); @@ -435,14 +431,14 @@ void GameState_InitArena(GameState* gameState, size_t size) { void* arena; osSyncPrintf("ハイラル確保 サイズ＝%u バイト\n"); // "Hyrule reserved size = %u bytes" - arena = GameAlloc_MallocDebug(&gameState->alloc, size, "../game.c", 992); + arena = GAMESTATE_MALLOC_DEBUG(&gameState->alloc, size); if (arena != NULL) { THA_Ct(&gameState->tha, arena, size); osSyncPrintf("ハイラル確保成功\n"); // "Successful Hyral" } else { THA_Ct(&gameState->tha, NULL, 0); osSyncPrintf("ハイラル確保失敗\n"); // "Failure to secure Hyrule" - Fault_AddHungupAndCrash("../game.c", 999); + Fault_AddHungupAndCrash(__FILE__, __LINE__); } } @@ -470,7 +466,7 @@ void GameState_Realloc(GameState* gameState, size_t size) { } osSyncPrintf("ハイラル再確保 サイズ＝%u バイト\n", size); // "Hyral reallocate size = %u bytes" - gameArena = GameAlloc_MallocDebug(alloc, size, "../game.c", 1033); + gameArena = GAMESTATE_MALLOC_DEBUG(alloc, size); if (gameArena != NULL) { THA_Ct(&gameState->tha, gameArena, size); osSyncPrintf("ハイラル再確保成功\n"); // "Successful reacquisition of Hyrule" @@ -478,7 +474,7 @@ void GameState_Realloc(GameState* gameState, size_t size) { THA_Ct(&gameState->tha, NULL, 0); osSyncPrintf("ハイラル再確保失敗\n"); // "Failure to secure Hyral" SystemArena_Display(); - Fault_AddHungupAndCrash("../game.c", 1044); + Fault_AddHungupAndCrash(__FILE__, __LINE__); } } @@ -516,7 +512,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g osSyncPrintf("init 処理時間 %d us\n", OS_CYCLES_TO_USEC(endTime - startTime)); startTime = endTime; - LogUtils_CheckNullPointer("this->cleanup", gameState->destroy, "../game.c", 1088); + LOG_CHECK_NULL_POINTER("this->cleanup", gameState->destroy); func_800ACE70(&D_801664F0); func_800AD920(&D_80166500); VisMono_Init(&sMonoColors); @@ -541,7 +537,7 @@ void GameState_Destroy(GameState* gameState) { func_800C3C20(); func_800F3054(); osRecvMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK); - LogUtils_CheckNullPointer("this->cleanup", gameState->destroy, "../game.c", 1139); + LOG_CHECK_NULL_POINTER("this->cleanup", gameState->destroy); if (gameState->destroy != NULL) { gameState->destroy(gameState); } diff --git a/soh/src/code/gamealloc.c b/soh/src/code/gamealloc.c index 451c56de2..105fe0520 100644 --- a/soh/src/code/gamealloc.c +++ b/soh/src/code/gamealloc.c @@ -13,7 +13,7 @@ void GameAlloc_Log(GameAlloc* this) { } void* GameAlloc_MallocDebug(GameAlloc* this, size_t size, const char* file, s32 line) { - GameAllocEntry* ptr = SystemArena_MallocDebug(size + sizeof(GameAllocEntry), file, line); + GameAllocEntry* ptr = SystemArena_MallocDebug(size + sizeof(GameAllocEntry), __FILE__, __LINE__); if (ptr != NULL) { ptr->size = size; @@ -29,7 +29,7 @@ void* GameAlloc_MallocDebug(GameAlloc* this, size_t size, const char* file, s32 } void* GameAlloc_Malloc(GameAlloc* this, size_t size) { - GameAllocEntry* ptr = SystemArena_MallocDebug(size + sizeof(GameAllocEntry), "../gamealloc.c", 93); + GameAllocEntry* ptr = SYSTEM_ARENA_MALLOC_DEBUG(size + sizeof(GameAllocEntry)); if (ptr != NULL) { ptr->size = size; @@ -49,12 +49,12 @@ void GameAlloc_Free(GameAlloc* this, void* data) { if (data != NULL) { ptr = &((GameAllocEntry*)data)[-1]; - LogUtils_CheckNullPointer("ptr->prev", ptr->prev, "../gamealloc.c", 120); - LogUtils_CheckNullPointer("ptr->next", ptr->next, "../gamealloc.c", 121); + LOG_CHECK_NULL_POINTER("ptr->prev", ptr->prev); + LOG_CHECK_NULL_POINTER("ptr->next", ptr->next); ptr->prev->next = ptr->next; ptr->next->prev = ptr->prev; this->head = this->base.prev; - SystemArena_FreeDebug(ptr, "../gamealloc.c", 125); + SYSTEM_ARENA_FREE_DEBUG(ptr); } } @@ -65,7 +65,7 @@ void GameAlloc_Cleanup(GameAlloc* this) { while (&this->base != next) { cur = next; next = next->next; - SystemArena_FreeDebug(cur, "../gamealloc.c", 145); + SYSTEM_ARENA_FREE_DEBUG(cur); } this->head = &this->base; diff --git a/soh/src/code/graph.c b/soh/src/code/graph.c index ca0c9511a..f4a824cb4 100644 --- a/soh/src/code/graph.c +++ b/soh/src/code/graph.c @@ -134,7 +134,7 @@ GameStateOverlay* Graph_GetNextGameState(GameState* gameState) { return &gGameStateOverlayTable[5]; } - LOG_ADDRESS("game_init_func", gameStateInitFunc, "../graph.c", 696); + LOG_ADDRESS("game_init_func", gameStateInitFunc); return NULL; } @@ -225,11 +225,9 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { task->output_buff_size = (u64*)((u8*)gGfxSPTaskOutputBuffer + sizeof(gGfxSPTaskOutputBuffer)); task->data_ptr = (u64*)gfxCtx->workBuffer; - OPEN_DISPS(gfxCtx, "../graph.c", 828); + OPEN_DISPS(gfxCtx); task->data_size = (uintptr_t)WORK_DISP - (uintptr_t)gfxCtx->workBuffer; - CLOSE_DISPS(gfxCtx, "../graph.c", 830); - - { s32 pad2; } // Necessary to match stack usage + CLOSE_DISPS(gfxCtx); task->yield_data_ptr = (u64*)gGfxSPTaskYieldBuffer; task->yield_data_size = sizeof(gGfxSPTaskYieldBuffer); @@ -258,8 +256,6 @@ void Graph_TaskSet00(GraphicsContext* gfxCtx) { scTask->framebuffer = cfb; sGraphCfbInfoIdx = sGraphCfbInfoIdx % ARRAY_COUNT(sGraphCfbInfos); - if (1) {} - gfxCtx->schedMsgQ = &gSchedContext.cmdQ; osSendMesgPtr(&gSchedContext.cmdQ, scTask, OS_MESG_BLOCK); @@ -272,29 +268,29 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { gameState->unk_A0 = 0; Graph_InitTHGA(gfxCtx); - OPEN_DISPS(gfxCtx, "../graph.c", 966); + OPEN_DISPS(gfxCtx); gDPNoOpString(WORK_DISP++, "WORK_DISP 開始", 0); gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 開始", 0); gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 開始", 0); gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 開始", 0); - CLOSE_DISPS(gfxCtx, "../graph.c", 975); + CLOSE_DISPS(gfxCtx); GameState_ReqPadData(gameState); GameState_Update(gameState); Debug_Draw(); - OPEN_DISPS(gfxCtx, "../graph.c", 987); + OPEN_DISPS(gfxCtx); gDPNoOpString(WORK_DISP++, "WORK_DISP 終了", 0); gDPNoOpString(POLY_OPA_DISP++, "POLY_OPA_DISP 終了", 0); gDPNoOpString(POLY_XLU_DISP++, "POLY_XLU_DISP 終了", 0); gDPNoOpString(OVERLAY_DISP++, "OVERLAY_DISP 終了", 0); - CLOSE_DISPS(gfxCtx, "../graph.c", 996); + CLOSE_DISPS(gfxCtx); - OPEN_DISPS(gfxCtx, "../graph.c", 999); + OPEN_DISPS(gfxCtx); gSPBranchList(WORK_DISP++, gfxCtx->polyOpaBuffer); gSPBranchList(POLY_OPA_DISP++, gfxCtx->polyXluBuffer); @@ -305,7 +301,7 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { gDPFullSync(OVERLAY_DISP++); gSPEndDisplayList(OVERLAY_DISP++); - CLOSE_DISPS(gfxCtx, "../graph.c", 1028); + CLOSE_DISPS(gfxCtx); if (HREG(80) == 10 && HREG(93) == 2) { HREG(80) = 7; @@ -344,14 +340,14 @@ void Graph_Update(GraphicsContext* gfxCtx, GameState* gameState) { osSyncPrintf("%c", 7); // "Dynamic area head is destroyed" osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域先頭が破壊されています\n" VT_RST); - Fault_AddHungupAndCrash("../graph.c", 1070); + Fault_AddHungupAndCrash(__FILE__, __LINE__); } if (pool->tailMagic != GFXPOOL_TAIL_MAGIC) { problem = true; osSyncPrintf("%c", 7); // "Dynamic region tail is destroyed" osSyncPrintf(VT_COL(RED, WHITE) "ダイナミック領域末尾が破壊されています\n" VT_RST); - Fault_AddHungupAndCrash("../graph.c", 1076); + Fault_AddHungupAndCrash(__FILE__, __LINE__); } } @@ -458,7 +454,7 @@ static void RunFrame() size = runFrameContext.ovl->instanceSize; osSyncPrintf("クラスサイズ＝%dバイト\n", size); // "Class size = %d bytes" - runFrameContext.gameState = SystemArena_MallocDebug(size, "../graph.c", 1196); + runFrameContext.gameState = SYSTEM_ARENA_MALLOC_DEBUG(size); if (!runFrameContext.gameState) { @@ -499,7 +495,7 @@ static void RunFrame() runFrameContext.nextOvl = Graph_GetNextGameState(runFrameContext.gameState); GameState_Destroy(runFrameContext.gameState); - SystemArena_FreeDebug(runFrameContext.gameState, "../graph.c", 1227); + SYSTEM_ARENA_FREE_DEBUG(runFrameContext.gameState); Overlay_FreeGameState(runFrameContext.ovl); } Graph_Destroy(&runFrameContext.gfxCtx); diff --git a/soh/src/code/irqmgr.c b/soh/src/code/irqmgr.c index 43d61ad71..41b432e91 100644 --- a/soh/src/code/irqmgr.c +++ b/soh/src/code/irqmgr.c @@ -19,9 +19,9 @@ u32 sIrqMgrRetraceCount = 0; void IrqMgr_AddClient(IrqMgr* this, IrqMgrClient* c, OSMesgQueue* msgQ) { OSIntMask prevInt; - LogUtils_CheckNullPointer("this", this, "../irqmgr.c", 96); - LogUtils_CheckNullPointer("c", c, "../irqmgr.c", 97); - LogUtils_CheckNullPointer("msgQ", msgQ, "../irqmgr.c", 98); + LOG_CHECK_NULL_POINTER("this", this); + LOG_CHECK_NULL_POINTER("c", c); + LOG_CHECK_NULL_POINTER("msgQ", msgQ); prevInt = osSetIntMask(1); @@ -45,8 +45,8 @@ void IrqMgr_RemoveClient(IrqMgr* this, IrqMgrClient* c) { IrqMgrClient* lastIter = NULL; OSIntMask prevInt; - LogUtils_CheckNullPointer("this", this, "../irqmgr.c", 129); - LogUtils_CheckNullPointer("c", c, "../irqmgr.c", 130); + LOG_CHECK_NULL_POINTER("this", this); + LOG_CHECK_NULL_POINTER("c", c); prevInt = osSetIntMask(1); @@ -214,8 +214,8 @@ void IrqMgr_ThreadEntry(void* arg0) { } void IrqMgr_Init(IrqMgr* this, void* stack, OSPri pri, u8 retraceCount) { - LogUtils_CheckNullPointer("this", this, "../irqmgr.c", 346); - LogUtils_CheckNullPointer("stack", stack, "../irqmgr.c", 347); + LOG_CHECK_NULL_POINTER("this", this); + LOG_CHECK_NULL_POINTER("stack", stack); this->clients = NULL; this->retraceMsg.type = OS_SC_RETRACE_MSG; diff --git a/soh/src/code/listalloc.c b/soh/src/code/listalloc.c index 18d43328d..3dc090f11 100644 --- a/soh/src/code/listalloc.c +++ b/soh/src/code/listalloc.c @@ -7,7 +7,7 @@ ListAlloc* ListAlloc_Init(ListAlloc* this) { } void* ListAlloc_Alloc(ListAlloc* this, size_t size) { - ListAlloc* ptr = SystemArena_MallocDebug(size + sizeof(ListAlloc), "../listalloc.c", 40); + ListAlloc* ptr = SYSTEM_ARENA_MALLOC_DEBUG(size + sizeof(ListAlloc)); ListAlloc* next; if (ptr == NULL) { @@ -49,7 +49,7 @@ void ListAlloc_Free(ListAlloc* this, void* data) { this->next = ptr->prev; } - SystemArena_FreeDebug(ptr, "../listalloc.c", 72); + SYSTEM_ARENA_FREE_DEBUG(ptr); } void ListAlloc_FreeAll(ListAlloc* this) { diff --git a/soh/src/code/loadfragment2.c b/soh/src/code/loadfragment2.c index dd413ca49..03e7497e1 100644 --- a/soh/src/code/loadfragment2.c +++ b/soh/src/code/loadfragment2.c @@ -1,7 +1,7 @@ #include "global.h" void* Overlay_AllocateAndLoad(uintptr_t vRomStart, uintptr_t vRomEnd, void* vRamStart, void* vRamEnd) { - void* allocatedVRamAddr = SystemArena_MallocRDebug((intptr_t)vRamEnd - (intptr_t)vRamStart, "../loadfragment2.c", 31); + void* allocatedVRamAddr = SYSTEM_ARENA_MALLOC_RDEBUG((intptr_t)vRamEnd - (intptr_t)vRamStart); if (gOverlayLogSeverity >= 3) { osSyncPrintf("OVL:SPEC(%08x-%08x) REAL(%08x-%08x) OFFSET(%08x)\n", vRamStart, vRamEnd, allocatedVRamAddr, diff --git a/soh/src/code/main.c b/soh/src/code/main.c index 35435815c..372e3947c 100644 --- a/soh/src/code/main.c +++ b/soh/src/code/main.c @@ -75,7 +75,7 @@ void Main(void* arg) { debugHeapSize = (0x80600000 - (uintptr_t)debugHeap); } else { debugHeapSize = 0x400; - debugHeap = SystemArena_MallocDebug(debugHeapSize, "../main.c", 565); + debugHeap = SYSTEM_ARENA_MALLOC_DEBUG(debugHeapSize); } debugHeapSize = 1024 * 64; diff --git a/soh/src/code/mtxuty-cvt.c b/soh/src/code/mtxuty-cvt.c index 18c7a36f3..3414ce5f0 100644 --- a/soh/src/code/mtxuty-cvt.c +++ b/soh/src/code/mtxuty-cvt.c @@ -4,8 +4,8 @@ void MtxConv_F2L(Mtx* m1, MtxF* m2) { s32 i; s32 j; - LogUtils_CheckNullPointer("m1", m1, "../mtxuty-cvt.c", 31); - LogUtils_CheckNullPointer("m2", m2, "../mtxuty-cvt.c", 32); + LOG_CHECK_NULL_POINTER("m1", m1); + LOG_CHECK_NULL_POINTER("m2", m2); for (i = 0; i < 4; i++) { for (j = 0; j < 4; j++) { @@ -18,7 +18,7 @@ void MtxConv_F2L(Mtx* m1, MtxF* m2) { } void MtxConv_L2F(MtxF* m1, Mtx* m2) { - LogUtils_CheckNullPointer("m1", m1, "../mtxuty-cvt.c", 55); - LogUtils_CheckNullPointer("m2", m2, "../mtxuty-cvt.c", 56); + LOG_CHECK_NULL_POINTER("m1", m1); + LOG_CHECK_NULL_POINTER("m2", m2); guMtxL2F(m1, m2); } diff --git a/soh/src/code/padmgr.c b/soh/src/code/padmgr.c index c650639df..d89207e6f 100644 --- a/soh/src/code/padmgr.c +++ b/soh/src/code/padmgr.c @@ -73,7 +73,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) { if (padMgr->rumbleEnable[i] != 0) { if (padMgr->rumbleCounter[i] < 3) { // clang-format off - if (1) {} osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf(VT_FGCOL(YELLOW)); // clang-format on // "Vibration pack jumble jumble"? @@ -95,7 +95,7 @@ void PadMgr_RumbleControl(PadMgr* padMgr) { } else { if (padMgr->rumbleCounter[i] != 0) { // clang-format off - if (1) {} osSyncPrintf(VT_FGCOL(YELLOW)); + osSyncPrintf(VT_FGCOL(YELLOW)); // clang-format on // "Stop vibration pack" @@ -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, "../padmgr.c", 282); + LOG_NUM("++errcnt", ++errcnt); osSyncPrintf(VT_FGCOL(YELLOW)); // "Controller pack communication error" osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "コントローラパックの通信エラー"); @@ -223,8 +223,6 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) { for (i = 0; i < padMgr->nControllers; i++, input++, padnow1++) { input->prev = input->cur; - if (1) {} // Necessary to match - switch (padnow1->err_no) { case 0: input->cur = *padnow1; @@ -237,7 +235,7 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) { break; case 4: input->cur = input->prev; - LOG_NUM("this->Key_switch[i]", padMgr->ctrlrIsConnected[i], "../padmgr.c", 380); + LOG_NUM("this->Key_switch[i]", padMgr->ctrlrIsConnected[i]); osSyncPrintf(VT_FGCOL(YELLOW)); // "Overrun error occurred" osSyncPrintf("padmgr: %dコン: %s\n", i + 1, "オーバーランエラーが発生"); @@ -259,8 +257,8 @@ void PadMgr_ProcessInputs(PadMgr* padMgr) { } break; default: - LOG_HEX("padnow1->errno", padnow1->err_no, "../padmgr.c", 396); - Fault_AddHungupAndCrash("../padmgr.c", 397); + LOG_HEX("padnow1->errno", padnow1->err_no); + Fault_AddHungupAndCrash(__FILE__, __LINE__); } buttonDiff = input->prev.button ^ input->cur.button; @@ -325,7 +323,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, "../padmgr.c", 458); + //LOG_HEX("this->pad_status[i].type", padMgr->padStatus[i].type); // "An unknown type of controller is connected" //osSyncPrintf("知らない種類のコントローラが接続されています\n"); } @@ -400,7 +398,7 @@ void PadMgr_ThreadEntry(PadMgr* padMgr) { } osRecvMesg(&padMgr->interruptMsgQ, (OSMesg*)&mesg, OS_MESG_BLOCK); - //LogUtils_CheckNullPointer("msg", mesg, "../padmgr.c", 563); + //LOG_CHECK_NULL_POINTER("msg", mesg); PadMgr_HandleRetraceMsg(padMgr); break; diff --git a/soh/src/code/sched.c b/soh/src/code/sched.c index 4bc314491..0970b4fd9 100644 --- a/soh/src/code/sched.c +++ b/soh/src/code/sched.c @@ -18,7 +18,7 @@ OSTime sRDPStartTime; void Sched_SwapFrameBuffer(CfbInfo* cfbInfo) { u16 width; - LogUtils_CheckValidPointer("cfbinfo->swapbuffer", cfbInfo->swapBuffer, "../sched.c", 340); + LOG_CHECK_VALID_POINTER("cfbinfo->swapbuffer", cfbInfo->swapBuffer); if (cfbInfo->swapBuffer != NULL) { osViSwapBuffer(cfbInfo->swapBuffer); cfbInfo->updateRate2 = cfbInfo->updateRate; @@ -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), "../sched.c", 421); + 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), "../sched.c", 427); + 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), "../sched.c", 431); + OS_CYCLES_TO_USEC(now - sRDPStartTime)); osSendMesg32(&sc->interruptQ, RDP_DONE_MSG, OS_MESG_NOBLOCK); } } @@ -102,9 +102,7 @@ void Sched_HandleStart(SchedContext* sc) { void Sched_QueueTask(SchedContext* sc, OSScTask* task) { s32 type = task->list.t.type; - ASSERT((type == M_AUDTASK) || (type == M_GFXTASK) || (type == M_NJPEGTASK) || (type == M_NULTASK), - "(type == M_AUDTASK) || (type == M_GFXTASK) || (type == M_NJPEGTASK) || (type == M_NULTASK)", "../sched.c", - 463); + ASSERT((type == M_AUDTASK) || (type == M_GFXTASK) || (type == M_NJPEGTASK) || (type == M_NULTASK)); if (type == M_AUDTASK) { if (sLogScheduler) { @@ -136,7 +134,7 @@ void Sched_QueueTask(SchedContext* sc, OSScTask* task) { void Sched_Yield(SchedContext* sc) { if (!(sc->curRSPTask->state & OS_SC_YIELD)) { - ASSERT(sc->curRSPTask->list.t.type != M_AUDTASK, "sc->curRSPTask->list.t.type != M_AUDTASK", "../sched.c", 496); + ASSERT(sc->curRSPTask->list.t.type != M_AUDTASK); sc->curRSPTask->state |= OS_SC_YIELD; @@ -155,14 +153,14 @@ OSScTask* func_800C89D4(SchedContext* sc, OSScTask* task) { if (sc->pendingSwapBuf1 != NULL) { if (0) { - ASSERT(sc->pendingSwapBuf1 != NULL, "sc->pending_swapbuffer1", "../sched.c", UNK_LINE); + ASSERT(sc->pendingSwapBuf1 != NULL); } return NULL; } if (sc->pendingSwapBuf2 != NULL) { if (0) { - ASSERT(sc->pendingSwapBuf2 != NULL, "sc->pending_swapbuffer2", "../sched.c", UNK_LINE); + ASSERT(sc->pendingSwapBuf2 != NULL); } return NULL; } @@ -223,7 +221,7 @@ void func_800C8BC4(SchedContext* sc, OSScTask* task) { if (sc->pendingSwapBuf1 == NULL) { sc->pendingSwapBuf1 = task->framebuffer; - LogUtils_CheckValidPointer("sc->pending_swapbuffer1", sc->pendingSwapBuf1, "../sched.c", 618); + LOG_CHECK_VALID_POINTER("sc->pending_swapbuffer1", sc->pendingSwapBuf1); if ((sc->curBuf == NULL) || (sc->curBuf->updateRate2 < 1)) { func_800C84E4(sc, task->framebuffer); @@ -248,7 +246,7 @@ u32 Sched_IsComplete(SchedContext* sc, OSScTask* task) { } void Sched_RunTask(SchedContext* sc, OSScTask* spTask, OSScTask* dpTask) { - ASSERT(sc->curRSPTask == NULL, "sc->curRSPTask == NULL", "../sched.c", 663); + ASSERT(sc->curRSPTask == NULL); if (spTask != NULL) { if (spTask->list.t.type == M_NULTASK) { if (spTask->flags & OS_SC_NEEDS_RSP) { @@ -358,7 +356,7 @@ void Sched_HandleRSPDone(SchedContext* sc) { OSScTask* nextRDP = NULL; s32 state; - ASSERT(sc->curRSPTask != NULL, "sc->curRSPTask", "../sched.c", 819); + ASSERT(sc->curRSPTask != NULL); if (sc->curRSPTask->list.t.type == M_AUDTASK) { gRSPAudioTotalTime += osGetTime() - sRSPAudioStartTime; @@ -407,8 +405,8 @@ void Sched_HandleRDPDone(SchedContext* sc) { s32 state; gRDPTotalTime = osGetTime() - sRDPStartTime; - ASSERT(sc->curRDPTask != NULL, "sc->curRDPTask", "../sched.c", 878); - ASSERT(sc->curRDPTask->list.t.type == M_GFXTASK, "sc->curRDPTask->list.t.type == M_GFXTASK", "../sched.c", 879); + ASSERT(sc->curRDPTask != NULL); + ASSERT(sc->curRDPTask->list.t.type == M_GFXTASK); curTask = sc->curRDPTask; sc->curRDPTask = NULL; curTask->state &= ~OS_SC_DP; diff --git a/soh/src/code/speed_meter.c b/soh/src/code/speed_meter.c index 7d768d090..f645c7bb5 100644 --- a/soh/src/code/speed_meter.c +++ b/soh/src/code/speed_meter.c @@ -29,7 +29,7 @@ SpeedMeterTimeEntry sSpeedMeterTimeEntryArray[] = { gDPPipeSync(gfx); void SpeedMeter_InitImpl(SpeedMeter* this, u32 arg1, u32 y) { - LogUtils_CheckNullPointer("this", this, "../speed_meter.c", 181); + LOG_CHECK_NULL_POINTER("this", this); this->unk_18 = arg1; this->y = y; } @@ -55,7 +55,7 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { uly = this->y; lry = this->y + 2; - OPEN_DISPS(gfxCtx, "../speed_meter.c", 225); + OPEN_DISPS(gfxCtx); /*! @bug if gIrqMgrRetraceTime is 0, CLOSE_DISPS will never be reached */ if (gIrqMgrRetraceTime == 0) { @@ -98,7 +98,7 @@ void SpeedMeter_DrawTimeEntries(SpeedMeter* this, GraphicsContext* gfxCtx) { OVERLAY_DISP = gfx; - CLOSE_DISPS(gfxCtx, "../speed_meter.c", 276); + CLOSE_DISPS(gfxCtx); } void SpeedMeter_InitAllocEntry(SpeedMeterAllocEntry* this, u32 maxval, u32 val, u16 backColor, u16 foreColor, u32 ulx, @@ -120,10 +120,10 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC if (this->maxval == 0) { osSyncPrintf(VT_FGCOL(RED)); - LOG_NUM("this->maxval", this->maxval, "../speed_meter.c", 313); + LOG_NUM("this->maxval", this->maxval); osSyncPrintf(VT_RST); } else { - OPEN_DISPS(gfxCtx, "../speed_meter.c", 318); + OPEN_DISPS(gfxCtx); View_Init(&view, gfxCtx); view.flags = 0xA; @@ -146,7 +146,7 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* this, GraphicsContext* gfxC gDPPipeSync(gfx++); OVERLAY_DISP = gfx; - CLOSE_DISPS(gfxCtx, "../speed_meter.c", 339); + CLOSE_DISPS(gfxCtx); } } diff --git a/soh/src/code/sys_cfb.c b/soh/src/code/sys_cfb.c index 9412c3035..39106c49b 100644 --- a/soh/src/code/sys_cfb.c +++ b/soh/src/code/sys_cfb.c @@ -25,7 +25,7 @@ void SysCfb_Init(s32 n64dd) { osSyncPrintf("RAM4M mode\n"); sSysCfbEnd = 0x80400000; } else { - LogUtils_HungupThread("../sys_cfb.c", 354); + LOG_HUNGUP_THREAD(); } */ diff --git a/soh/src/code/sys_matrix.c b/soh/src/code/sys_matrix.c index bc90bf669..06e2e881f 100644 --- a/soh/src/code/sys_matrix.c +++ b/soh/src/code/sys_matrix.c @@ -22,7 +22,7 @@ MtxF* sMatrixStack; // "Matrix_stack" MtxF* sCurrentMatrix; // "Matrix_now" void Matrix_Init(GameState* gameState) { - sCurrentMatrix = GameState_Alloc(gameState, 20 * sizeof(MtxF), "../sys_matrix.c", 153); + sCurrentMatrix = GAMESTATE_ALLOC_MC(gameState, 20 * sizeof(MtxF)); sMatrixStack = sCurrentMatrix; } @@ -35,7 +35,7 @@ void Matrix_Push(void) { void Matrix_Pop(void) { FrameInterpolation_RecordMatrixPop(); sCurrentMatrix--; - ASSERT(sCurrentMatrix >= sMatrixStack, "Matrix_now >= Matrix_stack", "../sys_matrix.c", 176); + ASSERT(sCurrentMatrix >= sMatrixStack); } void Matrix_Get(MtxF* dest) { @@ -556,7 +556,7 @@ Mtx* Matrix_ToMtx(Mtx* dest, char* file, s32 line) { FrameInterpolation_RecordMatrixToMtx(dest, file, line); guMtxF2L(Matrix_CheckFloats(sCurrentMatrix, file, line), dest); return dest; - //return Matrix_MtxFToMtx(Matrix_CheckFloats(sCurrentMatrix, file, line), dest); + //return Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(sCurrentMatrix), dest); } Mtx* Matrix_NewMtx(GraphicsContext* gfxCtx, char* file, s32 line) { @@ -851,8 +851,6 @@ void Matrix_RotateAxis(f32 angle, Vec3f* axis, u8 mode) { cmf->yy = axis->y * axis->y * rCos + cos; cmf->zz = axis->z * axis->z * rCos + cos; - if (0) {} - temp2 = axis->x * rCos * axis->y; temp3 = axis->z * sin; cmf->yx = temp2 + temp3; diff --git a/soh/src/code/ucode_disas.c b/soh/src/code/ucode_disas.c index 4ca61f3c5..56e3aad9a 100644 --- a/soh/src/code/ucode_disas.c +++ b/soh/src/code/ucode_disas.c @@ -247,8 +247,6 @@ void UCodeDisas_PrintVertices(UCodeDisas* this, Vtx* vtx, s32 count, s32 start) vtx->v.cn[3], start + i); } vtx++; - - if (1) {} } } @@ -717,7 +715,6 @@ void UCodeDisas_Disassemble(UCodeDisas* this, GfxMod* ptr) { : "???"; if ((setscissor.x0frac | setscissor.y0frac | setscissor.x1frac | setscissor.y1frac)) { - if (1) {} DISAS_LOG("gsDPSetScissorFrac(%s, %d, %d, %d, %d),", modeStr, (setscissor.x0 << 2) + setscissor.x0frac, (setscissor.y0 << 2) + setscissor.y0frac, (setscissor.x1 << 2) + setscissor.x1frac, (setscissor.y1 << 2) + setscissor.y1frac); diff --git a/soh/src/code/z_DLF.c b/soh/src/code/z_DLF.c index 3409cc779..370334d18 100644 --- a/soh/src/code/z_DLF.c +++ b/soh/src/code/z_DLF.c @@ -104,7 +104,7 @@ void Overlay_FreeGameState(GameStateOverlay* overlayEntry) { overlayEntry->unk_24 = NULL; } - SystemArena_FreeDebug(overlayEntry->loadedRamAddr, "../z_DLF.c", 149); + SYSTEM_ARENA_FREE_DEBUG(overlayEntry->loadedRamAddr); overlayEntry->loadedRamAddr = NULL; } } diff --git a/soh/src/code/z_actor.c b/soh/src/code/z_actor.c index adcac4522..dbcb577d4 100644 --- a/soh/src/code/z_actor.c +++ b/soh/src/code/z_actor.c @@ -93,7 +93,7 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf temp1 = actor->world.pos.y - actor->floorHeight; if (temp1 >= -50.0f && temp1 < 500.0f) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1553); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); @@ -120,11 +120,11 @@ void ActorShadow_Draw(Actor* actor, Lights* lights, GlobalContext* globalCtx, Gf temp2 = (1.0f - (temp1 * (1.0f / 350))) * actor->shape.shadowScale; Matrix_Scale(actor->scale.x * temp2, 1.0f, actor->scale.z * temp2, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1588), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1594); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } } @@ -148,7 +148,7 @@ void ActorShadow_DrawFoot(GlobalContext* globalCtx, Light* light, MtxF* arg2, s3 f32 sp58; s32 pad2[2]; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1661); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, (u32)(((arg3 * 0.00005f) > 1.0f ? 1.0f : (arg3 * 0.00005f)) * arg4) & 0xFF); @@ -160,11 +160,11 @@ void ActorShadow_DrawFoot(GlobalContext* globalCtx, Light* light, MtxF* arg2, s3 Matrix_RotateY(sp58, MTXMODE_APPLY); Matrix_Scale(arg5, 1.0f, arg5 * arg6, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 1687), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gFootShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1693); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx) { @@ -200,7 +200,7 @@ void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx Vec3f* feetPosPtr = actor->shape.feetPos; f32* floorHeightPtr = floorHeight; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1741); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); @@ -267,7 +267,7 @@ void ActorShadow_DrawFeet(Actor* actor, Lights* lights, GlobalContext* globalCtx } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 1831); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -416,7 +416,7 @@ void func_8002C0C0(TargetContext* targetCtx, Actor* actor, GlobalContext* global void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Actor* actor = targetCtx->targetedActor; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 2029); + OPEN_DISPS(globalCtx->state.gfxCtx); if (targetCtx->unk_48 != 0) { TargetContextEntry* entry; @@ -496,7 +496,7 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Matrix_RotateZ(M_PI / 2, MTXMODE_APPLY); Matrix_Push(); Matrix_Translate(entry->unk_0C, entry->unk_0C, 0.0f, MTXMODE_APPLY); - gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2116), + gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(OVERLAY_DISP++, gZTargetLockOnTriangleDL); Matrix_Pop(); @@ -525,13 +525,13 @@ void func_8002C124(TargetContext* targetCtx, GlobalContext* globalCtx) { Matrix_Scale((iREG(27) + 35) / 1000.0f, (iREG(28) + 60) / 1000.0f, (iREG(29) + 50) / 1000.0f, MTXMODE_APPLY); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, naviColor->inner.r, naviColor->inner.g, naviColor->inner.b, 255); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 2153), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gZTargetArrowDL); FrameInterpolation_RecordCloseChild(); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 2158); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_8002C7BC(TargetContext* targetCtx, Player* player, Actor* actorArg, GlobalContext* globalCtx) { @@ -1051,7 +1051,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { titleY = (titleCtx->y * 4) - (height * 2); doubleWidth = width * 2; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 2824); + OPEN_DISPS(globalCtx->state.gfxCtx); height = (width * height > 0x1000) ? 0x1000 / width : height; titleSecondY = titleY + (height * 4); @@ -1099,7 +1099,7 @@ void TitleCard_Draw(GlobalContext* globalCtx, TitleCardContext* titleCtx) { titleSecondY + (height * 4), G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 2880); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -1692,11 +1692,11 @@ Gfx* func_8002E830(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) { Hilite* hilite; - OPEN_DISPS(gfxCtx, "../z_actor.c", 4306); + OPEN_DISPS(gfxCtx); POLY_OPA_DISP = func_8002E830(object, eye, lightDir, gfxCtx, POLY_OPA_DISP, &hilite); - CLOSE_DISPS(gfxCtx, "../z_actor.c", 4313); + CLOSE_DISPS(gfxCtx); return hilite; } @@ -1704,11 +1704,11 @@ Hilite* func_8002EABC(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContex Hilite* func_8002EB44(Vec3f* object, Vec3f* eye, Vec3f* lightDir, GraphicsContext* gfxCtx) { Hilite* hilite; - OPEN_DISPS(gfxCtx, "../z_actor.c", 4332); + OPEN_DISPS(gfxCtx); POLY_XLU_DISP = func_8002E830(object, eye, lightDir, gfxCtx, POLY_XLU_DISP, &hilite); - CLOSE_DISPS(gfxCtx, "../z_actor.c", 4339); + CLOSE_DISPS(gfxCtx); return hilite; } @@ -1734,13 +1734,13 @@ void func_8002EBCC(Actor* actor, GlobalContext* globalCtx, s32 flag) { displayList = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx)); displayListHead = displayList; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 4384); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); gSPSegment(POLY_OPA_DISP++, 0x07, displayList); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 4394); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -1760,13 +1760,13 @@ void func_8002ED80(Actor* actor, GlobalContext* globalCtx, s32 flag) { displayList = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx)); displayListHead = displayList; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 4429); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPSetHilite1Tile(displayListHead++, 1, hilite, 0x10, 0x10); gSPEndDisplayList(displayListHead); gSPSegment(POLY_XLU_DISP++, 0x07, displayList); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 4439); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -2157,7 +2157,7 @@ void Actor_DrawFaroresWindPointer(GlobalContext* globalCtx) { s32 lightRadius = -1; s32 params; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 5308); + OPEN_DISPS(globalCtx->state.gfxCtx); params = gSaveContext.respawn[RESPAWN_MODE_TOP].data; @@ -2277,14 +2277,14 @@ void Actor_DrawFaroresWindPointer(GlobalContext* globalCtx) { gDPSetEnvColor(POLY_XLU_DISP++, 100, 200, 0, 255); Matrix_RotateZ(((globalCtx->gameplayFrames * 1500) & 0xFFFF) * M_PI / 32768.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5458), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); Matrix_Pop(); Matrix_RotateZ(~((globalCtx->gameplayFrames * 1200) & 0xFFFF) * M_PI / 32768.0f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 5463), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); } @@ -2294,7 +2294,7 @@ void Actor_DrawFaroresWindPointer(GlobalContext* globalCtx) { ((void)0, gSaveContext.respawn[RESPAWN_MODE_TOP].pos.z), 255, 255, 255, lightRadius); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 5474); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80030488(GlobalContext* globalCtx) { @@ -2363,7 +2363,7 @@ void Actor_UpdateAll(GlobalContext* globalCtx, ActorContext* actorCtx) { if (0) { // This ASSERT is optimized out but it exists due to its presence in rodata - ASSERT(gMaxActorId == ACTOR_ID_MAX, "MaxProfile == ACTOR_DLF_MAX", "../z_actor.c", UNK_LINE); + ASSERT(gMaxActorId == ACTOR_ID_MAX); } sp74 = NULL; @@ -2520,7 +2520,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { Fault_AddClient(&faultClient, Actor_FaultPrint, actor, "Actor_draw"); FrameInterpolation_RecordOpenChild(actor, 0); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 6035); + OPEN_DISPS(globalCtx->state.gfxCtx); lights = LightContext_NewLights(&globalCtx->lightCtx, globalCtx->state.gfxCtx); @@ -2576,7 +2576,7 @@ void Actor_Draw(GlobalContext* globalCtx, Actor* actor) { actor->shape.shadowDraw(actor, lights, globalCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 6119); + CLOSE_DISPS(globalCtx->state.gfxCtx); FrameInterpolation_RecordCloseChild(); Fault_RemoveClient(&faultClient); @@ -2597,7 +2597,7 @@ void func_80030ED8(Actor* actor) { } void func_80030FA8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_actor.c", 6161); + OPEN_DISPS(gfxCtx); gDPLoadTextureBlock(POLY_XLU_DISP++, gLensOfTruthMaskTex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_MIRROR | G_TX_CLAMP, G_TX_MIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); @@ -2612,7 +2612,7 @@ void func_80030FA8(GraphicsContext* gfxCtx) { gSPWideTextureRectangle(POLY_XLU_DISP++, x, 0, x + abs(x), 960, G_TX_RENDERTILE, 0, 0, 0, 0); gSPWideTextureRectangle(POLY_XLU_DISP++, 0, 0, w, 960, G_TX_RENDERTILE, 2240, 1600, 576, 597); gDPPipeSync(POLY_XLU_DISP++); - CLOSE_DISPS(gfxCtx, "../z_actor.c", 6183); + CLOSE_DISPS(gfxCtx); } void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** invisibleActors) { @@ -2622,7 +2622,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv gfxCtx = globalCtx->state.gfxCtx; - OPEN_DISPS(gfxCtx, "../z_actor.c", 6197); + OPEN_DISPS(gfxCtx); gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ START", 0); // "Magic lens START" @@ -2683,7 +2683,7 @@ void func_8003115C(GlobalContext* globalCtx, s32 numInvisibleActors, Actor** inv gDPNoOpString(POLY_OPA_DISP++, "魔法のメガネ END", 0); // "Magic lens END" - CLOSE_DISPS(gfxCtx, "../z_actor.c", 6284); + CLOSE_DISPS(gfxCtx); } s32 func_800314B0(GlobalContext* globalCtx, Actor* actor) { @@ -2721,7 +2721,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { invisibleActorCounter = 0; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 6336); + OPEN_DISPS(globalCtx->state.gfxCtx); actorListEntry = &actorCtx->actorLists[0]; @@ -2763,8 +2763,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { if ((actor->flags & ACTOR_FLAG_7) && ((globalCtx->roomCtx.curRoom.showInvisActors == 0) || (globalCtx->actorCtx.unk_03 != 0) || (actor->room != globalCtx->roomCtx.curRoom.num))) { - ASSERT(invisibleActorCounter < INVISIBLE_ACTOR_MAX, - "invisible_actor_counter < INVISIBLE_ACTOR_MAX", "../z_actor.c", 6464); + ASSERT(invisibleActorCounter < INVISIBLE_ACTOR_MAX); invisibleActors[invisibleActorCounter] = actor; invisibleActorCounter++; } else { @@ -2811,7 +2810,7 @@ void func_800315AC(GlobalContext* globalCtx, ActorContext* actorCtx) { CollisionCheck_DrawCollision(globalCtx, &globalCtx->colChkCtx); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 6563); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80031A28(GlobalContext* globalCtx, ActorContext* actorCtx) { @@ -2890,7 +2889,7 @@ void func_80031C3C(ActorContext* actorCtx, GlobalContext* globalCtx) { } if (actorCtx->absoluteSpace != NULL) { - ZeldaArena_FreeDebug(actorCtx->absoluteSpace, "../z_actor.c", 6731); + ZELDA_ARENA_FREE_DEBUG(actorCtx->absoluteSpace); actorCtx->absoluteSpace = NULL; } @@ -2981,7 +2980,7 @@ void Actor_FreeOverlay(ActorOverlay* actorOverlay) { if (HREG(20) != 0) { osSyncPrintf("オーバーレイ解放します\n"); // "Overlay deallocated" } - ZeldaArena_FreeDebug(actorOverlay->loadedRamAddr, "../z_actor.c", 6834); + ZELDA_ARENA_FREE_DEBUG(actorOverlay->loadedRamAddr); actorOverlay->loadedRamAddr = NULL; } } @@ -3007,7 +3006,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId u32 overlaySize; overlayEntry = &gActorOverlayTable[actorId]; - ASSERT(actorId < ACTOR_ID_MAX, "profile < ACTOR_DLF_MAX", "../z_actor.c", 6883); + ASSERT(actorId < ACTOR_ID_MAX); name = overlayEntry->name != NULL ? overlayEntry->name : ""; overlaySize = (uintptr_t)overlayEntry->vramEnd - (uintptr_t)overlayEntry->vramStart; @@ -3036,11 +3035,11 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId } } else { if (overlayEntry->allocType & ALLOCTYPE_ABSOLUTE) { - ASSERT(overlaySize <= AM_FIELD_SIZE, "actor_segsize <= AM_FIELD_SIZE", "../z_actor.c", 6934); + ASSERT(overlaySize <= AM_FIELD_SIZE); if (actorCtx->absoluteSpace == NULL) { // "AMF: absolute magic field" - actorCtx->absoluteSpace = ZeldaArena_MallocRDebug(AM_FIELD_SIZE, "AMF:絶対魔法領域", 0); + actorCtx->absoluteSpace = ZELDA_ARENA_MALLOC_RDEBUG(AM_FIELD_SIZE); if (HREG(20) != 0) { // "Absolute magic field reservation - %d bytes reserved" osSyncPrintf("絶対魔法領域確保 %d バイト確保\n", AM_FIELD_SIZE); @@ -3049,9 +3048,9 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId overlayEntry->loadedRamAddr = actorCtx->absoluteSpace; } else if (overlayEntry->allocType & ALLOCTYPE_PERMANENT) { - overlayEntry->loadedRamAddr = ZeldaArena_MallocRDebug(overlaySize, name, 0); + overlayEntry->loadedRamAddr = ZELDA_ARENA_MALLOC_RDEBUG(overlaySize); } else { - overlayEntry->loadedRamAddr = ZeldaArena_MallocDebug(overlaySize, name, 0); + overlayEntry->loadedRamAddr = ZELDA_ARENA_MALLOC_DEBUG(overlaySize); } if (overlayEntry->loadedRamAddr == NULL) { @@ -3093,7 +3092,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId return NULL; } - actor = ZeldaArena_MallocDebug(actorInit->instanceSize, name, 1); + actor = ZELDA_ARENA_MALLOC_DEBUG(actorInit->instanceSize); if (actor == NULL) { // "Actor class cannot be reserved! %s <size＝%d bytes>" @@ -3103,7 +3102,7 @@ Actor* Actor_Spawn(ActorContext* actorCtx, GlobalContext* globalCtx, s16 actorId return NULL; } - ASSERT(overlayEntry->numLoaded < 255, "actor_dlftbl->clients < 255", "../z_actor.c", 7031); + ASSERT(overlayEntry->numLoaded < 255); overlayEntry->numLoaded++; @@ -3237,15 +3236,15 @@ Actor* Actor_Delete(ActorContext* actorCtx, Actor* actor, GlobalContext* globalC newHead = Actor_RemoveFromCategory(globalCtx, actorCtx, actor); - ZeldaArena_FreeDebug(actor, "../z_actor.c", 7242); + ZELDA_ARENA_FREE_DEBUG(actor); /* if (overlayEntry->vramStart == 0) { if (HREG(20) != 0) { osSyncPrintf("オーバーレイではありません\n"); // "Not an overlay" } } else { */ - //ASSERT(overlayEntry->loadedRamAddr != NULL, "actor_dlftbl->allocp != NULL", "../z_actor.c", 7251); - //ASSERT(overlayEntry->numLoaded > 0, "actor_dlftbl->clients > 0", "../z_actor.c", 7252); + //ASSERT(overlayEntry->loadedRamAddr != NULL, "actor_dlftbl->allocp != NULL"); + //ASSERT(overlayEntry->numLoaded > 0, "actor_dlftbl->clients > 0"); overlayEntry->numLoaded--; Actor_FreeOverlay(overlayEntry); //} @@ -3415,15 +3414,15 @@ void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, GlobalContext* globalCtx) u32 objectIdsSize; matricesSize = (count + 1) * sizeof(*bodyBreak->matrices); - bodyBreak->matrices = ZeldaArena_MallocDebug(matricesSize, "../z_actor.c", 7540); + bodyBreak->matrices = ZELDA_ARENA_MALLOC_DEBUG(matricesSize); if (bodyBreak->matrices != NULL) { dListsSize = (count + 1) * sizeof(*bodyBreak->dLists); - bodyBreak->dLists = ZeldaArena_MallocDebug(dListsSize, "../z_actor.c", 7543); + bodyBreak->dLists = ZELDA_ARENA_MALLOC_DEBUG(dListsSize); if (bodyBreak->dLists != NULL) { objectIdsSize = (count + 1) * sizeof(*bodyBreak->objectIds); - bodyBreak->objectIds = ZeldaArena_MallocDebug(objectIdsSize, "../z_actor.c", 7546); + bodyBreak->objectIds = ZELDA_ARENA_MALLOC_DEBUG(objectIdsSize); if (bodyBreak->objectIds != NULL) { memset((u8*)bodyBreak->matrices,0, matricesSize); @@ -3436,15 +3435,15 @@ void BodyBreak_Alloc(BodyBreak* bodyBreak, s32 count, GlobalContext* globalCtx) } if (bodyBreak->matrices != NULL) { - ZeldaArena_FreeDebug(bodyBreak->matrices, "../z_actor.c", 7558); + ZELDA_ARENA_FREE_DEBUG(bodyBreak->matrices); } if (bodyBreak->dLists != NULL) { - ZeldaArena_FreeDebug(bodyBreak->dLists, "../z_actor.c", 7561); + ZELDA_ARENA_FREE_DEBUG(bodyBreak->dLists); } if (bodyBreak->objectIds != NULL) { - ZeldaArena_FreeDebug(bodyBreak->objectIds, "../z_actor.c", 7564); + ZELDA_ARENA_FREE_DEBUG(bodyBreak->objectIds); } } @@ -3511,9 +3510,9 @@ s32 BodyBreak_SpawnParts(Actor* actor, BodyBreak* bodyBreak, GlobalContext* glob bodyBreak->val = BODYBREAK_STATUS_FINISHED; - ZeldaArena_FreeDebug(bodyBreak->matrices, "../z_actor.c", 7678); - ZeldaArena_FreeDebug(bodyBreak->dLists, "../z_actor.c", 7679); - ZeldaArena_FreeDebug(bodyBreak->objectIds, "../z_actor.c", 7680); + ZELDA_ARENA_FREE_DEBUG(bodyBreak->matrices); + ZELDA_ARENA_FREE_DEBUG(bodyBreak->dLists); + ZELDA_ARENA_FREE_DEBUG(bodyBreak->objectIds); return true; } @@ -3821,9 +3820,7 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) Vec3f sp50; CollisionPoly* sp4C; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8120); - - if (0) {} // Necessary to match + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_OPA_DISP = Gfx_CallSetupDL(POLY_OPA_DISP, 0x2C); @@ -3844,11 +3841,11 @@ void func_80033C30(Vec3f* arg0, Vec3f* arg1, u8 alpha, GlobalContext* globalCtx) Matrix_Scale(arg1->x, 1.0f, arg1->z, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8149), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gCircleShadowDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8155); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80033DB8(GlobalContext* globalCtx, s16 arg1, s16 arg2) { @@ -3917,7 +3914,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) { entry = &sDoorLocksInfo[type]; chainRotZ = entry->chainsRotZInit; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8265); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(0.0f, entry->yShift, 500.0f, MTXMODE_APPLY); Matrix_Get(&baseMtxF); @@ -3934,7 +3931,7 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) { Matrix_Scale(entry->chainsScale, entry->chainsScale, entry->chainsScale, MTXMODE_APPLY); } - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8299), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, entry->chainDL); @@ -3950,11 +3947,11 @@ void Actor_DrawDoorLock(GlobalContext* globalCtx, s32 frame, s32 type) { Matrix_Put(&baseMtxF); Matrix_Scale(frame * 0.1f, frame * 0.1f, frame * 0.1f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_actor.c", 8314), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, entry->lockDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8319); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_8003424C(GlobalContext* globalCtx, Vec3f* arg1) { @@ -4196,7 +4193,7 @@ Gfx* func_80034B54(GraphicsContext* gfxCtx) { void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, Actor* actor, s16 alpha) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8831); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -4208,12 +4205,12 @@ void func_80034BA0(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, overrideLimbDraw, postLimbDraw, actor, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8860); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbDraw overrideLimbDraw, PostLimbDraw postLimbDraw, Actor* actor, s16 alpha) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8876); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); @@ -4224,7 +4221,7 @@ void func_80034CC4(GlobalContext* globalCtx, SkelAnime* skelAnime, OverrideLimbD POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, overrideLimbDraw, postLimbDraw, actor, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_actor.c", 8904); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s16 func_80034DD4(Actor* actor, GlobalContext* globalCtx, s16 arg2, f32 arg3) { @@ -5803,8 +5800,6 @@ s32 func_80037D98(GlobalContext* globalCtx, Actor* actor, s16 arg2, s32* arg3) { Actor_GetScreenPos(globalCtx, actor, &sp2C, &sp2A); - if (0) {} // Necessary to match - if ((sp2C < 0) || (sp2C > SCREEN_WIDTH) || (sp2A < 0) || (sp2A > SCREEN_HEIGHT)) { return false; } diff --git a/soh/src/code/z_bgcheck.c b/soh/src/code/z_bgcheck.c index 130351f42..91d3951ca 100644 --- a/soh/src/code/z_bgcheck.c +++ b/soh/src/code/z_bgcheck.c @@ -87,7 +87,7 @@ void SSNodeList_SetSSListHead(SSNodeList* nodeList, SSList* ssList, s16* polyId) void DynaSSNodeList_SetSSListHead(DynaSSNodeList* nodeList, SSList* ssList, s16* polyId) { u16 newNodeId = DynaSSNodeList_GetNextNodeIdx(nodeList); - ASSERT(newNodeId != SS_NULL, "new_node != SS_NULL", "../z_bgcheck.c", 1776); + ASSERT(newNodeId != SS_NULL); SSNode_SetValue(&nodeList->tbl[newNodeId], polyId, ssList->head); ssList->head = newNodeId; } @@ -106,7 +106,7 @@ void DynaSSNodeList_Initialize(GlobalContext* globalCtx, DynaSSNodeList* nodeLis void DynaSSNodeList_Alloc(GlobalContext* globalCtx, DynaSSNodeList* nodeList, s32 max) { nodeList->tbl = THA_AllocEndAlign(&globalCtx->state.tha, max * sizeof(SSNode), -2); - ASSERT(nodeList->tbl != NULL, "psst->tbl != NULL", "../z_bgcheck.c", 1811); + ASSERT(nodeList->tbl != NULL); nodeList->max = max; nodeList->count = 0; @@ -216,7 +216,6 @@ void func_80038A28(CollisionPoly* poly, f32 tx, f32 ty, f32 tz, MtxF* dest) { phi_f12 = -(nz * inv_phi_f2); } else { phi_f14 = sqrtf(1.0f - SQ(ny)); - if (1) {} if (!IS_ZERO(phi_f14)) { inv_phi_f14 = (1.0f / phi_f14); phi_f12 = nx * inv_phi_f14; @@ -700,7 +699,7 @@ s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 } } - ASSERT(!IS_ZERO(normalXZ), "!IS_ZERO(ac_size)", "../z_bgcheck.c", 2854); + ASSERT(!IS_ZERO(normalXZ)); invNormalXZ = 1.0f / normalXZ; temp_f16 = fabsf(nz) * invNormalXZ; @@ -781,7 +780,7 @@ s32 BgCheck_SphVsStaticWall(StaticLookup* lookup, CollisionContext* colCtx, u16 } } - ASSERT(!IS_ZERO(normalXZ), "!IS_ZERO(ac_size)", "../z_bgcheck.c", 2964); + ASSERT(!IS_ZERO(normalXZ)); invNormalXZ = 1.0f / normalXZ; temp_f16 = fabsf(nx) * invNormalXZ; @@ -1570,7 +1569,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, GlobalContext* globalCtx, Collis &globalCtx->state.tha, colCtx->subdivAmount.x * sizeof(StaticLookup) * colCtx->subdivAmount.y * colCtx->subdivAmount.z, ~1); if (colCtx->lookupTbl == NULL) { - LogUtils_HungupThread("../z_bgcheck.c", 4176); + LOG_HUNGUP_THREAD(); } colCtx->minBounds.x = colCtx->colHeader->minBounds.x; colCtx->minBounds.y = colCtx->colHeader->minBounds.y; @@ -1599,7 +1598,7 @@ void BgCheck_Allocate(CollisionContext* colCtx, GlobalContext* globalCtx, Collis tblMax = customNodeListMax; } else { if (colCtx->memSize < memSize) { - LogUtils_HungupThread("../z_bgcheck.c", 4230); + LOG_HUNGUP_THREAD(); } tblMax = (colCtx->memSize - memSize) / sizeof(SSNode); } @@ -1677,7 +1676,7 @@ f32 BgCheck_RaycastFloorImpl(GlobalContext* globalCtx, CollisionContext* colCtx, if (checkPos.y < colCtx->minBounds.y) { break; } - if (BgCheck_PosErrorCheck(&checkPos, "../z_bgcheck.c", 4410)) { + if (BGCHECK_POS_ERROR_CHECK(&checkPos)) { if (actor != NULL) { osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); } @@ -1892,8 +1891,8 @@ s32 BgCheck_CheckWallImpl(CollisionContext* colCtx, u16 xpFlags, Vec3f* posResul dy = posNext->y - posPrev->y; dz = posNext->z - posPrev->z; - if (BgCheck_PosErrorCheck(posNext, "../z_bgcheck.c", 4831) == true || - BgCheck_PosErrorCheck(posPrev, "../z_bgcheck.c", 4832) == true) { + if (BGCHECK_POS_ERROR_CHECK(posNext) == true || + BGCHECK_POS_ERROR_CHECK(posPrev) == true) { if (actor != NULL) { osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); } @@ -2081,7 +2080,7 @@ s32 BgCheck_CheckCeilingImpl(CollisionContext* colCtx, u16 xpFlags, f32* outY, V *outBgId = BGCHECK_SCENE; *outY = pos->y; - if (BgCheck_PosErrorCheck(pos, "../z_bgcheck.c", 5206) == true) { + if (BGCHECK_POS_ERROR_CHECK(pos) == true) { if (actor != NULL) { osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); } @@ -2155,8 +2154,8 @@ s32 BgCheck_CheckLineImpl(CollisionContext* colCtx, u16 xpFlags1, u16 xpFlags2, s32 temp_lo; *outBgId = BGCHECK_SCENE; - if (BgCheck_PosErrorCheck(posA, "../z_bgcheck.c", 5334) == true || - BgCheck_PosErrorCheck(posB, "../z_bgcheck.c", 5335) == true) { + if (BGCHECK_POS_ERROR_CHECK(posA) == true || + BGCHECK_POS_ERROR_CHECK(posB) == true) { if (actor != NULL) { osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); } else { @@ -2369,7 +2368,7 @@ s32 BgCheck_SphVsFirstPolyImpl(CollisionContext* colCtx, u16 xpFlags, CollisionP StaticLookup* lookup; *outBgId = BGCHECK_SCENE; - if (BgCheck_PosErrorCheck(center, "../z_bgcheck.c", 5852) == true) { + if (BGCHECK_POS_ERROR_CHECK(center) == true) { if (actor != NULL) { osSyncPrintf("こいつ,pself_actor->name %d\n", actor->id); } @@ -2427,11 +2426,11 @@ void SSNodeList_Alloc(GlobalContext* globalCtx, SSNodeList* this, s32 tblMax, s3 this->count = 0; this->tbl = THA_AllocEndAlign(&globalCtx->state.tha, tblMax * sizeof(SSNode), -2); - ASSERT(this->tbl != NULL, "this->short_slist_node_tbl != NULL", "../z_bgcheck.c", 5975); + ASSERT(this->tbl != NULL); - this->polyCheckTbl = GameState_Alloc(&globalCtx->state, numPolys, "../z_bgcheck.c", 5979); + this->polyCheckTbl = GAMESTATE_ALLOC_MC(&globalCtx->state, numPolys); - ASSERT(this->polyCheckTbl != NULL, "this->polygon_check != NULL", "../z_bgcheck.c", 5981); + ASSERT(this->polyCheckTbl != NULL); } /** @@ -2441,8 +2440,7 @@ SSNode* SSNodeList_GetNextNode(SSNodeList* this) { SSNode* result = &this->tbl[this->count]; this->count++; - ASSERT(this->count < this->max, "this->short_slist_node_last_index < this->short_slist_node_size", "../z_bgcheck.c", - 5998); + ASSERT(this->count < this->max); if (!(this->count < this->max)) { return NULL; } @@ -2455,7 +2453,7 @@ SSNode* SSNodeList_GetNextNode(SSNodeList* this) { u16 SSNodeList_GetNextNodeIdx(SSNodeList* this) { u16 new_index = this->count++; - ASSERT(new_index < this->max, "new_index < this->short_slist_node_size", "../z_bgcheck.c", 6021); + ASSERT(new_index < this->max); return new_index; } @@ -2561,7 +2559,7 @@ void DynaPoly_NullPolyList(CollisionPoly** polyList) { */ void DynaPoly_AllocPolyList(GlobalContext* globalCtx, CollisionPoly** polyList, s32 numPolys) { *polyList = THA_AllocEndAlign(&globalCtx->state.tha, numPolys * sizeof(CollisionPoly), -2); - ASSERT(*polyList != NULL, "ptbl->pbuf != NULL", "../z_bgcheck.c", 6247); + ASSERT(*polyList != NULL); } /** @@ -2576,7 +2574,7 @@ void DynaPoly_NullVtxList(Vec3s** vtxList) { */ void DynaPoly_AllocVtxList(GlobalContext* globalCtx, Vec3s** vtxList, s32 numVtx) { *vtxList = THA_AllocEndAlign(&globalCtx->state.tha, numVtx * sizeof(Vec3s), -2); - ASSERT(*vtxList != NULL, "ptbl->pbuf != NULL", "../z_bgcheck.c", 6277); + ASSERT(*vtxList != NULL); } /** @@ -2793,10 +2791,8 @@ void DynaPoly_ExpandSRT(GlobalContext* globalCtx, DynaCollisionContext* dyna, s3 *vtxStartIndex + pbgdata->numVertices, dyna->vtxListMax); } - ASSERT(dyna->polyListMax >= *polyStartIndex + pbgdata->numPolygons, - "pdyna_poly_info->poly_num >= *pstart_poly_index + pbgdata->poly_num", "../z_bgcheck.c", 6687); - ASSERT(dyna->vtxListMax >= *vtxStartIndex + pbgdata->numVertices, - "pdyna_poly_info->vert_num >= *pstart_vert_index + pbgdata->vtx_num", "../z_bgcheck.c", 6688); + ASSERT(dyna->polyListMax >= *polyStartIndex + pbgdata->numPolygons); + ASSERT(dyna->vtxListMax >= *vtxStartIndex + pbgdata->numVertices); if (!(dyna->bitFlag & DYNAPOLY_INVALIDATE_LOOKUP) && (BgActor_IsTransformUnchanged(&dyna->bgActors[bgId]) == true)) { @@ -3229,7 +3225,7 @@ s32 BgCheck_SphVsDynaWallInBgActor(CollisionContext* colCtx, u16 xpFlags, DynaCo poly = &dyna->polyList[polyId]; CollisionPoly_GetNormalF(poly, &nx, &ny, &nz); normalXZ = sqrtf(SQ(nx) + SQ(nz)); - ASSERT(!IS_ZERO(normalXZ), "!IS_ZERO(ac_size)", "../z_bgcheck.c", 7382); + ASSERT(!IS_ZERO(normalXZ)); planeDist = Math3D_DistPlaneToPos(nx, ny, nz, poly->dist, &resultPos); if (radius < fabsf(planeDist) || COLPOLY_VIA_FLAG_TEST(poly->flags_vIA, xpFlags)) { @@ -3302,7 +3298,7 @@ s32 BgCheck_SphVsDynaWallInBgActor(CollisionContext* colCtx, u16 xpFlags, DynaCo poly = &dyna->polyList[polyId]; CollisionPoly_GetNormalF(poly, &nx, &ny, &nz); normalXZ = sqrtf(SQ(nx) + SQ(nz)); - ASSERT(!IS_ZERO(normalXZ), "!IS_ZERO(ac_size)", "../z_bgcheck.c", 7489); + ASSERT(!IS_ZERO(normalXZ)); planeDist = Math3D_DistPlaneToPos(nx, ny, nz, poly->dist, &resultPos); if (radius < fabsf(planeDist) || COLPOLY_VIA_FLAG_TEST(poly->flags_vIA, xpFlags)) { diff --git a/soh/src/code/z_camera.c b/soh/src/code/z_camera.c index e29cf2bf6..7f4a5d704 100644 --- a/soh/src/code/z_camera.c +++ b/soh/src/code/z_camera.c @@ -949,7 +949,6 @@ s32 func_800458D4(Camera* camera, VecSph* eyeAtDir, f32 arg2, f32* arg3, s16 arg eyeAtAngle = Math_FAtan2F(deltaY, OLib_Vec3fDistXZ(&camera->at, &camera->eye)); if (eyeAtAngle > DEGF_TO_RADF(OREG(32))) { - if (1) {} phi_f2 = 1.0f - sinf(DEGF_TO_RADF(eyeAtAngle - OREG(32))); } else if (eyeAtAngle < DEGF_TO_RADF(OREG(33))) { phi_f2 = 1.0f - sinf(DEGF_TO_RADF(OREG(33)) - eyeAtAngle); @@ -1876,7 +1875,6 @@ s32 Camera_Normal3(Camera* camera) { camera->yawUpdateRateInv, sp98, 0.1f); camera->pitchUpdateRateInv = Camera_LERPCeilF((f32)OREG(7) + (anim->swing.swingUpdateRateTimer * 2), camera->pitchUpdateRateInv, sp94, 0.1f); - if (1) {} anim->swing.swingUpdateRateTimer--; } else { camera->yawUpdateRateInv = Camera_LERPCeilF(norm3->yawUpdateSpeed, camera->yawUpdateRateInv, sp98, 0.1f); @@ -5401,7 +5399,6 @@ s32 Camera_Unique9(Camera* camera) { } spB4 = scratchSph.r; - if (1) {} scratchSph.r = !(spB4 < anim->curKeyFrame->eyeTargetInit.z) ? Camera_LERPCeilF(anim->curKeyFrame->eyeTargetInit.z, spB4, anim->curKeyFrame->lerpStepScale, 1.0f) @@ -6666,7 +6663,6 @@ s32 Camera_Special9(Camera* camera) { sCameraInterfaceFlags = params->interfaceFlags; switch (camera->animState) { - if (1) {} case 0: camera->unk_14C &= ~(0x4 | 0x2); @@ -6751,7 +6747,6 @@ s32 Camera_Special9(Camera* camera) { } break; } - if (1) {} spAC = playerPosRot->pos; spAC.y += playerYOffset; camera->dist = OLib_Vec3fDist(&spAC, eye); @@ -6762,7 +6757,7 @@ s32 Camera_Special9(Camera* camera) { } Camera* Camera_Create(View* view, CollisionContext* colCtx, GlobalContext* globalCtx) { - Camera* newCamera = ZeldaArena_MallocDebug(sizeof(*newCamera), "../z_camera.c", 9370); + Camera* newCamera = ZELDA_ARENA_MALLOC_DEBUG(sizeof(*newCamera)); if (newCamera != NULL) { osSyncPrintf(VT_FGCOL(BLUE) "camera: create --- allocate %d byte" VT_RST "\n", sizeof(*newCamera) * 4); @@ -6776,7 +6771,7 @@ Camera* Camera_Create(View* view, CollisionContext* colCtx, GlobalContext* globa void Camera_Destroy(Camera* camera) { if (camera != NULL) { osSyncPrintf(VT_FGCOL(BLUE) "camera: destroy ---" VT_RST "\n"); - ZeldaArena_FreeDebug(camera, "../z_camera.c", 9391); + ZELDA_ARENA_FREE_DEBUG(camera); } else { osSyncPrintf(VT_COL(YELLOW, BLACK) "camera: destroy: already cleared\n" VT_RST); } @@ -7782,7 +7777,6 @@ s16 Camera_ChangeSettingFlags(Camera* camera, s16 setting, s16 flags) { } if (flags & 8) { - if (1) {} camera->camDataIdx = camera->prevCamDataIdx; camera->prevCamDataIdx = -1; } else if (!(flags & 4)) { diff --git a/soh/src/code/z_cheap_proc.c b/soh/src/code/z_cheap_proc.c index d611c08d2..75b6b8f5d 100644 --- a/soh/src/code/z_cheap_proc.c +++ b/soh/src/code/z_cheap_proc.c @@ -1,23 +1,23 @@ #include "global.h" void Gfx_DrawDListOpa(GlobalContext* globalCtx, Gfx* dlist) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 214); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 216), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 219); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Gfx_DrawDListXlu(GlobalContext* globalCtx, Gfx* dlist) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 228); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 230), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_cheap_proc.c", 233); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_collision_check.c b/soh/src/code/z_collision_check.c index 3170eb87a..91deaa26a 100644 --- a/soh/src/code/z_collision_check.c +++ b/soh/src/code/z_collision_check.c @@ -55,7 +55,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC, f32 nz; f32 originDist; - OPEN_DISPS(gfxCtx, "../z_collision_check.c", 713); + OPEN_DISPS(gfxCtx); gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(POLY_OPA_DISP++, 0x00, 0xFF, r, g, b, 50); @@ -70,7 +70,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC, gDPPipeSync(POLY_OPA_DISP++); vtxTbl = Graph_Alloc(gfxCtx, 3 * sizeof(Vtx)); - ASSERT(vtxTbl != NULL, "vtx_tbl != NULL", "../z_collision_check.c", 726); + ASSERT(vtxTbl != NULL); vtxTbl[0].n.ob[0] = vA->x; vtxTbl[0].n.ob[1] = vA->y; @@ -97,7 +97,7 @@ void Collider_DrawPoly(GraphicsContext* gfxCtx, Vec3f* vA, Vec3f* vB, Vec3f* vC, gSPVertex(POLY_OPA_DISP++, vtxTbl, 3, 0); gSP1Triangle(POLY_OPA_DISP++, 0, 1, 2, 0); - CLOSE_DISPS(gfxCtx, "../z_collision_check.c", 757); + CLOSE_DISPS(gfxCtx); } s32 Collider_InitBase(GlobalContext* globalCtx, Collider* collider) { @@ -336,7 +336,7 @@ s32 Collider_FreeJntSph(GlobalContext* globalCtx, ColliderJntSph* collider) { collider->count = 0; if (collider->elements != NULL) { - ZeldaArena_FreeDebug(collider->elements, "../z_collision_check.c", 1393); + ZELDA_ARENA_FREE_DEBUG(collider->elements); } collider->elements = NULL; return 1; @@ -367,7 +367,7 @@ s32 Collider_SetJntSphToActor(GlobalContext* globalCtx, ColliderJntSph* dest, Co Collider_SetBaseToActor(globalCtx, &dest->base, &src->base); dest->count = src->count; - dest->elements = ZeldaArena_MallocDebug(src->count * sizeof(ColliderJntSphElement), "../z_collision_check.c", 1443); + dest->elements = ZELDA_ARENA_MALLOC_DEBUG(src->count * sizeof(ColliderJntSphElement)); if (dest->elements == NULL) { dest->count = 0; @@ -396,7 +396,7 @@ s32 Collider_SetJntSphAllocType1(GlobalContext* globalCtx, ColliderJntSph* dest, Collider_SetBaseType1(globalCtx, &dest->base, actor, &src->base); dest->count = src->count; - dest->elements = ZeldaArena_MallocDebug(src->count * sizeof(ColliderJntSphElement), "../z_collision_check.c", 1490); + dest->elements = ZELDA_ARENA_MALLOC_DEBUG(src->count * sizeof(ColliderJntSphElement)); if (dest->elements == NULL) { dest->count = 0; @@ -424,7 +424,7 @@ s32 Collider_SetJntSphAlloc(GlobalContext* globalCtx, ColliderJntSph* dest, Acto Collider_SetBase(globalCtx, &dest->base, actor, &src->base); dest->count = src->count; - dest->elements = ZeldaArena_MallocDebug(src->count * sizeof(ColliderJntSphElement), "../z_collision_check.c", 1551); + dest->elements = ZELDA_ARENA_MALLOC_DEBUG(src->count * sizeof(ColliderJntSphElement)); if (dest->elements == NULL) { dest->count = 0; @@ -452,7 +452,7 @@ s32 Collider_SetJntSph(GlobalContext* globalCtx, ColliderJntSph* dest, Actor* ac Collider_SetBase(globalCtx, &dest->base, actor, &src->base); dest->count = src->count; dest->elements = elements; - ASSERT(dest->elements != NULL, "pclobj_jntsph->elem_tbl != NULL", "../z_collision_check.c", 1603); + ASSERT(dest->elements != NULL); for (destElem = dest->elements, srcElem = src->elements; destElem < dest->elements + dest->count; destElem++, srcElem++) { @@ -702,7 +702,7 @@ s32 Collider_FreeTris(GlobalContext* globalCtx, ColliderTris* tris) { tris->count = 0; if (tris->elements != NULL) { - ZeldaArena_FreeDebug(tris->elements, "../z_collision_check.c", 2099); + ZELDA_ARENA_FREE_DEBUG(tris->elements); } tris->elements = NULL; return 1; @@ -734,7 +734,7 @@ s32 Collider_SetTrisAllocType1(GlobalContext* globalCtx, ColliderTris* dest, Act Collider_SetBaseType1(globalCtx, &dest->base, actor, &src->base); dest->count = src->count; - dest->elements = ZeldaArena_MallocDebug(dest->count * sizeof(ColliderTrisElement), "../z_collision_check.c", 2156); + dest->elements = ZELDA_ARENA_MALLOC_DEBUG(dest->count * sizeof(ColliderTrisElement)); if (dest->elements == NULL) { dest->count = 0; osSyncPrintf(VT_FGCOL(RED)); @@ -760,7 +760,7 @@ s32 Collider_SetTrisAlloc(GlobalContext* globalCtx, ColliderTris* dest, Actor* a Collider_SetBase(globalCtx, &dest->base, actor, &src->base); dest->count = src->count; - dest->elements = ZeldaArena_MallocDebug(dest->count * sizeof(ColliderTrisElement), "../z_collision_check.c", 2207); + dest->elements = ZELDA_ARENA_MALLOC_DEBUG(dest->count * sizeof(ColliderTrisElement)); if (dest->elements == NULL) { osSyncPrintf(VT_FGCOL(RED)); @@ -789,7 +789,7 @@ s32 Collider_SetTris(GlobalContext* globalCtx, ColliderTris* dest, Actor* actor, Collider_SetBase(globalCtx, &dest->base, actor, &src->base); dest->count = src->count; dest->elements = elements; - ASSERT(dest->elements != NULL, "pclobj_tris->elem_tbl != NULL", "../z_collision_check.c", 2258); + ASSERT(dest->elements != NULL); for (destElem = dest->elements, srcElem = src->elements; destElem < dest->elements + dest->count; destElem++, srcElem++) { @@ -1180,7 +1180,7 @@ s32 CollisionCheck_SetAT(GlobalContext* globalCtx, CollisionCheckContext* colChk if (FrameAdvance_IsEnabled(globalCtx) == true) { return -1; } - ASSERT(collider->shape <= COLSHAPE_QUAD, "pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 2997); + ASSERT(collider->shape <= COLSHAPE_QUAD); sATResetFuncs[collider->shape](globalCtx, collider); if (collider->actor != NULL && collider->actor->update == NULL) { return -1; @@ -1205,7 +1205,7 @@ s32 CollisionCheck_SetAT(GlobalContext* globalCtx, CollisionCheckContext* colChk */ s32 CollisionCheck_SetAT_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, s32 index) { - ASSERT(collider->shape <= COLSHAPE_QUAD, "pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3037); + ASSERT(collider->shape <= COLSHAPE_QUAD); if (FrameAdvance_IsEnabled(globalCtx) == true) { return -1; } @@ -1249,7 +1249,7 @@ s32 CollisionCheck_SetAC(GlobalContext* globalCtx, CollisionCheckContext* colChk if (FrameAdvance_IsEnabled(globalCtx) == true) { return -1; } - ASSERT(collider->shape <= COLSHAPE_QUAD, "pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3114); + ASSERT(collider->shape <= COLSHAPE_QUAD); sACResetFuncs[collider->shape](globalCtx, collider); if (collider->actor != NULL && collider->actor->update == NULL) { return -1; @@ -1274,7 +1274,7 @@ s32 CollisionCheck_SetAC(GlobalContext* globalCtx, CollisionCheckContext* colChk */ s32 CollisionCheck_SetAC_SAC(GlobalContext* globalCtx, CollisionCheckContext* colChkCtx, Collider* collider, s32 index) { - ASSERT(collider->shape <= COLSHAPE_QUAD, "pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3153); + ASSERT(collider->shape <= COLSHAPE_QUAD); if (FrameAdvance_IsEnabled(globalCtx) == true) { return -1; } @@ -1319,7 +1319,7 @@ s32 CollisionCheck_SetOC(GlobalContext* globalCtx, CollisionCheckContext* colChk return -1; } - ASSERT(collider->shape <= COLSHAPE_QUAD, "pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3229); + ASSERT(collider->shape <= COLSHAPE_QUAD); sOCResetFuncs[collider->shape](globalCtx, collider); if (collider->actor != NULL && collider->actor->update == NULL) { @@ -1348,7 +1348,7 @@ s32 CollisionCheck_SetOC_SAC(GlobalContext* globalCtx, CollisionCheckContext* co if (FrameAdvance_IsEnabled(globalCtx) == true) { return -1; } - ASSERT(collider->shape <= COLSHAPE_QUAD, "pcl_obj->data_type <= CL_DATA_LBL_SWRD", "../z_collision_check.c", 3274); + ASSERT(collider->shape <= COLSHAPE_QUAD); sOCResetFuncs[collider->shape](globalCtx, collider); if (collider->actor != NULL && collider->actor->update == NULL) { return -1; @@ -2987,7 +2987,7 @@ void CollisionCheck_ApplyDamage(GlobalContext* globalCtx, CollisionCheckContext* return; } - ASSERT(info->acHitInfo != NULL, "pclobj_elem->ac_hit_elem != NULL", "../z_collision_check.c", 6493); + ASSERT(info->acHitInfo != NULL); tbl = collider->actor->colChkInfo.damageTable; if (tbl == NULL) { damage = (f32)info->acHitInfo->toucher.damage - info->bumper.defense; diff --git a/soh/src/code/z_construct.c b/soh/src/code/z_construct.c index 0bdf4a9d4..96915d919 100644 --- a/soh/src/code/z_construct.c +++ b/soh/src/code/z_construct.c @@ -34,20 +34,20 @@ void func_801109B0(GlobalContext* globalCtx) { // "Permanent PARAMETER Segment = %x" osSyncPrintf("常駐ＰＡＲＡＭＥＴＥＲセグメント=%x\n", parameterSize); - interfaceCtx->parameterSegment = GameState_Alloc(&globalCtx->state, parameterSize, "../z_construct.c", 159); + interfaceCtx->parameterSegment = GAMESTATE_ALLOC_MC(&globalCtx->state, parameterSize); osSyncPrintf("parameter->parameterSegment=%x\n", interfaceCtx->parameterSegment); - ASSERT(interfaceCtx->parameterSegment != NULL, "parameter->parameterSegment != NULL", "../z_construct.c", 161); + ASSERT(interfaceCtx->parameterSegment != NULL); DmaMgr_SendRequest1(interfaceCtx->parameterSegment, (uintptr_t)_parameter_staticSegmentRomStart, parameterSize, - "../z_construct.c", 162); + __FILE__, 162); - interfaceCtx->doActionSegment = GameState_Alloc(&globalCtx->state, 0x480, "../z_construct.c", 166); + interfaceCtx->doActionSegment = GAMESTATE_ALLOC_MC(&globalCtx->state, 0x480); osSyncPrintf("ＤＯアクション テクスチャ初期=%x\n", 0x480); // "DO Action Texture Initialization" osSyncPrintf("parameter->do_actionSegment=%x\n", interfaceCtx->doActionSegment); - ASSERT(interfaceCtx->doActionSegment != NULL, "parameter->do_actionSegment != NULL", "../z_construct.c", 169); + ASSERT(interfaceCtx->doActionSegment != NULL); if (gSaveContext.language == LANGUAGE_ENG) { doActionOffset = 0; @@ -60,7 +60,7 @@ void func_801109B0(GlobalContext* globalCtx) { memcpy(interfaceCtx->doActionSegment, ResourceMgr_LoadTexByName(gAttackDoActionENGTex), 0x180); memcpy(interfaceCtx->doActionSegment + 0x180, ResourceMgr_LoadTexByName(gCheckDoActionENGTex), 0x180); //DmaMgr_SendRequest1(interfaceCtx->doActionSegment, (uintptr_t)_do_action_staticSegmentRomStart + doActionOffset, 0x300, - //"../z_construct.c", 174); + //__FILE__, __LINE__); if (gSaveContext.language == LANGUAGE_ENG) { doActionOffset = 0x480; @@ -72,16 +72,16 @@ void func_801109B0(GlobalContext* globalCtx) { memcpy(interfaceCtx->doActionSegment + 0x300, ResourceMgr_LoadTexByName(gReturnDoActionENGTex), 0x180); //DmaMgr_SendRequest1(interfaceCtx->doActionSegment + 0x300, (uintptr_t)_do_action_staticSegmentRomStart + doActionOffset, - //0x180, "../z_construct.c", 178); + //0x180); - interfaceCtx->iconItemSegment = GameState_Alloc( - &globalCtx->state, 0x1000 * ARRAY_COUNT(gSaveContext.equips.buttonItems), "../z_construct.c", 190); + interfaceCtx->iconItemSegment = GAMESTATE_ALLOC_MC( + &globalCtx->state, 0x1000 * ARRAY_COUNT(gSaveContext.equips.buttonItems)); // "Icon Item Texture Initialization = %x" osSyncPrintf("アイコンアイテム テクスチャ初期=%x\n", 0x4000); osSyncPrintf("parameter->icon_itemSegment=%x\n", interfaceCtx->iconItemSegment); - ASSERT(interfaceCtx->iconItemSegment != NULL, "parameter->icon_itemSegment != NULL", "../z_construct.c", 193); + ASSERT(interfaceCtx->iconItemSegment != NULL); osSyncPrintf("Register_Item[%x, %x, %x, %x]\n", gSaveContext.equips.buttonItems[0], gSaveContext.equips.buttonItems[1], gSaveContext.equips.buttonItems[2], @@ -92,12 +92,12 @@ void func_801109B0(GlobalContext* globalCtx) { DmaMgr_SendRequest1(interfaceCtx->iconItemSegment + 0x1000 * buttonIndex, _icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[buttonIndex] * 0x1000, - 0x1000, "../z_construct.c", 198); + 0x1000, __FILE__, __LINE__); } else if (buttonIndex == 0 && gSaveContext.equips.buttonItems[buttonIndex] != 0xFF) { DmaMgr_SendRequest1(interfaceCtx->iconItemSegment + 0x1000 * buttonIndex, _icon_item_staticSegmentRomStart + gSaveContext.equips.buttonItems[buttonIndex] * 0x1000, - 0x1000, "../z_construct.c", 203); + 0x1000, __FILE__, __LINE__); } } @@ -171,12 +171,12 @@ void Message_Init(GlobalContext* globalCtx) { View_Init(&msgCtx->view, globalCtx->state.gfxCtx); - msgCtx->textboxSegment = GameState_Alloc(&globalCtx->state, 0x2200, "../z_construct.c", 349); + msgCtx->textboxSegment = GAMESTATE_ALLOC_MC(&globalCtx->state, 0x2200); osSyncPrintf("message->fukidashiSegment=%x\n", msgCtx->textboxSegment); osSyncPrintf("吹き出しgame_alloc=%x\n", 0x2200); // "Textbox game_alloc=%x" - ASSERT(msgCtx->textboxSegment != NULL, "message->fukidashiSegment != NULL", "../z_construct.c", 352); + ASSERT(msgCtx->textboxSegment != NULL); Font_LoadOrderedFont(&globalCtx->msgCtx.font); diff --git a/soh/src/code/z_debug.c b/soh/src/code/z_debug.c index c88dd0288..c2129ee5f 100644 --- a/soh/src/code/z_debug.c +++ b/soh/src/code/z_debug.c @@ -37,7 +37,7 @@ char regChar[] = " SOPQMYDUIZCNKXcsiWAVHGmnBdkb"; void func_800636C0(void) { s32 i; - gGameInfo = (GameInfo*)SystemArena_MallocDebug(sizeof(GameInfo), "../z_debug.c", 260); + gGameInfo = (GameInfo*)SYSTEM_ARENA_MALLOC_DEBUG(sizeof(GameInfo)); gGameInfo->regPage = 0; gGameInfo->regGroup = 0; gGameInfo->regCur = 0; @@ -222,7 +222,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) { if (!CVar_GetS32("gDebugEnabled", 0)) return; - OPEN_DISPS(gfxCtx, "../z_debug.c", 628); + OPEN_DISPS(gfxCtx); GfxPrint_Init(&printer); sp78 = POLY_OPA_DISP; @@ -244,9 +244,7 @@ void func_80063D7C(GraphicsContext* gfxCtx) { Graph_BranchDlist(sp78, sp7C); POLY_OPA_DISP = sp7C; - if (1) {} - - CLOSE_DISPS(gfxCtx, "../z_debug.c", 664); + CLOSE_DISPS(gfxCtx); GfxPrint_Destroy(&printer); } diff --git a/soh/src/code/z_debug_display.c b/soh/src/code/z_debug_display.c index efa25dc89..14a75aa41 100644 --- a/soh/src/code/z_debug_display.c +++ b/soh/src/code/z_debug_display.c @@ -67,7 +67,7 @@ void DebugDisplay_DrawObjects(GlobalContext* globalCtx) { } void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 169); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80094678(globalCtx->state.gfxCtx); @@ -81,15 +81,15 @@ void DebugDisplay_DrawSpriteI8(DebugDispObject* dispObj, void* texture, GlobalCo gDPLoadTextureBlock(POLY_XLU_DISP++, texture, G_IM_FMT_I, G_IM_SIZ_8b, 16, 16, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 189), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gDebugSpriteDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 192); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* dlist, GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 211); + OPEN_DISPS(globalCtx->state.gfxCtx); func_8009435C(globalCtx->state.gfxCtx); @@ -100,9 +100,9 @@ void DebugDisplay_DrawPolygon(DebugDispObject* dispObj, void* dlist, GlobalConte Matrix_SetTranslateRotateYXZ(dispObj->pos.x, dispObj->pos.y, dispObj->pos.z, &dispObj->rot); Matrix_Scale(dispObj->scale.x, dispObj->scale.y, dispObj->scale.z, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_debug_display.c", 228), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, dlist); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_debug_display.c", 231); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_demo.c b/soh/src/code/z_demo.c index f6bb7d572..2134f323c 100644 --- a/soh/src/code/z_demo.c +++ b/soh/src/code/z_demo.c @@ -1910,13 +1910,10 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { Gfx* displayList; Gfx* prevDisplayList; - if (0) {} // Necessary to match - if (gSaveContext.cutsceneIndex >= 0xFFF0) { - if (0) {} // Also necessary to match if (BREG(0) != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo.c", 4101); + OPEN_DISPS(globalCtx->state.gfxCtx); prevDisplayList = POLY_OPA_DISP; displayList = Graph_GfxPlusOne(POLY_OPA_DISP); @@ -1926,7 +1923,7 @@ void func_80068C3C(GlobalContext* globalCtx, CutsceneContext* csCtx) { Graph_BranchDlist(prevDisplayList, displayList); POLY_OPA_DISP = displayList; - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo.c", 4108); + CLOSE_DISPS(globalCtx->state.gfxCtx); } csCtx->frames++; diff --git a/soh/src/code/z_draw.c b/soh/src/code/z_draw.c index 20ff39b0b..11df7329a 100644 --- a/soh/src/code/z_draw.c +++ b/soh/src/code/z_draw.c @@ -382,36 +382,36 @@ void GetItem_Draw(GlobalContext* globalCtx, s16 drawId) { void GetItem_DrawMaskOrBombchu(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 556); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093BA8(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 560), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 565); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawSoldOut(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 572); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 5); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 576), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 581); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 588); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 592), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); @@ -423,26 +423,26 @@ void GetItem_DrawBlueFire(GlobalContext* globalCtx, s16 drawId) { Matrix_Push(); Matrix_Translate(-8.0f, -2.0f, 0.0f, MTXMODE_APPLY); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 615), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 621); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 628); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 632), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 641), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -451,27 +451,27 @@ void GetItem_DrawPoes(GlobalContext* globalCtx, s16 drawId) { 1 * -(globalCtx->state.frames * 6), 16, 32)); Matrix_Push(); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 656), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 663); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 670); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 674), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 683), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); gSPSegment(POLY_XLU_DISP++, 0x08, @@ -480,18 +480,18 @@ void GetItem_DrawFairy(GlobalContext* globalCtx, s16 drawId) { 1 * -(globalCtx->state.frames * 6), 32, 32)); Matrix_Push(); Matrix_ReplaceRotation(&globalCtx->billboardMtxF); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 698), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 704); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawMirrorShield(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 712); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, @@ -499,25 +499,25 @@ void GetItem_DrawMirrorShield(GlobalContext* globalCtx, s16 drawId) { 1 * (globalCtx->state.frames * 2) % 256, 64, 64, 1, 0 * (globalCtx->state.frames * 0) % 128, 1 * (globalCtx->state.frames * 1) % 128, 32, 32)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 723), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 730), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 735); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawSkullToken(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 742); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 746), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); @@ -526,56 +526,56 @@ void GetItem_DrawSkullToken(GlobalContext* globalCtx, s16 drawId) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), 1 * -(globalCtx->state.frames * 5), 32, 32, 1, 0 * (globalCtx->state.frames * 0), 0 * (globalCtx->state.frames * 0), 32, 64)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 760), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 765); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawEggOrMedallion(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 772); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093BA8(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 776), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 783); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawCompass(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 811); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 815), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 5); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 822), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 827); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawPotion(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 834); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -1 * (globalCtx->state.frames * 1), 1 * (globalCtx->state.frames * 1), 32, 32, 1, -1 * (globalCtx->state.frames * 1), 1 * (globalCtx->state.frames * 1), 32, 32)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 845), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); @@ -583,290 +583,290 @@ void GetItem_DrawPotion(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 855), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[5]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 861); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawGoronSword(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 868); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 1), 0 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 1), 0 * (globalCtx->state.frames * 1), 32, 32)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 878), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 883); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawDekuNuts(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 890); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 6), 1 * (globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 6), 1 * (globalCtx->state.frames * 6), 32, 32)); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 901), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 906); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawRecoveryHeart(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 913); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 1), 1 * -(globalCtx->state.frames * 3), 32, 32, 1, 0 * (globalCtx->state.frames * 1), 1 * -(globalCtx->state.frames * 2), 32, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 924), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 929); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawFish(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 936); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0 * (globalCtx->state.frames * 0), 1 * (globalCtx->state.frames * 1), 32, 32, 1, 0 * (globalCtx->state.frames * 0), 1 * (globalCtx->state.frames * 1), 32, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 947), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 952); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa0(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 959); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 963), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 968); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa0Xlu1(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 975); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 979), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 986), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 991); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawXlu01(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 998); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1002), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1008); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa10Xlu2(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1015); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1019), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1027), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1032); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawMagicArrow(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1039); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1043), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1050), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1056); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawMagicSpell(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1063); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2), 1 * -(globalCtx->state.frames * 6), 32, 32, 1, 1 * (globalCtx->state.frames * 1), -1 * (globalCtx->state.frames * 2), 32, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1074), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1081); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa1023(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1088); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1092), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[3]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1100); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawOpa10Xlu32(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1108); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1112), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1120), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1126); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawSmallRupee(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1133); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Scale(0.7f, 0.7f, 0.7f, MTXMODE_APPLY); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1140), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1148), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1154); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawScale(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1162); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 1 * (globalCtx->state.frames * 2), -1 * (globalCtx->state.frames * 2), 64, 64, 1, 1 * (globalCtx->state.frames * 4), 1 * -(globalCtx->state.frames * 4), 32, 32)); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1173), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[0]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1181); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawBulletBag(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1188); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1192), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); func_80093D84(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1200), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[2]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[3]); gSPDisplayList(POLY_XLU_DISP++, sDrawItemTable[drawId].dlists[4]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1207); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1214); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_draw.c", 1218), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[1]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[0]); @@ -877,5 +877,5 @@ void GetItem_DrawWallet(GlobalContext* globalCtx, s16 drawId) { gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[6]); gSPDisplayList(POLY_OPA_DISP++, sDrawItemTable[drawId].dlists[7]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_draw.c", 1230); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_eff_blure.c b/soh/src/code/z_eff_blure.c index f3a1e6122..dc2793b75 100644 --- a/soh/src/code/z_eff_blure.c +++ b/soh/src/code/z_eff_blure.c @@ -280,8 +280,6 @@ void EffectBlure_UpdateFlags(EffectBlureElement* elem) { f32 sp30; f32 sp2C; - if (1) {} // Necessary to match - Math_Vec3s_DiffToVec3f(&sp64, &elem->p1, &prev->p1); Math_Vec3s_DiffToVec3f(&sp58, &elem->p2, &prev->p2); Math_Vec3s_DiffToVec3f(&sp4C, &next->p1, &elem->p1); @@ -345,7 +343,6 @@ void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3 vec1->x = (sp30.x * 0.5f * mode4Param * ratio) + elem->p1.x; vec1->y = (sp30.y * 0.5f * mode4Param * ratio) + elem->p1.y; - if (1) {} // Necessary to match vec1->z = (sp30.z * 0.5f * mode4Param * ratio) + elem->p1.z; vec2->x = -(sp30.x * 0.5f * mode4Param * ratio) + elem->p2.x; @@ -382,11 +379,11 @@ void EffectBlure_GetComputedValues(EffectBlure* this, s32 index, f32 ratio, Vec3 } void EffectBlure_SetupSmooth(EffectBlure* this, GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 809); + OPEN_DISPS(gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); - CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 813); + CLOSE_DISPS(gfxCtx); } // original name: "SQ_NoInterpolate_disp" @@ -403,7 +400,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* Vec3f sp60; Vec3f sp54; - OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 838); + OPEN_DISPS(gfxCtx); Math_Vec3s_ToVec3f(&sp6C, &this->elements[0].p2); @@ -433,8 +430,6 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* vtx[0].v.cn[2] = sp78.b; vtx[0].v.cn[3] = sp78.a; - if (1) {} // Necessary to match - sp60.x = sp8C.x; sp60.y = sp8C.y; sp60.z = sp8C.z; @@ -464,8 +459,6 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* vtx[2].v.cn[2] = sp7C.b; vtx[2].v.cn[3] = sp7C.a; - if (1) {} // Necessary to match - sp60.x = sp84.x; sp60.y = sp84.y; sp60.z = sp84.z; @@ -483,7 +476,7 @@ void EffectBlure_DrawElemNoInterpolation(EffectBlure* this, EffectBlureElement* gSP2Triangles(POLY_XLU_DISP++, 0, 1, 2, 0, 0, 2, 3, 0); } - CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 932); + CLOSE_DISPS(gfxCtx); } void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElement* elem, s32 index, @@ -514,7 +507,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem Color_RGBA8 sp144; Vec3f sp138; - OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 971); + OPEN_DISPS(gfxCtx); Math_Vec3s_ToVec3f(&sp138, &this->elements[0].p2); @@ -535,7 +528,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem Vec3f sp118; Vec3f sp10C; - ASSERT(index - 1 >= 0, "index - 1 >= 0", "../z_eff_blure.c", 1005); + ASSERT(index - 1 >= 0); ratio = (f32)(elem - 1)->timer / (f32)this->elemDuration; EffectBlure_GetComputedValues(this, index - 1, ratio, &sp1EC, &sp1E4, &sp1DC, &sp1D8); @@ -555,7 +548,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem Vec3f sp100; Vec3f spF4; - ASSERT(index + 2 < this->numElements, "index + 2 < this2->now_edge_num", "../z_eff_blure.c", 1032); + ASSERT(index + 2 < this->numElements); ratio = (f32)(elem + 2)->timer / (f32)this->elemDuration; EffectBlure_GetComputedValues(this, index + 2, ratio, &sp1EC, &sp1E4, &sp1DC, &sp1D8); @@ -656,7 +649,7 @@ void EffectBlure_DrawElemHermiteInterpolation(EffectBlure* this, EffectBlureElem gSP2Triangles(POLY_XLU_DISP++, 12, 13, 15, 0, 12, 15, 14, 0); } - CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1184); + CLOSE_DISPS(gfxCtx); } void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { @@ -668,7 +661,7 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { MtxF sp5C; Mtx* mtx; - OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1201); + OPEN_DISPS(gfxCtx); if (this->numElements < 2) { return; @@ -710,19 +703,19 @@ void EffectBlure_DrawSmooth(EffectBlure* this2, GraphicsContext* gfxCtx) { } } - CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1263); + CLOSE_DISPS(gfxCtx); } void EffectBlure_SetupSimple(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { - OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1280); + OPEN_DISPS(gfxCtx); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); - CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1285); + CLOSE_DISPS(gfxCtx); } void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { - OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1294); + OPEN_DISPS(gfxCtx); gDPPipeSync(POLY_XLU_DISP++); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); @@ -743,7 +736,7 @@ void EffectBlure_SetupSimpleAlt(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* gDPSetEnvColor(POLY_XLU_DISP++, this->altEnvColor.r, this->altEnvColor.g, this->altEnvColor.b, this->altEnvColor.a); - CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1329); + CLOSE_DISPS(gfxCtx); } void (*sSetupHandlers[])(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) = { @@ -757,7 +750,7 @@ s32 D_80115788 = 0; // unused void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, Vtx* vtx) { Mtx* mtx; - OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1356); + OPEN_DISPS(gfxCtx); sSetupHandlers[this->drawMode](gfxCtx, this, vtx); gDPPipeSync(POLY_XLU_DISP++); @@ -785,8 +778,6 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, gDPPipeSync(POLY_XLU_DISP++); } - if (1) {} // Necessary to match - gSPVertex(POLY_XLU_DISP++, &vtx[j], 4, 0); gSP2Triangles(POLY_XLU_DISP++, 0, 1, 3, 0, 0, 3, 2, 0); @@ -829,7 +820,7 @@ void EffectBlure_DrawSimpleVertices(GraphicsContext* gfxCtx, EffectBlure* this, } } - CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1452); + CLOSE_DISPS(gfxCtx); } Vtx_t D_8011578C[] = { @@ -949,7 +940,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { s32 phi_t2; FrameInterpolation_RecordOpenChild(this, 0); - OPEN_DISPS(gfxCtx, "../z_eff_blure.c", 1596); + OPEN_DISPS(gfxCtx); gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -1044,8 +1035,7 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { } else { gSP1Quadrangle(POLY_XLU_DISP++, j - 2, j - 1, j + 1, j, 0); - if (1) {} // Necessary to match - + if (this->unkFlag == 1) { phi_t2 = 0; } @@ -1061,6 +1051,6 @@ void EffectBlure_Draw(void* thisx, GraphicsContext* gfxCtx) { } } - CLOSE_DISPS(gfxCtx, "../z_eff_blure.c", 1823); + CLOSE_DISPS(gfxCtx); FrameInterpolation_RecordCloseChild(); } diff --git a/soh/src/code/z_eff_shield_particle.c b/soh/src/code/z_eff_shield_particle.c index 73134a654..a5d9ca53f 100644 --- a/soh/src/code/z_eff_shield_particle.c +++ b/soh/src/code/z_eff_shield_particle.c @@ -157,7 +157,7 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { Color_RGBA8 envColor; FrameInterpolation_RecordOpenChild(this, 0); - OPEN_DISPS(gfxCtx, "../z_eff_shield_particle.c", 272); + OPEN_DISPS(gfxCtx); if (this != NULL) { POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x26); @@ -215,6 +215,6 @@ void EffectShieldParticle_Draw(void* thisx, GraphicsContext* gfxCtx) { } } - CLOSE_DISPS(gfxCtx, "../z_eff_shield_particle.c", 359); + CLOSE_DISPS(gfxCtx); FrameInterpolation_RecordCloseChild(); } diff --git a/soh/src/code/z_eff_spark.c b/soh/src/code/z_eff_spark.c index b76968371..445fd7fea 100644 --- a/soh/src/code/z_eff_spark.c +++ b/soh/src/code/z_eff_spark.c @@ -155,7 +155,7 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { f32 ratio; FrameInterpolation_RecordOpenChild(this, 0); - OPEN_DISPS(gfxCtx, "../z_eff_spark.c", 293); + OPEN_DISPS(gfxCtx); if (this != NULL) { gSPMatrix(POLY_XLU_DISP++, &gMtxClear, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); @@ -276,6 +276,6 @@ void EffectSpark_Draw(void* thisx, GraphicsContext* gfxCtx) { } end: - CLOSE_DISPS(gfxCtx, "../z_eff_spark.c", 498); + CLOSE_DISPS(gfxCtx); FrameInterpolation_RecordCloseChild(); } diff --git a/soh/src/code/z_eff_ss_dead.c b/soh/src/code/z_eff_ss_dead.c index b3978547b..f03fcd343 100644 --- a/soh/src/code/z_eff_ss_dead.c +++ b/soh/src/code/z_eff_ss_dead.c @@ -5,7 +5,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a Gfx* displayListHead; f32 absCos; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 113); + OPEN_DISPS(globalCtx->state.gfxCtx); displayListHead = POLY_OPA_DISP; cos = Math_CosS((0x8000 / arg3) * arg2); @@ -23,9 +23,7 @@ void func_80026230(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a POLY_OPA_DISP = displayListHead; - if (1) {} // Necessary to match - - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 129); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { @@ -33,7 +31,7 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a f32 cos; if (arg3 != 0) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 141); + OPEN_DISPS(globalCtx->state.gfxCtx); cos = Math_CosS((0x4000 / arg3) * arg2); displayListHead = POLY_OPA_DISP; @@ -44,21 +42,19 @@ void func_80026400(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a POLY_OPA_DISP = displayListHead; - if (1) {} // Necessary to match - - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 153); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } void func_80026608(GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 159); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 164); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { @@ -66,7 +62,7 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a Gfx* displayListHead; f32 absCos; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 178); + OPEN_DISPS(globalCtx->state.gfxCtx); displayListHead = POLY_XLU_DISP; cos = Math_CosS((0x8000 / arg3) * arg2); @@ -84,16 +80,14 @@ void func_80026690(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a POLY_XLU_DISP = displayListHead; - if (1) {} // Necessary to match - - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 194); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 arg3) { f32 cos; Gfx* displayListHead; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 201); + OPEN_DISPS(globalCtx->state.gfxCtx); displayListHead = POLY_XLU_DISP; cos = Math_CosS((0x4000 / arg3) * arg2); @@ -104,18 +98,16 @@ void func_80026860(GlobalContext* globalCtx, Color_RGBA8* color, s16 arg2, s16 a POLY_XLU_DISP = displayListHead; - if (1) {} // Necessary to match - - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 212); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80026A6C(GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 217); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPPipeSync(POLY_XLU_DISP++); POLY_XLU_DISP = Gameplay_SetFog(globalCtx, POLY_XLU_DISP); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead.c", 222); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_effect.c b/soh/src/code/z_effect.c index d024d0892..5c2a12215 100644 --- a/soh/src/code/z_effect.c +++ b/soh/src/code/z_effect.c @@ -169,13 +169,10 @@ void Effect_DrawAll(GraphicsContext* gfxCtx) { if (sEffectContext.blures[i].status.active) { sEffectInfoTable[EFFECT_BLURE1].draw(&sEffectContext.blures[i].effect, gfxCtx); } - if (1) {} // Necessary to match - if (1) {} } for (i = 0; i < SHIELD_PARTICLE_COUNT; i++) { if (sEffectContext.shieldParticles[i].status.active) { - if (gfxCtx) {} // Necessary to match sEffectInfoTable[EFFECT_SHIELD_PARTICLE].draw(&sEffectContext.shieldParticles[i].effect, gfxCtx); } } diff --git a/soh/src/code/z_effect_soft_sprite.c b/soh/src/code/z_effect_soft_sprite.c index 2548966cc..e093edf38 100644 --- a/soh/src/code/z_effect_soft_sprite.c +++ b/soh/src/code/z_effect_soft_sprite.c @@ -17,8 +17,8 @@ void EffectSs_InitInfo(GlobalContext* globalCtx, s32 tableSize) { } sEffectSsInfo.table = - GameState_Alloc(&globalCtx->state, tableSize * sizeof(EffectSs), "../z_effect_soft_sprite.c", 289); - ASSERT(sEffectSsInfo.table != NULL, "EffectSS2Info.data_table != NULL", "../z_effect_soft_sprite.c", 290); + GAMESTATE_ALLOC_MC(&globalCtx->state, tableSize * sizeof(EffectSs)); + ASSERT(sEffectSsInfo.table != NULL); sEffectSsInfo.searchStartIndex = 0; sEffectSsInfo.tableSize = tableSize; @@ -54,7 +54,7 @@ void EffectSs_ClearAll(GlobalContext* globalCtx) { addr = overlay->loadedRamAddr; if (addr != NULL) { - ZeldaArena_FreeDebug(addr, "../z_effect_soft_sprite.c", 337); + ZELDA_ARENA_FREE_DEBUG(addr); } overlay->loadedRamAddr = NULL; @@ -175,7 +175,7 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init overlayEntry = &gEffectSsOverlayTable[type]; - ASSERT(type < EFFECT_SS_TYPE_MAX, "type < EFFECT_SS2_TYPE_LAST_LABEL", "../z_effect_soft_sprite.c", 556); + ASSERT(type < EFFECT_SS_TYPE_MAX); if (EffectSs_FindSlot(priority, &index) != 0) { // Abort because we couldn't find a suitable slot to add this effect in @@ -191,7 +191,7 @@ void EffectSs_Spawn(GlobalContext* globalCtx, s32 type, s32 priority, void* init initInfo = overlayEntry->initInfo; } else { if (overlayEntry->loadedRamAddr == NULL) { - overlayEntry->loadedRamAddr = ZeldaArena_MallocRDebug(overlaySize, "../z_effect_soft_sprite.c", 585); + overlayEntry->loadedRamAddr = ZELDA_ARENA_MALLOC_RDEBUG(overlaySize); if (overlayEntry->loadedRamAddr == NULL) { osSyncPrintf(VT_FGCOL(RED)); diff --git a/soh/src/code/z_effect_soft_sprite_old_init.c b/soh/src/code/z_effect_soft_sprite_old_init.c index 8d052a8bf..e3efdffaa 100644 --- a/soh/src/code/z_effect_soft_sprite_old_init.c +++ b/soh/src/code/z_effect_soft_sprite_old_init.c @@ -51,7 +51,7 @@ void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* textur Mtx* mtx; void* object = globalCtx->objectCtx.status[this->rgObjBankIdx].segment; - OPEN_DISPS(gfxCtx, "../z_effect_soft_sprite_old_init.c", 196); + OPEN_DISPS(gfxCtx); scale = this->rgScale * 0.0025f; SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z); @@ -73,7 +73,7 @@ void EffectSs_DrawGEffect(GlobalContext* globalCtx, EffectSs* this, void* textur gSPDisplayList(POLY_XLU_DISP++, this->gfx); } - CLOSE_DISPS(gfxCtx, "../z_effect_soft_sprite_old_init.c", 243); + CLOSE_DISPS(gfxCtx); } // EffectSsDust Spawn Functions diff --git a/soh/src/code/z_elf_message.c b/soh/src/code/z_elf_message.c index 370fe8d41..2e847f738 100644 --- a/soh/src/code/z_elf_message.c +++ b/soh/src/code/z_elf_message.c @@ -58,8 +58,8 @@ u32 ElfMessage_CheckCondition(ElfMessage* msg) { } } - LOG_STRING("企画外 条件", "../z_elf_message.c", 156); // "Unplanned conditions" - ASSERT(0, "0", "../z_elf_message.c", 157); + LOG_STRING("企画外 条件"); // "Unplanned conditions" + ASSERT(0); return false; } @@ -141,8 +141,8 @@ u16 ElfMessage_GetTextFromMsgs(ElfMessage* msg) { case (ELF_MSG_TYPE_END << 5): return msg->byte2 | 0x100; default: - LOG_STRING("企画外 条件", "../z_elf_message.c", 281); // "Unplanned conditions" - ASSERT(0, "0", "../z_elf_message.c", 282); + LOG_STRING("企画外 条件"); // "Unplanned conditions" + ASSERT(0); } msg++; } diff --git a/soh/src/code/z_en_a_keep.c b/soh/src/code/z_en_a_keep.c index 80ccb38f7..df9f76a1a 100644 --- a/soh/src/code/z_en_a_keep.c +++ b/soh/src/code/z_en_a_keep.c @@ -283,7 +283,6 @@ void EnAObj_BoulderFragment(EnAObj* this, GlobalContext* globalCtx) { if (this->dyna.actor.speedXZ != 0.0f && this->dyna.actor.bgCheckFlags & 0x8) { this->dyna.actor.world.rot.y = this->dyna.actor.wallYaw - this->dyna.actor.world.rot.y + this->dyna.actor.wallYaw - 0x8000; - if (1) {} this->dyna.actor.bgCheckFlags &= ~0x8; } @@ -348,7 +347,7 @@ void EnAObj_Update(Actor* thisx, GlobalContext* globalCtx) { void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) { s32 type = thisx->params; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 701); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); @@ -360,9 +359,9 @@ void EnAObj_Draw(Actor* thisx, GlobalContext* globalCtx) { gDPSetPrimColor(POLY_OPA_DISP++, 0, 1, 60, 60, 60, 50); } - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 712), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, sDLists[type]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_a_keep.c", 715); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_en_item00.c b/soh/src/code/z_en_item00.c index 7aa2a282b..27e2b6f50 100644 --- a/soh/src/code/z_en_item00.c +++ b/soh/src/code/z_en_item00.c @@ -1244,7 +1244,7 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) { s32 pad; s32 texIndex; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1546); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); @@ -1255,14 +1255,14 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) { texIndex = this->actor.params - 0x10; } - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1562), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRupeeTex[texIndex])); gSPDisplayList(POLY_OPA_DISP++, gRupeeDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1568); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1271,7 +1271,7 @@ void EnItem00_DrawRupee(EnItem00* this, GlobalContext* globalCtx) { void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) { s32 texIndex = this->actor.params - 3; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1594); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); @@ -1285,11 +1285,11 @@ void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sItemDropTex[texIndex])); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1607), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gItemDropDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1611); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1298,21 +1298,21 @@ void EnItem00_DrawCollectible(EnItem00* this, GlobalContext* globalCtx) { void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1623); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx); func_8002EBCC(&this->actor, globalCtx, 0); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1634), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, gHeartPieceExteriorDL); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1644), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gHeartContainerInteriorDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1647); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -1321,15 +1321,15 @@ void EnItem00_DrawHeartContainer(EnItem00* this, GlobalContext* globalCtx) { void EnItem00_DrawHeartPiece(EnItem00* this, GlobalContext* globalCtx) { s32 pad; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1658); + OPEN_DISPS(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx); func_8002ED80(&this->actor, globalCtx, 0); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_item00.c", 1670), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPDisplayList(POLY_XLU_DISP++, gHeartPieceInteriorDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_item00.c", 1673); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** diff --git a/soh/src/code/z_fbdemo.c b/soh/src/code/z_fbdemo.c index 16989fe5e..4930ddfb4 100644 --- a/soh/src/code/z_fbdemo.c +++ b/soh/src/code/z_fbdemo.c @@ -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, "../z_fbdemo.c", - 144); - LOG_NUM("gp - this->gfxtbl", gfx - this->gfx, "../z_fbdemo.c", 145); + 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) { @@ -112,19 +111,19 @@ void TransitionUnk_Destroy(TransitionUnk* this) { Sleep_Msec(100); if (this->unk_0C != NULL) { - SystemArena_FreeDebug(this->unk_0C, "../z_fbdemo.c", 180); + SYSTEM_ARENA_FREE_DEBUG(this->unk_0C); this->unk_0C = NULL; } if (this->vtxFrame1 != NULL) { - SystemArena_FreeDebug(this->vtxFrame1, "../z_fbdemo.c", 181); + SYSTEM_ARENA_FREE_DEBUG(this->vtxFrame1); this->vtxFrame1 = NULL; } if (this->vtxFrame2 != NULL) { - SystemArena_FreeDebug(this->vtxFrame2, "../z_fbdemo.c", 182); + SYSTEM_ARENA_FREE_DEBUG(this->vtxFrame2); this->vtxFrame2 = NULL; } if (this->gfx != NULL) { - SystemArena_FreeDebug(this->gfx, "../z_fbdemo.c", 183); + SYSTEM_ARENA_FREE_DEBUG(this->gfx); this->gfx = NULL; } } @@ -135,27 +134,27 @@ TransitionUnk* TransitionUnk_Init(TransitionUnk* this, s32 row, s32 col) { this->frame = 0; this->row = row; this->col = col; - this->unk_0C = SystemArena_MallocDebug((row + 1) * sizeof(TransitionUnkData) * (col + 1), "../z_fbdemo.c", 195); - this->vtxFrame1 = SystemArena_MallocDebug((row + 1) * sizeof(Vtx) * (col + 1), "../z_fbdemo.c", 196); - this->vtxFrame2 = SystemArena_MallocDebug((row + 1) * sizeof(Vtx) * (col + 1), "../z_fbdemo.c", 197); - this->gfx = SystemArena_MallocDebug((this->col * (1 + this->row * 9) + 2) * sizeof(Gfx), "../z_fbdemo.c", 198); + this->unk_0C = SYSTEM_ARENA_MALLOC_DEBUG((row + 1) * sizeof(TransitionUnkData) * (col + 1)); + this->vtxFrame1 = SYSTEM_ARENA_MALLOC_DEBUG((row + 1) * sizeof(Vtx) * (col + 1)); + this->vtxFrame2 = SYSTEM_ARENA_MALLOC_DEBUG((row + 1) * sizeof(Vtx) * (col + 1)); + this->gfx = SYSTEM_ARENA_MALLOC_DEBUG((this->col * (1 + this->row * 9) + 2) * sizeof(Gfx)); if (this->unk_0C == NULL || this->vtxFrame1 == NULL || this->vtxFrame2 == NULL || this->gfx == NULL) { osSyncPrintf("fbdemo_init allocation error\n"); if (this->unk_0C != NULL) { - SystemArena_FreeDebug(this->unk_0C, "../z_fbdemo.c", 202); + SYSTEM_ARENA_FREE_DEBUG(this->unk_0C); this->unk_0C = NULL; } if (this->vtxFrame1 != NULL) { - SystemArena_FreeDebug(this->vtxFrame1, "../z_fbdemo.c", 203); + SYSTEM_ARENA_FREE_DEBUG(this->vtxFrame1); this->vtxFrame1 = NULL; } if (this->vtxFrame2 != NULL) { - SystemArena_FreeDebug(this->vtxFrame2, "../z_fbdemo.c", 204); + SYSTEM_ARENA_FREE_DEBUG(this->vtxFrame2); this->vtxFrame2 = NULL; } if (this->gfx != NULL) { - SystemArena_FreeDebug(this->gfx, "../z_fbdemo.c", 205); + SYSTEM_ARENA_FREE_DEBUG(this->gfx); this->gfx = NULL; } return NULL; diff --git a/soh/src/code/z_fcurve_data_skelanime.c b/soh/src/code/z_fcurve_data_skelanime.c index 78169e664..98e79387c 100644 --- a/soh/src/code/z_fcurve_data_skelanime.c +++ b/soh/src/code/z_fcurve_data_skelanime.c @@ -23,16 +23,15 @@ s32 SkelCurve_Init(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, SkelCurv skelCurve->limbCount = limbList->limbCount; skelCurve->limbList = SEGMENTED_TO_VIRTUAL(limbList->limbs); - skelCurve->transforms = ZeldaArena_MallocDebug(sizeof(*skelCurve->transforms) * skelCurve->limbCount, - "../z_fcurve_data_skelanime.c", 125); - ASSERT(skelCurve->transforms != NULL, "this->now_joint != NULL", "../z_fcurve_data_skelanime.c", 127); + skelCurve->transforms = ZELDA_ARENA_MALLOC_DEBUG(sizeof(*skelCurve->transforms) * skelCurve->limbCount); + ASSERT(skelCurve->transforms != NULL); skelCurve->animCurFrame = 0.0f; return 1; } void SkelCurve_Destroy(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve) { if (skelCurve->transforms != NULL) { - ZeldaArena_FreeDebug(skelCurve->transforms, "../z_fcurve_data_skelanime.c", 146); + ZELDA_ARENA_FREE_DEBUG(skelCurve->transforms); } } @@ -104,7 +103,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* OverrideCurveLimbDraw overrideLimbDraw, PostCurveLimbDraw postLimbDraw, s32 lod, void* data) { SkelCurveLimb* limb = SEGMENTED_TO_VIRTUAL(skelCurve->limbList[limbIndex]); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_fcurve_data_skelanime.c", 279); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -136,7 +135,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* dList = limb->dList[0]; if (dList != NULL) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fcurve_data_skelanime.c", 321), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, dList); } @@ -145,13 +144,13 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* dList = limb->dList[0]; if (dList != NULL) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fcurve_data_skelanime.c", 332), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, dList); } dList = limb->dList[1]; if (dList != NULL) { - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_fcurve_data_skelanime.c", 338), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD | G_MTX_NOPUSH | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, dList); } @@ -175,7 +174,7 @@ void SkelCurve_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, SkelAnimeCurve* SkelCurve_DrawLimb(globalCtx, limb->nextLimbIdx, skelCurve, overrideLimbDraw, postLimbDraw, lod, data); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_fcurve_data_skelanime.c", 371); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void SkelCurve_Draw(Actor* actor, GlobalContext* globalCtx, SkelAnimeCurve* skelCurve, diff --git a/soh/src/code/z_game_over.c b/soh/src/code/z_game_over.c index ff488aae4..86ba7c6e1 100644 --- a/soh/src/code/z_game_over.c +++ b/soh/src/code/z_game_over.c @@ -75,7 +75,6 @@ void GameOver_Update(GlobalContext* globalCtx) { Environment_InitGameOverLights(globalCtx); gGameOverTimer = 20; - if (1) {} v90 = VREG(90); v91 = VREG(91); v92 = VREG(92); @@ -109,7 +108,6 @@ void GameOver_Update(GlobalContext* globalCtx) { case GAMEOVER_REVIVE_RUMBLE: gGameOverTimer = 50; gameOverCtx->state++; - if (1) {} v90 = VREG(90); v91 = VREG(91); diff --git a/soh/src/code/z_horse.c b/soh/src/code/z_horse.c index 3a2870116..5d4647a04 100644 --- a/soh/src/code/z_horse.c +++ b/soh/src/code/z_horse.c @@ -52,7 +52,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { player->actor.world.pos.y, player->actor.world.pos.z, player->actor.shape.rot.x, player->actor.shape.rot.y, player->actor.shape.rot.z, 9); - ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 343); + ASSERT(player->rideActor != NULL); Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); @@ -70,7 +70,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { } else if ((gSaveContext.entranceIndex == 1230) && (gSaveContext.eventChkInf[1] & 0x100)) { Actor* horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, -25.0f, 0.0f, -1600.0f, 0, -0x4000, 0, 1); - ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 389); + ASSERT(horseActor != NULL); } else if ((globalCtx->sceneNum == gSaveContext.horseData.scene) && (Flags_GetEventChkInf(0x18) != 0 || DREG(1) != 0)) { // "Set by existence of horse %d %d %d" @@ -81,7 +81,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { Actor* horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, gSaveContext.horseData.pos.x, gSaveContext.horseData.pos.y, gSaveContext.horseData.pos.z, 0, gSaveContext.horseData.angle, 0, 1); - ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 414); + ASSERT(horseActor != NULL); if (globalCtx->sceneNum == SCENE_SPOT12) { horseActor->room = -1; } @@ -95,7 +95,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { } else if ((globalCtx->sceneNum == SCENE_SPOT20) && !Flags_GetEventChkInf(0x18) && (DREG(1) == 0)) { Actor* horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 0.0f, 0.0f, -500.0f, 0, 0, 0, 1); - ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 443); + ASSERT(horseActor != NULL); } else if (Flags_GetEventChkInf(0x18) || (DREG(1) != 0)) { for (i = 0; i < ARRAY_COUNT(horseSpawns); i++) { HorseSpawn* horseSpawn = &horseSpawns[i]; @@ -103,7 +103,7 @@ void func_8006D0EC(GlobalContext* globalCtx, Player* player) { Actor* horseActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, horseSpawn->pos.x, horseSpawn->pos.y, horseSpawn->pos.z, 0, horseSpawn->angle, 0, horseSpawn->type); - ASSERT(horseActor != NULL, "horse_actor != NULL", "../z_horse.c", 466); + ASSERT(horseActor != NULL); if (globalCtx->sceneNum == SCENE_SPOT12) { horseActor->room = -1; } @@ -153,7 +153,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, spawnPos.x, spawnPos.y, spawnPos.z, 0, player->actor.world.rot.y, 0, 7); - ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 561); + ASSERT(player->rideActor != NULL); Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); @@ -162,7 +162,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { (Flags_GetEventChkInf(0x18) == 0) && (DREG(1) == 0)) { player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, 894.0f, 0.0f, -2084.0f, 0, -0x7FFF, 0, 5); - ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 582); + ASSERT(player->rideActor != NULL); Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); @@ -192,7 +192,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, player->actor.world.rot.y, 0, D_8011F9B8[i].type); - ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 628); + ASSERT(player->rideActor != NULL); Actor_MountHorse(globalCtx, player, player->rideActor); func_8002DE74(globalCtx, player); @@ -207,7 +207,7 @@ void func_8006D684(GlobalContext* globalCtx, Player* player) { player->rideActor = Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_HORSE, D_8011F9B8[i].pos.x, D_8011F9B8[i].pos.y, D_8011F9B8[i].pos.z, 0, D_8011F9B8[i].angle, 0, D_8011F9B8[i].type | temp); - ASSERT(player->rideActor != NULL, "player->ride.actor != NULL", "../z_horse.c", 667); + ASSERT(player->rideActor != NULL); player->actor.world.pos.x = D_8011F9B8[i].pos.x; player->actor.world.pos.y = D_8011F9B8[i].pos.y; diff --git a/soh/src/code/z_jpeg.c b/soh/src/code/z_jpeg.c index c289a173e..79fe1ed46 100644 --- a/soh/src/code/z_jpeg.c +++ b/soh/src/code/z_jpeg.c @@ -250,8 +250,7 @@ s32 Jpeg_Decode(void* data, void* zbuffer, void* work, u32 workSize) { time = osGetTime(); // (?) I guess MB_SIZE=0x180, PROC_OF_MBS=5 which means data is not a part of JpegWork - ASSERT(workSize >= sizeof(JpegWork), "worksize >= sizeof(JPEGWork) + MB_SIZE * (PROC_OF_MBS - 1)", "../z_jpeg.c", - 527); + ASSERT(workSize >= sizeof(JpegWork)); osCreateMesgQueue(&ctx.mq, &ctx.msg, 1); MsgEvent_SendNullTask(); diff --git a/soh/src/code/z_kaleido_manager.c b/soh/src/code/z_kaleido_manager.c index 783fd6d6e..d215d5fa0 100644 --- a/soh/src/code/z_kaleido_manager.c +++ b/soh/src/code/z_kaleido_manager.c @@ -22,7 +22,7 @@ KaleidoMgrOverlay* gKaleidoMgrCurOvl = NULL; u8 gBossMarkState = 0; void KaleidoManager_LoadOvl(KaleidoMgrOverlay* ovl) { - //LogUtils_CheckNullPointer("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 99); + //LOG_CHECK_NULL_POINTER("KaleidoArea_allocp", sKaleidoAreaPtr); ovl->loadedRamAddr = sKaleidoAreaPtr; Overlay_Load(ovl->vromStart, ovl->vromEnd, ovl->vramStart, ovl->vramEnd, ovl->loadedRamAddr); @@ -62,8 +62,8 @@ void KaleidoManager_Init(GlobalContext* globalCtx) { osSyncPrintf("KaleidoArea の最大サイズは %d バイトを確保します\n", largestSize); osSyncPrintf(VT_RST); - sKaleidoAreaPtr = GameState_Alloc(&globalCtx->state, largestSize, "../z_kaleido_manager.c", 150); - LogUtils_CheckNullPointer("KaleidoArea_allocp", sKaleidoAreaPtr, "../z_kaleido_manager.c", 151); + sKaleidoAreaPtr = GAMESTATE_ALLOC_MC(&globalCtx->state, largestSize); + LOG_CHECK_NULL_POINTER("KaleidoArea_allocp", sKaleidoAreaPtr); osSyncPrintf(VT_FGCOL(GREEN)); osSyncPrintf("KaleidoArea %08x - %08x\n", sKaleidoAreaPtr, (uintptr_t)sKaleidoAreaPtr + largestSize); diff --git a/soh/src/code/z_kaleido_scope_call.c b/soh/src/code/z_kaleido_scope_call.c index c023066be..6e7e81651 100644 --- a/soh/src/code/z_kaleido_scope_call.c +++ b/soh/src/code/z_kaleido_scope_call.c @@ -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, "../z_kaleido_scope_call.c", 98); - LOG_ADDRESS("kaleido_scope_move_func", sKaleidoScopeUpdateFunc, "../z_kaleido_scope_call.c", 99); - LOG_ADDRESS("kaleido_scope_draw", KaleidoScope_Draw, "../z_kaleido_scope_call.c", 100); - LOG_ADDRESS("kaleido_scope_draw_func", sKaleidoScopeDrawFunc, "../z_kaleido_scope_call.c", 101); + 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); } diff --git a/soh/src/code/z_kanfont.c b/soh/src/code/z_kanfont.c index c774ac07f..590b25e9d 100644 --- a/soh/src/code/z_kanfont.c +++ b/soh/src/code/z_kanfont.c @@ -171,7 +171,7 @@ void func_8006EE50(Font* font, u16 arg1, u16 arg2) { void Font_LoadChar(Font* font, u8 character, u16 codePointIndex) { //DmaMgr_SendRequest1(&font->charTexBuf[codePointIndex], //&_nes_font_staticSegmentRomStart[character * FONT_CHAR_TEX_SIZE], FONT_CHAR_TEX_SIZE, - //"../z_kanfont.c", 93); + //__FILE__, __LINE__); if (character < 0x8B) memcpy(&font->charTexBuf[codePointIndex], ResourceMgr_LoadTexByName(fntTbl[character]), FONT_CHAR_TEX_SIZE); @@ -219,7 +219,7 @@ void Font_LoadOrderedFont(Font* font) { offset = (font->msgBuf[codePointIndex] - '\x20') * FONT_CHAR_TEX_SIZE; memcpy(fontBuf, ResourceMgr_LoadTexByName(fntTbl[offset / FONT_CHAR_TEX_SIZE]), FONT_CHAR_TEX_SIZE); - //DmaMgr_SendRequest1(fontBuf, fontStatic + offset, FONT_CHAR_TEX_SIZE, "../z_kanfont.c", 134); + //DmaMgr_SendRequest1(fontBuf, fontStatic + offset, FONT_CHAR_TEX_SIZE, __FILE__, __LINE__); fontBufIndex += FONT_CHAR_TEX_SIZE / 8; } } diff --git a/soh/src/code/z_kankyo.c b/soh/src/code/z_kankyo.c index 6f1fc0c8f..9eb91118b 100644 --- a/soh/src/code/z_kankyo.c +++ b/soh/src/code/z_kankyo.c @@ -691,7 +691,7 @@ void Environment_UpdateSkybox(GlobalContext* globalCtx, u8 skyboxId, Environment //osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1); //DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->staticSegments[0], //gSkyboxFiles[newSkybox1Index].file.vromStart, size, 0, &envCtx->loadQueue, NULL, - //"../z_kankyo.c", 1264); + //__FILE__, __LINE__); } if ((envCtx->skybox2Index != newSkybox2Index) && (envCtx->skyboxDmaState == SKYBOX_DMA_INACTIVE)) { @@ -710,7 +710,7 @@ void Environment_UpdateSkybox(GlobalContext* globalCtx, u8 skyboxId, Environment //osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1); //DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->staticSegments[1], //gSkyboxFiles[newSkybox2Index].file.vromStart, size, 0, &envCtx->loadQueue, NULL, - //"../z_kankyo.c", 1281); + //__FILE__, __LINE__); } if (envCtx->skyboxDmaState == SKYBOX_DMA_FILE1_DONE) { @@ -725,7 +725,7 @@ void Environment_UpdateSkybox(GlobalContext* globalCtx, u8 skyboxId, Environment //osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1); //DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes, //gSkyboxFiles[newSkybox1Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL, - //"../z_kankyo.c", 1307); + //__FILE__, __LINE__); } else { SkyboxTableEntry entryA = sSkyboxTable[newSkybox1Index]; LoadSkyboxPalette(skyboxCtx, 1, entryA.palettes[0], 16, 8); @@ -734,7 +734,7 @@ void Environment_UpdateSkybox(GlobalContext* globalCtx, u8 skyboxId, Environment //osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1); //DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes + size, //gSkyboxFiles[newSkybox1Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL, - //"../z_kankyo.c", 1320); + //__FILE__, __LINE__); } Skybox_Update(skyboxCtx); @@ -752,7 +752,7 @@ void Environment_UpdateSkybox(GlobalContext* globalCtx, u8 skyboxId, Environment osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1); DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes, gSkyboxFiles[newSkybox2Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL, - "../z_kankyo.c", 1342);*/ + __FILE__, __LINE__);*/ } else { SkyboxTableEntry entryA = sSkyboxTable[newSkybox2Index]; @@ -762,7 +762,7 @@ void Environment_UpdateSkybox(GlobalContext* globalCtx, u8 skyboxId, Environment osCreateMesgQueue(&envCtx->loadQueue, &envCtx->loadMsg, 1); DmaMgr_SendRequest2(&envCtx->dmaRequest, (uintptr_t)skyboxCtx->palettes + size, gSkyboxFiles[newSkybox2Index].palette.vromStart, size, 0, &envCtx->loadQueue, NULL, - "../z_kankyo.c", 1355);*/ + __FILE__, __LINE__);*/ } Skybox_Update(skyboxCtx); @@ -949,7 +949,7 @@ void Environment_Update(GlobalContext* globalCtx, EnvironmentContext* envCtx, Li Gfx* displayList; Gfx* prevDisplayList; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 1682); + OPEN_DISPS(globalCtx->state.gfxCtx); prevDisplayList = POLY_OPA_DISP; displayList = Graph_GfxPlusOne(POLY_OPA_DISP); @@ -958,8 +958,7 @@ void Environment_Update(GlobalContext* globalCtx, EnvironmentContext* envCtx, Li gSPEndDisplayList(displayList++); Graph_BranchDlist(prevDisplayList, displayList); POLY_OPA_DISP = displayList; - if (1) {} - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 1690); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if ((envCtx->unk_BF != 0xFF) && (envCtx->unk_DC != 2) && (envCtx->unk_BD != envCtx->unk_BF) && @@ -1302,7 +1301,7 @@ void Environment_DrawSunAndMoon(GlobalContext* globalCtx) { f32 scale; f32 temp; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 2266); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->csCtx.state != 0) { Math_SmoothStepToF(&globalCtx->envCtx.sunPos.x, @@ -1350,7 +1349,7 @@ void Environment_DrawSunAndMoon(GlobalContext* globalCtx) { scale = (color * 2.0f) + 10.0f; Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_kankyo.c", 2364), G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD); func_80093AD0(globalCtx->state.gfxCtx); static Vtx vertices[] = { @@ -1388,7 +1387,7 @@ void Environment_DrawSunAndMoon(GlobalContext* globalCtx) { alpha = temp * 255.0f; if (alpha > 0.0f) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_kankyo.c", 2406), G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD); func_8009398C(globalCtx->state.gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 240, 255, 180, alpha); @@ -1397,7 +1396,7 @@ void Environment_DrawSunAndMoon(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 2429); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Environment_DrawSunLensFlare(GlobalContext* globalCtx, EnvironmentContext* envCtx, View* view, @@ -1461,7 +1460,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, LENS_FLARE_CIRCLE1, }; - OPEN_DISPS(gfxCtx, "../z_kankyo.c", 2516); + OPEN_DISPS(gfxCtx); dist = Math3D_Vec3f_DistXYZ(&pos, &view->eye) / 12.0f; @@ -1547,7 +1546,6 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env alpha *= 1.0f - fogInfluence; - if (1) {} if (!(isOffScreen ^ 0)) { Math_SmoothStepToF(&envCtx->unk_88, unk88Target, 0.5f, 0.05f, 0.001f); @@ -1558,7 +1556,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env POLY_XLU_DISP = func_800947AC(POLY_XLU_DISP++); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, lensFlareColors[i].r, lensFlareColors[i].g, lensFlareColors[i].b, alpha * envCtx->unk_88); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_kankyo.c", 2662), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0); @@ -1615,7 +1613,7 @@ void Environment_DrawLensFlare(GlobalContext* globalCtx, EnvironmentContext* env } } - CLOSE_DISPS(gfxCtx, "../z_kankyo.c", 2750); + CLOSE_DISPS(gfxCtx); } f32 func_800746DC(void) { @@ -1642,7 +1640,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext* Player* player = GET_PLAYER(globalCtx); if (!(globalCtx->cameraPtrs[0]->unk_14C & 0x100) && (globalCtx->envCtx.unk_EE[2] == 0)) { - OPEN_DISPS(gfxCtx, "../z_kankyo.c", 2799); + OPEN_DISPS(gfxCtx); vec.x = view->lookAt.x - view->eye.x; vec.y = view->lookAt.y - view->eye.y; @@ -1691,7 +1689,7 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext* Matrix_RotateY(-rotY, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2 - rotX, MTXMODE_APPLY); Matrix_Scale(0.4f, 1.2f, 0.4f, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_kankyo.c", 2887), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gRaindropDL); } @@ -1718,13 +1716,13 @@ void Environment_DrawRain(GlobalContext* globalCtx, View* view, GraphicsContext* Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY); } - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_kankyo.c", 2940), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL); } } - CLOSE_DISPS(gfxCtx, "../z_kankyo.c", 2946); + CLOSE_DISPS(gfxCtx); } } @@ -1758,7 +1756,7 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) { (globalCtx->skyboxId == SKYBOX_UNSET_1D)) { f32 alpha; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 3032); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800938B4(globalCtx->state.gfxCtx); @@ -1776,11 +1774,11 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) { globalCtx->lightCtx.fogColor[2], 255.0f * alpha); gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 3043); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if (globalCtx->envCtx.customSkyboxFilter) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 3048); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800938B4(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, globalCtx->envCtx.skyboxFilterColor[0], @@ -1788,18 +1786,18 @@ void Environment_DrawSkyboxFilters(GlobalContext* globalCtx) { globalCtx->envCtx.skyboxFilterColor[3]); gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 3056); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } void Environment_DrawLightningFlash(GlobalContext* globalCtx, u8 red, u8 green, u8 blue, u8 alpha) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 3069); + OPEN_DISPS(globalCtx->state.gfxCtx); func_800938B4(globalCtx->state.gfxCtx); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, red, green, blue, alpha); gDPFillRectangle(POLY_OPA_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 3079); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Environment_UpdateLightningStrike(GlobalContext* globalCtx) { @@ -1914,7 +1912,7 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) { Vec3f unused1 = { 0.0f, 0.0f, 0.0f }; Vec3f unused2 = { 0.0f, 0.0f, 0.0f }; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 3253); + OPEN_DISPS(globalCtx->state.gfxCtx); for (i = 0; i < ARRAY_COUNT(sLightningBolts); i++) { switch (sLightningBolts[i].state) { @@ -1964,7 +1962,7 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) { Matrix_Scale(22.0f, 100.0f, 22.0f, MTXMODE_APPLY); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 128); gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 255, 128); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_kankyo.c", 3333), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(lightningTextures[sLightningBolts[i].textureIndex])); func_80094C50(globalCtx->state.gfxCtx); @@ -1973,7 +1971,7 @@ void Environment_DrawLightning(GlobalContext* globalCtx, s32 unused) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 3353); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Environment_PlaySceneSequence(GlobalContext* globalCtx) { @@ -2239,7 +2237,7 @@ void func_800766C4(GlobalContext* globalCtx) { void Environment_FillScreen(GraphicsContext* gfxCtx, u8 red, u8 green, u8 blue, u8 alpha, u8 drawFlags) { if (alpha != 0) { - OPEN_DISPS(gfxCtx, "../z_kankyo.c", 3835); + OPEN_DISPS(gfxCtx); if (drawFlags & FILL_SCREEN_OPA) { POLY_OPA_DISP = func_800937C0(POLY_OPA_DISP); @@ -2262,7 +2260,7 @@ void Environment_FillScreen(GraphicsContext* gfxCtx, u8 red, u8 green, u8 blue, gDPFillRectangle(POLY_XLU_DISP++, 0, 0, SCREEN_WIDTH - 1, SCREEN_HEIGHT - 1); } - CLOSE_DISPS(gfxCtx, "../z_kankyo.c", 3863); + CLOSE_DISPS(gfxCtx); } } @@ -2413,7 +2411,7 @@ void Environment_DrawSandstorm(GlobalContext* globalCtx, u8 sandstormState) { sp94 = (s32)(D_8015FDB0 * (9.0f / 6.0f)); sp92 = (s32)(D_8015FDB0 * (6.0f / 6.0f)); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 4044); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = func_80093F34(POLY_XLU_DISP); gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); @@ -2429,7 +2427,7 @@ void Environment_DrawSandstorm(GlobalContext* globalCtx, u8 sandstormState) { gSPWideTextureRectangle(POLY_XLU_DISP++, OTRGetRectDimensionFromLeftEdge(0) << 2, 0, OTRGetRectDimensionFromRightEdge(SCREEN_WIDTH) << 2, 0x03C0, G_TX_RENDERTILE, 0, 0, 0x008C, -0x008C); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_kankyo.c", 4068); + CLOSE_DISPS(globalCtx->state.gfxCtx); D_8015FDB0 += (s32)sp98; } diff --git a/soh/src/code/z_lifemeter.c b/soh/src/code/z_lifemeter.c index 79a1f89eb..43fd66084 100644 --- a/soh/src/code/z_lifemeter.c +++ b/soh/src/code/z_lifemeter.c @@ -412,7 +412,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) { u8* curBgImgLoaded = NULL; s32 ddHeartCountMinusOne = gSaveContext.inventory.defenseHearts - 1; - OPEN_DISPS(gfxCtx, "../z_lifemeter.c", 353); + OPEN_DISPS(gfxCtx); if (!(gSaveContext.health % 0x10)) { fullHeartCount--; @@ -584,7 +584,7 @@ void HealthMeter_Draw(GlobalContext* globalCtx) { } } - CLOSE_DISPS(gfxCtx, "../z_lifemeter.c", 606); + CLOSE_DISPS(gfxCtx); } void HealthMeter_HandleCriticalAlarm(GlobalContext* globalCtx) { diff --git a/soh/src/code/z_lights.c b/soh/src/code/z_lights.c index bee677276..649d4c115 100644 --- a/soh/src/code/z_lights.c +++ b/soh/src/code/z_lights.c @@ -67,7 +67,7 @@ void Lights_Draw(Lights* lights, GraphicsContext* gfxCtx) { #if 1 - OPEN_DISPS(gfxCtx, "../z_lights.c", 339); + OPEN_DISPS(gfxCtx); gSPNumLights(POLY_OPA_DISP++, lights->numLights); gSPNumLights(POLY_XLU_DISP++, lights->numLights); @@ -82,13 +82,11 @@ void Lights_Draw(Lights* lights, GraphicsContext* gfxCtx) { light++; } - if (0) {} - i++; // abmient light is total number of lights + 1 gSPLight(POLY_OPA_DISP++, &lights->l.a, i); gSPLight(POLY_XLU_DISP++, &lights->l.a, i); - CLOSE_DISPS(gfxCtx, "../z_lights.c", 352); + CLOSE_DISPS(gfxCtx); #endif } @@ -120,7 +118,6 @@ void Lights_BindPoint(Lights* lights, LightParams* params, Vec3f* vec) { if (light != NULL) { posDiff = sqrtf(posDiff); - if (1) {} scale = posDiff / scale; scale = 1 - SQ(scale); @@ -399,9 +396,7 @@ void Lights_GlowCheck(GlobalContext* globalCtx) { if ((multDest.z > 1.0f) && y >= shrink && y <= SCREEN_HEIGHT - shrink) { wZ = (s32)((multDest.z * wDest) * 16352.0f) + 16352; zBuf = OTRGetPixelDepth(x, y) * 4; - if (1) {} - if (1) {} - + if (wZ < (zBuf >> 3)) { params->drawGlow = true; } @@ -417,7 +412,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { node = globalCtx->lightCtx.listHead; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_lights.c", 887); + OPEN_DISPS(globalCtx->state.gfxCtx); POLY_XLU_DISP = func_800947AC(POLY_XLU_DISP++); gDPSetAlphaDither(POLY_XLU_DISP++, G_AD_NOISE); @@ -440,7 +435,7 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, params->color[0], params->color[1], params->color[2], 50); Matrix_Translate(params->x, params->y, params->z, MTXMODE_NEW); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_lights.c", 918), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, gGlowCircleDL); FrameInterpolation_RecordCloseChild(); @@ -449,5 +444,5 @@ void Lights_DrawGlow(GlobalContext* globalCtx) { node = node->next; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_lights.c", 927); + CLOSE_DISPS(globalCtx->state.gfxCtx); } diff --git a/soh/src/code/z_map_exp.c b/soh/src/code/z_map_exp.c index aaee434b0..4b1e05c89 100644 --- a/soh/src/code/z_map_exp.c +++ b/soh/src/code/z_map_exp.c @@ -410,7 +410,7 @@ void Map_InitData(GlobalContext* globalCtx, s16 room) { sEntranceIconMapIndex = extendedMapIndex; //DmaMgr_SendRequest1(interfaceCtx->mapSegment, //(uintptr_t)_map_grand_staticSegmentRomStart + gMapData->owMinimapTexOffset[extendedMapIndex], - //gMapData->owMinimapTexSize[mapIndex], "../z_map_exp.c", 309); + //gMapData->owMinimapTexSize[mapIndex], __FILE__, __LINE__); if (sEntranceIconMapIndex < 24) memcpy(globalCtx->interfaceCtx.mapSegment, ResourceMgr_LoadTexByName(minimapTableOW[sEntranceIconMapIndex]), gMapData->owMinimapTexSize[mapIndex]); @@ -443,7 +443,7 @@ void Map_InitData(GlobalContext* globalCtx, s16 room) { //DmaMgr_SendRequest1(globalCtx->interfaceCtx.mapSegment, //(uintptr_t)_map_i_staticSegmentRomStart + //((gMapData->dgnMinimapTexIndexOffset[mapIndex] + room) * 0xFF0), - //0xFF0, "../z_map_exp.c", 346); + //0xFF0, __FILE__, __LINE__); memcpy(globalCtx->interfaceCtx.mapSegment, ResourceMgr_LoadTexByName(minimapTableDangeon[gMapData->dgnMinimapTexIndexOffset[mapIndex] + room]), 0xFF0); @@ -516,11 +516,11 @@ void Map_Init(GlobalContext* globalCtx) { interfaceCtx->unk_258 = -1; interfaceCtx->unk_25A = -1; - interfaceCtx->mapSegment = GameState_Alloc(&globalCtx->state, 0x1000, "../z_map_exp.c", 457); + interfaceCtx->mapSegment = GAMESTATE_ALLOC_MC(&globalCtx->state, 0x1000); // "ＭＡＰ texture initialization scene_data_ID=%d mapSegment=%x" osSyncPrintf("\n\n\nＭＡＰ テクスチャ初期化 scene_data_ID=%d\nmapSegment=%x\n\n", globalCtx->sceneNum, interfaceCtx->mapSegment, globalCtx); - ASSERT(interfaceCtx->mapSegment != NULL, "parameter->mapSegment != NULL", "../z_map_exp.c", 459); + ASSERT(interfaceCtx->mapSegment != NULL); switch (globalCtx->sceneNum) { case SCENE_SPOT00: @@ -599,7 +599,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { Player* player = GET_PLAYER(globalCtx); s16 tempX, tempZ; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_map_exp.c", 565); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->interfaceCtx.minimapAlpha >= 0xAA) { func_80094A14(globalCtx->state.gfxCtx); @@ -618,7 +618,7 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { Matrix_RotateX(-1.6f, MTXMODE_APPLY); tempX = (0x7FFF - player->actor.shape.rot.y) / 0x400; Matrix_RotateY(tempX / 10.0f, MTXMODE_APPLY); - gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_map_exp.c", 585), + gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 200, 255, 0, 255); @@ -632,14 +632,14 @@ void Minimap_DrawCompassIcons(GlobalContext* globalCtx) { Matrix_Scale(VREG(9) / 100.0f, VREG(9) / 100.0f, VREG(9) / 100.0f, MTXMODE_APPLY); Matrix_RotateX(VREG(52) / 10.0f, MTXMODE_APPLY); Matrix_RotateY(sPlayerInitialDirection / 10.0f, MTXMODE_APPLY); - gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_map_exp.c", 603), + gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetPrimColor(OVERLAY_DISP++, 0, 0xFF, 200, 0, 0, 255); gSPDisplayList(OVERLAY_DISP++, gCompassArrowDL); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_map_exp.c", 607); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Minimap_Draw(GlobalContext* globalCtx) { @@ -647,7 +647,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s32 mapIndex = gSaveContext.mapIndex; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_map_exp.c", 626); + OPEN_DISPS(globalCtx->state.gfxCtx); if (globalCtx->pauseCtx.state < 4) { switch (globalCtx->sceneNum) { @@ -819,7 +819,7 @@ void Minimap_Draw(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_map_exp.c", 782); + CLOSE_DISPS(globalCtx->state.gfxCtx); } s16 Map_GetFloorTextIndexOffset(s32 mapIndex, s32 floor) { @@ -876,7 +876,6 @@ void Map_Update(GlobalContext* globalCtx) { if (R_MAP_TEX_INDEX != (R_MAP_TEX_INDEX_BASE + Map_GetFloorTextIndexOffset(mapIndex, floor))) { R_MAP_TEX_INDEX = R_MAP_TEX_INDEX_BASE + Map_GetFloorTextIndexOffset(mapIndex, floor); } - if (1) {} // Appears to be necessary to match if (interfaceCtx->mapRoomNum != sLastRoomNum) { // "Current floor = %d Current room = %x Number of rooms = %d" diff --git a/soh/src/code/z_map_mark.c b/soh/src/code/z_map_mark.c index 894daeb2d..9102a457e 100644 --- a/soh/src/code/z_map_mark.c +++ b/soh/src/code/z_map_mark.c @@ -58,8 +58,8 @@ void MapMark_Init(GlobalContext* globalCtx) { MapMarkDataOverlay* overlay = &sMapMarkDataOvl; u32 overlaySize = (uintptr_t)overlay->vramEnd - (uintptr_t)overlay->vramStart; - overlay->loadedRamAddr = GameState_Alloc(&globalCtx->state, overlaySize, "../z_map_mark.c", 235); - LogUtils_CheckNullPointer("dlftbl->allocp", overlay->loadedRamAddr, "../z_map_mark.c", 236); + overlay->loadedRamAddr = GAMESTATE_ALLOC_MC(&globalCtx->state, overlaySize); + LOG_CHECK_NULL_POINTER("dlftbl->allocp", overlay->loadedRamAddr); Overlay_Load(overlay->vromStart, overlay->vromEnd, overlay->vramStart, overlay->vramEnd, overlay->loadedRamAddr); @@ -96,7 +96,7 @@ void MapMark_DrawForDungeon(GlobalContext* globalCtx) { mapMarkIconData = &sLoadedMarkDataTable[dungeon][interfaceCtx->mapRoomNum][0]; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_map_mark.c", 303); + OPEN_DISPS(globalCtx->state.gfxCtx); while (true) { if (mapMarkIconData->markType == MAP_MARK_NONE) { @@ -145,7 +145,7 @@ void MapMark_DrawForDungeon(GlobalContext* globalCtx) { mapMarkIconData++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_map_mark.c", 339); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void MapMark_Draw(GlobalContext* globalCtx) { diff --git a/soh/src/code/z_message_PAL.c b/soh/src/code/z_message_PAL.c index 952fda106..584322f30 100644 --- a/soh/src/code/z_message_PAL.c +++ b/soh/src/code/z_message_PAL.c @@ -1629,7 +1629,7 @@ void Message_OpenText(GlobalContext* globalCtx, u16 textId) { // OTRTODO //DmaMgr_SendRequest1(font->msgBuf, (uintptr_t)(_staff_message_data_staticSegmentRomStart + 4 + font->msgOffset), - //font->msgLength, "../z_message_PAL.c", 1954); + //font->msgLength, __FILE__, __LINE__); } else { Message_FindMessage(globalCtx, textId); msgCtx->msgLength = font->msgLength; @@ -2869,7 +2869,6 @@ void Message_DrawMain(GlobalContext* globalCtx, Gfx** p) { break; } - if (1) {} if (sOcarinaNotesAlphaValues[i] != 255) { sOcarinaNotesAlphaValues[i] += VREG(50); if (sOcarinaNotesAlphaValues[i] >= 255) { @@ -2922,7 +2921,7 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { static s16 sFillTimer = 0; s32 pad; - OPEN_DISPS(gfxCtx, "../z_message_PAL.c", 3485); + OPEN_DISPS(gfxCtx); if (sVarLastValue != *var) { sVarLastValue = *var; @@ -2943,7 +2942,7 @@ void Message_DrawDebugVariableChanged(s16* var, GraphicsContext* gfxCtx) { gDPFillRectangle(POLY_OPA_DISP++, 40, 120, 60, 140); // 20x20 white box gDPPipeSync(POLY_OPA_DISP++); } - CLOSE_DISPS(gfxCtx, "../z_message_PAL.c", 3513); + CLOSE_DISPS(gfxCtx); } void Message_DrawDebugText(GlobalContext* globalCtx, Gfx** p) { @@ -2969,7 +2968,7 @@ void Message_Draw(GlobalContext* globalCtx) { Gfx* polyOpaP; s16 watchVar; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_message_PAL.c", 3554); + OPEN_DISPS(globalCtx->state.gfxCtx); watchVar = gSaveContext.scarecrowCustomSongSet; Message_DrawDebugVariableChanged(&watchVar, globalCtx->state.gfxCtx); @@ -2981,14 +2980,13 @@ void Message_Draw(GlobalContext* globalCtx) { Graph_BranchDlist(polyOpaP, plusOne); POLY_OPA_DISP = plusOne; } - if (1) {} plusOne = Graph_GfxPlusOne(polyOpaP = POLY_OPA_DISP); gSPDisplayList(OVERLAY_DISP++, plusOne); Message_DrawMain(globalCtx, &plusOne); gSPEndDisplayList(plusOne++); Graph_BranchDlist(polyOpaP, plusOne); POLY_OPA_DISP = plusOne; - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_message_PAL.c", 3582); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Message_Update(GlobalContext* globalCtx) { diff --git a/soh/src/code/z_moji.c b/soh/src/code/z_moji.c index dddaf4d3d..ff6c04800 100644 --- a/soh/src/code/z_moji.c +++ b/soh/src/code/z_moji.c @@ -73,7 +73,7 @@ void Moji_SetPosition(s32 gridX, s32 gridY) { void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { s32 pad[2]; - OPEN_DISPS(gfxCtx, "../z_moji.c", 86); + OPEN_DISPS(gfxCtx); if ((u32)gMojiFontTLUTs & 0xF) { osSyncPrintf("moji_tlut --> %X\n", gMojiFontTLUTs); @@ -87,7 +87,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { (sScreenPosY + DISP_CHAR_HEIGHT) << 2, G_TX_RENDERTILE, GET_TEX_CHAR_S(c), GET_TEX_CHAR_T(c), (1 << 10) * TEX_CHAR_WIDTH / DISP_CHAR_WIDTH, (1 << 10) * TEX_CHAR_HEIGHT / DISP_CHAR_HEIGHT); - CLOSE_DISPS(gfxCtx, "../z_moji.c", 123); + CLOSE_DISPS(gfxCtx); } /** @@ -99,7 +99,7 @@ void Moji_DrawChar(GraphicsContext* gfxCtx, char c) { void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) { s32 i; - OPEN_DISPS(gfxCtx, "../z_moji.c", 137); + OPEN_DISPS(gfxCtx); if ((u32)gMojiFontTex & 0xF) { osSyncPrintf("font_ff --> %X\n", gMojiFontTex); @@ -140,5 +140,5 @@ void Moji_DrawString(GraphicsContext* gfxCtx, const char* str) { } } - CLOSE_DISPS(gfxCtx, "../z_moji.c", 181); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/code/z_onepointdemo.c b/soh/src/code/z_onepointdemo.c index 538859764..bd765d9cd 100644 --- a/soh/src/code/z_onepointdemo.c +++ b/soh/src/code/z_onepointdemo.c @@ -246,7 +246,7 @@ s32 OnePointCutscene_SetInfo(GlobalContext* globalCtx, s16 camIdx, s16 csId, Act D_801211D4[0].atTargetInit.y = actor->focus.pos.y - 5.0f; D_801211D4[0].atTargetInit.z = actor->focus.pos.z; spC0 = ((EnSw*)actor)->unk_364; - osSyncPrintf("%s(%d): xyz_t: %s (%f %f %f)\n", "../z_onepointdemo.c", 1671, "&cp", spC0.x, spC0.y, + osSyncPrintf("%s(%d): xyz_t: %s (%f %f %f)\n", __FILE__, __LINE__, "&cp", spC0.x, spC0.y, spC0.z); D_801211D4[0].eyeTargetInit.x = (actor->focus.pos.x + (120.0f * spC0.x)) - (Rand_ZeroOne() * 20.0f); D_801211D4[0].eyeTargetInit.y = actor->focus.pos.y + (120.0f * spC0.y) + 20.0f; diff --git a/soh/src/code/z_parameter.c b/soh/src/code/z_parameter.c index 303964eb1..716dfacd1 100644 --- a/soh/src/code/z_parameter.c +++ b/soh/src/code/z_parameter.c @@ -998,7 +998,6 @@ void func_80083108(GlobalContext* globalCtx) { gSaveContext.buttonStatus[0] = gSaveContext.equips.buttonItems[0]; } } - if (1) {} // Necessary to match } if (sp28) { @@ -1495,7 +1494,7 @@ void Interface_LoadItemIcon1(GlobalContext* globalCtx, u16 button) { osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, interfaceCtx->iconItemSegment + button * 0x1000, (uintptr_t)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000), - 0x1000, 0, &interfaceCtx->loadQueue, OS_MESG_PTR(NULL), "../z_parameter.c", 1171); + 0x1000, 0, &interfaceCtx->loadQueue, OS_MESG_PTR(NULL), __FILE__, __LINE__); osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); } @@ -1505,7 +1504,7 @@ void Interface_LoadItemIcon2(GlobalContext* globalCtx, u16 button) { osCreateMesgQueue(&interfaceCtx->loadQueue, &interfaceCtx->loadMsg, OS_MESG_BLOCK); DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_180, interfaceCtx->iconItemSegment + button * 0x1000, (uintptr_t)_icon_item_staticSegmentRomStart + (gSaveContext.equips.buttonItems[button] * 0x1000), - 0x1000, 0, &interfaceCtx->loadQueue, OS_MESG_PTR(NULL), "../z_parameter.c", 1193); + 0x1000, 0, &interfaceCtx->loadQueue, OS_MESG_PTR(NULL), __FILE__, __LINE__); osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); } @@ -2312,7 +2311,7 @@ void Interface_LoadActionLabel(InterfaceContext* interfaceCtx, u16 action, s16 l //DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, //interfaceCtx->doActionSegment + (loadOffset * DO_ACTION_TEX_SIZE), //(uintptr_t)_do_action_staticSegmentRomStart + (action * DO_ACTION_TEX_SIZE), DO_ACTION_TEX_SIZE, - //0, &interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2145); + //0, &interfaceCtx->loadQueue, NULL, __FILE__, __LINE__); //osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); } else { gSegments[7] = VIRTUAL_TO_PHYSICAL(interfaceCtx->doActionSegment); @@ -2398,7 +2397,7 @@ void Interface_LoadActionLabelB(GlobalContext* globalCtx, u16 action) { memcpy(interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE, ResourceMgr_LoadTexByName(doAction), DO_ACTION_TEX_SIZE); //DmaMgr_SendRequest2(&interfaceCtx->dmaRequest_160, interfaceCtx->doActionSegment + DO_ACTION_TEX_SIZE, //(uintptr_t)_do_action_staticSegmentRomStart + (action * DO_ACTION_TEX_SIZE), DO_ACTION_TEX_SIZE, 0, - //&interfaceCtx->loadQueue, NULL, "../z_parameter.c", 2228); + //&interfaceCtx->loadQueue, NULL, __FILE__, __LINE__); osRecvMesg(&interfaceCtx->loadQueue, NULL, OS_MESG_BLOCK); interfaceCtx->unk_1FA = 1; @@ -2835,7 +2834,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; s16 magicBarY; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 2650); + OPEN_DISPS(globalCtx->state.gfxCtx); if (gSaveContext.magicLevel != 0) { if (gSaveContext.healthCapacity > 0xA0) { @@ -2921,7 +2920,7 @@ void Interface_DrawMagicBar(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 2731); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void func_80088AA0(s16 arg0) { @@ -2961,7 +2960,7 @@ void func_80088B34(s16 arg0) { } void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { - OPEN_DISPS(gfxCtx, "../z_parameter.c", 2820); + OPEN_DISPS(gfxCtx); gDPLoadTextureBlock_4b(OVERLAY_DISP++, texture, G_IM_FMT_IA, DO_ACTION_TEX_WIDTH, DO_ACTION_TEX_HEIGHT, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, @@ -2969,7 +2968,7 @@ void Interface_DrawActionLabel(GraphicsContext* gfxCtx, void* texture) { gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); - CLOSE_DISPS(gfxCtx, "../z_parameter.c", 2829); + CLOSE_DISPS(gfxCtx); } void Interface_DrawItemButtons(GlobalContext* globalCtx) { @@ -2988,7 +2987,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { s16 C_Up_BTN_Pos[] = { C_UP_BUTTON_X+Right_HUD_Margin, C_UP_BUTTON_Y+(Top_HUD_Margin*-1) }; s16 C_Down_BTN_Pos[] = { C_DOWN_BUTTON_X+Right_HUD_Margin, C_DOWN_BUTTON_Y+(Top_HUD_Margin*-1) }; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 2900); + OPEN_DISPS(globalCtx->state.gfxCtx); // B Button Color & Texture // Also loads the Item Button Texture reused by other buttons afterwards @@ -3184,7 +3183,7 @@ void Interface_DrawItemButtons(GlobalContext* globalCtx) { } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3071); + CLOSE_DISPS(globalCtx->state.gfxCtx); } int16_t gItemIconX[] = { B_BUTTON_X, C_LEFT_BUTTON_X, C_DOWN_BUTTON_X, C_RIGHT_BUTTON_X, @@ -3195,7 +3194,7 @@ int16_t gItemIconWidth[] = { 30, 24, 24, 24, 16, 16, 16, 16 }; int16_t gItemIconDD[] = { 550, 680, 680, 680, 1024, 1024, 1024, 1024 }; void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 button) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3079); + OPEN_DISPS(globalCtx->state.gfxCtx); gDPLoadTextureBlock(OVERLAY_DISP++, texture, G_IM_FMT_RGBA, G_IM_SIZ_32b, 32, 32, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD); @@ -3207,7 +3206,7 @@ void Interface_DrawItemIconTexture(GlobalContext* globalCtx, void* texture, s16 (gItemIconY[button] + (Top_HUD_Margin * -1) + gItemIconWidth[button]) << 2, G_TX_RENDERTILE, 0, 0, gItemIconDD[button] << 1, gItemIconDD[button] << 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3094); + CLOSE_DISPS(globalCtx->state.gfxCtx); } const char* _gAmmoDigit0Tex[] = @@ -3225,7 +3224,7 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { s16 i; s16 ammo; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3105); + OPEN_DISPS(globalCtx->state.gfxCtx); i = gSaveContext.equips.buttonItems[button]; @@ -3278,19 +3277,19 @@ void Interface_DrawAmmoCount(GlobalContext* globalCtx, s16 button, s16 alpha) { gItemAmmoY[button] + (Top_HUD_Margin * -1), 8, 8, 1 << 10, 1 << 10); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3158); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Interface_DrawActionButton(GlobalContext* globalCtx, f32 x, f32 y) { InterfaceContext* interfaceCtx = &globalCtx->interfaceCtx; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3172); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Translate(-137.0f + x, 97.0f - y, XREG(18) / 10.0f, MTXMODE_NEW); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY); - gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3177), + gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPVertex(OVERLAY_DISP++, &interfaceCtx->actionVtx[0], 4, 0); @@ -3300,7 +3299,7 @@ void Interface_DrawActionButton(GlobalContext* globalCtx, f32 x, f32 y) { gSP1Quadrangle(OVERLAY_DISP++, 0, 2, 3, 1, 0); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3187); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Interface_InitVertices(GlobalContext* globalCtx) { @@ -3464,7 +3463,7 @@ void Interface_Draw(GlobalContext* globalCtx) { s16 svar6; bool fullUi = !CVar_GetS32("gMinimalUI", 0) || !R_MINIMAP_DISABLED || globalCtx->pauseCtx.state != 0; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 3405); + OPEN_DISPS(globalCtx->state.gfxCtx); // Invalidate Do Action textures as they may have changed gSPInvalidateTexCache(OVERLAY_DISP++, interfaceCtx->doActionSegment); @@ -3800,7 +3799,7 @@ void Interface_Draw(GlobalContext* globalCtx) { Matrix_Translate(-138.0f + rAIconX, 98.0f - (R_A_ICON_Y+(Top_HUD_Margin*-1)), WREG(46 + gSaveContext.language) / 10.0f, MTXMODE_NEW); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_RotateX(interfaceCtx->unk_1F4 / 10000.0f, MTXMODE_APPLY); - gSPMatrix(OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_parameter.c", 3701), + gSPMatrix(OVERLAY_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); gSPVertex(OVERLAY_DISP++, &interfaceCtx->actionVtx[4], 4, 0); @@ -4352,7 +4351,7 @@ void Interface_Draw(GlobalContext* globalCtx) { gDPFillRectangle(OVERLAY_DISP++, 0, 0, gScreenWidth - 1, gScreenHeight - 1); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_parameter.c", 4269); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Interface_Update(GlobalContext* globalCtx) { diff --git a/soh/src/code/z_play.c b/soh/src/code/z_play.c index 0850ba5db..bb579dce2 100644 --- a/soh/src/code/z_play.c +++ b/soh/src/code/z_play.c @@ -28,7 +28,7 @@ void func_800BC450(GlobalContext* globalCtx) { } void func_800BC490(GlobalContext* globalCtx, s16 point) { - ASSERT(point == 1 || point == 2, "point == 1 || point == 2", "../z_play.c", 2160); + ASSERT(point == 1 || point == 2); globalCtx->unk_1242B = point; @@ -135,7 +135,7 @@ void func_800BC5E0(GlobalContext* globalCtx, s32 transitionType) { globalCtx->transitionMode = 16; break; default: - Fault_AddHungupAndCrash("../z_play.c", 2290); + Fault_AddHungupAndCrash(__FILE__, __LINE__); break; } } @@ -365,7 +365,7 @@ void Gameplay_Init(GameState* thisx) { osSyncPrintf("ZELDA ALLOC SIZE=%x\n", THA_GetSize(&globalCtx->state.tha)); zAllocSize = THA_GetSize(&globalCtx->state.tha); - zAlloc = GameState_Alloc(&globalCtx->state, zAllocSize, "../z_play.c", 2918); + zAlloc = GAMESTATE_ALLOC_MC(&globalCtx->state, zAllocSize); zAllocAligned = (zAlloc + 8) & ~0xF; ZeldaArena_Init(zAllocAligned, zAllocSize - zAllocAligned + zAlloc); // "Zelda Heap" @@ -728,7 +728,7 @@ void Gameplay_Update(GlobalContext* globalCtx) { globalCtx->envCtx.sandstormPrimA = 255; globalCtx->envCtx.sandstormEnvA = 255; // "It's here!!!!!!!!!" - LOG_STRING("来た!!!!!!!!!!!!!!!!!!!!!", "../z_play.c", 3471); + 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, "../z_play.c", 3533); + LOG_NUM("1", 1); } if (1 && (gTrnsnUnkState != 3)) { if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3542); + 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, "../z_play.c", 3551); + LOG_NUM("1", 1); } sp80 = (globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3555); + LOG_NUM("1", 1); } AnimationContext_Reset(&globalCtx->animationCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3561); + LOG_NUM("1", 1); } Object_UpdateBank(&globalCtx->objectCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3577); + LOG_NUM("1", 1); } if ((sp80 == 0) && (IREG(72) == 0)) { if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3580); + LOG_NUM("1", 1); } globalCtx->gameplayFrames++; @@ -830,37 +830,37 @@ void Gameplay_Update(GlobalContext* globalCtx) { } } else { if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3606); + LOG_NUM("1", 1); } func_800973FC(globalCtx, &globalCtx->roomCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3612); + LOG_NUM("1", 1); } CollisionCheck_AT(globalCtx, &globalCtx->colChkCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3618); + LOG_NUM("1", 1); } CollisionCheck_OC(globalCtx, &globalCtx->colChkCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3624); + LOG_NUM("1", 1); } CollisionCheck_Damage(globalCtx, &globalCtx->colChkCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3631); + LOG_NUM("1", 1); } CollisionCheck_ClearContext(globalCtx, &globalCtx->colChkCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3637); + 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, "../z_play.c", 3643); + LOG_NUM("1", 1); } func_80064558(globalCtx, &globalCtx->csCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3648); + LOG_NUM("1", 1); } func_800645A0(globalCtx, &globalCtx->csCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3651); + LOG_NUM("1", 1); } Effect_UpdateAll(globalCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3657); + LOG_NUM("1", 1); } EffectSs_UpdateAll(globalCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3662); + LOG_NUM("1", 1); } } } else { @@ -900,19 +900,19 @@ void Gameplay_Update(GlobalContext* globalCtx) { } if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3672); + LOG_NUM("1", 1); } func_80095AA0(globalCtx, &globalCtx->roomCtx.curRoom, &input[1], 0); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3675); + LOG_NUM("1", 1); } func_80095AA0(globalCtx, &globalCtx->roomCtx.prevRoom, &input[1], 1); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3677); + 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, "../z_play.c", 3708); + LOG_NUM("1", 1); } SkyboxDraw_Update(&globalCtx->skyboxCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3716); + LOG_NUM("1", 1); } if ((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0)) { if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3721); + LOG_NUM("1", 1); } KaleidoScopeCall_Update(globalCtx); } else if (globalCtx->gameOverCtx.state != GAMEOVER_INACTIVE) { if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3727); + LOG_NUM("1", 1); } GameOver_Update(globalCtx); } else { if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3733); + LOG_NUM("1", 1); } Message_Update(globalCtx); } if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3737); + LOG_NUM("1", 1); } if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3742); + LOG_NUM("1", 1); } Interface_Update(globalCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3765); + LOG_NUM("1", 1); } AnimationContext_Update(globalCtx, &globalCtx->animationCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3771); + LOG_NUM("1", 1); } SoundSource_UpdateAll(globalCtx); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3777); + LOG_NUM("1", 1); } ShrinkWindow_Update(R_UPDATE_RATE); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3783); + 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, "../z_play.c", 3799); + LOG_NUM("1", 1); } skip: if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3801); + 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, "../z_play.c", 3806); + 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, "../z_play.c", 3809); + 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, "../z_play.c", 3814); + LOG_NUM("1", 1); } } if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 3816); + LOG_NUM("1", 1); } Environment_Update(globalCtx, &globalCtx->envCtx, &globalCtx->lightCtx, &globalCtx->pauseCtx, &globalCtx->msgCtx, @@ -1065,7 +1065,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) { Lights* sp228; Vec3f sp21C; - OPEN_DISPS(gfxCtx, "../z_play.c", 3907); + OPEN_DISPS(gfxCtx); gSegments[4] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[globalCtx->objectCtx.mainKeepIndex].segment); gSegments[5] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[globalCtx->objectCtx.subKeepIndex].segment); @@ -1109,7 +1109,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) { 0.0f; // This transpose is where the viewing matrix is properly converted into a billboard matrix Matrix_Transpose(&globalCtx->billboardMtxF); - globalCtx->billboardMtx = Matrix_MtxFToMtx(Matrix_CheckFloats(&globalCtx->billboardMtxF, "../z_play.c", 4005), + globalCtx->billboardMtx = Matrix_MtxFToMtx(MATRIX_CHECKFLOATS(&globalCtx->billboardMtxF), Graph_Alloc(gfxCtx, sizeof(Mtx))); gSPSegment(POLY_OPA_DISP++, 0x01, globalCtx->billboardMtx); @@ -1341,7 +1341,7 @@ void Gameplay_Draw(GlobalContext* globalCtx) { POLY_OPA_DISP = gfxP; } - CLOSE_DISPS(gfxCtx, "../z_play.c", 4508); + CLOSE_DISPS(gfxCtx); } void Gameplay_Main(GameState* thisx) { @@ -1352,7 +1352,7 @@ void Gameplay_Main(GameState* thisx) { DebugDisplay_Init(); if (1 && HREG(63)) { - LOG_NUM("1", 1, "../z_play.c", 4556); + 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, "../z_play.c", 4583); + 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, "../z_play.c", 4587); + LOG_NUM("1", 1); } } @@ -1465,8 +1465,8 @@ void* Gameplay_LoadFile(GlobalContext* globalCtx, RomFile* file) { void* allocp; size = file->vromEnd - file->vromStart; - allocp = GameState_Alloc(&globalCtx->state, size, "../z_play.c", 4692); - DmaMgr_SendRequest1(allocp, file->vromStart, size, "../z_play.c", 4694); + allocp = GAMESTATE_ALLOC_MC(&globalCtx->state, size); + DmaMgr_SendRequest1(allocp, file->vromStart, size, __FILE__, __LINE__); return allocp; } @@ -1647,7 +1647,6 @@ s32 Gameplay_CameraSetAtEyeUp(GlobalContext* globalCtx, s16 camId, Vec3f* at, Ve s32 Gameplay_CameraSetFov(GlobalContext* globalCtx, s16 camId, f32 fov) { s32 ret = Camera_SetParam(globalCtx->cameraPtrs[camId], 0x20, &fov) & 1; - if (1) {} return ret; } diff --git a/soh/src/code/z_player_lib.c b/soh/src/code/z_player_lib.c index d40aeab99..a12a14481 100644 --- a/soh/src/code/z_player_lib.c +++ b/soh/src/code/z_player_lib.c @@ -630,8 +630,6 @@ s32 func_8008F2F8(GlobalContext* globalCtx) { if (!Player_InCsMode(globalCtx)) { triggerEntry = &sTextTriggers[var]; - if (0) {} - if ((triggerEntry->flag != 0) && !(gSaveContext.textTriggerFlags & triggerEntry->flag) && (((var == 0) && (this->currentTunic != PLAYER_TUNIC_GORON && CVar_GetS32("gSuperTunic", 0) == 0)) || (((var == 1) || (var == 3)) && (this->currentBoots == PLAYER_BOOTS_IRON) && @@ -719,7 +717,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, s32 eyeIndex = (jointTable[22].x & 0xF) - 1; s32 mouthIndex = (jointTable[22].x >> 4) - 1; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 1721); + OPEN_DISPS(globalCtx->state.gfxCtx); if (eyeIndex < 0) { eyeIndex = sEyeMouthIndexes[face][0]; @@ -814,7 +812,7 @@ void func_8008F470(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable, } } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 1803); + CLOSE_DISPS(globalCtx->state.gfxCtx); } Vec3f D_8012602C = { 0.0f, 0.0f, 0.0f }; @@ -1166,7 +1164,7 @@ void func_800906D4(GlobalContext* globalCtx, Player* this, Vec3f* newTipPos) { void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPos, s32 drawIdPlusOne) { f32 height = (this->exchangeItemId != EXCH_ITEM_NONE) ? 6.0f : 14.0f; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2401); + OPEN_DISPS(globalCtx->state.gfxCtx); gSegments[6] = VIRTUAL_TO_PHYSICAL(this->giObjectSegment); @@ -1180,7 +1178,7 @@ void Player_DrawGetItemImpl(GlobalContext* globalCtx, Player* this, Vec3f* refPo GetItem_Draw(globalCtx, drawIdPlusOne - 1); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2421); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void Player_DrawGetItem(GlobalContext* globalCtx, Player* this) { @@ -1223,10 +1221,8 @@ void Player_DrawHookshotReticle(GlobalContext* globalCtx, Player* this, f32 arg2 D_801260C8.z = arg2; Matrix_MultVec3f(&D_801260C8, &sp80); - if (1) {} - if (BgCheck_AnyLineTest3(&globalCtx->colCtx, &sp8C, &sp80, &sp74, &sp9C, 1, 1, 1, 1, &bgId)) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2572); + OPEN_DISPS(globalCtx->state.gfxCtx); WORLD_OVERLAY_DISP = Gfx_CallSetupDL(WORLD_OVERLAY_DISP, 0x07); @@ -1237,12 +1233,12 @@ void Player_DrawHookshotReticle(GlobalContext* globalCtx, Player* this, f32 arg2 Matrix_Translate(sp74.x, sp74.y, sp74.z, MTXMODE_NEW); Matrix_Scale(sp60, sp60, sp60, MTXMODE_APPLY); - gSPMatrix(WORLD_OVERLAY_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2587), + gSPMatrix(WORLD_OVERLAY_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPSegment(WORLD_OVERLAY_DISP++, 0x06, globalCtx->objectCtx.status[this->actor.objBankIndex].segment); gSPDisplayList(WORLD_OVERLAY_DISP++, gLinkAdultHookshotReticleDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2592); + CLOSE_DISPS(globalCtx->state.gfxCtx); } } @@ -1308,7 +1304,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* if (this->itemActionParam == PLAYER_AP_STICK) { Vec3f sp124[3]; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2633); + OPEN_DISPS(globalCtx->state.gfxCtx); if (this->actor.scale.y >= 0.0f) { D_80126080.x = this->unk_85C * 5000.0f; @@ -1324,11 +1320,11 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* Matrix_RotateZYX(-0x8000, 0, 0x4000, MTXMODE_APPLY); Matrix_Scale(1.0f, this->unk_85C, 1.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2653), + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_OPA_DISP++, gLinkChildLinkDekuStickDL); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2656); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else if ((this->actor.scale.y >= 0.0f) && (this->swordState != 0)) { Vec3f spE4[3]; @@ -1343,14 +1339,14 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* } else if ((*dList != NULL) && (this->leftHandType == 7)) { Color_RGB8* bottleColor = &sBottleColors[Player_ActionToBottle(this, this->itemActionParam)]; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2710); + OPEN_DISPS(globalCtx->state.gfxCtx); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2712), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetEnvColor(POLY_XLU_DISP++, bottleColor->r, bottleColor->g, bottleColor->b, 0); gSPDisplayList(POLY_XLU_DISP++, sBottleDLists[(gSaveContext.linkAge)]); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2717); + CLOSE_DISPS(globalCtx->state.gfxCtx); } if (this->actor.scale.y >= 0.0f) { @@ -1386,7 +1382,7 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* } else if ((this->rightHandType == 11) || (this->rightHandType == 12)) { BowStringData* stringData = &sBowStringData[gSaveContext.linkAge]; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2783); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); Matrix_Translate(stringData->pos.x, stringData->pos.y, stringData->pos.z, MTXMODE_APPLY); @@ -1417,13 +1413,13 @@ void func_80090D20(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* Matrix_RotateZ(this->unk_858 * -0.2f, MTXMODE_APPLY); } - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player_lib.c", 2804), + gSPMatrix(POLY_XLU_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPDisplayList(POLY_XLU_DISP++, stringData->dList); Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 2809); + CLOSE_DISPS(globalCtx->state.gfxCtx); } else if ((this->actor.scale.y >= 0.0f) && (this->rightHandType == 10)) { Matrix_Get(&this->shieldMf); func_80090604(globalCtx, this, &this->shieldQuad, D_80126154); @@ -1493,11 +1489,11 @@ u32 func_80091738(GlobalContext* globalCtx, u8* segment, SkelAnime* skelAnime) { size = gObjectTable[OBJECT_GAMEPLAY_KEEP].vromEnd - gObjectTable[OBJECT_GAMEPLAY_KEEP].vromStart; ptr = segment + 0x3800; - DmaMgr_SendRequest1(ptr, gObjectTable[OBJECT_GAMEPLAY_KEEP].vromStart, size, "../z_player_lib.c", 2982); + DmaMgr_SendRequest1(ptr, gObjectTable[OBJECT_GAMEPLAY_KEEP].vromStart, size, __FILE__, __LINE__); size = gObjectTable[linkObjectId].vromEnd - gObjectTable[linkObjectId].vromStart; ptr = segment + 0x8800; - DmaMgr_SendRequest1(ptr, gObjectTable[linkObjectId].vromStart, size, "../z_player_lib.c", 2988); + DmaMgr_SendRequest1(ptr, gObjectTable[linkObjectId].vromStart, size, __FILE__, __LINE__); ptr = (void*)ALIGN16((intptr_t)ptr + size); @@ -1590,7 +1586,7 @@ void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, SkelAnime Mtx* perspMtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx)); Mtx* lookAtMtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx)); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 3129); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); @@ -1660,7 +1656,7 @@ void func_80091A24(GlobalContext* globalCtx, void* seg04, void* seg06, SkelAnime POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP++); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player_lib.c", 3288); + CLOSE_DISPS(globalCtx->state.gfxCtx); } uintptr_t SelectedAnim = 0; // Current Animaiton on the menu diff --git a/soh/src/code/z_prenmi.c b/soh/src/code/z_prenmi.c index 9f0d3ad58..f76255b23 100644 --- a/soh/src/code/z_prenmi.c +++ b/soh/src/code/z_prenmi.c @@ -12,7 +12,7 @@ void PreNMI_Update(PreNMIContext* this) { // Strings existing only in rodata if (0) { - osSyncPrintf("../z_prenmi.c"); + osSyncPrintf(__FILE__); osSyncPrintf("(int)volume = %d\n"); } @@ -30,7 +30,7 @@ void PreNMI_Draw(PreNMIContext* this) { osSyncPrintf(VT_COL(YELLOW, BLACK) "prenmi_draw\n" VT_RST); - OPEN_DISPS(gfxCtx, "../z_prenmi.c", 96); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); func_80095248(gfxCtx, 0, 0, 0); @@ -38,7 +38,7 @@ void PreNMI_Draw(PreNMIContext* this) { gDPSetFillColor(POLY_OPA_DISP++, (GPACK_RGBA5551(255, 255, 255, 1) << 16) | GPACK_RGBA5551(255, 255, 255, 1)); gDPFillRectangle(POLY_OPA_DISP++, 0, this->timer + 100, SCREEN_WIDTH - 1, this->timer + 100); - CLOSE_DISPS(gfxCtx, "../z_prenmi.c", 112); + CLOSE_DISPS(gfxCtx); } void PreNMI_Main(GameState* thisx) { diff --git a/soh/src/code/z_rcp.c b/soh/src/code/z_rcp.c index 63ce5bb8a..7050973e1 100644 --- a/soh/src/code/z_rcp.c +++ b/soh/src/code/z_rcp.c @@ -852,7 +852,7 @@ Gfx* Gfx_SetFog(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) { far++; } - ASSERT(near != far, "n != f", "../z_rcp.c", 1155); + ASSERT(near != far); gDPSetFogColor(gfx++, r, g, b, a); @@ -873,7 +873,7 @@ Gfx* Gfx_SetFogWithSync(Gfx* gfx, s32 r, s32 g, s32 b, s32 a, s32 near, s32 far) if (far == near) { far++; } - ASSERT(near != far, "n != f", "../z_rcp.c", 1187); + ASSERT(near != far); gDPPipeSync(gfx++); gDPSetFogColor(gfx++, r, g, b, a); @@ -928,83 +928,83 @@ Gfx* func_80093808(Gfx* gfx) { } void func_80093848(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1293); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x3A]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1297); + CLOSE_DISPS(gfxCtx); } void func_800938B4(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1309); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x39]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1313); + CLOSE_DISPS(gfxCtx); } void func_80093920(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1325); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x32]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1329); + CLOSE_DISPS(gfxCtx); } void func_8009398C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1341); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x33]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1345); + CLOSE_DISPS(gfxCtx); } void func_800939F8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1357); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x34]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1361); + CLOSE_DISPS(gfxCtx); } void func_80093A64(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1373); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x35]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1377); + CLOSE_DISPS(gfxCtx); } void func_80093AD0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1389); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x36]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1393); + CLOSE_DISPS(gfxCtx); } void func_80093B3C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1405); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x37]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1409); + CLOSE_DISPS(gfxCtx); } void func_80093BA8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1421); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1A]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1425); + CLOSE_DISPS(gfxCtx); } void func_80093C14(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1439); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x19]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1443); + CLOSE_DISPS(gfxCtx); } void func_80093C80(GlobalContext* globalCtx) { @@ -1013,52 +1013,52 @@ void func_80093C80(GlobalContext* globalCtx) { func_80093D18(gfxCtx); if (globalCtx->roomCtx.curRoom.unk_03 == 3) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1460); + OPEN_DISPS(gfxCtx); gDPSetColorDither(POLY_OPA_DISP++, G_CD_DISABLE); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1462); + CLOSE_DISPS(gfxCtx); } } void func_80093D18(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1475); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x19]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1479); + CLOSE_DISPS(gfxCtx); } void func_80093D84(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1491); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x19]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1495); + CLOSE_DISPS(gfxCtx); } void func_80093DF0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1507); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1F]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1511); + CLOSE_DISPS(gfxCtx); } void func_80093E5C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1523); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x20]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1527); + CLOSE_DISPS(gfxCtx); } void func_80093EC8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1539); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x21]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1543); + CLOSE_DISPS(gfxCtx); } Gfx* func_80093F34(Gfx* gfx) { @@ -1072,35 +1072,35 @@ Gfx* func_80093F58(Gfx* gfx) { } void func_80093F7C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1569); + OPEN_DISPS(gfxCtx); POLY_OPA_DISP = func_80093F58(POLY_OPA_DISP); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1573); + CLOSE_DISPS(gfxCtx); } void func_80093FD8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1585); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x23]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1589); + CLOSE_DISPS(gfxCtx); } void func_80094044(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1601); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x2C]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1605); + CLOSE_DISPS(gfxCtx); } void func_800940B0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1617); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x24]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1621); + CLOSE_DISPS(gfxCtx); } Gfx* func_8009411C(Gfx* gfx) { @@ -1109,67 +1109,67 @@ Gfx* func_8009411C(Gfx* gfx) { } void func_80094140(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1640); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x1C]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1644); + CLOSE_DISPS(gfxCtx); } void func_800941AC(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1651); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2B]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1655); + CLOSE_DISPS(gfxCtx); } void func_80094218(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1670); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2D]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1674); + CLOSE_DISPS(gfxCtx); } void func_80094284(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1681); + OPEN_DISPS(gfxCtx); gSPDisplayList(OVERLAY_DISP++, sSetupDL[0x2E]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1685); + CLOSE_DISPS(gfxCtx); } void func_800942F0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1700); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x26]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1704); + CLOSE_DISPS(gfxCtx); } void func_8009435C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1722); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x04]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1726); + CLOSE_DISPS(gfxCtx); } void func_800943C8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1758); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x25]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1762); + CLOSE_DISPS(gfxCtx); } void func_80094434(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1775); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x02]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1779); + CLOSE_DISPS(gfxCtx); } Gfx* func_800944A0(Gfx* gfx) { @@ -1178,27 +1178,27 @@ Gfx* func_800944A0(Gfx* gfx) { } void func_800944C4(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1799); + OPEN_DISPS(gfxCtx); POLY_OPA_DISP = func_800944A0(POLY_OPA_DISP); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1801); + CLOSE_DISPS(gfxCtx); } void func_800944C4_KAL(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1799); + OPEN_DISPS(gfxCtx); POLY_KAL_DISP = func_800944A0(POLY_KAL_DISP); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1801); + CLOSE_DISPS(gfxCtx); } void func_80094520(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1809); + OPEN_DISPS(gfxCtx); OVERLAY_DISP = func_800944A0(OVERLAY_DISP); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1811); + CLOSE_DISPS(gfxCtx); } void func_8009457C(Gfx** gfxp) { @@ -1208,27 +1208,27 @@ void func_8009457C(Gfx** gfxp) { } void func_800945A0(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1837); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x28]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1841); + CLOSE_DISPS(gfxCtx); } void func_8009460C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1853); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x29]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1857); + CLOSE_DISPS(gfxCtx); } void func_80094678(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1869); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x2F]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1873); + CLOSE_DISPS(gfxCtx); } Gfx* func_800946E4(Gfx* gfx) { @@ -1288,76 +1288,76 @@ Gfx* func_80094968(Gfx* gfx) { } void func_800949A8(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1953); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x2A]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1957); + CLOSE_DISPS(gfxCtx); } void func_800949A8_KAL(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1953); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_KAL_DISP++, sSetupDL[0x2A]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1957); + CLOSE_DISPS(gfxCtx); } void func_80094A14(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1964); + OPEN_DISPS(gfxCtx); gSPDisplayList(OVERLAY_DISP++, sSetupDL[0x2A]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1968); + CLOSE_DISPS(gfxCtx); } void func_80094A80(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 1992); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x30]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 1996); + CLOSE_DISPS(gfxCtx); } void func_80094AEC(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 2008); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x31]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2012); + CLOSE_DISPS(gfxCtx); } void func_80094B58(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 2024); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x1B]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2028); + CLOSE_DISPS(gfxCtx); } void func_80094BC4(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 2040); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x3C]); gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2043); + CLOSE_DISPS(gfxCtx); } void func_80094C50(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 2056); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_XLU_DISP++, sSetupDL[0x3D]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2058); + CLOSE_DISPS(gfxCtx); } void func_80094CBC(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 2086); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x38]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2090); + CLOSE_DISPS(gfxCtx); } void func_80094D28(Gfx** gfxp) { @@ -1369,11 +1369,11 @@ void func_80094D28(Gfx** gfxp) { } void func_80094D4C(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 2112); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sSetupDL[0x3B]); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2116); + CLOSE_DISPS(gfxCtx); } Gfx* Gfx_BranchTexScroll(Gfx** gfxp, u32 x, u32 y, s32 width, s32 height) { @@ -1454,7 +1454,7 @@ Gfx* Gfx_EnvColor(GraphicsContext* gfxCtx, s32 r, s32 g, s32 b, s32 a) { } void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 2386); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL); gSPDisplayList(POLY_XLU_DISP++, sFillSetupDL); @@ -1545,16 +1545,16 @@ void func_80095248(GraphicsContext* gfxCtx, u8 r, u8 g, u8 b) { } } - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2497); + CLOSE_DISPS(gfxCtx); } void func_80095974(GraphicsContext* gfxCtx) { - OPEN_DISPS(gfxCtx, "../z_rcp.c", 2503); + OPEN_DISPS(gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sFillSetupDL); gDPSetScissor(POLY_OPA_DISP++, G_SC_NON_INTERLACE, 0, 0, gScreenWidth, gScreenHeight); gDPSetDepthImage(POLY_OPA_DISP++, gZBuffer); gDPSetColorImage(POLY_OPA_DISP++, G_IM_FMT_RGBA, G_IM_SIZ_16b, gScreenWidth, gfxCtx->curFrameBuffer); - CLOSE_DISPS(gfxCtx, "../z_rcp.c", 2513); + CLOSE_DISPS(gfxCtx); } diff --git a/soh/src/code/z_room.c b/soh/src/code/z_room.c index f1fa7c7e1..ab3d04721 100644 --- a/soh/src/code/z_room.c +++ b/soh/src/code/z_room.c @@ -37,7 +37,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { PolygonType0* polygon0; PolygonDlist* polygonDlist; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 193); + OPEN_DISPS(globalCtx->state.gfxCtx); if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); @@ -67,7 +67,7 @@ void func_80095AB4(GlobalContext* globalCtx, Room* room, u32 flags) { polygonDlist++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 239); + CLOSE_DISPS(globalCtx->state.gfxCtx); } #define SHAPE_SORT_MAX 64 @@ -99,14 +99,13 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { PolygonDlist2* temp; f32 temp_f2; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 287); + OPEN_DISPS(globalCtx->state.gfxCtx); if (flags & 1) { func_800342EC(&D_801270A0, globalCtx); //gSPSegment(POLY_OPA_DISP++, 0x03, room->segment); func_80093C80(globalCtx); gSPMatrix(POLY_OPA_DISP++, &gMtxClear, G_MTX_MODELVIEW | G_MTX_LOAD); } - if (1) {} if (flags & 2) { func_8003435C(&D_801270A0, globalCtx); //gSPSegment(POLY_XLU_DISP++, 0x03, room->segment); @@ -118,7 +117,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { polygonDlist = SEGMENTED_TO_VIRTUAL(polygon2->start); spA4 = spB8; - ASSERT(polygon2->num <= SHAPE_SORT_MAX, "polygon2->num <= SHAPE_SORT_MAX", "../z_room.c", 317); + ASSERT(polygon2->num <= SHAPE_SORT_MAX); sp78 = polygonDlist; for (sp9C = 0; sp9C < polygon2->num; sp9C++, polygonDlist++) { @@ -215,7 +214,7 @@ void func_80095D04(GlobalContext* globalCtx, Room* room, u32 flags) { iREG(88) = sp9C - 1; - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 430); + CLOSE_DISPS(globalCtx->state.gfxCtx); } //#define JPEG_MARKER 0xFFD8FFE0 @@ -344,7 +343,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { u32 sp94; u32 sp90; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 628); + OPEN_DISPS(globalCtx->state.gfxCtx); camera = GET_ACTIVE_CAM(globalCtx); sp9C = (camera->setting == CAM_SET_PREREND_FIXED); @@ -390,7 +389,7 @@ void func_80096680(GlobalContext* globalCtx, Room* room, u32 flags) { gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 691); + CLOSE_DISPS(globalCtx->state.gfxCtx); } BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) { @@ -422,7 +421,7 @@ BgImage* func_80096A74(PolygonType1* polygon1, GlobalContext* globalCtx) { // "z_room.c: Data consistent with camera id does not exist camid=%d" osSyncPrintf(VT_COL(RED, WHITE) "z_room.c:カメラＩＤに一致するデータが存在しません camid=%d\n" VT_RST, camId); - LogUtils_HungupThread("../z_room.c", 726); + LOG_HUNGUP_THREAD(); return NULL; } @@ -439,7 +438,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { u32 sp90; u32 sp8C; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 752); + OPEN_DISPS(globalCtx->state.gfxCtx); camera = GET_ACTIVE_CAM(globalCtx); sp98 = (camera->setting == CAM_SET_PREREND_FIXED); @@ -485,7 +484,7 @@ void func_80096B6C(GlobalContext* globalCtx, Room* room, u32 flags) { gSPDisplayList(POLY_XLU_DISP++, polygonDlist->xlu); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_room.c", 819); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Room Draw Polygon Type 1 @@ -497,7 +496,7 @@ void func_80096F6C(GlobalContext* globalCtx, Room* room, u32 flags) { } else if (polygon1->format == 2) { func_80096B6C(globalCtx, room, flags); } else { - LogUtils_HungupThread("../z_room.c", 841); + LOG_HUNGUP_THREAD(); } } @@ -530,7 +529,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, "../z_room.c", 912); + LOG_NUM("game_play->room_rom_address.num", globalCtx->numRooms); for (j = 0; j < globalCtx->transiActorCtx.numActors; j++) { frontRoom = transitionActor->sides[0].room; @@ -551,7 +550,7 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx) { osSyncPrintf(VT_FGCOL(YELLOW)); // "Room buffer size=%08x(%5.1fK)" osSyncPrintf("部屋バッファサイズ=%08x(%5.1fK)\n", maxRoomSize, maxRoomSize / 1024.0f); - roomCtx->bufPtrs[0] = GameState_Alloc(&globalCtx->state, maxRoomSize, "../z_room.c", 946); + roomCtx->bufPtrs[0] = GAMESTATE_ALLOC_MC(&globalCtx->state, maxRoomSize); // "Room buffer initial pointer=%08x" osSyncPrintf("部屋バッファ開始ポインタ=%08x\n", roomCtx->bufPtrs[0]); roomCtx->bufPtrs[1] = (void*)((intptr_t)roomCtx->bufPtrs[0] + maxRoomSize); @@ -579,14 +578,14 @@ s32 func_8009728C(GlobalContext* globalCtx, RoomContext* roomCtx, s32 roomNum) { roomCtx->curRoom.segment = NULL; roomCtx->status = 1; - ASSERT(roomNum < globalCtx->numRooms, "read_room_ID < game_play->room_rom_address.num", "../z_room.c", 1009); + ASSERT(roomNum < globalCtx->numRooms); size = globalCtx->roomList[roomNum].vromEnd - globalCtx->roomList[roomNum].vromStart; roomCtx->unk_34 = (void*)ALIGN16((intptr_t)roomCtx->bufPtrs[roomCtx->unk_30] - ((size + 8) * roomCtx->unk_30 + 7)); osCreateMesgQueue(&roomCtx->loadQueue, &roomCtx->loadMsg, 1); DmaMgr_SendRequest2(&roomCtx->dmaRequest, roomCtx->unk_34, globalCtx->roomList[roomNum].vromStart, size, 0, - &roomCtx->loadQueue, OS_MESG_PTR(NULL), "../z_room.c", 1036); + &roomCtx->loadQueue, OS_MESG_PTR(NULL), __FILE__, __LINE__); roomCtx->unk_30 ^= 1; return 1; @@ -622,8 +621,7 @@ void Room_Draw(GlobalContext* globalCtx, Room* room, u32 flags) { if (room->segment != NULL) { gSegments[3] = VIRTUAL_TO_PHYSICAL(room->segment); - ASSERT(room->mesh->polygon.type < ARRAY_COUNTU(sRoomDrawHandlers), - "this->ground_shape->polygon.type < number(Room_Draw_Proc)", "../z_room.c", 1125); + ASSERT(room->mesh->polygon.type < ARRAY_COUNTU(sRoomDrawHandlers)); sRoomDrawHandlers[room->mesh->polygon.type](globalCtx, room, flags); } } diff --git a/soh/src/code/z_sample.c b/soh/src/code/z_sample.c index 21e959678..edb823988 100644 --- a/soh/src/code/z_sample.c +++ b/soh/src/code/z_sample.c @@ -11,7 +11,7 @@ void Sample_Draw(SampleContext* this) { GraphicsContext* gfxCtx = this->state.gfxCtx; View* view = &this->view; - OPEN_DISPS(gfxCtx, "../z_sample.c", 62); + OPEN_DISPS(gfxCtx); gSPSegment(POLY_OPA_DISP++, 0x00, NULL); gSPSegment(POLY_OPA_DISP++, 0x01, this->staticSegment); @@ -36,7 +36,7 @@ void Sample_Draw(SampleContext* this) { gDPSetCombineMode(POLY_OPA_DISP++, G_CC_PRIMITIVE, G_CC_PRIMITIVE); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 0, 0); - CLOSE_DISPS(gfxCtx, "../z_sample.c", 111); + CLOSE_DISPS(gfxCtx); } void Sample_Main(GameState* thisx) { @@ -79,8 +79,8 @@ void Sample_SetupView(SampleContext* this) { void Sample_LoadTitleStatic(SampleContext* this) { size_t size = _title_staticSegmentRomEnd - _title_staticSegmentRomStart; - this->staticSegment = GameState_Alloc(&this->state, size, "../z_sample.c", 163); - DmaMgr_SendRequest1(this->staticSegment, _title_staticSegmentRomStart, size, "../z_sample.c", 164); + this->staticSegment = GAMESTATE_ALLOC_MC(&this->state, size); + DmaMgr_SendRequest1(this->staticSegment, _title_staticSegmentRomStart, size, __FILE__, __LINE__); } void Sample_Init(GameState* thisx) { diff --git a/soh/src/code/z_scene.c b/soh/src/code/z_scene.c index e6dbf64d3..a80fa62ea 100644 --- a/soh/src/code/z_scene.c +++ b/soh/src/code/z_scene.c @@ -15,12 +15,10 @@ s32 Object_Spawn(ObjectContext* objectCtx, s16 objectId) { objectCtx->spaceEnd); ASSERT(((objectCtx->num < OBJECT_EXCHANGE_BANK_MAX) && - (((uintptr_t)objectCtx->status[objectCtx->num].segment + size) < (uintptr_t)objectCtx->spaceEnd)), - "this->num < OBJECT_EXCHANGE_BANK_MAX && (this->status[this->num].Segment + size) < this->endSegment", - "../z_scene.c", 142); + (((uintptr_t)objectCtx->status[objectCtx->num].segment + size) < (uintptr_t)objectCtx->spaceEnd))); DmaMgr_SendRequest1(objectCtx->status[objectCtx->num].segment, gObjectTable[objectId].vromStart, size, - "../z_scene.c", 145); + __FILE__, __LINE__); if (objectCtx->num < OBJECT_EXCHANGE_BANK_MAX - 1) { objectCtx->status[objectCtx->num + 1].segment = @@ -70,7 +68,7 @@ void Object_InitBank(GlobalContext* globalCtx, ObjectContext* objectCtx) { osSyncPrintf(VT_RST); objectCtx->spaceStart = objectCtx->status[0].segment = - GameState_Alloc(&globalCtx->state, spaceSize, "../z_scene.c", 219); + GAMESTATE_ALLOC_MC(&globalCtx->state, spaceSize); objectCtx->spaceEnd = (void*)((uintptr_t)objectCtx->spaceStart + spaceSize); objectCtx->mainKeepIndex = Object_Spawn(objectCtx, OBJECT_GAMEPLAY_KEEP); @@ -92,7 +90,7 @@ void Object_UpdateBank(ObjectContext* objectCtx) { size = objectFile->vromEnd - objectFile->vromStart; osSyncPrintf("OBJECT EXCHANGE BANK-%2d SIZE %8.3fK SEG=%08x\n", i, size / 1024.0f, status->segment); DmaMgr_SendRequest2(&status->dmaRequest, status->segment, objectFile->vromStart, size, 0, - &status->loadQueue, NULL, "../z_scene.c", 266); + &status->loadQueue, NULL, __FILE__, __LINE__); } else if (!osRecvMesg(&status->loadQueue, NULL, OS_MESG_NOBLOCK)) { status->id = -status->id; } @@ -136,7 +134,7 @@ void func_800981B8(ObjectContext* objectCtx) { objectCtx->status[i].segment); osSyncPrintf("num=%d adrs=%x end=%x\n", objectCtx->num, (uintptr_t)objectCtx->status[i].segment + size, objectCtx->spaceEnd); - DmaMgr_SendRequest1(objectCtx->status[i].segment, gObjectTable[id].vromStart, size, "../z_scene.c", 342); + DmaMgr_SendRequest1(objectCtx->status[i].segment, gObjectTable[id].vromStart, size, __FILE__, __LINE__); } } @@ -153,9 +151,8 @@ void* func_800982FC(ObjectContext* objectCtx, s32 bankIndex, s16 objectId) { osSyncPrintf("OBJECT EXCHANGE NO=%2d BANK=%3d SIZE=%8.3fK\n", bankIndex, objectId, size / 1024.0f); nextPtr = (void*)ALIGN16((uintptr_t)status->segment + size); - if (1) {} // Necessary to match - ASSERT(nextPtr < objectCtx->spaceEnd, "nextptr < this->endSegment", "../z_scene.c", 381); + ASSERT(nextPtr < objectCtx->spaceEnd); // "Object exchange free size=%08x" osSyncPrintf("オブジェクト入れ替え空きサイズ=%08x\n", (uintptr_t)objectCtx->spaceEnd - (uintptr_t)nextPtr); @@ -295,10 +292,7 @@ void func_8009899C(GlobalContext* globalCtx, SceneCmd* cmd) { status++; } - ASSERT(cmd->objectList.num <= OBJECT_EXCHANGE_BANK_MAX, "scene_info->object_bank.num <= OBJECT_EXCHANGE_BANK_MAX", - "../z_scene.c", 705); - - if (1) {} + ASSERT(cmd->objectList.num <= OBJECT_EXCHANGE_BANK_MAX); while (k < cmd->objectList.num) { nextPtr = func_800982FC(&globalCtx->objectCtx, i, *objectEntry); @@ -443,8 +437,6 @@ void func_800991A0(GlobalContext* globalCtx, SceneCmd* cmd) { if (gSaveContext.sceneSetupIndex != 0) { altHeader = ((SceneCmd**)SEGMENTED_TO_VIRTUAL(cmd->altHeaders.segment))[gSaveContext.sceneSetupIndex - 1]; - if (1) {} - if (altHeader != NULL) { Scene_ExecuteCommands(globalCtx, SEGMENTED_TO_VIRTUAL(altHeader)); (cmd + 1)->base.code = 0x14; diff --git a/soh/src/code/z_scene_table.c b/soh/src/code/z_scene_table.c index 742d57b9e..ea1f45863 100644 --- a/soh/src/code/z_scene_table.c +++ b/soh/src/code/z_scene_table.c @@ -976,12 +976,12 @@ void func_800994A0(GlobalContext* globalCtx) { // Scene Draw Config 0 void func_80099550(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4725); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPDisplayList(POLY_OPA_DISP++, sDefaultDisplayList); gSPDisplayList(POLY_XLU_DISP++, sDefaultDisplayList); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4735); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* D_8012A2F8[] = { @@ -993,7 +993,7 @@ void* D_8012A2F8[] = { void func_800995DC(GlobalContext* globalCtx) { u32 gameplayFrames = globalCtx->gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4763); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x09, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, @@ -1006,14 +1006,14 @@ void func_800995DC(GlobalContext* globalCtx) { gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A2F8[gSaveContext.nightFlag])); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4783); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 28 void func_80099760(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4845); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1023,7 +1023,7 @@ void func_80099760(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4859); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* gDCEntranceTextures[] = { @@ -1041,7 +1041,7 @@ void func_80099878(GlobalContext* globalCtx) { s32 pad; Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 2 * sizeof(Gfx[3])); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4905); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDCEntranceTextures[gSaveContext.nightFlag])); @@ -1071,7 +1071,7 @@ void func_80099878(GlobalContext* globalCtx) { gDPSetEnvColor(displayListHead++, 255, 255, 255, globalCtx->roomCtx.unk_74[BGDODOAGO_EYE_RIGHT]); gSPEndDisplayList(displayListHead); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 4956); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 30 @@ -1079,7 +1079,7 @@ void func_80099BD8(GlobalContext* globalCtx) { f32 temp; Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Gfx)); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5069); + OPEN_DISPS(globalCtx->state.gfxCtx); temp = globalCtx->roomCtx.unk_74[0] / 255.0f; @@ -1123,7 +1123,7 @@ void func_80099BD8(GlobalContext* globalCtx) { gDPSetEnvColor(displayListHead++, 0, 0, 0, globalCtx->roomCtx.unk_74[1]); gSPEndDisplayList(displayListHead); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5145); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (gSaveContext.sceneSetupIndex == 5) { gCustomLensFlareOn = true; @@ -1140,7 +1140,7 @@ void func_80099BD8(GlobalContext* globalCtx) { void func_8009A45C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5171); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); @@ -1163,14 +1163,14 @@ void func_8009A45C(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5212); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 32 void func_8009A798(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5226); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 2) % 256, 64, 64)); @@ -1191,14 +1191,14 @@ void func_8009A798(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5264); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 33 void func_8009A9DC(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5278); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1214,14 +1214,14 @@ void func_8009A9DC(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5301); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 48 void func_8009AB98(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5317); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 256, 16)); @@ -1232,14 +1232,14 @@ void func_8009AB98(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5330); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 39 void func_8009ACA8(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5346); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1253,14 +1253,14 @@ void func_8009ACA8(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5367); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 24 void func_8009AE30(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5384); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -1280,7 +1280,7 @@ void func_8009AE30(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5416); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sThievesHideoutEntranceTextures[] = { @@ -1292,7 +1292,7 @@ void* sThievesHideoutEntranceTextures[] = { void func_8009AFE0(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5490); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x09, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); @@ -1301,7 +1301,7 @@ void func_8009AFE0(GlobalContext* globalCtx) { gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sThievesHideoutEntranceTextures[gSaveContext.nightFlag])); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5507); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* D_8012A330[] = { @@ -1315,9 +1315,7 @@ void func_8009B0FC(GlobalContext* globalCtx) { s32 spB0; s32 spAC; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5535); - - if (1) {} // Necessary to match + OPEN_DISPS(globalCtx->state.gfxCtx); spB0 = (globalCtx->roomCtx.unk_74[1] >> 8) & 0xFF; spAC = globalCtx->roomCtx.unk_74[1] & 0xFF; @@ -1378,14 +1376,14 @@ void func_8009B0FC(GlobalContext* globalCtx) { { s32 pad[2]; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5644); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 29 void func_8009B86C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5791); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -1397,14 +1395,14 @@ void func_8009B86C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 145); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5808); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 34 void func_8009B9BC(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5822); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames % 64, 4, 16)); @@ -1412,14 +1410,14 @@ void func_8009B9BC(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5836); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 35 void func_8009BAA4(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5850); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1437,7 +1435,7 @@ void func_8009BAA4(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5876); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 36 @@ -1445,11 +1443,9 @@ void func_8009BC44(GlobalContext* globalCtx) { u32 gameplayFrames; s8 sp83; - if (1) {} // Necessary to match - sp83 = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5894); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; @@ -1476,7 +1472,7 @@ void func_8009BC44(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, sp83, sp83, sp83, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5930); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Screen Shake for Ganon's Tower Collapse @@ -1503,11 +1499,9 @@ void func_8009C0AC(GlobalContext* globalCtx) { u32 gameplayFrames; s8 sp7B; - if (1) {} // Necessary to match - sp7B = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 5968); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -1530,7 +1524,7 @@ void func_8009C0AC(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, sp7B, sp7B, sp7B, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6004); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (Flags_GetSwitch(globalCtx, 0x37)) { if ((globalCtx->sceneNum == SCENE_GANON_DEMO) || (globalCtx->sceneNum == SCENE_GANON_FINAL) || @@ -1549,9 +1543,7 @@ void* sIceCavernEntranceTextures[] = { void func_8009C3EC(GlobalContext* globalCtx) { u32 gameplayFrames; - if (0) {} // Necessary to match - - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6042); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sIceCavernEntranceTextures[gSaveContext.nightFlag])); @@ -1570,14 +1562,14 @@ void func_8009C3EC(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6076); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 42 void func_8009C608(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6151); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 1) % 64, 256, 16)); @@ -1597,14 +1589,14 @@ void func_8009C608(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6187); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 43 void func_8009C8B8(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6201); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -1621,14 +1613,14 @@ void func_8009C8B8(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6232); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 47 void func_8009CAC0(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6249); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1641,7 +1633,7 @@ void func_8009CAC0(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6264); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sGTGEntranceTextures[] = { @@ -1653,9 +1645,7 @@ void* sGTGEntranceTextures[] = { void func_8009CC00(GlobalContext* globalCtx) { u32 gameplayFrames; - if (0) {} // Necessary to match - - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6290); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sGTGEntranceTextures[gSaveContext.nightFlag])); @@ -1674,7 +1664,7 @@ void func_8009CC00(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6320); + CLOSE_DISPS(globalCtx->state.gfxCtx); } Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y1, s32 width1, s32 height1, s32 tile2, @@ -1700,7 +1690,7 @@ Gfx* Gfx_TwoTexScrollPrimColor(GraphicsContext* gfxCtx, s32 tile1, u32 x1, u32 y void func_8009CF84(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6433); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1715,14 +1705,14 @@ void func_8009CF84(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6449); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 41 void func_8009D0E8(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6463); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1740,7 +1730,7 @@ void func_8009D0E8(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6491); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sLonLonHouseEntranceTextures[] = { @@ -1750,7 +1740,7 @@ void* sLonLonHouseEntranceTextures[] = { // Scene Draw Config 44 void func_8009D31C(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6515); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } @@ -1762,7 +1752,7 @@ void func_8009D31C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6528); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sGuardHouseView2Textures[] = { @@ -1778,7 +1768,7 @@ void* sGuardHouseView1Textures[] = { void func_8009D438(GlobalContext* globalCtx) { s32 var; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6560); + OPEN_DISPS(globalCtx->state.gfxCtx); if (LINK_IS_ADULT) { var = 1; @@ -1795,14 +1785,14 @@ void func_8009D438(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6581); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 46 void func_8009D5B4(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6595); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, Gfx_TexScroll(globalCtx->state.gfxCtx, 0, (gameplayFrames * 3) % 128, 32, 32)); @@ -1816,7 +1806,7 @@ void func_8009D5B4(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6615); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sForestTempleEntranceTextures[] = { @@ -1828,9 +1818,7 @@ void* sForestTempleEntranceTextures[] = { void func_8009D758(GlobalContext* globalCtx) { u32 gameplayFrames; - if (0) {} // Necessary to match - - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6640); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sForestTempleEntranceTextures[gSaveContext.nightFlag])); @@ -1849,7 +1837,7 @@ void func_8009D758(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6671); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sSpiritTempleEntranceTextures[] = { @@ -1859,13 +1847,13 @@ void* sSpiritTempleEntranceTextures[] = { // Scene Draw Config 25 void func_8009D974(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6752); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSpiritTempleEntranceTextures[gSaveContext.nightFlag])); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6762); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 1 @@ -1875,7 +1863,7 @@ void func_8009DA30(GlobalContext* globalCtx) { displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx)); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6814); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1911,7 +1899,7 @@ void func_8009DA30(GlobalContext* globalCtx) { gSPEndDisplayList(displayListHead); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6866); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sKakarikoWindowTextures[] = { @@ -1921,7 +1909,7 @@ void* sKakarikoWindowTextures[] = { // Scene Draw Config 2 void func_8009DD5C(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6890); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } @@ -1933,14 +1921,14 @@ void func_8009DD5C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6903); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 3 void func_8009DE78(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6917); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -1959,7 +1947,7 @@ void func_8009DE78(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6948); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 4 @@ -1973,10 +1961,7 @@ void func_8009E0B8(GlobalContext* globalCtx) { spA0 = 500; displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 6 * sizeof(Gfx)); - if (1) {} - if (1) {} - - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 6965); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x09, @@ -2015,14 +2000,14 @@ void func_8009E0B8(GlobalContext* globalCtx) { Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (s16)(-globalCtx->roomCtx.unk_74[0] * 0.02f), 32, 16, 1, 0, (s16)(-globalCtx->roomCtx.unk_74[0] * 0.02f), 32, 16)); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7044); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 5 void func_8009E54C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7058); + OPEN_DISPS(globalCtx->state.gfxCtx); if ((gSaveContext.sceneSetupIndex > 3) || (LINK_IS_ADULT && !(gSaveContext.eventChkInf[6] & 0x200))) { globalCtx->roomCtx.unk_74[0] = 87; @@ -2039,7 +2024,7 @@ void func_8009E54C(GlobalContext* globalCtx) { gDPPipeSync(POLY_OPA_DISP++); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7097); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sZorasDomainEntranceTextures[] = { @@ -2052,7 +2037,7 @@ void func_8009E730(GlobalContext* globalCtx) { u32 gameplayFrames; u32 var; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7123); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; var = 127 - (gameplayFrames * 1) % 128; @@ -2068,14 +2053,14 @@ void func_8009E730(GlobalContext* globalCtx) { { s32 pad[2]; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7147); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 7 void func_8009E8C0(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7161); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2093,14 +2078,14 @@ void func_8009E8C0(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7192); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 8 void func_8009EAD8(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7206); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -2128,16 +2113,14 @@ void func_8009EAD8(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7260); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 9 void func_8009EE44(GlobalContext* globalCtx) { u32 gameplayFrames; - if (0) {} // Necessary to match - - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7274); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -2161,14 +2144,14 @@ void func_8009EE44(GlobalContext* globalCtx) { globalCtx->roomCtx.unk_74[1]++; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7309); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 10 void func_8009F074(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7323); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2180,7 +2163,7 @@ void func_8009F074(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7339); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* D_8012A380[] = { @@ -2190,20 +2173,20 @@ void* D_8012A380[] = { // Scene Draw Config 11 void func_8009F1B4(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7363); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_8012A380[gSaveContext.nightFlag])); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7371); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 12 void func_8009F270(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7385); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2219,14 +2202,14 @@ void func_8009F270(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7409); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 13 void func_8009F40C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7423); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -2242,14 +2225,14 @@ void func_8009F40C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7443); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 14 void func_8009F5D4(GlobalContext* globalCtx) { Gfx* displayListHead = Graph_Alloc(globalCtx->state.gfxCtx, 3 * sizeof(Gfx)); - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7461); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_XLU_DISP++, 0x08, displayListHead); @@ -2277,7 +2260,7 @@ void func_8009F5D4(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7495); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 15 @@ -2286,7 +2269,7 @@ void func_8009F7D4(GlobalContext* globalCtx) { s8 sp6E = coss((globalCtx->gameplayFrames * 1500) & 0xFFFF) >> 8; u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7512); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; sp6F = (sp6F >> 1) + 192; @@ -2302,7 +2285,7 @@ void func_8009F7D4(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7530); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sGoronCityEntranceTextures[] = { @@ -2314,7 +2297,7 @@ void* sGoronCityEntranceTextures[] = { void func_8009F9D0(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7555); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2331,7 +2314,7 @@ void func_8009F9D0(GlobalContext* globalCtx) { { s32 pad[2]; } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7578); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void* sLonLonRanchWindowTextures[] = { @@ -2341,7 +2324,7 @@ void* sLonLonRanchWindowTextures[] = { // Scene Draw Config 17 void func_8009FB74(GlobalContext* globalCtx) { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7602); + OPEN_DISPS(globalCtx->state.gfxCtx); { s32 pad[2]; } @@ -2353,14 +2336,14 @@ void func_8009FB74(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7615); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 18 void func_8009FC90(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7630); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2377,7 +2360,7 @@ void func_8009FC90(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 64); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7653); + CLOSE_DISPS(globalCtx->state.gfxCtx); } f32 D_8012A398 = 0.0f; @@ -2388,7 +2371,7 @@ void func_8009FE58(GlobalContext* globalCtx) { u32 gameplayFrames; f32 temp; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7712); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; if (globalCtx->sceneNum == SCENE_BDAN) { @@ -2457,16 +2440,16 @@ void func_8009FE58(GlobalContext* globalCtx) { Matrix_Scale(1.005f, sinf(D_8012A398) * 0.8f, 1.005f, MTXMODE_NEW); } - gSPSegment(POLY_OPA_DISP++, 0x0D, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_scene_table.c", 7809)); + gSPSegment(POLY_OPA_DISP++, 0x0D, MATRIX_NEWMTX(globalCtx->state.gfxCtx)); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7811); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 26 void func_800A0334(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7825); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_XLU_DISP++, 0x08, @@ -2485,7 +2468,7 @@ void func_800A0334(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7852); + CLOSE_DISPS(globalCtx->state.gfxCtx); } // Scene Draw Config 52 @@ -2502,7 +2485,7 @@ void func_800A057C(GlobalContext* globalCtx) { void func_800A059C(GlobalContext* globalCtx) { u32 gameplayFrames; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7893); + OPEN_DISPS(globalCtx->state.gfxCtx); gameplayFrames = globalCtx->gameplayFrames; gSPSegment(POLY_OPA_DISP++, 0x08, @@ -2515,7 +2498,7 @@ void func_800A059C(GlobalContext* globalCtx) { gDPPipeSync(POLY_XLU_DISP++); gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 7910); + CLOSE_DISPS(globalCtx->state.gfxCtx); } void (*sSceneDrawHandlers[])(GlobalContext*) = { @@ -2548,14 +2531,14 @@ void Scene_Draw(GlobalContext* globalCtx) { HREG(94) = 0; } - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 8104); + OPEN_DISPS(globalCtx->state.gfxCtx); if (HREG(81) == 1) { gSPDisplayList(POLY_OPA_DISP++, sDefaultDisplayList); gSPDisplayList(POLY_XLU_DISP++, sDefaultDisplayList); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_scene_table.c", 8109); + CLOSE_DISPS(globalCtx->state.gfxCtx); if (HREG(82) == 1) { sSceneDrawHandlers[globalCtx->sceneConfig](globalCtx); diff --git a/soh/src/code/z_skelanime.c b/soh/src/code/z_skelanime.c index cb066c5e3..b99510cd4 100644 --- a/soh/src/code/z_skelanime.c +++ b/soh/src/code/z_skelanime.c @@ -25,7 +25,7 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele Vec3f pos; Vec3s rot; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 773); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); limb = (LodLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]); @@ -41,13 +41,11 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, limbIndex, &dList, &pos, &rot, arg)) { Matrix_TranslateRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 805), G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dList); } } - if (1) {} - if (postLimbDraw != NULL) { postLimbDraw(globalCtx, limbIndex, &dList, &rot, arg); } @@ -62,7 +60,7 @@ void SkelAnime_DrawLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** skele SkelAnime_DrawLimbLod(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, lod); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 821); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -84,7 +82,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa return; } - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 849); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -99,7 +97,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, 1, &dList, &pos, &rot, arg)) { Matrix_TranslateRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 881), G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dList); } } @@ -114,7 +112,7 @@ void SkelAnime_DrawLod(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 894); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -146,16 +144,16 @@ void SkelAnime_DrawFlexLimbLod(GlobalContext* globalCtx, s32 limbIndex, void** s if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, limbIndex, &newDList, &pos, &rot, arg)) { Matrix_TranslateRotateZYX(&pos, &rot); if (newDList != NULL) { - Matrix_ToMtx(*mtx, "../z_skelanime.c", 945); + MATRIX_TOMTX(*mtx); { - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 946); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPMatrix(POLY_OPA_DISP++, *mtx, G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, newDList); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 949); + CLOSE_DISPS(globalCtx->state.gfxCtx); } (*mtx)++; } else if (limbDList != NULL) { - Matrix_ToMtx(*mtx, "../z_skelanime.c", 954); + MATRIX_TOMTX(*mtx); (*mtx)++; } } @@ -197,7 +195,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi return; } - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1000); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0xD, mtx); Matrix_Push(); @@ -214,13 +212,13 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi if ((overrideLimbDraw == 0) || !overrideLimbDraw(globalCtx, 1, &newDList, &pos, &rot, arg)) { Matrix_TranslateRotateZYX(&pos, &rot); if (newDList != NULL) { - Matrix_ToMtx(mtx, "../z_skelanime.c", 1033); + MATRIX_TOMTX(mtx); gDPNoOpString(POLY_OPA_DISP++, "T5ST", 0); gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, newDList); mtx++; } else if (limbDList != NULL) { - Matrix_ToMtx(mtx, "../z_skelanime.c", 1040); + MATRIX_TOMTX(mtx); mtx++; } } @@ -235,7 +233,7 @@ void SkelAnime_DrawFlexLod(GlobalContext* globalCtx, void** skeleton, Vec3s* joi Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1053); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -248,7 +246,7 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele Vec3f pos; Vec3s rot; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1076); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); limb = (StandardLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]); @@ -262,13 +260,11 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, limbIndex, &dList, &pos, &rot, arg)) { Matrix_TranslateRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1103), G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dList); } } - if (1) {} - if (postLimbDraw != NULL) { postLimbDraw(globalCtx, limbIndex, &dList, &rot, arg); } @@ -282,7 +278,7 @@ void SkelAnime_DrawLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** skele if (limb->sibling != LIMB_DONE) { SkelAnime_DrawLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1121); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -303,7 +299,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa return; } - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1148); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); rootLimb = (StandardLimb*)SEGMENTED_TO_VIRTUAL(skeleton[0]); @@ -318,7 +314,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, 1, &dList, &pos, &rot, arg)) { Matrix_TranslateRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1176), G_MTX_LOAD); + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, dList); } } @@ -333,7 +329,7 @@ void SkelAnime_DrawOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTa Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1190); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -348,7 +344,7 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s Vec3f pos; Vec3s rot; - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1214); + OPEN_DISPS(globalCtx->state.gfxCtx); Matrix_Push(); @@ -365,12 +361,12 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, limbIndex, &newDList, &pos, &rot, arg)) { Matrix_TranslateRotateZYX(&pos, &rot); if (newDList != NULL) { - Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1242); + MATRIX_TOMTX(*limbMatricies); gSPMatrix(POLY_OPA_DISP++, *limbMatricies, G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, newDList); (*limbMatricies)++; } else if (limbDList != NULL) { - Matrix_ToMtx(*limbMatricies, "../z_skelanime.c", 1249); + MATRIX_TOMTX(*limbMatricies); (*limbMatricies)++; } } @@ -390,7 +386,7 @@ void SkelAnime_DrawFlexLimbOpa(GlobalContext* globalCtx, s32 limbIndex, void** s SkelAnime_DrawFlexLimbOpa(globalCtx, limb->sibling, skeleton, jointTable, overrideLimbDraw, postLimbDraw, arg, limbMatricies); } - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1265); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -415,7 +411,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi return; } - OPEN_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1294); + OPEN_DISPS(globalCtx->state.gfxCtx); gSPSegment(POLY_OPA_DISP++, 0xD, mtx); @@ -434,12 +430,12 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, 1, &newDList, &pos, &rot, arg)) { Matrix_TranslateRotateZYX(&pos, &rot); if (newDList != NULL) { - Matrix_ToMtx(mtx, "../z_skelanime.c", 1327); + MATRIX_TOMTX(mtx); gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_LOAD); gSPDisplayList(POLY_OPA_DISP++, newDList); mtx++; } else if (limbDList != NULL) { - Matrix_ToMtx(mtx, "../z_skelanime.c", 1334); + MATRIX_TOMTX(mtx); mtx++; } } @@ -454,7 +450,7 @@ void SkelAnime_DrawFlexOpa(GlobalContext* globalCtx, void** skeleton, Vec3s* joi } Matrix_Pop(); - CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_skelanime.c", 1347); + CLOSE_DISPS(globalCtx->state.gfxCtx); } /** @@ -476,10 +472,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, "../z_skelanime.c", 1392); - LOG_ADDRESS("ref_tbl", jointIndices, "../z_skelanime.c", 1393); - LOG_ADDRESS("frame_tbl", dynamicData, "../z_skelanime.c", 1394); - LOG_ADDRESS("tbl", staticData, "../z_skelanime.c", 1395); + LOG_ADDRESS("out", frameTable); + LOG_ADDRESS("ref_tbl", jointIndices); + LOG_ADDRESS("frame_tbl", dynamicData); + LOG_ADDRESS("tbl", staticData); } frameTable->x = @@ -534,7 +530,7 @@ Gfx* SkelAnime_DrawLimb(GlobalContext* globalCtx, s32 limbIndex, void** skeleton if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, limbIndex, &dList, &pos, &rot, arg, &gfx)) { Matrix_TranslateRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1489), G_MTX_LOAD); + gSPMatrix(gfx++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD); gSPDisplayList(gfx++, dList); } } @@ -592,7 +588,7 @@ Gfx* SkelAnime_Draw(GlobalContext* globalCtx, void** skeleton, Vec3s* jointTable if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, 1, &dList, &pos, &rot, arg, &gfx)) { Matrix_TranslateRotateZYX(&pos, &rot); if (dList != NULL) { - gSPMatrix(gfx++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_skelanime.c", 1558), G_MTX_LOAD); + gSPMatrix(gfx++, MATRIX_NEWMTX(globalCtx->state.gfxCtx), G_MTX_LOAD); gSPDisplayList(gfx++, dList); } } @@ -637,12 +633,12 @@ Gfx* SkelAnime_DrawFlexLimb(GlobalContext* globalCtx, s32 limbIndex, void** skel if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, limbIndex, &newDList, &pos, &rot, arg, &gfx)) { Matrix_TranslateRotateZYX(&pos, &rot); if (newDList != NULL) { - Matrix_ToMtx(*mtx, "../z_skelanime.c", 1623); + MATRIX_TOMTX(*mtx); gSPMatrix(gfx++, *mtx, G_MTX_LOAD); gSPDisplayList(gfx++, newDList); (*mtx)++; } else if (limbDList != NULL) { - Matrix_ToMtx(*mtx, "../z_skelanime.c", 1630); + MATRIX_TOMTX(*mtx); (*mtx)++; } } @@ -702,12 +698,12 @@ Gfx* SkelAnime_DrawFlex(GlobalContext* globalCtx, void** skeleton, Vec3s* jointT if ((overrideLimbDraw == NULL) || !overrideLimbDraw(globalCtx, 1, &newDList, &pos, &rot, arg, &gfx)) { Matrix_TranslateRotateZYX(&pos, &rot); if (newDList != NULL) { - Matrix_ToMtx(mtx, "../z_skelanime.c", 1710); + MATRIX_TOMTX(mtx); gSPMatrix(gfx++, mtx, G_MTX_LOAD); gSPDisplayList(gfx++, newDList); mtx++; } else if (limbDList != NULL) { - Matrix_ToMtx(mtx, "../z_skelanime.c", 1717); + MATRIX_TOMTX(mtx); mtx++; } } @@ -881,8 +877,8 @@ void AnimationContext_SetLoadFrame(GlobalContext* globalCtx, LinkAnimationHeader //DmaMgr_SendRequest2(&entry->data.load.req, ram, //LINK_ANIMATION_OFFSET(linkAnimHeader->segment, ((sizeof(Vec3s) * limbCount + 2) * frame)), - //sizeof(Vec3s) * limbCount + 2, 0, &entry->data.load.msgQueue, NULL, "../z_skelanime.c", - //2004); + //sizeof(Vec3s) * limbCount + 2, 0, &entry->data.load.msgQueue, NULL, __FILE__, + //__LINE__); } } @@ -1103,10 +1099,10 @@ void SkelAnime_InitLink(GlobalContext* globalCtx, SkelAnime* skelAnime, FlexSkel } if (jointTable == NULL) { - skelAnime->jointTable = ZeldaArena_MallocDebug(allocSize, "../z_skelanime.c", 2364); - skelAnime->morphTable = ZeldaArena_MallocDebug(allocSize, "../z_skelanime.c", 2365); + skelAnime->jointTable = ZELDA_ARENA_MALLOC_DEBUG(allocSize); + skelAnime->morphTable = ZELDA_ARENA_MALLOC_DEBUG(allocSize); } else { - ASSERT(limbBufCount == limbCount, "joint_buff_num == joint_num", "../z_skelanime.c", 2369); + ASSERT(limbBufCount == limbCount); skelAnime->jointTable = (Vec3s*)ALIGN16((uintptr_t)jointTable); skelAnime->morphTable = (Vec3s*)ALIGN16((uintptr_t)morphTable); @@ -1431,11 +1427,11 @@ s32 SkelAnime_Init(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonHeade skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->segment); if (jointTable == NULL) { skelAnime->jointTable = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->jointTable), "../z_skelanime.c", 2968); + ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable)); skelAnime->morphTable = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->morphTable), "../z_skelanime.c", 2969); + ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable)); } else { - ASSERT(limbCount == skelAnime->limbCount, "joint_buff_num == this->joint_num", "../z_skelanime.c", 2973); + ASSERT(limbCount == skelAnime->limbCount); skelAnime->jointTable = jointTable; skelAnime->morphTable = morphTable; } @@ -1466,12 +1462,12 @@ s32 SkelAnime_InitFlex(GlobalContext* globalCtx, SkelAnime* skelAnime, FlexSkele if (jointTable == NULL) { skelAnime->jointTable = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->jointTable), "../z_skelanime.c", 3047); + ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable)); skelAnime->morphTable = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->morphTable), "../z_skelanime.c", 3048); + ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable)); } else { - ASSERT(limbCount == skelAnime->limbCount, "joint_buff_num == this->joint_num", "../z_skelanime.c", 3052); + ASSERT(limbCount == skelAnime->limbCount); skelAnime->jointTable = jointTable; skelAnime->morphTable = morphTable; } @@ -1500,9 +1496,9 @@ s32 SkelAnime_InitSkin(GlobalContext* globalCtx, SkelAnime* skelAnime, SkeletonH skelAnime->limbCount = skeletonHeader->limbCount + 1; skelAnime->skeleton = SEGMENTED_TO_VIRTUAL(skeletonHeader->segment); skelAnime->jointTable = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->jointTable), "../z_skelanime.c", 3120); + ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->jointTable)); skelAnime->morphTable = - ZeldaArena_MallocDebug(skelAnime->limbCount * sizeof(*skelAnime->morphTable), "../z_skelanime.c", 3121); + ZELDA_ARENA_MALLOC_DEBUG(skelAnime->limbCount * sizeof(*skelAnime->morphTable)); if ((skelAnime->jointTable == NULL) || (skelAnime->morphTable == NULL)) { osSyncPrintf(VT_FGCOL(RED)); // "Memory allocation error" @@ -1896,13 +1892,13 @@ s32 Animation_OnFrame(SkelAnime* skelAnime, f32 frame) { */ void SkelAnime_Free(SkelAnime* skelAnime, GlobalContext* globalCtx) { if (skelAnime->jointTable != NULL) { - ZeldaArena_FreeDebug(skelAnime->jointTable, "../z_skelanime.c", 3729); + ZELDA_ARENA_FREE_DEBUG(skelAnime->jointTable); } else { osSyncPrintf("now_joint あきまへん！！\n"); // "now_joint is freed! !" } if (skelAnime->morphTable != NULL) { - ZeldaArena_FreeDebug(skelAnime->morphTable, "../z_skelanime.c", 3731); + ZELDA_ARENA_FREE_DEBUG(skelAnime->morphTable); } else { osSyncPrintf("morf_joint あきまへん！！\n"); // "morf_joint is freed !!" } diff --git a/soh/src/code/z_skin.c b/soh/src/code/z_skin.c index 9c886fa2e..bd5f2288c 100644 --- a/soh/src/code/z_skin.c +++ b/soh/src/code/z_skin.c @@ -59,7 +59,7 @@ void Skin_ApplyLimbModifications(GraphicsContext* gfxCtx, Skin* skin, s32 limbIn Vec3f spD0; SkinTransformation* transformationEntry; - OPEN_DISPS(gfxCtx, "../z_skin.c", 254); + OPEN_DISPS(gfxCtx); skeleton = (SkinLimb**)SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); data = SEGMENTED_TO_VIRTUAL(((SkinLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]))->segment); @@ -130,7 +130,7 @@ void Skin_ApplyLimbModifications(GraphicsContext* gfxCtx, Skin* skin, s32 limbIn vtxEntry->index = (vtxEntry->index == 0) ? 1 : 0; - CLOSE_DISPS(gfxCtx, "../z_skin.c", 344); + CLOSE_DISPS(gfxCtx); } /** @@ -141,7 +141,7 @@ void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s SkinLimb** skeleton; SkinAnimatedLimbData* data; - OPEN_DISPS(gfxCtx, "../z_skin.c", 364); + OPEN_DISPS(gfxCtx); skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); data = SEGMENTED_TO_VIRTUAL(((SkinLimb*)SEGMENTED_TO_VIRTUAL(skeleton[limbIndex]))->segment); @@ -152,7 +152,7 @@ void Skin_DrawAnimatedLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, s gSPDisplayList(POLY_OPA_DISP++, data->dlist); - CLOSE_DISPS(gfxCtx, "../z_skin.c", 377); + CLOSE_DISPS(gfxCtx); } /** @@ -163,7 +163,7 @@ void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlis SkinLimb** skeleton; s32 pad; - OPEN_DISPS(gfxCtx, "../z_skin.c", 395); + OPEN_DISPS(gfxCtx); skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); @@ -182,7 +182,7 @@ void Skin_DrawLimb(GraphicsContext* gfxCtx, Skin* skin, s32 limbIndex, Gfx* dlis } } - CLOSE_DISPS(gfxCtx, "../z_skin.c", 433); + CLOSE_DISPS(gfxCtx); } void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostDraw postDraw, @@ -193,7 +193,7 @@ void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostD GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; s32 pad; - OPEN_DISPS(gfxCtx, "../z_skin.c", 471); + OPEN_DISPS(gfxCtx); if (!(drawFlags & SKIN_DRAW_FLAG_CUSTOM_TRANSFORMS)) { Skin_ApplyAnimTransformations(skin, gSkinLimbMatrices, actor, setTranslation); @@ -235,7 +235,7 @@ void Skin_DrawImpl(Actor* actor, GlobalContext* globalCtx, Skin* skin, SkinPostD } close_disps: - CLOSE_DISPS(gfxCtx, "../z_skin.c", 534); + CLOSE_DISPS(gfxCtx); } // allows specifying PostLimbDraw and setTranslation diff --git a/soh/src/code/z_skin_awb.c b/soh/src/code/z_skin_awb.c index 636de0f8c..81f4bcbab 100644 --- a/soh/src/code/z_skin_awb.c +++ b/soh/src/code/z_skin_awb.c @@ -51,9 +51,9 @@ void Skin_Init(GlobalContext* globalCtx, Skin* skin, SkeletonHeader* skeletonHea skeleton = SEGMENTED_TO_VIRTUAL(skin->skeletonHeader->segment); limbCount = skin->skeletonHeader->limbCount; - skin->vtxTable = ZeldaArena_MallocDebug(limbCount * sizeof(SkinLimbVtx), "../z_skin_awb.c", 212); + skin->vtxTable = ZELDA_ARENA_MALLOC_DEBUG(limbCount * sizeof(SkinLimbVtx)); - ASSERT(skin->vtxTable != NULL, "pskin_awb->avb_tbl != NULL", "../z_skin_awb.c", 214); + ASSERT(skin->vtxTable != NULL); for (i = 0; i < limbCount; i++) { SkinLimbVtx* vtxEntry = &skin->vtxTable[i]; @@ -70,12 +70,12 @@ void Skin_Init(GlobalContext* globalCtx, Skin* skin, SkeletonHeader* skeletonHea vtxEntry->index = 0; vtxEntry->buf[0] = - ZeldaArena_MallocDebug(animatedLimbData->totalVtxCount * sizeof(Vtx), "../z_skin_awb.c", 235); - ASSERT(vtxEntry->buf[0] != NULL, "psavb->buf[0] != NULL", "../z_skin_awb.c", 237); + ZELDA_ARENA_MALLOC_DEBUG(animatedLimbData->totalVtxCount * sizeof(Vtx)); + ASSERT(vtxEntry->buf[0] != NULL); vtxEntry->buf[1] = - ZeldaArena_MallocDebug(animatedLimbData->totalVtxCount * sizeof(Vtx), "../z_skin_awb.c", 240); - ASSERT(vtxEntry->buf[1] != NULL, "psavb->buf[1] != NULL", "../z_skin_awb.c", 242); + ZELDA_ARENA_MALLOC_DEBUG(animatedLimbData->totalVtxCount * sizeof(Vtx)); + ASSERT(vtxEntry->buf[1] != NULL); Skin_InitAnimatedLimb(globalCtx, skin, i); } @@ -93,17 +93,17 @@ void Skin_Free(GlobalContext* globalCtx, Skin* skin) { for (i = 0; i < skin->limbCount; i++) { if (skin->vtxTable[i].buf[0] != NULL) { - ZeldaArena_FreeDebug(skin->vtxTable[i].buf[0], "../z_skin_awb.c", 276); + ZELDA_ARENA_FREE_DEBUG(skin->vtxTable[i].buf[0]); skin->vtxTable[i].buf[0] = NULL; } if (skin->vtxTable[i].buf[1] != NULL) { - ZeldaArena_FreeDebug(skin->vtxTable[i].buf[1], "../z_skin_awb.c", 280); + ZELDA_ARENA_FREE_DEBUG(skin->vtxTable[i].buf[1]); skin->vtxTable[i].buf[1] = NULL; } } if (skin->vtxTable != NULL) { - ZeldaArena_FreeDebug(skin->vtxTable, "../z_skin_awb.c", 286); + ZELDA_ARENA_FREE_DEBUG(skin->vtxTable); } SkelAnime_Free(&skin->skelAnime, globalCtx); diff --git a/soh/src/code/z_skin_matrix.c b/soh/src/code/z_skin_matrix.c index d822d6c13..51b414853 100644 --- a/soh/src/code/z_skin_matrix.c +++ b/soh/src/code/z_skin_matrix.c @@ -351,8 +351,6 @@ void SkinMatrix_SetRotateZYX(MtxF* mf, s16 x, s16 y, s16 z) { } else { mf->xx = cosZ; - if (1) {} - if (1) {} xz = sinZ; // required to match mf->yx = sinZ; mf->zx = mf->xz = mf->yz = 0; @@ -368,7 +366,6 @@ void SkinMatrix_SetRotateZYX(MtxF* mf, s16 x, s16 y, s16 z) { mf->xy = (xy * cos) + (xz * sin); mf->xz = (xz * cos) - (xy * sin); - if (1) {} yz = mf->yz; yy = mf->yy; mf->yy = (yy * cos) + (yz * sin); @@ -419,8 +416,6 @@ void SkinMatrix_SetRotateYXZ(MtxF* mf, s16 x, s16 y, s16 z) { } else { mf->zz = cosY; - if (1) {} - if (1) {} xy = sinY; // required to match mf->xz = sinY; mf->xy = mf->zy = mf->yz = 0; @@ -434,7 +429,6 @@ void SkinMatrix_SetRotateYXZ(MtxF* mf, s16 x, s16 y, s16 z) { xy = mf->xy; mf->xx = (xx * cos) + (xy * sin); mf->xy = xy * cos - (xx * sin); - if (1) {} zy = mf->zy; zx = mf->zx; mf->zx = (zx * cos) + (zy * sin); diff --git a/soh/src/code/z_view.c b/soh/src/code/z_view.c index e03daee83..6b70bfac0 100644 --- a/soh/src/code/z_view.c +++ b/soh/src/code/z_view.c @@ -23,7 +23,7 @@ void View_ViewportToVp(Vp* dest, Viewport* src) { } View* View_New(GraphicsContext* gfxCtx) { - View* view = SystemArena_MallocDebug(sizeof(View), "../z_view.c", 285); + View* view = SYSTEM_ARENA_MALLOC_DEBUG(sizeof(View)); if (view != NULL) { memset(view, 0, sizeof(View)); @@ -34,7 +34,7 @@ View* View_New(GraphicsContext* gfxCtx) { } void View_Free(View* view) { - SystemArena_FreeDebug(view, "../z_view.c", 297); + SYSTEM_ARENA_FREE_DEBUG(view); } void View_Init(View* view, GraphicsContext* gfxCtx) { @@ -176,12 +176,12 @@ void func_800AA550(View* view) { lrx = view->viewport.rightX - varX; lry = view->viewport.bottomY - varY; - ASSERT(ulx >= 0, "ulx >= 0", "../z_view.c", 454); - ASSERT(uly >= 0, "uly >= 0", "../z_view.c", 455); - ASSERT(lrx <= SCREEN_WIDTH, "lrx <= SCREEN_WD", "../z_view.c", 456); - ASSERT(lry <= SCREEN_HEIGHT, "lry <= SCREEN_HT", "../z_view.c", 457); + ASSERT(ulx >= 0); + ASSERT(uly >= 0); + ASSERT(lrx <= SCREEN_WIDTH); + ASSERT(lry <= SCREEN_HEIGHT); - OPEN_DISPS(gfxCtx, "../z_view.c", 459); + OPEN_DISPS(gfxCtx); gDPPipeSync(POLY_OPA_DISP++); gDPSetScissor(POLY_OPA_DISP++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); @@ -190,7 +190,7 @@ void func_800AA550(View* view) { gDPPipeSync(POLY_KAL_DISP++); gDPSetScissor(POLY_KAL_DISP++, G_SC_NON_INTERLACE, ulx, uly, lrx, lry); - CLOSE_DISPS(gfxCtx, "../z_view.c", 472); + CLOSE_DISPS(gfxCtx); } void func_800AA76C(View* view, f32 x, f32 y, f32 z) { @@ -265,7 +265,7 @@ s32 func_800AA890(View* view, Mtx* mtx) { Matrix_RotateZ(-view->unk_104.z, MTXMODE_APPLY); Matrix_RotateY(-view->unk_104.y, MTXMODE_APPLY); Matrix_RotateX(-view->unk_104.x, MTXMODE_APPLY); - Matrix_ToMtx(mtx, "../z_view.c", 566); + MATRIX_TOMTX(mtx); return 1; } @@ -293,10 +293,10 @@ s32 func_800AAA9C(View* view) { Mtx* viewing; GraphicsContext* gfxCtx = view->gfxCtx; - OPEN_DISPS(gfxCtx, "../z_view.c", 596); + OPEN_DISPS(gfxCtx); vp = Graph_Alloc(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 601); + LOG_CHECK_NULL_POINTER("vp", vp); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -307,7 +307,7 @@ s32 func_800AAA9C(View* view) { gSPViewport(POLY_KAL_DISP++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 616); + LOG_CHECK_NULL_POINTER("projection", projection); view->projectionPtr = projection; width = view->viewport.rightX - view->viewport.leftX; @@ -315,7 +315,7 @@ s32 func_800AAA9C(View* view) { aspect = (f32)width / (f32)height; viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 667); + LOG_CHECK_NULL_POINTER("viewing", viewing); view->viewingPtr = viewing; if (view->eye.x == view->lookAt.x && view->eye.y == view->lookAt.y && view->eye.z == view->lookAt.z) { @@ -460,7 +460,7 @@ s32 func_800AAA9C(View* view) { gSPMatrix(POLY_KAL_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); FrameInterpolation_RecordCloseChild(); - CLOSE_DISPS(gfxCtx, "../z_view.c", 711); + CLOSE_DISPS(gfxCtx); return 1; } @@ -470,10 +470,10 @@ s32 func_800AB0A8(View* view) { Mtx* projection; GraphicsContext* gfxCtx = view->gfxCtx; - OPEN_DISPS(gfxCtx, "../z_view.c", 726); + OPEN_DISPS(gfxCtx); vp = Graph_Alloc(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 730); + LOG_CHECK_NULL_POINTER("vp", vp); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -485,7 +485,7 @@ s32 func_800AB0A8(View* view) { gSPViewport(OVERLAY_DISP++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 744); + LOG_CHECK_NULL_POINTER("projection", projection); view->projectionPtr = projection; guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, @@ -497,7 +497,7 @@ s32 func_800AB0A8(View* view) { gSPMatrix(POLY_XLU_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); gSPMatrix(POLY_KAL_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - CLOSE_DISPS(gfxCtx, "../z_view.c", 762); + CLOSE_DISPS(gfxCtx); return 1; } @@ -509,10 +509,10 @@ s32 func_800AB2C4(View* view) { gfxCtx = view->gfxCtx; - OPEN_DISPS(gfxCtx, "../z_view.c", 777); + OPEN_DISPS(gfxCtx); vp = Graph_Alloc(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 781); + LOG_CHECK_NULL_POINTER("vp", vp); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -522,7 +522,7 @@ s32 func_800AB2C4(View* view) { gSPViewport(OVERLAY_DISP++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 791); + LOG_CHECK_NULL_POINTER("projection", projection); view->projectionPtr = projection; guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, @@ -532,7 +532,7 @@ s32 func_800AB2C4(View* view) { gSPMatrix(OVERLAY_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); - CLOSE_DISPS(gfxCtx, "../z_view.c", 801); + CLOSE_DISPS(gfxCtx); return 1; } @@ -547,10 +547,10 @@ s32 func_800AB560(View* view) { Mtx* viewing; GraphicsContext* gfxCtx = view->gfxCtx; - OPEN_DISPS(gfxCtx, "../z_view.c", 816); + OPEN_DISPS(gfxCtx); vp = Graph_Alloc(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 821); + LOG_CHECK_NULL_POINTER("vp", vp); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -560,7 +560,7 @@ s32 func_800AB560(View* view) { gSPViewport(OVERLAY_DISP++, vp); projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 833); + LOG_CHECK_NULL_POINTER("projection", projection); view->projectionPtr = projection; width = view->viewport.rightX - view->viewport.leftX; @@ -575,7 +575,7 @@ s32 func_800AB560(View* view) { gSPMatrix(OVERLAY_DISP++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 848); + LOG_CHECK_NULL_POINTER("viewing", viewing); view->viewingPtr = viewing; if (view->eye.x == view->lookAt.x && view->eye.y == view->lookAt.y && view->eye.z == view->lookAt.z) { @@ -592,19 +592,19 @@ s32 func_800AB560(View* view) { gSPMatrix(OVERLAY_DISP++, viewing, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_PROJECTION); - CLOSE_DISPS(gfxCtx, "../z_view.c", 871); + CLOSE_DISPS(gfxCtx); return 1; } s32 func_800AB944(View* view) { - OPEN_DISPS(view->gfxCtx, "../z_view.c", 878); + OPEN_DISPS(view->gfxCtx); func_800ABE74(view->eye.x, view->eye.y, view->eye.z); guLookAt(view->viewingPtr, view->eye.x, view->eye.y, view->eye.z, view->lookAt.x, view->lookAt.y, view->lookAt.z, view->up.x, view->up.y, view->up.z); - CLOSE_DISPS(view->gfxCtx, "../z_view.c", 886); + CLOSE_DISPS(view->gfxCtx); return 1; } @@ -622,7 +622,7 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { if (arg1 & 2) { vp = Graph_Alloc(gfxCtx, sizeof(Vp)); - LogUtils_CheckNullPointer("vp", vp, "../z_view.c", 910); + LOG_CHECK_NULL_POINTER("vp", vp); View_ViewportToVp(vp, &view->viewport); view->vp = *vp; @@ -635,7 +635,7 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { if (arg1 & 8) { projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 921); + LOG_CHECK_NULL_POINTER("projection", projection); view->projectionPtr = projection; guOrtho(projection, -(f32)gScreenWidth * 0.5f, (f32)gScreenWidth * 0.5f, -(f32)gScreenHeight * 0.5f, @@ -646,7 +646,7 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { gSPMatrix(gfx++, projection, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_PROJECTION); } else if (arg1 & 6) { projection = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("projection", projection, "../z_view.c", 932); + LOG_CHECK_NULL_POINTER("projection", projection); view->projectionPtr = projection; width = view->viewport.rightX - view->viewport.leftX; @@ -663,7 +663,7 @@ s32 func_800AB9EC(View* view, s32 arg1, Gfx** gfxp) { if (arg1 & 1) { viewing = Graph_Alloc(gfxCtx, sizeof(Mtx)); - LogUtils_CheckNullPointer("viewing", viewing, "../z_view.c", 948); + LOG_CHECK_NULL_POINTER("viewing", viewing); view->viewingPtr = viewing; func_800ABE74(view->eye.x, view->eye.y, view->eye.z); diff --git a/soh/src/code/z_vimode.c b/soh/src/code/z_vimode.c index d0987ea24..6d4291cb1 100644 --- a/soh/src/code/z_vimode.c +++ b/soh/src/code/z_vimode.c @@ -1,25 +1,25 @@ #include "global.h" void ViMode_LogPrint(OSViMode* osViMode) { - LOG_ADDRESS("osvimodep", osViMode, "../z_vimode.c", 87); - LOG_ADDRESS("osvimodep->comRegs.ctrl", osViMode->comRegs.ctrl, "../z_vimode.c", 88); - LOG_ADDRESS("osvimodep->comRegs.width", osViMode->comRegs.width, "../z_vimode.c", 89); - LOG_ADDRESS("osvimodep->comRegs.burst", osViMode->comRegs.burst, "../z_vimode.c", 90); - LOG_ADDRESS("osvimodep->comRegs.vSync", osViMode->comRegs.vSync, "../z_vimode.c", 91); - LOG_ADDRESS("osvimodep->comRegs.hSync", osViMode->comRegs.hSync, "../z_vimode.c", 92); - LOG_ADDRESS("osvimodep->comRegs.leap", osViMode->comRegs.leap, "../z_vimode.c", 93); - LOG_ADDRESS("osvimodep->comRegs.hStart", osViMode->comRegs.hStart, "../z_vimode.c", 94); - LOG_ADDRESS("osvimodep->comRegs.xScale", osViMode->comRegs.xScale, "../z_vimode.c", 95); - LOG_ADDRESS("osvimodep->fldRegs[0].vStart", osViMode->fldRegs[0].vStart, "../z_vimode.c", 96); - LOG_ADDRESS("osvimodep->fldRegs[0].vBurst", osViMode->fldRegs[0].vBurst, "../z_vimode.c", 97); - LOG_ADDRESS("osvimodep->fldRegs[0].origin", osViMode->fldRegs[0].origin, "../z_vimode.c", 98); - LOG_ADDRESS("osvimodep->fldRegs[0].yScale", osViMode->fldRegs[0].yScale, "../z_vimode.c", 99); - LOG_ADDRESS("osvimodep->fldRegs[0].vIntr", osViMode->fldRegs[0].vIntr, "../z_vimode.c", 100); - LOG_ADDRESS("osvimodep->fldRegs[1].vStart", osViMode->fldRegs[1].vStart, "../z_vimode.c", 101); - LOG_ADDRESS("osvimodep->fldRegs[1].vBurst", osViMode->fldRegs[1].vBurst, "../z_vimode.c", 102); - LOG_ADDRESS("osvimodep->fldRegs[1].origin", osViMode->fldRegs[1].origin, "../z_vimode.c", 103); - LOG_ADDRESS("osvimodep->fldRegs[1].yScale", osViMode->fldRegs[1].yScale, "../z_vimode.c", 104); - LOG_ADDRESS("osvimodep->fldRegs[1].vIntr", osViMode->fldRegs[1].vIntr, "../z_vimode.c", 105); + 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`. diff --git a/soh/src/code/z_vismono.c b/soh/src/code/z_vismono.c index 2af876ad6..8b01a8f8c 100644 --- a/soh/src/code/z_vismono.c +++ b/soh/src/code/z_vismono.c @@ -23,7 +23,7 @@ void VisMono_Init(VisMono* this) { } void VisMono_Destroy(VisMono* this) { - SystemArena_FreeDebug(this->monoDl, "../z_vismono.c", 137); + SYSTEM_ARENA_FREE_DEBUG(this->monoDl); } void VisMono_UpdateTexture(VisMono* this, u16* tex) { @@ -96,12 +96,12 @@ void VisMono_Draw(VisMono* this, Gfx** gfxp) { glistpEnd = VisMono_DrawTexture(this, monoDL); if (!(glistpEnd <= monoDL + DLSIZE)) { - LOG_ADDRESS("glistp_end", glistpEnd, "../z_vismono.c", 257); - LOG_ADDRESS("mono_dl", monoDL, "../z_vismono.c", 258); - LOG_ADDRESS("mono_dl + (1+3+1+1+80*(7+2+2+3)+1)", monoDL + DLSIZE, "../z_vismono.c", 259); - LOG_ADDRESS("(1+3+1+1+80*(7+2+2+3)+1)", DLSIZE, "../z_vismono.c", 260); + 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", "../z_vismono.c", 262); + ASSERT(glistpEnd <= monoDL + DLSIZE); } gDPPipeSync(gfx++); @@ -124,13 +124,13 @@ void VisMono_DrawOld(VisMono* this) { Gfx* glistpEnd; if (!this->tlut) { - this->tlut = SystemArena_MallocDebug(256 * sizeof(u16), "../z_vismono.c", 283); + this->tlut = SYSTEM_ARENA_MALLOC_DEBUG(256 * sizeof(u16)); VisMono_UpdateTexture(this, this->tlut); } if (!this->monoDl) { - this->monoDl = SystemArena_MallocDebug(DLSIZE * sizeof(Gfx), "../z_vismono.c", 289); + this->monoDl = SYSTEM_ARENA_MALLOC_DEBUG(DLSIZE * sizeof(Gfx)); glistpEnd = VisMono_DrawTexture(this, this->monoDl); - ASSERT(glistpEnd <= this->monoDl + DLSIZE, "glistp_end <= this->mono_dl + DLSIZE", "../z_vismono.c", 292); + ASSERT(glistpEnd <= this->monoDl + DLSIZE); } } diff --git a/soh/src/code/z_vr_box.c b/soh/src/code/z_vr_box.c index 76753e096..4b5b5be72 100644 --- a/soh/src/code/z_vr_box.c +++ b/soh/src/code/z_vr_box.c @@ -960,25 +960,25 @@ void Skybox_Init(GameState* state, SkyboxContext* skyboxCtx, s16 skyboxId) { osSyncPrintf(VT_FGCOL(GREEN)); if (skyboxCtx->unk_140 != 0) { - skyboxCtx->dListBuf = GameState_Alloc(state, 8 * 150 * sizeof(Gfx), "../z_vr_box.c", 1636); - ASSERT(skyboxCtx->dListBuf != NULL, "vr_box->dpList != NULL", "../z_vr_box.c", 1637); + skyboxCtx->dListBuf = GAMESTATE_ALLOC_MC(state, 8 * 150 * sizeof(Gfx)); + ASSERT(skyboxCtx->dListBuf != NULL); - skyboxCtx->roomVtx = GameState_Alloc(state, 256 * sizeof(Vtx), "../z_vr_box.c", 1639); - ASSERT(skyboxCtx->roomVtx != NULL, "vr_box->roomVtx != NULL", "../z_vr_box.c", 1640); + skyboxCtx->roomVtx = GAMESTATE_ALLOC_MC(state, 256 * sizeof(Vtx)); + ASSERT(skyboxCtx->roomVtx != NULL); func_800AEFC8(skyboxCtx, skyboxId); } else { - skyboxCtx->dListBuf = GameState_Alloc(state, 12 * 150 * sizeof(Gfx), "../z_vr_box.c", 1643); - ASSERT(skyboxCtx->dListBuf != NULL, "vr_box->dpList != NULL", "../z_vr_box.c", 1644); + skyboxCtx->dListBuf = GAMESTATE_ALLOC_MC(state, 12 * 150 * sizeof(Gfx)); + ASSERT(skyboxCtx->dListBuf != NULL); if (skyboxId == SKYBOX_CUTSCENE_MAP) { - skyboxCtx->roomVtx = GameState_Alloc(state, 192 * sizeof(Vtx), "../z_vr_box.c", 1648); - ASSERT(skyboxCtx->roomVtx != NULL, "vr_box->roomVtx != NULL", "../z_vr_box.c", 1649); + skyboxCtx->roomVtx = GAMESTATE_ALLOC_MC(state, 192 * sizeof(Vtx)); + ASSERT(skyboxCtx->roomVtx != NULL); func_800AF178(skyboxCtx, 6); } else { - skyboxCtx->roomVtx = GameState_Alloc(state, 160 * sizeof(Vtx), "../z_vr_box.c", 1653); - ASSERT(skyboxCtx->roomVtx != NULL, "vr_box->roomVtx != NULL", "../z_vr_box.c", 1654); + skyboxCtx->roomVtx = GAMESTATE_ALLOC_MC(state, 160 * sizeof(Vtx)); + ASSERT(skyboxCtx->roomVtx != NULL); func_800AF178(skyboxCtx, 5); } diff --git a/soh/src/code/z_vr_box_draw.c b/soh/src/code/z_vr_box_draw.c index 13eb93bd0..6e66df903 100644 --- a/soh/src/code/z_vr_box_draw.c +++ b/soh/src/code/z_vr_box_draw.c @@ -10,11 +10,11 @@ Mtx* SkyboxDraw_UpdateMatrix(SkyboxContext* skyboxCtx, f32 x, f32 y, f32 z) { Matrix_RotateX(skyboxCtx->rot.x, MTXMODE_APPLY); Matrix_RotateY(skyboxCtx->rot.y, MTXMODE_APPLY); Matrix_RotateZ(skyboxCtx->rot.z, MTXMODE_APPLY); - return Matrix_ToMtx(sSkyboxDrawMatrix, "../z_vr_box_draw.c", 42); + return MATRIX_TOMTX(sSkyboxDrawMatrix); } void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyboxId, s16 blend, f32 x, f32 y, f32 z) { - OPEN_DISPS(gfxCtx, "../z_vr_box_draw.c", 52); + OPEN_DISPS(gfxCtx); FrameInterpolation_RecordOpenChild(NULL, FrameInterpolation_GetCameraEpoch()); func_800945A0(gfxCtx); @@ -35,7 +35,7 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb Matrix_RotateX(skyboxCtx->rot.x, MTXMODE_APPLY); Matrix_RotateY(skyboxCtx->rot.y, MTXMODE_APPLY); Matrix_RotateZ(skyboxCtx->rot.z, MTXMODE_APPLY); - Matrix_ToMtx(sSkyboxDrawMatrix, "../z_vr_box_draw.c", 76); + MATRIX_TOMTX(sSkyboxDrawMatrix); gSPMatrix(POLY_OPA_DISP++, sSkyboxDrawMatrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gDPSetColorDither(POLY_OPA_DISP++, G_CD_MAGICSQ); @@ -89,7 +89,7 @@ void SkyboxDraw_Draw(SkyboxContext* skyboxCtx, GraphicsContext* gfxCtx, s16 skyb //gsSPShaderTest2(POLY_OPA_DISP++); FrameInterpolation_RecordCloseChild(); - CLOSE_DISPS(gfxCtx, "../z_vr_box_draw.c", 125); + CLOSE_DISPS(gfxCtx); } void SkyboxDraw_Update(SkyboxContext* skyboxCtx) { |