github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-21 22:03:36 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Almost all overlay

Browse source
This commit is contained in:
Baoulettes 2022-06-26 22:54:35 +02:00
commit 2e793f0d56
252 changed files with 1424 additions and 1424 deletions
Download patch file Download diff file Expand all files Collapse all files

8
soh/src/overlays/actors/ovl_Bg_Spot07_Taki/z_bg_spot07_taki.c
View file

@ -70,11 +70,11 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgSpot07Taki* this = (BgSpot07Taki*)thisx; BgSpot07Taki* this = (BgSpot07Taki*)thisx;
u32 frames; u32 frames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 169); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
frames = globalCtx->gameplayFrames; frames = globalCtx->gameplayFrames;
if (LINK_IS_ADULT) { if (LINK_IS_ADULT) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 177), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->dyna.actor.params == 0) { if (this->dyna.actor.params == 0) {
gSPDisplayList(POLY_OPA_DISP++, object_spot07_object_DL_001CF0); gSPDisplayList(POLY_OPA_DISP++, object_spot07_object_DL_001CF0);
@ -84,7 +84,7 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 191), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
@ -115,5 +115,5 @@ void BgSpot07Taki_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else { } else {
gSPDisplayList(POLY_XLU_DISP++, object_spot07_object_DL_0032D8); gSPDisplayList(POLY_XLU_DISP++, object_spot07_object_DL_0032D8);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot07_taki.c", 272); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_Bg_Spot08_Iceblock/z_bg_spot08_iceblock.c
View file

@ -50,7 +50,7 @@ void BgSpot08Iceblock_InitDynaPoly(BgSpot08Iceblock* this, GlobalContext* global
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
if (this->dyna.bgId == BG_ACTOR_MAX) { if (this->dyna.bgId == BG_ACTOR_MAX) {
// "Warning: move BG registration failed" // "Warning: move BG registration failed"
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xD9, osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params); this->dyna.actor.id, this->dyna.actor.params);
} }
} }
@ -63,7 +63,7 @@ void BgSpot08Iceblock_CheckParams(BgSpot08Iceblock* this) {
break; break;
default: default:
// "Error: arg_data setting error" // "Error: arg_data setting error"
osSyncPrintf("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot08_iceblock.c", 0xF6, osSyncPrintf("Error : arg_data 設定ミスです。(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.params); this->dyna.actor.params);
this->dyna.actor.params = 0x10; this->dyna.actor.params = 0x10;
break; break;

8
soh/src/overlays/actors/ovl_Bg_Spot09_Obj/z_bg_spot09_obj.c
View file

@ -143,7 +143,7 @@ void BgSpot09Obj_Init(Actor* thisx, GlobalContext* globalCtx) {
this->dyna.actor.params &= 0xFF; this->dyna.actor.params &= 0xFF;
if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) { if ((this->dyna.actor.params < 0) || (this->dyna.actor.params >= 5)) {
osSyncPrintf("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n", osSyncPrintf("Error : Spot 09 object の arg_data が判別出来ない(%s %d)(arg_data 0x%04x)\n",
"../z_bg_spot09_obj.c", 322, this->dyna.actor.params); __FILE__, __LINE__, this->dyna.actor.params);
} }
if (!func_808B1C70(this, globalCtx)) { if (!func_808B1C70(this, globalCtx)) {
@ -169,14 +169,14 @@ void BgSpot09Obj_Draw(Actor* thisx, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, sDLists[thisx->params]); Gfx_DrawDListOpa(globalCtx, sDLists[thisx->params]);
if (thisx->params == 3) { if (thisx->params == 3) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 388); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 391), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCarpentersTentEntranceDL); gSPDisplayList(POLY_XLU_DISP++, gCarpentersTentEntranceDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot09_obj.c", 396); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }

6
soh/src/overlays/actors/ovl_Bg_Spot11_Oasis/z_bg_spot11_oasis.c
View file

@ -151,13 +151,13 @@ void BgSpot11Oasis_Update(Actor* thisx, GlobalContext* globalCtx) {
void BgSpot11Oasis_Draw(Actor* thisx, GlobalContext* globalCtx) { void BgSpot11Oasis_Draw(Actor* thisx, GlobalContext* globalCtx) {
u32 gameplayFrames = globalCtx->gameplayFrames; u32 gameplayFrames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 327); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 331), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 127 - (gameplayFrames % 128), (gameplayFrames * 1) % 128,
32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32)); 32, 32, 1, gameplayFrames % 128, (gameplayFrames * 1) % 128, 32, 32));
gSPDisplayList(POLY_XLU_DISP++, gDesertColossusOasisDL); gSPDisplayList(POLY_XLU_DISP++, gDesertColossusOasisDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot11_oasis.c", 346); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

2
soh/src/overlays/actors/ovl_Bg_Spot12_Gate/z_bg_spot12_gate.c
View file

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

2
soh/src/overlays/actors/ovl_Bg_Spot12_Saku/z_bg_spot12_saku.c
View file

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

4
soh/src/overlays/actors/ovl_Bg_Spot15_Rrbox/z_bg_spot15_rrbox.c
View file

@ -66,7 +66,7 @@ void func_808B3960(BgSpot15Rrbox* this, GlobalContext* globalCtx, CollisionHeade
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader); this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
if (this->dyna.bgId == BG_ACTOR_MAX) { if (this->dyna.bgId == BG_ACTOR_MAX) {
osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 171, osSyncPrintf("Warning : move BG 登録失敗(%s %d)(name %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.id, this->dyna.actor.params); this->dyna.actor.id, this->dyna.actor.params);
} }
} }
@ -323,7 +323,7 @@ void func_808B43D0(BgSpot15Rrbox* this, GlobalContext* globalCtx) {
if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) { if (actor->world.pos.y <= BGCHECK_Y_MIN + 10.0f) {
// "Lon Lon wooden crate fell too much" // "Lon Lon wooden crate fell too much"
osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot15_rrbox.c", 599, osSyncPrintf("Warning : ロンロン木箱落ちすぎた(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
actor->params); actor->params);
Actor_Kill(actor); Actor_Kill(actor);

6
soh/src/overlays/actors/ovl_Bg_Spot15_Saku/z_bg_spot15_saku.c
View file

@ -95,13 +95,13 @@ void BgSpot15Saku_Update(Actor* thisx, GlobalContext* globalCtx) {
} }
void BgSpot15Saku_Draw(Actor* thisx, GlobalContext* globalCtx) { void BgSpot15Saku_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 259); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 263), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gLonLonCorralFenceDL); gSPDisplayList(POLY_XLU_DISP++, gLonLonCorralFenceDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot15_saku.c", 268); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

14
soh/src/overlays/actors/ovl_Bg_Spot16_Bombstone/z_bg_spot16_bombstone.c
View file

@ -223,8 +223,8 @@ s32 func_808B4E58(BgSpot16Bombstone* this, GlobalContext* globalctx) {
this->bombiwaBankIndex = Object_GetIndex(&globalctx->objectCtx, OBJECT_BOMBIWA); this->bombiwaBankIndex = Object_GetIndex(&globalctx->objectCtx, OBJECT_BOMBIWA);
if (this->bombiwaBankIndex < 0) { if (this->bombiwaBankIndex < 0) {
osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, "../z_bg_spot16_bombstone.c", osSyncPrintf("Error : バンク危険！(arg_data 0x%04x)(%s %d)\n", actor->params, __FILE__,
589); __LINE__);
return false; return false;
} }
@ -253,7 +253,7 @@ void BgSpot16Bombstone_Init(Actor* thisx, GlobalContext* globalCtx) {
shouldLive = func_808B4E58(this, globalCtx); shouldLive = func_808B4E58(this, globalCtx);
break; break;
default: default:
osSyncPrintf("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot16_bombstone.c", 668, osSyncPrintf("Error : arg_data おかしいな(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->actor.params); this->actor.params);
shouldLive = false; shouldLive = false;
break; break;
@ -387,7 +387,7 @@ void func_808B56BC(BgSpot16Bombstone* this, GlobalContext* globalCtx) {
player->actor.world.pos.z += sinValue * this->cosRotation; player->actor.world.pos.z += sinValue * this->cosRotation;
} else { } else {
osSyncPrintf("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n", osSyncPrintf("Error 補正出来ない(%s %d)(arg_data 0x%04x)(hosei_angY %x)\n",
"../z_bg_spot16_bombstone.c", 935, this->actor.params, adjustedYawDiff); __FILE__, __LINE__, this->actor.params, adjustedYawDiff);
} }
} }
} }
@ -535,11 +535,11 @@ void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgSpot16Bombstone* this = (BgSpot16Bombstone*)thisx; BgSpot16Bombstone* this = (BgSpot16Bombstone*)thisx;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1253); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1257), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params == 0xFF) { if (this->actor.params == 0xFF) {
@ -551,7 +551,7 @@ void BgSpot16Bombstone_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, this->dList); gSPDisplayList(POLY_OPA_DISP++, this->dList);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_bombstone.c", 1274); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BgSpot16Bombstone_Reset(void) { void BgSpot16Bombstone_Reset(void) {

12
soh/src/overlays/actors/ovl_Bg_Spot16_Doughnut/z_bg_spot16_doughnut.c
View file

@ -122,13 +122,13 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) {
u32 scroll = globalCtx->gameplayFrames & 0xFFFF; u32 scroll = globalCtx->gameplayFrames & 0xFFFF;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 210); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
if (1) {} if (1) {}
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 213), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->fireFlag & 1) { if (this->fireFlag & 1) {
gSPSegment( gSPSegment(
@ -142,22 +142,22 @@ void BgSpot16Doughnut_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL); gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 238); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
// Draw function for outwardly expanding and dissipating // Draw function for outwardly expanding and dissipating
void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) { void BgSpot16Doughnut_DrawExpanding(Actor* thisx, GlobalContext* globalCtx) {
BgSpot16Doughnut* this = (BgSpot16Doughnut*)thisx; BgSpot16Doughnut* this = (BgSpot16Doughnut*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 245); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 248), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->envColorAlpha); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, this->envColorAlpha);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL); gSPDisplayList(POLY_XLU_DISP++, gDeathMountainCloudCircleNormalDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot16_doughnut.c", 256); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

12
soh/src/overlays/actors/ovl_Bg_Spot17_Bakudankabe/z_bg_spot17_bakudankabe.c
View file

@ -128,11 +128,11 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
s8 r = coss(globalCtx->gameplayFrames * 1500) >> 8; s8 r = coss(globalCtx->gameplayFrames * 1500) >> 8;
s8 g = coss(globalCtx->gameplayFrames * 1500) >> 8; s8 g = coss(globalCtx->gameplayFrames * 1500) >> 8;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 269); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 273), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
r = (r >> 1) + 0xC0; r = (r >> 1) + 0xC0;
@ -142,15 +142,15 @@ void BgSpot17Bakudankabe_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_OPA_DISP++, gCraterBombableWallDL); gSPDisplayList(POLY_OPA_DISP++, gCraterBombableWallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 283); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 286); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 290), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCraterBombableWallCracksDL); gSPDisplayList(POLY_XLU_DISP++, gCraterBombableWallCracksDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_bakudankabe.c", 295); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_Bg_Spot17_Funen/z_bg_spot17_funen.c
View file

@ -55,14 +55,14 @@ void func_808B746C(Actor* thisx, GlobalContext* globalCtx) {
void func_808B7478(Actor* thisx, GlobalContext* globalCtx) { void func_808B7478(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 153); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) - thisx->shape.rot.y + 0x8000) * Matrix_RotateY((s16)(Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)) - thisx->shape.rot.y + 0x8000) *
9.58738019108e-05f, 9.58738019108e-05f,
MTXMODE_APPLY); MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 161), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20, 1, 0, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (0 - globalCtx->gameplayFrames) & 0x7F, 0x20, 0x20, 1, 0,
@ -71,5 +71,5 @@ void func_808B7478(Actor* thisx, GlobalContext* globalCtx) {
if (1) {} if (1) {}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_spot17_funen.c", 176); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

2
soh/src/overlays/actors/ovl_Bg_Spot18_Basket/z_bg_spot18_basket.c
View file

@ -159,7 +159,7 @@ void BgSpot18Basket_Init(Actor* thisx, GlobalContext* globalCtx) {
if (this->dyna.actor.child == NULL) { if (this->dyna.actor.child == NULL) {
osSyncPrintf(VT_FGCOL(RED)); osSyncPrintf(VT_FGCOL(RED));
osSyncPrintf("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", "../z_bg_spot18_basket.c", 351); osSyncPrintf("Ｅｒｒｏｒ : 変化壷蓋発生失敗(%s %d)\n", __FILE__, __LINE__);
osSyncPrintf(VT_RST); osSyncPrintf(VT_RST);
Actor_Kill(&this->dyna.actor); Actor_Kill(&this->dyna.actor);
} }

6
soh/src/overlays/actors/ovl_Bg_Spot18_Obj/z_bg_spot18_obj.c
View file

@ -97,7 +97,7 @@ s32 func_808B8910(BgSpot18Obj* this, GlobalContext* globalCtx) {
} else if (LINK_AGE_IN_YEARS == YEARS_CHILD) { } else if (LINK_AGE_IN_YEARS == YEARS_CHILD) {
age = 0; age = 0;
} else { } else {
osSyncPrintf("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 182, osSyncPrintf("Error : リンク年齢不詳 (%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.params); this->dyna.actor.params);
return 0; return 0;
} }
@ -110,11 +110,11 @@ s32 func_808B8910(BgSpot18Obj* this, GlobalContext* globalCtx) {
} }
return D_808B90F0[this->dyna.actor.params & 0xF][age]; return D_808B90F0[this->dyna.actor.params & 0xF][age];
case 2: case 2:
osSyncPrintf("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 202, osSyncPrintf("Error : Obj出現判定が設定されていない(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.params); this->dyna.actor.params);
break; break;
default: default:
osSyncPrintf("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n", "../z_bg_spot18_obj.c", 210, osSyncPrintf("Error : Obj出現判定失敗(%s %d)(arg_data 0x%04x)\n", __FILE__, __LINE__,
this->dyna.actor.params); this->dyna.actor.params);
} }
return 0; return 0;

6
soh/src/overlays/actors/ovl_Bg_Sst_Floor/z_bg_sst_floor.c
View file

@ -126,14 +126,14 @@ void BgSstFloor_Update(BgSstFloor* thisx, GlobalContext* globalCtx) {
void BgSstFloor_Draw(BgSstFloor* thisx, GlobalContext* globalCtx) { void BgSstFloor_Draw(BgSstFloor* thisx, GlobalContext* globalCtx) {
BgSstFloor* this = (BgSstFloor*)thisx; BgSstFloor* this = (BgSstFloor*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 277); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
Matrix_Scale(1.0f, this->drumHeight * -0.0025f, 1.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, this->drumHeight * -0.0025f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 283), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gBongoDrumDL); gSPDisplayList(POLY_OPA_DISP++, gBongoDrumDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_sst_floor.c", 287); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

18
soh/src/overlays/actors/ovl_Bg_Toki_Hikari/z_bg_toki_hikari.c
View file

@ -85,9 +85,9 @@ void BgTokiHikari_Draw(Actor* thisx, GlobalContext* globalCtx) {
void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) { void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 246); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 252), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (LINK_IS_ADULT) { if (LINK_IS_ADULT) {
@ -101,12 +101,12 @@ void func_808BA018(BgTokiHikari* this, GlobalContext* globalCtx) {
gSPSegment(POLY_XLU_DISP++, 9, gSPSegment(POLY_XLU_DISP++, 9,
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 64, 32)); Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->gameplayFrames % 128, 64, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 278), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_007EE0); gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_007EE0);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 284); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_808BA204(BgTokiHikari* this, GlobalContext* globalCtx) { void func_808BA204(BgTokiHikari* this, GlobalContext* globalCtx) {
@ -136,7 +136,7 @@ void func_808BA274(BgTokiHikari* this, GlobalContext* globalCtx) {
void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) { void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) {
s32 pad[2]; s32 pad[2];
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 350); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Translate(0.0f, 276.0f, 1122.0f, MTXMODE_NEW); Matrix_Translate(0.0f, 276.0f, 1122.0f, MTXMODE_NEW);
Matrix_Scale(0.32f, 0.32f, this->unk_14C * 7.0f, MTXMODE_APPLY); Matrix_Scale(0.32f, 0.32f, this->unk_14C * 7.0f, MTXMODE_APPLY);
Matrix_RotateZ(M_PI, MTXMODE_APPLY); Matrix_RotateZ(M_PI, MTXMODE_APPLY);
@ -148,7 +148,7 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 155.0f) + 100, (u8)(255.0f * this->unk_14C), 0, 128); gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 155.0f) + 100, (u8)(255.0f * this->unk_14C), 0, 128);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 382), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
@ -164,7 +164,7 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f), gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f),
(u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C)); (u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 415), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_0009C0); gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_0009C0);
@ -176,10 +176,10 @@ void func_808BA2CC(BgTokiHikari* this, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f), gDPSetEnvColor(POLY_XLU_DISP++, (u8)(this->unk_14C * 255.0f), (u8)(this->unk_14C * 255.0f),
(u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C)); (u8)(this->unk_14C * 255.0f), (u8)(200.0f * this->unk_14C));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 437), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayListOffset(POLY_XLU_DISP++, object_toki_objects_DL_0009C0, 10); gSPDisplayListOffset(POLY_XLU_DISP++, object_toki_objects_DL_0009C0, 10);
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_hikari.c", 443); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_Bg_Toki_Swd/z_bg_toki_swd.c
View file

@ -164,7 +164,7 @@ void BgTokiSwd_Draw(Actor* thisx, GlobalContext* globalCtx2) {
BgTokiSwd* this = (BgTokiSwd*)thisx; BgTokiSwd* this = (BgTokiSwd*)thisx;
s32 pad[3]; s32 pad[3];
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 727); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -172,9 +172,9 @@ void BgTokiSwd_Draw(Actor* thisx, GlobalContext* globalCtx2) {
gSPSegment(POLY_OPA_DISP++, 0x08, gSPSegment(POLY_OPA_DISP++, 0x08,
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, -(globalCtx->gameplayFrames % 0x80), 32, 32)); Gfx_TexScroll(globalCtx->state.gfxCtx, 0, -(globalCtx->gameplayFrames % 0x80), 32, 32));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 742), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_001BD0); gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_001BD0);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_toki_swd.c", 776); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_Bg_Treemouth/z_bg_treemouth.c
View file

@ -228,7 +228,7 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
u16 alpha = 500; u16 alpha = 500;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 893); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -244,9 +244,9 @@ void BgTreemouth_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, alpha * 0.1f); gDPSetEnvColor(POLY_OPA_DISP++, 128, 128, 128, alpha * 0.1f);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 932), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDekuTreeMouthDL); gSPDisplayList(POLY_OPA_DISP++, gDekuTreeMouthDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_treemouth.c", 937); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_Bg_Vb_Sima/z_bg_vb_sima.c
View file

@ -150,10 +150,10 @@ void BgVbSima_Update(Actor* thisx, GlobalContext* globalCtx) {
} }
void BgVbSima_Draw(Actor* thisx, GlobalContext* globalCtx) { void BgVbSima_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_vb_sima.c", 285); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_vb_sima.c", 291), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gVolvagiaPlatformDL); gSPDisplayList(POLY_OPA_DISP++, gVolvagiaPlatformDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_vb_sima.c", 296); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_Bg_Ydan_Hasi/z_bg_ydan_hasi.c
View file

@ -177,17 +177,17 @@ void BgYdanHasi_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->dyna.actor.params == HASI_WATER_BLOCK || this->dyna.actor.params == HASI_THREE_BLOCKS) { if (this->dyna.actor.params == HASI_WATER_BLOCK || this->dyna.actor.params == HASI_THREE_BLOCKS) {
Gfx_DrawDListOpa(globalCtx, dLists[this->dyna.actor.params]); Gfx_DrawDListOpa(globalCtx, dLists[this->dyna.actor.params]);
} else { } else {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 577); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -globalCtx->gameplayFrames % 128, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -globalCtx->gameplayFrames % 128,
globalCtx->gameplayFrames % 128, 0x20, 0x20, 1, globalCtx->gameplayFrames % 128, globalCtx->gameplayFrames % 128, 0x20, 0x20, 1, globalCtx->gameplayFrames % 128,
globalCtx->gameplayFrames % 128, 0x20, 0x20)); globalCtx->gameplayFrames % 128, 0x20, 0x20));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 592), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDTWaterPlaneDL); gSPDisplayList(POLY_XLU_DISP++, gDTWaterPlaneDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_hasi.c", 597); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }

12
soh/src/overlays/actors/ovl_Bg_Ydan_Sp/z_bg_ydan_sp.c
View file

@ -424,10 +424,10 @@ void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 i; s32 i;
MtxF mtxF; MtxF mtxF;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 781); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
if (thisx->params == WEB_WALL) { if (thisx->params == WEB_WALL) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 787), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDTWebWallDL); gSPDisplayList(POLY_XLU_DISP++, gDTWebWallDL);
} else if (this->actionFunc == BgYdanSp_FloorWebBroken) { } else if (this->actionFunc == BgYdanSp_FloorWebBroken) {
@ -435,7 +435,7 @@ void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (this->timer == 40) { if (this->timer == 40) {
Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 808), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL); gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL);
} }
@ -444,17 +444,17 @@ void BgYdanSp_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateZYX(-0x5A0, i * 0x2000, 0, MTXMODE_APPLY); Matrix_RotateZYX(-0x5A0, i * 0x2000, 0, MTXMODE_APPLY);
Matrix_Translate(0.0f, 700.0f, -900.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 700.0f, -900.0f, MTXMODE_APPLY);
Matrix_Scale(3.5f, 5.0f, 1.0f, MTXMODE_APPLY); Matrix_Scale(3.5f, 5.0f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 830), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDTUnknownWebDL); gSPDisplayList(POLY_XLU_DISP++, gDTUnknownWebDL);
} }
} else { } else {
Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, (thisx->home.pos.y - thisx->world.pos.y) * 10.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, ((thisx->home.pos.y - thisx->world.pos.y) + 10.0f) * 0.1f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 849), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL); gSPDisplayList(POLY_XLU_DISP++, gDTWebFloorDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ydan_sp.c", 856); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_Bg_Zg/z_bg_zg.c
View file

@ -123,14 +123,14 @@ void BgZg_Init(Actor* thisx, GlobalContext* globalCtx) {
void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) { void func_808C0EEC(BgZg* this, GlobalContext* globalCtx) {
GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx; GraphicsContext* localGfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(localGfxCtx, "../z_bg_zg.c", 311); OPEN_DISPS(localGfxCtx, __FILE__, __LINE__);
func_80093D18(localGfxCtx); func_80093D18(localGfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, "../z_bg_zg.c", 315), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(localGfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseBarsDL); gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseBarsDL);
CLOSE_DISPS(localGfxCtx, "../z_bg_zg.c", 320); CLOSE_DISPS(localGfxCtx, __FILE__, __LINE__);
} }
void BgZg_Draw(Actor* thisx, GlobalContext* globalCtx) { void BgZg_Draw(Actor* thisx, GlobalContext* globalCtx) {

16
soh/src/overlays/actors/ovl_Boss_Dodongo/z_boss_dodongo.c
View file

@ -1074,7 +1074,7 @@ block_1:
Matrix_TranslateRotateZYX(pos, rot); Matrix_TranslateRotateZYX(pos, rot);
if (*dList != NULL) { if (*dList != NULL) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_dodongo.c", 3787); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
mtxScaleZ = 1.0f; mtxScaleZ = 1.0f;
mtxScaleY = 1.0f; mtxScaleY = 1.0f;
@ -1096,12 +1096,12 @@ block_1:
Matrix_RotateX(-(this->unk_25C[limbIndex] * 0.115f), MTXMODE_APPLY); Matrix_RotateX(-(this->unk_25C[limbIndex] * 0.115f), MTXMODE_APPLY);
} }
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_dodongo.c", 3822), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList); gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_dodongo.c", 3826); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
{ s32 pad; } // Required to match { s32 pad; } // Required to match
return 1; return 1;
@ -1133,7 +1133,7 @@ void BossDodongo_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossDodongo* this = (BossDodongo*)thisx; BossDodongo* this = (BossDodongo*)thisx;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_dodongo.c", 3922); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
if ((this->unk_1C0 >= 2) && (this->unk_1C0 & 1)) { if ((this->unk_1C0 >= 2) && (this->unk_1C0 & 1)) {
@ -1151,7 +1151,7 @@ void BossDodongo_Draw(Actor* thisx, GlobalContext* globalCtx) {
POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_dodongo.c", 3981); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
BossDodongo_DrawEffects(globalCtx); BossDodongo_DrawEffects(globalCtx);
} }
@ -1691,7 +1691,7 @@ void BossDodongo_DrawEffects(GlobalContext* globalCtx) {
eff = (BossDodongoEffect*)globalCtx->specialEffects; eff = (BossDodongoEffect*)globalCtx->specialEffects;
OPEN_DISPS(gfxCtx, "../z_boss_dodongo.c", 5228); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
unkMtx = &globalCtx->billboardMtxF; unkMtx = &globalCtx->billboardMtxF;
@ -1711,11 +1711,11 @@ void BossDodongo_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(eff->unk_00.x, eff->unk_00.y, eff->unk_00.z, MTXMODE_NEW); Matrix_Translate(eff->unk_00.x, eff->unk_00.y, eff->unk_00.z, MTXMODE_NEW);
Matrix_ReplaceRotation(unkMtx); Matrix_ReplaceRotation(unkMtx);
Matrix_Scale(eff->unk_2C, eff->unk_2C, 1.0f, MTXMODE_APPLY); Matrix_Scale(eff->unk_2C, eff->unk_2C, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_dodongo.c", 5253), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_009DD0); gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_009DD0);
} }
} }
CLOSE_DISPS(gfxCtx, "../z_boss_dodongo.c", 5258); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }

32
soh/src/overlays/actors/ovl_Boss_Fd/z_boss_fd.c
View file

