mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-07 13:03:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

z_bg_astr_bombwall decompiled (#841)

Browse Source 
* z_bg_astr_bombwall decompiled

* review fixes

* formatting

* pr review fixes

* PR review fixes

* PR review fixes

Co-authored-by: SonicDcer <noreply@github.com>
This commit is contained in:
Alejandro Asenjo
2022-06-19 19:28:48 -03:00
committed by GitHub
parent 689ef2fe0b
commit 67345d9be5
5 changed files with 179 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/PR/gbi.h
+1
View File
@@ -284,6 +284,7 @@
#define G_TEXTURE_GEN 0x00040000
#define G_TEXTURE_GEN_LINEAR 0x00080000
#define G_LOD 0x00100000 /* NOT IMPLEMENTED */
#define G_LIGHTING_POSITIONAL 0x00400000
#if (defined(F3DEX_GBI)||defined(F3DLP_GBI))
# define G_CLIPPING 0x00800000
#else
spec
+1 -2
View File
@@ -5002,8 +5002,7 @@ beginseg
name "ovl_Bg_Astr_Bombwall"
compress
include "build/src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.o"
include "build/data/ovl_Bg_Astr_Bombwall/ovl_Bg_Astr_Bombwall.data.o"
include "build/data/ovl_Bg_Astr_Bombwall/ovl_Bg_Astr_Bombwall.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Astr_Bombwall/ovl_Bg_Astr_Bombwall_reloc.o"
endseg
beginseg
src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.c
+169 -30
View File
@@ -5,6 +5,7 @@
*/
#include "z_bg_astr_bombwall.h"
#include "objects/object_astr_obj/object_astr_obj.h"
#define FLAGS 0x00000000
@@ -15,7 +16,13 @@ void BgAstrBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgAstrBombwall_Update(Actor* thisx, GlobalContext* globalCtx);
void BgAstrBombwall_Draw(Actor* thisx, GlobalContext* globalCtx);
#if 0
void func_80C0A378(BgAstrBombwall* this);
void func_80C0A38C(BgAstrBombwall* this, GlobalContext* globalCtx);
void func_80C0A400(BgAstrBombwall* this, GlobalContext* globalCtx);
void func_80C0A418(BgAstrBombwall* this, GlobalContext* globalCtx);
void func_80C0A458(BgAstrBombwall* this, GlobalContext* globalCtx);
void func_80C0A4BC(BgAstrBombwall* this, GlobalContext* globalCtx);
const ActorInit Bg_Astr_Bombwall_InitVars = {
ACTOR_BG_ASTR_BOMBWALL,
ACTORCAT_BG,
@@ -28,59 +35,191 @@ const ActorInit Bg_Astr_Bombwall_InitVars = {
(ActorFunc)BgAstrBombwall_Draw,
};
// static ColliderTrisElementInit sTrisElementsInit[2] = {
static ColliderTrisElementInit D_80C0A620[2] = {
static ColliderTrisElementInit sTrisElementsInit[2] = {
{
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
{
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
TOUCH_NONE | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_NONE,
},
{ { { -70.0f, 0.0f, 3.0f }, { 70.0f, 0.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } },
},
{
{ ELEMTYPE_UNK0, { 0x00000000, 0x00, 0x00 }, { 0x00000008, 0x00, 0x00 }, TOUCH_NONE | TOUCH_SFX_NORMAL, BUMP_ON, OCELEM_NONE, },
{
ELEMTYPE_UNK0,
{ 0x00000000, 0x00, 0x00 },
{ 0x00000008, 0x00, 0x00 },
TOUCH_NONE | TOUCH_SFX_NORMAL,
BUMP_ON,
OCELEM_NONE,
},
{ { { 70.0f, 0.0f, 3.0f }, { 70.0f, 200.0f, 3.0f }, { -70.0f, 200.0f, 3.0f } } },
},
};
// static ColliderTrisInit sTrisInit = {
static ColliderTrisInit D_80C0A698 = {
{ COLTYPE_NONE, AT_NONE, AC_ON | AC_TYPE_PLAYER, OC1_NONE, OC2_NONE, COLSHAPE_TRIS, },
2, D_80C0A620, // sTrisElementsInit,
static ColliderTrisInit sTrisInit = {
{
COLTYPE_NONE,
AT_NONE,
AC_ON | AC_TYPE_PLAYER,
OC1_NONE,
OC2_NONE,
COLSHAPE_TRIS,
},
2,
sTrisElementsInit,
};
// static InitChainEntry sInitChain[] = {
static InitChainEntry D_80C0A6A8[] = {
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 1000, ICHAIN_STOP),
};
#endif
void BgAstrBombwall_InitCollider(ColliderTrisInit* init, Vec3f* pos, Vec3s* rot, ColliderTris* collider) {
s32 i;
s32 j;
Vec3f sp54[3];
extern ColliderTrisElementInit D_80C0A620[2];
extern ColliderTrisInit D_80C0A698;
extern InitChainEntry D_80C0A6A8[];
Matrix_RotateYS(rot->y, MTXMODE_NEW);
Matrix_RotateXS(rot->x, MTXMODE_APPLY);
Matrix_RotateZS(rot->z, MTXMODE_APPLY);
extern UNK_TYPE D_06002178;
extern UNK_TYPE D_06002380;
extern UNK_TYPE D_06002498;
for (i = 0; i < init->count; i++) {
for (j = 0; j < 3; j++) { // https://decomp.me/scratch/JrEnl
Matrix_MultVec3f(&(init->elements + i)->dim.vtx[j], &sp54[j]); //! FAKE MATCH:
Math_Vec3f_Sum(&sp54[j], pos, &sp54[j]);
}
Collider_SetTrisVertices(collider, i, &sp54[0], &sp54[1], &sp54[2]);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C09ED0.s")
void BgAstrBombwall_Init(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
BgAstrBombwall* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/BgAstrBombwall_Init.s")
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyActor_Init(&this->dyna, 1);
DynaPolyActor_LoadMesh(globalCtx, &this->dyna, &object_astr_obj_Colheader_002498);
Collider_InitTris(globalCtx, &this->collider);
if (Flags_GetSwitch(globalCtx, BGASTRBOMBWALL_GET_SWITCHFLAG(thisx))) {
Actor_MarkForDeath(&this->dyna.actor);
return;
}
this->dyna.actor.flags |= ACTOR_FLAG_10000000;
if (!Collider_SetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInit, this->colliderElements)) {
Actor_MarkForDeath(&this->dyna.actor);
return;
}
BgAstrBombwall_InitCollider(&sTrisInit, &this->dyna.actor.world.pos, &this->dyna.actor.shape.rot, &this->collider);
SubS_FillCutscenesList(&this->dyna.actor, this->cutscenes, ARRAY_COUNT(this->cutscenes));
func_80C0A378(this);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/BgAstrBombwall_Destroy.s")
void BgAstrBombwall_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgAstrBombwall* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A120.s")
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A378.s")
void func_80C0A120(BgAstrBombwall* this, GlobalContext* globalCtx) {
s32 i;
Vec3f vec;
Vec3f pos;
s16 var_v0;
Vec3f velocity;
f32 rand;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A38C.s")
Matrix_RotateYS(this->dyna.actor.shape.rot.y, MTXMODE_NEW);
for (i = 0; i < 30; i++) {
vec.x = Rand_Centered() * 140.0f;
vec.y = Rand_ZeroOne() * 200.0f;
vec.z = 0.0f;
Matrix_MultVec3f(&vec, &pos);
Math_Vec3f_Sum(&this->dyna.actor.world.pos, &pos, &pos);
func_800BBFB0(globalCtx, &pos, 50.0f, 2, Rand_ZeroOne() * 120.0f + 20.0f, Rand_ZeroOne() * 240.0f + 20.0f, 0);
velocity.x = Rand_ZeroOne() * 2.5f;
velocity.y = (Rand_ZeroOne() * 2.5f) + 1.0f;
velocity.z = Rand_ZeroOne() * 2.5f;
rand = Rand_ZeroOne();
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A400.s")
if (rand < 0.2f) {
var_v0 = 0x60;
} else if (rand < 0.6f) {
var_v0 = 0x40;
} else {
var_v0 = 0x20;
}
EffectSsKakera_Spawn(globalCtx, &pos, &velocity, &pos, -260, var_v0, 20, 0, 0, 10, 0, 0, 50, -1,
OBJECT_ASTR_OBJ, object_astr_obj_DL_002178);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A418.s")
void func_80C0A378(BgAstrBombwall* this) {
this->actionFunc = func_80C0A38C;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A458.s")
void func_80C0A38C(BgAstrBombwall* this, GlobalContext* globalCtx) {
if (this->collider.base.acFlags & AC_HIT) {
this->collider.base.acFlags &= ~AC_HIT;
Flags_SetSwitch(globalCtx, BGASTRBOMBWALL_GET_SWITCHFLAG(&this->dyna.actor));
func_80C0A400(this, globalCtx);
} else {
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/func_80C0A4BC.s")
void func_80C0A400(BgAstrBombwall* this, GlobalContext* globalCtx) {
this->actionFunc = func_80C0A418;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/BgAstrBombwall_Update.s")
void func_80C0A418(BgAstrBombwall* this, GlobalContext* globalCtx) {
if (SubS_StartActorCutscene(&this->dyna.actor, this->cutscenes[0], -1, SUBS_CUTSCENE_SET_UNK_LINK_FIELDS)) {
func_80C0A458(this, globalCtx);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_Bg_Astr_Bombwall/BgAstrBombwall_Draw.s")
void func_80C0A458(BgAstrBombwall* this, GlobalContext* globalCtx) {
func_800C62BC(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
this->dyna.actor.draw = NULL;
func_80C0A120(this, globalCtx);
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EV_WALL_BROKEN);
this->actionFunc = func_80C0A4BC;
}
void func_80C0A4BC(BgAstrBombwall* this, GlobalContext* globalCtx) {
}
void BgAstrBombwall_Update(Actor* thisx, GlobalContext* globalCtx) {
BgAstrBombwall* this = THIS;
this->actionFunc(this, globalCtx);
}
void BgAstrBombwall_Draw(Actor* thixs, GlobalContext* globalCtx) {
{
Gfx* opa;
OPEN_DISPS(globalCtx->state.gfxCtx);
opa = POLY_OPA_DISP;
gSPDisplayList(&opa[0], &sSetupDL[25 * 6]);
gSPMatrix(&opa[1], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSetGeometryMode(&opa[2], G_LIGHTING_POSITIONAL);
gSPDisplayList(&opa[3], object_astr_obj_DL_002380);
POLY_OPA_DISP = &opa[4];
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
{
Gfx* xlu;
OPEN_DISPS(globalCtx->state.gfxCtx);
xlu = POLY_XLU_DISP;
gSPDisplayList(&xlu[0], &sSetupDL[25 * 6]);
gSPMatrix(&xlu[1], Matrix_NewMtx(globalCtx->state.gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSetGeometryMode(&xlu[2], G_LIGHTING_POSITIONAL);
gSPDisplayList(&xlu[3], object_astr_obj_DL_0022E0);
POLY_XLU_DISP = &xlu[4];
CLOSE_DISPS(globalCtx->state.gfxCtx);
}
}
src/overlays/actors/ovl_Bg_Astr_Bombwall/z_bg_astr_bombwall.h
+8 -7
View File
@@ -5,15 +5,16 @@
struct BgAstrBombwall;
#define BGASTRBOMBWALL_GET_SWITCHFLAG(thisx) ((thisx)->params & 0x7F)
typedef void (*BgAstrBombwallActionFunc)(struct BgAstrBombwall*, GlobalContext*);
typedef struct BgAstrBombwall {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0x18];
/* 0x015C */ BgAstrBombwallActionFunc actionFunc;
/* 0x0160 */ char unk_160[0xDC];
} BgAstrBombwall; // size = 0x23C
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ BgAstrBombwallActionFunc actionFunc;
/* 0x160 */ ColliderTris collider;
/* 0x180 */ ColliderTrisElement colliderElements[2];
/* 0x238 */ s16 cutscenes[1];
} BgAstrBombwall;
extern const ActorInit Bg_Astr_Bombwall_InitVars;
#endif // Z_BG_ASTR_BOMBWALL_H
undefined_syms.txt
-7
View File
@@ -540,13 +540,6 @@ D_06011AB8 = 0x06011AB8;
D_06012A80 = 0x06012A80;
D_06013138 = 0x06013138;
// ovl_Bg_Astr_Bombwall
D_06002178 = 0x06002178;
D_060022E0 = 0x060022E0;
D_06002380 = 0x06002380;
D_06002498 = 0x06002498;
// ovl_Bg_Botihasira
D_06000638 = 0x06000638;