mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-07-08 05:40:40 -04:00
Code Issues Packages Projects Releases Wiki Activity

ActorNavi (#132)

Browse Source 
* Map symbol in Game

* ActorNavi 93%

* ActorNavi_04 96%

* Document Actor fields

* Move MAX_KEYS to ItemManager

* Move gTouchControl to its own header

* Fix missing includes

* Fix regressions

* Fix build

* Update decompiling guide images

* Fix regression
This commit is contained in:
Aetias
2025-08-29 20:01:10 +02:00
committed by GitHub
parent be02098914
commit cb52c8c23f
66 changed files with 778 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/00_Core/Map/MapManager.cpp
+6 -7
View File
@@ -44,7 +44,6 @@ extern s32 func_ov000_0208e6f0(Vec3p *param_1);
extern s32 func_ov000_0208e704(Vec3p *param_1);
extern s32 func_ov000_0208e87c(AABB *param_1, Vec3p *param_2, Vec3p *param_3);
extern void func_ov000_0208ed74(AABB *param_1, Vec3p *param_2);
extern void func_ov000_02093a1c(u32 *param_1, unk32 *param_2, unk32 param_3);
extern void func_ov000_02096324(unk32 *param_1, unk32 *param_2);
extern s32 *func_ov000_02096418(s32 *param_1);
extern void func_ov015_021849a4(unk32 *param_1);
@@ -1268,13 +1267,13 @@ unk8 MapManager::MapData_vfunc_6c(Vec3p *param_2, unk32 *param_3, Vec3p *param_4
this->mMap->vfunc_6c(param_2, param_3, param_4);
}
ARM unk32 MapManager::MapData_vfunc_70(Vec3p *param_2) {
ARM u16 MapManager::MapData_vfunc_70(Vec3p *param_2) {
return this->mMap->vfunc_70(param_2);
}
ARM void MapManager::func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p *param_3) {
unk32 *iVar1; // find type with field that exists at offset 0xc
s32 dVar2;
u16 dVar2;
iVar1 = (unk32 *) param_2->mMap->vfunc_74(param_3);
if (iVar1 != NULL) {
@@ -1284,7 +1283,7 @@ ARM void MapManager::func_ov00_02083fb0(u32 *param_1, MapManager *param_2, Vec3p
dVar2 = param_2->MapData_vfunc_70(param_3);
if (dVar2 != 0xffff) {
func_ov000_02093a1c(param_1, (unk32 *) data_027e0f6c, dVar2);
UnkStruct_027e0f6c::func_ov000_02093a1c(param_1, data_027e0f6c, dVar2);
return;
}
@@ -2086,7 +2085,7 @@ unk32 MapManager::func_ov00_02084ebc(Vec3p *param_2) {
}
// dVar3 = this->MapData_vfunc_70(); // Missing param.
if (dVar3 != 0xffff) {
func_ov000_02093a1c(&uStack_14, (unk32 *) data_027e0f6c, dVar3);
UnkStruct_027e0f6c::func_ov000_02093a1c(&uStack_14, data_027e0f6c, dVar3);
if ((uStack_14 >> 5 & 3) != 1) {
return 0;
}
@@ -2274,7 +2273,7 @@ s32 MapManager::func_ov00_020853fc(MapManager *param_1, Vec3p *param_2, s32 *par
ARM unk32 MapManager::func_ov00_02085594(Vec3p *param_2) {
UnkStruct_02085594 *piVar1;
unk32 dVar3;
u16 dVar3;
unk32 uVar4;
bool bVar5;
u32 uStack_24;
@@ -2337,7 +2336,7 @@ ARM unk32 MapManager::func_ov00_02085594(Vec3p *param_2) {
if (dVar3 == 0xffff) {
return 0;
}
func_ov000_02093a1c(&uStack_24, (unk32 *) data_027e0f6c, dVar3);
UnkStruct_027e0f6c::func_ov000_02093a1c(&uStack_24, data_027e0f6c, dVar3);
if ((uStack_24 >> 5 & 3) == 1) {
return bVar5 ? 1 : 2;
}