diff --git a/asm/include/ov05.inc b/asm/include/ov05.inc index 6d0eac96..4588f973 100644 --- a/asm/include/ov05.inc +++ b/asm/include/ov05.inc @@ -1542,7 +1542,7 @@ .extern func_ov00_020af538 .extern func_ov00_020bc46c .extern func_ov00_020afb6c -.extern func_ov00_020a7c00 +.extern _ZN10PlayerBase18func_ov00_020a7c00Ei .extern func_ov00_020bc71c .extern func_ov00_020bc46c .extern func_ov00_020b5360 diff --git a/asm/include/ov12.inc b/asm/include/ov12.inc index bb820a08..d0626a19 100644 --- a/asm/include/ov12.inc +++ b/asm/include/ov12.inc @@ -489,7 +489,7 @@ .extern data_027e0e60 .extern func_ov00_020c3674 .extern func_ov05_0210e4e4 -.extern func_ov00_020a7c00 +.extern _ZN10PlayerBase18func_ov00_020a7c00Ei .extern _ZNK11ItemManager8GetFairyEi .extern func_ov00_020b510c .extern func_ov00_020b50f8 @@ -526,7 +526,7 @@ .extern func_ov00_020bccc8 .extern func_ov00_020bbb64 .extern func_ov00_020bcdb8 -.extern func_ov00_020a7c00 +.extern _ZN10PlayerBase18func_ov00_020a7c00Ei .extern func_ov00_020bbbd0 .extern func_ov00_02097738 .extern func_ov00_020d7b60 @@ -2268,7 +2268,7 @@ .extern data_ov00_020eec9c .extern func_ov00_020c5e20 .extern func_ov00_020c2a0c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020833f4 .extern func_ov00_02083400 .extern data_027e0f90 @@ -2630,7 +2630,7 @@ .extern func_ov00_020bcad8 .extern func_ov00_020bca94 .extern func_ov00_020bca4c -.extern func_ov00_020a7d8c +.extern _ZN10PlayerBase9AddHealthEs .extern func_ov00_020bd5f0 .extern func_ov00_020bc27c .extern func_ov00_020bc0a8 diff --git a/asm/include/ov14.inc b/asm/include/ov14.inc index a2112ec7..e90b31de 100644 --- a/asm/include/ov14.inc +++ b/asm/include/ov14.inc @@ -824,7 +824,7 @@ .extern func_0202b154 .extern func_ov00_02097bcc .extern func_ov00_02097bcc -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern data_027e1048 .extern data_ov03_02100634 .extern data_027e0d78 @@ -834,7 +834,7 @@ .extern data_027e0f74 .extern data_02050f54 .extern data_027e0f90 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_02097bcc .extern func_ov00_020ce8e4 .extern func_ov00_0209a4f4 @@ -1412,14 +1412,14 @@ .extern func_ov00_02087d34 .extern func_ov00_02098074 .extern func_ov00_020888e8 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_0202e740 .extern func_020370d0 .extern func_0202e740 .extern func_ov00_02098074 .extern func_ov00_0208ba08 .extern func_0202e740 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_0208b180 .extern func_ov00_020875f8 .extern data_027e077c @@ -2930,7 +2930,7 @@ .extern func_ov00_020bd5fc .extern data_027e0fb8 .extern data_ov00_020e5684 -.extern func_ov00_020a7c00 +.extern _ZN10PlayerBase18func_ov00_020a7c00Ei .extern _ZN11ItemManager13TickEquipItemEv .extern func_ov23_02178058 .extern func_ov23_02178174 @@ -2987,7 +2987,7 @@ .extern func_ov00_020bcdb8 .extern func_ov00_02097ff4 .extern func_ov05_02103ff0 -.extern func_ov00_020a7d34 +.extern _ZN10PlayerBase9SetHealthEs .extern func_ov00_020bbbd0 .extern _ZN11ItemManager9SetPotionEjj .extern _ZN11ItemManager17EquipPreviousItemEv @@ -3004,7 +3004,7 @@ .extern data_027e0f64 .extern func_ov00_020bc46c .extern func_ov23_02178174 -.extern func_ov00_020a7d8c +.extern _ZN10PlayerBase9AddHealthEs .extern data_027e0fbc .extern func_ov00_020af298 .extern func_ov05_02110bb4 diff --git a/asm/include/ov15.inc b/asm/include/ov15.inc index ad24b548..bfc6bd53 100644 --- a/asm/include/ov15.inc +++ b/asm/include/ov15.inc @@ -1115,7 +1115,7 @@ .extern func_01ff9bc4 .extern func_ov00_020c2a0c .extern func_ov00_020c28d4 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020c198c .extern data_027e10a4 .extern data_02050f54 @@ -2266,7 +2266,7 @@ .extern data_027e1094 .extern data_027e0fac .extern data_027e0fac -.extern func_ov00_020a7c00 +.extern _ZN10PlayerBase18func_ov00_020a7c00Ei .extern _ZN11ItemManager18func_ov00_020ad528Ev .extern func_ov05_02103f4c .extern func_ov00_02097738 @@ -2285,7 +2285,7 @@ .extern data_027e0f94 .extern data_027e0d78 .extern data_027e0fac -.extern func_ov00_020a7e70 +.extern _ZN10PlayerBase18TeleportToEntranceEib .extern data_027e0fac .extern func_ov00_02097738 .extern func_ov00_02097750 @@ -6839,7 +6839,7 @@ .extern data_02050f54 .extern func_ov00_020c1d58 .extern func_ov00_020c2a0c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_01ff9bf8 .extern data_027e0f90 .extern data_027e0f94 @@ -9053,9 +9053,9 @@ .extern func_ov00_020c322c .extern func_ov00_020a9ab8 .extern data_ov12_0213a604 -.extern func_ov00_020a7af0 -.extern func_ov00_020a7af8 -.extern func_ov00_020a7b00 +.extern _ZN10PlayerBase8vfunc_04Ev +.extern _ZN10PlayerBase10GetEquipIdEv +.extern _ZN10PlayerBase7CanMoveEv .extern data_ov12_02139ef4 .extern data_ov12_02139f50 .extern data_ov12_02139f7c @@ -9064,9 +9064,9 @@ .extern data_ov12_0213a184 .extern data_ov12_02139170 .extern data_ov12_0213a480 -.extern func_ov00_020a7df4 +.extern _ZN10PlayerBase8TeleportEP5Vec3psibb .extern data_ov12_0213a618 -.extern func_ov00_020a7d8c +.extern _ZN10PlayerBase9AddHealthEs .extern data_ov12_02139ab4 .extern data_ov12_02139cd0 .extern data_ov12_02139a80 diff --git a/asm/include/ov19.inc b/asm/include/ov19.inc index 465fa832..48395ece 100644 --- a/asm/include/ov19.inc +++ b/asm/include/ov19.inc @@ -276,7 +276,7 @@ .extern func_ov00_020c5118 .extern func_0203611c .extern func_ov00_0207b2f0 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_020c1b18 .extern func_ov00_02083ee0 .extern func_ov00_02087d34 @@ -826,7 +826,7 @@ .extern func_ov00_020c29ec .extern func_ov00_02083770 .extern func_ov00_020c2a0c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020c28ec .extern func_ov00_020bd3b0 .extern func_ov00_020c243c diff --git a/asm/include/ov20.inc b/asm/include/ov20.inc index e53d5da1..1950aaa5 100644 --- a/asm/include/ov20.inc +++ b/asm/include/ov20.inc @@ -52,7 +52,7 @@ .extern func_ov00_020c5d74 .extern func_ov00_020c5d74 .extern func_ov00_020c5d74 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_020c1b18 .extern func_ov00_020c5d74 .extern func_ov00_02087d34 diff --git a/asm/include/ov23.inc b/asm/include/ov23.inc index 5d7fc972..31b008f6 100644 --- a/asm/include/ov23.inc +++ b/asm/include/ov23.inc @@ -581,7 +581,7 @@ .extern func_ov00_020cd52c .extern func_ov00_020cd62c .extern func_ov00_020c28ec -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020cca50 .extern data_027e0f90 .extern func_ov00_020c38fc @@ -595,7 +595,7 @@ .extern func_ov14_0212de74 .extern data_027e0fe4 .extern data_027e0e60 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020cca50 .extern data_027e0f90 .extern func_ov00_020c28ec diff --git a/asm/include/ov24.inc b/asm/include/ov24.inc index 8c1313b4..17c29437 100644 --- a/asm/include/ov24.inc +++ b/asm/include/ov24.inc @@ -746,7 +746,7 @@ .extern func_ov00_020c3180 .extern func_ov00_020c3674 .extern func_ov00_020c1e2c -.extern func_ov00_020a7ce4 +.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi .extern func_ov00_020bf008 .extern _ZNK11ItemManager19GetActiveFairyLevelEi .extern func_ov00_020c2238 diff --git a/asm/include/ov25.inc b/asm/include/ov25.inc index 73c7da20..6ba705e5 100644 --- a/asm/include/ov25.inc +++ b/asm/include/ov25.inc @@ -972,7 +972,7 @@ .extern func_ov00_020cb140 .extern func_ov00_020c1d58 .extern func_01ff9bf8 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern data_027e0f94 .extern data_027e0f90 .extern func_ov00_020c5d74 diff --git a/asm/include/ov26.inc b/asm/include/ov26.inc index 9f83a20f..d023f694 100644 --- a/asm/include/ov26.inc +++ b/asm/include/ov26.inc @@ -602,7 +602,7 @@ .extern func_ov00_02087d34 .extern func_ov00_02098074 .extern func_ov00_020888e8 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_0202e740 .extern func_0200b954 .extern func_020370d0 @@ -610,7 +610,7 @@ .extern func_ov00_02098074 .extern func_ov00_0208ba08 .extern func_0202e740 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_020875f8 .extern func_0200b974 .extern func_ov00_0209779c @@ -834,7 +834,7 @@ .extern func_ov00_02087d34 .extern func_ov00_02098074 .extern func_ov00_020888e8 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_0209a4f4 .extern func_ov00_02097810 .extern func_ov00_0209a508 @@ -846,7 +846,7 @@ .extern func_ov09_0211a514 .extern func_0202e740 .extern func_ov00_020875f8 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_02097bcc .extern func_ov09_02119030 .extern func_ov09_0211a52c diff --git a/asm/include/ov30.inc b/asm/include/ov30.inc index bb3fa7b7..7be87744 100644 --- a/asm/include/ov30.inc +++ b/asm/include/ov30.inc @@ -709,7 +709,7 @@ .extern data_02050f54 .extern data_027e0e58 .extern func_ov00_020c1d58 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern data_027e0f90 .extern data_027e0fc8 .extern data_02050f54 diff --git a/asm/include/ov32.inc b/asm/include/ov32.inc index 31478aa7..76671e8a 100644 --- a/asm/include/ov32.inc +++ b/asm/include/ov32.inc @@ -355,7 +355,7 @@ .extern func_ov00_020c1e2c .extern data_027e0764 .extern func_01fffcec -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020c070c .extern func_ov00_020c1ef8 .extern data_02050f54 @@ -656,7 +656,7 @@ .extern func_ov00_02087d34 .extern func_ov00_02098074 .extern func_ov00_020888e8 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_0202e740 .extern func_020370d0 .extern func_ov00_0208ba08 @@ -664,7 +664,7 @@ .extern func_ov00_020ceacc .extern func_ov00_02098074 .extern func_0202e740 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_0208b180 .extern func_ov00_020875f8 .extern data_027e0f74 diff --git a/asm/include/ov35.inc b/asm/include/ov35.inc index 1f6325cd..d492b9e4 100644 --- a/asm/include/ov35.inc +++ b/asm/include/ov35.inc @@ -609,7 +609,7 @@ .extern func_0202e58c .extern func_ov00_020c2974 .extern func_0202b154 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_0202e310 .extern func_ov00_020ceacc .extern func_0202e58c diff --git a/asm/include/ov36.inc b/asm/include/ov36.inc index 9d3a4793..f75d212a 100644 --- a/asm/include/ov36.inc +++ b/asm/include/ov36.inc @@ -469,7 +469,7 @@ .extern func_ov00_02087d34 .extern func_ov00_02097810 .extern func_ov00_020bc46c -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_0207c5d4 .extern func_ov00_0209a508 .extern data_027e103c @@ -500,7 +500,7 @@ .extern func_ov00_0207c5d4 .extern func_ov00_020c198c .extern func_ov00_02097760 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_0207c5d4 .extern func_ov00_0209779c .extern func_ov00_02097bcc @@ -525,7 +525,7 @@ .extern func_ov00_02097810 .extern func_ov00_0209a508 .extern func_ov00_02097b9c -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_0202b308 .extern Divide .extern Divide @@ -556,7 +556,7 @@ .extern func_ov00_020ceacc .extern func_0202e58c .extern func_ov00_02097bcc -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_02083918 .extern func_ov00_02083948 .extern func_ov00_0208726c @@ -586,7 +586,7 @@ .extern data_ov00_020eec68 .extern data_027e0d0c .extern data_027e0f74 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_0207c1b0 .extern func_ov00_02088000 .extern func_ov00_020ceacc diff --git a/asm/include/ov37.inc b/asm/include/ov37.inc index ae9a5eb9..1b336acd 100644 --- a/asm/include/ov37.inc +++ b/asm/include/ov37.inc @@ -92,7 +92,7 @@ .extern func_ov00_020c5d74 .extern func_ov00_020bd070 .extern func_ov00_020cc960 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb .extern func_ov00_020c1b18 .extern func_ov00_020c5d74 .extern func_ov00_0207c31c @@ -866,11 +866,11 @@ .extern data_027e0ffc .extern func_ov00_020c2974 .extern func_01ff9bf8 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern data_027e0f94 .extern data_027e0f90 .extern func_01ff9bf8 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020cca50 .extern data_027e0f94 .extern data_027e0f90 diff --git a/asm/include/ov39.inc b/asm/include/ov39.inc index d8e04b5b..2230fe8b 100644 --- a/asm/include/ov39.inc +++ b/asm/include/ov39.inc @@ -249,7 +249,7 @@ .extern func_ov00_020a61ac .extern func_01ff9bc4 .extern func_01ff9bf8 -.extern func_ov00_020a7c60 +.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i .extern data_02050f54 .extern data_027e0f90 .extern data_ov29_0217bd28 @@ -264,7 +264,7 @@ .extern data_027e0c68 .extern data_027e0e60 .extern func_ov00_020c2974 -.extern func_ov00_020a7ce4 +.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi .extern func_ov00_020bf008 .extern func_ov00_020ceacc .extern func_ov00_020c71fc @@ -578,7 +578,7 @@ .extern data_02050f54 .extern func_01ff9bf8 .extern func_01ff9bc4 -.extern func_ov00_020a7cfc +.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv .extern func_ov09_02113698 .extern data_027e0f90 .extern data_ov29_0217a4ac @@ -745,7 +745,7 @@ .extern func_0202e310 .extern func_01ff9bf8 .extern func_01ffa0f4 -.extern func_ov00_020a7ce4 +.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi .extern func_ov00_020c070c .extern func_ov00_020c1ef8 .extern func_ov00_020ceacc diff --git a/asm/include/ov41.inc b/asm/include/ov41.inc index d4541e61..df997b0c 100644 --- a/asm/include/ov41.inc +++ b/asm/include/ov41.inc @@ -394,7 +394,7 @@ .extern data_027e0f90 .extern data_027e0fac .extern data_027e0e60 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020cca50 .extern data_027e0f90 .extern func_ov00_020caef8 diff --git a/asm/include/ov43.inc b/asm/include/ov43.inc index 0b79c346..22d8d768 100644 --- a/asm/include/ov43.inc +++ b/asm/include/ov43.inc @@ -110,7 +110,7 @@ .extern func_ov00_020c5d74 .extern func_ov00_020c5d74 .extern data_027e0764 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020c070c .extern func_ov00_020c1ef8 .extern func_ov00_020ceacc diff --git a/asm/include/ov47.inc b/asm/include/ov47.inc index e0f2fd74..151a5369 100644 --- a/asm/include/ov47.inc +++ b/asm/include/ov47.inc @@ -360,7 +360,7 @@ .extern _ZNK11ItemManager19GetActiveFairyLevelEi .extern func_ov00_020c2238 .extern func_ov00_020c070c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020c3180 .extern func_ov00_0207a1c8 .extern data_027e0f94 diff --git a/asm/include/ov48.inc b/asm/include/ov48.inc index b0f0f84b..02bafc9f 100644 --- a/asm/include/ov48.inc +++ b/asm/include/ov48.inc @@ -51,7 +51,7 @@ .extern func_ov00_020c1d58 .extern func_01ff9bf8 .extern func_ov00_020c2a0c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern data_027e0f94 .extern data_027e0f90 .extern func_ov00_020c5f1c @@ -155,10 +155,10 @@ .extern func_ov00_020c288c .extern _ZNK11ItemManager19GetActiveFairyLevelEi .extern func_01ff9e64 -.extern func_ov00_020a7c60 +.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i .extern func_ov00_020c2974 .extern func_ov00_020c070c -.extern func_ov00_020a7bac +.extern _ZN10PlayerBase6LookAtEP5Vec3p .extern func_ov00_020c28ec .extern func_01ff9e64 .extern func_01ff9bf8 @@ -259,7 +259,7 @@ .extern func_ov00_020ceacc .extern func_ov00_020ceacc .extern func_ov00_020c2a0c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_01ff9bf8 .extern func_02002c14 .extern func_02002c14 diff --git a/asm/include/ov49.inc b/asm/include/ov49.inc index 92040027..80a7672a 100644 --- a/asm/include/ov49.inc +++ b/asm/include/ov49.inc @@ -137,7 +137,7 @@ .extern func_ov00_020cadb0 .extern data_027e0fc8 .extern func_ov00_020c2a0c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020c28d4 .extern func_ov00_020c28d4 .extern func_ov00_020cb160 @@ -162,7 +162,7 @@ .extern func_01fffbec .extern func_01ff9bc4 .extern func_ov00_020bc46c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020bd3b0 .extern func_ov00_020c28ec .extern func_ov00_020bd4d8 diff --git a/asm/include/ov50.inc b/asm/include/ov50.inc index 97814050..c43ba82b 100644 --- a/asm/include/ov50.inc +++ b/asm/include/ov50.inc @@ -150,7 +150,7 @@ .extern func_ov00_020c3674 .extern data_027e0fe4 .extern func_ov00_020c2a0c -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern func_ov00_020c37ec .extern data_027e0f90 .extern data_027e0fe4 diff --git a/asm/include/ov51.inc b/asm/include/ov51.inc index b83cd607..9e1f7b31 100644 --- a/asm/include/ov51.inc +++ b/asm/include/ov51.inc @@ -89,7 +89,7 @@ .extern func_ov00_0207c474 .extern func_01ff9bf8 .extern func_ov00_020c1ef8 -.extern func_ov00_020a7ce4 +.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi .extern func_ov00_020b7e6c .extern func_ov00_020cec60 .extern data_027e0e58 diff --git a/asm/ov00/Player/LinkStateBase.s b/asm/ov00/Player/LinkStateBase.s index 95493971..50d597e5 100644 --- a/asm/ov00/Player/LinkStateBase.s +++ b/asm/ov00/Player/LinkStateBase.s @@ -249,12 +249,12 @@ _020a81e8: .word func_01fffcd8 .global _ZN13LinkStateBase6LookAtEP5Vec3p arm_func_start _ZN13LinkStateBase6LookAtEP5Vec3p _ZN13LinkStateBase6LookAtEP5Vec3p: ; 0x020a81ec - ldr ip, _020a81f8 ; =func_ov00_020a7bac + ldr ip, _020a81f8 ; =_ZN10PlayerBase6LookAtEP5Vec3p ldr r0, [r0, #8] bx ip .align 2, 0 arm_func_end _ZN13LinkStateBase6LookAtEP5Vec3p -_020a81f8: .word func_ov00_020a7bac +_020a81f8: .word _ZN10PlayerBase6LookAtEP5Vec3p .global _ZN13LinkStateBase18func_ov00_020a81fcEv arm_func_start _ZN13LinkStateBase18func_ov00_020a81fcEv @@ -501,9 +501,9 @@ _ZN13LinkStateBase18func_ov00_020a84bcEi: ; 0x020a84bc moveq r0, #0 mov r0, r0, lsl #0x10 mov r4, r0, asr #0x10 - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv strh r4, [r0, #0x5c] - bl func_ov00_020a7b9c + bl _ZN10PlayerBase14GetEquipShieldEv ldr r1, _020a8504 ; =data_027e0e58 strh r4, [r0, #0xe] ldr r0, [r1] diff --git a/asm/ov00/Player/LinkStateGrab.s b/asm/ov00/Player/LinkStateGrab.s index 418d7417..5b4158d1 100644 --- a/asm/ov00/Player/LinkStateGrab.s +++ b/asm/ov00/Player/LinkStateGrab.s @@ -1005,7 +1005,7 @@ _020aaff4: mov r0, #0 ldmia sp!, {r4, r5, r6, r7, r8, pc} _020ab000: - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv ldr r2, [r0] mov r1, #1 ldr r2, [r2, #0x14] @@ -1600,7 +1600,7 @@ _ZN13LinkStateGrab18func_ov00_020ab7bcEP5Vec3pP5Actor: ; 0x020ab7bc beq _020ab818 b _020ab8c0 _020ab7fc: - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv ldr r2, [r0] mov r1, #1 ldr r2, [r2, #0x14] diff --git a/asm/ov00/Player/include/LinkStateBase.inc b/asm/ov00/Player/include/LinkStateBase.inc index cd075073..2e7b0723 100644 --- a/asm/ov00/Player/include/LinkStateBase.inc +++ b/asm/ov00/Player/include/LinkStateBase.inc @@ -19,7 +19,7 @@ .extern _ZN11ItemManager22UpdateSwordShieldInUseEv .extern func_ov05_02106980 .extern func_01fffcd8 -.extern func_ov00_020a7bac +.extern _ZN10PlayerBase6LookAtEP5Vec3p .extern func_ov00_020bb810 .extern func_ov00_020bbbd0 .extern func_0202b154 @@ -41,8 +41,8 @@ .extern func_ov00_020c3674 .extern data_027e0fe8 .extern data_027e0fe4 -.extern func_ov00_020a7b8c -.extern func_ov00_020a7b9c +.extern _ZN10PlayerBase13GetEquipSwordEv +.extern _ZN10PlayerBase14GetEquipShieldEv .extern func_ov00_0207c5d4 .extern data_027e0e58 .extern data_027e0fcc diff --git a/asm/ov00/Player/include/LinkStateGrab.inc b/asm/ov00/Player/include/LinkStateGrab.inc index 1f41a8ca..25d37db8 100644 --- a/asm/ov00/Player/include/LinkStateGrab.inc +++ b/asm/ov00/Player/include/LinkStateGrab.inc @@ -85,7 +85,7 @@ .extern func_ov00_020c2a0c .extern func_01ff9cec .extern func_ov00_020af044 -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern _ZN13LinkStateBase12GetGrabActorEv .extern _ZN13LinkStateBase19GetCurrentCharacterEv .extern func_ov23_02171410 @@ -141,7 +141,7 @@ .extern func_ov00_020c3180 .extern func_ov00_020aeffc .extern data_027e0fb8 -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern func_ov00_020c2a0c .extern _ZN13LinkStateBase12GetPlayerPosEv .extern func_01ff9bf8 diff --git a/asm/ov00/include/ov00_020773c0.inc b/asm/ov00/include/ov00_020773c0.inc index 703a6f90..471048db 100644 --- a/asm/ov00/include/ov00_020773c0.inc +++ b/asm/ov00/include/ov00_020773c0.inc @@ -1997,7 +1997,7 @@ .extern func_ov00_0208949c .extern func_ov00_02089318 .extern func_ov00_02089168 -.extern func_ov00_020a7b08 +.extern _ZN10PlayerBase12SetUpdatePosEb .extern func_ov00_02087d98 .extern func_ov00_0207b2f0 .extern func_ov00_0207b334 @@ -2022,8 +2022,8 @@ .extern data_027e0f64 .extern func_ov00_020bcdec .extern func_ov00_020bcdec -.extern func_ov00_020a7b10 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase10SetVisibleEb +.extern _ZN10PlayerBase10SetVisibleEb .extern data_027e071c .extern data_027e0fc8 .extern data_027e0f90 @@ -2032,8 +2032,8 @@ .extern func_ov00_0207b334 .extern data_027e0c68 .extern data_027e0db0 -.extern func_ov00_020a7b10 -.extern func_ov00_020a7b08 +.extern _ZN10PlayerBase10SetVisibleEb +.extern _ZN10PlayerBase12SetUpdatePosEb .extern func_ov00_02087d98 .extern func_ov00_0207b334 .extern func_ov00_020838e8 diff --git a/asm/ov00/include/ov00_020a8e04.inc b/asm/ov00/include/ov00_020a8e04.inc index 6640f456..e4e28e74 100644 --- a/asm/ov00/include/ov00_020a8e04.inc +++ b/asm/ov00/include/ov00_020a8e04.inc @@ -2,7 +2,7 @@ .extern _ZN13LinkStateBase18GetDebugHierarchy0Ev .extern _ZN13LinkStateBase12GetEquipItemEi .extern _ZN13LinkStateBase12GetEquipItemEi -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern func_ov00_020c06b0 .extern func_ov00_020d77e4 .extern data_ov00_020eec9c @@ -33,7 +33,7 @@ .extern func_ov00_02083c7c .extern data_027e0fb8 .extern data_027e0e60 -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern data_027e0d78 .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectdlEPv @@ -266,7 +266,7 @@ .extern func_ov00_020c2a0c .extern func_01ff9cec .extern func_ov00_020af044 -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern _ZN13LinkStateBase12GetGrabActorEv .extern _ZN13LinkStateBase19GetCurrentCharacterEv .extern func_ov23_02171410 @@ -322,7 +322,7 @@ .extern func_ov00_020c3180 .extern func_ov00_020aeffc .extern data_027e0fb8 -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern func_ov00_020c2a0c .extern _ZN13LinkStateBase12GetPlayerPosEv .extern func_01ff9bf8 diff --git a/asm/ov00/include/ov00_020ae7a4.inc b/asm/ov00/include/ov00_020ae7a4.inc index a06d5c30..13391fb2 100644 --- a/asm/ov00/include/ov00_020ae7a4.inc +++ b/asm/ov00/include/ov00_020ae7a4.inc @@ -1019,9 +1019,9 @@ .extern func_ov00_020a914c .extern func_ov00_020b1eec .extern _ZN13LinkStateBase16GetLinkItemStateEv -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern _ZN13LinkStateBase16GetLinkItemStateEv -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern func_ov00_020a914c .extern data_027e0fd4 .extern func_ov03_020f3f94 @@ -1038,7 +1038,7 @@ .extern data_027e0fd4 .extern func_ov05_0210eba4 .extern _ZN13LinkStateBase16GetLinkItemStateEv -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern gOverlayManager .extern data_027e0fd4 .extern data_027e0fe4 @@ -1122,22 +1122,22 @@ .extern func_ov00_020b30e4 .extern data_027e0f74 .extern data_027e0fe4 -.extern func_ov00_020a7df4 +.extern _ZN10PlayerBase8TeleportEP5Vec3psibb .extern func_ov03_020f9f30 .extern func_ov00_02079878 .extern data_027e0c54 .extern data_027e0d3c -.extern func_ov00_020a7df4 -.extern func_ov00_020a7b10 +.extern _ZN10PlayerBase8TeleportEP5Vec3psibb +.extern _ZN10PlayerBase10SetVisibleEb .extern data_027e0c54 -.extern func_ov00_020a7e70 +.extern _ZN10PlayerBase18TeleportToEntranceEib .extern func_ov00_020a914c .extern func_ov00_020b38dc .extern data_027e0d38 .extern data_027e0fcc .extern data_027e0fd4 .extern data_027e0f94 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern data_027e0fd8 .extern data_027e0fd4 .extern data_027e0fd8 @@ -1204,7 +1204,7 @@ .extern data_027e0fd0 .extern _ZN13LinkStateBase16GetLinkItemStateEv .extern func_ov00_020a914c -.extern func_ov00_020a7b9c +.extern _ZN10PlayerBase14GetEquipShieldEv .extern data_027e0fd8 .extern data_027e0fd4 .extern data_027e0fcc @@ -1486,18 +1486,18 @@ .extern data_027e0f94 .extern data_027e0f90 .extern func_01ff9bf8 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern data_027e0f94 .extern data_027e0f90 -.extern func_ov00_020a7c1c +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder .extern data_027e0f90 -.extern func_ov00_020a7c60 +.extern _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i .extern data_027e0f90 .extern func_ov00_02097738 .extern func_01ff9bf8 -.extern func_ov00_020a7cfc +.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv .extern _ZNK11ItemManager19GetActiveFairyLevelEi -.extern func_ov00_020a7cfc +.extern _ZN10PlayerBase18EquipItem_vfunc_2cEv .extern data_027e0f74 .extern data_027e0f94 .extern data_027e0f90 @@ -1505,13 +1505,13 @@ .extern data_027e0fc8 .extern func_01ff9bf8 .extern func_01ffa0f4 -.extern func_ov00_020a7ce4 +.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi .extern data_027e0f94 .extern data_027e0fac .extern data_027e0f90 -.extern func_ov00_020a7c1c -.extern func_ov00_020a7ce4 -.extern func_ov00_020a7ce4 +.extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi +.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi .extern data_027e0f90 .extern data_027e0fc8 .extern func_ov00_020c398c @@ -1622,13 +1622,13 @@ .extern func_ov00_020a98bc .extern func_ov00_020a9890 .extern func_ov00_020a9968 -.extern func_ov00_020a7af0 +.extern _ZN10PlayerBase8vfunc_04Ev .extern func_ov04_0210a9ac .extern func_ov04_0210ab20 .extern func_ov05_0210e8b4 .extern func_ov05_0210eaa0 .extern func_ov05_0210e4e4 -.extern func_ov00_020a7d8c +.extern _ZN10PlayerBase9AddHealthEs .extern func_ov04_0210a734 .extern func_ov04_0210a804 .extern func_ov00_0208f70c @@ -2088,7 +2088,7 @@ .extern data_027e0e58 .extern func_ov00_020c1fc8 .extern func_ov00_020c243c -.extern func_ov00_020a7b8c +.extern _ZN10PlayerBase13GetEquipSwordEv .extern func_ov00_020bf008 .extern func_ov14_02146634 .extern func_ov14_021231d4 @@ -2096,13 +2096,13 @@ .extern func_ov14_02120ac4 .extern func_ov14_02123904 .extern data_027e0ffc -.extern func_ov00_020a7b9c +.extern _ZN10PlayerBase14GetEquipShieldEv .extern func_ov00_020c070c -.extern func_ov00_020a7b9c +.extern _ZN10PlayerBase14GetEquipShieldEv .extern func_ov00_020c070c -.extern func_ov00_020a7b9c +.extern _ZN10PlayerBase14GetEquipShieldEv .extern func_ov00_020c070c -.extern func_ov00_020a7b9c +.extern _ZN10PlayerBase14GetEquipShieldEv .extern func_ov00_020c070c .extern data_027e0ffc .extern Divide diff --git a/asm/ov00/ov00_0207af9c.s b/asm/ov00/ov00_0207af9c.s index cd8144f9..f8a926df 100644 --- a/asm/ov00/ov00_0207af9c.s +++ b/asm/ov00/ov00_0207af9c.s @@ -37894,7 +37894,7 @@ _0209828c: ldr r0, _020985ac ; =data_027e0f90 mov r1, #0 ldr r0, [r0] - bl func_ov00_020a7b08 + bl _ZN10PlayerBase12SetUpdatePosEb _020982a8: ldrb r1, [r4, #0x11] cmp r1, #0 @@ -38495,7 +38495,7 @@ _02098a34: ldr r0, _02098b28 ; =data_027e0f90 strb r1, [r4, #0x21] ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb _02098a8c: ldrb r0, [r4, #0x22] cmp r0, #0 @@ -38522,7 +38522,7 @@ _02098abc: ldr r0, _02098b28 ; =data_027e0f90 strb r1, [r4, #0x21] ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb _02098af0: ldrb r0, [r4, #0x22] cmp r0, #0 @@ -39110,7 +39110,7 @@ _02099244: ldr r0, _020994b4 ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb _0209925c: ldrb r0, [r6, #0x2e] cmp r0, #0 @@ -39131,7 +39131,7 @@ _0209928c: ldr r0, _020994b4 ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b08 + bl _ZN10PlayerBase12SetUpdatePosEb _020992a4: ldrb r0, [r6, #0x2f] cmp r0, #0 @@ -57528,37 +57528,37 @@ func_ov00_020a7aec: ; 0x020a7aec bx lr arm_func_end func_ov00_020a7aec - .global func_ov00_020a7af0 - arm_func_start func_ov00_020a7af0 -func_ov00_020a7af0: ; 0x020a7af0 + .global _ZN10PlayerBase8vfunc_04Ev + arm_func_start _ZN10PlayerBase8vfunc_04Ev +_ZN10PlayerBase8vfunc_04Ev: ; 0x020a7af0 mov r0, #1 bx lr - arm_func_end func_ov00_020a7af0 + arm_func_end _ZN10PlayerBase8vfunc_04Ev - .global func_ov00_020a7af8 - arm_func_start func_ov00_020a7af8 -func_ov00_020a7af8: ; 0x020a7af8 + .global _ZN10PlayerBase10GetEquipIdEv + arm_func_start _ZN10PlayerBase10GetEquipIdEv +_ZN10PlayerBase10GetEquipIdEv: ; 0x020a7af8 mvn r0, #0 bx lr - arm_func_end func_ov00_020a7af8 + arm_func_end _ZN10PlayerBase10GetEquipIdEv - .global func_ov00_020a7b00 - arm_func_start func_ov00_020a7b00 -func_ov00_020a7b00: ; 0x020a7b00 + .global _ZN10PlayerBase7CanMoveEv + arm_func_start _ZN10PlayerBase7CanMoveEv +_ZN10PlayerBase7CanMoveEv: ; 0x020a7b00 mov r0, #1 bx lr - arm_func_end func_ov00_020a7b00 + arm_func_end _ZN10PlayerBase7CanMoveEv - .global func_ov00_020a7b08 - arm_func_start func_ov00_020a7b08 -func_ov00_020a7b08: ; 0x020a7b08 + .global _ZN10PlayerBase12SetUpdatePosEb + arm_func_start _ZN10PlayerBase12SetUpdatePosEb +_ZN10PlayerBase12SetUpdatePosEb: ; 0x020a7b08 strb r1, [r0, #0x10] bx lr - arm_func_end func_ov00_020a7b08 + arm_func_end _ZN10PlayerBase12SetUpdatePosEb - .global func_ov00_020a7b10 - arm_func_start func_ov00_020a7b10 -func_ov00_020a7b10: ; 0x020a7b10 + .global _ZN10PlayerBase10SetVisibleEb + arm_func_start _ZN10PlayerBase10SetVisibleEb +_ZN10PlayerBase10SetVisibleEb: ; 0x020a7b10 stmdb sp!, {r4, r5, r6, lr} mov r6, r0 mov r4, r1 @@ -57578,9 +57578,9 @@ func_ov00_020a7b10: ; 0x020a7b10 moveq r0, #0 mov r0, r0, lsl #0x10 mov r5, r0, asr #0x10 - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv strh r5, [r0, #0x5c] - bl func_ov00_020a7b9c + bl _ZN10PlayerBase14GetEquipShieldEv ldr r1, _020a7b88 ; =data_027e0e58 strh r5, [r0, #0xe] ldr r0, [r1] @@ -57589,33 +57589,33 @@ func_ov00_020a7b10: ; 0x020a7b10 bl func_ov00_0207c5d4 ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_020a7b10 + arm_func_end _ZN10PlayerBase10SetVisibleEb _020a7b84: .word gItemManager _020a7b88: .word data_027e0e58 - .global func_ov00_020a7b8c - arm_func_start func_ov00_020a7b8c -func_ov00_020a7b8c: ; 0x020a7b8c + .global _ZN10PlayerBase13GetEquipSwordEv + arm_func_start _ZN10PlayerBase13GetEquipSwordEv +_ZN10PlayerBase13GetEquipSwordEv: ; 0x020a7b8c ldr ip, _020a7b98 ; =func_01fffcec mov r0, #0 bx ip .align 2, 0 - arm_func_end func_ov00_020a7b8c + arm_func_end _ZN10PlayerBase13GetEquipSwordEv _020a7b98: .word func_01fffcec - .global func_ov00_020a7b9c - arm_func_start func_ov00_020a7b9c -func_ov00_020a7b9c: ; 0x020a7b9c + .global _ZN10PlayerBase14GetEquipShieldEv + arm_func_start _ZN10PlayerBase14GetEquipShieldEv +_ZN10PlayerBase14GetEquipShieldEv: ; 0x020a7b9c ldr ip, _020a7ba8 ; =func_01fffcec mov r0, #1 bx ip .align 2, 0 - arm_func_end func_ov00_020a7b9c + arm_func_end _ZN10PlayerBase14GetEquipShieldEv _020a7ba8: .word func_01fffcec - .global func_ov00_020a7bac - arm_func_start func_ov00_020a7bac -func_ov00_020a7bac: ; 0x020a7bac + .global _ZN10PlayerBase6LookAtEP5Vec3p + arm_func_start _ZN10PlayerBase6LookAtEP5Vec3p +_ZN10PlayerBase6LookAtEP5Vec3p: ; 0x020a7bac stmdb sp!, {lr} sub sp, sp, #0xc mov r0, r1 @@ -57636,13 +57636,13 @@ func_ov00_020a7bac: ; 0x020a7bac add sp, sp, #0xc ldmia sp!, {pc} .align 2, 0 - arm_func_end func_ov00_020a7bac + arm_func_end _ZN10PlayerBase6LookAtEP5Vec3p _020a7bf8: .word data_027e0f94 _020a7bfc: .word data_027e0fac - .global func_ov00_020a7c00 - arm_func_start func_ov00_020a7c00 -func_ov00_020a7c00: ; 0x020a7c00 + .global _ZN10PlayerBase18func_ov00_020a7c00Ei + arm_func_start _ZN10PlayerBase18func_ov00_020a7c00Ei +_ZN10PlayerBase18func_ov00_020a7c00Ei: ; 0x020a7c00 ldr r0, _020a7c18 ; =data_027e0c54 ldrb r0, [r0] cmp r1, r0 @@ -57650,12 +57650,12 @@ func_ov00_020a7c00: ; 0x020a7c00 movne r0, #0 bx lr .align 2, 0 - arm_func_end func_ov00_020a7c00 + arm_func_end _ZN10PlayerBase18func_ov00_020a7c00Ei _020a7c18: .word data_027e0c54 - .global func_ov00_020a7c1c - arm_func_start func_ov00_020a7c1c -func_ov00_020a7c1c: ; 0x020a7c1c + .global _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder + arm_func_start _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder +_ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder: ; 0x020a7c1c stmdb sp!, {r4, lr} sub sp, sp, #0x10 ldr r2, [r0] @@ -57673,11 +57673,11 @@ func_ov00_020a7c1c: ; 0x020a7c1c bl func_01ffec34 add sp, sp, #0x10 ldmia sp!, {r4, pc} - arm_func_end func_ov00_020a7c1c + arm_func_end _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder - .global func_ov00_020a7c60 - arm_func_start func_ov00_020a7c60 -func_ov00_020a7c60: ; 0x020a7c60 + .global _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i + arm_func_start _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i +_ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i: ; 0x020a7c60 stmdb sp!, {r4, r5, r6, lr} sub sp, sp, #0x28 ldr ip, [r0] @@ -57711,23 +57711,23 @@ func_ov00_020a7c60: ; 0x020a7c60 bl func_ov00_0208f030 add sp, sp, #0x28 ldmia sp!, {r4, r5, r6, pc} - arm_func_end func_ov00_020a7c60 + arm_func_end _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i - .global func_ov00_020a7ce4 - arm_func_start func_ov00_020a7ce4 -func_ov00_020a7ce4: ; 0x020a7ce4 + .global _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi + arm_func_start _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi +_ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi: ; 0x020a7ce4 ldr r0, _020a7cf4 ; =gItemManager ldr ip, _020a7cf8 ; =_ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi ldr r0, [r0] bx ip .align 2, 0 - arm_func_end func_ov00_020a7ce4 + arm_func_end _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi _020a7cf4: .word gItemManager _020a7cf8: .word _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pi - .global func_ov00_020a7cfc - arm_func_start func_ov00_020a7cfc -func_ov00_020a7cfc: ; 0x020a7cfc + .global _ZN10PlayerBase18EquipItem_vfunc_2cEv + arm_func_start _ZN10PlayerBase18EquipItem_vfunc_2cEv +_ZN10PlayerBase18EquipItem_vfunc_2cEv: ; 0x020a7cfc stmdb sp!, {r3, lr} ldr r1, [r0] ldr r1, [r1, #8] @@ -57742,12 +57742,12 @@ func_ov00_020a7cfc: ; 0x020a7cfc bl _ZN11ItemManager18EquipItem_vfunc_2cEi ldmia sp!, {r3, pc} .align 2, 0 - arm_func_end func_ov00_020a7cfc + arm_func_end _ZN10PlayerBase18EquipItem_vfunc_2cEv _020a7d30: .word gItemManager - .global func_ov00_020a7d34 - arm_func_start func_ov00_020a7d34 -func_ov00_020a7d34: ; 0x020a7d34 + .global _ZN10PlayerBase9SetHealthEs + arm_func_start _ZN10PlayerBase9SetHealthEs +_ZN10PlayerBase9SetHealthEs: ; 0x020a7d34 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 ldrb r2, [r5, #0x12] @@ -57771,11 +57771,11 @@ _020a7d7c: movlt r0, #0 strlth r0, [r5, #0xa] ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_020a7d34 + arm_func_end _ZN10PlayerBase9SetHealthEs - .global func_ov00_020a7d8c - arm_func_start func_ov00_020a7d8c -func_ov00_020a7d8c: ; 0x020a7d8c + .global _ZN10PlayerBase9AddHealthEs + arm_func_start _ZN10PlayerBase9AddHealthEs +_ZN10PlayerBase9AddHealthEs: ; 0x020a7d8c stmdb sp!, {r3, r4, r5, lr} mov r4, r0 ldrb r2, [r4, #0x12] @@ -57803,11 +57803,11 @@ _020a7de4: movlt r0, #0 strlth r0, [r4, #0xa] ldmia sp!, {r3, r4, r5, pc} - arm_func_end func_ov00_020a7d8c + arm_func_end _ZN10PlayerBase9AddHealthEs - .global func_ov00_020a7df4 - arm_func_start func_ov00_020a7df4 -func_ov00_020a7df4: ; 0x020a7df4 + .global _ZN10PlayerBase8TeleportEP5Vec3psibb + arm_func_start _ZN10PlayerBase8TeleportEP5Vec3psibb +_ZN10PlayerBase8TeleportEP5Vec3psibb: ; 0x020a7df4 stmdb sp!, {r3, r4, r5, r6, lr} sub sp, sp, #0x1c ldr r3, _020a7e6c ; =data_027e0e60 @@ -57839,12 +57839,12 @@ func_ov00_020a7df4: ; 0x020a7df4 add sp, sp, #0x1c ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 - arm_func_end func_ov00_020a7df4 + arm_func_end _ZN10PlayerBase8TeleportEP5Vec3psibb _020a7e6c: .word data_027e0e60 - .global func_ov00_020a7e70 - arm_func_start func_ov00_020a7e70 -func_ov00_020a7e70: ; 0x020a7e70 + .global _ZN10PlayerBase18TeleportToEntranceEib + arm_func_start _ZN10PlayerBase18TeleportToEntranceEib +_ZN10PlayerBase18TeleportToEntranceEib: ; 0x020a7e70 stmdb sp!, {r4, r5, lr} sub sp, sp, #0xc mov r5, r1 @@ -57909,7 +57909,7 @@ _020a7f58: add sp, sp, #0xc ldmia sp!, {r4, r5, pc} .align 2, 0 - arm_func_end func_ov00_020a7e70 + arm_func_end _ZN10PlayerBase18TeleportToEntranceEib _020a7f64: .word data_027e0f94 _020a7f68: .word data_027e0e60 _020a7f6c: .word data_027e0fac @@ -57920,9 +57920,9 @@ _020a7f7c: .word data_027e0fe4 _020a7f80: .word data_027e0f74 _020a7f84: .word data_027e0f64 - .global func_ov00_020a7f88 - arm_func_start func_ov00_020a7f88 -func_ov00_020a7f88: ; 0x020a7f88 + .global _ZN10PlayerBase22TeleportToLastEntranceEb + arm_func_start _ZN10PlayerBase22TeleportToLastEntranceEb +_ZN10PlayerBase22TeleportToLastEntranceEb: ; 0x020a7f88 stmdb sp!, {r3, lr} ldr r3, [r0] mov r2, r1 @@ -57930,7 +57930,7 @@ func_ov00_020a7f88: ; 0x020a7f88 ldr r3, [r3, #0x38] blx r3 ldmia sp!, {r3, pc} - arm_func_end func_ov00_020a7f88 + arm_func_end _ZN10PlayerBase22TeleportToLastEntranceEb .rodata .global data_ov00_020d8798 @@ -68917,13 +68917,13 @@ data_ov00_020e55d8: ; 0x020e55d8 .byte 0x00, 0x00, 0x00, 0x00 .global data_ov00_020e55dc data_ov00_020e55dc: ; 0x020e55dc - .word func_ov00_020a7af0 + .word _ZN10PlayerBase8vfunc_04Ev .global data_ov00_020e55e0 data_ov00_020e55e0: ; 0x020e55e0 - .word func_ov00_020a7af8 + .word _ZN10PlayerBase10GetEquipIdEv .global data_ov00_020e55e4 data_ov00_020e55e4: ; 0x020e55e4 - .word func_ov00_020a7b00 + .word _ZN10PlayerBase7CanMoveEv .global data_ov00_020e55e8 data_ov00_020e55e8: ; 0x020e55e8 .byte 0x00, 0x00, 0x00, 0x00 @@ -68953,16 +68953,16 @@ data_ov00_020e5608: ; 0x020e5608 .byte 0x00, 0x00, 0x00, 0x00 .global data_ov00_020e560c data_ov00_020e560c: ; 0x020e560c - .word func_ov00_020a7e70 + .word _ZN10PlayerBase18TeleportToEntranceEib .global data_ov00_020e5610 data_ov00_020e5610: ; 0x020e5610 - .word func_ov00_020a7df4 + .word _ZN10PlayerBase8TeleportEP5Vec3psibb .global data_ov00_020e5614 data_ov00_020e5614: ; 0x020e5614 - .word func_ov00_020a7f88 + .word _ZN10PlayerBase22TeleportToLastEntranceEb .global data_ov00_020e5618 data_ov00_020e5618: ; 0x020e5618 - .word func_ov00_020a7d8c + .word _ZN10PlayerBase9AddHealthEs .global data_ov00_020e561c data_ov00_020e561c: ; 0x020e561c .byte 0x00, 0x00, 0x00, 0x00 diff --git a/asm/ov00/ov00_020a8e04.s b/asm/ov00/ov00_020a8e04.s index 579835e0..077f66c1 100644 --- a/asm/ov00/ov00_020a8e04.s +++ b/asm/ov00/ov00_020a8e04.s @@ -78,7 +78,7 @@ func_ov00_020a8e58: ; 0x020a8e58 mov r1, #1 ldr r2, [r2, #0x28] blx r2 - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv mvn r1, #0 bl func_ov00_020c06b0 ldr r0, _020a8ec8 ; =data_ov00_020eec9c @@ -406,7 +406,7 @@ func_ov00_020a9210: ; 0x020a9210 str r1, [r4, #8] ldmia sp!, {r4, r5, pc} _020a926c: - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv ldr r2, [r0] mov r1, #1 ldr r2, [r2, #0x14] diff --git a/asm/ov00/ov00_020ae7a4.s b/asm/ov00/ov00_020ae7a4.s index 2e22e871..ff3f4cc5 100644 --- a/asm/ov00/ov00_020ae7a4.s +++ b/asm/ov00/ov00_020ae7a4.s @@ -16582,7 +16582,7 @@ func_ov00_020bbabc: ; 0x020bbabc ldrb r0, [r0, #0x26] cmp r0, #0 beq _020bbb10 - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv ldr r0, [r0, #0x40] cmp r0, #3 addls pc, pc, r0, lsl #2 @@ -16613,7 +16613,7 @@ func_ov00_020bbb18: ; 0x020bbb18 ldrb r0, [r0, #0x26] cmp r0, #0 beq _020bbb5c - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv ldr r0, [r0, #0x40] cmp r0, #5 cmpne r0, #6 @@ -16855,7 +16855,7 @@ _020bbdd8: moveq r1, #0 cmp r1, #0 bne _020bbe44 - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv ldr r0, [r0, #0x40] cmp r0, #7 cmpne r0, #8 @@ -17839,7 +17839,7 @@ func_ov00_020bca4c: ; 0x020bca4c add r4, r0, #0 add r2, r1, #0 ldrh r1, [r4, #0xe] - blx func_ov00_020a7df4 + blx _ZN10PlayerBase8TeleportEP5Vec3psibb cmp r0, #0 beq _020bca86 add r0, r4, #0 @@ -17875,7 +17875,7 @@ _020bca90: .word data_027e0d3c func_ov00_020bca94: ; 0x020bca94 stmdb sp!, {r4, lr} mov r4, r0 - bl func_ov00_020a7df4 + bl _ZN10PlayerBase8TeleportEP5Vec3psibb cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, pc} @@ -17886,7 +17886,7 @@ func_ov00_020bca94: ; 0x020bca94 mov r1, #1 strb r3, [r4, #0x5c] strh r2, [r4, #0x48] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb mov r0, #1 ldmia sp!, {r4, pc} .align 2, 0 @@ -17906,7 +17906,7 @@ func_ov00_020bcad8: ; 0x020bcad8 mov r5, r2 mov r4, r3 str ip, [sp, #4] - bl func_ov00_020a7e70 + bl _ZN10PlayerBase18TeleportToEntranceEib cmp r0, #0 beq _020bcc08 ldr r0, _020bcc14 ; =data_027e0d38 @@ -18010,7 +18010,7 @@ func_ov00_020bcc2c: ; 0x020bcc2c ldrsh r2, [r2, #0x5a] cmp r2, #4 bne _020bcc60 - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder ldmia sp!, {r3, pc} _020bcc60: mov r0, #0 @@ -18611,7 +18611,7 @@ func_ov00_020bd364: ; 0x020bd364 ldr r2, [r1, #0xc] ldr r1, _020bd3ac ; =data_027e0f94 blx func_ov00_020b4c4c - bl func_ov00_020a7b9c + bl _ZN10PlayerBase14GetEquipShieldEv mov r1, #0 strb r1, [r0, #0xb] ldmia sp!, {r3, pc} @@ -24742,7 +24742,7 @@ _020c1e9c: ldr r0, _020c1ef4 ; =data_027e0f90 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 addeq sp, sp, #0x1c moveq r0, #0 @@ -24776,7 +24776,7 @@ func_ov00_020c1ef8: ; 0x020c1ef8 ldr r0, _020c1f58 ; =data_027e0f90 mov r1, r6 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} @@ -24809,7 +24809,7 @@ func_ov00_020c1f5c: ; 0x020c1f5c ldr r0, [r0] mov r2, r5 mov r3, r4 - bl func_ov00_020a7c60 + bl _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} @@ -24860,7 +24860,7 @@ func_ov00_020c1fc8: ; 0x020c1fc8 strb r2, [sp, #0x48] str r1, [sp, #0x58] str r2, [sp, #0x5c] - bl func_ov00_020a7cfc + bl _ZN10PlayerBase18EquipItem_vfunc_2cEv mov r1, r5 ldr r5, [sp, #0x60] ldr r3, [sp, #0x64] @@ -24925,7 +24925,7 @@ _020c2110: strb r2, [sp, #0x18] str r1, [sp, #0x28] str r2, [sp, #0x2c] - bl func_ov00_020a7cfc + bl _ZN10PlayerBase18EquipItem_vfunc_2cEv ldr lr, [sp, #0x60] ldr ip, [sp, #0x64] ldr r3, [sp, #0x68] @@ -25016,7 +25016,7 @@ func_ov00_020c2238: ; 0x020c2238 mov r1, r5 ldr r0, [r0] mov r2, #1 - bl func_ov00_020a7ce4 + bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi cmp r0, #0 addne sp, sp, #0xc movne r0, #1 @@ -25049,7 +25049,7 @@ func_ov00_020c22b8: ; 0x020c22b8 ldr r0, _020c23bc ; =data_027e0f90 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 addne sp, sp, #0x10 movne r0, #1 @@ -25061,7 +25061,7 @@ _020c2308: add r1, sp, #0 ldr r0, [r0] mov r2, #0 - bl func_ov00_020a7ce4 + bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi cmp r0, #0 addne sp, sp, #0x10 movne r0, #1 @@ -25095,7 +25095,7 @@ _020c2384: add r1, sp, #0 ldr r0, [r0] mov r2, #8 - bl func_ov00_020a7ce4 + bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi cmp r0, #0 addne sp, sp, #0x10 movne r0, #1 @@ -36837,7 +36837,7 @@ _020cb6fc: strb r0, [sp, #4] strb r0, [sp, #0x14] strb r0, [sp, #0x15] - bl func_ov00_020a7b8c + bl _ZN10PlayerBase13GetEquipSwordEv mov r1, #0xf6 mov r2, #0 bl func_ov00_020bf008 @@ -37372,14 +37372,14 @@ _020cbdfc: ldrb r0, [r4, #0x15] cmp r0, #0 beq _020cbe20 - bl func_ov00_020a7b9c + bl _ZN10PlayerBase14GetEquipShieldEv add r2, r5, #0x48 mov r1, #0x18c mov r3, #0 bl func_ov00_020c070c b _020cbec0 _020cbe20: - bl func_ov00_020a7b9c + bl _ZN10PlayerBase14GetEquipShieldEv add r2, r5, #0x48 mvn r1, #0 mov r3, #0 @@ -37389,14 +37389,14 @@ _020cbe38: ldrb r0, [r4, #0x15] cmp r0, #0 beq _020cbe5c - bl func_ov00_020a7b9c + bl _ZN10PlayerBase14GetEquipShieldEv add r2, r5, #0x48 mov r1, #0x18c mov r3, #0 bl func_ov00_020c070c b _020cbec0 _020cbe5c: - bl func_ov00_020a7b9c + bl _ZN10PlayerBase14GetEquipShieldEv add r2, r5, #0x48 mvn r1, #0 mov r3, #0 @@ -60302,7 +60302,7 @@ data_ov00_020e6c88: ; 0x020e6c88 .word func_ov00_020bb44c - 1 .global data_ov00_020e6c8c data_ov00_020e6c8c: ; 0x020e6c8c - .word func_ov00_020a7af0 + .word _ZN10PlayerBase8vfunc_04Ev .global data_ov00_020e6c90 data_ov00_020e6c90: ; 0x020e6c90 .word func_ov00_020bc6d4 - 1 @@ -60347,7 +60347,7 @@ data_ov00_020e6cc4: ; 0x020e6cc4 .word func_ov00_020bca4c .global data_ov00_020e6cc8 data_ov00_020e6cc8: ; 0x020e6cc8 - .word func_ov00_020a7d8c + .word _ZN10PlayerBase9AddHealthEs .global data_ov00_020e6ccc data_ov00_020e6ccc: ; 0x020e6ccc .byte 0x00, 0x00, 0x00, 0x00 diff --git a/asm/ov05.s b/asm/ov05.s index ecb5f4ef..2a4e328d 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -16250,7 +16250,7 @@ func_ov05_0210e4e4: ; 0x0210e4e4 _0210e52c: mov r0, r6 mov r1, r5 - bl func_ov00_020a7c00 + bl _ZN10PlayerBase18func_ov00_020a7c00Ei cmp r0, #0 beq _0210e838 ldr r0, _0210e87c ; =data_027e0fcc diff --git a/asm/ov12.s b/asm/ov12.s index e0be7345..e13b5f36 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -8530,7 +8530,7 @@ _02119ac4: bl func_ov05_0210e4e4 mov r0, r6 mov r1, r5 - bl func_ov00_020a7c00 + bl _ZN10PlayerBase18func_ov00_020a7c00Ei cmp r0, #0 ldmeqia sp!, {r3, r4, r5, r6, r7, pc} ldr r0, _02119dc4 ; =gItemManager @@ -8800,7 +8800,7 @@ _02119e90: moveq r2, #0 mov r0, r6 strb r2, [r6, #0x74] - bl func_ov00_020a7c00 + bl _ZN10PlayerBase18func_ov00_020a7c00Ei cmp r0, #0 beq _0211a378 cmp r4, #0 @@ -38118,7 +38118,7 @@ _02131c18: ldr r0, _02131d74 ; =data_027e0f90 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 bne _02131c88 ldr r0, [r4, #0x748] @@ -46212,7 +46212,7 @@ data_ov12_02135db4: ; 0x02135db4 .word func_ov00_020bca4c .global data_ov12_02135db8 data_ov12_02135db8: ; 0x02135db8 - .word func_ov00_020a7d8c + .word _ZN10PlayerBase9AddHealthEs .global data_ov12_02135dbc data_ov12_02135dbc: ; 0x02135dbc .word func_ov12_0211933c diff --git a/asm/ov14.s b/asm/ov14.s index caa626be..429ca789 100644 --- a/asm/ov14.s +++ b/asm/ov14.s @@ -11281,7 +11281,7 @@ _02128938: ldr r0, _021289a0 ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb mov r0, r7 mov r1, r6 bl func_ov14_02126b04 @@ -11347,7 +11347,7 @@ _02128a18: ldr r0, _02128d70 ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb b _02128d64 _02128a2c: ldr r0, _02128d74 ; =data_027e0f74 @@ -18775,7 +18775,7 @@ _0212e97c: ldr r0, _0212eb3c ; =data_027e0f90 mov r1, #0 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, _0212eb40 ; =data_027e0fe4 mov r1, #0 ldr r0, [r0] @@ -18824,7 +18824,7 @@ _0212eacc: ldr r0, _0212eb3c ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, _0212eb40 ; =data_027e0fe4 mov r2, #1 ldr r1, [r0] @@ -39555,7 +39555,7 @@ func_ov14_0213f104: ; 0x0213f104 mov r4, r0 mov r7, r1 mov r6, r2 - bl func_ov00_020a7c00 + bl _ZN10PlayerBase18func_ov00_020a7c00Ei movs r5, r0 beq _0213f170 ldr r0, _0213f318 ; =gItemManager @@ -39873,7 +39873,7 @@ _0213f4f2: blx func_ov05_02103ff0 add r0, r5, #0 mov r1, #0x20 - blx func_ov00_020a7d34 + blx _ZN10PlayerBase9SetHealthEs cmp r4, #0 bne _0213f510 add r0, r5, #0 @@ -39977,7 +39977,7 @@ func_ov14_0213f5a8: ; 0x0213f5a8 func_ov14_0213f5dc: ; 0x0213f5dc stmdb sp!, {r4, lr} mov r4, r0 - bl func_ov00_020a7d8c + bl _ZN10PlayerBase9AddHealthEs ldr r0, _0213f5fc ; =data_027e0fbc ldrsh r1, [r4, #0xa] ldr r0, [r0] diff --git a/asm/ov15.s b/asm/ov15.s index b21f34a7..a3a616b0 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -17385,7 +17385,7 @@ _0212dbf4: ldr r0, _0212dd1c ; =data_027e0f90 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _0212dcf8 _0212dcdc: @@ -31478,7 +31478,7 @@ func_ov15_0213a184: ; 0x0213a184 stmdb sp!, {r3, r4, r5, lr} mov r5, r0 mov r4, r2 - bl func_ov00_020a7c00 + bl _ZN10PlayerBase18func_ov00_020a7c00Ei cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} ldr r0, _0213a454 ; =gItemManager @@ -31706,7 +31706,7 @@ _0213a4b0: mov r2, r6 mov r3, r5 str ip, [sp, #4] - bl func_ov00_020a7e70 + bl _ZN10PlayerBase18TeleportToEntranceEib cmp r0, #0 addeq sp, sp, #8 moveq r0, #0 @@ -97265,7 +97265,7 @@ func_ov15_021724d0: ; 0x021724d0 ldr r0, _021725c4 ; =data_027e0f90 add r1, sp, #0x1c ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 addeq sp, sp, #0x2c ldmeqia sp!, {r3, r4, pc} @@ -131913,13 +131913,13 @@ data_ov15_0218aaac: ; 0x0218aaac .word func_ov15_0213a604 .global data_ov15_0218aab0 data_ov15_0218aab0: ; 0x0218aab0 - .word func_ov00_020a7af0 + .word _ZN10PlayerBase8vfunc_04Ev .global data_ov15_0218aab4 data_ov15_0218aab4: ; 0x0218aab4 - .word func_ov00_020a7af8 + .word _ZN10PlayerBase10GetEquipIdEv .global data_ov15_0218aab8 data_ov15_0218aab8: ; 0x0218aab8 - .word func_ov00_020a7b00 + .word _ZN10PlayerBase7CanMoveEv .global data_ov15_0218aabc data_ov15_0218aabc: ; 0x0218aabc .word func_ov15_02139ef4 @@ -131952,13 +131952,13 @@ data_ov15_0218aae0: ; 0x0218aae0 .word func_ov15_0213a480 .global data_ov15_0218aae4 data_ov15_0218aae4: ; 0x0218aae4 - .word func_ov00_020a7df4 + .word _ZN10PlayerBase8TeleportEP5Vec3psibb .global data_ov15_0218aae8 data_ov15_0218aae8: ; 0x0218aae8 .word func_ov15_0213a618 .global data_ov15_0218aaec data_ov15_0218aaec: ; 0x0218aaec - .word func_ov00_020a7d8c + .word _ZN10PlayerBase9AddHealthEs .global data_ov15_0218aaf0 data_ov15_0218aaf0: ; 0x0218aaf0 .word func_ov15_021412b0 diff --git a/asm/ov19.s b/asm/ov19.s index 4bd9b174..f85ff109 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -3454,7 +3454,7 @@ _021703a4: ldr r0, _02170560 ; =data_027e0f90 mov r1, #0 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb mov r0, r4 bl func_ov00_020c1b18 mov r0, #0 @@ -9179,7 +9179,7 @@ _02174f38: ldr r0, _0217558c ; =data_027e0f90 add r1, sp, #0x38 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _02174fa8 mov r0, r4 diff --git a/asm/ov20.s b/asm/ov20.s index ff45b818..2e1bc058 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -936,7 +936,7 @@ _0216e3dc: ldr r0, _0216e554 ; =data_027e0f90 mov r1, r4 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb mov r0, r7 bl func_ov00_020c1b18 mov r0, #0x1f diff --git a/asm/ov23.s b/asm/ov23.s index 2031b7f5..ee82da97 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -6380,7 +6380,7 @@ func_ov23_02172928: ; 0x02172928 ldr r0, [r0] mov r1, r3 str r2, [sp, #0xc] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _02172984 mov r0, r4 @@ -6514,7 +6514,7 @@ func_ov23_02172b18: ; 0x02172b18 add r1, r4, #0x184 ldr r0, [r0] add r1, r1, #0x400 - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _02172b54 mov r0, r4 diff --git a/asm/ov24.s b/asm/ov24.s index 5a43e522..b7111934 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -9726,7 +9726,7 @@ _021754f4: ldr r0, [r0] add r1, r3, #0x400 mov r2, #0 - bl func_ov00_020a7ce4 + bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi cmp r0, #0 beq _02175624 bl func_ov24_02170468 diff --git a/asm/ov25.s b/asm/ov25.s index 3d59b91c..3e5ff199 100644 --- a/asm/ov25.s +++ b/asm/ov25.s @@ -13686,7 +13686,7 @@ func_ov25_02178d0c: ; 0x02178d0c ldr r0, _02178d88 ; =data_027e0f90 add r1, r4, #0x34c ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 addeq sp, sp, #0xc moveq r0, #0 diff --git a/asm/ov26.s b/asm/ov26.s index ec9d08fe..ec5f82ec 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -7098,7 +7098,7 @@ _02173010: ldr r0, _021732b0 ; =data_027e0f90 mov r1, #0 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, _021732b4 ; =data_027e0fe4 mov r1, #0 ldr r0, [r0] @@ -7149,7 +7149,7 @@ _02173160: ldr r0, _021732b0 ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, _021732b4 ; =data_027e0fe4 mov r2, #1 ldr r1, [r0] @@ -9780,7 +9780,7 @@ _02174d14: ldr r0, _02174ff0 ; =data_027e0f90 mov r1, #0 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb add r0, sp, #0xc bl func_ov00_0209a4f4 mvn r0, #0 @@ -9843,7 +9843,7 @@ _02174ea4: ldr r0, _02174ff0 ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, _02174fec ; =data_027e0f74 ldr r1, [r4, #0x68] ldr r0, [r0] diff --git a/asm/ov30.s b/asm/ov30.s index 9c0230ce..86ba4f25 100644 --- a/asm/ov30.s +++ b/asm/ov30.s @@ -8644,7 +8644,7 @@ func_ov30_02182ae4: ; 0x02182ae4 ldr r0, _02182b44 ; =data_027e0f90 mov r1, r6 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 moveq r0, #0 ldmeqia sp!, {r4, r5, r6, pc} diff --git a/asm/ov32.s b/asm/ov32.s index 483fa5bd..29a9a591 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -3858,7 +3858,7 @@ _0217ee34: add r3, sb, r3 mov r2, r1 str r3, [r2, #8] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _0217ef50 ldr r0, _0217efd0 ; =data_027e0fac @@ -7624,7 +7624,7 @@ _02182080: ldr r0, _021822a4 ; =data_027e0f90 mov r1, #0 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb b _0218226c _02182134: ldr r0, _02182294 ; =data_027e077c @@ -7708,7 +7708,7 @@ _0218223c: ldr r0, _021822a4 ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, _0218229c ; =data_027e0f64 ldr r0, [r0] bl func_ov00_0208b180 diff --git a/asm/ov35.s b/asm/ov35.s index 24c58b4f..b35c4145 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -7626,7 +7626,7 @@ func_ov35_02182720: ; 0x02182720 mov r4, r0 ldr r0, [r1] mov r1, #0 - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, [r4, #0x168] mov r1, #0x32000 add r0, r0, #0xc diff --git a/asm/ov36.s b/asm/ov36.s index 8c187057..0645c751 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -6739,7 +6739,7 @@ _02181b40: ldr r0, _02181ba0 ; =data_027e0f90 mov r1, #0 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r1, [r4, #0x6b4] mov r2, #0 strb r2, [r1, #0x11a] @@ -6950,7 +6950,7 @@ _02181e34: ldr r0, _02181f38 ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, _02181f24 ; =data_027e0e58 mov r1, #1 ldr r0, [r0] @@ -7234,7 +7234,7 @@ _02182270: ldr r0, _0218294c ; =data_027e0f90 mov r1, #0 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb mov r0, #1 strb r0, [r4, #0x8aa] mov r0, #0 @@ -7643,7 +7643,7 @@ _0218287c: ldr r0, _0218294c ; =data_027e0f90 mov r1, #1 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb mov r3, #0 mov r0, #0xff add r2, sp, #0x2c @@ -7911,7 +7911,7 @@ func_ov36_02182c88: ; 0x02182c88 mov r4, r0 ldr r0, [r1] mov r1, #0 - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb ldr r0, [r4, #0x168] ldr r0, [r0, #0x14] cmp r0, #0xa8000 diff --git a/asm/ov37.s b/asm/ov37.s index 41e73583..096441ee 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -817,7 +817,7 @@ _0217c814: ldr r0, _0217c918 ; =data_027e0f90 mov r1, r2 ldr r0, [r0] - bl func_ov00_020a7b10 + bl _ZN10PlayerBase10SetVisibleEb mov r0, r4 bl func_ov00_020c1b18 ldr r1, [r4, #0x14] @@ -13800,7 +13800,7 @@ func_ov37_02187c5c: ; 0x02187c5c str lr, [sp, #0x14] str r3, [sp, #0x10] str r2, [sp, #0x18] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 addeq sp, sp, #0x28 moveq r0, #0 @@ -13841,7 +13841,7 @@ func_ov37_02187cec: ; 0x02187cec str lr, [sp, #0x10] str ip, [sp, #0x14] str r2, [sp, #0x18] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _02187d78 mov r0, r4 diff --git a/asm/ov39.s b/asm/ov39.s index 2a9a012a..4e360295 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -3072,7 +3072,7 @@ _0217e6dc: mov r1, r5 mov r2, r6 mov r3, r8 - bl func_ov00_020a7c60 + bl _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i cmp r0, #0 movne sl, #1 cmp sl, #0 @@ -3513,7 +3513,7 @@ _0217ecdc: add r1, sp, #0 mov r2, #0 str r3, [sp, #0xc] - bl func_ov00_020a7ce4 + bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi cmp r0, #0 beq _0217edd8 ldr r0, [r4, #0x158] @@ -8421,7 +8421,7 @@ func_ov39_021831d8: ; 0x021831d8 add r1, r1, #1 str r1, [r4, #0x174] ldr r0, [r0] - bl func_ov00_020a7cfc + bl _ZN10PlayerBase18EquipItem_vfunc_2cEv add r1, r4, #0x100 ldrsh r2, [r1, #0x20] add r0, r2, r0 @@ -11551,7 +11551,7 @@ func_ov39_02185c3c: ; 0x02185c3c add r1, sp, #0x28 ldr r0, [r0] mov r2, #1 - bl func_ov00_020a7ce4 + bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi cmp r0, #0 beq _02185d1c bl func_ov39_02185ea8 diff --git a/asm/ov41.s b/asm/ov41.s index 986e1db1..964da192 100644 --- a/asm/ov41.s +++ b/asm/ov41.s @@ -4803,7 +4803,7 @@ func_ov41_0218d324: ; 0x0218d324 ldr r0, [r1] mov r1, r3 str r2, [sp, #0xc] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _0218d388 mov r0, r4 diff --git a/asm/ov43.s b/asm/ov43.s index abbf3d48..0bfac7de 100644 --- a/asm/ov43.s +++ b/asm/ov43.s @@ -1344,7 +1344,7 @@ func_ov43_0218a674: ; 0x0218a674 str sb, [sp, #0x1c] add r2, sb, r3 str r2, [r1, #8] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _0218a7ac ldr r0, _0218a858 ; =data_027e0fac diff --git a/asm/ov47.s b/asm/ov47.s index 5b6c94a2..df1e068f 100644 --- a/asm/ov47.s +++ b/asm/ov47.s @@ -4816,7 +4816,7 @@ _02194028: ldr r0, _0219410c ; =data_027e0f90 add r1, sp, #0 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _0219407c ldr r0, _0219410c ; =data_027e0f90 diff --git a/asm/ov48.s b/asm/ov48.s index 29923d89..257e6a95 100644 --- a/asm/ov48.s +++ b/asm/ov48.s @@ -782,7 +782,7 @@ func_ov48_021908ac: ; 0x021908ac ldr r0, [r0] add r1, sp, #0 str r2, [sp, #0xc] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 addeq sp, sp, #0x1c moveq r0, #0 @@ -2077,7 +2077,7 @@ _021918a4: ldr r0, [r0] add r1, sp, #0x44 add r2, sp, #0x38 - bl func_ov00_020a7c60 + bl _ZN10PlayerBase18func_ov00_020a7c60EP5Vec3pS1_i cmp r0, #0 beq _02191964 ldr r1, _02191c3c ; =data_027e0fac @@ -2096,7 +2096,7 @@ _021918a4: ldr r0, _02191c38 ; =data_027e0f90 add r1, r4, #0x48 ldr r0, [r0] - bl func_ov00_020a7bac + bl _ZN10PlayerBase6LookAtEP5Vec3p mov r0, r4 bl func_ov00_020c28ec sub r0, r0, #0x800 @@ -3568,7 +3568,7 @@ _02192b5c: bl func_ov00_020c2a0c ldr r0, [sl] mov r1, r4 - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _02192bc4 add r0, sp, #0x6c diff --git a/asm/ov49.s b/asm/ov49.s index 9f10795d..9c5d2932 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -1368,7 +1368,7 @@ func_ov49_02196710: ; 0x02196710 ldr r0, [r0] add r1, sp, #0x98 str r2, [sp, #0xa4] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _02196788 mov r0, r5 @@ -1679,7 +1679,7 @@ _02196bec: ldr r0, _02196ff0 ; =data_027e0f90 add r1, sp, #0x70 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 beq _02196c54 mov r0, r5 diff --git a/asm/ov50.s b/asm/ov50.s index 78a2f39b..42f4afc2 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -1919,7 +1919,7 @@ func_ov50_02196ee4: ; 0x02196ee4 ldr r0, _02196f70 ; =data_027e0f90 add r1, sp, #0x18 ldr r0, [r0] - bl func_ov00_020a7c1c + bl _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder cmp r0, #0 addne sp, sp, #0x28 movne r0, #1 diff --git a/asm/ov51.s b/asm/ov51.s index cff7f7e3..b3a5ce76 100644 --- a/asm/ov51.s +++ b/asm/ov51.s @@ -1209,7 +1209,7 @@ _021963d4: ldr r0, [r4] mov r1, r5 mov r2, #0 - bl func_ov00_020a7ce4 + bl _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi cmp r0, #0 beq _02196450 ldr r0, [r4]