MGislv/ooot
1
0
Fork 0
mirror of https://github.com/blawar/ooot.git synced 2024-06-30 16:29:55 +00:00
Code Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Blake Warner 2022-04-09 08:11:56 -04:00
parent f5256eabb4
commit 4395eb0826
12 changed files with 8 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/z64message.h
View File

@ -157,7 +157,7 @@ struct MessageContext
/* 0xE3E4 */ u8 textboxEndType; // original name : "select" /* 0xE3E4 */ u8 textboxEndType; // original name : "select"
/* 0xE3E5 */ u8 choiceIndex; /* 0xE3E5 */ u8 choiceIndex;
/* 0xE3E6 */ u8 choiceNum; // textboxes that are not choice textboxes have a choiceNum of 1 /* 0xE3E6 */ u8 choiceNum; // textboxes that are not choice textboxes have a choiceNum of 1
/* 0xE3E7 */ u8 stateTimer; /* 0xE3E7 */ TimerU8 stateTimer;
/* 0xE3E8 */ Timer textDelayTimer; /* 0xE3E8 */ Timer textDelayTimer;
/* 0xE3EA */ u16 textDelay; /* 0xE3EA */ u16 textDelay;
/* 0xE3EA */ u16 lastPlayedSong; // original references : "Ocarina_Flog" , "Ocarina_Free" /* 0xE3EA */ u16 lastPlayedSong; // original references : "Ocarina_Flog" , "Ocarina_Free"

2
src/code/audio.cpp
View File

@ -670,7 +670,7 @@ u8 D_8016B9D8;
u8 sAudioSpecPeakNumNotes[0x12]; u8 sAudioSpecPeakNumNotes[0x12];
u8 D_8016B9F2; u8 D_8016B9F2;
u8 D_8016B9F3; u8 D_8016B9F3;
u8 gFanfareDelay; TimerU8 gFanfareDelay;
u16 gFanfareLastSeqPlayed; u16 gFanfareLastSeqPlayed;
OcarinaStaff sPlayingStaff; OcarinaStaff sPlayingStaff;

1
src/code/speed_meter.cpp
View File

