From 7064ac9ac04efc6402507874b9bc9cb9a4508460 Mon Sep 17 00:00:00 2001 From: aMannus Date: Tue, 7 Nov 2023 09:37:02 +0100 Subject: [PATCH] Add star to tree --- .../objects/object_xmas_tree/GlowAlpha_64 | Bin 0 -> 4188 bytes .../objects/object_xmas_tree/gXmasStarDL | 13 + .../object_xmas_tree/gXmasStarDL_tri_0 | 7 + .../object_xmas_tree/gXmasStarDL_tri_1 | 390 ++++++++++++++++++ .../object_xmas_tree/gXmasStarDL_vtx_0 | 6 + .../object_xmas_tree/gXmasStarDL_vtx_1 | 347 ++++++++++++++++ .../objects/object_xmas_tree/hilite_melon | Bin 0 -> 2140 bytes .../mat_gXmasStarDL_f3dlite_Glow | 21 + .../mat_gXmasStarDL_f3dlite_OrnamentGold | 21 + soh/assets/soh_assets.h | 3 + .../ovl_En_ChristmasTree/z_en_christmastree.c | 1 + 11 files changed, 809 insertions(+) create mode 100644 soh/assets/custom/objects/object_xmas_tree/GlowAlpha_64 create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasStarDL create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_0 create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_1 create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_xmas_tree/hilite_melon create mode 100644 soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_Glow create mode 100644 soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_OrnamentGold diff --git a/soh/assets/custom/objects/object_xmas_tree/GlowAlpha_64 b/soh/assets/custom/objects/object_xmas_tree/GlowAlpha_64 new file mode 100644 index 0000000000000000000000000000000000000000..1682d9e6f2f415e5fe43b2d7c3e3894a476f2ee1 GIT binary patch literal 4188 zcmd5;OP16y3=BJ#+z2+T*|6X^T!<@h6t2LxXPNsc{CZ!4-fL>b#=XWhV~>C@JNj2OaWsZGLBcsV zv8U51ZW{xq%?Juy5J0P8hs`}E1YFqPG~KNTRs!t4d6#ct^K?E-f|8(B0HO=9 zd*zPar5wnIG>f1F5-0^#fZ+;0;eq}`Ba0Y1f!81fjPB`Oz6JJ442)qa0Qktg+!y#? zT4-P*TLe`=b+6#*9Uy^y!V_blfV+|b2Qavo`Ud|;3k@JB5tPrM;Njlt>^Mco{w2!zq!M%cT-z2671%K;Tt*kdNpS4m1r6po0QuAO!$NJT6E-YY+Y@-|p?a z5GVo)D0mVGZoI=!ys(ctQ$WLe1zG}Ucm)sSBMnzYz$J77Si^gGE&eVZB@h+R7GUK+ z(x=p~{5yfS@ef!%r*ETw?mzS2@>lUppcimA{taFN2(&qU`}s>e*1y%yZ2dR&lLgf4 zM|c$=2w1*Zz}pW1iSPBhEg;oDNnkGDarwCqt??Ovzkp=$2b>Kc%eUft0)`J*%Rsb? zcWgj#Z~yfRkN|!{P|zDtwx8YrTlFyl5aBt#z*qtikOJ6%NBdI$TH^--wxE!ZXf^P? z{#^uQ4{`@*=eMc(M)%dn*RmG@Q~}z6Ab}cayjAP;9-RAEWUpqxO-M~#K@bV!4odNT z_ZZw~4?_w?pe?ZP-bPD&_I|>P`w0PJ&@L>`+Iv$x|AE%Pt5F2rCO<4dM)NIloz zrdOO}hE5@{d|!iy0!au41DkK7cf3=B6qul?09u-G^6OALzj#WcNMr+Fac;sO@c(Fo nx6!%RVYJQN-VF1uJZzB|xiWw9YDF=babSpEpXv7iYn}20J+4Pf literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL new file mode 100644 index 00000000000..2bad08d2da6 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_0 b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_0 new file mode 100644 index 00000000000..79b9903f80a --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_0 @@ -0,0 +1,7 @@ + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_1 b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_1 new file mode 100644 index 00000000000..0f82cf89324 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_tri_1 @@ -0,0 +1,390 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_0 b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_0 new file mode 100644 index 00000000000..a990fc5af05 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_0 @@ -0,0 +1,6 @@ + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_1 b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_1 new file mode 100644 index 00000000000..7467705946b --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasStarDL_vtx_1 @@ -0,0 +1,347 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/hilite_melon b/soh/assets/custom/objects/object_xmas_tree/hilite_melon new file mode 100644 index 0000000000000000000000000000000000000000..df1d605b38e65151f7f23aa1a0bbcba40252a1c8 GIT binary patch literal 2140 zcma)+EsWzx5QTG#js}LUp`oGCN|BCaz)H!1lMM|UHZ(b4m|+RCp{`L{*-!Hq} z`{&QyZhnroT#ozG1v}r%rHwn+ubpe-TPt%$Z)#sI*@TyEt_5ecpPxfw8}MK|HzY&S z##LnUY&zd%*<|u6Qe0=Ms5lgdashuW9-TAi`{`nGXGS|(XUgS#Kkhe6-;&q(C3!tv z(AKX*f{)3|rHZO(NK6j%kdR63vnhQOHhsg;l}%_lUDCH~s(rtXwqLJ>ZA@-*+nn#H z5E?EFWq4)2p{`(BtSe?*5cy!l-iHl$2m*c)Ts7~;+X^wjoobT!-HNe7# zVmcmO8?zm-Y`V3)>feP+usm)ZpU z2ZG%MUiXS9qvcHVqZoYSCp`Xmfr59Nf2jy~vQXn;328y7{;~mtCpWM+wjE|;w@>MnIobY;rPzE7Fz{pEjHV-EKV%NDCLxfNb zd4wJZG*9IpG$?B+pwhfoEO^QJN7F7;1*KH^2GyaaQb&xBCM6phufVPdR1(h6qb-iG WoJf;Se#T3`d_vWDf(%%_7svl_`n}`; literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_Glow b/soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_Glow new file mode 100644 index 00000000000..381668c5c49 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_Glow @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_OrnamentGold b/soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_OrnamentGold new file mode 100644 index 00000000000..b657da8a753 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/mat_gXmasStarDL_f3dlite_OrnamentGold @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h index 95242a31a84..a4a471f9fbe 100644 --- a/soh/assets/soh_assets.h +++ b/soh/assets/soh_assets.h @@ -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; diff --git a/soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c b/soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c index f102d52933e..3ce1e112526 100644 --- a/soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c +++ b/soh/src/overlays/actors/ovl_En_ChristmasTree/z_en_christmastree.c @@ -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);