Game-Decompilation/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2024-11-23 12:59:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ovl_En_Snowwd decompiled (#1276)

Browse Source 
* ovl_En_Snowwd decompiled

* formatting

* improved

* improvements

* D_80AF7AC8

* params

* D_06001AA0

* improvements
This commit is contained in:
Nuss 2023-06-11 15:35:09 +02:00 committed by GitHub
parent 47be99fb0c
commit 21671975ec
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 102 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
assets/xml/objects/object_snowwd.xml
View File

@ -2,8 +2,8 @@
<File Name="object_snowwd" Segment="6">
<DList Name="object_snowwd_DL_000190" Offset="0x190" />
<DList Name="object_snowwd_DL_000198" Offset="0x198" />
<!-- <Blob Name="object_snowwd_Blob_0002A0" Size="0x1000" Offset="0x2A0" /> -->
<Texture Name="object_snowwd_Tex_002A0" OutName="tex_002A0" Format="rgba16" Width="32" Height="64" Offset="0x2A0" />
<Texture Name="object_snowwd_Tex_0012A0" OutName="tex_0012A0" Format="rgba16" Width="32" Height="32" Offset="0x12A0" />
<!-- <Blob Name="object_snowwd_Blob_001AA0" Size="0x1000" Offset="0x1AA0" /> -->
<Texture Name="object_snowwd_Tex_001AA0" OutName="tex_001AA0" Format="rgba16" Width="32" Height="64" Offset="0x1AA0" />
</File>
</Root>

3
spec
View File

@ -3481,8 +3481,7 @@ beginseg
name "ovl_En_Snowwd"
compress
include "build/src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.o"
include "build/data/ovl_En_Snowwd/ovl_En_Snowwd.data.o"
include "build/data/ovl_En_Snowwd/ovl_En_Snowwd.reloc.o"
include "build/src/overlays/actors/ovl_En_Snowwd/ovl_En_Snowwd_reloc.o"
endseg
beginseg

108
src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.c
View File

@ -5,6 +5,7 @@
*/
#include "z_en_snowwd.h"
#include "objects/object_snowwd/object_snowwd.h"
#define FLAGS 0x00000000
@ -17,7 +18,6 @@ void EnSnowwd_Draw(Actor* thisx, PlayState* play);
void func_80AF76F0(EnSnowwd* this, PlayState* play);
#if 0
ActorInit En_Snowwd_InitVars = {
ACTOR_EN_SNOWWD,
ACTORCAT_PROP,
@ -30,25 +30,107 @@ ActorInit En_Snowwd_InitVars = {
(ActorFunc)EnSnowwd_Draw,
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_80AF7A90 = {
{ COLTYPE_TREE, AT_NONE, AC_ON | AC_HARD | AC_TYPE_PLAYER, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
{ ELEMTYPE_UNK5, { 0x00000000, 0x00, 0x00 }, { 0x0100020A, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_ON, },
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_TREE,
AT_NONE,
AC_ON | AC_HARD | AC_TYPE_PLAYER,
OC1_ON | OC1_TYPE_ALL,
OC2_TYPE_1,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK5,
{ 0x00000000, 0x00, 0x00 },
{ 0x0100020A, 0x00, 0x00 },
TOUCH_NONE | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_ON,
},
{ 18, 60, 0, { 0, 0, 0 } },
};
#endif
Vec3f D_80AF7ABC = { 0.0f, 0.0f, 0.0f };
extern ColliderCylinderInit D_80AF7A90;
Vec3f D_80AF7AC8 = { 0.0f, -4.0f, 0.0f };
extern UNK_TYPE D_06001AA0;
Color_RGBA8 D_80AF7AD4 = { 255, 255, 255, 255 };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Snowwd/EnSnowwd_Init.s")
Color_RGBA8 D_80AF7AD8 = { 200, 200, 220, 0 };
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Snowwd/EnSnowwd_Destroy.s")
void EnSnowwd_Init(Actor* thisx, PlayState* play) {
EnSnowwd* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Snowwd/func_80AF76F0.s")
this->actor.home.rot.z = 0;
this->actor.home.rot.y = 0;
this->unk190 = 0;
this->actor.uncullZoneForward = 4000.0f;
this->actor.uncullZoneScale = 2000.0f;
this->actor.uncullZoneDownward = 2400.0f;
Collider_InitAndSetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
Actor_SetScale(&this->actor, 1.0f);
this->actionFunc = func_80AF76F0;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Snowwd/EnSnowwd_Update.s")
void EnSnowwd_Destroy(Actor* thisx, PlayState* play) {
EnSnowwd* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Snowwd/EnSnowwd_Draw.s")
Collider_DestroyCylinder(play, &this->collider);
}
void func_80AF76F0(EnSnowwd* this, PlayState* play) {
s32 pad;
Actor* thisx = &this->actor;
f32 sp54;
Vec3f sp48;
if (this->collider.base.acFlags & AC_HIT) {
this->collider.base.acFlags &= ~AC_HIT;
Actor_PlaySfx(thisx, NA_SE_IT_REFLECTION_WOOD);
}
if (thisx->home.rot.y != 0) {
this->unk190 = 0x15;
thisx->home.rot.y = 0;
if (thisx->home.rot.z == 0) {
if (SNOWWD_GET_PARAM_F80(&this->actor) < 0x10) {
sp48 = thisx->world.pos;
sp48.y += 200.0f;
Item_DropCollectibleRandom(play, NULL, &sp48, SNOWWD_GET_PARAM_F80(&this->actor) * 0x10);
}
thisx->home.rot.z = 1;
}
}
if (thisx->xzDistToPlayer < 600.0f) {
Collider_UpdateCylinder(thisx, &this->collider);
CollisionCheck_SetAC(play, &play->colChkCtx, &this->collider.base);
CollisionCheck_SetOC(play, &play->colChkCtx, &this->collider.base);
}
if (this->unk190 > 0) {
this->unk190--;
sp54 = Math_SinS((s16)((this->unk190 ^ 0xFFFF) * 0x3332)) * 250.0f;
thisx->shape.rot.x = (s16)(Math_CosS(thisx->yawTowardsPlayer - thisx->shape.rot.y) * sp54);
thisx->shape.rot.z = (s16)(Math_SinS(thisx->yawTowardsPlayer - thisx->shape.rot.y) * sp54);
sp48 = thisx->world.pos;
sp48.x += Rand_CenteredFloat(80.0f);
sp48.y += 100.0f + Rand_ZeroFloat(30.0f);
sp48.z += Rand_CenteredFloat(80.0f);
func_800B0EB0(play, &sp48, &D_80AF7AC8, &D_80AF7ABC, &D_80AF7AD4, &D_80AF7AD8, 200, 10, 20);
}
}
void EnSnowwd_Update(Actor* thisx, PlayState* play) {
EnSnowwd* this = THIS;
this->actionFunc(this, play);
}
void EnSnowwd_Draw(Actor* thisx, PlayState* play) {
OPEN_DISPS(play->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
Gfx_SetupDL25_Opa(play->state.gfxCtx);
gSPSegment(POLY_OPA_DISP++, 0x08, Lib_SegmentedToVirtual(object_snowwd_Tex_001AA0));
gSPDisplayList(POLY_OPA_DISP++, object_snowwd_DL_000198);
CLOSE_DISPS(play->state.gfxCtx);
}

5
src/overlays/actors/ovl_En_Snowwd/z_en_snowwd.h
View File

@ -3,13 +3,16 @@
#include "global.h"
#define SNOWWD_GET_PARAM_F80(thisx) (((thisx)->params & 0xF80) >> 7)
struct EnSnowwd;
typedef void (*EnSnowwdActionFunc)(struct EnSnowwd*, PlayState*);
typedef struct EnSnowwd {
/* 0x000 */ Actor actor;
/* 0x144 */ char unk_144[0x50];
/* 0x144 */ ColliderCylinder collider;
/* 0x190 */ s16 unk190;
/* 0x194 */ EnSnowwdActionFunc actionFunc;
} EnSnowwd; // size = 0x198