summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2024-10-21 01:35:03 +1100
committerGitHub <noreply@github.com>2024-10-20 07:35:03 -0700
commitd03e8719e62900d5b917f5429177560bd044fddd (patch)
tree64dcc6536b083dfb2a0b0f40628b8183fd8098a3 /tools
parent781d1d111936bf17063d0a925f9f60ca04ab7507 (diff)
Player Docs: Idle and Fidget (#1723)
* idle and fidget docs * more cleanup * cleanup * regs * spacing
Diffstat (limited to 'tools')
-rw-r--r--tools/disasm/functions.txt12
-rw-r--r--tools/disasm/variables.txt34
2 files changed, 23 insertions, 23 deletions
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index 7a6ab8d61..8db1cc384 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -4300,9 +4300,9 @@
0x8082EC9C:("Player_Anim_PlayOnceWaterAdjustment",),
0x8082ECCC:("func_8082ECCC",),
0x8082ECE0:("func_8082ECE0",),
- 0x8082ED20:("func_8082ED20",),
- 0x8082ED94:("func_8082ED94",),
- 0x8082EEA4:("func_8082EEA4",),
+ 0x8082ED20:("Player_GetIdleAnim",),
+ 0x8082ED94:("Player_CheckForIdleAnim",),
+ 0x8082EEA4:("Player_ProcessFidgetAnimSfxList",),
0x8082EEE0:("func_8082EEE0",),
0x8082EF20:("func_8082EF20",),
0x8082EF54:("func_8082EF54",),
@@ -4381,7 +4381,7 @@
0x80832754:("func_80832754",),
0x80832888:("func_80832888",),
0x80832CAC:("Player_CalcSpeedAndYawFromControlStick",),
- 0x80832F24:("func_80832F24",),
+ 0x80832F24:("Player_DecelerateToZero",),
0x80832F78:("Player_GetMovementSpeedAndYaw",),
0x80833058:("Player_TryActionHandlerList",),
0x808331FC:("Player_TryActionInterrupt",),
@@ -4557,7 +4557,7 @@
0x8083E958:("func_8083E958",),
0x8083E9C4:("func_8083E9C4",),
0x8083EA44:("func_8083EA44",),
- 0x8083EBD0:("Player_ChooseIdleAnim",),
+ 0x8083EBD0:("Player_ChooseNextIdleAnim",),
0x8083EE60:("func_8083EE60",),
0x8083F144:("func_8083F144",),
0x8083F190:("func_8083F190",),
@@ -4665,7 +4665,7 @@
0x808497A0:("Player_Action_1",),
0x80849A9C:("Player_Action_2",),
0x80849DD0:("Player_Action_3",),
- 0x80849FE0:("Player_Action_4",),
+ 0x80849FE0:("Player_Action_Idle",),
0x8084A26C:("Player_Action_5",),
0x8084A5C0:("Player_Action_6",),
0x8084A794:("Player_Action_7",),
diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt
index 77bc31d35..573f6353d 100644
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@@ -4806,24 +4806,24 @@
0x8085C318:("D_8085C318","UNK_TYPE1","",0x1),
0x8085C344:("D_8085C344","UNK_TYPE1","",0x1),
0x8085C394:("D_8085C394","UNK_TYPE1","",0x1),
- 0x8085C3E4:("sPlayerWaterSpeedScale","f32","",0x4),
- 0x8085C3E8:("D_8085C3E8","f32","",0x4),
+ 0x8085C3E4:("sWaterSpeedFactor","f32","",0x4),
+ 0x8085C3E8:("sInvWaterSpeedFactor","f32","",0x4),
0x8085C3EC:("D_8085C3EC","UNK_TYPE2","",0x2),
0x8085C3F4:("sGetItemTable","GetItemEntry","[0xB9]",0x456),
- 0x8085C84C:("sPlayerIdleAnimations","UNK_TYPE4","",0x78),
- 0x8085C8C4:("D_8085C8C4","UNK_TYPE1","",0x1),
- 0x8085C8C8:("D_8085C8C8","UNK_TYPE1","",0x1),
- 0x8085C8CC:("D_8085C8CC","UNK_TYPE1","",0x1),
- 0x8085C8D0:("D_8085C8D0","UNK_TYPE1","",0x1),
- 0x8085C8D4:("D_8085C8D4","UNK_TYPE1","",0x1),
- 0x8085C8E8:("D_8085C8E8","UNK_TYPE1","",0x1),
- 0x8085C900:("D_8085C900","UNK_TYPE1","",0x1),
- 0x8085C90C:("D_8085C90C","UNK_TYPE1","",0x1),
- 0x8085C91C:("D_8085C91C","UNK_TYPE1","",0x1),
- 0x8085C924:("D_8085C924","UNK_TYPE1","",0x1),
- 0x8085C928:("D_8085C928","UNK_TYPE1","",0x14),
- 0x8085C93C:("D_8085C93C","UNK_TYPE1","",0x1),
- 0x8085C96C:("D_8085C96C","UNK_TYPE1","",0x1),
+ 0x8085C84C:("sFidgetAnimations","UNK_TYPE4","",0x78),
+ 0x8085C8C4:("sFidgetAnimSfxSneeze","UNK_TYPE1","",0x1),
+ 0x8085C8C8:("sFidgetAnimSfxSweat","UNK_TYPE1","",0x1),
+ 0x8085C8CC:("sFidgetAnimSfxCritHealthStart","UNK_TYPE1","",0x1),
+ 0x8085C8D0:("sFidgetAnimSfxCritHealthLoop","UNK_TYPE1","",0x1),
+ 0x8085C8D4:("sFidgetAnimSfxTunic","UNK_TYPE1","",0x1),
+ 0x8085C8E8:("sFidgetAnimSfxTapFeet","UNK_TYPE1","",0x1),
+ 0x8085C900:("sFidgetAnimSfxShield","UNK_TYPE1","",0x1),
+ 0x8085C90C:("sFidgetAnimSfxSword","UNK_TYPE1","",0x1),
+ 0x8085C91C:("sFidgetAnimSfxSwordTwoHand","UNK_TYPE1","",0x1),
+ 0x8085C924:("sFidgetAnimSfxStretch","UNK_TYPE1","",0x1),
+ 0x8085C928:("sFidgetAnimSfxPigGrunt","UNK_TYPE1","",0x14),
+ 0x8085C93C:("sFidgetAnimSfxLists","UNK_TYPE1","",0x1),
+ 0x8085C96C:("sFidgetAnimSfxTypes","UNK_TYPE1","",0x1),
0x8085C98C:("sZoraBarrierEnvLighting","UNK_TYPE1","",0x1),
0x8085C99C:("sItemActionParams","UNK_TYPE1","",0x1),
0x8085C9F0:("sPlayerUpperActionUpdateFuncs","UNK_PTR","",0x4),
@@ -4855,7 +4855,7 @@
0x8085D004:("sActionHandlerList4","UNK_TYPE1","",0x1),
0x8085D00C:("sActionHandlerList5","UNK_TYPE1","",0x1),
0x8085D018:("sActionHandlerList6","UNK_TYPE1","",0x1),
- 0x8085D01C:("sActionHandlerList7","UNK_TYPE1","",0x1),
+ 0x8085D01C:("sActionHandlerListIdle","UNK_TYPE1","",0x1),
0x8085D028:("sActionHandlerList8","UNK_TYPE1","",0x1),
0x8085D034:("sActionHandlerList9","UNK_TYPE1","",0x1),
0x8085D044:("sActionHandlerList10","UNK_TYPE1","",0x1),