diff --git a/asm/include/ov12.inc b/asm/include/ov12.inc index 98dbe3c9..357bbcd8 100644 --- a/asm/include/ov12.inc +++ b/asm/include/ov12.inc @@ -145,7 +145,7 @@ .extern func_01fffd04 .extern func_01ff9bf8 .extern func_01ff9cec -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c288c .extern func_ov00_020c2938 .extern func_ov00_020c2938 @@ -157,7 +157,7 @@ .extern func_01fffd04 .extern func_01ff9bf8 .extern func_01ff9cec -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c5d74 .extern func_ov00_020c5d74 .extern func_0202b2f8 @@ -301,9 +301,9 @@ .extern data_027e0fec .extern func_0201b1bc .extern func_0201b1bc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0ecc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0ecc .extern func_ov00_020c0e04 .extern func_0202e310 @@ -1035,7 +1035,7 @@ .extern func_01ff9b4c .extern func_ov00_020d77e4 .extern func_ov00_020d77e4 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_ov00_020eec9c .extern func_ov00_020d77e4 .extern func_ov00_020d77e4 @@ -1803,8 +1803,8 @@ .extern data_027e0e60 .extern data_027e0764 .extern func_ov00_020b1940 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020c0e24 .extern func_ov00_020d77e4 .extern func_ov00_020d77e4 @@ -1954,7 +1954,7 @@ .extern data_027e0fec .extern func_ov00_020c0e24 .extern func_ov00_020c0e24 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c22b8 .extern func_ov00_020c70ac .extern func_ov00_020d77e4 diff --git a/asm/include/ov14.inc b/asm/include/ov14.inc index 2934e723..e25978ef 100644 --- a/asm/include/ov14.inc +++ b/asm/include/ov14.inc @@ -272,7 +272,7 @@ .extern func_0204f8d4 .extern func_ov00_020c0e04 .extern func_01ff98e0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02083978 .extern func_ov00_02083a1c .extern func_ov00_020840c4 @@ -1243,11 +1243,11 @@ .extern func_01ff9bf8 .extern func_01ff9bc4 .extern func_ov00_0208b9cc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0e04 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020843ec .extern func_ov00_020843ec .extern data_027e0e60 @@ -1439,8 +1439,8 @@ .extern _ZN9SysObjectdlEPv .extern func_ov00_02083f80 .extern data_027e0e60 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_020370d0 .extern data_027e0c68 .extern func_ov00_020840a0 @@ -1591,7 +1591,7 @@ .extern func_ov00_020840c4 .extern func_ov00_0208b9e4 .extern data_027e0e60 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0208b9e4 .extern func_ov00_0208c3a4 .extern func_ov00_0208c468 @@ -1599,7 +1599,7 @@ .extern func_ov00_0208b9e4 .extern func_ov00_0208c3a4 .extern func_ov00_0208b9e4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0208b9e4 .extern func_ov00_0208c3a4 .extern func_ov00_02097738 @@ -1607,9 +1607,9 @@ .extern func_ov00_02098058 .extern func_ov00_02098058 .extern func_ov00_0208ba08 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0208b9e4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0208b9e4 .extern data_027e077c .extern data_027e0f74 @@ -2095,8 +2095,8 @@ .extern func_ov00_020c2b00 .extern func_01ff9bf8 .extern func_01ff9bc4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020c3070 .extern func_0202bbbc .extern func_ov00_020bba14 @@ -2817,8 +2817,8 @@ .extern func_ov57_02198e80 .extern func_ov57_02198fc0 .extern func_ov57_02199104 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_0208f030 .extern data_02050f54 .extern func_01ff9bf8 @@ -3310,14 +3310,14 @@ .extern func_ov00_02097bac .extern func_ov00_02097b9c .extern func_ov00_02098058 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_020038a4 .extern func_ov00_020cecd8 .extern func_ov00_020ceacc .extern func_ov00_02097bac .extern func_ov00_02097b9c .extern func_ov00_02098058 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_020038a4 .extern func_ov00_02097b9c .extern func_ov00_02098058 @@ -4125,11 +4125,11 @@ .extern func_ov00_02097b9c .extern func_ov00_02098058 .extern func_ov00_020884b4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02097738 .extern func_ov00_0208c3a4 .extern func_ov00_0208b9e4 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_ov00_020eec9c .extern data_027e0ffc .extern data_027e0f74 @@ -4211,7 +4211,7 @@ .extern func_0201926c .extern data_027e0e60 .extern func_01ff9ec0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff98e0 .extern func_01ff9bf8 .extern func_01ffa0f4 diff --git a/asm/include/ov15.inc b/asm/include/ov15.inc index 7f098125..c07fa957 100644 --- a/asm/include/ov15.inc +++ b/asm/include/ov15.inc @@ -489,7 +489,7 @@ .extern data_027e0ffc .extern func_ov00_020ceacc .extern func_ov00_02083ee0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02083ee0 .extern func_ov00_020c3180 .extern func_0202e58c @@ -772,7 +772,7 @@ .extern func_ov00_02083ee0 .extern func_0202b418 .extern func_0202b418 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207a1c8 .extern data_027e0e60 .extern data_02050f54 @@ -1111,7 +1111,7 @@ .extern data_02050f54 .extern func_ov00_020c2974 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_020c2a0c .extern func_ov00_020c28d4 @@ -1126,7 +1126,7 @@ .extern func_0202b154 .extern func_ov00_020c2974 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_02036ce4 .extern func_ov00_020c1908 @@ -1200,9 +1200,9 @@ .extern func_ov00_020c288c .extern func_ov00_020ce284 .extern func_ov00_020c2938 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c2938 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 .extern func_01ff9bc4 .extern data_02050f54 @@ -1339,8 +1339,8 @@ .extern data_027e0e60 .extern data_027e10a4 .extern data_027e0c68 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020c1bfc .extern func_ov00_020836dc .extern func_ov00_020c198c @@ -1431,8 +1431,8 @@ .extern func_ov00_020c1c20 .extern func_ov00_020c66e4 .extern func_ov00_020836dc -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_0209779c .extern data_027e0f94 .extern data_027e0f64 @@ -1440,8 +1440,8 @@ .extern data_027e0f74 .extern data_027e0e2c .extern data_027e0e60 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020c198c .extern func_ov00_0209a4f4 .extern func_ov00_02097810 @@ -1449,7 +1449,7 @@ .extern func_02036ce4 .extern func_ov00_020c1908 .extern func_ov00_02087d34 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_02097b9c .extern func_ov00_02097bcc @@ -1467,7 +1467,7 @@ .extern func_ov00_020875f8 .extern func_ov00_0209779c .extern func_ov00_020c3180 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern data_027e0f94 .extern data_027e0d0c @@ -1977,10 +1977,10 @@ .extern data_027e0f94 .extern data_027e0e58 .extern func_ov00_020cec08 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020a61ac .extern func_01ff9bc4 .extern func_ov00_020a61ac @@ -2959,14 +2959,14 @@ .extern func_01ff98e0 .extern func_01ff98e0 .extern func_ov00_02082454 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0e60 .extern func_ov00_0209a4f4 .extern func_ov00_02097810 .extern func_ov00_0209a508 .extern func_01ff9bf8 .extern func_0202b2f8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020ceacc .extern func_ov00_020d73bc .extern func_ov00_02097bcc @@ -2990,7 +2990,7 @@ .extern func_01ff9bc4 .extern func_0202b154 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_02042f68 .extern func_ov00_020d83f0 .extern data_ov00_020eec9c @@ -3034,7 +3034,7 @@ .extern data_027e0ffc .extern data_027e0e60 .extern data_027e0d38 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9ec0 .extern func_01ff9bf8 .extern func_01ffa0f4 @@ -3055,7 +3055,7 @@ .extern func_ov00_0207c1f8 .extern func_ov00_0207c1f8 .extern func_ov00_020c7734 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020ceacc .extern func_ov00_020cec08 .extern func_ov00_020ceacc @@ -3092,7 +3092,7 @@ .extern func_01ff9bc4 .extern func_02042f74 .extern func_02002c14 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_02042f74 .extern func_02002c14 .extern func_0202b154 @@ -3101,16 +3101,16 @@ .extern func_0202b154 .extern func_02042f74 .extern func_02002c14 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_02042f74 .extern func_02002c14 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_02042f74 .extern func_02002c14 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_02042f74 .extern func_02002c14 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02089318 .extern data_027e0f64 .extern data_027e0f74 @@ -3124,8 +3124,8 @@ .extern data_ov00_020eec68 .extern data_027e0fe4 .extern data_02050f54 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_02087fc0 .extern data_027e0f64 .extern func_ov00_020a5e9c @@ -3144,7 +3144,7 @@ .extern data_ov00_020eec68 .extern func_02042f68 .extern func_ov00_020d83f0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020d77e4 .extern func_ov00_020d77e4 .extern func_ov00_020d77e4 @@ -4475,7 +4475,7 @@ .extern data_027e0e60 .extern data_027e0e58 .extern data_027e0ffc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9bf8 .extern func_01ffa0f4 @@ -4641,7 +4641,7 @@ .extern func_ov00_020c75f4 .extern func_ov00_0207c1b0 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202e58c .extern data_027e0e60 .extern data_027e0e58 @@ -4752,15 +4752,15 @@ .extern func_01ff98e0 .extern func_01ff98e0 .extern func_ov00_0209779c -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_0207c474 .extern func_ov00_02082d40 .extern func_ov00_020c198c .extern func_02036da8 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0f94 .extern data_027e10a8 .extern data_027e0e60 @@ -4792,7 +4792,7 @@ .extern func_01ff8214 .extern data_02050f54 .extern data_027e10a8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207c474 .extern data_027e10a8 .extern data_027e0e58 @@ -5070,8 +5070,8 @@ .extern func_ov00_020c3070 .extern func_ov00_020ceacc .extern func_01ff9bc4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_0202b154 .extern func_ov00_020ceacc .extern func_ov00_020ceacc @@ -5080,14 +5080,14 @@ .extern func_01ff9958 .extern func_0202b418 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207c474 .extern func_01ff9958 .extern func_ov00_020ce2f0 .extern func_ov03_020f3d74 .extern func_ov00_0207c474 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_02083ee0 .extern func_ov00_020ceacc @@ -5097,14 +5097,14 @@ .extern func_ov00_020c28ec .extern func_01ffa0f4 .extern func_ov00_02083ee0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020ceacc .extern func_ov00_02083ee0 .extern func_ov00_020c7734 .extern func_ov00_020c28ec .extern func_01ffa0f4 .extern func_ov00_02083ee0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020ceacc .extern func_ov00_020c3674 .extern func_ov00_0207c474 @@ -5437,11 +5437,11 @@ .extern func_01ff9cec .extern func_01ffa0f4 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_020c1500 .extern func_ov00_020c3348 @@ -5450,7 +5450,7 @@ .extern func_ov00_020a61ac .extern func_ov00_0207c1b0 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov05_0210826c .extern func_01ff9bc4 @@ -5460,17 +5460,17 @@ .extern func_ov00_020c2974 .extern func_0202b154 .extern func_ov00_02089318 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c1908 .extern func_ov00_020c2974 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02089318 .extern func_ov00_020c2974 .extern func_0202b154 .extern func_ov00_020c2938 .extern func_ov00_02089318 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_020c3070 .extern func_ov00_02083ee0 @@ -6183,8 +6183,8 @@ .extern func_ov00_020c1cf8 .extern func_ov00_0207a1c8 .extern data_02050f54 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov09_0211c428 .extern func_ov00_0207c1b0 .extern func_ov00_0207c1b0 @@ -6393,7 +6393,7 @@ .extern func_0201e544 .extern func_ov00_020c0c9c .extern func_ov00_020c5d74 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0e04 .extern func_ov00_02079e68 .extern func_02019534 @@ -6743,12 +6743,12 @@ .extern func_ov00_020d70a4 .extern func_ov00_0209a508 .extern func_ov00_02089a2c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02087d34 .extern func_ov00_02089318 .extern func_02036ce4 .extern func_ov00_020c1908 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02087d34 .extern func_ov00_02089318 .extern func_ov00_02097b9c @@ -6790,13 +6790,13 @@ .extern func_ov00_0209a508 .extern func_ov00_02087d34 .extern func_ov00_020c2974 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02089318 .extern func_ov00_020c1c20 .extern func_ov00_02078fac .extern func_ov00_02087d34 .extern func_ov00_020c2974 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02089318 .extern data_027e0e60 .extern data_027e0e58 @@ -6822,8 +6822,8 @@ .extern data_027e0fac .extern data_02050f54 .extern data_02050f54 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9cec .extern func_01ffa0f4 @@ -6879,7 +6879,7 @@ .extern data_027e071c .extern func_ov00_02087d34 .extern func_ov00_02083ee0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9ec0 .extern func_01ffa0f4 .extern func_ov00_02089318 @@ -7540,7 +7540,7 @@ .extern func_0202b418 .extern func_01ff98e0 .extern func_01ff98e0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9958 .extern func_0202b154 .extern data_027e0fac @@ -7791,7 +7791,7 @@ .extern func_ov00_020ceacc .extern data_027e0e58 .extern data_027e0ffc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_020a61ac .extern func_01ff9bc4 diff --git a/asm/include/ov17.inc b/asm/include/ov17.inc index adbc56a2..6e9e8f2d 100644 --- a/asm/include/ov17.inc +++ b/asm/include/ov17.inc @@ -182,7 +182,7 @@ .extern func_ov00_020d4478 .extern _ZN9SysObjectdlEPv .extern func_ov00_020d4494 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c3070 .extern func_01ff9bc4 .extern func_01ff9bc4 @@ -283,7 +283,7 @@ .extern func_01ff98e0 .extern func_01ff98e0 .extern func_ov26_0217287c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov26_021727b4 .extern func_ov00_020ceacc .extern func_ov00_0207c31c @@ -302,8 +302,8 @@ .extern data_027e0fc4 .extern func_ov00_020d4964 .extern func_ov00_020c313c -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern data_02050f54 .extern func_ov00_020c3070 .extern func_01ff9bc4 @@ -885,8 +885,8 @@ .extern func_ov00_02083368 .extern func_ov00_020840c4 .extern data_027e0e60 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020843ec .extern func_ov00_020843ec .extern func_ov00_020843ec @@ -1030,7 +1030,7 @@ .extern func_ov00_020cec60 .extern func_ov00_020c198c .extern func_ov00_02097bac -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207a1c8 .extern data_027e0ffc .extern data_027e0f74 diff --git a/asm/include/ov18.inc b/asm/include/ov18.inc index c7eef9f3..37cbc165 100644 --- a/asm/include/ov18.inc +++ b/asm/include/ov18.inc @@ -51,7 +51,7 @@ .extern data_027e0c68 .extern data_027e0f64 .extern func_ov00_02083a1c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0d68 .extern data_027e0f94 .extern data_027e0e60 @@ -967,7 +967,7 @@ .extern _ZN9SysObjectdlEPv .extern func_ov00_0208b9cc .extern func_ov00_0208b9e4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0208ba08 .extern func_ov00_0208ba08 .extern func_ov00_020ce8e4 @@ -1100,12 +1100,12 @@ .extern func_ov00_020c1fc8 .extern func_ov14_02145f0c .extern func_ov14_02145f0c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_020385b8 .extern func_ov00_020ab934 .extern func_ov14_02145f0c .extern data_027e0fc8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov14_02145cac .extern func_ov14_02145178 .extern func_ov00_020c5f1c @@ -1191,8 +1191,8 @@ .extern func_01ff98e0 .extern func_01ff98e0 .extern func_01ff98e0 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_0202b2e8 .extern func_0202b2e8 .extern data_02050f54 @@ -1228,11 +1228,11 @@ .extern func_01ff98e0 .extern func_01ff98e0 .extern func_01ff98e0 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk .extern func_ov14_0214a92c .extern func_ov00_020bcf50 .extern func_0202b418 @@ -1261,12 +1261,12 @@ .extern func_ov00_020ceacc .extern func_0202e310 .extern func_ov00_020ceacc -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov14_0214a92c .extern func_0202b3bc -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov14_0214a92c .extern func_ov00_02087d98 .extern func_0202b154 diff --git a/asm/include/ov19.inc b/asm/include/ov19.inc index 77bae0c2..e5a3e8c9 100644 --- a/asm/include/ov19.inc +++ b/asm/include/ov19.inc @@ -353,7 +353,7 @@ .extern func_ov00_0207c2e8 .extern data_027e0e58 .extern func_ov00_020b7e6c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c5f1c .extern func_ov00_020c6114 .extern func_ov00_020c0c08 @@ -403,7 +403,7 @@ .extern func_0201e544 .extern func_ov00_020c0c9c .extern func_ov00_020c5d74 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0e04 .extern func_ov00_02079e68 .extern func_02019534 @@ -634,7 +634,7 @@ .extern func_ov00_02094824 .extern func_ov00_0208b5a4 .extern _ZN9SysObjectdlEPv -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020cecd8 .extern func_ov00_02097bac .extern func_ov00_02097b9c @@ -642,7 +642,7 @@ .extern func_ov00_020bcfb8 .extern func_ov00_02098058 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020cecd8 .extern data_027e0ffc .extern data_027e0f74 diff --git a/asm/include/ov20.inc b/asm/include/ov20.inc index 43889a5c..79c28b54 100644 --- a/asm/include/ov20.inc +++ b/asm/include/ov20.inc @@ -224,7 +224,7 @@ .extern func_ov00_020ceacc .extern data_027e0ffc .extern data_027e0e58 -.extern func_0202b0f4 +.extern Approach_thunk .extern _ZN9SysObjectnwEmPjj .extern data_027e0fe0 .extern func_ov00_020ca668 diff --git a/asm/include/ov22.inc b/asm/include/ov22.inc index 034ee1d7..e4fc53a0 100644 --- a/asm/include/ov22.inc +++ b/asm/include/ov22.inc @@ -261,10 +261,10 @@ .extern func_ov14_0214610c .extern func_ov14_02145f0c .extern func_01ff9ec0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov14_0214610c .extern func_ov14_02145f0c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov14_021452b0 .extern data_027e0f94 .extern data_02050f54 @@ -359,10 +359,10 @@ .extern func_ov00_020c2974 .extern func_0202b154 .extern func_ov00_020c28d4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c2974 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c3070 .extern func_01fffd04 .extern data_02050f54 @@ -372,7 +372,7 @@ .extern func_ov00_020c2974 .extern func_01ff9e64 .extern func_01ff9bf8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202da8c .extern func_01ff9cec .extern func_ov00_020c5d74 @@ -834,7 +834,7 @@ .extern func_ov00_02097bac .extern func_ov00_02097b9c .extern func_ov00_02098058 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0f74 .extern func_ov00_0209a4f4 .extern func_ov00_02097810 @@ -986,14 +986,14 @@ .extern func_ov00_020c0e24 .extern data_027e0fc8 .extern func_ov00_020bbd60 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c1f5c .extern data_027e0764 .extern func_ov46_02193fac .extern data_027e0764 .extern func_ov46_02193fac .extern data_ov48_02194c8c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02094884 .extern func_0202e58c .extern func_0202e58c @@ -1035,7 +1035,7 @@ .extern func_0201e544 .extern func_ov00_020c0c9c .extern func_ov00_020c5d74 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0e04 .extern func_ov00_02079e68 .extern func_02019534 diff --git a/asm/include/ov23.inc b/asm/include/ov23.inc index 7b31e7a0..a5f60458 100644 --- a/asm/include/ov23.inc +++ b/asm/include/ov23.inc @@ -71,10 +71,10 @@ .extern func_ov14_0214610c .extern func_ov14_02145f0c .extern func_01ff9ec0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov14_0214610c .extern func_ov14_02145f0c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov14_021452b0 .extern data_027e0f94 .extern data_02050f54 @@ -1041,8 +1041,8 @@ .extern func_ov00_02098058 .extern func_ov00_02098058 .extern func_ov00_0207c1f8 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020b7e6c .extern func_ov00_02097bac .extern func_ov00_02097bac @@ -1050,8 +1050,8 @@ .extern func_ov00_02098058 .extern func_ov00_02098058 .extern func_ov00_0207c1f8 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020b7e6c .extern func_ov00_02097bac .extern data_027e0f74 diff --git a/asm/include/ov24.inc b/asm/include/ov24.inc index bb75d56b..ff074b51 100644 --- a/asm/include/ov24.inc +++ b/asm/include/ov24.inc @@ -27,7 +27,7 @@ .extern func_ov00_02093a5c .extern data_027e0e60 .extern data_027e0f6c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207a1c8 .extern func_01ff8214 .extern data_02050f54 @@ -69,7 +69,7 @@ .extern func_ov00_02098058 .extern func_ov00_02098058 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0208413c .extern func_0202b3bc .extern func_ov00_02097bac @@ -77,7 +77,7 @@ .extern func_ov00_02098058 .extern func_ov00_02098058 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0208413c .extern func_0202b3bc .extern func_ov00_02097bac @@ -1109,8 +1109,8 @@ .extern func_ov00_020cecd8 .extern func_ov00_02097b9c .extern func_ov00_02098058 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern data_027e0ffc .extern data_027e0f74 .extern func_ov00_0208ba08 diff --git a/asm/include/ov26.inc b/asm/include/ov26.inc index ee55f3b2..0d96ab56 100644 --- a/asm/include/ov26.inc +++ b/asm/include/ov26.inc @@ -1194,8 +1194,8 @@ .extern func_ov00_02098058 .extern func_ov05_0210a018 .extern func_ov00_02098058 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020c7764 .extern func_ov00_020ceacc .extern func_ov00_020bb68c diff --git a/asm/include/ov28.inc b/asm/include/ov28.inc index 0bd9e974..7f670d44 100644 --- a/asm/include/ov28.inc +++ b/asm/include/ov28.inc @@ -108,7 +108,7 @@ .extern func_ov00_020d70a4 .extern func_ov14_02145f0c .extern func_ov00_020c0e24 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0e24 .extern func_ov00_020c0e24 .extern func_ov00_020c0e24 @@ -148,9 +148,9 @@ .extern func_ov00_02097738 .extern func_ov14_0214aa0c .extern func_ov00_020c0e24 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b3bc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0e24 .extern func_ov00_020c0e24 .extern func_ov00_020c0e24 @@ -743,7 +743,7 @@ .extern func_ov00_02098058 .extern func_ov00_0207c1b0 .extern func_ov00_020d77e4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02097bcc .extern data_027e0f74 .extern data_027e0e58 @@ -1124,7 +1124,7 @@ .extern func_ov00_0207c1b0 .extern func_ov00_0207c1b0 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020ceacc .extern func_ov00_020b7e6c .extern func_ov00_020c5e20 @@ -1190,7 +1190,7 @@ .extern data_027e0fe4 .extern func_ov00_020c313c .extern func_ov00_020c2bf4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_020ccf0c .extern func_01ff9e64 diff --git a/asm/include/ov29.inc b/asm/include/ov29.inc index d6587cce..922dc90e 100644 --- a/asm/include/ov29.inc +++ b/asm/include/ov29.inc @@ -154,7 +154,7 @@ .extern func_02019570 .extern func_02019570 .extern func_02019570 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_02019570 .extern func_02019570 .extern func_02019570 @@ -296,7 +296,7 @@ .extern func_0201e544 .extern func_ov00_020c0cc8 .extern data_027e0764 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9e64 .extern func_ov00_020c1500 @@ -309,14 +309,14 @@ .extern data_027e0fe8 .extern data_027e0e58 .extern data_027e0ffc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9e64 .extern func_ov00_020c1500 .extern func_ov00_020c3348 .extern func_ov00_020c4048 .extern func_ov00_0207c1b0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c1e2c .extern func_ov00_0207c1b0 .extern func_ov00_020ceacc @@ -324,35 +324,35 @@ .extern data_027e0e58 .extern data_027e0ffc .extern data_027e0764 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9e64 .extern func_ov00_020c37ec .extern data_027e0fe4 .extern data_ov38_02189238 .extern data_027e0764 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9e64 .extern func_ov00_020c1500 .extern func_ov00_020c3348 .extern func_ov00_020c4048 .extern func_ov00_0207c1b0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c1e2c .extern func_ov00_0207c1b0 .extern func_ov00_020ceacc .extern data_027e0fe8 .extern data_027e0e58 .extern data_027e0ffc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9e64 .extern func_ov00_020c1500 .extern func_ov00_020c3348 .extern func_ov00_020c4048 .extern func_ov00_0207c1b0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c1e2c .extern func_ov00_0207c1b0 .extern func_ov00_020ceacc @@ -421,18 +421,18 @@ .extern func_ov00_020c2974 .extern data_027e0ffc .extern func_0202e58c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c1fc8 .extern func_ov00_020c243c .extern func_0202e58c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c1fc8 .extern func_ov00_020c243c .extern data_027e0f94 .extern func_01ff9bf8 .extern func_01ff9c2c -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_0202e310 .extern func_0202e310 .extern func_ov00_020ceacc @@ -554,9 +554,9 @@ .extern func_01ff9bc4 .extern func_0202b2e8 .extern func_ov38_021854e4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 .extern data_02050f54 .extern func_0202dc38 @@ -571,7 +571,7 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01ff9bf8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 .extern func_0202b154 .extern func_0202b2e8 @@ -583,11 +583,11 @@ .extern func_0202dc38 .extern func_02007908 .extern func_ov00_020c1e2c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 .extern func_0202b154 .extern func_0202b2e8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov38_021854e4 .extern data_027e0f94 .extern data_027e0e58 @@ -623,11 +623,11 @@ .extern data_02057200 .extern func_ov38_021854e4 .extern func_02007908 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_02050f54 .extern func_0202b2e8 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020d5a68 .extern func_ov00_020d5c54 .extern func_ov38_021854e4 @@ -640,7 +640,7 @@ .extern func_ov09_021136c4 .extern func_ov00_0207a1c8 .extern func_ov00_020c313c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0e24 .extern func_ov00_0207a1c8 .extern func_ov00_0207a1c8 @@ -702,7 +702,7 @@ .extern func_ov14_0213d420 .extern func_ov14_0213d5d0 .extern func_01ff9bc4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9bf8 .extern func_01fffb4c @@ -712,7 +712,7 @@ .extern func_ov00_020c7154 .extern func_ov38_02185720 .extern data_027e0d0c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_01ff9bf8 .extern func_01ff9cec @@ -720,7 +720,7 @@ .extern func_01ff9bc4 .extern func_ov00_020ceacc .extern func_01ff9bc4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c2974 .extern func_0202b154 .extern data_027e0ffc @@ -759,10 +759,10 @@ .extern func_ov00_0208b5a4 .extern _ZN9SysObjectdlEPv .extern func_ov00_020cecd8 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020bcfb8 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0ffc .extern data_027e0fc8 .extern func_ov00_0208ba08 @@ -955,7 +955,7 @@ .extern data_027e0fec .extern func_ov00_020ceacc .extern data_027e0ffc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b2e8 .extern func_01ff9ec0 .extern func_01ff9bc4 @@ -964,7 +964,7 @@ .extern func_01ff9bf8 .extern func_0202d95c .extern data_027e0f94 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_01ff9ec0 .extern data_027e0f94 @@ -1018,7 +1018,7 @@ .extern data_027e0ffc .extern func_ov00_0207c1f8 .extern data_027e0e58 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020ba458 .extern func_ov00_020bb810 .extern func_02036770 @@ -1040,7 +1040,7 @@ .extern func_0202b154 .extern func_ov14_0214aa0c .extern data_02050f54 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020b7e6c .extern func_ov00_020ba458 .extern func_ov00_020bb810 diff --git a/asm/include/ov32.inc b/asm/include/ov32.inc index 4796511f..6a51e14e 100644 --- a/asm/include/ov32.inc +++ b/asm/include/ov32.inc @@ -610,7 +610,7 @@ .extern data_027e0e60 .extern func_ov00_02097b9c .extern func_ov00_02098058 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207c474 .extern func_ov00_020b7e6c .extern func_ov00_02097bac @@ -618,9 +618,9 @@ .extern func_ov00_02098058 .extern func_ov00_020ceacc .extern func_ov00_020cecd8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0208b9e4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0209809c .extern func_ov00_02097738 .extern func_ov00_02097bbc diff --git a/asm/include/ov34.inc b/asm/include/ov34.inc index 99e67ffe..ec24eeff 100644 --- a/asm/include/ov34.inc +++ b/asm/include/ov34.inc @@ -24,7 +24,7 @@ .extern func_ov00_020c5e20 .extern func_ov00_020c0e24 .extern func_0202e58c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c5f80 .extern func_ov00_020c5f80 .extern data_027e0194 @@ -156,16 +156,16 @@ .extern func_ov00_02089318 .extern func_ov00_020bcf50 .extern func_01ff9ec0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02089318 .extern func_01ff9bc4 .extern func_ov00_02089318 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_02089318 .extern func_ov00_020cfc70 .extern func_ov00_02083948 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02087d84 .extern func_ov00_02089318 .extern func_ov00_020cc960 @@ -180,7 +180,7 @@ .extern func_ov00_0209a508 .extern data_027e0f64 .extern data_027e0fc8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02089318 .extern func_ov00_020cc960 .extern func_ov00_020bb810 @@ -199,7 +199,7 @@ .extern data_ov22_0217a5d4 .extern data_027e0e58 .extern func_0202e58c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020b7e6c .extern data_027e0764 .extern data_02050f54 @@ -245,9 +245,9 @@ .extern func_0202b154 .extern func_0202b154 .extern func_0202b2e8 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk .extern data_027e0ffc .extern data_02050f54 .extern data_027e0f94 @@ -276,14 +276,14 @@ .extern func_0202b154 .extern func_0202b2e8 .extern func_0202b2e8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202e58c .extern func_ov00_0207c1f8 .extern func_ov00_0207c1f8 .extern func_ov00_020cec60 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202e58c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202e58c .extern func_01ff9bc4 .extern func_ov00_0207c1f8 @@ -328,9 +328,9 @@ .extern func_0202b154 .extern func_0202b154 .extern func_0202b2e8 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk .extern data_027e0f94 .extern data_027e0ffc .extern data_02050f54 @@ -340,8 +340,8 @@ .extern func_0202b154 .extern func_0202b154 .extern data_02050f54 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_0202e58c .extern func_ov00_020a6110 .extern func_ov00_020a61ac @@ -363,8 +363,8 @@ .extern func_ov00_020c4048 .extern func_ov00_020b7e6c .extern func_0202b2e8 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_0202e58c .extern data_027e0f94 .extern data_027e0ffc @@ -376,7 +376,7 @@ .extern data_027e0ffc .extern data_027e0e58 .extern func_ov22_0217746c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202e310 .extern func_ov22_02177450 .extern func_ov00_02088000 @@ -390,9 +390,9 @@ .extern func_0202e58c .extern func_0202e58c .extern func_0202b2e8 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk .extern data_027e0f64 .extern data_027e0e58 .extern data_027e0ffc @@ -403,7 +403,7 @@ .extern data_027e0ffc .extern func_0202e58c .extern func_ov00_020b7e6c -.extern func_0202b0f4 +.extern Approach_thunk .extern data_ov22_0217a5d4 .extern func_ov00_0207c1b0 .extern func_ov00_0207c1b0 @@ -461,10 +461,10 @@ .extern func_ov00_020c0e24 .extern func_ov00_020ceacc .extern data_027e0ffc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b2e8 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020c0e24 .extern func_ov00_020ceacc .extern func_ov00_020d716c @@ -476,7 +476,7 @@ .extern func_0202b154 .extern func_0202b2e8 .extern func_0202e58c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_0207c31c .extern data_027e0e58 @@ -573,7 +573,7 @@ .extern func_ov00_020c0cc8 .extern data_027e0fec .extern func_ov00_020c0e04 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0d4c .extern func_ov00_020c0e04 .extern func_ov00_020c0d4c @@ -642,12 +642,12 @@ .extern data_027e0e58 .extern func_01ff9bc4 .extern func_ov00_020c1e2c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01fffd04 .extern data_027e0f94 .extern func_ov00_020ceacc .extern data_027e0ffc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c2938 .extern func_0202b308 .extern func_ov00_020c2a0c @@ -655,7 +655,7 @@ .extern func_ov14_0213d420 .extern func_ov14_0213e144 .extern func_01ff9bc4 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c23c4 .extern func_01fffd04 .extern data_02050f54 @@ -713,9 +713,9 @@ .extern func_ov00_020c313c .extern func_ov00_020c1e2c .extern data_027e0194 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020b7e6c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0203e784 .extern func_0204f8d4 .extern func_0204f8d4 diff --git a/asm/include/ov35.inc b/asm/include/ov35.inc index ce3fcdd0..c2dec99f 100644 --- a/asm/include/ov35.inc +++ b/asm/include/ov35.inc @@ -583,7 +583,7 @@ .extern func_ov00_020c5d74 .extern func_ov00_020c2974 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020cec60 .extern data_027e0764 .extern data_02050f54 diff --git a/asm/include/ov36.inc b/asm/include/ov36.inc index b3648c05..811bade4 100644 --- a/asm/include/ov36.inc +++ b/asm/include/ov36.inc @@ -12,7 +12,7 @@ .extern func_0201e544 .extern func_ov00_020c0c9c .extern func_ov00_020c5d74 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0e04 .extern func_ov00_020cec60 .extern data_027e0ffc @@ -199,7 +199,7 @@ .extern func_ov00_020d70a4 .extern data_027e0c68 .extern data_ov00_020eec68 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020cfc70 .extern func_ov00_020bd0a8 .extern func_01ff98e0 diff --git a/asm/include/ov37.inc b/asm/include/ov37.inc index 085c3ac1..9fb88c25 100644 --- a/asm/include/ov37.inc +++ b/asm/include/ov37.inc @@ -563,7 +563,7 @@ .extern data_027e0e58 .extern func_01ff9158 .extern func_01ff9158 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020a95ec .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj diff --git a/asm/include/ov38.inc b/asm/include/ov38.inc index 356535ff..58bd3535 100644 --- a/asm/include/ov38.inc +++ b/asm/include/ov38.inc @@ -302,22 +302,22 @@ .extern func_ov00_020d70a4 .extern data_ov00_020eec68 .extern data_027e0fc8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202e544 .extern func_0202e58c .extern func_ov00_020cfc70 .extern func_0202e310 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202e544 .extern func_0202e58c .extern func_ov00_020ceacc .extern func_0202b154 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020bb9b0 .extern func_ov00_020bb810 .extern func_ov00_020a6110 @@ -380,7 +380,7 @@ .extern func_0202e310 .extern func_0202e310 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0ffc .extern func_0202e58c .extern func_0202e310 @@ -392,7 +392,7 @@ .extern func_0202e310 .extern func_0202e310 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0ffc .extern data_027e0d0c .extern data_027e0764 @@ -420,7 +420,7 @@ .extern data_027e0ffc .extern func_0202e58c .extern func_ov29_02174cc8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov29_02172ddc .extern func_ov00_02093a5c .extern data_027e0f6c @@ -436,7 +436,7 @@ .extern func_ov00_020ceacc .extern func_ov00_020c198c .extern func_ov29_02174cc8 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0fe8 .extern data_027e0ffc .extern func_ov29_02172ddc @@ -450,7 +450,7 @@ .extern func_0202e310 .extern func_0202e310 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0ffc .extern func_0202e58c .extern func_ov00_020ceacc @@ -461,7 +461,7 @@ .extern func_0202e310 .extern func_0202e310 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0ffc .extern func_0202e58c .extern func_ov00_020ceacc @@ -477,37 +477,37 @@ .extern func_0202e58c .extern func_ov00_020ceacc .extern func_ov00_020c243c -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0ffc .extern func_02018c90 .extern data_027e0d0c .extern func_0202e58c .extern func_0202e310 -.extern func_0202b0f4 +.extern Approach_thunk .extern gItemManager .extern func_0202e544 -.extern func_0202b0f4 +.extern Approach_thunk .extern data_027e0764 .extern data_02050f54 .extern data_027e0764 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_020c1e2c .extern func_ov00_020ceacc .extern func_ov00_020c1fc8 .extern func_ov00_020c243c .extern data_02050f54 .extern data_027e0ffc -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_0202e544 .extern func_0202e310 .extern func_0202e310 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020a61ac .extern func_0202e58c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 .extern func_ov00_020a61ac .extern func_ov00_020d5f98 @@ -517,7 +517,7 @@ .extern func_ov00_020ceacc .extern func_0202e310 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207c1b0 .extern func_ov00_0207c1b0 .extern func_ov00_0207c1b0 @@ -544,7 +544,7 @@ .extern func_01ff9e64 .extern func_01ff9e64 .extern func_ov00_020c0e04 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c0d4c .extern func_ov00_020c0e04 .extern func_ov00_020c0d4c @@ -704,8 +704,8 @@ .extern func_01ff9c2c .extern func_01ff9e64 .extern func_01fffbec -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9cec .extern func_01fffb4c @@ -816,7 +816,7 @@ .extern func_ov00_02097bcc .extern func_ov00_0209a508 .extern func_ov00_02089318 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020a61ac .extern func_01ff9bc4 .extern func_ov00_020bb810 diff --git a/asm/include/ov39.inc b/asm/include/ov39.inc index 03800388..c9c069cc 100644 --- a/asm/include/ov39.inc +++ b/asm/include/ov39.inc @@ -186,7 +186,7 @@ .extern func_ov00_020c2bf4 .extern func_ov00_020c5e20 .extern func_ov00_020c5e20 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_020c2974 .extern func_ov00_02087fe0 @@ -403,14 +403,14 @@ .extern func_01ff9bc4 .extern func_01ff9bc4 .extern func_0202b2e8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_01ff9bc4 .extern func_0202b2e8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_0202b2e8 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_020ceacc .extern func_0202e58c @@ -537,9 +537,9 @@ .extern func_ov00_020b7e6c .extern func_ov00_020c5e20 .extern func_ov00_020c5e20 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ffa0f4 .extern func_0202e58c .extern func_ov00_020875f8 @@ -549,9 +549,9 @@ .extern func_01ff9bc4 .extern func_ov00_0207c1b0 .extern func_ov00_020cec60 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_020c2974 .extern func_01ff98e0 .extern func_ov00_020c2974 @@ -572,7 +572,7 @@ .extern data_027e0ffc .extern func_ov00_020c2974 .extern data_02050f54 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ffa0f4 .extern func_0202e58c .extern data_02050f54 diff --git a/asm/include/ov44.inc b/asm/include/ov44.inc index 211519b2..0adcba8b 100644 --- a/asm/include/ov44.inc +++ b/asm/include/ov44.inc @@ -224,8 +224,8 @@ .extern func_0202b154 .extern func_ov00_020c3070 .extern func_0202b154 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern data_027e0f94 .extern func_0202b154 .extern func_ov00_020c3070 diff --git a/asm/include/ov46.inc b/asm/include/ov46.inc index 8b875d08..1ea80dfd 100644 --- a/asm/include/ov46.inc +++ b/asm/include/ov46.inc @@ -265,7 +265,7 @@ .extern data_02050f54 .extern func_ov00_020d5a68 .extern data_027e0764 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bc4 .extern func_ov00_020c1fc8 .extern func_ov00_020c243c diff --git a/asm/include/ov50.inc b/asm/include/ov50.inc index 1857b742..541edd64 100644 --- a/asm/include/ov50.inc +++ b/asm/include/ov50.inc @@ -128,10 +128,10 @@ .extern func_ov00_020c7764 .extern func_ov00_020ceacc .extern data_027e0ffc -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk .extern func_0202bfc0 .extern func_ov00_020c3070 .extern data_02050f54 diff --git a/asm/include/ov57.inc b/asm/include/ov57.inc index 906af5d8..209ceb83 100644 --- a/asm/include/ov57.inc +++ b/asm/include/ov57.inc @@ -39,7 +39,7 @@ .extern func_ov00_0207c1f8 .extern func_ov14_0213d420 .extern func_ov00_020ceacc -.extern func_0202b0f4 +.extern Approach_thunk .extern data_ov00_020eec9c .extern data_027e0e58 .extern data_027e0ffc diff --git a/asm/main.s b/asm/main.s index a28f1efa..aac06c77 100644 --- a/asm/main.s +++ b/asm/main.s @@ -57329,18 +57329,18 @@ _0202b0e8: ldmia sp!, {r3, r4, r5, r6, r7, r8, pc} arm_func_end func_0202b03c - .global func_0202b0f4 - arm_func_start func_0202b0f4 -func_0202b0f4: ; 0x0202b0f4 - ldr ip, _0202b0fc ; =func_0202b100 + .global Approach_thunk + arm_func_start Approach_thunk +Approach_thunk: ; 0x0202b0f4 + ldr ip, _0202b0fc ; =Approach bx ip .align 2, 0 - arm_func_end func_0202b0f4 -_0202b0fc: .word func_0202b100 + arm_func_end Approach_thunk +_0202b0fc: .word Approach - .global func_0202b100 - arm_func_start func_0202b100 -func_0202b100: ; 0x0202b100 + .global Approach + arm_func_start Approach +Approach: ; 0x0202b100 ldr r3, [r0] cmp r2, #0 sub r3, r1, r3 @@ -57364,7 +57364,7 @@ _0202b140: moveq r0, #1 movne r0, #0 bx lr - arm_func_end func_0202b100 + arm_func_end Approach .global func_0202b154 arm_func_start func_0202b154 @@ -57462,12 +57462,12 @@ func_0202b1d4: ; 0x0202b1d4 str r1, [sp, #8] ldr r1, [r6] mov r0, r7 - bl func_0202b100 + bl Approach mov r5, r0 ldr r1, [r6, #8] ldr r2, [sp, #8] add r0, r7, #8 - bl func_0202b100 + bl Approach cmp r4, #0 mov r4, r0 mov r0, #1 @@ -57475,7 +57475,7 @@ func_0202b1d4: ; 0x0202b1d4 ldr r1, [r6, #4] ldr r2, [sp, #4] add r0, r7, #4 - bl func_0202b100 + bl Approach _0202b2cc: cmp r5, #0 cmpne r0, #0 @@ -57637,7 +57637,7 @@ _0202b494: _0202b4c0: mov r0, r6 mov r1, r5 - bl func_0202b0f4 + bl Approach_thunk _0202b4cc: ldr r1, [r6] mov r0, #0 diff --git a/asm/ov00/ItemManager/ItemManager.s b/asm/ov00/ItemManager/ItemManager.s index 1a0fc5da..528b3537 100644 --- a/asm/ov00/ItemManager/ItemManager.s +++ b/asm/ov00/ItemManager/ItemManager.s @@ -3,45 +3,6 @@ .text - .global _ZN11ItemManager18func_ov00_020ad678Ejjj - arm_func_start _ZN11ItemManager18func_ov00_020ad678Ejjj -_ZN11ItemManager18func_ov00_020ad678Ejjj: ; 0x020ad678 - stmdb sp!, {r4, r5, r6, lr} - sub sp, sp, #0x10 - mov r6, r0 - ldr r0, [r6, #0xac] - mov r4, r2 - ldr r0, [r0, r4, lsl #2] - mov r5, r1 - ldr r2, [r0] - add r1, sp, #0 - ldr r2, [r2, #0x3c] - blx r2 - cmp r0, #0 - beq _020ad6ec - ldr r0, [r6, #0xac] - ldr r0, [r0, r4, lsl #2] - ldr r1, [r0] - ldr r1, [r1, #0x4c] - blx r1 - mov r2, r0 - cmp r2, #0 - ble _020ad6d8 - ldr r1, [r5, #4] - add r0, sp, #4 - bl func_0202b0f4 -_020ad6d8: - add r1, sp, #0 - mov r0, r5 - bl func_01ffec34 - add sp, sp, #0x10 - ldmia sp!, {r4, r5, r6, pc} -_020ad6ec: - mov r0, #0 - add sp, sp, #0x10 - ldmia sp!, {r4, r5, r6, pc} - arm_func_end _ZN11ItemManager18func_ov00_020ad678Ejjj - .global _ZN11ItemManager17EquipItem_vfunc_2cEj arm_func_start _ZN11ItemManager17EquipItem_vfunc_2cEj _ZN11ItemManager17EquipItem_vfunc_2cEj: ; 0x020ad6f8 diff --git a/asm/ov00/ItemManager/include/ItemManager.inc b/asm/ov00/ItemManager/include/ItemManager.inc index d65f6792..2327316c 100644 --- a/asm/ov00/ItemManager/include/ItemManager.inc +++ b/asm/ov00/ItemManager/include/ItemManager.inc @@ -10,7 +10,7 @@ .extern data_027e0fc4 .extern data_027e0618 .extern data_027e0d38 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ffec34 .extern func_ov00_02078b40 .extern func_ov15_02136670 diff --git a/asm/ov00/include/ov00_0208b220.inc b/asm/ov00/include/ov00_0208b220.inc index a34230b7..3c3a9b86 100644 --- a/asm/ov00/include/ov00_0208b220.inc +++ b/asm/ov00/include/ov00_0208b220.inc @@ -395,8 +395,8 @@ .extern func_01ff9cec .extern func_01ff9bc4 .extern func_01ff9bc4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_02087d84 .extern func_ov00_02087d84 .extern func_ov00_02087d84 @@ -406,19 +406,19 @@ .extern func_01ff9cec .extern func_0202b154 .extern func_0202b154 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ffa0f4 .extern func_ov00_02087d84 .extern func_01ff9bf8 .extern func_01ffa0f4 .extern func_ov00_02087d84 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ffa0f4 .extern func_ov00_02087d84 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_02087d84 .extern func_ov00_02087d84 .extern func_ov00_02087d84 diff --git a/asm/ov00/include/ov00_0209bea0.inc b/asm/ov00/include/ov00_0209bea0.inc index 14e03e58..7cbf8c6f 100644 --- a/asm/ov00/include/ov00_0209bea0.inc +++ b/asm/ov00/include/ov00_0209bea0.inc @@ -161,7 +161,7 @@ .extern data_027e0d38 .extern func_ov00_02090a7c .extern func_ov00_02090a7c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02090cb0 .extern func_ov00_02090ca4 .extern func_ov00_02090a7c diff --git a/asm/ov00/include/ov00_020a03e4.inc b/asm/ov00/include/ov00_020a03e4.inc index f6306e76..c1deb8e5 100644 --- a/asm/ov00/include/ov00_020a03e4.inc +++ b/asm/ov00/include/ov00_020a03e4.inc @@ -141,7 +141,7 @@ .extern func_ov00_02090e90 .extern func_ov00_02090e54 .extern func_ov00_02083ee0 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_02090ae4 .extern func_ov00_02090ef0 .extern func_ov00_02090eb4 @@ -423,9 +423,9 @@ .extern func_01fffb4c .extern func_01fffbec .extern func_01ff9bc4 -.extern func_0202b0f4 -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ffa0f4 .extern func_ov00_02090e20 @@ -439,8 +439,8 @@ .extern func_01ff9bf8 .extern func_01ff9cec .extern func_ov00_02090a7c -.extern func_0202b0f4 -.extern func_0202b0f4 +.extern Approach_thunk +.extern Approach_thunk .extern func_ov00_02090c1c .extern func_ov00_02090c04 .extern func_ov00_02090c10 @@ -555,7 +555,7 @@ .extern func_01ffec34 .extern func_ov00_0208f030 .extern gItemManager -.extern _ZN11ItemManager18func_ov00_020ad678Ejjj +.extern _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pj .extern _ZN11ItemManager17EquipItem_vfunc_2cEj .extern gItemManager .extern func_ov00_02083624 diff --git a/asm/ov00/include/ov00_020d1870.inc b/asm/ov00/include/ov00_020d1870.inc index 01e2a07d..5c9caced 100644 --- a/asm/ov00/include/ov00_020d1870.inc +++ b/asm/ov00/include/ov00_020d1870.inc @@ -294,21 +294,21 @@ .extern func_ov00_020b199c .extern data_027e0e60 .extern func_ov00_020b1940 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_01ff9bf8 .extern func_01ff9e64 .extern func_ov00_020c313c .extern func_ov00_020c195c .extern func_ov00_020bba28 .extern func_ov00_020bc500 -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207a1c8 .extern data_027e0fac .extern data_027e0f94 .extern data_027e0fc8 .extern data_027e0fd4 .extern func_ov00_020c195c -.extern func_0202b0f4 +.extern Approach_thunk .extern func_ov00_0207a1c8 .extern data_027e0fac .extern func_01ff9bf8 diff --git a/asm/ov00/ov00_0208b220.s b/asm/ov00/ov00_0208b220.s index cecd53a4..e628fc64 100644 --- a/asm/ov00/ov00_0208b220.s +++ b/asm/ov00/ov00_0208b220.s @@ -9299,7 +9299,7 @@ _02092704: ldr r1, [r0, #0x18] ldr r2, _020931ec ; =0x0000019a mov r0, r6 - bl func_0202b0f4 + bl Approach_thunk b _02092750 _0209272c: mov r0, r4 @@ -9310,7 +9310,7 @@ _0209272c: ldr r1, [r0, #0x18] mov r0, r6 mov r2, #0x1000 - bl func_0202b0f4 + bl Approach_thunk _02092750: ldr r0, [r4, #4] ldr r0, [r0, #0x15c] @@ -9450,7 +9450,7 @@ _02092944: bl func_ov00_02090e04 mov r1, r7 mov r2, #0x1000 - bl func_0202b0f4 + bl Approach_thunk b _02092b4c _0209295c: add r0, sp, #0x100 @@ -9514,7 +9514,7 @@ _02092a2c: ldr r1, [r0, #0x18] mov r0, r5 mov r2, #0x1000 - bl func_0202b0f4 + bl Approach_thunk b _02092b4c _02092a50: add r0, sp, #0x100 @@ -9550,7 +9550,7 @@ _02092ab4: ldr r1, [r0, #0x18] mov r0, r5 mov r2, #0x1000 - bl func_0202b0f4 + bl Approach_thunk b _02092b4c _02092ad8: ldrb r0, [r2, #0x2ed] @@ -9567,7 +9567,7 @@ _02092af0: ldr r1, [r0, #0x18] mov r0, r5 mov r2, #0x1000 - bl func_0202b0f4 + bl Approach_thunk _02092b10: ldr r0, [r4, #4] ldr r0, [r0, #0x15c] diff --git a/asm/ov00/ov00_0209bea0.s b/asm/ov00/ov00_0209bea0.s index 6e51d0bc..68c2890d 100644 --- a/asm/ov00/ov00_0209bea0.s +++ b/asm/ov00/ov00_0209bea0.s @@ -3241,7 +3241,7 @@ func_ov00_0209e6f8: ; 0x0209e6f8 ldr r2, [r0, #0x3c] ldr r1, [r4, #0x38] add r0, r6, #0x24 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [r6, #0x24] mov r0, r6 bl func_ov00_02090cb0 diff --git a/asm/ov00/ov00_020a03e4.s b/asm/ov00/ov00_020a03e4.s index 74bd002c..b4839d50 100644 --- a/asm/ov00/ov00_020a03e4.s +++ b/asm/ov00/ov00_020a03e4.s @@ -3165,7 +3165,7 @@ _020a2b28: add r0, sp, #0 add r1, r1, #0x300 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp] mov r0, r4 bl func_ov00_02090ae4 @@ -8215,13 +8215,13 @@ _020a6a50: add r0, sl, #0x30 orr r1, r1, r2, lsl #20 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk b _020a6abc _020a6aac: add r0, sl, #0x30 mov r1, #0 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk _020a6abc: ldr r1, [sp, #0x80] ldr r0, [sl, #0x30] @@ -8232,7 +8232,7 @@ _020a6ad0: add r0, sl, #0x30 mov r1, #0 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk _020a6ae0: add r0, sl, #0x18 add r3, sp, #0x58 @@ -8334,11 +8334,11 @@ _020a6c2c: mov r6, r7, asr #0x1 mov r1, r6 add r0, sl, #0x38 - bl func_0202b0f4 + bl Approach_thunk ldr r2, _020a6df4 ; =0x00000666 mov r1, r7 add r0, sl, #0x3c - bl func_0202b0f4 + bl Approach_thunk cmp sb, #0 streq r6, [sl, #0x38] streq r7, [sl, #0x3c] @@ -9646,13 +9646,13 @@ func_ov00_020a7c60: ; 0x020a7c60 arm_func_start func_ov00_020a7ce4 func_ov00_020a7ce4: ; 0x020a7ce4 ldr r0, _020a7cf4 ; =gItemManager - ldr ip, _020a7cf8 ; =_ZN11ItemManager18func_ov00_020ad678Ejjj + ldr ip, _020a7cf8 ; =_ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pj ldr r0, [r0] bx ip .align 2, 0 arm_func_end func_ov00_020a7ce4 _020a7cf4: .word gItemManager -_020a7cf8: .word _ZN11ItemManager18func_ov00_020ad678Ejjj +_020a7cf8: .word _ZN11ItemManager18EquipItem_vfunc_3cEP5Vec4pj .global func_ov00_020a7cfc arm_func_start func_ov00_020a7cfc diff --git a/asm/ov00/ov00_020d1870.s b/asm/ov00/ov00_020d1870.s index 7bb432ba..4ba8f207 100644 --- a/asm/ov00/ov00_020d1870.s +++ b/asm/ov00/ov00_020d1870.s @@ -3784,7 +3784,7 @@ func_ov00_020d4880: ; 0x020d4880 ldr r2, [r5, #0x174] ldr r1, _020d4960 ; =0x00000fd7 add r0, r5, #0x170 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [r5, #0x170] mov r4, r0 sub r0, r1, #0x800 @@ -3914,7 +3914,7 @@ _020d4a44: movle r2, r0 ldr r1, [r5, #0x17c] add r0, r5, #0x90 - bl func_0202b0f4 + bl Approach_thunk _020d4a84: ldrb r0, [r5, #0x11b] strb r0, [r5, #0x183] @@ -3971,7 +3971,7 @@ _020d4af0: movle r2, r0 ldr r1, [r5, #0x17c] add r0, r5, #0x90 - bl func_0202b0f4 + bl Approach_thunk _020d4b30: ldrb r0, [r5, #0x11b] strb r0, [r5, #0x183] diff --git a/asm/ov12.s b/asm/ov12.s index c0b64549..987706da 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -1881,7 +1881,7 @@ _02114398: mov r2, r5, asr #0x1 mov r1, #0 str r3, [r6, #0x76c] - bl func_0202b0f4 + bl Approach_thunk bl func_ov12_02114b18 cmp r0, #0 beq _02114478 @@ -2048,7 +2048,7 @@ _021145fc: mov r2, r7, asr #0x1 mov r1, #0 str r3, [r8, #0x76c] - bl func_0202b0f4 + bl Approach_thunk mov r0, #0xa mul r0, r7, r0 ldr r1, [r8, #0x76c] @@ -4293,7 +4293,7 @@ func_ov12_0211653c: ; 0x0211653c mov r2, #0x2800 bne _02116594 mov r1, #0x1f000 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r6, #0x4c8] cmp r0, #0x4f bne _021165c0 @@ -4306,7 +4306,7 @@ func_ov12_0211653c: ; 0x0211653c b _021165c0 _02116594: mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r6, #0x4c8] cmp r0, #0x52 bne _021165c0 @@ -16804,7 +16804,7 @@ _021207ec: add r0, r4, #0x160 mov r1, #0x1000 mov r2, #0x240 - bl func_0202b0f4 + bl Approach_thunk str r5, [r4, #0x158] ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -29431,12 +29431,12 @@ func_ov12_0212ad0c: ; 0x0212ad0c ldr r1, [r5, #0x22c] ldr r2, [r5, #0x64] add r1, r1, #0x8000 - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 add r0, r5, #0x64 mov r1, #0x800 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk cmp r4, #0 ldmeqia sp!, {r3, r4, r5, pc} bl func_ov12_0211cfe0 @@ -32102,7 +32102,7 @@ func_ov12_0212cdc4: ; 0x0212cdc4 ldr r1, [r4, #0x18] ldr r2, [r4, #0x64] add r0, r4, #0x4c - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldreq r0, [r4, #0x64] subeq r0, r0, #0xcd diff --git a/asm/ov14.s b/asm/ov14.s index b6b08639..d4473a09 100644 --- a/asm/ov14.s +++ b/asm/ov14.s @@ -3212,7 +3212,7 @@ _0212204c: ldr r1, _02122abc ; =0x0000059a ldr r2, _02122ac0 ; =0x00000333 add r0, r5, #0x90 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x130] cmp r0, #2 bne _02122124 @@ -16159,7 +16159,7 @@ _0212c90c: ldr r2, _0212c9c4 ; =0x00000266 add r0, r4, #0x64 mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk add r0, r4, #0xcc bl func_ov00_020c0e04 ldmia sp!, {r4, pc} @@ -16167,7 +16167,7 @@ _0212c928: ldr r1, _0212c9c8 ; =0x0000099a add r0, r4, #0x64 mov r2, #0x1d - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -16181,7 +16181,7 @@ _0212c95c: ldr r2, _0212c9cc ; =0x0000011f add r0, r4, #0x64 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -16195,7 +16195,7 @@ _0212c990: ldr r1, _0212c9d0 ; =0xffffd99a ldr r2, _0212c9c4 ; =0x00000266 add r0, r4, #0x68 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -19026,7 +19026,7 @@ _0212ed34: ldr r2, _0212edb8 ; =0x00000266 add r0, r4, #0x38 mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -19040,7 +19040,7 @@ _0212ed68: ldr r2, _0212edb8 ; =0x00000266 add r0, r4, #0x38 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -21345,7 +21345,7 @@ _02130c24: ldr r2, _02130f74 ; =0x00000333 add r0, r4, #0x64 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02130c58 mov r0, r4 @@ -21470,7 +21470,7 @@ _02130de8: ldr r1, _02130f7c ; =0xfffff333 ldr r2, _02130f80 ; =0x00000266 add r0, r4, #0x64 - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 mov r1, #0 bl func_ov00_0208b9e4 @@ -21533,7 +21533,7 @@ _02130eec: ldr r1, _02130f7c ; =0xfffff333 ldr r2, _02130f80 ; =0x00000266 add r0, r4, #0x64 - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 mov r1, #0 bl func_ov00_0208b9e4 @@ -21550,7 +21550,7 @@ _02130f2c: ldr r1, _02130f7c ; =0xfffff333 ldr r2, _02130f80 ; =0x00000266 add r0, r4, #0x64 - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 mov r1, #0 bl func_ov00_0208b9e4 @@ -27703,7 +27703,7 @@ func_ov14_02135e30: ; 0x02135e30 cmp r1, r0 beq _02135eb4 mov r0, r3 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp] ldr r0, [r4, #0x48] sub r0, r1, r0 @@ -27712,7 +27712,7 @@ func_ov14_02135e30: ; 0x02135e30 _02135eb4: ldr r1, [r4, #0x19c] add r0, sp, #8 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp, #8] ldr r0, [r4, #0x50] sub r0, r1, r0 @@ -38102,11 +38102,11 @@ func_ov14_0213dfbc: ; 0x0213dfbc ldr r1, [r6, #4] ldr r2, _0213e138 ; =0x00000333 add r0, sp, #0x28 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [r6, #4] ldr r2, _0213e138 ; =0x00000333 add r0, sp, #0x1c - bl func_0202b0f4 + bl Approach_thunk ldr r2, [sp, #0x24] ldr r1, [sp, #0x28] str r2, [sp, #0xc] @@ -43426,7 +43426,7 @@ _021421b0: ldr r2, _021424a8 ; =0x0000019a add r0, r6, #0x50 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 ldr r0, [r6, #0x50] add r1, sp, #0x10 @@ -43527,7 +43527,7 @@ _0214231c: add r0, r6, #0x50 add r1, r1, #1 mov r1, r1, lsl #0xc - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 ldr r0, [r6, #0x50] add r1, sp, #0xc @@ -55446,7 +55446,7 @@ _0214b7f4: ldr r1, [r4, #0x70] add r0, r4, #0x6c mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} @@ -55523,7 +55523,7 @@ _0214b914: ldr r2, [r4, #0x7c] add r0, r4, #0x6c mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #0x18 ldmeqia sp!, {r4, pc} @@ -56462,7 +56462,7 @@ func_ov14_0214c4a4: ; 0x0214c4a4 mov r4, r1 ldr r1, [r5, #0x18] add r0, r5, #0x1c - bl func_0202b0f4 + bl Approach_thunk ldr r1, [r5, #0x18] mov r6, r0 cmp r1, #0 diff --git a/asm/ov15.s b/asm/ov15.s index e57be565..4559fcd4 100644 --- a/asm/ov15.s +++ b/asm/ov15.s @@ -7405,7 +7405,7 @@ _02125b20: mov r2, r1, lsr #0xc add r1, r5, #0x1000 orr r2, r2, r3, lsl #20 - bl func_0202b0f4 + bl Approach_thunk add r0, r4, #0x200 ldrh r1, [r0, #0x88] add r1, r1, #0x384 @@ -11046,7 +11046,7 @@ _021287f0: mov r1, r3 add r0, r6, #0x84 mov r2, #0xa000 - bl func_0202b0f4 + bl Approach_thunk _02128800: ldr r1, [r6, #0x84] ldr r0, _021288c4 ; =0x01194000 @@ -17344,7 +17344,7 @@ _0212dbf4: ldr r1, _0212dd14 ; =0x00000171 add r0, r4, #0x24c mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r2, _0212dd18 ; =data_02050f54 ldr lr, [r4, #0x24c] @@ -17509,7 +17509,7 @@ _0212de68: add r0, r4, #0x24c mov r1, #0 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r2, _0212e060 ; =data_02050f54 ldr r7, [r4, #0x24c] @@ -18621,7 +18621,7 @@ func_ov15_0212ed78: ; 0x0212ed78 _0212ee2c: ldr r2, [r5] add r0, sb, #0x24c - bl func_0202b0f4 + bl Approach_thunk b _0212ee94 _0212ee3c: bl func_ov00_020c2938 @@ -18646,7 +18646,7 @@ _0212ee3c: _0212ee88: ldr r2, [r5] add r0, sb, #0x24c - bl func_0202b0f4 + bl Approach_thunk _0212ee94: add r0, sb, #0x100 ldrsh r1, [r0, #0xd4] @@ -20307,7 +20307,7 @@ _021305c8: bge _021305e4 add r0, r4, #0x4b0 mov r2, #2 - bl func_0202b0f4 + bl Approach_thunk _021305e4: ldr r0, [r4, #0x4b8] cmp r0, #0 @@ -20334,7 +20334,7 @@ _02130628: add r0, r4, #0x4b0 mov r1, #0 mov r2, #4 - bl func_0202b0f4 + bl Approach_thunk _02130644: ldrb r0, [r4, #0x1a9] cmp r0, #0 @@ -21631,12 +21631,12 @@ _02131840: bge _021318bc ldr r1, _02131934 ; =0x00000171 add r0, r4, #0x4b0 - bl func_0202b0f4 + bl Approach_thunk b _021318c8 _021318bc: add r0, r4, #0x4b0 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk _021318c8: mov r0, r4 bl func_ov15_02130c38 @@ -21713,12 +21713,12 @@ _021319b0: bge _021319d8 ldr r1, _02131edc ; =0x00000171 add r0, r4, #0x4b0 - bl func_0202b0f4 + bl Approach_thunk b _021319e4 _021319d8: add r0, r4, #0x4b0 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk _021319e4: mov r0, r4 bl func_ov15_02130c38 @@ -21801,7 +21801,7 @@ _02131b10: ldr r1, _02131ef8 ; =0x000002e2 add r0, r4, #0x4b0 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r2, _02131efc ; =data_02050f54 ldr lr, [r4, #0x4b0] @@ -22020,7 +22020,7 @@ _02131e50: ldr r1, _02131ef8 ; =0x000002e2 add r0, r4, #0x4b0 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r2, _02131efc ; =data_02050f54 ldr lr, [r4, #0x4b0] @@ -28728,7 +28728,7 @@ _02137980: orr r3, r3, r2, lsl #20 strh r3, [r4, #0x94] mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x4e8] cmp r0, #0 bne _02137b00 @@ -28782,7 +28782,7 @@ _02137a44: mov r2, r0 add r0, r4, #0x78 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x4e8] cmp r0, #0 bne _02137b00 @@ -28803,7 +28803,7 @@ _02137ad4: mov r2, r0 add r0, r4, #0x78 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk _02137b00: ldr r0, _02137cb4 ; =data_027e0fac ldr r3, _02137cb8 ; =0x00000333 @@ -42553,7 +42553,7 @@ _021436a4: add r0, r5, #0x2b8 mov r1, #0 mov r2, #0x10 - bl func_0202b0f4 + bl Approach_thunk add sp, sp, #0x18 ldmia sp!, {r3, r4, r5, pc} .align 2, 0 @@ -42623,7 +42623,7 @@ _02143744: add r0, r7, #0x2b8 mov r1, #0 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [r4, #0x4c] ldr r0, [r7, #0x298] add r6, r1, #0x800 @@ -43130,7 +43130,7 @@ _02143eb0: mov r1, #0 mov r2, #1 ldr r5, [r4, #0x32c] - bl func_0202b0f4 + bl Approach_thunk ldr r6, [r4, #0x32c] sub r0, r5, r6 bl func_02042f68 @@ -43864,7 +43864,7 @@ func_ov15_021448f8: ; 0x021448f8 add r0, r0, #0x400 sub r1, r1, #0x800 mov r2, #0x14 - bl func_0202b0f4 + bl Approach_thunk _02144928: add r0, r4, #0xc4 add r1, r4, #0xb8 @@ -44201,7 +44201,7 @@ _02144e00: mov r2, #1 add r3, r4, r3 str r3, [sb, #0x4bc] - bl func_0202b0f4 + bl Approach_thunk _02144e40: ldr r0, [sb, #0x298] mov r3, #0 @@ -44704,7 +44704,7 @@ _02145524: add r0, sb, #0x5c ldr r1, _02145834 ; =0x00000e39 add r0, r0, #0x400 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sb, #0x460] ldr r0, _02145838 ; =0x000023b0 sub r0, r0, r1 @@ -44744,7 +44744,7 @@ _02145524: add r0, sb, #0x68 ldr r1, _021457f0 ; =0x0000028f add r0, r0, #0x400 - bl func_0202b0f4 + bl Approach_thunk ldr r0, _021457d8 ; =data_027e0fac ldr r8, [sp, #0x3c] ldrh r2, [r0] @@ -44787,7 +44787,7 @@ _02145524: mov r8, sl, lsr #0xc orr r8, r8, r3, lsl #20 add r1, r1, r8 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp, #0x40] ldr r0, [sb, #0x4bc] add r8, r1, #0xe9 @@ -44799,7 +44799,7 @@ _02145524: mov r2, r0 add r0, sb, #0xbc add r0, r0, #0x400 - bl func_0202b0f4 + bl Approach_thunk ldr r8, [sp, #0x44] ldr r0, [sb, #0x4c0] sub r1, r8, #0x6a @@ -44829,7 +44829,7 @@ _02145524: mov r3, r3, lsr #0xc orr r3, r3, r1, lsl #20 add r1, r7, r3 - bl func_0202b0f4 + bl Approach_thunk _02145798: mov r1, #0 str r1, [sp] @@ -44913,7 +44913,7 @@ _02145898: strne r1, [r0, #0x6c] ldr r0, _02145930 ; =data_ov15_0218efd8 mov r1, #0x80 - bl func_0202b0f4 + bl Approach_thunk b _021458ec _021458c8: ldrb r0, [r5, #0x352] @@ -44930,7 +44930,7 @@ _021458ec: mov r1, r4 ldr r2, [r0, #0x6c] add r0, r5, #0x2e0 - bl func_0202b0f4 + bl Approach_thunk ldr r0, _02145934 ; =data_027e0f64 add r1, r5, #0x2dc ldr r0, [r0] @@ -45165,7 +45165,7 @@ _02145c24: add r0, r5, #0x32c mov r1, #0 mov r2, #1 - bl func_0202b0f4 + bl Approach_thunk _02145c40: mov r0, #0 str r0, [r5, #0x330] @@ -65160,7 +65160,7 @@ func_ov15_02156b04: ; 0x02156b04 ldr r1, [r6, #0x2e4] add r0, r6, #0x2e0 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldrb r0, [r6, #0x2f2] cmp r0, #0 beq _02156be4 @@ -68322,7 +68322,7 @@ _0215976c: ldr r2, [r5, #0x6c] add r0, r5, #0x64 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x64] cmp r0, #0 addne sp, sp, #0x38 @@ -70101,7 +70101,7 @@ _0215afb4: ldr r1, [sp, #8] add r0, r4, #0x1c4 orr r2, r2, r3, lsl #20 - bl func_0202b0f4 + bl Approach_thunk tst r0, #1 movne sl, #1 moveq sl, #0 @@ -70124,7 +70124,7 @@ _0215b004: adc r3, r2, #0 mov r2, fp, lsr #0xc orr r2, r2, r3, lsl #20 - bl func_0202b0f4 + bl Approach_thunk tst sl, r0 add r0, sb, #1 mov r0, r0, lsl #0x10 @@ -70144,7 +70144,7 @@ _0215b004: ldr r1, [sp, #4] add r0, r4, #0x1dc orr r2, r2, r3, lsl #20 - bl func_0202b0f4 + bl Approach_thunk tst sl, r0 movne sl, #1 moveq sl, #0 @@ -70168,7 +70168,7 @@ _0215b0b0: adc r3, r2, #0 mov r2, fp, lsr #0xc orr r2, r2, r3, lsl #20 - bl func_0202b0f4 + bl Approach_thunk tst sl, r0 add r0, sb, #1 mov r0, r0, lsl #0x10 @@ -70262,7 +70262,7 @@ _0215b248: mov r1, r5 ldr r2, [r0, #4] add r0, r4, #0x228 - bl func_0202b0f4 + bl Approach_thunk add sp, sp, #0x40 ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc} .align 2, 0 @@ -70678,7 +70678,7 @@ _0215b7e8: ldr r1, [r7, r8, lsl #2] mov r0, sb mov r2, r6 - bl func_0202b0f4 + bl Approach_thunk ldrb r1, [r4, #0x200] add r8, r8, #1 add sb, sb, #4 @@ -74437,11 +74437,11 @@ _0215ea34: ldr r2, _0215f7d0 ; =0x00000889 add r0, sb, #0x3c8 mov r1, #0x10000 - bl func_0202b0f4 + bl Approach_thunk ldr r2, _0215f7d4 ; =0x00000444 add r0, sb, #0x3c4 mov r1, #0x14000 - bl func_0202b0f4 + bl Approach_thunk add r0, sb, #0x300 ldrsh r1, [r0, #0xdc] ldr r2, _0215f7d4 ; =0x00000444 @@ -74670,7 +74670,7 @@ _0215ed88: ldrsh r2, [r0, #0xda] add r0, sb, #0x3c8 mov r1, #0x1c000 - bl func_0202b0f4 + bl Approach_thunk _0215edd8: ldr r0, [sb, #0x3c8] cmp r0, #0x14000 @@ -74794,11 +74794,11 @@ _0215ef7c: ldr r2, _0215f7d0 ; =0x00000889 add r0, sb, #0x3c8 mov r1, #0x10000 - bl func_0202b0f4 + bl Approach_thunk ldr r2, _0215f7d0 ; =0x00000889 add r0, sb, #0x3c4 mov r1, #0x14000 - bl func_0202b0f4 + bl Approach_thunk add r0, sb, #0x48 add r1, sb, #0x60 mov r2, r0 @@ -74935,7 +74935,7 @@ _0215f158: str r1, [sb, #0x4c] add r0, sb, #0x3cc mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _0215f1f4 mov r1, #5 @@ -75058,7 +75058,7 @@ _0215f35c: ldr r2, _0215f808 ; =0x0000019a add r0, sb, #0x4c rsb r1, r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 movne r0, #5 strneb r0, [sb, #0x3ea] @@ -79597,7 +79597,7 @@ _02163238: add r0, r4, #0x234 mov r1, #0xf6 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r2, _02163c34 ; =data_02050f54 ldr r6, [r4, #0x234] @@ -79655,7 +79655,7 @@ _02163338: strne r0, [r4, #0x24c] add r0, r4, #0x234 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r6, _02163c34 ; =data_02050f54 ldr r2, [r4, #0x234] @@ -79739,7 +79739,7 @@ _0216346c: add r0, r4, #0x234 mov r1, #0 mov r2, #0x1f - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r6, _02163c34 ; =data_02050f54 ldr r2, [r4, #0x234] @@ -79935,7 +79935,7 @@ _02163774: add r0, r4, #0x234 mov r1, #0 mov r2, #0x14 - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r1, _02163c34 ; =data_02050f54 ldr r3, [r4, #0x234] @@ -80080,7 +80080,7 @@ _02163960: add r0, r4, #0x234 mov r1, #0 mov r2, #0x1f - bl func_0202b0f4 + bl Approach_thunk bl func_ov15_0215cf38 cmp r0, #0 bne _02163b1c @@ -80100,7 +80100,7 @@ _021639f0: add r0, r4, #0x234 mov r1, #0 mov r2, #0x1f - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x10000 ldr r1, [r4, #0x38c] rsb r0, r0, #0 @@ -80164,7 +80164,7 @@ _02163a8c: add r0, r4, #0x234 mov r1, #0x1ec mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 bl func_ov15_02163c88 _02163b1c: @@ -89038,7 +89038,7 @@ _0216b2fc: ldr r1, _0216b34c ; =0x0000199a add r0, r4, #0x4c mov r2, #0x7b - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, [r4, #0x130] @@ -89049,7 +89049,7 @@ _0216b324: ldr r1, _0216b350 ; =0x00000333 add r0, r4, #0x4c mov r2, #0x7b - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, [r4, #0x130] @@ -91618,7 +91618,7 @@ _0216d64c: add r0, r4, #0x17c mov r1, #0 mov r2, #0x88 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x188] @@ -95681,7 +95681,7 @@ _02170e3c: add r0, r4, #0x4c mov r1, #0x2000 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk ldr r0, _02170fec ; =data_027e0f64 add r1, sp, #0xac ldr r0, [r0] @@ -95726,7 +95726,7 @@ _02170eec: add r0, r4, #0x4c mov r1, #0x2000 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk ldr r0, _02170fec ; =data_027e0f64 add r1, sp, #0x44 ldr r0, [r0] @@ -96324,7 +96324,7 @@ _02171790: mov r1, r0 ldr r2, _0217192c ; =0x00000222 add r0, sp, #0xe4 - bl func_0202b0f4 + bl Approach_thunk ldr r0, _02171930 ; =data_027e0f94 mov r1, #0 ldr r3, [r0] @@ -96386,7 +96386,7 @@ _0217187c: mov r1, r0 ldr r2, _0217192c ; =0x00000222 add r0, sp, #0x7c - bl func_0202b0f4 + bl Approach_thunk ldr r0, _02171930 ; =data_027e0f94 mov r1, #0 ldr r3, [r0] @@ -96912,7 +96912,7 @@ func_ov15_02172014: ; 0x02172014 add r0, r4, #0x4c mov r1, #0x800 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk b _02172058 _0217203c: ldr r0, [r4, #0x4c] @@ -96921,7 +96921,7 @@ _0217203c: movgt r2, #0x52 movle r2, #0xcd add r0, r4, #0x4c - bl func_0202b0f4 + bl Approach_thunk _02172058: ldr r0, [r4, #0x4c] cmp r0, #0x2000 @@ -98223,7 +98223,7 @@ func_ov15_0217317c: ; 0x0217317c bge _02173264 add r0, sp, #0x24 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldr r0, [sp, #0x24] str r0, [r6, #0x520] _02173264: @@ -105885,7 +105885,7 @@ _02179bc4: add r0, r3, #0x400 add r1, r1, r8 add r5, r6, #0x72 - bl func_0202b0f4 + bl Approach_thunk ldrb r1, [r6, #0x472] orrs r0, r1, r0 add r0, r4, r7 @@ -109260,7 +109260,7 @@ func_ov15_0217ca04: ; 0x0217ca04 add r0, r4, #0x2dc mov r2, #0x29 str r3, [r4, #0x4c] - bl func_0202b0f4 + bl Approach_thunk add r2, r4, #0x200 ldr r0, _0217cea4 ; =data_027e0fac ldrh r3, [r2, #0xe6] @@ -116773,7 +116773,7 @@ _02182ff0: bge _021830c0 add r0, sp, #0x28 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldr r0, [sp, #0x28] str r0, [r6, #0x328] _021830c0: diff --git a/asm/ov17.s b/asm/ov17.s index 62660baf..3d20fac3 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -2426,7 +2426,7 @@ func_ov17_0215d114: ; 0x0215d114 ldr r1, _0215d468 ; =0x000008cd ldr r2, _0215d46c ; =0x0000019a add r0, r4, #0x228 - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 bl func_ov00_020c3070 ldr r0, [r4, #0x60] @@ -3971,7 +3971,7 @@ _0215e658: str r2, [sp, #0x1c] ldr r2, [r4, #0x64] add r0, r4, #0x4c - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _0215e71c ldr r0, [r4, #0x254] @@ -4235,7 +4235,7 @@ func_ov17_0215e9f4: ; 0x0215e9f4 ldrsh r1, [r0, #0x80] add r0, r4, #0x234 mov r2, #0x800 - bl func_0202b0f4 + bl Approach_thunk ldmia sp!, {r3, r4, r5, pc} _0215ea3c: ldrsh r0, [r4, #0x78] @@ -4255,7 +4255,7 @@ _0215ea3c: add r1, r1, #0x800 mov r1, r1, asr #0xc add r1, r1, #0x800 - bl func_0202b0f4 + bl Approach_thunk ldmia sp!, {r3, r4, r5, pc} .align 2, 0 arm_func_end func_ov17_0215e9f4 @@ -10995,7 +10995,7 @@ _02163f0c: ldr r2, _02163f88 ; =0x0000019a add r0, r4, #0x6c mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02163f70 mov r0, r4 @@ -11009,7 +11009,7 @@ _02163f40: ldr r1, _02163f8c ; =0xfffff666 ldr r2, _02163f88 ; =0x0000019a add r0, r4, #0x6c - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02163f70 mov r0, r4 @@ -13169,7 +13169,7 @@ _021658dc: add r0, r5, #0x160 mov r1, #0x1000 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02165930 mov r0, r5 diff --git a/asm/ov18.s b/asm/ov18.s index 5c757e6f..e9e94498 100644 --- a/asm/ov18.s +++ b/asm/ov18.s @@ -856,7 +856,7 @@ _0215c06c: ldr r1, [r5, #0x1d4] ldr r2, _0215c134 ; =0x0000019a add r0, r5, #0x1d8 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x1d8] cmp r0, #0x10000 addge sp, sp, #0x10 @@ -11480,7 +11480,7 @@ _02164954: ldr r2, _0216499c ; =0x00000266 add r0, r4, #0x60 mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} ldr r0, [r4, #0x64] @@ -12796,7 +12796,7 @@ _02165928: .word func_ov14_02145f0c .global func_ov18_0216592c arm_func_start func_ov18_0216592c func_ov18_0216592c: ; 0x0216592c - ldr ip, _02165944 ; =func_0202b0f4 + ldr ip, _02165944 ; =Approach_thunk add r0, r0, #0x7c add r0, r0, #0x400 mov r1, #0 @@ -12804,7 +12804,7 @@ func_ov18_0216592c: ; 0x0216592c bx ip .align 2, 0 arm_func_end func_ov18_0216592c -_02165944: .word func_0202b0f4 +_02165944: .word Approach_thunk .global func_ov18_02165948 arm_func_start func_ov18_02165948 @@ -12892,7 +12892,7 @@ func_ov18_02165a24: ; 0x02165a24 mov r1, #0 mov r2, #0x29 strh ip, [r3, #0x80] - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} add r0, r4, #0x400 @@ -14113,11 +14113,11 @@ _02166adc: add r0, r4, #0x114 add r0, r0, #0x400 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk mov r1, r5 add r0, r4, #0x510 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk add r1, r4, #0xec ldr r2, [r4, #0x514] add r0, r4, #0x4e0 @@ -14668,13 +14668,13 @@ _02167258: mov r2, r5 add r0, r6, #0x48 mov r5, r4 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldr r1, [sp, #0x68] mov r2, r7 add r0, r6, #0x50 movne r4, #1 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldr r0, [r6, #0x1e8] movne r5, #1 @@ -14684,18 +14684,18 @@ _02167258: add r0, r6, #0x470 ble _021672b4 mov r1, #0xa4 - bl func_0202b0f4 + bl Approach_thunk b _021672bc _021672b4: mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk _021672bc: ldr r0, [r6, #0x18] ldr r2, [r6, #0x470] add r1, r0, #0x33 add r0, r6, #0x4c add r1, r1, #0x1300 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 cmpne r4, #0 cmpne r5, #0 @@ -15193,11 +15193,11 @@ _0216798c: add r0, r4, #0x470 bge _021679b0 mov r1, #0xa4 - bl func_0202b0f4 + bl Approach_thunk b _021679b8 _021679b0: mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk _021679b8: ldr r2, [r4, #0x4c] ldr r0, [r4, #0x470] @@ -15240,12 +15240,12 @@ _02167a24: bge _02167a5c add r0, r4, #0x470 mov r1, #0x148 - bl func_0202b0f4 + bl Approach_thunk b _02167a68 _02167a5c: ldr r1, _02167dec ; =0xfffffee1 add r0, r4, #0x470 - bl func_0202b0f4 + bl Approach_thunk _02167a68: ldr r0, [r4, #0x1f4] add r1, sp, #8 diff --git a/asm/ov19.s b/asm/ov19.s index 68c60235..f1175652 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -4207,7 +4207,7 @@ func_ov19_02170dd8: ; 0x02170dd8 str r1, [sp] mov r1, #0x1000 mov r2, #0x44 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [sp] str r0, [r4, #0x77c] add sp, sp, #4 @@ -4718,7 +4718,7 @@ _0217148c: ldr r2, _021714c8 ; =0x000002aa add r0, r4, #0x17c mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x188] @@ -7323,7 +7323,7 @@ _02173638: ldr r2, _02173784 ; =0x00000666 add r0, r4, #0x64 rsb r1, r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 mov r1, #0 beq _02173674 @@ -7392,7 +7392,7 @@ _0217373c: ldr r2, _02173784 ; =0x00000666 add r0, r4, #0x64 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addne sp, sp, #8 ldmneia sp!, {r4, pc} diff --git a/asm/ov20.s b/asm/ov20.s index 33fd5aaf..844b3f22 100644 --- a/asm/ov20.s +++ b/asm/ov20.s @@ -3056,7 +3056,7 @@ func_ov20_021700b0: ; 0x021700b0 str r1, [sp] mov r1, #0x1000 mov r2, #0x44 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [sp] str r0, [r4, #0x100] add sp, sp, #4 diff --git a/asm/ov22.s b/asm/ov22.s index 79271501..007d3d4a 100644 --- a/asm/ov22.s +++ b/asm/ov22.s @@ -3708,7 +3708,7 @@ _02170778: add r0, sp, #4 mov r1, r1, asr #0xc mov r2, #0x800 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp, #4] ldr r0, [r4, #0x1e8] str r1, [r0, #0x10] @@ -3727,7 +3727,7 @@ _021707d4: mov r1, #0x1000 str r2, [sp] mov r2, #0x800 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp] ldr r0, [r4, #0x1e8] str r1, [r0, #0x10] @@ -4866,7 +4866,7 @@ func_ov22_02171694: ; 0x02171694 ldr r1, _02171768 ; =0x00000333 add r0, r5, #0x740 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk b _0217171c _021716f4: mov r0, r5 @@ -4878,7 +4878,7 @@ _021716f4: add r0, r5, #0x740 mov r1, #0 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk _0217171c: ldr r1, [r5, #0x740] mov r0, r5 @@ -4980,7 +4980,7 @@ _021717d8: add r0, r4, #0x740 mov r1, #0xcd mov r2, #0xa4 - bl func_0202b0f4 + bl Approach_thunk add r0, sp, #0xc ldr r1, [r4, #0x740] mov r2, r0 @@ -10347,7 +10347,7 @@ _02175dd8: add r0, r4, #0x3c mov r1, #0 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 moveq r1, #1 movne r1, #0 @@ -12368,7 +12368,7 @@ func_ov22_02177814: ; 0x02177814 ldr r1, _0217792c ; =0x00000ccd ldr r2, _02177930 ; =0x0000019a add r0, r4, #0x2ac - bl func_0202b0f4 + bl Approach_thunk ldr r1, [r4, #0x50] ldr r0, [r4, #0x280] ldr r2, [r4, #0x28c] @@ -12625,7 +12625,7 @@ func_ov22_02177b38: ; 0x02177b38 _02177b70: add r0, r4, #0x2c0 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r4, pc} mov r0, r4 @@ -13155,7 +13155,7 @@ _0217818c: ldr r2, _021781cc ; =0x000002aa add r0, r4, #0x17c mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x188] diff --git a/asm/ov23.s b/asm/ov23.s index 81432fd4..6d3bfc6c 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -959,7 +959,7 @@ _0216e2d0: add r0, sp, #4 mov r1, r1, asr #0xc mov r2, #0x800 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp, #4] ldr r0, [r4, #0x1e8] str r1, [r0, #0x10] @@ -978,7 +978,7 @@ _0216e328: mov r1, #0x1000 str r2, [sp] mov r2, #0x800 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp] ldr r0, [r4, #0x1e8] str r1, [r0, #0x10] @@ -11800,7 +11800,7 @@ _0217724c: ldr r1, _0217746c ; =0xfffffd9a add r0, r4, #0x48 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} @@ -11816,7 +11816,7 @@ _02177288: add r0, r4, #0x48 mov r1, #0 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldrne r0, [r4, #0x58] cmpne r0, #0 @@ -11899,7 +11899,7 @@ _021773c0: ldr r1, _0217746c ; =0xfffffd9a add r0, r4, #0x48 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #4 ldmeqia sp!, {r3, r4, pc} @@ -11915,7 +11915,7 @@ _021773fc: ldr r1, _02177470 ; =0xfffff19a add r0, r4, #0x48 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldrne r0, [r4, #0x58] cmpne r0, #0 diff --git a/asm/ov24.s b/asm/ov24.s index 8f43fcf3..415fbb48 100644 --- a/asm/ov24.s +++ b/asm/ov24.s @@ -319,7 +319,7 @@ func_ov24_0216da80: ; 0x0216da80 ldr r1, [r5, #0x74] add r0, r5, #0x1c mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #8] cmp r0, #0 beq _0216dac8 @@ -916,7 +916,7 @@ _0216e258: ldr r1, [r4, #0x164] ldr r2, [r0, r2, lsl #2] add r0, r4, #0x16c - bl func_0202b0f4 + bl Approach_thunk ldr r0, _0216e4b0 ; =data_027e0e60 ldr r1, [r4, #0x16c] ldr r0, [r0] @@ -994,7 +994,7 @@ _0216e378: ldr r1, [r4, #0x168] ldr r2, [r0, r2, lsl #2] add r0, r4, #0x16c - bl func_0202b0f4 + bl Approach_thunk ldr r0, _0216e4b0 ; =data_027e0e60 ldr r1, [r4, #0x16c] ldr r0, [r0] @@ -13761,7 +13761,7 @@ _02178a1c: ldr r2, _02178aa0 ; =0x00000333 add r0, r4, #0x64 rsb r1, r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r3, r4, r5, pc} @@ -13777,7 +13777,7 @@ _02178a5c: ldr r2, _02178aa0 ; =0x00000333 add r0, r4, #0x64 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r3, r4, r5, pc} diff --git a/asm/ov26.s b/asm/ov26.s index aab1dcb2..79dc90c8 100644 --- a/asm/ov26.s +++ b/asm/ov26.s @@ -14507,11 +14507,11 @@ _02178818: ldr r1, [r5, #0x4c] ldr r2, _02178984 ; =0x0000019a add r0, r5, #0x48 - bl func_0202b0f4 + bl Approach_thunk ldr r2, [r5, #0x48] ldr r1, _02178988 ; =0xffffeccd add r0, r5, #0x44 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02178924 ldr r0, [r5, #0x3c] diff --git a/asm/ov28.s b/asm/ov28.s index 69e93bc5..67611539 100644 --- a/asm/ov28.s +++ b/asm/ov28.s @@ -830,7 +830,7 @@ _0216e228: add r0, r4, #0x880 add r1, r2, r1 mov r2, #0x14 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _0216e708 mov r0, #0 @@ -1553,7 +1553,7 @@ _0216ec00: add r0, r0, #0x800 add r1, r1, #0xc00 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0xca mov r1, #0x2000 ldr r2, _0216eec8 ; =0x0000011f @@ -1581,7 +1581,7 @@ _0216ec64: add r0, r0, #0x800 mov r2, #0x7b movne r4, #1 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 movne r6, #1 cmp r4, #0 @@ -8516,7 +8516,7 @@ _02174428: add r0, r4, #0x23c mov r1, #0 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 bne _02174488 add r1, r4, #0x200 @@ -12148,7 +12148,7 @@ _021773a8: ldr r1, _02177488 ; =0xffffe8cd ldr r2, _0217748c ; =0x0000011f add r0, r4, #0x4c - bl func_0202b0f4 + bl Approach_thunk _021773b8: ldr r0, [r4, #0x138] cmp r0, #0x99 @@ -12845,7 +12845,7 @@ func_ov28_02177bec: ; 0x02177bec add r0, r4, #0x188 mov r1, #0 mov r2, #0x21 - bl func_0202b0f4 + bl Approach_thunk ldrh r0, [r4, #0x78] ldr r2, _02178040 ; =data_02050f54 ldr r6, [r4, #0x188] diff --git a/asm/ov29.s b/asm/ov29.s index 412ca6b0..cb543f77 100644 --- a/asm/ov29.s +++ b/asm/ov29.s @@ -1723,7 +1723,7 @@ func_ov29_0216ec6c: ; 0x0216ec6c ldr r1, _0216ed7c ; =0x000004cd add r0, r4, #0x4e0 mov r2, #0x15 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x4e0] str r0, [r4, #0x1c8] ldmia sp!, {r4, pc} @@ -3470,7 +3470,7 @@ func_ov29_02170468: ; 0x02170468 ldr r2, [r5, #0x250] add r0, r5, #0x24c mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 add r2, sp, #0x34 add r0, r5, #0x228 @@ -3631,7 +3631,7 @@ func_ov29_021706ac: ; 0x021706ac ldr r2, [r5, #0x250] add r0, r5, #0x24c mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 add r2, sp, #0x34 add r0, r5, #0x228 @@ -3695,7 +3695,7 @@ _021707b0: ldr r1, _02170844 ; =0x0000019a add r0, r5, #0x250 mov r2, #0x14 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x258] cmp r0, #0 addeq sp, sp, #0x40 @@ -3842,7 +3842,7 @@ func_ov29_021709c0: ; 0x021709c0 ldr r2, [r5, #0x250] add r0, r5, #0x24c mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 add r2, sp, #4 add r0, r5, #0x228 @@ -4049,7 +4049,7 @@ func_ov29_02170ca0: ; 0x02170ca0 ldr r2, [r5, #0x250] add r0, r5, #0x24c mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 add r2, sp, #0x34 add r0, r5, #0x228 @@ -4115,7 +4115,7 @@ _02170dc8: add r0, r5, #0x250 rsb r1, r1, #0x770 mov r2, #8 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x258] cmp r0, #0 beq _02170e3c @@ -4236,7 +4236,7 @@ _02170f74: ldr r2, [r5, #0x250] add r0, r5, #0x24c mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 add r2, sp, #0x34 add r0, r5, #0x228 @@ -4301,7 +4301,7 @@ _02171070: ldr r1, _0217110c ; =0x0000019a add r0, r5, #0x250 mov r2, #0x14 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x258] cmp r0, #0 addeq sp, sp, #0x40 @@ -5187,7 +5187,7 @@ _02171bfc: add r0, r4, #0x88 mov r1, #0x800 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 mov r1, #0x12 bl func_ov00_020c1fc8 @@ -5220,7 +5220,7 @@ _02171c68: ldr r2, _02171cf8 ; =0x0000019a add r0, r4, #0x88 mov r1, #0xc00 - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 mov r1, #0x12 bl func_ov00_020c1fc8 @@ -5330,13 +5330,13 @@ _02171dec: add r0, r6, #0x328 mov r1, #0xcd mov r2, #0x14 - bl func_0202b0f4 + bl Approach_thunk b _02171e10 _02171e00: add r0, r6, #0x328 mov r1, #0 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk _02171e10: add r0, r6, #0x290 mov r1, #0x1000 @@ -7231,7 +7231,7 @@ _021736d4: ldr r2, _02173828 ; =0x0000019a add r0, r5, #0x278 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0x78 mov r1, #0 mov r2, #0x1000 @@ -7250,7 +7250,7 @@ _021737d4: add r0, r5, #0x278 mov r1, #0x1000 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk mov r1, r4 add r0, r5, #0x78 mov r2, #0x800 @@ -7523,7 +7523,7 @@ _02173bbc: add r0, r4, #0x278 mov r1, #0x1000 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk b _02173e68 _02173bd0: add r0, r4, #0x78 @@ -7657,7 +7657,7 @@ _02173d8c: add r0, r4, #0x278 mov r1, #0x1000 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk b _02173e68 _02173dc8: add r0, r4, #0x96 @@ -7702,7 +7702,7 @@ _02173e58: ldr r2, _0217403c ; =0x0000019a add r0, r4, #0x278 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk _02173e68: mov r0, r4 bl func_ov29_02173314 @@ -8402,7 +8402,7 @@ func_ov29_02174814: ; 0x02174814 add r0, r4, #0x274 mov r1, #0 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 bne _02174910 add r3, r4, #0x200 @@ -8496,7 +8496,7 @@ func_ov29_02174950: ; 0x02174950 ble _02174b2c add r0, r4, #0x274 mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk add r0, r5, r5, lsr #31 mov r0, r0, lsl #0xf mov r0, r0, lsr #0x10 @@ -8585,7 +8585,7 @@ func_ov29_02174950: ; 0x02174950 _02174b2c: ldr r1, _02174cc0 ; =0x00000333 add r0, r4, #0x274 - bl func_0202b0f4 + bl Approach_thunk add r0, r5, r5, lsr #31 mov r0, r0, lsl #0xf mov r0, r0, lsr #0x10 @@ -8809,7 +8809,7 @@ _02174e3c: mov r2, #0x1000 _02174e4c: add r0, r5, #0x27c - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldrne r0, [r5, #0x28c] cmpne r0, #0 @@ -9673,7 +9673,7 @@ func_ov29_02175900: ; 0x02175900 ldr r2, [r6, #0x2ac] add r0, r6, #0x2a8 mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk ldr r3, [r6, #0x290] ldr r1, [r6, #0x29c] ldr r0, [r6, #0x2a8] @@ -9814,7 +9814,7 @@ func_ov29_02175b4c: ; 0x02175b4c add r0, r4, #0x280 bne _02175cb8 mov r1, #0x4000 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02175cec ldr r0, [r4, #0x2b4] @@ -9899,7 +9899,7 @@ _02175c50: b _02175cec _02175cb8: mov r1, #0x800 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x244] bl func_ov00_020c2974 add r3, r4, #0xbe @@ -10310,7 +10310,7 @@ _02176238: ldr r2, _02176320 ; =0x00000666 add r0, r4, #0x68 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 bl func_ov29_021765ac cmp r0, #0 @@ -10329,7 +10329,7 @@ _0217627c: ldr r2, _02176320 ; =0x00000666 add r0, r4, #0x64 rsb r1, r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r3, r4, r5, pc} @@ -10355,7 +10355,7 @@ _021762e0: ldr r2, _02176320 ; =0x00000666 add r0, r4, #0x64 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #8 ldmeqia sp!, {r3, r4, r5, pc} @@ -12314,7 +12314,7 @@ func_ov29_02177d08: ; 0x02177d08 add r0, r4, #0x254 mov r1, #0x1000 mov r2, #0xcc - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x254] rsb r0, r0, r0, lsl #5 mov r0, r0, asr #0xc @@ -12484,7 +12484,7 @@ func_ov29_02177f28: ; 0x02177f28 add r0, r4, #0x64 mov r2, #0x29 str r3, [sp, #4] - bl func_0202b0f4 + bl Approach_thunk add r1, r4, #0x48 add r0, r4, #0x60 mov r2, r1 @@ -13210,7 +13210,7 @@ func_ov29_02178858: ; 0x02178858 strgtb r0, [r4, #0x522] add r0, r4, #0x11c add r0, r0, #0x400 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [r4, #0x51c] cmp r0, #0 rsb r0, r1, r1, lsl #4 @@ -13525,7 +13525,7 @@ _02178ce0: add r0, r0, #0x400 mov r1, #0 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk add r1, r4, #0x500 ldrh r2, [r1, #0x20] ldr r1, _02178da8 ; =data_02050f54 diff --git a/asm/ov32.s b/asm/ov32.s index 4b239cc6..fdd97d5a 100644 --- a/asm/ov32.s +++ b/asm/ov32.s @@ -6969,7 +6969,7 @@ _02181794: ldr r2, _02181ce0 ; =0x0000019a add r0, r4, #0xa0 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 bne _021817c4 ldr r0, _02181ce4 ; =data_027e0e58 @@ -7092,7 +7092,7 @@ _02181960: ldr r2, _02181ce0 ; =0x0000019a add r0, r4, #0xa4 mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk mov r0, r4 mov r1, #1 bl func_ov00_0208b9e4 @@ -7109,7 +7109,7 @@ _021819a0: ldr r2, _02181ce0 ; =0x0000019a add r0, r4, #0xa4 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk b _02181cb4 _021819b4: ldr r0, _02181cdc ; =data_027e0f74 diff --git a/asm/ov34.s b/asm/ov34.s index 4a1cbaae..c0a21a31 100644 --- a/asm/ov34.s +++ b/asm/ov34.s @@ -393,7 +393,7 @@ _0217c25c: ldr r1, [r6, #0x20c] ldr r2, [r6, #0x210] add r0, r6, #0x208 - bl func_0202b0f4 + bl Approach_thunk ldmia sp!, {r4, r5, r6, pc} arm_func_end func_ov34_0217c134 @@ -1978,7 +1978,7 @@ _0217d894: ldr r0, _0217deb4 ; =data_ov34_0218632c mov r1, #0x1000 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk ldr r1, _0217de9c ; =data_ov34_021861e8 mov r4, r0 add r3, sp, #0x78 @@ -2147,7 +2147,7 @@ _0217db28: ldr r0, _0217deb4 ; =data_ov34_0218632c mov r1, #0x1000 mov r2, #0x21 - bl func_0202b0f4 + bl Approach_thunk ldr r6, _0217deb8 ; =data_ov34_02186294 add lr, sp, #0x9c mov r4, r0 @@ -2313,7 +2313,7 @@ _0217dd9c: ldr r0, _0217deb4 ; =data_ov34_0218632c mov r1, #0x1000 mov r2, #0x7b - bl func_0202b0f4 + bl Approach_thunk mov r4, r0 _0217ddc8: ldr r0, _0217deb0 ; =data_027e0f94 @@ -2521,7 +2521,7 @@ func_ov34_0217e09c: ; 0x0217e09c ldr r0, _0217e268 ; =data_ov34_0218632c mov r1, #0x1000 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk ldr r1, _0217e264 ; =data_ov34_021861a0 mov r4, r0 ldr ip, [r1, #0x18c] @@ -2896,7 +2896,7 @@ _0217e5d8: add r0, r0, #0x1c00 mov r1, #0 mov r2, #0x3d - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} add r0, r5, #0x1000 @@ -3934,19 +3934,19 @@ _0217f4c0: ldr r1, [r1, #0xab8] ldr r2, _0217f538 ; =0x00000266 add r0, r0, #0x1800 - bl func_0202b0f4 + bl Approach_thunk add r1, r4, #0x1000 add r0, r4, #0xa70 ldr r1, [r1, #0xab0] ldr r2, _0217f53c ; =0x00000333 add r0, r0, #0x1000 - bl func_0202b0f4 + bl Approach_thunk add r1, r4, #0x1000 add r0, r4, #0x274 ldr r1, [r1, #0xd58] ldr r2, _0217f53c ; =0x00000333 add r0, r0, #0x1800 - bl func_0202b0f4 + bl Approach_thunk add sp, sp, #0x28 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 @@ -4473,7 +4473,7 @@ _0217fc0c: add r0, r0, #0x1c00 mov r1, #0x1000 mov r2, #0xf6 - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0x1000 ldr r0, [r0, #0xaa0] add r1, r5, #0x2ec @@ -4559,7 +4559,7 @@ _0217fde0: mov r1, r4 add r0, r0, #0x1c00 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0x1000 ldr r0, [r0, #0xaa0] add r1, r5, #0x2ec @@ -4579,7 +4579,7 @@ _0217fe2c: mov r1, r4 add r0, r0, #0x1c00 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0x1000 ldr r0, [r0, #0xaa0] add r1, r5, #0x2ec @@ -5253,19 +5253,19 @@ _021807c0: ldr r1, [r1, #0xab8] ldr r2, _02180838 ; =0x00000266 add r0, r0, #0x1800 - bl func_0202b0f4 + bl Approach_thunk add r1, r5, #0x1000 add r0, r5, #0xa70 ldr r1, [r1, #0xab0] ldr r2, _0218083c ; =0x00000333 add r0, r0, #0x1000 - bl func_0202b0f4 + bl Approach_thunk add r1, r5, #0x1000 add r0, r5, #0x274 ldr r1, [r1, #0xd58] ldr r2, _0218083c ; =0x00000333 add r0, r0, #0x1800 - bl func_0202b0f4 + bl Approach_thunk add sp, sp, #0x50 ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 @@ -5462,12 +5462,12 @@ _02180a70: add r0, r0, #0x1800 add r1, r1, #0x6c00 mov r2, #0x400 - bl func_0202b0f4 + bl Approach_thunk add r0, r4, #0x164 add r0, r0, #0x1c00 mov r1, #0 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk add r0, r4, #0x1000 ldr r0, [r0, #0xaa0] add r1, r4, #0x2ec @@ -5835,13 +5835,13 @@ _02181020: ldr r1, [r1, #0xab0] add r0, r0, #0x1000 add r2, r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk add r1, r4, #0x1000 add r0, r4, #0x274 ldr r1, [r1, #0xd58] ldr r2, _021810f4 ; =0x00000333 add r0, r0, #0x1800 - bl func_0202b0f4 + bl Approach_thunk _02181068: add r0, r4, #0x1000 ldr r0, [r0, #0xaa0] @@ -6005,7 +6005,7 @@ _02181284: add r0, r0, #0x1c00 mov r1, #0x1000 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0x1000 ldr r0, [r0, #0xaa0] add r1, r5, #0x2ec @@ -6137,19 +6137,19 @@ _02181438: ldr r1, [r1, #0xab8] ldr r2, _0218154c ; =0x00000266 add r0, r0, #0x1800 - bl func_0202b0f4 + bl Approach_thunk add r1, r5, #0x1000 add r0, r5, #0xa70 ldr r1, [r1, #0xab0] ldr r2, _02181550 ; =0x00000333 add r0, r0, #0x1000 - bl func_0202b0f4 + bl Approach_thunk add r1, r5, #0x1000 add r0, r5, #0x274 ldr r1, [r1, #0xd58] ldr r2, _02181550 ; =0x00000333 add r0, r0, #0x1800 - bl func_0202b0f4 + bl Approach_thunk mov r0, r5 bl func_ov34_02182dc8 add r1, r5, #0x1000 @@ -6338,7 +6338,7 @@ _02181770: add r0, r0, #0x1c00 mov r1, #0 mov r2, #0x3d - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 addeq sp, sp, #0xc ldmeqia sp!, {r3, r4, pc} @@ -7132,7 +7132,7 @@ func_ov34_02182214: ; 0x02182214 mov r1, r4 add r0, r0, #0x1c00 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk add r1, r6, #0x1000 ldr ip, [r1, #0xab4] add r3, r6, #0xab0 @@ -7158,13 +7158,13 @@ func_ov34_02182214: ; 0x02182214 ldr r1, [r1, #0xab0] ldr r2, _02182320 ; =0x00000333 add r0, r0, #0x1000 - bl func_0202b0f4 + bl Approach_thunk add r1, r6, #0x1000 add r0, r6, #0x274 ldr r1, [r1, #0xd58] ldr r2, _02182320 ; =0x00000333 add r0, r0, #0x1800 - bl func_0202b0f4 + bl Approach_thunk _021822f4: cmp r4, #0 cmpne r5, #0 @@ -7336,7 +7336,7 @@ _021824c8: mov r1, #0x1000 mov r2, #0x52 str r3, [sp, #0xc] - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02182570 add r0, r5, #0x21c @@ -9140,7 +9140,7 @@ func_ov34_02183e9c: ; 0x02183e9c ldr r2, [r1, #0xd60] add r0, r0, #0x1c00 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 add r0, r4, #0x1000 ldr r0, [r0, #0xaa0] @@ -10094,7 +10094,7 @@ func_ov34_02184b70: ; 0x02184b70 ldr r1, [r1, #4] mov r2, #0x148 add r1, r1, #0x800 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x160] cmp r0, #0 beq _02184c10 @@ -10192,7 +10192,7 @@ func_ov34_02184cec: ; 0x02184cec add r0, r4, #0x188 mov r1, #0 mov r2, #0x1000 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02184d84 ldr r0, [r4, #0x16c] @@ -10264,7 +10264,7 @@ _02184df8: ldr r1, [r1, #0x4c] mov r2, #0x148 add r1, r1, #0x800 - bl func_0202b0f4 + bl Approach_thunk add r0, sp, #0 mov r1, r4 bl func_ov00_020c23c4 @@ -10902,7 +10902,7 @@ func_ov34_0218565c: ; 0x0218565c add r0, r4, #0x20c mov r1, #0x1000 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x20c] cmp r0, #0x1000 ldmltia sp!, {r4, pc} @@ -10961,7 +10961,7 @@ func_ov34_021856f4: ; 0x021856f4 ldr r2, _02185728 ; =0x0000019a add r0, r4, #0x20c mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x20c] cmp r0, #0 ldmgtia sp!, {r4, pc} diff --git a/asm/ov35.s b/asm/ov35.s index cd817985..94ff6f0d 100644 --- a/asm/ov35.s +++ b/asm/ov35.s @@ -7333,7 +7333,7 @@ _02182360: ldr r1, [r4, #0x540] add r0, r0, #0x400 mov r2, #0x14 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r4, #0x53c] cmp r0, #0 bne _021823a0 diff --git a/asm/ov36.s b/asm/ov36.s index 73fe4940..bee2daa9 100644 --- a/asm/ov36.s +++ b/asm/ov36.s @@ -164,7 +164,7 @@ _0217bfa0: ldr r2, _0217c008 ; =0x00000385 add r0, r4, #0x17c mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 movne r0, #0 strneb r0, [r4, #0x188] @@ -2518,7 +2518,7 @@ _0217df94: add r0, r5, #0x68 mov r1, #0 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _0217e030 ldr r0, _0217e3ac ; =data_027e103c diff --git a/asm/ov37.s b/asm/ov37.s index 68197525..c4057fa6 100644 --- a/asm/ov37.s +++ b/asm/ov37.s @@ -9530,7 +9530,7 @@ func_ov37_0218431c: ; 0x0218431c str r1, [sp] mov r1, #0x1000 mov r2, #0x44 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp] add r0, r4, #0x1000 str r1, [r0, #0x5a8] diff --git a/asm/ov38.s b/asm/ov38.s index d07e10c4..9883732c 100644 --- a/asm/ov38.s +++ b/asm/ov38.s @@ -3330,7 +3330,7 @@ _0217ebec: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r4, #0x3d8 str r0, [sp] @@ -3459,7 +3459,7 @@ _0217edd4: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r1, #0x10 add r0, r4, #0x82 str r1, [sp] @@ -3597,7 +3597,7 @@ _0217efcc: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r4, #0x3d8 str r0, [sp] @@ -3622,12 +3622,12 @@ _0217efcc: add r0, r0, #0xc00 sub r1, r1, #0x8000 mov r2, #0x800 - bl func_0202b0f4 + bl Approach_thunk add r0, r4, #0x3c add r0, r0, #0x1000 mov r1, #0x800 mov r2, #0xc - bl func_0202b0f4 + bl Approach_thunk b _0217f0a4 _0217f074: mov r0, r1, lsl #0x10 @@ -4787,7 +4787,7 @@ _02180074: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r4, #0x3d8 str r0, [sp] @@ -4994,7 +4994,7 @@ _02180360: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r5, #0x3d8 str r0, [sp] @@ -5678,7 +5678,7 @@ _02180d1c: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r4, #0x3d8 str r0, [sp] @@ -5989,7 +5989,7 @@ _02181178: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r4, #0x3d8 str r0, [sp] @@ -6264,7 +6264,7 @@ _0218154c: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r5, #0x3d8 str r0, [sp] @@ -6469,7 +6469,7 @@ _0218182c: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r5, #0x3d8 str r0, [sp] @@ -6869,7 +6869,7 @@ _02181dbc: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r5, #0x3d8 str r0, [sp] @@ -7021,7 +7021,7 @@ _02181ff0: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r4, #0x3d8 str r0, [sp] @@ -7157,7 +7157,7 @@ _021821d4: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, r4, #0x3d8 str r0, [sp] @@ -7290,7 +7290,7 @@ func_ov38_0218233c: ; 0x0218233c mov r2, #0x66 mov r4, r4, asr #0xc mov r5, r5, asr #0xc - bl func_0202b0f4 + bl Approach_thunk add r3, r6, #0x1000 ldr r0, [r3, #0x54] cmp r0, #0 @@ -7331,7 +7331,7 @@ func_ov38_0218233c: ; 0x0218233c mov r1, #0x1000 mov r2, #0x66 str r3, [r6, #0xfe0] - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _021824e0 mov r0, r6 @@ -7478,7 +7478,7 @@ _02182610: mov r2, #0x66 mov r7, r5, asr #0xc mov r8, r4, asr #0xc - bl func_0202b0f4 + bl Approach_thunk add r3, sb, #0x1000 rsb fp, r7, #0 ldr ip, [r3, #0x44] @@ -7557,7 +7557,7 @@ _02182610: add r0, r0, #0x1000 mov r1, #0x1000 mov r2, #0x14 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 beq _02182810 ldr r0, [sb, #0x2c4] @@ -7613,7 +7613,7 @@ _02182870: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 str r0, [sp] add r0, sb, #0x1000 @@ -7711,7 +7711,7 @@ _021829c0: str r3, [sp, #0x90] str r1, [sp, #0x94] str r3, [sp, #0x98] - bl func_0202b0f4 + bl Approach_thunk add r0, sb, #0x82 add r0, r0, #0x1000 mov r1, #0x300 @@ -7816,7 +7816,7 @@ _02182b78: ldr r1, [r1, #0x3c] add r0, r0, #0x1000 mov r2, #0x66 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0x29 add r1, sb, #0x3d8 str r0, [sp] @@ -8248,7 +8248,7 @@ func_ov38_0218314c: ; 0x0218314c ldr r2, [r5, #0x2c0] add r0, r5, #0x2bc mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldr r0, [r5, #0x2c4] beq _021831f4 @@ -10460,13 +10460,13 @@ _0218500c: add r0, sl, #0x224 mov fp, #0x2c00 mov sb, #0 - bl func_0202b0f4 + bl Approach_thunk ldr r1, _021854d4 ; =0x00000b9a add r0, sl, #0x22c str r1, [sl, #0x228] ldr r1, [sl, #0x230] mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldr r0, _021854d8 ; =0x00000666 str r0, [sl, #0x230] rsb r0, r0, #0x1400 @@ -11673,7 +11673,7 @@ _02186194: ldr r0, _02186a38 ; =data_ov38_021892f0 mov r1, #0x2000 mov r2, #0x52 - bl func_0202b0f4 + bl Approach_thunk mov r3, #0 ldr r1, _02186a10 ; =data_ov38_021891e0 sub r0, r3, #0x1000 diff --git a/asm/ov39.s b/asm/ov39.s index 677f66f0..7a74f392 100644 --- a/asm/ov39.s +++ b/asm/ov39.s @@ -2061,7 +2061,7 @@ _0217d914: ldr r2, _0217dd08 ; =0x0000011f add r0, r5, #0x1e4 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk _0217d950: mov r0, r5 bl func_ov39_0217e82c @@ -5711,7 +5711,7 @@ _02180c00: ldr r2, _02180f7c ; =0x0000019a add r0, r5, #0x1c0 mov r1, #0x400 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x280] add r1, sp, #0x38 bl func_ov39_02185208 @@ -5750,7 +5750,7 @@ _02180c94: ldr r2, _02180f7c ; =0x0000019a add r0, r5, #0x1c0 mov r1, #0x400 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x280] add r1, sp, #0x38 bl func_ov39_02185208 @@ -5769,7 +5769,7 @@ _02180cdc: ldr r2, _02180f7c ; =0x0000019a add r0, r5, #0x1c0 mov r1, #0x400 - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x280] add r1, sp, #0x38 bl func_ov39_02185208 @@ -7856,7 +7856,7 @@ _02182984: ldr r2, _02182f20 ; =0x0000011f add r0, r5, #0x1e4 mov r1, #0 - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0x5e add r0, r0, #0x100 mov r1, #0 @@ -7865,7 +7865,7 @@ _02182984: add r0, r5, #0x1a8 mov r1, #0 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0x100 ldrh r0, [r0, #0x60] ldr r2, _02182f24 ; =data_02050f54 @@ -8005,7 +8005,7 @@ _02182bc0: ldr r1, _02182f44 ; =0x00001666 ldr r2, _02182f20 ; =0x0000011f add r0, r5, #0x1e4 - bl func_0202b0f4 + bl Approach_thunk add r0, r5, #0x5e ldr r1, _02182f48 ; =0x0000251c add r0, r0, #0x100 @@ -8018,7 +8018,7 @@ _02182bc0: add r0, r5, #0x1a8 mov r1, #0x400 mov r2, #0xcd - bl func_0202b0f4 + bl Approach_thunk ldr r0, [r5, #0x16c] cmp r0, #0 mov r0, r5 @@ -8292,7 +8292,7 @@ func_ov39_02182ffc: ; 0x02182ffc add r0, r4, #0x1a8 mov r1, #0 mov r2, #0x7b - bl func_0202b0f4 + bl Approach_thunk add r0, r4, #0x100 ldrh r0, [r0, #0x60] ldr r2, _021830d4 ; =data_02050f54 diff --git a/asm/ov44.s b/asm/ov44.s index f30fe155..1508ba1a 100644 --- a/asm/ov44.s +++ b/asm/ov44.s @@ -2816,7 +2816,7 @@ _0218b670: ldr r1, [r0, #8] ldr r2, _0218b6fc ; =0x0000019a add r0, sp, #4 - bl func_0202b0f4 + bl Approach_thunk mov r0, #0 str r0, [r4, #0x60] ldr r1, [sp, #4] @@ -2831,7 +2831,7 @@ _0218b6a8: ldr r2, _0218b6fc ; =0x0000019a add r0, sp, #0 str r3, [sp] - bl func_0202b0f4 + bl Approach_thunk ldr r2, [sp] ldr r1, [r4, #0x48] mov r0, #0 diff --git a/asm/ov46.s b/asm/ov46.s index cb0ed02d..872f3ca6 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -4049,7 +4049,7 @@ func_ov46_02193574: ; 0x02193574 ldr r1, _02193b14 ; =0x0000019a add r0, r4, #0x68 mov r2, #0x29 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [r4, #0x4c] mov r0, #0x52 sub r1, r1, #0x800 diff --git a/asm/ov50.s b/asm/ov50.s index ff500e14..ddc9802e 100644 --- a/asm/ov50.s +++ b/asm/ov50.s @@ -1584,7 +1584,7 @@ _02196a2c: cmp r1, r0 beq _02196a94 mov r0, r3 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp, #0xc] ldr r0, [r4, #0x48] sub r0, r1, r0 @@ -1593,7 +1593,7 @@ _02196a2c: _02196a94: ldr r1, [r4, #0x164] add r0, sp, #0x14 - bl func_0202b0f4 + bl Approach_thunk ldr r1, [sp, #0x14] ldr r0, [r4, #0x50] sub r0, r1, r0 @@ -1607,7 +1607,7 @@ _02196ab4: ldr r1, [r4, #0x160] ldr r2, [r4, #0x60] mov r0, r3 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 ldrne r1, [r4, #0x160] movne r0, #0 @@ -1621,7 +1621,7 @@ _02196af4: ldr r1, [r4, #0x164] ldr r2, [r4, #0x68] add r0, sp, #8 - bl func_0202b0f4 + bl Approach_thunk cmp r0, #0 bne _02196b24 ldr r1, [sp, #8] diff --git a/asm/ov57.s b/asm/ov57.s index d51bf534..a97df001 100644 --- a/asm/ov57.s +++ b/asm/ov57.s @@ -925,7 +925,7 @@ _021998a4: ldr r2, _021998ec ; =0x00000266 add r0, r4, #0x74 mov r1, #0x1000 - bl func_0202b0f4 + bl Approach_thunk add sp, sp, #4 ldmia sp!, {r3, r4, r5, r6, pc} .align 2, 0 diff --git a/include/ItemManager.hpp b/include/ItemManager.hpp index cd304e5f..ee88540c 100644 --- a/include/ItemManager.hpp +++ b/include/ItemManager.hpp @@ -251,7 +251,7 @@ public: void Sword_vfunc_38(unk32 param1); void Shield_vfunc_38(unk32 param1); void EquipItem_vfunc_38(unk32 param1); - void func_ov00_020ad678(Vec3p *param1, ItemFlag equipId); + bool EquipItem_vfunc_3c(Vec4p *param1, ItemFlag equipId); void EquipItem_vfunc_2c(ItemFlag equipId); EquipItem* GetEquipItem(ItemFlag equipId); unk32 func_ov00_020ad790(unk32 param1); @@ -327,7 +327,7 @@ public: void func_ov00_020ae350() const; void GiveKeys(u32 amount); void func_ov00_020ae4dc(unk32 param1); // sets mUnk_0ba - void _ZN11ItemManager18func_ov00_020ae648Ejjj(unk32 param1, unk32 param2, unk32 param3); + void func_ov00_020ae648(unk32 param1, unk32 param2, unk32 param3); }; extern ItemManager *gItemManager; diff --git a/include/Player/EquipHammer.hpp b/include/Player/EquipHammer.hpp index da0fef3b..8ea2364e 100644 --- a/include/Player/EquipHammer.hpp +++ b/include/Player/EquipHammer.hpp @@ -31,7 +31,7 @@ public: /* 2c */ virtual unk32 vfunc_2c() override; // func_ov59_02198fcc /* 30 */ virtual void vfunc_30() override; // func_ov59_02198e6c /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_0v59_02198fc8 - /* 3c */ virtual bool vfunc_3c(void *param1, unk32 param2, unk32 param3) const override; // func_ov14_0213ee10 - /* 4c */ virtual unk32 vfunc_4c() const override; // func_ov14_0213eea8 + /* 3c */ virtual bool vfunc_3c(Vec4p *param1) const override; // func_ov14_0213ee10 + /* 4c */ virtual s32 vfunc_4c() const override; // func_ov14_0213eea8 /* 50 */ }; diff --git a/include/Player/EquipItem.hpp b/include/Player/EquipItem.hpp index 4009bbf0..4ab0c8ea 100644 --- a/include/Player/EquipItem.hpp +++ b/include/Player/EquipItem.hpp @@ -32,10 +32,10 @@ public: /* 30 */ virtual void vfunc_30() = 0; /* 34 */ virtual void vfunc_34(unk16 *param1); // func_ov00_020be96c /* 38 */ virtual void vfunc_38(unk32 param1) = 0; - /* 3c */ virtual bool vfunc_3c(void *param1, unk32 param2, unk32 param3) const; // func_ov00_020beb90 + /* 3c */ virtual bool vfunc_3c(Vec4p *param1) const; // func_ov00_020beb90 /* 40 */ virtual unk32 vfunc_40() const; // func_ov00_020be970 /* 44 */ virtual unk32 vfunc_44(unk32 param1) const; // func_ov00_020be978 /* 48 */ virtual unk32 vfunc_48(unk32 param1) const; // func_ov00_020be980 - /* 4c */ virtual unk32 vfunc_4c() const; // func_ov00_020be988 + /* 4c */ virtual s32 vfunc_4c() const; // func_ov00_020be988 /* 50 */ }; diff --git a/include/Player/EquipShield.hpp b/include/Player/EquipShield.hpp index 2e554108..3eb47d83 100644 --- a/include/Player/EquipShield.hpp +++ b/include/Player/EquipShield.hpp @@ -30,6 +30,6 @@ public: /* 30 */ virtual void vfunc_30() override; // func_ov00_020c0804 /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov00_020c086c - /* 3c */ virtual bool vfunc_3c(void *param1, unk32 param2, unk32 param3) const; // func_ov00_020c0a88 + /* 3c */ virtual bool vfunc_3c(Vec4p *param1) const; // func_ov00_020c0a88 /* 50 */ }; diff --git a/include/Player/EquipSword.hpp b/include/Player/EquipSword.hpp index 85aaecb3..57b64443 100644 --- a/include/Player/EquipSword.hpp +++ b/include/Player/EquipSword.hpp @@ -53,6 +53,6 @@ public: /* 2c */ virtual u32 vfunc_2c() override; // func_ov00_020c0674 /* 30 */ virtual void vfunc_30() override; // func_ov00_020bf538 /* 38 */ virtual void vfunc_38(unk32 param1) override; // func_ov00_020bff94 - /* 3c */ virtual bool vfunc_3c(void *param1, unk32 param2, unk32 param3) const override; // func_ov00_020c01dc + /* 3c */ virtual bool vfunc_3c(Vec4p *param1) const override; // func_ov00_020c01dc /* 50 */ }; diff --git a/include/lib/math.h b/include/lib/math.h index 1b27fe54..d3379e7f 100644 --- a/include/lib/math.h +++ b/include/lib/math.h @@ -3,8 +3,6 @@ #include "types.h" -extern "C" u32 FastDivide(u32 a, u32 b); - // 20.12 fixed point number typedef u32 p32; @@ -15,4 +13,17 @@ typedef struct { /* c */ } Vec3p; +typedef struct { + /* 00 */ p32 x; + /* 04 */ p32 y; + /* 08 */ p32 z; + /* 0c */ p32 w; + /* 10 */ +} Vec4p; + +extern "C" u32 FastDivide(u32 a, u32 b); +extern "C" bool Approach(unk32 *src, unk32 dest, unk32 step); +extern "C" bool Approach_thunk(unk32 *src, unk32 dest, unk32 step); +extern "C" bool func_01ffec34(Vec4p *param1, Vec4p *param2); + #endif diff --git a/src/ItemManager.cpp b/src/ItemManager.cpp index d914e729..5356ec77 100644 --- a/src/ItemManager.cpp +++ b/src/ItemManager.cpp @@ -237,3 +237,15 @@ void ItemManager::EquipItem_vfunc_38(unk32 param1) { (*this->mEquipItems)[equip]->vfunc_38(param1); } + +bool ItemManager::EquipItem_vfunc_3c(Vec4p *param1, ItemFlag equipId) { + Vec4p result; + if ((*this->mEquipItems)[equipId]->vfunc_3c(&result)) { + s32 step = (*this->mEquipItems)[equipId]->vfunc_4c(); + if (step > 0) { + Approach_thunk(&result.y, param1->y, step); + } + return func_01ffec34(param1, &result); + } + return false; +}