@ -1524,7 +1524,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
s16 i; s16 i;
BossFdEffect* firstEffect = effect; BossFdEffect* firstEffect = effect;
OPEN_DISPS(gfxCtx, "../z_boss_fd.c", 4023); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
for (i = 0; i < 180; i++, effect++) { for (i = 0; i < 180; i++, effect++) {
if (effect->type == BFD_FX_EMBER) { if (effect->type == BFD_FX_EMBER) {
@ -1540,7 +1540,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4046), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberModelDL); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaEmberModelDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -1563,7 +1563,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
Matrix_RotateX(effect->vFdFxRotX, MTXMODE_APPLY); Matrix_RotateX(effect->vFdFxRotX, MTXMODE_APPLY);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4068), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisModelDL); gSPDisplayList(POLY_OPA_DISP++, gVolvagiaDebrisModelDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -1587,7 +1587,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4104), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2])); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2]));
gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL);
@ -1612,7 +1612,7 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4154), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2])); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(dustTex[effect->timer2]));
gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaDustModelDL);
@ -1636,14 +1636,14 @@ void BossFd_DrawEffects(BossFdEffect* effect, GlobalContext* globalCtx) {
Matrix_RotateX(effect->vFdFxRotX, MTXMODE_APPLY); Matrix_RotateX(effect->vFdFxRotX, MTXMODE_APPLY);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_fd.c", 4192), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceModelDL); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaSkullPieceModelDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
} }
} }
CLOSE_DISPS(gfxCtx, "../z_boss_fd.c", 4198); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void BossFd_Draw(Actor* thisx, GlobalContext* globalCtx) { void BossFd_Draw(Actor* thisx, GlobalContext* globalCtx) {
@ -1652,7 +1652,7 @@ void BossFd_Draw(Actor* thisx, GlobalContext* globalCtx) {
osSyncPrintf("FD DRAW START\n"); osSyncPrintf("FD DRAW START\n");
if (this->actionFunc != BossFd_Wait) { if (this->actionFunc != BossFd_Wait) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4217); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
if (this->work[BFD_DAMAGE_FLASH_TIMER] & 2) { if (this->work[BFD_DAMAGE_FLASH_TIMER] & 2) {
POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 255, 255, 255, 0, 900, 1099); POLY_OPA_DISP = Gfx_SetFog(POLY_OPA_DISP, 255, 255, 255, 0, 900, 1099);
@ -1660,7 +1660,7 @@ void BossFd_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossFd_DrawBody(globalCtx, this); BossFd_DrawBody(globalCtx, this);
POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4243); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
osSyncPrintf("FD DRAW END\n"); osSyncPrintf("FD DRAW END\n");
@ -1733,7 +1733,7 @@ void BossFd_DrawMane(GlobalContext* globalCtx, BossFd* this, Vec3f* manePos, Vec
f32 phi_f20; f32 phi_f20;
f32 phi_f22; f32 phi_f22;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4419); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
maneLength = this->skinSegments; maneLength = this->skinSegments;
maneLength = CLAMP_MAX(maneLength, 10); maneLength = CLAMP_MAX(maneLength, 10);
@ -1774,12 +1774,12 @@ void BossFd_DrawMane(GlobalContext* globalCtx, BossFd* this, Vec3f* manePos, Vec
Matrix_Scale(maneScale[maneIndex] * (0.01f - (i * 0.0008f)), maneScale[maneIndex] * (0.01f - (i * 0.0008f)), Matrix_Scale(maneScale[maneIndex] * (0.01f - (i * 0.0008f)), maneScale[maneIndex] * (0.01f - (i * 0.0008f)),
0.01f, MTXMODE_APPLY); 0.01f, MTXMODE_APPLY);
Matrix_RotateX(-M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(-M_PI / 2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4480), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeModelDL); gSPDisplayList(POLY_XLU_DISP++, gVolvagiaManeModelDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4483); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
s32 BossFd_OverrideHeadDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { s32 BossFd_OverrideHeadDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
@ -1839,7 +1839,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) {
f32 temp_float; f32 temp_float;
Mtx* tempMat = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Mtx)); Mtx* tempMat = Graph_Alloc(globalCtx->state.gfxCtx, 18 * sizeof(Mtx));
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4589); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->skinSegments != 0) { if (this->skinSegments != 0) {
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeState])); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeState]));
} }
@ -1893,7 +1893,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) {
this->fwork[BFD_BODY_PULSE]), this->fwork[BFD_BODY_PULSE]),
1.0f, MTXMODE_APPLY); 1.0f, MTXMODE_APPLY);
Matrix_RotateY(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateY(M_PI / 2.0f, MTXMODE_APPLY);
Matrix_ToMtx(tempMat, "../z_boss_fd.c", 4719); Matrix_ToMtx(tempMat, __FILE__, __LINE__);
gSPMatrix(POLY_OPA_DISP++, tempMat, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_OPA_DISP++, tempMat, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sBodyDLists[i]); gSPDisplayList(POLY_OPA_DISP++, sBodyDLists[i]);
} else { } else {
@ -1917,7 +1917,7 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) {
temp_float = 0.1f * sp84; temp_float = 0.1f * sp84;
} }
Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY); Matrix_Scale(0.1f, 0.1f, 0.1f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4768), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gVolvagiaRibsDL); gSPDisplayList(POLY_OPA_DISP++, gVolvagiaRibsDL);
@ -1993,5 +1993,5 @@ void BossFd_DrawBody(GlobalContext* globalCtx, BossFd* this) {
Matrix_Pop(); Matrix_Pop();
osSyncPrintf("END\n"); osSyncPrintf("END\n");
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd.c", 4987); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

22
soh/src/overlays/actors/ovl_Boss_Fd2/z_boss_fd2.c
View file

@ -1027,15 +1027,15 @@ s32 BossFd2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
} }
if ((limbIndex == 32) || (limbIndex == 35) || (limbIndex == 36)) { if ((limbIndex == 32) || (limbIndex == 35) || (limbIndex == 36)) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2165); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)bossFd->fwork[BFD_HEAD_TEX2_ALPHA]); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)bossFd->fwork[BFD_HEAD_TEX2_ALPHA]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2172); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} else { } else {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2174); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)bossFd->fwork[BFD_BODY_TEX2_ALPHA]); gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, (s8)bossFd->fwork[BFD_BODY_TEX2_ALPHA]);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2181); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
if ((0 < limbIndex) && (limbIndex < 16)) { if ((0 < limbIndex) && (limbIndex < 16)) {
*dList = NULL; *dList = NULL;
@ -1076,7 +1076,7 @@ void BossFd2_UpdateMane(BossFd2* this, GlobalContext* globalCtx, Vec3f* head, Ve
Vec3f spB0; Vec3f spB0;
f32 xyScale; f32 xyScale;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2389); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
@ -1152,12 +1152,12 @@ void BossFd2_UpdateMane(BossFd2* this, GlobalContext* globalCtx, Vec3f* head, Ve
xyScale = (0.01f - (i * 0.0009f)) * spE8[i] * scale[i]; xyScale = (0.01f - (i * 0.0009f)) * spE8[i] * scale[i];
Matrix_Scale(xyScale, xyScale, 0.01f * spE8[i], MTXMODE_APPLY); Matrix_Scale(xyScale, xyScale, 0.01f * spE8[i], MTXMODE_APPLY);
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2498), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeModelDL); gSPDisplayList(POLY_XLU_DISP++, gHoleVolvagiaManeModelDL);
} }
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2503); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) { void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) {
@ -1165,7 +1165,7 @@ void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) {
BossFd* bossFd = (BossFd*)this->actor.parent; BossFd* bossFd = (BossFd*)this->actor.parent;
s16 i; s16 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2515); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (1) {} if (1) {}
for (i = 0; i < 10; i++) { for (i = 0; i < 10; i++) {
this->centerMane.scale[i] = 1.5f + 0.3f * Math_SinS(5596.0f * this->work[FD2_VAR_TIMER] + i * 0x3200); this->centerMane.scale[i] = 1.5f + 0.3f * Math_SinS(5596.0f * this->work[FD2_VAR_TIMER] + i * 0x3200);
@ -1189,7 +1189,7 @@ void BossFd2_DrawMane(BossFd2* this, GlobalContext* globalCtx) {
BossFd2_UpdateMane(this, globalCtx, &this->leftMane.head, this->leftMane.pos, this->leftMane.rot, BossFd2_UpdateMane(this, globalCtx, &this->leftMane.head, this->leftMane.pos, this->leftMane.rot,
this->leftMane.pull, this->leftMane.scale); this->leftMane.pull, this->leftMane.scale);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2601); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossFd2_Draw(Actor* thisx, GlobalContext* globalCtx) { void BossFd2_Draw(Actor* thisx, GlobalContext* globalCtx) {
@ -1197,7 +1197,7 @@ void BossFd2_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
BossFd2* this = (BossFd2*)thisx; BossFd2* this = (BossFd2*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2617); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
osSyncPrintf("FD2 draw start \n"); osSyncPrintf("FD2 draw start \n");
if (this->actionFunc != BossFd2_Wait) { if (this->actionFunc != BossFd2_Wait) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -1219,5 +1219,5 @@ void BossFd2_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossFd2_DrawMane(this, globalCtx); BossFd2_DrawMane(this, globalCtx);
POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_fd2.c", 2688); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

102
soh/src/overlays/actors/ovl_Boss_Ganon/z_boss_ganon.c
View file

@ -3270,14 +3270,14 @@ void BossGanon_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList
} else if (limbIndex == 19) { } else if (limbIndex == 19) {
Matrix_MultVec3f(&D_808E4DB8, &this->actor.focus.pos); Matrix_MultVec3f(&D_808E4DB8, &this->actor.focus.pos);
} else if (limbIndex == 11) { } else if (limbIndex == 11) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7191); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_MultVec3f(&D_808E4DB8, &this->unk_208); Matrix_MultVec3f(&D_808E4DB8, &this->unk_208);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7196), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90));
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7198); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} else if (limbIndex == 6) { } else if (limbIndex == 6) {
Matrix_MultVec3f(&D_808E4DC4, &this->unk_238); Matrix_MultVec3f(&D_808E4DC4, &this->unk_238);
} else if (limbIndex == 10) { } else if (limbIndex == 10) {
@ -3350,7 +3350,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s16 i; s16 i;
OPEN_DISPS(gfxCtx, "../z_boss_ganon.c", 7350); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if ((this->unk_2E8 != 0) || (this->unk_2E6 != 0)) { if ((this->unk_2E8 != 0) || (this->unk_2E6 != 0)) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -3367,7 +3367,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(this->unk_49C[i], this->unk_49C[i], this->unk_49C[i], MTXMODE_APPLY); Matrix_Scale(this->unk_49C[i], this->unk_49C[i], this->unk_49C[i], MTXMODE_APPLY);
Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7384), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
} }
@ -3381,7 +3381,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) {
Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
} }
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7401), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->shockGlow) { if (this->shockGlow) {
@ -3398,7 +3398,7 @@ void BossGanon_DrawShock(BossGanon* this, GlobalContext* globalCtx) {
} }
} }
CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 7465); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) { void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) {
@ -3406,7 +3406,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s32 alpha; s32 alpha;
OPEN_DISPS(gfxCtx, "../z_boss_ganon.c", 7476); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (this->handLightBallScale > 0.0f) { if (this->handLightBallScale > 0.0f) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -3424,7 +3424,7 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(this->handLightBallScale, this->handLightBallScale, this->handLightBallScale, MTXMODE_APPLY); Matrix_Scale(this->handLightBallScale, this->handLightBallScale, this->handLightBallScale, MTXMODE_APPLY);
Matrix_RotateZ(this->unk_258, 1); Matrix_RotateZ(this->unk_258, 1);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7510), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
@ -3433,11 +3433,11 @@ void BossGanon_DrawHandLightBall(BossGanon* this, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 155, alpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 155, alpha);
Matrix_Translate(this->unk_260.x, 0.0f, this->unk_260.z, MTXMODE_NEW); Matrix_Translate(this->unk_260.x, 0.0f, this->unk_260.z, MTXMODE_NEW);
Matrix_Scale(this->handLightBallScale * 0.75f, 1.0f, this->handLightBallScale * 0.75f, MTXMODE_APPLY); Matrix_Scale(this->handLightBallScale * 0.75f, 1.0f, this->handLightBallScale * 0.75f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7531), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL); gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL);
CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 7534); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
} }
@ -3447,7 +3447,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s16 i; s16 i;
OPEN_DISPS(gfxCtx, "../z_boss_ganon.c", 7548); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (this->unk_284 > 0.0f) { if (this->unk_284 > 0.0f) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -3461,7 +3461,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) {
Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW); Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(this->unk_28C, this->unk_28C, this->unk_28C, MTXMODE_APPLY); Matrix_Scale(this->unk_28C, this->unk_28C, this->unk_28C, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7588), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfLightFlecksDL); gSPDisplayList(POLY_XLU_DISP++, gDorfLightFlecksDL);
@ -3469,7 +3469,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) {
Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW); Matrix_Translate(this->unk_278.x, this->unk_278.y, this->unk_278.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(this->unk_284, this->unk_284, this->unk_284, MTXMODE_APPLY); Matrix_Scale(this->unk_284, this->unk_284, this->unk_284, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7601), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 100, (s8)this->unk_288); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 0, 100, (s8)this->unk_288);
gSPSegment( gSPSegment(
@ -3494,7 +3494,7 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(this->unk_2D0, this->unk_2D0, this->unk_2D0, MTXMODE_APPLY); Matrix_Scale(this->unk_2D0, this->unk_2D0, this->unk_2D0, MTXMODE_APPLY);
Matrix_RotateZ((this->unk_1A2 * 10.0f) / 1000.0f, MTXMODE_APPLY); Matrix_RotateZ((this->unk_1A2 * 10.0f) / 1000.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7673), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
@ -3515,14 +3515,14 @@ void BossGanon_DrawBigMagicCharge(BossGanon* this, GlobalContext* globalCtx) {
Matrix_RotateZ(xzRot, MTXMODE_APPLY); Matrix_RotateZ(xzRot, MTXMODE_APPLY);
Matrix_Translate(0.0f, 0.0f, 50.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 0.0f, 50.0f, MTXMODE_APPLY);
Matrix_Scale(4.0f, 4.0f, 1.0f, MTXMODE_APPLY); Matrix_Scale(4.0f, 4.0f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 7713), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfLightRayTriDL); gSPDisplayList(POLY_XLU_DISP++, gDorfLightRayTriDL);
Matrix_Pop(); Matrix_Pop();
} }
CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 7721); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
} }
@ -3530,7 +3530,7 @@ void BossGanon_DrawTriforce(BossGanon* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
if (this->fwork[GDF_TRIFORCE_PRIM_A] > 0.0f) { if (this->fwork[GDF_TRIFORCE_PRIM_A] > 0.0f) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7732); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
@ -3568,13 +3568,13 @@ void BossGanon_DrawTriforce(BossGanon* this, GlobalContext* globalCtx) {
} }
Matrix_Scale(this->fwork[GDF_TRIFORCE_SCALE], this->fwork[GDF_TRIFORCE_SCALE], 1.0f, MTXMODE_APPLY); Matrix_Scale(this->fwork[GDF_TRIFORCE_SCALE], this->fwork[GDF_TRIFORCE_SCALE], 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7779), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gDorfTriforceDL)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gDorfTriforceDL));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7782); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
@ -3582,7 +3582,7 @@ void BossGanon_DrawDarkVortex(BossGanon* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
if (this->fwork[GDF_VORTEX_ALPHA] > 0.0f) { if (this->fwork[GDF_VORTEX_ALPHA] > 0.0f) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7792); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
@ -3603,13 +3603,13 @@ void BossGanon_DrawDarkVortex(BossGanon* this, GlobalContext* globalCtx) {
Matrix_Scale(this->fwork[GDF_VORTEX_SCALE], this->fwork[GDF_VORTEX_SCALE], this->fwork[GDF_VORTEX_SCALE], Matrix_Scale(this->fwork[GDF_VORTEX_SCALE], this->fwork[GDF_VORTEX_SCALE], this->fwork[GDF_VORTEX_SCALE],
MTXMODE_APPLY); MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7841), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gDorfVortexDL)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gDorfVortexDL));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 7844); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
@ -3763,7 +3763,7 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, GlobalContext* glob
f32 zOffset; f32 zOffset;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_boss_ganon.c", 8372); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, 50); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 0, 0, 0, 50);
@ -3777,14 +3777,14 @@ void BossGanon_DrawShadowTexture(void* tex, BossGanon* this, GlobalContext* glob
} }
Matrix_Scale(0.95000005f, 1.0f, 0.95000005f, MTXMODE_APPLY); Matrix_Scale(0.95000005f, 1.0f, 0.95000005f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 8396), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDorfShadowSetupDL); gSPDisplayList(POLY_OPA_DISP++, gDorfShadowSetupDL);
gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, gDPLoadTextureBlock(POLY_OPA_DISP++, tex, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
gSPDisplayList(POLY_OPA_DISP++, gDorfShadowModelDL); gSPDisplayList(POLY_OPA_DISP++, gDorfShadowModelDL);
CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 8426); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) { void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) {
@ -3794,7 +3794,7 @@ void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) {
shadowTex = Graph_Alloc(globalCtx->state.gfxCtx, 64 * 64); shadowTex = Graph_Alloc(globalCtx->state.gfxCtx, 64 * 64);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9138); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -3833,7 +3833,7 @@ void BossGanon_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossGanon_GenShadowTexture(shadowTex, this, globalCtx); BossGanon_GenShadowTexture(shadowTex, this, globalCtx);
BossGanon_DrawShadowTexture(shadowTex, this, globalCtx); BossGanon_DrawShadowTexture(shadowTex, this, globalCtx);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9393); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
s32 BossGanon_CheckFallingPlatforms(BossGanon* this, GlobalContext* globalCtx, Vec3f* checkPos) { s32 BossGanon_CheckFallingPlatforms(BossGanon* this, GlobalContext* globalCtx, Vec3f* checkPos) {
@ -4136,7 +4136,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 alpha; f32 alpha;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9849); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -4146,7 +4146,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push(); Matrix_Push();
Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z, MTXMODE_NEW);
Matrix_Scale(this->actor.scale.x * 0.75f, 1.0f, this->actor.scale.z * 0.75f, MTXMODE_APPLY); Matrix_Scale(this->actor.scale.x * 0.75f, 1.0f, this->actor.scale.z * 0.75f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9875), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL); gSPDisplayList(POLY_XLU_DISP++, gDorfLightCoreDL);
@ -4162,7 +4162,7 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push(); Matrix_Push();
Matrix_RotateY(i * (M_PI / 8), MTXMODE_APPLY); Matrix_RotateY(i * (M_PI / 8), MTXMODE_APPLY);
Matrix_RotateZ(this->fwork[GDF_FWORK_0], MTXMODE_APPLY); Matrix_RotateZ(this->fwork[GDF_FWORK_0], MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9899), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
@ -4171,12 +4171,12 @@ void BossGanon_LightBall_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else if (this->unk_1A8 == 0) { } else if (this->unk_1A8 == 0) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_RotateZ((this->actor.shape.rot.z / 32768.0f) * 3.1416f, MTXMODE_APPLY); Matrix_RotateZ((this->actor.shape.rot.z / 32768.0f) * 3.1416f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9907), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 9911); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_808E1EB4(Actor* thisx, GlobalContext* globalCtx2) { void func_808E1EB4(Actor* thisx, GlobalContext* globalCtx2) {
@ -4283,7 +4283,7 @@ void func_808E229C(Actor* thisx, GlobalContext* globalCtx2) {
s16 i; s16 i;
s32 temp; s32 temp;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10081); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 0, 0);
@ -4296,12 +4296,12 @@ void func_808E229C(Actor* thisx, GlobalContext* globalCtx2) {
this->actor.scale.z * (1.0f - (i * 0.07000001f)), MTXMODE_APPLY); this->actor.scale.z * (1.0f - (i * 0.07000001f)), MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_RotateZ(((2.0f * (i * M_PI)) / 10.0f) + BINANG_TO_RAD(this->actor.shape.rot.z), MTXMODE_APPLY); Matrix_RotateZ(((2.0f * (i * M_PI)) / 10.0f) + BINANG_TO_RAD(this->actor.shape.rot.z), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10109), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10113); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_808E2544(Actor* thisx, GlobalContext* globalCtx) { void func_808E2544(Actor* thisx, GlobalContext* globalCtx) {
@ -4565,7 +4565,7 @@ void func_808E324C(Actor* thisx, GlobalContext* globalCtx) {
mtx = Graph_Alloc(globalCtx->state.gfxCtx, 12 * sizeof(Mtx)); mtx = Graph_Alloc(globalCtx->state.gfxCtx, 12 * sizeof(Mtx));
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10489); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, (s8)this->fwork[GDF_FWORK_1]); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, (s8)this->fwork[GDF_FWORK_1]);
@ -4579,7 +4579,7 @@ void func_808E324C(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateX(-this->unk_3C4[temp].x, MTXMODE_APPLY); Matrix_RotateX(-this->unk_3C4[temp].x, MTXMODE_APPLY);
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
Matrix_RotateY(M_PI / 2, MTXMODE_APPLY); Matrix_RotateY(M_PI / 2, MTXMODE_APPLY);
Matrix_ToMtx(mtx, "../z_boss_ganon.c", 10520); Matrix_ToMtx(mtx, __FILE__, __LINE__);
gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sBigMagicLightStreakDLists[i]); gSPDisplayList(POLY_XLU_DISP++, sBigMagicLightStreakDLists[i]);
mtx++; mtx++;
@ -4589,13 +4589,13 @@ void func_808E324C(Actor* thisx, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(10.0f, 10.0f, 10.0f, MTXMODE_APPLY); Matrix_Scale(10.0f, 10.0f, 10.0f, MTXMODE_APPLY);
Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10534), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL); gSPDisplayList(POLY_XLU_DISP++, gDorfLightBallMaterialDL);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon.c", 10541); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossGanon_UpdateEffects(GlobalContext* globalCtx) { void BossGanon_UpdateEffects(GlobalContext* globalCtx) {
@ -4822,7 +4822,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
GanondorfEffect* eff = globalCtx->specialEffects; GanondorfEffect* eff = globalCtx->specialEffects;
GanondorfEffect* effFirst = eff; GanondorfEffect* effFirst = eff;
OPEN_DISPS(gfxCtx, "../z_boss_ganon.c", 10865); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
for (i = 0; i < 200; i++, eff++) { for (i = 0; i < 200; i++, eff++) {
@ -4842,7 +4842,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY);
Matrix_RotateY(eff->unk_48, MTXMODE_APPLY); Matrix_RotateY(eff->unk_48, MTXMODE_APPLY);
Matrix_RotateX(eff->unk_44, MTXMODE_APPLY); Matrix_RotateX(eff->unk_44, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10898), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDorfWindowShardModelDL); gSPDisplayList(POLY_OPA_DISP++, gDorfWindowShardModelDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -4866,7 +4866,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10932), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -4892,7 +4892,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
Matrix_Scale(eff->scale, eff->scale, eff->unk_38 * eff->scale, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, eff->unk_38 * eff->scale, MTXMODE_APPLY);
Matrix_RotateX(M_PI / 2, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 10971), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL); gSPDisplayList(POLY_XLU_DISP++, gDorfSquareDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -4920,7 +4920,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
Matrix_RotateX(eff->unk_3C * 1.3f, MTXMODE_APPLY); Matrix_RotateX(eff->unk_3C * 1.3f, MTXMODE_APPLY);
Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11023), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfShockDL); gSPDisplayList(POLY_XLU_DISP++, gDorfShockDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -4943,7 +4943,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY); Matrix_RotateZ(eff->unk_3C, MTXMODE_APPLY);
Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, eff->scale, MTXMODE_APPLY);
Matrix_RotateY(eff->unk_44, MTXMODE_APPLY); Matrix_RotateY(eff->unk_44, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11074), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLightningTextures[eff->timer])); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sLightningTextures[eff->timer]));
gSPDisplayList(POLY_XLU_DISP++, gDorfLightningDL); gSPDisplayList(POLY_XLU_DISP++, gDorfLightningDL);
@ -4964,7 +4964,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
eff->timer * -20, 32, 32)); eff->timer * -20, 32, 32));
Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11121), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfImpactDarkDL); gSPDisplayList(POLY_XLU_DISP++, gDorfImpactDarkDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -4984,7 +4984,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
eff->timer * -20, 32, 32)); eff->timer * -20, 32, 32));
Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->unk_40 * eff->scale, eff->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11165), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfImpactLightDL); gSPDisplayList(POLY_XLU_DISP++, gDorfImpactLightDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -5005,7 +5005,7 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
Matrix_Scale((eff->scale * 200.0f) / 1500.0f, (eff->unk_40 * 200.0f) / 1500.0f, Matrix_Scale((eff->scale * 200.0f) / 1500.0f, (eff->unk_40 * 200.0f) / 1500.0f,
(eff->scale * 200.0f) / 1500.0f, MTXMODE_APPLY); (eff->scale * 200.0f) / 1500.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11209), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfShockwaveDL); gSPDisplayList(POLY_XLU_DISP++, gDorfShockwaveDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -5026,14 +5026,14 @@ void BossGanon_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_ganon.c", 11250), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gDorfDotDL); gSPDisplayList(POLY_XLU_DISP++, gDorfDotDL);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
} }
} }
CLOSE_DISPS(gfxCtx, "../z_boss_ganon.c", 11255); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
#include "overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h" #include "overlays/ovl_Boss_Ganon/ovl_Boss_Ganon.h"

94
soh/src/overlays/actors/ovl_Boss_Ganon2/z_boss_ganon2.c
View file

@ -105,12 +105,12 @@ void BossGanon2_SetObjectSegment(BossGanon2* this, GlobalContext* globalCtx, s32
gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objectIdx].segment); gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objectIdx].segment);
if (setRSPSegment) { if (setRSPSegment) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 790); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objectIdx].segment); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objectIdx].segment);
gSPSegment(POLY_XLU_DISP++, 0x06, globalCtx->objectCtx.status[objectIdx].segment); gSPSegment(POLY_XLU_DISP++, 0x06, globalCtx->objectCtx.status[objectIdx].segment);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 799); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
@ -2411,7 +2411,7 @@ void func_809034E4(Vec3f* arg0, Vec3f* arg1) {
} }
void func_80903F38(BossGanon2* this, GlobalContext* globalCtx) { void func_80903F38(BossGanon2* this, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5083); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->unk_312 != 0) { if (this->unk_312 != 0) {
func_809034E4(&this->unk_200, &this->unk_20C); func_809034E4(&this->unk_200, &this->unk_20C);
@ -2425,19 +2425,19 @@ void func_80903F38(BossGanon2* this, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, D_80907080); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, D_80907080);
Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW); Matrix_Translate(0.0f, 0.0f, 0.0f, MTXMODE_NEW);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5117), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00BB80); gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00BB80);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5122); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80904108(BossGanon2* this, GlobalContext* globalCtx) { void func_80904108(BossGanon2* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
if (this->unk_324 > 0.0f) { if (this->unk_324 > 0.0f) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5131); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
@ -2448,12 +2448,12 @@ void func_80904108(BossGanon2* this, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128); gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 128);
Matrix_Translate(-200.0f, 1086.0f, -200.0f, MTXMODE_NEW); Matrix_Translate(-200.0f, 1086.0f, -200.0f, MTXMODE_NEW);
Matrix_Scale(0.098000005f, 0.1f, 0.098000005f, MTXMODE_APPLY); Matrix_Scale(0.098000005f, 0.1f, 0.098000005f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5183), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00E1C0)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00E1C0));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5186); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
@ -2464,7 +2464,7 @@ void func_80904340(BossGanon2* this, GlobalContext* globalCtx) {
f32 sin; f32 sin;
f32 cos; f32 cos;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5196); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
if ((this->unk_330 != 0) || (this->unk_328 != 0)) { if ((this->unk_330 != 0) || (this->unk_328 != 0)) {
@ -2498,21 +2498,21 @@ void func_80904340(BossGanon2* this, GlobalContext* globalCtx) {
Matrix_RotateY(M_PI, MTXMODE_APPLY); Matrix_RotateY(M_PI, MTXMODE_APPLY);
} }
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5250), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00D798)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00D798));
} }
} }
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5255); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_8090464C(BossGanon2* this, GlobalContext* globalCtx) { void func_8090464C(BossGanon2* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
if (this->unk_1B4 > 0.0f) { if (this->unk_1B4 > 0.0f) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5264); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
@ -2522,12 +2522,12 @@ void func_8090464C(BossGanon2* this, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_RotateZ(-0.2f, MTXMODE_APPLY); Matrix_RotateZ(-0.2f, MTXMODE_APPLY);
Matrix_Scale(0.6f, 0.6f, 1.0f, MTXMODE_APPLY); Matrix_Scale(0.6f, 0.6f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5290), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00CCD8)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00CCD8));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5293); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
@ -2536,7 +2536,7 @@ s32 BossGanon2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
s32 pad; s32 pad;
BossGanon2* this = (BossGanon2*)thisx; BossGanon2* this = (BossGanon2*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5355); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (limbIndex == 15) { if (limbIndex == 15) {
rot->y += this->unk_31A; rot->y += this->unk_31A;
@ -2558,7 +2558,7 @@ s32 BossGanon2_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
*dList = NULL; *dList = NULL;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5431); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
return 0; return 0;
} }
@ -2568,7 +2568,7 @@ void BossGanon2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
BossGanon2* this = (BossGanon2*)thisx; BossGanon2* this = (BossGanon2*)thisx;
Vec3f sp4C; Vec3f sp4C;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5459); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
D_80907120.z = 17000.0f; D_80907120.z = 17000.0f;
D_8090712C.z = 3000.0f; D_8090712C.z = 3000.0f;
@ -2600,14 +2600,14 @@ void BossGanon2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
if ((limbIndex == 7) || (limbIndex == 13)) { if ((limbIndex == 7) || (limbIndex == 13)) {
Matrix_Push(); Matrix_Push();
Matrix_Scale(this->unk_224, this->unk_224, this->unk_224, MTXMODE_APPLY); Matrix_Scale(this->unk_224, this->unk_224, this->unk_224, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5522), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList); gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pop(); Matrix_Pop();
} else if ((limbIndex == 33) || (limbIndex == 34)) { } else if ((limbIndex == 33) || (limbIndex == 34)) {
Matrix_Push(); Matrix_Push();
Matrix_Scale(this->unk_228, this->unk_228, this->unk_228, MTXMODE_APPLY); Matrix_Scale(this->unk_228, this->unk_228, this->unk_228, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5533), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList); gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pop(); Matrix_Pop();
@ -2627,14 +2627,14 @@ void BossGanon2_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5566); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80904D88(BossGanon2* this, GlobalContext* globalCtx) { void func_80904D88(BossGanon2* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
s16 i; s16 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5575); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->unk_30C > 0.0f) { if (this->unk_30C > 0.0f) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -2652,19 +2652,19 @@ void func_80904D88(BossGanon2* this, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(this->unk_30C, this->unk_30C, this->unk_30C, MTXMODE_APPLY); Matrix_Scale(this->unk_30C, this->unk_30C, this->unk_30C, MTXMODE_APPLY);
Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY); Matrix_RotateZ(Rand_CenteredFloat(M_PI), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5618), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B378); gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00B378);
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5622); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) { void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5632); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->unk_384 > 0.0f) { if (this->unk_384 > 0.0f) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -2676,23 +2676,23 @@ void func_80904FC8(BossGanon2* this, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(this->unk_384, this->unk_384, this->unk_384, MTXMODE_APPLY); Matrix_Scale(this->unk_384, this->unk_384, this->unk_384, MTXMODE_APPLY);
Matrix_RotateZ(this->unk_388, MTXMODE_APPLY); Matrix_RotateZ(this->unk_388, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5661), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378));
Matrix_RotateZ(this->unk_388 * -2.0f, MTXMODE_APPLY); Matrix_RotateZ(this->unk_388 * -2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5664), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378));
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5667); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_8090523C(BossGanon2* this, GlobalContext* globalCtx) { void func_8090523C(BossGanon2* this, GlobalContext* globalCtx) {
Player* player; Player* player;
f32 phi_f20; f32 phi_f20;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5675); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->unk_38C > 0.0f) { if (this->unk_38C > 0.0f) {
s8 i; s8 i;
@ -2716,13 +2716,13 @@ void func_8090523C(BossGanon2* this, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(200.0f * phi_f20, 200.0f * phi_f20, 1.0f, MTXMODE_APPLY); Matrix_Scale(200.0f * phi_f20, 200.0f * phi_f20, 1.0f, MTXMODE_APPLY);
Matrix_RotateZ(Rand_ZeroFloat(2.0f * M_PI), MTXMODE_APPLY); Matrix_RotateZ(Rand_ZeroFloat(2.0f * M_PI), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5721), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00B378));
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5725); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossGanon2_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { void BossGanon2_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
@ -2733,13 +2733,13 @@ void BossGanon2_PostLimbDraw2(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
Matrix_MultVec3f(&D_80906D60, &this->unk_234[temp_v1]); Matrix_MultVec3f(&D_80906D60, &this->unk_234[temp_v1]);
} }
if (limbIndex == 11) { if (limbIndex == 11) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5749); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5752), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_ganon_DL_00BE90));
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5754); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} else if (limbIndex == 10) { } else if (limbIndex == 10) {
Matrix_MultVec3f(&D_80907164, &this->unk_1B8); Matrix_MultVec3f(&D_80907164, &this->unk_1B8);
} }
@ -2749,7 +2749,7 @@ void func_80905674(BossGanon2* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
if (this->unk_380 > 0.0f) { if (this->unk_380 > 0.0f) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5772); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
@ -2763,12 +2763,12 @@ void func_80905674(BossGanon2* this, GlobalContext* globalCtx) {
Matrix_RotateY(-M_PI / 4.0f, MTXMODE_APPLY); Matrix_RotateY(-M_PI / 4.0f, MTXMODE_APPLY);
Matrix_Scale(0.040000003f, 0.040000003f, this->unk_380, MTXMODE_APPLY); Matrix_Scale(0.040000003f, 0.040000003f, this->unk_380, MTXMODE_APPLY);
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5814), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00EC40)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(ovl_Boss_Ganon2_DL_00EC40));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5817); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
@ -2777,7 +2777,7 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossGanon2* this = (BossGanon2*)thisx; BossGanon2* this = (BossGanon2*)thisx;
s16 i; s16 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5840); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -2803,7 +2803,7 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(0.0f, -4000.0f, 4000.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, -4000.0f, 4000.0f, MTXMODE_APPLY);
Matrix_RotateX(this->unk_394, MTXMODE_APPLY); Matrix_RotateX(this->unk_394, MTXMODE_APPLY);
Matrix_Translate(0.0f, 4000.0f, -4000.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 4000.0f, -4000.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5910), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, BossGanon2_OverrideLimbDraw, BossGanon2_PostLimbDraw, this->skelAnime.dListCount, BossGanon2_OverrideLimbDraw, BossGanon2_PostLimbDraw,
@ -2844,7 +2844,7 @@ void BossGanon2_Draw(Actor* thisx, GlobalContext* globalCtx) {
D_80910638 = 0; D_80910638 = 0;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 5983); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_809060E8(globalCtx); func_809060E8(globalCtx);
} }
@ -2920,7 +2920,7 @@ void func_809060E8(GlobalContext* globalCtx) {
effects = effect = globalCtx->specialEffects; effects = effect = globalCtx->specialEffects;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6086); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -2939,7 +2939,7 @@ void func_809060E8(GlobalContext* globalCtx) {
Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY); Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY);
Matrix_RotateY(effect->unk_38.z, MTXMODE_APPLY); Matrix_RotateY(effect->unk_38.z, MTXMODE_APPLY);
Matrix_RotateX(effect->unk_38.y, MTXMODE_APPLY); Matrix_RotateX(effect->unk_38.y, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6116), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_OPA_DISP++, 0x08, gSPSegment(POLY_OPA_DISP++, 0x08,
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 0 - (globalCtx->gameplayFrames & 0x7F), 32, 32)); Gfx_TexScroll(globalCtx->state.gfxCtx, 0, 0 - (globalCtx->gameplayFrames & 0x7F), 32, 32));
@ -2956,7 +2956,7 @@ void func_809060E8(GlobalContext* globalCtx) {
Matrix_Translate(effect->position.x + temp_f0, 1086.0f, (effect->position.z - 1.0f) + temp_f0, MTXMODE_NEW); Matrix_Translate(effect->position.x + temp_f0, 1086.0f, (effect->position.z - 1.0f) + temp_f0, MTXMODE_NEW);
Matrix_RotateY(angle, MTXMODE_APPLY); Matrix_RotateY(angle, MTXMODE_APPLY);
Matrix_Scale(1.0f, 0.0f, 1.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, 0.0f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6155), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00F188); gSPDisplayList(POLY_XLU_DISP++, ovl_Boss_Ganon2_DL_00F188);
} }
@ -2975,13 +2975,13 @@ void func_809060E8(GlobalContext* globalCtx) {
Matrix_RotateY(effect->unk_38.z, MTXMODE_APPLY); Matrix_RotateY(effect->unk_38.z, MTXMODE_APPLY);
Matrix_RotateX(effect->unk_38.y, MTXMODE_APPLY); Matrix_RotateX(effect->unk_38.y, MTXMODE_APPLY);
Matrix_RotateZ(effect->unk_38.x, MTXMODE_APPLY); Matrix_RotateZ(effect->unk_38.x, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6179), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gGanonRubbleDL); gSPDisplayList(POLY_OPA_DISP++, gGanonRubbleDL);
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6185); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80906538(BossGanon2* this, u8* shadowTexture, f32 arg2) { void func_80906538(BossGanon2* this, u8* shadowTexture, f32 arg2) {
@ -3081,7 +3081,7 @@ void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, GlobalC
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
s16 alpha; s16 alpha;
OPEN_DISPS(gfxCtx, "../z_boss_ganon2.c", 6430); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -3095,14 +3095,14 @@ void BossGanon2_DrawShadowTexture(void* shadowTexture, BossGanon2* this, GlobalC
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 0);
Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z - 20.0f, MTXMODE_NEW); Matrix_Translate(this->actor.world.pos.x, this->actor.floorHeight, this->actor.world.pos.z - 20.0f, MTXMODE_NEW);
Matrix_Scale(1.65f, 1.0f, 1.65f, MTXMODE_APPLY); Matrix_Scale(1.65f, 1.0f, 1.65f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_ganon2.c", 6457), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_00B3D0); gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_00B3D0);
gDPLoadTextureBlock(POLY_OPA_DISP++, shadowTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP, gDPLoadTextureBlock(POLY_OPA_DISP++, shadowTexture, G_IM_FMT_I, G_IM_SIZ_8b, 64, 64, 0, G_TX_NOMIRROR | G_TX_CLAMP,
G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD); G_TX_NOMIRROR | G_TX_CLAMP, 6, 6, G_TX_NOLOD, G_TX_NOLOD);
gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_00B3F0); gSPDisplayList(POLY_OPA_DISP++, ovl_Boss_Ganon2_DL_00B3F0);
CLOSE_DISPS(gfxCtx, "../z_boss_ganon2.c", 6479); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void BossGanon2_Reset(void) { void BossGanon2_Reset(void) {

4
soh/src/overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.c
View file

@ -1505,7 +1505,7 @@ void BossGanondrof_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossGanondrof* this = (BossGanondrof*)thisx; BossGanondrof* this = (BossGanondrof*)thisx;
EnfHG* horse; EnfHG* horse;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganondrof.c", 3716); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
osSyncPrintf("MOVE P = %x\n", this->actor.update); osSyncPrintf("MOVE P = %x\n", this->actor.update);
osSyncPrintf("STOP TIMER = %d ==============\n", this->actor.freezeTimer); osSyncPrintf("STOP TIMER = %d ==============\n", this->actor.freezeTimer);
horse = (EnfHG*)this->actor.child; horse = (EnfHG*)this->actor.child;
@ -1537,6 +1537,6 @@ void BossGanondrof_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossGanondrof_PostLimbDraw, this); BossGanondrof_PostLimbDraw, this);
osSyncPrintf("DRAW 22\n"); osSyncPrintf("DRAW 22\n");
POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP); POLY_OPA_DISP = Gameplay_SetFog(globalCtx, POLY_OPA_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_ganondrof.c", 3814); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
osSyncPrintf("DRAW END %d\n", this->actor.params); osSyncPrintf("DRAW END %d\n", this->actor.params);
} }

