2ship2harkinian/mm/src/code/z_sub_s.c, branch develop-keiichi 2Ship2Harkinian: Majora’s Mask PC port Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753) 2025-09-16T18:18:09+00:00 Tom Overton tom-overton@users.noreply.github.com 2024-12-11T02:06:55+00:00 c2ba5f016c6640c3747e45f47baf5a151d8cd897 * 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 -> 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 -> landSfxTimer * actionState -> 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 -> texScroll * low hanging fruit * PR + small fix * Happy with >20% of functions * Happy with >40% of functions * Happy with >60% of functions * Happy with >75% of functions * Happy with >90% of functions * Happy with >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` -> `deceleration` * Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam` * Use decimal numbers in the various `FillShadowTex` functions --------- Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: petrie911 <pmontag@Monday.localdomain> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: petrie911 <petrie911@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com> 
* 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 -> 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 -> landSfxTimer

* actionState -> 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 -> texScroll

* low hanging fruit

* PR + small fix

* Happy with >20% of functions

* Happy with >40% of functions

* Happy with >60% of functions

* Happy with >75% of functions

* Happy with >90% of functions

* Happy with >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` -> `deceleration`

* Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam`

* Use decimal numbers in the various `FillShadowTex` functions

---------

Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain>
Co-authored-by: petrie911 <pmontag@Monday.localdomain>
Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com>
Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu>
Co-authored-by: petrie911 <petrie911@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Name Talking Related Actor Flags (#1733) 2025-09-16T16:49:35+00:00 engineer124 47598039+engineer124@users.noreply.github.com 2024-10-24T00:12:41+00:00 c4a3acbf41080f229813c2aba708177182f78bbe * talk actor flags * fix order * remove comment 
* talk actor flags

* fix order

* remove comment
 Cleanup gSPMatrix, rename `Matrix_New` -> `Matrix_Finalize`, add MATRIX_FINALIZE_AND_LOAD (#1729) 2025-09-16T15:16:58+00:00 engineer124 47598039+engineer124@users.noreply.github.com 2024-10-23T00:51:00+00:00 111979112a633e03cb65c00899501073fd8a3f16 * mtx-finalize * cleanup gSPMatrix 
* mtx-finalize

* cleanup gSPMatrix
Misc Clean (#1680) 2025-09-16T01:32:00+00:00 Derek Hensley hensley.derek58@gmail.com 2024-09-08T03:55:59+00:00 044b5c4c6bd509187038c8f7fc1344db395585ac * vramu32 in Overlay_Relocate * Actor_SetColorFilter args * Effect Hitmark enum * Actor_WorldToActorCoords * Some fault clean up * contoller.h * macros.h no longer needs stdint.h 
* vramu32 in Overlay_Relocate

* Actor_SetColorFilter args

* Effect Hitmark enum

* Actor_WorldToActorCoords

* Some fault clean up

* contoller.h

* macros.h no longer needs stdint.h
`ovl_En_Door` docs pass (#1603) 2025-09-14T12:48:11+00:00 Anghelo Carvajal angheloalf95@gmail.com 2024-04-23T01:34:02+00:00 53953b6739e9e7eec52ffba269ce36ecf265e412 * DoorScheduleResult * actionVar * DOOR_DL_ * enums * ENDOOR_TYPE_SCHEDULE and related stuff * Name some functions and start figuring out stuff * defines * start documenting schedules * Name Inn doors * More door schedule naming * ajar * Name remaining schedule types * parameters diagram and some cleanups * Name renaiming types * format * rename some schedules * Use more static_assert * name anims * yeet unrelated stuff * requestOpen * Yeet DoorScheduleResult * whoops * stuff i missed * Update src/overlays/actors/ovl_En_Door/scheduleScripts.schl Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Door/z_en_door.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_En_Door/z_en_door.h Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * Update src/overlays/actors/ovl_En_Pm/z_en_pm.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/code/z_sub_s.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * review * FindScheduleDoor --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> 
* DoorScheduleResult

* actionVar

* DOOR_DL_

* enums

* ENDOOR_TYPE_SCHEDULE and related stuff

* Name some functions and start figuring out stuff

* defines

* start documenting schedules

* Name Inn doors

* More door schedule naming

* ajar

* Name remaining schedule types

* parameters diagram and some cleanups

* Name renaiming types

* format

* rename some schedules

* Use more static_assert

* name anims

* yeet unrelated stuff

* requestOpen

* Yeet DoorScheduleResult

* whoops

* stuff i missed

* Update src/overlays/actors/ovl_En_Door/scheduleScripts.schl

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Door/z_en_door.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Door/z_en_door.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

* Update src/overlays/actors/ovl_En_Pm/z_en_pm.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sub_s.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* review

* FindScheduleDoor

---------

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Misc Cleanup 2 (#1521) 2025-09-14T02:32:44+00:00 engineer124 47598039+engineer124@users.noreply.github.com 2024-03-23T11:04:07+00:00 54756970edad81bb6e1972a7cbb7c0ff231d15af * begin cleanup * more cleanup * more cleanup * more cleanup * more cleanup * more cleanup * fake matches * more cleanup * more cleanup * small thing * PR Review * PR Review 
* begin cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* fake matches

* more cleanup

* more cleanup

* small thing

* PR Review

* PR Review
Use more `TRUNCF_BINANG` for f32 -> s16 casts (#1503) 2025-09-13T23:59:34+00:00 engineer124 47598039+engineer124@users.noreply.github.com 2023-12-13T04:16:24+00:00 9f1f53f4d8cf40a1af28a65f2140fb41e252dacc * TRUNCF_BINANG * brackets * extra cast 
* TRUNCF_BINANG

* brackets

* extra cast
Misc Cleanup (#1509) 2025-09-13T01:21:58+00:00 engineer124 47598039+engineer124@users.noreply.github.com 2023-11-27T14:54:11+00:00 80e547e0dea626dfa402238d4a5da195e3eca033 * begin anim R * sTexturesDesegmented * more misc docs * more misc cleanup * small adjustments * oh sneaky * PR Review * adj comment, reads better * missed an enum * this one actor reverses true/false * bool * CARNIVOROUS_LILY 
* begin anim R

* sTexturesDesegmented

* more misc docs

* more misc cleanup

* small adjustments

* oh sneaky

* PR Review

* adj comment, reads better

* missed an enum

* this one actor reverses true/false

* bool

* CARNIVOROUS_LILY
Animation Cleanup: En_P* (#1507) 2025-09-13T01:15:51+00:00 engineer124 47598039+engineer124@users.noreply.github.com 2023-11-22T05:10:55+00:00 ed6caf708960af2f521fbc110322ce38690584c7 * anim P cleanup * PR Review * PR Review * Postbox Idle 
* anim P cleanup

* PR Review

* PR Review

* Postbox Idle
Use `CURRENT_TIME` Macro (#1514) 2025-09-12T20:58:31+00:00 engineer124 47598039+engineer124@users.noreply.github.com 2023-11-27T09:04:54+00:00 39386c8ec22684659d088bc3773ad6be5a897f9b * use CURRENT_TIME macro * add comment * cleanup brackets 
* use CURRENT_TIME macro

* add comment

* cleanup brackets