mirror of
https://github.com/zeldaret/mm.git
synced 2026-09-06 10:45:18 -04:00
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>
This commit is contained in:
Tom Overton
+136
-136
@@ -2707,7 +2707,7 @@
|
||||
0x8013E5CC:("SubS_LineSegVsPlane",),
|
||||
0x8013E640:("SubS_FindActorCustom",),
|
||||
0x8013E748:("SubS_OfferTalkExchangeCustom",),
|
||||
0x8013E7C0:("SubS_ActorAndPlayerFaceEachOther",),
|
||||
0x8013E7C0:("SubS_ArePlayerAndActorFacing",),
|
||||
0x8013E8F8:("SubS_OfferTalkExchangeFacing",),
|
||||
0x8013E950:("SubS_TrackPointStep",),
|
||||
0x8013EC10:("Rumble_Update",),
|
||||
@@ -9267,7 +9267,7 @@
|
||||
0x809D441C:("Boss01_SetupStunned",),
|
||||
0x809D4464:("Boss01_Stunned",),
|
||||
0x809D44C0:("Boss01_Thaw",),
|
||||
0x809D4668:("Boss01_ArePlayerAndOdolwaFacing",),
|
||||
0x809D4668:("Boss01_ArePlayerAndActorFacing",),
|
||||
0x809D46E4:("Boss01_Update",),
|
||||
0x809D519C:("Boss01_DrawSwordTrail",),
|
||||
0x809D5584:("Boss01_OverrideLimbDraw",),
|
||||
@@ -9435,142 +9435,142 @@
|
||||
0x809F2EE8:("Boss06_CurtainDestroyed",),
|
||||
0x809F2F0C:("Boss06_Update",),
|
||||
0x809F334C:("Boss06_Draw",),
|
||||
0x809F4980:("func_809F4980",),
|
||||
0x809F49A0:("func_809F49A0",),
|
||||
0x809F49C0:("func_809F49C0",),
|
||||
0x809F4AE8:("func_809F4AE8",),
|
||||
0x809F4BB0:("func_809F4BB0",),
|
||||
0x809F4C40:("func_809F4C40",),
|
||||
0x809F4CBC:("func_809F4CBC",),
|
||||
0x809F4D10:("func_809F4D10",),
|
||||
0x809F4D54:("func_809F4D54",),
|
||||
0x809F4FAC:("func_809F4FAC",),
|
||||
0x809F4FF8:("func_809F4FF8",),
|
||||
0x809F51E8:("func_809F51E8",),
|
||||
0x809F52CC:("func_809F52CC",),
|
||||
0x809F536C:("func_809F536C",),
|
||||
0x809F5494:("func_809F5494",),
|
||||
0x809F4980:("Boss07_Remains_PlayDamageSfx",),
|
||||
0x809F49A0:("Boss07_InitRand",),
|
||||
0x809F49C0:("Boss07_RandZeroOne",),
|
||||
0x809F4AE8:("Boss07_SpawnFlameEffect",),
|
||||
0x809F4BB0:("Boss07_SetColliderSphere",),
|
||||
0x809F4C40:("Boss07_ArePlayerAndActorFacing",),
|
||||
0x809F4CBC:("Boss07_SmoothStop",),
|
||||
0x809F4D10:("Boss07_RandXZ",),
|
||||
0x809F4D54:("Boss07_Incarnation_SpawnDust",),
|
||||
0x809F4FAC:("Boss07_MovePlayer",),
|
||||
0x809F4FF8:("Boss07_Wrath_SpawnDustAtPos",),
|
||||
0x809F51E8:("Boss07_Wrath_ChooseJump",),
|
||||
0x809F52CC:("Boss07_Wrath_JumpAwayFromExplosive",),
|
||||
0x809F536C:("Boss07_Wrath_BombWhip",),
|
||||
0x809F5494:("Boss07_Wrath_CheckBombWhips",),
|
||||
0x809F552C:("Boss07_Init",),
|
||||
0x809F5DA0:("Boss07_Destroy",),
|
||||
0x809F5E14:("func_809F5E14",),
|
||||
0x809F5E88:("func_809F5E88",),
|
||||
0x809F64F4:("func_809F64F4",),
|
||||
0x809F65F4:("func_809F65F4",),
|
||||
0x809F7400:("func_809F7400",),
|
||||
0x809F748C:("func_809F748C",),
|
||||
0x809F7688:("func_809F7688",),
|
||||
0x809F76D0:("func_809F76D0",),
|
||||
0x809F77A8:("func_809F77A8",),
|
||||
0x809F783C:("func_809F783C",),
|
||||
0x809F7968:("func_809F7968",),
|
||||
0x809F7AB4:("func_809F7AB4",),
|
||||
0x809F7BC4:("func_809F7BC4",),
|
||||
0x809F7D2C:("func_809F7D2C",),
|
||||
0x809F805C:("func_809F805C",),
|
||||
0x809F8658:("func_809F8658",),
|
||||
0x809F86B8:("func_809F86B8",),
|
||||
0x809F87C8:("func_809F87C8",),
|
||||
0x809F8908:("func_809F8908",),
|
||||
0x809F8AB0:("func_809F8AB0",),
|
||||
0x809F8B1C:("func_809F8B1C",),
|
||||
0x809F8D04:("func_809F8D04",),
|
||||
0x809F8DEC:("func_809F8DEC",),
|
||||
0x809F8E68:("func_809F8E68",),
|
||||
0x809F8EC8:("func_809F8EC8",),
|
||||
0x809F91D4:("func_809F91D4",),
|
||||
0x809F9280:("func_809F9280",),
|
||||
0x809F93DC:("func_809F93DC",),
|
||||
0x809F94AC:("func_809F94AC",),
|
||||
0x809F99C4:("func_809F99C4",),
|
||||
0x809F9CEC:("func_809F9CEC",),
|
||||
0x809F9E94:("func_809F9E94",),
|
||||
0x809FA1B4:("Boss07_Update",),
|
||||
0x809FAA44:("func_809FAA44",),
|
||||
0x809FB114:("func_809FB114",),
|
||||
0x809FB504:("func_809FB504",),
|
||||
0x809FB55C:("func_809FB55C",),
|
||||
0x809FB728:("func_809FB728",),
|
||||
0x809FB7D4:("func_809FB7D4",),
|
||||
0x809FBB9C:("func_809FBB9C",),
|
||||
0x809FBF94:("func_809FBF94",),
|
||||
0x809FC1C8:("Boss07_Draw",),
|
||||
0x809FC4C0:("func_809FC4C0",),
|
||||
0x809FC8B0:("func_809FC8B0",),
|
||||
0x809FC960:("func_809FC960",),
|
||||
0x809FCBC8:("func_809FCBC8",),
|
||||
0x809FCC70:("func_809FCC70",),
|
||||
0x809FCCCC:("func_809FCCCC",),
|
||||
0x809FD5F8:("func_809FD5F8",),
|
||||
0x809FD710:("func_809FD710",),
|
||||
0x809FD818:("func_809FD818",),
|
||||
0x809FD89C:("func_809FD89C",),
|
||||
0x809FD984:("func_809FD984",),
|
||||
0x809FDAB0:("func_809FDAB0",),
|
||||
0x809FDB2C:("func_809FDB2C",),
|
||||
0x809FDBA0:("func_809FDBA0",),
|
||||
0x809FDEDC:("func_809FDEDC",),
|
||||
0x809FDF54:("func_809FDF54",),
|
||||
0x809FE068:("func_809FE068",),
|
||||
0x809FE0E4:("func_809FE0E4",),
|
||||
0x809FE2D4:("func_809FE2D4",),
|
||||
0x809FE348:("func_809FE348",),
|
||||
0x809FE4B0:("func_809FE4B0",),
|
||||
0x809FE524:("func_809FE524",),
|
||||
0x809FE6B0:("func_809FE6B0",),
|
||||
0x809FE734:("func_809FE734",),
|
||||
0x809FEE70:("func_809FEE70",),
|
||||
0x809FF0E4:("func_809FF0E4",),
|
||||
0x809FF12C:("func_809FF12C",),
|
||||
0x809FF5CC:("func_809FF5CC",),
|
||||
0x809FF678:("func_809FF678",),
|
||||
0x809FF6B0:("func_809FF6B0",),
|
||||
0x809FF810:("func_809FF810",),
|
||||
0x809FF900:("func_809FF900",),
|
||||
0x809FFA04:("func_809FFA04",),
|
||||
0x809FFA80:("func_809FFA80",),
|
||||
0x809FFE64:("func_809FFE64",),
|
||||
0x809FFEAC:("func_809FFEAC",),
|
||||
0x80A0021C:("func_80A0021C",),
|
||||
0x80A00274:("func_80A00274",),
|
||||
0x80A00484:("func_80A00484",),
|
||||
0x80A00554:("func_80A00554",),
|
||||
0x80A006D0:("func_80A006D0",),
|
||||
0x80A006F4:("func_80A006F4",),
|
||||
0x80A00720:("func_80A00720",),
|
||||
0x80A016E4:("func_80A016E4",),
|
||||
0x80A01750:("func_80A01750",),
|
||||
0x80A025AC:("func_80A025AC",),
|
||||
0x80A0264C:("func_80A0264C",),
|
||||
0x80A02B30:("func_80A02B30",),
|
||||
0x80A02C54:("func_80A02C54",),
|
||||
0x80A03238:("func_80A03238",),
|
||||
0x80A036C4:("func_80A036C4",),
|
||||
0x80A03868:("func_80A03868",),
|
||||
0x80A03F18:("func_80A03F18",),
|
||||
0x80A03F5C:("func_80A03F5C",),
|
||||
0x80A0434C:("func_80A0434C",),
|
||||
0x80A045A8:("func_80A045A8",),
|
||||
0x80A04768:("func_80A04768",),
|
||||
0x80A04878:("func_80A04878",),
|
||||
0x80A04890:("func_80A04890",),
|
||||
0x80A04DE0:("func_80A04DE0",),
|
||||
0x80A04E5C:("func_80A04E5C",),
|
||||
0x80A055E0:("func_80A055E0",),
|
||||
0x80A05608:("func_80A05608",),
|
||||
0x80A05694:("func_80A05694",),
|
||||
0x80A057A0:("func_80A057A0",),
|
||||
0x80A05AF8:("func_80A05AF8",),
|
||||
0x80A05B50:("func_80A05B50",),
|
||||
0x80A05C88:("func_80A05C88",),
|
||||
0x80A05DDC:("func_80A05DDC",),
|
||||
0x80A06500:("func_80A06500",),
|
||||
0x80A06990:("func_80A06990",),
|
||||
0x80A06C64:("func_80A06C64",),
|
||||
0x80A06E24:("func_80A06E24",),
|
||||
0x80A06F48:("func_80A06F48",),
|
||||
0x80A07604:("func_80A07604",),
|
||||
0x80A07638:("func_80A07638",),
|
||||
0x80A07740:("func_80A07740",),
|
||||
0x809F5E14:("Boss07_Wrath_SetupIntroCutscene",),
|
||||
0x809F5E88:("Boss07_Wrath_IntroCutscene",),
|
||||
0x809F64F4:("Boss07_Wrath_SetupDeathCutscene",),
|
||||
0x809F65F4:("Boss07_Wrath_DeathCutscene",),
|
||||
0x809F7400:("Boss07_Wrath_SetupIdle",),
|
||||
0x809F748C:("Boss07_Wrath_Idle",),
|
||||
0x809F7688:("Boss07_Wrath_SetupJump",),
|
||||
0x809F76D0:("Boss07_Wrath_StartJump",),
|
||||
0x809F77A8:("Boss07_Wrath_Jump",),
|
||||
0x809F783C:("Boss07_Wrath_SetupFlip",),
|
||||
0x809F7968:("Boss07_Wrath_Flip",),
|
||||
0x809F7AB4:("Boss07_Wrath_SetupSidestep",),
|
||||
0x809F7BC4:("Boss07_Wrath_Sidestep",),
|
||||
0x809F7D2C:("Boss07_Wrath_SetupAttack",),
|
||||
0x809F805C:("Boss07_Wrath_Attack",),
|
||||
0x809F8658:("Boss07_Wrath_SetupTryGrab",),
|
||||
0x809F86B8:("Boss07_Wrath_TryGrab",),
|
||||
0x809F87C8:("Boss07_Wrath_GrabPlayer",),
|
||||
0x809F8908:("Boss07_Wrath_ThrowPlayer",),
|
||||
0x809F8AB0:("Boss07_Wrath_SetupShock",),
|
||||
0x809F8B1C:("Boss07_Wrath_ShockWhip",),
|
||||
0x809F8D04:("Boss07_Wrath_ShockStunned",),
|
||||
0x809F8DEC:("Boss07_Wrath_SetupStunned",),
|
||||
0x809F8E68:("Boss07_Wrath_SetupThrowTop",),
|
||||
0x809F8EC8:("Boss07_Wrath_ThrowTop",),
|
||||
0x809F91D4:("Boss07_Wrath_Stunned",),
|
||||
0x809F9280:("Boss07_Wrath_SetupDamaged",),
|
||||
0x809F93DC:("Boss07_Wrath_Damaged",),
|
||||
0x809F94AC:("Boss07_Wrath_CheckWhipCollisions",),
|
||||
0x809F99C4:("Boss07_Wrath_UpdateDamage",),
|
||||
0x809F9CEC:("Boss07_Wrath_Thaw",),
|
||||
0x809F9E94:("Boss07_UpdateDamageEffects",),
|
||||
0x809FA1B4:("Boss07_Wrath_Update",),
|
||||
0x809FAA44:("Boss07_Wrath_UpdateWhips",),
|
||||
0x809FB114:("Boss07_Wrath_DrawWhip",),
|
||||
0x809FB504:("Boss07_Wrath_OverrideLimbDraw",),
|
||||
0x809FB55C:("Boss07_Wrath_PostLimbDraw",),
|
||||
0x809FB728:("Boss07_Wrath_TransformLimbDraw",),
|
||||
0x809FB7D4:("Boss07_Wrath_DrawShocks",),
|
||||
0x809FBB9C:("Boss07_Wrath_DrawDeathLights",),
|
||||
0x809FBF94:("Boss07_BattleHandler_DrawIntroPlayerLightOrb",),
|
||||
0x809FC1C8:("Boss07_Wrath_Draw",),
|
||||
0x809FC4C0:("Boss07_Wrath_FillShadowTex",),
|
||||
0x809FC8B0:("Boss07_Wrath_GenShadowTex",),
|
||||
0x809FC960:("Boss07_Wrath_DrawShadowTex",),
|
||||
0x809FCBC8:("Boss07_Incarnation_AvoidPlayer",),
|
||||
0x809FCC70:("Boss07_Incarnation_SetupIntroCutscene",),
|
||||
0x809FCCCC:("Boss07_Incarnation_IntroCutscene",),
|
||||
0x809FD5F8:("Boss07_Incarnation_SetupTaunt",),
|
||||
0x809FD710:("Boss07_Incarnation_Taunt",),
|
||||
0x809FD818:("Boss07_Incarnation_SetupStunned",),
|
||||
0x809FD89C:("Boss07_Incarnation_Stunned",),
|
||||
0x809FD984:("Boss07_Incarnation_SetupDamaged",),
|
||||
0x809FDAB0:("Boss07_Incarnation_Damaged",),
|
||||
0x809FDB2C:("Boss07_Incarnation_SetupRun",),
|
||||
0x809FDBA0:("Boss07_Incarnation_Run",),
|
||||
0x809FDEDC:("Boss07_Incarnation_SetupAttack",),
|
||||
0x809FDF54:("Boss07_Incarnation_Attack",),
|
||||
0x809FE068:("Boss07_Incarnation_SetupSquattingDance",),
|
||||
0x809FE0E4:("Boss07_Incarnation_SquattingDance",),
|
||||
0x809FE2D4:("Boss07_Incarnation_SetupMoonwalk",),
|
||||
0x809FE348:("Boss07_Incarnation_Moonwalk",),
|
||||
0x809FE4B0:("Boss07_Incarnation_SetupPirouette",),
|
||||
0x809FE524:("Boss07_Incarnation_Pirouette",),
|
||||
0x809FE6B0:("Boss07_Incarnation_SetupDeathCutscene",),
|
||||
0x809FE734:("Boss07_Incarnation_DeathCutscene",),
|
||||
0x809FEE70:("Boss07_Incarnation_UpdateDamage",),
|
||||
0x809FF0E4:("Boss07_IncarnationAfterimage_Update",),
|
||||
0x809FF12C:("Boss07_Incarnation_Update",),
|
||||
0x809FF5CC:("Boss07_IncarnationAfterimage_Draw",),
|
||||
0x809FF678:("Boss07_Incarnation_OverrideLimbDraw",),
|
||||
0x809FF6B0:("Boss07_Incarnation_PostLimbDraw",),
|
||||
0x809FF810:("Boss07_Incarnation_TransformLimbDraw",),
|
||||
0x809FF900:("Boss07_Incarnation_Draw",),
|
||||
0x809FFA04:("Boss07_Mask_SetupIdle",),
|
||||
0x809FFA80:("Boss07_Mask_Idle",),
|
||||
0x809FFE64:("Boss07_Mask_SetupSpinAttack",),
|
||||
0x809FFEAC:("Boss07_Mask_SpinAttack",),
|
||||
0x80A0021C:("Boss07_Mask_SetupStunned",),
|
||||
0x80A00274:("Boss07_Mask_Stunned",),
|
||||
0x80A00484:("Boss07_Mask_SetupDamaged",),
|
||||
0x80A00554:("Boss07_Mask_Damaged",),
|
||||
0x80A006D0:("Boss07_Mask_StopBeam",),
|
||||
0x80A006F4:("Boss07_Mask_SetupFireBeam",),
|
||||
0x80A00720:("Boss07_Mask_FireBeam",),
|
||||
0x80A016E4:("Boss07_Mask_SetupIntroCutscene",),
|
||||
0x80A01750:("Boss07_Mask_IntroCutscene",),
|
||||
0x80A025AC:("Boss07_Mask_SetupDeathCutscene",),
|
||||
0x80A0264C:("Boss07_Mask_DeathCutscene",),
|
||||
0x80A02B30:("Boss07_Mask_UpdateDamage",),
|
||||
0x80A02C54:("Boss07_Mask_Update",),
|
||||
0x80A03238:("Boss07_Mask_UpdateTentacles",),
|
||||
0x80A036C4:("Boss07_Mask_DrawTentacles",),
|
||||
0x80A03868:("Boss07_Mask_DrawBeam",),
|
||||
0x80A03F18:("Boss07_Mask_PostLimbDraw",),
|
||||
0x80A03F5C:("Boss07_Mask_Draw",),
|
||||
0x80A0434C:("Boss07_Projectile_Update",),
|
||||
0x80A045A8:("Boss07_Projectile_Draw",),
|
||||
0x80A04768:("Boss07_Remains_UpdateDamage",),
|
||||
0x80A04878:("Boss07_Remains_SetupIntroCutscene",),
|
||||
0x80A04890:("Boss07_Remains_IntroCutscene",),
|
||||
0x80A04DE0:("Boss07_Remains_SetupMove",),
|
||||
0x80A04E5C:("Boss07_Remains_Move",),
|
||||
0x80A055E0:("Boss07_Remains_SetupStunned",),
|
||||
0x80A05608:("Boss07_Remains_Stunned",),
|
||||
0x80A05694:("Boss07_Remains_Update",),
|
||||
0x80A057A0:("Boss07_Remains_Draw",),
|
||||
0x80A05AF8:("Boss07_Top_SetupThrown",),
|
||||
0x80A05B50:("Boss07_Top_Thrown",),
|
||||
0x80A05C88:("Boss07_Top_SetupMove",),
|
||||
0x80A05DDC:("Boss07_Top_Move",),
|
||||
0x80A06500:("Boss07_Top_CheckTopCollision",),
|
||||
0x80A06990:("Boss07_Top_UpdateDamage",),
|
||||
0x80A06C64:("Boss07_Top_Update",),
|
||||
0x80A06E24:("Boss07_Top_Draw",),
|
||||
0x80A06F48:("Boss07_BattleHandler_Update",),
|
||||
0x80A07604:("Boss07_BattleHandler_Draw",),
|
||||
0x80A07638:("Boss07_BattleHandler_UpdateEffects",),
|
||||
0x80A07740:("Boss07_BattleHandler_DrawEffects",),
|
||||
0x80A0A8A0:("BgDyYoseizo_Init",),
|
||||
0x80A0A95C:("BgDyYoseizo_Destroy",),
|
||||
0x80A0A96C:("BgDyYoseizo_UpdateEyes",),
|
||||
|
||||
+73
-88
@@ -10180,78 +10180,66 @@
|
||||
0x809F4974:("sBoss06Seed1","UNK_TYPE4","",0x4),
|
||||
0x809F4978:("sBoss06Seed2","UNK_TYPE4","",0x4),
|
||||
0x809F497C:("sBoss06Seed3","UNK_TYPE4","",0x4),
|
||||
0x80A07950:("D_80A07950","UNK_TYPE2","",0x2),
|
||||
0x80A07952:("D_80A07952","UNK_TYPE2","",0x2),
|
||||
0x80A07954:("D_80A07954","UNK_TYPE2","",0x2),
|
||||
0x80A07968:("D_80A07968","UNK_TYPE1","",0x1),
|
||||
0x80A07980:("D_80A07980","UNK_TYPE1","",0x1),
|
||||
0x80A079A0:("D_80A079A0","UNK_TYPE1","",0x1),
|
||||
0x80A079C0:("D_80A079C0","UNK_TYPE1","",0x1),
|
||||
0x80A079E0:("D_80A079E0","UNK_TYPE1","",0x1),
|
||||
0x80A07A00:("D_80A07A00","UNK_TYPE1","",0x1),
|
||||
0x80A07A20:("Boss_07_Profile","UNK_TYPE1","",0x1),
|
||||
0x80A07A40:("D_80A07A40","UNK_TYPE1","",0x1),
|
||||
0x80A07A8C:("D_80A07A8C","UNK_TYPE2","",0x2),
|
||||
0x80A07A90:("D_80A07A90","UNK_TYPE2","",0x2),
|
||||
0x80A07BCC:("D_80A07BCC","UNK_TYPE1","",0x1),
|
||||
0x80A07BDC:("D_80A07BDC","UNK_TYPE1","",0x1),
|
||||
0x80A07C08:("D_80A07C08","UNK_TYPE1","",0x1),
|
||||
0x80A07C2C:("D_80A07C2C","UNK_TYPE1","",0x1),
|
||||
0x80A07C3C:("D_80A07C3C","UNK_TYPE1","",0x1),
|
||||
0x80A07C8C:("D_80A07C8C","UNK_TYPE1","",0x1),
|
||||
0x80A07CDC:("D_80A07CDC","UNK_TYPE1","",0x1),
|
||||
0x80A07E68:("D_80A07E68","UNK_TYPE1","",0x1),
|
||||
0x80A07E78:("D_80A07E78","UNK_TYPE1","",0x1),
|
||||
0x80A07EA4:("D_80A07EA4","UNK_TYPE1","",0x1),
|
||||
0x80A07ED0:("D_80A07ED0","UNK_TYPE1","",0x1),
|
||||
0x80A07EFC:("D_80A07EFC","UNK_TYPE1","",0x1),
|
||||
0x80A07F00:("D_80A07F00","UNK_TYPE1","",0x1),
|
||||
0x80A07F04:("D_80A07F04","UNK_TYPE1","",0x1),
|
||||
0x80A07F08:("D_80A07F08","UNK_TYPE1","",0x1),
|
||||
0x80A07F0C:("D_80A07F0C","UNK_TYPE1","",0x1),
|
||||
0x80A07F3C:("D_80A07F3C","UNK_TYPE1","",0x1),
|
||||
0x80A07F54:("D_80A07F54","UNK_TYPE2","",0x2),
|
||||
0x80A07F5C:("D_80A07F5C","EffectTireMarkInit","",0x8),
|
||||
0x80A07F64:("D_80A07F64","EffectTireMarkInit","",0x8),
|
||||
0x80A07F6C:("D_80A07F6C","UNK_TYPE4","",0x4),
|
||||
0x80A07FA8:("D_80A07FA8","UNK_TYPE4","",0x4),
|
||||
0x80A07FB4:("D_80A07FB4","UNK_TYPE4","",0x4),
|
||||
0x80A07FC0:("D_80A07FC0","UNK_TYPE4","",0x4),
|
||||
0x80A07FCC:("D_80A07FCC","UNK_TYPE1","",0x1),
|
||||
0x80A07FD0:("D_80A07FD0","UNK_TYPE1","",0x1),
|
||||
0x80A07FD4:("D_80A07FD4","UNK_TYPE1","",0x1),
|
||||
0x80A07FE0:("D_80A07FE0","UNK_TYPE4","",0x4),
|
||||
0x80A07FEC:("D_80A07FEC","UNK_TYPE1","",0x1),
|
||||
0x80A07FF8:("D_80A07FF8","UNK_TYPE1","",0x1),
|
||||
0x80A07FFC:("D_80A07FFC","UNK_TYPE1","",0x1),
|
||||
0x80A07FFD:("D_80A07FFD","UNK_TYPE1","",0x1),
|
||||
0x80A07FFE:("D_80A07FFE","UNK_TYPE1","",0x1),
|
||||
0x80A07FFF:("D_80A07FFF","UNK_TYPE1","",0x1),
|
||||
0x80A08002:("D_80A08002","UNK_TYPE1","",0x1),
|
||||
0x80A08004:("D_80A08004","UNK_TYPE1","",0x1),
|
||||
0x80A08006:("D_80A08006","UNK_TYPE1","",0x1),
|
||||
0x80A0800C:("D_80A0800C","UNK_TYPE1","",0x1),
|
||||
0x80A08090:("D_80A08090","UNK_TYPE1","",0x1),
|
||||
0x80A080B0:("D_80A080B0","UNK_TYPE1","",0x1),
|
||||
0x80A080BC:("D_80A080BC","UNK_TYPE4","",0x4),
|
||||
0x80A080D4:("D_80A080D4","UNK_TYPE4","",0x4),
|
||||
0x80A080F0:("D_80A080F0","UNK_TYPE4","",0x4),
|
||||
0x80A08110:("D_80A08110","UNK_TYPE4","",0x4),
|
||||
0x80A08140:("D_80A08140","UNK_TYPE4","",0x4),
|
||||
0x80A0817C:("D_80A0817C","UNK_TYPE1","",0x1),
|
||||
0x80A0818C:("D_80A0818C","UNK_TYPE1","",0x1),
|
||||
0x80A08198:("D_80A08198","UNK_TYPE1","",0x1),
|
||||
0x80A081A0:("D_80A081A0","UNK_TYPE1","",0x1),
|
||||
0x80A081A8:("D_80A081A8","UNK_TYPE1","",0x1),
|
||||
0x80A081C8:("D_80A081C8","UNK_TYPE1","",0x1),
|
||||
0x80A081E8:("D_80A081E8","UNK_TYPE1","",0x1),
|
||||
0x80A0826C:("D_80A0826C","UNK_TYPE1","",0x1),
|
||||
0x80A0828C:("D_80A0828C","UNK_TYPE1","",0x1),
|
||||
0x80A082A4:("D_80A082A4","UNK_TYPE1","",0x1),
|
||||
0x80A082BC:("D_80A082BC","UNK_TYPE4","",0x4),
|
||||
0x80A082C8:("D_80A082C8","UNK_TYPE4","",0x4),
|
||||
0x80A082D4:("D_80A082D4","UNK_TYPE4","",0x4),
|
||||
0x80A082E0:("D_80A082E0","UNK_TYPE1","",0x1),
|
||||
0x80A07950:("sProjectileEnvColors","s16","[4][3]",0x18),
|
||||
0x80A07968:("sProjectilePrimColors","s16","[4][3]",0x18),
|
||||
0x80A07980:("sMajorasMaskDamageTable","DamageTable","",0x20),
|
||||
0x80A079A0:("sMajorasIncarnationDamageTable","DamageTable","",0x20),
|
||||
0x80A079C0:("sMajorasWrathDamageTable","DamageTable","",0x20),
|
||||
0x80A079E0:("sRemainsDamageTable","DamageTable","",0x20),
|
||||
0x80A07A00:("sTopDamageTable","DamageTable","",0x20),
|
||||
0x80A07A20:("Boss_07_Profile","ActorProfile","",0x20),
|
||||
0x80A07A40:("sWrathBodyColliderJntSphElementsInit","ColliderJntSphElementInit","[11]",0x18C),
|
||||
0x80A07BCC:("sWrathBodyColliderJntSphInit","ColliderJntSphInit","",0x10),
|
||||
0x80A07BDC:("sWrathCylinderInit","ColliderCylinderInit","",0x2C),
|
||||
0x80A07C08:("sWrathKickColliderJntSphElementsInit","ColliderJntSphElementInit","[1]",0x24),
|
||||
0x80A07C2C:("sWrathKickColliderJntSphInit","ColliderJntSphInit","",0x10),
|
||||
0x80A07C3C:("sMaskFrontQuadInit","ColliderQuadInit","",0x50),
|
||||
0x80A07C8C:("sMaskBackQuadInit","ColliderQuadInit","",0x50),
|
||||
0x80A07CDC:("sIncarnationBodyJntSphElementsInit","ColliderJntSphElementInit","[11]",0x18C),
|
||||
0x80A07E68:("sIncarnationBodyColliderJntSphInit","ColliderJntSphInit","",0x10),
|
||||
0x80A07E78:("sProjectileCylinderInit","ColliderCylinderInit","",0x2C),
|
||||
0x80A07EA4:("sRemainsCylinderInit","ColliderCylinderInit","",0x2C),
|
||||
0x80A07ED0:("sTopCylinderInit","ColliderCylinderInit","",0x2C),
|
||||
0x80A07EFC:("sDustPrimColor","Color_RGBA8","",0x4),
|
||||
0x80A07F00:("sDustEnvColor","Color_RGBA8","",0x4),
|
||||
0x80A07F04:("sDustPrimColor","Color_RGBA8","",0x4),
|
||||
0x80A07F08:("sDustEnvColor","Color_RGBA8","",0x4),
|
||||
0x80A07F0C:("sRemainsStartTargetOffset","Vec3f","[4]",0x30),
|
||||
0x80A07F3C:("sRemainsEndTarget","Vec3s","[4]",0x18),
|
||||
0x80A07F54:("sMajoraRemainsParams","s16","[4]",0x8),
|
||||
0x80A07F5C:("sTopTireMarkInit","EffectTireMarkInit","",0x8),
|
||||
0x80A07F64:("sMaskTireMarkInit","EffectTireMarkInit","",0x8),
|
||||
0x80A07F6C:("sCamPoints","MajorasWrathIntroCutsceneCamPoints","[5]",0x3C),
|
||||
0x80A07FA8:("subCamAtOffset","Vec3f","",0xC),
|
||||
0x80A07FB4:("hahenVelocity","Vec3f","",0xC),
|
||||
0x80A07FC0:("hahenAccel","Vec3f","",0xC),
|
||||
0x80A07FCC:("sIcePrimColor","Color_RGBA8","",0x4),
|
||||
0x80A07FD0:("sIceEnvColor","Color_RGBA8","",0x4),
|
||||
0x80A07FD4:("sIceAccel","Vec3f","",0xC),
|
||||
0x80A07FE0:("baseSegVec","Vec3f","",0xC),
|
||||
0x80A07FEC:("sWrathLimbToColliderBodyParts","s8","[30]",0x1E),
|
||||
0x80A0800C:("sWrathLimbColliderOffsets","Vec3f","[11]",0x84),
|
||||
0x80A08090:("sWrathLimbToBodyParts","s8","[30]",0x1E),
|
||||
0x80A080B0:("sWhipOffset","Vec3f","",0xC),
|
||||
0x80A080BC:("sShadowSmallMap","s32","[6]",0x18),
|
||||
0x80A080D4:("sShadowMediumMap","s32","[7]",0x1C),
|
||||
0x80A080F0:("sShadowLargeMap","s32","[8]",0x20),
|
||||
0x80A08110:("sShadowExtraLargeMap","s32","[12]",0x38),
|
||||
0x80A08140:("sParentShadowBodyParts","s32","[15]",0x3C),
|
||||
0x80A0817C:("sShadowSizes","u8","[15]",0xE),
|
||||
0x80A0818C:("sTauntAnimations","AnimationHeader*","[3]",0xC),
|
||||
0x80A08198:("sPrevLightSettings","u8","[8]",0x8),
|
||||
0x80A081A0:("sLightSettings","u8","[8]",0x8),
|
||||
0x80A081A8:("sIncarnationLimbToColliderBodyParts","s8","[30]",0x1E),
|
||||
0x80A081C8:("sIncarnationLimbToPumpBodyParts","s8","[30]",0x1E),
|
||||
0x80A081E8:("sIncarnationLimbColliderOffsets","Vec3f","[11]",0x84),
|
||||
0x80A0826C:("sIncarnationLimbToBodyParts","s8","[30]",0x1E),
|
||||
0x80A0828C:("sRemainsAttachSubCamEyes","Vec3s","[4]",0x18),
|
||||
0x80A082A4:("sRemainsAttachSubCamAts","Vec3s","[4]",0x18),
|
||||
0x80A082BC:("hahenVelocity","Vec3f","",0xC),
|
||||
0x80A082C8:("hahenAccel","Vec3f","",0xC),
|
||||
0x80A082D4:("baseSegVec","Vec3f","",0xC),
|
||||
0x80A082E0:("sMaskEyeTextures","UNK_TYPE1","",0x1),
|
||||
0x80A082F0:("D_80A082F0","f32","",0x4),
|
||||
0x80A082F4:("D_80A082F4","f32","",0x4),
|
||||
0x80A082F8:("D_80A082F8","f32","",0x4),
|
||||
@@ -10428,22 +10416,19 @@
|
||||
0x80A08794:("D_80A08794","f32","",0x4),
|
||||
0x80A08798:("D_80A08798","f32","",0x4),
|
||||
0x80A09740:("D_80A09740","UNK_TYPE1","",0x1),
|
||||
0x80A09A40:("D_80A09A40","UNK_TYPE1","",0x1),
|
||||
0x80A09A4C:("D_80A09A4C","UNK_TYPE1","",0x1),
|
||||
0x80A09A50:("D_80A09A50","UNK_TYPE4","",0x4),
|
||||
0x80A09A54:("D_80A09A54","UNK_TYPE4","",0x4),
|
||||
0x80A09A58:("D_80A09A58","UNK_TYPE4","",0x4),
|
||||
0x80A09A5C:("D_80A09A5C","UNK_TYPE4","",0x4),
|
||||
0x80A09A60:("D_80A09A60","UNK_TYPE4","",0x4),
|
||||
0x80A09A64:("D_80A09A64","UNK_TYPE4","",0x4),
|
||||
0x80A09A68:("D_80A09A68","UNK_TYPE4","",0x4),
|
||||
0x80A09A6C:("D_80A09A6C","UNK_TYPE4","",0x4),
|
||||
0x80A09A70:("D_80A09A70","UNK_TYPE1","",0x1),
|
||||
0x80A09A71:("D_80A09A71","UNK_TYPE1","",0x1),
|
||||
0x80A09A78:("D_80A09A78","UNK_TYPE1","",0x1),
|
||||
0x80A0A888:("D_80A0A888","UNK_TYPE4","",0x4),
|
||||
0x80A0A88C:("D_80A0A88C","UNK_TYPE4","",0x4),
|
||||
0x80A0A890:("D_80A0A890","UNK_TYPE4","",0x4),
|
||||
0x80A09A40:("sMajoraSfxPos","Vec3f","",0xC),
|
||||
0x80A09A4C:("sHeartbeatTimer","u8","",0x1),
|
||||
0x80A09A50:("sWhipLength","s32","",0x4),
|
||||
0x80A09A54:("sMajorasWrath","Boss07*","",0x4),
|
||||
0x80A09A58:("sMajoraBattleHandler","Boss07*","",0x4),
|
||||
0x80A09A5C:("sMajorasMask","Boss07*","",0x4),
|
||||
0x80A09A60:("sMajoraRemains","Boss07*","[4]",0x10),
|
||||
0x80A09A70:("sKillAllProjectiles","u8","",0x1),
|
||||
0x80A09A71:("sMusicStartTimer","u8","",0x1),
|
||||
0x80A09A78:("sMajoraEffects","MajoraEffect","[50]",0xE10),
|
||||
0x80A0A888:("sMajoraRandSeed1","s32","",0x4),
|
||||
0x80A0A88C:("sMajoraRandSeed2","s32","",0x4),
|
||||
0x80A0A890:("sMajoraRandSeed3","s32","",0x4),
|
||||
0x80A0C4A0:("Bg_Dy_Yoseizo_Profile","UNK_TYPE1","",0x1),
|
||||
0x80A0C4C0:("sAnimations","AnimationHeader*","9",0x24),
|
||||
0x80A0C4E4:("sEffectPrimColors","Color_RGB8","6",0x12),
|
||||
|
||||
@@ -2221,7 +2221,7 @@ asm/non_matchings/code/z_sub_s/SubS_ConstructPlane.s,SubS_ConstructPlane,0x8013E
|
||||
asm/non_matchings/code/z_sub_s/SubS_LineSegVsPlane.s,SubS_LineSegVsPlane,0x8013E5CC,0x1D
|
||||
asm/non_matchings/code/z_sub_s/SubS_FindActorCustom.s,SubS_FindActorCustom,0x8013E640,0x42
|
||||
asm/non_matchings/code/z_sub_s/SubS_OfferTalkExchangeCustom.s,SubS_OfferTalkExchangeCustom,0x8013E748,0x1E
|
||||
asm/non_matchings/code/z_sub_s/SubS_ActorAndPlayerFaceEachOther.s,SubS_ActorAndPlayerFaceEachOther,0x8013E7C0,0x4E
|
||||
asm/non_matchings/code/z_sub_s/SubS_ArePlayerAndActorFacing.s,SubS_ArePlayerAndActorFacing,0x8013E7C0,0x4E
|
||||
asm/non_matchings/code/z_sub_s/SubS_OfferTalkExchangeFacing.s,SubS_OfferTalkExchangeFacing,0x8013E8F8,0x16
|
||||
asm/non_matchings/code/z_sub_s/SubS_TrackPointStep.s,SubS_TrackPointStep,0x8013E950,0xB0
|
||||
asm/non_matchings/code/code_8013EC10/Rumble_Update.s,Rumble_Update,0x8013EC10,0xD
|
||||
|
||||
|
Reference in New Issue
Block a user