12
soh/src/overlays/actors/ovl_Boss_Goma/z_boss_goma.c
View file

@ -1961,7 +1961,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
BossGoma* this = (BossGoma*)thisx; BossGoma* this = (BossGoma*)thisx;
s32 doNotDrawLimb = false; s32 doNotDrawLimb = false;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_goma.c", 4685); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->mainEnvColor[0], (s16)this->mainEnvColor[1], (s16)this->mainEnvColor[2], gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->mainEnvColor[0], (s16)this->mainEnvColor[1], (s16)this->mainEnvColor[2],
@ -2012,7 +2012,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
if (*dList != NULL) { if (*dList != NULL) {
Matrix_Push(); Matrix_Push();
Matrix_Scale(this->eyeIrisScaleX, this->eyeIrisScaleY, 1.0f, MTXMODE_APPLY); Matrix_Scale(this->eyeIrisScaleX, this->eyeIrisScaleY, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_goma.c", 4815), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList); gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pop(); Matrix_Pop();
@ -2033,7 +2033,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
Matrix_Scale(this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4], Matrix_Scale(this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4],
this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4], this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4],
this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4], MTXMODE_APPLY); this->tailLimbsScale[limbIndex - BOSSGOMA_LIMB_TAIL4], MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_goma.c", 4836), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, *dList); gSPDisplayList(POLY_OPA_DISP++, *dList);
Matrix_Pop(); Matrix_Pop();
@ -2043,7 +2043,7 @@ s32 BossGoma_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
break; break;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_goma.c", 4858); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
return doNotDrawLimb; return doNotDrawLimb;
} }
@ -2126,7 +2126,7 @@ Gfx* BossGoma_NoBackfaceCullingDlist(GraphicsContext* gfxCtx) {
void BossGoma_Draw(Actor* thisx, GlobalContext* globalCtx) { void BossGoma_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossGoma* this = (BossGoma*)thisx; BossGoma* this = (BossGoma*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_goma.c", 4991); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
Matrix_Translate(0.0f, -4000.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, -4000.0f, 0.0f, MTXMODE_APPLY);
@ -2148,7 +2148,7 @@ void BossGoma_Draw(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_DrawOpa(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, BossGoma_OverrideLimbDraw, SkelAnime_DrawOpa(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, BossGoma_OverrideLimbDraw,
BossGoma_PostLimbDraw, this); BossGoma_PostLimbDraw, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_goma.c", 5012); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossGoma_SpawnChildGohma(BossGoma* this, GlobalContext* globalCtx, s16 i) { void BossGoma_SpawnChildGohma(BossGoma* this, GlobalContext* globalCtx, s16 i) {

42
soh/src/overlays/actors/ovl_Boss_Mo/z_boss_mo.c
View file

@ -2444,7 +2444,7 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) {
f32 phi_f22; f32 phi_f22;
Vec3f sp110; Vec3f sp110;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6366); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
sp110.x = globalCtx->envCtx.dirLight1.params.dir.x; sp110.x = globalCtx->envCtx.dirLight1.params.dir.x;
sp110.y = globalCtx->envCtx.dirLight1.params.dir.y; sp110.y = globalCtx->envCtx.dirLight1.params.dir.y;
@ -2494,7 +2494,7 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) {
MTXMODE_APPLY); MTXMODE_APPLY);
} }
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
Matrix_ToMtx(matrix, "../z_boss_mo.c", 6452); Matrix_ToMtx(matrix, __FILE__, __LINE__);
gSPMatrix(POLY_XLU_DISP++, matrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, matrix, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
@ -2527,7 +2527,7 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(phi_f22, phi_f22, 1.0f, MTXMODE_APPLY); Matrix_Scale(phi_f22, phi_f22, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6511), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL); gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL);
@ -2563,13 +2563,13 @@ void BossMo_DrawTentacle(BossMo* this, GlobalContext* globalCtx) {
} }
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6571); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossMo_DrawWater(BossMo* this, GlobalContext* globalCtx) { void BossMo_DrawWater(BossMo* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6582); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (1) {} if (1) {}
Matrix_Push(); Matrix_Push();
@ -2587,20 +2587,20 @@ void BossMo_DrawWater(BossMo* this, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 80); gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 80);
Matrix_Scale(0.5f, 1.0f, 0.5f, MTXMODE_APPLY); Matrix_Scale(0.5f, 1.0f, 0.5f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6675), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL); gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL);
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6680); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) { void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
BossMo* this = (BossMo*)thisx; BossMo* this = (BossMo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6688); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actor.world.pos.y > MO_WATER_LEVEL(globalCtx)) { if (this->actor.world.pos.y > MO_WATER_LEVEL(globalCtx)) {
BossMo_DrawWater(this, globalCtx); BossMo_DrawWater(this, globalCtx);
} }
@ -2618,7 +2618,7 @@ void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateX(this->work[MO_TENT_MOVE_TIMER] * 0.5f, MTXMODE_APPLY); Matrix_RotateX(this->work[MO_TENT_MOVE_TIMER] * 0.5f, MTXMODE_APPLY);
Matrix_RotateZ(this->work[MO_TENT_MOVE_TIMER] * 0.8f, MTXMODE_APPLY); Matrix_RotateZ(this->work[MO_TENT_MOVE_TIMER] * 0.8f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6735), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, (s8)this->baseAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, (s8)this->baseAlpha);
@ -2656,7 +2656,7 @@ void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(this->actor.world.pos.x, groundLevel, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Translate(this->actor.world.pos.x, groundLevel, this->actor.world.pos.z, MTXMODE_NEW);
Matrix_Scale(0.23f, 1.0f, 0.23f, MTXMODE_APPLY); Matrix_Scale(0.23f, 1.0f, 0.23f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6820), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL));
@ -2714,12 +2714,12 @@ void BossMo_DrawCore(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
Matrix_Scale(0.05f, 1.0f, 0.05f, MTXMODE_APPLY); Matrix_Scale(0.05f, 1.0f, 0.05f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6941), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL); gSPDisplayList(POLY_XLU_DISP++, gMorphaWaterDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6945); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
BossMo_DrawEffects(globalCtx->specialEffects, globalCtx); BossMo_DrawEffects(globalCtx->specialEffects, globalCtx);
} }
@ -2729,7 +2729,7 @@ void BossMo_DrawTent(Actor* thisx, GlobalContext* globalCtx) {
BossMo* this = (BossMo*)thisx; BossMo* this = (BossMo*)thisx;
u16 scroll; u16 scroll;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 6958); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (1) {} if (1) {}
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, (s8)(this->baseAlpha * 1.5f)); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 255, 255, (s8)(this->baseAlpha * 1.5f));
@ -2748,7 +2748,7 @@ void BossMo_DrawTent(Actor* thisx, GlobalContext* globalCtx) {
if (this->drawActor) { if (this->drawActor) {
BossMo_DrawTentacle(this, globalCtx); BossMo_DrawTentacle(this, globalCtx);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_mo.c", 7023); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossMo_UpdateEffects(BossMo* this, GlobalContext* globalCtx) { void BossMo_UpdateEffects(BossMo* this, GlobalContext* globalCtx) {
@ -2911,7 +2911,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
BossMoEffect* effectHead = effect; BossMoEffect* effectHead = effect;
OPEN_DISPS(gfxCtx, "../z_boss_mo.c", 7264); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) { for (i = 0; i < ARRAY_COUNT(sEffects); i++, effect++) {
@ -2929,7 +2929,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7294), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffWaterRippleDL); gSPDisplayList(POLY_XLU_DISP++, gEffWaterRippleDL);
@ -2954,7 +2954,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7330), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL); gSPDisplayList(POLY_XLU_DISP++, gEffShockwaveDL);
@ -2985,7 +2985,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(effect->scale / effect->fwork[MO_FX_STRETCH], effect->fwork[MO_FX_STRETCH] * effect->scale, Matrix_Scale(effect->scale / effect->fwork[MO_FX_STRETCH], effect->fwork[MO_FX_STRETCH] * effect->scale,
1.0f, MTXMODE_APPLY); 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7373), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletModelDL); gSPDisplayList(POLY_XLU_DISP++, gMorphaDropletModelDL);
@ -3013,7 +3013,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, 1.0f, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7441), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gMorphaWetSpotModelDL); gSPDisplayList(POLY_XLU_DISP++, gMorphaWetSpotModelDL);
@ -3039,7 +3039,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_mo.c", 7476), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL); gSPDisplayList(POLY_OPA_DISP++, gMorphaBubbleDL);
@ -3048,7 +3048,7 @@ void BossMo_DrawEffects(BossMoEffect* effect, GlobalContext* globalCtx) {
} }
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(gfxCtx, "../z_boss_mo.c", 7482); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void BossMo_Unknown(void) { void BossMo_Unknown(void) {

20
soh/src/overlays/actors/ovl_Boss_Sst/z_boss_sst.c
View file

@ -2707,7 +2707,7 @@ s32 BossSst_OverrideHandTrailDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx**
void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx) { void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx) {
BossSst* this = (BossSst*)thisx; BossSst* this = (BossSst*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6563); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -2757,7 +2757,7 @@ void BossSst_DrawHand(Actor* thisx, GlobalContext* globalCtx) {
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6654); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
BossSst_DrawEffect(&this->actor, globalCtx); BossSst_DrawEffect(&this->actor, globalCtx);
} }
@ -2859,7 +2859,7 @@ void BossSst_DrawHead(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
BossSst* this = (BossSst*)thisx; BossSst* this = (BossSst*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6810); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) { if (!CHECK_FLAG_ALL(this->actor.flags, ACTOR_FLAG_7)) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -2919,12 +2919,12 @@ void BossSst_DrawHead(Actor* thisx, GlobalContext* globalCtx) {
this->actor.world.pos.z + vanishMaskOffset.z, MTXMODE_NEW); this->actor.world.pos.z + vanishMaskOffset.z, MTXMODE_NEW);
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6934), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sIntroVanishDList); gSPDisplayList(POLY_XLU_DISP++, sIntroVanishDList);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 6941); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->viewProjectionMtxF, &this->actor.focus.pos, &this->center); SkinMatrix_Vec3fMtxFMultXYZ(&globalCtx->viewProjectionMtxF, &this->actor.focus.pos, &this->center);
BossSst_DrawEffect(&this->actor, globalCtx); BossSst_DrawEffect(&this->actor, globalCtx);
@ -3154,7 +3154,7 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) {
BossSstEffect* effect; BossSstEffect* effect;
if (this->effectMode != BONGO_NULL) { if (this->effectMode != BONGO_NULL) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7302); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
if (this->effectMode == BONGO_ICE) { if (this->effectMode == BONGO_ICE) {
@ -3179,7 +3179,7 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateZYX(effect->rot.x, effect->rot.y, effect->rot.z, MTXMODE_APPLY); Matrix_RotateZYX(effect->rot.x, effect->rot.y, effect->rot.z, MTXMODE_APPLY);
Matrix_Scale(effect->scale * 0.001f, effect->scale * 0.001f, effect->scale * 0.001f, MTXMODE_APPLY); Matrix_Scale(effect->scale * 0.001f, effect->scale * 0.001f, effect->scale * 0.001f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7350), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBongoIceShardDL); gSPDisplayList(POLY_XLU_DISP++, gBongoIceShardDL);
} }
@ -3202,7 +3202,7 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 30, 0, 30, effect->alpha * effect->move); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 30, 0, 30, effect->alpha * effect->move);
gDPSetEnvColor(POLY_XLU_DISP++, 30, 0, 30, 0); gDPSetEnvColor(POLY_XLU_DISP++, 30, 0, 30, 0);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7396), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL); gSPDisplayList(POLY_XLU_DISP++, gEffFireCircleDL);
} }
@ -3216,14 +3216,14 @@ void BossSst_DrawEffect(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_Scale(effect->scale * 0.001f, 1.0f, effect->scale * 0.001f, MTXMODE_APPLY); Matrix_Scale(effect->scale * 0.001f, 1.0f, effect->scale * 0.001f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7423), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, sShadowDList); gSPDisplayList(POLY_XLU_DISP++, sShadowDList);
effect++; effect++;
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_sst.c", 7433); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }

132
soh/src/overlays/actors/ovl_Boss_Tw/z_boss_tw.c
View file

