<feed xmlns='http://www.w3.org/2005/Atom'>
<title>2ship2harkinian/mm/assets/xml/GC_US/objects, 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>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>Sync GC_US gameplay_keep.xml</title>
<updated>2025-09-23T00:21:57+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-09-23T00:21:57+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=e000a32bb6b904655c72f91849d791dae7369f5f'/>
<id>e000a32bb6b904655c72f91849d791dae7369f5f</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Document Player's Face and z_actor FaceChange functions (#1777)</title>
<updated>2025-09-17T01:56:23+00:00</updated>
<author>
<name>engineer124</name>
<email>47598039+engineer124@users.noreply.github.com</email>
</author>
<published>2025-06-04T01:59:25+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=8e73f0c39df0c00f1a6639d2f200cfa2babb2a3d'/>
<id>8e73f0c39df0c00f1a6639d2f200cfa2babb2a3d</id>
<content type='text'>
* player face docs

* more docs

* cleanup

* toto

* more comments

* fix bss, names

* better comment

* PR, fix comment

* fix bss

* sEyeTextures comment

* FaceChange_UpdateBlinkingNonHuman

---------

Co-authored-by: Anghelo Carvajal &lt;angheloalf95@gmail.com&gt;
Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* player face docs

* more docs

* cleanup

* toto

* more comments

* fix bss, names

* better comment

* PR, fix comment

* fix bss

* sEyeTextures comment

* FaceChange_UpdateBlinkingNonHuman

---------

