mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-17 15:05:05 -05:00
Code Issues Projects Releases Wiki Activity

First batch some overlay

Browse Source
This commit is contained in:
Baoulettes 2022-06-26 19:35:32 +02:00
parent efd4b26f3d
commit c20c4ee1a0
67 changed files with 277 additions and 277 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
soh/src/overlays/actors/ovl_Arms_Hook/z_arms_hook.c
View File

@ -306,7 +306,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 sp58;
if ((player->actor.draw != NULL) && (player->rightHandType == 15)) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_arms_hook.c", 850);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if ((ArmsHook_Shoot != this->actionFunc) || (this->timer <= 0)) {
Matrix_MultVec3f(&D_80865B70, &this->unk_1E8);
@ -321,7 +321,7 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80090480(globalCtx, &this->collider, &this->hookInfo, &sp6C, &sp60);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arms_hook.c", 895),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gLinkAdultHookshotTipDL);
Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW);
@ -331,10 +331,10 @@ void ArmsHook_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(Math_FAtan2F(sp78.x, sp78.z), MTXMODE_APPLY);
Matrix_RotateX(Math_FAtan2F(-sp78.y, sp5C), MTXMODE_APPLY);
Matrix_Scale(0.015f, 0.015f, sqrtf(SQ(sp78.y) + sp58) * 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arms_hook.c", 910),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gLinkAdultHookshotChainDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arms_hook.c", 913);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
}

8
soh/src/overlays/actors/ovl_Arrow_Fire/z_arrow_fire.c
View File

@ -56,7 +56,7 @@ void ArrowFire_Init(Actor* thisx, GlobalContext* globalCtx) {
void ArrowFire_Destroy(Actor* thisx, GlobalContext* globalCtx) {
func_800876C8(globalCtx);
LOG_STRING("消滅", "../z_arrow_fire.c", 421); // "Disappearance"
LOG_STRING("消滅", __FILE__, __LINE__); // "Disappearance"
}
void ArrowFire_Charge(ArrowFire* this, GlobalContext* globalCtx) {
@ -204,7 +204,7 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) {
if (1) {}
tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 618);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
@ -234,7 +234,7 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) {
}
Matrix_Scale(this->radius * 0.2f, this->unk_158 * 4.0f, this->radius * 0.2f, MTXMODE_APPLY);
Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 666),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++,
@ -242,6 +242,6 @@ void ArrowFire_Draw(Actor* thisx, GlobalContext* globalCtx2) {
255 - stateFrames % 256, 511 - (stateFrames * 10) % 512, 64, 64));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_fire.c", 682);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
}

8
soh/src/overlays/actors/ovl_Arrow_Ice/z_arrow_ice.c
View File

@ -57,7 +57,7 @@ void ArrowIce_Init(Actor* thisx, GlobalContext* globalCtx) {
void ArrowIce_Destroy(Actor* thisx, GlobalContext* globalCtx) {
func_800876C8(globalCtx);
LOG_STRING("消滅", "../z_arrow_ice.c", 415); // "Disappearance"
LOG_STRING("消滅", __FILE__, __LINE__); // "Disappearance"
}
void ArrowIce_Charge(ArrowIce* this, GlobalContext* globalCtx) {
@ -203,7 +203,7 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (1) {}
tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 610);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
@ -233,7 +233,7 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
Matrix_Scale(this->radius * 0.2f, this->unk_160 * 3.0f, this->radius * 0.2f, MTXMODE_APPLY);
Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 660),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++,
@ -241,6 +241,6 @@ void ArrowIce_Draw(Actor* thisx, GlobalContext* globalCtx) {
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 10) % 512, 4, 16));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_ice.c", 676);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
}

8
soh/src/overlays/actors/ovl_Arrow_Light/z_arrow_light.c
View File

@ -57,7 +57,7 @@ void ArrowLight_Init(Actor* thisx, GlobalContext* globalCtx) {
void ArrowLight_Destroy(Actor* thisx, GlobalContext* globalCtx) {
func_800876C8(globalCtx);
LOG_STRING("消滅", "../z_arrow_light.c", 403); // "Disappearance"
LOG_STRING("消滅", __FILE__, __LINE__); // "Disappearance"
}
void ArrowLight_Charge(ArrowLight* this, GlobalContext* globalCtx) {
@ -201,7 +201,7 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (1) {}
tranform = (arrow->hitFlags & 2) ? &this->actor : &arrow->actor;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_arrow_light.c", 598);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Translate(tranform->world.pos.x, tranform->world.pos.y, tranform->world.pos.z, MTXMODE_NEW);
Matrix_RotateY(tranform->shape.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
@ -231,7 +231,7 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
Matrix_Scale(this->radius * 0.2f, this->unk_160 * 4.0f, this->radius * 0.2f, MTXMODE_APPLY);
Matrix_Translate(0.0f, -700.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_arrow_light.c", 648),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sMaterialDL);
gSPDisplayList(POLY_XLU_DISP++,
@ -239,6 +239,6 @@ void ArrowLight_Draw(Actor* thisx, GlobalContext* globalCtx) {
511 - (stateFrames * 10) % 512, 511 - (stateFrames * 30) % 512, 8, 16));
gSPDisplayList(POLY_XLU_DISP++, sModelDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_arrow_light.c", 664);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
}

6
soh/src/overlays/actors/ovl_Bg_Bowl_Wall/z_bg_bowl_wall.c
View File

@ -202,13 +202,13 @@ void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
BgBowlWall* this = (BgBowlWall*)thisx;
u32 frames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_bowl_wall.c", 441);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x8,
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, -2 * (frames = globalCtx->state.frames), 16, 16));
gDPPipeSync(POLY_OPA_DISP++);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_bowl_wall.c", 453),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->dyna.actor.params == 0) {
@ -217,5 +217,5 @@ void BgBowlWall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_OPA_DISP++, gBowlingRound2WallDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_bowl_wall.c", 464);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Breakwall/z_bg_breakwall.c
View File

@ -294,10 +294,10 @@ void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgBreakwall* this = (BgBreakwall*)thisx;
if (this->bombableWallDList != NULL) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_breakwall.c", 767);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_breakwall.c", 771),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, this->bombableWallDList);
@ -315,6 +315,6 @@ void BgBreakwall_Draw(Actor* thisx, GlobalContext* globalCtx) {
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_breakwall.c", 822);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
}

6
soh/src/overlays/actors/ovl_Bg_Dodoago/z_bg_dodoago.c
View File

