diff --git a/data/uking_functions.csv b/data/uking_functions.csv index fca7e3e5..ec44bee8 100644 --- a/data/uking_functions.csv +++ b/data/uking_functions.csv @@ -764,8 +764,8 @@ Address,Quality,Size,Name 0x0000007100023b54,U,000004,j__ZdlPv_16 0x0000007100023b58,U,000012, 0x0000007100023b64,U,000372, -0x0000007100023cd8,U,000140,_ZNK4sead15RuntimeTypeInfo6DeriveINS_10FileDeviceEE9isDerivedEPKNS0_9InterfaceE -0x0000007100023d64,U,000284,_ZN3ore11ResMetaData8DataType4InitEv +0x0000007100023cd8,U,000140, +0x0000007100023d64,O,000284,_ZN3ore11ResMetaData8DataType4InitEv 0x0000007100023e80,U,000304,_ZN4evfl11TriggerType4InitEv 0x0000007100023fb0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveINS_8ResourceEE9isDerivedEPKNS0_9InterfaceE 0x000000710002403c,U,000416, @@ -1101,7 +1101,7 @@ Address,Quality,Size,Name 0x000000710003b4c8,U,000140, 0x000000710003b554,U,000016, 0x000000710003b564,U,000216, -0x000000710003b63c,U,000224,_ZN4sead21FormatFixedSafeStringILi32EEC2EPKcz +0x000000710003b63c,O,000224,_ZN4sead21FormatFixedSafeStringILi32EEC2EPKcz 0x000000710003b71c,U,000028,_ZN3eui8LayoutEx15findPartsLayoutEPKc 0x000000710003b738,U,000244, 0x000000710003b82c,U,000096,Guardian::m34 @@ -2398,9 +2398,9 @@ Address,Quality,Size,Name 0x000000710007ffc8,O,000240,_ZN4sead15FixedSafeStringILi256EEaSERKNS_14SafeStringBaseIcEE 0x00000071000800b8,O,000004,_ZN4sead19FixedSafeStringBaseIcLi256EED0Ev 0x00000071000800bc,O,000240,_ZN4sead19FixedSafeStringBaseIcLi256EEaSERKNS_14SafeStringBaseIcEE -0x00000071000801ac,U,000060,_ZN4sead18HeapSafeStringBaseIcED0Ev +0x00000071000801ac,O,000060,_ZN4sead18HeapSafeStringBaseIcED0Ev 0x00000071000801e8,U,000004,j__ZdlPv_31 -0x00000071000801ec,U,000240,_ZN4sead15FixedSafeStringILi128EEaSERKNS_14SafeStringBaseIcEE +0x00000071000801ec,O,000240,_ZN4sead15FixedSafeStringILi128EEaSERKNS_14SafeStringBaseIcEE 0x00000071000802dc,U,000024, 0x00000071000802f4,U,000140, 0x0000007100080380,U,000104,HavokActiveObject::construct @@ -3263,7 +3263,7 @@ Address,Quality,Size,Name 0x000000710009fa10,U,000084,AI_ActionInOutSendMessage::ctor 0x000000710009fa64,U,000200,_ZN5uking6action25ActorAreaInOutSendMessageD1Ev 0x000000710009fb2c,U,000008, -0x000000710009fb34,O,000036,_ZN5uking6action25ActorAreaInOutSendMessageD0Ev +0x000000710009fb34,U,000036,_ZN5uking6action25ActorAreaInOutSendMessageD0Ev 0x000000710009fb58,U,000040,_ZThn48_N3agl2fx12OfxLensFlare6PresetD0Ev 0x000000710009fb80,U,000300,_ZN5uking6action25ActorAreaInOutSendMessage5init_EPN4sead4HeapE 0x000000710009fcac,U,000132,_ZN5uking6action25ActorAreaInOutSendMessage6enter_EPN4ksys3act2ai15InlineParamPackE @@ -8572,7 +8572,7 @@ Address,Quality,Size,Name 0x000000710014ea4c,O,000092,_ZNK5uking6action19ForkEmitExpandField18getRuntimeTypeInfoEv 0x000000710014eaa8,U,000060,AI_Action_ForkEmitExpandFieldWithCreate::ctor 0x000000710014eae4,U,000192,_ZN5uking6action29ForkEmitExpandFieldWithCreateD1Ev -0x000000710014eba4,O,000036,_ZN5uking6action29ForkEmitExpandFieldWithCreateD0Ev +0x000000710014eba4,U,000036,_ZN5uking6action29ForkEmitExpandFieldWithCreateD0Ev 0x000000710014ebc8,U,000728,_ZN5uking6action29ForkEmitExpandFieldWithCreate5init_EPN4sead4HeapE 0x000000710014eea0,U,000044,_ZN5uking6action29ForkEmitExpandFieldWithCreate6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710014eecc,O,000004,_ZN5uking6action29ForkEmitExpandFieldWithCreate5calc_Ev @@ -9888,7 +9888,7 @@ Address,Quality,Size,Name 0x00000071001727a0,O,000092,_ZNK5uking6action15GameDataSubVec318getRuntimeTypeInfoEv 0x00000071001727fc,U,000124,AI_Action_GanonAttackWithEmitChemical::ctor 0x0000007100172878,U,000364,_ZN5uking6action27GanonAttackWithEmitChemicalD1Ev -0x00000071001729e4,O,000036,_ZN5uking6action27GanonAttackWithEmitChemicalD0Ev +0x00000071001729e4,U,000036,_ZN5uking6action27GanonAttackWithEmitChemicalD0Ev 0x0000007100172a08,U,000744,_ZN5uking6action27GanonAttackWithEmitChemical5init_EPN4sead4HeapE 0x0000007100172cf0,U,000116,_ZN5uking6action27GanonAttackWithEmitChemical6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100172d64,U,000580,_ZN5uking6action27GanonAttackWithEmitChemical5calc_Ev @@ -15331,7 +15331,7 @@ Address,Quality,Size,Name 0x000000710023c550,U,000008,uking::action::RodMagicPhysBall::m33 0x000000710023c558,U,000100,AI_Action_RodMagicPhysBallDivision::ctor 0x000000710023c5bc,U,000276,_ZN5uking6action24RodMagicPhysBallDivisionD1Ev -0x000000710023c6d0,O,000036,_ZN5uking6action24RodMagicPhysBallDivisionD0Ev +0x000000710023c6d0,U,000036,_ZN5uking6action24RodMagicPhysBallDivisionD0Ev 0x000000710023c6f4,U,000056,_ZN5uking6action24RodMagicPhysBallDivision5init_EPN4sead4HeapE 0x000000710023c72c,U,000848, 0x000000710023ca7c,U,000032,_ZN5uking6action24RodMagicPhysBallDivision6enter_EPN4ksys3act2ai15InlineParamPackE @@ -18985,7 +18985,7 @@ Address,Quality,Size,Name 0x00000071002be720,O,000092,_ZNK5uking6action18WizzrobeChanceTime18getRuntimeTypeInfoEv 0x00000071002be77c,U,000096,AI_Action_WizzrobeSummon::ctor 0x00000071002be7dc,U,000384,_ZN5uking6action14WizzrobeSummonD1Ev -0x00000071002be95c,O,000036,_ZN5uking6action14WizzrobeSummonD0Ev +0x00000071002be95c,U,000036,_ZN5uking6action14WizzrobeSummonD0Ev 0x00000071002be980,U,000384,_ZN5uking6action14WizzrobeSummon5init_EPN4sead4HeapE 0x00000071002beb00,O,000004,_ZN5uking6action14WizzrobeSummon6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071002beb04,O,000004,_ZN5uking6action14WizzrobeSummon5calc_Ev @@ -20282,7 +20282,7 @@ Address,Quality,Size,Name 0x00000071002fca5c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai6ForkAIEE9isDerivedEPKNS0_9InterfaceE 0x00000071002fcae8,U,000148,AI_AI_AirOctaState::ctor 0x00000071002fcb7c,U,000140,_ZN5uking2ai12AirOctaStateD1Ev -0x00000071002fcc08,O,000036,_ZN5uking2ai12AirOctaStateD0Ev +0x00000071002fcc08,U,000036,_ZN5uking2ai12AirOctaStateD0Ev 0x00000071002fcc2c,U,000060,_ZN5uking2ai12AirOctaState5init_EPN4sead4HeapE 0x00000071002fcc68,U,001072,_ZN5uking2ai12AirOctaState6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071002fd098,U,000328, @@ -20819,7 +20819,7 @@ Address,Quality,Size,Name 0x0000007100315ebc,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai22SimpleEscapeFromTargetEE9isDerivedEPKNS0_9InterfaceE 0x0000007100315f48,U,000092,AI_AI_AssassinBossFirstBattle::ctor 0x0000007100315fa4,U,000480,_ZN5uking2ai23AssassinBossFirstBattleD1Ev -0x0000007100316184,O,000036,_ZN5uking2ai23AssassinBossFirstBattleD0Ev +0x0000007100316184,U,000036,_ZN5uking2ai23AssassinBossFirstBattleD0Ev 0x00000071003161a8,U,000692,_ZN5uking2ai23AssassinBossFirstBattle5init_EPN4sead4HeapE 0x000000710031645c,U,000044,_ZN5uking2ai23AssassinBossFirstBattle6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100316488,U,000244,_ZN5uking2ai23AssassinBossFirstBattle5calc_Ev @@ -20903,7 +20903,7 @@ Address,Quality,Size,Name 0x0000007100319444,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai26AssassinBossIronBallAttackEE9isDerivedEPKNS0_9InterfaceE 0x00000071003194d0,U,000348,AI_AI_AssassinBossRoot::ctor 0x000000710031962c,U,000748,_ZN5uking2ai16AssassinBossRootD1Ev -0x0000007100319918,O,000036,_ZN5uking2ai16AssassinBossRootD0Ev +0x0000007100319918,U,000036,_ZN5uking2ai16AssassinBossRootD0Ev 0x000000710031993c,U,000240,_ZN5uking2ai16AssassinBossRoot5init_EPN4sead4HeapE 0x0000007100319a2c,U,000136,_ZN5uking2ai16AssassinBossRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100319ab4,U,000292, @@ -21407,7 +21407,7 @@ Address,Quality,Size,Name 0x000000710032b68c,O,000092,_ZNK5uking2ai16BeeSwarmReaction18getRuntimeTypeInfoEv 0x000000710032b6e8,O,000048,_ZN5uking2ai12BeeSwarmRootC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710032b718,U,000160,_ZN5uking2ai12BeeSwarmRootD1Ev -0x000000710032b7b8,O,000036,_ZN5uking2ai12BeeSwarmRootD0Ev +0x000000710032b7b8,U,000036,_ZN5uking2ai12BeeSwarmRootD0Ev 0x000000710032b7dc,O,000004,_ZN5uking2ai12BeeSwarmRoot5init_EPN4sead4HeapE 0x000000710032b7e0,U,000288,_ZN5uking2ai12BeeSwarmRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710032b900,U,000004,_ZN5uking2ai12BeeSwarmRoot5calc_Ev @@ -21655,7 +21655,7 @@ Address,Quality,Size,Name 0x000000710033cb60,O,000092,_ZNK5uking2ai8BowShoot18getRuntimeTypeInfoEv 0x000000710033cbbc,U,000080,AI_AI_BoxWaterRoot::ctor 0x000000710033cc0c,U,000152,_ZN5uking2ai12BoxWaterRootD1Ev -0x000000710033cca4,O,000036,_ZN5uking2ai12BoxWaterRootD0Ev +0x000000710033cca4,U,000036,_ZN5uking2ai12BoxWaterRootD0Ev 0x000000710033ccc8,U,001908,_ZN5uking2ai12BoxWaterRoot5init_EPN4sead4HeapE 0x000000710033d43c,U,000140,_ZN5uking2ai12BoxWaterRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710033d4c8,U,003184, @@ -22078,7 +22078,7 @@ Address,Quality,Size,Name 0x000000710034d820,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai13NavMoveTargetEE9isDerivedEPKNS0_9InterfaceE 0x000000710034d8ac,U,000128,AI_AI_ChuchuRoot::ctor 0x000000710034d92c,U,000240,_ZN5uking2ai10ChuchuRootD1Ev -0x000000710034da1c,O,000036,_ZN5uking2ai10ChuchuRootD0Ev +0x000000710034da1c,U,000036,_ZN5uking2ai10ChuchuRootD0Ev 0x000000710034da40,U,000832,_ZN5uking2ai10ChuchuRoot5init_EPN4sead4HeapE 0x000000710034dd80,U,000428,_ZN5uking2ai10ChuchuRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710034df2c,U,000040,_ZN5uking2ai10ChuchuRoot5calc_Ev @@ -24729,7 +24729,7 @@ Address,Quality,Size,Name 0x00000071003c745c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai24UnarmedEnemySearchWeaponEE9isDerivedEPKNS0_9InterfaceE 0x00000071003c74e8,U,000184,AI_AI_EquipStand::ctor 0x00000071003c75a0,U,000184,_ZN5uking2ai10EquipStandD1Ev -0x00000071003c7658,O,000036,_ZN5uking2ai10EquipStandD0Ev +0x00000071003c7658,U,000036,_ZN5uking2ai10EquipStandD0Ev 0x00000071003c767c,O,000008,_ZN5uking2ai10EquipStand5init_EPN4sead4HeapE 0x00000071003c7684,U,000204,_ZN5uking2ai10EquipStand6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071003c7750,U,000904,_ZN5uking2ai10EquipStand5calc_Ev @@ -24860,7 +24860,7 @@ Address,Quality,Size,Name 0x00000071003cb8a4,O,000092,_ZNK5uking2ai17FishGoToAndNibble18getRuntimeTypeInfoEv 0x00000071003cb900,U,000160,AI_AI_FishRoot::ctor 0x00000071003cb9a0,U,000200,_ZN5uking2ai8FishRootD1Ev -0x00000071003cba68,O,000036,_ZN5uking2ai8FishRootD0Ev +0x00000071003cba68,U,000036,_ZN5uking2ai8FishRootD0Ev 0x00000071003cba8c,U,001416,_ZN5uking2ai8FishRoot5init_EPN4sead4HeapE 0x00000071003cc014,U,000408, 0x00000071003cc1ac,U,000444, @@ -25653,7 +25653,7 @@ Address,Quality,Size,Name 0x00000071003ef3a4,O,000092,_ZNK5uking2ai20GanonStateChangeRoot18getRuntimeTypeInfoEv 0x00000071003ef400,U,000100,AI_AI_GanonThrowActorRoot::ctor 0x00000071003ef464,U,000256,_ZN5uking2ai19GanonThrowActorRootD1Ev -0x00000071003ef564,O,000036,_ZN5uking2ai19GanonThrowActorRootD0Ev +0x00000071003ef564,U,000036,_ZN5uking2ai19GanonThrowActorRootD0Ev 0x00000071003ef588,U,000228,_ZN5uking2ai19GanonThrowActorRoot5init_EPN4sead4HeapE 0x00000071003ef66c,U,001064, 0x00000071003efa94,U,000312,_ZN5uking2ai19GanonThrowActorRoot6enter_EPN4ksys3act2ai15InlineParamPackE @@ -25670,7 +25670,7 @@ Address,Quality,Size,Name 0x00000071003f0748,U,000008,uking::ai::GanonThrowActorRoot::m37 0x00000071003f0750,U,000100,AI_AI_GanonThrowMultiActorRoot::ctor 0x00000071003f07b4,U,001004,_ZN5uking2ai24GanonThrowMultiActorRootD1Ev -0x00000071003f0ba0,O,000036,_ZN5uking2ai24GanonThrowMultiActorRootD0Ev +0x00000071003f0ba0,U,000036,_ZN5uking2ai24GanonThrowMultiActorRootD0Ev 0x00000071003f0bc4,U,000836,_ZN5uking2ai24GanonThrowMultiActorRoot5init_EPN4sead4HeapE 0x00000071003f0f08,O,000004,_ZN5uking2ai24GanonThrowMultiActorRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071003f0f0c,U,000004,_ZN5uking2ai24GanonThrowMultiActorRoot5calc_Ev @@ -25739,7 +25739,7 @@ Address,Quality,Size,Name 0x00000071003f367c,U,000008, 0x00000071003f3684,U,000184,AI_AI_GerudoQueenBattle::ctor 0x00000071003f373c,U,000384,_ZN5uking2ai17GerudoQueenBattleD1Ev -0x00000071003f38bc,O,000036,_ZN5uking2ai17GerudoQueenBattleD0Ev +0x00000071003f38bc,U,000036,_ZN5uking2ai17GerudoQueenBattleD0Ev 0x00000071003f38e0,U,000628,_ZN5uking2ai17GerudoQueenBattle5init_EPN4sead4HeapE 0x00000071003f3b54,U,000752,_ZN5uking2ai17GerudoQueenBattle6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071003f3e44,U,000304, @@ -25810,7 +25810,7 @@ Address,Quality,Size,Name 0x00000071003f6520,O,000092,_ZNK5uking2ai14GiantArmorRoot18getRuntimeTypeInfoEv 0x00000071003f657c,U,000060,AI_AI_GiantEarthReleaseAttack::ctor 0x00000071003f65b8,O,000004,_ZN5uking2ai23GiantEarthReleaseAttackD1Ev -0x00000071003f65bc,U,000036,_ZN5uking2ai23GiantEarthReleaseAttackD0Ev +0x00000071003f65bc,O,000036,_ZN5uking2ai23GiantEarthReleaseAttackD0Ev 0x00000071003f65e0,O,000004,_ZN5uking2ai23GiantEarthReleaseAttack5init_EPN4sead4HeapE 0x00000071003f65e4,U,000040,_ZN5uking2ai23GiantEarthReleaseAttack6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071003f660c,U,000108,_ZN5uking2ai23GiantEarthReleaseAttack5calc_Ev @@ -26485,7 +26485,7 @@ Address,Quality,Size,Name 0x0000007100412aa0,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai18GuardianMiniBattleEE9isDerivedEPKNS0_9InterfaceE 0x0000007100412b2c,U,000160,AI_AI_GuardianMini2ndBattleAttack::ctor 0x0000007100412bcc,U,000212,_ZN5uking2ai27GuardianMini2ndBattleAttackD1Ev -0x0000007100412ca0,O,000036,_ZN5uking2ai27GuardianMini2ndBattleAttackD0Ev +0x0000007100412ca0,U,000036,_ZN5uking2ai27GuardianMini2ndBattleAttackD0Ev 0x0000007100412cc4,U,000024,_ZN5uking2ai27GuardianMini2ndBattleAttack5init_EPN4sead4HeapE 0x0000007100412cdc,U,000252, 0x0000007100412dd8,U,000384,_ZN5uking2ai27GuardianMini2ndBattleAttack6enter_EPN4ksys3act2ai15InlineParamPackE @@ -26797,7 +26797,7 @@ Address,Quality,Size,Name 0x0000007100426060,U,000292,AI_AI_GuardianMiniRoot::ctor 0x0000007100426184,U,000336,_ZN5uking2ai16GuardianMiniRootD1Ev 0x00000071004262d4,U,000380, -0x0000007100426450,O,000036,_ZN5uking2ai16GuardianMiniRootD0Ev +0x0000007100426450,U,000036,_ZN5uking2ai16GuardianMiniRootD0Ev 0x0000007100426474,U,000356,_ZN5uking2ai16GuardianMiniRoot5init_EPN4sead4HeapE 0x00000071004265d8,U,000524,_ZN5uking2ai16GuardianMiniRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071004267e4,U,000440, @@ -27854,7 +27854,7 @@ Address,Quality,Size,Name 0x00000071004558d0,U,000092,_ZN5uking2ai16KeyLockedShutterD0Ev 0x000000710045592c,O,000048,_ZN5uking2ai10KokkoAngryC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x000000710045595c,U,000232,_ZN5uking2ai10KokkoAngryD1Ev -0x0000007100455a44,O,000036,_ZN5uking2ai10KokkoAngryD0Ev +0x0000007100455a44,U,000036,_ZN5uking2ai10KokkoAngryD0Ev 0x0000007100455a68,O,000004,_ZN5uking2ai10KokkoAngry5init_EPN4sead4HeapE 0x0000007100455a6c,U,000200,_ZN5uking2ai10KokkoAngry6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100455b34,U,000216,_ZN5uking2ai10KokkoAngry5calc_Ev @@ -28302,7 +28302,7 @@ Address,Quality,Size,Name 0x00000071004752a8,U,000036,_ZNK5uking2ai31LastAttackerSpecialActionSelect10isFinishedEv 0x00000071004752cc,U,000100,AI_AI_LastBossBeamAttackRoot::ctor 0x0000007100475330,U,000312,_ZN5uking2ai22LastBossBeamAttackRootD1Ev -0x0000007100475468,O,000036,_ZN5uking2ai22LastBossBeamAttackRootD0Ev +0x0000007100475468,U,000036,_ZN5uking2ai22LastBossBeamAttackRootD0Ev 0x000000710047548c,U,000208,_ZN5uking2ai22LastBossBeamAttackRoot5init_EPN4sead4HeapE 0x000000710047555c,U,000808, 0x0000007100475884,U,000676,_ZN5uking2ai22LastBossBeamAttackRoot6enter_EPN4ksys3act2ai15InlineParamPackE @@ -28502,7 +28502,7 @@ Address,Quality,Size,Name 0x00000071004806c4,O,000288,_ZNK5uking2ai12LeadToTarget27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x00000071004807e4,O,000092,_ZNK5uking2ai12LeadToTarget18getRuntimeTypeInfoEv 0x0000007100480840,U,000004,j__ZdlPv_112 -0x0000007100480844,U,000240,_ZN4sead15FixedSafeStringILi512EEaSERKNS_14SafeStringBaseIcEE +0x0000007100480844,U,000240,_ZN4sead15FixedSafeStringILi21EEaSERKNS_14SafeStringBaseIcEE 0x0000007100480934,U,000004,j__ZdlPv_113 0x0000007100480938,U,000240, 0x0000007100480a28,O,000052,_ZN5uking2ai15LeaveFromTargetC1ERKN4ksys3act2ai10ActionBase7InitArgE @@ -28616,7 +28616,7 @@ Address,Quality,Size,Name 0x00000071004855dc,U,001076,_ZN3agl3eft4Star9updateUBOEjRKN4sead8Matrix44IfEERKNS2_8Matrix34IfEE 0x0000007100485a10,U,000384,AI_AI_LumberjackFallenTree::ctor 0x0000007100485b90,U,000240,_ZN5uking2ai20LumberjackFallenTreeD1Ev -0x0000007100485c80,O,000036,_ZN5uking2ai20LumberjackFallenTreeD0Ev +0x0000007100485c80,U,000036,_ZN5uking2ai20LumberjackFallenTreeD0Ev 0x0000007100485ca4,U,000100,_ZN5uking2ai20LumberjackFallenTree18updateForPreDeleteEv 0x0000007100485d08,U,000164,_ZN5uking2ai20LumberjackFallenTree5init_EPN4sead4HeapE 0x0000007100485dac,U,000596,_ZN5uking2ai20LumberjackFallenTree6enter_EPN4ksys3act2ai15InlineParamPackE @@ -28636,7 +28636,7 @@ Address,Quality,Size,Name 0x00000071004874ac,U,000464,AI_AI_LumberjackTree::ctor 0x000000710048767c,U,000312,_ZN5uking2ai14LumberjackTreeD1Ev 0x00000071004877b4,U,000084, -0x0000007100487808,O,000036,_ZN5uking2ai14LumberjackTreeD0Ev +0x0000007100487808,U,000036,_ZN5uking2ai14LumberjackTreeD0Ev 0x000000710048782c,U,000256,_ZN5uking2ai14LumberjackTree11onPreDeleteEv 0x000000710048792c,U,002016,_ZN5uking2ai14LumberjackTree5init_EPN4sead4HeapE 0x000000710048810c,U,000932, @@ -29019,7 +29019,7 @@ Address,Quality,Size,Name 0x000000710049a270,U,000364,AI_AI_LynelRoot::ctor 0x000000710049a3dc,U,000592,_ZN5uking2ai9LynelRootD1Ev 0x000000710049a62c,U,000088, -0x000000710049a684,O,000036,_ZN5uking2ai9LynelRootD0Ev +0x000000710049a684,U,000036,_ZN5uking2ai9LynelRootD0Ev 0x000000710049a6a8,U,001092,_ZN5uking2ai9LynelRoot5init_EPN4sead4HeapE 0x000000710049aaec,U,000396,_ZN5uking2ai9LynelRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710049ac78,U,000552,_ZN5uking2ai9LynelRoot5calc_Ev @@ -29594,7 +29594,7 @@ Address,Quality,Size,Name 0x00000071004b1280,U,000544,AI_AI_MoveRemainsElectric::ctor 0x00000071004b14a0,U,000460, 0x00000071004b166c,U,000724,_ZN5uking2ai19MoveRemainsElectricD1Ev -0x00000071004b1940,O,000036,_ZN5uking2ai19MoveRemainsElectricD0Ev +0x00000071004b1940,U,000036,_ZN5uking2ai19MoveRemainsElectricD0Ev 0x00000071004b1964,U,000156,_ZN5uking2ai19MoveRemainsElectric5init_EPN4sead4HeapE 0x00000071004b1a00,U,000576, 0x00000071004b1c40,U,001348, @@ -29879,7 +29879,7 @@ Address,Quality,Size,Name 0x00000071004c1008,O,000092,_ZNK5uking2ai14NPCAttentionAI18getRuntimeTypeInfoEv 0x00000071004c1064,U,000164,AI_AI_NPCAvoid::ctor 0x00000071004c1108,U,000164,_ZN5uking2ai8NPCAvoidD1Ev -0x00000071004c11ac,O,000036,_ZN5uking2ai8NPCAvoidD0Ev +0x00000071004c11ac,U,000036,_ZN5uking2ai8NPCAvoidD0Ev 0x00000071004c11d0,U,001036,_ZN5uking2ai8NPCAvoid6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071004c15dc,U,000564, 0x00000071004c1810,U,002756,_ZN5uking2ai8NPCAvoid5calc_Ev @@ -29935,7 +29935,7 @@ Address,Quality,Size,Name 0x00000071004c64a4,O,000092,_ZNK5uking2ai11NPCConfront18getRuntimeTypeInfoEv 0x00000071004c6500,U,000216,AI_AI_NPCConfrontEnemy::ctor 0x00000071004c65d8,U,000172,_ZN5uking2ai16NPCConfrontEnemyD1Ev -0x00000071004c6684,O,000036,_ZN5uking2ai16NPCConfrontEnemyD0Ev +0x00000071004c6684,U,000036,_ZN5uking2ai16NPCConfrontEnemyD0Ev 0x00000071004c66a8,U,000152,_ZN5uking2ai16NPCConfrontEnemy5init_EPN4sead4HeapE 0x00000071004c6740,U,000624,_ZN5uking2ai16NPCConfrontEnemy6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071004c69b0,U,000172, @@ -29968,7 +29968,7 @@ Address,Quality,Size,Name 0x00000071004c957c,O,000092,_ZNK5uking2ai11NpcDemoRoot18getRuntimeTypeInfoEv 0x00000071004c95d8,U,000060,AI_AI_NPCGerudoQueenRoot::ctor 0x00000071004c9614,U,000208,_ZN5uking2ai18NPCGerudoQueenRootD1Ev -0x00000071004c96e4,O,000036,_ZN5uking2ai18NPCGerudoQueenRootD0Ev +0x00000071004c96e4,U,000036,_ZN5uking2ai18NPCGerudoQueenRootD0Ev 0x00000071004c9708,U,000212,_ZN5uking2ai18NPCGerudoQueenRoot5init_EPN4sead4HeapE 0x00000071004c97dc,O,000004,_ZN5uking2ai18NPCGerudoQueenRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071004c97e0,U,001072,_ZN5uking2ai18NPCGerudoQueenRoot5calc_Ev @@ -30162,7 +30162,7 @@ Address,Quality,Size,Name 0x00000071004dd218,U,000092, 0x00000071004dd274,U,000224,AI_AI_NPCRunaway::ctor 0x00000071004dd354,U,000172,_ZN5uking2ai10NPCRunawayD1Ev -0x00000071004dd400,O,000036,_ZN5uking2ai10NPCRunawayD0Ev +0x00000071004dd400,U,000036,_ZN5uking2ai10NPCRunawayD0Ev 0x00000071004dd424,U,000196,_ZN5uking2ai10NPCRunaway5init_EPN4sead4HeapE 0x00000071004dd4e8,U,000364,_ZN5uking2ai10NPCRunaway6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071004dd654,U,000172, @@ -30427,7 +30427,7 @@ Address,Quality,Size,Name 0x00000071004eda28,U,000320,AI_AI_OctarockRoot::ctor 0x00000071004edb68,U,000624,_ZN5uking2ai12OctarockRootD1Ev 0x00000071004eddd8,U,000084, -0x00000071004ede2c,O,000036,_ZN5uking2ai12OctarockRootD0Ev +0x00000071004ede2c,U,000036,_ZN5uking2ai12OctarockRootD0Ev 0x00000071004ede50,U,001028,_ZN5uking2ai12OctarockRoot5init_EPN4sead4HeapE 0x00000071004ee254,U,000112,_ZN5uking2ai12OctarockRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071004ee2c4,U,000596,_ZN5uking2ai12OctarockRoot5calc_Ev @@ -31355,7 +31355,7 @@ Address,Quality,Size,Name 0x0000007100515940,U,000028,uking::ai::PriestBossEyeBeam::m46 0x000000710051595c,U,000064,AI_AI_PriestBossEyeBeamFourth::ctor 0x000000710051599c,O,000004,_ZN5uking2ai23PriestBossEyeBeamFourthD1Ev -0x00000071005159a0,U,000036,_ZN5uking2ai23PriestBossEyeBeamFourthD0Ev +0x00000071005159a0,O,000036,_ZN5uking2ai23PriestBossEyeBeamFourthD0Ev 0x00000071005159c4,O,000004,_ZN5uking2ai23PriestBossEyeBeamFourth5init_EPN4sead4HeapE 0x00000071005159c8,U,000092,_ZN5uking2ai23PriestBossEyeBeamFourth6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100515a24,U,001512,_ZN5uking2ai23PriestBossEyeBeamFourth5calc_Ev @@ -31382,7 +31382,7 @@ Address,Quality,Size,Name 0x0000007100516e1c,O,000092,_ZNK5uking2ai25PriestBossEyeBeamStandAim18getRuntimeTypeInfoEv 0x0000007100516e78,U,000060,AI_AI_PriestBossEyeBeamThird::ctor 0x0000007100516eb4,O,000004,_ZN5uking2ai22PriestBossEyeBeamThirdD1Ev -0x0000007100516eb8,U,000036,_ZN5uking2ai22PriestBossEyeBeamThirdD0Ev +0x0000007100516eb8,O,000036,_ZN5uking2ai22PriestBossEyeBeamThirdD0Ev 0x0000007100516edc,O,000004,_ZN5uking2ai22PriestBossEyeBeamThird5init_EPN4sead4HeapE 0x0000007100516ee0,O,000004,_ZN5uking2ai22PriestBossEyeBeamThird6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100516ee4,U,000200,_ZN5uking2ai22PriestBossEyeBeamThird5calc_Ev @@ -31590,7 +31590,7 @@ Address,Quality,Size,Name 0x000000710052067c,U,000504,AI_AI_PriestBossIronBallRoot::ctor 0x0000007100520874,U,000704, 0x0000007100520b34,U,000356,_ZN5uking2ai22PriestBossIronBallRootD1Ev -0x0000007100520c98,O,000036,_ZN5uking2ai22PriestBossIronBallRootD0Ev +0x0000007100520c98,U,000036,_ZN5uking2ai22PriestBossIronBallRootD0Ev 0x0000007100520cbc,U,000576,_ZN5uking2ai22PriestBossIronBallRoot5init_EPN4sead4HeapE 0x0000007100520efc,U,000552,_ZN5uking2ai22PriestBossIronBallRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100521124,U,001868,_ZN5uking2ai22PriestBossIronBallRoot5calc_Ev @@ -31615,7 +31615,7 @@ Address,Quality,Size,Name 0x000000710052299c,U,000092, 0x00000071005229f8,U,000068,AI_AI_PriestBossIronBallStageRotate::ctor 0x0000007100522a3c,O,000004,_ZN5uking2ai29PriestBossIronBallStageRotateD1Ev -0x0000007100522a40,U,000036,_ZN5uking2ai29PriestBossIronBallStageRotateD0Ev +0x0000007100522a40,O,000036,_ZN5uking2ai29PriestBossIronBallStageRotateD0Ev 0x0000007100522a64,O,000004,_ZN5uking2ai29PriestBossIronBallStageRotate5init_EPN4sead4HeapE 0x0000007100522a68,U,000044,_ZN5uking2ai29PriestBossIronBallStageRotate6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100522a94,U,000004,_ZN5uking2ai29PriestBossIronBallStageRotate5calc_Ev @@ -31827,7 +31827,7 @@ Address,Quality,Size,Name 0x000000710052ac94,U,000008,uking::ai::PriestBossPhaseFourth::m38 0x000000710052ac9c,U,000204,AI_AI_PriestBossPhaseSecond::ctor 0x000000710052ad68,U,000276,_ZN5uking2ai21PriestBossPhaseSecondD1Ev -0x000000710052ae7c,O,000036,_ZN5uking2ai21PriestBossPhaseSecondD0Ev +0x000000710052ae7c,U,000036,_ZN5uking2ai21PriestBossPhaseSecondD0Ev 0x000000710052aea0,U,000004,uking::ai::PriestBossPhaseSecond::m34 0x000000710052aea4,U,000004,uking::ai::PriestBossPhaseSecond::m36 0x000000710052aea8,U,000304,uking::ai::PriestBossPhaseSecond::m37 @@ -32379,7 +32379,7 @@ Address,Quality,Size,Name 0x000000710053e630,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai29RegistedActorNumTwoSelectBaseEE9isDerivedEPKNS0_9InterfaceE 0x000000710053e6bc,U,000084,AI_AI_RemainElectricCannonBeamAttack::ctor 0x000000710053e710,U,000128,_ZN5uking2ai30RemainElectricCannonBeamAttackD1Ev -0x000000710053e790,O,000036,_ZN5uking2ai30RemainElectricCannonBeamAttackD0Ev +0x000000710053e790,U,000036,_ZN5uking2ai30RemainElectricCannonBeamAttackD0Ev 0x000000710053e7b4,O,000008,_ZN5uking2ai30RemainElectricCannonBeamAttack5init_EPN4sead4HeapE 0x000000710053e7bc,U,000168,_ZN5uking2ai30RemainElectricCannonBeamAttack6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710053e864,U,000332, @@ -32466,7 +32466,7 @@ Address,Quality,Size,Name 0x0000007100541960,U,000036,_ZNK5uking2ai29RemainsFireBattleStepSelector10isFinishedEv 0x0000007100541984,U,000448,AI_AI_RemainsFireDroneNormal::ctor 0x0000007100541b44,U,000284,_ZN5uking2ai22RemainsFireDroneNormalD1Ev -0x0000007100541c60,O,000036,_ZN5uking2ai22RemainsFireDroneNormalD0Ev +0x0000007100541c60,U,000036,_ZN5uking2ai22RemainsFireDroneNormalD0Ev 0x0000007100541c84,U,000552,_ZN5uking2ai22RemainsFireDroneNormal5init_EPN4sead4HeapE 0x0000007100541eac,U,000584,_ZN5uking2ai22RemainsFireDroneNormal6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071005420f4,U,000264, @@ -32546,7 +32546,7 @@ Address,Quality,Size,Name 0x00000071005469ac,U,000504,AI_AI_RemainsWaterBulletController::ctor 0x0000007100546ba4,U,000396,_ZN5uking2ai28RemainsWaterBulletControllerD1Ev 0x0000007100546d30,U,000308, -0x0000007100546e64,O,000036,_ZN5uking2ai28RemainsWaterBulletControllerD0Ev +0x0000007100546e64,U,000036,_ZN5uking2ai28RemainsWaterBulletControllerD0Ev 0x0000007100546e88,U,001456,_ZN5uking2ai28RemainsWaterBulletController5init_EPN4sead4HeapE 0x0000007100547438,U,000172,_ZN5uking2ai28RemainsWaterBulletController6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071005474e4,U,000696, @@ -32628,7 +32628,7 @@ Address,Quality,Size,Name 0x000000710054c848,O,000092,_ZNK5uking2ai25RemainsWaterWeakPointRoot18getRuntimeTypeInfoEv 0x000000710054c8a4,U,000100,AI_AI_RemainsWindBatteryAttack::ctor 0x000000710054c908,U,000364,_ZN5uking2ai24RemainsWindBatteryAttackD1Ev -0x000000710054ca74,O,000036,_ZN5uking2ai24RemainsWindBatteryAttackD0Ev +0x000000710054ca74,U,000036,_ZN5uking2ai24RemainsWindBatteryAttackD0Ev 0x000000710054ca98,U,000432,_ZN5uking2ai24RemainsWindBatteryAttack5init_EPN4sead4HeapE 0x000000710054cc48,U,000048,_ZN5uking2ai24RemainsWindBatteryAttack6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710054cc78,U,000824,_ZN5uking2ai24RemainsWindBatteryAttack5calc_Ev @@ -32673,7 +32673,7 @@ Address,Quality,Size,Name 0x000000710054f400,O,000372,_ZN5uking2ai15RemainsWindRoot33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710054f574,U,000144,AI_AI_RememberMesOneActorEnemyRoot::ctor 0x000000710054f604,U,000232,_ZN5uking2ai28RememberMesOneActorEnemyRootD1Ev -0x000000710054f6ec,O,000036,_ZN5uking2ai28RememberMesOneActorEnemyRootD0Ev +0x000000710054f6ec,U,000036,_ZN5uking2ai28RememberMesOneActorEnemyRootD0Ev 0x000000710054f710,U,000184,_ZN5uking2ai28RememberMesOneActorEnemyRoot5init_EPN4sead4HeapE 0x000000710054f7c8,O,000004,_ZN5uking2ai28RememberMesOneActorEnemyRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710054f7cc,U,000004,_ZN5uking2ai28RememberMesOneActorEnemyRoot5calc_Ev @@ -32781,7 +32781,7 @@ Address,Quality,Size,Name 0x0000007100552e84,U,000012,uking::ai::RodEnemyFindPlayer::m53 0x0000007100552e90,U,000156,AI_AI_RodRoot::ctor 0x0000007100552f2c,U,000308,_ZN5uking2ai7RodRootD1Ev -0x0000007100553060,O,000036,_ZN5uking2ai7RodRootD0Ev +0x0000007100553060,U,000036,_ZN5uking2ai7RodRootD0Ev 0x0000007100553084,U,000016,_ZN5uking2ai7RodRoot5init_EPN4sead4HeapE 0x0000007100553094,U,000084,_ZN5uking2ai7RodRoot11loadParams_Ev 0x00000071005530e8,U,000256,_ZN5uking2ai7RodRoot6enter_EPN4ksys3act2ai15InlineParamPackE @@ -33703,7 +33703,7 @@ Address,Quality,Size,Name 0x0000007100575314,U,000092,AI_AI_SiteBossBowRoot::ctor 0x0000007100575370,U,000216,_ZN5uking2ai15SiteBossBowRootD1Ev 0x0000007100575448,U,000276, -0x000000710057555c,O,000036,_ZN5uking2ai15SiteBossBowRootD0Ev +0x000000710057555c,U,000036,_ZN5uking2ai15SiteBossBowRootD0Ev 0x0000007100575580,U,001108,_ZN5uking2ai15SiteBossBowRoot5init_EPN4sead4HeapE 0x00000071005759d4,U,000656, 0x0000007100575c64,U,000692, @@ -33810,7 +33810,7 @@ Address,Quality,Size,Name 0x000000710057c7a0,U,000008,_ZNK5uking2ai26SiteBossLswordFireBallRoot10isFlag4SetEv 0x000000710057c7a8,U,000064,AI_AI_SiteBossLswordRoot::ctor 0x000000710057c7e8,U,000648,_ZN5uking2ai18SiteBossLswordRootD1Ev -0x000000710057ca70,O,000036,_ZN5uking2ai18SiteBossLswordRootD0Ev +0x000000710057ca70,U,000036,_ZN5uking2ai18SiteBossLswordRootD0Ev 0x000000710057ca94,U,002676,_ZN5uking2ai18SiteBossLswordRoot5init_EPN4sead4HeapE 0x000000710057d508,U,000148,_ZN5uking2ai18SiteBossLswordRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710057d59c,U,000236,_ZN5uking2ai18SiteBossLswordRoot5calc_Ev @@ -34025,7 +34025,7 @@ Address,Quality,Size,Name 0x000000710058d1e0,U,000080,_ZNK5uking2ai25SiteBossSpearLifeSelector10isFinishedEv 0x000000710058d230,U,000088,AI_AI_SiteBossSpearRoot::ctor 0x000000710058d288,U,000372,_ZN5uking2ai17SiteBossSpearRootD1Ev -0x000000710058d3fc,O,000036,_ZN5uking2ai17SiteBossSpearRootD0Ev +0x000000710058d3fc,U,000036,_ZN5uking2ai17SiteBossSpearRootD0Ev 0x000000710058d420,U,000952,_ZN5uking2ai17SiteBossSpearRoot5init_EPN4sead4HeapE 0x000000710058d7d8,U,001528,_ZN5uking2ai17SiteBossSpearRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x000000710058ddd0,U,000844,_ZN5uking2ai17SiteBossSpearRoot5calc_Ev @@ -34073,7 +34073,7 @@ Address,Quality,Size,Name 0x00000071005943c4,O,000092,_ZNK5uking2ai25SiteBossSwordApproachRoot18getRuntimeTypeInfoEv 0x0000007100594420,U,000136,AI_AI_SiteBossSwordAttackRoot::ctor 0x00000071005944a8,U,000332,_ZN5uking2ai23SiteBossSwordAttackRootD1Ev -0x00000071005945f4,O,000036,_ZN5uking2ai23SiteBossSwordAttackRootD0Ev +0x00000071005945f4,U,000036,_ZN5uking2ai23SiteBossSwordAttackRootD0Ev 0x0000007100594618,U,000404,_ZN5uking2ai23SiteBossSwordAttackRoot5init_EPN4sead4HeapE 0x00000071005947ac,U,001036, 0x0000007100594bb8,U,000448, @@ -34098,7 +34098,7 @@ Address,Quality,Size,Name 0x0000007100597250,O,000092,_ZNK5uking2ai23SiteBossSwordAttackRoot18getRuntimeTypeInfoEv 0x00000071005972ac,U,000136,AI_AI_SiteBossSwordIronPileRoot::ctor 0x0000007100597334,U,000164,_ZN5uking2ai25SiteBossSwordIronPileRootD1Ev -0x00000071005973d8,O,000036,_ZN5uking2ai25SiteBossSwordIronPileRootD0Ev +0x00000071005973d8,U,000036,_ZN5uking2ai25SiteBossSwordIronPileRootD0Ev 0x00000071005973fc,U,000352,_ZN5uking2ai25SiteBossSwordIronPileRoot5init_EPN4sead4HeapE 0x000000710059755c,U,000220,_ZN5uking2ai25SiteBossSwordIronPileRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x0000007100597638,U,000900,_ZN5uking2ai25SiteBossSwordIronPileRoot5calc_Ev @@ -34322,7 +34322,7 @@ Address,Quality,Size,Name 0x000000710059f534,U,000556,AI_AI_StalEnemyRoot::ctor 0x000000710059f760,U,000328,_ZN5uking2ai13StalEnemyRootD1Ev 0x000000710059f8a8,U,000004,nullsub_1684 -0x000000710059f8ac,O,000036,_ZN5uking2ai13StalEnemyRootD0Ev +0x000000710059f8ac,U,000036,_ZN5uking2ai13StalEnemyRootD0Ev 0x000000710059f8d0,U,001204,_ZN5uking2ai13StalEnemyRoot5init_EPN4sead4HeapE 0x000000710059fd84,U,000324, 0x000000710059fec8,U,000024,uking::ai::StalEnemyRoot::m34 @@ -34427,7 +34427,7 @@ Address,Quality,Size,Name 0x00000071005a6b68,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai6LiftedEE9isDerivedEPKNS0_9InterfaceE 0x00000071005a6bf4,O,000048,_ZN5uking2ai16StalHeadPartRootC1ERKN4ksys3act2ai10ActionBase7InitArgE 0x00000071005a6c24,O,000004,_ZN5uking2ai16StalHeadPartRootD1Ev -0x00000071005a6c28,U,000036,_ZN5uking2ai16StalHeadPartRootD0Ev +0x00000071005a6c28,O,000036,_ZN5uking2ai16StalHeadPartRootD0Ev 0x00000071005a6c4c,O,000004,_ZN5uking2ai16StalHeadPartRoot5init_EPN4sead4HeapE 0x00000071005a6c50,U,000120,_ZN5uking2ai16StalHeadPartRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071005a6cc8,U,000168,_ZN5uking2ai16StalHeadPartRoot5calc_Ev @@ -36456,7 +36456,7 @@ Address,Quality,Size,Name 0x00000071005edb04,U,000816, 0x00000071005ede34,U,000284,AI_AI_WeakPointRoot::ctor 0x00000071005edf50,U,000200,_ZN5uking2ai13WeakPointRootD1Ev -0x00000071005ee018,O,000036,_ZN5uking2ai13WeakPointRootD0Ev +0x00000071005ee018,U,000036,_ZN5uking2ai13WeakPointRootD0Ev 0x00000071005ee03c,U,000076,_ZN5uking2ai13WeakPointRoot5init_EPN4sead4HeapE 0x00000071005ee088,U,000332,_ZN5uking2ai13WeakPointRoot6enter_EPN4ksys3act2ai15InlineParamPackE 0x00000071005ee1d4,U,001360,_ZN5uking2ai13WeakPointRoot5calc_Ev @@ -36785,7 +36785,7 @@ Address,Quality,Size,Name 0x00000071005fa02c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking2ai16CircleMoveTargetEE9isDerivedEPKNS0_9InterfaceE 0x00000071005fa0b8,U,000680,AI_AI_WizzrobeCombat::ctor 0x00000071005fa360,U,000384,_ZN5uking2ai14WizzrobeCombatD1Ev -0x00000071005fa4e0,O,000036,_ZN5uking2ai14WizzrobeCombatD0Ev +0x00000071005fa4e0,U,000036,_ZN5uking2ai14WizzrobeCombatD0Ev 0x00000071005fa504,U,000384,_ZN5uking2ai14WizzrobeCombat5init_EPN4sead4HeapE 0x00000071005fa684,U,000920, 0x00000071005faa1c,U,000700,_ZN5uking2ai14WizzrobeCombat6enter_EPN4ksys3act2ai15InlineParamPackE @@ -51446,7 +51446,7 @@ Address,Quality,Size,Name 0x000000710083e450,O,000288,_ZNK5uking2ai12PlayerNormal27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE 0x000000710083e570,O,000092,_ZNK5uking2ai12PlayerNormal18getRuntimeTypeInfoEv 0x000000710083e5cc,U,000236,_ZN5uking2ai12PlayerNormalD1Ev -0x000000710083e6b8,O,000036,_ZN5uking2ai12PlayerNormalD0Ev +0x000000710083e6b8,U,000036,_ZN5uking2ai12PlayerNormalD0Ev 0x000000710083e6dc,U,000072,AI_AI_PlayerRideHorse::ctor 0x000000710083e724,O,000008,_ZN5uking2ai15PlayerRideHorse5init_EPN4sead4HeapE 0x000000710083e72c,U,000864,_ZN5uking2ai15PlayerRideHorse6enter_EPN4ksys3act2ai15InlineParamPackE @@ -63446,7 +63446,7 @@ Address,Quality,Size,Name 0x0000007100b0caac,U,000012, 0x0000007100b0cab8,O,000208,_ZN4sead22BufferedSafeStringBaseIcEaSERKNS_14SafeStringBaseIcEE 0x0000007100b0cb88,U,000212,_ZN3agl2fx17OccludedEffectMgr11TextureInfo9PlacementC2EiPS2_ -0x0000007100b0cc5c,U,000208,_ZN4sead18HeapSafeStringBaseIcEaSERKNS_14SafeStringBaseIcEE +0x0000007100b0cc5c,O,000208,_ZN4sead18HeapSafeStringBaseIcEaSERKNS_14SafeStringBaseIcEE 0x0000007100b0cd2c,U,000212,_ZN4sead19FixedSafeStringBaseIcLi12EEaSERKNS_14SafeStringBaseIcEE 0x0000007100b0ce00,O,000020,_ZNK4sead22BufferedSafeStringBaseIcE22assureTerminationImpl_Ev 0x0000007100b0ce14,U,000020, @@ -64023,7 +64023,7 @@ Address,Quality,Size,Name 0x0000007100b292d0,U,000404, 0x0000007100b29464,U,000004,j__ZdlPv_618 0x0000007100b29468,U,000240,_ZN4sead19FixedSafeStringBaseIcLi385EEaSERKNS_14SafeStringBaseIcEE -0x0000007100b29558,U,000560,_ZN4sead18HeapSafeStringBaseIcEC2EPNS_4HeapERKNS_14SafeStringBaseIcEEi +0x0000007100b29558,O,000560,_ZN4sead18HeapSafeStringBaseIcEC2EPNS_4HeapERKNS_14SafeStringBaseIcEEi 0x0000007100b29788,U,000244,_ZN4sead10XmlElementC2Ev 0x0000007100b2987c,U,000068,_ZN4sead10XmlElementD2Ev 0x0000007100b298c0,U,000196,_ZN4sead7ObjListINS_10XmlElement12XmlAttributeEE10freeBufferEv @@ -64535,7 +64535,7 @@ Address,Quality,Size,Name 0x0000007100b3e344,U,000008, 0x0000007100b3e34c,U,000016, 0x0000007100b3e35c,U,000020,_ZN3agl2fx10VolumeMask11setViewInfoEjRKN4sead8Matrix44IfEERKNS2_8Matrix34IfEEff -0x0000007100b3e370,U,000004,_ZN3agl3utl12IParameterIO23callbackInvalidVersion_ENS0_19ResParameterArchiveE +0x0000007100b3e370,O,000004,_ZN3agl3utl12IParameterIO23callbackInvalidVersion_ENS0_19ResParameterArchiveE 0x0000007100b3e374,U,000004,nullsub_3275 0x0000007100b3e378,U,000004,j__ZdlPv_625 0x0000007100b3e37c,U,000004,j__ZdlPv_626 @@ -64735,8 +64735,8 @@ Address,Quality,Size,Name 0x0000007100b4dc94,O,000008,_ZNK3agl3utl9ParameterIbE4sizeEv 0x0000007100b4dc9c,O,000012,_ZNK3agl3utl9ParameterIbE16calcBinarizeSizeEv 0x0000007100b4dca8,O,000208,_ZNK3agl3utl9ParameterIbE5cloneEPN4sead4HeapEPNS0_13IParameterObjE -0x0000007100b4dd78,U,000020,_ZN3agl3utl9ParameterIfED2Ev -0x0000007100b4dd8c,U,000004,_ZN3agl3utl9ParameterIfED0Ev +0x0000007100b4dd78,O,000020,_ZN3agl3utl9ParameterIfED1Ev +0x0000007100b4dd8c,O,000004,_ZN3agl3utl9ParameterIfED0Ev 0x0000007100b4dd90,U,000008, 0x0000007100b4dd98,U,000008, 0x0000007100b4dda0,U,000008, @@ -64744,7 +64744,7 @@ Address,Quality,Size,Name 0x0000007100b4ddb0,U,000008, 0x0000007100b4ddb8,U,000008, 0x0000007100b4ddc0,U,000012, -0x0000007100b4ddcc,U,000208,_ZNK3agl3utl9ParameterIfE5cloneEPN4sead4HeapEPNS0_13IParameterObjE +0x0000007100b4ddcc,O,000208,_ZNK3agl3utl9ParameterIfE5cloneEPN4sead4HeapEPNS0_13IParameterObjE 0x0000007100b4de9c,U,000020, 0x0000007100b4deb0,U,000004,j__ZdlPv_635 0x0000007100b4deb4,U,000008, @@ -64754,7 +64754,7 @@ Address,Quality,Size,Name 0x0000007100b4ded4,U,000008, 0x0000007100b4dedc,U,000008, 0x0000007100b4dee4,U,000012, -0x0000007100b4def0,U,000208,_ZNK3agl3utl9ParameterIiE5cloneEPN4sead4HeapEPNS0_13IParameterObjE +0x0000007100b4def0,O,000208,_ZNK3agl3utl9ParameterIiE5cloneEPN4sead4HeapEPNS0_13IParameterObjE 0x0000007100b4dfc0,U,000020, 0x0000007100b4dfd4,U,000004,j__ZdlPv_636 0x0000007100b4dfd8,U,000008, @@ -64764,7 +64764,7 @@ Address,Quality,Size,Name 0x0000007100b4dff8,U,000008, 0x0000007100b4e000,U,000008, 0x0000007100b4e008,U,000012, -0x0000007100b4e014,U,000208,_ZNK3agl3utl9ParameterIjE5cloneEPN4sead4HeapEPNS0_13IParameterObjE +0x0000007100b4e014,O,000208,_ZNK3agl3utl9ParameterIjE5cloneEPN4sead4HeapEPNS0_13IParameterObjE 0x0000007100b4e0e4,U,000020, 0x0000007100b4e0f8,U,000004,j__ZdlPv_637 0x0000007100b4e0fc,U,000008, @@ -64774,7 +64774,7 @@ Address,Quality,Size,Name 0x0000007100b4e11c,U,000008, 0x0000007100b4e124,U,000008, 0x0000007100b4e12c,U,000012, -0x0000007100b4e138,U,000216,_ZNK3agl3utl9ParameterIN4sead7Vector2IfEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE +0x0000007100b4e138,O,000216,_ZNK3agl3utl9ParameterIN4sead7Vector2IfEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE 0x0000007100b4e210,U,000020, 0x0000007100b4e224,U,000004,j__ZdlPv_638 0x0000007100b4e228,U,000008, @@ -64784,7 +64784,7 @@ Address,Quality,Size,Name 0x0000007100b4e248,U,000008, 0x0000007100b4e250,U,000008, 0x0000007100b4e258,U,000012, -0x0000007100b4e264,U,000224,_ZNK3agl3utl9ParameterIN4sead7Vector3IfEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE +0x0000007100b4e264,O,000224,_ZNK3agl3utl9ParameterIN4sead7Vector3IfEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE 0x0000007100b4e344,U,000020, 0x0000007100b4e358,U,000004,j__ZdlPv_639 0x0000007100b4e35c,U,000008, @@ -64794,7 +64794,7 @@ Address,Quality,Size,Name 0x0000007100b4e37c,U,000008, 0x0000007100b4e384,U,000008, 0x0000007100b4e38c,U,000012, -0x0000007100b4e398,U,000232,_ZNK3agl3utl9ParameterIN4sead7Vector4IfEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE +0x0000007100b4e398,O,000232,_ZNK3agl3utl9ParameterIN4sead7Vector4IfEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE 0x0000007100b4e480,U,000020, 0x0000007100b4e494,U,000004,j__ZdlPv_640 0x0000007100b4e498,U,000008, @@ -64804,7 +64804,7 @@ Address,Quality,Size,Name 0x0000007100b4e4b8,U,000008, 0x0000007100b4e4c0,U,000008, 0x0000007100b4e4c8,U,000012, -0x0000007100b4e4d4,U,000260,_ZNK3agl3utl9ParameterIN4sead7Color4fEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE +0x0000007100b4e4d4,O,000260,_ZNK3agl3utl9ParameterIN4sead7Color4fEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE 0x0000007100b4e5d8,U,000020, 0x0000007100b4e5ec,U,000004,j__ZdlPv_641 0x0000007100b4e5f0,U,000008, @@ -64829,24 +64829,24 @@ Address,Quality,Size,Name 0x0000007100b4ea64,U,000020, 0x0000007100b4ea78,U,000004,j__ZdlPv_643 0x0000007100b4ea7c,U,000008, -0x0000007100b4ea84,U,000048,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEE3ptrEv -0x0000007100b4eab4,U,000048,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEE3ptrEv +0x0000007100b4ea84,O,000048,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEE3ptrEv +0x0000007100b4eab4,O,000048,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEE3ptrEv 0x0000007100b4eae4,U,000008, 0x0000007100b4eaec,U,000008, 0x0000007100b4eaf4,U,000008, -0x0000007100b4eafc,U,000148,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEE16calcBinarizeSizeEv -0x0000007100b4eb90,U,000136,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE -0x0000007100b4ec18,U,000412,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEEC2ERKS4_RKNS2_14SafeStringBaseIcEESB_SB_PNS0_13IParameterObjE +0x0000007100b4eafc,O,000148,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEE16calcBinarizeSizeEv +0x0000007100b4eb90,O,000136,_ZNK3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE +0x0000007100b4ec18,O,000412,_ZN3agl3utl9ParameterIN4sead15FixedSafeStringILi256EEEEC2ERKS4_RKNS2_14SafeStringBaseIcEESB_SB_PNS0_13IParameterObjE 0x0000007100b4edb4,U,000020, 0x0000007100b4edc8,U,000004,j__ZdlPv_644 0x0000007100b4edcc,U,000008, -0x0000007100b4edd4,U,000048,_ZNK3agl3utl9ParameterIN4sead14SafeStringBaseIcEEE3ptrEv +0x0000007100b4edd4,O,000048,_ZNK3agl3utl9ParameterIN4sead14SafeStringBaseIcEEE3ptrEv 0x0000007100b4ee04,U,000008, 0x0000007100b4ee0c,U,000008, 0x0000007100b4ee14,U,000008, 0x0000007100b4ee1c,U,000008, -0x0000007100b4ee24,U,000148,_ZNK3agl3utl9ParameterIN4sead14SafeStringBaseIcEEE16calcBinarizeSizeEv -0x0000007100b4eeb8,U,000244,_ZNK3agl3utl9ParameterIN4sead14SafeStringBaseIcEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE +0x0000007100b4ee24,O,000148,_ZNK3agl3utl9ParameterIN4sead14SafeStringBaseIcEEE16calcBinarizeSizeEv +0x0000007100b4eeb8,O,000244,_ZNK3agl3utl9ParameterIN4sead14SafeStringBaseIcEEE5cloneEPNS2_4HeapEPNS0_13IParameterObjE 0x0000007100b4efac,O,000004,_ZN3agl3utl14ParameterCurveILj1EED0Ev 0x0000007100b4efb0,O,000112,_ZN3agl3utl14ParameterCurveILj1EE4copyERKNS0_13ParameterBaseE 0x0000007100b4f020,O,000168,_ZN3agl3utl14ParameterCurveILj1EE10copyUnsafeERKNS0_13ParameterBaseE @@ -79770,9 +79770,9 @@ Address,Quality,Size,Name 0x0000007100ebf050,U,000004,nullsub_4036 0x0000007100ebf054,U,000428, 0x0000007100ebf200,U,000004,j__ZdlPv_952 -0x0000007100ebf204,U,000240,_ZN4sead19FixedSafeStringBaseIcLi22EEaSERKNS_14SafeStringBaseIcEE +0x0000007100ebf204,U,000240,_ZN4sead19FixedSafeStringBaseIcLi377EEaSERKNS_14SafeStringBaseIcEE 0x0000007100ebf2f4,U,000004,j__ZdlPv_953 -0x0000007100ebf2f8,U,000240,_ZN4sead15FixedSafeStringILi4EEaSERKNS_14SafeStringBaseIcEE +0x0000007100ebf2f8,U,000240,_ZN4sead15FixedSafeStringILi377EEaSERKNS_14SafeStringBaseIcEE 0x0000007100ebf3e8,U,000428, 0x0000007100ebf594,U,000140, 0x0000007100ebf620,U,000112,ActorReaction::construct @@ -86449,7 +86449,7 @@ Address,Quality,Size,Name 0x0000007101027250,U,000004,j__ZdlPv_1100 0x0000007101027254,U,000240,_ZN4sead19FixedSafeStringBaseIcLi83EEaSERKNS_14SafeStringBaseIcEE 0x0000007101027344,U,000004,j__ZdlPv_1101 -0x0000007101027348,U,000240,_ZN4sead15FixedSafeStringILi21EEaSERKNS_14SafeStringBaseIcEE +0x0000007101027348,U,000240, 0x0000007101027438,U,000004,nullsub_5554 0x000000710102743c,U,000004,nullsub_5555 0x0000007101027440,U,000004,nullsub_5556 @@ -86814,9 +86814,9 @@ Address,Quality,Size,Name 0x0000007101042f28,U,000008, 0x0000007101042f30,U,000428, 0x00000071010430dc,U,000004,j__ZdlPv_1115 -0x00000071010430e0,U,000240,_ZN4sead19FixedSafeStringBaseIcLi1559EEaSERKNS_14SafeStringBaseIcEE +0x00000071010430e0,U,000240, 0x00000071010431d0,U,000004,j__ZdlPv_1116 -0x00000071010431d4,U,000240,_ZN4sead15FixedSafeStringILi2EEaSERKNS_14SafeStringBaseIcEE +0x00000071010431d4,U,000240, 0x00000071010432c4,U,022524, 0x0000007101048ac0,U,000040, 0x0000007101048ae8,U,000172, @@ -86826,14 +86826,14 @@ Address,Quality,Size,Name 0x0000007101048f34,U,000004,j__ZdlPv_1117 0x0000007101048f38,U,000428, 0x00000071010490e4,U,000004,j__ZdlPv_1118 -0x00000071010490e8,U,000240,_ZN4sead19FixedSafeStringBaseIcLi2EEaSERKNS_14SafeStringBaseIcEE +0x00000071010490e8,U,000240, 0x00000071010491d8,U,000004,j__ZdlPv_1119 -0x00000071010491dc,U,000240,_ZN4sead19FixedSafeStringBaseIcLi16EEaSERKNS_14SafeStringBaseIcEE +0x00000071010491dc,U,000240, 0x00000071010492cc,U,000428,_ZN3aal11PerfMonitor15ProcessTypeBase5text_Ei 0x0000007101049478,U,000004,j__ZdlPv_1120 -0x000000710104947c,U,000240,_ZN4sead15FixedSafeStringILi5120EEaSERKNS_14SafeStringBaseIcEE +0x000000710104947c,U,000240, 0x000000710104956c,U,000004,j__ZdlPv_1121 -0x0000007101049570,U,000240,_ZN4sead19FixedSafeStringBaseIcLi5120EEaSERKNS_14SafeStringBaseIcEE +0x0000007101049570,U,000240, 0x0000007101049660,U,000136, 0x00000071010496e8,U,000144, 0x0000007101049778,U,000172, @@ -97187,9 +97187,9 @@ Address,Quality,Size,Name 0x0000007101313c64,U,000428, 0x0000007101313e10,U,000428, 0x0000007101313fbc,U,000004,j__ZdlPv_1356 -0x0000007101313fc0,U,000240,_ZN4sead15FixedSafeStringILi75EEaSERKNS_14SafeStringBaseIcEE +0x0000007101313fc0,U,000240,_ZN4sead15FixedSafeStringILi168EEaSERKNS_14SafeStringBaseIcEE 0x00000071013140b0,U,000004,j__ZdlPv_1357 -0x00000071013140b4,U,000240,_ZN4sead19FixedSafeStringBaseIcLi75EEaSERKNS_14SafeStringBaseIcEE +0x00000071013140b4,U,000240,_ZN4sead19FixedSafeStringBaseIcLi168EEaSERKNS_14SafeStringBaseIcEE 0x00000071013141a4,U,000428, 0x0000007101314350,U,000476, 0x000000710131452c,U,000004,j__ZdlPv_1358 @@ -99368,7 +99368,7 @@ Address,Quality,Size,Name 0x000000710136bf34,U,000008, 0x000000710136bf3c,U,000204, 0x000000710136c008,U,000092, -0x000000710136c064,U,000004,_ZN4sead3JobD2Ev +0x000000710136c064,O,000004,_ZN4sead3JobD1Ev 0x000000710136c068,U,000192, 0x000000710136c128,U,000548,_ZN4sead23ParallelSZSDecompressorC2EjiPNS_4HeapEPhRKNS_10CoreIdMaskE 0x000000710136c34c,U,000160,_ZN4sead23ParallelSZSDecompressorD2Ev diff --git a/tools/viking/src/functions.rs b/tools/viking/src/functions.rs index 36385ad1..dec84e9c 100644 --- a/tools/viking/src/functions.rs +++ b/tools/viking/src/functions.rs @@ -15,6 +15,19 @@ pub enum Status { Library, } +impl Status { + pub fn description(&self) -> &'static str { + match &self { + Status::Matching => "matching", + Status::NonMatchingMinor => "non-matching (minor)", + Status::NonMatchingMajor => "non-matching (major)", + Status::NotDecompiled => "not decompiled", + Status::Wip => "WIP", + Status::Library => "library function", + } + } +} + pub struct Info { pub addr: u64, pub size: u32, @@ -145,7 +158,7 @@ pub fn make_known_function_map(functions: &[Info]) -> FxHashMap { FxHashMap::with_capacity_and_hasher(functions.len(), Default::default()); for function in functions { - if !function.is_decompiled() { + if function.name.is_empty() { continue; } known_functions.insert(function.addr, function); diff --git a/tools/viking/src/tools/check.rs b/tools/viking/src/tools/check.rs index 1a61904e..11b83fb5 100644 --- a/tools/viking/src/tools/check.rs +++ b/tools/viking/src/tools/check.rs @@ -27,13 +27,15 @@ fn check_function( decomp_symtab: &elf::SymbolTableByName, function: &functions::Info, ) -> Result { - if !function.is_decompiled() { - return Ok(true); - } - let name = function.name.as_str(); let decomp_fn = elf::get_function_by_name(&decomp_elf, &decomp_symtab, &name); + match function.status { + Status::NotDecompiled if decomp_fn.is_err() => return Ok(true), + Status::Library => return Ok(true), + _ => (), + } + if decomp_fn.is_err() { let error = decomp_fn.err().unwrap(); ui::print_warning(&format!( @@ -79,7 +81,10 @@ fn check_function( } } - Status::NonMatchingMinor | Status::NonMatchingMajor | Status::Wip => { + Status::NotDecompiled + | Status::NonMatchingMinor + | Status::NonMatchingMajor + | Status::Wip => { let orig_fn = get_orig_fn()?; let result = checker @@ -88,13 +93,14 @@ fn check_function( if result.is_none() { ui::print_note(&format!( - "function {} is marked as non-matching but matches", + "function {} is marked as {} but matches", ui::format_symbol_name(name), + function.status.description(), )); } } - Status::NotDecompiled | Status::Library => unreachable!(), + Status::Library => unreachable!(), }; Ok(true)