mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-26 15:45:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remangle MapManager::func_ov00_02083fb0

Browse Source
This commit is contained in:
Aetias
2024-05-03 19:21:42 +02:00
parent 6fa786a02e
commit 40a3b9d851
27 changed files with 43 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Map/MapManager.s
+4 -4
View File
@@ -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
asm/ov00/ov00_020b1498.inc
+1 -1
View File
@@ -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
asm/ov00/ov00_020b1498.s
+2 -2
View File
@@ -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
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -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
asm/ov00/ov00_020c3e54.s
+3 -3
View File
@@ -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
asm/ov05.inc
+1 -1
View File
@@ -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
asm/ov05.s
+2 -2
View File
@@ -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
asm/ov12.inc
+1 -1
View File
@@ -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
asm/ov12.s
+2 -2
View File
@@ -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
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -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
asm/ov14/ov14_0211f640.s
+5 -5
View File
@@ -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
asm/ov17.inc
+1 -1
View File
@@ -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
asm/ov17.s
+2 -2
View File
@@ -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
asm/ov19.inc
+1 -1
View File
@@ -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
asm/ov19.s
+1 -1
View File
@@ -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
asm/ov23.inc
+1 -1
View File
@@ -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
asm/ov23.s
+2 -2
View File
@@ -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
asm/ov46.inc
+1 -1
View File
@@ -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
asm/ov46.s
+2 -2
View File
@@ -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
asm/ov49.inc
+1 -1
View File
@@ -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
asm/ov49.s
+1 -1
View File
@@ -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
asm/ov58.inc
+1 -1
View File
@@ -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
asm/ov58.s
+2 -2
View File
@@ -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
asm/ov59.inc
+1 -1
View File
@@ -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
asm/ov59.s
+1 -1
View File
@@ -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
include/Map/MapManager.hpp
+1 -1
View File
@@ -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);
src/00_Core/Map/MapManager.cpp
+1 -1
View File
@@ -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) {}