@ -309,16 +309,16 @@ void BgDodoago_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgDodoago_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_dodoago.c", 672);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (Flags_GetEventChkInf(0xB0)) {
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_dodoago.c", 677),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDodongoLowerJawDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_dodoago.c", 681);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgDodoago_Reset(void) {

10
soh/src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.c
View File

@ -894,7 +894,7 @@ static void* sMouthTextures[] = {
void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgDyYoseizo* this = (BgDyYoseizo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_dy_yoseizo.c", 1609);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc != BgDyYoseizo_Vanish) {
func_80093D18(globalCtx->state.gfxCtx);
@ -909,7 +909,7 @@ void BgDyYoseizo_Draw(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, BgDyYoseizo_OverrideLimbDraw, NULL, this);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_dy_yoseizo.c", 1629);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
BgDyYoseizo_ParticleDraw(this, globalCtx);
}
@ -1010,7 +1010,7 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) {
BgDyYoseizoParticle* particle = this->particles;
s16 i;
OPEN_DISPS(gfxCtx, "../z_bg_dy_yoseizo.c", 1767);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
for (i = 0; i < 200; i++, particle++) {
@ -1031,11 +1031,11 @@ void BgDyYoseizo_ParticleDraw(BgDyYoseizo* this, GlobalContext* globalCtx) {
Matrix_Scale(particle->scale, particle->scale, 1.0f, MTXMODE_APPLY);
Matrix_RotateZ(particle->roll, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_bg_dy_yoseizo.c", 1810),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gGreatFairyParticleAliveDL));
}
}
CLOSE_DISPS(gfxCtx, "../z_bg_dy_yoseizo.c", 1819);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}

10
soh/src/overlays/actors/ovl_Bg_Ganon_Otyuka/z_bg_ganon_otyuka.c
View File

@ -257,7 +257,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossGanon* ganondorf;
f32 spBC = -30.0f;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 702);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
actor = globalCtx->actorCtx.actorLists[ACTORCAT_BOSS].head;
while (actor != NULL) {
@ -303,7 +303,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
phi_s1 = sPlatformTopDL;
}
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 766),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, phi_s2);
@ -317,7 +317,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(sSideCenters[i].x, 0.0f, sSideCenters[i].z, MTXMODE_APPLY);
Matrix_RotateY(sSideAngles[i], MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++,
Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 785),
Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sPlatformSideDL);
Matrix_Pop();
@ -355,7 +355,7 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(sSideAngles[i], MTXMODE_APPLY);
Matrix_Scale(0.3f, platform->flashYScale * 0.3f, 0.3f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++,
Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 847),
Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sFlashDL);
Matrix_Pop();
@ -368,5 +368,5 @@ void BgGanonOtyuka_Draw(Actor* thisx, GlobalContext* globalCtx) {
actor = actor->next;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ganon_otyuka.c", 857);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Gate_Shutter/z_bg_gate_shutter.c
View File

@ -124,13 +124,13 @@ void BgGateShutter_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGateShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 323);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 328),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gKakarikoGuardGateDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gate_shutter.c", 333);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Gjyo_Bridge/z_bg_gjyo_bridge.c
View File

@ -100,7 +100,7 @@ void BgGjyoBridge_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgGjyoBridge* this = (BgGjyoBridge*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 260);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
@ -112,10 +112,10 @@ void BgGjyoBridge_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, -globalCtx->gameplayFrames & 127, 32, 32, 1, 0,
globalCtx->gameplayFrames & 127, 32, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 281),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gRainbowBridgeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gjyo_bridge.c", 285);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

8
soh/src/overlays/actors/ovl_Bg_Gnd_Darkmeiro/z_bg_gnd_darkmeiro.c
View File

@ -197,19 +197,19 @@ void BgGndDarkmeiro_DrawSwitchBlock(Actor* thisx, GlobalContext* globalCtx) {
this->timer2 = vanishTimer * 8;
}
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_darkmeiro.c", 378);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
//! @bug Due to a bug in the display list, the transparency data is not used.
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 198, 202, 208, this->timer2);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_darkmeiro.c", 380);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Gfx_DrawDListXlu(globalCtx, gClearBlockDL);
}
}
void BgGndDarkmeiro_DrawStaticBlock(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_darkmeiro.c", 391);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 198, 202, 208, 255);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_darkmeiro.c", 393);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Gfx_DrawDListXlu(globalCtx, gClearBlockDL);
}

6
soh/src/overlays/actors/ovl_Bg_Gnd_Firemeiro/z_bg_gnd_firemeiro.c
View File

@ -140,12 +140,12 @@ void BgGndFiremeiro_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgGndFiremeiro_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_firemeiro.c", 280);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_800943C8(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gnd_firemeiro.c", 282),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gFireTrialPlatformDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_firemeiro.c", 285);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Gnd_Soulmeiro/z_bg_gnd_soulmeiro.c
View File

@ -201,12 +201,12 @@ void BgGndSoulmeiro_Draw(Actor* thisx, GlobalContext* globalCtx) {
switch (params) {
case 0:
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_soulmeiro.c", 398);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_gnd_soulmeiro.c", 400),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, dLists[params]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_gnd_soulmeiro.c", 403);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
break;
case 1:
Gfx_DrawDListXlu(globalCtx, dLists[params]);

8
soh/src/overlays/actors/ovl_Bg_Haka/z_bg_haka.c
View File

@ -148,18 +148,18 @@ void BgHaka_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHaka_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka.c", 401);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka.c", 406),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gGravestoneStoneDL);
Matrix_Translate(0.0f, 0.0f, thisx->minVelocityY * 10.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka.c", 416),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gGravestoneEarthDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka.c", 421);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

14
soh/src/overlays/actors/ovl_Bg_Haka_Gate/z_bg_haka_gate.c
View File

@ -319,7 +319,7 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) {
f32 scale;
if (this->vFlameScale > 0) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 716);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (1) {}
@ -334,10 +334,10 @@ void BgHakaGate_DrawFlame(BgHakaGate* this, GlobalContext* globalCtx) {
Matrix_RotateY(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) * (M_PI / 0x8000), MTXMODE_APPLY);
scale = this->vFlameScale * 0.00001f;
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 744),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 749);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
}
@ -356,22 +356,22 @@ void BgHakaGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else {
func_80093D18(globalCtx->state.gfxCtx);
if (thisx->params == BGHAKAGATE_FLOOR) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 781);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Get(&currentMtxF);
Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY);
Matrix_RotateX(this->vOpenAngle * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_Translate(0.0f, 0.0f, 2000.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 788),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_010A10);
Matrix_Put(&currentMtxF);
Matrix_Translate(0.0f, 0.0f, 2000.0f, MTXMODE_APPLY);
Matrix_RotateX(-this->vOpenAngle * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_Translate(0.0f, 0.0f, -2000.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 796),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_010C10);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_gate.c", 800);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} else {
Gfx_DrawDListOpa(globalCtx, displayLists[thisx->params]);
}

12
soh/src/overlays/actors/ovl_Bg_Haka_Ship/z_bg_haka_ship.c
View File

@ -198,29 +198,29 @@ void BgHakaShip_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHakaShip* this = (BgHakaShip*)thisx;
f32 angleTemp;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 528);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
if (this->dyna.actor.params == 0) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 534),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_00D330);
angleTemp = this->yOffset * (M_PI / 0x8000);
Matrix_Translate(-3670.0f, 620.0f, 1150.0f, MTXMODE_APPLY);
Matrix_RotateZ(angleTemp, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 547),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_005A70);
Matrix_Translate(0.0f, 0.0f, -2300.0f, MTXMODE_APPLY);
Matrix_RotateZ(-(2.0f * angleTemp), MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 556),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_005A70);
} else {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 562),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_haka_objects_DL_00E910);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_ship.c", 568);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc == BgHakaShip_CutsceneStationary || this->actionFunc == BgHakaShip_Move) {
s32 pad;
Vec3f sp2C;

6
soh/src/overlays/actors/ovl_Bg_Haka_Tubo/z_bg_haka_tubo.c
View File

@ -222,7 +222,7 @@ void BgHakaTubo_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_tubo.c", 476);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
Matrix_Translate(this->dyna.actor.world.pos.x, this->dyna.actor.world.pos.y + 235.0f, this->dyna.actor.world.pos.z,
@ -235,11 +235,11 @@ void BgHakaTubo_DrawFlameCircle(BgHakaTubo* this, GlobalContext* globalCtx) {
gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->fireScroll & 127, 0, 32, 64, 1, 0,
(this->fireScroll * -15) & 0xFF, 32, 64));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_tubo.c", 497),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_tubo.c", 501);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgHakaTubo_Draw(Actor* thisx, GlobalContext* globalCtx) {

8
soh/src/overlays/actors/ovl_Bg_Haka_Water/z_bg_haka_water.c
View File

@ -112,7 +112,7 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 temp;
s32 pad2;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 287);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
if (this->isLowered) {
@ -127,7 +127,7 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
globalCtx->gameplayFrames % 128, 32, 32, 1, 0, (0 - globalCtx->gameplayFrames) % 128,
32, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 312),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBotwWaterRingDL);
@ -140,9 +140,9 @@ void BgHakaWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (u8)(5.1f * temp));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 328),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBotwWaterFallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_haka_water.c", 332);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