@ -3177,7 +3177,7 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
}; };
BossTw* this = (BossTw*)thisx; BossTw* this = (BossTw*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6168); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
switch (limbIndex) { switch (limbIndex) {
case 21: case 21:
@ -3185,7 +3185,7 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
Matrix_MultVec3f(&D_8094A950, &this->crownPos); Matrix_MultVec3f(&D_8094A950, &this->crownPos);
if (this->unk_5F8 != 0) { if (this->unk_5F8 != 0) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6190), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
if (this->actor.params == 0) { if (this->actor.params == 0) {
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013AE8)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_013AE8));
@ -3202,7 +3202,7 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
Matrix_MultVec3f(&D_8094A95C[4], &this->scepterFlamePos[4]); Matrix_MultVec3f(&D_8094A95C[4], &this->scepterFlamePos[4]);
if (this->scepterAlpha > 0.0f) { if (this->scepterAlpha > 0.0f) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6221), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
if (this->actor.params == 0) { if (this->actor.params == 0) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 225, 255, (s16)this->scepterAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 225, 255, (s16)this->scepterAlpha);
@ -3219,19 +3219,19 @@ void BossTw_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, V
break; break;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6236); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80941BC0(BossTw* this, GlobalContext* globalCtx) { void func_80941BC0(BossTw* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6341); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_Translate(this->groundBlastPos2.x, this->groundBlastPos2.y, this->groundBlastPos2.z, MTXMODE_NEW); Matrix_Translate(this->groundBlastPos2.x, this->groundBlastPos2.y, this->groundBlastPos2.z, MTXMODE_NEW);
Matrix_Scale(this->workf[UNK_F12], this->workf[UNK_F12], this->workf[UNK_F12], MTXMODE_APPLY); Matrix_Scale(this->workf[UNK_F12], this->workf[UNK_F12], this->workf[UNK_F12], MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6358), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F11]); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F11]);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 40, 30, 80); gDPSetEnvColor(POLY_XLU_DISP++, 0, 40, 30, 80);
@ -3243,11 +3243,11 @@ void func_80941BC0(BossTw* this, GlobalContext* globalCtx) {
(this->work[CS_TIMER_2] * 4) & 0x3F, 0x10, 0x10)); (this->work[CS_TIMER_2] * 4) & 0x3F, 0x10, 0x10));
Matrix_Push(); Matrix_Push();
Matrix_RotateY(this->workf[UNK_F15], MTXMODE_APPLY); Matrix_RotateY(this->workf[UNK_F15], MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6423), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01C1C0)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01C1C0));
Matrix_Pop(); Matrix_Pop();
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6427), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPSegment(POLY_XLU_DISP++, 0xD, gSPSegment(POLY_XLU_DISP++, 0xD,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->work[CS_TIMER_2] & 0x7F, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->work[CS_TIMER_2] & 0x7F,
@ -3263,13 +3263,13 @@ void func_80941BC0(BossTw* this, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A790)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A790));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6461); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80942180(BossTw* this, GlobalContext* globalCtx) { void func_80942180(BossTw* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6468); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
@ -3279,7 +3279,7 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) {
gSPSegment(POLY_XLU_DISP++, 8, gSPSegment(POLY_XLU_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (-this->work[CS_TIMER_1]) & 0x7F, 0, 0x20, 0x20, 1, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (-this->work[CS_TIMER_1]) & 0x7F, 0, 0x20, 0x20, 1,
(this->work[CS_TIMER_1] * 2) & 0x7F, 0, 0x20, 0x20)); (this->work[CS_TIMER_1] * 2) & 0x7F, 0, 0x20, 0x20));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6497), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 40, 00, (s16)this->workf[KM_GRND_CRTR_A]); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 40, 00, (s16)this->workf[KM_GRND_CRTR_A]);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
@ -3287,7 +3287,7 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019D40)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019D40));
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6514), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPSegment(POLY_XLU_DISP++, 8, gSPSegment(POLY_XLU_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->work[CS_TIMER_1] & 0x7F, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, this->work[CS_TIMER_1] & 0x7F,
@ -3305,20 +3305,20 @@ void func_80942180(BossTw* this, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 200, 235, 240, 128); gDPSetEnvColor(POLY_XLU_DISP++, 200, 235, 240, 128);
Matrix_Scale(this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], MTXMODE_APPLY); Matrix_Scale(this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], this->workf[KM_GD_FLM_SCL], MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6575), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019938)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_019938));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6579); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_809426F0(BossTw* this, GlobalContext* globalCtx) { void func_809426F0(BossTw* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
s16 i; s16 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6587); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_XLU_DISP++, 8, gSPSegment(POLY_XLU_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (u8)(-this->work[CS_TIMER_2] * 15), 0x20, 0x40, 1, 0, 0, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (u8)(-this->work[CS_TIMER_2] * 15), 0x20, 0x40, 1, 0, 0,
@ -3328,7 +3328,7 @@ void func_809426F0(BossTw* this, GlobalContext* globalCtx) {
Matrix_Scale(this->spawnPortalScale / 2000.0f, this->spawnPortalScale / 2000.0f, this->spawnPortalScale / 2000.0f, Matrix_Scale(this->spawnPortalScale / 2000.0f, this->spawnPortalScale / 2000.0f, this->spawnPortalScale / 2000.0f,
MTXMODE_APPLY); MTXMODE_APPLY);
Matrix_RotateZ(this->portalRotation, MTXMODE_APPLY); Matrix_RotateZ(this->portalRotation, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6614), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
if (this->actor.params == 0) { if (this->actor.params == 0) {
@ -3359,20 +3359,20 @@ void func_809426F0(BossTw* this, GlobalContext* globalCtx) {
(u8)((-this->work[CS_TIMER_2] * 15) + (i * 50)), 0x20, 0x40, 1, 0, 0, 0x20, 0x20)); (u8)((-this->work[CS_TIMER_2] * 15) + (i * 50)), 0x20, 0x40, 1, 0, 0, 0x20, 0x20));
Matrix_Scale(0.4f, 0.4f, 0.4f, MTXMODE_APPLY); Matrix_Scale(0.4f, 0.4f, 0.4f, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6751), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
Matrix_Pop(); Matrix_Pop();
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6756); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80942C70(Actor* thisx, GlobalContext* globalCtx) { void func_80942C70(Actor* thisx, GlobalContext* globalCtx) {
BossTw* this = (BossTw*)thisx; BossTw* this = (BossTw*)thisx;
s16 alpha; s16 alpha;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6765); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->beamDist != 0.0f) { if (this->beamDist != 0.0f) {
Matrix_Push(); Matrix_Push();
@ -3393,7 +3393,7 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateX(this->beamPitch, MTXMODE_APPLY); Matrix_RotateX(this->beamPitch, MTXMODE_APPLY);
Matrix_RotateZ(this->beamRoll, MTXMODE_APPLY); Matrix_RotateZ(this->beamRoll, MTXMODE_APPLY);
Matrix_Scale(this->beamScale, this->beamScale, (this->beamDist * 0.01f * 98.0f) / 20000.0f, MTXMODE_APPLY); Matrix_Scale(this->beamScale, this->beamScale, (this->beamDist * 0.01f * 98.0f) / 20000.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6846), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0));
@ -3405,7 +3405,7 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateZ(this->beamRoll, MTXMODE_APPLY); Matrix_RotateZ(this->beamRoll, MTXMODE_APPLY);
Matrix_Scale(this->beamScale, this->beamScale, (this->beamReflectionDist * 0.01f * 100.0f) / 20000.0f, Matrix_Scale(this->beamScale, this->beamScale, (this->beamReflectionDist * 0.01f * 100.0f) / 20000.0f,
MTXMODE_APPLY); MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6870), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DDF0));
} }
@ -3413,19 +3413,19 @@ void func_80942C70(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Pop(); Matrix_Pop();
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6878); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80943028(Actor* thisx, GlobalContext* globalCtx) { void func_80943028(Actor* thisx, GlobalContext* globalCtx) {
BossTw* this = (BossTw*)thisx; BossTw* this = (BossTw*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6885); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + 57.0f, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + 57.0f, this->actor.world.pos.z, MTXMODE_NEW);
Matrix_Scale(this->workf[UNK_F17], this->workf[UNK_F17], this->workf[UNK_F17], MTXMODE_APPLY); Matrix_Scale(this->workf[UNK_F17], this->workf[UNK_F17], this->workf[UNK_F17], MTXMODE_APPLY);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6908), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F608)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F608));
func_80094044(globalCtx->state.gfxCtx); func_80094044(globalCtx->state.gfxCtx);
@ -3433,12 +3433,12 @@ void func_80943028(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(this->actor.world.pos.x, 240.0f, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Translate(this->actor.world.pos.x, 240.0f, this->actor.world.pos.z, MTXMODE_NEW);
Matrix_Scale((this->actor.scale.x * 4000.0f) / 100.0f, 1.0f, (this->actor.scale.x * 4000.0f) / 100.0f, Matrix_Scale((this->actor.scale.x * 4000.0f) / 100.0f, 1.0f, (this->actor.scale.x * 4000.0f) / 100.0f,
MTXMODE_APPLY); MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6926), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gCircleShadowDL));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6933); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
static void* sEyeTextures[] = { static void* sEyeTextures[] = {
@ -3453,7 +3453,7 @@ void BossTw_Draw(Actor* thisx, GlobalContext* globalCtx2) {
BossTw* this = (BossTw*)thisx; BossTw* this = (BossTw*)thisx;
Player* player = GET_PLAYER(globalCtx); Player* player = GET_PLAYER(globalCtx);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 6947); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->visible) { if (this->visible) {
gSPSegment(POLY_OPA_DISP++, 10, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIdx])); gSPSegment(POLY_OPA_DISP++, 10, SEGMENTED_TO_VIRTUAL(sEyeTextures[this->eyeTexIdx]));
@ -3525,7 +3525,7 @@ void BossTw_Draw(Actor* thisx, GlobalContext* globalCtx2) {
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7123); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void* D_8094A9B0[] = { void* D_8094A9B0[] = {
@ -3538,7 +3538,7 @@ s32 BossTw_TwinrovaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx
void* thisx) { void* thisx) {
BossTw* this = (BossTw*)thisx; BossTw* this = (BossTw*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7139); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
switch (limbIndex) { switch (limbIndex) {
case 21: case 21:
@ -3592,7 +3592,7 @@ s32 BossTw_TwinrovaOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx
*dList = NULL; *dList = NULL;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7251); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
return false; return false;
} }
@ -3605,7 +3605,7 @@ void BossTw_TwinrovaPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx**
BossTw* this = (BossTw*)thisx; BossTw* this = (BossTw*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7262); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
switch (limbIndex) { switch (limbIndex) {
case 34: case 34:
@ -3628,14 +3628,14 @@ void BossTw_TwinrovaPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx**
case 42: case 42:
Matrix_Push(); Matrix_Push();
Matrix_Scale(this->workf[UNK_F12], this->workf[UNK_F12], this->workf[UNK_F12], MTXMODE_APPLY); Matrix_Scale(this->workf[UNK_F12], this->workf[UNK_F12], this->workf[UNK_F12], MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7295), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
Matrix_Pop(); Matrix_Pop();
gSPDisplayList(POLY_XLU_DISP++, *dList); gSPDisplayList(POLY_XLU_DISP++, *dList);
break; break;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7301); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) { void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) {
@ -3644,7 +3644,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) {
s16 temp_t0; s16 temp_t0;
s16 temp_a0; s16 temp_a0;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7311); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
@ -3679,7 +3679,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) {
if (temp_t0 != 0) { if (temp_t0 != 0) {
Matrix_Mult(&player->shieldMf, MTXMODE_NEW); Matrix_Mult(&player->shieldMf, MTXMODE_NEW);
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7362), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
temp_a0 = (Math_SinS(this->work[CS_TIMER_1] * 2730 * temp_t0) * D_8094C854 * 0.5f) + (D_8094C854 * 0.5f); temp_a0 = (Math_SinS(this->work[CS_TIMER_1] * 2730 * temp_t0) * D_8094C854 * 0.5f) + (D_8094C854 * 0.5f);
if (sShieldFireCharge != 0) { if (sShieldFireCharge != 0) {
@ -3719,7 +3719,7 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) {
Matrix_Mult(&player->shieldMf, MTXMODE_NEW); Matrix_Mult(&player->shieldMf, MTXMODE_NEW);
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7486), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
if (sShieldFireCharge != 0) { if (sShieldFireCharge != 0) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 220, 20, (s16)D_8094C858); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 220, 20, (s16)D_8094C858);
@ -3737,13 +3737,13 @@ void BossTw_ShieldChargeDraw(BossTw* this, GlobalContext* globalCtx) {
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7531); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossTw_SpawnPortalDraw(BossTw* this, GlobalContext* globalCtx) { void BossTw_SpawnPortalDraw(BossTw* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7546); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPSegment( gSPSegment(
@ -3755,48 +3755,48 @@ void BossTw_SpawnPortalDraw(BossTw* this, GlobalContext* globalCtx) {
Matrix_Translate(0.0f, 232.0f, -600.0f, MTXMODE_NEW); Matrix_Translate(0.0f, 232.0f, -600.0f, MTXMODE_NEW);
Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY); Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7582), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68));
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 135, 175, 165, (s16)this->spawnPortalAlpha);
Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY);
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7596), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01CEE0)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01CEE0));
Matrix_Translate(0.0f, 232.0f, 600.0f, MTXMODE_NEW); Matrix_Translate(0.0f, 232.0f, 600.0f, MTXMODE_NEW);
Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY); Matrix_Scale(this->spawnPortalScale, this->spawnPortalScale, this->spawnPortalScale, MTXMODE_APPLY);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (s16)this->spawnPortalAlpha);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7617), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EC68));
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, (s16)this->spawnPortalAlpha); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, (s16)this->spawnPortalAlpha);
Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 2.0f, 0.0f, MTXMODE_APPLY);
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7631), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DBE8)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01DBE8));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7635); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80944C50(BossTw* this, GlobalContext* globalCtx) { void func_80944C50(BossTw* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
f32 scale; f32 scale;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7645); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
Matrix_Translate(0.0f, 750.0f, 0.0f, MTXMODE_NEW); Matrix_Translate(0.0f, 750.0f, 0.0f, MTXMODE_NEW);
Matrix_Scale(0.35f, 0.35f, 0.35f, MTXMODE_APPLY); Matrix_Scale(0.35f, 0.35f, 0.35f, MTXMODE_APPLY);
Matrix_Push(); Matrix_Push();
Matrix_Scale(this->workf[UNK_F19], this->workf[UNK_F19], this->workf[UNK_F19], MTXMODE_APPLY); Matrix_Scale(this->workf[UNK_F19], this->workf[UNK_F19], this->workf[UNK_F19], MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7671), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F390)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F390));
@ -3805,7 +3805,7 @@ void func_80944C50(BossTw* this, GlobalContext* globalCtx) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -sKoumePtr->work[CS_TIMER_1] * 2, 0, 0x20, 0x20, 1, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, -sKoumePtr->work[CS_TIMER_1] * 2, 0, 0x20, 0x20, 1,
-sKoumePtr->work[CS_TIMER_1] * 2, 0, 0x20, 0x40)); -sKoumePtr->work[CS_TIMER_1] * 2, 0, 0x20, 0x40));
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F18] / 2); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s16)this->workf[UNK_F18] / 2);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7694), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F238)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01F238));
@ -3819,12 +3819,12 @@ void func_80944C50(BossTw* this, GlobalContext* globalCtx) {
scale = CLAMP_MAX(scale, 1.0f); scale = CLAMP_MAX(scale, 1.0f);
Matrix_Scale(scale, 1.0f, scale, MTXMODE_APPLY); Matrix_Scale(scale, 1.0f, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7728), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH); G_MTX_LOAD | G_MTX_MODELVIEW | G_MTX_NOPUSH);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EEB0)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01EEB0));
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7732); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossTw_TwinrovaDraw(Actor* thisx, GlobalContext* globalCtx2) { void BossTw_TwinrovaDraw(Actor* thisx, GlobalContext* globalCtx2) {
@ -3832,7 +3832,7 @@ void BossTw_TwinrovaDraw(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2; GlobalContext* globalCtx = globalCtx2;
BossTw* this = (BossTw*)thisx; BossTw* this = (BossTw*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7748); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->visible) { if (this->visible) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -3864,7 +3864,7 @@ void BossTw_TwinrovaDraw(Actor* thisx, GlobalContext* globalCtx2) {
func_80944C50(this, globalCtx); func_80944C50(this, globalCtx);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 7804); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossTw_BlastFire(BossTw* this, GlobalContext* globalCtx) { void BossTw_BlastFire(BossTw* this, GlobalContext* globalCtx) {
@ -4404,7 +4404,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) {
s16 tailIdx; s16 tailIdx;
s16 i; s16 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 8818); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -4424,7 +4424,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor,
this->actor.scale.z * scaleFactor, MTXMODE_APPLY); this->actor.scale.z * scaleFactor, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 8865), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
} }
@ -4448,7 +4448,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor,
this->actor.scale.z * scaleFactor, MTXMODE_APPLY); this->actor.scale.z * scaleFactor, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9004), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
} }
@ -4458,7 +4458,7 @@ void BossTw_BlastDraw(Actor* thisx, GlobalContext* globalCtx2) {
break; break;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9013); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) { void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) {
@ -4468,7 +4468,7 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) {
s16 tailIdx; s16 tailIdx;
s16 i; s16 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9028); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -4488,7 +4488,7 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor,
this->actor.scale.z * scaleFactor, MTXMODE_APPLY); this->actor.scale.z * scaleFactor, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9071), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
} }
@ -4508,13 +4508,13 @@ void BossTw_DrawDeathBall(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor,
this->actor.scale.z * scaleFactor, MTXMODE_APPLY); this->actor.scale.z * scaleFactor, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9107), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_tw.c", 9111); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossTw_UpdateEffects(GlobalContext* globalCtx) { void BossTw_UpdateEffects(GlobalContext* globalCtx) {
@ -4870,7 +4870,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) {
effectHead = currentEffect; effectHead = currentEffect;
OPEN_DISPS(gfxCtx, "../z_boss_tw.c", 9592); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -4886,7 +4886,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW); Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9617), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_tw_DL_01A5A8); gSPDisplayList(POLY_XLU_DISP++, object_tw_DL_01A5A8);
} }
@ -4911,7 +4911,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW); Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9660), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
} }
@ -4936,7 +4936,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW); Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9709), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01A430));
} }
@ -4979,7 +4979,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) {
Matrix_RotateZ(currentEffect->workf[EFF_ROLL], MTXMODE_APPLY); Matrix_RotateZ(currentEffect->workf[EFF_ROLL], MTXMODE_APPLY);
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
Matrix_Scale(currentEffect->workf[EFF_SCALE], 1.0f, currentEffect->workf[EFF_SCALE], MTXMODE_APPLY); Matrix_Scale(currentEffect->workf[EFF_SCALE], 1.0f, currentEffect->workf[EFF_SCALE], MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9775), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2);
gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BACK | G_FOG); gSPClearGeometryMode(POLY_XLU_DISP++, G_CULL_BACK | G_FOG);
@ -5026,7 +5026,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) {
currentEffect->workf[EFF_SCALE], MTXMODE_APPLY); currentEffect->workf[EFF_SCALE], MTXMODE_APPLY);
Matrix_RotateY(BossTw_RandZeroOne() * M_PI, MTXMODE_APPLY); Matrix_RotateY(BossTw_RandZeroOne() * M_PI, MTXMODE_APPLY);
Matrix_RotateX((BossTw_RandZeroOne() - 0.5f) * M_PI * 0.5f, MTXMODE_APPLY); Matrix_RotateX((BossTw_RandZeroOne() - 0.5f) * M_PI * 0.5f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9855), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(object_tw_DL_01AB00));
} }
@ -5055,7 +5055,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW); Matrix_Translate(currentEffect->pos.x, currentEffect->pos.y, currentEffect->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY); Matrix_Scale(currentEffect->workf[EFF_SCALE], currentEffect->workf[EFF_SCALE], 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_tw.c", 9911), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (currentEffect->work[EFF_ARGS] == 0) { if (currentEffect->work[EFF_ARGS] == 0) {
@ -5068,7 +5068,7 @@ void BossTw_DrawEffects(GlobalContext* globalCtx) {
currentEffect++; currentEffect++;
} }
CLOSE_DISPS(gfxCtx, "../z_boss_tw.c", 9920); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void BossTw_TwinrovaSetupArriveAtTarget(BossTw* this, GlobalContext* globalCtx) { void BossTw_TwinrovaSetupArriveAtTarget(BossTw* this, GlobalContext* globalCtx) {

54
soh/src/overlays/actors/ovl_Boss_Va/z_boss_va.c
View file

@ -2874,7 +2874,7 @@ s32 BossVa_BodyOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
BossVa* this = (BossVa*)thisx; BossVa* this = (BossVa*)thisx;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4156); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (limbIndex == 20) { if (limbIndex == 20) {
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
@ -2894,7 +2894,7 @@ s32 BossVa_BodyOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
rot->x -= 0xCCC; rot->x -= 0xCCC;
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4183); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
return false; return false;
} }
@ -2903,7 +2903,7 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Vec3f sp78 = { 0.0f, 0.0f, 0.0f }; Vec3f sp78 = { 0.0f, 0.0f, 0.0f };
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4192); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (limbIndex == 6) { if (limbIndex == 6) {
if (sFightPhase < PHASE_3) { if (sFightPhase < PHASE_3) {
@ -2914,11 +2914,11 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Matrix_MultVec3f(&sp78, &this->unk_1D8); Matrix_MultVec3f(&sp78, &this->unk_1D8);
} else if ((limbIndex >= 10) && (limbIndex < 20) && (sBodyBari[limbIndex - 10] != 0)) { } else if ((limbIndex >= 10) && (limbIndex < 20) && (sBodyBari[limbIndex - 10] != 0)) {
if (((limbIndex >= 16) || (limbIndex == 10)) && (sFightPhase <= PHASE_3)) { if (((limbIndex >= 16) || (limbIndex == 10)) && (sFightPhase <= PHASE_3)) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4208), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008BB8); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008BB8);
} else if ((limbIndex >= 11) && (sFightPhase <= PHASE_2)) { } else if ((limbIndex >= 11) && (sFightPhase <= PHASE_2)) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4212), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008BB8); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008BB8);
} }
@ -2933,11 +2933,11 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
gSPSegment(POLY_XLU_DISP++, 0x09, gSPSegment(POLY_XLU_DISP++, 0x09,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (globalCtx->gameplayFrames * 10) % 128, 16, 32, 1, 0, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (globalCtx->gameplayFrames * 10) % 128, 16, 32, 1, 0,
(globalCtx->gameplayFrames * 5) % 128, 16, 32)); (globalCtx->gameplayFrames * 5) % 128, 16, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4232), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008D70); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008D70);
} else if ((*dList != NULL) && (limbIndex >= 29) && (limbIndex < 56)) { } else if ((*dList != NULL) && (limbIndex >= 29) && (limbIndex < 56)) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4236), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, *dList); gSPDisplayList(POLY_XLU_DISP++, *dList);
} else if ((limbIndex == 24) && (sCsState < DEATH_START)) { } else if ((limbIndex == 24) && (sCsState < DEATH_START)) {
@ -2966,7 +2966,7 @@ void BossVa_BodyPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
Matrix_MultVec3f(&sp78, &this->unk_274); Matrix_MultVec3f(&sp78, &this->unk_274);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4264); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
s32 BossVa_SupportOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, s32 BossVa_SupportOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot,
@ -3157,22 +3157,22 @@ s32 BossVa_BariOverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
void BossVa_BariPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { void BossVa_BariPostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
BossVa* this = (BossVa*)thisx; BossVa* this = (BossVa*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4494); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (limbIndex == 2) { if (limbIndex == 2) {
gSPSegment(POLY_XLU_DISP++, 0x0A, gSPSegment(POLY_XLU_DISP++, 0x0A,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (globalCtx->gameplayFrames * 10) % 32, 16, 32, 1, 0, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, (globalCtx->gameplayFrames * 10) % 32, 16, 32, 1, 0,
(globalCtx->gameplayFrames * -5) % 32, 16, 32)); (globalCtx->gameplayFrames * -5) % 32, 16, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4508), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_000FA0); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_000FA0);
} else if ((limbIndex == 3) || (limbIndex == 4)) { } else if ((limbIndex == 3) || (limbIndex == 4)) {
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 4512), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, *dList); gSPDisplayList(POLY_XLU_DISP++, *dList);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4517); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx) { void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx) {
@ -3187,7 +3187,7 @@ void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx) {
Vec3f sp74 = { -15.0f, 40.0f, 0.0f }; Vec3f sp74 = { -15.0f, 40.0f, 0.0f };
Color_RGBA8 unused = { 250, 250, 230, 200 }; Color_RGBA8 unused = { 250, 250, 230, 200 };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4542); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
paramsPtr = &this->actor.params; paramsPtr = &this->actor.params;
@ -3292,7 +3292,7 @@ void BossVa_Draw(Actor* thisx, GlobalContext* globalCtx) {
BossVa_DrawDoor(globalCtx, sDoorState); BossVa_DrawDoor(globalCtx, sDoorState);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 4673); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
static s32 sUnkValue = 0x009B0000; // Unreferenced? Possibly a color static s32 sUnkValue = 0x009B0000; // Unreferenced? Possibly a color
@ -3518,7 +3518,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
BossVaEffect* effectHead = effect; BossVaEffect* effectHead = effect;
Camera* camera = Gameplay_GetCamera(globalCtx, sCsCamera); Camera* camera = Gameplay_GetCamera(globalCtx, sCsCamera);
OPEN_DISPS(gfxCtx, "../z_boss_va.c", 4953); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
for (i = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) { for (i = 0; i < ARRAY_COUNT(sVaEffects); i++, effect++) {
if (effect->type == VA_LARGE_SPARK) { if (effect->type == VA_LARGE_SPARK) {
@ -3535,7 +3535,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
Matrix_Scale(effect->scale * 0.0185f, effect->scale * 0.0185f, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale * 0.0185f, effect->scale * 0.0185f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 4976), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -3556,7 +3556,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5002), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSparkBallTex[effect->mode])); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(sSparkBallTex[effect->mode]));
@ -3595,7 +3595,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5052), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_009468); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_009468);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -3620,7 +3620,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW); Matrix_Translate(effect->pos.x, effect->pos.y, effect->pos.z, MTXMODE_NEW);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5080), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012948); gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012948);
} }
@ -3654,7 +3654,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
Matrix_RotateY(-(effect->offset.x * 0.13f), MTXMODE_APPLY); Matrix_RotateY(-(effect->offset.x * 0.13f), MTXMODE_APPLY);
Matrix_RotateX(-(effect->offset.x * 0.115f), MTXMODE_APPLY); Matrix_RotateX(-(effect->offset.x * 0.115f), MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5124), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012C50); gSPDisplayList(POLY_OPA_DISP++, gBarinadeDL_012C50);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -3679,7 +3679,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
Matrix_RotateZYX(effect->rot.x, effect->rot.y, 0, MTXMODE_APPLY); Matrix_RotateZYX(effect->rot.x, effect->rot.y, 0, MTXMODE_APPLY);
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5152), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_013638); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_013638);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -3703,7 +3703,7 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); Matrix_RotateZ((effect->rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
Matrix_Scale(effect->scale * 0.02f, effect->scale * 0.02f, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale * 0.02f, effect->scale * 0.02f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5180), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_015710);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
@ -3727,14 +3727,14 @@ void BossVa_DrawEffects(BossVaEffect* effect, GlobalContext* globalCtx) {
Matrix_RotateY((effect->rot.y / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); Matrix_RotateY((effect->rot.y / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_boss_va.c", 5208), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008F70); gSPDisplayList(POLY_XLU_DISP++, gBarinadeDL_008F70);
FrameInterpolation_RecordCloseChild(); FrameInterpolation_RecordCloseChild();
} }
} }
CLOSE_DISPS(gfxCtx, "../z_boss_va.c", 5215); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void BossVa_SpawnSpark(GlobalContext* globalCtx, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale, void BossVa_SpawnSpark(GlobalContext* globalCtx, BossVaEffect* effect, BossVa* this, Vec3f* offset, s16 scale,
@ -4006,7 +4006,7 @@ void BossVa_DrawDoor(GlobalContext* globalCtx, s16 scale) {
f32 segAngle = 0.0f; f32 segAngle = 0.0f;
s32 i; s32 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 5600); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Translate(0.0f, 80.0f, 400.0f, MTXMODE_NEW); Matrix_Translate(0.0f, 80.0f, 400.0f, MTXMODE_NEW);
Matrix_RotateY(M_PI, MTXMODE_APPLY); Matrix_RotateY(M_PI, MTXMODE_APPLY);
@ -4026,12 +4026,12 @@ void BossVa_DrawDoor(GlobalContext* globalCtx, s16 scale) {
Matrix_RotateZ(segAngle, MTXMODE_APPLY); Matrix_RotateZ(segAngle, MTXMODE_APPLY);
Matrix_Translate(0.0f, doorPieceLength[i] * yScale, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, doorPieceLength[i] * yScale, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_boss_va.c", 5621), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, doorPieceDispList[i]); gSPDisplayList(POLY_OPA_DISP++, doorPieceDispList[i]);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_boss_va.c", 5629); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void BossVa_Reset(void) { void BossVa_Reset(void) {

44
soh/src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
View file

@ -86,7 +86,7 @@ void Demo6K_Init(Actor* thisx, GlobalContext* globalCtx) {
osSyncPrintf("bank_ID = %d\n", objBankIndex); osSyncPrintf("bank_ID = %d\n", objBankIndex);
if (objBankIndex < 0) { if (objBankIndex < 0) {
ASSERT(0, "0", "../z_demo_6k.c", 334); ASSERT(0, "0", __FILE__, __LINE__);
} else { } else {
this->objBankIndex = objBankIndex; this->objBankIndex = objBankIndex;
} }
@ -173,7 +173,7 @@ void Demo6K_Init(Actor* thisx, GlobalContext* globalCtx) {
this->unk_293 = params - 14; this->unk_293 = params - 14;
break; break;
default: default:
ASSERT(0, "0", "../z_demo_6k.c", 435); ASSERT(0, "0", __FILE__, __LINE__);
break; break;
} }
@ -564,7 +564,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
u16 timer1 = this->timer1; u16 timer1 = this->timer1;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1070); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY); Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY);
@ -585,7 +585,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) {
for (i = 0; i < 6; i++) { for (i = 0; i < 6; i++) {
Matrix_RotateZ(M_PI / 3, MTXMODE_APPLY); Matrix_RotateZ(M_PI / 3, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1115), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, colors[i][0].r, colors[i][0].g, colors[i][0].b, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, colors[i][0].r, colors[i][0].g, colors[i][0].b, 255);
@ -597,7 +597,7 @@ void func_80967FFC(Actor* thisx, GlobalContext* globalCtx) {
if ((s16)i) {} if ((s16)i) {}
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1127); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80968298(Actor* thisx, GlobalContext* globalCtx) { void func_80968298(Actor* thisx, GlobalContext* globalCtx) {
@ -611,7 +611,7 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) {
s32 i2; s32 i2;
u8 alpha; u8 alpha;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1145); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
alpha = (s32)(this->unk_170 * 255.0f); alpha = (s32)(this->unk_170 * 255.0f);
POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP); POLY_XLU_DISP = func_800937C0(POLY_XLU_DISP);
@ -631,7 +631,7 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) {
} }
Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY); Matrix_RotateX(-M_PI / 2, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1170), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 210, 210, 210, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 210, 210, 210, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 100, 100, 100, 255); gDPSetEnvColor(POLY_XLU_DISP++, 100, 100, 100, 255);
@ -640,14 +640,14 @@ void func_80968298(Actor* thisx, GlobalContext* globalCtx) {
64, 1, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 64, 32)); 64, 1, (0xFFF - (timer1 * 6)) & 0xFFF, (timer1 * 12) & 0xFFF, 64, 32));
gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_0039D0); gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_0039D0);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1189), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 50, 50, 50, 255); gDPSetEnvColor(POLY_XLU_DISP++, 50, 50, 50, 255);
gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_001040); gSPDisplayList(POLY_XLU_DISP++, object_demo_6k_DL_001040);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1198); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_8096865C(Actor* thisx, GlobalContext* globalCtx) { void func_8096865C(Actor* thisx, GlobalContext* globalCtx) {
@ -655,7 +655,7 @@ void func_8096865C(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
Gfx* displayList; Gfx* displayList;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1208); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (!(this->flags & 1)) { if (!(this->flags & 1)) {
if (this->actor.params > 8) { if (this->actor.params > 8) {
@ -671,17 +671,17 @@ void func_8096865C(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_Push(); Matrix_Push();
Matrix_RotateZ((f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY); Matrix_RotateZ((f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1230), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, displayList); gSPDisplayList(POLY_XLU_DISP++, displayList);
Matrix_Pop(); Matrix_Pop();
Matrix_RotateZ(-(f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY); Matrix_RotateZ(-(f32)(this->timer2 * 6) * (M_PI / 180.0f), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1236), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, displayList); gSPDisplayList(POLY_XLU_DISP++, displayList);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1242); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) { void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) {
@ -692,7 +692,7 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) {
if ((i = (globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[1] != NULL)) && if ((i = (globalCtx->csCtx.state != CS_STATE_IDLE) && (globalCtx->csCtx.npcActions[1] != NULL)) &&
(globalCtx->csCtx.npcActions[1]->action != 1)) { (globalCtx->csCtx.npcActions[1]->action != 1)) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1277); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 255, 255);
@ -708,7 +708,7 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) {
this->unk_234[i] * D_8096931C[(frames + i) & 3], this->unk_234[i] * D_8096931C[(frames + i) & 3],
this->unk_234[i] * D_8096931C[(frames + i) & 3], MTXMODE_APPLY); this->unk_234[i] * D_8096931C[(frames + i) & 3], MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1297), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
Matrix_Pop(); Matrix_Pop();
@ -716,7 +716,7 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx2) {
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1305); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
@ -729,12 +729,12 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) {
if (1) {} if (1) {}
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1316); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateX(M_PI / 2, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1322), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0xFF - ((timer2 * 2) & 0xFF), 0, 32, 32, 1, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0xFF - ((timer2 * 2) & 0xFF), 0, 32, 32, 1,
@ -766,7 +766,7 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, envColor[0], envColor[1], envColor[2], 128); gDPSetEnvColor(POLY_XLU_DISP++, envColor[0], envColor[1], envColor[2], 128);
gSPDisplayList(POLY_XLU_DISP++, object_gnd_magic_DL_001190); gSPDisplayList(POLY_XLU_DISP++, object_gnd_magic_DL_001190);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1368); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) { void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) {
@ -779,13 +779,13 @@ void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) {
if (1) {} if (1) {}
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1386); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
scaleFactor = ((s16)D_809693CC[(frames * 4) & 0xF] * 0.01f) + 1.0f; scaleFactor = ((s16)D_809693CC[(frames * 4) & 0xF] * 0.01f) + 1.0f;
Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor, Matrix_Scale(this->actor.scale.x * scaleFactor, this->actor.scale.y * scaleFactor,
this->actor.scale.z * scaleFactor, MTXMODE_APPLY); this->actor.scale.z * scaleFactor, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1394), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, displayList); gSPSegment(POLY_XLU_DISP++, 0x08, displayList);
gDPPipeSync(displayList++); gDPPipeSync(displayList++);
@ -795,7 +795,7 @@ void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 200, 0, 255);
gSPDisplayList(POLY_XLU_DISP++, gGlowCircleSmallDL); gSPDisplayList(POLY_XLU_DISP++, gGlowCircleSmallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1411); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_809691BC(Demo6K* this, GlobalContext* globalCtx, s32 params) { void func_809691BC(Demo6K* this, GlobalContext* globalCtx, s32 params) {

4
soh/src/overlays/actors/ovl_Demo_Du/z_demo_du.c
View file

@ -1000,7 +1000,7 @@ void DemoDu_Draw_01(Actor* thisx, GlobalContext* globalCtx2) {
void* mouthTexture = sMouthTextures[mouthTexIndex]; void* mouthTexture = sMouthTextures[mouthTexIndex];
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_du.c", 615); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -1015,7 +1015,7 @@ void DemoDu_Draw_01(Actor* thisx, GlobalContext* globalCtx2) {
SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL,
this); this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_du.c", 638); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
static DemoDuDrawFunc sDrawFuncs[] = { static DemoDuDrawFunc sDrawFuncs[] = {

12
soh/src/overlays/actors/ovl_Demo_Ec/z_demo_ec.c
View file

@ -254,7 +254,7 @@ void DemoEc_DrawSkeleton(DemoEc* this, GlobalContext* globalCtx, void* eyeTextur
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
s32 pad; s32 pad;
OPEN_DISPS(gfxCtx, "../z_demo_ec.c", 565); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(gfxCtx); func_80093D18(gfxCtx);
@ -271,7 +271,7 @@ void DemoEc_DrawSkeleton(DemoEc* this, GlobalContext* globalCtx, void* eyeTextur
gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]); gSPSegment(POLY_OPA_DISP++, 0x0C, &D_80116280[2]);
POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
overrideLimbDraw, postLimbDraw, &this->actor, POLY_OPA_DISP); overrideLimbDraw, postLimbDraw, &this->actor, POLY_OPA_DISP);
CLOSE_DISPS(gfxCtx, "../z_demo_ec.c", 595); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void DemoEc_DrawSkeletonCustomColor(DemoEc* this, GlobalContext* globalCtx, Gfx* arg2, Gfx* arg3, u8* color1, void DemoEc_DrawSkeletonCustomColor(DemoEc* this, GlobalContext* globalCtx, Gfx* arg2, Gfx* arg3, u8* color1,
@ -280,7 +280,7 @@ void DemoEc_DrawSkeletonCustomColor(DemoEc* this, GlobalContext* globalCtx, Gfx*
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(gfxCtx, "../z_demo_ec.c", 609); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(gfxCtx); func_80093D18(gfxCtx);
@ -308,7 +308,7 @@ void DemoEc_DrawSkeletonCustomColor(DemoEc* this, GlobalContext* globalCtx, Gfx*
POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, POLY_OPA_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
overrideLimbDraw, postLimbDraw, &this->actor, POLY_OPA_DISP); overrideLimbDraw, postLimbDraw, &this->actor, POLY_OPA_DISP);
CLOSE_DISPS(gfxCtx, "../z_demo_ec.c", 646); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void DemoEc_UseDrawObject(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_UseDrawObject(DemoEc* this, GlobalContext* globalCtx) {
@ -316,13 +316,13 @@ void DemoEc_UseDrawObject(DemoEc* this, GlobalContext* globalCtx) {
s32 drawObjBankIndex = this->drawObjBankIndex; s32 drawObjBankIndex = this->drawObjBankIndex;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_demo_ec.c", 662); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[drawObjBankIndex].segment); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[drawObjBankIndex].segment);
gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[drawObjBankIndex].segment); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[drawObjBankIndex].segment);
if (!globalCtx) {} if (!globalCtx) {}
CLOSE_DISPS(gfxCtx, "../z_demo_ec.c", 670); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void DemoEc_UseAnimationObject(DemoEc* this, GlobalContext* globalCtx) { void DemoEc_UseAnimationObject(DemoEc* this, GlobalContext* globalCtx) {

84
soh/src/overlays/actors/ovl_Demo_Effect/z_demo_effect.c
View file

@ -196,7 +196,7 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx2) {
osSyncPrintf(VT_FGCOL(CYAN) " bank_ID = %d\n" VT_RST, objectIndex); osSyncPrintf(VT_FGCOL(CYAN) " bank_ID = %d\n" VT_RST, objectIndex);
if (objectIndex < 0) { if (objectIndex < 0) {
ASSERT(0, "0", "../z_demo_effect.c", 723); ASSERT(0, "0", __FILE__, __LINE__);
} else { } else {
this->initObjectBankIndex = objectIndex; this->initObjectBankIndex = objectIndex;
} }
@ -506,7 +506,7 @@ void DemoEffect_Init(Actor* thisx, GlobalContext* globalCtx2) {
break; break;
default: default:
ASSERT(0, "0", "../z_demo_effect.c", 1062); ASSERT(0, "0", __FILE__, __LINE__);
break; break;
} }
@ -683,7 +683,7 @@ void DemoEffect_InitTimeWarp(DemoEffect* this, GlobalContext* globalCtx) {
s32 effectType = (this->actor.params & 0x00FF); s32 effectType = (this->actor.params & 0x00FF);
if (!SkelCurve_Init(globalCtx, &this->skelCurve, &gTimeWarpSkel, &gTimeWarpAnim)) { if (!SkelCurve_Init(globalCtx, &this->skelCurve, &gTimeWarpSkel, &gTimeWarpAnim)) {
ASSERT(0, "0", "../z_demo_effect.c", 1283); ASSERT(0, "0", __FILE__, __LINE__);
} }
if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL) { if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL) {
@ -1669,7 +1669,7 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2; GlobalContext* globalCtx = globalCtx2;
u32 frames = this->jewel.timer; u32 frames = this->jewel.timer;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2543); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) {
if (1) {} if (1) {}
@ -1701,9 +1701,9 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) {
if (!frames) {} if (!frames) {}
gSPSegment(POLY_OPA_DISP++, 8, Gfx_TexScroll(globalCtx->state.gfxCtx, (u8)frames, (u8)frames, 16, 16)); gSPSegment(POLY_OPA_DISP++, 8, Gfx_TexScroll(globalCtx->state.gfxCtx, (u8)frames, (u8)frames, 16, 16));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2597), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2599), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
func_8002ED80(&this->actor, globalCtx, 0); func_8002ED80(&this->actor, globalCtx, 0);
@ -1720,7 +1720,7 @@ void DemoEffect_DrawJewel(Actor* thisx, GlobalContext* globalCtx2) {
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2620); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -1731,7 +1731,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* parent = (DemoEffect*)this->actor.parent; DemoEffect* parent = (DemoEffect*)this->actor.parent;
u32 frames = globalCtx->gameplayFrames & 0xFFFF; u32 frames = globalCtx->gameplayFrames & 0xFFFF;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2634); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (parent != NULL) { if (parent != NULL) {
gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 170, parent->triforceSpot.crystalLightOpacity); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 255, 255, 170, parent->triforceSpot.crystalLightOpacity);
@ -1748,7 +1748,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(0.0f, MTXMODE_APPLY); Matrix_RotateY(0.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2661), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL); gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL);
Matrix_Pop(); Matrix_Pop();
@ -1756,7 +1756,7 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY((2.0f * M_PI) / 3.0f, MTXMODE_APPLY); Matrix_RotateY((2.0f * M_PI) / 3.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2672), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL); gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL);
Matrix_Pop(); Matrix_Pop();
@ -1764,11 +1764,11 @@ void DemoEffect_DrawCrystalLight(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY((4.0f * M_PI) / 3.0f, MTXMODE_APPLY); Matrix_RotateY((4.0f * M_PI) / 3.0f, MTXMODE_APPLY);
Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY); Matrix_RotateX((11.0 * M_PI) / 180.0, MTXMODE_APPLY);
Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 150.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2683), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL); gSPDisplayList(POLY_XLU_DISP++, gCrystalLightDL);
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2688); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -1778,18 +1778,18 @@ void DemoEffect_DrawFireBall(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = (DemoEffect*)thisx; DemoEffect* this = (DemoEffect*)thisx;
u32 frames = globalCtx->gameplayFrames; u32 frames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2701); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 200, 0, 255); gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 200, 0, 255);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 0, 0, 255);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2709), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPMatrix(POLY_XLU_DISP++, globalCtx->billboardMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, globalCtx->billboardMtx, G_MTX_NOPUSH | G_MTX_MUL | G_MTX_MODELVIEW);
gSPSegment( gSPSegment(
POLY_XLU_DISP++, 8, POLY_XLU_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 128 - ((frames * 20) % 128) - 1, 32, 32)); Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 32, 1, 0, 128 - ((frames * 20) % 128) - 1, 32, 32));
gSPDisplayList(POLY_XLU_DISP++, gCreationFireBallDL); gSPDisplayList(POLY_XLU_DISP++, gCreationFireBallDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2723); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -1801,7 +1801,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
u32 frames = globalCtx->gameplayFrames; u32 frames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2737); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (!DemoEffect_CheckCsAction(this, globalCtx, 2)) { if (!DemoEffect_CheckCsAction(this, globalCtx, 2)) {
if (gSaveContext.entranceIndex == 0x00A0) { if (gSaveContext.entranceIndex == 0x00A0) {
@ -1827,7 +1827,7 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255); gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_Push(); Matrix_Push();
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2801), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessAuraDL); gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessAuraDL);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -1844,12 +1844,12 @@ void DemoEffect_DrawGodLgt(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY); Matrix_RotateX(M_PI / 2.0f, MTXMODE_APPLY);
Matrix_Translate(0.0f, -140.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, -140.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY); Matrix_Scale(0.03f, 0.03f, 0.03f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2824), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gGoldenGoddessBodyDL); gSPDisplayList(POLY_OPA_DISP++, gGoldenGoddessBodyDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2829); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -1860,7 +1860,7 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) {
u8* alpha; u8* alpha;
Gfx* disp; Gfx* disp;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2842); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) { if (!DemoEffect_CheckCsAction(this, globalCtx, 1)) {
@ -1878,20 +1878,20 @@ void DemoEffect_DrawLightEffect(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push(); Matrix_Push();
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateZ(this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY); Matrix_RotateZ(this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2866), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH); G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
if (disp) {}; if (disp) {};
gSPDisplayList(POLY_XLU_DISP++, disp); gSPDisplayList(POLY_XLU_DISP++, disp);
Matrix_Pop(); Matrix_Pop();
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateZ(-(f32)this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY); Matrix_RotateZ(-(f32)this->light.rotation * (M_PI / 180.0f), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2874), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, disp); gSPDisplayList(POLY_XLU_DISP++, disp);
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2881); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -1901,17 +1901,17 @@ void DemoEffect_DrawBlueOrb(Actor* thisx, GlobalContext* globalCtx) {
DemoEffect* this = (DemoEffect*)thisx; DemoEffect* this = (DemoEffect*)thisx;
s32 pad2; s32 pad2;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2892); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 188, 255, 255, this->blueOrb.alpha); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 188, 255, 255, this->blueOrb.alpha);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateZ(this->blueOrb.rotation * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateZ(this->blueOrb.rotation * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2901), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
this->blueOrb.rotation += 0x01F4; this->blueOrb.rotation += 0x01F4;
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2907); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -1922,17 +1922,17 @@ void DemoEffect_DrawLgtShower(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
u32 frames = globalCtx->gameplayFrames; u32 frames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2921); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 255, 160, this->lgtShower.alpha); gDPSetPrimColor(POLY_XLU_DISP++, 64, 64, 255, 255, 160, this->lgtShower.alpha);
gDPSetEnvColor(POLY_XLU_DISP++, 50, 200, 0, 255); gDPSetEnvColor(POLY_XLU_DISP++, 50, 200, 0, 255);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2927), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 8, gSPSegment(POLY_XLU_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 5) % 1024, 0, 256, 64, 1, (frames * 10) % 128, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 5) % 1024, 0, 256, 64, 1, (frames * 10) % 128,
512 - ((frames * 50) % 512), 32, 16)); 512 - ((frames * 50) % 512), 32, 16));
gSPDisplayList(POLY_XLU_DISP++, gEnliveningLightDL); gSPDisplayList(POLY_XLU_DISP++, gEnliveningLightDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2942); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -1943,19 +1943,19 @@ void DemoEffect_DrawLightRing(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2; GlobalContext* globalCtx = globalCtx2;
u32 frames = this->lightRing.timer; u32 frames = this->lightRing.timer;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2956); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 170, 255, 255, this->lightRing.alpha); gDPSetPrimColor(POLY_XLU_DISP++, 128, 128, 170, 255, 255, this->lightRing.alpha);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 0, 100, 255, 255);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2963), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 8, gSPSegment(POLY_XLU_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 5) % 64, 512 - ((frames * 2) % 512) - 1, 16, 128, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 5) % 64, 512 - ((frames * 2) % 512) - 1, 16, 128,
1, 0, 0, 8, 1024)); 1, 0, 0, 8, 1024));
gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessLightRingDL); gSPDisplayList(POLY_XLU_DISP++, gGoldenGoddessLightRingDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2978); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -1967,7 +1967,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
Vtx* vertices = ResourceMgr_LoadVtxByName(SEGMENTED_TO_VIRTUAL(gTriforceVtx)); Vtx* vertices = ResourceMgr_LoadVtxByName(SEGMENTED_TO_VIRTUAL(gTriforceVtx));
u32 frames = globalCtx->gameplayFrames; u32 frames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 2994); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (gSaveContext.entranceIndex != 0x0400 || globalCtx->csCtx.frames < 885) { if (gSaveContext.entranceIndex != 0x0400 || globalCtx->csCtx.frames < 885) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -1975,7 +1975,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
Audio_PlayActorSound2(&this->actor, NA_SE_EV_AURORA - SFX_FLAG); Audio_PlayActorSound2(&this->actor, NA_SE_EV_AURORA - SFX_FLAG);
Matrix_Push(); Matrix_Push();
Matrix_Scale(1.0f, 2.4f, 1.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, 2.4f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3011), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 9, gSPSegment(POLY_XLU_DISP++, 9,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 256 - ((frames * 4) % 256) - 1, 64, 64, 1, 0, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 256 - ((frames * 4) % 256) - 1, 64, 64, 1, 0,
@ -1990,7 +1990,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
if (this->triforceSpot.triforceSpotOpacity != 0) { if (this->triforceSpot.triforceSpotOpacity != 0) {
Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRIFORCE - SFX_FLAG); Audio_PlayActorSound2(&this->actor, NA_SE_EV_TRIFORCE - SFX_FLAG);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3042), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->triforceSpot.triforceSpotOpacity < 250) { if (this->triforceSpot.triforceSpotOpacity < 250) {
@ -1998,7 +1998,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2); gDPSetRenderMode(POLY_XLU_DISP++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2);
Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3053), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 8, gSPSegment(POLY_XLU_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8)); Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8));
@ -2010,7 +2010,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_AA_ZB_OPA_SURF2); gDPSetRenderMode(POLY_OPA_DISP++, G_RM_PASS, G_RM_AA_ZB_OPA_SURF2);
Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateY(this->triforceSpot.rotation * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3085), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_OPA_DISP++, 8, gSPSegment(POLY_OPA_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8)); Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 32, 16, 1, 0, 0, 16, 8));
@ -2020,7 +2020,7 @@ void DemoEffect_DrawTriforceSpot(Actor* thisx, GlobalContext* globalCtx) {
} }
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3112); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -2048,14 +2048,14 @@ s32 DemoEffect_DrawTimewarpLimbs(GlobalContext* globalCtx, SkelAnimeCurve* skelC
DemoEffect* this = (DemoEffect*)thisx; DemoEffect* this = (DemoEffect*)thisx;
u32 frames = globalCtx->gameplayFrames; u32 frames = globalCtx->gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3154); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, 170, 255, 255, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 128, 170, 255, 255, 255);
gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255); gDPSetEnvColor(POLY_XLU_DISP++, this->envXluColor[0], this->envXluColor[1], this->envXluColor[2], 255);
gSPSegment(POLY_XLU_DISP++, 8, gSPSegment(POLY_XLU_DISP++, 8,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 6) % 1024, 256 - ((frames * 16) % 256) - 1, 256, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (frames * 6) % 1024, 256 - ((frames * 16) % 256) - 1, 256,
64, 1, (frames * 4) % 512, 128 - ((frames * 12) % 128) - 1, 128, 32)); 64, 1, (frames * 4) % 512, 128 - ((frames * 12) % 128) - 1, 128, 32));
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_effect.c", 3172); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (limbIndex == 0) { if (limbIndex == 0) {
LimbTransform* transform = &skelCuve->transforms[0]; LimbTransform* transform = &skelCuve->transforms[0];
@ -2077,11 +2077,11 @@ void DemoEffect_DrawTimeWarp(Actor* thisx, GlobalContext* globalCtx) {
if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL || if (effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_LARGE || effectType == DEMO_EFFECT_TIMEWARP_TIMEBLOCK_SMALL ||
Flags_GetEnv(globalCtx, 1) || gSaveContext.sceneSetupIndex >= 4 || gSaveContext.entranceIndex == 0x0324) { Flags_GetEnv(globalCtx, 1) || gSaveContext.sceneSetupIndex >= 4 || gSaveContext.entranceIndex == 0x0324) {
OPEN_DISPS(gfxCtx, "../z_demo_effect.c", 3201); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 25); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 25);
Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY); Matrix_Scale(2.0f, 2.0f, 2.0f, MTXMODE_APPLY);
SkelCurve_Draw(thisx, globalCtx, &this->skelCurve, DemoEffect_DrawTimewarpLimbs, NULL, 1, this); SkelCurve_Draw(thisx, globalCtx, &this->skelCurve, DemoEffect_DrawTimewarpLimbs, NULL, 1, this);
CLOSE_DISPS(gfxCtx, "../z_demo_effect.c", 3216); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
} }