Co-authored-by: Anghelo Carvajal &lt;angheloalf95@gmail.com&gt;
Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>`En_Kaizoku` and `object_kz` documented: the pirate fighter miniboss (#1788)</title>
<updated>2025-09-17T00:47:11+00:00</updated>
<author>
<name>Isghj</name>
<email>42048411+isghj5@users.noreply.github.com</email>
</author>
<published>2025-02-27T00:59:58+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=0f7e5d91431eb68cb0d5e99d6454230604c4bbab'/>
<id>0f7e5d91431eb68cb0d5e99d6454230604c4bbab</id>
<content type='text'>
* Kaizoku: some docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: all object labeled

* Kaizoku: more docs

* More docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: first pass complete

* format

* Kaizoku: minor tweaks

* Kaizoku: Anghelos requested changes pass1

* Kaizoku: minor docs

* Kaizoku: get'n't

* Kaizoku: format

* Apply suggestions from code review

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;

* Kaizoku: back to OK

* Kaizoku: more requested changes

* Kaizoku: outfit and lipstick color enums

* Kaizoku: rename object assets from gKaizoku to gFighterPirate

* Kaizoku: LIMB_FULL

* Kaizoku: some requested changes

* Kaizoku: more requested changes

* Apply suggestions from code review

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;

* Kaizoku: back to matching

* Kaizoku: requested changes

* Kaizoku: missed change

* Apply suggestions from code review

Co-authored-by: Tom Overton &lt;tom-overton@users.noreply.github.com&gt;

* Kaizoku: back to matching and more requested changes

---------

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
Co-authored-by: Tom Overton &lt;tom-overton@users.noreply.github.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Kaizoku: some docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: all object labeled

* Kaizoku: more docs

* More docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: more docs

* Kaizoku: first pass complete

* format

* Kaizoku: minor tweaks

* Kaizoku: Anghelos requested changes pass1

* Kaizoku: minor docs

* Kaizoku: get'n't

* Kaizoku: format

* Apply suggestions from code review

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;

* Kaizoku: back to OK

* Kaizoku: more requested changes

* Kaizoku: outfit and lipstick color enums

* Kaizoku: rename object assets from gKaizoku to gFighterPirate

* Kaizoku: LIMB_FULL

* Kaizoku: some requested changes

* Kaizoku: more requested changes

* Apply suggestions from code review

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;

* Kaizoku: back to matching

* Kaizoku: requested changes

* Kaizoku: missed change

* Apply suggestions from code review

Co-authored-by: Tom Overton &lt;tom-overton@users.noreply.github.com&gt;

* Kaizoku: back to matching and more requested changes

---------

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
Co-authored-by: Tom Overton &lt;tom-overton@users.noreply.github.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>`EnIshi` documentation pass, and `gameplay_field_keep` assets labeled (#1794)</title>
<updated>2025-09-17T00:12:31+00:00</updated>
<author>
<name>Isghj</name>
<email>42048411+isghj5@users.noreply.github.com</email>
</author>
<published>2025-02-22T00:31:45+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=03efac84bf42bde934077d4830a8c259bd747909'/>
<id>03efac84bf42bde934077d4830a8c259bd747909</id>
<content type='text'>
* Ishi: some docs

* Ishi: more docs

* Ishi: more docs

* Ishi: field_keep assets labeled

* Ishi: format

* Ishi: minor docs/fixes

* Ishi: requested changes

* Spawn and Dust Funcs

* Ishi: only us version

* Ishi/Bombiwa: more requested changes

* Ishi: format

* Apply suggestions from code review

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;

* Ishi: back to matching

* Ishi: a value got inverted somehow

---------

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Ishi: some docs

* Ishi: more docs

* Ishi: more docs

* Ishi: field_keep assets labeled

* Ishi: format

* Ishi: minor docs/fixes

* Ishi: requested changes

* Spawn and Dust Funcs

* Ishi: only us version

* Ishi/Bombiwa: more requested changes

* Ishi: format

* Apply suggestions from code review

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;

* Ishi: back to matching

* Ishi: a value got inverted somehow

---------

Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Add gameplay_*_keep original assets to GC</title>
<updated>2025-09-16T22:15:20+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-09-16T22:15:20+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=7af8c221f73eefc7915233b9b2e677a720ec24fd'/>
<id>7af8c221f73eefc7915233b9b2e677a720ec24fd</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add missing ExternalFile tags to GC variants</title>
<updated>2025-09-16T22:12:04+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-09-16T22:12:04+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=2fbe7f3a6773e7ae355ea30a1d727862b948ac96'/>
<id>2fbe7f3a6773e7ae355ea30a1d727862b948ac96</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Add original asset names to all `object_y*` and `object_z*` files (#1765)</title>
<updated>2025-09-16T18:33:06+00:00</updated>
<author>
<name>Tom Overton</name>
<email>tom-overton@users.noreply.github.com</email>
</author>
<published>2024-12-17T16:30:28+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=84280c503d2e191b7c3f42bf9f9e3bd23a2571d3'/>
<id>84280c503d2e191b7c3f42bf9f9e3bd23a2571d3</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Apply object_u-w* names to GC_US</title>
<updated>2025-09-16T18:32:07+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-09-16T18:32:07+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=ffb0e7411f8906c6770082b7536ed2f09d55c0ce'/>
<id>ffb0e7411f8906c6770082b7536ed2f09d55c0ce</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753)</title>
<updated>2025-09-16T18:18:09+00:00</updated>
<author>
<name>Tom Overton</name>
<email>tom-overton@users.noreply.github.com</email>
</author>
<published>2024-12-11T02:06:55+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=c2ba5f016c6640c3747e45f47baf5a151d8cd897'/>
<id>c2ba5f016c6640c3747e45f47baf5a151d8cd897</id>
<content type='text'>
* more matches

* more functions

* merge, I hope

* wrath done-ish

* 5 nonmatchings

* more matchings

* more improvements

* more stuff

* stuff

* docs part 1 / infinity

* more docs

* .

* more adjustments

* linked assets

* Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!)

* more stuff

* play part 2

* lol merge

* update

* unk types

* SWEET GOOGLY MOOGLY IT MATCHES

* cam fixes

* adjust damage stuff

* if?

* stuff

* signs

* macro stuff. clean up later

* names

* Some small cleanup

* cleanup and docs

* more cleanup

* Wrath shadow docs

* Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging

* Update functions.txt

* Types cleanup

* Some low hanging fruit

* Undefined_syms.txt

* More static -&gt; battle handler

* Lots of naming cleanup

* Remove z_boss_07_dmgtbl.inc
The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things.

* Get most of the limb stuff named (and actually update the spec)

* Some minor cleanup

* Updating the repo with what we talked about in discord

* Some syncing with Odolwa and other misc name stuff

* Some Odolwa/Bio Baba sync

* Another bit of Odolwa/Bio Baba sync

* Name a lot of incarnation limb variables

* Finalize the incarnation intro variable stuff

* Fix a goof

* `incarnationWrathTransition` variables

* `generalCollider` and always use "tentacle"

* Completely remove "shot," always use "projectile"

* Clean up `Boss07_Mask_Draw`

* Name `maskShakeTimer`

* Give better names to a few more things

* Some beam-related struct vars

* undefined_syms

* More beam names

* More beam stuff

* Beam, pt 100000

* Some intro struct members

* Some timers

* More non-beam stuff, back to beam

* Done with beam finally

* All but one of the subcam variables, some other stuff

* Some variable names and cleanup

* More cleanup

* jumpSfxTimer -&gt; landSfxTimer

* actionState -&gt; subAction and a little bit of syncing with Odolwa

* A couple more variables sync

* Buncha variables

* Lots of non-whip variables

* Commit what I have before starting on some of the grab stuff

* All but one struct var done

* Lots of header cleanup

* Finish the header file

* Fix build after merging main

* Damage effect enums

* Update damage effect enums for Incarnation and Wrath

* Update damage effect enums for Mask and Remains

* First pass at top damage effects

* Do a few sub action enums so I have something to show

* Fix the damage effect enums, clean up a lot of subaction enums

* All remaining sub action enums, cleanup damage effect enums, other misc cleanup

* Finish enums

* Finish data

* Push up what I have

* Consistency

* scroll -&gt; texScroll

* low hanging fruit

* PR + small fix

* Happy with &gt;20% of functions

* Happy with &gt;40% of functions

* Happy with &gt;60% of functions

* Happy with &gt;75% of functions

* Happy with &gt;90% of functions

* Happy with &gt;95% of functions

* Happy with `Boss07_Wrath_DeathCutscene`

* Happy with `Boss07_Mask_FireBeam`

* Happy with `Boss07_Wrath_CheckWhipCollisions`

* Happy with everything but `Boss07_Mask_Draw`

* Happy with all functions I think?

* Clean up forward declarations

* Write a half-decent file header

* Fix after merging

* Fix some minor stuff here and there

* Minor fix in the file header because I forgot I renamed this

* Respond to engineer's review

* Respond to Anghelo's review

* Replace as many actor lookups with for-loops as I can in Odolwa/Majora

* Change the comment about the hookshot from a `@note` to a `@bug`

* `drag` -&gt; `deceleration`

* Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam`

* Use decimal numbers in the various `FillShadowTex` functions

---------

Co-authored-by: petrie911 &lt;pmontag@DESKTOP-LG8A167.localdomain&gt;
Co-authored-by: petrie911 &lt;pmontag@Monday.localdomain&gt;
Co-authored-by: petrie911 &lt;69443847+petrie911@users.noreply.github.com&gt;
Co-authored-by: petrie911 &lt;pmontag@PHYS-S129.iowa.uiowa.edu&gt;
Co-authored-by: petrie911 &lt;petrie911@users.noreply.github.com&gt;
Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
Co-authored-by: engineer124 &lt;engineer124engineer124@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* more matches

* more functions

* merge, I hope

* wrath done-ish

* 5 nonmatchings

* more matchings

* more improvements

* more stuff

* stuff

* docs part 1 / infinity

* more docs

* .

* more adjustments

* linked assets

* Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!)

* more stuff

* play part 2

* lol merge

* update

* unk types

* SWEET GOOGLY MOOGLY IT MATCHES

* cam fixes

* adjust damage stuff

* if?

* stuff

* signs

* macro stuff. clean up later

* names

* Some small cleanup

* cleanup and docs

* more cleanup

* Wrath shadow docs

* Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging

* Update functions.txt

* Types cleanup

* Some low hanging fruit

* Undefined_syms.txt

* More static -&gt; battle handler

* Lots of naming cleanup

* Remove z_boss_07_dmgtbl.inc
The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things.

* Get most of the limb stuff named (and actually update the spec)

* Some minor cleanup

* Updating the repo with what we talked about in discord

* Some syncing with Odolwa and other misc name stuff

* Some Odolwa/Bio Baba sync

* Another bit of Odolwa/Bio Baba sync

* Name a lot of incarnation limb variables

* Finalize the incarnation intro variable stuff

* Fix a goof

* `incarnationWrathTransition` variables

* `generalCollider` and always use "tentacle"

* Completely remove "shot," always use "projectile"

* Clean up `Boss07_Mask_Draw`

* Name `maskShakeTimer`

* Give better names to a few more things

* Some beam-related struct vars

* undefined_syms

* More beam names

* More beam stuff

* Beam, pt 100000

* Some intro struct members

* Some timers

* More non-beam stuff, back to beam

* Done with beam finally

* All but one of the subcam variables, some other stuff

* Some variable names and cleanup

* More cleanup

* jumpSfxTimer -&gt; landSfxTimer

* actionState -&gt; subAction and a little bit of syncing with Odolwa

* A couple more variables sync

* Buncha variables

* Lots of non-whip variables

* Commit what I have before starting on some of the grab stuff

* All but one struct var done

* Lots of header cleanup

* Finish the header file

* Fix build after merging main

* Damage effect enums

* Update damage effect enums for Incarnation and Wrath

* Update damage effect enums for Mask and Remains

* First pass at top damage effects

* Do a few sub action enums so I have something to show

* Fix the damage effect enums, clean up a lot of subaction enums

* All remaining sub action enums, cleanup damage effect enums, other misc cleanup

* Finish enums

* Finish data

* Push up what I have

* Consistency

* scroll -&gt; texScroll

* low hanging fruit

* PR + small fix

* Happy with &gt;20% of functions

* Happy with &gt;40% of functions

* Happy with &gt;60% of functions

* Happy with &gt;75% of functions

* Happy with &gt;90% of functions

* Happy with &gt;95% of functions

* Happy with `Boss07_Wrath_DeathCutscene`

* Happy with `Boss07_Mask_FireBeam`

* Happy with `Boss07_Wrath_CheckWhipCollisions`

* Happy with everything but `Boss07_Mask_Draw`

* Happy with all functions I think?

* Clean up forward declarations

* Write a half-decent file header

* Fix after merging

* Fix some minor stuff here and there

* Minor fix in the file header because I forgot I renamed this

* Respond to engineer's review

* Respond to Anghelo's review

* Replace as many actor lookups with for-loops as I can in Odolwa/Majora

* Change the comment about the hookshot from a `@note` to a `@bug`

* `drag` -&gt; `deceleration`

* Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam`

* Use decimal numbers in the various `FillShadowTex` functions

---------

Co-authored-by: petrie911 &lt;pmontag@DESKTOP-LG8A167.localdomain&gt;
Co-authored-by: petrie911 &lt;pmontag@Monday.localdomain&gt;
Co-authored-by: petrie911 &lt;69443847+petrie911@users.noreply.github.com&gt;
Co-authored-by: petrie911 &lt;pmontag@PHYS-S129.iowa.uiowa.edu&gt;
Co-authored-by: petrie911 &lt;petrie911@users.noreply.github.com&gt;
Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
Co-authored-by: engineer124 &lt;engineer124engineer124@gmail.com&gt;
</pre>
</div>
</content>
</entry>
</feed>
