diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL deleted file mode 100644 index 49ed9b0e5a..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_0 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_0 deleted file mode 100644 index 747739cb74..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_0 +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_1 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_1 deleted file mode 100644 index 6a28afee11..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_1 +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_2 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_2 deleted file mode 100644 index 0f07ec6161..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_2 +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_3 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_3 deleted file mode 100644 index b3bccf78ab..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_3 +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_4 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_4 deleted file mode 100644 index 7aa7522e8a..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_4 +++ /dev/null @@ -1,341 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_5 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_5 deleted file mode 100644 index e815ce7edb..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_5 +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_6 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_6 deleted file mode 100644 index 1c9bb3d9e9..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_6 +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_7 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_7 deleted file mode 100644 index fff6a9fee6..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_tri_7 +++ /dev/null @@ -1,80 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0 deleted file mode 100644 index 810b26e0c7..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_0 +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1 deleted file mode 100644 index 69b125a3e0..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_1 +++ /dev/null @@ -1,209 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2 deleted file mode 100644 index 606a6ab098..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_2 +++ /dev/null @@ -1,115 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3 deleted file mode 100644 index 8d8b43d0f4..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_3 +++ /dev/null @@ -1,176 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4 deleted file mode 100644 index 802a69d262..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_4 +++ /dev/null @@ -1,672 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5 deleted file mode 100644 index 4137d75a2d..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_5 +++ /dev/null @@ -1,62 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6 deleted file mode 100644 index 7ce420cfcb..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_6 +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7 b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7 deleted file mode 100644 index 381565a0e4..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_7 +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_cull b/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_cull deleted file mode 100644 index 47672f31f1..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/gFishingPoleGiDL_vtx_cull +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL new file mode 100644 index 0000000000..abafdc7ccd --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_0 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_0 new file mode 100644 index 0000000000..840c31045a --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_0 @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_1 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_1 new file mode 100644 index 0000000000..69b79c1470 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_1 @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_2 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_2 new file mode 100644 index 0000000000..f594c43fb1 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_2 @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_3 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_3 new file mode 100644 index 0000000000..15b3132eff --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_3 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_4 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_4 new file mode 100644 index 0000000000..3524e6aec5 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_4 @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_5 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_5 new file mode 100644 index 0000000000..5a9650ff37 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_tri_5 @@ -0,0 +1,38 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_0 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_0 new file mode 100644 index 0000000000..be8191fd0b --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_0 @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_1 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_1 new file mode 100644 index 0000000000..14273ed62d --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_1 @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_2 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_2 new file mode 100644 index 0000000000..cc60e96985 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_2 @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_3 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_3 new file mode 100644 index 0000000000..b820241ec0 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_4 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_4 new file mode 100644 index 0000000000..e906e93c52 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_5 b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_5 new file mode 100644 index 0000000000..a625817efa --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/gGiFishingPoleDL_layer_Opaque_vtx_5 @@ -0,0 +1,48 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_black b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_black deleted file mode 100644 index 26808af42b..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_black +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_f3dlite_material_006 b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_f3dlite_material_006 deleted file mode 100644 index 3db97957e4..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_f3dlite_material_006 +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_line b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_line deleted file mode 100644 index d08aa632ae..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_line +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_accent_001 b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_accent_001 deleted file mode 100644 index d282a83ddd..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_accent_001 +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_handle_metal b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_handle_metal deleted file mode 100644 index 748446d3d4..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_handle_metal +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_metal_001 b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_metal_001 deleted file mode 100644 index de6787e0ba..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_metal_001 +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_white b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_white deleted file mode 100644 index 4b12ae0fbb..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_reel_white +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_wood b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_wood deleted file mode 100644 index 82b446f53c..0000000000 --- a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gFishingPoleGiDL_wood +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_line_layerOpaque b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_line_layerOpaque new file mode 100644 index 0000000000..48d5d61e53 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_line_layerOpaque @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_lure_head_layerOpaque b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_lure_head_layerOpaque new file mode 100644 index 0000000000..0808efa06e --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_lure_head_layerOpaque @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_lure_tail_layerOpaque b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_lure_tail_layerOpaque new file mode 100644 index 0000000000..0ca6278771 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_lure_tail_layerOpaque @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_reel_layerOpaque b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_reel_layerOpaque new file mode 100644 index 0000000000..8b08e71c37 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_reel_layerOpaque @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_rod_handle_layerOpaque b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_rod_handle_layerOpaque new file mode 100644 index 0000000000..6685210a06 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_rod_handle_layerOpaque @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_rod_layerOpaque b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_rod_layerOpaque new file mode 100644 index 0000000000..2270f8cae9 --- /dev/null +++ b/soh/assets/custom/objects/object_gi_fishing_pole/mat_gGiFishingPoleDL_fishing_rod_layerOpaque @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h index 4799b53c01..aa75992736 100644 --- a/soh/assets/soh_assets.h +++ b/soh/assets/soh_assets.h @@ -191,8 +191,8 @@ 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; +#define dgGiFishingPoleDL "__OTR__objects/object_gi_fishing_pole/gGiFishingPoleDL" +static const ALIGN_ASSET(2) char gGiFishingPoleDL[] = dgGiFishingPoleDL; #define dgMysteryItemDL "__OTR__objects/object_mystery_item/gMysteryItemDL" static const ALIGN_ASSET(2) char gMysteryItemDL[] = dgMysteryItemDL; diff --git a/soh/soh/Enhancements/randomizer/draw.cpp b/soh/soh/Enhancements/randomizer/draw.cpp index db5f2294bf..ff7fc3b750 100644 --- a/soh/soh/Enhancements/randomizer/draw.cpp +++ b/soh/soh/Enhancements/randomizer/draw.cpp @@ -1281,48 +1281,14 @@ extern "C" void Randomizer_DrawOpenChest(PlayState* play, GetItemEntry* getItemE } extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry) { - Vec3f pos; OPEN_DISPS(play->state.gfxCtx); - // Draw rod Gfx_SetupDL_25Opa(play->state.gfxCtx); - Matrix_Scale(0.2f, 0.2f, 0.2f, MTXMODE_APPLY); + gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingPoleGiDL); - // Draw lure - Matrix_Push(); - Matrix_Scale(5.0f, 5.0f, 5.0f, MTXMODE_APPLY); - pos = { 0.0f, -25.5f, -4.0f }; - Matrix_Translate(pos.x, pos.y, pos.z, MTXMODE_APPLY); - Matrix_RotateZ(-M_PI_2f, MTXMODE_APPLY); - Matrix_RotateY(-M_PI_2f - 0.2f, MTXMODE_APPLY); - Matrix_Scale(0.006f, 0.006f, 0.006f, MTXMODE_APPLY); - Gfx_SetupDL_25Opa(play->state.gfxCtx); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), - G_MTX_NOPUSH | G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureFloatDL); - - // Draw hooks - Matrix_RotateY(0.2f, MTXMODE_APPLY); - Matrix_Translate(0.0f, 0.0f, -300.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL); - Matrix_RotateZ(M_PI_2f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL); - - Matrix_Translate(0.0f, -2200.0f, 700.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL); - Matrix_RotateZ(M_PIf / 2.0f, MTXMODE_APPLY); - gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), - G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingLureHookDL); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiFishingPoleDL); Matrix_Pop(); diff --git a/soh/src/code/z_draw.c b/soh/src/code/z_draw.c index 98695c992e..4706aaf7a7 100644 --- a/soh/src/code/z_draw.c +++ b/soh/src/code/z_draw.c @@ -391,7 +391,7 @@ DrawItemTableEntry sDrawItemTable[] = { { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Song of time { GetItem_DrawGenericMusicNote, { gGiSongNoteDL } }, // Song of storms { GetItem_DrawTriforcePiece, { gTriforcePiece0DL } }, // Triforce Piece - { GetItem_DrawFishingPole, { gFishingPoleGiDL } }, // Fishing Pole + { GetItem_DrawFishingPole, { gGiFishingPoleDL } }, // Fishing Pole }; /** @@ -1036,7 +1036,7 @@ void GetItem_DrawFishingPole(PlayState* play, s16 drawId) { Matrix_Scale(0.2, 0.2, 0.2, MTXMODE_APPLY); gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__), G_MTX_MODELVIEW | G_MTX_LOAD); - gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gFishingPoleGiDL); + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiFishingPoleDL); // Draw lure Matrix_Push();