6
soh/src/overlays/actors/ovl_Demo_Ext/z_demo_ext.c
View file

@ -192,12 +192,12 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) {
gfxCtx = globalCtx->state.gfxCtx; gfxCtx = globalCtx->state.gfxCtx;
mtx = Graph_Alloc(gfxCtx, sizeof(Mtx)); mtx = Graph_Alloc(gfxCtx, sizeof(Mtx));
OPEN_DISPS(gfxCtx, "../z_demo_ext.c", 460); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
Matrix_Scale(scale->x, scale->y, scale->z, MTXMODE_APPLY); Matrix_Scale(scale->x, scale->y, scale->z, MTXMODE_APPLY);
Matrix_RotateZYX((s16)(kREG(16) + 0x4000), this->rotationPitch, kREG(18), MTXMODE_APPLY); Matrix_RotateZYX((s16)(kREG(16) + 0x4000), this->rotationPitch, kREG(18), MTXMODE_APPLY);
Matrix_Translate(kREG(22), kREG(23), kREG(24), MTXMODE_APPLY); Matrix_Translate(kREG(22), kREG(23), kREG(24), MTXMODE_APPLY);
Matrix_ToMtx(mtx, "../z_demo_ext.c", 476); Matrix_ToMtx(mtx, __FILE__, __LINE__);
Matrix_Pop(); Matrix_Pop();
func_80093D84(gfxCtx); func_80093D84(gfxCtx);
@ -213,7 +213,7 @@ void DemoExt_DrawVortex(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gPhantomWarpDL); gSPDisplayList(POLY_XLU_DISP++, gPhantomWarpDL);
gSPPopMatrix(POLY_XLU_DISP++, G_MTX_MODELVIEW); gSPPopMatrix(POLY_XLU_DISP++, G_MTX_MODELVIEW);
CLOSE_DISPS(gfxCtx, "../z_demo_ext.c", 512); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
static DemoExtDrawFunc sDrawFuncs[] = { static DemoExtDrawFunc sDrawFuncs[] = {

10
soh/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
View file

@ -73,16 +73,16 @@ void DemoGeff_Init(Actor* thisx, GlobalContext* globalCtx) {
void func_80977EA8(GlobalContext* globalCtx, Gfx* dlist) { void func_80977EA8(GlobalContext* globalCtx, Gfx* dlist) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_demo_geff.c", 181); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(gfxCtx); func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_geff.c", 183), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, dlist); gSPDisplayList(POLY_OPA_DISP++, dlist);
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
CLOSE_DISPS(gfxCtx, "../z_demo_geff.c", 188); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) { void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
@ -90,7 +90,7 @@ void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
s32 objBankIndex = this->objBankIndex; s32 objBankIndex = this->objBankIndex;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_demo_geff.c", 204); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment);
gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIndex].segment); gSegments[6] = VIRTUAL_TO_PHYSICAL(globalCtx->objectCtx.status[objBankIndex].segment);
@ -98,7 +98,7 @@ void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
// Necessary to match // Necessary to match
if (!globalCtx) {} if (!globalCtx) {}
CLOSE_DISPS(gfxCtx, "../z_demo_geff.c", 212); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void func_80978030(DemoGeff* this, GlobalContext* globalCtx) { void func_80978030(DemoGeff* this, GlobalContext* globalCtx) {

12
soh/src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View file

@ -270,17 +270,17 @@ void DemoGj_DrawCommon(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList)
if (kREG(0) == 0) { if (kREG(0) == 0) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_demo_gj.c", 1163); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(gfxCtx); func_80093D18(gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gj.c", 1165), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, displayList); gSPDisplayList(POLY_OPA_DISP++, displayList);
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
CLOSE_DISPS(gfxCtx, "../z_demo_gj.c", 1169); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
} }
@ -296,11 +296,11 @@ void DemoGj_DrawRotated(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList
gfxCtx = globalCtx->state.gfxCtx; gfxCtx = globalCtx->state.gfxCtx;
matrix = Graph_Alloc(gfxCtx, sizeof(Mtx)); matrix = Graph_Alloc(gfxCtx, sizeof(Mtx));
OPEN_DISPS(gfxCtx, "../z_demo_gj.c", 1187); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
Matrix_RotateZYX(x, y, z, MTXMODE_APPLY); Matrix_RotateZYX(x, y, z, MTXMODE_APPLY);
Matrix_ToMtx(matrix, "../z_demo_gj.c", 1193); Matrix_ToMtx(matrix, __FILE__, __LINE__);
Matrix_Pop(); Matrix_Pop();
func_80093D18(gfxCtx); func_80093D18(gfxCtx);
@ -309,7 +309,7 @@ void DemoGj_DrawRotated(DemoGj* this, GlobalContext* globalCtx, Gfx* displayList
gSPDisplayList(POLY_OPA_DISP++, displayList); gSPDisplayList(POLY_OPA_DISP++, displayList);
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW); gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
CLOSE_DISPS(gfxCtx, "../z_demo_gj.c", 1201); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void DemoGj_SetupRotation(DemoGj* this, GlobalContext* globalCtx) { void DemoGj_SetupRotation(DemoGj* this, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Demo_Go/z_demo_go.c
View file

@ -331,7 +331,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) {
void* eyeTexture = sEyeTextures[eyeTexIdx]; void* eyeTexture = sEyeTextures[eyeTexIdx];
void* mouthTexture = gGoronCsMouthSmileTex; void* mouthTexture = gGoronCsMouthSmileTex;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_go.c", 732); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture)); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTexture));
@ -340,7 +340,7 @@ void func_8097D29C(DemoGo* this, GlobalContext* globalCtx) {
SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL, SkelAnime_DrawFlexOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, NULL, NULL,
this); this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_go.c", 746); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoGo_Draw(Actor* thisx, GlobalContext* globalCtx) { void DemoGo_Draw(Actor* thisx, GlobalContext* globalCtx) {

6
soh/src/overlays/actors/ovl_Demo_Gt/z_demo_gt.c
View file

@ -650,7 +650,7 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) {
spB4 = Graph_Alloc(gfxCtx, sizeof(Mtx)); spB4 = Graph_Alloc(gfxCtx, sizeof(Mtx));
sp98 = 1.0f - Math_CosS(spC6); sp98 = 1.0f - Math_CosS(spC6);
OPEN_DISPS(gfxCtx, "../z_demo_gt_part1.c", 458); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
spA8.x = Math_CosS(spB8); spA8.x = Math_CosS(spB8);
spA8.y = 0.0f; spA8.y = 0.0f;
@ -663,7 +663,7 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) {
Matrix_RotateAxis(spC0, &spA8, MTXMODE_APPLY); Matrix_RotateAxis(spC0, &spA8, MTXMODE_APPLY);
Matrix_Translate(sp9C.x, sp9C.y, sp9C.z, MTXMODE_APPLY); Matrix_Translate(sp9C.x, sp9C.y, sp9C.z, MTXMODE_APPLY);
Matrix_ToMtx(spB4, "../z_demo_gt_part1.c", 474); Matrix_ToMtx(spB4, __FILE__, __LINE__);
unk198 = this->unk_198; unk198 = this->unk_198;
unk188 = this->unk_188; unk188 = this->unk_188;
unk178 = this->unk_178; unk178 = this->unk_178;
@ -688,7 +688,7 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) {
gSPMatrix(POLY_XLU_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); gSPMatrix(POLY_XLU_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gTowerCollapseCsFlameSmokeDL); gSPDisplayList(POLY_XLU_DISP++, gTowerCollapseCsFlameSmokeDL);
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part1.c", 557); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void func_8097F904_Init1(DemoGt* this, GlobalContext* globalCtx) { void func_8097F904_Init1(DemoGt* this, GlobalContext* globalCtx) {

12
soh/src/overlays/actors/ovl_Demo_Ik/z_demo_ik.c
View file

@ -259,22 +259,22 @@ void DemoIk_Type1PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLi
DemoIk* this = (DemoIk*)thisx; DemoIk* this = (DemoIk*)thisx;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 385); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (limbIndex == 1) { if (limbIndex == 1) {
switch (this->actor.params) { switch (this->actor.params) {
case 0: case 0:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 390), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016BE0);
break; break;
case 2: case 2:
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_ik_inArmer.c", 396), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88); gSPDisplayList(POLY_XLU_DISP++, object_ik_DL_016F88);
break; break;
} }
} }
CLOSE_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 404); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx) { void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx) {
@ -282,7 +282,7 @@ void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 422); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_8002EBCC(&this->actor, globalCtx, 0); func_8002EBCC(&this->actor, globalCtx, 0);
func_80093D18(gfxCtx); func_80093D18(gfxCtx);
func_80093D84(gfxCtx); func_80093D84(gfxCtx);
@ -290,7 +290,7 @@ void DemoIk_Type1Draw(DemoIk* this, GlobalContext* globalCtx) {
gSPSegment(POLY_OPA_DISP++, 0x09, DemoIk_SetColors(gfxCtx, 255, 40, 0, 40, 0, 0)); gSPSegment(POLY_OPA_DISP++, 0x09, DemoIk_SetColors(gfxCtx, 255, 40, 0, 40, 0, 0));
gSPSegment(POLY_OPA_DISP++, 0x0A, DemoIk_SetColors(gfxCtx, 255, 255, 255, 20, 40, 30)); gSPSegment(POLY_OPA_DISP++, 0x0A, DemoIk_SetColors(gfxCtx, 255, 255, 255, 20, 40, 30));
SkelAnime_DrawOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, NULL, DemoIk_Type1PostLimbDraw, this); SkelAnime_DrawOpa(globalCtx, skelAnime->skeleton, skelAnime->jointTable, NULL, DemoIk_Type1PostLimbDraw, this);
CLOSE_DISPS(gfxCtx, "../z_demo_ik_inArmer.c", 444); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void DemoIk_Type2Init(DemoIk* this, GlobalContext* globalCtx) { void DemoIk_Type2Init(DemoIk* this, GlobalContext* globalCtx) {

4
soh/src/overlays/actors/ovl_Demo_Im/z_demo_im.c
View file

@ -524,7 +524,7 @@ void DemoIm_DrawTranslucent(DemoIm* this, GlobalContext* globalCtx) {
void* eyeTex = sEyeTextures[eyeIndex]; void* eyeTex = sEyeTextures[eyeIndex];
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_im_inKenjyanomaDemo02.c", 281); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -536,7 +536,7 @@ void DemoIm_DrawTranslucent(DemoIm* this, GlobalContext* globalCtx) {
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
NULL, NULL, NULL, POLY_XLU_DISP); NULL, NULL, NULL, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_im_inKenjyanomaDemo02.c", 308); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_80985E60(DemoIm* this, GlobalContext* globalCtx) { void func_80985E60(DemoIm* this, GlobalContext* globalCtx) {

46
soh/src/overlays/actors/ovl_Demo_Kankyo/z_demo_kankyo.c
View file

@ -186,7 +186,7 @@ void DemoKankyo_Init(Actor* thisx, GlobalContext* globalCtx) {
osSyncPrintf("bank_ID = %d\n", objBankIndex); osSyncPrintf("bank_ID = %d\n", objBankIndex);
if (objBankIndex < 0) { if (objBankIndex < 0) {
ASSERT(0, "0", "../z_demo_kankyo.c", 521); ASSERT(0, "0", __FILE__, __LINE__);
} else { } else {
this->objBankIndex = objBankIndex; this->objBankIndex = objBankIndex;
} }
@ -522,7 +522,7 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) {
f32 translateZ; f32 translateZ;
s16 j; s16 j;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1186); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
for (i = 0; i < 30; i++) { for (i = 0; i < 30; i++) {
s32 pad[2]; s32 pad[2];
@ -619,20 +619,20 @@ void DemoKankyo_DrawRain(Actor* thisx, GlobalContext* globalCtx) {
} }
Matrix_Translate(translateX, translateY, translateZ, MTXMODE_APPLY); Matrix_Translate(translateX, translateY, translateZ, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1344), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14); POLY_XLU_DISP = Gfx_CallSetupDL(POLY_XLU_DISP, 0x14);
gSPDisplayList(POLY_XLU_DISP++, object_efc_star_field_DL_000080); gSPDisplayList(POLY_XLU_DISP++, object_efc_star_field_DL_000080);
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1358); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) { void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) {
DemoKankyo* this = (DemoKankyo*)thisx; DemoKankyo* this = (DemoKankyo*)thisx;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1376); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW);
@ -642,11 +642,11 @@ void DemoKankyo_DrawRock(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY); Matrix_Scale(this->actor.scale.x, this->actor.scale.y, this->actor.scale.z, MTXMODE_APPLY);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255);
gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1404), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0); gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1409); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) { void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) {
@ -657,7 +657,7 @@ void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) {
f32 dy; f32 dy;
f32 dz; f32 dz;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1425); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
for (i = 0; i < 30; i++) { for (i = 0; i < 30; i++) {
dx = -(Math_SinS(this->unk_150[i].unk_20 - 0x8000) * 120.0f) * (30.0f + (i / 30.0f) * 10.0f); dx = -(Math_SinS(this->unk_150[i].unk_20 - 0x8000) * 120.0f) * (30.0f + (i / 30.0f) * 10.0f);
@ -673,7 +673,7 @@ void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 255); gDPSetEnvColor(POLY_XLU_DISP++, 255, 255, 255, 255);
gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE); gDPSetColorDither(POLY_XLU_DISP++, G_CD_DISABLE);
gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ); gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1461), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust5Tex)); gSPSegment(POLY_XLU_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(gDust5Tex));
@ -683,45 +683,45 @@ void DemoKankyo_DrawClouds(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, gEffDustDL); gSPDisplayList(POLY_XLU_DISP++, gEffDustDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1474); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx) { void DemoKankyo_DrawDoorOfTime(Actor* thisx, GlobalContext* globalCtx) {
DemoKankyo* this = (DemoKankyo*)thisx; DemoKankyo* this = (DemoKankyo*)thisx;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1487); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
Matrix_Translate(-this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(-this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1492), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007440); gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007440);
Matrix_Translate(this->unk_150[0].unk_18 + this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(this->unk_150[0].unk_18 + this->unk_150[0].unk_18, 0.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1497), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007578); gSPDisplayList(POLY_OPA_DISP++, object_toki_objects_DL_007578);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1501); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx) { void DemoKankyo_DrawLightPlane(Actor* thisx, GlobalContext* globalCtx) {
DemoKankyo* this = (DemoKankyo*)thisx; DemoKankyo* this = (DemoKankyo*)thisx;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1514); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (globalCtx->csCtx.state == CS_STATE_IDLE || gSaveContext.sceneSetupIndex >= 4) { if (globalCtx->csCtx.state == CS_STATE_IDLE || gSaveContext.sceneSetupIndex >= 4) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames & 0x7F, 64, 32)); Gfx_TexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames & 0x7F, 64, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1529), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_008390); gSPDisplayList(POLY_XLU_DISP++, object_toki_objects_DL_008390);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1534); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoKankyo_Vec3fCopy(Vec3f* src, Vec3f* dst) { void DemoKankyo_Vec3fCopy(Vec3f* src, Vec3f* dst) {
@ -772,7 +772,7 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) {
PosRot posRot; PosRot posRot;
u8 linkAge = gSaveContext.linkAge; u8 linkAge = gSaveContext.linkAge;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 1824); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->sparkleCounter < 30) { if (this->sparkleCounter < 30) {
this->sparkleCounter += 2; this->sparkleCounter += 2;
@ -879,14 +879,14 @@ void DemoKankyo_DrawWarpSparkles(Actor* thisx, GlobalContext* globalCtx) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY); Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2011), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, disp); gSPDisplayList(POLY_XLU_DISP++, disp);
this->unk_150[i].unk_24 += 0x190; this->unk_150[i].unk_24 += 0x190;
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2019); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) { void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) {
@ -908,7 +908,7 @@ void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) {
s16 i; s16 i;
PosRot posRot; PosRot posRot;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2434); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->sparkleCounter < 20) { if (this->sparkleCounter < 20) {
this->sparkleCounter++; this->sparkleCounter++;
@ -981,12 +981,12 @@ void DemoKankyo_DrawSparkles(Actor* thisx, GlobalContext* globalCtx) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY); Matrix_RotateZ(DEG_TO_RAD(this->unk_150[i].unk_24), MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2572), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL); gSPDisplayList(POLY_XLU_DISP++, gEffFlash1DL);
this->unk_150[i].unk_24 += 0x190; this->unk_150[i].unk_24 += 0x190;
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kankyo.c", 2579); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

16
soh/src/overlays/actors/ovl_Demo_Kekkai/z_demo_kekkai.c
View file

