diff options
| author | engineer124 <47598039+engineer124@users.noreply.github.com> | 2024-11-18 11:37:11 +1100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-11-17 16:37:11 -0800 |
| commit | 00bafced8e2bcdec514c80dc4506da56f0bd434f (patch) | |
| tree | e2bb0288bbdca03a512f6a6b1f664c51b0fef6cb /tools | |
| parent | a957342583ade3867679b93e126bcd39b80f5e43 (diff) | |
Player Docs: Zora Boomerang (#1739)
* zora boomerang
* missed some
* more docs
* cleanup docs
* more cleanup
* Player_IsUsingZoraBoomerang
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/disasm/functions.txt | 4 | ||||
| -rw-r--r-- | tools/overlayhelpers/mscriptdis.py | 2 | ||||
| -rw-r--r-- | tools/sizes/code_functions.csv | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt index ebf96434a..b9a7eca95 100644 --- a/tools/disasm/functions.txt +++ b/tools/disasm/functions.txt @@ -1143,7 +1143,7 @@ 0x800CBAD4:("Camera_GetFocalActorPos",), 0x800CBB58:("Camera_IsUnderwaterAsZora",), 0x800CBB88:("func_800CBB88",), - 0x800CBC00:("Camera_IsUsingZoraFins",), + 0x800CBC00:("func_800CBC00",), 0x800CBC30:("func_800CBC30",), 0x800CBC84:("func_800CBC84",), 0x800CBFA4:("func_800CBFA4",), @@ -4298,7 +4298,7 @@ 0x8082EB18:("Player_AnimReplace_PlayLoopNormalAdjusted",), 0x8082EB38:("Player_ProcessControlStick",), 0x8082EC9C:("Player_Anim_PlayOnceWaterAdjustment",), - 0x8082ECCC:("func_8082ECCC",), + 0x8082ECCC:("Player_IsUsingZoraBoomerang",), 0x8082ECE0:("func_8082ECE0",), 0x8082ED20:("Player_GetIdleAnim",), 0x8082ED94:("Player_CheckForIdleAnim",), diff --git a/tools/overlayhelpers/mscriptdis.py b/tools/overlayhelpers/mscriptdis.py index c8f632100..d82ccf767 100644 --- a/tools/overlayhelpers/mscriptdis.py +++ b/tools/overlayhelpers/mscriptdis.py @@ -1309,7 +1309,7 @@ item_action_names = ( "PLAYER_IA_SWORD_GILDED", "PLAYER_IA_SWORD_TWO_HANDED", "PLAYER_IA_DEKU_STICK", - "PLAYER_IA_ZORA_FINS", + "PLAYER_IA_ZORA_BOOMERANG", "PLAYER_IA_BOW", "PLAYER_IA_BOW_FIRE", "PLAYER_IA_BOW_ICE", diff --git a/tools/sizes/code_functions.csv b/tools/sizes/code_functions.csv index 2c6503463..2ba310d31 100644 --- a/tools/sizes/code_functions.csv +++ b/tools/sizes/code_functions.csv @@ -657,7 +657,7 @@ 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 asm/non_matchings/code/z_camera/Camera_IsUnderwaterAsZora.s,Camera_IsUnderwaterAsZora,0x800CBB58,0xC asm/non_matchings/code/z_camera/func_800CBB88.s,func_800CBB88,0x800CBB88,0x1E -asm/non_matchings/code/z_camera/Camera_IsUsingZoraFins.s,Camera_IsUsingZoraFins,0x800CBC00,0xC +asm/non_matchings/code/z_camera/func_800CBC00.s,func_800CBC00,0x800CBC00,0xC asm/non_matchings/code/z_camera/func_800CBC30.s,func_800CBC30,0x800CBC30,0x15 asm/non_matchings/code/z_camera/func_800CBC84.s,func_800CBC84,0x800CBC84,0xC8 asm/non_matchings/code/z_camera/func_800CBFA4.s,func_800CBFA4,0x800CBFA4,0x17 |