mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

effect & gamestate

This commit is contained in:
Baoulettes 2022-06-26 23:13:08 +02:00
parent 2e793f0d56
commit e6c3c71649
38 changed files with 162 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
soh/src/overlays/actors/ovl_Oceff_Wipe3/z_oceff_wipe3.c
View File

@ -89,7 +89,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
vtxPtr[11].v.cn[3] = vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[17].v.cn[3] = vtxPtr[19].v.cn[3] =
vtxPtr[21].v.cn[3] = alpha;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 343);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
@ -98,7 +98,7 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 353),
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, 170, 255);
@ -108,5 +108,5 @@ void OceffWipe3_Draw(Actor* thisx, GlobalContext* globalCtx) {
scroll * 8, scroll * (-8), 64, 64));
gSPDisplayList(POLY_XLU_DISP++, sFrustumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe3.c", 370);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

6
soh/src/overlays/actors/ovl_Oceff_Wipe4/z_oceff_wipe4.c
View File

@ -84,7 +84,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
vtxPtr[11].v.cn[3] = vtxPtr[13].v.cn[3] = vtxPtr[15].v.cn[3] = vtxPtr[17].v.cn[3] = vtxPtr[19].v.cn[3] =
vtxPtr[21].v.cn[3] = alpha;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 314);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx);
@ -93,7 +93,7 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Translate(0.0f, 0.0f, -z, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 324),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params == OCEFF_WIPE4_UNUSED) {
@ -107,5 +107,5 @@ void OceffWipe4_Draw(Actor* thisx, GlobalContext* globalCtx) {
scroll * (-1), scroll, 32, 32));
gSPDisplayListOffset(POLY_XLU_DISP++, sMaterial2DL, 11);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_oceff_wipe4.c", 344);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}

28
soh/src/overlays/actors/ovl_player_actor/z_player.c
View File

@ -4900,11 +4900,11 @@ void func_8083AE40(Player* this, s16 objectId) {
size = gObjectTable[objectId].vromEnd - gObjectTable[objectId].vromStart;
LOG_HEX("size", size, "../z_player.c", 9090);
ASSERT(size <= 1024 * 8, "size <= 1024 * 8", "../z_player.c", 9091);
LOG_HEX("size", size, __FILE__, __LINE__);
ASSERT(size <= 1024 * 8, "size <= 1024 * 8", __FILE__, __LINE__);
DmaMgr_SendRequest2(&this->giObjectDmaRequest, (uintptr_t)this->giObjectSegment, gObjectTable[objectId].vromStart,
size, 0, &this->giObjectLoadQueue, OS_MESG_PTR(NULL), "../z_player.c", 9099);
size, 0, &this->giObjectLoadQueue, OS_MESG_PTR(NULL), __FILE__, __LINE__);
}
}
@ -9526,7 +9526,7 @@ void Player_Init(Actor* thisx, GlobalContext* globalCtx2) {
Player_SetEquipmentData(globalCtx, this);
this->prevBoots = this->currentBoots;
Player_InitCommon(this, globalCtx, gPlayerSkelHeaders[((void)0, gSaveContext.linkAge)]);
this->giObjectSegment = (void*)(((uintptr_t)ZeldaArena_MallocDebug(0x3008, "../z_player.c", 17175) + 8) & ~0xF);
this->giObjectSegment = (void*)(((uintptr_t)ZeldaArena_MallocDebug(0x3008, __FILE__, __LINE__) + 8) & ~0xF);
sp50 = gSaveContext.respawnFlag;
@ -10400,7 +10400,7 @@ void func_80848EF8(Player* this, GlobalContext* globalCtx) {
rectLeft = OTRGetRectDimensionFromLeftEdge(26);
}
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 2824);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(OVERLAY_DISP++);
gDPSetPrimColor(OVERLAY_DISP++, 0, 0, 255, 255, 255, DefaultIconA);
gDPSetCombineLERP(OVERLAY_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0);
@ -10420,7 +10420,7 @@ void func_80848EF8(Player* this, GlobalContext* globalCtx) {
gDPLoadTextureBlock(OVERLAY_DISP++, gStoneOfAgonyIconTex, G_IM_FMT_RGBA, G_IM_SIZ_32b, 24, 24, 0, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMIRROR | G_TX_WRAP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gDPSetOtherMode(OVERLAY_DISP++, G_AD_DISABLE | G_CD_DISABLE | G_CK_NONE | G_TC_FILT | G_TF_BILERP | G_TT_IA16 | G_TL_TILE | G_TD_CLAMP | G_TP_NONE | G_CYC_1CYCLE | G_PM_NPRIMITIVE, G_AC_NONE | G_ZS_PRIM | G_RM_XLU_SURF | G_RM_XLU_SURF2);
gSPWideTextureRectangle(OVERLAY_DISP++, rectLeft << 2, rectTop << 2, (rectLeft + rectWidth) << 2, (rectTop + rectHeight) << 2, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 3500);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
if (this->unk_6A0 > 4000000.0f) {
@ -10933,7 +10933,7 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c
OverrideLimbDrawOpa overrideLimbDraw) {
static s32 D_8085486C = 255;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19228);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x0C, cullDList);
gSPSegment(POLY_XLU_DISP++, 0x0C, cullDList);
@ -10954,13 +10954,13 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c
sp68.y = D_80858AC8.unk_04 + 0xDBE;
sp68.z = D_80858AC8.unk_00 - 0x348A;
Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f, -240.0f, &sp68);
Matrix_ToMtx(sp70++, "../z_player.c", 19273);
Matrix_ToMtx(sp70++, __FILE__, __LINE__);
sp68.x = D_80858AC8.unk_02 - 0x3E2;
sp68.y = -0xDBE - D_80858AC8.unk_04;
sp68.z = D_80858AC8.unk_00 - 0x348A;
Matrix_SetTranslateRotateYXZ(97.0f, -1203.0f, 240.0f, &sp68);
Matrix_ToMtx(sp70, "../z_player.c", 19279);
Matrix_ToMtx(sp70, __FILE__, __LINE__);
}
gSPDisplayList(POLY_OPA_DISP++, sMaskDlists[this->currentMask - 1]);
@ -10992,7 +10992,7 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c
this->actor.world.pos.z, &D_80854864);
Matrix_Scale(4.0f, 4.0f, 4.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19317),
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, 0, 0, 16, 32, 1, 0,
@ -11003,7 +11003,7 @@ void Player_DrawGameplay(GlobalContext* globalCtx, Player* this, s32 lod, Gfx* c
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19328);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) {
@ -11037,7 +11037,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) {
rot.y = 32300;
rot.x = rot.z = 0;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19346);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (!(this->stateFlags2 & PLAYER_STATE2_29)) {
@ -11120,7 +11120,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) {
0, (globalCtx->gameplayFrames * -2) % 128, 32, 32));
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_player.c", 19459),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, 255);
gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment3DL);
@ -11131,7 +11131,7 @@ void Player_Draw(Actor* thisx, GlobalContext* globalCtx2) {
}
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_player.c", 19473);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void Player_Destroy(Actor* thisx, GlobalContext* globalCtx) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Blast/z_eff_ss_blast.c
View File