8
soh/src/overlays/actors/ovl_Bg_Heavy_Block/z_bg_heavy_block.c
View File

@ -351,7 +351,7 @@ void BgHeavyBlock_LiftedUp(BgHeavyBlock* this, GlobalContext* globalCtx) {
if (this->timer == 11) {
func_800AA000(0.0f, 0xFF, 0x14, 0x14);
func_8002F7DC(&player->actor, NA_SE_PL_PULL_UP_BIGROCK);
LOG_STRING("NA_SE_PL_PULL_UP_BIGROCK", "../z_bg_heavy_block.c", 691);
LOG_STRING("NA_SE_PL_PULL_UP_BIGROCK", __FILE__, __LINE__);
}
if (this->timer < 40) {
@ -489,7 +489,7 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
Player* player = GET_PLAYER(globalCtx);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 904);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (BgHeavyBlock_LiftedUp == this->actionFunc) {
Matrix_SetTranslateRotateYXZ(player->leftHandPos.x, player->leftHandPos.y, player->leftHandPos.z,
@ -504,11 +504,11 @@ void BgHeavyBlock_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_MultVec3f(&D_80884ED4, &thisx->home.pos);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 931),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gHeavyBlockEntirePillarDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_heavy_block.c", 935);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgHeavyBlock_DrawPiece(Actor* thisx, GlobalContext* globalCtx) {

12
soh/src/overlays/actors/ovl_Bg_Hidan_Curtain/z_bg_hidan_curtain.c
View File

@ -76,8 +76,8 @@ void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
this->type = (thisx->params >> 0xC) & 0xF;
if (this->type > 6) {
// "Type is not set"
osSyncPrintf("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_hidan_curtain.c",
352, this->actor.params);
osSyncPrintf("Error : object のタイプが設定されていない(%s %d)(arg_data 0x%04x)\n", __FILE__,
__LINE__, this->actor.params);
Actor_Kill(&this->actor);
return;
}
@ -90,7 +90,7 @@ void BgHidanCurtain_Init(Actor* thisx, GlobalContext* globalCtx) {
if ((this->actor.params < 0) || (this->actor.params > 0x3F)) {
// "Save bit is not set"
osSyncPrintf("Warning : object のセーブビットが設定されていない(%s %d)(arg_data 0x%04x)\n",
"../z_bg_hidan_curtain.c", 373, this->actor.params);
__FILE__, __LINE__, this->actor.params);
}
Actor_SetScale(&this->actor, hcParams->scale);
Collider_InitCylinder(globalCtx, &this->collider);
@ -242,7 +242,7 @@ void BgHidanCurtain_Update(Actor* thisx, GlobalContext* globalCtx2) {
void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanCurtain* this = (BgHidanCurtain*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 685);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 220, 0, this->alpha);
@ -253,10 +253,10 @@ void BgHidanCurtain_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->texScroll & 0x7F, 0, 0x20, 0x40, 1, 0,
(this->texScroll * -0xF) & 0xFF, 0x20, 0x40));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 698),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_curtain.c", 702);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Hidan_Firewall/z_bg_hidan_firewall.c
View File

@ -202,16 +202,16 @@ static void* sFireballTexs[] = {
void BgHidanFirewall_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanFirewall* this = (BgHidanFirewall*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 448);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sFireballTexs[this->unk_150]));
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x01, 255, 255, 0, 150);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 458),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFireTempleFireballUpperHalfDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_firewall.c", 463);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Hidan_Fwbig/z_bg_hidan_fwbig.c
View File

@ -251,7 +251,7 @@ void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
f32 height;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_fwbig.c", 630);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
@ -269,10 +269,10 @@ void BgHidanFwbig_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 0x80, 0, 0x20, 0x40, 1, 0,
(u8)(globalCtx->gameplayFrames * -15), 0x20, 0x40));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_fwbig.c", 660),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFireTempleBigFireWallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_fwbig.c", 664);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

10
soh/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
View File

@ -186,7 +186,7 @@ void BgHidanHamstep_Init(Actor* thisx, GlobalContext* globalCtx) {
// "[Hammer Step] I can't create a step!"
osSyncPrintf("【ハンマーステップ】 足場産れない！！\n");
osSyncPrintf("%s %d\n", "../z_bg_hidan_hamstep.c", 425);
osSyncPrintf("%s %d\n", __FILE__, __LINE__);
while (step != NULL) {
Actor_Kill(&step->dyna.actor);
@ -350,7 +350,7 @@ void func_80888A58(BgHidanHamstep* this, GlobalContext* globalCtx) {
if (((this->dyna.actor.params & 0xFF) <= 0) || ((this->dyna.actor.params & 0xFF) >= 6)) {
// "[Hammer Step] arg_data strange (arg_data = %d)"
osSyncPrintf("【ハンマーステップ】 arg_data おかしい (arg_data = %d)", this->dyna.actor.params);
osSyncPrintf("%s %d\n", "../z_bg_hidan_hamstep.c", 696);
osSyncPrintf("%s %d\n", __FILE__, __LINE__);
}
if (((this->dyna.actor.world.pos.y - this->dyna.actor.home.pos.y) <=
@ -397,11 +397,11 @@ void BgHidanHamstep_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_hamstep.c", 782);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_hamstep.c", 787),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if ((thisx->params & 0xFF) == 0) {
@ -410,5 +410,5 @@ void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gFireTempleStoneStep2DL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_hamstep.c", 796);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.c
View File

@ -151,13 +151,13 @@ void BgHidanKousi_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgHidanKousi_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_kousi.c", 350);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_kousi.c", 354),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sMetalFencesDLs[thisx->params & 0xFF]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_kousi.c", 359);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

8
soh/src/overlays/actors/ovl_Bg_Hidan_Kowarerukabe/z_bg_hidan_kowarerukabe.c
View File

@ -120,7 +120,7 @@ void BgHidanKowarerukabe_Init(Actor* thisx, GlobalContext* globalCtx) {
((this->dyna.actor.params & 0xFF) > LARGE_BOMBABLE_WALL)) {
// "Error: Fire Temple Breakable Walls. arg_data I can't determine the (%s %d)(arg_data 0x%04x)"
osSyncPrintf("Error : 炎の神殿 壊れる壁 の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n",
"../z_bg_hidan_kowarerukabe.c", 254, this->dyna.actor.params);
__FILE__, __LINE__, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
return;
}
@ -324,15 +324,15 @@ void BgHidanKowarerukabe_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgHidanKowarerukabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanKowarerukabe* this = (BgHidanKowarerukabe*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_kowarerukabe.c", 565);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_kowarerukabe.c", 568),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sBreakableWallDLists[this->dyna.actor.params & 0xFF]);
Collider_UpdateSpheres(0, &this->collider);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_kowarerukabe.c", 573);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Hidan_Rock/z_bg_hidan_rock.c
View File

@ -353,7 +353,7 @@ static void* sVerticalFlamesTexs[] = {
void func_8088BC40(GlobalContext* globalCtx, BgHidanRock* this) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_rock.c", 808);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x01, 255, 255, 0, 150);
@ -371,11 +371,11 @@ void func_8088BC40(GlobalContext* globalCtx, BgHidanRock* this) {
Matrix_Scale(6.0f, this->unk_16C, 6.0f, MTXMODE_APPLY);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sVerticalFlamesTexs[globalCtx->gameplayFrames & 7]));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_rock.c", 853),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFireTempleBigVerticalFlameDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_rock.c", 857);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgHidanRock_Draw(Actor* thisx, GlobalContext* globalCtx) {

8
soh/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
View File

@ -215,7 +215,7 @@ Gfx* BgHidanRsekizou_DrawFireball(GlobalContext* globalCtx, BgHidanRsekizou* thi
mf->zw = (tmpf7 * coss) + this->dyna.actor.world.pos.z;
gSPMatrix(displayList++,
Matrix_MtxFToMtx(Matrix_CheckFloats(mf, "../z_bg_hidan_rsekizou.c", 543),
Matrix_MtxFToMtx(Matrix_CheckFloats(mf, __FILE__, __LINE__),
Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx))),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(displayList++, gFireTempleFireballDL);
@ -229,11 +229,11 @@ void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
MtxF mf;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 564);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 568),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gFireTempleSpinningFlamethrowerDL);
Matrix_MtxFCopy(&mf, &gMtxFClear);
@ -259,5 +259,5 @@ void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 600);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

