mirror of https://github.com/zeldaret/mm.git
document object_tsubo, object_racetsubo and object_obj_chan (#1346)
* 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
GitHub
parent
f0ca606cd2
commit
17b7f3f90e
|
|
@ -1,13 +1,14 @@
|
|||
<Root>
|
||||
<!-- Object for the Goron Shrine Chandelier -->
|
||||
<File Name="object_obj_chan" Segment="6">
|
||||
<DList Name="object_obj_chan_DL_000A10" Offset="0xA10" />
|
||||
<DList Name="object_obj_chan_DL_000AF0" Offset="0xAF0" />
|
||||
<Texture Name="object_obj_chan_Tex_000D80" OutName="tex_000D80" Format="rgba16" Width="32" Height="32" Offset="0xD80" />
|
||||
<Texture Name="object_obj_chan_Tex_001580" OutName="tex_001580" Format="rgba16" Width="32" Height="32" Offset="0x1580" />
|
||||
<Texture Name="object_obj_chan_Tex_001D80" OutName="tex_001D80" Format="ia4" Width="16" Height="32" Offset="0x1D80" />
|
||||
<Texture Name="object_obj_chan_Tex_001E80" OutName="tex_001E80" Format="i8" Width="32" Height="8" Offset="0x1E80" />
|
||||
<DList Name="object_obj_chan_DL_002350" Offset="0x2350" />
|
||||
<DList Name="object_obj_chan_DL_002358" Offset="0x2358" />
|
||||
<Texture Name="object_obj_chan_Tex_0024F0" OutName="tex_0024F0" Format="rgba16" Width="32" Height="64" Offset="0x24F0" />
|
||||
<DList Name="gChandelierPotHolderDL" Offset="0xA10" />
|
||||
<DList Name="gChandelierCenterDL" Offset="0xAF0" />
|
||||
<Texture Name="gChandelierCenterBottomTex" OutName="chandelier_center_bottom" Format="rgba16" Width="32" Height="32" Offset="0xD80" />
|
||||
<Texture Name="gChandelierCenterTopTex" OutName="chandelier_center_top" Format="rgba16" Width="32" Height="32" Offset="0x1580" />
|
||||
<Texture Name="gChandelierChainTex" OutName="chandelier_chain" Format="ia4" Width="16" Height="32" Offset="0x1D80" />
|
||||
<Texture Name="gChandelierPotHolderTex" OutName="chandelier_pot_holder" Format="i8" Width="32" Height="8" Offset="0x1E80" />
|
||||
<DList Name="gChandelierEmptyDL" Offset="0x2350" />
|
||||
<DList Name="gChandelierPotDL" Offset="0x2358" />
|
||||
<Texture Name="gChandelierPotTex" OutName="chandelier_pot" Format="rgba16" Width="32" Height="64" Offset="0x24F0" />
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
|||
|
|
@ -1,11 +1,12 @@
|
|||
<Root>
|
||||
<!-- Object for green magic pot -->
|
||||
<File Name="object_racetsubo" Segment="6">
|
||||
<DList Name="object_racetsubo_DL_000270" Offset="0x270" />
|
||||
<DList Name="object_racetsubo_DL_000278" Offset="0x278" />
|
||||
<Texture Name="object_racetsubo_Tex_0003E0" OutName="tex_0003E0" Format="rgba16" Width="32" Height="64" Offset="0x3E0" />
|
||||
<Texture Name="object_racetsubo_Tex_0013E0" OutName="tex_0013E0" Format="rgba16" Width="16" Height="16" Offset="0x13E0" />
|
||||
<DList Name="object_racetsubo_DL_001610" Offset="0x1610" />
|
||||
<DList Name="object_racetsubo_DL_001698" Offset="0x1698" />
|
||||
<Texture Name="object_racetsubo_Tex_0016A0" OutName="tex_0016A0" Format="rgba16" Width="16" Height="16" Offset="0x16A0" />
|
||||
<DList Name="gMagicPotEmpty1DL" Offset="0x270" />
|
||||
<DList Name="gMagicPotDL" Offset="0x278" />
|
||||
<Texture Name="gMagicPotWallTex" OutName="magic_pot_wall" Format="rgba16" Width="32" Height="64" Offset="0x3E0" />
|
||||
<Texture Name="gMagicPotRimTex" OutName="magic_pot_rim" Format="rgba16" Width="16" Height="16" Offset="0x13E0" />
|
||||
<DList Name="gMagicPotShardDL" Offset="0x1610" />
|
||||
<DList Name="gMagicPotEmpty2DL" Offset="0x1698" />
|
||||
<Texture Name="gMagicPotShardTex" OutName="magic_pot_shard" Format="rgba16" Width="16" Height="16" Offset="0x16A0" />
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
|||
|
|
@ -1,9 +1,10 @@
|
|||
<Root>
|
||||
<!-- Object for normal brown pot/jar -->
|
||||
<File Name="object_tsubo" Segment="6">
|
||||
<Texture Name="object_tsubo_Tex_000000" OutName="tex_000000" Format="rgba16" Width="32" Height="64" Offset="0x0" />
|
||||
<Texture Name="object_tsubo_Tex_001000" OutName="tex_001000" Format="rgba16" Width="16" Height="16" Offset="0x1000" />
|
||||
<Texture Name="object_tsubo_Tex_001200" OutName="tex_001200" Format="rgba16" Width="16" Height="16" Offset="0x1200" />
|
||||
<DList Name="object_tsubo_DL_0017C0" Offset="0x17C0" />
|
||||
<DList Name="object_tsubo_DL_001960" Offset="0x1960" />
|
||||
<Texture Name="gPotWallTex" OutName="pot_wall" Format="rgba16" Width="32" Height="64" Offset="0x0" />
|
||||
<Texture Name="gPotRimTex" OutName="pot_rim" Format="rgba16" Width="16" Height="16" Offset="0x1000" />
|
||||
<Texture Name="gPotShardTex" OutName="pot_shard" Format="rgba16" Width="16" Height="16" Offset="0x1200" />
|
||||
<DList Name="gPotDL" Offset="0x17C0" />
|
||||
<DList Name="gPotShardDL" Offset="0x1960" />
|
||||
</File>
|
||||
</Root>
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue