From a395df135d696738685eb07da5bf40669b5c1772 Mon Sep 17 00:00:00 2001 From: Demur Rumed Date: Fri, 1 Aug 2025 22:09:01 +0000 Subject: [PATCH] color coded jabbernuts --- .../object_jabbernut/gGiDekuJabbernutDL | 17 +++ .../object_jabbernut/gGiDekuJabbernutDL_tri_0 | 129 ++++++++++++++++ .../object_jabbernut/gGiDekuJabbernutDL_tri_1 | 11 ++ .../object_jabbernut/gGiDekuJabbernutDL_tri_2 | 12 ++ .../object_jabbernut/gGiDekuJabbernutDL_tri_3 | 13 ++ .../object_jabbernut/gGiDekuJabbernutDL_vtx_0 | 140 ++++++++++++++++++ .../object_jabbernut/gGiDekuJabbernutDL_vtx_1 | 9 ++ .../object_jabbernut/gGiDekuJabbernutDL_vtx_2 | 13 ++ .../object_jabbernut/gGiDekuJabbernutDL_vtx_3 | 12 ++ .../object_jabbernut/gGiGerudoJabbernutDL | 17 +++ .../gGiGerudoJabbernutDL_tri_0 | 129 ++++++++++++++++ .../gGiGerudoJabbernutDL_tri_1 | 11 ++ .../gGiGerudoJabbernutDL_tri_2 | 12 ++ .../gGiGerudoJabbernutDL_tri_3 | 13 ++ .../gGiGerudoJabbernutDL_vtx_0 | 140 ++++++++++++++++++ .../gGiGerudoJabbernutDL_vtx_1 | 9 ++ .../gGiGerudoJabbernutDL_vtx_2 | 13 ++ .../gGiGerudoJabbernutDL_vtx_3 | 12 ++ .../object_jabbernut/gGiGoronJabbernutDL | 17 +++ .../gGiGoronJabbernutDL_tri_0 | 129 ++++++++++++++++ .../gGiGoronJabbernutDL_tri_1 | 11 ++ .../gGiGoronJabbernutDL_tri_2 | 12 ++ .../gGiGoronJabbernutDL_tri_3 | 13 ++ .../gGiGoronJabbernutDL_vtx_0 | 140 ++++++++++++++++++ .../gGiGoronJabbernutDL_vtx_1 | 9 ++ .../gGiGoronJabbernutDL_vtx_2 | 13 ++ .../gGiGoronJabbernutDL_vtx_3 | 12 ++ .../object_jabbernut/gGiHylianJabbernutDL | 17 +++ .../gGiHylianJabbernutDL_tri_0 | 129 ++++++++++++++++ .../gGiHylianJabbernutDL_tri_1 | 11 ++ .../gGiHylianJabbernutDL_tri_2 | 12 ++ .../gGiHylianJabbernutDL_tri_3 | 13 ++ .../gGiHylianJabbernutDL_vtx_0 | 140 ++++++++++++++++++ .../gGiHylianJabbernutDL_vtx_1 | 9 ++ .../gGiHylianJabbernutDL_vtx_2 | 13 ++ .../gGiHylianJabbernutDL_vtx_3 | 12 ++ .../object_jabbernut/gGiKokiriJabbernutDL | 17 +++ .../gGiKokiriJabbernutDL_tri_0 | 129 ++++++++++++++++ .../gGiKokiriJabbernutDL_tri_1 | 11 ++ .../gGiKokiriJabbernutDL_tri_2 | 12 ++ .../gGiKokiriJabbernutDL_tri_3 | 13 ++ .../gGiKokiriJabbernutDL_vtx_0 | 140 ++++++++++++++++++ .../gGiKokiriJabbernutDL_vtx_1 | 9 ++ .../gGiKokiriJabbernutDL_vtx_2 | 13 ++ .../gGiKokiriJabbernutDL_vtx_3 | 12 ++ .../object_jabbernut/gGiZoraJabbernutDL | 17 +++ .../object_jabbernut/gGiZoraJabbernutDL_tri_0 | 129 ++++++++++++++++ .../object_jabbernut/gGiZoraJabbernutDL_tri_1 | 11 ++ .../object_jabbernut/gGiZoraJabbernutDL_tri_2 | 12 ++ .../object_jabbernut/gGiZoraJabbernutDL_tri_3 | 13 ++ .../object_jabbernut/gGiZoraJabbernutDL_vtx_0 | 140 ++++++++++++++++++ .../object_jabbernut/gGiZoraJabbernutDL_vtx_1 | 9 ++ .../object_jabbernut/gGiZoraJabbernutDL_vtx_2 | 13 ++ .../object_jabbernut/gGiZoraJabbernutDL_vtx_3 | 12 ++ .../mat_gGiDekuJabbernutDL_f3dlite_fruit | 20 +++ ...at_gGiDekuJabbernutDL_f3dlite_fruit_shadow | 20 +++ .../mat_gGiDekuJabbernutDL_f3dlite_leaf | 27 ++++ .../mat_gGiDekuJabbernutDL_f3dlite_stem | 21 +++ .../mat_gGiGerudoJabbernutDL_f3dlite_fruit | 20 +++ ..._gGiGerudoJabbernutDL_f3dlite_fruit_shadow | 20 +++ .../mat_gGiGerudoJabbernutDL_f3dlite_leaf | 27 ++++ .../mat_gGiGerudoJabbernutDL_f3dlite_stem | 21 +++ .../mat_gGiGoronJabbernutDL_f3dlite_fruit | 20 +++ ...t_gGiGoronJabbernutDL_f3dlite_fruit_shadow | 20 +++ .../mat_gGiGoronJabbernutDL_f3dlite_leaf | 27 ++++ .../mat_gGiGoronJabbernutDL_f3dlite_stem | 21 +++ .../mat_gGiHylianJabbernutDL_f3dlite_fruit | 20 +++ ..._gGiHylianJabbernutDL_f3dlite_fruit_shadow | 20 +++ .../mat_gGiHylianJabbernutDL_f3dlite_leaf | 27 ++++ .../mat_gGiHylianJabbernutDL_f3dlite_stem | 21 +++ .../mat_gGiJabbernutDL_f3dlite_fruit | 2 +- .../mat_gGiJabbernutDL_f3dlite_fruit_shadow | 3 +- .../mat_gGiKokiriJabbernutDL_f3dlite_fruit | 20 +++ ..._gGiKokiriJabbernutDL_f3dlite_fruit_shadow | 20 +++ .../mat_gGiKokiriJabbernutDL_f3dlite_leaf | 27 ++++ .../mat_gGiKokiriJabbernutDL_f3dlite_stem | 21 +++ .../mat_gGiZoraJabbernutDL_f3dlite_fruit | 20 +++ ...at_gGiZoraJabbernutDL_f3dlite_fruit_shadow | 20 +++ .../mat_gGiZoraJabbernutDL_f3dlite_leaf | 27 ++++ .../mat_gGiZoraJabbernutDL_f3dlite_stem | 21 +++ soh/assets/soh_assets.h | 18 +++ soh/soh/Enhancements/randomizer/draw.cpp | 60 +++++--- soh/soh/SohGui/SohMenuRandomizer.cpp | 11 ++ 83 files changed, 2734 insertions(+), 24 deletions(-) create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_0 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_1 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_2 create mode 100644 soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_3 create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_fruit create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_fruit_shadow create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_leaf create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_stem create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_fruit create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_fruit_shadow create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_leaf create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_stem create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_fruit create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_fruit_shadow create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_leaf create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_stem create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_fruit create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_fruit_shadow create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_leaf create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_stem create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_fruit create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_fruit_shadow create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_leaf create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_stem create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_fruit create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_fruit_shadow create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_leaf create mode 100644 soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_stem diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL new file mode 100644 index 000000000..9fa3e6994 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_0 b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_0 new file mode 100644 index 000000000..afa1a515b --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_0 @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_1 b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_1 new file mode 100644 index 000000000..2816b4b2b --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_1 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_2 b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_2 new file mode 100644 index 000000000..44e9b9eb4 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_3 b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_3 new file mode 100644 index 000000000..ad002de95 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_tri_3 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_0 b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_0 new file mode 100644 index 000000000..c72717a09 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_0 @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_1 b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_1 new file mode 100644 index 000000000..91b3a82ce --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_1 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_2 b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_2 new file mode 100644 index 000000000..b4d3e99c3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_2 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_3 b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_3 new file mode 100644 index 000000000..122fe5ad7 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiDekuJabbernutDL_vtx_3 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL new file mode 100644 index 000000000..1d9cf59c7 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_0 b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_0 new file mode 100644 index 000000000..b42a0d2b3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_0 @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_1 b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_1 new file mode 100644 index 000000000..687ac7b81 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_1 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_2 b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_2 new file mode 100644 index 000000000..2699f49a2 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_3 b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_3 new file mode 100644 index 000000000..a3067eb2b --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_tri_3 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_0 b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_0 new file mode 100644 index 000000000..c72717a09 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_0 @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_1 b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_1 new file mode 100644 index 000000000..91b3a82ce --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_1 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_2 b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_2 new file mode 100644 index 000000000..b4d3e99c3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_2 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_3 b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_3 new file mode 100644 index 000000000..122fe5ad7 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGerudoJabbernutDL_vtx_3 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL new file mode 100644 index 000000000..c579e8390 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_0 b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_0 new file mode 100644 index 000000000..eef04e034 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_0 @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_1 b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_1 new file mode 100644 index 000000000..e9d18900f --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_1 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_2 b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_2 new file mode 100644 index 000000000..ad2297481 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_3 b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_3 new file mode 100644 index 000000000..d3d25bf59 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_tri_3 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_0 b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_0 new file mode 100644 index 000000000..c72717a09 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_0 @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_1 b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_1 new file mode 100644 index 000000000..91b3a82ce --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_1 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_2 b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_2 new file mode 100644 index 000000000..b4d3e99c3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_2 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_3 b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_3 new file mode 100644 index 000000000..122fe5ad7 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiGoronJabbernutDL_vtx_3 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL new file mode 100644 index 000000000..7481e77cd --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_0 b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_0 new file mode 100644 index 000000000..98771a392 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_0 @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_1 b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_1 new file mode 100644 index 000000000..8bc06c54f --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_1 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_2 b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_2 new file mode 100644 index 000000000..5feb8060d --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_3 b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_3 new file mode 100644 index 000000000..6171987ed --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_tri_3 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_0 b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_0 new file mode 100644 index 000000000..c72717a09 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_0 @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_1 b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_1 new file mode 100644 index 000000000..91b3a82ce --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_1 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_2 b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_2 new file mode 100644 index 000000000..b4d3e99c3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_2 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_3 b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_3 new file mode 100644 index 000000000..122fe5ad7 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiHylianJabbernutDL_vtx_3 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL new file mode 100644 index 000000000..b3c308584 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_0 b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_0 new file mode 100644 index 000000000..bb959e1f2 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_0 @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_1 b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_1 new file mode 100644 index 000000000..650ddc218 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_1 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_2 b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_2 new file mode 100644 index 000000000..ad105f64d --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_3 b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_3 new file mode 100644 index 000000000..2f739e6e1 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_tri_3 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_0 b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_0 new file mode 100644 index 000000000..c72717a09 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_0 @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_1 b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_1 new file mode 100644 index 000000000..91b3a82ce --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_1 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_2 b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_2 new file mode 100644 index 000000000..b4d3e99c3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_2 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_3 b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_3 new file mode 100644 index 000000000..122fe5ad7 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiKokiriJabbernutDL_vtx_3 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL new file mode 100644 index 000000000..5a31859b5 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_0 b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_0 new file mode 100644 index 000000000..52a442cd8 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_0 @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_1 b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_1 new file mode 100644 index 000000000..cb0e634ce --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_1 @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_2 b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_2 new file mode 100644 index 000000000..c4a23e265 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_2 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_3 b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_3 new file mode 100644 index 000000000..9cfd9fc2f --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_tri_3 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_0 b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_0 new file mode 100644 index 000000000..c72717a09 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_0 @@ -0,0 +1,140 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_1 b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_1 new file mode 100644 index 000000000..91b3a82ce --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_1 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_2 b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_2 new file mode 100644 index 000000000..b4d3e99c3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_2 @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_3 b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_3 new file mode 100644 index 000000000..122fe5ad7 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/gGiZoraJabbernutDL_vtx_3 @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_fruit b/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_fruit new file mode 100644 index 000000000..3c8da9d57 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_fruit @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_fruit_shadow b/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_fruit_shadow new file mode 100644 index 000000000..e4e3c0dd3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_fruit_shadow @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_leaf b/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_leaf new file mode 100644 index 000000000..bdee796e4 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_leaf @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_stem b/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_stem new file mode 100644 index 000000000..e4f7cfac1 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiDekuJabbernutDL_f3dlite_stem @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_fruit b/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_fruit new file mode 100644 index 000000000..3c8da9d57 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_fruit @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_fruit_shadow b/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_fruit_shadow new file mode 100644 index 000000000..e4e3c0dd3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_fruit_shadow @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_leaf b/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_leaf new file mode 100644 index 000000000..bdee796e4 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_leaf @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_stem b/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_stem new file mode 100644 index 000000000..e4f7cfac1 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiGerudoJabbernutDL_f3dlite_stem @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_fruit b/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_fruit new file mode 100644 index 000000000..3c8da9d57 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_fruit @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_fruit_shadow b/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_fruit_shadow new file mode 100644 index 000000000..e4e3c0dd3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_fruit_shadow @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_leaf b/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_leaf new file mode 100644 index 000000000..bdee796e4 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_leaf @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_stem b/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_stem new file mode 100644 index 000000000..e4f7cfac1 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiGoronJabbernutDL_f3dlite_stem @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_fruit b/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_fruit new file mode 100644 index 000000000..3c8da9d57 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_fruit @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_fruit_shadow b/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_fruit_shadow new file mode 100644 index 000000000..e4e3c0dd3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_fruit_shadow @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_leaf b/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_leaf new file mode 100644 index 000000000..bdee796e4 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_leaf @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_stem b/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_stem new file mode 100644 index 000000000..e4f7cfac1 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiHylianJabbernutDL_f3dlite_stem @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit index 4724ff6c5..3c8da9d57 100644 --- a/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit @@ -1,6 +1,6 @@ - + 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 index 2840a342b..e4e3c0dd3 100644 --- a/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit_shadow +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiJabbernutDL_f3dlite_fruit_shadow @@ -1,6 +1,6 @@ - + @@ -15,7 +15,6 @@ - diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_fruit b/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_fruit new file mode 100644 index 000000000..3c8da9d57 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_fruit @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_fruit_shadow b/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_fruit_shadow new file mode 100644 index 000000000..e4e3c0dd3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_fruit_shadow @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_leaf b/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_leaf new file mode 100644 index 000000000..bdee796e4 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_leaf @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_stem b/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_stem new file mode 100644 index 000000000..e4f7cfac1 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiKokiriJabbernutDL_f3dlite_stem @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_fruit b/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_fruit new file mode 100644 index 000000000..3c8da9d57 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_fruit @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_fruit_shadow b/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_fruit_shadow new file mode 100644 index 000000000..e4e3c0dd3 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_fruit_shadow @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_leaf b/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_leaf new file mode 100644 index 000000000..bdee796e4 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_leaf @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_stem b/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_stem new file mode 100644 index 000000000..e4f7cfac1 --- /dev/null +++ b/soh/assets/custom/objects/object_jabbernut/mat_gGiZoraJabbernutDL_f3dlite_stem @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h index 98ddada03..12ca8c22e 100644 --- a/soh/assets/soh_assets.h +++ b/soh/assets/soh_assets.h @@ -140,6 +140,24 @@ static const ALIGN_ASSET(2) char gRandoCuttableGrassJunkDL[] = dgRandoCuttableGr #define dgGiJabbernutDL "__OTR__objects/object_jabbernut/gGiJabbernutDL" static const ALIGN_ASSET(2) char gGiJabbernutDL[] = dgGiJabbernutDL; +#define dgGiDekuJabbernutDL "__OTR__objects/object_jabbernut/gGiDekuJabbernutDL" +static const ALIGN_ASSET(2) char gGiDekuJabbernutDL[] = dgGiDekuJabbernutDL; + +#define dgGiGerudoJabbernutDL "__OTR__objects/object_jabbernut/gGiGerudoJabbernutDL" +static const ALIGN_ASSET(2) char gGiGerudoJabbernutDL[] = dgGiGerudoJabbernutDL; + +#define dgGiGoronJabbernutDL "__OTR__objects/object_jabbernut/gGiGoronJabbernutDL" +static const ALIGN_ASSET(2) char gGiGoronJabbernutDL[] = dgGiGoronJabbernutDL; + +#define dgGiHylianJabbernutDL "__OTR__objects/object_jabbernut/gGiHylianJabbernutDL" +static const ALIGN_ASSET(2) char gGiHylianJabbernutDL[] = dgGiHylianJabbernutDL; + +#define dgGiKokiriJabbernutDL "__OTR__objects/object_jabbernut/gGiKokiriJabbernutDL" +static const ALIGN_ASSET(2) char gGiKokiriJabbernutDL[] = dgGiKokiriJabbernutDL; + +#define dgGiZoraJabbernutDL "__OTR__objects/object_jabbernut/gGiZoraJabbernutDL" +static const ALIGN_ASSET(2) char gGiZoraJabbernutDL[] = dgGiZoraJabbernutDL; + #define dgFishingPoleGiDL "__OTR__objects/object_gi_fishing_pole/gFishingPoleGiDL" static const ALIGN_ASSET(2) char gFishingPoleGiDL[] = dgFishingPoleGiDL; diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp index d1e8bf072..9f40322da 100644 --- a/soh/soh/Enhancements/randomizer/draw.cpp +++ b/soh/soh/Enhancements/randomizer/draw.cpp @@ -1116,28 +1116,46 @@ extern "C" void Randomizer_DrawJabbernut(PlayState* play, GetItemEntry* getItemE gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); - switch (getItemEntry->drawItemId) { - case RG_SPEAK_DEKU: - gDPSetEnvColor(POLY_OPA_DISP++, 255, 160, 64, 255); - break; - case RG_SPEAK_GERUDO: - gDPSetEnvColor(POLY_OPA_DISP++, 255, 32, 0, 255); - break; - case RG_SPEAK_GORON: - gDPSetEnvColor(POLY_OPA_DISP++, 128, 48, 0, 255); - break; - case RG_SPEAK_HYLIAN: - gDPSetEnvColor(POLY_OPA_DISP++, 255, 255, 0, 255); - break; - case RG_SPEAK_KOKIRI: - gDPSetEnvColor(POLY_OPA_DISP++, 32, 192, 32, 255); - break; - case RG_SPEAK_ZORA: - gDPSetEnvColor(POLY_OPA_DISP++, 96, 255, 255, 255); - break; + Color_RGB8 bodyColor; + if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("GenericJabbernutModel"), 0)) { + bodyColor = CVarGetColor24(CVAR_COSMETIC("Equipment.Jabbernut.Value"), Color_RGB8{ 255, 0, 216 }); + gDPSetEnvColor(POLY_OPA_DISP++, bodyColor.r, bodyColor.g, bodyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiJabbernutDL); + } else { + switch (getItemEntry->drawItemId) { + case RG_SPEAK_DEKU: + bodyColor = CVarGetColor24(CVAR_COSMETIC("Equipment.DekuJabbernut.Value"), Color_RGB8{ 255, 160, 32 }); + gDPSetEnvColor(POLY_OPA_DISP++, bodyColor.r, bodyColor.g, bodyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiDekuJabbernutDL); + break; + case RG_SPEAK_GERUDO: + bodyColor = CVarGetColor24(CVAR_COSMETIC("Equipment.GerudoJabbernut.Value"), Color_RGB8{ 128, 64, 0 }); + gDPSetEnvColor(POLY_OPA_DISP++, bodyColor.r, bodyColor.g, bodyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiGerudoJabbernutDL); + break; + case RG_SPEAK_GORON: + bodyColor = CVarGetColor24(CVAR_COSMETIC("Equipment.GoronJabbernut.Value"), Color_RGB8{ 255, 32, 0 }); + gDPSetEnvColor(POLY_OPA_DISP++, bodyColor.r, bodyColor.g, bodyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiGoronJabbernutDL); + break; + case RG_SPEAK_HYLIAN: + bodyColor = CVarGetColor24(CVAR_COSMETIC("Equipment.HylianJabbernut.Value"), Color_RGB8{ 255, 255, 0 }); + gDPSetEnvColor(POLY_OPA_DISP++, bodyColor.r, bodyColor.g, bodyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiHylianJabbernutDL); + break; + case RG_SPEAK_KOKIRI: + bodyColor = + CVarGetColor24(CVAR_COSMETIC("Equipment.KokiriJabbernut.Value"), Color_RGB8{ 128, 216, 48 }); + gDPSetEnvColor(POLY_OPA_DISP++, bodyColor.r, bodyColor.g, bodyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiKokiriJabbernutDL); + break; + case RG_SPEAK_ZORA: + bodyColor = CVarGetColor24(CVAR_COSMETIC("Equipment.ZoraJabbernut.Value"), Color_RGB8{ 96, 240, 255 }); + gDPSetEnvColor(POLY_OPA_DISP++, bodyColor.r, bodyColor.g, bodyColor.b, 255); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiZoraJabbernutDL); + break; + } } - - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiJabbernutDL); CLOSE_DISPS(play->state.gfxCtx); } diff --git a/soh/soh/SohGui/SohMenuRandomizer.cpp b/soh/soh/SohGui/SohMenuRandomizer.cpp index 47e651408..88e62008b 100644 --- a/soh/soh/SohGui/SohMenuRandomizer.cpp +++ b/soh/soh/SohGui/SohMenuRandomizer.cpp @@ -65,6 +65,17 @@ void SohMenu::AddMenuRandomizer() { "applies to seeds with maps & compasses shuffled to \"Any Dungeon\", \"Overworld\", or " "\"Anywhere\".") .DefaultValue(true)); + AddWidget(path, "Jabbernut Colors Match Kind", WIDGET_CVAR_CHECKBOX) + .CVar(CVAR_RANDOMIZER_ENHANCEMENT("GenericJabbernutModel")) + .PreFunc([](WidgetInfo& info) { + info.options->disabled = !OTRGlobals::Instance->gRandoContext->GetOption(RSK_SHUFFLE_SPEAK); + info.options->disabledTooltip = + "This setting is disabled because a savefile is loaded without Shuffle Speak."; + }) + .RaceDisable(false) + .Options(CheckboxOptions() + .Tooltip("With Shuffle Speak, jabbernut model & color will be generic.") + .DefaultValue(true)); AddWidget(path, "Quest Item Fanfares", WIDGET_CVAR_CHECKBOX) .CVar(CVAR_RANDOMIZER_ENHANCEMENT("QuestItemFanfares")) .RaceDisable(false)