8
soh/src/overlays/actors/ovl_Bg_Hidan_Sekizou/z_bg_hidan_sekizou.c
View File

@ -319,7 +319,7 @@ Gfx* func_8088D9F4(GlobalContext* globalCtx, BgHidanSekizou* this, s16 arg2, Mtx
arg3->yw = this->dyna.actor.world.pos.y + 30.0f + (.7f * phi_f12);
arg3->zw = (temp_f2 * arg5) + this->dyna.actor.world.pos.z;
gSPMatrix(arg7++,
Matrix_MtxFToMtx(Matrix_CheckFloats(arg3, "../z_bg_hidan_sekizou.c", 711),
Matrix_MtxFToMtx(Matrix_CheckFloats(arg3, __FILE__, __LINE__),
Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx))),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -395,9 +395,9 @@ void BgHidanSekizou_Draw(Actor* thisx, GlobalContext* globalCtx2) {
s32 i;
s32 sp6C[4];
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_sekizou.c", 827);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_sekizou.c", 831),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->dyna.actor.params == 0) {
gSPDisplayList(POLY_OPA_DISP++, gFireTempleStationaryFlamethrowerShortDL);
@ -430,5 +430,5 @@ void BgHidanSekizou_Draw(Actor* thisx, GlobalContext* globalCtx2) {
}
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_sekizou.c", 899);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

10
soh/src/overlays/actors/ovl_Bg_Hidan_Sima/z_bg_hidan_sima.c
View File

@ -260,7 +260,7 @@ Gfx* func_8088EB54(GlobalContext* globalCtx, BgHidanSima* this, Gfx* gfx) {
gSPSegment(gfx++, 0x09, SEGMENTED_TO_VIRTUAL(sFireballsTexs[(this->timer + s3) % 7]));
gSPMatrix(gfx++,
Matrix_MtxFToMtx(Matrix_CheckFloats(&mtxF, "../z_bg_hidan_sima.c", 611),
Matrix_MtxFToMtx(Matrix_CheckFloats(&mtxF, __FILE__, __LINE__),
Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx))),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, gFireTempleFireballDL);
@ -269,7 +269,7 @@ Gfx* func_8088EB54(GlobalContext* globalCtx, BgHidanSima* this, Gfx* gfx) {
mtxF.zw = this->dyna.actor.world.pos.z + (phi_s5 * 25 + 80) * cos;
gSPSegment(gfx++, 0x09, SEGMENTED_TO_VIRTUAL(sFireballsTexs[(this->timer + s3) % 7]));
gSPMatrix(gfx++,
Matrix_MtxFToMtx(Matrix_CheckFloats(&mtxF, "../z_bg_hidan_sima.c", 624),
Matrix_MtxFToMtx(Matrix_CheckFloats(&mtxF, __FILE__, __LINE__),
Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx))),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfx++, gFireTempleFireballDL);
@ -279,9 +279,9 @@ Gfx* func_8088EB54(GlobalContext* globalCtx, BgHidanSima* this, Gfx* gfx) {
void BgHidanSima_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanSima* this = (BgHidanSima*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_sima.c", 641);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_sima.c", 645),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->dyna.actor.params == 0) {
gSPDisplayList(POLY_OPA_DISP++, gFireTempleStonePlatform1DL);
@ -294,5 +294,5 @@ void BgHidanSima_Draw(Actor* thisx, GlobalContext* globalCtx) {
POLY_XLU_DISP = func_8088EB54(globalCtx, this, POLY_XLU_DISP);
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_sima.c", 668);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

8
soh/src/overlays/actors/ovl_Bg_Ice_Shelter/z_bg_ice_shelter.c
View File

@ -110,7 +110,7 @@ void func_80890874(BgIceShelter* this, GlobalContext* globalCtx, CollisionHeader
if (this->dyna.bgId == BG_ACTOR_MAX) {
// "Warning : move BG registration failed"
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_ice_shelter.c", 362,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}
@ -388,11 +388,11 @@ void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
BgIceShelter* this = (BgIceShelter*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ice_shelter.c", 748);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ice_shelter.c", 751),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
switch ((this->dyna.actor.params >> 8) & 7) {
@ -435,5 +435,5 @@ void BgIceShelter_Draw(Actor* thisx, GlobalContext* globalCtx2) {
break;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ice_shelter.c", 815);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
View File

@ -104,14 +104,14 @@ void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 240);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 245),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gIngoGateDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 250);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

2
soh/src/overlays/actors/ovl_Bg_Jya_1flift/z_bg_jya_1flift.c
View File

@ -78,7 +78,7 @@ void BgJya1flift_InitDynapoly(BgJya1flift* this, GlobalContext* globalCtx, Colli
if (this->dyna.bgId == BG_ACTOR_MAX) {
// "Warning : move BG login failed"
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_1flift.c", 179,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}

2
soh/src/overlays/actors/ovl_Bg_Jya_Amishutter/z_bg_jya_amishutter.c
View File

@ -53,7 +53,7 @@ void BgJyaAmishutter_InitDynaPoly(BgJyaAmishutter* this, GlobalContext* globalCt
CollisionHeader_GetVirtual(collision, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
if (this->dyna.bgId == BG_ACTOR_MAX) {
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_amishutter.c", 129,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}

14
soh/src/overlays/actors/ovl_Bg_Jya_Bigmirror/z_bg_jya_bigmirror.c
View File

@ -77,7 +77,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, GlobalContext* globalCtx) {
if (curCobraInfo->cobra->dyna.actor.update == NULL) {
// "Cobra deleted"
osSyncPrintf("Error : コブラ削除された (%s %d)\n", "../z_bg_jya_bigmirror.c", 203);
osSyncPrintf("Error : コブラ削除された (%s %d)\n", __FILE__, __LINE__);
}
} else {
curCobraInfo->cobra = (BgJyaCobra*)Actor_SpawnAsChild(
@ -87,7 +87,7 @@ void BgJyaBigmirror_HandleCobra(Actor* thisx, GlobalContext* globalCtx) {
if (&curCobraInfo->cobra->dyna.actor == NULL) {
// "Cobra generation failed"
osSyncPrintf("Error : コブラ発生失敗 (%s %d)\n", "../z_bg_jya_bigmirror.c", 221);
osSyncPrintf("Error : コブラ発生失敗 (%s %d)\n", __FILE__, __LINE__);
}
}
}
@ -159,7 +159,7 @@ void BgJyaBigmirror_HandleMirRay(Actor* thisx, GlobalContext* globalCtx) {
if (this->lightBeams[i] == NULL) {
// "Mir Ray generation failed"
osSyncPrintf("Error : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_bigmirror.c", 310);
osSyncPrintf("Error : Mir Ray 発生失敗 (%s %d)\n", __FILE__, __LINE__);
}
}
} else {
@ -213,7 +213,7 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBigmirror* this = (BgJyaBigmirror*)thisx;
Actor* lift;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bigmirror.c", 435);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
lift = Actor_Find(&globalCtx->actorCtx, ACTOR_BG_JYA_LIFT, ACTORCAT_BG);
if (lift != NULL) {
@ -222,7 +222,7 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) {
Matrix_SetTranslateRotateYXZ(this->actor.world.pos.x, this->actor.world.pos.y + 40.0f, this->actor.world.pos.z,
&this->actor.shape.rot);
Matrix_Scale(0.1f, (this->liftHeight * -(1.0f / 1280.0f)) + (1779.4f / 1280.0f), 0.1f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_bigmirror.c", 457),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBigMirror1DL);
@ -230,12 +230,12 @@ void BgJyaBigmirror_DrawLightBeam(Actor* thisx, GlobalContext* globalCtx) {
if (1) {}
Matrix_SetTranslateRotateYXZ(lift->world.pos.x, lift->world.pos.y, lift->world.pos.z, &D_80893F4C);
Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_bigmirror.c", 467),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBigMirror2DL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bigmirror.c", 476);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgJyaBigmirror_Draw(Actor* thisx, GlobalContext* globalCtx) {

6
soh/src/overlays/actors/ovl_Bg_Jya_Block/z_bg_jya_block.c
View File

@ -64,15 +64,15 @@ void BgJyaBlock_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBlock_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_block.c", 145);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gPushBlockGrayTex));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_block.c", 153),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetEnvColor(POLY_OPA_DISP++, 232, 210, 176, 255);
gSPDisplayList(POLY_OPA_DISP++, gPushBlockDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_block.c", 158);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

14
soh/src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.c
View File

@ -183,7 +183,7 @@ void BgJyaBombchuiwa_SpawnLightRay(BgJyaBombchuiwa* this, GlobalContext* globalC
if (Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_MIR_RAY, this->actor.world.pos.x, this->actor.world.pos.y,
this->actor.world.pos.z, 0, 0, 0, 0) == NULL) {
// "Occurrence failure"
osSyncPrintf("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombchuiwa.c", 410,
osSyncPrintf("Ｅｒｒｏｒ : Mir_Ray 発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->actor.params);
}
}
@ -197,27 +197,27 @@ void BgJyaBombchuiwa_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgJyaBombchuiwa_DrawRock(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 436);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 439),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBombchuiwa2DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 443);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgJyaBombchuiwa_DrawLight(Actor* thisx, GlobalContext* globalCtx) {
BgJyaBombchuiwa* this = (BgJyaBombchuiwa*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 453);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 457),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, CLAMP_MAX((u32)(this->lightRayIntensity * 153.0f), 153));
gSPDisplayList(POLY_XLU_DISP++, gBombchuiwaLight1DL);
gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, CLAMP_MAX((u32)(this->lightRayIntensity * 255.0f), 255));
gSPDisplayList(POLY_XLU_DISP++, gBombchuiwaLight2DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_bombchuiwa.c", 472);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgJyaBombchuiwa_Draw(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Jya_Bombiwa/z_bg_jya_bombiwa.c
View File

@ -74,7 +74,7 @@ void BgJyaBombiwa_SetupDynaPoly(BgJyaBombiwa* this, GlobalContext* globalCtx, Co
if (this->dyna.bgId == BG_ACTOR_MAX) {
// "Warning: move BG registration failed"
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_bombiwa.c", 174,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}
@ -93,7 +93,7 @@ void BgJyaBombiwa_Init(Actor* thisx, GlobalContext* globalCtx) {
osSyncPrintf(VT_COL(YELLOW, BLACK));
// "Warning: Switch Number changed (%s %d)(SW %d)"
osSyncPrintf("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n", "../z_bg_jya_bombiwa.c", 218,
osSyncPrintf("Ｗａｒｎｉｎｇ : Switch Number が変更された(%s %d)(SW %d)\n", __FILE__, __LINE__,
this->dyna.actor.params & 0x3F);
osSyncPrintf(VT_RST);
}

22
soh/src/overlays/actors/ovl_Bg_Jya_Cobra/z_bg_jya_cobra.c
View File

@ -129,7 +129,7 @@ void BgJyaCobra_InitDynapoly(BgJyaCobra* this, GlobalContext* globalCtx, Collisi
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
if (this->dyna.bgId == BG_ACTOR_MAX) {
// "Warning : move BG Registration Failure"
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_cobra.c", 247,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}
@ -140,7 +140,7 @@ void BgJyaCobra_SpawnRay(BgJyaCobra* this, GlobalContext* globalCtx) {
if (this->dyna.actor.child == NULL) {
osSyncPrintf(VT_FGCOL(RED));
// "Ｅｒｒｏｒ : Mir Ray occurrence failure"
osSyncPrintf("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", "../z_bg_jya_cobra.c", 270);
osSyncPrintf("Ｅｒｒｏｒ : Mir Ray 発生失敗 (%s %d)\n", __FILE__, __LINE__);
osSyncPrintf(VT_RST);
}
}
@ -531,21 +531,21 @@ void BgJyaCobra_Update(Actor* thisx, GlobalContext* globalCtx2) {
}
void func_80896CB4(GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 864);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 867),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCobra2DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 872);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void func_80896D78(BgJyaCobra* this, GlobalContext* globalCtx) {
s32 pad;
Vec3s sp44;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 924);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
sp44.x = D_80897308[this->dyna.actor.params & 3] + this->dyna.actor.shape.rot.x;
@ -554,12 +554,12 @@ void func_80896D78(BgJyaCobra* this, GlobalContext* globalCtx) {
Matrix_SetTranslateRotateYXZ(this->unk_180.x, this->unk_180.y, this->unk_180.z, &sp44);
Matrix_Scale(0.1f, 0.1f, this->unk_190, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 939),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s32)(this->unk_18C * 140.0f));
gSPDisplayList(POLY_XLU_DISP++, gCobra3DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 947);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
@ -568,7 +568,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
Vec3f sp64;
Vec3s* phi_a3;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 966);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80094044(globalCtx->state.gfxCtx);
@ -593,7 +593,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
Matrix_Translate(0.0f, 0.0f, 40.0f, MTXMODE_APPLY);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 120);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 994),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPLoadTextureBlock(POLY_XLU_DISP++, ALIGN16((s32)(&this->shadowTexture)), G_IM_FMT_I, G_IM_SIZ_8b, 0x40, 0x40, 0,
@ -602,7 +602,7 @@ void BgJyaCobra_DrawShadow(BgJyaCobra* this, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, sShadowDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_cobra.c", 1006);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgJyaCobra_Draw(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Jya_Ironobj/z_bg_jya_ironobj.c
View File

@ -108,7 +108,7 @@ void BgJyaIronobj_SpawnPillarParticles(BgJyaIronobj* this, GlobalContext* global
s32 pad[2];
if (enIk->unk_2FF <= 0 || enIk->unk_2FF >= 4) {
osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 233, enIk->unk_2FF);
osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", __FILE__, __LINE__, enIk->unk_2FF);
return;
}
osSyncPrintf("¢ attack_type(%d)\n", enIk->unk_2FF);
@ -171,7 +171,7 @@ void BgJyaIronobj_SpawnThoneParticles(BgJyaIronobj* this, GlobalContext* arg1, E
s32 pad[2];
if (enIk->unk_2FF <= 0 || enIk->unk_2FF >= 4) {
osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", "../z_bg_jya_ironobj.c", 362, enIk->unk_2FF);
osSyncPrintf("Error 攻撃方法が分からない(%s %d)\n", __FILE__, __LINE__, enIk->unk_2FF);
return;
}
osSyncPrintf("¢ attack_type(%d)\n", enIk->unk_2FF);

12
soh/src/overlays/actors/ovl_Bg_Jya_Megami/z_bg_jya_megami.c
View File

@ -297,16 +297,16 @@ static void* sLeftSideCrumbles[] = {
};
void BgJyaMegami_DrawFace(BgJyaMegami* this, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 706);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sRightSideCrumbles[this->crumbleIndex]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sLeftSideCrumbles[this->crumbleIndex]));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 716),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMegami1DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 720);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
static Gfx* sDLists[] = {
@ -320,7 +320,7 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, GlobalContext* globalCtx) {
BgJyaMegamiPiece* piece;
u32 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 746);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
@ -334,12 +334,12 @@ void BgJyaMegami_DrawExplode(BgJyaMegami* this, GlobalContext* globalCtx) {
Matrix_Translate(sPiecesInit[i].unk_00.x * -10.0f, sPiecesInit[i].unk_00.y * -10.0f,
sPiecesInit[i].unk_00.z * -10.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 778),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sDLists[i]);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_jya_megami.c", 783);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgJyaMegami_Draw(Actor* thisx, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Bg_Jya_Zurerukabe/z_bg_jya_zurerukabe.c
View File

@ -70,7 +70,7 @@ void BgJyaZurerukabe_InitDynaPoly(BgJyaZurerukabe* this, GlobalContext* globalCt
CollisionHeader_GetVirtual(collision, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
if (this->dyna.bgId == BG_ACTOR_MAX) {
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 194,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}
@ -124,7 +124,7 @@ void BgJyaZurerukabe_Init(Actor* thisx, GlobalContext* globalCtx) {
if (i == ARRAY_COUNT(D_8089B9F0)) {
osSyncPrintf(VT_COL(RED, WHITE));
osSyncPrintf("home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n", "../z_bg_jya_zurerukabe.c", 299,
osSyncPrintf("home pos が変更されたみたい(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.params);
osSyncPrintf(VT_RST);
}

6
soh/src/overlays/actors/ovl_Bg_Menkuri_Eye/z_bg_menkuri_eye.c
View File

@ -123,7 +123,7 @@ void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMenkuriEye* this = (BgMenkuriEye*)thisx;
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 292);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
if (Flags_GetSwitch(globalCtx, this->actor.params)) {
gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 255);
@ -135,11 +135,11 @@ void BgMenkuriEye_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW);
Matrix_RotateZYX(this->actor.world.rot.x, this->actor.world.rot.y, this->actor.world.rot.z, MTXMODE_APPLY);
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 331),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gGTGEyeStatueEyeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_menkuri_eye.c", 335);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgMenkuriEye_Reset(void) {

26
soh/src/overlays/actors/ovl_Bg_Mizu_Bwall/z_bg_mizu_bwall.c
View File

@ -191,8 +191,8 @@ void BgMizuBwall_Init(Actor* thisx, GlobalContext* globalCtx) {
} else {
Collider_InitTris(globalCtx, &this->collider);
if (!Collider_SetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInitFloor, this->elements)) {
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c",
484, this->dyna.actor.params);
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
__LINE__, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@ -227,8 +227,8 @@ void BgMizuBwall_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_InitTris(globalCtx, &this->collider);
if (!Collider_SetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInitRutoWall,
this->elements)) {
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c",
558, this->dyna.actor.params);
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
__LINE__, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@ -263,8 +263,8 @@ void BgMizuBwall_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_InitTris(globalCtx, &this->collider);
if (!Collider_SetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInitUnusedWall,
this->elements)) {
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c",
638, this->dyna.actor.params);
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
__LINE__, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@ -301,8 +301,8 @@ void BgMizuBwall_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_InitTris(globalCtx, &this->collider);
if (!Collider_SetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInitStingerWall,
this->elements)) {
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c",
724, this->dyna.actor.params);
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
__LINE__, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@ -339,8 +339,8 @@ void BgMizuBwall_Init(Actor* thisx, GlobalContext* globalCtx) {
Collider_InitTris(globalCtx, &this->collider);
if (!Collider_SetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInitStingerWall,
this->elements)) {
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mizu_bwall.c",
798, this->dyna.actor.params);
osSyncPrintf("Error : コリジョンデータセット失敗(%s %d)(arg_data 0x%04x)\n", __FILE__,
__LINE__, this->dyna.actor.params);
Actor_Kill(&this->dyna.actor);
} else {
f32 sin = Math_SinS(this->dyna.actor.shape.rot.y);
@ -505,7 +505,7 @@ void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
u32 frames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_bwall.c", 1095);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (1) {}
frames = globalCtx->gameplayFrames;
@ -522,10 +522,10 @@ void BgMizuBwall_Draw(Actor* thisx, GlobalContext* globalCtx2) {
gSPSegment(POLY_OPA_DISP++, 0x0B,
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, 3 * frames, 0, 0x20, 0x20, 1, 0, 0, 0x20, 0x20, 0,
0, 0, this->scrollAlpha4));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mizu_bwall.c", 1129), 2);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__), 2);
if (this->dList != NULL) {
gSPDisplayList(POLY_OPA_DISP++, this->dList);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_bwall.c", 1136);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Mizu_Movebg/z_bg_mizu_movebg.c
View File

@ -365,7 +365,7 @@ void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx2) {
if (1) {}
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_movebg.c", 754);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
frames = globalCtx->gameplayFrames;
func_80093D18(globalCtx->state.gfxCtx);
@ -386,12 +386,12 @@ void BgMizuMovebg_Draw(Actor* thisx, GlobalContext* globalCtx2) {
Gfx_TwoTexScrollEnvColor(globalCtx->state.gfxCtx, 0, frames * 3, 0, 32, 32, 1, 0, 0, 32, 32, 0, 0, 0,
this->scrollAlpha4));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mizu_movebg.c", 788),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->dlist != NULL) {
gSPDisplayList(POLY_OPA_DISP++, this->dlist);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_movebg.c", 795);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Mizu_Shutter/z_bg_mizu_shutter.c
View File

@ -158,13 +158,13 @@ void BgMizuShutter_Draw(BgMizuShutter* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMizuShutter* this = (BgMizuShutter*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_shutter.c", 410);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mizu_shutter.c", 415),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->displayList != NULL) {
gSPDisplayList(POLY_OPA_DISP++, this->displayList);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_shutter.c", 422);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
View File

@ -329,7 +329,7 @@ void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMizuWater* this = (BgMizuWater*)thisx;
s32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 738);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gameplayFrames = globalCtx->gameplayFrames;
func_80093D84(globalCtx->state.gfxCtx);
@ -337,7 +337,7 @@ void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -gameplayFrames * 1, gameplayFrames * 1, 32, 32, 1, 0,
-gameplayFrames * 1, 32, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 749),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 128);
@ -346,5 +346,5 @@ void BgMizuWater_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gObjectMizuObjectsWaterDL_004B20);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mizu_water.c", 756);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Mjin/z_bg_mjin.c
View File

@ -107,7 +107,7 @@ void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMjin* this = (BgMjin*)thisx;
Gfx* dlist;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 250);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (thisx->params != 0) {
s32 objBankIndex = Object_GetIndex(&globalCtx->objectCtx, sObjectIDs[thisx->params - 1]);
@ -123,9 +123,9 @@ void BgMjin_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 285),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, dlist);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mjin.c", 288);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

10
soh/src/overlays/actors/ovl_Bg_Mori_Bigst/z_bg_mori_bigst.c
View File

@ -61,7 +61,7 @@ void BgMoriBigst_InitDynapoly(BgMoriBigst* this, GlobalContext* globalCtx, Colli
if (this->dyna.bgId == BG_ACTOR_MAX) {
// "Warning : move BG login failed"
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_bigst.c", 190,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}
@ -81,7 +81,7 @@ void BgMoriBigst_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->moriTexObjIndex < 0) {
// "【Big Stalfos key ceiling】 bank danger!"
osSyncPrintf("【ビッグスタルフォス鍵型天井】 バンク危険！\n");
osSyncPrintf("%s %d\n", "../z_bg_mori_bigst.c", 234);
osSyncPrintf("%s %d\n", __FILE__, __LINE__);
Actor_Kill(&this->dyna.actor);
return;
}
@ -244,14 +244,14 @@ void BgMoriBigst_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriBigst* this = (BgMoriBigst*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 541);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 548),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMoriBigstDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_bigst.c", 553);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

12
soh/src/overlays/actors/ovl_Bg_Mori_Elevator/z_bg_mori_elevator.c
View File

@ -92,7 +92,7 @@ void BgMoriElevator_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->moriTexObjIndex < 0) {
Actor_Kill(thisx);
// "Forest Temple obj elevator Bank Danger!"
osSyncPrintf("Error : 森の神殿 obj elevator バンク危険！(%s %d)\n", "../z_bg_mori_elevator.c", 277);
osSyncPrintf("Error : 森の神殿 obj elevator バンク危険！(%s %d)\n", __FILE__, __LINE__);
} else {
switch (sKankyoIsSpawned) {
case false:
@ -141,7 +141,7 @@ void BgMoriElevator_WaitAfterInit(BgMoriElevator* this, GlobalContext* globalCtx
BgMoriElevator_SetupSetPosition(this);
} else {
// "Error: Forest Temple obj elevator Room setting is dangerous"
osSyncPrintf("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "../z_bg_mori_elevator.c", 371);
osSyncPrintf("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", __FILE__, __LINE__);
}
} else {
BgMoriElevator_SetupSetPosition(this);
@ -202,7 +202,7 @@ void BgMoriElevator_SetPosition(BgMoriElevator* this, GlobalContext* globalCtx)
BgMoriElevator_StopMovement(this);
} else {
// "Error:Forest Temple obj elevator Room setting is dangerous(%s %d)"
osSyncPrintf("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", "../z_bg_mori_elevator.c", 479);
osSyncPrintf("Error : 森の神殿 obj elevator 部屋設定が危険(%s %d)\n", __FILE__, __LINE__);
}
} else if ((globalCtx->roomCtx.curRoom.num == 2) && (this->dyna.actor.world.pos.y < -275.0f)) {
this->targetY = 233.0f;
@ -252,13 +252,13 @@ void BgMoriElevator_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriElevator* this = (BgMoriElevator*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_elevator.c", 575);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_elevator.c", 580),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMoriElevatorDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_elevator.c", 584);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

12
soh/src/overlays/actors/ovl_Bg_Mori_Hashigo/z_bg_mori_hashigo.c
View File

@ -90,7 +90,7 @@ void BgMoriHashigo_InitDynapoly(BgMoriHashigo* this, GlobalContext* globalCtx, C
if (this->dyna.bgId == BG_ACTOR_MAX) {
// "Warning : move BG login failed"
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 164,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}
@ -127,7 +127,7 @@ s32 BgMoriHashigo_SpawnLadder(BgMoriHashigo* this, GlobalContext* globalCtx) {
return true;
} else {
// "Ladder failure"
osSyncPrintf("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashigo.c", 220,
osSyncPrintf("Error : 梯子の発生失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.params);
return false;
}
@ -170,7 +170,7 @@ void BgMoriHashigo_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->moriTexObjIndex < 0) {
// "Bank danger!"
osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
"../z_bg_mori_hashigo.c", 312);
__FILE__, __LINE__);
Actor_Kill(&this->dyna.actor);
} else {
BgMoriHashigo_SetupWaitForMoriTex(this);
@ -282,12 +282,12 @@ void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashigo* this = (BgMoriHashigo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 516);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
if (1) {}
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 521),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
switch (this->dyna.actor.params) {
@ -298,5 +298,5 @@ void BgMoriHashigo_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gMoriHashigoLadderDL);
break;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashigo.c", 531);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

10
soh/src/overlays/actors/ovl_Bg_Mori_Hashira4/z_bg_mori_hashira4.c
View File

@ -62,7 +62,7 @@ void BgMoriHashira4_InitDynaPoly(BgMoriHashira4* this, GlobalContext* globalCtx,
if (this->dyna.bgId == BG_ACTOR_MAX) {
// "Warning : move BG login failed"
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_mori_hashira4.c", 155,
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params);
}
}
@ -85,7 +85,7 @@ void BgMoriHashira4_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_Kill(&this->dyna.actor);
// "Bank danger!"
osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->dyna.actor.params,
"../z_bg_mori_hashira4.c", 196);
__FILE__, __LINE__);
return;
}
if ((this->dyna.actor.params != 0) && Flags_GetSwitch(globalCtx, this->switchFlag)) {
@ -162,14 +162,14 @@ void BgMoriHashira4_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriHashira4* this = (BgMoriHashira4*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 339);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 344),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sDisplayLists[this->dyna.actor.params]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hashira4.c", 348);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