@ -253,7 +253,7 @@ void DemoKekkai_TrialBarrierIdle(Actor* thisx, GlobalContext* globalCtx) {
if (this->collider2.base.acFlags & AC_HIT) { if (this->collider2.base.acFlags & AC_HIT) {
func_80078884(NA_SE_SY_CORRECT_CHIME); func_80078884(NA_SE_SY_CORRECT_CHIME);
// "I got it" // "I got it"
LOG_STRING("当ったよ", "../z_demo_kekkai.c", 572); LOG_STRING("当ったよ", __FILE__, __LINE__);
this->actor.update = DemoKekkai_TrialBarrierDispel; this->actor.update = DemoKekkai_TrialBarrierDispel;
this->timer = 0; this->timer = 0;
globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(sSageCutscenes[this->actor.params]); globalCtx->csCtx.segment = SEGMENTED_TO_VIRTUAL(sSageCutscenes[this->actor.params]);
@ -286,20 +286,20 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, GlobalContext* globalCtx2) {
energyVtx[i].v.cn[3] = alphas[alphaIndex[i]]; energyVtx[i].v.cn[3] = alphas[alphaIndex[i]];
} }
colorIndex = (this->actor.params - 1) * 6; colorIndex = (this->actor.params - 1) * 6;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 632); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
Matrix_Push(); Matrix_Push();
Matrix_Translate(0.0f, 1200.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 1200.0f, 0.0f, MTXMODE_APPLY);
Matrix_Scale(this->orbScale, this->orbScale, this->orbScale, MTXMODE_APPLY); Matrix_Scale(this->orbScale, this->orbScale, this->orbScale, MTXMODE_APPLY);
Matrix_Translate(0.0f, -1200.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, -1200.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 639), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x09, gSPSegment(POLY_XLU_DISP++, 0x09,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5,
frames * -10, 0x20, 0x20)); frames * -10, 0x20, 0x20));
gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierOrbDL); gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierOrbDL);
Matrix_Pop(); Matrix_Pop();
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 656), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 50, 0, 100, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 50, 0, 100, 255);
@ -315,7 +315,7 @@ void DemoKekkai_DrawTrialBarrier(Actor* thisx, GlobalContext* globalCtx2) {
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, frames * 5, frames * -10, 0x20, 0x20, 1, frames * 5,
frames * -10, 0x20, 0x40)); frames * -10, 0x20, 0x40));
gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierEnergyDL); gSPDisplayList(POLY_XLU_DISP++, gTrialBarrierEnergyDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 696); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
@ -325,16 +325,16 @@ void DemoKekkai_DrawTowerBarrier(Actor* thisx, GlobalContext* globalCtx) {
s32 scroll; s32 scroll;
scroll = (s32)this->barrierScroll & 0xFFFF; scroll = (s32)this->barrierScroll & 0xFFFF;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 705); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 707), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 255, 170, 255, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x80, 255, 170, 255, 255);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * -4, 0x20, 0x40, 1, scroll * 2, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, scroll * 2, scroll * -4, 0x20, 0x40, 1, scroll * 2,
scroll * -4, 0x20, 0x40)); scroll * -4, 0x20, 0x40));
gSPDisplayList(POLY_XLU_DISP++, gTowerBarrierDL); gSPDisplayList(POLY_XLU_DISP++, gTowerBarrierDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_kekkai.c", 722); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoKekkai_Reset(void) { void DemoKekkai_Reset(void) {

4
soh/src/overlays/actors/ovl_Demo_Sa/z_demo_sa.c
View file

@ -464,7 +464,7 @@ void DemoSa_DrawXlu(DemoSa* this, GlobalContext* globalCtx) {
void* sp6C = sMouthTextures[mouthIndex]; void* sp6C = sMouthTextures[mouthIndex];
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_sa_inKenjyanomaDemo02.c", 296); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -477,7 +477,7 @@ void DemoSa_DrawXlu(DemoSa* this, GlobalContext* globalCtx) {
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount, POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, skelAnime->skeleton, skelAnime->jointTable, skelAnime->dListCount,
NULL, NULL, NULL, POLY_XLU_DISP); NULL, NULL, NULL, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_sa_inKenjyanomaDemo02.c", 325); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void func_8098F390(DemoSa* this, GlobalContext* globalCtx) { void func_8098F390(DemoSa* this, GlobalContext* globalCtx) {

6
soh/src/overlays/actors/ovl_Demo_Shd/z_demo_shd.c
View file

@ -104,11 +104,11 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (1) {} // Necessary to match, can be anywhere in the function if (1) {} // Necessary to match, can be anywhere in the function
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_shd.c", 726); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_demo_shd.c", 729), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_809932D0); gSPDisplayList(POLY_XLU_DISP++, D_809932D0);
@ -122,5 +122,5 @@ void DemoShd_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPDisplayList(POLY_XLU_DISP++, D_809934B8); gSPDisplayList(POLY_XLU_DISP++, D_809934B8);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_shd.c", 762); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

10
soh/src/overlays/actors/ovl_Demo_Tre_Lgt/z_demo_tre_lgt.c
View file

@ -54,7 +54,7 @@ void DemoTreLgt_Init(Actor* thisx, GlobalContext* globalCtx) {
osSyncPrintf("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n"); osSyncPrintf("Demo_Tre_Lgt_Actor_ct();コンストラクト失敗\n");
} }
ASSERT(true, "1", "../z_demo_tre_lgt.c", UNK_LINE); ASSERT(true, "1", __FILE__, UNK_LINE);
this->unk_170 = 255; this->unk_170 = 255;
this->unk_174 = 255; this->unk_174 = 255;
@ -136,7 +136,7 @@ s32 DemoTreLgt_PostLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve,
s32 pad; s32 pad;
DemoTreLgt* this = (DemoTreLgt*)thisx; DemoTreLgt* this = (DemoTreLgt*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_demo_tre_lgt.c", 423); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (globalCtx->state.frames * 2) % 256, 0, 64, 32, 1, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (globalCtx->state.frames * 2) % 256, 0, 64, 32, 1,
(globalCtx->state.frames * -2) % 256, 0, 64, 32)); (globalCtx->state.frames * -2) % 256, 0, 64, 32));
@ -147,14 +147,14 @@ s32 DemoTreLgt_PostLimbDraw(GlobalContext* globalCtx, SkelAnimeCurve* skelCurve,
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 180, this->unk_174); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 180, this->unk_174);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_tre_lgt.c", 448); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx) { void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
DemoTreLgt* this = (DemoTreLgt*)thisx; DemoTreLgt* this = (DemoTreLgt*)thisx;
OPEN_DISPS(gfxCtx, "../z_demo_tre_lgt.c", 461); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
if (this->action != DEMO_TRE_LGT_ACTION_ANIMATE) { if (this->action != DEMO_TRE_LGT_ACTION_ANIMATE) {
return; return;
@ -164,5 +164,5 @@ void DemoTreLgt_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, 200, 255, 0, 0); gDPSetEnvColor(POLY_XLU_DISP++, 200, 255, 0, 0);
SkelCurve_Draw(&this->actor, globalCtx, &this->skelCurve, DemoTreLgt_PostLimbDraw, NULL, 1, thisx); SkelCurve_Draw(&this->actor, globalCtx, &this->skelCurve, DemoTreLgt_PostLimbDraw, NULL, 1, thisx);
CLOSE_DISPS(gfxCtx, "../z_demo_tre_lgt.c", 476); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_Door_Ana/z_door_ana.c
View file

@ -174,12 +174,12 @@ void DoorAna_Update(Actor* thisx, GlobalContext* globalCtx) {
} }
void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx) { void DoorAna_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_ana.c", 440); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_ana.c", 446), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gGrottoDL); gSPDisplayList(POLY_XLU_DISP++, gGrottoDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_ana.c", 449); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_Door_Gerudo/z_door_gerudo.c
View file

@ -144,11 +144,11 @@ void DoorGerudo_Update(Actor* thisx, GlobalContext* globalCtx) {
void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) { void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) {
DoorGerudo* this = (DoorGerudo*)thisx; DoorGerudo* this = (DoorGerudo*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 361); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 365), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gGerudoCellDoorDL); gSPDisplayList(POLY_OPA_DISP++, gGerudoCellDoorDL);
@ -157,5 +157,5 @@ void DoorGerudo_Draw(Actor* thisx, GlobalContext* globalCtx) {
Actor_DrawDoorLock(globalCtx, this->unk_166, DOORLOCK_NORMAL); Actor_DrawDoorLock(globalCtx, this->unk_166, DOORLOCK_NORMAL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_gerudo.c", 377); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_Door_Killer/z_door_killer.c
View file

@ -498,9 +498,9 @@ void DoorKiller_SetTexture(Actor* thisx, GlobalContext* globalCtx) {
DoorKiller* this = (DoorKiller*)thisx; DoorKiller* this = (DoorKiller*)thisx;
void* doorTexture = this->texture; void* doorTexture = this->texture;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_killer.c", 883); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x08, doorTexture); gSPSegment(POLY_OPA_DISP++, 0x08, doorTexture);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_killer.c", 885); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DoorKiller_DrawDoor(Actor* thisx, GlobalContext* globalCtx) { void DoorKiller_DrawDoor(Actor* thisx, GlobalContext* globalCtx) {

12
soh/src/overlays/actors/ovl_Door_Shutter/z_door_shutter.c
View file

@ -661,7 +661,7 @@ Gfx* func_80997838(GlobalContext* globalCtx, DoorShutter* this, Gfx* p) {
if (this->unk_166 != 100) { if (this->unk_166 != 100) {
Matrix_Scale(1.0f, yScale, 1.0f, MTXMODE_APPLY); Matrix_Scale(1.0f, yScale, 1.0f, MTXMODE_APPLY);
} }
gSPMatrix(p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 1991), gSPMatrix(p++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(p++, sJabuDoorDLists[i]); gSPDisplayList(p++, sJabuDoorDLists[i]);
angle -= M_PI / 4; angle -= M_PI / 4;
@ -707,7 +707,7 @@ void DoorShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad[2]; s32 pad[2];
ShutterInfo* sp70 = &sShutterInfo[this->unk_16C]; ShutterInfo* sp70 = &sShutterInfo[this->unk_16C];
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_shutter.c", 2048); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -720,7 +720,7 @@ void DoorShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255.0f * sp58); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255.0f * sp58);
Matrix_Translate(0, 0, sp70->translateZ, MTXMODE_APPLY); Matrix_Translate(0, 0, sp70->translateZ, MTXMODE_APPLY);
Matrix_Scale(sp58, sp58, sp58, MTXMODE_APPLY); Matrix_Scale(sp58, sp58, sp58, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 2069), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sp70->b); gSPDisplayList(POLY_OPA_DISP++, sp70->b);
} }
@ -742,12 +742,12 @@ void DoorShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else if (this->doorType == SHUTTER_BOSS) { } else if (this->doorType == SHUTTER_BOSS) {
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809982D4[this->unk_168])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(D_809982D4[this->unk_168]));
} }
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 2109), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sp70->a); gSPDisplayList(POLY_OPA_DISP++, sp70->a);
if (this->unk_170 != 0.0f && sp70->b != NULL) { if (this->unk_170 != 0.0f && sp70->b != NULL) {
Matrix_Translate(0, sp70->c * (1.0f - this->unk_170), sp70->translateZ, MTXMODE_APPLY); Matrix_Translate(0, sp70->c * (1.0f - this->unk_170), sp70->translateZ, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_shutter.c", 2119), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, sp70->b); gSPDisplayList(POLY_OPA_DISP++, sp70->b);
} }
@ -761,7 +761,7 @@ void DoorShutter_Draw(Actor* thisx, GlobalContext* globalCtx) {
: ((this->unk_16C == 6) ? DOORLOCK_NORMAL_SPIRIT : DOORLOCK_NORMAL)); : ((this->unk_16C == 6) ? DOORLOCK_NORMAL_SPIRIT : DOORLOCK_NORMAL));
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_shutter.c", 2135); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }

18
soh/src/overlays/actors/ovl_Door_Warp1/z_door_warp1.c
View file

@ -881,7 +881,7 @@ void DoorWarp1_Update(Actor* thisx, GlobalContext* globalCtx) {
void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, GlobalContext* globalCtx) { void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, GlobalContext* globalCtx) {
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2078); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -891,7 +891,7 @@ void DoorWarp1_DrawBlueCrystal(DoorWarp1* this, GlobalContext* globalCtx) {
POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL, POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL,
&this->actor, POLY_XLU_DISP); &this->actor, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2098); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
SkelAnime_Update(&this->skelAnime); SkelAnime_Update(&this->skelAnime);
} }
@ -904,7 +904,7 @@ void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, GlobalContext* globalCtx) {
eye.y = (Math_CosS(globalCtx->state.frames * 200) * 120.0f) * 80.0f; eye.y = (Math_CosS(globalCtx->state.frames * 200) * 120.0f) * 80.0f;
eye.z = (Math_CosS(globalCtx->state.frames * 200) * 120.0f) * 80.0f; eye.z = (Math_CosS(globalCtx->state.frames * 200) * 120.0f) * 80.0f;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2122); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
func_8002EB44(&this->actor.world.pos, &eye, &eye, globalCtx->state.gfxCtx); func_8002EB44(&this->actor.world.pos, &eye, &eye, globalCtx->state.gfxCtx);
@ -915,7 +915,7 @@ void DoorWarp1_DrawPurpleCrystal(DoorWarp1* this, GlobalContext* globalCtx) {
POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL, POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, NULL,
&this->actor, POLY_XLU_DISP); &this->actor, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2152); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
SkelAnime_Update(&this->skelAnime); SkelAnime_Update(&this->skelAnime);
} }
@ -929,7 +929,7 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) {
f32 xzScale; f32 xzScale;
f32 temp_f0; f32 temp_f0;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2173); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
temp_f0 = 1.0f - (2.0f - this->unk_194) / 1.7f; temp_f0 = 1.0f - (2.0f - this->unk_194) / 1.7f;
if (this->actor.params != WARP_YELLOW && this->actor.params != WARP_DESTINATION && if (this->actor.params != WARP_YELLOW && this->actor.params != WARP_DESTINATION &&
@ -967,7 +967,7 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) {
gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ); gDPSetColorDither(POLY_XLU_DISP++, G_AD_NOTPATTERN | G_CD_MAGICSQ);
Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + 1.0f, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y + 1.0f, this->actor.world.pos.z, MTXMODE_NEW);
gSPSegment(POLY_XLU_DISP++, 0x0A, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2247)); gSPSegment(POLY_XLU_DISP++, 0x0A, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__));
Matrix_Push(); Matrix_Push();
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
@ -978,7 +978,7 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) {
Matrix_Translate(0.0f, this->unk_194 * 230.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, this->unk_194 * 230.0f, 0.0f, MTXMODE_APPLY);
xzScale = (((f32)this->unk_1AE * spE8) / 100.0f) + 1.0f; xzScale = (((f32)this->unk_1AE * spE8) / 100.0f) + 1.0f;
Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY); Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY);
gSPSegment(POLY_XLU_DISP++, 0x09, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2267)); gSPSegment(POLY_XLU_DISP++, 0x09, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__));
gSPDisplayList(POLY_XLU_DISP++, gWarpPortalDL); gSPDisplayList(POLY_XLU_DISP++, gWarpPortalDL);
Matrix_Pop(); Matrix_Pop();
@ -1016,11 +1016,11 @@ void DoorWarp1_DrawWarp(DoorWarp1* this, GlobalContext* globalCtx) {
xzScale = (((f32)this->unk_1B0 * spE4) / 100.0f) + 1.0f; xzScale = (((f32)this->unk_1B0 * spE4) / 100.0f) + 1.0f;
Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY); Matrix_Scale(xzScale, 1.0f, xzScale, MTXMODE_APPLY);
gSPSegment(POLY_XLU_DISP++, 0x09, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2336)); gSPSegment(POLY_XLU_DISP++, 0x09, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__));
gSPDisplayList(POLY_XLU_DISP++, gWarpPortalDL); gSPDisplayList(POLY_XLU_DISP++, gWarpPortalDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_door_warp1.c", 2340); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void DoorWarp1_Draw(Actor* thisx, GlobalContext* globalCtx) { void DoorWarp1_Draw(Actor* thisx, GlobalContext* globalCtx) {

14
soh/src/overlays/actors/ovl_Efc_Erupc/z_efc_erupc.c
View file

@ -115,7 +115,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) {
EfcErupc* this = (EfcErupc*)thisx; EfcErupc* this = (EfcErupc*)thisx;
u16 csAction; u16 csAction;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_efc_erupc.c", 282); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -133,7 +133,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Push(); Matrix_Push();
Matrix_Scale(0.8f, 0.8f, 0.8f, MTXMODE_APPLY); Matrix_Scale(0.8f, 0.8f, 0.8f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_efc_erupc.c", 321), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (globalCtx->csCtx.state != 0) { if (globalCtx->csCtx.state != 0) {
@ -143,7 +143,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
Matrix_Pop(); Matrix_Pop();
Matrix_Scale(3.4f, 3.4f, 3.4f, MTXMODE_APPLY); Matrix_Scale(3.4f, 3.4f, 3.4f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_efc_erupc.c", 333), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (globalCtx->csCtx.state != 0) { if (globalCtx->csCtx.state != 0) {
CsCmdActorAction* csActorAction = globalCtx->csCtx.npcActions[2]; CsCmdActorAction* csActorAction = globalCtx->csCtx.npcActions[2];
@ -156,7 +156,7 @@ void EfcErupc_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_efc_erupc.c", 356); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
EfcErupc_DrawParticles(this->particles, globalCtx); EfcErupc_DrawParticles(this->particles, globalCtx);
} }
@ -165,7 +165,7 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, GlobalContext* globalC
s16 i; s16 i;
s32 pad; s32 pad;
OPEN_DISPS(gfxCtx, "../z_efc_erupc.c", 368); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
for (i = 0; i < EFC_ERUPC_NUM_PARTICLES; i++, particles++) { for (i = 0; i < EFC_ERUPC_NUM_PARTICLES; i++, particles++) {
if (particles->isActive) { if (particles->isActive) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -177,12 +177,12 @@ void EfcErupc_DrawParticles(EfcErupcParticles* particles, GlobalContext* globalC
Matrix_Translate(particles->pos.x, particles->pos.y, particles->pos.z, MTXMODE_NEW); Matrix_Translate(particles->pos.x, particles->pos.y, particles->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(particles->scale, particles->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(particles->scale, particles->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_efc_erupc.c", 393), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_0027D8); gSPDisplayList(POLY_XLU_DISP++, object_efc_erupc_DL_0027D8);
} }
} }
CLOSE_DISPS(gfxCtx, "../z_efc_erupc.c", 399); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
static Color_RGB8 D_8099D770[] = { static Color_RGB8 D_8099D770[] = {

14
soh/src/overlays/actors/ovl_Eff_Dust/z_eff_dust.c
View file

@ -103,7 +103,7 @@ void EffDust_Init(Actor* thisx, GlobalContext* globalCtx) {
this->scalingFactor = 20.0f; this->scalingFactor = 20.0f;
break; break;
default: default:
SystemArena_FreeDebug(this, "../z_eff_dust.c", 202); SystemArena_FreeDebug(this, __FILE__, __LINE__);
break; break;
} }
@ -269,7 +269,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) {
s32 i; s32 i;
f32 aux; f32 aux;
OPEN_DISPS(gfxCtx, "../z_eff_dust.c", 425); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(gfxCtx); func_80093D18(gfxCtx);
@ -293,7 +293,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_Scale(this->scalingFactor, this->scalingFactor, this->scalingFactor, MTXMODE_APPLY); Matrix_Scale(this->scalingFactor, this->scalingFactor, this->scalingFactor, MTXMODE_APPLY);
Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY); Matrix_Mult(&globalCtx->billboardMtxF, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_dust.c", 449), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffSparklesDL)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffSparklesDL));
} }
@ -304,7 +304,7 @@ void EffDust_DrawFunc_8099E4F4(Actor* thisx, GlobalContext* globalCtx2) {
if (0) {} if (0) {}
} }
CLOSE_DISPS(gfxCtx, "../z_eff_dust.c", 458); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) { void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) {
@ -317,7 +317,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) {
f32 aux; f32 aux;
Player* player = GET_PLAYER(globalCtx); Player* player = GET_PLAYER(globalCtx);
OPEN_DISPS(gfxCtx, "../z_eff_dust.c", 472); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(gfxCtx); func_80093D18(gfxCtx);
@ -354,7 +354,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_eff_dust.c", 506), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffSparklesDL)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffSparklesDL));
} }
@ -363,7 +363,7 @@ void EffDust_DrawFunc_8099E784(Actor* thisx, GlobalContext* globalCtx2) {
distanceTraveled++; distanceTraveled++;
} }
CLOSE_DISPS(gfxCtx, "../z_eff_dust.c", 515); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx) { void EffDust_Draw(Actor* thisx, GlobalContext* globalCtx) {

10
soh/src/overlays/actors/ovl_Elf_Msg/z_elf_msg.c
View file

@ -47,14 +47,14 @@ void ElfMsg_SetupAction(ElfMsg* this, ElfMsgActionFunc actionFunc) {
s32 ElfMsg_KillCheck(ElfMsg* this, GlobalContext* globalCtx) { s32 ElfMsg_KillCheck(ElfMsg* this, GlobalContext* globalCtx) {
if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) &&
Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) { Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) {
LOG_STRING("共倒れ", "../z_elf_msg.c", 161); // "Mutual destruction" LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction"
if (((this->actor.params >> 8) & 0x3F) != 0x3F) { if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F);
} }
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return 1; return 1;
} else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) { } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) {
LOG_STRING("共倒れ", "../z_elf_msg.c", 172); // "Mutual destruction" LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction"
if (((this->actor.params >> 8) & 0x3F) != 0x3F) { if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F); Flags_SetSwitch(globalCtx, (this->actor.params >> 8) & 0x3F);
} }
@ -175,7 +175,7 @@ void ElfMsg_Update(Actor* thisx, GlobalContext* globalCtx) {
void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx) void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx)
{ {
#ifdef ZELDA_DEBUG #ifdef ZELDA_DEBUG
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 436); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (R_NAVI_MSG_REGION_ALPHA == 0) { if (R_NAVI_MSG_REGION_ALPHA == 0) {
return; return;
@ -188,7 +188,7 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx)
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, R_NAVI_MSG_REGION_ALPHA); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, R_NAVI_MSG_REGION_ALPHA);
} }
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg.c", 448), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_809AD278); gSPDisplayList(POLY_XLU_DISP++, D_809AD278);
@ -198,6 +198,6 @@ void ElfMsg_Draw(Actor* thisx, GlobalContext* globalCtx)
gSPDisplayList(POLY_XLU_DISP++, sCylinderDL); gSPDisplayList(POLY_XLU_DISP++, sCylinderDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg.c", 457); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
#endif #endif
} }

12
soh/src/overlays/actors/ovl_Elf_Msg2/z_elf_msg2.c
View file

@ -47,14 +47,14 @@ void ElfMsg2_SetupAction(ElfMsg2* this, ElfMsg2ActionFunc actionFunc) {
s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) { s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) {
if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) && if ((this->actor.world.rot.y > 0) && (this->actor.world.rot.y < 0x41) &&
Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) { Flags_GetSwitch(globalCtx, this->actor.world.rot.y - 1)) {
LOG_STRING("共倒れ", "../z_elf_msg2.c", 171); // "Mutual destruction" LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction"
if (((this->actor.params >> 8) & 0x3F) != 0x3F) { if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F));
} }
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return 1; return 1;
} else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) { } else if ((this->actor.world.rot.y == -1) && Flags_GetClear(globalCtx, this->actor.room)) {
LOG_STRING("共倒れ２", "../z_elf_msg2.c", 182); // "Mutual destruction 2" LOG_STRING("共倒れ２", __FILE__, __LINE__); // "Mutual destruction 2"
if (((this->actor.params >> 8) & 0x3F) != 0x3F) { if (((this->actor.params >> 8) & 0x3F) != 0x3F) {
Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F)); Flags_SetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F));
} }
@ -63,7 +63,7 @@ s32 ElfMsg2_KillCheck(ElfMsg2* this, GlobalContext* globalCtx) {
} else if (((this->actor.params >> 8) & 0x3F) == 0x3F) { } else if (((this->actor.params >> 8) & 0x3F) == 0x3F) {
return 0; return 0;
} else if (Flags_GetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F))) { } else if (Flags_GetSwitch(globalCtx, ((this->actor.params >> 8) & 0x3F))) {
LOG_STRING("共倒れ", "../z_elf_msg2.c", 192); // "Mutual destruction" LOG_STRING("共倒れ", __FILE__, __LINE__); // "Mutual destruction"
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return 1; return 1;
} }
@ -154,7 +154,7 @@ void ElfMsg2_Update(Actor* thisx, GlobalContext* globalCtx) {
void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) { void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) {
#if ZELDA_DEBUG #if ZELDA_DEBUG
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 355); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (R_NAVI_MSG_REGION_ALPHA == 0) { if (R_NAVI_MSG_REGION_ALPHA == 0) {
return; return;
@ -162,11 +162,11 @@ void ElfMsg2_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 100, 255, R_NAVI_MSG_REGION_ALPHA); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 100, 100, 255, R_NAVI_MSG_REGION_ALPHA);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 362), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, D_809ADC38); gSPDisplayList(POLY_XLU_DISP++, D_809ADC38);
gSPDisplayList(POLY_XLU_DISP++, sCubeDL); gSPDisplayList(POLY_XLU_DISP++, sCubeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_elf_msg2.c", 367); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
#endif #endif
} }

4
soh/src/overlays/actors/ovl_En_Am/z_en_am.c
View file

@ -946,7 +946,7 @@ void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx) {
Vec3f sp68; Vec3f sp68;
EnAm* this = (EnAm*)thisx; EnAm* this = (EnAm*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_am.c", 1580); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->textureBlend); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->textureBlend);
@ -971,5 +971,5 @@ void EnAm_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_am.c", 1605); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_En_Ani/z_en_ani.c
View file

@ -319,7 +319,7 @@ void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnAni* this = (EnAni*)thisx; EnAni* this = (EnAni*)thisx;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ani.c", 719); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_800943C8(globalCtx->state.gfxCtx); func_800943C8(globalCtx->state.gfxCtx);
@ -328,5 +328,5 @@ void EnAni_Draw(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnAni_OverrideLimbDraw, EnAni_PostLimbDraw, this); EnAni_OverrideLimbDraw, EnAni_PostLimbDraw, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ani.c", 736); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Anubice/z_en_anubice.c
View file

@ -478,14 +478,14 @@ void EnAnubice_PostLimbDraw(struct GlobalContext* globalCtx, s32 limbIndex, Gfx*
Vec3f pos = { 0.0f, 0.0f, 0.0f }; Vec3f pos = { 0.0f, 0.0f, 0.0f };
if (limbIndex == ANUBICE_LIMB_HEAD) { if (limbIndex == ANUBICE_LIMB_HEAD) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_anubice.c", 853); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_anubice.c", 856), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gAnubiceEyesDL); gSPDisplayList(POLY_XLU_DISP++, gAnubiceEyesDL);
Matrix_MultVec3f(&pos, &this->fireballPos); Matrix_MultVec3f(&pos, &this->fireballPos);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_anubice.c", 868); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }

6
soh/src/overlays/actors/ovl_En_Anubice_Fire/z_en_anubice_fire.c
View file

@ -222,7 +222,7 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad[2]; s32 pad[2];
s32 i; s32 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_anubice_fire.c", 503); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 0, 255);
@ -244,7 +244,7 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_RotateZ(this->actor.world.rot.z + i * 1000.0f, MTXMODE_APPLY); Matrix_RotateZ(this->actor.world.rot.z + i * 1000.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_anubice_fire.c", 546), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gAnubiceFireAttackDL); gSPDisplayList(POLY_XLU_DISP++, gAnubiceFireAttackDL);
@ -256,5 +256,5 @@ void EnAnubiceFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
Matrix_Pop(); Matrix_Pop();
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_anubice_fire.c", 556); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

8
soh/src/overlays/actors/ovl_En_Arrow/z_en_arrow.c
View file

@ -131,7 +131,7 @@ void EnArrow_Init(Actor* thisx, GlobalContext* globalCtx) {
} else if (this->actor.params <= ARROW_SEED) { } else if (this->actor.params <= ARROW_SEED) {
this->collider.info.toucher.dmgFlags = dmgFlags[this->actor.params]; this->collider.info.toucher.dmgFlags = dmgFlags[this->actor.params];
LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.info.toucher.dmgFlags, LOG_HEX("this->at_info.cl_elem.at_btl_info.at_type", this->collider.info.toucher.dmgFlags,
"../z_en_arrow.c", 707); __FILE__, __LINE__);
} }
} }
@ -462,7 +462,7 @@ void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx) {
} else if (this->actor.speedXZ != 0.0f) { } else if (this->actor.speedXZ != 0.0f) {
alpha = (Math_CosS(this->timer * 5000) * 127.5f) + 127.5f; alpha = (Math_CosS(this->timer * 5000) * 127.5f) + 127.5f;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1346); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093C14(globalCtx->state.gfxCtx); func_80093C14(globalCtx->state.gfxCtx);
@ -483,13 +483,13 @@ void EnArrow_Draw(Actor* thisx, GlobalContext* globalCtx) {
: ((globalCtx->gameplayFrames & 0xFF) * 4000) * (M_PI / 0x8000), : ((globalCtx->gameplayFrames & 0xFF) * 4000) * (M_PI / 0x8000),
MTXMODE_APPLY); MTXMODE_APPLY);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1374), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffSparklesDL); gSPDisplayList(POLY_XLU_DISP++, gEffSparklesDL);
Matrix_Pop(); Matrix_Pop();
Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_arrow.c", 1381); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
func_809B4800(this, globalCtx); func_809B4800(this, globalCtx);

10
soh/src/overlays/actors/ovl_En_Ba/z_en_ba.c
View file

@ -479,7 +479,7 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) {
Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 14); Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx) * 14);
Vec3f unused = { 0.0f, 0.0f, 448.0f }; Vec3f unused = { 0.0f, 0.0f, 448.0f };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ba.c", 933); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
if (this->actor.params < EN_BA_DEAD_BLOB) { if (this->actor.params < EN_BA_DEAD_BLOB) {
Matrix_Push(); Matrix_Push();
@ -503,10 +503,10 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) {
break; break;
} }
} }
Matrix_ToMtx(mtx, "../z_en_ba.c", 970); Matrix_ToMtx(mtx, __FILE__, __LINE__);
} }
Matrix_Pop(); Matrix_Pop();
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ba.c", 973), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_000890); gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_000890);
} else { } else {
@ -516,9 +516,9 @@ void EnBa_Draw(Actor* thisx, GlobalContext* globalCtx) {
(globalCtx->gameplayFrames * -5) % 128, (globalCtx->gameplayFrames * -5) % 128, 32, (globalCtx->gameplayFrames * -5) % 128, (globalCtx->gameplayFrames * -5) % 128, 32,
32)); 32));
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 125, 100, 255); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 125, 100, 255);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ba.c", 991), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_001D80); gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_001D80);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ba.c", 995); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Bb/z_en_bb.c
View file