@ -61,7 +61,7 @@ void EffectSsBlast_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
s32 pad;
f32 radius;
OPEN_DISPS(gfxCtx, "../z_eff_ss_blast.c", 170);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
radius = this->rScale * 0.0025f;
@ -71,11 +71,11 @@ void EffectSsBlast_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
Matrix_Put(&mf);
Matrix_Scale(radius, radius, radius, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_blast.c", 199),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
CLOSE_DISPS(gfxCtx, "../z_eff_ss_blast.c", 204);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsBlast_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_Bomb/z_eff_ss_bomb.c
View File

@ -54,7 +54,7 @@ void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
if (1) {}
OPEN_DISPS(gfxCtx, "../z_eff_ss_bomb.c", 168);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale = this->rScale / 100.0f;
@ -79,7 +79,7 @@ void EffectSsBomb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gDPPipeSync(POLY_XLU_DISP++);
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_bomb.c", 214);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsBomb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

10
soh/src/overlays/effects/ovl_Effect_Ss_Bomb2/z_eff_ss_bomb2.c
View File

@ -73,7 +73,7 @@ void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this)
s32 pad;
f32 scale;
OPEN_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 298);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale = this->rScale * 0.01f;
SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
@ -96,7 +96,7 @@ void EffectSsBomb2_DrawFade(GlobalContext* globalCtx, u32 index, EffectSs* this)
if (1) {}
if (1) {}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 345);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* this) {
@ -118,7 +118,7 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th
f32 layer2Scale = 0.925f;
s32 i;
OPEN_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 386);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
depth = this->rDepth;
scale = this->rScale * 0.01f;
@ -150,7 +150,7 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th
Matrix_Translate(0.0f, 0.0f, depth, MTXMODE_APPLY);
Matrix_RotateZ((this->life * 0.02f) + 180.0f, MTXMODE_APPLY);
Matrix_Scale(layer2Scale, layer2Scale, layer2Scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_bomb2.c", 448),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffBombExplosion3DL);
layer2Scale -= 0.15f;
@ -161,7 +161,7 @@ void EffectSsBomb2_DrawLayered(GlobalContext* globalCtx, u32 index, EffectSs* th
if (1) {}
if (1) {}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_bomb2.c", 456);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsBomb2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Bubble/z_eff_ss_bubble.c
View File

@ -41,11 +41,11 @@ void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
f32 scale = this->rScale / 100.0f;
OPEN_DISPS(gfxCtx, "../z_eff_ss_bubble.c", 154);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_bubble.c", 167),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D18(gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, 255);
@ -53,7 +53,7 @@ void EffectSsBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx);
gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL));
CLOSE_DISPS(gfxCtx, "../z_eff_ss_bubble.c", 179);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_D_Fire/z_eff_ss_d_fire.c
View File

@ -71,7 +71,7 @@ void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
object = globalCtx->objectCtx.status[this->rObjBankIdx].segment;
OPEN_DISPS(gfxCtx, "../z_eff_ss_d_fire.c", 276);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (Object_GetIndex(&globalCtx->objectCtx, OBJECT_DODONGO) > -1) {
gSegments[6] = VIRTUAL_TO_PHYSICAL(object);
@ -96,7 +96,7 @@ void EffectSsDFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
}
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_d_fire.c", 330);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsDFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_Dead_Db/z_eff_ss_dead_db.c
View File

@ -70,7 +70,7 @@ void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Mtx* mtx;
f32 scale;
OPEN_DISPS(gfxCtx, "../z_eff_ss_dead_db.c", 201);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale = this->rScale * 0.01f;
@ -90,7 +90,7 @@ void EffectSsDeadDb_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_dead_db.c", 247);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsDeadDb_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_Dead_Dd/z_eff_ss_dead_dd.c
View File

@ -97,7 +97,7 @@ void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Mtx* mtx;
f32 scale;
OPEN_DISPS(gfxCtx, "../z_eff_ss_dead_dd.c", 214);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale = this->rScale * 0.01f;
SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
@ -117,7 +117,7 @@ void EffectSsDeadDd_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPDisplayList(POLY_XLU_DISP++, gLensFlareCircleDL);
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_dead_dd.c", 259);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsDeadDd_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Dead_Ds/z_eff_ss_dead_ds.c
View File