12
soh/src/overlays/actors/ovl_Bg_Mori_Hineri/z_bg_mori_hineri.c
View File

@ -232,11 +232,11 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
s8 objIndex;
MtxF mtx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 611);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIdx].segment);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 618),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sDLists[this->dyna.actor.params]);
if (this->boxObjIdx > 0) {
@ -251,7 +251,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
}
Matrix_RotateZYX(0, -0x8000, this->dyna.actor.shape.rot.z, MTXMODE_APPLY);
Matrix_Translate(0.0f, -50.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 652),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDungeonDoorDL);
}
@ -263,7 +263,7 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(147.0f, -245.0f, -453.0f, MTXMODE_APPLY);
Matrix_RotateY(M_PI / 2, MTXMODE_APPLY);
Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 689),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTreasureChestBossKeyChestFrontDL);
Matrix_Put(&mtx);
@ -274,12 +274,12 @@ void BgMoriHineri_DrawHallAndRoom(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateZ(M_PI, MTXMODE_APPLY);
}
Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 703),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTreasureChestBossKeyChestSideAndTopDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_hineri.c", 709);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgMoriHineri_Reset() {

10
soh/src/overlays/actors/ovl_Bg_Mori_Idomizu/z_bg_mori_idomizu.c
View File

@ -71,8 +71,8 @@ void BgMoriIdomizu_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->moriTexObjIndex < 0) {
Actor_Kill(&this->actor);
// "Bank danger!"
osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->actor.params, "../z_bg_mori_idomizu.c",
202);
osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", this->actor.params, __FILE__,
__LINE__);
return;
}
BgMoriIdomizu_SetupWaitForMoriTex(this);
@ -163,11 +163,11 @@ void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgMoriIdomizu* this = (BgMoriIdomizu*)thisx;
u32 gameplayFrames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 356);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 360),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
@ -180,5 +180,5 @@ void BgMoriIdomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gMoriIdomizuWaterDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_idomizu.c", 382);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