@ -143,7 +143,6 @@ void SpeedMeter_DrawAllocEntry(SpeedMeterAllocEntry* pthis, GraphicsContext* gfx
if(pthis->maxval == 0) if(pthis->maxval == 0)
{ {
osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf(VT_FGCOL(RED));
LOG_NUM("pthis->maxval", pthis->maxval, "../speed_meter.c", 313);
osSyncPrintf(VT_RST); osSyncPrintf(VT_RST);
} }
else else

3
src/code/z_fbdemo.cpp
View File

@ -98,9 +98,6 @@ void TransitionUnk_InitGraphics(TransitionUnk* pthis)
gDPPipeSync(gfx++); gDPPipeSync(gfx++);
gSPEndDisplayList(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) void TransitionUnk_InitData(TransitionUnk* pthis)

10
src/code/z_message_PAL.cpp
View File

@ -321,13 +321,13 @@ void Message_GrowTextbox(MessageContext* msgCtx)
static f32 sHeightCoefficients[] = { static f32 sHeightCoefficients[] = {
0.6f, 0.75f, 0.9f, 1.0f, 1.05f, 1.1f, 1.05f, 1.0f, 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 width = R_TEXTBOX_WIDTH_TARGET * (sWidthCoefficients[msgCtx->stateTimer.whole()] + sWidthCoefficients[msgCtx->stateTimer.whole()]);
f32 height = R_TEXTBOX_HEIGHT_TARGET * sHeightCoefficients[msgCtx->stateTimer]; f32 height = R_TEXTBOX_HEIGHT_TARGET * sHeightCoefficients[msgCtx->stateTimer.whole()];
f32 texWidth = R_TEXTBOX_TEXWIDTH_TARGET / (sWidthCoefficients[msgCtx->stateTimer] + sWidthCoefficients[msgCtx->stateTimer]); f32 texWidth = R_TEXTBOX_TEXWIDTH_TARGET / (sWidthCoefficients[msgCtx->stateTimer.whole()] + sWidthCoefficients[msgCtx->stateTimer.whole()]);
f32 texHeight = R_TEXTBOX_TEXHEIGHT_TARGET / sHeightCoefficients[msgCtx->stateTimer]; f32 texHeight = R_TEXTBOX_TEXHEIGHT_TARGET / sHeightCoefficients[msgCtx->stateTimer.whole()];
// Adjust y pos // 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->textboxColorAlphaCurrent += msgCtx->textboxColorAlphaTarget / 8;
msgCtx->stateTimer++; msgCtx->stateTimer++;

208
src/code/z_play.cpp
View File

@ -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 && (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)) if((gSaveContext.gameMode == 0) && (globalCtx->msgCtx.msgMode == MSGMODE_NONE) && (globalCtx->gameOverCtx.state == GAMEOVER_INACTIVE))
{ {
KaleidoSetup_Update(globalCtx); KaleidoSetup_Update(globalCtx);
} }
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3551);
}
sp80 = (globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0); 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); AnimationContext_Reset(&globalCtx->animationCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3561);
}
Object_UpdateBank(&globalCtx->objectCtx); Object_UpdateBank(&globalCtx->objectCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3577);
}
if((sp80 == 0) && (IREG(72) == 0)) if((sp80 == 0) && (IREG(72) == 0))
{ {
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3580);
}
globalCtx->gameplayFrames++; globalCtx->gameplayFrames++;
Rumble_Enable(1); Rumble_Enable(1);
@ -1044,83 +1009,25 @@ void Gameplay_Update(GlobalContext* globalCtx)
} }
else else
{ {
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3606);
}
func_800973FC(globalCtx, &globalCtx->roomCtx); func_800973FC(globalCtx, &globalCtx->roomCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3612);
}
CollisionCheck_AT(globalCtx, &globalCtx->colChkCtx); CollisionCheck_AT(globalCtx, &globalCtx->colChkCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3618);
}
CollisionCheck_OC(globalCtx, &globalCtx->colChkCtx); CollisionCheck_OC(globalCtx, &globalCtx->colChkCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3624);
}
CollisionCheck_Damage(globalCtx, &globalCtx->colChkCtx); CollisionCheck_Damage(globalCtx, &globalCtx->colChkCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3631);
}
CollisionCheck_ClearContext(globalCtx, &globalCtx->colChkCtx); CollisionCheck_ClearContext(globalCtx, &globalCtx->colChkCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3637);
}
if(globalCtx->unk_11DE9 == 0) if(globalCtx->unk_11DE9 == 0)
{ {
Actor_UpdateAll(globalCtx, &globalCtx->actorCtx); Actor_UpdateAll(globalCtx, &globalCtx->actorCtx);
} }
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3643);
}
func_80064558(globalCtx, &globalCtx->csCtx); func_80064558(globalCtx, &globalCtx->csCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3648);
}
Cinema_Update(globalCtx, &globalCtx->csCtx); Cinema_Update(globalCtx, &globalCtx->csCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3651);
}
Effect_UpdateAll(globalCtx); Effect_UpdateAll(globalCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3657);
}
EffectSs_UpdateAll(globalCtx); EffectSs_UpdateAll(globalCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3662);
}
} }
} }
else else
@ -1128,25 +1035,9 @@ void Gameplay_Update(GlobalContext* globalCtx)
Rumble_Enable(0); Rumble_Enable(0);
} }
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3672);
}
func_80095AA0(globalCtx, &globalCtx->roomCtx.curRoom, &input[1], 0); 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); 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(globalCtx->unk_1242B != 0)
{ {
if(CHECK_BTN_ALL(input[0].press.button, BTN_CUP)) if(CHECK_BTN_ALL(input[0].press.button, BTN_CUP))
@ -1173,84 +1064,29 @@ void Gameplay_Update(GlobalContext* globalCtx)
func_800BC450(globalCtx); func_800BC450(globalCtx);
} }
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3708);
}
SkyboxDraw_Update(&globalCtx->skyboxCtx); 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((globalCtx->pauseCtx.state != 0) || (globalCtx->pauseCtx.debugState != 0))
{ {
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3721);
}
KaleidoScopeCall_Update(globalCtx); KaleidoScopeCall_Update(globalCtx);
} }
else if(globalCtx->gameOverCtx.state != GAMEOVER_INACTIVE) else if(globalCtx->gameOverCtx.state != GAMEOVER_INACTIVE)
{ {
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3727);
}
GameOver_Update(globalCtx); GameOver_Update(globalCtx);
} }
else else
{ {
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3733);
}
Message_Update(globalCtx); 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); Interface_Update(globalCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3765);
}
AnimationContext_Update(globalCtx, &globalCtx->animationCtx); AnimationContext_Update(globalCtx, &globalCtx->animationCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3771);
}
func_8006BA30(globalCtx); func_8006BA30(globalCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3777);
}
ShrinkWindow_Update(R_UPDATE_RATE); ShrinkWindow_Update(R_UPDATE_RATE);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3783);
}
TransitionFade_Update(&globalCtx->transitionFade, R_UPDATE_RATE); TransitionFade_Update(&globalCtx->transitionFade, R_UPDATE_RATE);
} }
else else
@ -1259,17 +1095,7 @@ void Gameplay_Update(GlobalContext* globalCtx)
} }
} }
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3799);
}
skip: skip:
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3801);
}
if((sp80 == 0) || (gDbgCamEnabled)) if((sp80 == 0) || (gDbgCamEnabled))
{ {
s32 pad3[5]; s32 pad3[5];
@ -1277,35 +1103,16 @@ skip:
globalCtx->nextCamera = globalCtx->activeCamera; globalCtx->nextCamera = globalCtx->activeCamera;
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 3806);
}
for(i = 0; i < NUM_CAMS; i++) for(i = 0; i < NUM_CAMS; i++)
{ {
if((i != globalCtx->nextCamera) && (globalCtx->cameraPtrs[i] != NULL)) 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[i]);
} }
} }
Camera_Update(globalCtx->cameraPtrs[globalCtx->nextCamera]); 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); 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]; 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)) if((HREG(80) == 10) && (HREG(94) != 10))
{ {
HREG(81) = 1; HREG(81) = 1;
@ -1661,17 +1463,7 @@ void Gameplay_Main(GameState* thisx)
Gameplay_Update(globalCtx); Gameplay_Update(globalCtx);
} }
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 4583);
}
Gameplay_Draw(globalCtx); Gameplay_Draw(globalCtx);
if(1 && HREG(63))
{
LOG_NUM("1", 1, "../z_play.c", 4587);
}
} }
// original name: "Game_play_demo_mode_check" // original name: "Game_play_demo_mode_check"

