<feed xmlns='http://www.w3.org/2005/Atom'>
<title>2ship2harkinian/mm/assets, branch develop</title>
<subtitle>2Ship2Harkinian: Majora’s Mask PC port</subtitle>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/'/>
<entry>
<title>Add new file setup screen, for selecting preset, rando/vanilla and seed (#1829)</title>
<updated>2026-08-01T04:47:26+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2026-08-01T04:47:26+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=f740fe0506483200142108b64fb2abf2eb2f735e'/>
<id>f740fe0506483200142108b64fb2abf2eb2f735e</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Shuffle keaton grass and some more missed grass (#1822)</title>
<updated>2026-07-30T23:38:29+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2026-07-30T23:38:29+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=dd5a36d60a0f29dd500cb0e826e3d41780f46944'/>
<id>dd5a36d60a0f29dd500cb0e826e3d41780f46944</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Sync shaders from LUS (#1804)</title>
<updated>2026-07-23T16:13:17+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2026-07-23T16:13:17+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=6eeeae0340a9eb549ec9a250731a91d7aff2a073'/>
<id>6eeeae0340a9eb549ec9a250731a91d7aff2a073</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Implement skeleton key (#1776)</title>
<updated>2026-07-11T11:46:31+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2026-07-11T11:46:31+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=b3cc366288c0a3e7583810be816d5fed3cd54ac2'/>
<id>b3cc366288c0a3e7583810be816d5fed3cd54ac2</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>gGiScaleMtx</title>
<updated>2026-07-08T11:19:10+00:00</updated>
<author>
<name>Jameriquiah</name>
<email>jordynhardyman12@gmail.com</email>
</author>
<published>2026-07-08T11:19:10+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=23a81b4211a8c44cf4ff4df7c4bdeaa4d6ec5030'/>
<id>23a81b4211a8c44cf4ff4df7c4bdeaa4d6ec5030</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix GC US assets conflicting with N64 US HD assets (#1726)</title>
<updated>2026-06-11T13:54:35+00:00</updated>
<author>
<name>GhostlyDark</name>
<email>31742919+GhostlyDark@users.noreply.github.com</email>
</author>
<published>2026-06-11T13:54:35+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=626f922c617c33d9aea3a598f39397820fae2e78'/>
<id>626f922c617c33d9aea3a598f39397820fae2e78</id>
<content type='text'>
* GC US: Fix copyright text

* GC US: Fix File Select text</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* GC US: Fix copyright text

* GC US: Fix File Select text</pre>
</div>
</content>
</entry>
<entry>
<title>Add Flippers Icon (#1586)</title>
<updated>2026-03-10T21:35:35+00:00</updated>
<author>
<name>ItsHeckinPat</name>
<email>115201185+Patrick12115@users.noreply.github.com</email>
</author>
<published>2026-03-10T21:35:35+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=b439220de1eed65073cf6d44795955b47601a10b'/>
<id>b439220de1eed65073cf6d44795955b47601a10b</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>[Rando] Shuffle Ocarina Buttons (#1303)</title>
<updated>2026-01-09T18:03:58+00:00</updated>
<author>
<name>Caladius</name>
<email>Caladius@users.noreply.github.com</email>
</author>
<published>2026-01-09T18:03:58+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=b06178e41709d57a97514f638722a87a08080952'/>
<id>b06178e41709d57a97514f638722a87a08080952</id>
<content type='text'>
* Import Models

* Give and Draw for Models

* Logic updates, need to do Evans Song

* Update OnFileCreate

* Fixes

* clang

* Implement Japas Jam Session

* Update naming uniformity

* Rename Logic

* ugh

* Fixes VB, Logic, and removes magic numbers from Starting Items Macro.

* Adds Item Tracker implementation

* Adds Scarecrow song check and makes feedback changes.

* Stop error chime from starting an EDM album.

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

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

* Update mm/2s2h/Rando/Logic/Logic.h

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

* Update mm/2s2h/Rando/Logic/Logic.h

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

* Update mm/2s2h/Enhancements/Songs/SkipScarecrowSong.cpp

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

* Undo Swim change (no idea why i did this)

* Reworked Hook

* Cleanup

* Clean up

Fix bug with SkipScarecrowSong
Fix Zora Ballad logic
Grant Ocarina buttons when not shuffled
Fix VB_PLAY_OCARINA_NOTE boolean
Re-instantiate starting items RI adjustment
Swap Ocarina right and left

---------

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>
* Import Models

* Give and Draw for Models

* Logic updates, need to do Evans Song

* Update OnFileCreate

* Fixes

* clang

* Implement Japas Jam Session

* Update naming uniformity

* Rename Logic

* ugh

* Fixes VB, Logic, and removes magic numbers from Starting Items Macro.

* Adds Item Tracker implementation

* Adds Scarecrow song check and makes feedback changes.

* Stop error chime from starting an EDM album.

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

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

* Update mm/2s2h/Rando/Logic/Logic.h

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

* Update mm/2s2h/Rando/Logic/Logic.h

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

* Update mm/2s2h/Enhancements/Songs/SkipScarecrowSong.cpp

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

* Undo Swim change (no idea why i did this)

* Reworked Hook

* Cleanup

* Clean up

Fix bug with SkipScarecrowSong
Fix Zora Ballad logic
Grant Ocarina buttons when not shuffled
Fix VB_PLAY_OCARINA_NOTE boolean
Re-instantiate starting items RI adjustment
Swap Ocarina right and left

---------

Co-authored-by: Eblo &lt;7004497+Eblo@users.noreply.github.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Port Input Viewer from SoH (#1345)</title>
<updated>2025-11-25T03:31:54+00:00</updated>
<author>
<name>Glought</name>
<email>Glought@users.noreply.github.com</email>
</author>
<published>2025-11-25T03:31:54+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=af7ca2f75f7a62c975a01d055bb265b313223e9c'/>
<id>af7ca2f75f7a62c975a01d055bb265b313223e9c</id>
<content type='text'>
* Port Input Viewer from SoH

* Made Changes requested by Eblo for "InputViewer.h" and "InputViewer.cpp"

* Renamed the button PNGS back to the original names from SoH
Custom .otr files for the InputViewer on SoH should work.

* Ran Clang Format

* Removed unneeded code from "BenPort.cpp: Line 186: controlDeck"
Removed unneeded code from "BenPort.h"
Ran Clang Format</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Port Input Viewer from SoH

* Made Changes requested by Eblo for "InputViewer.h" and "InputViewer.cpp"

* Renamed the button PNGS back to the original names from SoH
Custom .otr files for the InputViewer on SoH should work.

* Ran Clang Format

* Removed unneeded code from "BenPort.cpp: Line 186: controlDeck"
Removed unneeded code from "BenPort.h"
Ran Clang Format</pre>
</div>
</content>
</entry>
<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>
</feed>