@ -55,7 +55,7 @@ void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Vec3f pos;
CollisionPoly* floorPoly;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 157);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
scale = this->rScale * 0.01f;
func_80094BC4(globalCtx->state.gfxCtx);
@ -99,13 +99,13 @@ void EffectSsDeadDs_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_RotateZYX(this->rRoll, this->rPitch, this->rYaw, MTXMODE_APPLY);
Matrix_RotateX(1.57f, MTXMODE_APPLY);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 246),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetCombineLERP(POLY_XLU_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
PRIMITIVE, 0);
gSPDisplayList(POLY_XLU_DISP++, gLensFlareCircleDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_dead_ds.c", 255);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void EffectSsDeadDs_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Dt_Bubble/z_eff_ss_dt_bubble.c
View File

@ -76,12 +76,12 @@ void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
f32 scale;
OPEN_DISPS(gfxCtx, "../z_eff_ss_dt_bubble.c", 201);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale = this->rScale * 0.004f;
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_dt_bubble.c", 213),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093C14(gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB,
@ -91,7 +91,7 @@ void EffectSsDtBubble_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
gSPSegment(POLY_XLU_DISP++, 0x08, this->gfx);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL));
CLOSE_DISPS(gfxCtx, "../z_eff_ss_dt_bubble.c", 236);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsDtBubble_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_Dust/z_eff_ss_dust.c
View File

@ -89,7 +89,7 @@ void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Mtx* mtx;
f32 scale;
OPEN_DISPS(gfxCtx, "../z_eff_ss_dust.c", 321);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale = this->rScale * 0.0025f;
SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
@ -125,7 +125,7 @@ void EffectSsDust_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_dust.c", 389);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsDust_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_En_Fire/z_eff_ss_en_fire.c
View File

@ -70,7 +70,7 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
s32 pad[3];
s16 redGreen;
OPEN_DISPS(gfxCtx, "../z_eff_en_fire.c", 169);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
camYaw = (Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) + 0x8000);
@ -78,7 +78,7 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
scale = Math_SinS(this->life * 0x333) * (this->rScale * 0.00005f);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_en_fire.c", 180),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
redGreen = this->life - 5;
@ -100,7 +100,7 @@ void EffectSsEnFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
}
CLOSE_DISPS(gfxCtx, "../z_eff_en_fire.c", 213);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
typedef struct {

6
soh/src/overlays/effects/ovl_Effect_Ss_En_Ice/z_eff_ss_en_ice.c
View File

@ -96,7 +96,7 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
scale = this->rScale * 0.01f;
gameplayFrames = globalCtx->gameplayFrames;
OPEN_DISPS(gfxCtx, "../z_eff_en_ice.c", 235);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (this->rAlphaMode != 0) {
alpha = this->life * 12;
@ -113,7 +113,7 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateX(this->rPitch * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_en_ice.c", 261),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
hiliteLightDir.x = 89.8f;
@ -130,7 +130,7 @@ void EffectSsEnIce_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, (u32)alpha);
gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment2DL);
CLOSE_DISPS(gfxCtx, "../z_eff_en_ice.c", 294);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsEnIce_UpdateFlying(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Extra/z_eff_ss_extra.c
View File

@ -63,7 +63,7 @@ void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
f32 scale = this->rScale / 100.0f;
void* object = globalCtx->objectCtx.status[this->rObjBankIdx].segment;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 168);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSegments[6] = VIRTUAL_TO_PHYSICAL(object);
gSPSegment(POLY_XLU_DISP++, 0x06, object);
@ -71,12 +71,12 @@ void EffectSsExtra_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
func_80093D84(globalCtx->state.gfxCtx);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 186),
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(sTextures[this->rScoreIdx]));
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_yabusame_point_DL_000DC0));
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_extra.c", 194);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void EffectSsExtra_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Fcircle/z_eff_ss_fcircle.c
View File

@ -49,7 +49,7 @@ void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
f32 xzScale;
f32 scale;
OPEN_DISPS(gfxCtx, "../z_eff_fcircle.c", 149);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale = (this->rScale * (0.5f + (this->life * 0.025f))) * 0.01f;
yScale = (this->rHeight * 0.001f) * scale;
@ -58,7 +58,7 @@ void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_fcircle.c", 163),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08,
@ -68,7 +68,7 @@ void EffectSsFcircle_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 0);
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
CLOSE_DISPS(gfxCtx, "../z_eff_fcircle.c", 186);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsFcircle_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

12
soh/src/overlays/effects/ovl_Effect_Ss_Fhg_Flash/z_eff_ss_fhg_flash.c
View File

@ -93,7 +93,7 @@ void EffectSsFhgFlash_DrawLightBall(GlobalContext* globalCtx, u32 index, EffectS
scale = this->rScale / 100.0f;
object = globalCtx->objectCtx.status[this->rObjBankIdx].segment;
OPEN_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 268);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
@ -105,11 +105,11 @@ void EffectSsFhgFlash_DrawLightBall(GlobalContext* globalCtx, u32 index, EffectS
gDPPipeSync(POLY_XLU_DISP++);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_RotateZ((this->rXZRot / 32768.0f) * 3.1416f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_fhg_flash.c", 326),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
CLOSE_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 330);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* this) {
@ -119,7 +119,7 @@ void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* t
scale = this->rScale / 100.0f;
OPEN_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 346);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
@ -138,11 +138,11 @@ void EffectSsFhgFlash_DrawShock(GlobalContext* globalCtx, u32 index, EffectSs* t
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, this->rAlpha);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 155, 0);
Matrix_RotateZ((this->rXZRot / 32768.0f) * 3.1416f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_fhg_flash.c", 395),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
CLOSE_DISPS(gfxCtx, "../z_eff_fhg_flash.c", 399);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsFhgFlash_UpdateLightBall(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Fire_Tail/z_eff_ss_fire_tail.c
View File

@ -74,7 +74,7 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
f32 temp2;
f32 dist;
OPEN_DISPS(gfxCtx, "../z_eff_fire_tail.c", 182);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale.x = scale.y = scale.z = 0.0f;
@ -119,7 +119,7 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
Matrix_Scale(1.0f, temp1, 1.0f / temp1, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_fire_tail.c", 238),
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);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, 255);
@ -134,7 +134,7 @@ void EffectSsFireTail_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
}
CLOSE_DISPS(gfxCtx, "../z_eff_fire_tail.c", 273);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsFireTail_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_G_Magma2/z_eff_ss_g_magma2.c
View File

