diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-11-21 10:48:50 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-20 15:48:50 -0800 |
| commit | 0b51a16453b0dcf136bf694206ee603adac67eaf (patch) | |
| tree | e1cd8196a489bbc982a87665557fe2ab5ce5c6dc /tools | |
| parent | 70e97dc285caf2060dda282c7420ed1e655f806e (diff) | |
Player Docs: Spin Attack (#1741)
* spin attack
* cleanup
* fix bss
* PR review
* sync func name
* add todo
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/disasm/functions.txt | 4 | ||||
| -rw-r--r-- | tools/disasm/variables.txt | 6 | ||||
| -rw-r--r-- | tools/sizes/code_functions.csv | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index 18dddec53..f6582b96b 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -1137,7 +1137,7 @@ 0x800CB924:("func_800CB924",), 0x800CB950:("func_800CB950",), 0x800CBA08:("Camera_IsClimbingLedge",), - 0x800CBA34:("Camera_IsChargingSwordOrDekuFlowerDive",), + 0x800CBA34:("Camera_IsChargingSpinAttackOrDekuFlowerDive",), 0x800CBA7C:("func_800CBA7C",), 0x800CBAAC:("func_800CBAAC",), 0x800CBAD4:("Camera_GetFocalActorPos",), @@ -4386,7 +4386,7 @@ 0x80833058:("Player_TryActionHandlerList",), 0x808331FC:("Player_TryActionInterrupt",), 0x808332A0:("func_808332A0",), - 0x808333CC:("func_808333CC",), + 0x808333CC:("Player_CanSpinAttack",), 0x808334D4:("func_808334D4",), 0x808335B0:("func_808335B0",), 0x808335F4:("func_808335F4",), diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt index 7d4a7a36d..1041cf377 100644 --- a/tools/disasm/variables.txt +++ b/tools/disasm/variables.txt @@ -5240,9 +5240,9 @@ 0x8085E6F0:("D_8085E6F0","f32","",0x4), 0x8085E6F4:("D_8085E6F4","f32","",0x4), 0x80862AF0:("sDogSpawnPos","Vec3f","",0xC), - 0x80862AFC:("sPlayerControlStickMagnitude","f32","",0x4), - 0x80862B00:("sPlayerControlStickAngle","UNK_TYPE1","",0x1), - 0x80862B02:("D_80862B02","UNK_TYPE1","",0x1), + 0x80862AFC:("sControlStickMagnitude","f32","",0x4), + 0x80862B00:("sControlStickAngle","UNK_TYPE1","",0x1), + 0x80862B02:("sControlStickWorldYaw","UNK_TYPE1","",0x1), 0x80862B04:("sUpperBodyIsBusy","UNK_TYPE1","",0x1), 0x80862B08:("sPlayerFloorType","UNK_TYPE1","",0x1), 0x80862B0C:("sPlayerTouchedWallFlags","UNK_TYPE1","",0x1), diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index 2ba310d31..a62c3a73a 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -651,7 +651,7 @@ asm/non_matchings/code/z_camera/Camera_IsPlayerFormZora.s,Camera_IsPlayerFormZor asm/non_matchings/code/z_camera/func_800CB924.s,func_800CB924,0x800CB924,0xB asm/non_matchings/code/z_camera/func_800CB950.s,func_800CB950,0x800CB950,0x2E asm/non_matchings/code/z_camera/Camera_IsClimbingLedge.s,Camera_IsClimbingLedge,0x800CBA08,0xB -asm/non_matchings/code/z_camera/Camera_IsChargingSwordOrDekuFlowerDive.s,Camera_IsChargingSwordOrDekuFlowerDive,0x800CBA34,0x12 +asm/non_matchings/code/z_camera/Camera_IsChargingSpinAttackOrDekuFlowerDive.s,Camera_IsChargingSpinAttackOrDekuFlowerDive,0x800CBA34,0x12 asm/non_matchings/code/z_camera/func_800CBA7C.s,func_800CBA7C,0x800CBA7C,0xC asm/non_matchings/code/z_camera/func_800CBAAC.s,func_800CBAAC,0x800CBAAC,0xA asm/non_matchings/code/z_camera/Camera_GetFocalActorPos.s,Camera_GetFocalActorPos,0x800CBAD4,0x21 |