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

En_Test (#756) 

* En_Test

* PR

* PR

* PR

* Fix
This commit is contained in:
Maide 2022-03-29 21:14:29 +01:00 committed by GitHub
parent f5ba6986f9
commit 98143afb1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 261 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
assets/xml/objects/gameplay_keep.xml
View File

@ -1262,7 +1262,8 @@
<Texture Name="gameplay_keep_Tex_06ABF8" OutName="tex_06ABF8" Format="rgba16" Width="36" Height="36" Offset="0x6ABF8" />
<TextureAnimation Name="gameplay_keep_Matanimheader_06B6A0" Offset="0x6B6A0" />
<TextureAnimation Name="gameplay_keep_Matanimheader_06B730" Offset="0x6B730" />
<Blob Name="gameplay_keep_Blob_06B750" Size="0x3D0" Offset="0x6B750" />
<Blob Name="gameplay_keep_Blob_06B750" Size="0x3BC" Offset="0x6B750" />
<Blob Name="gameplay_keep_Blob_06BB0C" Size="0x4D4" Offset="0x6BB0C" />
<DList Name="gameplay_keep_DL_06BFE0" Offset="0x6BFE0" />
<DList Name="gameplay_keep_DL_06C098" Offset="0x6C098" />
<DList Name="gameplay_keep_DL_06C1E8" Offset="0x6C1E8" />
@ -1271,7 +1272,8 @@
<Texture Name="gameplay_keep_Tex_06D350" OutName="tex_06D350" Format="i4" Width="64" Height="64" Offset="0x6D350" />
<Texture Name="gameplay_keep_Tex_06DB50" OutName="tex_06DB50" Format="i4" Width="64" Height="64" Offset="0x6DB50" />
<Texture Name="gameplay_keep_Tex_06E350" OutName="tex_06E350" Format="i4" Width="64" Height="64" Offset="0x6E350" />
<Blob Name="gameplay_keep_Blob_06EB50" Size="0x30" Offset="0x6EB50" />
<Blob Name="gameplay_keep_Blob_06EB50" Size="0x20" Offset="0x6EB50" />
<Blob Name="gameplay_keep_Blob_06EB70" Size="0x10" Offset="0x6EB70" />
<Texture Name="gameplay_keep_Tex_06EB80" OutName="tex_06EB80" Format="i4" Width="64" Height="64" Offset="0x6EB80" />
<DList Name="gameplay_keep_DL_06F380" Offset="0x6F380" />
<DList Name="gameplay_keep_DL_06F9F0" Offset="0x6F9F0" />

3
spec
View File

@ -736,8 +736,7 @@ beginseg
name "ovl_En_Test"
compress
include "build/src/overlays/actors/ovl_En_Test/z_en_test.o"
include "build/data/ovl_En_Test/ovl_En_Test.data.o"
include "build/data/ovl_En_Test/ovl_En_Test.reloc.o"
include "build/src/overlays/actors/ovl_En_Test/ovl_En_Test_reloc.o"
endseg
beginseg

247
src/overlays/actors/ovl_En_Test/z_en_test.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_test.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#define FLAGS (ACTOR_FLAG_10)
@ -15,7 +16,6 @@ void EnTest_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnTest_Update(Actor* thisx, GlobalContext* globalCtx);
void EnTest_Draw(Actor* thisx, GlobalContext* globalCtx);
#if 0
const ActorInit En_Test_InitVars = {
ACTOR_EN_TEST,
ACTORCAT_ITEMACTION,
@ -28,22 +28,247 @@ const ActorInit En_Test_InitVars = {
(ActorFunc)EnTest_Draw,
};
#endif
void func_80862B70(EnTestStruct* arg0) {
s32 i;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/func_80862B70.s")
for (i = 0; i < 20; i++) {
EnTestStruct* ptr = &arg0[i];
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/func_80862CBC.s")
ptr->unk_00 = false;
ptr->unk_04 = 0;
ptr->unk_08.x = 0.0f;
ptr->unk_08.y = 0.0f;
ptr->unk_08.z = 0.0f;
ptr->unk_14.x = 0.0f;
ptr->unk_14.y = 0.0f;
ptr->unk_14.z = 0.0f;
ptr->unk_20.x = 0.0f;
ptr->unk_20.y = 0.0f;
ptr->unk_20.z = 0.0f;
ptr->unk_2C = 0.001f;
ptr->unk_30.x = 0;
ptr->unk_30.y = 0;
ptr->unk_30.z = 0;
ptr->unk_36.x = 0;
ptr->unk_36.y = 0;
ptr->unk_36.z = 0;
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/func_80862EDC.s")
void func_80862CBC(EnTestStruct* arg0, Vec3f* arg1) {
EnTestStruct* ptr;
s32 i;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/func_80863048.s")
for (i = 0; i < 20; i++) {
ptr = &arg0[i];
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/EnTest_Init.s")
if (!ptr->unk_00) {
s16 sp26 = Rand_ZeroOne() * 0xFFFF;
f32 sp20;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/EnTest_Destroy.s")
ptr->unk_00 = true;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/EnTest_Update.s")
ptr->unk_08.x = (Math_CosS(sp26) * 20.0f) + arg1->x;
ptr->unk_08.y = arg1->y;
ptr->unk_08.z = (Math_SinS(sp26) * 20.0f) + arg1->z;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/func_808634B8.s")
sp20 = Rand_ZeroOne();
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Test/EnTest_Draw.s")
ptr->unk_14.x = Math_CosS(sp26) * 13.0f * sp20;
ptr->unk_14.y = (Rand_ZeroOne() * 5.0f) + 8.0f;
ptr->unk_14.z = (Math_SinS(sp26) * 13.0f) * sp20;
ptr->unk_20.x = 0.0f;
ptr->unk_20.z = 0.0f;
ptr->unk_20.y = -2.0f;
ptr->unk_2C = (Rand_ZeroOne() * 0.0004f) + 0.0004f;
ptr->unk_30.x = Rand_ZeroOne() * 0x7FFE;
ptr->unk_30.y = Rand_ZeroOne() * 0x7FFE;
ptr->unk_30.z = Rand_ZeroOne() * 0x7FFE;
ptr->unk_36.x = Rand_ZeroOne() * 0x2000;
ptr->unk_36.y = Rand_ZeroOne() * 0x2000;
ptr->unk_36.z = Rand_ZeroOne() * 0x2000;
ptr->unk_04 = 10;
break;
}
}
}
void func_80862EDC(EnTestStruct* arg0) {
s32 i;
EnTestStruct* ptr;
for (i = 0; i < 20; i++) {
ptr = &arg0[i];
if (ptr->unk_00) {
ptr->unk_04--;
if (ptr->unk_04 < 0) {
ptr->unk_00 = false;
}
ptr->unk_08.x += ptr->unk_14.x;
ptr->unk_08.y += ptr->unk_14.y;
ptr->unk_08.z += ptr->unk_14.z;
ptr->unk_14.x += ptr->unk_20.x;
ptr->unk_14.y += ptr->unk_20.y;
ptr->unk_14.z += ptr->unk_20.z;
ptr->unk_30.x += ptr->unk_36.x;
ptr->unk_30.y += ptr->unk_36.y;
ptr->unk_30.z += ptr->unk_36.z;
}
}
}
void func_80863048(GlobalContext* globalCtx, EnTestStruct* arg1) {
EnTestStruct* ptr;
s32 i;
Mtx* mtx;
OPEN_DISPS(globalCtx->state.gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, 255, 255, 255, 255);
gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 255, 255);
for (i = 0; i < 20; i++) {
ptr = &arg1[i];
if (!ptr->unk_00) {
continue;
}
Matrix_InsertTranslation(ptr->unk_08.x, ptr->unk_08.y, ptr->unk_08.z, MTXMODE_NEW);
Matrix_InsertRotation(ptr->unk_30.x, ptr->unk_30.y, ptr->unk_30.z, MTXMODE_APPLY);
Matrix_Scale(ptr->unk_2C, ptr->unk_2C, ptr->unk_2C, MTXMODE_APPLY);
mtx = Matrix_NewMtx(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gameplay_keep_DL_06AB30);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
void EnTest_Init(Actor* thisx, GlobalContext* globalCtx2) {
GlobalContext* globalCtx = globalCtx2;
EnTest* this = THIS;
MtxF sp38;
s32 sp34;
this->unk_209 = 0;
this->unk_174 = 0;
if (thisx->params > 0) {
Actor_SetScale(thisx, thisx->params / 100000.0f);
this->unk_20A = 0;
} else {
thisx->floorPoly = NULL;
thisx->world.pos.y += 10.0f;
thisx->floorHeight =
BgCheck_EntityRaycastFloor3(&globalCtx->colCtx, &thisx->floorPoly, &sp34, &thisx->world.pos);
if ((thisx->floorPoly == NULL) || (thisx->floorHeight == BGCHECK_Y_MIN)) {
Actor_MarkForDeath(thisx);
return;
}
thisx->world.pos.y = thisx->floorHeight;
func_800C0094(thisx->floorPoly, thisx->world.pos.x, thisx->floorHeight, thisx->world.pos.z, &sp38);
func_8018219C(&sp38, &thisx->shape.rot, 1);
thisx->world.rot = thisx->shape.rot;
this->unk_20A = func_800C9BB8(&globalCtx->colCtx, thisx->floorPoly, sp34);
}
func_80183430(&this->skeletonInfo, &gameplay_keep_Blob_06EB70, &gameplay_keep_Blob_06BB0C, this->unk_178,
this->unk_1C0, NULL);
func_801834A8(&this->skeletonInfo, &gameplay_keep_Blob_06BB0C);
this->skeletonInfo.frameCtrl.unk_10 = 9.0f;
func_80862B70(this->unk_20C);
}
void EnTest_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnTest* this = THIS;
func_8018349C(&this->skeletonInfo);
}
void EnTest_Update(Actor* thisx, GlobalContext* globalCtx) {
EnTest* this = THIS;
s32 i;
this->unk_208 = this->skeletonInfo.frameCtrl.unk_10;
if (func_80183DE0(&this->skeletonInfo) && (this->actor.parent == NULL) && (this->actor.params != -1)) {
this->unk_209++;
if (this->unk_209 > 20) {
Actor_MarkForDeath(&this->actor);
}
}
if ((this->actor.params != -1) && (this->unk_208 >= 2)) {
if (!(this->unk_174 & 1)) {
this->unk_174 |= 1;
for (i = 0; i < ARRAY_COUNT(this->unk_20C); i++) {
func_80862CBC(this->unk_20C, &this->actor.world.pos);
}
}
}
func_80862EDC(this->unk_20C);
}
s32 EnTest_OverrideKeyframeDraw(GlobalContext* globalCtx, SkeletonInfo* skeletonInfo, s32 limbIndex, Gfx** dList,
u8* flags, Actor* thisx, Vec3f* scale, Vec3s* rot, Vec3f* pos) {
EnTest* this = THIS;
OPEN_DISPS(globalCtx->state.gfxCtx);
if ((this->actor.params == -1) && ((limbIndex == 1) || (limbIndex == 2))) {
*dList = NULL;
}
if ((this->actor.params == -2) && (limbIndex == 3)) {
*dList = NULL;
}
if (limbIndex == 3) {
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 0, 0, 0, ((20 - this->unk_209) * 255.0f) / 20.0f);
gDPSetEnvColor(POLY_XLU_DISP++, 0, 0, 0, ((20 - this->unk_209) * 255.0f) / 20.0f);
}
CLOSE_DISPS(globalCtx->state.gfxCtx);
return true;
}
void EnTest_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnTest* this = THIS;
Mtx* sp28;
s32 sp2C = this->unk_208 - 1;
if (sp2C >= 29) {
sp2C = 29;
}
if ((this->unk_20A == 15) || (this->unk_20A == 14)) {
AnimatedMat_DrawStep(globalCtx, Lib_SegmentedToVirtual(gameplay_keep_Matanimheader_06B730), sp2C);
} else {
AnimatedMat_DrawStep(globalCtx, Lib_SegmentedToVirtual(gameplay_keep_Matanimheader_06B6A0), sp2C);
}
sp28 = GRAPH_ALLOC(globalCtx->state.gfxCtx, ALIGN16(this->skeletonInfo.unk_18->unk_1 * sizeof(Mtx)));
if (sp28 != NULL) {
func_8012C2DC(globalCtx->state.gfxCtx);
func_8018450C(globalCtx, &this->skeletonInfo, sp28, EnTest_OverrideKeyframeDraw, NULL, thisx);
func_80863048(globalCtx, this->unk_20C);
}
}

20
src/overlays/actors/ovl_En_Test/z_en_test.h
View File

@ -5,9 +5,27 @@
struct EnTest;
typedef struct {
/* 0x00 */ s32 unk_00;
/* 0x04 */ s32 unk_04;
/* 0x08 */ Vec3f unk_08;
/* 0x14 */ Vec3f unk_14;
/* 0x20 */ Vec3f unk_20;
/* 0x2C */ f32 unk_2C;
/* 0x30 */ Vec3s unk_30;
/* 0x36 */ Vec3s unk_36;
} EnTestStruct; // size = 0x3C
typedef struct EnTest {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x578];
/* 0x144 */ SkeletonInfo skeletonInfo;
/* 0x174 */ s32 unk_174;
/* 0x178 */ Vec3s unk_178[12];
/* 0x1C0 */ s16 unk_1C0[36];
/* 0x208 */ u8 unk_208;
/* 0x209 */ u8 unk_209;
/* 0x20A */ u8 unk_20A;
/* 0x20C */ EnTestStruct unk_20C[20];
} EnTest; // size = 0x6BC
extern const ActorInit En_Test_InitVars;

2
tools/disasm/functions.txt
View File

@ -4893,7 +4893,7 @@
0x80863188:("EnTest_Init",),
0x80863310:("EnTest_Destroy",),
0x8086333C:("EnTest_Update",),
0x808634B8:("func_808634B8",),
0x808634B8:("EnTest_OverrideKeyframeDraw",),
0x808636A8:("EnTest_Draw",),
0x80863870:("EnGirlA_SetupAction",),
0x8086387C:("EnGirlA_InitObjIndex",),