@ -80,13 +80,13 @@ void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
scale = this->rScale / 100.0f;
object = globalCtx->objectCtx.status[this->rObjBankIdx].segment;
OPEN_DISPS(gfxCtx, "../z_eff_ss_g_magma2.c", 261);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSegments[6] = VIRTUAL_TO_PHYSICAL(object);
gSPSegment(POLY_XLU_DISP++, 0x06, object);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_g_magma2.c", 282),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->rDrawMode == 0) {
@ -100,7 +100,7 @@ void EffectSsGMagma2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sTextures[this->rTexIdx]));
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
CLOSE_DISPS(gfxCtx, "../z_eff_ss_g_magma2.c", 311);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsGMagma2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_G_Ripple/z_eff_ss_g_ripple.c
View File

@ -69,7 +69,7 @@ void EffectSsGRipple_DrawRipple(GlobalContext* globalCtx, EffectSs* this, void*
Mtx* mtx;
f32 yPos;
OPEN_DISPS(gfxCtx, "../z_eff_ss_g_ripple.c", 199);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (globalCtx) {}
@ -98,7 +98,7 @@ void EffectSsGRipple_DrawRipple(GlobalContext* globalCtx, EffectSs* this, void*
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_g_ripple.c", 247);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsGRipple_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_G_Spk/z_eff_ss_g_spk.c
View File

@ -81,7 +81,7 @@ void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
f32 scale;
s32 pad;
OPEN_DISPS(gfxCtx, "../z_eff_ss_g_spk.c", 208);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
scale = this->rScale * 0.0025f;
SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
@ -103,7 +103,7 @@ void EffectSsGSpk_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
if (1) {}
if (1) {}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_g_spk.c", 255);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsGSpk_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

12
soh/src/overlays/effects/ovl_Effect_Ss_Hahen/z_eff_ss_hahen.c
View File

@ -71,7 +71,7 @@ void EffectSsHahen_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
s32 pad;
f32 scale = this->rScale * 0.001f;
OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 208);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (this->rObjId != -1) {
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment);
@ -81,12 +81,12 @@ void EffectSsHahen_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY);
Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_hahen.c", 228),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D18(globalCtx->state.gfxCtx);
gSPDisplayList(POLY_OPA_DISP++, this->gfx);
CLOSE_DISPS(gfxCtx, "../z_eff_hahen.c", 236);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
// in the original game this function is hardcoded to be used only by the skull pots in Shadow Temple
@ -95,7 +95,7 @@ void EffectSsHahen_DrawGray(GlobalContext* globalCtx, u32 index, EffectSs* this)
s32 pad;
f32 scale = this->rScale * 0.001f;
OPEN_DISPS(gfxCtx, "../z_eff_hahen.c", 253);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (this->rObjId != -1) {
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment);
@ -105,7 +105,7 @@ void EffectSsHahen_DrawGray(GlobalContext* globalCtx, u32 index, EffectSs* this)
Matrix_RotateY(this->rYaw * 0.01f, MTXMODE_APPLY);
Matrix_RotateX(this->rPitch * 0.01f, MTXMODE_APPLY);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_hahen.c", 271),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D18(globalCtx->state.gfxCtx);
gDPSetCombineLERP(POLY_OPA_DISP++, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0, PRIMITIVE, 0, SHADE, 0,
@ -113,7 +113,7 @@ void EffectSsHahen_DrawGray(GlobalContext* globalCtx, u32 index, EffectSs* this)
gDPSetPrimColor(POLY_OPA_DISP++, 0x0, 0x01, 100, 100, 120, 255);
gSPDisplayList(POLY_OPA_DISP++, this->gfx);
CLOSE_DISPS(gfxCtx, "../z_eff_hahen.c", 288);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsHahen_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_HitMark/z_eff_ss_hitmark.c
View File

@ -79,7 +79,7 @@ void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
f32 scale;
s32 pad;
OPEN_DISPS(gfxCtx, "../z_eff_ss_hitmark.c", 297);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
scale = this->rScale / 100.0f;
@ -98,7 +98,7 @@ void EffectSsHitMark_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gDPSetEnvColor(POLY_XLU_DISP++, this->rEnvColorR, this->rEnvColorG, this->rEnvColorB, 0);
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_hitmark.c", 341);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsHitMark_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Ice_Piece/z_eff_ss_ice_piece.c
View File

@ -52,7 +52,7 @@ void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
scale = this->rScale * 0.01f;
frames = globalCtx->state.frames;
OPEN_DISPS(gfxCtx, "../z_eff_ice_piece.c", 161);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if ((this->rLifespan > 0) && (this->life < (this->rLifespan >> 1))) {
alpha = ((this->life * 2.0f) / this->rLifespan);
@ -65,7 +65,7 @@ void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
Matrix_RotateY(this->rYaw * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateX(this->rPitch * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ice_piece.c", 185),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 50, 100, (s32)alpha & 0xFF);
@ -75,7 +75,7 @@ void EffectSsIcePiece_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
0x40, 0x20));
gSPDisplayList(POLY_XLU_DISP++, gEffIceFragment1DL);
CLOSE_DISPS(gfxCtx, "../z_eff_ice_piece.c", 209);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsIcePiece_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Ice_Smoke/z_eff_ss_ice_smoke.c
View File

@ -59,7 +59,7 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
object = globalCtx->objectCtx.status[this->rObjBankIdx].segment;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_ice_smoke.c", 155);
OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
objBankIdx = Object_GetIndex(&globalCtx->objectCtx, OBJECT_FZ);
@ -79,7 +79,7 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
scale = this->rScale * 0.0001f;
Matrix_Scale(scale, scale, 1.0f, MTXMODE_APPLY);
mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_ss_ice_smoke.c", 196);
mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (mtx != NULL) {
gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -89,7 +89,7 @@ void EffectSsIceSmoke_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
this->life = -1;
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_eff_ss_ice_smoke.c", 210);
CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
}
void EffectSsIceSmoke_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_K_Fire/z_eff_ss_k_fire.c
View File

@ -49,7 +49,7 @@ void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
xzScale = this->rXZScale / 10000.0f;
yScale = this->rYScale / 10000.0f;
OPEN_DISPS(gfxCtx, "../z_eff_k_fire.c", 152);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(xzScale, yScale, xzScale, MTXMODE_APPLY);
@ -75,11 +75,11 @@ void EffectSsKFire_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_RotateY(M_PI, MTXMODE_APPLY);
}
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_eff_k_fire.c", 215),
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(gfxCtx, "../z_eff_k_fire.c", 220);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsKFire_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

10
soh/src/overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.c
View File

@ -54,7 +54,7 @@ u32 EffectSsKakera_Init(GlobalContext* globalCtx, u32 index, EffectSs* this, voi
} else {
osSyncPrintf("shape_modelがNULL\n");
LogUtils_HungupThread("../z_eff_kakera.c", 178);
LogUtils_HungupThread(__FILE__, __LINE__);
}
this->draw = EffectSsKakera_Draw;
@ -96,7 +96,7 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
scale = this->rScale / 256.0f;
colorIdx = this->rColorIdx;
OPEN_DISPS(gfxCtx, "../z_eff_kakera.c", 241);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (this->rObjId != KAKERA_OBJECT_DEFAULT) {
if ((((this->rReg4 >> 7) & 1) << 7) == 0x80) {
@ -112,7 +112,7 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
if ((((this->rReg4 >> 7) & 1) << 7) == 0x80) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_kakera.c", 268),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx);
@ -122,7 +122,7 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
} else {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_kakera.c", 286),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D18(globalCtx->state.gfxCtx);
@ -133,7 +133,7 @@ void EffectSsKakera_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPDisplayList(POLY_OPA_DISP++, this->gfx);
}
CLOSE_DISPS(gfxCtx, "../z_eff_kakera.c", 302);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void func_809A9BA8(EffectSs* this, GlobalContext* globalCtx) {

4
soh/src/overlays/effects/ovl_Effect_Ss_KiraKira/z_eff_ss_kirakira.c
View File

@ -89,7 +89,7 @@ void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
scale = this->rScale / 10000.0f;
gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_eff_ss_kirakira.c", 257);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
SkinMatrix_SetTranslate(&mfTrans, this->pos.x, this->pos.y, this->pos.z);
SkinMatrix_SetRotateZYX(&mfRotY, 0, 0, this->rYaw);
@ -110,7 +110,7 @@ void EffectSsKiraKira_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_kirakira.c", 301);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void func_809AABF0(GlobalContext* globalCtx, u32 index, EffectSs* this) {

4
soh/src/overlays/effects/ovl_Effect_Ss_Lightning/z_eff_ss_lightning.c
View File

@ -83,7 +83,7 @@ void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
s16 texIdx;
f32 xzScale;
OPEN_DISPS(gfxCtx, "../z_eff_ss_lightning.c", 233);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
yScale = this->rScale * 0.01f;
texIdx = this->rLifespan - this->life;
@ -114,7 +114,7 @@ void EffectSsLightning_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this)
gSPDisplayList(POLY_XLU_DISP++, this->gfx);
}
CLOSE_DISPS(gfxCtx, "../z_eff_ss_lightning.c", 281);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsLightning_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Sibuki/z_eff_ss_sibuki.c
View File

@ -63,11 +63,11 @@ void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
f32 scale = this->rScale / 100.0f;
OPEN_DISPS(gfxCtx, "../z_eff_ss_sibuki.c", 163);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_sibuki.c", 176),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D18(gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
@ -75,7 +75,7 @@ void EffectSsSibuki_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPSegment(POLY_OPA_DISP++, 0x08, this->gfx);
gSPDisplayList(POLY_OPA_DISP++, SEGMENTED_TO_VIRTUAL(gEffBubbleDL));
CLOSE_DISPS(gfxCtx, "../z_eff_ss_sibuki.c", 198);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsSibuki_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Sibuki2/z_eff_ss_sibuki2.c
View File

@ -59,11 +59,11 @@ void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
f32 scale = this->rScale / 100.0f;
OPEN_DISPS(gfxCtx, "../z_eff_ss_sibuki2.c", 158);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_sibuki2.c", 171),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D18(gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, this->rPrimColorR, this->rPrimColorG, this->rPrimColorB, this->rPrimColorA);
@ -71,7 +71,7 @@ void EffectSsSibuki2_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(bubbleTextures[this->rTexIdx]));
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffUnusedBubblesDL));
CLOSE_DISPS(gfxCtx, "../z_eff_ss_sibuki2.c", 198);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsSibuki2_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Stick/z_eff_ss_stick.c
View File

