From b58b33e8b5d803b2cefc73518bba8e4de1676547 Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Fri, 1 Aug 2025 02:05:23 +0000 Subject: [PATCH] object_jabbernut --- .../custom/objects/object_jabbernut/LeafTex | Bin 0 -> 348 bytes .../objects/object_jabbernut/gGiJabbernutDL | 17 +++ .../object_jabbernut/gGiJabbernutDL_tri_0 | 129 ++++++++++++++++ .../object_jabbernut/gGiJabbernutDL_tri_1 | 11 ++ .../object_jabbernut/gGiJabbernutDL_tri_2 | 12 ++ .../object_jabbernut/gGiJabbernutDL_tri_3 | 13 ++ .../object_jabbernut/gGiJabbernutDL_vtx_0 | 140 ++++++++++++++++++ .../object_jabbernut/gGiJabbernutDL_vtx_1 | 9 ++ .../object_jabbernut/gGiJabbernutDL_vtx_2 | 13 ++ .../object_jabbernut/gGiJabbernutDL_vtx_3 | 12 ++ .../mat_gGiJabbernutDL_f3dlite_fruit | 21 +++ .../mat_gGiJabbernutDL_f3dlite_fruit_shadow | 21 +++ .../mat_gGiJabbernutDL_f3dlite_leaf | 27 ++++ .../mat_gGiJabbernutDL_f3dlite_stem | 21 +++ .../custom/objects/object_jabbernut/shadow | Bin 0 -> 2140 bytes .../custom/objects/object_jabbernut/shinyspot | Bin 0 -> 2140 bytes soh/assets/soh_assets.h | 3 + soh/soh/Enhancements/randomizer/draw.cpp | 11 ++ soh/soh/Enhancements/randomizer/draw.h | 1 + soh/soh/Enhancements/randomizer/item_list.cpp | 1 + 20 files changed, 462 insertions(+) create mode 100644 soh/assets/custom/objects/object_jabbernut/LeafTex create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit_shadow create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_leaf create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_stem create mode 100644 soh/assets/custom/objects/object_jabbernut/shadow create mode 100644 soh/assets/custom/objects/object_jabbernut/shinyspot diff --git a/soh/assets/custom/objects/object_jabbernut/LeafTex b/soh/assets/custom/objects/object_jabbernut/LeafTex new file mode 100644 index 0000000000000000000000000000000000000000..8872d9d6ee884c5154a198854c4bee9191447f1d GIT binary patch literal 348 zcma)1OBTT}6n#k}X-TN6HmWJAzQq=dj72gN;em(9_16}@oh<1hz+|ca^pkV?55cUXmx}~H=8S{fiLG2C~-Co#gIPOP-c$g&2 zvjR#b8->|;oGZ&QD<;!fE;3PC11{#_gher>vNDE%CP_wF#JE&;eJXnMf|puQb^xV| zJf~U^a%mI6Q<8HoSL@B^mAF!J>({%HGniOXDZk#k4>>g;%jobmm;&M7zH7Y!rc4tL literal 0 HcmV?d00001 diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL new file mode 100644 index 000000000..e59d96333 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_0 b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_0 new file mode 100644 index 000000000..0b52cbb47 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_0 @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_1 b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_1 new file mode 100644 index 000000000..036ae2e20 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_1 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_2 b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_2 new file mode 100644 index 000000000..cee24069a --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_3 b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_3 new file mode 100644 index 000000000..6f8e1dc03 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_tri_3 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_0 b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_0 new file mode 100644 index 000000000..c72717a09 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_0 @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_1 b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_1 new file mode 100644 index 000000000..91b3a82ce --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_1 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_2 b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_2 new file mode 100644 index 000000000..b4d3e99c3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_2 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_3 b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_3 new file mode 100644 index 000000000..122fe5ad7 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiJabbernutDL_vtx_3 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit new file mode 100644 index 000000000..b414b0944 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit_shadow b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit_shadow new file mode 100644 index 000000000..2840a342b --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit_shadow @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_leaf b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_leaf new file mode 100644 index 000000000..bdee796e4 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_leaf @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_stem b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_stem new file mode 100644 index 000000000..e4f7cfac1 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_stem @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/shadow b/soh/assets/custom/objects/object_jabbernut/shadow new file mode 100644 index 0000000000000000000000000000000000000000..667d99efcb152063dc1ce251a9e10678efa6888f GIT binary patch literal 2140 zcmd6nEpEd=5QWD@E;BStVPRoWfmKux5|HDR81^W+LaAYH&@1!`@zd+m{(9GG6v-J` z-fZT3Gdr0bGqdCSVc*Q}-|y28o_V?Y^Dukv{vJY~Z)Wq;n!TR4X)j-~te*n=YZ&l4ZoP> zcV8jSAf>JGt)}33dipHaQeYLr8q{fMEGvY38e2P1!2iiAx*CvI<>Z~d$#-LpN9FN* zO8Gm=AnXFf-vVDdfzIDgY5wfJas_nyT>Wn2Rl(8;!tAf@K+yT_K_B_Im!5tnXvg(l z7@Z2ZzsomRw>Pd`+{IGxrvO;SUZ#};r-++=Bx}=4S*Q+fhLWsL&rpHW9~3gCL0ews VH#}*a*j$&H+^_%Ta$5Jq z-<@0FNGqEiI0E-}|L*Ob=Xu`q-P6NGJ2oHYfUAA{^Y5~qdHr({db{zw_PX-C`KPwq ziMIQN+w`0bz&M)^? ze_orY3g`j#+s4H#^~d$2bFunTKdxRC>`GV_m>TutiArOlVwQ!7KE~fp zBtA1>4Oa#F4|mYgfx3U@pVEQD4uTJw-UG4&Sbxh?0c$`F>|(@4WUc*vG2B1kW%tVt zl>G}state.gfxCtx); } +extern "C" void Randomizer_DrawJabbernut(PlayState* play, GetItemEntry* getItemEntry) { + OPEN_DISPS(play->state.gfxCtx); + + Gfx_SetupDL_26Opa(play->state.gfxCtx); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), + G_MTX_MODELVIEW | G_MTX_LOAD); + + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiJabbernutDL); + CLOSE_DISPS(play->state.gfxCtx); +} + extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry) { Vec3f pos; OPEN_DISPS(play->state.gfxCtx); diff --git a/soh/soh/Enhancements/randomizer/draw.h b/soh/soh/Enhancements/randomizer/draw.h index 8483a7bf9..c3d222a43 100644 --- a/soh/soh/Enhancements/randomizer/draw.h +++ b/soh/soh/Enhancements/randomizer/draw.h @@ -21,6 +21,7 @@ void Randomizer_DrawTriforcePiece(PlayState* play, GetItemEntry getItemEntry); void Randomizer_DrawTriforcePieceGI(PlayState* play, GetItemEntry getItemEntry); void Randomizer_DrawOcarinaButton(PlayState* play, GetItemEntry* getItemEntry); void Randomizer_DrawBronzeScale(PlayState* play, GetItemEntry* getItemEntry); +void Randomizer_DrawJabbernut(PlayState* play, GetItemEntry* getItemEntry); void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry); void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry); void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry* getItemEntry); diff --git a/soh/soh/Enhancements/randomizer/item_list.cpp b/soh/soh/Enhancements/randomizer/item_list.cpp index 563803ab6..08dcc277e 100644 --- a/soh/soh/Enhancements/randomizer/item_list.cpp +++ b/soh/soh/Enhancements/randomizer/item_list.cpp @@ -353,6 +353,7 @@ void Rando::StaticData::InitItemTable() { itemTable[RG_BRONZE_SCALE].SetCustomDrawFunc(Randomizer_DrawBronzeScale); itemTable[RG_SPEAK] = Item(RG_SPEAK, Text{ "Speak", "Parler", "" }, ITEMTYPE_ITEM, GI_SCALE_SILVER, true, LOGIC_NONE, RHT_SPEAK, RG_SPEAK, OBJECT_GI_SCALE, GID_SCALE_SILVER, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER); + itemTable[RG_SPEAK].SetCustomDrawFunc(Randomizer_DrawJabbernut); itemTable[RG_BOMBCHU_BAG] = Item(RG_BOMBCHU_BAG, Text{ "Bombchu Bag", "Sac de Missiles Teigneux", "Krabbelminentasche" }, ITEMTYPE_ITEM, RG_BOMBCHU_BAG, true, LOGIC_BOMBCHUS, RHT_BOMBCHU_BAG, RG_BOMBCHU_BAG, OBJECT_GI_BOMB_2, GID_BOMBCHU, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER); itemTable[RG_BOMBCHU_BAG].SetCustomDrawFunc(Randomizer_DrawBombchuBag);