diff --git a/include/z64message.h b/include/z64message.h index f7be5e2df..6a81d4898 100644 --- a/include/z64message.h +++ b/include/z64message.h @@ -157,7 +157,7 @@ struct MessageContext /* 0xE3E4 */ u8 textboxEndType; // original name : "select" /* 0xE3E5 */ u8 choiceIndex; /* 0xE3E6 */ u8 choiceNum; // textboxes that are not choice textboxes have a choiceNum of 1 - /* 0xE3E7 */ u8 stateTimer; + /* 0xE3E7 */ TimerU8 stateTimer; /* 0xE3E8 */ Timer textDelayTimer; /* 0xE3EA */ u16 textDelay; /* 0xE3EA */ u16 lastPlayedSong; // original references : "Ocarina_Flog" , "Ocarina_Free" diff --git a/src/code/audio.cpp b/src/code/audio.cpp index 7ee1d976c..a0266f755 100644 --- a/src/code/audio.cpp +++ b/src/code/audio.cpp @@ -670,7 +670,7 @@ u8 D_8016B9D8; u8 sAudioSpecPeakNumNotes[0x12]; u8 D_8016B9F2; u8 D_8016B9F3; -u8 gFanfareDelay; +TimerU8 gFanfareDelay; u16 gFanfareLastSeqPlayed; OcarinaStaff sPlayingStaff; diff --git a/src/code/speed_meter.cpp b/src/code/speed_meter.cpp index a7447a737..f539c8a9d 100644 --- a/src/code/speed_meter.cpp +++ b/src/code/speed_meter.cpp @@ -143,7 +143,6 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* pthis, GraphicsContext* gfx if(pthis->maxval == 0) { osSyncPrintf(VT_FGCOL(RED)); - LOG_NUM("pthis->maxval", pthis->maxval, "../speed_meter.c", 313); osSyncPrintf(VT_RST); } else diff --git a/src/code/z_fbdemo.cpp b/src/code/z_fbdemo.cpp index 89abede7f..14862038a 100644 --- a/src/code/z_fbdemo.cpp +++ b/src/code/z_fbdemo.cpp @@ -98,9 +98,6 @@ void TransitionUnk_InitGraphics(TransitionUnk* pthis) gDPPipeSync(gfx++); gSPEndDisplayList(gfx++); - - LOG_NUM("pthis->col * (1 + pthis->row * (1 + 7 + 1)) + 1 + 1", pthis->col * (1 + pthis->row * 9) + 2, "../z_fbdemo.c", 144); - LOG_NUM("gp - pthis->gfxtbl", gfx - pthis->gfx, "../z_fbdemo.c", 145); } void TransitionUnk_InitData(TransitionUnk* pthis) diff --git a/src/code/z_message_PAL.cpp b/src/code/z_message_PAL.cpp index bc18b6ec1..820975867 100644 --- a/src/code/z_message_PAL.cpp +++ b/src/code/z_message_PAL.cpp @@ -321,13 +321,13 @@ void Message_GrowTextbox(MessageContext* msgCtx) static f32 sHeightCoefficients[] = { 0.6f, 0.75f, 0.9f, 1.0f, 1.05f, 1.1f, 1.05f, 1.0f, }; - f32 width = R_TEXTBOX_WIDTH_TARGET * (sWidthCoefficients[msgCtx->stateTimer] + sWidthCoefficients[msgCtx->stateTimer]); - f32 height = R_TEXTBOX_HEIGHT_TARGET * sHeightCoefficients[msgCtx->stateTimer]; - f32 texWidth = R_TEXTBOX_TEXWIDTH_TARGET / (sWidthCoefficients[msgCtx->stateTimer] + sWidthCoefficients[msgCtx->stateTimer]); - f32 texHeight = R_TEXTBOX_TEXHEIGHT_TARGET / sHeightCoefficients[msgCtx->stateTimer]; + f32 width = R_TEXTBOX_WIDTH_TARGET * (sWidthCoefficients[msgCtx->stateTimer.whole()] + sWidthCoefficients[msgCtx->stateTimer.whole()]); + f32 height = R_TEXTBOX_HEIGHT_TARGET * sHeightCoefficients[msgCtx->stateTimer.whole()]; + f32 texWidth = R_TEXTBOX_TEXWIDTH_TARGET / (sWidthCoefficients[msgCtx->stateTimer.whole()] + sWidthCoefficients[msgCtx->stateTimer.whole()]); + f32 texHeight = R_TEXTBOX_TEXHEIGHT_TARGET / sHeightCoefficients[msgCtx->stateTimer.whole()]; // Adjust y pos - R_TEXTBOX_Y = R_TEXTBOX_Y_TARGET + (R_TEXTBOX_Y_TARGET - (s16)(R_TEXTBOX_Y_TARGET * sHeightCoefficients[msgCtx->stateTimer] + 0.5f)) / 2; + R_TEXTBOX_Y = R_TEXTBOX_Y_TARGET + (R_TEXTBOX_Y_TARGET - (s16)(R_TEXTBOX_Y_TARGET * sHeightCoefficients[msgCtx->stateTimer.whole()] + 0.5f)) / 2; msgCtx->textboxColorAlphaCurrent += msgCtx->textboxColorAlphaTarget / 8; msgCtx->stateTimer++; diff --git a/src/code/z_play.cpp b/src/code/z_play.cpp index 6a50352de..0bdf90714 100644 --- a/src/code/z_play.cpp +++ b/src/code/z_play.cpp @@ -974,56 +974,21 @@ void Gameplay_Update(GlobalContext* globalCtx) } } - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3533); - } - if(1 && (gTrnsnUnkState != 3)) { - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3542); - } - if((gSaveContext.gameMode == 0) && (globalCtx->msgCtx.msgMode == MSGMODE_NONE) && (globalCtx->gameOverCtx.state == GAMEOVER_INACTIVE)) { KaleidoSetup_Update(globalCtx); } - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3551); - } - sp80 = (globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3555); - } - AnimationContext_Reset(&globalCtx->animationCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3561); - } - Object_UpdateBank(&globalCtx->objectCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3577); - } - if((sp80 == 0) && (IREG(72) == 0)) { - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3580); - } - globalCtx->gameplayFrames++; Rumble_Enable(1); @@ -1044,83 +1009,25 @@ void Gameplay_Update(GlobalContext* globalCtx) } else { - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3606); - } - func_800973FC(globalCtx, &globalCtx->roomCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3612); - } - CollisionCheck_AT(globalCtx, &globalCtx->colChkCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3618); - } - CollisionCheck_OC(globalCtx, &globalCtx->colChkCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3624); - } - CollisionCheck_Damage(globalCtx, &globalCtx->colChkCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3631); - } - CollisionCheck_ClearContext(globalCtx, &globalCtx->colChkCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3637); - } - if(globalCtx->unk_11DE9 == 0) { Actor_UpdateAll(globalCtx, &globalCtx->actorCtx); } - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3643); - } - func_80064558(globalCtx, &globalCtx->csCtx); - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3648); - } - Cinema_Update(globalCtx, &globalCtx->csCtx); - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3651); - } - Effect_UpdateAll(globalCtx); - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3657); - } - EffectSs_UpdateAll(globalCtx); - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3662); - } } } else @@ -1128,25 +1035,9 @@ void Gameplay_Update(GlobalContext* globalCtx) Rumble_Enable(0); } - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3672); - } - func_80095AA0(globalCtx, &globalCtx->roomCtx.curRoom, &input[1], 0); - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3675); - } - func_80095AA0(globalCtx, &globalCtx->roomCtx.prevRoom, &input[1], 1); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3677); - } - if(globalCtx->unk_1242B != 0) { if(CHECK_BTN_ALL(input[0].press.button, BTN_CUP)) @@ -1173,84 +1064,29 @@ void Gameplay_Update(GlobalContext* globalCtx) func_800BC450(globalCtx); } - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3708); - } - SkyboxDraw_Update(&globalCtx->skyboxCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3716); - } - if((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0)) { - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3721); - } - KaleidoScopeCall_Update(globalCtx); } else if(globalCtx->gameOverCtx.state != GAMEOVER_INACTIVE) { - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3727); - } - GameOver_Update(globalCtx); } else { - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3733); - } - Message_Update(globalCtx); } - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3737); - } - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3742); - } - Interface_Update(globalCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3765); - } - AnimationContext_Update(globalCtx, &globalCtx->animationCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3771); - } - func_8006BA30(globalCtx); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3777); - } - ShrinkWindow_Update(R_UPDATE_RATE); - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3783); - } - TransitionFade_Update(&globalCtx->transitionFade, R_UPDATE_RATE); } else @@ -1259,17 +1095,7 @@ void Gameplay_Update(GlobalContext* globalCtx) } } - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3799); - } - skip: - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3801); - } - if((sp80 == 0) || (gDbgCamEnabled)) { s32 pad3[5]; @@ -1277,35 +1103,16 @@ skip: globalCtx->nextCamera = globalCtx->activeCamera; - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3806); - } 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); - } - Camera_Update(globalCtx->cameraPtrs[i]); } } Camera_Update(globalCtx->cameraPtrs[globalCtx->nextCamera]); - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3814); - } - } - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 3816); } Environment_Update(globalCtx, &globalCtx->envCtx, &globalCtx->lightCtx, &globalCtx->pauseCtx, &globalCtx->msgCtx, &globalCtx->gameOverCtx, globalCtx->state.gfxCtx); @@ -1633,11 +1440,6 @@ void Gameplay_Main(GameState* thisx) D_8012D1F8 = &globalCtx->state.input[0]; - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 4556); - } - if((HREG(80) == 10) && (HREG(94) != 10)) { HREG(81) = 1; @@ -1661,17 +1463,7 @@ void Gameplay_Main(GameState* thisx) Gameplay_Update(globalCtx); } - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 4583); - } - Gameplay_Draw(globalCtx); - - if(1 && HREG(63)) - { - LOG_NUM("1", 1, "../z_play.c", 4587); - } } // original name: "Game_play_demo_mode_check" diff --git a/src/code/z_room.cpp b/src/code/z_room.cpp index be0ab374d..8d4e3c69f 100644 --- a/src/code/z_room.cpp +++ b/src/code/z_room.cpp @@ -601,8 +601,6 @@ 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); - for(j = 0; j < globalCtx->transiActorCtx.numActors; j++) { frontRoom = transitionActor->sides[0].room; diff --git a/src/overlays/actors/ovl_En_Elf/z_en_elf.cpp b/src/overlays/actors/ovl_En_Elf/z_en_elf.cpp index 9abaa7551..859bf5ea5 100644 --- a/src/overlays/actors/ovl_En_Elf/z_en_elf.cpp +++ b/src/overlays/actors/ovl_En_Elf/z_en_elf.cpp @@ -1650,14 +1650,6 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) thisx->shape.rot.y = pthis->unk_2BC; nREG(80) = gSaveContext.sceneFlags[127].chest; - if(nREG(81) != 0) - { - if(gSaveContext.sceneFlags[127].chest) - { - LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", gSaveContext.sceneFlags[127].chest, "../z_en_elf.c", 2595); - } - } - if(!Gameplay_InCsMode(globalCtx)) { if(gSaveContext.naviTimer < 25800) diff --git a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.cpp b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.cpp index 4f239d2a9..4e3d1d847 100644 --- a/src/overlays/actors/ovl_En_Ge1/z_en_ge1.cpp +++ b/src/overlays/actors/ovl_En_Ge1/z_en_ge1.cpp @@ -754,8 +754,7 @@ void EnGe1_TalkNoPrize_Archery(EnGe1* pthis, GlobalContext* globalCtx) void EnGe1_TalkAfterGame_Archery(EnGe1* pthis, GlobalContext* globalCtx) { gSaveContext.eventInf[0] &= ~0x100; - LOG_NUM("z_common_data.yabusame_total", gSaveContext.minigameScore, "../z_en_ge1.c", 1110); - LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", HIGH_SCORE(HS_HBA), "../z_en_ge1.c", 1111); + pthis->actor.flags |= ACTOR_FLAG_16; if(HIGH_SCORE(HS_HBA) < gSaveContext.minigameScore) diff --git a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.cpp b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.cpp index 18ebdbcf8..b72ecf560 100644 --- a/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.cpp +++ b/src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.cpp @@ -208,7 +208,6 @@ void ItemEtcetera_UpdateFireArrow(ItemEtcetera* pthis, GlobalContext* globalCtx) { if((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[0] != NULL)) { - LOG_NUM("(game_play->demo_play.npcdemopnt[0]->dousa)", globalCtx->csCtx.npcActions[0]->action, "../z_item_etcetera.c", 441); if(globalCtx->csCtx.npcActions[0]->action == 2) { pthis->actor.draw = ItemEtcetera_Draw; diff --git a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.cpp b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.cpp index 9748386a6..0a030c030 100644 --- a/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.cpp +++ b/src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.cpp @@ -71,7 +71,6 @@ void ItemOcarina_Init(Actor* thisx, GlobalContext* globalCtx) return; } - LOG_NUM("no", params, "../z_item_ocarina.c", 210); pthis->spinRotOffset = 0x400; } diff --git a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.cpp b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.cpp index acebe14c6..16f39b014 100644 --- a/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.cpp +++ b/src/overlays/actors/ovl_Mir_Ray/z_mir_ray.cpp @@ -156,7 +156,6 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx) ActorShape_Init(&pthis->actor.shape, 0.0f, NULL, 0.0f); // "Generation of reflectable light!" osSyncPrintf("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); - LOG_NUM("pthis->actor.arg_data", pthis->actor.params, "../z_mir_ray.c", 518); if(pthis->actor.params >= 0xA) {