diff options
| author | Aly Cerruti <aprime2003@gmail.com> | 2021-07-28 09:51:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-28 12:51:12 -0400 |
| commit | 6f7312a3480f722425f31fcacbd031c1155bc4d6 (patch) | |
| tree | 5d457a50935afbeec2a9b6dc99360ea7b60db1f2 /assets/xml/objects | |
| parent | 5c147e5e03e9d693213537101f56d3a6eb53f16a (diff) | |
Dancing Couple (ovl_En_Tg) (#866)
* 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
Diffstat (limited to 'assets/xml/objects')
| -rw-r--r-- | assets/xml/objects/object_mu.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/assets/xml/objects/object_mu.xml b/assets/xml/objects/object_mu.xml index b18046d6a..49c0cae1f 100644 --- a/assets/xml/objects/object_mu.xml +++ b/assets/xml/objects/object_mu.xml @@ -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> |