Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753)

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

1 files changed, 3 insertions, 3 deletions

diff --git a/assets/xml/objects/object_boss07.xml b/assets/xml/objects/object_boss07.xml
index 2d3aa4fa1..7c5d702c8 100644
--- a/assets/xml/objects/object_boss07.xml
+++ b/assets/xml/objects/object_boss07.xml
@@ -4,7 +4,7 @@
         <!-- Majora's Incarnation Animations -->
         <Animation Name="gMajorasIncarnationPirouetteAnim" Offset="0x194" /> <!-- Original name is "last2_bd" (probably short for "ballet dance") -->
         <Animation Name="gMajorasIncarnationEnergyBallAttackAnim" Offset="0x428" /> <!-- Original name is "last2_beam02" -->
-        <Animation Name="gMajorasIncarnationDamageAnim" Offset="0xD0C" /> <!-- Original name is "last2_dam" -->
+        <Animation Name="gMajorasIncarnationDamagedAnim" Offset="0xD0C" /> <!-- Original name is "last2_dam" -->
         <Animation Name="gMajorasIncarnationIntroDanceAnim" Offset="0x2C40" /> <!-- Original name is "last2_hensin" ("metamorphosis/transformation") -->
         <Animation Name="gMajorasIncarnationJerkingAnim" Offset="0x2D84" /> <!-- Original name is "last2_hensin2" -->
         <Animation Name="gMajorasIncarnationPumpingUpAnim" Offset="0x31E4" /> <!-- Original name is "last2_hensin3" -->
@@ -154,14 +154,14 @@
         <Animation Name="gMajorasWrathDoubleKickAndJumpBackAnim" Offset="0x1C430" /> <!-- Unused. Original name is "last_ac02" -->
         <Animation Name="gMajorasWrathBackflipUppercutAttackAnim" Offset="0x1CFF0" /> <!-- Unused. Original name is "last_ac03" -->
         <Animation Name="gMajorasWrathHighKickAnim" Offset="0x1D974" /> <!-- Unused and almost identical to gMajorasWrathKickAnim. Original name is "last_ac04" -->
-        <Animation Name="gMajorasWrathDamageAnim" Offset="0x1DEB4" /> <!-- Original name is "last_dam" -->
+        <Animation Name="gMajorasWrathDamagedAnim" Offset="0x1DEB4" /> <!-- Original name is "last_dam" -->
         <Animation Name="gMajorasWrathDeathAnim" Offset="0x22BB4" /> <!-- Original name is "last_dead" -->
         <Animation Name="gMajorasWrathTiptoeWhipAttackAnim" Offset="0x23A44" /> <!-- Unused. Original name is "last_def" -->
         <Animation Name="gMajorasWrathHeavyBreathingAnim" Offset="0x23DAC" /> <!-- Original name is "last_hen" (short for "metamorphosis/transformation") -->
         <Animation Name="gMajorasWrathIntroAnim" Offset="0x25018" /> <!-- Original name is "last_hen2" -->
         <Animation Name="gMajorasWrathBackflipAnim" Offset="0x25878" /> <!-- Original name is "last_jump" -->
         <Animation Name="gMajorasWrathKickAnim" Offset="0x26204" /> <!-- Original name is "last_kick" -->
-        <Animation Name="gMajorasWrathReleaseTopAnim" Offset="0x269EC" /> <!-- Original name is "last_koma" ("spinning top") -->
+        <Animation Name="gMajorasWrathThrowTopAnim" Offset="0x269EC" /> <!-- Original name is "last_koma" ("spinning top") -->
         <Animation Name="gMajorasWrathGrabAnim" Offset="0x26EA0" /> <!-- Original name is "last_link" -->
         <Animation Name="gMajorasWrathThrowAnim" Offset="0x27270" /> <!-- Original name is "last_link2" -->