@ -1280,7 +1280,7 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) {
Vec3f blureVtx1; Vec3f blureVtx1;
Vec3f blureVtx2; Vec3f blureVtx2;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bb.c", 2044); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
blureBase1.z = this->maxSpeed * 80.0f; blureBase1.z = this->maxSpeed * 80.0f;
blureBase2.z = this->maxSpeed * 80.0f; blureBase2.z = this->maxSpeed * 80.0f;
@ -1334,7 +1334,7 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) {
(M_PI / 0x8000), (M_PI / 0x8000),
MTXMODE_APPLY); MTXMODE_APPLY);
Matrix_Scale(this->flameScaleX * 0.01f, this->flameScaleY * 0.01f, 1.0f, MTXMODE_APPLY); Matrix_Scale(this->flameScaleX * 0.01f, this->flameScaleY * 0.01f, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bb.c", 2106), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
} else { } else {
@ -1348,5 +1348,5 @@ void EnBb_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bb.c", 2127); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Bdfire/z_en_bdfire.c
View file

@ -204,7 +204,7 @@ void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx) {
s16 temp; s16 temp;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bdfire.c", 612); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
temp = this->unk_156 & 7; temp = this->unk_156 & 7;
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
func_80094BC4(globalCtx->state.gfxCtx); func_80094BC4(globalCtx->state.gfxCtx);
@ -217,10 +217,10 @@ void EnBdfire_DrawFire(EnBdfire* this, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 0); gDPSetEnvColor(POLY_XLU_DISP++, 200, 0, 0, 0);
gSPSegment(POLY_XLU_DISP++, 8, SEGMENTED_TO_VIRTUAL(D_809BCB10[temp])); gSPSegment(POLY_XLU_DISP++, 8, SEGMENTED_TO_VIRTUAL(D_809BCB10[temp]));
Matrix_Translate(0.0f, 11.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 11.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bdfire.c", 647), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_01D950); gSPDisplayList(POLY_XLU_DISP++, object_kingdodongo_DL_01D950);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bdfire.c", 651); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnBdfire_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnBdfire_Draw(Actor* thisx, GlobalContext* globalCtx) {

12
soh/src/overlays/actors/ovl_En_Bigokuta/z_en_bigokuta.c
View file

@ -817,7 +817,7 @@ s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
if (limbIndex == 15) { if (limbIndex == 15) {
if (this->actionFunc == func_809BE058 || this->actionFunc == func_809BE180) { if (this->actionFunc == func_809BE058 || this->actionFunc == func_809BE180) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1914); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc == func_809BE058) { if (this->actionFunc == func_809BE058) {
temp_hi = this->unk_196 % 12; temp_hi = this->unk_196 % 12;
@ -839,10 +839,10 @@ s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, temp_f0, temp_f0, temp_f0, 255); gDPSetEnvColor(POLY_OPA_DISP++, temp_f0, temp_f0, temp_f0, 255);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1945); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} else if (limbIndex == 10) { } else if (limbIndex == 10) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1950); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc == func_809BE26C) { if (this->actionFunc == func_809BE26C) {
intensity = this->unk_196 * (255.0f / 38); intensity = this->unk_196 * (255.0f / 38);
} else { } else {
@ -851,7 +851,7 @@ s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, intensity, intensity, intensity, intensity); gDPSetEnvColor(POLY_OPA_DISP++, intensity, intensity, intensity, intensity);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 1972); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} else if (limbIndex == 17 && this->actionFunc == func_809BE26C) { } else if (limbIndex == 17 && this->actionFunc == func_809BE26C) {
if (this->unk_198 < 5) { if (this->unk_198 < 5) {
Matrix_Scale((this->unk_198 * 0.2f * 0.25f) + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_Scale((this->unk_198 * 0.2f * 0.25f) + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
@ -869,7 +869,7 @@ s32 EnBigokuta_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBigokuta* this = (EnBigokuta*)thisx; EnBigokuta* this = (EnBigokuta*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 2017); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if ((this->actionFunc != func_809BE26C) || (this->unk_196 != 0) || (this->unk_198 != 0)) { if ((this->actionFunc != func_809BE26C) || (this->unk_196 != 0) || (this->unk_198 != 0)) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -897,5 +897,5 @@ void EnBigokuta_Draw(Actor* thisx, GlobalContext* globalCtx) {
POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, POLY_XLU_DISP = SkelAnime_DrawFlex(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, NULL, NULL, NULL, POLY_XLU_DISP); this->skelAnime.dListCount, NULL, NULL, NULL, POLY_XLU_DISP);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bigokuta.c", 2076); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_En_Bili/z_en_bili.c
View file

@ -751,7 +751,7 @@ static void* sTentaclesTextures[] = {
void EnBili_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnBili_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBili* this = (EnBili*)thisx; EnBili* this = (EnBili*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bili.c", 1521); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
this->tentaclesTexIndex = CLAMP_MAX(this->tentaclesTexIndex, 7); this->tentaclesTexIndex = CLAMP_MAX(this->tentaclesTexIndex, 7);
@ -766,5 +766,5 @@ void EnBili_Draw(Actor* thisx, GlobalContext* globalCtx) {
POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
EnBili_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); EnBili_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bili.c", 1552); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

10
soh/src/overlays/actors/ovl_En_Blkobj/z_en_blkobj.c
View file

@ -131,7 +131,7 @@ void EnBlkobj_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnBlkobj_DrawAlpha(GlobalContext* globalCtx, Gfx* dList, s32 alpha) { void EnBlkobj_DrawAlpha(GlobalContext* globalCtx, Gfx* dList, s32 alpha) {
Gfx* segment; Gfx* segment;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 322); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (alpha == 255) { if (alpha == 255) {
segment = sSetupOpaDL; segment = sSetupOpaDL;
@ -143,7 +143,7 @@ void EnBlkobj_DrawAlpha(GlobalContext* globalCtx, Gfx* dList, s32 alpha) {
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, alpha); gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, alpha);
gSPDisplayList(POLY_XLU_DISP++, dList); gSPDisplayList(POLY_XLU_DISP++, dList);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 330); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) {
@ -152,7 +152,7 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 illusionAlpha; s32 illusionAlpha;
u32 gameplayFrames; u32 gameplayFrames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 349); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -160,7 +160,7 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(POLY_XLU_DISP++, 0x0D, gSPSegment(POLY_XLU_DISP++, 0x0D,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames, 0, 32, 32, 1, gameplayFrames, 0, 32, 32)); Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, gameplayFrames, 0, 32, 32, 1, gameplayFrames, 0, 32, 32));
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 363), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->alpha != 0) { if (this->alpha != 0) {
@ -171,5 +171,5 @@ void EnBlkobj_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBlkobj_DrawAlpha(globalCtx, gIllusionRoomIllusionDL, illusionAlpha); EnBlkobj_DrawAlpha(globalCtx, gIllusionRoomIllusionDL, illusionAlpha);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_blkobj.c", 375); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

8
soh/src/overlays/actors/ovl_En_Bom/z_en_bom.c
View file

@ -362,18 +362,18 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (1) {} if (1) {}
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bom.c", 913); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (thisx->params == BOMB_BODY) { if (thisx->params == BOMB_BODY) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
func_8002EBCC(thisx, globalCtx, 0); func_8002EBCC(thisx, globalCtx, 0);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 928), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gBombCapDL); gSPDisplayList(POLY_OPA_DISP++, gBombCapDL);
Matrix_RotateZYX(0x4000, 0, 0, MTXMODE_APPLY); Matrix_RotateZYX(0x4000, 0, 0, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom.c", 934), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 0, 40, 255); gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 0, 40, 255);
@ -382,5 +382,5 @@ void EnBom_Draw(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateSpheres(0, &this->explosionCollider); Collider_UpdateSpheres(0, &this->explosionCollider);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bom.c", 951); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_En_Bom_Bowl_Man/z_en_bom_bowl_man.c
View file

@ -526,12 +526,12 @@ void EnBomBowlMan_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* eyeTextures[] = { gChuGirlEyeOpenTex, gChuGirlEyeHalfTex, gChuGirlEyeClosedTex }; static void* eyeTextures[] = { gChuGirlEyeOpenTex, gChuGirlEyeHalfTex, gChuGirlEyeClosedTex };
EnBomBowlMan* this = (EnBomBowlMan*)thisx; EnBomBowlMan* this = (EnBomBowlMan*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bom_bowl_man.c", 907); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTextureIndex])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTextureIndex]));
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnBomBowlMan_OverrideLimbDraw, NULL, this); EnBomBowlMan_OverrideLimbDraw, NULL, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bom_bowl_man.c", 923); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Bom_Chu/z_en_bom_chu.c
View file

@ -484,7 +484,7 @@ void EnBomChu_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 blinkHalfPeriod; s32 blinkHalfPeriod;
s32 blinkTime; s32 blinkTime;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bom_chu.c", 921); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(&this->actor, globalCtx, 0); func_8002EBCC(&this->actor, globalCtx, 0);
@ -509,9 +509,9 @@ void EnBomChu_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetEnvColor(POLY_OPA_DISP++, 9.0f + (colorIntensity * 209.0f), 9.0f + (colorIntensity * 34.0f), gDPSetEnvColor(POLY_OPA_DISP++, 9.0f + (colorIntensity * 209.0f), 9.0f + (colorIntensity * 34.0f),
35.0f + (colorIntensity * -35.0f), 255); 35.0f + (colorIntensity * -35.0f), 255);
Matrix_Translate(this->visualJitter * (1.0f / BOMBCHU_SCALE), 0.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(this->visualJitter * (1.0f / BOMBCHU_SCALE), 0.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bom_chu.c", 956), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gBombchuDL); gSPDisplayList(POLY_OPA_DISP++, gBombchuDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bom_chu.c", 961); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

10
soh/src/overlays/actors/ovl_En_Bombf/z_en_bombf.c
View file

@ -472,7 +472,7 @@ Gfx* EnBombf_NewMtxDList(GraphicsContext* gfxCtx, GlobalContext* globalCtx) {
displayList = Graph_Alloc(gfxCtx, 5 * sizeof(Gfx)); displayList = Graph_Alloc(gfxCtx, 5 * sizeof(Gfx));
displayListHead = displayList; displayListHead = displayList;
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(displayListHead++, Matrix_NewMtx(gfxCtx, "../z_en_bombf.c", 1021), gSPMatrix(displayListHead++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPEndDisplayList(displayListHead); gSPEndDisplayList(displayListHead);
return displayList; return displayList;
@ -484,13 +484,13 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (1) {} if (1) {}
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1034); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (thisx->params <= BOMBFLOWER_BODY) { if (thisx->params <= BOMBFLOWER_BODY) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
if (thisx->params != BOMBFLOWER_BODY) { if (thisx->params != BOMBFLOWER_BODY) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1041), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gBombFlowerLeavesDL); gSPDisplayList(POLY_OPA_DISP++, gBombFlowerLeavesDL);
gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBaseLeavesDL); gSPDisplayList(POLY_OPA_DISP++, gBombFlowerBaseLeavesDL);
@ -502,7 +502,7 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 200, 255, 200, 255); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 200, 255, 200, 255);
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 20, 10, 0); gDPSetEnvColor(POLY_OPA_DISP++, (s16)this->flashIntensity, 20, 10, 0);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1054), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_OPA_DISP++, 0x08, gSPSegment(POLY_OPA_DISP++, 0x08,
SEGMENTED_TO_VIRTUAL(EnBombf_NewMtxDList(globalCtx->state.gfxCtx, globalCtx))); SEGMENTED_TO_VIRTUAL(EnBombf_NewMtxDList(globalCtx->state.gfxCtx, globalCtx)));
@ -511,5 +511,5 @@ void EnBombf_Draw(Actor* thisx, GlobalContext* globalCtx) {
Collider_UpdateSpheres(0, &this->explosionCollider); Collider_UpdateSpheres(0, &this->explosionCollider);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bombf.c", 1063); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -255,7 +255,7 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) {
Vec3f vec1; Vec3f vec1;
Vec3f vec2; Vec3f vec2;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_boom.c", 567); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateY(this->actor.world.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_RotateZ(0x1F40 * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateZ(0x1F40 * (M_PI / 0x8000), MTXMODE_APPLY);
@ -270,9 +270,9 @@ void EnBoom_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
Matrix_RotateY((this->activeTimer * 12000) * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateY((this->activeTimer * 12000) * (M_PI / 0x8000), MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_boom.c", 601), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gBoomerangRefDL); gSPDisplayList(POLY_OPA_DISP++, gBoomerangRefDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_boom.c", 604); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

14
soh/src/overlays/actors/ovl_En_Box/z_en_box.c
View file

@ -546,7 +546,7 @@ void EnBox_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
s32 pad; s32 pad;
if (limbIndex == 1) { if (limbIndex == 1) {
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_box.c", 1492), gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->type != ENBOX_TYPE_DECORATED_BIG) { if (this->type != ENBOX_TYPE_DECORATED_BIG) {
gSPDisplayList((*gfx)++, gTreasureChestChestFrontDL); gSPDisplayList((*gfx)++, gTreasureChestChestFrontDL);
@ -554,7 +554,7 @@ void EnBox_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Ve
gSPDisplayList((*gfx)++, gTreasureChestBossKeyChestFrontDL); gSPDisplayList((*gfx)++, gTreasureChestBossKeyChestFrontDL);
} }
} else if (limbIndex == 3) { } else if (limbIndex == 3) {
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_box.c", 1502), gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->type != ENBOX_TYPE_DECORATED_BIG) { if (this->type != ENBOX_TYPE_DECORATED_BIG) {
gSPDisplayList((*gfx)++, gTreasureChestChestSideAndLidDL); gSPDisplayList((*gfx)++, gTreasureChestChestSideAndLidDL);
@ -569,7 +569,7 @@ Gfx* EnBox_EmptyDList(GraphicsContext* gfxCtx) {
Gfx* dList; Gfx* dList;
dList = Graph_Alloc(gfxCtx, sizeof(Gfx)); dList = Graph_Alloc(gfxCtx, sizeof(Gfx));
ASSERT(dList != NULL, "gfxp != NULL", "../z_en_box.c", 1528); ASSERT(dList != NULL, "gfxp != NULL", __FILE__, __LINE__);
dListHead = dList; dListHead = dList;
gSPEndDisplayList(dListHead++); gSPEndDisplayList(dListHead++);
@ -583,7 +583,7 @@ Gfx* func_809CA4A0(GraphicsContext* gfxCtx) {
Gfx* dListHead; Gfx* dListHead;
dListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); dListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx));
ASSERT(dListHead != NULL, "gfxp != NULL", "../z_en_box.c", 1546); ASSERT(dListHead != NULL, "gfxp != NULL", __FILE__, __LINE__);
dList = dListHead; dList = dListHead;
gDPSetRenderMode(dListHead++, gDPSetRenderMode(dListHead++,
@ -601,7 +601,7 @@ Gfx* func_809CA518(GraphicsContext* gfxCtx) {
Gfx* dListHead; Gfx* dListHead;
dListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx)); dListHead = Graph_Alloc(gfxCtx, 2 * sizeof(Gfx));
ASSERT(dListHead != NULL, "gfxp != NULL", "../z_en_box.c", 1564); ASSERT(dListHead != NULL, "gfxp != NULL", __FILE__, __LINE__);
dList = dListHead; dList = dListHead;
gDPSetRenderMode(dListHead++, gDPSetRenderMode(dListHead++,
@ -616,7 +616,7 @@ Gfx* func_809CA518(GraphicsContext* gfxCtx) {
void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBox* this = (EnBox*)thisx; EnBox* this = (EnBox*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_box.c", 1581); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
/* /*
this->dyna.actor.flags & ACTOR_FLAG_7 is set by Init (if type is 4 or 6) this->dyna.actor.flags & ACTOR_FLAG_7 is set by Init (if type is 4 or 6)
@ -644,5 +644,5 @@ void EnBox_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBox_PostLimbDraw, this, POLY_XLU_DISP); EnBox_PostLimbDraw, this, POLY_XLU_DISP);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_box.c", 1639); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Bubble/z_en_bubble.c
View file

@ -409,7 +409,7 @@ void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnBubble* this = (EnBubble*)thisx; EnBubble* this = (EnBubble*)thisx;
u32 pad; u32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bubble.c", 1175); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc != EnBubble_Disappear) { if (this->actionFunc != EnBubble_Disappear) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -422,12 +422,12 @@ void EnBubble_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Scale(this->graphicEccentricity + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY); Matrix_Scale(this->graphicEccentricity + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
Matrix_RotateZ((-(f32)globalCtx->state.frames * (M_PI / 180.0f)) * this->graphicRotSpeed, MTXMODE_APPLY); Matrix_RotateZ((-(f32)globalCtx->state.frames * (M_PI / 180.0f)) * this->graphicRotSpeed, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bubble.c", 1220), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gBubbleDL); gSPDisplayList(POLY_XLU_DISP++, gBubbleDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bubble.c", 1226); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc != EnBubble_Disappear) { if (this->actionFunc != EnBubble_Disappear) {
this->actor.shape.shadowScale = (f32)((this->expansionWidth + 1.0f) * 0.2f); this->actor.shape.shadowScale = (f32)((this->expansionWidth + 1.0f) * 0.2f);

6
soh/src/overlays/actors/ovl_En_Butte/z_en_butte.c
View file

@ -115,7 +115,7 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) {
s32 alpha; s32 alpha;
Vec3s camDir; Vec3s camDir;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_choo.c", 295); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093C14(globalCtx->state.gfxCtx); func_80093C14(globalCtx->state.gfxCtx);
@ -130,13 +130,13 @@ void EnButte_DrawTransformationEffect(EnButte* this, GlobalContext* globalCtx) {
Matrix_SetTranslateRotateYXZ(this->actor.focus.pos.x + sp5C.x, this->actor.focus.pos.y + sp5C.y, Matrix_SetTranslateRotateYXZ(this->actor.focus.pos.x + sp5C.x, this->actor.focus.pos.y + sp5C.y,
this->actor.focus.pos.z + sp5C.z, &camDir); this->actor.focus.pos.z + sp5C.z, &camDir);
Matrix_Scale(sTransformationEffectScale, sTransformationEffectScale, sTransformationEffectScale, MTXMODE_APPLY); Matrix_Scale(sTransformationEffectScale, sTransformationEffectScale, sTransformationEffectScale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_choo.c", 317), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 180, alpha); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 200, 200, 180, alpha);
gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255); gDPSetEnvColor(POLY_XLU_DISP++, 200, 200, 210, 255);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffFlash1DL)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gEffFlash1DL));
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_choo.c", 326); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
static InitChainEntry sInitChain[] = { static InitChainEntry sInitChain[] = {

8
soh/src/overlays/actors/ovl_En_Bw/z_en_bw.c
View file

@ -824,7 +824,7 @@ s32 EnBw_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList,
Matrix_RotateZ(-(this->unk_258 * 0.1f), MTXMODE_APPLY); Matrix_RotateZ(-(this->unk_258 * 0.1f), MTXMODE_APPLY);
Matrix_RotateY(-(this->unk_258 * 0.13f), MTXMODE_APPLY); Matrix_RotateY(-(this->unk_258 * 0.13f), MTXMODE_APPLY);
Matrix_RotateX(-(this->unk_258 * 0.115f), MTXMODE_APPLY); Matrix_RotateX(-(this->unk_258 * 0.115f), MTXMODE_APPLY);
gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bw.c", 1388), gSPMatrix((*gfx)++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList((*gfx)++, *dList); gSPDisplayList((*gfx)++, *dList);
Matrix_Pop(); Matrix_Pop();
@ -846,7 +846,7 @@ void EnBw_Draw(Actor* thisx, GlobalContext* globalCtx2) {
Vec3f icePos; Vec3f icePos;
s32 iceIndex; s32 iceIndex;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bw.c", 1423); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->color1.a == 0xFF) { if (this->color1.a == 0xFF) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -886,7 +886,7 @@ void EnBw_Draw(Actor* thisx, GlobalContext* globalCtx2) {
gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0x80, 0x80, 255, 255, 0, 255);
Matrix_Scale(this->unk_248 * 0.01f, this->unk_248 * 0.01f, this->unk_248 * 0.01f, MTXMODE_APPLY); Matrix_Scale(this->unk_248 * 0.01f, this->unk_248 * 0.01f, this->unk_248 * 0.01f, MTXMODE_APPLY);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bw.c", 1500), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
@ -902,7 +902,7 @@ void EnBw_Draw(Actor* thisx, GlobalContext* globalCtx2) {
EffectSsEnIce_SpawnFlyingVec3f(globalCtx, thisx, &icePos, 0x96, 0x96, 0x96, 0xFA, 0xEB, 0xF5, 0xFF, 1.3f); EffectSsEnIce_SpawnFlyingVec3f(globalCtx, thisx, &icePos, 0x96, 0x96, 0x96, 0xFA, 0xEB, 0xF5, 0xFF, 1.3f);
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bw.c", 1521); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnBw_Reset(void) { void EnBw_Reset(void) {

8
soh/src/overlays/actors/ovl_En_Bx/z_en_bx.c
View file

@ -206,7 +206,7 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) {
Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx)); Mtx* mtx = Graph_Alloc(globalCtx->state.gfxCtx, 4 * sizeof(Mtx));
s16 i; s16 i;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_bx.c", 464); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -215,7 +215,7 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPSegment(POLY_OPA_DISP++, 0x09, gSPSegment(POLY_OPA_DISP++, 0x09,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 16, 1, 0, (globalCtx->gameplayFrames * -10) % 128, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0, 0, 16, 16, 1, 0, (globalCtx->gameplayFrames * -10) % 128,
32, 32)); 32, 32));
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_bx.c", 478), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (this->actor.params & 0x80) { if (this->actor.params & 0x80) {
@ -238,10 +238,10 @@ void EnBx_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(this->unk_154[i].x, this->unk_154[i].y, this->unk_154[i].z, MTXMODE_NEW); Matrix_Translate(this->unk_154[i].x, this->unk_154[i].y, this->unk_154[i].z, MTXMODE_NEW);
Matrix_RotateZYX(this->unk_1B4[i].x, this->unk_1B4[i].y, this->unk_1B4[i].z, MTXMODE_APPLY); Matrix_RotateZYX(this->unk_1B4[i].x, this->unk_1B4[i].y, this->unk_1B4[i].z, MTXMODE_APPLY);
Matrix_Scale(this->unk_184[i].x, this->unk_184[i].y, this->unk_184[i].z, MTXMODE_APPLY); Matrix_Scale(this->unk_184[i].x, this->unk_184[i].y, this->unk_184[i].z, MTXMODE_APPLY);
Matrix_ToMtx(mtx, "../z_en_bx.c", 507); Matrix_ToMtx(mtx, __FILE__, __LINE__);
} }
gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_0022F0); gSPDisplayList(POLY_OPA_DISP++, object_bxa_DL_0022F0);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_bx.c", 511); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

28
soh/src/overlays/actors/ovl_En_Clear_Tag/z_en_clear_tag.c
View file

@ -686,7 +686,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
EnClearTag* this = (EnClearTag*)thisx; EnClearTag* this = (EnClearTag*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 983); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->drawMode != CLEAR_TAG_DRAW_MODE_EFFECT) { if (this->drawMode != CLEAR_TAG_DRAW_MODE_EFFECT) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -695,12 +695,12 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 255, 0, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 255, 0, 255);
Matrix_Translate(25.0f, 0.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(25.0f, 0.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1004), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gArwingLaserDL); gSPDisplayList(POLY_XLU_DISP++, gArwingLaserDL);
Matrix_Translate(-50.0f, 0.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(-50.0f, 0.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1011), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gArwingLaserDL); gSPDisplayList(POLY_XLU_DISP++, gArwingLaserDL);
} else { } else {
@ -718,7 +718,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(yRotation, MTXMODE_APPLY); Matrix_RotateY(yRotation, MTXMODE_APPLY);
} }
Matrix_RotateZ(this->roll, MTXMODE_APPLY); Matrix_RotateZ(this->roll, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1030), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gArwingDL); gSPDisplayList(POLY_OPA_DISP++, gArwingDL);
@ -732,7 +732,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 200, 155); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 200, 155);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 0, 0); gDPSetEnvColor(POLY_XLU_DISP++, 255, 50, 0, 0);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1067), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gArwingBackfireDL); gSPDisplayList(POLY_XLU_DISP++, gArwingBackfireDL);
@ -756,7 +756,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_RotateY(yRotation, MTXMODE_APPLY); Matrix_RotateY(yRotation, MTXMODE_APPLY);
} }
Matrix_RotateZ(this->roll, MTXMODE_APPLY); Matrix_RotateZ(this->roll, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1104), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gArwingShadowDL); gSPDisplayList(POLY_XLU_DISP++, gArwingShadowDL);
} }
@ -766,7 +766,7 @@ void EnClearTag_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnClearTag_DrawEffects(globalCtx); EnClearTag_DrawEffects(globalCtx);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_clear_tag.c", 1119); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
/** /**
@ -896,7 +896,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) {
EnClearTagEffect* effect = (EnClearTagEffect*)globalCtx->specialEffects; EnClearTagEffect* effect = (EnClearTagEffect*)globalCtx->specialEffects;
EnClearTagEffect* firstEffect = effect; EnClearTagEffect* firstEffect = effect;
OPEN_DISPS(gfxCtx, "../z_en_clear_tag.c", 1288); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -914,7 +914,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) {
Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, effect->scale, MTXMODE_APPLY);
Matrix_RotateY(effect->rotationY, MTXMODE_APPLY); Matrix_RotateY(effect->rotationY, MTXMODE_APPLY);
Matrix_RotateX(effect->rotationX, MTXMODE_APPLY); Matrix_RotateX(effect->rotationX, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1307), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gArwingDebrisEffectDL); gSPDisplayList(POLY_OPA_DISP++, gArwingDebrisEffectDL);
} }
@ -938,7 +938,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) {
Matrix_RotateX(effect->floorTangent.x, MTXMODE_APPLY); Matrix_RotateX(effect->floorTangent.x, MTXMODE_APPLY);
Matrix_RotateZ(effect->floorTangent.z, MTXMODE_APPLY); Matrix_RotateZ(effect->floorTangent.z, MTXMODE_APPLY);
Matrix_Scale(effect->scale + effect->scale, 1.0f, effect->scale * 2.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale + effect->scale, 1.0f, effect->scale * 2.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1342), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gArwingFlashEffectGroundDL); gSPDisplayList(POLY_XLU_DISP++, gArwingFlashEffectGroundDL);
} }
@ -967,7 +967,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) {
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
Matrix_Translate(0.0f, 20.0f, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 20.0f, 0.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1392), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gArwingFireEffectDL); gSPDisplayList(POLY_XLU_DISP++, gArwingFireEffectDL);
} }
@ -993,7 +993,7 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW); Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1439), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gArwingFireEffectDL); gSPDisplayList(POLY_XLU_DISP++, gArwingFireEffectDL);
} }
@ -1016,13 +1016,13 @@ void EnClearTag_DrawEffects(GlobalContext* globalCtx) {
Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW); Matrix_Translate(effect->position.x, effect->position.y, effect->position.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(effect->scale, effect->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, "../z_en_clear_tag.c", 1470), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gArwingFlashEffectDL); gSPDisplayList(POLY_XLU_DISP++, gArwingFlashEffectDL);
} }
} }
CLOSE_DISPS(gfxCtx, "../z_en_clear_tag.c", 1477); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }
void EnClearTag_Reset(void) { void EnClearTag_Reset(void) {

6
soh/src/overlays/actors/ovl_En_Cs/z_en_cs.c
View file

@ -462,7 +462,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnCs* this = (EnCs*)thisx; EnCs* this = (EnCs*)thisx;
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_cs.c", 968); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeIndex]));
@ -478,7 +478,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) {
Mtx* mtx; Mtx* mtx;
Matrix_Put(&this->spookyMaskMtx); Matrix_Put(&this->spookyMaskMtx);
mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_cs.c", 1000); mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[childLinkObjectIndex].segment); gSPSegment(POLY_OPA_DISP++, 0x06, globalCtx->objectCtx.status[childLinkObjectIndex].segment);
gSPSegment(POLY_OPA_DISP++, 0x0D, mtx - 7); gSPSegment(POLY_OPA_DISP++, 0x0D, mtx - 7);
gSPDisplayList(POLY_OPA_DISP++, gLinkChildSpookyMaskDL); gSPDisplayList(POLY_OPA_DISP++, gLinkChildSpookyMaskDL);
@ -486,7 +486,7 @@ void EnCs_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_cs.c", 1015); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
s32 EnCs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { s32 EnCs_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {

8
soh/src/overlays/actors/ovl_En_Daiku/z_en_daiku.c
View file

@ -589,7 +589,7 @@ void EnDaiku_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnDaiku_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnDaiku_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDaiku* this = (EnDaiku*)thisx; EnDaiku* this = (EnDaiku*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku.c", 1227); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -606,7 +606,7 @@ void EnDaiku_Draw(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnDaiku_OverrideLimbDraw, EnDaiku_PostLimbDraw, this); EnDaiku_OverrideLimbDraw, EnDaiku_PostLimbDraw, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku.c", 1255); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
s32 EnDaiku_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) { s32 EnDaiku_OverrideLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3f* pos, Vec3s* rot, void* thisx) {
@ -632,12 +632,12 @@ void EnDaiku_PostLimbDraw(GlobalContext* globalCtx, s32 limb, Gfx** dList, Vec3s
static Vec3f targetPosHeadLocal = { 700, 1100, 0 }; static Vec3f targetPosHeadLocal = { 700, 1100, 0 };
EnDaiku* this = (EnDaiku*)thisx; EnDaiku* this = (EnDaiku*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku.c", 1323); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (limb == 15) { // head if (limb == 15) { // head
Matrix_MultVec3f(&targetPosHeadLocal, &this->actor.focus.pos); Matrix_MultVec3f(&targetPosHeadLocal, &this->actor.focus.pos);
gSPDisplayList(POLY_OPA_DISP++, hairDLists[this->actor.params & 3]); gSPDisplayList(POLY_OPA_DISP++, hairDLists[this->actor.params & 3]);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku.c", 1330); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

8
soh/src/overlays/actors/ovl_En_Daiku_Kakariko/z_en_daiku_kakariko.c
View file

@ -530,20 +530,20 @@ void EnDaikuKakariko_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx**
static Vec3f unkVec = { 700.0f, 1100.0f, 0.0f }; static Vec3f unkVec = { 700.0f, 1100.0f, 0.0f };
EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; EnDaikuKakariko* this = (EnDaikuKakariko*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1104); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (limbIndex == 15) { if (limbIndex == 15) {
Matrix_MultVec3f(&unkVec, &this->actor.focus.pos); Matrix_MultVec3f(&unkVec, &this->actor.focus.pos);
gSPDisplayList(POLY_OPA_DISP++, carpenterHeadDLists[this->actor.params & 3]); gSPDisplayList(POLY_OPA_DISP++, carpenterHeadDLists[this->actor.params & 3]);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1113); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDaikuKakariko* this = (EnDaikuKakariko*)thisx; EnDaikuKakariko* this = (EnDaikuKakariko*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1124); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -560,5 +560,5 @@ void EnDaikuKakariko_Draw(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnDaikuKakariko_OverrideLimbDraw, EnDaikuKakariko_PostLimbDraw, thisx); EnDaikuKakariko_OverrideLimbDraw, EnDaikuKakariko_PostLimbDraw, thisx);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_daiku_kakariko.c", 1151); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

32
soh/src/overlays/actors/ovl_En_Dekubaba/z_en_dekubaba.c
View file

@ -1149,7 +1149,7 @@ void EnDekubaba_Update(Actor* thisx, GlobalContext* globalCtx) {
void EnDekubaba_DrawStemRetracted(EnDekubaba* this, GlobalContext* globalCtx) { void EnDekubaba_DrawStemRetracted(EnDekubaba* this, GlobalContext* globalCtx) {
f32 horizontalScale; f32 horizontalScale;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2445); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
horizontalScale = this->size * 0.01f; horizontalScale = this->size * 0.01f;
@ -1157,13 +1157,13 @@ void EnDekubaba_DrawStemRetracted(EnDekubaba* this, GlobalContext* globalCtx) {
MTXMODE_NEW); MTXMODE_NEW);
Matrix_RotateZYX(this->stemSectionAngle[0], this->actor.shape.rot.y, 0, MTXMODE_APPLY); Matrix_RotateZYX(this->stemSectionAngle[0], this->actor.shape.rot.y, 0, MTXMODE_APPLY);
Matrix_Scale(horizontalScale, horizontalScale, horizontalScale, MTXMODE_APPLY); Matrix_Scale(horizontalScale, horizontalScale, horizontalScale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2461), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemTopDL); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemTopDL);
Actor_SetFocus(&this->actor, 0.0f); Actor_SetFocus(&this->actor, 0.0f);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2468); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) { void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) {
@ -1175,7 +1175,7 @@ void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) {
f32 scale; f32 scale;
s32 stemSections; s32 stemSections;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2487); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc == EnDekubaba_PrunedSomersault) { if (this->actionFunc == EnDekubaba_PrunedSomersault) {
stemSections = 2; stemSections = 2;
@ -1202,7 +1202,7 @@ void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) {
Matrix_Put(&mtx); Matrix_Put(&mtx);
Matrix_RotateZYX(this->stemSectionAngle[i], this->actor.shape.rot.y, 0, MTXMODE_APPLY); Matrix_RotateZYX(this->stemSectionAngle[i], this->actor.shape.rot.y, 0, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2533), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, stemDLists[i]); gSPDisplayList(POLY_OPA_DISP++, stemDLists[i]);
@ -1230,27 +1230,27 @@ void EnDekubaba_DrawStemExtended(EnDekubaba* this, GlobalContext* globalCtx) {
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2569); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnDekubaba_DrawStemBasePruned(EnDekubaba* this, GlobalContext* globalCtx) { void EnDekubaba_DrawStemBasePruned(EnDekubaba* this, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2579); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_RotateZYX(this->stemSectionAngle[2], this->actor.shape.rot.y, 0, MTXMODE_APPLY); Matrix_RotateZYX(this->stemSectionAngle[2], this->actor.shape.rot.y, 0, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2586), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemBaseDL); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStemBaseDL);
Collider_UpdateSpheres(55, &this->collider); Collider_UpdateSpheres(55, &this->collider);
Collider_UpdateSpheres(56, &this->collider); Collider_UpdateSpheres(56, &this->collider);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2596); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnDekubaba_DrawBaseShadow(EnDekubaba* this, GlobalContext* globalCtx) { void EnDekubaba_DrawBaseShadow(EnDekubaba* this, GlobalContext* globalCtx) {
MtxF mtx; MtxF mtx;
f32 horizontalScale; f32 horizontalScale;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2692); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80094044(globalCtx->state.gfxCtx); func_80094044(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, 255);
@ -1260,10 +1260,10 @@ void EnDekubaba_DrawBaseShadow(EnDekubaba* this, GlobalContext* globalCtx) {
horizontalScale = this->size * 0.15f; horizontalScale = this->size * 0.15f;
Matrix_Scale(horizontalScale, 1.0f, horizontalScale, MTXMODE_APPLY); Matrix_Scale(horizontalScale, 1.0f, horizontalScale, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2710), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL); gSPDisplayList(POLY_XLU_DISP++, gCircleShadowDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2715); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnDekubaba_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) { void EnDekubaba_PostLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dList, Vec3s* rot, void* thisx) {
@ -1279,7 +1279,7 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 scale; f32 scale;
if (1) {} if (1) {}
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2752); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
if (this->actionFunc != EnDekubaba_DeadStickDrop) { if (this->actionFunc != EnDekubaba_DeadStickDrop) {
@ -1296,7 +1296,7 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, MTXMODE_NEW); Matrix_Translate(this->actor.home.pos.x, this->actor.home.pos.y, this->actor.home.pos.z, MTXMODE_NEW);
Matrix_RotateY(this->actor.home.rot.y * (M_PI / 0x8000), MTXMODE_APPLY); Matrix_RotateY(this->actor.home.rot.y * (M_PI / 0x8000), MTXMODE_APPLY);
Matrix_Scale(scale, scale, scale, MTXMODE_APPLY); Matrix_Scale(scale, scale, scale, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2780), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDekuBabaBaseLeavesDL); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaBaseLeavesDL);
@ -1311,12 +1311,12 @@ void EnDekubaba_Draw(Actor* thisx, GlobalContext* globalCtx) {
// Display solid until 40 frames left, then blink until killed. // Display solid until 40 frames left, then blink until killed.
} else if ((this->timer > 40) || ((this->timer % 2) != 0)) { } else if ((this->timer > 40) || ((this->timer % 2) != 0)) {
Matrix_Translate(0.0f, 0.0f, 200.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, 0.0f, 200.0f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2797), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStickDropDL); gSPDisplayList(POLY_OPA_DISP++, gDekuBabaStickDropDL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dekubaba.c", 2804); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
//OTRTODO fix this one //OTRTODO fix this one

6
soh/src/overlays/actors/ovl_En_Dh/z_en_dh.c
View file

@ -547,7 +547,7 @@ void EnDh_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
EnDh* this = (EnDh*)thisx; EnDh* this = (EnDh*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dh.c", 1099); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->alpha == 255) { if (this->alpha == 255) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->alpha); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, this->alpha);
@ -574,9 +574,9 @@ void EnDh_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Translate(0.0f, -this->actor.shape.yOffset, 0.0f, MTXMODE_APPLY); Matrix_Translate(0.0f, -this->actor.shape.yOffset, 0.0f, MTXMODE_APPLY);
Matrix_Scale(this->dirtWaveSpread * 0.01f, this->dirtWaveHeight * 0.01f, this->dirtWaveSpread * 0.01f, Matrix_Scale(this->dirtWaveSpread * 0.01f, this->dirtWaveHeight * 0.01f, this->dirtWaveSpread * 0.01f,
MTXMODE_APPLY); MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dh.c", 1160), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, object_dh_DL_007FC0); gSPDisplayList(POLY_XLU_DISP++, object_dh_DL_007FC0);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dh.c", 1166); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_En_Diving_Game/z_en_diving_game.c
View file

@ -562,7 +562,7 @@ void EnDivingGame_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDivingGame* this = (EnDivingGame*)thisx; EnDivingGame* this = (EnDivingGame*)thisx;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_diving_game.c", 1212); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255); gDPSetEnvColor(POLY_OPA_DISP++, 0, 0, 0, 255);
gSPSegment(POLY_OPA_DISP++, 0x0C, EnDivingGame_EmptyDList(globalCtx->state.gfxCtx)); gSPSegment(POLY_OPA_DISP++, 0x0C, EnDivingGame_EmptyDList(globalCtx->state.gfxCtx));
@ -570,5 +570,5 @@ void EnDivingGame_Draw(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnDivingGame_OverrideLimbDraw, NULL, this); EnDivingGame_OverrideLimbDraw, NULL, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_diving_game.c", 1232); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Dnt_Jiji/z_en_dnt_jiji.c
View file

@ -431,7 +431,7 @@ void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx) {
static void* blinkTex[] = { gDntJijiEyeOpenTex, gDntJijiEyeHalfTex, gDntJijiEyeShutTex }; static void* blinkTex[] = { gDntJijiEyeOpenTex, gDntJijiEyeHalfTex, gDntJijiEyeShutTex };
EnDntJiji* this = (EnDntJiji*)thisx; EnDntJiji* this = (EnDntJiji*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1019); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
Matrix_Push(); Matrix_Push();
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState]));
@ -439,8 +439,8 @@ void EnDntJiji_Draw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Pop(); Matrix_Pop();
Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW); Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW);
Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1040), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDntJijiFlowerDL); gSPDisplayList(POLY_OPA_DISP++, gDntJijiFlowerDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_jiji.c", 1043); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

16
soh/src/overlays/actors/ovl_En_Dnt_Nomal/z_en_dnt_nomal.c
View file

@ -825,11 +825,11 @@ s32 EnDntNomal_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** d
EnDntNomal* this = (EnDntNomal*)thisx; EnDntNomal* this = (EnDntNomal*)thisx;
if ((limbIndex == 1) || (limbIndex == 3) || (limbIndex == 4) || (limbIndex == 5) || (limbIndex == 6)) { if ((limbIndex == 1) || (limbIndex == 3) || (limbIndex == 4) || (limbIndex == 5) || (limbIndex == 6)) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1733); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, sLeafColors[this->type - ENDNTNOMAL_STAGE].r, gDPSetEnvColor(POLY_OPA_DISP++, sLeafColors[this->type - ENDNTNOMAL_STAGE].r,
sLeafColors[this->type - ENDNTNOMAL_STAGE].g, sLeafColors[this->type - ENDNTNOMAL_STAGE].b, 255); sLeafColors[this->type - ENDNTNOMAL_STAGE].g, sLeafColors[this->type - ENDNTNOMAL_STAGE].b, 255);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1743); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
return false; return false;
} }
@ -853,7 +853,7 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) {
Vec3f dustScale = { 0.25f, 0.25f, 0.25f }; Vec3f dustScale = { 0.25f, 0.25f, 0.25f };
s32 pad; s32 pad;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1790); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(blinkTex[this->eyeState]));
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDntNomal_OverrideLimbDraw, SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDntNomal_OverrideLimbDraw,
@ -863,10 +863,10 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_OPA_DISP++); gDPPipeSync(POLY_OPA_DISP++);
gDPSetEnvColor(POLY_OPA_DISP++, sLeafColors[this->type - ENDNTNOMAL_STAGE].r, gDPSetEnvColor(POLY_OPA_DISP++, sLeafColors[this->type - ENDNTNOMAL_STAGE].r,
sLeafColors[this->type - ENDNTNOMAL_STAGE].g, sLeafColors[this->type - ENDNTNOMAL_STAGE].b, 255); sLeafColors[this->type - ENDNTNOMAL_STAGE].g, sLeafColors[this->type - ENDNTNOMAL_STAGE].b, 255);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1814), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gDntStageFlowerDL); gSPDisplayList(POLY_OPA_DISP++, gDntStageFlowerDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1817); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc == EnDntNomal_StageCelebrate) { if (this->actionFunc == EnDntNomal_StageCelebrate) {
func_80033C30(&this->actor.world.pos, &dustScale, 255, globalCtx); func_80033C30(&this->actor.world.pos, &dustScale, 255, globalCtx);
} }
@ -875,14 +875,14 @@ void EnDntNomal_DrawStageScrub(Actor* thisx, GlobalContext* globalCtx) {
void EnDntNomal_DrawTargetScrub(Actor* thisx, GlobalContext* globalCtx) { void EnDntNomal_DrawTargetScrub(Actor* thisx, GlobalContext* globalCtx) {
EnDntNomal* this = (EnDntNomal*)thisx; EnDntNomal* this = (EnDntNomal*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1833); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnDntNomal_PostLimbDraw, SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, NULL, EnDntNomal_PostLimbDraw,
this); this);
Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW); Matrix_Translate(this->flowerPos.x, this->flowerPos.y, this->flowerPos.z, MTXMODE_NEW);
Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY); Matrix_Scale(0.01f, 0.01f, 0.01f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1848), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gHintNutsFlowerDL); gSPDisplayList(POLY_OPA_DISP++, gHintNutsFlowerDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dnt_nomal.c", 1851); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_En_Dog/z_en_dog.c
View file

@ -473,7 +473,7 @@ void EnDog_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDog* this = (EnDog*)thisx; EnDog* this = (EnDog*)thisx;
Color_RGBA8 colors[] = { { 255, 255, 200, 0 }, { 150, 100, 50, 0 } }; Color_RGBA8 colors[] = { { 255, 255, 200, 0 }, { 150, 100, 50, 0 } };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_dog.c", 972); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -484,5 +484,5 @@ void EnDog_Draw(Actor* thisx, GlobalContext* globalCtx) {
SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount, SkelAnime_DrawFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, this->skelAnime.dListCount,
EnDog_OverrideLimbDraw, EnDog_PostLimbDraw, this); EnDog_OverrideLimbDraw, EnDog_PostLimbDraw, this);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_dog.c", 994); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_En_Door/z_en_door.c
View file

@ -333,7 +333,7 @@ void EnDoor_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnDoor* this = (EnDoor*)thisx; EnDoor* this = (EnDoor*)thisx;
if (this->actor.objBankIndex == this->requiredObjBankIndex) { if (this->actor.objBankIndex == this->requiredObjBankIndex) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_door.c", 910); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDoor_OverrideLimbDraw, SkelAnime_DrawOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, EnDoor_OverrideLimbDraw,
@ -350,6 +350,6 @@ void EnDoor_Draw(Actor* thisx, GlobalContext* globalCtx) {
Actor_DrawDoorLock(globalCtx, this->lockTimer, DOORLOCK_NORMAL); Actor_DrawDoorLock(globalCtx, this->lockTimer, DOORLOCK_NORMAL);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_door.c", 941); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }

4
soh/src/overlays/actors/ovl_En_Du/z_en_du.c
View file

@ -629,7 +629,7 @@ void EnDu_Draw(Actor* thisx, GlobalContext* globalCtx) {
}; };
EnDu* this = (EnDu*)thisx; EnDu* this = (EnDu*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_du.c", 1470); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(eyeTextures[this->eyeTexIndex]));
gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(mouthTextures[this->mouthTexIndex])); gSPSegment(POLY_OPA_DISP++, 0x09, SEGMENTED_TO_VIRTUAL(mouthTextures[this->mouthTexIndex]));
@ -637,5 +637,5 @@ void EnDu_Draw(Actor* thisx, GlobalContext* globalCtx) {
func_80034BA0(globalCtx, &this->skelAnime, EnDu_OverrideLimbDraw, EnDu_PostLimbDraw, &this->actor, 255); func_80034BA0(globalCtx, &this->skelAnime, EnDu_OverrideLimbDraw, EnDu_PostLimbDraw, &this->actor, 255);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_du.c", 1487); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Dy_Extra/z_en_dy_extra.c
View file

@ -110,19 +110,19 @@ void EnDyExtra_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
} }
OPEN_DISPS(gfxCtx, "../z_en_dy_extra.c", 294); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames * 2, 0, 0x20, 0x40, 1, Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, globalCtx->state.frames * 2, 0, 0x20, 0x40, 1,
globalCtx->state.frames, globalCtx->state.frames * -8, 0x10, 0x10)); globalCtx->state.frames, globalCtx->state.frames * -8, 0x10, 0x10));
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_dy_extra.c", 307), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColors[this->type].r, primColors[this->type].g, gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColors[this->type].r, primColors[this->type].g,
primColors[this->type].b, 255); primColors[this->type].b, 255);
gDPSetEnvColor(POLY_XLU_DISP++, envColors[this->type].r, envColors[this->type].g, envColors[this->type].b, 128); gDPSetEnvColor(POLY_XLU_DISP++, envColors[this->type].r, envColors[this->type].g, envColors[this->type].b, 128);
gSPDisplayList(POLY_XLU_DISP++, gGreatFairySpiralBeamDL); gSPDisplayList(POLY_XLU_DISP++, gGreatFairySpiralBeamDL);
CLOSE_DISPS(gfxCtx, "../z_en_dy_extra.c", 325); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }

4
soh/src/overlays/actors/ovl_En_Eiyer/z_en_eiyer.c
View file

@ -697,7 +697,7 @@ s32 EnEiyer_OverrideLimbDraw(GlobalContext* globalCtx, s32 limbIndex, Gfx** dLis
void EnEiyer_Draw(Actor* thisx, GlobalContext* globalCtx) { void EnEiyer_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnEiyer* this = (EnEiyer*)thisx; EnEiyer* this = (EnEiyer*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_eiyer.c", 1494); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actionFunc != EnEiyer_Dead) { if (this->actionFunc != EnEiyer_Dead) {
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
@ -714,5 +714,5 @@ void EnEiyer_Draw(Actor* thisx, GlobalContext* globalCtx) {
POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable, POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelanime.skeleton, this->skelanime.jointTable,
EnEiyer_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); EnEiyer_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_eiyer.c", 1541); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

10
soh/src/overlays/actors/ovl_En_Elf/z_en_elf.c
View file

@ -404,7 +404,7 @@ void EnElf_Init(Actor* thisx, GlobalContext* globalCtx) {
} }
break; break;
default: default:
ASSERT(0, "0", "../z_en_elf.c", 1103); ASSERT(0, "0", __FILE__, 1103);
break; break;
} }
@ -798,7 +798,7 @@ void func_80A03AB0(EnElf* this, GlobalContext* globalCtx) {
SkelAnime_Update(&this->skelAnime); SkelAnime_Update(&this->skelAnime);
if (this->func_2C8 == NULL) { if (this->func_2C8 == NULL) {
ASSERT(0, "0", "../z_en_elf.c", 1725); ASSERT(0, "0", __FILE__, 1725);
} }
this->func_2C8(this, globalCtx); this->func_2C8(this, globalCtx);
@ -1410,7 +1410,7 @@ void func_80A053F0(Actor* thisx, GlobalContext* globalCtx) {
if (nREG(81) != 0) { if (nREG(81) != 0) {
if (gSaveContext.sceneFlags[127].chest) { if (gSaveContext.sceneFlags[127].chest) {
LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", gSaveContext.sceneFlags[127].chest, LOG_NUM("z_common_data.memory.information.room_inf[127][ 0 ]", gSaveContext.sceneFlags[127].chest,
"../z_en_elf.c", 2595); __FILE__, __LINE__);
} }
} }
@ -1502,7 +1502,7 @@ void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx) {
if (!(player->stateFlags1 & 0x100000) || (kREG(90) < this->actor.projectedPos.z)) { if (!(player->stateFlags1 & 0x100000) || (kREG(90) < this->actor.projectedPos.z)) {
dListHead = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Gfx) * 4); dListHead = Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Gfx) * 4);
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_elf.c", 2730); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80094B58(globalCtx->state.gfxCtx); func_80094B58(globalCtx->state.gfxCtx);
@ -1528,7 +1528,7 @@ void EnElf_Draw(Actor* thisx, GlobalContext* globalCtx) {
POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable, POLY_XLU_DISP = SkelAnime_Draw(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
EnElf_OverrideLimbDraw, NULL, this, POLY_XLU_DISP); EnElf_OverrideLimbDraw, NULL, this, POLY_XLU_DISP);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_elf.c", 2793); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }
} }

6
soh/src/overlays/actors/ovl_En_Encount2/z_en_encount2.c
View file

@ -345,7 +345,7 @@ void EnEncount2_ParticleDraw(Actor* thisx, GlobalContext* globalCtx) {
s16 i; s16 i;
s32 objBankIndex; s32 objBankIndex;
OPEN_DISPS(gfxCtx, "../z_en_encount2.c", 642); OPEN_DISPS(gfxCtx, __FILE__, __LINE__);
objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_EFC_STAR_FIELD); objBankIndex = Object_GetIndex(&globalCtx->objectCtx, OBJECT_EFC_STAR_FIELD);
@ -362,12 +362,12 @@ void EnEncount2_ParticleDraw(Actor* thisx, GlobalContext* globalCtx) {
Matrix_Scale(particle->scale, particle->scale, particle->scale, MTXMODE_APPLY); Matrix_Scale(particle->scale, particle->scale, particle->scale, MTXMODE_APPLY);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255); gDPSetPrimColor(POLY_OPA_DISP++, 0, 0, 255, 155, 55, 255);
gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255); gDPSetEnvColor(POLY_OPA_DISP++, 155, 255, 55, 255);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_encount2.c", 669), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0); gSPDisplayList(POLY_OPA_DISP++, object_efc_star_field_DL_000DE0);
} }
} }
} }
CLOSE_DISPS(gfxCtx, "../z_en_encount2.c", 678); CLOSE_DISPS(gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Ex_Item/z_en_ex_item.c
View file

@ -498,15 +498,15 @@ void EnExItem_DrawMagic(EnExItem* this, GlobalContext* globalCtx, s16 magicIndex
void EnExItem_DrawKey(EnExItem* this, GlobalContext* globalCtx, s32 index) { void EnExItem_DrawKey(EnExItem* this, GlobalContext* globalCtx, s32 index) {
static void* keySegments[] = { gDropKeySmallTex }; static void* keySegments[] = { gDropKeySmallTex };
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_item.c", 880); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_8009460C(globalCtx->state.gfxCtx); func_8009460C(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_item.c", 887), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(keySegments[index])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(keySegments[index]));
gSPDisplayList(POLY_OPA_DISP++, gItemDropDL); gSPDisplayList(POLY_OPA_DISP++, gItemDropDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_item.c", 893); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnExItem_DrawRupee(EnExItem* this, GlobalContext* globalCtx) { void EnExItem_DrawRupee(EnExItem* this, GlobalContext* globalCtx) {

6
soh/src/overlays/actors/ovl_En_Ex_Ruppy/z_en_ex_ruppy.c
View file

@ -383,15 +383,15 @@ void EnExRuppy_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnExRuppy* this = (EnExRuppy*)thisx; EnExRuppy* this = (EnExRuppy*)thisx;
if (!this->invisible) { if (!this->invisible) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 774); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
func_80093D18(globalCtx->state.gfxCtx); func_80093D18(globalCtx->state.gfxCtx);
func_8002EBCC(thisx, globalCtx, 0); func_8002EBCC(thisx, globalCtx, 0);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 780), gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(rupeeTextures[this->colorIdx])); gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL(rupeeTextures[this->colorIdx]));
gSPDisplayList(POLY_OPA_DISP++, gRupeeDL); gSPDisplayList(POLY_OPA_DISP++, gRupeeDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ex_ruppy.c", 784); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
} }

16
soh/src/overlays/actors/ovl_En_Fd/z_en_fd.c
View file

@ -766,7 +766,7 @@ void EnFd_Draw(Actor* thisx, GlobalContext* globalCtx) {
frames = globalCtx->state.frames; frames = globalCtx->state.frames;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 1751); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Push(); Matrix_Push();
EnFd_DrawDots(this, globalCtx); EnFd_DrawDots(this, globalCtx);
@ -790,7 +790,7 @@ void EnFd_Draw(Actor* thisx, GlobalContext* globalCtx) {
this->skelAnime.dListCount, EnFd_OverrideLimbDraw, EnFd_PostLimbDraw, this, this->skelAnime.dListCount, EnFd_OverrideLimbDraw, EnFd_PostLimbDraw, this,
POLY_XLU_DISP); POLY_XLU_DISP);
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 1822); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnFd_AddEffect(EnFd* this, u8 type, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 timer, f32 scale, void EnFd_AddEffect(EnFd* this, u8 type, Vec3f* pos, Vec3f* velocity, Vec3f* accel, u8 timer, f32 scale,
@ -882,7 +882,7 @@ void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) {
s16 idx; s16 idx;
EnFdEffect* eff = this->effects; EnFdEffect* eff = this->effects;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 1969); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
firstDone = false; firstDone = false;
if (1) {} if (1) {}
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -899,14 +899,14 @@ void EnFd_DrawFlames(EnFd* this, GlobalContext* globalCtx) {
Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fd.c", 2006), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
idx = eff->timer * (8.0f / eff->initialTimer); idx = eff->timer * (8.0f / eff->initialTimer);
gSPSegment(POLY_XLU_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(dustTextures[idx])); gSPSegment(POLY_XLU_DISP++, 0x8, SEGMENTED_TO_VIRTUAL(dustTextures[idx]));
gSPDisplayList(POLY_XLU_DISP++, gFlareDancerSquareParticleDL); gSPDisplayList(POLY_XLU_DISP++, gFlareDancerSquareParticleDL);
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 2020); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }
void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) { void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) {
@ -914,7 +914,7 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) {
s16 firstDone; s16 firstDone;
EnFdEffect* eff = this->effects; EnFdEffect* eff = this->effects;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 2034); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
firstDone = false; firstDone = false;
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
@ -933,11 +933,11 @@ void EnFd_DrawDots(EnFd* this, GlobalContext* globalCtx) {
Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW); Matrix_Translate(eff->pos.x, eff->pos.y, eff->pos.z, MTXMODE_NEW);
Matrix_ReplaceRotation(&globalCtx->billboardMtxF); Matrix_ReplaceRotation(&globalCtx->billboardMtxF);
Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY); Matrix_Scale(eff->scale, eff->scale, 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fd.c", 2064), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gFlareDancerTriangleParticleDL); gSPDisplayList(POLY_XLU_DISP++, gFlareDancerTriangleParticleDL);
} }
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fd.c", 2071); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

6
soh/src/overlays/actors/ovl_En_Fd_Fire/z_en_fd_fire.c
View file

@ -247,7 +247,7 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
f32 sp84; f32 sp84;
f32 sp80; f32 sp80;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fd_fire.c", 572); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW); Matrix_Translate(this->actor.world.pos.x, this->actor.world.pos.y, this->actor.world.pos.z, MTXMODE_NEW);
sp8E = Math_Vec3f_Yaw(&scale, &this->actor.velocity) - Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx)); sp8E = Math_Vec3f_Yaw(&scale, &this->actor.velocity) - Camera_GetCamDirYaw(GET_ACTIVE_CAM(globalCtx));
@ -266,7 +266,7 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
sp84 = 0.1f; sp84 = 0.1f;
} }
Matrix_Scale(1.0f, sp84, 1.0f / sp84, MTXMODE_APPLY); Matrix_Scale(1.0f, sp84, 1.0f / sp84, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fd_fire.c", 623), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gSPSegment(POLY_XLU_DISP++, 0x8, gSPSegment(POLY_XLU_DISP++, 0x8,
@ -283,5 +283,5 @@ void EnFdFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL); gSPDisplayList(POLY_XLU_DISP++, gEffFire1DL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fd_fire.c", 672); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

12
soh/src/overlays/actors/ovl_En_Fhg_Fire/z_en_fhg_fire.c
View file

@ -700,14 +700,14 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
s32 pad; s32 pad;
EnFhgFire* this = (EnFhgFire*)thisx; EnFhgFire* this = (EnFhgFire*)thisx;
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1723); OPEN_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
if (this->actor.params == FHGFIRE_LIGHTNING_BURST) { if (this->actor.params == FHGFIRE_LIGHTNING_BURST) {
func_80093D84(globalCtx->state.gfxCtx); func_80093D84(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]);
gDPSetEnvColor(POLY_XLU_DISP++, 165, 255, 75, 0); gDPSetEnvColor(POLY_XLU_DISP++, 165, 255, 75, 0);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1745), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gPhantomLightningBlastDL)); gSPDisplayList(POLY_XLU_DISP++, SEGMENTED_TO_VIRTUAL(gPhantomLightningBlastDL));
} else if ((this->actor.params == FHGFIRE_SPEAR_LIGHT) || (this->actor.params == FHGFIRE_ENERGY_BALL)) { } else if ((this->actor.params == FHGFIRE_SPEAR_LIGHT) || (this->actor.params == FHGFIRE_ENERGY_BALL)) {
@ -723,7 +723,7 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
} }
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
Matrix_RotateZ((this->actor.shape.rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY); Matrix_RotateZ((this->actor.shape.rot.z / (f32)0x8000) * 3.1416f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1801), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gPhantomEnergyBallDL); gSPDisplayList(POLY_XLU_DISP++, gPhantomEnergyBallDL);
} else if ((this->actor.params == FHGFIRE_WARP_EMERGE) || (this->actor.params == FHGFIRE_WARP_RETREAT) || } else if ((this->actor.params == FHGFIRE_WARP_EMERGE) || (this->actor.params == FHGFIRE_WARP_RETREAT) ||
@ -732,7 +732,7 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (u8)this->fwork[FHGFIRE_WARP_ALPHA]); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 0, 0, 0, (u8)this->fwork[FHGFIRE_WARP_ALPHA]);
gDPSetEnvColor(POLY_XLU_DISP++, 90, 50, 95, (s8)(this->fwork[FHGFIRE_WARP_ALPHA] * 0.5f)); gDPSetEnvColor(POLY_XLU_DISP++, 90, 50, 95, (s8)(this->fwork[FHGFIRE_WARP_ALPHA] * 0.5f));
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1833), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08, gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (s16)this->fwork[FHGFIRE_WARP_TEX_1_X], Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, (s16)this->fwork[FHGFIRE_WARP_TEX_1_X],
@ -747,11 +747,11 @@ void EnFhgFire_Draw(Actor* thisx, GlobalContext* globalCtx) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]); gDPSetPrimColor(POLY_XLU_DISP++, 0, 0, 255, 255, 255, (s8)this->fwork[FHGFIRE_ALPHA]);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 30, 0); gDPSetEnvColor(POLY_XLU_DISP++, 0, 255, 30, 0);
gDPPipeSync(POLY_XLU_DISP++); gDPPipeSync(POLY_XLU_DISP++);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1892), gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, __FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, gPhantomLightningDL); gSPDisplayList(POLY_XLU_DISP++, gPhantomLightningDL);
osSyncPrintf("FF DRAW 2\n"); osSyncPrintf("FF DRAW 2\n");
} }
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_fhg_fire.c", 1900); CLOSE_DISPS(globalCtx->state.gfxCtx, __FILE__, __LINE__);
} }

Some files were not shown because too many files have changed in this diff Show more