summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorengineer124 <47598039+engineer124@users.noreply.github.com>2024-11-20 10:15:28 +1100
committerGitHub <noreply@github.com>2024-11-20 10:15:28 +1100
commit70e97dc285caf2060dda282c7420ed1e655f806e (patch)
treeaf702c8f19d97dedf5471c9459372b686867f899 /tools
parent00bafced8e2bcdec514c80dc4506da56f0bd434f (diff)
Player Docs: Init Action Cleanup (#1743)
* init action cleanup * boomerang * revert name
Diffstat (limited to 'tools')
-rw-r--r--tools/disasm/functions.txt12
-rw-r--r--tools/disasm/variables.txt4
2 files changed, 8 insertions, 8 deletions
diff --git a/tools/disasm/functions.txt b/tools/disasm/functions.txt
index b9a7eca95..18dddec53 100644
--- a/tools/disasm/functions.txt
+++ b/tools/disasm/functions.txt
@@ -4316,13 +4316,13 @@
0x8082F43C:("Player_SetUpperAction",),
0x8082F470:("Player_InitItemActionWithAnim",),
0x8082F524:("Player_ItemToItemAction",),
- 0x8082F594:("Player_InitItemAction_DoNothing",),
- 0x8082F5A4:("Player_InitItemAction_DekuStick",),
- 0x8082F5C0:("Player_InitItemAction_2",),
+ 0x8082F594:("Player_InitDefaultIA",),
+ 0x8082F5A4:("Player_InitDekuStickIA",),
+ 0x8082F5C0:("Player_InitBowOrDekuNutIA",),
0x8082F5FC:("func_8082F5FC",),
- 0x8082F62C:("Player_InitItemAction_SpawnExplosive",),
- 0x8082F7F4:("Player_InitItemAction_SpawnHookshot",),
- 0x8082F8A0:("Player_InitItemAction_5",),
+ 0x8082F62C:("Player_InitExplosiveIA",),
+ 0x8082F7F4:("Player_InitHookshotIA",),
+ 0x8082F8A0:("Player_InitZoraBoomerangIA",),
0x8082F8BC:("Player_InitItemAction",),
0x8082F938:("Player_OverrideBlureColors",),
0x8082FA5C:("func_8082FA5C",),
diff --git a/tools/disasm/variables.txt b/tools/disasm/variables.txt
index 3acc21c41..7d4a7a36d 100644
--- a/tools/disasm/variables.txt
+++ b/tools/disasm/variables.txt
@@ -4826,8 +4826,8 @@
0x8085C96C:("sFidgetAnimSfxTypes","UNK_TYPE1","",0x1),
0x8085C98C:("sZoraBarrierEnvLighting","UNK_TYPE1","",0x1),
0x8085C99C:("sItemActionParams","UNK_TYPE1","",0x1),
- 0x8085C9F0:("sPlayerUpperActionUpdateFuncs","UNK_PTR","",0x4),
- 0x8085CB3C:("sPlayerItemActionInitFuncs","UNK_PTR","",0x4),
+ 0x8085C9F0:("sItemActionUpdateFuncs","UNK_PTR","",0x4),
+ 0x8085CB3C:("sItemActionInitFuncs","UNK_PTR","",0x4),
0x8085CC88:("sPlayerItemChangeInfo","UNK_TYPE1","",0x1),
0x8085CD00:("sPlayerItemChangeTypes","s8","[36]",0x24),
0x8085CD24:("sPlayerExplosiveInfo","UNK_TYPE1","",0x1),