mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

boss_ganon (Ganondorf) OK (#1037)

Browse source 
* data migrated and OK

* some functions ported

* everything ported and updated

* merge message

* plenty of functions matched

* remove unwanted file

* 5 more, progress on update

* update matched

* fix proto

* fix

* func_808E06FC

* asm

* 2 left

* 1 more

* last function inital decomp

* Dbg MQ OK

* docs progress

* revert limb stuff

* some more docs

* docs progress

* more docs

* done with docs for now i think

* revert unwanted change

* some symbols

* anime2

* format

* small changes

* some more changes

* merge master and fix matrices

* reviews 1 and 2

* remove continue

* review 3 and 4

* un-name bodyPartsPos for now
This commit is contained in:
fig02 2021-12-02 17:31:39 -05:00 • committed by GitHub
parent 8ff1f242fa
commit 4390dd74b6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
85 changed files with 5160 additions and 17288 deletions
Download patch file Download diff file Expand all files Collapse all files

2
assets/xml/objects/gameplay_keep.xml
View file

@ -749,7 +749,7 @@
<Texture Name="gEffHitMark24Tex" OutName="eff_hit_mark_24" Format="i4" Width="32" Height="24" Offset="0x215F0"/>
<DList Name="gEffHitMarkDL" Offset="0x21770"/>
<Texture Name="gEffUnknown6Tex" OutName="eff_unknown_6" Format="i8" Width="32" Height="64" Offset="0x21810"/>
<Texture Name="gEffUnknown7Tex" OutName="eff_unknown_7" Format="i8" Width="32" Height="64" Offset="0x22010"/>
<Texture Name="gEffFleckTex" OutName="eff_fleck" Format="i8" Width="32" Height="64" Offset="0x22010"/>
<Texture Name="gEffUnknown8Tex" OutName="eff_unknown_8" Format="i8" Width="64" Height="64" Offset="0x22810"/>
<Texture Name="gEffMagmaBubble1Tex" OutName="eff_magma_bubbles_1" Format="ia8" Width="16" Height="24" Offset="0x23810"/>
<Texture Name="gEffMagmaBubble2Tex" OutName="eff_magma_bubbles_2" Format="ia8" Width="16" Height="24" Offset="0x23990"/>

14
assets/xml/objects/object_ganon.xml
View file

@ -21,6 +21,7 @@
<DList Name="object_ganon_DL_007518" Offset="0x7518"/>
<DList Name="object_ganon_DL_007640" Offset="0x7640"/>
<DList Name="object_ganon_DL_007908" Offset="0x7908"/>
<Texture Name="object_ganon_TLUT_007B10" OutName="tlut_00007B10" Format="rgba16" Width="16" Height="16" Offset="0x7B10"/>
<Texture Name="object_ganon_TLUT_007D10" OutName="tlut_00007D10" Format="rgba16" Width="16" Height="16" Offset="0x7D10"/>
<Texture Name="object_ganon_Tex_007F10" OutName="tex_00007F10" Format="rgba16" Width="8" Height="8" Offset="0x7F10"/>
@ -44,7 +45,7 @@
<Texture Name="object_ganon_Tex_0091B0" OutName="tex_000091B0" Format="rgba16" Width="32" Height="16" Offset="0x91B0"/>
<Texture Name="object_ganon_TLUT_0095B0" OutName="tlut_000095B0" Format="rgba16" Width="56" Height="1" Offset="0x95B0"/>
<Texture Name="object_ganon_Tex_009620" OutName="tex_00009620" Format="rgba16" Width="16" Height="32" Offset="0x9620"/>
<Texture Name="object_ganon_Tex_009A20" OutName="tex_00009A20" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
<Texture Name="gDorfEyeTex" OutName="dorf_eye" Format="rgba16" Width="32" Height="16" Offset="0x9A20"/>
<Texture Name="object_ganon_Tex_009E20" OutName="tex_00009E20" Format="rgba16" Width="16" Height="16" Offset="0x9E20"/>
<Texture Name="object_ganon_Tex_00A020" OutName="tex_0000A020" Format="rgba16" Width="16" Height="16" Offset="0xA020"/>
<Texture Name="object_ganon_Tex_00A220" OutName="tex_0000A220" Format="ci8" Width="8" Height="8" Offset="0xA220" TlutOffset="0x95B0"/>
@ -53,13 +54,17 @@
<Texture Name="object_ganon_Tex_00A4A0" OutName="tex_0000A4A0" Format="ci8" Width="8" Height="8" Offset="0xA4A0"/>
<Texture Name="object_ganon_Tex_00A4E0" OutName="tex_0000A4E0" Format="rgba16" Width="32" Height="16" Offset="0xA4E0"/>
<Texture Name="object_ganon_Tex_00A8E0" OutName="tex_0000A8E0" Format="rgba16" Width="32" Height="16" Offset="0xA8E0"/>
<DList Name="object_ganon_DL_00BE90" Offset="0xBE90"/>
<DList Name="object_ganon_DL_00BF40" Offset="0xBF40"/>
<DList Name="object_ganon_DL_00C048" Offset="0xC048"/>
<DList Name="object_ganon_DL_00C518" Offset="0xC518"/>
<DList Name="object_ganon_DL_00C9E8" Offset="0xC9E8"/>
<Blob Name="object_ganon_Blob_00CF00" Size="0x3C00" Offset="0xCF00"/>
<DList Name="gDorfOpenHandDL" Offset="0xC9E8"/>
<Texture Name="gDorfTitleCardTex" OutName="ganondorf_title_card" Format="i8" Width="128" Height="40" Offset="0xCF00"/>
<Animation Name="object_ganon_Anim_011348" Offset="0x11348"/>
<Limb Name="object_ganon_Limb_011358" LimbType="Standard" Offset="0x11358"/>
<Limb Name="object_ganon_Limb_011364" LimbType="Standard" Offset="0x11364"/>
<Limb Name="object_ganon_Limb_011370" LimbType="Standard" Offset="0x11370"/>
@ -85,6 +90,7 @@
<Limb Name="object_ganon_Limb_011460" LimbType="Standard" Offset="0x11460"/>
<Limb Name="object_ganon_Limb_01146C" LimbType="Standard" Offset="0x1146C"/>
<Limb Name="object_ganon_Limb_011478" LimbType="Standard" Offset="0x11478"/>
<Skeleton Name="object_ganon_Skel_0114E8" Type="Flex" LimbType="Standard" Offset="0x114E8"/>
<Skeleton Name="gDorfSkel" Type="Flex" LimbType="Standard" Offset="0x114E8"/>
</File>
</Root>

50
assets/xml/objects/object_ganon_anime1.xml
View file

@ -1,29 +1,29 @@
<Root>
<File Name="object_ganon_anime1" Segment="6">
<Animation Name="object_ganon_anime1_Anim_000540" Offset="0x540"/>
<Animation Name="object_ganon_anime1_Anim_000FE8" Offset="0xFE8"/>
<Animation Name="object_ganon_anime1_Anim_001440" Offset="0x1440"/>
<Animation Name="object_ganon_anime1_Anim_001B0C" Offset="0x1B0C"/>
<Animation Name="object_ganon_anime1_Anim_001FF8" Offset="0x1FF8"/>
<Animation Name="object_ganon_anime1_Anim_002D2C" Offset="0x2D2C"/>
<Animation Name="object_ganon_anime1_Anim_00343C" Offset="0x343C"/>
<Animation Name="object_ganon_anime1_Anim_003D40" Offset="0x3D40"/>
<Animation Name="object_ganon_anime1_Anim_004884" Offset="0x4884"/>
<Animation Name="object_ganon_anime1_Anim_004DA8" Offset="0x4DA8"/>
<Animation Name="object_ganon_anime1_Anim_0058C4" Offset="0x58C4"/>
<Animation Name="object_ganon_anime1_Anim_006028" Offset="0x6028"/>
<Animation Name="object_ganon_anime1_Anim_0063CC" Offset="0x63CC"/>
<Animation Name="object_ganon_anime1_Anim_0069A0" Offset="0x69A0"/>
<Animation Name="object_ganon_anime1_Anim_00738C" Offset="0x738C"/>
<Animation Name="object_ganon_anime1_Anim_008128" Offset="0x8128"/>
<Animation Name="object_ganon_anime1_Anim_008A88" Offset="0x8A88"/>
<Animation Name="object_ganon_anime1_Anim_008F44" Offset="0x8F44"/>
<Animation Name="object_ganon_anime1_Anim_0096B0" Offset="0x96B0"/>
<Animation Name="object_ganon_anime1_Anim_009A14" Offset="0x9A14"/>
<Animation Name="object_ganon_anime1_Anim_009D5C" Offset="0x9D5C"/>
<Animation Name="object_ganon_anime1_Anim_00A598" Offset="0xA598"/>
<Animation Name="object_ganon_anime1_Anim_00AA24" Offset="0xAA24"/>
<Animation Name="object_ganon_anime1_Anim_00B4AC" Offset="0xB4AC"/>
<Animation Name="object_ganon_anime1_Anim_00BC28" Offset="0xBC28"/>
<Animation Name="gDorfBigMagicWindupAnim" Offset="0x0540"/>
<Animation Name="gDorfBigMagicThrowAnim" Offset="0x0FE8"/>
<Animation Name="gDorfBigMagicThrowEndAnim" Offset="0x1440"/>
<Animation Name="gDorfBigMagicChargeStartAnim" Offset="0x1B0C"/>
<Animation Name="gDorfBigMagicChargeHoldAnim" Offset="0x1FF8"/>
<Animation Name="gDorfPoundAnim" Offset="0x2D2C"/>
<Animation Name="gDorfPoundEndAnim" Offset="0x343C"/>
<Animation Name="gDorfKneelVulnerableAnim" Offset="0x3D40"/>
<Animation Name="gDorfLightArrowHitAnim" Offset="0x4884"/>
<Animation Name="gDorfLightEnergyHitAnim" Offset="0x4DA8"/>
<Animation Name="gDorfGetUp1Anim" Offset="0x58C4"/>
<Animation Name="gDorfGetUp2Anim" Offset="0x6028"/>
<Animation Name="gDorfLandAnim" Offset="0x63CC"/>
<Animation Name="gDorfVulnerableAnim" Offset="0x69A0"/>
<Animation Name="gDorfThrowAnim" Offset="0x738C"/>
<Animation Name="gDorfBigMagicHitAnim" Offset="0x8128"/>
<Animation Name="gDorfGetUp3Anim" Offset="0x8A88"/>
<Animation Name="gDorfLightArrowWaitAnim" Offset="0x8F44"/>
<Animation Name="gDorfDamageAnim" Offset="0x96B0"/>
<Animation Name="gDorfFloatAnim" Offset="0x9A14"/>
<Animation Name="gDorfBlockAnim" Offset="0x9D5C"/>
<Animation Name="gDorfBlockReleaseAnim" Offset="0xA598"/>
<Animation Name="gDorfChargeLightBallAnim" Offset="0xAA24"/>
<Animation Name="gDorfVolleyLeftAnim" Offset="0xB4AC"/>
<Animation Name="gDorfVolleyRightAnim" Offset="0xBC28"/>
</File>
</Root>

52
assets/xml/overlays/ovl_Boss_Ganon.xml Normal file
View file

@ -0,0 +1,52 @@
<Root>
<File Name="ovl_Boss_Ganon" BaseAddress="0x808D6870" RangeStart="0xE6B8" RangeEnd="0x211D8">
<Texture Name="gDorfLightning1Tex" OutName="lightning_1" Format="i8" Width="32" Height="96" Offset="0x11600" Static="Off"/>
<Texture Name="gDorfLightning2Tex" OutName="lightning_2" Format="i8" Width="32" Height="96" Offset="0x12200" Static="Off"/>
<Texture Name="gDorfLightning3Tex" OutName="lightning_3" Format="i8" Width="32" Height="96" Offset="0x12E00" Static="Off"/>
<Texture Name="gDorfLightning4Tex" OutName="lightning_4" Format="i8" Width="32" Height="96" Offset="0x13A00" Static="Off"/>
<Texture Name="gDorfLightning5Tex" OutName="lightning_5" Format="i8" Width="32" Height="96" Offset="0x14600" Static="Off"/>
<Texture Name="gDorfLightning6Tex" OutName="lightning_6" Format="i8" Width="32" Height="96" Offset="0x15200" Static="Off"/>
<Texture Name="gDorfLightning7Tex" OutName="lightning_7" Format="i8" Width="32" Height="96" Offset="0x15E00" Static="Off"/>
<Texture Name="gDorfLightning8Tex" OutName="lightning_8" Format="i8" Width="32" Height="96" Offset="0x16A00" Static="Off"/>
<Texture Name="gDorfLightning9Tex" OutName="lightning_9" Format="i8" Width="32" Height="96" Offset="0x17600" Static="Off"/>
<Texture Name="gDorfLightning10Tex" OutName="lightning_10" Format="i8" Width="32" Height="96" Offset="0x18200" Static="Off"/>
<Texture Name="gDorfLightning11Tex" OutName="lightning_11" Format="i8" Width="32" Height="96" Offset="0x18E00" Static="Off"/>
<Texture Name="gDorfLightning12Tex" OutName="lightning_12" Format="i8" Width="32" Height="96" Offset="0x19A00" Static="Off"/>
<Texture Name="gDorfWindowShatterTemplateTex" OutName="window_shatter_template" Format="ci8" Width="32" Height="64" Offset="0xFD38" Static="Off"/>
<DList Name="gDorfLightStreak1DL" Offset="0x1FCF0" Static="Off"/>
<DList Name="gDorfLightStreak2DL" Offset="0x1FD28" Static="Off"/>
<DList Name="gDorfLightStreak3DL" Offset="0x1FD60" Static="Off"/>
<DList Name="gDorfLightStreak4DL" Offset="0x1FD98" Static="Off"/>
<DList Name="gDorfLightStreak5DL" Offset="0x1FDD0" Static="Off"/>
<DList Name="gDorfLightStreak6DL" Offset="0x1FE08" Static="Off"/>
<DList Name="gDorfLightStreak7DL" Offset="0x1FE40" Static="Off"/>
<DList Name="gDorfLightStreak8DL" Offset="0x1FE78" Static="Off"/>
<DList Name="gDorfLightStreak9DL" Offset="0x1FEB0" Static="Off"/>
<DList Name="gDorfLightStreak10DL" Offset="0x1FEE8" Static="Off"/>
<DList Name="gDorfLightStreak11DL" Offset="0x1FF20" Static="Off"/>
<DList Name="gDorfLightStreak12DL" Offset="0x1FF58" Static="Off"/>
<DList Name="gDorfShadowSetupDL" Offset="0xE6F8" Static="Off"/>
<DList Name="gDorfShadowModelDL" Offset="0xE718" Static="Off"/>
<DList Name="gDorfTriforceDL" Offset="0xF788" Static="Off"/>
<DList Name="gDorfWindowShardMaterialDL" Offset="0xFC78" Static="Off"/>
<DList Name="gDorfWindowShardModelDL" Offset="0xFD20" Static="Off"/>
<DList Name="gDorfLightBallMaterialDL" Offset="0x11578" Static="Off"/>
<DList Name="gDorfSquareDL" Offset="0x115E8" Static="Off"/>
<DList Name="gDorfLightningDL" Offset="0x1A640" Static="Off"/>
<DList Name="gDorfUnusedDL" Offset="0x1A6F0" Static="Off"/>
<DList Name="gDorfLightRayTriDL" Offset="0x1A768" Static="Off"/>
<DList Name="gDorfLightFlecksDL" Offset="0x1C1C0" Static="Off"/>
<DList Name="gDorfBigMagicBGCircleDL" Offset="0x1C2B0" Static="Off"/>
<DList Name="gDorfDotDL" Offset="0x1C358" Static="Off"/>
<DList Name="gDorfShockwaveDL" Offset="0x1CDC0" Static="Off"/>
<DList Name="gDorfImpactDarkDL" Offset="0x1DC58" Static="Off"/>
<DList Name="gDorfImpactLightDL" Offset="0x1DD70" Static="Off"/>
<DList Name="gDorfShockGlowDL" Offset="0x1EEC8" Static="Off"/>
<DList Name="gDorfLightCoreDL" Offset="0x20228" Static="Off"/>
<DList Name="gDorfShockDL" Offset="0x202F0" Static="Off"/>
<DList Name="gDorfVortexDL" Offset="0x210D0" Static="Off"/>
</File>
</Root>