From 40a3b9d85177d30fd2f438ec3240c9f1bb258337 Mon Sep 17 00:00:00 2001 From: Aetias Date: Fri, 3 May 2024 19:21:42 +0200 Subject: [PATCH] Remangle `MapManager::func_ov00_02083fb0` --- asm/ov00/Map/MapManager.s | 8 ++++---- asm/ov00/ov00_020b1498.inc | 2 +- asm/ov00/ov00_020b1498.s | 4 ++-- asm/ov00/ov00_020c3e54.inc | 2 +- asm/ov00/ov00_020c3e54.s | 6 +++--- asm/ov05.inc | 2 +- asm/ov05.s | 4 ++-- asm/ov12.inc | 2 +- asm/ov12.s | 4 ++-- asm/ov14/ov14_0211f640.inc | 2 +- asm/ov14/ov14_0211f640.s | 10 +++++----- asm/ov17.inc | 2 +- asm/ov17.s | 4 ++-- asm/ov19.inc | 2 +- asm/ov19.s | 2 +- asm/ov23.inc | 2 +- asm/ov23.s | 4 ++-- asm/ov46.inc | 2 +- asm/ov46.s | 4 ++-- asm/ov49.inc | 2 +- asm/ov49.s | 2 +- asm/ov58.inc | 2 +- asm/ov58.s | 4 ++-- asm/ov59.inc | 2 +- asm/ov59.s | 2 +- include/Map/MapManager.hpp | 2 +- src/00_Core/Map/MapManager.cpp | 2 +- 27 files changed, 43 insertions(+), 43 deletions(-) diff --git a/asm/ov00/Map/MapManager.s b/asm/ov00/Map/MapManager.s index fe64cb25..35e4d2b4 100644 --- a/asm/ov00/Map/MapManager.s +++ b/asm/ov00/Map/MapManager.s @@ -2746,9 +2746,9 @@ _ZN10MapManager16MapData_vfunc_70Ev: ; 0x02083f98 ldmia sp!, {r3, pc} arm_func_end _ZN10MapManager16MapData_vfunc_70Ev - .global _ZN10MapManager18func_ov00_02083fb0EiPS_i - arm_func_start _ZN10MapManager18func_ov00_02083fb0EiPS_i -_ZN10MapManager18func_ov00_02083fb0EiPS_i: ; 0x02083fb0 + .global _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p + arm_func_start _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p +_ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p: ; 0x02083fb0 stmdb sp!, {r4, r5, r6, lr} mov r6, r1 mov r4, r0 @@ -2777,7 +2777,7 @@ _ZN10MapManager18func_ov00_02083fb0EiPS_i: ; 0x02083fb0 bl func_ov00_02093a1c ldmia sp!, {r4, r5, r6, pc} .align 2, 0 - arm_func_end _ZN10MapManager18func_ov00_02083fb0EiPS_i + arm_func_end _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p _0208401c: .word 0x0000ffff _02084020: .word data_027e0f6c diff --git a/asm/ov00/ov00_020b1498.inc b/asm/ov00/ov00_020b1498.inc index a9e87b3c..931f2316 100644 --- a/asm/ov00/ov00_020b1498.inc +++ b/asm/ov00/ov00_020b1498.inc @@ -20,7 +20,7 @@ .extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi .extern _ZN10MapManager18func_ov00_02083e34Ecci .extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_020840a0Ecci .extern _ZN10MapManager18func_ov00_0208412cEv .extern _ZN10MapManager18func_ov00_02084164Ev diff --git a/asm/ov00/ov00_020b1498.s b/asm/ov00/ov00_020b1498.s index 07ecf977..02541758 100644 --- a/asm/ov00/ov00_020b1498.s +++ b/asm/ov00/ov00_020b1498.s @@ -605,7 +605,7 @@ func_ov00_020b1ba4: ; 0x020b1ba4 add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp] mov r0, r0, lsr #0x9 and r0, r0, #3 @@ -6545,7 +6545,7 @@ _020b6830: add r0, sp, #0x1c add r2, sp, #0x50 str r3, [sp, #0x58] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #0x1c] mov r1, r0 mov r0, r0, lsr #0x5 diff --git a/asm/ov00/ov00_020c3e54.inc b/asm/ov00/ov00_020c3e54.inc index 840dc10a..03614a14 100644 --- a/asm/ov00/ov00_020c3e54.inc +++ b/asm/ov00/ov00_020c3e54.inc @@ -14,7 +14,7 @@ .extern _ZN10MapManager18func_ov00_02083c24Ei .extern _ZN10MapManager18func_ov00_02083c50Ei .extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_020840dcEv .extern _ZN10MapManager18func_ov00_02084164Ev .extern _ZN10MapManager18func_ov00_02084838Ev diff --git a/asm/ov00/ov00_020c3e54.s b/asm/ov00/ov00_020c3e54.s index 7236a01d..7275d53e 100644 --- a/asm/ov00/ov00_020c3e54.s +++ b/asm/ov00/ov00_020c3e54.s @@ -933,7 +933,7 @@ _020c498c: str lr, [sp, #8] str ip, [sp, #0xc] str r3, [sp, #0x10] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #4] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -1665,7 +1665,7 @@ func_ov00_020c5288: ; 0x020c5288 ldr r3, [r5, #8] mov r1, r4 str r3, [sp, #0x10] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #4] mov r0, r0, lsr #0x9 and r0, r0, #3 @@ -10465,7 +10465,7 @@ func_ov00_020cc27c: ; 0x020cc27c add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov05.inc b/asm/ov05.inc index 901ca129..14911a36 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -18,7 +18,7 @@ .extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi .extern _ZN10MapManager18func_ov00_02083e34Ecci .extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_020840a0Ecci .extern _ZN10MapManager18func_ov00_02084740Ev .extern _ZN10MapManager18func_ov00_020848b8Ev diff --git a/asm/ov05.s b/asm/ov05.s index cd59e77b..3d13fb75 100644 --- a/asm/ov05.s +++ b/asm/ov05.s @@ -2641,7 +2641,7 @@ _02102e24: ldr r1, [sp, #0x44] add r0, sp, #0x74 add r2, sp, #0x78 - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p add r0, sp, #0x74 bl func_ov05_02103b2c cmp r0, #2 @@ -12408,7 +12408,7 @@ _0210ae98: str r7, [sp, #0x10] str r6, [sp, #0x14] str r3, [sp, #0x18] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #0xc] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov12.inc b/asm/ov12.inc index 0303dc97..3130d090 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -18,7 +18,7 @@ .extern _ZN10MapManager18func_ov00_02083c50Ei .extern _ZN10MapManager18func_ov00_02083e34Ecci .extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_ -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_020840a0Ecci .extern _ZN10PlayerBase18func_ov00_020a7c00Ei .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder diff --git a/asm/ov12.s b/asm/ov12.s index 70704064..466d3f93 100644 --- a/asm/ov12.s +++ b/asm/ov12.s @@ -29082,7 +29082,7 @@ _0212a830: add r0, sp, #4 add r2, sp, #8 str r3, [sp, #0x10] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #4] mov r0, r0, lsr #0x9 and r0, r0, #3 @@ -34553,7 +34553,7 @@ func_ov12_0212ecb0: ; 0x0212ecb0 add r0, sp, #4 add r2, sp, #8 str r3, [sp, #0x10] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldrb r1, [sp] ldrb r0, [sp, #1] sub r2, sp, #4 diff --git a/asm/ov14/ov14_0211f640.inc b/asm/ov14/ov14_0211f640.inc index f23b93a8..92d28a72 100644 --- a/asm/ov14/ov14_0211f640.inc +++ b/asm/ov14/ov14_0211f640.inc @@ -27,7 +27,7 @@ .extern _ZN10MapManager18func_ov00_02083c50Ei .extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi .extern _ZN10MapManager18func_ov00_02083e34Ecci -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_020840a0Ecci .extern _ZN10MapManager18func_ov00_020840dcEv .extern _ZN10MapManager18func_ov00_020843ecEPi diff --git a/asm/ov14/ov14_0211f640.s b/asm/ov14/ov14_0211f640.s index 21002b8b..28936275 100644 --- a/asm/ov14/ov14_0211f640.s +++ b/asm/ov14/ov14_0211f640.s @@ -6080,7 +6080,7 @@ _02124668: add r0, sp, #0x1c add r2, sp, #0x68 str r3, [sp, #0x70] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r1, [r5, #0x48] ldr r0, _02124c54 ; =gMapManager str r1, [sp, #0x5c] @@ -6318,7 +6318,7 @@ _021249a4: add r0, sp, #0x10 add r2, sp, #0x2c str r3, [sp, #0x34] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #0x10] mov r1, r0 mov r0, r0, lsr #0x5 @@ -31114,7 +31114,7 @@ func_ov14_02138b18: ; 0x02138b18 add r0, sp, #0xc add r2, sp, #0x1c str r3, [sp, #0x24] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #0xc] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -33299,7 +33299,7 @@ _0213a68c: add r0, sp, #0 add r2, sp, #0x38 str r3, [sp, #0x40] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -33681,7 +33681,7 @@ _0213ab94: add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov17.inc b/asm/ov17.inc index c8e656d3..c17f45de 100644 --- a/asm/ov17.inc +++ b/asm/ov17.inc @@ -250,7 +250,7 @@ .extern _ZN10MapManager18func_ov00_02083c50Ei .extern _ZN10MapManager16MapData_vfunc_68Ev .extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_020840a0Ecci .extern _ZN10MapManager16MapData_vfunc_78Ev .extern _ZN10MapManager18func_ov00_020843ecEPi diff --git a/asm/ov17.s b/asm/ov17.s index cb50764d..458afc1a 100644 --- a/asm/ov17.s +++ b/asm/ov17.s @@ -6940,7 +6940,7 @@ _02160b10: add r0, sp, #4 add r2, sp, #0x14 str r3, [sp, #0x1c] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #4] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -7012,7 +7012,7 @@ _02160c28: add r0, sp, #0 add r2, sp, #8 str r3, [sp, #0x10] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov19.inc b/asm/ov19.inc index 7d8152e9..b05b0aba 100644 --- a/asm/ov19.inc +++ b/asm/ov19.inc @@ -7,7 +7,7 @@ .extern _ZN10MapManager18func_ov00_02083770Eji .extern _ZN10MapManager18func_ov00_02083780Ei .extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_02084d24Ecci .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN10PlayerBase18func_ov00_020a7c1cEP8Cylinder diff --git a/asm/ov19.s b/asm/ov19.s index 627744b2..dc799a3d 100644 --- a/asm/ov19.s +++ b/asm/ov19.s @@ -5462,7 +5462,7 @@ func_ov19_02171e64: ; 0x02171e64 add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov23.inc b/asm/ov23.inc index 694a2f3f..1281e283 100644 --- a/asm/ov23.inc +++ b/asm/ov23.inc @@ -18,7 +18,7 @@ .extern _ZN10MapManager18func_ov00_02083c24Ei .extern _ZN10MapManager18func_ov00_02083c50Ei .extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_020840a0Ecci .extern _ZN10MapManager18func_ov00_02084740Ev .extern _ZN10MapManager18func_ov00_02084b38Eiii diff --git a/asm/ov23.s b/asm/ov23.s index 4e6986ee..e15ccc20 100644 --- a/asm/ov23.s +++ b/asm/ov23.s @@ -13756,7 +13756,7 @@ _02178b10: ldr r1, [r1] add r0, sp, #0x10 mov r2, r4 - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #0x10] mov r0, r0, lsr #0x5 and r0, r0, #3 @@ -13902,7 +13902,7 @@ _02178de8: ldr r1, [r1] add r0, sp, #0xc add r2, sp, #0x20 - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #0xc] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov46.inc b/asm/ov46.inc index 094317f1..0757fbcc 100644 --- a/asm/ov46.inc +++ b/asm/ov46.inc @@ -2,7 +2,7 @@ .extern Approach_thunk .extern _ZN10MapManager16MapData_vfunc_78Ev .extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN11ItemManager10GiveRupeesEsb .extern _ZN11ItemManager16SetTreasureCountEjc .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j diff --git a/asm/ov46.s b/asm/ov46.s index 58abc6f7..5f34693d 100644 --- a/asm/ov46.s +++ b/asm/ov46.s @@ -60,7 +60,7 @@ _021900d8: ldr r3, [r6, #8] mov r1, r5 str r3, [sp, #0x10] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #4] and r0, r0, #0x1f cmp r0, #0xe @@ -783,7 +783,7 @@ _02190a10: ldr r3, [r6, #8] mov r1, r5 str r3, [sp, #0x10] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #4] and r0, r0, #0x1f cmp r0, #0xe diff --git a/asm/ov49.inc b/asm/ov49.inc index 7ff8c456..7e7d2899 100644 --- a/asm/ov49.inc +++ b/asm/ov49.inc @@ -122,7 +122,7 @@ .extern _ZN10MapManager18func_ov00_020839b4Ei .extern _ZN10MapManager18func_ov00_020839c4Ei .extern _ZN10MapManager16MapData_vfunc_68Ev -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern func_ov00_02088000 .extern func_ov00_02094824 .extern func_ov00_0209a4f4 diff --git a/asm/ov49.s b/asm/ov49.s index cdf531cb..df8173e8 100644 --- a/asm/ov49.s +++ b/asm/ov49.s @@ -2661,7 +2661,7 @@ _021978a8: add r0, sp, #0 add r2, sp, #4 str r3, [sp, #0xc] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp] mov r0, r0, lsr #0x5 and r0, r0, #3 diff --git a/asm/ov58.inc b/asm/ov58.inc index 4ce7c74e..58fadba3 100644 --- a/asm/ov58.inc +++ b/asm/ov58.inc @@ -78,7 +78,7 @@ .extern _ZN10MapManager16MapData_vfunc_68Ev .extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p .extern _ZN10MapManager16MapData_vfunc_6cEv -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager16MapData_vfunc_54Ev .extern _ZN10MapManager18func_ov00_020840dcEv .extern _ZN10MapManager18func_ov00_0208499cEv diff --git a/asm/ov58.s b/asm/ov58.s index 33b2e70a..f61c67cf 100644 --- a/asm/ov58.s +++ b/asm/ov58.s @@ -1881,7 +1881,7 @@ _02199d50: add r0, sp, #0x60 ldr r1, [r1] add r2, r7, #0 - blx _ZN10MapManager18func_ov00_02083fb0EiPS_i + blx _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r1, [sp, #0x60] ldr r0, [sp, #0x60] lsr r2, r1, #5 @@ -2014,7 +2014,7 @@ _02199e54: add r2, sp, #0x74 str r0, [sp, #0x7c] add r0, sp, #0x5c - blx _ZN10MapManager18func_ov00_02083fb0EiPS_i + blx _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p ldr r0, [sp, #0x5c] ldr r2, [sp, #0x5c] lsr r1, r0, #5 diff --git a/asm/ov59.inc b/asm/ov59.inc index b1008d20..555e07f5 100644 --- a/asm/ov59.inc +++ b/asm/ov59.inc @@ -1,6 +1,6 @@ #pragma once .extern _ZN10MapManager16MapData_vfunc_68Ev -.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i +.extern _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p .extern _ZN10MapManager18func_ov00_020858b0Ev .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j .extern _ZN12ActorManager8GetActorEP8ActorRef diff --git a/asm/ov59.s b/asm/ov59.s index 894f00e9..688da49e 100644 --- a/asm/ov59.s +++ b/asm/ov59.s @@ -982,7 +982,7 @@ _02199968: str r6, [sp, #0x38] str r5, [sp, #0x64] str r5, [sp, #0x40] - bl _ZN10MapManager18func_ov00_02083fb0EiPS_i + bl _ZN10MapManager18func_ov00_02083fb0EPjPS_P5Vec3p bl func_ov59_02198e2c ldrb r1, [r0, #0x27] mov r2, #0 diff --git a/include/Map/MapManager.hpp b/include/Map/MapManager.hpp index e773ef19..632b9e25 100644 --- a/include/Map/MapManager.hpp +++ b/include/Map/MapManager.hpp @@ -171,7 +171,7 @@ public: void func_ov00_02083f44(Vec3p *param_2); unk8 MapData_vfunc_6c(); unk8 MapData_vfunc_70(); - static unk8 func_ov00_02083fb0(unk32 param_1, MapManager *param_2, unk32 param_3); + static unk8 func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3); void func_ov00_02084024(unk32 param_2, AABB *param_3); unk8 MapData_vfunc_54(); unk8 func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4); diff --git a/src/00_Core/Map/MapManager.cpp b/src/00_Core/Map/MapManager.cpp index 802043ac..409dc9bd 100644 --- a/src/00_Core/Map/MapManager.cpp +++ b/src/00_Core/Map/MapManager.cpp @@ -133,7 +133,7 @@ void MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3) {} void MapManager::func_ov00_02083f44(Vec3p *param_2) {} unk8 MapManager::MapData_vfunc_6c() {} unk8 MapManager::MapData_vfunc_70() {} -unk8 MapManager::func_ov00_02083fb0(unk32 param_1, MapManager *param_2, unk32 param_3) {} +unk8 MapManager::func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3) {} void MapManager::func_ov00_02084024(unk32 param_2, AABB *param_3) {} unk8 MapManager::MapData_vfunc_54() {} unk8 MapManager::func_ov00_020840a0(unk8 param_2, unk8 param_3, unk32 param_4) {}