@ -52,7 +52,7 @@ void EffectSsStick_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s32 pad;
OPEN_DISPS(gfxCtx, "../z_eff_ss_stick.c", 153);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
@ -64,14 +64,14 @@ void EffectSsStick_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
Matrix_RotateZYX(0, this->rYaw, globalCtx->state.frames * 10000, MTXMODE_APPLY);
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_stick.c", 176),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D18(gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[this->rObjBankIdx].segment);
gSPSegment(POLY_OPA_DISP++, 0x0C, gCullBackDList);
gSPDisplayList(POLY_OPA_DISP++, this->gfx);
CLOSE_DISPS(gfxCtx, "../z_eff_ss_stick.c", 188);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsStick_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

6
soh/src/overlays/effects/ovl_Effect_Ss_Stone1/z_eff_ss_stone1.c
View File

@ -56,13 +56,13 @@ void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
f32 mfW;
f32 scale;
OPEN_DISPS(gfxCtx, "../z_eff_ss_stone1.c", 154);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
SkinMatrix_Vec3fMtxFMultXYZW(&globalCtx->viewProjectionMtxF, &this->pos, &mfVec, &mfW);
scale = (mfW < 1500.0f) ? 3.0f : (mfW / 1500.0f) * 3.0f;
Matrix_Translate(this->pos.x, this->pos.y, this->pos.z, MTXMODE_NEW);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_ss_stone1.c", 168),
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80094C50(gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(drawParams->texture));
@ -71,7 +71,7 @@ void EffectSsStone1_Draw(GlobalContext* globalCtx, u32 index, EffectSs* this) {
gDPSetEnvColor(POLY_XLU_DISP++, drawParams->envColor.r, drawParams->envColor.g, drawParams->envColor.b, 255);
gSPDisplayList(POLY_XLU_DISP++, gUnknownEffStoneDL);
CLOSE_DISPS(gfxCtx, "../z_eff_ss_stone1.c", 183);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void EffectSsStone1_Update(GlobalContext* globalCtx, u32 index, EffectSs* this) {

42
soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@ -755,7 +755,7 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) {
if (1) {}
OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", 1709);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_OPA_DISP++);
gDPSetCombineLERP(POLY_OPA_DISP++, 0, 0, 0, PRIMITIVE, TEXEL0, 0, PRIMITIVE, 0, 0, 0, 0, PRIMITIVE, TEXEL0, 0,
@ -835,7 +835,7 @@ void FileChoose_DrawFileInfo(GameState* thisx, s16 fileIndex, s16 isActive) {
}
}
CLOSE_DISPS(this->state.gfxCtx, "../z_file_choose.c", 1797);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
static void* sFileInfoBoxTextures[] = {
@ -895,7 +895,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
s16 isActive;
s16 pad;
OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", 1940);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
// draw title label
gDPPipeSync(POLY_OPA_DISP++);
@ -1114,7 +1114,7 @@ void FileChoose_DrawWindowContents(GameState* thisx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA);
CLOSE_DISPS(this->state.gfxCtx, "../z_file_choose.c", 2198);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
void FileChoose_ConfigModeDraw(GameState* thisx) {
@ -1123,7 +1123,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
f32 eyeY;
f32 eyeZ;
OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", 2218);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_OPA_DISP++);
eyeX = 1000.0f * Math_CosS(ZREG(11)) - 1000.0f * Math_SinS(ZREG(11));
@ -1163,7 +1163,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
Matrix_RotateX(this->windowRot / 100.0f, MTXMODE_APPLY);
}
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_file_choose.c", 2282),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
@ -1197,7 +1197,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
Matrix_Translate(0.0f, 0.0f, -93.6f, MTXMODE_NEW);
Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
Matrix_RotateX((this->windowRot - 314.0f) / 100.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_file_choose.c", 2316),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
@ -1232,7 +1232,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
Matrix_RotateX((this->windowRot - 314.0f) / 100.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_file_choose.c", 2337),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
@ -1254,7 +1254,7 @@ void FileChoose_ConfigModeDraw(GameState* thisx) {
FrameInterpolation_RecordCloseChild();
CLOSE_DISPS(this->state.gfxCtx, "../z_file_choose.c", 2352);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
/**
@ -1555,7 +1555,7 @@ void FileChoose_SelectModeDraw(GameState* thisx) {
f32 eyeY;
f32 eyeZ;
OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", 2753);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_OPA_DISP++);
@ -1588,7 +1588,7 @@ void FileChoose_SelectModeDraw(GameState* thisx) {
Matrix_Translate(0.0f, 0.0f, -93.6f, MTXMODE_NEW);
Matrix_Scale(0.78f, 0.78f, 0.78f, MTXMODE_APPLY);
Matrix_RotateX(this->windowRot / 100.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_file_choose.c", 2810),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_OPA_DISP++, &this->windowVtx[0], 32, 0);
@ -1604,7 +1604,7 @@ void FileChoose_SelectModeDraw(GameState* thisx) {
gDPPipeSync(POLY_OPA_DISP++);
FileChoose_SetView(this, 0.0f, 0.0f, 64.0f);
CLOSE_DISPS(this->state.gfxCtx, "../z_file_choose.c", 2834);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
static void (*gFileSelectDrawFuncs[])(GameState*) = {
@ -1632,7 +1632,7 @@ void FileChoose_Main(GameState* thisx) {
gSaveContext.skyboxTime += 0x10;
}
OPEN_DISPS(this->state.gfxCtx, "../z_file_choose.c", 2898);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
this->n64ddFlag = 0;
@ -1781,7 +1781,7 @@ void FileChoose_Main(GameState* thisx) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, sScreenFillAlpha);
gDPFillRectangle(POLY_OPA_DISP++, 0, 0, gScreenWidth - 1, gScreenHeight - 1);
CLOSE_DISPS(this->state.gfxCtx, "../z_file_choose.c", 3035);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
void FileChoose_InitContext(GameState* thisx) {
@ -1953,15 +1953,15 @@ void FileChoose_Init(GameState* thisx) {
SREG(30) = 1;
osSyncPrintf("SIZE=%x\n", size);
this->staticSegment = GameState_Alloc(&this->state, size, "../z_file_choose.c", 3392);
ASSERT(this->staticSegment != NULL, "this->staticSegment != NULL", "../z_file_choose.c", 3393);
DmaMgr_SendRequest1(this->staticSegment, (u32)_title_staticSegmentRomStart, size, "../z_file_choose.c", 3394);
this->staticSegment = GameState_Alloc(&this->state, size, __FILE__, __LINE__);
ASSERT(this->staticSegment != NULL, "this->staticSegment != NULL", __FILE__, __LINE__);
DmaMgr_SendRequest1(this->staticSegment, (u32)_title_staticSegmentRomStart, size, __FILE__, __LINE__);
size = (u32)_parameter_staticSegmentRomEnd - (u32)_parameter_staticSegmentRomStart;
this->parameterSegment = GameState_Alloc(&this->state, size, "../z_file_choose.c", 3398);
ASSERT(this->parameterSegment != NULL, "this->parameterSegment != NULL", "../z_file_choose.c", 3399);
DmaMgr_SendRequest1(this->parameterSegment, (u32)_parameter_staticSegmentRomStart, size, "../z_file_choose.c",
3400);
this->parameterSegment = GameState_Alloc(&this->state, size, __FILE__, __LINE__);
ASSERT(this->parameterSegment != NULL, "this->parameterSegment != NULL", __FILE__, __LINE__);
DmaMgr_SendRequest1(this->parameterSegment, (u32)_parameter_staticSegmentRomStart, size, __FILE__,
__LINE__);
Matrix_Init(&this->state);
View_Init(&this->view, this->state.gfxCtx);

26
soh/src/overlays/gamestates/ovl_file_choose/z_file_nameset_PAL.c
View File

@ -19,13 +19,13 @@ static s16 D_80812544[] = {
};
void FileChoose_DrawCharacter(GraphicsContext* gfxCtx, void* texture, s16 vtx) {
OPEN_DISPS(gfxCtx, "../z_file_nameset_PAL.c", 110);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
gDPLoadTextureBlock_4b(POLY_OPA_DISP++, texture, G_IM_FMT_I, 16, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
gSP1Quadrangle(POLY_OPA_DISP++, vtx, vtx + 2, vtx + 3, vtx + 1, 0);
CLOSE_DISPS(gfxCtx, "../z_file_nameset_PAL.c", 119);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void FileChoose_SetKeyboardVtx(GameState* thisx) {
@ -118,7 +118,7 @@ void FileChoose_SetNameEntryVtx(GameState* thisx) {
if (1) {}
if (1) {}
OPEN_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 205);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_OPA_DISP++);
gDPSetCombineLERP(POLY_OPA_DISP++, PRIMITIVE, ENVIRONMENT, TEXEL0, ENVIRONMENT, TEXEL0, 0, PRIMITIVE, 0, PRIMITIVE,
@ -238,7 +238,7 @@ void FileChoose_SetNameEntryVtx(GameState* thisx) {
this->nameEntryVtx[0x29].v.tc[0] = this->nameEntryVtx[0x2B].v.tc[0] = 0x500;
}
CLOSE_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 307);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
void FileChoose_DrawKeyboard(GameState* thisx) {
@ -248,7 +248,7 @@ void FileChoose_DrawKeyboard(GameState* thisx) {
s16 tmp;
s16 vtx = 0;
OPEN_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 324);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
func_800949A8(this->state.gfxCtx);
gDPSetCycleType(POLY_OPA_DISP++, G_CYC_2CYCLE);
@ -270,7 +270,7 @@ void FileChoose_DrawKeyboard(GameState* thisx) {
gSPVertex(POLY_OPA_DISP++, &this->keyboardVtx[0x100], 4, 0);
FileChoose_DrawCharacter(this->state.gfxCtx, font->fontBuf + D_808123F0[i] * FONT_CHAR_TEX_SIZE, 0);
CLOSE_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 347);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
void FileChoose_DrawNameEntry(GameState* thisx) {
@ -283,7 +283,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
s16 validName;
char* filename = Save_GetSaveMetaInfo(this->buttonIndex)->playerName;
OPEN_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 368);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
FileChoose_SetKeyboardVtx(&this->state);
FileChoose_SetNameEntryVtx(&this->state);
@ -494,7 +494,7 @@ void FileChoose_DrawNameEntry(GameState* thisx) {
gDPPipeSync(POLY_OPA_DISP++);
gDPSetCombineMode(POLY_OPA_DISP++, G_CC_MODULATEIDECALA, G_CC_MODULATEIDECALA);
CLOSE_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 550);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
/**
@ -818,7 +818,7 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) {
s16 j;
s16 vtx;
OPEN_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 848);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
cursorRed = ABS(cursorPrimRed - cursorPrimColors[cursorPulseDir][0]) / cursorFlashTimer;
cursorGreen = ABS(cursorPrimGreen - cursorPrimColors[cursorPulseDir][1]) / cursorFlashTimer;
@ -983,7 +983,7 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) {
Matrix_Push();
Matrix_Translate(0.0f, 0.1f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_file_nameset_PAL.c", 1009),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_OPA_DISP++, gOptionsDividerTopVtx, 4, 0);
gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
@ -991,7 +991,7 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) {
Matrix_Push();
Matrix_Translate(0.0f, 0.2f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_file_nameset_PAL.c", 1021),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_OPA_DISP++, gOptionsDividerMiddleVtx, 4, 0);
@ -1000,13 +1000,13 @@ void FileChoose_DrawOptionsImpl(GameState* thisx) {
Matrix_Push();
Matrix_Translate(0.0f, 0.4f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_file_nameset_PAL.c", 1033),
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPVertex(POLY_OPA_DISP++, gOptionsDividerBottomVtx, 4, 0);
gSP1Quadrangle(POLY_OPA_DISP++, 0, 2, 3, 1, 0);
Matrix_Pop();
CLOSE_DISPS(this->state.gfxCtx, "../z_file_nameset_PAL.c", 1040);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
void FileChoose_DrawOptions(GameState* thisx) {

16
soh/src/overlays/gamestates/ovl_select/z_select.c
View File

@ -513,7 +513,7 @@ void Select_DrawMenu(SelectContext* this) {
GraphicsContext* gfxCtx = this->state.gfxCtx;
GfxPrint* printer;
OPEN_DISPS(gfxCtx, "../z_select.c", 930);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
func_80095248(gfxCtx, 0, 0, 0);
@ -530,14 +530,14 @@ void Select_DrawMenu(SelectContext* this) {
POLY_OPA_DISP = GfxPrint_Close(printer);
GfxPrint_Destroy(printer);
CLOSE_DISPS(gfxCtx, "../z_select.c", 966);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void Select_DrawLoadingScreen(SelectContext* this) {
GraphicsContext* gfxCtx = this->state.gfxCtx;
GfxPrint* printer;
OPEN_DISPS(gfxCtx, "../z_select.c", 977);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
func_80095248(gfxCtx, 0, 0, 0);
@ -552,13 +552,13 @@ void Select_DrawLoadingScreen(SelectContext* this) {
POLY_OPA_DISP = GfxPrint_Close(printer);
GfxPrint_Destroy(printer);
CLOSE_DISPS(gfxCtx, "../z_select.c", 1006);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void Select_Draw(SelectContext* this) {
GraphicsContext* gfxCtx = this->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_select.c", 1013);
OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x00, NULL);
func_80095248(gfxCtx, 0, 0, 0);
@ -571,7 +571,7 @@ void Select_Draw(SelectContext* this) {
Select_DrawMenu(this);
}
CLOSE_DISPS(gfxCtx, "../z_select.c", 1037);
CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
}
void Select_Main(GameState* thisx) {
@ -626,8 +626,8 @@ void Select_Init(GameState* thisx) {
}
R_UPDATE_RATE = 1;
#if !defined(_MSC_VER) && !defined(__GNUC__)
this->staticSegment = GameState_Alloc(&this->state, size, "../z_select.c", 1114);
DmaMgr_SendRequest1(this->staticSegment, _z_select_staticSegmentRomStart, size, "../z_select.c", 1115);
this->staticSegment = GameState_Alloc(&this->state, size, __FILE__, __LINE__);
DmaMgr_SendRequest1(this->staticSegment, _z_select_staticSegmentRomStart, size, __FILE__, __LINE__);
#endif
gSaveContext.cutsceneIndex = 0x8000;
gSaveContext.linkAge = 1;

14
soh/src/overlays/gamestates/ovl_title/z_title.c
View File

@ -166,7 +166,7 @@ void Title_Draw(TitleContext* this) {
Vec3f v2;
s32 pad2[2];
OPEN_DISPS(this->state.gfxCtx, "../z_title.c", 395);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
v3.x = 69;
v3.y = 69;
@ -188,7 +188,7 @@ void Title_Draw(TitleContext* this) {
Matrix_Scale(1.0, 1.0, 1.0, MTXMODE_APPLY);
Matrix_RotateZYX(0, sTitleRotY, 0, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, "../z_title.c", 424), G_MTX_LOAD);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(this->state.gfxCtx, __FILE__, __LINE__), G_MTX_LOAD);
gSPDisplayList(POLY_OPA_DISP++, gNintendo64LogoDL);
func_800944C4(this->state.gfxCtx);
gDPPipeSync(POLY_OPA_DISP++);
@ -216,7 +216,7 @@ void Title_Draw(TitleContext* this) {
sTitleRotY += 300;
CLOSE_DISPS(this->state.gfxCtx, "../z_title.c", 483);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
void Title_Main(GameState* thisx) {
@ -288,7 +288,7 @@ void Title_Main(GameState* thisx) {
return;
}
OPEN_DISPS(this->state.gfxCtx, "../z_title.c", 494);
OPEN_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0, NULL);
gSPSegment(POLY_OPA_DISP++, 1, this->staticSegment);
@ -316,7 +316,7 @@ void Title_Main(GameState* thisx) {
SET_NEXT_GAMESTATE(&this->state, Opening_Init, OpeningContext);
}
CLOSE_DISPS(this->state.gfxCtx, "../z_title.c", 541);
CLOSE_DISPS(this->state.gfxCtx, __FILE__, __LINE__);
}
void Title_Destroy(GameState* thisx) {
@ -331,9 +331,9 @@ void Title_Init(GameState* thisx) {
quote = SetQuote();
//this->staticSegment = GameState_Alloc(&this->state, size, "../z_title.c", 611);
//this->staticSegment = GameState_Alloc(&this->state, size, __FILE__, __LINE__);
osSyncPrintf("z_title.c\n");
//ASSERT(this->staticSegment != NULL, "this->staticSegment != NULL", "../z_title.c", 614);
//ASSERT(this->staticSegment != NULL, "this->staticSegment != NULL", __FILE__, __LINE__);
//ResourceMgr_CacheDirectory("nintendo_rogo_static*");