diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL b/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL deleted file mode 100644 index f1e794a963..0000000000 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0 b/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0 deleted file mode 100644 index 88f1059c31..0000000000 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_0 +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_2 b/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_2 deleted file mode 100644 index 6683ff1d25..0000000000 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_2 +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_bosskey b/soh/assets/custom/objects/object_tsubo/PotBase_bosskey new file mode 100644 index 0000000000..8564d59655 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_bosskey differ diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_fairy b/soh/assets/custom/objects/object_tsubo/PotBase_fairy new file mode 100644 index 0000000000..7d115df239 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_fairy differ diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_heart b/soh/assets/custom/objects/object_tsubo/PotBase_heart new file mode 100644 index 0000000000..4a6faa4b1b Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_heart differ diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_major b/soh/assets/custom/objects/object_tsubo/PotBase_major new file mode 100644 index 0000000000..8bbdf4819e Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_major differ diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_mask b/soh/assets/custom/objects/object_tsubo/PotBase_mask new file mode 100644 index 0000000000..6ba198cbf7 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_mask differ diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_minor b/soh/assets/custom/objects/object_tsubo/PotBase_minor new file mode 100644 index 0000000000..0aeb8155e1 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_minor differ diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_smallkey b/soh/assets/custom/objects/object_tsubo/PotBase_smallkey new file mode 100644 index 0000000000..af74fa56d5 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_smallkey differ diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_standard b/soh/assets/custom/objects/object_tsubo/PotBase_standard new file mode 100644 index 0000000000..8981574b7b Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_standard differ diff --git a/soh/assets/custom/objects/object_tsubo/PotBase_token b/soh/assets/custom/objects/object_tsubo/PotBase_token new file mode 100644 index 0000000000..085589211c Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotBase_token differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_bosskey b/soh/assets/custom/objects/object_tsubo/PotFace_bosskey new file mode 100644 index 0000000000..dccfbf90b5 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_bosskey differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_fairy b/soh/assets/custom/objects/object_tsubo/PotFace_fairy new file mode 100644 index 0000000000..043a004e71 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_fairy differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_heart b/soh/assets/custom/objects/object_tsubo/PotFace_heart new file mode 100644 index 0000000000..a35cc79ca1 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_heart differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_major b/soh/assets/custom/objects/object_tsubo/PotFace_major new file mode 100644 index 0000000000..74ccaa156a Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_major differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_mask b/soh/assets/custom/objects/object_tsubo/PotFace_mask new file mode 100644 index 0000000000..b0abf3826c Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_mask differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_minor b/soh/assets/custom/objects/object_tsubo/PotFace_minor new file mode 100644 index 0000000000..76e3ba592a Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_minor differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_mystery b/soh/assets/custom/objects/object_tsubo/PotFace_mystery new file mode 100644 index 0000000000..e21ba823fd Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_mystery differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_smallkey b/soh/assets/custom/objects/object_tsubo/PotFace_smallkey new file mode 100644 index 0000000000..9116f913ec Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_smallkey differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_standard b/soh/assets/custom/objects/object_tsubo/PotFace_standard new file mode 100644 index 0000000000..e32ee6418a Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_standard differ diff --git a/soh/assets/custom/objects/object_tsubo/PotFace_token b/soh/assets/custom/objects/object_tsubo/PotFace_token new file mode 100644 index 0000000000..4259b2246d Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotFace_token differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_bosskey b/soh/assets/custom/objects/object_tsubo/PotLip_bosskey new file mode 100644 index 0000000000..122538da07 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_bosskey differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_fairy b/soh/assets/custom/objects/object_tsubo/PotLip_fairy new file mode 100644 index 0000000000..2d7c762298 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_fairy differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_heart b/soh/assets/custom/objects/object_tsubo/PotLip_heart new file mode 100644 index 0000000000..d07207a771 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_heart differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_major b/soh/assets/custom/objects/object_tsubo/PotLip_major new file mode 100644 index 0000000000..a41e17457f Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_major differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_mask b/soh/assets/custom/objects/object_tsubo/PotLip_mask new file mode 100644 index 0000000000..645b927911 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_mask differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_minor b/soh/assets/custom/objects/object_tsubo/PotLip_minor new file mode 100644 index 0000000000..64d08bc693 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_minor differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_smallkey b/soh/assets/custom/objects/object_tsubo/PotLip_smallkey new file mode 100644 index 0000000000..5197d965b8 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_smallkey differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_standard b/soh/assets/custom/objects/object_tsubo/PotLip_standard new file mode 100644 index 0000000000..5b9283e9bc Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_standard differ diff --git a/soh/assets/custom/objects/object_tsubo/PotLip_token b/soh/assets/custom/objects/object_tsubo/PotLip_token new file mode 100644 index 0000000000..f0dc62f3f9 Binary files /dev/null and b/soh/assets/custom/objects/object_tsubo/PotLip_token differ diff --git a/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL new file mode 100644 index 0000000000..5c6b7bf07e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_0 similarity index 79% rename from soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_0 rename to soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_0 index e3d576ab53..46f5d596b3 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_0 +++ b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_0 @@ -1,5 +1,5 @@ - + @@ -12,7 +12,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -38,7 +38,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_1 similarity index 73% rename from soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_1 rename to soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_1 index 9e3577c304..4ece3cf377 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_1 +++ b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_1 @@ -1,5 +1,5 @@ - + @@ -10,7 +10,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_2 similarity index 68% rename from soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_2 rename to soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_2 index 957020e994..f91c0b3727 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_2 +++ b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_2 @@ -1,5 +1,5 @@ - + @@ -8,7 +8,7 @@ - + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_3 similarity index 63% rename from soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_3 rename to soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_3 index 7b2e00037e..5823c82ae1 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_3 +++ b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_3 @@ -1,5 +1,5 @@ - + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_4 similarity index 63% rename from soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_4 rename to soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_4 index 554a34e4bc..e2d32f4541 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_tri_4 +++ b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_tri_4 @@ -1,5 +1,5 @@ - + diff --git a/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_1 similarity index 100% rename from soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_1 rename to soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_1 diff --git a/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_3 similarity index 100% rename from soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_3 rename to soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_3 diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_4 similarity index 100% rename from soh/assets/custom/objects/gameplay_dangeon_keep/gRandoPotDL_vtx_4 rename to soh/assets/custom/objects/object_tsubo/gPotBossKeyDL_vtx_4 diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL b/soh/assets/custom/objects/object_tsubo/gPotFairyDL new file mode 100644 index 0000000000..dfc22f0abc --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_0 new file mode 100644 index 0000000000..0ae5a07df5 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_1 new file mode 100644 index 0000000000..48c7c8c2bb --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_2 new file mode 100644 index 0000000000..0502e601d7 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_3 new file mode 100644 index 0000000000..4919453312 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_4 new file mode 100644 index 0000000000..5cb1cfb5da --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotFairyDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL b/soh/assets/custom/objects/object_tsubo/gPotHeartDL new file mode 100644 index 0000000000..2101395140 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_0 new file mode 100644 index 0000000000..ac8bd9b642 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_1 new file mode 100644 index 0000000000..a50d616f39 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_2 new file mode 100644 index 0000000000..e86e02ac18 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_3 new file mode 100644 index 0000000000..5fa3080e42 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_4 new file mode 100644 index 0000000000..bac02eba99 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotHeartDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL b/soh/assets/custom/objects/object_tsubo/gPotMajorDL new file mode 100644 index 0000000000..a4e0619616 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_0 new file mode 100644 index 0000000000..5cee6437e1 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_1 new file mode 100644 index 0000000000..8f3eebb622 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_2 new file mode 100644 index 0000000000..84b86e30db --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_3 new file mode 100644 index 0000000000..b407c945f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_4 new file mode 100644 index 0000000000..5874c76a8b --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMajorDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL b/soh/assets/custom/objects/object_tsubo/gPotMaskDL new file mode 100644 index 0000000000..81de76471d --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_0 new file mode 100644 index 0000000000..8627466f80 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_1 new file mode 100644 index 0000000000..df3b4edc96 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_2 new file mode 100644 index 0000000000..c1b6587116 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_3 new file mode 100644 index 0000000000..400f465b5c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_4 new file mode 100644 index 0000000000..e892e161e0 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMaskDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL b/soh/assets/custom/objects/object_tsubo/gPotMinorDL new file mode 100644 index 0000000000..cce59a83dd --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_0 new file mode 100644 index 0000000000..614dbc1944 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_1 new file mode 100644 index 0000000000..50a1b129ff --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_2 new file mode 100644 index 0000000000..bc60603eba --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_3 new file mode 100644 index 0000000000..416675ad0b --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_4 new file mode 100644 index 0000000000..e2bedd742f --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotMinorDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL b/soh/assets/custom/objects/object_tsubo/gPotRandomDL new file mode 100644 index 0000000000..1eb0ae61bf --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_0 new file mode 100644 index 0000000000..bd04658604 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_1 new file mode 100644 index 0000000000..16941c4cd4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_2 new file mode 100644 index 0000000000..6094886fc0 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_3 new file mode 100644 index 0000000000..1b844d9dc1 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_4 new file mode 100644 index 0000000000..e7516cfcf1 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotRandomDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL new file mode 100644 index 0000000000..f5915880a6 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_0 new file mode 100644 index 0000000000..70b2b37dfa --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_1 new file mode 100644 index 0000000000..6ae0344bae --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_2 new file mode 100644 index 0000000000..558920cd29 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_3 new file mode 100644 index 0000000000..db7840f18b --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_4 new file mode 100644 index 0000000000..0ef89c047f --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotSmallKeyDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL b/soh/assets/custom/objects/object_tsubo/gPotStandardDL new file mode 100644 index 0000000000..d0e3be2578 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_0 new file mode 100644 index 0000000000..6ac65d426f --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_1 new file mode 100644 index 0000000000..d02c62f8a5 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_2 new file mode 100644 index 0000000000..2ad2cba33c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_3 new file mode 100644 index 0000000000..b7b6852ca4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_4 new file mode 100644 index 0000000000..dc605f8f02 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotStandardDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL b/soh/assets/custom/objects/object_tsubo/gPotTokenDL new file mode 100644 index 0000000000..2a125a69f0 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_0 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_0 new file mode 100644 index 0000000000..86646812a9 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_0 @@ -0,0 +1,69 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_1 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_1 new file mode 100644 index 0000000000..30a19d11f3 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_1 @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_2 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_2 new file mode 100644 index 0000000000..ff058fea80 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_2 @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_3 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_3 new file mode 100644 index 0000000000..59876b4895 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_3 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_4 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_4 new file mode 100644 index 0000000000..18f7489ef8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_tri_4 @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_0 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_0 new file mode 100644 index 0000000000..5a13d3d77a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_0 @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_1 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_1 new file mode 100644 index 0000000000..24da4e34f4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_1 @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_2 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_2 new file mode 100644 index 0000000000..dee3d93a78 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_2 @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_3 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_3 new file mode 100644 index 0000000000..4394fa228c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_3 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_4 b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_4 new file mode 100644 index 0000000000..2ef56105ab --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/gPotTokenDL_vtx_4 @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbase b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potbase_Bosskey similarity index 72% rename from soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbase rename to soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potbase_Bosskey index 6c4a0fdeef..5c56ac8c15 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbase +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potbase_Bosskey @@ -8,13 +8,13 @@ - - + + - + - - + + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potbottom similarity index 94% rename from soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbottom rename to soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potbottom index e691790461..9935f477f8 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potbottom +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potbottom @@ -6,7 +6,7 @@ - + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potface b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potface_Bosskey similarity index 92% rename from soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potface rename to soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potface_Bosskey index 0969a02d52..55c9c24880 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potface +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potface_Bosskey @@ -8,7 +8,7 @@ - + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potrim_Bosskey b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potrim_Bosskey new file mode 100644 index 0000000000..c5dadc1ac6 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potrim_Bosskey @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potvoid similarity index 100% rename from soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potvoid rename to soh/assets/custom/objects/object_tsubo/mat_gPotBossKeyDL_f3dlite_potvoid diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potbase_fairy b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potbase_fairy new file mode 100644 index 0000000000..8bbd6c4112 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potbase_fairy @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potrim b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potbottom similarity index 94% rename from soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potrim rename to soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potbottom index 3c56bbc967..9935f477f8 100644 --- a/soh/assets/custom/objects/gameplay_dangeon_keep/mat_gRandoPotDL_f3dlite_potrim +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potbottom @@ -6,7 +6,7 @@ - + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potface_fairy b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potface_fairy new file mode 100644 index 0000000000..7f217c7327 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potface_fairy @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potrim_fairy b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potrim_fairy new file mode 100644 index 0000000000..a78e922390 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potrim_fairy @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotFairyDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potbase_heart b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potbase_heart new file mode 100644 index 0000000000..87e0d85271 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potbase_heart @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potbottom new file mode 100644 index 0000000000..9935f477f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potbottom @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potface_heart b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potface_heart new file mode 100644 index 0000000000..fbe35cc0f9 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potface_heart @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potrim_heart b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potrim_heart new file mode 100644 index 0000000000..db8c79031b --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potrim_heart @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotHeartDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potbase_major b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potbase_major new file mode 100644 index 0000000000..eb2d208a62 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potbase_major @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potbottom new file mode 100644 index 0000000000..9935f477f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potbottom @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potface_major b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potface_major new file mode 100644 index 0000000000..9066c281b7 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potface_major @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potrim_major b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potrim_major new file mode 100644 index 0000000000..cf26921fc2 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potrim_major @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMajorDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potbase_mask b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potbase_mask new file mode 100644 index 0000000000..b3b4c182c6 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potbase_mask @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potbottom new file mode 100644 index 0000000000..9935f477f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potbottom @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potface_mask b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potface_mask new file mode 100644 index 0000000000..b30a6debc4 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potface_mask @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potrim_mask b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potrim_mask new file mode 100644 index 0000000000..03c39c1f61 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potrim_mask @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMaskDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potbase_minor b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potbase_minor new file mode 100644 index 0000000000..13757a34d1 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potbase_minor @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potbottom new file mode 100644 index 0000000000..9935f477f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potbottom @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potface_minor b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potface_minor new file mode 100644 index 0000000000..e9ed0119d7 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potface_minor @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potrim_minor b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potrim_minor new file mode 100644 index 0000000000..e53985ce5a --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potrim_minor @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotMinorDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potbase b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potbase new file mode 100644 index 0000000000..130eb57af6 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potbase @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potbottom new file mode 100644 index 0000000000..9935f477f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potbottom @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potface b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potface new file mode 100644 index 0000000000..531e40224c --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potface @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potrim b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potrim new file mode 100644 index 0000000000..f166f5af6b --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potrim @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotRandomDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potbase_Smallkey b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potbase_Smallkey new file mode 100644 index 0000000000..6289432cfb --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potbase_Smallkey @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potbottom new file mode 100644 index 0000000000..9935f477f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potbottom @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potface_Smallkey b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potface_Smallkey new file mode 100644 index 0000000000..86197247ca --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potface_Smallkey @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potrim_Smallkey b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potrim_Smallkey new file mode 100644 index 0000000000..4a561448e3 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potrim_Smallkey @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotSmallKeyDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potbase b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potbase new file mode 100644 index 0000000000..130eb57af6 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potbase @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potbottom new file mode 100644 index 0000000000..9935f477f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potbottom @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potface_standard b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potface_standard new file mode 100644 index 0000000000..08dad82ae8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potface_standard @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potrim b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potrim new file mode 100644 index 0000000000..f166f5af6b --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potrim @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotStandardDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potbase_token b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potbase_token new file mode 100644 index 0000000000..f0b0feaf1f --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potbase_token @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potbottom b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potbottom new file mode 100644 index 0000000000..9935f477f8 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potbottom @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potface_token b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potface_token new file mode 100644 index 0000000000..b3d6d40803 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potface_token @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potrim_token b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potrim_token new file mode 100644 index 0000000000..a33c007be9 --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potrim_token @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potvoid b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potvoid new file mode 100644 index 0000000000..d39d1af92e --- /dev/null +++ b/soh/assets/custom/objects/object_tsubo/mat_gPotTokenDL_f3dlite_potvoid @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/soh/assets/soh_assets.h b/soh/assets/soh_assets.h index 120930659c..1ed9956673 100644 --- a/soh/assets/soh_assets.h +++ b/soh/assets/soh_assets.h @@ -44,6 +44,36 @@ static const ALIGN_ASSET(2) char gChestBodyTokenDL[] = dgChestBodyTokenDL; #define dgChestLidTokenDL "__OTR__objects/object_box/gChestLidTokenDL" static const ALIGN_ASSET(2) char gChestLidTokenDL[] = dgChestLidTokenDL; +#define dgPotBossKeyDL "__OTR__objects/object_tsubo/gPotBossKeyDL" +static const ALIGN_ASSET(2) char gPotBossKeyDL[] = dgPotBossKeyDL; + +#define dgPotFairyDL "__OTR__objects/object_tsubo/gPotFairyDL" +static const ALIGN_ASSET(2) char gPotFairyDL[] = dgPotFairyDL; + +#define dgPotHeartDL "__OTR__objects/object_tsubo/gPotHeartDL" +static const ALIGN_ASSET(2) char gPotHeartDL[] = dgPotHeartDL; + +#define dgPotMajorDL "__OTR__objects/object_tsubo/gPotMajorDL" +static const ALIGN_ASSET(2) char gPotMajorDL[] = dgPotMajorDL; + +#define dgPotMaskDL "__OTR__objects/object_tsubo/gPotMaskDL" +static const ALIGN_ASSET(2) char gPotMaskDL[] = dgPotMaskDL; + +#define dgPotMinorDL "__OTR__objects/object_tsubo/gPotMinorDL" +static const ALIGN_ASSET(2) char gPotMinorDL[] = dgPotMinorDL; + +#define dgPotRandomDL "__OTR__objects/object_tsubo/gPotRandomDL" +static const ALIGN_ASSET(2) char gPotRandomDL[] = dgPotRandomDL; + +#define dgPotSmallKeyDL "__OTR__objects/object_tsubo/gPotSmallKeyDL" +static const ALIGN_ASSET(2) char gPotSmallKeyDL[] = dgPotSmallKeyDL; + +#define dgPotStandardDL "__OTR__objects/object_tsubo/gPotStandardDL" +static const ALIGN_ASSET(2) char gPotStandardDL[] = dgPotStandardDL; + +#define dgPotTokenDL "__OTR__objects/object_tsubo/gPotTokenDL" +static const ALIGN_ASSET(2) char gPotTokenDL[] = dgPotTokenDL; + #define dgTitleRandomizerSubtitleTex "__OTR__objects/object_mag/gTitleRandomizerSubtitleTex" static const ALIGN_ASSET(2) char gTitleRandomizerSubtitleTex[] = dgTitleRandomizerSubtitleTex; @@ -80,9 +110,6 @@ static const ALIGN_ASSET(2) char gTriforcePieceCompletedDL[] = dgTriforcePieceCo #define dgBossSoulSkullDL "__OTR__objects/object_boss_soul/gGIBossSoulSkullDL" static const ALIGN_ASSET(2) char gBossSoulSkullDL[] = dgBossSoulSkullDL; -#define dgRandoPotDL "__OTR__objects/gameplay_dangeon_keep/gRandoPotDL" -static const ALIGN_ASSET(2) char gRandoPotDL[] = dgRandoPotDL; - #define dgRandoBushDL "__OTR__objects/gameplay_field_keep/gFieldBushRandomDL" static const ALIGN_ASSET(2) char gRandoBushDL[] = dgRandoBushDL; diff --git a/soh/soh/Enhancements/randomizer/ShufflePots.cpp b/soh/soh/Enhancements/randomizer/ShufflePots.cpp index b1ae4dd4df..dbf278db8e 100644 --- a/soh/soh/Enhancements/randomizer/ShufflePots.cpp +++ b/soh/soh/Enhancements/randomizer/ShufflePots.cpp @@ -6,21 +6,60 @@ extern "C" { #include "overlays/actors/ovl_Obj_Tsubo/z_obj_tsubo.h" #include "overlays/actors/ovl_Door_Shutter/z_door_shutter.h" +#include "objects/gameplay_dangeon_keep/gameplay_dangeon_keep.h" extern PlayState* gPlayState; } extern void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play); extern "C" void ObjTsubo_RandomizerDraw(Actor* thisx, PlayState* play) { - float potSize = 1.0f; - OPEN_DISPS(play->state.gfxCtx); - Gfx_SetupDL_25Opa(play->state.gfxCtx); - Matrix_Scale(potSize, potSize, potSize, 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*)gRandoPotDL); + Gfx_SetupDL_25Opa(play->state.gfxCtx); + gSPMatrix(POLY_OPA_DISP++, MATRIX_NEWMTX(play->state.gfxCtx), G_MTX_MODELVIEW | G_MTX_LOAD); + + const auto potIdentity = ObjectExtension::GetInstance().Get(thisx); + + if (potIdentity != nullptr && potIdentity->randomizerCheck != RC_MAX && + Flags_GetRandomizerInf(potIdentity->randomizerInf) == 0) { + bool csmc = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeAndTextureMatchContents"), 0); + int requiresStoneAgony = CVarGetInteger(CVAR_ENHANCEMENT("ChestSizeDependsStoneOfAgony"), 0); + + if (csmc && (!requiresStoneAgony || (requiresStoneAgony && CHECK_QUEST_ITEM(QUEST_STONE_OF_AGONY)))) { + auto itemEntry = + Rando::Context::GetInstance()->GetFinalGIEntry(potIdentity->randomizerCheck, true, GI_NONE); + GetItemCategory getItemCategory = itemEntry.getItemCategory; + + switch (getItemCategory) { + case ITEM_CATEGORY_LESSER: + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotMinorDL); + break; + case ITEM_CATEGORY_HEALTH: + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotHeartDL); + break; + case ITEM_CATEGORY_BOSS_KEY: + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotBossKeyDL); + break; + case ITEM_CATEGORY_SMALL_KEY: + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotSmallKeyDL); + break; + case ITEM_CATEGORY_SKULLTULA_TOKEN: + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotTokenDL); + break; + case ITEM_CATEGORY_MAJOR: + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotMajorDL); + break; + default: + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotStandardDL); + break; + } + } else { + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotStandardDL); + } + } else { + gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gPotDL); + } + CLOSE_DISPS(play->state.gfxCtx); }