From 153024933a8d0b0e48371bd9ce3cf1d717ed507d Mon Sep 17 00:00:00 2001 From: Aetias Date: Thu, 18 Apr 2024 19:57:01 +0200 Subject: [PATCH] Update externs --- asm/main.inc | 8 +- asm/ov00/Player/LinkStateInteract.inc | 8 +- asm/ov00/ov00_020980f4.inc | 6 +- asm/ov00/ov00_020c3e54.inc | 20 ++--- asm/ov03.inc | 12 +-- asm/ov06.inc | 2 +- asm/ov09.inc | 14 +-- asm/ov12.inc | 10 +-- asm/ov13.inc | 4 +- asm/ov14/ov14_0213b778.inc | 26 +++--- asm/ov15.inc | 26 +++--- asm/ov22.inc | 12 +-- asm/ov27.inc | 12 +-- asm/ov31.inc | 6 +- asm/ov33.inc | 118 ++++++++++++------------- asm/ov35.inc | 14 +-- asm/ov46.inc | 4 +- asm/ov47.inc | 118 ++++++++++++------------- asm/ov48.inc | 122 +++++++++++++------------- asm/ov49.inc | 8 +- asm/ov51.inc | 112 +++++++++++------------ asm/ov53.inc | 8 +- asm/ov58.inc | 2 +- 23 files changed, 336 insertions(+), 336 deletions(-) diff --git a/asm/main.inc b/asm/main.inc index f0597b61..7ccf79ea 100644 --- a/asm/main.inc +++ b/asm/main.inc @@ -8,6 +8,10 @@ .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN12TouchControl18func_ov00_0207af38Etb .extern _ZN12TouchControlC2Ev +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags6ExistsEv .extern _ZN17LinkStateInteract18func_ov00_020ab6c8Ev .extern _ZNK11ItemManager7HasItemEi .extern data_027e0000 @@ -318,10 +322,6 @@ .extern func_ov00_0208b180 .extern func_ov00_0208cae8 .extern func_ov00_0208caf8 -.extern _ZN14AdventureFlags6ExistsEv -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_0209d728 .extern func_ov00_0209d90c .extern func_ov00_020a5e9c diff --git a/asm/ov00/Player/LinkStateInteract.inc b/asm/ov00/Player/LinkStateInteract.inc index 8df9190c..c35564bc 100644 --- a/asm/ov00/Player/LinkStateInteract.inc +++ b/asm/ov00/Player/LinkStateInteract.inc @@ -1,6 +1,7 @@ #pragma once .extern Divide .extern _ZN10PlayerBase13GetEquipSwordEv +.extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase10GetStateIdEv .extern _ZN13LinkStateBase12GetGrabActorEv .extern _ZN13LinkStateBase12GetPlayerPosEv @@ -35,6 +36,9 @@ .extern _ZN13PlayerControl18func_ov00_020b05e8EP5Vec3p .extern _ZN13PlayerControl18func_ov00_020b0ad0EP5Actor .extern _ZN13PlayerControl9SetUnk_80Ev +.extern _ZN5Actor10SetUnk_11cEc +.extern _ZN5Actor4KillEv +.extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZNK11ItemManager16GetEquippedFairyEv .extern _ZNK11ItemManager8GetFairyEi .extern data_02050f54 @@ -56,10 +60,6 @@ .extern func_020350b4 .extern func_020351b8 .extern func_ov00_020ba458 -.extern _ZN5Actor10SetUnk_11cEc -.extern _ZN5Actor9GetHitboxEP8Cylinder -.extern _ZN5Actor4KillEv -.extern _ZN12ActorManager8GetActorEP8ActorRef .extern func_ov00_020d7a84 .extern func_ov00_020d7b20 .extern func_ov04_0210ab88 diff --git a/asm/ov00/ov00_020980f4.inc b/asm/ov00/ov00_020980f4.inc index 479bb174..088a4fd7 100644 --- a/asm/ov00/ov00_020980f4.inc +++ b/asm/ov00/ov00_020980f4.inc @@ -7,6 +7,9 @@ .extern _ZN11ItemManager21LoadDungeonItemModelsEv .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb +.extern _ZN14AdventureFlags6ExistsEv .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12CollidesWithEPKS_ @@ -312,9 +315,6 @@ .extern func_ov00_02090f24 .extern func_ov00_02090f74 .extern func_ov00_0209320c -.extern _ZN14AdventureFlags6ExistsEv -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020a956c .extern func_ov00_020a95ec .extern func_ov00_020a960c diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index e0d02a22..f14de2b1 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -8,6 +8,15 @@ .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern _ZN12ActorManager13FindActorByIdEj .extern _ZN12ActorManager8GetActorEP8ActorRef +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEi +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags3GetEj .extern _ZN17LinkStateInteract18func_ov00_020abba0EP8ActorRef .extern _ZN17LinkStateInteract18func_ov00_020abbdcEP8ActorRef .extern _ZN17LinkStateInteract18func_ov00_020abc18EP8ActorRef @@ -116,7 +125,6 @@ .extern data_027e0f94 .extern data_027e0fac .extern data_027e0fb8 -.extern gHealthManager .extern data_027e0fc8 .extern data_027e0fd4 .extern data_027e0fe0 @@ -523,15 +531,6 @@ .extern func_ov00_02089b00 .extern func_ov00_02093a1c .extern func_ov00_020965c0 -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097968Ei -.extern _ZN14AdventureFlags18func_ov00_02097b9cEv -.extern _ZN14AdventureFlags18func_ov00_02097bacEv -.extern _ZN14AdventureFlags18func_ov00_02097bbcEv -.extern _ZN14AdventureFlags18func_ov00_02097bccEv -.extern _ZN14AdventureFlags18func_ov00_02097bccEi .extern func_ov00_020985c0 .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 @@ -669,6 +668,7 @@ .extern func_ov26_021767ec .extern func_ov29_0216d918 .extern gAdventureFlags +.extern gHealthManager .extern gItemManager .extern gOverlayManager .extern strcat diff --git a/asm/ov03.inc b/asm/ov03.inc index 5d78598b..cb507b7d 100644 --- a/asm/ov03.inc +++ b/asm/ov03.inc @@ -3,6 +3,12 @@ .extern FastDivide .extern _ZN11ItemManager12GetEquipItemEi .extern _ZN11ItemManager18func_ov00_020ad790Ei +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags3GetEj .extern _ZN14OverlayManager15LoadIfNotLoadedEjj .extern _ZN14OverlayManager6UnloadEj .extern _ZN5Actor10SetUnk_11bEv @@ -307,12 +313,6 @@ .extern func_ov00_0208c38c .extern func_ov00_0208c39c .extern func_ov00_0208ca00 -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097b9cEv -.extern _ZN14AdventureFlags18func_ov00_02097bbcEv -.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209d748 diff --git a/asm/ov06.inc b/asm/ov06.inc index 1738f036..a0a773c4 100644 --- a/asm/ov06.inc +++ b/asm/ov06.inc @@ -1,5 +1,6 @@ #pragma once .extern Divide +.extern _ZN10ActorRupee5gTypeE .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern data_02068e7c @@ -93,7 +94,6 @@ .extern data_ov14_0215b1a0 .extern data_ov14_0215b1c0 .extern data_ov14_0215b1e0 -.extern _ZN10ActorRupee5gTypeE .extern data_ov14_0215b220 .extern data_ov14_0215b240 .extern data_ov14_0215b258 diff --git a/asm/ov09.inc b/asm/ov09.inc index 9461dc15..c328a07a 100644 --- a/asm/ov09.inc +++ b/asm/ov09.inc @@ -5,6 +5,12 @@ .extern _ZN11ItemManager16SetShipPartCountEjjc .extern _ZN11ItemManager16SetTreasureCountEjc .extern _ZN12ActorManager14Actor_vfunc_28Ev +.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 +.extern _ZN14AdventureFlags15Get_FlagsUnk_4aEi +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097eccEv +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags6CopyToEPi .extern _ZN14OverlayManager15LoadIfNotLoadedEjj .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj @@ -45,7 +51,6 @@ .extern data_027e0e60 .extern data_027e0f64 .extern data_027e0f90 -.extern gHealthManager .extern data_027e0fe4 .extern data_027e0ffc .extern data_027e103c @@ -233,12 +238,6 @@ .extern func_ov00_02083ee0 .extern func_ov00_020848b8 .extern func_ov00_02087d34 -.extern _ZN14AdventureFlags6CopyToEPi -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags15Get_FlagsUnk_4aEi -.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2 -.extern _ZN14AdventureFlags18func_ov00_02097eccEv .extern func_ov00_020a5e9c .extern func_ov00_020a61ac .extern func_ov00_020a956c @@ -451,6 +450,7 @@ .extern func_ov18_02160a74 .extern func_ov29_0216dcf4 .extern gAdventureFlags +.extern gHealthManager .extern gItemManager .extern gOverlayManager .extern strcat diff --git a/asm/ov12.inc b/asm/ov12.inc index 39f534c6..e2b5ae58 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -14,6 +14,11 @@ .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase19PlayerBase_vfunc_38EP5Vec3p .extern _ZN13LinkStateBase23PlayerLinkBase_vfunc_74Ev +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern _ZN14OverlayManager15LoadIfNotLoadedEjj .extern _ZN17LinkStateInteract20SetGrabActorVelocityEP5Vec3p .extern _ZN5Actor10GetAngleToEP5Vec3p @@ -432,11 +437,6 @@ .extern func_ov00_02090e10 .extern func_ov00_02090f64 .extern func_ov00_02094824 -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags18func_ov00_02097750Ev -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097bbcEv -.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov13.inc b/asm/ov13.inc index 39fa11ec..fafee3a6 100644 --- a/asm/ov13.inc +++ b/asm/ov13.inc @@ -70,8 +70,6 @@ .extern func_020400f4 .extern func_02040100 .extern func_02040464 -.extern strcpy -.extern strcat .extern func_0204f614 .extern func_0204f754 .extern func_ov00_0207a294 @@ -113,3 +111,5 @@ .extern func_ov01_020f802c .extern func_ov01_020f8434 .extern func_ov01_020f8500 +.extern strcat +.extern strcpy diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index bc8d8d64..04be01dd 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -21,6 +21,18 @@ .extern _ZN12ActorManager18func_ov00_020c3bb0EiPi .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13PlayerControl20UpdateUsingEquipItemEv +.extern _ZN14AdventureFlags15Get_FlagsUnk_30Ei +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bbcEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb +.extern _ZN14AdventureFlags18func_ov00_02098058Ev +.extern _ZN14AdventureFlags3GetEj .extern _ZN15LinkStateDamage18func_ov00_020aca94Ev .extern _ZN4Item18func_ov00_020ad020Ei .extern _ZN5Actor10GetUnk_08cEP8Cylinder @@ -120,7 +132,6 @@ .extern data_027e0f94 .extern data_027e0fa0 .extern data_027e0fb8 -.extern gHealthManager .extern data_027e0fc0 .extern data_027e0fc4 .extern data_027e0fc8 @@ -407,18 +418,6 @@ .extern func_ov00_02093a4c .extern func_ov00_02094824 .extern func_ov00_02094884 -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags18func_ov00_02097750Ev -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097968Ei -.extern _ZN14AdventureFlags18func_ov00_02097b9cEv -.extern _ZN14AdventureFlags18func_ov00_02097bacEv -.extern _ZN14AdventureFlags18func_ov00_02097bbcEv -.extern _ZN14AdventureFlags18func_ov00_02097bccEv -.extern _ZN14AdventureFlags15Get_FlagsUnk_30Ei -.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb -.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a5e9c @@ -851,6 +850,7 @@ .extern func_ov59_02198fc8 .extern func_ov59_02198fcc .extern gAdventureFlags +.extern gHealthManager .extern gItemManager .extern gOverlayManager .extern gPlayerAnimHandler diff --git a/asm/ov15.inc b/asm/ov15.inc index 4ad1b0ee..bf9fcdaa 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -1,6 +1,7 @@ #pragma once .extern Approach_thunk .extern Divide +.extern GiveShipPart .extern _ZN10PlayerBase10GetEquipIdEv .extern _ZN10PlayerBase18TeleportToEntranceEib .extern _ZN10PlayerBase18func_ov00_020a7c00Ei @@ -28,6 +29,17 @@ .extern _ZN13PlayerControl18func_ov00_020af2d4Ejb .extern _ZN13PlayerControl18func_ov00_020af538Ev .extern _ZN13PlayerControl9UpdateAimEv +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097750Ev +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev +.extern _ZN14AdventureFlags18func_ov00_020980bcEi +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern _ZN4Item18func_ov00_020ad020Ei .extern _ZN5Actor10GetAngleToEP5Vec3p .extern _ZN5Actor10SetUnk_11bEv @@ -150,7 +162,6 @@ .extern data_027e0fac .extern data_027e0fb0 .extern data_027e0fb8 -.extern gHealthManager .extern data_027e0fc4 .extern data_027e0fe0 .extern data_027e0fe4 @@ -540,17 +551,6 @@ .extern func_ov00_0209549c .extern func_ov00_02095720 .extern func_ov00_02095764 -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags18func_ov00_02097750Ev -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097968Ei -.extern _ZN14AdventureFlags18func_ov00_02097b9cEv -.extern _ZN14AdventureFlags18func_ov00_02097bacEv -.extern _ZN14AdventureFlags18func_ov00_02097bccEv -.extern _ZN14AdventureFlags18func_ov00_02098058Ev -.extern _ZN14AdventureFlags18func_ov00_020980bcEi .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_0209c1e4 @@ -892,7 +892,6 @@ .extern func_ov09_0211c6b4 .extern func_ov09_0211c724 .extern func_ov09_0211c808 -.extern GiveShipPart .extern func_ov09_0211cac0 .extern func_ov09_0211cc74 .extern func_ov09_0211cc98 @@ -908,6 +907,7 @@ .extern func_ov09_0211d668 .extern func_ov09_0211d794 .extern gAdventureFlags +.extern gHealthManager .extern gItemManager .extern strcat .extern strncpy diff --git a/asm/ov22.inc b/asm/ov22.inc index 2c895402..1e59a058 100644 --- a/asm/ov22.inc +++ b/asm/ov22.inc @@ -11,6 +11,12 @@ .extern _ZN13LinkStateBase14GetPlayerAngleEv .extern _ZN13LinkStateBase15ChangeLinkStateEi .extern _ZN13LinkStateBase18func_ov00_020a8954EbPi +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bacEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev +.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi +.extern _ZN14AdventureFlags3GetEj .extern _ZN5Actor10GetAngleToEP5Vec3p .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p @@ -239,12 +245,6 @@ .extern func_ov00_02093af0 .extern func_ov00_02094824 .extern func_ov00_02094884 -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097b9cEv -.extern _ZN14AdventureFlags18func_ov00_02097bacEv -.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi -.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a6110 diff --git a/asm/ov27.inc b/asm/ov27.inc index e0630bb2..ae7c718a 100644 --- a/asm/ov27.inc +++ b/asm/ov27.inc @@ -4,6 +4,12 @@ .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13PlayerControl14IsTouchingFastEv +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097738Ev +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern _ZN5Actor10GetAngleToEP5Vec3p .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc @@ -206,12 +212,6 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern _ZN14AdventureFlags18func_ov00_02097738Ev -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097b9cEv -.extern _ZN14AdventureFlags18func_ov00_02097bccEv .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov31.inc b/asm/ov31.inc index 98ece2ad..b5ef43d6 100644 --- a/asm/ov31.inc +++ b/asm/ov31.inc @@ -1,9 +1,12 @@ #pragma once .extern Divide +.extern GiveShipPart .extern LoadTreasureItemFanfare .extern _ZN11ItemManager10GiveRupeesEsi .extern _ZN11ItemManager8GiveAmmoEit .extern _ZN12ActorManager8GetActorEP8ActorRef +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p @@ -158,8 +161,6 @@ .extern func_ov00_020875f8 .extern func_ov00_020888e8 .extern func_ov00_0208b180 -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020a9588 .extern func_ov00_020bc500 .extern func_ov00_020bcdec @@ -183,7 +184,6 @@ .extern func_ov09_0211c1a8 .extern func_ov09_0211c980 .extern func_ov09_0211c9a0 -.extern GiveShipPart .extern func_ov09_0211cac0 .extern func_ov09_0211cca4 .extern func_ov09_0211ccb4 diff --git a/asm/ov33.inc b/asm/ov33.inc index e21c1f6a..d27e97e5 100644 --- a/asm/ov33.inc +++ b/asm/ov33.inc @@ -1,5 +1,63 @@ #pragma once .extern Divide +.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j +.extern _ZN12ActorManager8GetActorEP8ActorRef +.extern _ZN5Actor10GetAngleToEP5Vec3p +.extern _ZN5Actor10SetUnk_11bEv +.extern _ZN5Actor11SetVelocityEP5Vec3p +.extern _ZN5Actor12ApplyGravityEv +.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12GetOffsetPosEP5Vec3p +.extern _ZN5Actor12SetTransformEP9Transform +.extern _ZN5Actor12XzDistanceToEP5Vec3p +.extern _ZN5Actor14GetAngleToLinkEv +.extern _ZN5Actor15IsHitboxTouchedEb +.extern _ZN5Actor15TrySetTransformEP9Transform +.extern _ZN5Actor16CollidesWithLinkEv +.extern _ZN5Actor16XzDistanceToLinkEv +.extern _ZN5Actor18func_ov00_020c195cEv +.extern _ZN5Actor18func_ov00_020c1cf8Ev +.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p +.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_ +.extern _ZN5Actor18func_ov00_020c2e7cEv +.extern _ZN5Actor18func_ov00_020c2ed4Ev +.extern _ZN5Actor18func_ov00_020c313cEj +.extern _ZN5Actor20IncreaseActiveFramesEv +.extern _ZN5Actor4KillEv +.extern _ZN5Actor6GetPosEv +.extern _ZN5Actor8vfunc_0cEv +.extern _ZN5Actor8vfunc_10Ej +.extern _ZN5Actor8vfunc_18Ej +.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_24Ev +.extern _ZN5Actor8vfunc_28Ev +.extern _ZN5Actor8vfunc_2cEv +.extern _ZN5Actor8vfunc_30Ev +.extern _ZN5Actor8vfunc_38Ev +.extern _ZN5Actor8vfunc_48Ei +.extern _ZN5Actor8vfunc_4cEPi +.extern _ZN5Actor8vfunc_54Ev +.extern _ZN5Actor8vfunc_60Ev +.extern _ZN5Actor8vfunc_64Ev +.extern _ZN5Actor8vfunc_68Ev +.extern _ZN5Actor8vfunc_6cEv +.extern _ZN5Actor8vfunc_70Ev +.extern _ZN5Actor8vfunc_74Ev +.extern _ZN5Actor8vfunc_78Ev +.extern _ZN5Actor8vfunc_7cEv +.extern _ZN5Actor8vfunc_80Ev +.extern _ZN5Actor8vfunc_84Ev +.extern _ZN5Actor8vfunc_88Ev +.extern _ZN5Actor8vfunc_8cEv +.extern _ZN5Actor8vfunc_90Ev +.extern _ZN5Actor8vfunc_94Ev +.extern _ZN5Actor8vfunc_98Ev +.extern _ZN5Actor8vfunc_9cEv +.extern _ZN5Actor8vfunc_a8Ev +.extern _ZN5Actor8vfunc_acEv +.extern _ZN5Actor8vfunc_b0Ev +.extern _ZN5ActorC2Ev +.extern _ZN5ActorD2Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern data_02050f54 @@ -16,7 +74,6 @@ .extern data_027e0f94 .extern data_027e0fa0 .extern data_027e0fac -.extern gHealthManager .extern data_027e0fc8 .extern data_027e0fe0 .extern data_027e0fe4 @@ -79,65 +136,7 @@ .extern func_ov00_020c0cc8 .extern func_ov00_020c0e24 .extern func_ov00_020c1500 -.extern _ZN5ActorC2Ev -.extern _ZN5ActorD2Ev -.extern _ZN5Actor8vfunc_0cEv -.extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_24Ev -.extern _ZN5Actor8vfunc_28Ev -.extern _ZN5Actor12GetOffsetPosEP5Vec3p -.extern _ZN5Actor8vfunc_38Ev -.extern _ZN5Actor8vfunc_2cEv -.extern _ZN5Actor8vfunc_30Ev -.extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt -.extern _ZN5Actor10SetUnk_11bEv -.extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor8vfunc_60Ev -.extern _ZN5Actor8vfunc_64Ev -.extern _ZN5Actor8vfunc_68Ev -.extern _ZN5Actor8vfunc_6cEv -.extern _ZN5Actor8vfunc_70Ev -.extern _ZN5Actor8vfunc_74Ev -.extern _ZN5Actor8vfunc_7cEv -.extern _ZN5Actor8vfunc_78Ev -.extern _ZN5Actor8vfunc_80Ev -.extern _ZN5Actor8vfunc_84Ev -.extern _ZN5Actor8vfunc_88Ev -.extern _ZN5Actor8vfunc_8cEv -.extern _ZN5Actor8vfunc_90Ev -.extern _ZN5Actor8vfunc_94Ev -.extern _ZN5Actor8vfunc_98Ev -.extern _ZN5Actor8vfunc_9cEv -.extern _ZN5Actor18func_ov00_020c195cEv -.extern _ZN5Actor15TrySetTransformEP9Transform -.extern _ZN5Actor12SetTransformEP9Transform -.extern _ZN5Actor8vfunc_a8Ev -.extern _ZN5Actor8vfunc_48Ei -.extern _ZN5Actor8vfunc_4cEPi -.extern _ZN5Actor18func_ov00_020c1cf8Ev -.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p -.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_ -.extern _ZN5Actor12CollidesWithEPKS_ -.extern _ZN5Actor16CollidesWithLinkEv -.extern _ZN5Actor12XzDistanceToEP5Vec3p -.extern _ZN5Actor16XzDistanceToLinkEv -.extern _ZN5Actor10GetAngleToEP5Vec3p -.extern _ZN5Actor14GetAngleToLinkEv -.extern _ZN5Actor20IncreaseActiveFramesEv -.extern _ZN5Actor18func_ov00_020c2e7cEv -.extern _ZN5Actor18func_ov00_020c2ed4Ev -.extern _ZN5Actor15IsHitboxTouchedEb -.extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor6GetPosEv -.extern _ZN5Actor8vfunc_54Ev -.extern _ZN5Actor18func_ov00_020c313cEj -.extern _ZN5Actor4KillEv -.extern _ZN5Actor8vfunc_acEv -.extern _ZN5Actor8vfunc_b0Ev .extern func_ov00_020c3348 -.extern _ZN12ActorManager8GetActorEP8ActorRef -.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern func_ov00_020c4048 .extern func_ov00_020c566c .extern func_ov00_020c5c98 @@ -249,4 +248,5 @@ .extern func_ov14_02145f0c .extern func_ov18_02160a54 .extern func_ov18_02160a64 +.extern gHealthManager .extern strncpy diff --git a/asm/ov35.inc b/asm/ov35.inc index ec194367..6ec47331 100644 --- a/asm/ov35.inc +++ b/asm/ov35.inc @@ -7,6 +7,13 @@ .extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13PlayerControl14CheckTouchFastEj .extern _ZN13PlayerControl14IsTouchingFastEv +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097968Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02097bccEv +.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor10SetUnk_11cEc .extern _ZN5Actor11SetVelocityEP5Vec3p @@ -170,13 +177,6 @@ .extern func_ov00_02089318 .extern func_ov00_0208b158 .extern func_ov00_0208e7a4 -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097968Ei -.extern _ZN14AdventureFlags18func_ov00_02097b9cEv -.extern _ZN14AdventureFlags18func_ov00_02097bccEv -.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a6110 diff --git a/asm/ov46.inc b/asm/ov46.inc index 11a612e6..b0c00b00 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -5,6 +5,8 @@ .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager22FindNearestActorOfTypeEP8ActorRefPS_jP5Vec3p .extern _ZN12ActorManager8GetActorEP8ActorRef +.extern _ZN14AdventureFlags3GetEj +.extern _ZN14AdventureFlags3SetEjb .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv @@ -127,8 +129,6 @@ .extern func_ov00_02093a5c .extern func_ov00_02093af0 .extern func_ov00_02094824 -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags3SetEjb .extern func_ov00_020a5e9c .extern func_ov00_020a9588 .extern func_ov00_020a95a4 diff --git a/asm/ov47.inc b/asm/ov47.inc index cc56e2e1..1259f9ca 100644 --- a/asm/ov47.inc +++ b/asm/ov47.inc @@ -1,5 +1,64 @@ #pragma once .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +.extern _ZN5Actor10SetUnk_11bEv +.extern _ZN5Actor11SetVelocityEP5Vec3p +.extern _ZN5Actor12ApplyGravityEv +.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12GetOffsetPosEP5Vec3p +.extern _ZN5Actor12KillInBoundsEv +.extern _ZN5Actor12SetTransformEP9Transform +.extern _ZN5Actor12XzDistanceToEP5Vec3p +.extern _ZN5Actor15IsHitboxTouchedEb +.extern _ZN5Actor15TrySetTransformEP9Transform +.extern _ZN5Actor16CollidesWithLinkEv +.extern _ZN5Actor16XzDistanceToLinkEv +.extern _ZN5Actor18CollidesWithShieldEP8Cylinder +.extern _ZN5Actor18func_Ov00_020c1bfcEi +.extern _ZN5Actor18func_ov00_020c1c20Eiii +.extern _ZN5Actor18func_ov00_020c1cf8Ev +.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p +.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p +.extern _ZN5Actor18func_ov00_020c313cEj +.extern _ZN5Actor18func_ov00_020c3200Ei +.extern _ZN5Actor20IncreaseActiveFramesEv +.extern _ZN5Actor4KillEv +.extern _ZN5Actor6GetPosEv +.extern _ZN5Actor8vfunc_08Ev +.extern _ZN5Actor8vfunc_0cEv +.extern _ZN5Actor8vfunc_10Ej +.extern _ZN5Actor8vfunc_18Ej +.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_20Ei +.extern _ZN5Actor8vfunc_24Ev +.extern _ZN5Actor8vfunc_28Ev +.extern _ZN5Actor8vfunc_2cEv +.extern _ZN5Actor8vfunc_30Ev +.extern _ZN5Actor8vfunc_38Ev +.extern _ZN5Actor8vfunc_48Ei +.extern _ZN5Actor8vfunc_4cEPi +.extern _ZN5Actor8vfunc_54Ev +.extern _ZN5Actor8vfunc_60Ev +.extern _ZN5Actor8vfunc_64Ev +.extern _ZN5Actor8vfunc_68Ev +.extern _ZN5Actor8vfunc_6cEv +.extern _ZN5Actor8vfunc_70Ev +.extern _ZN5Actor8vfunc_74Ev +.extern _ZN5Actor8vfunc_78Ev +.extern _ZN5Actor8vfunc_7cEv +.extern _ZN5Actor8vfunc_80Ev +.extern _ZN5Actor8vfunc_84Ev +.extern _ZN5Actor8vfunc_88Ev +.extern _ZN5Actor8vfunc_8cEv +.extern _ZN5Actor8vfunc_90Ev +.extern _ZN5Actor8vfunc_94Ev +.extern _ZN5Actor8vfunc_98Ev +.extern _ZN5Actor8vfunc_9cEv +.extern _ZN5Actor8vfunc_a8Ev +.extern _ZN5Actor8vfunc_acEv +.extern _ZN5Actor8vfunc_b0Ev +.extern _ZN5Actor9GetHitboxEP8Cylinder +.extern _ZN5ActorC2Ev +.extern _ZN5ActorD2Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern _ZNK11ItemManager19GetActiveFairyLevelEi @@ -86,65 +145,6 @@ .extern func_ov00_020c070c .extern func_ov00_020c0c08 .extern func_ov00_020c1500 -.extern _ZN5ActorC2Ev -.extern _ZN5ActorD2Ev -.extern _ZN5Actor8vfunc_08Ev -.extern _ZN5Actor8vfunc_0cEv -.extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_24Ev -.extern _ZN5Actor8vfunc_28Ev -.extern _ZN5Actor12GetOffsetPosEP5Vec3p -.extern _ZN5Actor8vfunc_38Ev -.extern _ZN5Actor8vfunc_2cEv -.extern _ZN5Actor8vfunc_30Ev -.extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt -.extern _ZN5Actor8vfunc_20Ei -.extern _ZN5Actor10SetUnk_11bEv -.extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor8vfunc_60Ev -.extern _ZN5Actor8vfunc_64Ev -.extern _ZN5Actor8vfunc_68Ev -.extern _ZN5Actor8vfunc_6cEv -.extern _ZN5Actor8vfunc_70Ev -.extern _ZN5Actor8vfunc_74Ev -.extern _ZN5Actor8vfunc_7cEv -.extern _ZN5Actor8vfunc_78Ev -.extern _ZN5Actor8vfunc_80Ev -.extern _ZN5Actor8vfunc_84Ev -.extern _ZN5Actor8vfunc_88Ev -.extern _ZN5Actor8vfunc_8cEv -.extern _ZN5Actor8vfunc_90Ev -.extern _ZN5Actor8vfunc_94Ev -.extern _ZN5Actor8vfunc_98Ev -.extern _ZN5Actor8vfunc_9cEv -.extern _ZN5Actor15TrySetTransformEP9Transform -.extern _ZN5Actor12SetTransformEP9Transform -.extern _ZN5Actor8vfunc_a8Ev -.extern _ZN5Actor18func_Ov00_020c1bfcEi -.extern _ZN5Actor18func_ov00_020c1c20Eiii -.extern _ZN5Actor8vfunc_48Ei -.extern _ZN5Actor8vfunc_4cEPi -.extern _ZN5Actor18func_ov00_020c1cf8Ev -.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p -.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p -.extern _ZN5Actor18CollidesWithShieldEP8Cylinder -.extern _ZN5Actor12CollidesWithEPKS_ -.extern _ZN5Actor16CollidesWithLinkEv -.extern _ZN5Actor12XzDistanceToEP5Vec3p -.extern _ZN5Actor16XzDistanceToLinkEv -.extern _ZN5Actor9GetHitboxEP8Cylinder -.extern _ZN5Actor20IncreaseActiveFramesEv -.extern _ZN5Actor15IsHitboxTouchedEb -.extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor6GetPosEv -.extern _ZN5Actor8vfunc_54Ev -.extern _ZN5Actor18func_ov00_020c313cEj -.extern _ZN5Actor4KillEv -.extern _ZN5Actor12KillInBoundsEv -.extern _ZN5Actor8vfunc_acEv -.extern _ZN5Actor18func_ov00_020c3200Ei -.extern _ZN5Actor8vfunc_b0Ev .extern func_ov00_020c3348 .extern func_ov00_020c4048 .extern func_ov00_020c4588 diff --git a/asm/ov48.inc b/asm/ov48.inc index 33d76cea..faff0d84 100644 --- a/asm/ov48.inc +++ b/asm/ov48.inc @@ -3,9 +3,70 @@ .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i .extern _ZN10PlayerBase6LookAtEP5Vec3p +.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager8GetActorEP8ActorRef +.extern _ZN5Actor10SetUnk_11bEv +.extern _ZN5Actor11SetVelocityEP5Vec3p +.extern _ZN5Actor12ApplyGravityEv +.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12GetOffsetPosEP5Vec3p +.extern _ZN5Actor12SetTransformEP9Transform +.extern _ZN5Actor12XzDistanceToEP5Vec3p +.extern _ZN5Actor14GetAngleToLinkEv +.extern _ZN5Actor15IsHitboxTouchedEb +.extern _ZN5Actor15TrySetTransformEP9Transform +.extern _ZN5Actor16CollidesWithLinkEv +.extern _ZN5Actor16XzDistanceToLinkEv +.extern _ZN5Actor18CollidesWithShieldEP8Cylinder +.extern _ZN5Actor18func_ov00_020c1cf8Ev +.extern _ZN5Actor18func_ov00_020c1d58Ev +.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii +.extern _ZN5Actor18func_ov00_020c1fc8Ej +.extern _ZN5Actor18func_ov00_020c243cEiPi +.extern _ZN5Actor18func_ov00_020c313cEj +.extern _ZN5Actor18func_ov00_020c3200Ei +.extern _ZN5Actor20IncreaseActiveFramesEv +.extern _ZN5Actor4KillEv +.extern _ZN5Actor6GetPosEv +.extern _ZN5Actor8vfunc_08Ev +.extern _ZN5Actor8vfunc_0cEv +.extern _ZN5Actor8vfunc_10Ej +.extern _ZN5Actor8vfunc_18Ej +.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_20Ei +.extern _ZN5Actor8vfunc_24Ev +.extern _ZN5Actor8vfunc_28Ev +.extern _ZN5Actor8vfunc_2cEv +.extern _ZN5Actor8vfunc_30Ev +.extern _ZN5Actor8vfunc_38Ev +.extern _ZN5Actor8vfunc_4cEPi +.extern _ZN5Actor8vfunc_54Ev +.extern _ZN5Actor8vfunc_60Ev +.extern _ZN5Actor8vfunc_64Ev +.extern _ZN5Actor8vfunc_68Ev +.extern _ZN5Actor8vfunc_6cEv +.extern _ZN5Actor8vfunc_70Ev +.extern _ZN5Actor8vfunc_74Ev +.extern _ZN5Actor8vfunc_78Ev +.extern _ZN5Actor8vfunc_7cEv +.extern _ZN5Actor8vfunc_80Ev +.extern _ZN5Actor8vfunc_84Ev +.extern _ZN5Actor8vfunc_88Ev +.extern _ZN5Actor8vfunc_8cEv +.extern _ZN5Actor8vfunc_90Ev +.extern _ZN5Actor8vfunc_94Ev +.extern _ZN5Actor8vfunc_98Ev +.extern _ZN5Actor8vfunc_9cEv +.extern _ZN5Actor8vfunc_a8Ev +.extern _ZN5Actor8vfunc_acEv +.extern _ZN5Actor8vfunc_b0Ev +.extern _ZN5Actor9GetHitboxEP8Cylinder +.extern _ZN5ActorC2Ev +.extern _ZN5ActorD2Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern _ZNK11ItemManager19GetActiveFairyLevelEi +.extern _ZTV11FilterActor .extern data_02050f54 .extern data_027e0764 .extern data_027e0d38 @@ -20,7 +81,6 @@ .extern data_027e0fe8 .extern data_027e0fec .extern data_027e0ffc -.extern _ZTV11FilterActor .extern data_ov00_020e892c .extern func_01ff81f8 .extern func_01ff8214 @@ -87,67 +147,7 @@ .extern func_ov00_020c0e04 .extern func_ov00_020c0e24 .extern func_ov00_020c1500 -.extern _ZN5ActorC2Ev -.extern _ZN5ActorD2Ev -.extern _ZN5Actor8vfunc_08Ev -.extern _ZN5Actor8vfunc_0cEv -.extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_24Ev -.extern _ZN5Actor8vfunc_28Ev -.extern _ZN5Actor12GetOffsetPosEP5Vec3p -.extern _ZN5Actor8vfunc_38Ev -.extern _ZN5Actor8vfunc_2cEv -.extern _ZN5Actor8vfunc_30Ev -.extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt -.extern _ZN5Actor8vfunc_20Ei -.extern _ZN5Actor10SetUnk_11bEv -.extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor8vfunc_60Ev -.extern _ZN5Actor8vfunc_64Ev -.extern _ZN5Actor8vfunc_68Ev -.extern _ZN5Actor8vfunc_6cEv -.extern _ZN5Actor8vfunc_70Ev -.extern _ZN5Actor8vfunc_74Ev -.extern _ZN5Actor8vfunc_7cEv -.extern _ZN5Actor8vfunc_78Ev -.extern _ZN5Actor8vfunc_80Ev -.extern _ZN5Actor8vfunc_84Ev -.extern _ZN5Actor8vfunc_88Ev -.extern _ZN5Actor8vfunc_8cEv -.extern _ZN5Actor8vfunc_90Ev -.extern _ZN5Actor8vfunc_94Ev -.extern _ZN5Actor8vfunc_98Ev -.extern _ZN5Actor8vfunc_9cEv -.extern _ZN5Actor15TrySetTransformEP9Transform -.extern _ZN5Actor12SetTransformEP9Transform -.extern _ZN5Actor8vfunc_a8Ev -.extern _ZN5Actor8vfunc_4cEPi -.extern _ZN5Actor18func_ov00_020c1cf8Ev -.extern _ZN5Actor18func_ov00_020c1d58Ev -.extern _ZN5Actor18func_ov00_020c1f5cEP5Vec3pS1_iS1_ii -.extern _ZN5Actor18func_ov00_020c1fc8Ej -.extern _ZN5Actor18CollidesWithShieldEP8Cylinder -.extern _ZN5Actor18func_ov00_020c243cEiPi -.extern _ZN5Actor12CollidesWithEPKS_ -.extern _ZN5Actor16CollidesWithLinkEv -.extern _ZN5Actor12XzDistanceToEP5Vec3p -.extern _ZN5Actor16XzDistanceToLinkEv -.extern _ZN5Actor14GetAngleToLinkEv -.extern _ZN5Actor9GetHitboxEP8Cylinder -.extern _ZN5Actor20IncreaseActiveFramesEv -.extern _ZN5Actor15IsHitboxTouchedEb -.extern _ZN5Actor12ApplyGravityEv -.extern _ZN5Actor6GetPosEv -.extern _ZN5Actor8vfunc_54Ev -.extern _ZN5Actor18func_ov00_020c313cEj -.extern _ZN5Actor4KillEv -.extern _ZN5Actor8vfunc_acEv -.extern _ZN5Actor18func_ov00_020c3200Ei -.extern _ZN5Actor8vfunc_b0Ev .extern func_ov00_020c3348 -.extern _ZN12ActorManager8GetActorEP8ActorRef -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern func_ov00_020c4048 .extern func_ov00_020c4588 .extern func_ov00_020c5c98 diff --git a/asm/ov49.inc b/asm/ov49.inc index 6af8dfd1..922fc319 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -5,6 +5,10 @@ .extern _ZN11ItemManager10GiveRupeesEsi .extern _ZN11ItemManager10RemoveItemEi .extern _ZN11ItemManager12GetItemModelEj +.extern _ZN14AdventureFlags18func_Ov00_02097810Ei +.extern _ZN14AdventureFlags18func_ov00_02097b9cEv +.extern _ZN14AdventureFlags18func_ov00_02098058Ev +.extern _ZN14AdventureFlags3GetEj .extern _ZN5Actor10SetUnk_11bEv .extern _ZN5Actor11SetVelocityEP5Vec3p .extern _ZN5Actor12ApplyGravityEv @@ -121,10 +125,6 @@ .extern func_ov00_02083fb0 .extern func_ov00_02088000 .extern func_ov00_02094824 -.extern _ZN14AdventureFlags3GetEj -.extern _ZN14AdventureFlags18func_Ov00_02097810Ei -.extern _ZN14AdventureFlags18func_ov00_02097b9cEv -.extern _ZN14AdventureFlags18func_ov00_02098058Ev .extern func_ov00_0209a4f4 .extern func_ov00_0209a508 .extern func_ov00_020a61ac diff --git a/asm/ov51.inc b/asm/ov51.inc index bdd8df74..a96a5c51 100644 --- a/asm/ov51.inc +++ b/asm/ov51.inc @@ -1,5 +1,61 @@ #pragma once .extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi +.extern _ZN12ActorManager8GetActorEP8ActorRef +.extern _ZN5Actor10SetUnk_11bEv +.extern _ZN5Actor11SetVelocityEP5Vec3p +.extern _ZN5Actor12CollidesWithEPKS_ +.extern _ZN5Actor12GetOffsetPosEP5Vec3p +.extern _ZN5Actor12SetTransformEP9Transform +.extern _ZN5Actor15IsHitboxTouchedEb +.extern _ZN5Actor15TrySetTransformEP9Transform +.extern _ZN5Actor16CollidesWithLinkEv +.extern _ZN5Actor16XzDistanceToLinkEv +.extern _ZN5Actor18func_Ov00_020c1bfcEi +.extern _ZN5Actor18func_ov00_020c1cf8Ev +.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p +.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p +.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii +.extern _ZN5Actor18func_ov00_020c1fc8Ej +.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_ +.extern _ZN5Actor18func_ov00_020c243cEiPi +.extern _ZN5Actor18func_ov00_020c313cEj +.extern _ZN5Actor18func_ov00_020c3200Ei +.extern _ZN5Actor20IncreaseActiveFramesEv +.extern _ZN5Actor4KillEv +.extern _ZN5Actor6GetPosEv +.extern _ZN5Actor8vfunc_0cEv +.extern _ZN5Actor8vfunc_10Ej +.extern _ZN5Actor8vfunc_18Ej +.extern _ZN5Actor8vfunc_1cEt +.extern _ZN5Actor8vfunc_24Ev +.extern _ZN5Actor8vfunc_28Ev +.extern _ZN5Actor8vfunc_2cEv +.extern _ZN5Actor8vfunc_30Ev +.extern _ZN5Actor8vfunc_38Ev +.extern _ZN5Actor8vfunc_48Ei +.extern _ZN5Actor8vfunc_4cEPi +.extern _ZN5Actor8vfunc_54Ev +.extern _ZN5Actor8vfunc_60Ev +.extern _ZN5Actor8vfunc_64Ev +.extern _ZN5Actor8vfunc_68Ev +.extern _ZN5Actor8vfunc_6cEv +.extern _ZN5Actor8vfunc_70Ev +.extern _ZN5Actor8vfunc_74Ev +.extern _ZN5Actor8vfunc_78Ev +.extern _ZN5Actor8vfunc_7cEv +.extern _ZN5Actor8vfunc_80Ev +.extern _ZN5Actor8vfunc_84Ev +.extern _ZN5Actor8vfunc_88Ev +.extern _ZN5Actor8vfunc_8cEv +.extern _ZN5Actor8vfunc_90Ev +.extern _ZN5Actor8vfunc_94Ev +.extern _ZN5Actor8vfunc_98Ev +.extern _ZN5Actor8vfunc_9cEv +.extern _ZN5Actor8vfunc_a8Ev +.extern _ZN5Actor8vfunc_acEv +.extern _ZN5Actor8vfunc_b0Ev +.extern _ZN5ActorC2Ev +.extern _ZN5ActorD2Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern data_02050f54 @@ -73,63 +129,7 @@ .extern func_ov00_020c0cc8 .extern func_ov00_020c0e04 .extern func_ov00_020c1500 -.extern _ZN5ActorC2Ev -.extern _ZN5ActorD2Ev -.extern _ZN5Actor8vfunc_0cEv -.extern _ZN5Actor8vfunc_10Ej -.extern _ZN5Actor8vfunc_24Ev -.extern _ZN5Actor8vfunc_28Ev -.extern _ZN5Actor12GetOffsetPosEP5Vec3p -.extern _ZN5Actor8vfunc_38Ev -.extern _ZN5Actor8vfunc_2cEv -.extern _ZN5Actor8vfunc_30Ev -.extern _ZN5Actor8vfunc_18Ej -.extern _ZN5Actor8vfunc_1cEt -.extern _ZN5Actor10SetUnk_11bEv -.extern _ZN5Actor11SetVelocityEP5Vec3p -.extern _ZN5Actor8vfunc_60Ev -.extern _ZN5Actor8vfunc_64Ev -.extern _ZN5Actor8vfunc_68Ev -.extern _ZN5Actor8vfunc_6cEv -.extern _ZN5Actor8vfunc_70Ev -.extern _ZN5Actor8vfunc_74Ev -.extern _ZN5Actor8vfunc_7cEv -.extern _ZN5Actor8vfunc_78Ev -.extern _ZN5Actor8vfunc_80Ev -.extern _ZN5Actor8vfunc_84Ev -.extern _ZN5Actor8vfunc_88Ev -.extern _ZN5Actor8vfunc_8cEv -.extern _ZN5Actor8vfunc_90Ev -.extern _ZN5Actor8vfunc_94Ev -.extern _ZN5Actor8vfunc_98Ev -.extern _ZN5Actor8vfunc_9cEv -.extern _ZN5Actor15TrySetTransformEP9Transform -.extern _ZN5Actor12SetTransformEP9Transform -.extern _ZN5Actor8vfunc_a8Ev -.extern _ZN5Actor18func_Ov00_020c1bfcEi -.extern _ZN5Actor8vfunc_48Ei -.extern _ZN5Actor8vfunc_4cEPi -.extern _ZN5Actor18func_ov00_020c1cf8Ev -.extern _ZN5Actor18func_ov00_020c1da0EiP5Vec3p -.extern _ZN5Actor18func_ov00_020c1e2cEiP5Vec3p -.extern _ZN5Actor18func_ov00_020c1ef8EP8CylinderP5Vec3pii -.extern _ZN5Actor18func_ov00_020c1fc8Ej -.extern _ZN5Actor18func_ov00_020c23c4EP8ActorRefPS_ -.extern _ZN5Actor18func_ov00_020c243cEiPi -.extern _ZN5Actor12CollidesWithEPKS_ -.extern _ZN5Actor16CollidesWithLinkEv -.extern _ZN5Actor16XzDistanceToLinkEv -.extern _ZN5Actor20IncreaseActiveFramesEv -.extern _ZN5Actor15IsHitboxTouchedEb -.extern _ZN5Actor6GetPosEv -.extern _ZN5Actor8vfunc_54Ev -.extern _ZN5Actor18func_ov00_020c313cEj -.extern _ZN5Actor4KillEv -.extern _ZN5Actor8vfunc_acEv -.extern _ZN5Actor18func_ov00_020c3200Ei -.extern _ZN5Actor8vfunc_b0Ev .extern func_ov00_020c3348 -.extern _ZN12ActorManager8GetActorEP8ActorRef .extern func_ov00_020c4048 .extern func_ov00_020c4588 .extern func_ov00_020c57fc diff --git a/asm/ov53.inc b/asm/ov53.inc index eb80d325..300774f2 100644 --- a/asm/ov53.inc +++ b/asm/ov53.inc @@ -1,5 +1,7 @@ #pragma once .extern _ZN11ItemManager12GetItemModelEj +.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList +.extern _ZN12ActorManager8GetActorEP8ActorRef .extern _ZN13LinkStateBase14GetPlayerAngleEv .extern _ZN13LinkStateBase18func_ov00_020a81fcEv .extern _ZN13LinkStateBase18func_ov00_020a89bcEii @@ -11,6 +13,8 @@ .extern _ZN13PlayerControl18func_ov00_020b0f88EP5Vec3piS1_ .extern _ZN13PlayerControl20UpdateUsingEquipItemEv .extern _ZN13PlayerControl6SetAimEv +.extern _ZN5Actor9GetHitboxEP8Cylinder +.extern _ZN5ActorC2Ev .extern _ZN9SysObjectdlEPv .extern data_02050f54 .extern data_027e0d0c @@ -57,11 +61,7 @@ .extern func_ov00_020bed7c .extern func_ov00_020bedcc .extern func_ov00_020c1500 -.extern _ZN5ActorC2Ev -.extern _ZN5Actor9GetHitboxEP8Cylinder .extern func_ov00_020c3348 -.extern _ZN12ActorManager8GetActorEP8ActorRef -.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList .extern func_ov00_020c4048 .extern func_ov00_020ceacc .extern func_ov00_020d61b0 diff --git a/asm/ov58.inc b/asm/ov58.inc index 3bfc3abe..9b6f17b2 100644 --- a/asm/ov58.inc +++ b/asm/ov58.inc @@ -2,6 +2,7 @@ .extern Divide .extern _ZN11ItemManager12GetEquipItemEi .extern _ZN11ItemManager12GetItemModelEj +.extern _ZN12ActorManager13FindActorByIdEj .extern _ZN13LinkStateBase14GetPlayerAngleEv .extern _ZN13LinkStateBase15ChangeLinkStateEi .extern _ZN13LinkStateBase15GetGrabActorRefEv @@ -107,7 +108,6 @@ .extern func_ov00_020c0e5c .extern func_ov00_020c1500 .extern func_ov00_020c3348 -.extern _ZN12ActorManager13FindActorByIdEj .extern func_ov00_020c4048 .extern func_ov00_020cf01c .extern func_ov00_020d00c4