Skip to content

Commit

Permalink
Add star to tree
Browse files Browse the repository at this point in the history
  • Loading branch information
@aMannus
aMannus committed Nov 7, 2023
1 parent 10990bb commit 7064ac9
Show file tree
Hide file tree
Showing 11 changed files with 809 additions and 0 deletions.
Binary file added soh/assets/custom/objects/object_xmas_tree/GlowAlpha_64
View file
Binary file not shown.
13 changes: 13 additions & 0 deletions soh/assets/custom/objects/object_xmas_tree/gXmasStarDL
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<DisplayList Version="0">
<CallDisplayList Path="objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_Glow"/>
<CallDisplayList Path="objects/object_xmas_tree/gXmasStarDL_tri_0"/>
<CallDisplayList Path="objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_OrnamentGold"/>
<CallDisplayList Path="objects/object_xmas_tree/gXmasStarDL_tri_1"/>
<PipeSync/>
<SetGeometryMode G_LIGHTING="1" />
<ClearGeometryMode G_TEXTURE_GEN="1" />
<SetCombineLERP A0="G_CCMUX_0" B0="G_CCMUX_0" C0="G_CCMUX_0" D0="G_CCMUX_SHADE" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_ENVIRONMENT" A1="G_CCMUX_0" B1="G_CCMUX_0" C1="G_CCMUX_0" D1="G_CCMUX_SHADE" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_ENVIRONMENT"/>
<Texture S="65535" T="65535" Level="0" Tile="0" On="0"/>
<EndDisplayList/>
</DisplayList>

7 changes: 7 additions & 0 deletions soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_0
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<DisplayList Version="0">
<LoadVertices Path="objects/object_xmas_tree/gXmasStarDL_vtx_0" VertexBufferIndex="0" VertexOffset="0" Count="4"/>
<Triangle1 V00="0" V01="1" V02="2"/>
<Triangle1 V00="0" V01="2" V02="3"/>
<EndDisplayList/>
</DisplayList>

390 changes: 390 additions & 0 deletions soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_1
View file

Large diffs are not rendered by default.

6 changes: 6 additions & 0 deletions soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_0
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<Vertex Version="0">
<Vtx X="32" Y="568" Z="0" S="-16" T="2032" R="0" G="0" B="129" A="255"/>
<Vtx X="32" Y="504" Z="0" S="2032" T="2032" R="0" G="0" B="129" A="255"/>
<Vtx X="-32" Y="504" Z="0" S="2032" T="-16" R="0" G="0" B="129" A="255"/>
<Vtx X="-32" Y="568" Z="0" S="-16" T="-16" R="0" G="0" B="129" A="255"/>
</Vertex>
347 changes: 347 additions & 0 deletions soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_1
View file

Large diffs are not rendered by default.

Binary file added soh/assets/custom/objects/object_xmas_tree/hilite_melon
View file
Binary file not shown.
21 changes: 21 additions & 0 deletions soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_Glow
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<DisplayList Version="0">
<PipeSync/>
<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_TEXEL0" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_TEXEL0" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_COMBINED" Ab1="G_ACMUX_0" Ac1="G_ACMUX_PRIMITIVE" Ad1="G_ACMUX_0"/>
<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_FOG="1" G_LIGHTING="1" G_SHADING_SMOOTH="1" />
<ClearGeometryMode G_CULL_FRONT="1" G_CULL_BACK="1" G_TEXTURE_GEN="1" G_TEXTURE_GEN_LINEAR="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_XLU_SURF2="1" />
<Texture S="65535" T="65535" Level="0" Tile="0" On="1"/>
<SetTextureLUT Mode="G_TT_NONE"/>
<TileSync/>
<SetTextureImage Path="objects/object_xmas_tree/GlowAlpha_64" Format="G_IM_FMT_IA" Size="G_IM_SIZ_8b_LOAD_BLOCK" Width="1"/>
<SetTile Format="G_IM_FMT_IA" Size="G_IM_SIZ_8b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
<LoadSync/>
<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="2047" Dxt="256"/>
<PipeSync/>
<SetTile Format="G_IM_FMT_IA" Size="G_IM_SIZ_8b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="6" ShiftS="0" MaskT="6" ShiftT="0"/>
<SetTileSize T="0" Uls="0" Ult="0" Lrs="252" Lrt="252"/>
<SetPrimColor M="0" L="0" R="255" G="227" B="0" A="128"/>
<EndDisplayList/>
</DisplayList>

