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

Dancing Couple (ovl_En_Tg) (#866)

Browse source 
* Match EnTg_Destroy

* Match EnTg_Init

* Matching EnTg_Update

* Match func_80B18360

Moving both 'return phi;'s into a single return at the end of the function causes the assembly to not match.

* Probably equivalent, non-matching func_80B183F8

* Matching EnTg_Draw

* Matching update function

* Matching func_80B18778

* All functions decompiled

* Move data to C code

* All functions matched excepted weird switch/case

* Last matching function

* Remove unused ASM

* Name obvious symbols

* Clang format

* Name text-related functions and variables

* Describe actor as Dancing Couple

See https://github.com/zeldaret/oot/pull/866#discussion_r664726581

* Use named constants

* Name drawing constants

* Use THIS macro for void*

* Name the function that sets environment color

* Add comments to parts of code that aren't clear

* Rename timesSpokenTo to nextDialogue, treat isTalking as boolean
This commit is contained in:
Aly Cerruti 2021-07-28 09:51:12 -07:00 • committed by GitHub
parent 5c147e5e03
commit 6f7312a348
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 164 additions and 495 deletions
Download patch file Download diff file Expand all files Collapse all files

4
assets/xml/objects/object_mu.xml
View file

@ -41,7 +41,7 @@
<Limb Name="object_mu_Limb_004F1C" LimbType="Standard" Offset="0x4F1C"/>
<Limb Name="object_mu_Limb_004F28" LimbType="Standard" Offset="0x4F28"/>
<Skeleton Name="object_mu_Skel_004F70" Type="Flex" LimbType="Standard" Offset="0x4F70"/>
<Animation Name="object_mu_Anim_005040" Offset="0x5040"/>
<Animation Name="gDancingCoupleAnim" Offset="0x5040"/>
<Texture Name="object_mu_TLUT_005050" OutName="tlut_00005050" Format="rgba16" Width="16" Height="16" Offset="0x5050"/>
<Texture Name="object_mu_Tex_005250" OutName="tex_00005250" Format="i8" Width="16" Height="16" Offset="0x5250"/>
<Texture Name="object_mu_Tex_005350" OutName="tex_00005350" Format="ci8" Width="16" Height="16" Offset="0x5350"/>
@ -91,6 +91,6 @@
<Limb Name="object_mu_Limb_00ADCC" LimbType="Standard" Offset="0xADCC"/>
<Limb Name="object_mu_Limb_00ADD8" LimbType="Standard" Offset="0xADD8"/>
<Limb Name="object_mu_Limb_00ADE4" LimbType="Standard" Offset="0xADE4"/>
<Skeleton Name="object_mu_Skel_00AE40" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
<Skeleton Name="gDancingCoupleSkel" Type="Flex" LimbType="Standard" Offset="0xAE40"/>
</File>
</Root>