8
soh/src/overlays/actors/ovl_Bg_Mori_Kaitenkabe/z_bg_mori_kaitenkabe.c
View File

@ -61,7 +61,7 @@ void BgMoriKaitenkabe_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->moriTexObjIndex < 0) {
Actor_Kill(&this->dyna.actor);
// "【Rotating wall】 Bank danger!"
osSyncPrintf("【回転壁】 バンク危険！(%s %d)\n", "../z_bg_mori_kaitenkabe.c", 176);
osSyncPrintf("【回転壁】 バンク危険！(%s %d)\n", __FILE__, __LINE__);
} else {
this->actionFunc = BgMoriKaitenkabe_WaitForMoriTex;
}
@ -161,15 +161,15 @@ void BgMoriKaitenkabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriKaitenkabe* this = (BgMoriKaitenkabe*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 347);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 352),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMoriKaitenkabeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_kaitenkabe.c", 356);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

8
soh/src/overlays/actors/ovl_Bg_Mori_Rakkatenjo/z_bg_mori_rakkatenjo.c
View File

@ -67,7 +67,7 @@ void BgMoriRakkatenjo_Init(Actor* thisx, GlobalContext* globalCtx) {
this->moriTexObjIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_MORI_TEX);
if (this->moriTexObjIndex < 0) {
// "Forest Temple obj Falling Ceiling Bank Danger!"
osSyncPrintf("Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n", "../z_bg_mori_rakkatenjo.c", 205);
osSyncPrintf("Error : 森の神殿 obj 落下天井 バンク危険！(%s %d)\n", __FILE__, __LINE__);
Actor_Kill(&this->dyna.actor);
return;
}
@ -222,15 +222,15 @@ void BgMoriRakkatenjo_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgMoriRakkatenjo* this = (BgMoriRakkatenjo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 497);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, globalCtx->objectCtx.status[this->moriTexObjIndex].segment);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 502),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMoriRakkatenjoDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_mori_rakkatenjo.c", 506);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Po_Event/z_bg_po_event.c
View File

