From 297540e8599e35dd31059f21148176928ce0b17d Mon Sep 17 00:00:00 2001 From: aMannus Date: Sat, 4 Nov 2023 11:54:18 +0100 Subject: [PATCH] Updated models & updated text --- .../object_triforce_completed/GlowAlpha_64 | Bin 0 -> 4188 bytes .../gTriforcePieceCompletedDL | 4 +- .../gTriforcePieceCompletedDL_tri_0 | 53 +-- .../gTriforcePieceCompletedDL_tri_1 | 385 +++++++++++++++- .../gTriforcePieceCompletedDL_vtx_0 | 56 +-- .../gTriforcePieceCompletedDL_vtx_1 | 351 ++++++++++++++- .../object_triforce_completed/hilite_melon | Bin 0 -> 2140 bytes ...mat_gTriforcePieceCompletedDL_f3dlite_Glow | 21 + ...orcePieceCompletedDL_f3dlite_OrnamentGold} | 6 +- ...rcePieceCompletedDL_f3dlite_triforce_edges | 21 - ...ePieceCompletedDL_f3dlite_triforce_surface | 21 - .../object_triforce_completed/noise_tex | Bin 2140 -> 0 bytes .../object_triforce_piece_0/gTriforcePiece0DL | 6 +- .../gTriforcePiece0DL_tri_0 | 62 ++- .../gTriforcePiece0DL_tri_1 | 95 +++- .../gTriforcePiece0DL_tri_2 | 51 --- .../gTriforcePiece0DL_vtx_0 | 86 +++- .../gTriforcePiece0DL_vtx_1 | 125 +++++- .../gTriforcePiece0DL_vtx_2 | 49 -- .../objects/object_triforce_piece_0/image | Bin 0 -> 1116 bytes .../mat_gTriforcePiece0DL_ball | 21 + .../mat_gTriforcePiece0DL_f3dlite_shard_edge | 21 - ...t_gTriforcePiece0DL_f3dlite_triforce_edges | 21 - ...gTriforcePiece0DL_f3dlite_triforce_surface | 21 - .../mat_gTriforcePiece0DL_silver | 21 + .../objects/object_triforce_piece_0/noise_tex | Bin 2140 -> 0 bytes .../object_triforce_piece_1/gTriforcePiece1DL | 4 +- .../gTriforcePiece1DL_tri_0 | 71 ++- .../gTriforcePiece1DL_tri_1 | 97 +++- .../gTriforcePiece1DL_vtx_0 | 91 +++- .../gTriforcePiece1DL_vtx_1 | 126 ++++-- .../objects/object_triforce_piece_1/image | Bin 0 -> 1116 bytes .../object_triforce_piece_1/image_copy | Bin 0 -> 1116 bytes .../mat_gTriforcePiece1DL_blue_mat | 21 + .../mat_gTriforcePiece1DL_f3dlite_shard_edge | 21 - .../mat_gTriforcePiece1DL_silver_002 | 21 + .../objects/object_triforce_piece_1/noise_tex | Bin 2140 -> 0 bytes .../object_triforce_piece_2/gTriforcePiece2DL | 6 +- .../gTriforcePiece2DL_tri_0 | 80 +++- .../gTriforcePiece2DL_tri_1 | 373 +++++++++++++++- .../gTriforcePiece2DL_tri_2 | 19 - .../gTriforcePiece2DL_vtx_0 | 104 +++-- .../gTriforcePiece2DL_vtx_1 | 418 +++++++++++++++++- .../gTriforcePiece2DL_vtx_2 | 18 - .../objects/object_triforce_piece_2/image | Bin 0 -> 1116 bytes .../object_triforce_piece_2/image_copy | Bin 0 -> 1116 bytes .../mat_gTriforcePiece2DL_Green_mat | 21 + .../mat_gTriforcePiece2DL_f3dlite_shard_edge | 21 - ...t_gTriforcePiece2DL_f3dlite_triforce_edges | 21 - ...gTriforcePiece2DL_f3dlite_triforce_surface | 21 - .../mat_gTriforcePiece2DL_silver_001 | 21 + .../objects/object_triforce_piece_2/noise_tex | Bin 2140 -> 0 bytes .../custom/objects/object_xmas_tree/Bark_64 | Bin 0 -> 8284 bytes .../objects/object_xmas_tree/LeavesAlpha_64 | Bin 0 -> 8284 bytes .../objects/object_xmas_tree/gXmasTreeDL | 13 + .../object_xmas_tree/gXmasTreeDL_tri_0 | 40 ++ .../object_xmas_tree/gXmasTreeDL_tri_1 | 145 ++++++ .../object_xmas_tree/gXmasTreeDL_vtx_0 | 66 +++ .../object_xmas_tree/gXmasTreeDL_vtx_1 | 177 ++++++++ .../mat_gXmasTreeDL_f3dlite_TreeBrown | 21 + .../mat_gXmasTreeDL_f3dlite_TreeGreen | 20 + soh/assets/soh_assets.h | 4 +- .../3drando/hint_list/hint_list_item.cpp | 8 +- .../randomizer/3drando/item_list.cpp | 2 +- .../Enhancements/randomizer/3drando/shops.cpp | 6 +- .../Enhancements/randomizer/randomizer.cpp | 17 +- .../randomizer/randomizer_item_tracker.cpp | 8 +- soh/soh/OTRGlobals.cpp | 7 +- .../ovl_En_ChristmasTree/z_en_christmastree.c | 19 +- 69 files changed, 2932 insertions(+), 693 deletions(-) create mode 100644 soh/assets/custom/objects/object_triforce_completed/GlowAlpha_64 create mode 100644 soh/assets/custom/objects/object_triforce_completed/hilite_melon create mode 100644 soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_Glow rename soh/assets/custom/objects/{object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface => object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_OrnamentGold} (75%) delete mode 100644 soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges delete mode 100644 soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface delete mode 100644 soh/assets/custom/objects/object_triforce_completed/noise_tex delete mode 100644 soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 delete mode 100644 soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 create mode 100644 soh/assets/custom/objects/object_triforce_piece_0/image create mode 100644 soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_ball delete mode 100644 soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge delete mode 100644 soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges delete mode 100644 soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface create mode 100644 soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_silver delete mode 100644 soh/assets/custom/objects/object_triforce_piece_0/noise_tex create mode 100644 soh/assets/custom/objects/object_triforce_piece_1/image create mode 100644 soh/assets/custom/objects/object_triforce_piece_1/image_copy create mode 100644 soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_blue_mat delete mode 100644 soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge create mode 100644 soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_silver_002 delete mode 100644 soh/assets/custom/objects/object_triforce_piece_1/noise_tex delete mode 100644 soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 delete mode 100644 soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 create mode 100644 soh/assets/custom/objects/object_triforce_piece_2/image create mode 100644 soh/assets/custom/objects/object_triforce_piece_2/image_copy create mode 100644 soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_Green_mat delete mode 100644 soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge delete mode 100644 soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges delete mode 100644 soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface create mode 100644 soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_silver_001 delete mode 100644 soh/assets/custom/objects/object_triforce_piece_2/noise_tex create mode 100644 soh/assets/custom/objects/object_xmas_tree/Bark_64 create mode 100644 soh/assets/custom/objects/object_xmas_tree/LeavesAlpha_64 create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_0 create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_1 create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeBrown create mode 100644 soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeGreen diff --git a/soh/assets/custom/objects/object_triforce_completed/GlowAlpha_64 b/soh/assets/custom/objects/object_triforce_completed/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_triforce_completed/gTriforcePieceCompletedDL b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL index 966bef2060..b7c7d8af02 100644 --- a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL +++ b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL @@ -1,7 +1,7 @@ - + - + diff --git a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 index dea47708c1..f9d6420cc0 100644 --- a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 +++ b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_0 @@ -1,56 +1,5 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 index 36be4333f2..b67adf06ef 100644 --- a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 +++ b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_tri_1 @@ -1,7 +1,390 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 index 6ca96db305..ca11ab1b3b 100644 --- a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 +++ b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_0 @@ -1,54 +1,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + diff --git a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 index 3a653966d7..cc747f74a3 100644 --- a/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 +++ b/soh/assets/custom/objects/object_triforce_completed/gTriforcePieceCompletedDL_vtx_1 @@ -1,8 +1,347 @@ - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_completed/hilite_melon b/soh/assets/custom/objects/object_triforce_completed/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_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_Glow b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_Glow new file mode 100644 index 0000000000..6bed4d2744 --- /dev/null +++ b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_Glow @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_OrnamentGold similarity index 75% rename from soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface rename to soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_OrnamentGold index 5f8dc51f90..65dfd4f560 100644 --- a/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_triforce_surface +++ b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_OrnamentGold @@ -1,6 +1,6 @@ - + @@ -8,14 +8,14 @@ - + - + diff --git a/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges deleted file mode 100644 index 52591dfc85..0000000000 --- a/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_edges +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface deleted file mode 100644 index 06193ae61a..0000000000 --- a/soh/assets/custom/objects/object_triforce_completed/mat_gTriforcePieceCompletedDL_f3dlite_triforce_surface +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_completed/noise_tex b/soh/assets/custom/objects/object_triforce_completed/noise_tex deleted file mode 100644 index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk< zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv# z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%( z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7 zkVWyC0UUWR_wL|gup?AW- - + - + - - diff --git a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 index 09e44f1b79..286a543842 100644 --- a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 +++ b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_0 @@ -1,17 +1,67 @@ - - - + + + - - + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 index 48001e3c39..a3c013e4ac 100644 --- a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 +++ b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_1 @@ -1,18 +1,91 @@ - - - - - - - - - - + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 deleted file mode 100644 index e35e34492a..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_tri_2 +++ /dev/null @@ -1,51 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 index a86fa98bf5..3637534b99 100644 --- a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 +++ b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_0 @@ -1,18 +1,72 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 index 230fbb7f88..ef51d7124c 100644 --- a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 +++ b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_1 @@ -1,22 +1,107 @@ - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 b/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 deleted file mode 100644 index 86d1238254..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_0/gTriforcePiece0DL_vtx_2 +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_0/image b/soh/assets/custom/objects/object_triforce_piece_0/image new file mode 100644 index 0000000000000000000000000000000000000000..2a8a62348be3a83a33bc2ab4c4905ddac5a53351 GIT binary patch literal 1116 zcma))ds7-`6vpXHr=O$$_A<4$ndzj}s2Oj)Oi{;V)HdxHbtX}o)Cdx>#w)c^sTePK zM=pZgFAB?o!Y(YkEXytnq8K3}YE2+9;5X& z+&Q=5=t|7r*%UzC7#o6ZQIubjX%`! z{uWD?6Ige76}xW}_pXm{n(FK7>zg=2IS3hrZO#2t;>iO;UG+U}gf#cnmX(&2m6TjB z{IuZP9yN^VdOP|C2fXby{a7L>Z741+y;1b_H&t~FO}DCxep>K^J)%dPhuycIMpNWM z@fX*={ObD6#*Uuh(Xp}N#~rQnaFmn{aeo%l$I-R#cw)&ohkd7CvaV69l``p~s9T2a z9XggCxK4MsI^p!I%=sZSy8`SuZKe&STp^$8c7=}5;i=R<#t*#B<@1-h*T|d^1VNig zw=R>;a3zQIn-p}qJF3d&8T%refki8Nv(;j@=++h|1-;>9>PaT~7n$sla&Stj z)@^8YI+bMN2}gDszj%2#xWM2Hoy`yfe@sZEN`+jhQZ9&|aCqU=Kk38Yptt$Ud^Vds z({g%*qPeBz)m5o4jXN;HOlW*u$mehbkrVnUJCw`kuF{)${N@_=oz9`@RmHkS`D~cq1*Jl~ z3g5*g<7Zwha39^eSz5ytEh*F*y=H!t-|0RLaSNBz`CKNG!G+w8+Tt5OwhxJ!0Ih0v znA>HKlf9o;2#f?l?1=f?yERqil?~jHXDjk``O@Nw9B}W6KD+kuM`f)e;}fI2rtiy& zN^9>u9-U$Ss07`B!yQ+BQczIXC;?pNHDPO09sBlu!Jkv}i;_hZ1UYOwanFNae!Vl| zj2}IxAcJacRVvqLbt=V*-0byk+o5>SkCU(yIXF2>C-x&Gj(`?}MyE5GoLpvYc#qoCyZilr$0=i)P5qFK7XA(OYB7mj7e(JtJFr1AIAXL zM@ErAc<(ToIz2m19z-buM?8RDDzhPYzzzCQIz)L0IuhHD@5T0FG)bT^Xi~4q>?n=^ z2oj7^6z(A?GDHM%977QgXfx|IN`(nUojw#JcBA1i;tEiq0OEz+F2H6no6J_@h7opn z0|7i3i$GwJFI|@>1daxDT=0;_PoF*gBjF%qtyjDtQNh- IyzTe@3v^4aT>t<8 literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_ball b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_ball new file mode 100644 index 0000000000..214ad3df66 --- /dev/null +++ b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_ball @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge deleted file mode 100644 index f626317933..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_shard_edge +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges deleted file mode 100644 index 9355e70943..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_edges +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface deleted file mode 100644 index e863b31c5a..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_f3dlite_triforce_surface +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_silver b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_silver new file mode 100644 index 0000000000..d56781ad26 --- /dev/null +++ b/soh/assets/custom/objects/object_triforce_piece_0/mat_gTriforcePiece0DL_silver @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_0/noise_tex b/soh/assets/custom/objects/object_triforce_piece_0/noise_tex deleted file mode 100644 index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk< zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv# z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%( z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7 zkVWyC0UUWR_wL|gup?AW- - + - + diff --git a/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 index 5f33f7347e..c9e63a8d96 100644 --- a/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 +++ b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_0 @@ -1,20 +1,67 @@ - - - - - - + + + + + + + + - - - - - + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 index 43df6492b4..67f0ba8eb3 100644 --- a/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 +++ b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_tri_1 @@ -1,25 +1,88 @@ - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 index e078b82461..d9a5075af2 100644 --- a/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 +++ b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_0 @@ -1,23 +1,72 @@ - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 index e0460194da..8c2f954e7c 100644 --- a/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 +++ b/soh/assets/custom/objects/object_triforce_piece_1/gTriforcePiece1DL_vtx_1 @@ -1,34 +1,96 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_1/image b/soh/assets/custom/objects/object_triforce_piece_1/image new file mode 100644 index 0000000000000000000000000000000000000000..2a8a62348be3a83a33bc2ab4c4905ddac5a53351 GIT binary patch literal 1116 zcma))ds7-`6vpXHr=O$$_A<4$ndzj}s2Oj)Oi{;V)HdxHbtX}o)Cdx>#w)c^sTePK zM=pZgFAB?o!Y(YkEXytnq8K3}YE2+9;5X& z+&Q=5=t|7r*%UzC7#o6ZQIubjX%`! z{uWD?6Ige76}xW}_pXm{n(FK7>zg=2IS3hrZO#2t;>iO;UG+U}gf#cnmX(&2m6TjB z{IuZP9yN^VdOP|C2fXby{a7L>Z741+y;1b_H&t~FO}DCxep>K^J)%dPhuycIMpNWM z@fX*={ObD6#*Uuh(Xp}N#~rQnaFmn{aeo%l$I-R#cw)&ohkd7CvaV69l``p~s9T2a z9XggCxK4MsI^p!I%=sZSy8`SuZKe&STp^$8c7=}5;i=R<#t*#B<@1-h*T|d^1VNig zw=R>;a3zQIn-p}qJF3d&8T%refki8Nv(;j@=++h|1-;>9>PaT~7n$sla&Stj z)@^8YI+bMN2}gDszj%2#xWM2Hoy`yfe@sZEN`+jhQZ9&|aCqU=Kk38Yptt$Ud^Vds z({g%*qPeBz)m5o4jXN;HOlW*u$mehbkrVnUJCw`kuF{)${N@_=oz9`@RmHkS`D~cq1*Jl~ z3g5*g<7Zwha39^eSz5ytEh*F*y=H!t-|0RLaSNBz`CKNG!G+w8+Tt5OwhxJ!0Ih0v znA>HKlf9o;2#f?l?1=f?yERqil?~jHXDjk``O@Nw9B}W6KD+kuM`f)e;}fI2rtiy& zN^9>u9-U$Ss07`B!yQ+BQczIXC;?pNHDPO09sBlu!Jkv}i;_hZ1UYOwanFNae!Vl| zj2}IxAcJacRVvqLbt=V*-0byk+o5>SkCU(yIXF2>C-x&Gj(`?}MyE5GoLpvYc#qoCyZilr$0=i)P5qFK7XA(OYB7mj7e(JtJFr1AIAXL zM@ErAc<(ToIz2m19z-buM?8RDDzhPYzzzCQIz)L0IuhHD@5T0FG)bT^Xi~4q>?n=^ z2oj7^6z(A?GDHM%977QgXfx|IN`(nUojw#JcBA1i;tEiq0OEz+F2H6no6J_@h7opn z0|7i3i$GwJFI|@>1daxDT=0;_PoF*gBjF%qtyjDtQNh- IyzTe@3v^4aT>t<8 literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_triforce_piece_1/image_copy b/soh/assets/custom/objects/object_triforce_piece_1/image_copy new file mode 100644 index 0000000000000000000000000000000000000000..2a8a62348be3a83a33bc2ab4c4905ddac5a53351 GIT binary patch literal 1116 zcma))ds7-`6vpXHr=O$$_A<4$ndzj}s2Oj)Oi{;V)HdxHbtX}o)Cdx>#w)c^sTePK zM=pZgFAB?o!Y(YkEXytnq8K3}YE2+9;5X& z+&Q=5=t|7r*%UzC7#o6ZQIubjX%`! z{uWD?6Ige76}xW}_pXm{n(FK7>zg=2IS3hrZO#2t;>iO;UG+U}gf#cnmX(&2m6TjB z{IuZP9yN^VdOP|C2fXby{a7L>Z741+y;1b_H&t~FO}DCxep>K^J)%dPhuycIMpNWM z@fX*={ObD6#*Uuh(Xp}N#~rQnaFmn{aeo%l$I-R#cw)&ohkd7CvaV69l``p~s9T2a z9XggCxK4MsI^p!I%=sZSy8`SuZKe&STp^$8c7=}5;i=R<#t*#B<@1-h*T|d^1VNig zw=R>;a3zQIn-p}qJF3d&8T%refki8Nv(;j@=++h|1-;>9>PaT~7n$sla&Stj z)@^8YI+bMN2}gDszj%2#xWM2Hoy`yfe@sZEN`+jhQZ9&|aCqU=Kk38Yptt$Ud^Vds z({g%*qPeBz)m5o4jXN;HOlW*u$mehbkrVnUJCw`kuF{)${N@_=oz9`@RmHkS`D~cq1*Jl~ z3g5*g<7Zwha39^eSz5ytEh*F*y=H!t-|0RLaSNBz`CKNG!G+w8+Tt5OwhxJ!0Ih0v znA>HKlf9o;2#f?l?1=f?yERqil?~jHXDjk``O@Nw9B}W6KD+kuM`f)e;}fI2rtiy& zN^9>u9-U$Ss07`B!yQ+BQczIXC;?pNHDPO09sBlu!Jkv}i;_hZ1UYOwanFNae!Vl| zj2}IxAcJacRVvqLbt=V*-0byk+o5>SkCU(yIXF2>C-x&Gj(`?}MyE5GoLpvYc#qoCyZilr$0=i)P5qFK7XA(OYB7mj7e(JtJFr1AIAXL zM@ErAc<(ToIz2m19z-buM?8RDDzhPYzzzCQIz)L0IuhHD@5T0FG)bT^Xi~4q>?n=^ z2oj7^6z(A?GDHM%977QgXfx|IN`(nUojw#JcBA1i;tEiq0OEz+F2H6no6J_@h7opn z0|7i3i$GwJFI|@>1daxDT=0;_PoF*gBjF%qtyjDtQNh- IyzTe@3v^4aT>t<8 literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_blue_mat b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_blue_mat new file mode 100644 index 0000000000..18d8436b2b --- /dev/null +++ b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_blue_mat @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge deleted file mode 100644 index b9e61293d1..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_f3dlite_shard_edge +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_silver_002 b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_silver_002 new file mode 100644 index 0000000000..26f9a0b700 --- /dev/null +++ b/soh/assets/custom/objects/object_triforce_piece_1/mat_gTriforcePiece1DL_silver_002 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_1/noise_tex b/soh/assets/custom/objects/object_triforce_piece_1/noise_tex deleted file mode 100644 index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 zcma)-p;iK66oglkuRxQ?Q<%&agGb`VjYNupNF+ksxY6os*d%WB6=crmckY4&-2)5j zKXYg1-v6g*n&##4`RV3#|Na=h@;ZI|_uuVl<^Asq(Az`PoL+ZL(=FG>ZM*At{kGk< zoB8^f@B6V|^o#wtA9sD8b<1}4`pMPKy5;JSt6Sz1_+WFbkE_FGzU#q*&dPQML+cGs(0eCWBAFIAB+{qL)^;J{#(*^U779F9Cck7oMvyi7MiAz1X(~0sQ40!#}eYwJr z)w$3!#TWA08q`zmoX`3-iMlqu)Ut1KlNXALA#>#Hnt0flT_;zLs4+)eg_T-0z2Jv# z==wz%=q<_ft_t{={8V=eviFAWeF#3h{wM3p2TJs82JFS)hc4641%p29MHs>^6Wz%( z_P%H)*j`R&0VaIl)cQF&g7^Hu`S~RA&8l$%2Rru~ep=hPLVc9b!Em_yQawC50ZL_7 zkVWyC0UUWR_wL|gup?AW- - + - + - - diff --git a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 index b54e182d5e..59d81883f1 100644 --- a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 +++ b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_0 @@ -1,29 +1,67 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 index 00a32bfd88..a15c641d7a 100644 --- a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 +++ b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_1 @@ -1,11 +1,378 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 deleted file mode 100644 index 0993c1c1ee..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_tri_2 +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 index bf7dfcac67..5122e29042 100644 --- a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 +++ b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_0 @@ -1,36 +1,72 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 index e3237ab215..988bfb6735 100644 --- a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 +++ b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_1 @@ -1,12 +1,410 @@ - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 b/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 deleted file mode 100644 index ec4e737005..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_2/gTriforcePiece2DL_vtx_2 +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_2/image b/soh/assets/custom/objects/object_triforce_piece_2/image new file mode 100644 index 0000000000000000000000000000000000000000..2a8a62348be3a83a33bc2ab4c4905ddac5a53351 GIT binary patch literal 1116 zcma))ds7-`6vpXHr=O$$_A<4$ndzj}s2Oj)Oi{;V)HdxHbtX}o)Cdx>#w)c^sTePK zM=pZgFAB?o!Y(YkEXytnq8K3}YE2+9;5X& z+&Q=5=t|7r*%UzC7#o6ZQIubjX%`! z{uWD?6Ige76}xW}_pXm{n(FK7>zg=2IS3hrZO#2t;>iO;UG+U}gf#cnmX(&2m6TjB z{IuZP9yN^VdOP|C2fXby{a7L>Z741+y;1b_H&t~FO}DCxep>K^J)%dPhuycIMpNWM z@fX*={ObD6#*Uuh(Xp}N#~rQnaFmn{aeo%l$I-R#cw)&ohkd7CvaV69l``p~s9T2a z9XggCxK4MsI^p!I%=sZSy8`SuZKe&STp^$8c7=}5;i=R<#t*#B<@1-h*T|d^1VNig zw=R>;a3zQIn-p}qJF3d&8T%refki8Nv(;j@=++h|1-;>9>PaT~7n$sla&Stj z)@^8YI+bMN2}gDszj%2#xWM2Hoy`yfe@sZEN`+jhQZ9&|aCqU=Kk38Yptt$Ud^Vds z({g%*qPeBz)m5o4jXN;HOlW*u$mehbkrVnUJCw`kuF{)${N@_=oz9`@RmHkS`D~cq1*Jl~ z3g5*g<7Zwha39^eSz5ytEh*F*y=H!t-|0RLaSNBz`CKNG!G+w8+Tt5OwhxJ!0Ih0v znA>HKlf9o;2#f?l?1=f?yERqil?~jHXDjk``O@Nw9B}W6KD+kuM`f)e;}fI2rtiy& zN^9>u9-U$Ss07`B!yQ+BQczIXC;?pNHDPO09sBlu!Jkv}i;_hZ1UYOwanFNae!Vl| zj2}IxAcJacRVvqLbt=V*-0byk+o5>SkCU(yIXF2>C-x&Gj(`?}MyE5GoLpvYc#qoCyZilr$0=i)P5qFK7XA(OYB7mj7e(JtJFr1AIAXL zM@ErAc<(ToIz2m19z-buM?8RDDzhPYzzzCQIz)L0IuhHD@5T0FG)bT^Xi~4q>?n=^ z2oj7^6z(A?GDHM%977QgXfx|IN`(nUojw#JcBA1i;tEiq0OEz+F2H6no6J_@h7opn z0|7i3i$GwJFI|@>1daxDT=0;_PoF*gBjF%qtyjDtQNh- IyzTe@3v^4aT>t<8 literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_triforce_piece_2/image_copy b/soh/assets/custom/objects/object_triforce_piece_2/image_copy new file mode 100644 index 0000000000000000000000000000000000000000..2a8a62348be3a83a33bc2ab4c4905ddac5a53351 GIT binary patch literal 1116 zcma))ds7-`6vpXHr=O$$_A<4$ndzj}s2Oj)Oi{;V)HdxHbtX}o)Cdx>#w)c^sTePK zM=pZgFAB?o!Y(YkEXytnq8K3}YE2+9;5X& z+&Q=5=t|7r*%UzC7#o6ZQIubjX%`! z{uWD?6Ige76}xW}_pXm{n(FK7>zg=2IS3hrZO#2t;>iO;UG+U}gf#cnmX(&2m6TjB z{IuZP9yN^VdOP|C2fXby{a7L>Z741+y;1b_H&t~FO}DCxep>K^J)%dPhuycIMpNWM z@fX*={ObD6#*Uuh(Xp}N#~rQnaFmn{aeo%l$I-R#cw)&ohkd7CvaV69l``p~s9T2a z9XggCxK4MsI^p!I%=sZSy8`SuZKe&STp^$8c7=}5;i=R<#t*#B<@1-h*T|d^1VNig zw=R>;a3zQIn-p}qJF3d&8T%refki8Nv(;j@=++h|1-;>9>PaT~7n$sla&Stj z)@^8YI+bMN2}gDszj%2#xWM2Hoy`yfe@sZEN`+jhQZ9&|aCqU=Kk38Yptt$Ud^Vds z({g%*qPeBz)m5o4jXN;HOlW*u$mehbkrVnUJCw`kuF{)${N@_=oz9`@RmHkS`D~cq1*Jl~ z3g5*g<7Zwha39^eSz5ytEh*F*y=H!t-|0RLaSNBz`CKNG!G+w8+Tt5OwhxJ!0Ih0v znA>HKlf9o;2#f?l?1=f?yERqil?~jHXDjk``O@Nw9B}W6KD+kuM`f)e;}fI2rtiy& zN^9>u9-U$Ss07`B!yQ+BQczIXC;?pNHDPO09sBlu!Jkv}i;_hZ1UYOwanFNae!Vl| zj2}IxAcJacRVvqLbt=V*-0byk+o5>SkCU(yIXF2>C-x&Gj(`?}MyE5GoLpvYc#qoCyZilr$0=i)P5qFK7XA(OYB7mj7e(JtJFr1AIAXL zM@ErAc<(ToIz2m19z-buM?8RDDzhPYzzzCQIz)L0IuhHD@5T0FG)bT^Xi~4q>?n=^ z2oj7^6z(A?GDHM%977QgXfx|IN`(nUojw#JcBA1i;tEiq0OEz+F2H6no6J_@h7opn z0|7i3i$GwJFI|@>1daxDT=0;_PoF*gBjF%qtyjDtQNh- IyzTe@3v^4aT>t<8 literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_Green_mat b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_Green_mat new file mode 100644 index 0000000000..35d57dfeae --- /dev/null +++ b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_Green_mat @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge deleted file mode 100644 index c222fe68d5..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_shard_edge +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges deleted file mode 100644 index 5968068f5f..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_edges +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface deleted file mode 100644 index d903f00bbd..0000000000 --- a/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_f3dlite_triforce_surface +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_silver_001 b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_silver_001 new file mode 100644 index 0000000000..6a9be7bec4 --- /dev/null +++ b/soh/assets/custom/objects/object_triforce_piece_2/mat_gTriforcePiece2DL_silver_001 @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_triforce_piece_2/noise_tex b/soh/assets/custom/objects/object_triforce_piece_2/noise_tex deleted file mode 100644 index a6d6cf945e1bd755148a4d4dcbb52a7547cff5fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2140 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 JSEuLw{{SzE$8!Jx literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_xmas_tree/LeavesAlpha_64 b/soh/assets/custom/objects/object_xmas_tree/LeavesAlpha_64 new file mode 100644 index 0000000000000000000000000000000000000000..47ca211a96b664bf352a1740c1e797501521ad57 GIT binary patch literal 8284 zcmc(jJ#yn#7KLTXB)f>r%m&F+A!Mk|rmO5gCQ8vH6L>ijNJ42bvxSL7qP&UOf_EUz z`R;iS|D-GjcB4cBct77g=ic`K_RY=B%`ZRy>!080`?vr8=YRa^^mqSTspn7W&x8K` z#y5GTh_(4*p_wK?Dbt}L_v?!Uiadx z-PgMqukX|9X?Nn2?^S%So+YC;t0;Ghe_tQkstr{-r=R~aKRF>S9be9c{_r8` zAMm9jX36}O#?JYQcKw4i2Vbt^WU#mBFKhF=Oe8*SisMwQaVPvIk54#j{dSKTs@nQ5 z@yqq!PWyGKJXPjD;oE*4?hW`+D-*u@O!%%Ebo#)Bp3l9p|LBKLoy_^TPEPpDeCn5Z z&`*^n{jNXt4E<`)$AnM+({Kd@Uv+xdDr)>kzoLpy@iks9e~zEn8bt<1`V+s8fc$%% z4EfyC;qfzmq5EE!OZsVzBW4)$)nC5hq5agVT$j>{|MblI;iKB|a~31p^r`#IgWD^r zm+z=Q?gXE)I-lsLU*Z!3QE0zdvtumqMe%rcE@xnY-;VjzdGc<;r-gW}zvow4BUJ;z z`>BuoJDq60p_dbaE_=L zoA&weTQOYF&yM{^`MGk! z^Anjh@62D|dquN~6(1{7^f^CfX$!@KgA=}#;gnhw@9Zqh9r_zwLpN_8eg{eX^zOpla5w4q{>zw={ucLm zQycK91l>!=(}*uR{OaZN{FE#2jZ#l#II1Z>VnUbKz(7Cm^1*Kw_;N!vDE+* z-RTF-qZV4DN7nCJv(~YGe8s&fKh_2gyzn0FsvGzpv#UnL=Utf@c!mdGN~unc0sp~y z9p~ROCq52z`V&7^p?Y~X;%sB)EuV{gypG=?!~mZaFa1NlbS2lKcgJV;RDb4c4$T%b zGF#6Vo1c``h;h0vF>Ml)KPsX z2>rSq^WoAm8Cp3H&s34v#+Dt+(mvp;QL(p50$#2 zD(wMh|Uo+!Ri;@{X;zdvJMPT%hPySgS&X?*>YdG;0 zL)OnK5A}*?$R}3|{Fb^*v8aFWH7mcq#(dT?clWjGy9xclXBFVVfX`Um3`cYR3*wsV z@A=W2)sN;2e6<9>UFPEsu`KbaOtr*&%)o!~Q!X+e`iRf|hZl|v{@t(eV+W`;T2yw= zw0^Gg`9E0RBhcvzgP(qvx`H}B?ZlFwU(_VM*{@K@Ta4Fq<|~GlJ4rvkGNq5Zj6;9s zkLJNL;6N~TgTfuxe;8~OYj=$C!^rzK%$Y)l+N3-va_~(wVKIqCcM@k0r zoeO+r$o%v!KIU)aOH&-#MOdFP+eRbKg<3Sb`R7<8Q+|yPGyd!DRr-(ND*DZjr$T7K zfybo(d~5!u*i_GqV8+{xs8jxtXcUtoz1<}Lm-w62qxi4E*O(FopvR#6O09McU>6Sq#yO@0qQ97XKK0QG+k8jz=Bv zUqj`we3t*>moayt7`ns$i(iiUo2Ui#6z@z#a)t~(Cq8P<;%m;tmm_Lh=7%Z~f*ks~ z2sApPG+!=g7DrczDfgrz@i&L(!@1)>!$(uhAntWOGv%2(^_suqOAFbzNAy6~gnzzE z{Qag>EabC1zQ4V{p?l>2J^s`3{-!?aH|M{;6uF&b-`8CY>UEjIZc4^FK@BbN$Ycc)R K{A;mYYx_Ss>nwl( literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL new file mode 100644 index 0000000000..2bac0e0983 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_0 b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_0 new file mode 100644 index 0000000000..38cdbe014b --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_0 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_1 b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_1 new file mode 100644 index 0000000000..889e5aa4f5 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_tri_1 @@ -0,0 +1,145 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_0 b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_0 new file mode 100644 index 0000000000..94e5e1fefc --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_0 @@ -0,0 +1,66 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_1 b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_1 new file mode 100644 index 0000000000..bec46bbab6 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/gXmasTreeDL_vtx_1 @@ -0,0 +1,177 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeBrown b/soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeBrown new file mode 100644 index 0000000000..37fdb10d29 --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeBrown @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeGreen b/soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeGreen new file mode 100644 index 0000000000..69c9c11e5f --- /dev/null +++ b/soh/assets/custom/objects/object_xmas_tree/mat_gXmasTreeDL_f3dlite_TreeGreen @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h index 0eee73bb08..a672b3663e 100644 --- a/soh/assets/soh_assets.h +++ b/soh/assets/soh_assets.h @@ -56,8 +56,8 @@ static const ALIGN_ASSET(2) char gTriforcePiece2DL[] = dgTriforcePiece2DL; #define dgTriforcePieceCompletedDL "__OTR__objects/object_triforce_completed/gTriforcePieceCompletedDL" static const ALIGN_ASSET(2) char gTriforcePieceCompletedDL[] = dgTriforcePieceCompletedDL; -#define dxmas_tree "__OTR__objects/gameplay_holiday/xmas_tree" -static const ALIGN_ASSET(2) char xmas_tree[] = dxmas_tree; +#define dgXmasTreeDL "__OTR__objects/object_xmas_tree/gXmasTreeDL" +static const ALIGN_ASSET(2) char gXmasTreeDL[] = dgXmasTreeDL; #define dxmas_tree_presents "__OTR__objects/gameplay_holiday/xmas_tree_presents" static const ALIGN_ASSET(2) char xmas_tree_presents[] = dxmas_tree_presents; diff --git a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp index 9b9913c8c4..7d7a3cf428 100644 --- a/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp @@ -1931,12 +1931,12 @@ void HintTable_Init_Item() { hintTable[TRIFORCE_PIECE] = HintText::Item({ //obscure text - Text{"a triumph fork", /*french*/"la Tribosse", /*spanish*/"un trígono del triunfo"}, - Text{"cheese", /*french*/"du fromage", /*spanish*/"un porción de queso"}, - Text{"a gold fragment", /*french*/"un fragment d'or", /*spanish*/"un fragmento dorado"}, + Text{"a Christmas Ornament", /*french*/"la Tribosse", /*spanish*/"un trígono del triunfo"}, + Text{"a Christmas Ornament", /*french*/"du fromage", /*spanish*/"un porción de queso"}, + Text{"a Christmas Ornament", /*french*/"un fragment d'or", /*spanish*/"un fragmento dorado"}, }, {}, //clear text - Text{"a Piece of the Triforce", /*french*/"un fragment de la Triforce", /*spanish*/"un fragmento de la Trifuerza"} + Text{"a Christmas Ornament", /*french*/"un fragment de la Triforce", /*spanish*/"un fragmento de la Trifuerza"} ); hintTable[EPONA] = HintText::Item({ diff --git a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp index 34e9c779f7..6f61b9e126 100644 --- a/soh/soh/Enhancements/randomizer/3drando/item_list.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/item_list.cpp @@ -242,7 +242,7 @@ void ItemTable_Init() { // RandomizerGet itemTable[BUY_RED_POTION_40] = Item(RG_BUY_RED_POTION_40, Text{"Buy Red Potion [40]", "Acheter: Potion Rouge [40]", "Comprar poción roja [40]"}, ITEMTYPE_SHOP, 0x30, false, &noVariable, BOTTLE_WITH_RED_POTION, 40); itemTable[BUY_RED_POTION_50] = Item(RG_BUY_RED_POTION_50, Text{"Buy Red Potion [50]", "Acheter: Potion Rouge [50]", "Comprar poción roja [50]"}, ITEMTYPE_SHOP, 0x31, false, &noVariable, BOTTLE_WITH_RED_POTION, 50); - itemTable[TRIFORCE_PIECE] = Item(RG_TRIFORCE_PIECE, Text{"Triforce Piece", "Triforce Piece", "Triforce Piece"}, ITEMTYPE_ITEM, 0xDF, true, &TriforcePieces, TRIFORCE_PIECE); + itemTable[TRIFORCE_PIECE] = Item(RG_TRIFORCE_PIECE, Text{"Christmas Ornament", "Christmas Ornament", "Christmas Ornament"}, ITEMTYPE_ITEM, 0xDF, true, &TriforcePieces, TRIFORCE_PIECE); itemTable[TRIFORCE] = Item(RG_TRIFORCE, Text{"Triforce", "Triforce", "Trifuerza"}, ITEMTYPE_EVENT, GI_RUPEE_RED_LOSE, false, &noVariable, NONE); itemTable[HINT] = Item(RG_HINT, Text{"Hint", "Indice", "Pista"}, ITEMTYPE_EVENT, GI_RUPEE_BLUE_LOSE, false, &noVariable, NONE); diff --git a/soh/soh/Enhancements/randomizer/3drando/shops.cpp b/soh/soh/Enhancements/randomizer/3drando/shops.cpp index 85fb22c22d..7e94b8066d 100644 --- a/soh/soh/Enhancements/randomizer/3drando/shops.cpp +++ b/soh/soh/Enhancements/randomizer/3drando/shops.cpp @@ -699,9 +699,9 @@ void InitTrickNames() { Text{"Life Heart", "Cœur de vie", "Vida Corazón"}, Text{"Lots of Love", "Beaucoup d'amour", "Mucho amor"}}; trickNameTable[0xDF] = { - Text{"Piece of Cheese", "Morceau de Fromage", "Piece of Cheese"}, - Text{"Triforce Shard", "Éclat de Triforce", "Triforce Shard"}, - Text{"Shiny Rock", "Caiiloux Brillant", "Shiny Rock"}}; + Text{"Glass Ball", "Morceau de Fromage", "Piece of Cheese"}, + Text{"Coal", "Éclat de Triforce", "Triforce Shard"}, + Text{"Ornamento", "Caiiloux Brillant", "Shiny Rock"}}; /* //Names for individual upgrades, in case progressive names are replaced diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp index 549195d50f..664c5659b3 100644 --- a/soh/soh/Enhancements/randomizer/randomizer.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer.cpp @@ -3543,21 +3543,20 @@ void RandomizerSettingsWindow::DrawElement() { } // Triforce Hunt - UIWidgets::EnhancementCheckbox("Triforce Hunt", "gRandomizeTriforceHunt"); + UIWidgets::EnhancementCheckbox("Christmas Ornaments Hunt", "gRandomizeTriforceHunt"); UIWidgets::InsertHelpHoverText( - "Pieces of the Triforce of Courage have been scattered across the world. Find them all to finish the game!\n\n" - "When the required amount of pieces have been found, the game is saved and Ganon's Boss key is given " - "to you when you load back into the game if you desire to beat Ganon afterwards.\n\n" - "Keep in mind Ganon might not be logically beatable when \"All Locations Reachable\" is turned off." + "The Christmas ornnaments went missing from the tree in Kakariko Village! Find them back and restore the Christmas " + "magic. The tree will get more and more decorated as you find more of the ornaments. Interact with the completed tree " + "to finish the game! Your game will be saved and Ganon's Boss key will be granted once you load back into the save." ); if (CVarGetInteger("gRandomizeTriforceHunt", 0)) { // Triforce Hunt (total pieces) UIWidgets::Spacer(0); int totalPieces = CVarGetInteger("gRandomizeTriforceHuntTotalPieces", 30); - ImGui::Text("Triforce Pieces in the world: %d", totalPieces); + ImGui::Text("Ornaments in the world: %d", totalPieces); UIWidgets::InsertHelpHoverText( - "The amount of Triforce pieces that will be placed in the world. " + "The amount of Christmas ornaments that will be placed in the world. " "Keep in mind seed generation can fail if more pieces are placed than there are junk items in the item pool." ); ImGui::SameLine(); @@ -3565,9 +3564,9 @@ void RandomizerSettingsWindow::DrawElement() { // Triforce Hunt (required pieces) int requiredPieces = CVarGetInteger("gRandomizeTriforceHuntRequiredPieces", 20); - ImGui::Text("Triforce Pieces to win: %d", requiredPieces); + ImGui::Text("Ornaments to win: %d", requiredPieces); UIWidgets::InsertHelpHoverText( - "The amount of Triforce pieces required to win the game." + "The amount of Christmas ornaments required to win the game." ); ImGui::SameLine(); UIWidgets::EnhancementSliderInt("", "##TriforceHuntRequiredPieces", "gRandomizeTriforceHuntRequiredPieces", 1, totalPieces, "", 20); diff --git a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp index f24ab818b9..33477b0c62 100644 --- a/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp +++ b/soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp @@ -607,7 +607,7 @@ void DrawItem(ItemTrackerItem item) { case RG_TRIFORCE_PIECE: actualItemId = item.id; hasItem = IS_RANDO && OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_TRIFORCE_HUNT); - itemName = "Triforce Piece"; + itemName = "Christmas Ornament"; break; } @@ -1148,9 +1148,9 @@ void ItemTrackerSettingsWindow::DrawElement() { UIWidgets::Spacer(0); - ImGui::Text("Triforce Piece Count Tracking"); + ImGui::Text("Christmas ornament Count Tracking"); UIWidgets::EnhancementCombobox("gItemTrackerTriforcePieceTrack", itemTrackerTriforcePieceTrackOptions, TRIFORCE_PIECE_COLLECTED_REQUIRED_MAX); - UIWidgets::InsertHelpHoverText("Customize what numbers are shown for triforce piece tracking."); + UIWidgets::InsertHelpHoverText("Customize what numbers are shown for ornament tracking."); ImGui::TableNextColumn(); @@ -1191,7 +1191,7 @@ void ItemTrackerSettingsWindow::DrawElement() { shouldUpdateVectors = true; } - if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Triforce Pieces", "gItemTrackerTriforcePiecesDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) { + if (UIWidgets::LabeledRightAlignedEnhancementCombobox("Christmas Ornaments", "gItemTrackerTriforcePiecesDisplayType", displayTypes, SECTION_DISPLAY_HIDDEN)) { shouldUpdateVectors = true; } diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index d977b6202a..26fecba815 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -784,11 +784,8 @@ extern "C" void InitOTR() { time_t now = time(NULL); tm *tm_now = localtime(&now); - if (tm_now->tm_mon == 11 && tm_now->tm_mday >= 24 && tm_now->tm_mday <= 25) { - CVarRegisterInteger("gLetItSnow", 1); - } else { - CVarClear("gLetItSnow"); - } + + CVarRegisterInteger("gLetItSnow", 1); srand(now); #ifdef ENABLE_CROWD_CONTROL 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 b24aaf4d1c..fdc58fb27d 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 @@ -106,29 +106,28 @@ void EnChristmasTree_Draw(Actor* thisx, PlayState* play) { OPEN_DISPS(play->state.gfxCtx); - Gfx_SetupDL_25Xlu(play->state.gfxCtx); + Gfx_SetupDL_25Opa(play->state.gfxCtx); Matrix_Scale(treeSize, treeSize, treeSize, MTXMODE_APPLY); - gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), - G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)xmas_tree); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gXmasTreeDL); if (percentageCompleted >= 0.17f) { - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)xmas_tree_presents); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)xmas_tree_presents); } if (percentageCompleted >= 0.34f) { - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)xmas_tree_bauble_r); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)xmas_tree_bauble_r); } if (percentageCompleted >= 0.51f) { - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)xmas_tree_bauble_g); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)xmas_tree_bauble_g); } if (percentageCompleted >= 0.68f) { - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)xmas_tree_bauble_b); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)xmas_tree_bauble_b); } if (percentageCompleted >= 0.85f) { - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)xmas_tree_bauble_s); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)xmas_tree_bauble_s); } if (percentageCompleted >= 1.0f) { - gSPDisplayList(POLY_XLU_DISP++, (Gfx*)xmas_tree_star); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)xmas_tree_star); } CLOSE_DISPS(play->state.gfxCtx);