mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-08-19 21:32:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

document object_tsubo, object_racetsubo and object_obj_chan (#1346)

Browse Source 
* initial commit of object_tsubo, object_racetsubo and object_obj_chan documentation

* little description in chandelier xml

* desc between root and file

* changed green pot to race pot

* changed race pot to magic pot

* space in desc

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

---------

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
This commit is contained in:
MegaIDK
2023-08-14 21:34:52 -03:00
committed by GitHub
parent f0ca606cd2
commit 17b7f3f90e
5 changed files with 37 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/overlays/actors/ovl_Obj_Chan/z_obj_chan.c
+4 -4
View File
@@ -357,7 +357,7 @@ void ObjChan_CreateSmashEffects(ObjChan* this, PlayState* play) {
}
new_var2 = spA4 * Rand_ZeroOne();
EffectSsKakera_Spawn(play, &spDC, &spD0, &this->actor.world.pos, -260, phi_s0, 20, 0, 0, spA8 + new_var2, 0, 0,
50, -1, OBJECT_TSUBO, object_tsubo_DL_001960);
50, -1, OBJECT_TSUBO, gPotShardDL);
}
func_800BBFB0(play, &this->actor.world.pos, 30.0f, 2, 20, 50, true);
func_800BBFB0(play, &this->actor.world.pos, 30.0f, 2, 10, 80, true);
@@ -382,12 +382,12 @@ void ObjChan_Draw(Actor* thisx, PlayState* play) {
opa = Gfx_SetupDL(POLY_OPA_DISP, SETUPDL_25);
gSPMatrix(&opa[0], Matrix_NewMtx(play->state.gfxCtx), G_MTX_LOAD);
gSPDisplayList(&opa[1], object_obj_chan_DL_000AF0);
gSPDisplayList(&opa[1], gChandelierCenterDL);
POLY_OPA_DISP = &opa[2];
xlu = Gfx_SetupDL71(POLY_XLU_DISP);
gSPMatrix(&xlu[0], Matrix_NewMtx(play->state.gfxCtx), G_MTX_LOAD);
gSPDisplayList(&xlu[1], object_obj_chan_DL_000A10);
gSPDisplayList(&xlu[1], gChandelierPotHolderDL);
POLY_XLU_DISP = &xlu[2];
CLOSE_DISPS(play->state.gfxCtx);
@@ -408,7 +408,7 @@ void ObjChan_DrawPot(Actor* thisx, PlayState* play) {
dl = Gfx_SetupDL(POLY_OPA_DISP, SETUPDL_25);
gSPMatrix(&dl[0], Matrix_NewMtx(play->state.gfxCtx), G_MTX_LOAD);
gSPDisplayList(&dl[1], object_obj_chan_DL_002358);
gSPDisplayList(&dl[1], gChandelierPotDL);
POLY_OPA_DISP = &dl[2];
CLOSE_DISPS(play->state.gfxCtx);
src/overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.c
+9 -10
View File
@@ -20,11 +20,11 @@ void ObjTsubo_Update(Actor* thisx, PlayState* play);
void ObjTsubo_Draw(Actor* thisx, PlayState* play2);
void ObjTsubo_PotBreak1(ObjTsubo* this, PlayState* play);
void ObjTsubo_RacePotBreak1(ObjTsubo* this, PlayState* play);
void ObjTsubo_MagicPotBreak1(ObjTsubo* this, PlayState* play);
void ObjTsubo_PotBreak2(ObjTsubo* this, PlayState* play2);
void ObjTsubo_RacePotBreak2(ObjTsubo* this, PlayState* play2);
void ObjTsubo_MagicPotBreak2(ObjTsubo* this, PlayState* play2);
void ObjTsubo_PotBreak3(ObjTsubo* this, PlayState* play2);
void ObjTsubo_RacePotBreak3(ObjTsubo* this, PlayState* play2);
void ObjTsubo_MagicPotBreak3(ObjTsubo* this, PlayState* play2);
void func_80928914(ObjTsubo* this);
void func_80928928(ObjTsubo* this, PlayState* play);
void func_809289B4(ObjTsubo* this);
@@ -68,10 +68,9 @@ typedef struct {
ObjTsuboData sPotTypeData[4] = {
{ GAMEPLAY_DANGEON_KEEP, 0.197f, gameplay_dangeon_keep_DL_017EA0, gameplay_dangeon_keep_DL_018090, 12, 32,
ObjTsubo_PotBreak1, ObjTsubo_PotBreak2, ObjTsubo_PotBreak3 },
{ OBJECT_RACETSUBO, 0.29549998f, object_racetsubo_DL_000278, object_racetsubo_DL_001610, 18, 45,
ObjTsubo_RacePotBreak1, ObjTsubo_RacePotBreak2, ObjTsubo_RacePotBreak3 },
{ OBJECT_TSUBO, 0.197f, object_tsubo_DL_0017C0, object_tsubo_DL_001960, 12, 32, ObjTsubo_PotBreak1,
ObjTsubo_PotBreak2, ObjTsubo_PotBreak3 },
{ OBJECT_RACETSUBO, 0.29549998f, gMagicPotDL, gMagicPotShardDL, 18, 45, ObjTsubo_MagicPotBreak1,
ObjTsubo_MagicPotBreak2, ObjTsubo_MagicPotBreak3 },
{ OBJECT_TSUBO, 0.197f, gPotDL, gPotShardDL, 12, 32, ObjTsubo_PotBreak1, ObjTsubo_PotBreak2, ObjTsubo_PotBreak3 },
{ GAMEPLAY_DANGEON_KEEP, 0.197f, gameplay_dangeon_keep_DL_017EA0, gameplay_dangeon_keep_DL_018090, 12, 32,
ObjTsubo_PotBreak1, ObjTsubo_PotBreak2, ObjTsubo_PotBreak3 },
};
@@ -253,7 +252,7 @@ void ObjTsubo_PotBreak1(ObjTsubo* this, PlayState* play) {
func_800BBFB0(play, &this->actor.world.pos, 30.0f, 2, 10, 80, true);
}
void ObjTsubo_RacePotBreak1(ObjTsubo* this, PlayState* play) {
void ObjTsubo_MagicPotBreak1(ObjTsubo* this, PlayState* play) {
s16 rot;
s32 phi_s0;
s32 i;
@@ -336,7 +335,7 @@ void ObjTsubo_PotBreak2(ObjTsubo* this, PlayState* play2) {
}
}
void ObjTsubo_RacePotBreak2(ObjTsubo* this, PlayState* play2) {
void ObjTsubo_MagicPotBreak2(ObjTsubo* this, PlayState* play2) {
PlayState* play = (PlayState*)play2;
s32 pad;
s16 rot;
@@ -421,7 +420,7 @@ void ObjTsubo_PotBreak3(ObjTsubo* this, PlayState* play2) {
}
}
void ObjTsubo_RacePotBreak3(ObjTsubo* this, PlayState* play2) {
void ObjTsubo_MagicPotBreak3(ObjTsubo* this, PlayState* play2) {
}
void func_80928914(ObjTsubo* this) {