2
src/code/z_room.cpp
View File

@ -601,8 +601,6 @@ u32 func_80096FE8(GlobalContext* globalCtx, RoomContext* roomCtx)
RomFile* roomList = globalCtx->roomList; RomFile* roomList = globalCtx->roomList;
TransitionActorEntry* transitionActor = &globalCtx->transiActorCtx.list[0]; 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++) for(j = 0; j < globalCtx->transiActorCtx.numActors; j++)
{ {
frontRoom = transitionActor->sides[0].room; frontRoom = transitionActor->sides[0].room;

8
src/overlays/actors/ovl_En_Elf/z_en_elf.cpp
View File

@ -1650,14 +1650,6 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx)
thisx->shape.rot.y = pthis->unk_2BC; thisx->shape.rot.y = pthis->unk_2BC;
nREG(80) = gSaveContext.sceneFlags[127].chest; 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(!Gameplay_InCsMode(globalCtx))
{ {
if(gSaveContext.naviTimer < 25800) if(gSaveContext.naviTimer < 25800)

3
src/overlays/actors/ovl_En_Ge1/z_en_ge1.cpp
View File

@ -754,8 +754,7 @@ void EnGe1_TalkNoPrize_Archery(EnGe1* pthis, GlobalContext* globalCtx)
void EnGe1_TalkAfterGame_Archery(EnGe1* pthis, GlobalContext* globalCtx) void EnGe1_TalkAfterGame_Archery(EnGe1* pthis, GlobalContext* globalCtx)
{ {
gSaveContext.eventInf[0] &= ~0x100; 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; pthis->actor.flags |= ACTOR_FLAG_16;
if(HIGH_SCORE(HS_HBA) < gSaveContext.minigameScore) if(HIGH_SCORE(HS_HBA) < gSaveContext.minigameScore)

1
src/overlays/actors/ovl_Item_Etcetera/z_item_etcetera.cpp
View File

@ -208,7 +208,6 @@ void ItemEtcetera_UpdateFireArrow(ItemEtcetera* pthis, GlobalContext* globalCtx)
{ {
if((globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[0] != NULL)) 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) if(globalCtx->csCtx.npcActions[0]->action == 2)
{ {
pthis->actor.draw = ItemEtcetera_Draw; pthis->actor.draw = ItemEtcetera_Draw;

1
src/overlays/actors/ovl_Item_Ocarina/z_item_ocarina.cpp
View File

@ -71,7 +71,6 @@ void ItemOcarina_Init(Actor* thisx, GlobalContext* globalCtx)
return; return;
} }
LOG_NUM("no", params, "../z_item_ocarina.c", 210);
pthis->spinRotOffset = 0x400; pthis->spinRotOffset = 0x400;
} }

1
src/overlays/actors/ovl_Mir_Ray/z_mir_ray.cpp
View File

@ -156,7 +156,6 @@ void MirRay_Init(Actor* thisx, GlobalContext* globalCtx)
ActorShape_Init(&pthis->actor.shape, 0.0f, NULL, 0.0f); ActorShape_Init(&pthis->actor.shape, 0.0f, NULL, 0.0f);
// "Generation of reflectable light!" // "Generation of reflectable light!"
osSyncPrintf("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n"); osSyncPrintf("反射用 光の発生!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!\n");
LOG_NUM("pthis->actor.arg_data", pthis->actor.params, "../z_mir_ray.c", 518);
if(pthis->actor.params >= 0xA) if(pthis->actor.params >= 0xA)
{ {