diff options
| author | Alexis Cooper <89618924+AACooper1@users.noreply.github.com> | 2026-10-10 20:53:23 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-10 19:53:23 -0700 |
| commit | bf6bd9d0d3a90fe2f8960e034fbfd328e8bdef22 (patch) | |
| tree | b832d64883088404e224b887b861e2287909b403 /assets/xml/objects | |
| parent | 6e5fb93dde6368a6557fdd09ce9ae9309296670b (diff) | |
Document `EnToto` (#1887)
* Start documenting Toto
* Document EnToto_IsFacingPlayer and Unk2B6/isPlayerCancelingSoundCheck
* Rename EnTotoText to EnTotoSpeakData to align with EnTest3 (Kafei)
* Update gitignore
* Document some HandleTalk and SetupTalk functions similar to EnTest3
* Rename D_80BA502C to sEnTotoSpeakData1
* Document TalkState setup funcs
* Update gitignore, document talk state update functions (from En_Test3)
* Toto talk loop animations
* Update gitignore for functions.txt
* Document ActionFuncs
* Clean up remaining undocumented variables
* Clean up comments
* Run format.py and clean up result, and revert makefile changes
* Add missing newline at end of z_en_toto.h
* Clean up gitignore and other local stuff
* gitignore again
* Gitignore again again
* Gitignore again again again
* Restore old graphovl.py
* Update include/z64save.h
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Update src/overlays/actors/ovl_En_Toto/z_en_toto.c
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
* Rename SetupAction and Action functions; fix block comments; create enum for TalkData
* move enum up so it's declared before it's used lol
* Change shouldCancelSoundCheck and ShouldPlaySoundCheckCompleteCutscene to bool
* Run format.py even though it makes the SpeakData array less readable yay
* Remove accidentally pushed files
* Enum for SpeakDataIndex
* SpeakDataIndex
* Index into SpeakData with enums
* Apply requested changes
* Apply clang-format
* Apply requested changes (rename SetPlayedFlags, add formsPlayed enum, fix a few missing enum replacements)
* Change enum to macros
* Apply more suggested changes
---------
Co-authored-by: AlexisACooper1 <alexis@lingualogica.net>
Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com>
Diffstat (limited to 'assets/xml/objects')
| -rw-r--r-- | assets/xml/objects/object_zm.xml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/assets/xml/objects/object_zm.xml b/assets/xml/objects/object_zm.xml index bbfbad1d1..bd6a908e3 100644 --- a/assets/xml/objects/object_zm.xml +++ b/assets/xml/objects/object_zm.xml @@ -1,13 +1,13 @@ <Root> <File Name="object_zm" Segment="6"> - <Animation Name="object_zm_Anim_000C80" Offset="0xC80" /> <!-- Original name is "zM_aisatsu" --> - <Animation Name="object_zm_Anim_001324" Offset="0x1324" /> <!-- Original name is "zM_furimuki" --> - <Animation Name="object_zm_Anim_0016A4" Offset="0x16A4" /> <!-- Original name is "zM_furimuki2wait" --> - <Animation Name="object_zm_Anim_001DF0" Offset="0x1DF0" /> <!-- Original name is "zM_maru" --> - <Animation Name="object_zm_Anim_0022C8" Offset="0x22C8" /> <!-- Original name is "zM_ok2furimuki" --> - <Animation Name="object_zm_Anim_0028B8" Offset="0x28B8" /> <!-- Original name is "zM_suwaritalk01" --> - <Animation Name="object_zm_Anim_002F20" Offset="0x2F20" /> <!-- Original name is "zM_suwaritalk02" --> - <Animation Name="object_zm_Anim_003AA8" Offset="0x3AA8" /> <!-- Original name is "zM_suwariwait" --> + <Animation Name="gTotoWaveHelloAnim" Offset="0xC80" /> <!-- Original name is "zM_aisatsu" --> + <Animation Name="gTotoIdleLookAtGormanAnim" Offset="0x1324" /> <!-- Original name is "zM_furimuki" --> + <Animation Name="gTotoTurnLookAtStageAnim" Offset="0x16A4" /> <!-- Original name is "zM_furimuki2wait" --> + <Animation Name="gTotoCheerAnim" Offset="0x1DF0" /> <!-- Original name is "zM_maru" --> + <Animation Name="gTotoTurnLookAtGormanAnim" Offset="0x22C8" /> <!-- Original name is "zM_ok2furimuki" --> + <Animation Name="gTotoTalkSittingAnim" Offset="0x28B8" /> <!-- Original name is "zM_suwaritalk01" --> + <Animation Name="gTotoTapHeadWithCaneAnim" Offset="0x2F20" /> <!-- Original name is "zM_suwaritalk02" --> + <Animation Name="gTotoIdleSittingAnim" Offset="0x3AA8" /> <!-- Original name is "zM_suwariwait" --> <DList Name="object_zm_DL_0063A0" Offset="0x63A0" /> <DList Name="object_zm_DL_0066D0" Offset="0x66D0" /> <DList Name="object_zm_DL_006898" Offset="0x6898" /> @@ -55,10 +55,10 @@ <Limb Name="object_zm_Standardlimb_00A910" Type="Standard" EnumName="OBJECT_ZM_LIMB_0F" Offset="0xA910" /> <Limb Name="object_zm_Standardlimb_00A91C" Type="Standard" EnumName="OBJECT_ZM_LIMB_10" Offset="0xA91C" /> <Limb Name="object_zm_Standardlimb_00A928" Type="Standard" EnumName="OBJECT_ZM_LIMB_11" Offset="0xA928" /> - <Skeleton Name="object_zm_Skel_00A978" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZM_LIMB_NONE" LimbMax="OBJECT_ZM_LIMB_MAX" EnumName="ObjectZmLimb" Offset="0xA978" /> - <Animation Name="object_zm_Anim_00B3E0" Offset="0xB3E0" /> <!-- Original name is "zM_talk" --> - <Animation Name="object_zm_Anim_00B894" Offset="0xB894" /> <!-- Original name is "zM_talk01TOtalk02" --> - <Animation Name="object_zm_Anim_00BC08" Offset="0xBC08" /> <!-- Original name is "zM_talk02TOtalk01" --> - <Animation Name="object_zm_Anim_00C880" Offset="0xC880" /> <!-- Original name is "zM_wait" --> + <Skeleton Name="gTotoSkel" Type="Flex" LimbType="Standard" LimbNone="OBJECT_ZM_LIMB_NONE" LimbMax="OBJECT_ZM_LIMB_MAX" EnumName="ObjectZmLimb" Offset="0xA978" /> + <Animation Name="gTotoTalkStandingAnim" Offset="0xB3E0" /> <!-- Original name is "zM_talk" --> + <Animation Name="gTotoMoveCaneBehindHeadAnim" Offset="0xB894" /> <!-- Original name is "zM_talk01TOtalk02" --> + <Animation Name="gTotoMoveCaneBackDownAnim" Offset="0xBC08" /> <!-- Original name is "zM_talk02TOtalk01" --> + <Animation Name="gTotoIdleStandingAnim" Offset="0xC880" /> <!-- Original name is "zM_wait" --> </File> </Root> |