falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_Sda (#691) 

* En_Sda

* Format hello?

* PR
This commit is contained in:
Maide 2022-03-26 01:33:42 +00:00 committed by GitHub
parent ad6d314422
commit 844b5efb6f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 334 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
assets/xml/overlays/ovl_En_Sda.xml Normal file
View File

@ -0,0 +1,9 @@
<Root>
<File Name="ovl_En_Sda" BaseAddress="0x809468D0" RangeStart="0x1458" RangeEnd="0x14E8">
<Array Name="ovl_En_Sda_Vtx_1458" Count="4" Offset="0x1458">
<Vtx/>
</Array>
<DList Name="ovl_En_Sda_DL_1498" Offset="0x1498"/>
<DList Name="ovl_En_Sda_DL_14B8" Offset="0x14B8"/>
</File>
</Root>

4
spec
View File

@ -1574,9 +1574,7 @@ beginseg
name "ovl_En_Sda"
compress
include "build/src/overlays/actors/ovl_En_Sda/z_en_sda.o"
include "build/data/ovl_En_Sda/ovl_En_Sda.data.o"
include "build/data/ovl_En_Sda/ovl_En_Sda.bss.o"
include "build/data/ovl_En_Sda/ovl_En_Sda.reloc.o"
include "build/src/overlays/actors/ovl_En_Sda/ovl_En_Sda_reloc.o"
endseg
beginseg

331
src/overlays/actors/ovl_En_Sda/z_en_sda.c
View File

@ -15,7 +15,11 @@ void EnSda_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnSda_Update(Actor* thisx, GlobalContext* globalCtx);
void EnSda_Draw(Actor* thisx, GlobalContext* globalCtx);
#if 0
void func_8094702C(EnSda* this, u8* shadowTexture, Player* player, GlobalContext* globalCtx);
void func_80947668(u8* shadowTexture, Player* player, GlobalContext* globalCtx);
Vec3f D_80947EA0[16];
const ActorInit En_Sda_InitVars = {
ACTOR_EN_SDA,
ACTORCAT_BOSS,
@ -28,18 +32,327 @@ const ActorInit En_Sda_InitVars = {
(ActorFunc)EnSda_Draw,
};
#endif
Vec3f D_80947A60 = { 0.0f, 0.0f, 0.0f };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sda/EnSda_Init.s")
s16 D_80947A6C[] = { 1, 2, 3, 3, 2, 1 };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sda/EnSda_Destroy.s")
s16 D_80947A78[] = { 2, 3, 4, 4, 4, 3, 2, 0 };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sda/EnSda_Update.s")
s16 D_80947A88[] = { 2, 3, 4, 4, 4, 4, 3, 2 };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sda/EnSda_Draw.s")
s16 D_80947A98[] = { 2, 4, 5, 5, 6, 6, 6, 6, 5, 5, 4, 2 };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sda/func_809469C0.s")
s16 D_80947AB0[] = { 2, 4, 5, 6, 7, 8, 8, 8, 8, 7, 6, 5, 4, 2 };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sda/func_8094702C.s")
s16 D_80947ACC[] = { 1, -1, 1, 1, 3, 4, 1, 6, 7, 2, 9, 0xA, 2, 0xC, 0xD, 0 };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Sda/func_80947668.s")
u8 D_80947AEC[] = {
2, 2, 2, 3, 3, 3, 3, 3, 3, 0, 0, 0, 0, 0, 0, 3,
};
s8 D_80947AFC[] = {
2, 9, 10, 11, 12, 13, 14, 0, 15, -1, 3, 4, 5, 6, 7, 8, -1, 1, 0, 0,
};
Vec3f D_80947B10[] = {
{ -1.0f, 2.0f, -0.2f }, { 0.0f, 2.0f, -0.5f }, { 1.0f, 2.0f, -0.2f }, { -2.0f, 1.0f, -0.5f },
{ -1.0f, 1.0f, -0.2f }, { 0.0f, 1.0f, -0.2f }, { 1.0f, 1.0f, -0.2f }, { 2.0f, 1.0f, -0.5f },
{ -2.0f, 0.0f, -0.5f }, { -1.0f, 0.0f, -0.2f }, { 0.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, -0.2f },
{ 2.0f, 0.0f, -0.5f }, { -2.0f, -1.0f, -0.5f }, { -1.0f, -1.0f, -0.2f }, { 0.0f, -1.0f, -0.1f },
{ 1.0f, -1.0f, -0.2f }, { 2.0f, -1.0f, -0.5f }, { -1.0f, -2.0f, -0.2f }, { 0.0f, -2.0f, -0.2f },
{ 1.0f, -2.0f, -0.2f }, { 0.0f, -3.0f, -0.5f }, { -1.0f, 2.0f, -0.2f }, { 0.0f, 2.0f, -0.5f },
{ 1.0f, 2.0f, -0.2f }, { -2.0f, 1.0f, -0.5f }, { -1.0f, 1.0f, -0.2f }, { 0.0f, 1.0f, -0.2f },
{ 1.0f, 1.0f, -0.2f }, { 2.0f, 1.0f, -0.5f }, { -2.0f, 0.0f, -0.5f }, { -1.0f, 0.0f, -0.2f },
{ 0.0f, 0.0f, 0.0f }, { 1.0f, 0.0f, -0.2f }, { 2.0f, 0.0f, -0.5f }, { -2.0f, -1.0f, -0.5f },
{ -1.0f, -1.0f, -0.2f }, { 0.0f, -1.0f, -0.1f }, { 1.0f, -1.0f, -0.2f }, { 2.0f, -1.0f, -0.5f },
{ -1.0f, -2.0f, -0.2f }, { 0.0f, -2.0f, -0.2f }, { 1.0f, -2.0f, -0.2f }, { 0.0f, -3.0f, -0.5f },
};
static s32 sPad[2] = { 0, 0 };
#include "overlays/ovl_En_Sda/ovl_En_Sda.c"
void EnSda_Init(Actor* thisx, GlobalContext* globalCtx) {
}
void EnSda_Destroy(Actor* thisx, GlobalContext* globalCtx) {
}
void EnSda_Update(Actor* thisx, GlobalContext* globalCtx) {
EnSda* this = THIS;
Player* player;
if (this->actor.params == ENSDA_1) {
player = (Player*)this->actor.parent;
} else {
player = GET_PLAYER(globalCtx);
}
this->actor.world.pos = player->actor.world.pos;
}
void EnSda_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnSda* this = THIS;
Player* player;
u8* shadowTexture = GRAPH_ALLOC(globalCtx->state.gfxCtx, 64 * 64);
if (this->actor.params == ENSDA_1) {
player = (Player*)this->actor.parent;
} else {
player = GET_PLAYER(globalCtx);
}
player->actor.shape.shadowAlpha = 0;
func_8094702C(this, shadowTexture, player, globalCtx);
if (KREG(0) < 5) {
func_80947668(shadowTexture, player, globalCtx);
}
}
void func_809469C0(Player* player, u8* shadowTexture, f32 arg2) {
s16 temp_t0;
s16 temp_t1;
s16 temp_v1;
s16 temp_v0;
s16 phi_a0;
s16 phi_a3;
s16 i;
s16 j;
Vec3f lerp;
Vec3f sp88;
Vec3f sp7C;
for (i = 0; i < 16; i++) {
if ((arg2 == 0.0f) || ((j = D_80947ACC[i]) >= 0)) {
if (arg2 > 0.0f) {
lerp.x = D_80947EA0[i].x + (D_80947EA0[j].x - D_80947EA0[i].x) * arg2;
lerp.y = D_80947EA0[i].y + (D_80947EA0[j].y - D_80947EA0[i].y) * arg2;
lerp.z = D_80947EA0[i].z + (D_80947EA0[j].z - D_80947EA0[i].z) * arg2;
sp88.x = lerp.x - player->actor.world.pos.x;
sp88.y = lerp.y - player->actor.world.pos.y + BREG(48) + 76.0f + 30.0f - 105.0f + 15.0f;
sp88.z = lerp.z - player->actor.world.pos.z;
} else {
sp88.x = D_80947EA0[i].x - player->actor.world.pos.x;
sp88.y = D_80947EA0[i].y - player->actor.world.pos.y + BREG(48) + 76.0f + 30.0f - 105.0f + 15.0f;
sp88.z = D_80947EA0[i].z - player->actor.world.pos.z;
}
Matrix_MultiplyVector3fByState(&sp88, &sp7C);
sp7C.x *= (1.0f + (BREG(49) / 100.0f));
sp7C.y *= (1.0f + (BREG(49) / 100.0f));
temp_t0 = sp7C.x + 32.0f;
temp_t1 = sp7C.y * 64.0f;
if (D_80947AEC[i] == 2) {
for (j = 0, phi_a3 = -0x180; j < 12; j++, phi_a3 += 0x40) {
for (phi_a0 = -D_80947A98[j]; phi_a0 < D_80947A98[j]; phi_a0++) {
temp_v1 = temp_t0 + phi_a0;
if ((temp_v1 >= 0) && (temp_v1 < 0x40)) {
temp_v0 = temp_t1 + phi_a3;
if ((temp_v0 >= 0) && (temp_v0 < 0x1000)) {
shadowTexture[temp_v1 + temp_v0] = 255;
}
}
}
}
} else if (D_80947AEC[i] == 1) {
for (j = 0, phi_a3 = -0x100; j < 8; j++, phi_a3 += 0x40) {
for (phi_a0 = -D_80947A88[j]; phi_a0 < D_80947A88[j]; phi_a0++) {
temp_v1 = temp_t0 + phi_a0;
if ((temp_v1 >= 0) && (temp_v1 < 0x40)) {
temp_v0 = temp_t1 + phi_a3;
if ((temp_v0 >= 0) && (temp_v0 < 0x1000)) {
shadowTexture[temp_v1 + temp_v0] = 255;
}
}
}
}
} else if (D_80947AEC[i] == 0) {
for (j = 0, phi_a3 = -0xC0; j < 7; j++, phi_a3 += 0x40) {
for (phi_a0 = -D_80947A78[j]; phi_a0 < D_80947A78[j] - 1; phi_a0++) {
temp_v1 = temp_t0 + phi_a0;
if ((temp_v1 >= 0) && (temp_v1 < 0x40)) {
temp_v0 = temp_t1 + phi_a3;
if ((temp_v0 >= 0) && (temp_v0 < 0x1000)) {
shadowTexture[temp_v1 + temp_v0] = 255;
}
}
}
}
} else if (D_80947AEC[i] == 4) {
for (j = 0, phi_a3 = -0x1C0; j < 14; j++, phi_a3 += 0x40) {
for (phi_a0 = -D_80947AB0[j]; phi_a0 < D_80947AB0[j]; phi_a0++) {
temp_v1 = temp_t0 + phi_a0;
if ((temp_v1 >= 0) && (temp_v1 < 0x40)) {
temp_v0 = temp_t1 + phi_a3;
if ((temp_v0 >= 0) && (temp_v0 < 0x1000)) {
shadowTexture[temp_v1 + temp_v0] = 255;
}
}
}
}
} else {
for (j = 0, phi_a3 = -0x80; j < 6; j++, phi_a3 += 0x40) {
for (phi_a0 = -D_80947A6C[j]; phi_a0 < D_80947A6C[j] - 1; phi_a0++) {
temp_v1 = temp_t0 + phi_a0;
if ((temp_v1 >= 0) && (temp_v1 < 0x40)) {
temp_v0 = temp_t1 + phi_a3;
if ((temp_v0 >= 0) && (temp_v0 < 0x1000)) {
shadowTexture[temp_v1 + temp_v0] = 255;
}
}
}
}
}
}
}
}
void func_8094702C(EnSda* this, u8* shadowTexture, Player* player, GlobalContext* globalCtx) {
s16 temp_t0;
s16 temp_t1;
s16 temp_v0;
s16 temp_v1;
s16 phi_a0;
s16 phi_a3;
s16 i;
s16 j;
Vec3f sp194;
Vec3f sp188;
s32* shadowTextureTemp32;
u8* shadowTextureTemp;
Vec3s sp178;
Vec3f sp16C;
Vec3f sp64[22];
if (BREG(57) != 0) {
for (shadowTextureTemp = shadowTexture, i = 0; i < 0x1000; i++, shadowTextureTemp++) {
if ((i >= 0 && i < 0x40) || (i >= 0xFC0 && i < 0x1000) || ((i & 0x3F) == 0) || ((i & 0x3F) == 0x3F)) {
*shadowTextureTemp = 255;
} else {
*shadowTextureTemp = 0;
}
}
} else {
for (shadowTextureTemp32 = (s32*)shadowTexture, i = 0; i < 0x400; i++, shadowTextureTemp32++) {
*shadowTextureTemp32 = 0;
}
}
Matrix_SetStateXRotation((BREG(50) + 70) / 100.0f);
for (i = 0; i < 18; i++) {
if (D_80947AFC[i] >= 0) {
D_80947EA0[D_80947AFC[i]] = player->bodyPartsPos[i];
}
}
D_80947EA0[0].y += 3.0f;
D_80947EA0[15].x = D_80947EA0[0].x + ((D_80947EA0[15].x - D_80947EA0[0].x) * 1.2f);
D_80947EA0[15].y = D_80947EA0[0].y + ((D_80947EA0[15].y - D_80947EA0[0].y) * -1.2f);
D_80947EA0[15].z = D_80947EA0[0].z + ((D_80947EA0[15].z - D_80947EA0[0].z) * 1.2f);
for (i = 0; i < 6; i++) {
func_809469C0(player, shadowTexture, i / 5.0f);
}
if (this->actor.params != ENSDA_1) {
func_8018219C(&player->shieldMf, &sp178, false);
sp178.y += (KREG(87) * 0x8000) + 0x8000;
sp178.x *= (KREG(88) - 1);
Matrix_InsertMatrix(&player->shieldMf, MTXMODE_NEW);
Matrix_MultiplyVector3fByState(&D_80947A60, &sp16C);
Matrix_RotateY(sp178.y, MTXMODE_NEW);
Matrix_InsertXRotation_s(sp178.x, MTXMODE_APPLY);
for (i = 0; i < 22; i++) {
Matrix_MultiplyVector3fByState(&D_80947B10[i], &sp188);
sp64[i].x = (((KREG(82) / 100.0f) + 4.0f) * sp188.x) + sp16C.x;
sp64[i].y = (((KREG(82) / 100.0f) + 4.0f) * sp188.y) + sp16C.y;
sp64[i].z = (((KREG(82) / 100.0f) + 4.0f) * sp188.z) + sp16C.z;
}
Matrix_SetStateXRotation((BREG(50) + 70) / 100.0f);
for (i = 0; i < 22; i++) {
sp194.x = sp64[i].x - player->actor.world.pos.x;
sp194.y = sp64[i].y - player->actor.world.pos.y + KREG(80) + 16.0f;
sp194.z = sp64[i].z - player->actor.world.pos.z;
Matrix_MultiplyVector3fByState(&sp194, &sp188);
sp188.x *= (1.0f + (KREG(90) / 100.0f));
sp188.y *= (1.0f + (KREG(90) / 100.0f));
temp_t0 = sp188.x + 32.0f;
temp_t1 = sp188.y * 64.0f;
do {
for (j = 0, phi_a3 = -0xC0; j < 7; j++, phi_a3 += 0x40) {
for (phi_a0 = -D_80947A78[j]; phi_a0 < D_80947A78[j] - 1; phi_a0++) {
temp_v0 = temp_t0 + phi_a0;
if ((temp_v0 >= 0) && (temp_v0 < 0x40)) {
temp_v1 = temp_t1 + phi_a3;
if ((temp_v1 >= 0) && (temp_v1 < 0x1000)) {
shadowTexture[temp_v0 + temp_v1] = 255;
}
}
}
}
j++;
} while (j < 6);
}
}
if (BREG(61) == 1) {
for (shadowTextureTemp = shadowTexture, i = 0; i < 0x1000; i++, shadowTextureTemp++) {
if (*shadowTextureTemp != 0) {
*shadowTextureTemp = -((i >> 6) * (BREG(60) + 4)) + (255 - BREG(61));
}
}
}
}
void func_80947668(u8* shadowTexture, Player* player, GlobalContext* globalCtx) {
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
f32 tempx;
f32 tempz;
s16 i;
OPEN_DISPS(gfxCtx);
func_8012C448(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_XLU_DISP++, 0x00, 0x00, 0, 0, 0, (BREG(52) + 50));
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, 0);
Matrix_InsertTranslation(player->actor.world.pos.x, player->actor.floorHeight, player->actor.world.pos.z,
MTXMODE_NEW);
Matrix_InsertYRotation_f(BREG(51) / 100.0f, MTXMODE_APPLY);
Matrix_Scale(1.0f, 1.0f, (BREG(63) / 10.0f) + 1.0f, MTXMODE_APPLY);
tempx = (BREG(62) / 10.0f) + 2.0f;
tempz = ((player->actor.world.pos.y - player->actor.floorHeight + BREG(54)) * (BREG(55) - 5) / 10.0f) + BREG(58) -
20.0f;
Matrix_InsertTranslation(tempx, 0.0f, tempz, MTXMODE_APPLY);
Matrix_Scale(((BREG(56) - 250) / 1000.0f) + 0.6f, 1.0f, ((BREG(59) - 250) / 1000.0f) + 0.6f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, ovl_En_Sda_DL_1498);
gDPLoadTextureBlock(POLY_XLU_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);
gSPDisplayList(POLY_XLU_DISP++, ovl_En_Sda_DL_14B8);
for (i = 0; i < KREG(78); i++) {
Matrix_Scale((KREG(79) / 100.0f) + 1.0f, 1.0f, (KREG(79) / 100.0f) + 1.0f, MTXMODE_APPLY);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_XLU_DISP++, ovl_En_Sda_DL_14B8);
}
CLOSE_DISPS(gfxCtx);
if (1) {}
}

2
src/overlays/actors/ovl_En_Sda/z_en_sda.h
View File

@ -5,6 +5,8 @@
struct EnSda;
#define ENSDA_1 1
typedef struct EnSda {
/* 0x000 */ Actor actor;
} EnSda; // size = 0x144