mirror of
https://github.com/zeldaret/mm.git
synced 2026-05-23 23:05:08 -04:00
Anghelo Carvajal
78acaef73d
* Boss03_Init NON_EQUIVALENT * rand functions * Boss03_Draw * match the limb draws * Match Boss03_Init by Synray and Engineer * A bit of cleanup * a bunch of functions * another bunch of functions * func_809E299C and GyorgEffect * import data * A bit of cleanup * effects related functions * func_809E2DA0 * func_809E34B8 NON_EQUIVALENT * func_809E3968 NON_EQUIVALENT * func_809E3D98 * func_809E421C NON_EQUIVALENT * func_809E475C * func_809E497C * func_809E4C90 * func_809E6640 NON_MATCHING * func_809E6A38 * Match func_809E6640 by Tharo * func_809E7D00 * func_809E8810 * func_809E4E80 NON_EQUIVALENT * func_809E5B64 * func_809E6CB4 * Boss03_Update NON_EQUIVALENT * func_809E81E4 attempt * Boss03_Update improvement thanks to Petrie * func_809E81E4 NON_MATCHING * func_809E34B8 is at least equivalent * cleanups * format * import bss * more cleanup and minor renames * Match func_809E81E4 * cleanup effect functions * a few more renames * func_809E4E80 matched by Maide * documentation pass * name workTimer * macros * More renames * Improve func_809E34B8 a bit and match Boss03_ChewPlayer * defines placeholders for work timer, enum for effects and other minor renames * actorfixer * some cleanups * effects named * Some more renames and cleanups * more cleanups * Boss03_UpdateCollision, Boss03_SeaweedUpdate and Boss03_SeaweedDraw * Rename more actionfuncs * cleanup undefined syms * collision stuff and run formatter * more cleanups * more cleanups i forgot to commit * and yet more clenaup * Add notes * Remove debugging stuff * format * Match the last 3 functions by Anon58 * bit of cleaning * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * PR * format * Remove some if (1) from Boss03_IntroCutscene * Update src/overlays/actors/ovl_Boss_03/z_boss_03.h Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * PR * address pr * prevent_bss_reordering * Anon review * seaweed stuff thanks to elliptic * format * whoops * huh * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * address PR Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> * Address PR Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * Sectioning * whoops * a Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> * a * kinda * , * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Update src/overlays/actors/ovl_Boss_03/z_boss_03.c Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * remove redundant comment * actorfixer Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: EllipticEllipsis <73679967+EllipticEllipsis@users.noreply.github.com> Co-authored-by: EllipticEllipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
139 lines
9.9 KiB
XML
139 lines
9.9 KiB
XML
<Root>
|
|
<!--
|
|
Gyorg, his title card, the small fishes he summons, the seaweed in his boss arena,
|
|
and the bubbles in his intro cutscene. Also contains an unused copy of Majora's Wrath's
|
|
whip assets, along with an unused duplicate of the small fishes.
|
|
-->
|
|
<File Name="object_boss03" Segment="6">
|
|
<Animation Name="gGyorgIdleAnim" Offset="0x88" /> <!-- Original name is "bus_base". Maybe unused? -->
|
|
|
|
<!-- Unused Majora's Wrath Whip Texture -->
|
|
<Texture Name="gGyorgUnusedMajorasWrathWhipTex" OutName="unused_majoras_wrath_whip" Format="rgba16" Width="8" Height="16" Offset="0xA0" />
|
|
|
|
<!-- Unused Majora's Wrath Whip DisplayLists -->
|
|
<DList Name="gGyorgUnusedMajorasWrathWhipDL1" Offset="0x200" />
|
|
<DList Name="gGyorgUnusedMajorasWrathWhipDL2" Offset="0x278" />
|
|
<DList Name="gGyorgUnusedMajorasWrathWhipDL3" Offset="0x2A8" />
|
|
|
|
<!--Gyorg Limb DisplayLists -->
|
|
<DList Name="gGyorgHeadDL" Offset="0x3398" />
|
|
<DList Name="gGyorgJawDL" Offset="0x3A78" />
|
|
<DList Name="gGyorgUpperLeftFinDL" Offset="0x3E38" />
|
|
<DList Name="gGyorgLowerLeftFinDL" Offset="0x3FB8" />
|
|
<DList Name="gGyorgUpperRightFinDL" Offset="0x42D0" />
|
|
<DList Name="gGyorgLowerRightFinDL" Offset="0x4450" />
|
|
<DList Name="gGyorgUpperTrunkDL" Offset="0x4768" />
|
|
<DList Name="gGyorgLowerTrunkDL" Offset="0x4AC0" />
|
|
<DList Name="gGyorgTailDL" Offset="0x5010" />
|
|
|
|
<!-- Unused Empty Texture Animation -->
|
|
<TextureAnimation Name="gGyorgUnused5388TexAnim" Offset="0x5388" />
|
|
|
|
<!-- Gyorg Textures -->
|
|
<Texture Name="gGyorgFinsSpikesAndJawTLUT" OutName="gyorg_fins_spikes_and_jaw_tlut" Format="rgba16" Width="4" Height="4" Offset="0x5390" />
|
|
<Texture Name="gGyorgSidesTLUT" OutName="gyorg_sides_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53B0" />
|
|
<Texture Name="gGyorgMouthAndSpikeBacksideTLUT" OutName="gyorg_mouth_and_spike_backside_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53D0" />
|
|
<Texture Name="gGyorgBellyAndFinFleshTLUT" OutName="gyorg_belly_and_fin_flesh_tlut" Format="rgba16" Width="4" Height="4" Offset="0x53F0" />
|
|
<Texture Name="gGyorgEyeTex" OutName="gyorg_eye" Format="rgba16" Width="32" Height="32" Offset="0x5410" />
|
|
<Texture Name="gGyorgFinsSpikesAndJawTex" OutName="gyorg_fins_spikes_and_jaw" Format="ci4" Width="64" Height="64" Offset="0x5C10" />
|
|
<Texture Name="gGyorgSidesTex" OutName="gyorg_sides" Format="ci4" Width="64" Height="64" Offset="0x6410" />
|
|
<Texture Name="gGyorgMouthAndSpikeBacksideTex" OutName="gyorg_mouth_and_spike_backside" Format="ci4" Width="64" Height="64" Offset="0x6C10" />
|
|
<Texture Name="gGyorgBellyAndFinFleshTex" OutName="gyorg_belly_and_fin_flesh" Format="ci4" Width="64" Height="64" Offset="0x7410" />
|
|
<Texture Name="gGyorgHornsTeethAndClawsTex" OutName="gyorg_horns_teeth_claws" Format="rgba16" Width="16" Height="16" Offset="0x7C10" />
|
|
|
|
<!-- Bubble DisplayLists (texture comes from gameplay_keep) -->
|
|
<DList Name="gGyorgBubbleMaterialDL" Offset="0x7E50" />
|
|
<DList Name="gGyorgBubbleModelDL" Offset="0x7EB0" />
|
|
|
|
<!-- Gyorg Title Card -->
|
|
<Texture Name="gGyorgTitleCardTex" OutName="gyorg_title_card" Format="i8" Width="128" Height="40" Offset="0x7EC8" />
|
|
|
|
<!-- Gyorg Limbs -->
|
|
<Limb Name="gGyorgRootLimb" Type="Standard" EnumName="GYORG_LIMB_ROOT" Offset="0x92C8" />
|
|
<Limb Name="gGyorgHeadLimb" Type="Standard" EnumName="GYORG_LIMB_HEAD" Offset="0x92D4" />
|
|
<Limb Name="gGyorgBodyRootLimb" Type="Standard" EnumName="GYORG_LIMB_BODY_ROOT" Offset="0x92E0" />
|
|
<Limb Name="gGyorgUpperTrunkLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_TRUNK" Offset="0x92EC" />
|
|
<Limb Name="gGyorgLowerTrunkLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_TRUNK" Offset="0x92F8" />
|
|
<Limb Name="gGyorgTailLimb" Type="Standard" EnumName="GYORG_LIMB_TAIL" Offset="0x9304" />
|
|
<Limb Name="gGyorgRightFinRootLimb" Type="Standard" EnumName="GYORG_LIMB_RIGHT_FIN_ROOT" Offset="0x9310" />
|
|
<Limb Name="gGyorgUpperRightFinLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_RIGHT_FIN" Offset="0x931C" />
|
|
<Limb Name="gGyorgLowerRightFinLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_RIGHT_FIN" Offset="0x9328" />
|
|
<Limb Name="gGyorgLeftFinRootLimb" Type="Standard" EnumName="GYORG_LIMB_LEFT_FIN_ROOT" Offset="0x9334" />
|
|
<Limb Name="gGyorgUpperLeftFinLimb" Type="Standard" EnumName="GYORG_LIMB_UPPER_LEFT_FIN" Offset="0x9340" />
|
|
<Limb Name="gGyorgLowerLeftFinLimb" Type="Standard" EnumName="GYORG_LIMB_LOWER_LEFT_FIN" Offset="0x934C" />
|
|
<Limb Name="gGyorgJawRootLimb" Type="Standard" EnumName="GYORG_LIMB_JAW_ROOT" Offset="0x9358" />
|
|
<Limb Name="gGyorgJawLimb" Type="Standard" EnumName="GYORG_LIMB_JAW" Offset="0x9364" />
|
|
|
|
<!-- Gyorg Skeleton-->
|
|
<Skeleton Name="gGyorgSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_LIMB_NONE" LimbMax="GYORG_LIMB_MAX" EnumName="GyorgLimbs" Offset="0x93A8" />
|
|
|
|
<!-- Gyorg Animations -->
|
|
<Animation Name="gGyorgFloppingAnim" Offset="0x9554" /> <!-- Original name is "bus_dead" -->
|
|
<Animation Name="gGyorgJumpingAnim" Offset="0x98F0" /> <!-- Original name is "bus_jump". Maybe unused? -->
|
|
<Animation Name="gGyorgStunnedAnim" Offset="0x99D0" /> <!-- Original name is "bus_sibire" ("paralyzed") -->
|
|
<Animation Name="gGyorgBackingUpAnim" Offset="0x9C14" /> <!-- Original name is "bus_stop" -->
|
|
<Animation Name="gGyorgFastSwimmingAnim" Offset="0x9CF8" /> <!-- Original name is "bus_swim" -->
|
|
<Animation Name="gGyorgGentleSwimmingAnim" Offset="0xA020" /> <!-- Maybe unused? -->
|
|
<Animation Name="gGyorgTailSweepAnim" Offset="0xA134" /> <!-- Maybe unused? -->
|
|
<Animation Name="gGyorgCrawlingAnim" Offset="0xA6C8" />
|
|
|
|
<!-- Seaweed DisplayLists -->
|
|
<DList Name="gGyorgSeaweedPiece1DL" Offset="0xA8B0" />
|
|
<DList Name="gGyorgSeaweedPiece2DL" Offset="0xA948" />
|
|
<DList Name="gGyorgSeaweedPiece3DL" Offset="0xA978" />
|
|
<DList Name="gGyorgSeaweedPiece4DL" Offset="0xA9A8" />
|
|
<DList Name="gGyorgSeaweedPiece5DL" Offset="0xA9D8" />
|
|
<DList Name="gGyorgSeaweedTopDL" Offset="0xAA08" />
|
|
|
|
<!-- Seaweed Textures -->
|
|
<Texture Name="gGyorgSeaweedTopTLUT" OutName="gyorg_seaweed_top_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAAC0" />
|
|
<Texture Name="gGyorgSeaweedTLUT" OutName="gyord_seaweed_tlut" Format="rgba16" Width="4" Height="4" Offset="0xAAE0" />
|
|
<Texture Name="gGyorgSeaweedTopTex" OutName="gyorg_seaweed_top" Format="ci4" Width="64" Height="64" Offset="0xAB00" />
|
|
<Texture Name="gGyorgSeaweedTex" OutName="gyorg_seaweed" Format="ci4" Width="64" Height="64" Offset="0xB300" />
|
|
|
|
<!-- Unused Empty Texture Animation -->
|
|
<TextureAnimation Name="gGyorgUnusedBB00TexAnim" Offset="0xBB00" />
|
|
|
|
<!-- Unused Duplicate of Small Fish Limb DisplayLists -->
|
|
<DList Name="gUnusedGyorgSmallFishHeadDL" Offset="0xBD80" />
|
|
<DList Name="gUnusedGyorgSmallFishTrunkDL" Offset="0xBE40" />
|
|
<DList Name="gUnusedGyorgSmallFishRightFinDL" Offset="0xBF20" />
|
|
<DList Name="gUnusedGyorgSmallFishDorsalFinDL" Offset="0xBFD8" />
|
|
<DList Name="gUnusedGyorgSmallFishLeftFinDL" Offset="0xC0A8" />
|
|
<DList Name="gUnusedGyorgSmallFishTailFinDL" Offset="0xC160" />
|
|
|
|
<!-- Unused Duplicate of Small Fish Textures -->
|
|
<Texture Name="gUnusedGyorgSmallFishTLUT" OutName="unused_small_fish_tlut" Format="rgba16" Width="4" Height="4" Offset="0xC230" />
|
|
<Texture Name="gUnusedGyorgSmallFishTex" OutName="unused_small_fish" Format="ci4" Width="64" Height="64" Offset="0xC250" />
|
|
|
|
<!-- Small Fishes Limb DisplayLists -->
|
|
<DList Name="gGyorgSmallFishHeadDL" Offset="0xCCC0" />
|
|
<DList Name="gGyorgSmallFishTrunkDL" Offset="0xCD80" />
|
|
<DList Name="gGyorgSmallFishRightFinDL" Offset="0xCE60" />
|
|
<DList Name="gGyorgSmallFishDorsalFinDL" Offset="0xCF18" />
|
|
<DList Name="gGyorgSmallFishLeftFinDL" Offset="0xCFE8" />
|
|
<DList Name="gGyorgSmallFishTailFinDL" Offset="0xD0A0" />
|
|
|
|
<!-- Small Fishes Textures -->
|
|
<Texture Name="gGyorgSmallFishTLUT" OutName="small_fish_tlut" Format="rgba16" Width="4" Height="4" Offset="0xD170" />
|
|
<Texture Name="gGyorgSmallFishTex" OutName="small_fish" Format="ci4" Width="64" Height="64" Offset="0xD190" />
|
|
|
|
<!-- Small Fishes Limbs -->
|
|
<Limb Name="gGyorgSmallFishRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_ROOT" Offset="0xD990" />
|
|
<Limb Name="gGyorgSmallFishBodyRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_BODY_ROOT" Offset="0xD99C" />
|
|
<Limb Name="gGyorgSmallFishTrunkRootLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TRUNK_ROOT" Offset="0xD9A8" />
|
|
<Limb Name="gGyorgSmallFishTailFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TAIL_FIN" Offset="0xD9B4" />
|
|
<Limb Name="gGyorgSmallFishTrunkLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_TRUNK" Offset="0xD9C0" />
|
|
<Limb Name="gGyorgSmallFishLeftFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_LEFT_FIN" Offset="0xD9CC" />
|
|
<Limb Name="gGyorgSmallFishDorsalFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_DORSAL_FIN" Offset="0xD9D8" />
|
|
<Limb Name="gGyorgSmallFishRightFinLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_RIGHT_FIN" Offset="0xD9E4" />
|
|
<Limb Name="gGyorgSmallFishHeadLimb" Type="Standard" EnumName="GYORG_SMALL_FISH_LIMB_HEAD" Offset="0xD9F0" />
|
|
|
|
<!-- Small Fishes Skeleton -->
|
|
<Skeleton Name="gGyorgSmallFishSkel" Type="Flex" LimbType="Standard" LimbNone="GYORG_SMALL_FISH_LIMB_NONE" LimbMax="GYORG_SMALL_FISH_LIMB_MAX" EnumName="GyorgSmallFishLimbs" Offset="0xDA20" />
|
|
|
|
<!-- Small Fishes Animation -->
|
|
<Animation Name="gGyorgSmallFishSwimAnim" Offset="0xDAAC" /> <!-- Original name is "minibus_b_swim" -->
|
|
</File>
|
|
</Root>
|