<feed xmlns='http://www.w3.org/2005/Atom'>
<title>2ship2harkinian/mm/assets/custom, branch develop-mion</title>
<subtitle>2Ship2Harkinian: Majora’s Mask PC port</subtitle>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/'/>
<entry>
<title>[Rando] Implement Traps (#1287)</title>
<updated>2025-10-30T15:49:39+00:00</updated>
<author>
<name>Caladius</name>
<email>Caladius@users.noreply.github.com</email>
</author>
<published>2025-10-30T15:49:39+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=c91588d8af126f68f032b65e552f6d8a029ded22'/>
<id>c91588d8af126f68f032b65e552f6d8a029ded22</id>
<content type='text'>
* Initial Trap Implementation with 1 Trap Example.

* New TrapTypes and Per Trap Custom Messages

* Spruce up Menu and add placeholders for toggling traps

* Reordering and clean up

* Seeded Trap Models

* Trap Type Opt-in

* Add Jinx Trap

* Add Enemy (Like Like) Trap

* Fix Shop Item draws and convert for Progressive

* Placeholder for Custom Model

* Implemented time trap[Please Squash this] (#13)

* Implemented time trap

* Finished comment because im braindead today

* Forgot to fix indentation(whoops)

* Changed things not mess with the games code, added some more Time Trap messages

* Removed a include I forgot to yoink from the base code.

* Removed header define for VerifyTimeSkip

* Clangit

* Missed some leftovers from a merge conflict.

* Clang format throwing a fit over a empty line

* Added Timeskip CVar placeholder

* Fixed issue where game crashes past midnight

* Added Moonfall skipping prevention messures.

* Added fallback loop to handle the remaining cycles in the event of a overflow.

* Cleaner implementation

* Keep it simple stupid

* changed function name to be more accurate

* Removed outdated comment, used TimeSkipInc for moonfall skip prevention

* Reverted max trap(accidentally pushed it while testing)

* Removed old unused value

* Reduced the iteration by 1 to be closer to where it was at before.

* Will this fix Windows?

* Added TRAP_TIME to trapToCvarMap

* Corrected typo on comment

* Clangit...again

* Added calls to load environment values and adjust the weather.

* Update Time Trap and clean up code

* Add Flash effect to Time Trap

* Added a few more timeTrapMessages

* I hate you clang format

* Fix Trading Post Kick Out Time

* Added map for all locations I can think of that close.

* Clangit yet again

* Removed Inn handling because the edge case related to it closing cannot happen

* Corrected a whoopie I made when I was dealing with a conflict

* Removed pointless condition check that is always true

* Removed duped variable

* Removed unnecessary data from SCENE_8ITEMSHO kickout entry

* Removed now used TRADING_POS_ACTOR_PARAM

---------

Co-authored-by: Caladius &lt;clatini88@gmail.com&gt;

* Comment out Kick Out code for later TODO

* Clean out commented code

* Adds Wallet Trap and updates some tooltips

* More Trap Messages

* Even more trap messages

* moooooore messages

* update for clang

* Feedback changes for Time Trap

* Update Trap functions

* Fix Matrix call

* Trap Model Import (Thanks Zrc)

* rename

* Adjust size

* update name for uniformity

* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;

* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;

* feedback updates

* Update notifications to remove color codes from trap messages when item skip is on

* VBify Object Dependency

* Fix comma

* fix headers

* Refactor ObjectDependency hook

* Check if item get cutscenes are being skipped

* Use brackets for LUS include

* Header update

---------

Co-authored-by: sitton76 &lt;58642183+sitton76@users.noreply.github.com&gt;
Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Initial Trap Implementation with 1 Trap Example.

* New TrapTypes and Per Trap Custom Messages

* Spruce up Menu and add placeholders for toggling traps

* Reordering and clean up

* Seeded Trap Models

* Trap Type Opt-in

* Add Jinx Trap

* Add Enemy (Like Like) Trap

* Fix Shop Item draws and convert for Progressive

* Placeholder for Custom Model

* Implemented time trap[Please Squash this] (#13)

* Implemented time trap

* Finished comment because im braindead today

* Forgot to fix indentation(whoops)

* Changed things not mess with the games code, added some more Time Trap messages

* Removed a include I forgot to yoink from the base code.

* Removed header define for VerifyTimeSkip

* Clangit

* Missed some leftovers from a merge conflict.

* Clang format throwing a fit over a empty line

* Added Timeskip CVar placeholder

* Fixed issue where game crashes past midnight

* Added Moonfall skipping prevention messures.

* Added fallback loop to handle the remaining cycles in the event of a overflow.

* Cleaner implementation

* Keep it simple stupid

* changed function name to be more accurate

* Removed outdated comment, used TimeSkipInc for moonfall skip prevention

* Reverted max trap(accidentally pushed it while testing)

* Removed old unused value

* Reduced the iteration by 1 to be closer to where it was at before.

* Will this fix Windows?

* Added TRAP_TIME to trapToCvarMap

* Corrected typo on comment

* Clangit...again

* Added calls to load environment values and adjust the weather.

* Update Time Trap and clean up code

* Add Flash effect to Time Trap

* Added a few more timeTrapMessages

* I hate you clang format

* Fix Trading Post Kick Out Time

* Added map for all locations I can think of that close.

* Clangit yet again

* Removed Inn handling because the edge case related to it closing cannot happen

* Corrected a whoopie I made when I was dealing with a conflict

* Removed pointless condition check that is always true

* Removed duped variable

* Removed unnecessary data from SCENE_8ITEMSHO kickout entry

* Removed now used TRADING_POS_ACTOR_PARAM

---------

Co-authored-by: Caladius &lt;clatini88@gmail.com&gt;

* Comment out Kick Out code for later TODO

* Clean out commented code

* Adds Wallet Trap and updates some tooltips

* More Trap Messages

* Even more trap messages

* moooooore messages

* update for clang

* Feedback changes for Time Trap

* Update Trap functions

* Fix Matrix call

* Trap Model Import (Thanks Zrc)

* rename

* Adjust size

* update name for uniformity

* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;

* Update mm/2s2h/Rando/MiscBehavior/Traps.cpp

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;

* feedback updates

* Update notifications to remove color codes from trap messages when item skip is on

* VBify Object Dependency

* Fix comma

* fix headers

* Refactor ObjectDependency hook

* Check if item get cutscenes are being skipped

* Use brackets for LUS include

* Header update

---------

Co-authored-by: sitton76 &lt;58642183+sitton76@users.noreply.github.com&gt;
Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>[Rando] Shuffle Swim (#1087)</title>
<updated>2025-10-15T16:39:07+00:00</updated>
<author>
<name>Caladius</name>
<email>Caladius@users.noreply.github.com</email>
</author>
<published>2025-10-15T16:39:07+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=da767c966d1102fa2dfe8f78627400ab23f4634c'/>
<id>da767c966d1102fa2dfe8f78627400ab23f4634c</id>
<content type='text'>
* Shuffle Swim + Central Logic

* East Logic

* Great Bay Temple (hopefully)

* North Logic

* Pirates Logic (Hopefully)

* South Logic

* West Logic

* Fix Termina Field Logic

* Fix Great Bay Temple Logic

* Feedback Changes

* Split Southern Swamp North

* Update Swamp and GBC logic

* missed one

* Feedback Updates

* fix syntax

* Split Marine Lab Exterior from GBC

* replace Bronze Scale wording in Menu.

* Additional logic pass for swim ability

* Mimic Deku hop failure event when touching water

Separate Woodfall owl statue platform into own region

* Import Model

* Add to 2ship.o2r

* Add Model Selector

* Update Model

* Clean remove model for replacement

* Import new model extract from Dana

* Testing

* pathing change

* Pushing for someone to look at the model crash issue.

* Enable DrawAbilityItem to take in multiple items when more get added. This is ready to go.

* Feedback Changes

* clang

* Revert "clang"

This reverts commit e09482f8b83c39f4678a9c349ed9061f2e002251.

* Undo clang for once lol

* Do not skip pushing Mikau if no swim ability

* How did I mess that up

* Fix changes

* clang bullsh*t

---------

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Shuffle Swim + Central Logic

* East Logic

* Great Bay Temple (hopefully)

* North Logic

* Pirates Logic (Hopefully)

* South Logic

* West Logic

* Fix Termina Field Logic

* Fix Great Bay Temple Logic

* Feedback Changes

* Split Southern Swamp North

* Update Swamp and GBC logic

* missed one

* Feedback Updates

* fix syntax

* Split Marine Lab Exterior from GBC

* replace Bronze Scale wording in Menu.

* Additional logic pass for swim ability

* Mimic Deku hop failure event when touching water

Separate Woodfall owl statue platform into own region

* Import Model

* Add to 2ship.o2r

* Add Model Selector

* Update Model

* Clean remove model for replacement

* Import new model extract from Dana

* Testing

* pathing change

* Pushing for someone to look at the model crash issue.

* Enable DrawAbilityItem to take in multiple items when more get added. This is ready to go.

* Feedback Changes

* clang

* Revert "clang"

This reverts commit e09482f8b83c39f4678a9c349ed9061f2e002251.

* Undo clang for once lol

* Do not skip pushing Mikau if no swim ability

* How did I mess that up

* Fix changes

* clang bullsh*t

---------

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Add Rando Grass Model Fade-In (#1174)</title>
<updated>2025-07-09T19:03:42+00:00</updated>
<author>
<name>balloondude2</name>
<email>55861555+balloondude2@users.noreply.github.com</email>
</author>
<published>2025-07-09T19:03:42+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=2e63d7168e167e44547d151e71cb4bd580f50d8a'/>
<id>2e63d7168e167e44547d151e71cb4bd580f50d8a</id>
<content type='text'>
* grass fade in proof of concept

* finish rest of models</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* grass fade in proof of concept

* finish rest of models</pre>
</div>
</content>
</entry>
<entry>
<title>[Rando] Add Grass CSMC (#1170)</title>
<updated>2025-06-12T13:19:14+00:00</updated>
<author>
<name>balloondude2</name>
<email>55861555+balloondude2@users.noreply.github.com</email>
</author>
<published>2025-06-12T13:19:14+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=0cc6c61dcea160bd55fb7cfdc62a243c24bffe53'/>
<id>0cc6c61dcea160bd55fb7cfdc62a243c24bffe53</id>
<content type='text'>
* wip grass models

* grass csmc

* fix issue with objGrass

* cleanup includes

* fix interpolation</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* wip grass models

* grass csmc

* fix issue with objGrass

* cleanup includes

* fix interpolation</pre>
</div>
</content>
</entry>
<entry>
<title>LUS update (#1142)</title>
<updated>2025-05-18T19:28:26+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-05-18T19:28:26+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=089f845144da87a33fea21d6ba364d42de5fda60'/>
<id>089f845144da87a33fea21d6ba364d42de5fda60</id>
<content type='text'>
* LUS update

* Commit backend refactor

* Cleanup tinyxml includes

* Add LUS again

* Rebase LUS

* LUS bump

* Point to LUS main

* Fix metal

* Bump LUS to test

* Chagnes for removed cvar dropped file</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* LUS update

* Commit backend refactor

* Cleanup tinyxml includes

* Add LUS again

* Rebase LUS

* LUS bump

* Point to LUS main

* Fix metal

* Bump LUS to test

* Chagnes for removed cvar dropped file</pre>
</div>
</content>
</entry>
<entry>
<title>Fix incorrect directx shader condition for texture coordinates (#1089)</title>
<updated>2025-03-25T04:03:16+00:00</updated>
<author>
<name>Archez</name>
<email>Archez@users.noreply.github.com</email>
</author>
<published>2025-03-25T04:03:16+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=01e8004a2cb1664165ef2331029527320ea0bcf9'/>
<id>01e8004a2cb1664165ef2331029527320ea0bcf9</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix typo in DX shader (#1088)</title>
<updated>2025-03-24T03:59:59+00:00</updated>
<author>
<name>Archez</name>
<email>Archez@users.noreply.github.com</email>
</author>
<published>2025-03-24T03:59:59+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=c5680f395807bde8cbf4c32dd1907817676e4c12'/>
<id>c5680f395807bde8cbf4c32dd1907817676e4c12</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Bump LUS and LUS header cleanup (#1059)</title>
<updated>2025-03-22T20:09:05+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-03-22T20:09:05+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=7d1f56d838421cceb98a3a383eb4508260cdadfb'/>
<id>7d1f56d838421cceb98a3a383eb4508260cdadfb</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>CSMC for barrels and crates</title>
<updated>2025-01-13T06:00:44+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2025-01-13T06:00:42+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=d65f77d1f25c515a71dc4aae060b99c847bf49bf'/>
<id>d65f77d1f25c515a71dc4aae060b99c847bf49bf</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Shuffles Barrels, Crates &amp; Missed Freestanding Rupees (#125)</title>
<updated>2025-01-03T06:14:17+00:00</updated>
<author>
<name>Caladius</name>
<email>Caladius@users.noreply.github.com</email>
</author>
<published>2025-01-03T06:14:17+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=1de628ac018cebd65f0278e3a908a3ef2b35ada7'/>
<id>1de628ac018cebd65f0278e3a908a3ef2b35ada7</id>
<content type='text'>
* Great Bay Temple Barrels

* Great Bay Temple - Barrels and Crates

* New Icons + Pirate Fortress

* More shuffles/fixes

* Stone Tower Temple + Inverted

* Undo Debugging Tools.

* Missed Freestanding Rupees in Snowhead Icicle room.</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Great Bay Temple Barrels

* Great Bay Temple - Barrels and Crates

* New Icons + Pirate Fortress

* More shuffles/fixes

* Stone Tower Temple + Inverted

* Undo Debugging Tools.

* Missed Freestanding Rupees in Snowhead Icicle room.</pre>
</div>
</content>
</entry>
</feed>