21 changes: 21 additions & 0 deletions soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_OrnamentGold
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<DisplayList Version="0">
<PipeSync/>
<SetCombineLERP A0="G_CCMUX_TEXEL0" B0="G_CCMUX_0" C0="G_CCMUX_SHADE" D0="G_CCMUX_0" Aa0="G_ACMUX_0" Ab0="G_ACMUX_0" Ac0="G_ACMUX_0" Ad0="G_ACMUX_1" A1="G_CCMUX_COMBINED" B1="G_CCMUX_0" C1="G_CCMUX_PRIMITIVE" D1="G_CCMUX_0" Aa1="G_ACMUX_0" Ab1="G_ACMUX_0" Ac1="G_ACMUX_0" Ad1="G_ACMUX_COMBINED"/>
<SetGeometryMode G_ZBUFFER="1" G_SHADE="1" G_CULL_BACK="1" G_FOG="1" G_LIGHTING="1" G_TEXTURE_GEN="1" G_SHADING_SMOOTH="1" />
<ClearGeometryMode G_CULL_FRONT="1" G_TEXTURE_GEN_LINEAR="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_H" Sft="4" Length="20" G_AD_NOISE="1" G_CD_MAGICSQ="1" G_CK_NONE="1" G_TC_FILT="1" G_TF_BILERP="1" G_TL_TILE="1" G_TD_CLAMP="1" G_TP_PERSP="1" G_CYC_2CYCLE="1" G_PM_NPRIMITIVE="1" />
<SetOtherMode Cmd="G_SETOTHERMODE_L" Sft="0" Length="32" G_AC_NONE="1" G_ZS_PIXEL="1" G_RM_FOG_SHADE_A="1" G_RM_AA_ZB_OPA_SURF2="1" />
<Texture S="1984" T="1984" Level="0" Tile="0" On="1"/>
<SetTextureLUT Mode="G_TT_NONE"/>
<TileSync/>
<SetTextureImage Path="objects/object_xmas_tree/hilite_melon" Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Width="1"/>
<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b_LOAD_BLOCK" Line="0" TMem="0" Tile="7" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
<LoadSync/>
<LoadBlock Tile="7" Uls="0" Ult="0" Lrs="1023" Dxt="256"/>
<PipeSync/>
<SetTile Format="G_IM_FMT_RGBA" Size="G_IM_SIZ_16b" Line="8" TMem="0" Tile="0" Palette="0" Cms0="G_TX_WRAP" Cms1="G_TX_NOMIRROR" Cmt0="G_TX_WRAP" Cmt1="G_TX_NOMIRROR" MaskS="5" ShiftS="0" MaskT="5" ShiftT="0"/>
<SetTileSize T="0" Uls="0" Ult="0" Lrs="124" Lrt="124"/>
<SetPrimColor M="0" L="0" R="255" G="201" B="0" A="255"/>
<EndDisplayList/>
</DisplayList>

3 changes: 3 additions & 0 deletions soh/assets/soh_assets.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,9 @@ static const ALIGN_ASSET(2) char gXmasDecor90DL[] = dgXmasDecor90DL;
#define dgXmasDecor100DL "__OTR__objects/object_xmas_tree/gXmasDecor100DL"
static const ALIGN_ASSET(2) char gXmasDecor100DL[] = dgXmasDecor100DL;

#define dgXmasStarDL "__OTR__objects/object_xmas_tree/gXmasStarDL"
static const ALIGN_ASSET(2) char gXmasStarDL[] = dgXmasStarDL;

// overlays
#define dgOptionsDividerChangeLangVtx "__OTR__overlays/ovl_file_choose/gOptionsDividerChangeLangVtx"
static const ALIGN_ASSET(2) char gOptionsDividerChangeLangVtx[] = dgOptionsDividerChangeLangVtx;
Expand Down
1 change: 1 addition & 0 deletions soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -164,6 +164,7 @@ void EnChristmasTree_Draw(Actor* thisx, PlayState* play) {
}
if (percentageCompleted >= 1.0f) {
gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gXmasDecor100DL);
gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gXmasStarDL);
}

CLOSE_DISPS(play->state.gfxCtx);
Expand Down

0 comments on commit 7064ac9

Please sign in to comment.