@ -605,7 +605,7 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 sp48;
s32 pad2;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1481);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
if ((this->type == 3) || (this->type == 2)) {
if (this->actionFunc == BgPoEvent_PaintingEmpty) {
@ -617,10 +617,10 @@ void BgPoEvent_Draw(Actor* thisx, GlobalContext* globalCtx) {
}
gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, alpha);
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1501),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, displayLists[this->type]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_event.c", 1508);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if ((this->type == 0) || (this->type == 1)) {
sp48 = (833.0f - this->dyna.actor.world.pos.y) * 0.0025f;

8
soh/src/overlays/actors/ovl_Bg_Po_Syokudai/z_bg_po_syokudai.c
View File

@ -150,10 +150,10 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
u8 green;
u8 blue;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 315);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 319),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gGoldenTorchDL);
@ -183,9 +183,9 @@ void BgPoSyokudai_Draw(Actor* thisx, GlobalContext* globalCtx) {
MTXMODE_APPLY);
Matrix_Scale(0.0027f, 0.0027f, 0.0027f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 368),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_po_syokudai.c", 373);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Pushbox/z_bg_pushbox.c
View File

@ -78,12 +78,12 @@ void BgPushbox_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgPushbox_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 263);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 269),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gBlockSmallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_pushbox.c", 272);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

