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

Remangle MapManager::func_ov00_02083ef8

Browse Source
This commit is contained in:
Aetias
2024-06-30 11:12:33 +02:00
parent 28597a0698
commit e60433c809
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/itcm.inc
+1 -1
View File
@@ -57,7 +57,7 @@
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_02086284EPiP5Vec3pS2_itS2_S2_
.extern _ZN10MapManager18func_ov00_02086a84EPiP5Vec3pS2_iiiS2_S2_
asm/itcm.s
+1 -1
View File
@@ -7092,7 +7092,7 @@ _01ffdfa8:
mov r1, r7
mov r2, r9
str r4, [sp, #0x31c]
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
ldr r1, [sp, #0x1d4]
add r0, r0, r8
cmp r1, r0
asm/ov00/Actor/Actor.inc
+1 -1
View File
@@ -6,7 +6,7 @@
.extern Vec3p_Sub
.extern _ZN10EquipSword12GetEquipRopeEv
.extern _ZN10MapManager18func_ov00_02083570Eii
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084c5cEii
asm/ov00/Actor/Actor.s
+1 -1
View File
@@ -2351,7 +2351,7 @@ _ZN5Actor18func_ov00_020c3094Ev: ; 0x020c3094
ldr ip, [r5, #0x5c]
mov r3, r4
str ip, [sp, #8]
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
ldr r1, [r5, #0x4c]
cmp r1, r0
movle r4, #1
asm/ov00/Map/MapManager.s
+5 -5
View File
@@ -2679,9 +2679,9 @@ _ZN10MapManager16MapData_vfunc_68Ev: ; 0x02083ee0
ldmia sp!, {r3, pc}
arm_func_end _ZN10MapManager16MapData_vfunc_68Ev
.global _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
arm_func_start _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_: ; 0x02083ef8
.global _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
arm_func_start _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
_ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i: ; 0x02083ef8
stmdb sp!, {r3, r4, lr}
sub sp, sp, #0xc
add ip, sp, #0
@@ -2701,7 +2701,7 @@ _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_: ; 0x02083ef8
blx ip
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
arm_func_end _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
arm_func_end _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
.global _ZN10MapManager18func_ov00_02083f44EP5Vec3p
arm_func_start _ZN10MapManager18func_ov00_02083f44EP5Vec3p
@@ -2717,7 +2717,7 @@ _ZN10MapManager18func_ov00_02083f44EP5Vec3p: ; 0x02083f44
str lr, [sp]
str ip, [sp, #4]
str r4, [sp, #8]
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
add sp, sp, #0xc
ldmia sp!, {r3, r4, pc}
.align 2, 0
asm/ov12.inc
+1 -1
View File
@@ -25,7 +25,7 @@
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
.extern _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10PlayerBase12CollidesWithEP8Cylinder
asm/ov12.s
+1 -1
View File
@@ -37609,7 +37609,7 @@ func_ov12_021314e8: ; 0x021314e8
str ip, [sp, #4]
ldr ip, [r4, #0x5c]
str ip, [sp, #8]
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_
bl _ZN10MapManager18func_ov00_02083ef8EP5Vec3pS1_i
ldr r1, _021315b8 ; =data_ov12_02137680
str r0, [r4, #0x4c]
ldr r2, [r1, #0x28]
include/Map/MapManager.hpp
+1 -1
View File
@@ -167,7 +167,7 @@ public:
unk8 MapData_vfunc_60();
static unk8 func_ov00_02083e70();
unk8 MapData_vfunc_68();
s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3);
s32 func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3, unk32 param_4);
void func_ov00_02083f44(Vec3p *param_2);
unk8 MapData_vfunc_6c();
unk8 MapData_vfunc_70();
src/00_Core/Map/MapManager.cpp
+1 -1
View File
@@ -127,7 +127,7 @@ unk8 MapManager::func_ov00_02083e34(unk8 param_2, unk8 param_3, unk32 param_4) {
unk8 MapManager::MapData_vfunc_60() {}
unk8 MapManager::func_ov00_02083e70() {}
unk8 MapManager::MapData_vfunc_68() {}
s32 MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3) {}
s32 MapManager::func_ov00_02083ef8(Vec3p *param_2, Vec3p *param_3, unk32 param_4) {}
void MapManager::func_ov00_02083f44(Vec3p *param_2) {}
unk8 MapManager::MapData_vfunc_6c() {}
unk8 MapManager::MapData_vfunc_70() {}