12
soh/src/overlays/actors/ovl_Bg_Spot00_Hanebasi/z_bg_spot00_hanebasi.c
View File

@ -260,7 +260,7 @@ void BgSpot00Hanebasi_DrawTorches(Actor* thisx, GlobalContext* globalCtx2) {
f32 angle;
s32 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 633);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
@ -283,23 +283,23 @@ void BgSpot00Hanebasi_DrawTorches(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_RotateY(angle, MTXMODE_APPLY);
Matrix_Scale(sTorchFlameScale, sTorchFlameScale, sTorchFlameScale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 674),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 681);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) {
Vec3f basePos = { 158.0f, 10.0f, 400.0f };
Vec3f newPos;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 698);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 702),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (thisx->params == DT_DRAWBRIDGE) {
@ -327,5 +327,5 @@ void BgSpot00Hanebasi_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gHyruleFieldCastleDrawbridgeChainsDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot00_hanebasi.c", 733);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Spot01_Fusya/z_bg_spot01_fusya.c
View File

@ -76,13 +76,13 @@ void BgSpot01Fusya_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot01Fusya_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 210);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 214),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gKakarikoWindmillSailsDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_fusya.c", 219);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Spot01_Idohashira/z_bg_spot01_idohashira.c
View File

@ -321,16 +321,16 @@ void BgSpot01Idohashira_Init(Actor* thisx, GlobalContext* globalCtx) {
void func_808AB700(BgSpot01Idohashira* this, GlobalContext* globalCtx) {
GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(localGfxCtx, "../z_bg_spot01_idohashira.c", 689);
OPEN_DISPS(localGfxCtx, __FILE__, __LINE__);
func_80093D18(localGfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, "../z_bg_spot01_idohashira.c", 699),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_808AAF34(this, globalCtx);
gSPDisplayList(POLY_OPA_DISP++, gKakarikoWellArchDL);
CLOSE_DISPS(localGfxCtx, "../z_bg_spot01_idohashira.c", 708);
CLOSE_DISPS(localGfxCtx, __FILE__, __LINE__);
}
void BgSpot01Idohashira_Draw(Actor* thisx, GlobalContext* globalCtx) {

6
soh/src/overlays/actors/ovl_Bg_Spot01_Idomizu/z_bg_spot01_idomizu.c
View File

@ -70,11 +70,11 @@ void BgSpot01Idomizu_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
u32 frames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idomizu.c", 228);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idomizu.c", 232),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
frames = globalCtx->state.frames;
@ -84,5 +84,5 @@ void BgSpot01Idomizu_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gKakarikoWellWaterDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idomizu.c", 244);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Spot01_Idosoko/z_bg_spot01_idosoko.c
View File

@ -70,13 +70,13 @@ void BgSpot01Idosoko_Update(Actor* thisx, GlobalContext* globalCtx) {
}
void BgSpot01Idosoko_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 162);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 166),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gKakarikoBOTWStoneDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot01_idosoko.c", 171);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

12
soh/src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.c
View File

@ -226,7 +226,7 @@ void func_808ACCB8(Actor* thisx, GlobalContext* globalCtx) {
u8 greenEnv;
u8 blueEnv;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot02_objects.c", 600);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[0] != NULL &&
globalCtx->csCtx.npcActions[0]->action == 2) {
@ -257,7 +257,7 @@ void func_808ACCB8(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, redPrim, greenPrim, bluePrim, 255);
gDPSetEnvColor(POLY_XLU_DISP++, redEnv, greenEnv, blueEnv, 255);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot02_objects.c", 679),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_808AD850[this->unk_16A]));
gDPPipeSync(POLY_XLU_DISP++);
@ -265,7 +265,7 @@ void func_808ACCB8(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot02_objects.c", 692);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void func_808AD3D4(BgSpot02Objects* this, GlobalContext* globalCtx) {
@ -288,7 +288,7 @@ void func_808AD450(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
f32 lerp;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot02_objects.c", 736);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (globalCtx->csCtx.state != 0 && globalCtx->csCtx.npcActions[2] != NULL) {
u16 temp_v1 = globalCtx->csCtx.npcActions[2]->urot.z * 0.00549325f;
@ -318,7 +318,7 @@ void func_808AD450(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 170, 128);
gDPSetEnvColor(POLY_XLU_DISP++, 150, 120, 0, 128);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot02_objects.c", 795),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 2 * this->timer, -3 * this->timer, 32, 64, 1,
@ -329,5 +329,5 @@ void func_808AD450(Actor* thisx, GlobalContext* globalCtx) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot02_objects.c", 818);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.c
View File

@ -121,11 +121,11 @@ void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 321);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gameplayFrames = globalCtx->gameplayFrames;
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 325),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx);
@ -150,7 +150,7 @@ void BgSpot03Taki_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, object_spot03_object_DL_001580);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot03_taki.c", 358);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
this->bufferIndex = this->bufferIndex == 0;

6
soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c
View File

@ -432,11 +432,11 @@ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, GlobalContext* gl
s32 pad;
s32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot06_objects.c", 844);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot06_objects.c", 850),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gameplayFrames = globalCtx->state.frames;
@ -456,7 +456,7 @@ void BgSpot06Objects_DrawLakeHyliaWater(BgSpot06Objects* this, GlobalContext* gl
gSPDisplayList(POLY_XLU_DISP++, gLakeHyliaHighWaterDL);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot06_objects.c", 879);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void BgSpot06Objects_Draw(Actor* thisx, GlobalContext* globalCtx) {